diff options
author | Juan J. MartÃnez <jjm@usebox.net> | 2022-05-25 06:11:32 +0000 |
---|---|---|
committer | Juan J. MartÃnez <jjm@usebox.net> | 2022-05-25 06:11:32 +0000 |
commit | 15a7f7e4bda1a022a9e871b6c57fa7a7be22eb74 (patch) | |
tree | 401393be14ccf27b3d1f0adf71bf4716839d02b4 | |
parent | 39bd26a83749aaf5167de6af89161a3f8ef0c36b (diff) | |
parent | 89b67a7092ed6aae966b356d0cdb8607e51e2c4e (diff) | |
download | ubox-msx-lib-15a7f7e4bda1a022a9e871b6c57fa7a7be22eb74.tar.gz ubox-msx-lib-15a7f7e4bda1a022a9e871b6c57fa7a7be22eb74.zip |
Merge branch 'main' into 'master'
fixed docs and comment
See merge request reidrac/ubox-msx-lib!30
-rw-r--r-- | game/src/Makefile | 2 | ||||
-rw-r--r-- | include/ubox.h | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/game/src/Makefile b/game/src/Makefile index fef5f24..b05ef4e 100644 --- a/game/src/Makefile +++ b/game/src/Makefile @@ -12,7 +12,7 @@ TMPDIR := ../build # will automatically include (and compile) any .c or .z80 file OBJS := $(patsubst %.c,$(TMPDIR)/%.rel,$(wildcard *.c)) $(patsubst %.z80,$(TMPDIR)/%.rel,$(wildcard *.z80)) # crt0.z80 is compiled as requirement of the targets and MUST be linked first, -# so we exlude it from the list of user-provided source +# so we exclude it from the list of user-provided source OBJS := $(filter-out $(TMPDIR)/crt0.rel,$(OBJS)) UBOX_LIBS := $(wildcard ../../lib/*.lib) diff --git a/include/ubox.h b/include/ubox.h index ecb6fce..6b19915 100644 --- a/include/ubox.h +++ b/include/ubox.h @@ -471,26 +471,6 @@ void ubox_set_sprite_pat16(uint8_t *data, uint8_t pattern); */ void ubox_set_sprite_pat16_flip(uint8_t *data, uint8_t pattern); -/** - * Sets the sprite attributes of sprite number `sprite` using the attributes - * pointed by `attr`. - * - * `sprite` is the index in the sprite table of Screen 2. - * - * See [struct sprite_attr](#struct-sprite_attr) description for details on - * the sprite attributes. - * - * Example: - * ```c - * ubox_set_sprite_attr(&player_sprite_attr, 0); - * ``` - * - * To set the attributes of multiple sprites that are contiguous in the sprite - * table, it is recommended to use [ubox_write_vm](#ubox_write_vm). The sprite - * attribute table is in the memory address `0x1b00`. - */ -void ubox_set_sprite_attr(struct sprite_attr *attr, uint8_t sprite); - // @Control functions // // The supported controls are: cursor and joystick (port 1 and port 2). |