restarting, and working game

Author: kirjavascript

README.md

@@ -1,11 +1,13 @@
-a proof of concept NES game built with Rust
+a template for writing NES games in Rust
+
+includes an example game that uses sprites, background tiles, sfx, and controller input
 
 ## building
 
 ```bash
 node src/chr/convert.js src/chr
 docker pull mrkits/rust-mos
-docker run -it --name rustmos --entrypoint bash -v ${HOME}/tetris/rust:/hostfiles mrkits/rust-mos
+docker run -it --name rustmos --entrypoint bash -v ${HOME}/rust-nes-template:/hostfiles mrkits/rust-mos
 docker container exec -it rustmos /bin/bash
 cargo rustc --release
 ```

src/game.rs

@@ -148,9 +148,18 @@ impl Game {
     }
 
     fn step(&mut self) {
-
         let buttons = io::controller_buttons();
 
+        if self.ball.dy == 0 {
+            // dead
+            if buttons & io::START != 0 {
+                ppu::disable_nmi();
+                init();
+                ppu::enable_nmi();
+            }
+            return
+        }
+
         if buttons & io::LEFT != 0 && self.paddle.x > 1 {
             self.paddle.x -= 2;
         } else if buttons & io::RIGHT != 0  && self.paddle.x + self.paddle.width * 8 < 0xe0 {
@@ -189,9 +198,8 @@ impl Game {
                     let hit_bottom = dist_bottom < r;
 
                     if hit_left || hit_right {
-                        // self.ball.dx = -self.ball.dx;
-                    }
-                    if hit_top || hit_bottom {
+                        self.ball.dx = -self.ball.dx;
+                    } else if hit_top || hit_bottom {
                         self.ball.dy = -self.ball.dy;
                     }
 
@@ -220,7 +228,7 @@ impl Game {
         }
         // paddle collision
         if self.ball.y + BALL_DIAMETER >= self.paddle.y {
-            if self.ball.x > self.paddle.x && self.ball.x + BALL_DIAMETER < self.paddle.x + (self.paddle.width * 8) {
+            if self.ball.x + BALL_RADIUS > self.paddle.x && self.ball.x + BALL_RADIUS < self.paddle.x + (self.paddle.width * 8) {
                 self.ball.dy = -self.ball.dy;
                 apu::play_sfx(apu::Sfx::Lock);
             } else {

src/link.ld

@@ -1,33 +1,32 @@
 /* default load chain */
-/* ld.lld: /usr/local/bin/../mos-platform/nes-cnrom/lib/crt0.o */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/libcrt0.a */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/libcrt.a */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/libc.a */
-/* ld.lld: /usr/local/bin/../mos-platform/nes-cnrom/lib/link.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes-cnrom/lib/common.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/nes.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/imag-regs.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/text-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/rodata-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/data-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/zp-data-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/zp-bss-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/zp-bss-symbols.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/zp-noinit.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/zp-noinit-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/bss-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/bss-symbols.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/common/lib/noinit-sections.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/prg-ram-fixed.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/prg-rom-fixed.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/dpcm.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/ines.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/ines-header.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/ines-roms.ld */
-/* ld.lld: /usr/local/bin/../mos-platform/nes/lib/c-in-ram.ld */
+/* ld.lld: .../mos-platform/nes-cnrom/lib/crt0.o */
+/* ld.lld: .../mos-platform/nes/lib/libcrt0.a */
+/* ld.lld: .../mos-platform/common/lib/libcrt.a */
+/* ld.lld: .../mos-platform/common/lib/libc.a */
+/* ld.lld: .../mos-platform/nes-cnrom/lib/link.ld */
+/* ld.lld: .../mos-platform/nes-cnrom/lib/common.ld */
+/* ld.lld: .../mos-platform/nes/lib/nes.ld */
+/* ld.lld: .../mos-platform/common/lib/imag-regs.ld */
+/* ld.lld: .../mos-platform/common/lib/text-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/rodata-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/data-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/zp-data-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/zp-bss-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/zp-bss-symbols.ld */
+/* ld.lld: .../mos-platform/common/lib/zp-noinit.ld */
+/* ld.lld: .../mos-platform/common/lib/zp-noinit-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/bss-sections.ld */
+/* ld.lld: .../mos-platform/common/lib/bss-symbols.ld */
+/* ld.lld: .../mos-platform/common/lib/noinit-sections.ld */
+/* ld.lld: .../mos-platform/nes/lib/prg-ram-fixed.ld */
+/* ld.lld: .../mos-platform/nes/lib/prg-rom-fixed.ld */
+/* ld.lld: .../mos-platform/nes/lib/dpcm.ld */
+/* ld.lld: .../mos-platform/nes/lib/ines.ld */
+/* ld.lld: .../mos-platform/nes/lib/ines-header.ld */
+/* ld.lld: .../mos-platform/nes/lib/ines-roms.ld */
+/* ld.lld: .../mos-platform/nes/lib/c-in-ram.ld */
 
 __chr_rom_size = 16;
-/* __prg_rom_size = 32; */
 
 /* Provide imaginary (zero page) registers. */
 __rc0 = 0x00;
@@ -54,8 +53,11 @@ ASSERT(__chr_nvram_size == 0 ||
 MEMORY {
   zp : ORIGIN = __rc31 + 1, LENGTH = 0x100 - (__rc31 + 1)
 
+  /* reserved for inline asm usage */
+  _inline_nmi: ORIGIN = 0x80, LENGTH = 1
+
   /* reserved for sprites */
-  sprites : ORIGIN = 0x0200, LENGTH = 0x0100
+  _sprites : ORIGIN = 0x0200, LENGTH = 0x0100
 
   ram : ORIGIN = 0x0300, LENGTH = 0x0500
 

src/main.rs

@@ -9,7 +9,7 @@ mod sprites;
 mod game;
 
 // fixed memory usage;
-// 0x80 - nmi check bit (usually free)
+// 0x80 - nmi check bit
 // 0x200 - OAM (reserved in linker)
 
 #[start]