Browse Source

fix (not totally) darkness bug (delete transparency)

master
milang 1 month ago
parent
commit
4892f03f6d

BIN
BitmapWs.g1a View File


+ 1
- 1
Makefile View File

@@ -22,7 +22,7 @@ lf-cg := $(LDFLAGS) -Tfxcg50.ld -lgint-cg -lgcc -Wl,-Map=build-cg/map
dflags = -MMD -MT $@ -MF $(@:.o=.d) -MP
cpflags := -R .bss -R .gint_bss

g1af := -i "$(ICON_FX)" -n "$(NAME)" --internal="$(INTERNAL)"
g1af := -i "$(ICON_FX)" -n "$(NAME)" --internal="$(INTERNAL)" --version="$(VERSION)"
g3af := -n basic:"$(NAME)" -i uns:"$(ICON_CG_UNS)" -i sel:"$(ICON_CG_SEL)"

#

BIN
assets-fx/img/brouillard.png View File


BIN
assets-fx/img/houses.png View File


BIN
build-fx/assets/img/brouillard.png.o View File


BIN
build-fx/assets/img/houses.png.o View File


+ 156
- 157
build-fx/map View File

@@ -120,7 +120,7 @@ LOAD build-fx/assets/img/wall.png.o
LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a
LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
0x0000000000300000 _brom = 0x300000
0x0000000000002c94 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks))
0x0000000000002b9c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks))

.pretext 0x0000000000300200 0x8a8
*(.pretext.entry)
@@ -160,7 +160,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
*(.dtors .dtors.*)
0x0000000000300aa8 _etors = .

