Merge branch 'dev' of https://github.com/b1ackmai1er/RomWBW into dev

4 years ago · fdb5465e34
4 changed files with 3 additions and 3 deletions
--- a/Source/Images/d_bp/u15/save.com
+++ b/Source/Images/d_bp/u15/save.com
--- a/Source/ZZR/Makefile
+++ b/Source/ZZR/Makefile
@ -31,7 +31,7 @@ $(HD1024ZZZROMBOIMG): $(HD1024ZZRPREFIX) $(HD1024IMGS)
 $(ZZRROMHEX): $(ZZRROM)
 #	srec_cat $(ZZRROM) -Binary -Exclude 0x5000 0x7000 zzr_romldr.hex -Intel -Output $(ZZRROMHEX) -Intel
 	srec_cat $(ZZRROM) -Binary -Output $(ZZRROMHEX) -Intel
 	srec_cat $(ZZRROM) -Binary -Output $(ZZRROMHEX) -Intel -CRLF
 $(ZZRLDRROM): $(ZZRROMHEX)
 	srec_cat $(ZZRROMHEX) -Intel -Output $(ZZRLDRROM) -Binary
--- a/Source/ver.inc
+++ b/Source/ver.inc
@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
 #DEFINE BIOSVER	"3.1.1-pre.126"
 #DEFINE BIOSVER	"3.1.1-pre.127"
--- a/Source/ver.lib
+++ b/Source/ver.lib
@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
 	db	"3.1.1-pre.126"
 	db	"3.1.1-pre.127"
 	endm