v+1

leretour/apple2/fr/engine.s

@@ -6,88 +6,242 @@
 *
 
 	mx	%00
+	lst	off
+
+*-----------------------------------
+* RECOPIE ACTION A$
+*-----------------------------------
+
+	mx	%11
+	
+checkACTION	lda	#<newA$	; POINTEUR
+	sta	dpFROM
+	lda	#>newA$
+	sta	dpFROM+1
+	
+L953B       LDY	#0
+            LDA	(dpFROM),Y
+            CMP	MO$1	; premier mot
+            BEQ	L9546
+            JMP	L95EF
+L9546       INY	
+            LDA	(dpFROM),Y
+            BEQ	L9552
+            CMP	MO$2	; second mot
+            BEQ	L9552
+            JMP	L95EF
+
+L9552       INY		; on a trouvŽ, on g<>re
+            LDA	(dpFROM),Y
+            INY	
+            TAX	
+            LDA	(dpFROM),Y
+            CPX	#$41	; A
+            BEQ	L958B
+            CPX	#$42	; B
+            BEQ	L9593
+            CPX	#$43	; C
+            BEQ	L95A3
+            CPX	#$44	; D
+            BEQ	L95B3
+            CPX	#$45	; E
+            BEQ	L95BE
+            CPX	#$46	; F
+            BEQ	L95C7
+            CPX	#$47	; G
+            BEQ	L95D0
+            CPX	#$48	; H
+            BEQ	L95DB
+            CPX	#$49	; I
+            BEQ	L95E7
+
+            LDX	#0	; sinon, on recopie until FF
+L957F       LDA	(dpFROM),Y
+            STA	E$+1,X
+            INY	
+            INX	
+            CMP	#-1
+            BNE	L957F
+	dex		; save len
+	stx	E$
+            rts
+
+*-- A - 
+
+L958B       CMP	SALLE
+            BNE	L95EF
+            JMP	L9552		; on boucle
+
+*-- B - 
+
+L9593       TAX
+            LDA	O,X	; les objets
+            CMP	#-1
+            BEQ	L9552
+            CMP	SALLE
+            BEQ	L9552
+            JMP	L95EF
+
+*-- C - 
+
+L95A3       TAX
+            LDA	O,X
+            CMP	#-1
+            BEQ	L95EF
+            CMP	SALLE
+            BEQ	L95EF
+            JMP	L9552
+
+*-- D - 
+
+L95B3       TAX
+            LDA	O,X
+            CMP	#-1
+            BEQ	L9552
+            JMP	L95EF
+
+*-- E - 
+
+L95BE       TAX
+            LDA	P,X
+            BNE	L9552
+            JMP	L95EF
+
+*-- F - 
+
+L95C7       TAX
+            LDA	P,X
+            BEQ	L9552
+            JMP	L95EF
+
+*-- G - 
+
+L95D0       TAX
+            LDA	C,X
+            CMP	#1
+            BNE	L95EF
+            JMP	L9552
+
+*-- H - RANDOM
+
+L95DB	jmp	L95EF	; LOGO - Use the QDII RND
+
+*	STA   $7C
+*           LDA   $0306
+*           CMP   $7C
+*           BCS   L95EF
+*           JMP   L9552
+
+*-- I - 
+
+L95E7       CMP	SALLE
+            BEQ	L95EF
+            JMP	L9552
+
+*--- next
+
+L95EF	inc	dpFROM
+	bne	L95F0
+	inc	dpFROM+1
+L95F0	lda	(dpFROM)	; until the end
+	cmp	#-1
+	bne	L95EF
+	
+	inc	dpFROM
+	bne	L95F1
+	inc	dpFROM+1
+L95F1	lda	(dpFROM)	; on a parcouru
+	beq	L9619	; le tableau, on sort
+	jmp	L953B
+L9619       sta	E$	; on n'a rien trouvŽ
+	rts
 
 *-----------------------------------
 * AFFICHE UNE IMAGE
 *-----------------------------------
 
-showIMAGE	asl
+	mx	%00
+	
+showPIC	rep	#$30
+	asl
 	tax
 	lda	tblIMAGES,x
 	bne	L92A5
+showPIC99	sep	#$30
 	rts
-	
+
+	mx	%00
+
 L92A5	sta	dpFROM
 
 L92A6	ldy	#0
 	lda	(dpFROM),y
 	and	#$ff
-	bne	L92A7
-	rts
+	beq	showPIC99
 
-L92A7	CMP	#'A'	; A
+L92A7	CMP	#'A'	; A $41 CURSET
             BNE	L92B1
             JMP	L9319
 
-L92B1	CMP	#'B'	; B
+L92B1	CMP	#'B'	; B $42 DRAW X,Y
             BNE	L92B8
             JMP	L933E
 
-L92B8	CMP	#'C'	; C
+L92B8	CMP	#'C'	; C $43 DRAW ^X,Y
             BNE	L92BF
             JMP	L9368
 
-L92BF	CMP	#'D'	; D
+L92BF	CMP	#'D'	; D $44 DRAW X,^Y
             BNE	L92C6
             JMP	L9398
 
-L92C6	CMP	#'E'	; E
+L92C6	CMP	#'E'	; E $45 DRAW ^X,^Y
             BNE	L92CD
             JMP	L93C8
 
-L92CD	CMP	#'F'	; F
+L92CD	CMP	#'F'	; F $46 MOVE X,Y
             BNE	L92D4
             JMP	L93FD
 
-L92D4	CMP	#'G'	; G
+L92D4	CMP	#'G'	; G $47 MOVE ^X,Y
             BNE	L92DB
             JMP	L9402
 
-L92DB	CMP	#'H'	; H
+L92DB	CMP	#'H'	; H $48 MOVE X,^Y
             BNE	L92E2
             JMP	L9407
 
-L92E2	CMP	#'I'	; I
+L92E2	CMP	#'I'	; I $49 MOVE ^X,^Y
             BNE	L92E9
             JMP	L940C
 
-L92E9	CMP	#'J'	; J
+L92E9	CMP	#'J'	; J $4A INK
             BNE	L92F0
             JMP	L9411
 
-L92F0	CMP	#'K'	; K
+L92F0	CMP	#'K'	; K $4B PAPER
             BNE	L92F7
             JMP	L9426
 
-L92F7	CMP	#'L'	; L
+L92F7	CMP	#'L'	; L $4C FILL
             BNE	L92FE
             JMP	L943B
 
-L92FE	CMP	#'M'	; M
+L92FE	CMP	#'M'	; M $4D MESSAGE
             BNE	L9305
             JMP	L9462
 
-L9305	CMP	#'N'	; N
+L9305	CMP	#'N'	; N $4E CIRCLE
             BNE	L930C
             JMP	L94BC
 
-L930C	CMP	#'O'	; O
+L930C	CMP	#'O'	; O $4F OUTPUT
             BNE	L9313
             JMP	L94D8
 
 L9313       brk	$bd
 
-*--- A - CURSET
+*--- A $41 - CURSET
 
 L9319       iny
             lda	(dpFROM),y	; X
@@ -102,7 +256,7 @@ L9319       iny
 	_MoveTo
 	jmp	skip2
 
-*--- B - DRAW X,Y
+*--- B $42 - DRAW X,Y
 
 L933E       lda	#$01
 L9340	sta	theFB
@@ -117,7 +271,7 @@ L9340	sta	theFB
             jsr	DRAW
             jmp	skip2
 
-*--- C - DRAW ^X,Y
+*--- C $43 - DRAW ^X,Y
 
 L9368       lda	#$01
 L936A       sta	theFB
@@ -134,7 +288,7 @@ L936A       sta	theFB
             jsr	DRAW
             jmp	skip2
 
-*--- D - DRAW X,^Y
+*--- D $44 - DRAW X,^Y
 
 L9398       lda	#$01
 L939A       sta	theFB
@@ -151,7 +305,7 @@ L939A       sta	theFB
             jsr	DRAW
             jmp	skip2
 
-*--- E - DRAW ^X,^Y
+*--- E $45 - DRAW ^X,^Y
 
 L93C8       lda	#$01
 L93CA       sta	theFB
@@ -170,27 +324,27 @@ L93CA       sta	theFB
             jsr	DRAW
             jmp	skip2
 
-*--- F - DRAW X,Y,3 = CURMOV
+*--- F $46 - DRAW X,Y,3 = CURMOV
 
 L93FD       lda	#$03
             jmp	L9340
 
