Manual commit

jakiki6 · Jun 28, 2020 · 69b861b · 69b861b
1 parent e02959c
commit 69b861b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ asm
 ./*.nes
 *.lst
 DEADJOE
+*.orig
+*.rej
diff --git a/Makefile b/Makefile
@@ -32,6 +32,12 @@ builds:
 		mv smb.nes builds/$$(echo $$file | cut -d"/" -f2 | cut -d"." -f1).nes ; \
                 git checkout -- smb.asm ; \
         done
+	for file in $$(find patches/ -type f) ; do \
+                patch -i $$file smb.asm; \
+	done
+	make bin
+	mv smb.nes builds/all.nes
+	git checkout -- smb.asm
 push: builds
 	git add .
 	git commit

diff --git a/builds/all.nes b/builds/all.nes
diff --git a/builds/nodeath.nes b/builds/nodeath.nes
diff --git a/patches/nodeath.patch b/patches/nodeath.patch
@@ -0,0 +1,16 @@
+diff --git a/smb.asm b/smb.asm
+index e5ef1ad..b150411 100644
+--- a/smb.asm
++++ b/smb.asm
+@@ -2909,8 +2909,9 @@ PlayerLoseLife:
+              sta Sprite0HitDetectFlag
+              lda #Silence             ;silence music
+              sta EventMusicQueue
+-             dec NumberofLives        ;take one life from player
+-             bpl StillInGame          ;if player still has lives, branch
++             nop
++             nop
++             jmp StillInGame          ;if player still has lives, branch
+              lda #$00
+              sta OperMode_Task        ;initialize mode task,
+              lda #GameOverModeValue   ;switch to game over mode
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,5 @@ asm @@
     ./*.nes
     *.lst
     DEADJOE
+    *.orig
+    *.rej