6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-06-01 05:41:31 +00:00
Code Issues Projects Releases Wiki Activity

update nes presets, renamed .asm to .dasm

Browse Source
This commit is contained in:
Steven Hugg 2019-05-10 21:25:21 -04:00
parent 143cfa7153
commit 0f292a422f
18 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
presets/nes/climber.c
View File

@ -36,7 +36,7 @@ typedef enum { SND_START, SND_HIT, SND_COIN, SND_JUMP } SFXIndex;
#define COLS 30 // floor width in tiles #define COLS 30 // floor width in tiles
#define ROWS 60 // total nametable height in tiles #define ROWS 60 // total nametable height in tiles
#define MAX_FLOORS 4 // total # of floors in a stage #define MAX_FLOORS 24 // total # of floors in a stage
#define GAPSIZE 4 // gap size in tiles #define GAPSIZE 4 // gap size in tiles
#define BOTTOM_FLOOR_Y 2 // offset for bottommost floor #define BOTTOM_FLOOR_Y 2 // offset for bottommost floor

4
presets/nes/ex0.asm → presets/nes/ex0.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -35,7 +35,7 @@ Start:
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/ex1.asm → presets/nes/ex1.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -69,7 +69,7 @@ SetPalette: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/ex2.asm → presets/nes/ex2.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -70,7 +70,7 @@ SetPalette: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

6
presets/nes/ex3.asm → presets/nes/ex3.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -80,7 +80,7 @@ MoveSprites: subroutine
inx ; X = X + 1 inx ; X = X + 1
bne .loop ; loop until X wraps bne .loop ; loop until X wraps
rts ; return to caller rts ; return to caller
; set palette colors ; set palette colors
SetPalette: subroutine SetPalette: subroutine
PPU_SETADDR $3f00 PPU_SETADDR $3f00
@ -96,7 +96,7 @@ SetPalette: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/ex4.asm → presets/nes/ex4.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -64,7 +64,7 @@ SetPalette: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

0
presets/nes/famitone2.asm → presets/nes/famitone2.dasm
View File

28
presets/nes/flicker.c
View File