-*--- G - DRAW ^X,Y,3 = CURMOV
+*--- G $47 - DRAW ^X,Y,3 = CURMOV
 
 L9402       lda	#$03
             jmp	L936A
 
-*--- H - DRAW X,^Y,3 = CURMOV
+*--- H $48 - DRAW X,^Y,3 = CURMOV
 
 L9407       lda	#$03
             jmp	L939A
 
-*--- I - DRAW ^X,^Y,3 = CURMOV
+*--- I $49 - DRAW ^X,^Y,3 = CURMOV
 
 L940C       lda	#$03
             jmp	L93CA
 
-*--- J - INK
+*--- J $4A - INK
 
 L9411	iny
             lda	(dpFROM),y	; X
@@ -199,7 +353,7 @@ L9411	iny
 	jsr	INK
 	jmp	skip1
 
-*--- K - PAPER
+*--- K $4B - PAPER
 
 L9426	iny
             lda	(dpFROM),y	; X
@@ -208,15 +362,19 @@ L9426	iny
 	jsr	PAPER
 	jmp	skip1
 
-*--- L - FILL
+*--- L $4C - FILL
 
 L943B	iny
             lda	(dpFROM),y	; X
 	and	#$ff
+	clc
+	lda	curX
 	sta	fillX
 	iny
 	lda	(dpFROM),y	; Y
 	and	#$ff
+	clc
+	lda	curY
 	sta	fillY
 	iny
 	lda	(dpFROM),y	; fill color
@@ -225,7 +383,7 @@ L943B	iny
 	jsr	FILL
 	jmp	skip3
 
-*--- M - CHAR_ALT
+*--- M $4D - CHAR_ALT
 
 L9462	iny
             lda	(dpFROM),y	; X
@@ -238,23 +396,33 @@ L9462	iny
 	adc	#8	; QDII: Y est le bas du texte, pas le haut
 	pha
 	_MoveTo
+	
+	PushWord	#0
+	_GetTextMode
+	
+	PushWord	#modeForeCopy
+	_SetTextMode
+
 	ldy	#3
-]lp	sty	dpY
-	lda	(dpFROM),y
+]lp	lda	(dpFROM),y
 	and	#$ff
 	beq	L94B9
+	phy
 	pha
 	_DrawChar
-	ldy	dpY
+	ply
 	iny
 	bne	]lp
-L94B9       tya
+L94B9	tya
 	clc
 	adc	dpFROM
 	sta	dpFROM
+
+	_SetTextMode
+
 	jmp	skip0
 
-*--- N - CIRCLE
+*--- N $4E - CIRCLE
 
 L94BC	iny
 	lda	(dpFROM),y	; radius
@@ -263,13 +431,16 @@ L94BC	iny
 	jsr	CIRCLE
 	jmp	skip1
 
-*--- O - OUT
+*--- O $4F - OUT
 
 L94D8	iny
 	lda	(dpFROM),y
 	and	#$ff
+	sep	#$30
 	rts
 
+	mx	%00
+
 *--- Next one, please...
 
 skip3	inc	dpFROM
@@ -334,7 +505,6 @@ INK	ldx	theINK
 
 	PushWord	#0
 	PushWord	#15
-	
 	asl
 	tax
 	lda	palette320,x
@@ -342,7 +512,6 @@ INK	ldx	theINK
 	_SetColorEntry
 	
 *	PushWord	#^blackPATTERN
-*	
 *	asl
 *	asl
 *	asl
@@ -379,9 +548,7 @@ PAPER	ldx	thePAPER
 
 resMode	=	%0001_0000000000_10
 
-FILL	rts
-
-	ldx	fillCOLOR	; sets the pattern to use
+FILL	ldx	fillCOLOR	; sets the pattern to use
 	lda	o2gsCOLOR,x
 	and	#$ff
 	asl
@@ -441,10 +608,6 @@ CIRCLE4	sta	circleRECT+4
 	_FrameOval
 	rts
 
-*-----------------------------------
-
-CHAR_ALT	rts
-
 *-----------------------------------
 * DONNEES
 *-----------------------------------
@@ -477,9 +640,11 @@ fillCOLOR	ds	2
 
 srcLocInfoPtr
 	dw	mode320	; mode 320
-	adrl	ptrE12000
+	adrl	ptr012000
 	dw	160
-srcRect	dw	0,0,159,239
+	dw	0,0,199,239
+
+srcRect	dw	0,0,179,239
 
 patternPtr	adrl	blackPATTERN ; pointer to pattern
 

leretour/apple2/fr/fr.s

@@ -77,7 +77,168 @@ strINTRO	asc	"     LE RETOUR DU Dr GENIUS"8D
 *-----------------------------------
 
 *
-* Les conditions
+* Les actions version hexadecimale
+*
+
+newA$	hex	0100411246012E4931394DFF
+	hex	0300411245012E4931314DFF
+	hex	010041122E4430334EFF
+	hex	030041122E4430334EFF
+	hex	190045112E4438354BFF
+	hex	020041022E4430344EFF
+	hex	020041312E4430354BFF
+	hex	0400412E2E4430364BFF
+	hex	0A1342012E4230314AFF
+	hex	0A1242032E4230334AFF
+	hex	0A0E42052E4230354AFF
+	hex	0A2142062E4230364AFF
+	hex	0A2A42082E4230384AFF
+	hex	0A2B42092E4230394AFF
+	hex	0A36420A2E4231304AFF
+	hex	0A35420B2E4231314AFF
+	hex	0A2D420C2E4231324AFF
+	hex	0A2E420E2E4231344AFF
+	hex	0A2F420F2E4430374AFF
+	hex	0A10412E46092E4530394231364AFF
+	hex	0A3042112E4231374430384BFF
+	hex	0A3142122E4231384AFF
+	hex	0A29451142022E4230324AFF
+	hex	0A2942022E4430394531374230324DFF
+	hex	0A2142072E4230374AFF
+	hex	0B292E4330324AFF
+	hex	0B132E4330314AFF
+	hex	0B122E4330334AFF
+	hex	0B2E2E4331344AFF
+	hex	0B2142072E4330374AFF
+	hex	0B212E4330364AFF
+	hex	194A41152E4438394BFF
+	hex	0B2A2E4330384AFF
+	hex	0B2B2E4330394AFF
+	hex	0B362E4331304AFF
+	hex	0B352E4331314AFF
+	hex	0B2D440D2E4F31324331334831334AFF
+	hex	0B2D2E4331324AFF
+	hex	0B102E4331364AFF
+	hex	0B302E4331374AFF
+	hex	0B312E4331384AFF
+	hex	0A1142042E4230344AFF
+	hex	0A1142132E4331394831394230354230344AFF
+	hex	0B1144042E4330344AFF
+	hex	0B1144132E4331394831394230354F30344AFF
+	hex	052E440E2E4431324EFF
+	hex	322E440E2E4431324EFF
+	hex	4B2E440E2E4431324EFF
+	hex	0F2F41142E4431334EFF
+	hex	3435420B2E4431344EFF
+	hex	2823410F2E4530384431364BFF
+	hex	282343072E4431374BFF
+	hex	28232E4431384EFF
+	hex	2A0044082E4431394EFF
+	hex	342A44082E4431394EFF
+	hex	343144122E4432304EFF
+	hex	0C4C41122E4432314EFF
+	hex	0A1042102E4231364AFF
+	hex	28002E4431354BFF
+	hex	0F4D41312E4430354BFF
+	hex	0F4D412E2E4430354BFF
+	hex	0F4D2E4432324BFF
+	hex	0F112E4432334EFF
+	hex	0F44410F2E4432344BFF
+	hex	4344410F2E4432354BFF
+	hex	0F49411E2E4935334DFF
+	hex	1949411E2E4935334DFF
+	hex	0F1A412C2E4432374BFF
+	hex	431A412C2E4432374BFF
+	hex	434941352E4933304DFF
+	hex	191A412C2E4432364BFF
+	hex	5253412C2E4432384BFF
+	hex	1C1E412C2E4432394BFF
+	hex	1C1F412C2E4433304BFF
+	hex	1C20412C2E4433314BFF
+	hex	1C1D412C2E4433324BFF
+	hex	2221410F42062E4330364830364230374AFF
+	hex	2221410F42072E4433334BFF
+	hex	0A0E42132E4231394AFF
+	hex	0B0E42132E4331394AFF
+	hex	0B0E2E4330354AFF
+	hex	141744012E4433344EFF
+	hex	141644014931492E2E4433354BFF
+	hex	1416440141312E4433364934364DFF
+	hex	14164401412E2E4433364934394DFF
+	hex	14154401490E49144917491D49262E4433354BFF
+	hex	14154401410E2E4433374630344DFF
+	hex	1415440141142E4433374630354DFF
+	hex	1415440141172E4433374630334DFF
+	hex	14154401411D2E4433374630364DFF
+	hex	141544012E4433374630374DFF
+	hex	3412420346122E47303130344531384AFF
+	hex	341242032E4433334BFF
+	hex	322D440D2E4433334BFF
+	hex	322D440C2E4331324831324231334AFF
+	hex	342B4209460B2E4433384BFF
+	hex	342B42092E4433394BFF
+	hex	242C4209450B2E4631314AFF
+	hex	242C4209460B2E4531314AFF
+	hex	4B3044112E4434304BFF
+	hex	323044112E4434304BFF
+	hex	333044112E4AFF
+	hex	332D440D2E4331334831334231324AFF
+	hex	3436440A490449114916493049332E4433354BFF
+	hex	3436440A2E4434314BFF
+	hex	37002E4434324BFF
+	hex	38002E4434334BFF
+	hex	39002E4434344BFF
+	hex	3A002E4434354BFF
+	hex	3B002E4434364BFF
+	hex	3C3B2E4434364BFF
+	hex	3D002E4434374BFF
+	hex	4E002E41FF
+	hex	110E440444052E4330344330354830344830354231394AFF
+	hex	502144072E4330374830374230364AFF
+	hex	3F002E443438FF
+	hex	40002E4434394EFF
+	hex	14182E4435304BFF
+	hex	14424122450C2E4435314BFF
+	hex	14414122450C2E4435314BFF
+	hex	144241222E4435324EFF
+	hex	144141222E4531334435374BFF
+	hex	4546450C2E44353345313447303230354BFF
+	hex	4546460C4932460D2E4435344EFF
+	hex	4546460C450D2E44353345313447303230354BFF
+	hex	4546460C41322E44353345313447303230354BFF
+	hex	474A4115450F2E4433334BFF
+	hex	474A41152E45313544353547303430374BFF
+	hex	564A4115450F2E46313547303430304435364DFF
+	hex	564A41152E4435334BFF
+	hex	5758451041152E4631364435374BFF
+	hex	575841152E4436364BFF
+	hex	54002E443539FF
+	hex	55002E443630FF
+	hex	2526411D4410460C2E443631FF
+	hex	2526411D460C2E4438364EFF
+	hex	2526411D2E4436324EFF
+	hex	1C1B412C2E4436384BFF
+	hex	3E002E4436344BFF
+	hex	3C3E2E4436344BFF
+	hex	51002E4436334BFF
+	hex	3C512E4436334BFF
+	hex	241044102E4436394BFF
+	hex	521044102E4436394BFF
+	hex	470D412E2E4436374935314DFF
+	hex	190D412E2E4437304BFF
+	hex	192B42092E4437314BFF
+	hex	194841322E4437324BFF
+	hex	191342012E4439304BFF
+	hex	010041082E4439314EFF
+	hex	192741352E4933304DFF
+	hex	19272E4DFF
+	hex	19002E4437334BFF
+	hex	0B592E4438374BFF
+	hex	3C002E4438384BFF
+	hex	00
+
+*
+* Les actions
 *
 
 AA	=	155
