made gfx more working...

src/bios/bios.asm

@@ -1408,7 +1408,7 @@ POP_WR:	PUSH	BC	; Set write address
 	LD	A,#0x8E
 	OUT	(0x99),A
 	LD	A,L
-	LD	A,L
+	;LD	A,L
 	OUT	(0x99),A
 	LD	A,H
 	AND	#0x3F
@@ -1437,7 +1437,7 @@ POP_RD:	PUSH	BC	; Set read address
 	LD	A,#0x8E
 	OUT	(0x99),A
 	LD	A,L
-	LD	A,L
+	;LD	A,L
 	OUT	(0x99),A
 	LD	A,H
 	AND	#0x3F
@@ -1535,9 +1535,9 @@ store_open_f:
 
 	POP	HL
 	; skip bytes ??
-	;LD	L,H	; KAN ??
+	LD	L,H	; KAN ??
-	;LD	H,#0
+	LD	H,#0
-	;CALL	READ	; kan dit ??
+	CALL	READ	; kan dit ??
 
 	POP	HL
 	CALL	READ	; op oude DMA adres ???

src/dist/0module.mk

@@ -1,33 +0,0 @@
-
-DIST_NAME		:= dist
-DIST_SRC		:= $(PATH_SRC)/$(DIST_NAME)
-DIST_BIN		:= $(PATH_BIN)/$(DIST_NAME)
-DIST_OUT		:= $(PATH_BIN)/$(DIST_NAME).tar.gz
-DIST_INC		:= ALL.SR8 ASCII.SR8 readme.txt VELD.SR8 VELDBACK.4BP
-DIST_INC_BIN 	:= $(patsubst %,$(DIST_BIN)/%,$(DIST_INC))
-DIST_INC_SRC 	:= $(patsubst %,$(DIST_SRC)/%,$(DIST_INC))
-DIST_TARA_BIN	:= $(DIST_BIN)/tara.com
-DIST_TARA_SRC	:= $(PATH_BIN)/tara/tara.com
-
-$(DIST_BIN):
-	$(call mod_mkdir,$(DIST_BIN))
-
-$(DIST_BIN)/ALL.SR8: $(DIST_SRC)/ALL.SR8 | $(DIST_BIN)
-	cp $< $@;
-$(DIST_BIN)/ASCII.SR8: $(DIST_SRC)/ASCII.SR8 | $(DIST_BIN)
-	cp $< $@;
-$(DIST_BIN)/VELD.SR8: $(DIST_SRC)/VELD.SR8 | $(DIST_BIN)
-	cp $< $@;
-$(DIST_BIN)/VELDBACK.4BP: $(DIST_SRC)/VELDBACK.4BP | $(DIST_BIN)
-	cp $< $@;
-$(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN)
-	cp $< $@;
-
-#$(DIST_INC_BIN): $(DIST_INC_SRC) | $(DIST_BIN)
-#	cp $< $@;
-
-$(DIST_TARA_BIN): $(DIST_TARA_SRC) | $(DIST_BIN)
-	cp $< $@;
-
-$(DIST_OUT): $(DIST_INC_BIN) $(DIST_TARA_BIN)
-	cd $(DIST_BIN) && tar -czvf ../../$(DIST_OUT) *;

src/dome/0module.mk

@@ -7,6 +7,8 @@ DOME_DAT		:= $(DOME_BIN)/$(DOME_NAME).dat
 DOME_RELS		:= $(DOME_BIN)/$(DOME_NAME).rel
 DOME_CODE		:= $(DOME_SRC)/$(DOME_NAME).asm
 
+# TODO fix build trigger on ai_new.asm
+
 $(DOME_BIN):
 	$(call mod_mkdir,$(DOME_BIN))
 

src/dome/ai_new.asm

@@ -1,8 +1,8 @@
 	.dw	0x002F
 AI:
-	JR	AI_WAIT
+	;JR	AI_WAIT
-	CALL	AI_UPDATE_TNKS
+	;CALL	AI_UPDATE_TNKS
-	CALL	AI_ADD_TNKS
+	;CALL	AI_ADD_TNKS
 	RET
 
 AI_WAIT:

src/dome/dome.asm

@@ -66,6 +66,7 @@ TANKRED 	.equ	0x2000+128*TANK_DATA
 
 ;------------- DOME ----------------   kick off !!
 
+
 .area	_CODE
 	; org	0x8000
 ST:
@@ -6894,6 +6895,7 @@ CALC_MONEY:
 ;----------------------------------
 
 PUT_MONEY:
+RET
 	LD	HL,(DIS_MONEY)
 	LD	BC,(MONEY)
 	SBC	HL,BC
@@ -6924,20 +6926,20 @@ INC_MONEY:
 	JP	PUT_CHARS
 
 PUT_FPS:
-	RET
+	;RET
 
-	;    LD      HL,(DED_CNT_RED)
+	LD      HL,(FPS_OUT)
-	;    LD      IY,DEEL2
+	LD      IY,#DEEL2
-	;     LD      IX,MONEY_CHAR
+	LD      IX,#MONEY_CHAR
-	;     LD      B,5              ; aantal cijfers te delen
+	LD      B,#5              ; aantal cijfers te delen
 
-	;     CALL    DLINI
+	CALL    DLINI
-	;
+	
-	;      LD      IX,MONEY_CHAR
+	LD      IX,#MONEY_CHAR
-	;      LD      HL,(MONEY_POS)
+	LD      HL,(MONEY_POS)
-	;      LD      D,5
+	LD      D,#5
 
-	;      JP      PUT_CHARS
+	JP      PUT_CHARS
 
 ;----------------------------------
 ; DEEL - delen van getallen

src/domelib/0module.mk