@ -61,8 +61,7 @@ sbyte actor_dy[NUM_ACTORS];
// main program // main program
void main() { void main() {
char i; byte i;
char oam_id;
// setup graphics // setup graphics
setup_graphics(); setup_graphics();
@ -76,21 +75,24 @@ void main() {
// loop forever // loop forever
while (1) { while (1) {
// start with OAMid/sprite 0 // start with OAMid/sprite 0
oam_id = 0; oam_off = 0;
// draw and move all actors // draw and move all actors
// (note we don't reset i each loop iteration) // (note we don't reset i each loop iteration)
while (oam_id < 256-4*4) { while (oam_off < 256-4*4) {
// wrap around actor array // advance and wrap around actor array
if (i >= NUM_ACTORS) if (++i >= NUM_ACTORS)
i -= NUM_ACTORS; i -= NUM_ACTORS;
oam_id = oam_meta_spr(actor_x[i], actor_y[i], oam_id, metasprite); // draw and move actor
actor_x[i] += actor_dx[i]; oam_meta_spr_pal(
actor_y[i] += actor_dy[i]; actor_x[i] += actor_dx[i], // add x+dx and pass param
++i; actor_y[i] += actor_dy[i], // add y+dy and pass param
i&3, // palette color
metasprite); // metasprites
} }
// hide rest of sprites // hide rest of sprites
oam_hide_rest(oam_id); oam_hide_rest(oam_off);
// wait for next frame // wait for next NMI
ppu_wait_frame(); // we don't want to skip frames b/c it makes flicker worse
ppu_wait_nmi();
} }
} }

4
presets/nes/helloworld.asm → presets/nes/helloworld.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; ZERO-PAGE VARIABLES ;;;;; ZERO-PAGE VARIABLES
@ -113,7 +113,7 @@ ASCII2Tile:
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/musicdemo.asm → presets/nes/musicdemo.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -78,7 +78,7 @@ ShowTimeEnd:
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
include "famitone2.asm" include "famitone2.asm"

0
presets/nes/nesdefs.asm → presets/nes/nesdefs.dasm
View File

0
presets/nes/nesppu.asm → presets/nes/nesppu.dasm
View File

2
presets/nes/rletitle.c
View File

@ -16,7 +16,7 @@ extern const byte climbr_title_rle[];
void fade_in() { void fade_in() {
byte vb; byte vb;
for (vb=0; vb<=4; vb++) { for (vb=0; vb<=4; vb++) {
// set virtual bright vaule // set virtual bright value
pal_bright(vb); pal_bright(vb);
// wait for 4/60 sec // wait for 4/60 sec
ppu_wait_frame(); ppu_wait_frame();

4
presets/nes/road.asm → presets/nes/road.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; ZERO-PAGE VARIABLES ;;;;; ZERO-PAGE VARIABLES
@ -291,7 +291,7 @@ SetSprite0: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/scrollrt.asm → presets/nes/scrollrt.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; ZERO-PAGE VARIABLES ;;;;; ZERO-PAGE VARIABLES
@ -81,7 +81,7 @@ SetSprite0: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/skeleton.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; VARIABLES ;;;;; VARIABLES
@ -33,7 +33,7 @@ Start: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

4
presets/nes/xyscroll.asm → presets/nes/xyscroll.dasm
View File

@ -1,5 +1,5 @@
include "nesdefs.asm" include "nesdefs.dasm"
;;;;; ZERO-PAGE VARIABLES ;;;;; ZERO-PAGE VARIABLES
@ -79,7 +79,7 @@ SetSprite0: subroutine
;;;;; COMMON SUBROUTINES ;;;;; COMMON SUBROUTINES
include "nesppu.asm" include "nesppu.dasm"
;;;;; INTERRUPT HANDLERS ;;;;; INTERRUPT HANDLERS

18
src/platform/nes.ts
View File

@ -29,15 +29,15 @@ const JSNES_PRESETS = [
{id:'fami.c', name:'Famitone Demo'}, {id:'fami.c', name:'Famitone Demo'},
{id:'bankswitch.c', name:'Bank Switching'}, {id:'bankswitch.c', name:'Bank Switching'},
{id:'irq.c', name:'IRQ Scanline Counter'}, {id:'irq.c', name:'IRQ Scanline Counter'},
{id:'ex0.asm', name:'Initialization (ASM)'}, {id:'ex0.dasm', name:'Initialization (ASM)'},
{id:'ex1.asm', name:'Hello World (ASM)'}, {id:'ex1.dasm', name:'Hello World (ASM)'},
{id:'ex2.asm', name:'Scrolling Demo (ASM)'}, {id:'ex2.dasm', name:'Scrolling Demo (ASM)'},
{id:'ex3.asm', name:'Sprite Demo (ASM)'}, {id:'ex3.dasm', name:'Sprite Demo (ASM)'},
{id:'ex4.asm', name:'Controller Demo (ASM)'}, {id:'ex4.dasm', name:'Controller Demo (ASM)'},
{id:'musicdemo.asm', name:'Famitone Demo (ASM)'}, {id:'musicdemo.dasm', name:'Famitone Demo (ASM)'},
{id:'xyscroll.asm', name:'XY Split Scrolling (ASM)'}, {id:'xyscroll.dasm', name:'XY Split Scrolling (ASM)'},
{id:'scrollrt.asm', name:'Line-by-line Scrolling (ASM)'}, {id:'scrollrt.dasm', name:'Line-by-line Scrolling (ASM)'},
{id:'road.asm', name:'3-D Road Demo (ASM)'}, {id:'road.dasm', name:'3-D Road Demo (ASM)'},
{id:'chase/game.c', name:'Shiru\'s Chase Game'}, {id:'chase/game.c', name:'Shiru\'s Chase Game'},
]; ];