@@ -386,59 +547,59 @@ tblM$	da	$bdbd
 	da	M$41,M$42,M$43,M$44,M$45,M$46,M$47,M$48,M$49,M$50
 	da	M$51,M$52,M$53
 
-M$1	dfb	20230300
-M$2	dfb	30440100
-M$3	dfb	10120431900
-M$4	dfb	10220540300
-M$5	dfb	30640453800
-M$6	dfb	10540700
-M$7	dfb	20631640800
-M$8	dfb	20730900
-M$9	dfb	10821331041100
-M$10	dfb	1090
-M$11	dfb	11820931700
-M$12	dfb	31362700
-M$13	dfb	11240900
-M$14	dfb	3150
-M$15	dfb	11441600
-M$16	dfb	10721500
-M$17	dfb	1110
+M$1	dfb	2,02,3,03,00
+M$2	dfb	3,04,4,01,00
+M$3	dfb	1,01,2,04,3,19,00
+M$4	dfb	1,02,2,05,4,03,00
+M$5	dfb	3,06,4,04,5,38,00
+M$6	dfb	1,05,4,07,00
+M$7	dfb	2,06,3,16,4,08,00
+M$8	dfb	2,07,3,09,00
+M$9	dfb	1,08,2,13,3,10,4,11,00
+M$10	dfb	1,09,0
+M$11	dfb	1,18,2,09,3,17,00
+M$12	dfb	3,13,6,27,00
+M$13	dfb	1,12,4,09,00
+M$14	dfb	3,15,0
+M$15	dfb	1,14,4,16,00
+M$16	dfb	1,07,2,15,00
+M$17	dfb	1,11,0
 M$18	dfb	00
-M$19	dfb	10322031800
-M$20	dfb	4190
-M$21	dfb	3230
-M$22	dfb	22342500
-M$23	dfb	12132442200
-M$24	dfb	1230
-M$25	dfb	22264900
-M$26	dfb	1270
-M$27	dfb	32642851200
-M$28	dfb	22742900
-M$29	dfb	22843000
-M$30	dfb	2290
-M$31	dfb	24033200
-M$32	dfb	13124433300
-M$33	dfb	13234900
-M$34	dfb	14144300
-M$35	dfb	23634300
-M$36	dfb	13724843500
-M$37	dfb	13833600
-M$38	dfb	13924733744560500
-M$39	dfb	33844000
-M$40	dfb	23943100
-M$41	dfb	3340
-M$42	dfb	15024300
-M$43	dfb	13523444200
-M$44	dfb	4320
-M$45	dfb	2380
+M$19	dfb	1,03,2,20,3,18,00
+M$20	dfb	4,19,0
+M$21	dfb	3,23,0
+M$22	dfb	2,23,4,25,00
+M$23	dfb	1,21,3,24,4,22,00
+M$24	dfb	1,23,0
+M$25	dfb	2,22,6,49,00
+M$26	dfb	1,27,0
+M$27	dfb	3,26,4,28,5,12,00
+M$28	dfb	2,27,4,29,00
+M$29	dfb	2,28,4,30,00
+M$30	dfb	2,29,0
+M$31	dfb	2,40,3,32,00
+M$32	dfb	1,31,2,44,3,33,00
+M$33	dfb	1,32,3,49,00
+M$34	dfb	1,41,4,43,00
+M$35	dfb	2,36,3,43,00
+M$36	dfb	1,37,2,48,4,35,00
+M$37	dfb	1,38,3,36,00
+M$38	dfb	1,39,2,47,3,37,4,45,6,05,00
+M$39	dfb	3,38,4,40,00
+M$40	dfb	2,39,4,31,00
+M$41	dfb	3,34,0
+M$42	dfb	1,50,2,43,00
+M$43	dfb	1,35,2,34,4,42,00
+M$44	dfb	4,32,0
+M$45	dfb	2,38,0
 M$46	dfb	00
-M$47	dfb	34843800
-M$48	dfb	14743600
-M$49	dfb	13335052500
-M$50	dfb	14934200
-M$51	dfb	3460
+M$47	dfb	3,48,4,38,00
+M$48	dfb	1,47,4,36,00
+M$49	dfb	1,33,3,50,5,25,00
+M$50	dfb	1,49,3,42,00
+M$51	dfb	3,46,0
 M$52	dfb	00
-M$53	dfb	2290
+M$53	dfb	2,29,0
 
 *
 * Le vocabulaire
@@ -462,7 +623,7 @@ tblVL$	dfb	$bd
 	dfb	<V$111,<V$112,<V$113,<V$114,<V$115,<V$116,<V$117,<V$118,<V$119,<V$120
 	dfb	<V$121,<V$122,<V$123,<V$124,<V$125,<V$126,<V$127,<V$128,<V$129,<V$130
 	dfb	<V$131,<V$132,<V$133,<V$134,<V$135,<V$136,<V$137,<V$138,<V$139
