taus,twoplayer: Use separate RAM areas

ejona86 · Apr 26, 2020 · 948abbd · 948abbd
1 parent 5eabd4b
commit 948abbd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/taus.ips.cfg b/taus.ips.cfg
@@ -1,10 +1,10 @@
 MEMORY {
-    RAM: start = $0760, size = $00A0, file = ""; # GAMEBSS init is limited to 255 bytes
+    RAM: start = $0780, size = $0080, file = ""; # GAMEBSS init is limited to 255 bytes
     IPSHDR: start = $0000, size = $0005;
     SKIP_LEGALHDR:start = $0000, size = $0005;
     SKIP_LEGAL:   start = $8236, size = $0002;
     JMP_INIT_GAME_STATEHDR:start = $0000, size = $0005;
-    JMP_INIT_GAME_STATE:   start = $86E2, size = $0003;
+    JMP_INIT_GAME_STATE:   start = $86E5, size = $0004;
     JMP_RENDER_STATSHDR:start = $0000, size = $0005;
     JMP_RENDER_STATS:   start = $9645, size = $0004;
     STATS_NUMBERHDR:start = $0000, size = $0005;

diff --git a/taus.s b/taus.s
@@ -62,7 +62,6 @@ chartDrawn:
 
 initGameState_mod:
 .import __GAMEBSS_SIZE__, __GAMEBSS_RUN__
-        jsr     memset_page
         lda     #$00
         ldx     #<__GAMEBSS_SIZE__
 @clearByte:
@@ -132,6 +131,8 @@ initGameState_mod:
         bne     @initTestEffs
 .endif
 .endif
+        ldx     #$0F
+        lda     #$00
         rts
 
 statsPerBlock:
@@ -587,8 +588,9 @@ multiplyBy100:
 
 .segment "JMP_INIT_GAME_STATE"
 
-; at beginning of initGameState, replaces "jsr memset_page"
+; at beginning of initGameState, replaces "ldx #$0F; lda #$00"
         jsr initGameState_mod
+        nop
 
 .segment "JMP_POST_GAME_STATSHDR"
         ips_hunkhdr     "JMP_POST_GAME_STATS"

diff --git a/twoplayer.nes.cfg b/twoplayer.nes.cfg
@@ -1,7 +1,7 @@
 MEMORY {
     ZP:     start = $0000, size = $0100, type = rw, file = "";
     #OAM:    start = $0200, size = $0100, type = rw, file = "";
-    RAM:    start = $0100, size = $1F00, type = rw, file = "";
+    RAM:    start = $0100, size = $0680, type = rw, file = ""; # Leaving $80 bytes for taus
     HDR:    start = $0000, size = $0010, type = ro, fill = yes, fillval = $00;
     PRG:    start = $8000, size = $8000, type = ro, fill = yes, fillval = $00;
     CHR:    start = $0000, size = $4000, type = ro, fill = yes, fillval = $00;