@@ -0,0 +1,42 @@
+
+DOMELIB_NAME		:= domelib
+DOMELIB_SRC			:= $(PATH_SRC)/$(DOMELIB_NAME)
+DOMELIB_BIN			:= $(PATH_BIN)/$(DOMELIB_NAME)
+DOMELIB_OUT			:= $(PATH_BIN)/$(DOMELIB_NAME)/dome.000
+DOMELIB_DEPS		:= \
+$(PATH_BIN)/bios/bios.dat \
+$(PATH_BIN)/dome/dome.dat \
+$(PATH_BIN)/loader/loader.dat \
+$(PATH_BIN)/makelib/makelib.com \
+$(PATH_BIN)/menu/menu.dat \
+$(PATH_BIN)/mmenu/mmenu.dat
+
+
+$(DOMELIB_BIN):
+	$(call mod_mkdir,$(DOMELIB_BIN))
+
+$(DOMELIB_BIN)/autoexec.bat: $(DOMELIB_SRC)/autoexec.bat | $(DOMELIB_BIN)
+	unix2dos -n $< $@;
+
+$(DOMELIB_BIN)/bios.dat: $(PATH_BIN)/bios/bios.dat | $(DOMELIB_BIN)
+	cp $< $@;
+$(DOMELIB_BIN)/dome.dat: $(PATH_BIN)/dome/dome.dat | $(DOMELIB_BIN)
+	cp $< $@;
+$(DOMELIB_BIN)/loader.dat: $(PATH_BIN)/loader/loader.dat | $(DOMELIB_BIN)
+	cp $< $@;
+$(DOMELIB_BIN)/makelib.com: $(PATH_BIN)/makelib/makelib.com | $(DOMELIB_BIN) gfx
+	cp $< $@;
+	cp bin/gfx/*.zop $(DOMELIB_BIN);
+	cp src/levels/*.00* $(DOMELIB_BIN);
+	cp src/dist/*.zop $(DOMELIB_BIN);
+	cp src/dist/*.COM $(DOMELIB_BIN);
+	
+$(DOMELIB_BIN)/menu.dat: $(PATH_BIN)/menu/menu.dat | $(DOMELIB_BIN)
+	cp $< $@;
+$(DOMELIB_BIN)/mmenu.dat: $(PATH_BIN)/mmenu/mmenu.dat | $(DOMELIB_BIN)
+	cp $< $@;
+	
+$(DOMELIB_OUT): $(DOMELIB_BIN)/autoexec.bat \
+$(DOMELIB_BIN)/bios.dat $(DOMELIB_BIN)/dome.dat $(DOMELIB_BIN)/loader.dat $(DOMELIB_BIN)/makelib.com $(DOMELIB_BIN)/menu.dat $(DOMELIB_BIN)/mmenu.dat
+	cp $(DOMELIB_BIN)/autoexec.bat $(DOMELIB_OUT)
+	$(call run_openmsx_dos2, $(DOMELIB_BIN))

src/gfx/0module.mk

@@ -10,13 +10,36 @@ $(GFX_BIN):
 
 # TODO: add unittot.ge5
 
+#1 SCREEN 5 : SETPAGE 1,1
+#2 BLOAD"units.ge5",S : COLOR=RESTORE
+#3 SETPAGE 2,2
+#4 BLOAD"2row.ge5",S
+#5 SETPAGE 1,1
+#6 COPY (0,0)-(256,32),2 TO (0,208),1
+#7 BSAVE"unit.pop",&H8000,&HFFFF,S
+
 $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
 	cp $< $@;
 	unix2dos -n $(GFX_SRC)/autoexec.bat $(GFX_BIN)/autoexec.bat;
-	echo "popcom $(notdir $@)\r" >> $(GFX_BIN)/autoexec.bat;
+	echo "basic conv.bas\r" >> $(GFX_BIN)/autoexec.bat;
-	echo "cut $(notdir $@)\r" >> $(GFX_BIN)/autoexec.bat;
+	
-	echo "copy $(patsubst %.zop,%.pop,$(notdir $@)) $(notdir $@)\r" >> $(GFX_BIN)/autoexec.bat;
+	echo "10 SCREEN 5 : SETPAGE 1,1\r" > $(GFX_BIN)/conv.bas;
-	echo "omsxctl exit\r" >> $(GFX_BIN)/autoexec.bat;
+	echo "20 BLOAD\"$(notdir $@)\",S : COLOR=RESTORE\r" >> $(GFX_BIN)/conv.bas;
+	echo "30 BSAVE\"$(notdir $@)\",&H0000,&H7FFF,S\r" >> $(GFX_BIN)/conv.bas;
+	echo "40 _SYSTEM(\"pop.bat\")\r" >> $(GFX_BIN)/conv.bas;
+	
+	echo "\r" > $(GFX_BIN)/pop.bat;
+	echo "mode 80\r" >> $(GFX_BIN)/pop.bat;
+	echo "popcom $(notdir $@)\r" >> $(GFX_BIN)/pop.bat;
+	echo "echo \"All done..................\"\r" >> $(GFX_BIN)/pop.bat;
+	echo "omsxctl exit\r" >> $(GFX_BIN)/pop.bat;
+	$(call run_openmsx_dos2, $(GFX_BIN))
+
+gfx-test: gfx
+	unix2dos -n $(GFX_SRC)/autoexec.bat $(GFX_BIN)/autoexec.bat;
+	echo "omsxctl set renderer SDL\r" >> $(GFX_BIN)/autoexec.bat;
+	echo "omsxctl set throttle on\r" >> $(GFX_BIN)/autoexec.bat;
+	echo "omsxctl set speed 200\r" >> $(GFX_BIN)/autoexec.bat;
 	$(call run_openmsx_dos2, $(GFX_BIN))
 
 gfx: $(GFX_BIN_FILES)

src/loader/loader.asm

@@ -1942,8 +1942,8 @@ DO_INTRO:
 
 	LD	B,#40
 	CALL	INTRO_WAIT
-	CALL	INTRO_WAIT
+	;CALL	INTRO_WAIT
-	CALL	INTRO_WAIT
+	;CALL	INTRO_WAIT
 
 	;LD	HL,#COLOR_PRESENTS ; now equals to paragon colors
 	;CALL	PUT_COLOR