-	dfb	<V$201,<V$202
+	dfb	<V$200,<V$201
 	
 tblVH$	dfb	$bd
 	dfb	>V$1,>V$2,>V$3,>V$4,>V$5,>V$6,>V$7,>V$8,>V$9,>V$10
@@ -479,7 +640,7 @@ tblVH$	dfb	$bd
 	dfb	>V$111,>V$112,>V$113,>V$114,>V$115,>V$116,>V$117,>V$118,>V$119,>V$120
 	dfb	<V$121,<V$122,<V$123,<V$124,<V$125,<V$126,<V$127,<V$128,<V$129,<V$130
 	dfb	>V$131,>V$132,>V$133,>V$134,>V$135,>V$136,>V$137,>V$138,>V$139
-	dfb	>V$201,>V$202
+	dfb	>V$200,>V$201
 	
 tblV	dfb	$bd
 	dfb	01,01,02,02,03,03,04,04,05,05
@@ -496,7 +657,7 @@ tblV	dfb	$bd
 	dfb	75,76,77,77,78,78,79,80,80,80
 	dfb	81,81,82,83,83,84,84,84,85,85
 	dfb	85,86,87,87,88,88,89,89,00
-	dfb	201,202
+	dfb	200,201
 	
 V$1	str	"N"
 V$2	str	"NORD"
@@ -638,7 +799,7 @@ V$137	str	"TOUT"
 V$138	str	"TOTA"
 V$139	str	"    "
 
-V$201	str	"CASE"
+V$200	str	"CASE"
 V$201	str	"TIME"
 
 *
@@ -781,6 +942,8 @@ str4559	asc	"UIN LOI QRU ILD ESP ECU TAS ASU VIE RAL HOU MEA"00
 str4560	asc	"C"A7"est d"A7"accord."00
 str4570	asc	"Il etait temps, vous alliez mourir."00
 str4580	asc	"Vous mourrez deshydrate."00
+str4590	asc	""00
+str4600	asc	""00
 str4610	asc	"Le sas se referme derriere vous, le tableau de controle s"A7"allume et l"A7"ordinateur de bord vous demande le mot de passe pour le retour ?"00
 str4615	asc	"Le vaisseau de secours s"A7"eloigne, au loin vous voyez Genius qui pleure derriere un hublot"00
 str4616	asc	"          VOUS AVEZ GAGNE"00
@@ -795,8 +958,10 @@ str4660	asc	"Votre trajectoire est bonne, pourquoi la corriger ?"00
 str4670	asc	"Le mur au nord coulisse, vous avancez dans cette salle."00
 str4680	asc	"Quel livre ?"00
 str4690	asc	"Au dos du boitier est marque :"00
-str4692	asc	"        "A7"PROTEGEZ MOI"A7""00
+str4692	asc	"        "A7"PROTEGEZ MOI"A700
 str4700	asc	"Vous remarquez un boitier de radiocommande."00
+str4710	asc	""00
+str4720	asc	""00
 str4730	asc	"Que regardez vous ?"00
 str4740	asc	"Le tube de nitroglycerine vient d"A7"exploser, vous etes pulverise."00
 str4750	asc	"La bombe a retardement vient d"A7"exploser, vous etes pulverise."00

leretour/apple2/fr/iigs.s

@@ -28,8 +28,7 @@
 	
 GSOS	=	$e100a8
 
-dpY	=	$70
-dpFROM	=	dpY+2
+dpFROM	=	$70
 dpTO	=	dpFROM+2
 
 refIsPointer =	$0
@@ -42,108 +41,14 @@ FALSE	=	0
 ptr012000	=	$012000
 ptrE12000	=	$e12000
 
+modeForeCopy =	$0004	; QDII Table 16-10
+
 mode320	=	$00
 mode640	=	$80
 
 maxX	=	320
 maxY	=	200
 
-*-----------------------------------
-* SOFTSWITCHES AND FRIENDS
-*-----------------------------------
-
-WNDTOP	=	$22	; top of text window 
-WNDBTM	=	$23	; bottom+1 of text window 
-CH	=	$24	; cursor horizontal position 
-CV	=	$25	; cursor vertical position 
-LINNUM	=	$50	; result from GETADR
-X0L	=	$e0	; X-coord
-X0H	=	$e1
-Y0	=	$e2	; Y-coord
-
-nbOaP	=	10	; on peut porter dix objets
-
-chrLA	=	$88
-chrRA	=	$95
-chrDEL	=	$ff
-chrRET	=	$8d
-chrSPC	=	$a0
-TEXTBUFFER = 	$200
-maxLEN	=	20
-
-chrOUI	=	"O"
-chrNON	=	"N"
-
-idxCASSE	=	200
-idxTIMER	=	201
-
-PRODOS	=	$bf00
-
-KBD	=	$c000
-CLR80VID	=	$c00c
-KBDSTROBE	=	$c010
-VBL	=	$c019
-MONOCOLOR	=	$c021
-VERTCNT	=	$c02e
-SPKR	=	$c030
-CYAREG	=	$C036
-TXTCLR	=	$c050
-TXTSET	=	$c051
-MIXCLR	=	$c052
-MIXSET	=	$c053
-TXTPAGE1	=	$c054
-TXTPAGE2	=	$c055
-LORES	=	$c056
-HIRES	=	$c057
-
-*--- The firmware routines
-
-HGR	=	$F3E2	; HGR
-HPLOT	=	$F457	; HPLOT
-HILIN	=	$F53A	; HPLOT TO
-HCOLOR	=	$F6E9	; HCOLOR= (call+3)
-INIT	=	$FB2F
-TABV	=	$FB5B
-HOME	=	$FC58
-WAIT	=	$FCA8
-RDKEY	=	$FD0C
-*GETLN1	=	$FD6F	; using mine now
-COUT	=	$FDED
-IDROUTINE	=	$FE1F
-SETNORM	=	$FE84
-SETKBD	=	$FE89
-
-*-----------------------------------
-* MACROS
-*-----------------------------------
-
-@draw	mac
-	lda	#]1
-	jsr	showPIC
-	eom
-
-@explode	mac
-	jsr	EXPLODE
-	eom
-
-@play	mac
-	ldx	#>]1
-	ldy	#<]1
-	jsr	playMUSIC
-	eom
-
-@print	mac
-	ldx	#>]1
-	ldy	#<]1
-	jsr	printCSTRING
-	eom
-
-@wait	mac
-	ldx	#>]1
-	ldy	#<]1
-	jsr	waitMS
-	eom
-
 *-----------------------------------
 * DU 16-BITS
 *-----------------------------------
@@ -167,6 +72,8 @@ ICI	phk
 	pha
 	_MMStartUp
 	pla
+	sta	appID
+	ora	#$0100
 	sta	myID
 
 	pha
@@ -189,6 +96,10 @@ ICI	phk
 	pla
 	pla
 
+*-----------------------------------
+* INITIALISATIONS DESKTOP
+*-----------------------------------
+
 	PushLong	#0
 	_GetPort
 	PullLong	mainPORT
@@ -207,33 +118,27 @@ ICI	phk
 	PushWord	#0
 	_ClearScreen
 
-*-----------------------------------
-* AFFICHE UNE IMAGE
-*-----------------------------------
-
-	lda	#12
-	sta	myINDEX
-	
-loop	lda	myINDEX
-	jsr	showIMAGE
-
-]lp	ldal	$bfff
-	bpl	]lp
-	stal	$c00f
-	
 	PushWord	#0
-	_ClearScreen
+	_GetMasterSCB
+	pla
+	bmi	okSHADOW	; shadowing is on if bit 15 is set
 
-	inc	myINDEX
-	lda	myINDEX
-	cmp	#14
-	bcc	loop
+	lda	#^ptrE12000	; shadowing is off, use slow RAM
+	sta	srcLocInfoPtr+4
 
+okSHADOW
+
+*-----------------------------------
+* IL FAUT JOUER MAINTENANT
+*-----------------------------------
+
+	jsr	PLAY
+	
 *-----------------------------------
 * AU REVOIR LE IIGS
 *-----------------------------------
 
-	_GrafOff	
+QUIT	_GrafOff	
 	
 	PushWord #refIsPointer
 	PushLong ssREC
@@ -242,7 +147,10 @@ loop	lda	myINDEX
 	PushWord myID
 	_DisposeAll
 
-	PushWord myID
+	PushWord appID
+	_DisposeAll
+
+	PushWord appID
 	_MMShutDown
 
 	_TLShutDown
