Reorganize code to split mods into their components

Rename files to try to be more clear what is used for what.
ejona86 · May 19, 2019 · 1660d2e · 1660d2e
1 parent 643b712
commit 1660d2e
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 103 deletions.
diff --git a/Makefile b/Makefile
@@ -1,29 +1,39 @@
-all: tetris mod screens
+all: tetris taus screens
+
+# Manually list prerequisites that are generated. Non-generated files will
+# automatically be computed.
+build/taus.o: build/tetris.inc
+build/screens.o: build/tetris.inc
+# List linker dependencies
+build/tetris.nes: build/tetris.o tetris-PRG.o
+build/taus.ips: build/taus.o build/ips.o build/fastlegal.o build/highscores.o
+build/screens.ips: build/screens.o build/ips.o
+
+CAFLAGS =
+LDFLAGS =
+VPATH = build
 
 build:
 	mkdir build
 
-build/tetris-PRG.s: disasm.info tetris-PRG.bin Makefile | build
-	da65 -i disasm.info -o build/tetris-PRG.s tetris-PRG.bin
-
 build/%.o: %.s Makefile | build
-	ca65 $< -o $@
+	ca65 $(CAFLAGS) --create-dep $@.d $< -o $@
 
-build/tetris.o: tetris-CHR-00.bin tetris-CHR-01.bin
+build/%: %.cfg
+	ld65 $(LDFLAGS) -o $@ -C $< $(filter %.o,$^)
 
-build/tetris.nes: tetris.cfg build/tetris.o build/tetris-PRG.s
-	ca65 -g build/tetris-PRG.s -o build/tetris-PRG.o
-	ld65 -o build/tetris.nes -C tetris.cfg -Ln build/tetris.lbl build/tetris.o build/tetris-PRG.o
-	sed -E -e 's/al 00(.{4}) .(.*)/\2 := $$\1/' build/tetris.lbl > build/tetris.inc
+build/%.nes: build/%.ips build/tetris.nes
+	cp build/tetris.nes $@
+	flips $< $@ > /dev/null
+	flips build/tetris.nes $@ build/$*.dist.ips > /dev/null
 
-build/tetris-mod.o: build/tetris.nes
-build/tetris-screens.o: build/tetris.nes
+build/tetris-PRG.s: tetris-PRG.info tetris-PRG.bin Makefile | build
+	da65 -i tetris-PRG.info -o $@ tetris-PRG.bin
 
-build/tetris-%.nes: tetris-%.cfg build/tetris-%.o build/tetris.nes
-	ld65 -o build/tetris-$*.ips -C tetris-$*.cfg build/tetris-$*.o
-	cp build/tetris.nes build/tetris-$*.nes
-	flips build/tetris-$*.ips build/tetris-$*.nes > /dev/null
-	flips build/tetris.nes build/tetris-$*.nes build/tetris-$*.dist.ips > /dev/null
+build/tetris-PRG.o: CAFLAGS = -g
+build/tetris.nes: LDFLAGS = -Ln build/tetris.lbl
+build/tetris.inc: build/tetris.nes
+	sed -E -e 's/al 00(.{4}) .(.*)/\2 := $$\1/' build/tetris.lbl > build/tetris.inc
 
 test: tetris.nes build/tetris.nes
 	diff tetris.nes build/tetris.nes
@@ -33,11 +43,11 @@ clean:
 
 dis: build/tetris-PRG.s
 tetris: build/tetris.nes
-mod: build/tetris-mod.nes
-screens: build/tetris-screens.nes
+taus: build/taus.nes
+screens: build/screens.nes
 
 # These are simply aliases
-.PHONY: all dis tetris mod screens
+.PHONY: all dis tetris taus screens
 # These are "true" phonies, and always execute something
 .PHONY: test clean
 
@@ -46,3 +56,5 @@ screens: build/tetris-screens.nes
 ifneq "$(V)" "1"
 .SILENT:
 endif