.text 0x0000000000300aa8 0x20d0
.text 0x0000000000300aa8 0x20d8
*(.text .text.*)
.text 0x0000000000300aa8 0x1c8 build-fx/src/item.o
0x0000000000300aa8 get_item_type
@@ -171,130 +171,129 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
.text 0x0000000000300c70 0x0 build-fx/src/main.o
.text.startup 0x0000000000300c70 0x58 build-fx/src/main.o
0x0000000000300c70 main
.text 0x0000000000300cc8 0x17c build-fx/src/map.o
.text 0x0000000000300cc8 0x188 build-fx/src/map.o
0x0000000000300cc8 create_map
0x0000000000300d40 get_item
0x0000000000300d6c get_visibility
0x0000000000300d9c set_item
0x0000000000300dd4 display
.text 0x0000000000300e44 0x1c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
0x0000000000300e44 getkey_opt
0x0000000000300fc4 getkey
0x0000000000300fd0 getkey_repeat
.text 0x000000000030100c 0x2c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
0x00000000003011b0 pollevent
0x000000000030129c waitevent
.text 0x00000000003012d4 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
0x00000000003012d4 dclear
.text 0x0000000000301320 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
.text 0x0000000000301320 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
.text 0x0000000000301320 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
.text 0x0000000000301320 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
0x0000000000301320 dupdate
0x0000000000301338 dupdate_noint
.text 0x0000000000301344 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
0x0000000000301344 dimage
0x0000000000301398 dsubimage
.text 0x000000000030140c 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
0x000000000030140c dsize
.text 0x00000000003014a8 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
0x00000000003017c8 timer_setup
0x0000000000301858 timer_delay
0x00000000003018b8 timer_start
0x00000000003018ec timer_reload
0x000000000030190c timer_pause
0x0000000000301940 timer_stop
0x000000000030199c timer_timeout
0x00000000003019a8 timer_address
0x00000000003019e4 timer_clear
.text 0x0000000000301a14 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
0x0000000000301a14 gint_intlevel
0x0000000000301a68 gint_inthandler
.text 0x0000000000301a8c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
.text 0x0000000000301a8c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
.text 0x0000000000301a8c 0x170 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
0x0000000000301b40 gint_install
0x0000000000301be4 gint_unload
.text 0x0000000000301bfc 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
0x0000000000301c94 t6k11_display
0x0000000000301d68 t6k11_contrast
0x0000000000301d94 t6k11_backlight
.text 0x0000000000301dd4 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
0x0000000000301dd4 memcpy
0x0000000000301e8e _memmove
0x0000000000301e92 _memcmp
0x0000000000301e96 memset
.text 0x0000000000301eb0 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
0x0000000000301ebc iokbd_row
0x0000000000301fa4 iokbd_scan
.text 0x0000000000301fd4 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
0x0000000000302118 clock_freq
.text 0x0000000000302124 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
0x0000000000302124 bopti_asm_mono
0x000000000030214a bopti_asm_mono_alpha
.text 0x000000000030217c 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
0x000000000030217c bopti_grid
0x00000000003022f0 bopti_render
0x0000000000302418 bopti_render_clip
0x000000000030252c bopti_render_noclip
.text 0x0000000000302584 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
0x0000000000302584 masks
.text 0x0000000000302620 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
.text 0x0000000000302620 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
.text 0x0000000000302620 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
0x0000000000302620 gint_setvbr
.text 0x000000000030264c 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
0x000000000030264c tlb_addr
0x0000000000302660 tlb_data
0x0000000000302674 tlb_mapped_memory
0x0000000000302748 utlb_addr
0x0000000000302758 utlb_data
0x0000000000302768 utlb_mapped_memory
.text 0x0000000000302840 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
.text 0x0000000000302840 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
.text 0x0000000000302840 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
0x0000000000302840 __movstr
0x0000000000302840 __movmem
0x0000000000302874 __movmemSI64
0x0000000000302874 __movstrSI64
0x0000000000302878 __movstrSI60
0x0000000000302878 __movmemSI60
0x000000000030287c __movmemSI56
0x000000000030287c __movstrSI56
0x0000000000302880 __movstrSI52
0x0000000000302880 __movmemSI52
0x0000000000302884 __movstrSI48
0x0000000000302884 __movmemSI48
0x0000000000302888 __movstrSI44
0x0000000000302888 __movmemSI44
0x000000000030288c __movstrSI40
0x000000000030288c __movmemSI40
0x0000000000302890 __movstrSI36
0x0000000000302890 __movmemSI36
0x0000000000302894 __movmemSI32
0x0000000000302894 __movstrSI32
0x0000000000302898 __movmemSI28
0x0000000000302898 __movstrSI28
0x000000000030289c __movstrSI24
0x000000000030289c __movmemSI24
0x00000000003028a0 __movmemSI20
0x00000000003028a0 __movstrSI20
0x00000000003028a4 __movstrSI16
0x00000000003028a4 __movmemSI16
0x00000000003028a8 __movmemSI12
0x00000000003028a8 __movstrSI12
0x00000000003028ac __movmemSI8
0x00000000003028ac __movstrSI8
0x00000000003028b0 __movmemSI4
0x00000000003028b0 __movstrSI4
.text 0x00000000003028b8 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
0x00000000003028b8 __udivdi3
.text 0x0000000000302aa8 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
0x0000000000302aca __udivsi3
*fill* 0x0000000000302b14 0x4
.text 0x0000000000302b18 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
0x0000000000302b18 __udiv_qrnnd_16
.text 0x0000000000302b78 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
0x0000000000300d50 get_item
0x0000000000300d78 get_visibility
0x0000000000300da8 set_item
0x0000000000300de0 display
.text 0x0000000000300e50 0x1c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o)
0x0000000000300e50 getkey_opt
0x0000000000300fd0 getkey
0x0000000000300fdc getkey_repeat
.text 0x0000000000301018 0x2c8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
0x00000000003011bc pollevent
0x00000000003012a8 waitevent
.text 0x00000000003012e0 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o)
0x00000000003012e0 dclear
.text 0x000000000030132c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o)
.text 0x000000000030132c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o)
.text 0x000000000030132c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
.text 0x000000000030132c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o)
0x000000000030132c dupdate
0x0000000000301344 dupdate_noint
.text 0x0000000000301350 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
0x0000000000301350 dimage
0x00000000003013a4 dsubimage
.text 0x0000000000301418 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
0x0000000000301418 dsize
.text 0x00000000003014b4 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
0x00000000003017d4 timer_setup
0x0000000000301864 timer_delay
0x00000000003018c4 timer_start
0x00000000003018f8 timer_reload
0x0000000000301918 timer_pause
0x000000000030194c timer_stop
0x00000000003019a8 timer_timeout
0x00000000003019b4 timer_address
0x00000000003019f0 timer_clear
.text 0x0000000000301a20 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o)
0x0000000000301a20 gint_intlevel
0x0000000000301a74 gint_inthandler
.text 0x0000000000301a98 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o)
.text 0x0000000000301a98 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o)
.text 0x0000000000301a98 0x170 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o)
0x0000000000301b4c gint_install
0x0000000000301bf0 gint_unload
.text 0x0000000000301c08 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
0x0000000000301ca0 t6k11_display
0x0000000000301d74 t6k11_contrast
0x0000000000301da0 t6k11_backlight
.text 0x0000000000301de0 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o)
0x0000000000301de0 memcpy
0x0000000000301e9a _memmove
0x0000000000301e9e _memcmp
0x0000000000301ea2 memset
.text 0x0000000000301ebc 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o)
0x0000000000301ec8 iokbd_row
0x0000000000301fb0 iokbd_scan
.text 0x0000000000301fe0 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
0x0000000000302124 clock_freq
.text 0x0000000000302130 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o)
0x0000000000302130 bopti_asm_mono
0x0000000000302156 bopti_asm_mono_alpha
.text 0x0000000000302188 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
0x0000000000302188 bopti_grid
0x00000000003022fc bopti_render
0x0000000000302424 bopti_render_clip
0x0000000000302538 bopti_render_noclip
.text 0x0000000000302590 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o)
0x0000000000302590 masks
.text 0x000000000030262c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o)
.text 0x000000000030262c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o)
.text 0x000000000030262c 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o)
0x000000000030262c gint_setvbr
.text 0x0000000000302658 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o)
0x0000000000302658 tlb_addr
0x000000000030266c tlb_data
0x0000000000302680 tlb_mapped_memory
0x0000000000302754 utlb_addr
0x0000000000302764 utlb_data
0x0000000000302774 utlb_mapped_memory
.text 0x000000000030284c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o)
.text 0x000000000030284c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o)
.text 0x000000000030284c 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o)
0x000000000030284c __movstr
0x000000000030284c __movmem
0x0000000000302880 __movmemSI64
0x0000000000302880 __movstrSI64
0x0000000000302884 __movstrSI60
0x0000000000302884 __movmemSI60
0x0000000000302888 __movmemSI56
0x0000000000302888 __movstrSI56
0x000000000030288c __movstrSI52
0x000000000030288c __movmemSI52
0x0000000000302890 __movstrSI48
0x0000000000302890 __movmemSI48
0x0000000000302894 __movstrSI44
0x0000000000302894 __movmemSI44
0x0000000000302898 __movstrSI40
0x0000000000302898 __movmemSI40
0x000000000030289c __movstrSI36
0x000000000030289c __movmemSI36
0x00000000003028a0 __movmemSI32
0x00000000003028a0 __movstrSI32
0x00000000003028a4 __movmemSI28
0x00000000003028a4 __movstrSI28
0x00000000003028a8 __movstrSI24
0x00000000003028a8 __movmemSI24
0x00000000003028ac __movmemSI20
0x00000000003028ac __movstrSI20
0x00000000003028b0 __movstrSI16
0x00000000003028b0 __movmemSI16
0x00000000003028b4 __movmemSI12
0x00000000003028b4 __movstrSI12
0x00000000003028b8 __movmemSI8
0x00000000003028b8 __movstrSI8
0x00000000003028bc __movmemSI4
0x00000000003028bc __movstrSI4
.text 0x00000000003028c4 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o)
0x00000000003028c4 __udivdi3
.text 0x0000000000302ab4 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o)
0x0000000000302ad6 __udivsi3
.text 0x0000000000302b20 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o)
0x0000000000302b20 __udiv_qrnnd_16
.text 0x0000000000302b80 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
*(C P)