@@ -288,10 +196,10 @@ whitePATTERN ds	32,$ff
 
 ssREC	ds	4
 
-toolTBL	dw	$0000
-	dw	$0000
-	dw	$0000
-	ADRL	$00000000
+toolTBL	dw	$0000	; flags
+	dw	$C000	; videoMode (shadowing + fast port)
+	dw	$0000	; resFileID
+	ADRL	$00000000	; dPageHandle
 	dw	$0010
 	dw	$0003	; Miscellaneous Tool
 	dw	$0300
@@ -334,6 +242,7 @@ proQUIT	dw	2	; pcount
 	
 *-----------------------------------
 
+appID	ds	2
 myID	ds	2
 myDP	ds	2
 
@@ -343,7 +252,9 @@ mainPORT	ds	4
 * CODE BASIC EN ASM :-)
 *-----------------------------------
 
+	put	leretour.s
 	put	engine.s
+	put	fr.s
 	put	../common/images.s
 	
 *--- It's the end

leretour/apple2/fr/leretour.s

@@ -6,7 +6,6 @@
 *
 
 	mx	%11
-	org	$400
 	lst	off
 
 *-----------------------------------
@@ -22,10 +21,6 @@ X0L	=	$e0	; X-coord
 X0H	=	$e1
 Y0	=	$e2	; Y-coord
 
-maxY	=	191	; 0 to 191 = 192
-nbLINES	=	200	; 200 lignes sur un CPC
-deltaY	=	32
-
 nbOaP	=	10	; on peut porter dix objets
 
 chrLA	=	$88
@@ -42,24 +37,9 @@ chrNON	=	"N"
 idxCASSE	=	200
 idxTIMER	=	201
 
-PRODOS	=	$bf00
+*--- Softswitches
 
-KBD	=	$c000
-CLR80VID	=	$c00c
-KBDSTROBE	=	$c010
-VBL	=	$c019
-MONOCOLOR	=	$c021
-VERTCNT	=	$c02e
-SPKR	=	$c030
-CYAREG	=	$C036
-TXTCLR	=	$c050
-TXTSET	=	$c051
-MIXCLR	=	$c052
-MIXSET	=	$c053
-TXTPAGE1	=	$c054
-TXTPAGE2	=	$c055
-LORES	=	$c056
-HIRES	=	$c057
+VBL	=	$e0c019
 
 *--- The firmware routines
 
@@ -104,7 +84,7 @@ SETKBD	=	$FE89
 	eom
 
 @wait	mac
-	ldx	#>]1
+	lda	#>]1
 	ldy	#<]1
 	jsr	waitMS
 	eom
@@ -113,46 +93,7 @@ SETKBD	=	$FE89
 * CODE BASIC EN ASM :-)
 *-----------------------------------
 
-	sec
-	jsr	IDROUTINE
-	bcs	notiigs
-
-	lda	CYAREG	; 1 MHz vaincra!
-	sta	sauveCYA
-	and	#%0111_1111
-	sta	CYAREG
-	
-	lda	MONOCOLOR
-	sta	sauveMONO
-	ora	#%1000_0000
-*	and	#%0111_1111
-	sta	MONOCOLOR
-	
-notiigs
-
-*-------- CAN WE DO lowercase?
-
-	lda	$FBB3
-	cmp	#$06
-	beq	lowerOK
-	
-	lda	#$80	; ONLY UPPERCASE
-	sta	fgCASE	
-lowerOK
-
-*--------
-
-*	lda	#0
-*	sta	deltaY
-*	
-*	jsr	introPIC	; la picture GR
-*	
-*	lda	#32
-*	sta	deltaY
-
-	@play	#zikINTRODUCTION
-	
-REPLAY	jsr	initALL
+PLAY	jsr	initALL
 	jsr	HGR
 
 	jsr	HOME	; clear text screen
@@ -753,7 +694,7 @@ tbl1800	da	:1800,:1900
 	bne	:1960
 
 	@print	#strVOUSLAVEZ
-	jmp	:1920
+	rts
 
 :1960	lda	#-1
 	sta	O,x
@@ -1077,7 +1018,7 @@ tbl4000	da	$bdbd,:4010,:4020,:4030,:4040,:4050,:4060,:4070,:4080,:4090
 	rts
 	
 :4490	@print	#str4490
-	#print	#str4491
+	@print	#str4491
 	rts
 	
 :4500	@print	#str4500
@@ -1116,7 +1057,7 @@ tbl4000	da	$bdbd,:4010,:4020,:4030,:4040,:4050,:4060,:4070,:4080,:4090
 	rts
 	
 :4610	@print	#str4610
-	#print	#str4615
+	@print	#str4615
 	rts
 
 :4620	@print	#str4620
@@ -1149,10 +1090,18 @@ tbl4000	da	$bdbd,:4010,:4020,:4030,:4040,:4050,:4060,:4070,:4080,:4090
 :4700	@print	#str4700
 	rts
 
-:4710	@print	#str4710
+:4710	lda	SALLE
+	pha
+	@draw	#54
+	pla
+	sta	SALLE
 	rts
 
-:4720	@print	#str4720
+:4720	lda	SALLE
+	pha
+	@draw	#55
+	pla
+	sta	SALLE
 	rts
 
 :4730	@print	#str4730
@@ -1634,11 +1583,6 @@ initALL
 
 *---
 
-	lda	#<filleNUE	; remet l'image sur la fille nue
-	sta	ptrSALLEBA
-	lda	#>filleNUE
-	sta	ptrSALLEBA+1
-	
 	lda	#1
 	sta	SALLE
 
@@ -1681,8 +1625,7 @@ initALL
 	
 	jsr	setTEXTFULL
 	@print	#strPERDU
-	@play	#zikPERDU
-	@print	#strPERDU2
+*	@play	#zikPERDU
 
 :20050			; commun avec gagne
 ]lp	@print	#strREPLAY
@@ -1691,30 +1634,10 @@ initALL
 	beq	:20001
 	cmp	#chrOUI
 	bne	]lp
-	jmp	REPLAY
+	jmp	PLAY
 
-:20001
-	lda	sauveMONO
-	sta	MONOCOLOR
-	lda	sauveCYA
-	sta	CYAREG
+:20001	jmp	QUIT	; return to the IIgs
 
-	jsr	PRODOS	; exit
-	dfb	$65
-	da	proQUIT
-	brk	$bd	; on ne se refait pas ;-)
-
-*--- Data
-
-proQUIT	dfb	4
-	ds	1
-	ds	2
-	ds	1
-	ds	2
-
-sauveCYA	ds	1
-sauveMONO ds	1
-	
 *-----------------------------------
 * 32000 - GAGNE
 *-----------------------------------
@@ -1724,22 +1647,14 @@ sauveMONO ds	1
 	@wait	#400
 	jsr	setTEXTFULL
 	@print	#strGAGNE
-	@play	#zikINTRODUCTION
+*	@play	#zikINTRODUCTION
 	jmp	:20050
 
 *-----------------------------------
 * ORIC
 *-----------------------------------
 
-EXPLODE	ldx	#$25
-]lp	lda	TXTSET
-	lda	#$25
-	jsr	WAIT
-	lda	TXTCLR
-	lda	#$25
-	jsr	WAIT
-	dex
-	bpl	]lp
+EXPLODE	rts
 	rts
 
 *-----------------------------------
@@ -1750,30 +1665,19 @@ EXPLODE	ldx	#$25
 * setTEXTFULL
 *----------------------
 
-setTEXTFULL		; 40x24 text
-	sta	CLR80VID
-	jsr	INIT	; text screen
-	jsr	SETNORM	; set normal text mode
-	jsr	SETKBD	; reset input to keyboard
-	jmp	HOME	; home cursor and clear to end of page
+setTEXTFULL	rts	; 40x24 text
 
 *----------------------
 * setHGR
 *----------------------
 
-setHGR			; HGR
-	sta	TXTCLR
-	sta	MIXCLR
-	sta	TXTPAGE1
-	sta	HIRES	
-	rts
+setHGR	rts		; HGR
 
 *----------------------
 * switchCASE
 *----------------------
 
-switchCASE
-	lda	fgCASE
+switchCASE	lda	fgCASE
 	eor	#$80
 	sta	fgCASE
 	rts
@@ -1828,52 +1732,13 @@ switchENERGIE
 	sta	switchENERGIE+1
 	rts
 
