From 3f68e04eafb252cf240eec17eeaabfed06b6fe13 Mon Sep 17 00:00:00 2001
From: Antoine Vignau <34219772+antoinevignau@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:25:59 +0100
Subject: [PATCH] Ca bouge

---
 lemanoirdudocteurgenius/apple2/drgenius.s | 104 ++++++++++++++++-
 lemanoirdudocteurgenius/apple2/player.s   | 130 ----------------------
 2 files changed, 103 insertions(+), 131 deletions(-)
 delete mode 100644 lemanoirdudocteurgenius/apple2/player.s

diff --git a/lemanoirdudocteurgenius/apple2/drgenius.s b/lemanoirdudocteurgenius/apple2/drgenius.s
index 8a0751b..a29ab01 100644
--- a/lemanoirdudocteurgenius/apple2/drgenius.s
+++ b/lemanoirdudocteurgenius/apple2/drgenius.s
@@ -270,6 +270,101 @@ strRETURN	asc	8D
 
 :1000
 
+*-----------------------------------
+* 1400 - CONDITIONS
+*-----------------------------------
+
+:1400	lda	#1
+	sta	E
+	
+:1420	ldx	E
+	lda	E$,x
+	cmp	#"."
+	bne	:1430
+	jmp	:1700
+
+:1430	lda	#0
+	sta	OK
+	
+	lda	E$+1,x
+	sec
+	sbc	#"0"
+	tay
+	lda	tblD2H,y
+	sta	L
+
+	lda	E$+1,x
+	sec
+	sbc	#"0"
+	clc
+	adc	L
+	sta	L
+
+	ldx	E
+	lda	E$,x
+	sec
+	sbc	#"A"
+	asl
+	tax
+	jsr	(tbl1500,x)
+	
+	lda	OK
+	cmp	#0
+	bne	:1470
+	jmp	:1100
+
+:1470	lda	E
+	clc
+	adc	#3
+	sta	E
+	jmp	:1420
+
+*---------
+
+tbl1500	da	:1500,:1510,:1520,:1530,:1540
+	da	:1550,:1560,:1570,:1580
+	
+*---------
+
+:1500
+
+*---------
+
+:1510
+
+*---------
+
+:1520
+
+*---------
+
+:1530
+
+*---------
+
+:1540
+
+*---------
+
+:1550
+
+*---------
+
+:1560
+
+*---------
+
+:1570
+
+*---------
+
+:1580	lda	N
+	cmp	SALLE
+	beq	:1585
+	lda	#1
+	sta	OK
+:1585	rts
+
 *-----------------------------------
 * 4000 - LES REPONSES
 *-----------------------------------
@@ -1446,7 +1541,7 @@ A$
 	asc	"5645A16.D49I18M."00
 	asc	"5543D18E09.D30K."00
 	asc	"5543D18.P18E09J."00
-	asc	"574& E AND18F09.D30K."00
+	asc	"574EXPLODEAND18F09.D30K."00
 	asc	"5743D18.P18F09J."00
 	asc	"1233A24C12.D51K."00
 	asc	"1233A24C03.D52N."00
@@ -1485,8 +1580,11 @@ C$14	asc	".L."00
 
 BREAK	ds	2
 C	ds	10+1
+E	ds	1
+E$	ds	32	; the longest string
 F1	ds	1
 H	ds	1
+L	ds	1
 LX	ds	1
 N	ds	1
 P	ds	13+1
@@ -1496,6 +1594,10 @@ Y1	ds	1
 Y2	ds	1
 Z	ds	1
 
+*--- The lazy decimal to hexadecimal conversion
+
+tblD2H	dfb	0,10,20,30,40,50,60,70,80,90
+	
 *-----------------------------------
 * LES AUTRES FICHIERS
 *-----------------------------------
diff --git a/lemanoirdudocteurgenius/apple2/player.s b/lemanoirdudocteurgenius/apple2/player.s
deleted file mode 100644
index d551d70..0000000
--- a/lemanoirdudocteurgenius/apple2/player.s
+++ /dev/null
@@ -1,130 +0,0 @@
-*--- Electric Duet player
-
-LA025       LDA   #$00        ; music is at $4000
-            STA   $1E
-            LDA   #$40
-            STA   $1F
-            LDA   #$01
-            STA   $09
-            STA   $1D
-            PHA
-            PHA
-            PHA
-            BNE   LA04D
-LA038       INY
-            LDA   ($1E),Y
-            STA   $09
-            INY
-            LDA   ($1E),Y
-            STA   $1D
-LA042       LDA   $1E
-            CLC
-            ADC   #$03
-            STA   $1E
-            BCC   LA04D
-            INC   $1F
-LA04D       LDY   #$00
-            LDA   ($1E),Y
-            CMP   #$01
-            BEQ   LA038
-            BCS   LA067
-            PLA
-            PLA
-            PLA
-LA05A       LDX   #$49
-            INY
-            LDA   ($1E),Y
-            BNE   LA063
-            LDX   #$C9
-LA063       BIT   KBDSTROBE
-            RTS
-
-LA067       STA   $08
-            JSR   LA05A
-            STX   LA0B6
-            STA   $06
-            LDX   $09
-LA073       LSR
-            DEX
-            BNE   LA073
-            STA   LA0AE+1
-            JSR   LA05A
-            STX   LA0EE
-            STA   $07
-            LDX   $1D
-LA084       LSR
-            DEX
-            BNE   LA084
-            STA   LA0E6+1
-            JSR   LA0F6       ; animate
-            PLA
-            TAY
-            PLA
-            TAX
-            PLA
-            BNE   LA098
-LA095       BIT   SPKR
-LA098       CMP   #$00
-            BMI   LA09F
-            NOP
-            BPL   LA0A2
-LA09F       BIT   SPKR
-LA0A2       STA   $4E
-            BIT   KBD
-            BMI   LA063
-            DEY
-            BNE   LA0AE
-            BEQ   LA0B4
-LA0AE       CPY   #$36
-            BEQ   LA0B6
-            BNE   LA0B8
-LA0B4       LDY   $06
-LA0B6       EOR   #$40
-LA0B8       BIT   $4E
-            BVC   LA0C3
-            BVS   LA0BE
-LA0BE       BPL   LA0C9
-            NOP
-            BMI   LA0CC
-LA0C3       NOP
-            BMI   LA0C9
-            NOP
-            BPL   LA0CC
-LA0C9       CMP   SPKR
-LA0CC       DEC   $4F
-            BNE   LA0E1
-            DEC   $08
-            BNE   LA0E1
-            BVC   LA0D9
-            BIT   SPKR
-LA0D9       PHA
-            TXA
-            PHA
-            TYA
-            PHA
-            JMP   LA042
-
-LA0E1       DEX
-            BNE   LA0E6
-            BEQ   LA0EC
-LA0E6       CPX   #$0C
-            BEQ   LA0EE
-            BNE   LA0F0
-LA0EC       LDX   $07
-LA0EE       EOR   #$80
-LA0F0       BVS   LA095
-            NOP
-            BVC   LA098
-            NOP
-
-LA0F6       STA   LA022       ; store AXY
-            STX   LA023
-            STY   LA024
-            JSR   LA114       ; scroll
-            JSR   LA149       ; print
-            LDA   #$26
-            JSR   WAIT
-            LDA   LA022       ; restore
-            LDX   LA023
-            LDY   LA024
-            RTS