.gint.blocks 0x0000000000302b80 0x140
@@ -334,43 +333,43 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
*(.gint.drivers.6)
0x0000000000302d50 _edrv = .

.rodata 0x0000000000302d50 0x7f4
.rodata 0x0000000000302d50 0x6f4
*(.rodata .rodata.*)
.rodata.str1.4
0x0000000000302d50 0x15 build-fx/src/main.o
*fill* 0x0000000000302d65 0x3
.rodata 0x0000000000302d68 0x104 build-fx/assets/img/brouillard.png.o
.rodata 0x0000000000302d68 0x84 build-fx/assets/img/brouillard.png.o
0x0000000000302d68 img_brouillard
0x0000000000302e6c img_brouillard_end
.rodata 0x0000000000302e6c 0x104 build-fx/assets/img/houses.png.o
0x0000000000302e6c img_houses
0x0000000000302f70 img_houses_end
.rodata 0x0000000000302f70 0x84 build-fx/assets/img/wall.png.o
0x0000000000302f70 img_wall
0x0000000000302ff4 img_wall_end
0x0000000000302dec img_brouillard_end
.rodata 0x0000000000302dec 0x84 build-fx/assets/img/houses.png.o
0x0000000000302dec img_houses
0x0000000000302e70 img_houses_end
.rodata 0x0000000000302e70 0x84 build-fx/assets/img/wall.png.o
0x0000000000302e70 img_wall
0x0000000000302ef4 img_wall_end
.rodata.str1.4
0x0000000000302ff4 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
*fill* 0x0000000000302ffa 0x2
.rodata 0x0000000000302ffc 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
.rodata 0x0000000000303004 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
0x0000000000302ef4 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
*fill* 0x0000000000302efa 0x2
.rodata 0x0000000000302efc 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o)
.rodata 0x0000000000302f04 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o)
.rodata.str1.4
0x000000000030301c 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
0x0000000000302f1c 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)
.rodata.str1.4
0x0000000000303020 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
*fill* 0x0000000000303026 0x2
.rodata 0x0000000000303028 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o)
0x0000000000303028 gint_font5x7
0x0000000000303430 gint_font5x7_end
0x0000000000302f20 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o)
*fill* 0x0000000000302f26 0x2
.rodata 0x0000000000302f28 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o)
0x0000000000302f28 gint_font5x7
0x0000000000303330 gint_font5x7_end
.rodata.str1.4
0x0000000000303430 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
.rodata 0x0000000000303434 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
.rodata 0x0000000000303444 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
0x0000000000303444 __clz_tab
0x0000000000303330 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o)
.rodata 0x0000000000303334 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o)
.rodata 0x0000000000303344 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o)
0x0000000000303344 __clz_tab