-testENERGIE	tay
-	lda	switchENERGIE+1
-	beq	wedoENERGIE
-	tya
-	rts
-
-wedoENERGIE	dec	TEMPS+3
-	lda	TEMPS+3
-	bpl	printENERGIE
-	lda	#9
-	sta	TEMPS+3
-	dec	TEMPS+2
-	bpl	printENERGIE
-	lda	#9
-	sta	TEMPS+2
-	dec	TEMPS+1
-	bpl	printENERGIE
-	lda	#9
-	sta	TEMPS+1
-	dec	TEMPS
-	bpl	printENERGIE
-	jmp	:4370	; la fin !!!
-
-printENERGIE
-	lda	TEMPS
-	ora	#"0"
-	sta	strTEMPS
-	lda	TEMPS+1
-	ora	#"0"
-	sta	strTEMPS+1
-	lda	TEMPS+2
-	ora	#"0"
-	sta	strTEMPS+2
-	lda	TEMPS+3
-	ora	#"0"
-	sta	strTEMPS+3
-
-	tya	; restore Y
-	rts
+testENERGIE	rts
 
 *----------------------
 * switchVIDEO
 *----------------------
 
-switchVIDEO
-	lda	#0
+switchVIDEO	lda	#0
 	eor	#1
 	sta	switchVIDEO+1
 	bne	setMIXEDOFF
@@ -1883,8 +1748,6 @@ switchVIDEO
 *----------------------
 
 setMIXEDON		; HGR + 4 LINES OF TEXT
-	sta	TXTCLR
-	sta	MIXSET
 	rts
 
 *----------------------
@@ -1892,8 +1755,6 @@ setMIXEDON		; HGR + 4 LINES OF TEXT
 *----------------------
 
 setMIXEDOFF		; FULL HGR
-	sta	TXTSET
-	sta	MIXSET
 	rts
 
 *----------------------
@@ -1912,6 +1773,7 @@ pcs1	lda	$ffff
 	
 	tax		; from lower to upper
 	lda	tblKEY,x
+	and	#$ff
 	
 pcs2	jsr	COUT
 	
@@ -1930,8 +1792,7 @@ fgCASE	ds	1	; $00 lower OK, $80 otherwise
 * waitMS
 *----------------------
 
-switchWAIT
-	lda	waitMS+1
+switchWAIT	lda	waitMS+1
 	eor	#1
 	sta	waitMS+1
 	rts
@@ -1941,200 +1802,17 @@ waitMS	lda	#0	; skip if not zero
 	
 	sty	LINNUM
 doW1	ldy	LINNUM
-]lp	lda	#60	; 1/100<30>me de seconde
-	jsr	WAIT
+doW2	lda	#60	; 1/100<30>me de seconde
+]lp	ldal	VBL
+	bmi	]lp
+]lp	ldal	VBL
+	bpl	]lp
 	dey
-	bne	]lp
+	bne	doW2
 	dex
 	bpl	doW1
 waitMS9	rts
 
-*-----------------------------
-* MOTEUR
-*-----------------------------
-
-showPIC	pha
-
-	jsr	HGR
-	sta	MIXCLR
-
-	ldx	#>picFRAME
-	ldy	#<picFRAME
-	jsr	drawPICTURE
-
-	pla
-	asl
-	tax
-	lda	tblIMAGES,x
-	sta	LINNUM
-	lda	tblIMAGES+1,x
-	sta	LINNUM+1
-	ora	LINNUM
-	bne	showPIC1
-	sec
-	rts
-
-showPIC1	ldx	LINNUM+1
-	ldy	LINNUM
-
-*----------------------
-* drawPICTURE
-*----------------------
-
-drawPICTURE
-	sty	drawREAD+1
-	stx	drawREAD+2
-
-drawLOOP	jsr	drawREAD
-	cmp	#0
-	bne	drawPIC1
-	rts		; the end
-
-drawPIC1	pha
-	and	#%11_000000
-	lsr
-	lsr
-	lsr
-	lsr
-	lsr
-	lsr
-	sta	theINK	; c'est PEN mais bon
-
-	pla
-	lsr
-	bcs	doLINE
-	lsr
-	bcs	doPLOT
-
-* fill
-
-	jsr	drawREAD
-	jsr	drawREAD
-	jmp	drawLOOP
-
-*----------------------------------- PLOT
-
-doPLOT	jsr	drawREAD
-	sta	theX
-	jsr	drawREAD
-	sta	theY
-	
-	lda	#nbLINES
-	sec
-	sbc	theY
-	sta	theY
-	jmp	drawLOOP
-
-*----------------------------------- LINE ABS
-
-doLINE	jsr	drawREAD
-	sta	theX2
-
-	jsr	drawREAD
-	sta	theY2
-
-	lda	#nbLINES
-	sec
-	sbc	theY2
-	sta	theY2
-
-*---------- Check height
-
-	lda	theY
-	cmp	#maxY
-	bcc	doD1
-	lda	#maxY
-	sta	theY
-
-doD1	lda	theY2
-	cmp	#maxY
-	bcc	doD2
-	lda	#maxY
-	sta	theY2
-doD2
-	
-*---------- It is now time to draw as we have all variables
-
-*	ldy	theINK	; the ink color
-*	ldy	#0	; LOGO
-*	ldx	oric2hgr,y	; from the Oric to the Apple II
-	ldx	#7
-	jsr	HCOLOR+3	; to skip CHRGET 
-
-	ldx	theX	; HPLOT x,y
-	ldy	#0	; theX+1
-	lda	theY
-	sec
-	sbc	#deltaY	; -32 pour les images du jeu
-	jsr	HPLOT
-
-*	ldy	theY2
-	lda	theY2
-	sec
-	sbc	#deltaY
-	tay
-	lda	theX2	; TO x2,Y2
-	ldx	#0	; theX2+1
-	jsr	HILIN	; draw the line
-
-	lda	X0L	; save the updated coords
-	sta	theX
-*	lda	X0H
-*	sta	theX+1
-	lda	Y0
-	clc
-	adc	#deltaY
-	sta	theY
-	jmp	drawLOOP
-
-*-------- Read data
-	
-drawREAD	lda	$bdbd
-	inc	drawREAD+1
-	bne	drawREAD1
-	inc	drawREAD+2
-drawREAD1	rts
-	
-*----------------------
-* DonnŽes du moteur
-*----------------------
-
-picFRAME	hex	42
-	dfb	0,0
-	hex	41
-	dfb	0,149
-	hex	41
-	dfb	199,149
-	hex	41
-	dfb	199,0
-	hex	41
-	dfb	0,0
-	hex	00
-
-*---
-
-theX	dfb	140	; milieu de l'Žcran par dŽfaut
-theY	dfb	96
-theX2	ds	1
-theY2	ds	1
-theRADIUS	ds	1
-theFB	ds	1
-theINK	ds	1
-thePAPER	ds	1
-*deltaY	ds	1	; 0 or 32 - constante
-
-*	APPLE	ORIC
-* 0	black1	black
-* 1	green	red
-* 2	blue	green
-* 3	white1	yellow
-* 4	black2	blue
-* 5	-	magenta
-* 6	-	cyan
-* 7	white2	white
-
-*oric2hgr	hex	0705010602030400
-
 *-----------------------------------
 * rewriteSTRING (lower -> upper)
 *-----------------------------------
@@ -2176,130 +1854,6 @@ tblKEY
 	hex	D0,D1,D2,D3,D4,D5,D6,D7,D8,D9,DA,DB,DC,DD,DE,DF
 	hex	E0,C1,C2,C3,C4,C5,C6,C7,C8,C9,CA,CB,CC,CD,CE,CF
 	hex	D0,D1,D2,D3,D4,D5,D6,D7,D8,D9,DA,FB,FC,FD,FE,FF
-	
-*-----------------------------------
-* Electric Duet Player
-*-----------------------------------
-
-*-----------------------------------
-* PLAYMUSIC
-*-----------------------------------
-
-playMUSIC
-	sty	$1e
-	stx	$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
-*
-	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
 
 *-----------------------------------
 * VARIABLES
@@ -2307,33 +1861,34 @@ LA0F0	BVS	LA095
 
 DEBUT_DATA
 