+
+include $(wildcard build/*.d)
diff --git a/fastlegal.s b/fastlegal.s
@@ -0,0 +1,16 @@
+;
+; Mod that allows pressing start to skip legal screen
+;
+
+.include "ips.inc"
+
+.segment "SKIP_LEGALHDR"
+.import __SKIP_LEGAL_RUN__, __SKIP_LEGAL_SIZE__
+.byte 0
+.dbyt __SKIP_LEGAL_RUN__-IPSPRGOFFSET
+.dbyt __SKIP_LEGAL_SIZE__
+
+.segment "SKIP_LEGAL"
+
+; Allow skipping legal screen
+        lda     #$00
diff --git a/highscores.s b/highscores.s
@@ -0,0 +1,40 @@
+;
+; Custom high scores
+;
+
+.include "ips.inc"
+
+.segment "DEFAULT_HIGH_SCORESHDR"
+.import __DEFAULT_HIGH_SCORES_RUN__, __DEFAULT_HIGH_SCORES_SIZE__
+.byte 0
+.dbyt __DEFAULT_HIGH_SCORES_RUN__-IPSPRGOFFSET
+.dbyt __DEFAULT_HIGH_SCORES_SIZE__
+
+.segment "DEFAULT_HIGH_SCORES"
+
+; replace defaultHighScoresTable
+        ; NAME
+        ; # Convert ALPHA string to hex:
+        ; list(map(lambda x: hex(ord(x)-64), "CHEATR"))
+        .byte   $01,$13,$08,$01,$12,$01 ; "ASHARA"
+        .byte   $05,$0D,$2A,$0A,$2B,$2B ; "EM.J  "
+        .byte   $05,$12,$09,$03,$2B,$2B ; "ERIC  "
+        .byte   $00,$00,$00,$00,$00,$00
+        .byte   $01,$0C,$05,$18,$2B,$2B
+        .byte   $14,$0F,$0E,$19,$2B,$2B
+        .byte   $0E,$09,$0E,$14,$05,$0E
+        .byte   $00,$00,$00,$00,$00,$00
+        ; SCORE, in BCD
+        .byte   $39,$97,$72
+        .byte   $29,$51,$88
+        .byte   $17,$30,$68
+        .byte   $00,$00,$00
+        .byte   $00,$20,$00
+        .byte   $00,$10,$00
+        .byte   $00,$05,$00
+        .byte   $00,$00,$00
+        ; LV, in binary
+        .byte   $13,$12,$09,$00
+        .byte   $09,$05,$00,$00
+        .byte   $FF
+
diff --git a/ips.inc b/ips.inc
@@ -0,0 +1 @@
+IPSPRGOFFSET = -16+$8000
diff --git a/ips.s b/ips.s
@@ -0,0 +1,9 @@
+;
+; IPS file boilerplate
+;
+
+.segment "IPSHEADER"
+.byte 'P', 'A', 'T', 'C', 'H'
+
+.segment "IPSEOF"
+.byte 'E', 'O', 'F'
diff --git a/tetris-screens.cfg → screens.ips.cfg b/tetris-screens.cfg → screens.ips.cfg
@@ -4,18 +4,18 @@ MEMORY {
     HUNK1:   start = $800E,  size = $0003, type = ro, file = %O;
     JMP_MAIN_LOOP_ITERHDR:start = $0000,  size = $0005, type = ro, file = %O;
     JMP_MAIN_LOOP_ITER:   start = $8138,  size = $0003, type = ro, file = %O;
-    MAINHDR:start = $0000,  size = $0005, type = ro, file = %O;
-    MAIN:   start = $D6C9,  size = $0837, type = ro, file = %O;
+    CODEHDR:start = $0000,  size = $0005, type = ro, file = %O;
+    CODE:   start = $D6C9,  size = $0837, type = ro, file = %O;
     IPSEOF: start = $0000,  size = $0003, type = ro, file = %O;
 }
 
 SEGMENTS {
     IPSHEADER:load = IPSHDR, type = ro;
+    IPSEOF:   load = IPSEOF, type = ro;
+    CODEHDR: load = CODEHDR, type = ro;
+    CODE:    load = CODE, type = ro, define = yes;
     HUNK1HDR: load = HUNK1HDR, type = ro;
     HUNK1:    load = HUNK1, type = ro, define = yes;
     JMP_MAIN_LOOP_ITERHDR: load = JMP_MAIN_LOOP_ITERHDR, type = ro;
     JMP_MAIN_LOOP_ITER:    load = JMP_MAIN_LOOP_ITER, type = ro, define = yes;
-    MAINHDR: load = MAINHDR, type = ro;
-    MAIN:    load = MAIN, type = ro, define = yes;
-    IPSEOF:   load = IPSEOF, type = ro;
 }
diff --git a/tetris-screens.s → screens.s b/tetris-screens.s → screens.s
@@ -3,14 +3,7 @@
 ;
 
 .include "build/tetris.inc"
-
-IPSPRGOFFSET = -16+$8000
-
-.segment "IPSHEADER"
-.byte 'P', 'A', 'T', 'C', 'H'
-
-.segment "IPSEOF"
-.byte 'E', 'O', 'F'
+.include "ips.inc"
 
 .segment "HUNK1HDR"
 .import __HUNK1_RUN__, __HUNK1_SIZE__
@@ -37,13 +30,13 @@ IPSPRGOFFSET = -16+$8000
        jsr      mainLoopIterMod
 
 
-.segment "MAINHDR"
-.import __MAIN_RUN__, __MAIN_SIZE__
+.segment "CODEHDR"
+.import __CODE_RUN__, __CODE_SIZE__
 .byte 0
-.dbyt __MAIN_RUN__-IPSPRGOFFSET
-.dbyt __MAIN_SIZE__
+.dbyt __CODE_RUN__-IPSPRGOFFSET
+.dbyt __CODE_SIZE__
 
-.segment "MAIN"
+.segment "CODE"
 
 screenToDisplay := levelNumber
 backgroundRendered := levelNumber+1

diff --git a/tetris-mod.cfg → taus.ips.cfg b/tetris-mod.cfg → taus.ips.cfg
@@ -12,17 +12,18 @@ MEMORY {
     DEFAULT_HIGH_SCORES:   start = $AD67,  size = $8000, type = ro, file = %O;
     GAME_BGHDR:start = $0000,  size = $0005, type = ro, file = %O;
     GAME_BG:   start = $BF3C,  size = $8000, type = ro, file = %O;
-    MAINHDR:start = $0000,  size = $0005, type = ro, file = %O;
-    MAIN:   start = $D6C9,  size = $0837, type = ro, file = %O;
+    CODEHDR:start = $0000,  size = $0005, type = ro, file = %O;
+    CODE:   start = $D6C9,  size = $0837, type = ro, file = %O;
     IPSEOF: start = $0000,  size = $0003, type = ro, file = %O;
 }
 
 SEGMENTS {
     IPSHEADER:load = IPSHDR, type = ro;
+    IPSEOF:   load = IPSEOF, type = ro;
+    CODEHDR: load = CODEHDR, type = ro;
+    CODE:    load = CODE, type = ro, define = yes;
     HUNK1HDR: load = HUNK1HDR, type = ro;
     HUNK1:    load = HUNK1, type = ro, define = yes;
-    MAINHDR: load = MAINHDR, type = ro;
-    MAIN:    load = MAIN, type = ro, define = yes;
     GAME_BGHDR: load = GAME_BGHDR, type = ro;
     GAME_BG:    load = GAME_BG, type = ro, define = yes;
     STATS_NUMBERHDR: load = STATS_NUMBERHDR, type = ro;
@@ -33,5 +34,4 @@ SEGMENTS {
     JMP_STATS_PER_LINE_CLEAR:    load = JMP_STATS_PER_LINE_CLEAR, type = ro, define = yes;
     DEFAULT_HIGH_SCORESHDR: load = DEFAULT_HIGH_SCORESHDR, type = ro;
     DEFAULT_HIGH_SCORES:    load = DEFAULT_HIGH_SCORES, type = ro, define = yes;
-    IPSEOF:   load = IPSEOF, type = ro;
 }
diff --git a/tetris-mod.s → taus.s b/tetris-mod.s → taus.s
@@ -1,16 +1,9 @@
 ;
-; IPS Mod
+; Tetris AUS mod: Actually Useful Stats
 ;
 
 .include "build/tetris.inc"
-
-IPSPRGOFFSET = -16+$8000
-
-.segment "IPSHEADER"
-.byte 'P', 'A', 'T', 'C', 'H'
-
-.segment "IPSEOF"
-.byte 'E', 'O', 'F'
+.include "ips.inc"
 
 .segment "HUNK1HDR"
 .import __HUNK1_RUN__, __HUNK1_SIZE__
@@ -24,13 +17,13 @@ IPSPRGOFFSET = -16+$8000
        jmp statsPerBlock
 afterJmpResetStatMod:
 
-.segment "MAINHDR"
-.import __MAIN_RUN__, __MAIN_SIZE__
+.segment "CODEHDR"
+.import __CODE_RUN__, __CODE_SIZE__
 .byte 0
-.dbyt __MAIN_RUN__-IPSPRGOFFSET
-.dbyt __MAIN_SIZE__
+.dbyt __CODE_RUN__-IPSPRGOFFSET
+.dbyt __CODE_SIZE__
 
-.segment "MAIN"
+.segment "CODE"
 
 DHT_index = $00
 DHT := statsByType + DHT_index * 2
@@ -252,17 +245,6 @@ divmod_checkDone:
         cmp     #$03
 
 
-.segment "SKIP_LEGALHDR"
-.import __SKIP_LEGAL_RUN__, __SKIP_LEGAL_SIZE__
-.byte 0
-.dbyt __SKIP_LEGAL_RUN__-IPSPRGOFFSET
-.dbyt __SKIP_LEGAL_SIZE__
-
-.segment "SKIP_LEGAL"
-
-; Allow skipping legal screen
-        lda     #$00
-
 .segment "JMP_STATS_PER_LINE_CLEARHDR"
 .import __JMP_STATS_PER_LINE_CLEAR_RUN__, __JMP_STATS_PER_LINE_CLEAR_SIZE__
 .byte 0
@@ -274,38 +256,3 @@ divmod_checkDone:
 ; at end of addLineClearPoints, replaces "lda #0; sta completedLines"
         jsr statsPerLineClear
         nop
-
-.segment "DEFAULT_HIGH_SCORESHDR"
-.import __DEFAULT_HIGH_SCORES_RUN__, __DEFAULT_HIGH_SCORES_SIZE__
-.byte 0
-.dbyt __DEFAULT_HIGH_SCORES_RUN__-IPSPRGOFFSET
-.dbyt __DEFAULT_HIGH_SCORES_SIZE__
-
-.segment "DEFAULT_HIGH_SCORES"
-
-; replace defaultHighScoresTable
-        ; NAME
-        ; # Convert ALPHA string to hex:
-        ; list(map(lambda x: hex(ord(x)-64), "CHEATR"))
-        .byte   $01,$13,$08,$01,$12,$01 ; "ASHARA"
-        .byte   $05,$0D,$2A,$0A,$2B,$2B ; "EM.J  "
-        .byte   $05,$12,$09,$03,$2B,$2B ; "ERIC  "
-        .byte   $00,$00,$00,$00,$00,$00
-        .byte   $01,$0C,$05,$18,$2B,$2B
-        .byte   $14,$0F,$0E,$19,$2B,$2B
-        .byte   $0E,$09,$0E,$14,$05,$0E
-        .byte   $00,$00,$00,$00,$00,$00
-        ; SCORE, in BCD
-        .byte   $39,$97,$72
-        .byte   $29,$51,$88
-        .byte   $17,$30,$68
-        .byte   $00,$00,$00
-        .byte   $00,$20,$00
-        .byte   $00,$10,$00
-        .byte   $00,$05,$00
-        .byte   $00,$00,$00
-        ; LV, in binary
-        .byte   $13,$12,$09,$00
-        .byte   $09,$05,$00,$00
-        .byte   $FF
-
diff --git a/disasm.info → tetris-PRG.info b/disasm.info → tetris-PRG.info
diff --git a/tetris.cfg → tetris.nes.cfg b/tetris.cfg → tetris.nes.cfg