empathicqubit/waw-sprite-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Path stuff

Browse source
This commit is contained in:
Empathic Qubit 2021-11-22 18:54:21 +01:00
parent f30cc2ac3d
commit 2564809c6d
4 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.vimspector.json Normal file
View file

@ -0,0 +1,24 @@
{
"configurations": {
"CC65 VICE": {
"adapter": "cust_cc65-vice",
"configuration": {
"request": "launch",
"name": "CC65 Vice Launch",
"debugFile": "${workspaceFolder}/build/machismo.dbg",
"mapFile": "${workspaceFolder}/build/machismo.map",
"program": "${workspaceFolder}/build/machismo.d64",
"build": {
"cwd": "${workspaceFolder}",
"command": "scons",
"args": []
},
"stopOnEntry": true,
"viceArgs": [
"-model",
"ntsc"
]
}
}
}
}

4
SConstruct
View file

@ -8,7 +8,7 @@ character_start = 'D800'
if 'CC65_HOME' in os.environ: if 'CC65_HOME' in os.environ:
cc65_home = os.environ['CC65_HOME'] cc65_home = os.environ['CC65_HOME']
else: else:
cc65_home = '' cc65_home = str(Glob(os.environ['HOME'] + '/.vscode/extensions/entan-gl.cc65-vice*/dist/cc65')[0])
if 'DISPLAY' in os.environ: if 'DISPLAY' in os.environ:
display = os.environ['DISPLAY'] display = os.environ['DISPLAY']
@ -33,6 +33,8 @@ env = Environment(
LINKFLAGS = ['-g', '-C', 'c64.cfg', '-D__HIMEM__=$' + screen_start, '-Wl', '--dbgfile,build/msprite.dbg', '-Wl', '-Lnbuild/msprite.lbl', '-Wl', '--mapfile,build/msprite.map'] LINKFLAGS = ['-g', '-C', 'c64.cfg', '-D__HIMEM__=$' + screen_start, '-Wl', '--dbgfile,build/msprite.dbg', '-Wl', '-Lnbuild/msprite.lbl', '-Wl', '--mapfile,build/msprite.map']
) )
env.PrependENVPath("PATH", cc65_home + "/bin_linux_x64")
prg = env.Program(target=["build/msprite.prg", "build/msprite.map", "build/msprite.dbg", "build/msprite.lbl"], source=[Glob('src/*.c'), Glob('src/*_asm.s')]) prg = env.Program(target=["build/msprite.prg", "build/msprite.map", "build/msprite.dbg", "build/msprite.lbl"], source=[Glob('src/*.c'), Glob('src/*_asm.s')])
sprites = Glob('res/sprites/*.spd') sprites = Glob('res/sprites/*.spd')

2
src/main.c
View file

@ -193,7 +193,7 @@ typedef struct sprite_data* sprite_handle;
#define SPRITE_POOL_SIZE 32 #define SPRITE_POOL_SIZE 32
struct sprite_data _sprite_pool[SPRITE_POOL_SIZE]; struct sprite_data _sprite_pool[SPRITE_POOL_SIZE];
sprite_handle _sprite_list[SPRITE_POOL_SIZE]; sprite_handle _sprite_list[SPRITE_POOL_SIZE];
unsigned char sprite_count; unsigned char sprite_count = 0;
void init_sprite_pool(void) { void init_sprite_pool(void) {
memset(&_sprite_pool, 0x00, sizeof(struct sprite_data) * SPRITE_POOL_SIZE); memset(&_sprite_pool, 0x00, sizeof(struct sprite_data) * SPRITE_POOL_SIZE);

11
src/main_raster_irq_asm.s
View file

@ -161,7 +161,6 @@ moarcs:
sta sprite_index sta sprite_index
get_next_sprite get_next_sprite
; if new_y >= current_y + buffer ; if new_y >= current_y + buffer
lda current_y lda current_y
clc clc
@ -181,8 +180,6 @@ unhandled:
.proc raster_irq .proc raster_irq
; Make sure this is a raster interrupt and we're ready ; Make sure this is a raster interrupt and we're ready
lda _irq_setup_done
beq unhandled
lda VIC_IRQ_RASTER lda VIC_IRQ_RASTER
bit VIC_IRR bit VIC_IRR
beq unhandled beq unhandled
@ -191,6 +188,10 @@ unhandled:
ora VIC_IRR ora VIC_IRR
sta VIC_IRR sta VIC_IRR
; Make sure we're ready to start processing interrupts
lda _irq_setup_done
beq handled
lda ptr1 lda ptr1
ldx ptr1+1 ldx ptr1+1
sta ptr1_save sta ptr1_save
@ -210,4 +211,8 @@ unhandled:
lda IRQ_NOT_HANDLED lda IRQ_NOT_HANDLED
lsr lsr
rts rts
handled:
lda IRQ_HANDLED
lsr
rts
.endproc .endproc