-A1	ds	1
-BREAK	ds	1
-E	ds	1
-F1	ds	1
-G	ds	1
-H	ds	1
-HH	ds	1
-L	ds	1
-LX	ds	1
-MO$1	ds	1	; mot 1
-MO$2	ds	1	; mot 2
-N	ds	1
-NL	ds	1
-OK	ds	1
-S	ds	1
-SALLE	ds	1
-T	ds	1
-W	ds	1
-Z	ds	1
-lenSTRING	ds	1
+A1	ds	2
+BREAK	ds	2
+E	ds	2
+F1	ds	2
+G	ds	2
+H	ds	2
+HH	ds	2
+L	ds	2
+LX	ds	2
+MO$1	ds	2	; mot 1
+MO$2	ds	2	; mot 2
+N	ds	2
+NL	ds	2
+OK	ds	2
+S	ds	2
+SALLE	ds	2
+T	ds	2
+W	ds	2
+Z	ds	2
+lenSTRING	ds	2
 TEMPS	ds	4	; le temps = 5000
+strTEMPS	ds	4+1
 
-C	ds	61+1
+C	ds	62+1
 E$	ds	32	; the longest string
-P	ds	61+1
-X$1	ds	4+1	; premier mot saisi
-X$2	ds	4+1	; second mot saisi
+P	ds	62+1
+X$1	ds	1+4	; premier mot saisi
+X$2	ds	1+4	; second mot saisi
 
 FIN_DATA
 
@@ -2341,19 +1896,3 @@ FIN_DATA
 
 tblD2H	dfb	0,10,20,30,40,50,60,70,80,90
 
-*-----------------------------------
-* LES AUTRES FICHIERS
-*-----------------------------------
-
-	put	fr.s
-	put	../common/images.s
-	put	../common/musiques.s
-	
-*--- It's the end
-
-tblIMAGES	da	L423B,L786F,L7974,L4F61,L4E95,L7CC8,L6BDC,L5EFA,L7DE2,L7F38
-	da	L62EF,L57EA,L5925,L63F6,L47C3,L5A21,L5021,L4DFF,L64EF,L4700
-	da	L5D77,L52CA,L4E41,L6AF2,L81EA,L827B,L61DF,L497F,L4C16,L4A8D
-	da	L4CEE,L5B40,L6FDD,L6F05,L65FF,L8088,L7A40,L774C,L7B63,L5CC6
-	da	L5BEE,L50F6,L6D58,L6C6E,L74D2,L70F6,L487A,L71E0,L4DAB,L55C8
-	da	L72CA,L6958,$0000,L5F6B,L60EB,L6812,L6E33,L8367

leretour/oric/LERETOUR.S

@@ -17110,116 +17110,167 @@ L86F5       LDA   RESETV
 L86FF       RTS
 
 *-----------------------------------
-* LES ACTIONS (EN BLOC)
+* LES ACTIONS
 *-----------------------------------
 
-L8700       HEX   0100411246012E4931394DFF03004112
-            HEX   45012E4931314DFF010041122E443033
-            HEX   4EFF030041122E4430334EFF19004511
-            HEX   2E4438354BFF020041022E4430344EFF
-            HEX   020041312E4430354BFF0400412E2E44
-            HEX   30364BFF0A1342012E4230314AFF0A12
-            HEX   42032E4230334AFF0A0E42052E423035
-            HEX   4AFF0A2142062E4230364AFF0A2A4208
-            HEX   2E4230384AFF0A2B42092E4230394AFF
-            HEX   0A36420A2E4231304AFF0A35420B2E42
-            HEX   31314AFF0A2D420C2E4231324AFF0A2E
-            HEX   420E2E4231344AFF0A2F420F2E443037
-            HEX   4AFF0A10412E46092E4530394231364A
-            HEX   FF0A3042112E4231374430384BFF0A31
-            HEX   42122E4231384AFF0A29451142022E42
-            HEX   30324AFF0A2942022E44303945313742
-            HEX   30324DFF0A2142072E4230374AFF0B29
-            HEX   2E4330324AFF0B132E4330314AFF0B12
-            HEX   2E4330334AFF0B2E2E4331344AFF0B21
-            HEX   42072E4330374AFF0B212E4330364AFF
-            HEX   194A41152E4438394BFF0B2A2E433038
-            HEX   4AFF0B2B2E4330394AFF0B362E433130
-            HEX   4AFF0B352E4331314AFF0B2D440D2E4F
-            HEX   31324331334831334AFF0B2D2E433132
-            HEX   4AFF0B102E4331364AFF0B302E433137
-            HEX   4AFF0B312E4331384AFF0A1142042E42
-            HEX   30344AFF0A1142132E43313948313942
-            HEX   30354230344AFF0B1144042E4330344A
-            HEX   FF0B1144132E4331394831394230354F
-            HEX   30344AFF052E440E2E4431324EFF322E
-            HEX   440E2E4431324EFF4B2E440E2E443132
-            HEX   4EFF0F2F41142E4431334EFF3435420B
-            HEX   2E4431344EFF2823410F2E4530384431
-            HEX   364BFF282343072E4431374BFF28232E
-            HEX   4431384EFF2A0044082E4431394EFF34
-            HEX   2A44082E4431394EFF343144122E4432
-            HEX   304EFF0C4C41122E4432314EFF0A1042
-            HEX   102E4231364AFF28002E4431354BFF0F
-            HEX   4D41312E4430354BFF0F4D412E2E4430
-            HEX   354BFF0F4D2E4432324BFF0F112E4432
-            HEX   334EFF0F44410F2E4432344BFF434441
-            HEX   0F2E4432354BFF0F49411E2E4935334D
-            HEX   FF1949411E2E4935334DFF0F1A412C2E
-            HEX   4432374BFF431A412C2E4432374BFF43
-            HEX   4941352E4933304DFF191A412C2E4432
-            HEX   364BFF5253412C2E4432384BFF1C1E41
-            HEX   2C2E4432394BFF1C1F412C2E4433304B
-            HEX   FF1C20412C2E4433314BFF1C1D412C2E
-            HEX   4433324BFF2221410F42062E43303648
-            HEX   30364230374AFF2221410F42072E4433
-            HEX   334BFF0A0E42132E4231394AFF0B0E42
-            HEX   132E4331394AFF0B0E2E4330354AFF14
-            HEX   1744012E4433344EFF14164401493149
-            HEX   2E2E4433354BFF1416440141312E4433
-            HEX   364934364DFF14164401412E2E443336
-            HEX   4934394DFF14154401490E4914491749
-            HEX   1D49262E4433354BFF14154401410E2E
-            HEX   4433374630344DFF1415440141142E44
-            HEX   33374630354DFF1415440141172E4433
-            HEX   374630334DFF14154401411D2E443337
-            HEX   4630364DFF141544012E443337463037
-            HEX   4DFF3412420346122E47303130344531
-            HEX   384AFF341242032E4433334BFF322D44
-            HEX   0D2E4433334BFF322D440C2E43313248
-            HEX   31324231334AFF342B4209460B2E4433
-            HEX   384BFF342B42092E4433394BFF242C42
-            HEX   09450B2E4631314AFF242C4209460B2E
-            HEX   4531314AFF4B3044112E4434304BFF32
-            HEX   3044112E4434304BFF333044112E4AFF
+L8700       HEX   0100411246012E4931394DFF
+            HEX   0300411245012E4931314DFF
+            HEX   010041122E4430334EFF
+            HEX   030041122E4430334EFF
+            HEX   190045112E4438354BFF
+            HEX   020041022E4430344EFF
+            HEX   020041312E4430354BFF
+            HEX   0400412E2E4430364BFF
+            HEX   0A1342012E4230314AFF
+            HEX   0A1242032E4230334AFF
+            HEX   0A0E42052E4230354AFF
+            HEX   0A2142062E4230364AFF
+            HEX   0A2A42082E4230384AFF
+            HEX   0A2B42092E4230394AFF
+            HEX   0A36420A2E4231304AFF
+            HEX   0A35420B2E4231314AFF
+            HEX   0A2D420C2E4231324AFF
+            HEX   0A2E420E2E4231344AFF
+            HEX   0A2F420F2E4430374AFF
+            HEX   0A10412E46092E4530394231364AFF
+            HEX   0A3042112E4231374430384BFF
+            HEX   0A3142122E4231384AFF
+            HEX   0A29451142022E4230324AFF
+            HEX   0A2942022E4430394531374230324DFF
+            HEX   0A2142072E4230374AFF
+            HEX   0B292E4330324AFF
+            HEX   0B132E4330314AFF
+            HEX   0B122E4330334AFF
+            HEX   0B2E2E4331344AFF
+            HEX   0B2142072E4330374AFF
+            HEX   0B212E4330364AFF
+            HEX   194A41152E4438394BFF
+            HEX   0B2A2E4330384AFF
+            HEX   0B2B2E4330394AFF
+            HEX   0B362E4331304AFF
+            HEX   0B352E4331314AFF
+            HEX   0B2D440D2E4F31324331334831334AFF
+            HEX   0B2D2E4331324AFF
+            HEX   0B102E4331364AFF
+            HEX   0B302E4331374AFF
+            HEX   0B312E4331384AFF
+            HEX   0A1142042E4230344AFF
+            HEX   0A1142132E4331394831394230354230344AFF
+            HEX   0B1144042E4330344AFF
+            HEX   0B1144132E4331394831394230354F30344AFF
+            HEX   052E440E2E4431324EFF
+            HEX   322E440E2E4431324EFF
+            HEX   4B2E440E2E4431324EFF
+            HEX   0F2F41142E4431334EFF
+            HEX   3435420B2E4431344EFF
+            HEX   2823410F2E4530384431364BFF
+            HEX   282343072E4431374BFF
+            HEX   28232E4431384EFF
+            HEX   2A0044082E4431394EFF
+            HEX   342A44082E4431394EFF
+            HEX   343144122E4432304EFF
+            HEX   0C4C41122E4432314EFF
+            HEX   0A1042102E4231364AFF
+            HEX   28002E4431354BFF
+            HEX   0F4D41312E4430354BFF
+            HEX   0F4D412E2E4430354BFF
+            HEX   0F4D2E4432324BFF
+            HEX   0F112E4432334EFF
+            HEX   0F44410F2E4432344BFF
+            HEX   4344410F2E4432354BFF
+            HEX   0F49411E2E4935334DFF
+            HEX   1949411E2E4935334DFF
+            HEX   0F1A412C2E4432374BFF
+            HEX   431A412C2E4432374BFF
+            HEX   434941352E4933304DFF
+            HEX   191A412C2E4432364BFF
+            HEX   5253412C2E4432384BFF
+            HEX   1C1E412C2E4432394BFF
+            HEX   1C1F412C2E4433304BFF
+            HEX   1C20412C2E4433314BFF
+            HEX   1C1D412C2E4433324BFF
+            HEX   2221410F42062E4330364830364230374AFF
+            HEX   2221410F42072E4433334BFF
+            HEX   0A0E42132E4231394AFF
+            HEX   0B0E42132E4331394AFF
+            HEX   0B0E2E4330354AFF
+            HEX   141744012E4433344EFF
+            HEX   141644014931492E2E4433354BFF
+            HEX   1416440141312E4433364934364DFF
+            HEX   14164401412E2E4433364934394DFF
+            HEX   14154401490E49144917491D49262E4433354BFF
+            HEX   14154401410E2E4433374630344DFF
+            HEX   1415440141142E4433374630354DFF
+            HEX   1415440141172E4433374630334DFF
+            HEX   14154401411D2E4433374630364DFF
+            HEX   141544012E4433374630374DFF
+            HEX   3412420346122E47303130344531384AFF
+            HEX   341242032E4433334BFF
+            HEX   322D440D2E4433334BFF
+            HEX   322D440C2E4331324831324231334AFF
+            HEX   342B4209460B2E4433384BFF
+            HEX   342B42092E4433394BFF
+            HEX   242C4209450B2E4631314AFF
+            HEX   242C4209460B2E4531314AFF
+            HEX   4B3044112E4434304BFF
+            HEX   323044112E4434304BFF
+            HEX   333044112E4AFF
             HEX   332D440D2E4331334831334231324AFF