.rela.dyn 0x0000000000303544 0x0
.rela.text 0x0000000000303544 0x0 build-fx/src/map.o
.rela.dyn 0x0000000000303444 0x0
.rela.text 0x0000000000303444 0x0 build-fx/src/map.o
.rela.pretext.entry
0x0000000000303544 0x0 build-fx/src/map.o
0x0000000000303444 0x0 build-fx/src/map.o
0x0000000008100000 . = ORIGIN (ram)

.bss 0x0000000008100000 0x690
@@ -419,8 +418,8 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
0x0000000008100690 . = ALIGN (0x10)
0x0000000000000690 _sbss = SIZEOF (.bss)

.data 0x0000000008100690 0x10 load address 0x0000000000303544
0x0000000000303544 _ldata = LOADADDR (.data)
.data 0x0000000008100690 0x10 load address 0x0000000000303444
0x0000000000303444 _ldata = LOADADDR (.data)
0x0000000008100690 _rdata = .
*(.data .data.*)
.data 0x0000000008100690 0x0 build-fx/src/item.o
@@ -463,15 +462,15 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
*(D)
0x00000000081006a0 . = ALIGN (0x10)

.data.4 0x00000000081006a0 0x0 load address 0x0000000000303554
.data.4 0x00000000081006a0 0x0 load address 0x0000000000303454
*(.data.4)
0x00000000081006a0 . = ALIGN (0x10)
0x0000000000000010 _sdata = (SIZEOF (.data) + SIZEOF (.data.4))
0x000000008800df00 _gint_vbr = 0x8800df00
0x000000008800f400 . = ORIGIN (rram)

.gint.data 0x000000008800f400 0x130 load address 0x0000000000303554
0x0000000000303554 _lgdata = LOADADDR (.gint.data)
.gint.data 0x000000008800f400 0x130 load address 0x0000000000303454
0x0000000000303454 _lgdata = LOADADDR (.gint.data)
0x000000008800f400 _rgdata = .
*(.gint.data .gint.data.*)
.gint.data 0x000000008800f400 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
@@ -489,7 +488,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a
0x000000008800f530 . = ALIGN (0x10)
0x0000000000000130 _sgdata = SIZEOF (.gint.data)

.gint.bss 0x000000008800f530 0x210 load address 0x0000000000303684
.gint.bss 0x000000008800f530 0x210 load address 0x0000000000303584
*(.gint.bss .gint.bss.*)
.gint.bss 0x000000008800f530 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o)
.gint.bss 0x000000008800f630 0x88 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o)

BIN
build-fx/src/BitmapWs.bin View File


BIN
build-fx/src/BitmapWs.elf View File


BIN
build-fx/src/map.o View File


+ 2
- 0
project.cfg View File

@@ -6,6 +6,8 @@
NAME = BitmapWs
# Internal name, should be '@' followed by at most 7 uppercase letters.
INTERNAL = @BMPWARS
# version
VERSION = 00.01.0000

# fx-9860G icon location
ICON_FX = assets-fx/icon-fx.png

+ 6
- 1
src/map.c View File

@@ -52,6 +52,11 @@ void create_map()

map[1][0].item.type=WALL;
map[1][2].item.type=WALL;
map[1][1].item.type=HOUSE;

map[3][1].item.type=HOUSE;
map[3][2].item.type=HOUSE;
map[4][2].item.type=HOUSE;
}


@@ -59,7 +64,7 @@ int dx=0, dy=0; // delta(en items) pour l'affichage

generic_item* get_item(int x, int y)
{
if (x<0||x>=DIM_X||y<0||y>DIM_Y)
if (x<0||x>=DIM_X||y<0||y>=DIM_Y)
return 0;
return &map[y][x].item;
}

+ 3
- 3
src/map.h View File

@@ -9,9 +9,9 @@ extern const int dim_y;

typedef enum
{
EARTH = 0,
WATER = 1,
MOUNTAIN
EARTH = 0,
WATER = 1,
MOUNTAIN = 2

} map_terrain;


Loading…
Cancel
Save