-            HEX   3436440A490449114916493049332E44
-            HEX   33354BFF3436440A2E4434314BFF3700
-            HEX   2E4434324BFF38002E4434334BFF3900
-            HEX   2E4434344BFF3A002E4434354BFF3B00
-            HEX   2E4434364BFF3C3B2E4434364BFF3D00
-            HEX   2E4434374BFF4E002E41FF110E440444
-            HEX   052E4330344330354830344830354231
-            HEX   394AFF502144072E4330374830374230
-            HEX   364AFF3F002E443438FF40002E443439
-            HEX   4EFF14182E4435304BFF14424122450C
-            HEX   2E4435314BFF14414122450C2E443531
-            HEX   4BFF144241222E4435324EFF14414122
-            HEX   2E4531334435374BFF4546450C2E4435
-            HEX   3345313447303230354BFF4546460C49
-            HEX   32460D2E4435344EFF4546460C450D2E
-            HEX   44353345313447303230354BFF454646
-            HEX   0C41322E44353345313447303230354B
-            HEX   FF474A4115450F2E4433334BFF474A41
-            HEX   152E45313544353547303430374BFF56
-            HEX   4A4115450F2E46313547303430304435
-            HEX   364DFF564A41152E4435334BFF575845
-            HEX   1041152E4631364435374BFF57584115
-            HEX   2E4436364BFF54002E443539FF55002E
-            HEX   443630FF2526411D4410460C2E443631
-            HEX   FF2526411D460C2E4438364EFF252641
-            HEX   1D2E4436324EFF1C1B412C2E4436384B
-            HEX   FF3E002E4436344BFF3C3E2E4436344B
-            HEX   FF51002E4436334BFF3C512E4436334B
-            HEX   FF241044102E4436394BFF521044102E
-            HEX   4436394BFF470D412E2E443637493531
-            HEX   4DFF190D412E2E4437304BFF192B4209
-            HEX   2E4437314BFF194841322E4437324BFF
-            HEX   191342012E4439304BFF010041082E44
-            HEX   39314EFF192741352E4933304DFF1927
-            HEX   2E4DFF19002E4437334BFF0B592E4438
-            HEX   374BFF3C002E4438384BFF00
+            HEX   3436440A490449114916493049332E4433354BFF
+            HEX   3436440A2E4434314BFF
+            HEX   37002E4434324BFF
+            HEX   38002E4434334BFF
+            HEX   39002E4434344BFF
+            HEX   3A002E4434354BFF
+            HEX   3B002E4434364BFF
+            HEX   3C3B2E4434364BFF
+            HEX   3D002E4434374BFF
+            HEX   4E002E41FF
+            HEX   110E440444052E4330344330354830344830354231394AFF
+            HEX   502144072E4330374830374230364AFF
+            HEX   3F002E443438FF
+            HEX   40002E4434394EFF
+            HEX   14182E4435304BFF
+            HEX   14424122450C2E4435314BFF
+            HEX   14414122450C2E4435314BFF
+            HEX   144241222E4435324EFF
+            HEX   144141222E4531334435374BFF
+            HEX   4546450C2E44353345313447303230354BFF
+            HEX   4546460C4932460D2E4435344EFF
+            HEX   4546460C450D2E44353345313447303230354BFF
+            HEX   4546460C41322E44353345313447303230354BFF
+            HEX   474A4115450F2E4433334BFF
+            HEX   474A41152E45313544353547303430374BFF
+            HEX   564A4115450F2E46313547303430304435364DFF
+            HEX   564A41152E4435334BFF
+            HEX   5758451041152E4631364435374BFF
+            HEX   575841152E4436364BFF
+            HEX   54002E443539FF
+            HEX   55002E443630FF
+            HEX   2526411D4410460C2E443631FF
+            HEX   2526411D460C2E4438364EFF
+            HEX   2526411D2E4436324EFF
+            HEX   1C1B412C2E4436384BFF
+            HEX   3E002E4436344BFF
+            HEX   3C3E2E4436344BFF
+            HEX   51002E4436334BFF
+            HEX   3C512E4436334BFF
+            HEX   241044102E4436394BFF
+            HEX   521044102E4436394BFF
+            HEX   470D412E2E4436374935314DFF
+            HEX   190D412E2E4437304BFF
+            HEX   192B42092E4437314BFF
+            HEX   194841322E4437324BFF
+            HEX   191342012E4439304BFF
+            HEX   010041082E4439314EFF
+            HEX   192741352E4933304DFF
+            HEX   19272E4DFF
+            HEX   19002E4437334BFF
+            HEX   0B592E4438374BFF
+            HEX   3C002E4438384BFF
+            HEX   00
             DS    $64,$55
+
 L8E00       ASC   'N   '
             HEX   01
             ASC   'NORD'