ca avance

leretour/apple2/common/images.s

@@ -11,7 +11,7 @@
 * POINTEURS DES IMAGES
 *-----------------------------------
 
-* image 0 : L423B
+* image 0 : L423B - L5925
 
 tblIMAGES	da	TEST1,L786F,L7974,L4F61,L4E95,L7CC8,L6BDC,L5EFA,L7DE2,L7F38
 	da	L62EF,L57EA,L5925,L63F6,L47C3,L5A21,L5021,L4DFF,L64EF,L4700

leretour/apple2/fr/engine.s

@@ -126,7 +126,6 @@ L936A       sta	theFB
 	and	#$ff
 	eor	#-1
 	inc
-*	and	#$ff
 	sta	theX
 	iny
 	lda	(dpFROM),y	; Y
@@ -148,7 +147,6 @@ L939A       sta	theFB
 	and	#$ff
 	eor	#-1
 	inc
-*	and	#$ff
 	sta	theY
             jsr	DRAW
             jmp	skip2
@@ -162,14 +160,12 @@ L93CA       sta	theFB
 	and	#$ff
 	eor	#-1
 	inc
-*	and	#$ff
 	sta	theX
 	iny
 	lda	(dpFROM),y	; Y
 	and	#$ff
 	eor	#-1
 	inc
-*	and	#$ff
 	sta	theY
             jsr	DRAW
             jmp	skip2
@@ -281,10 +277,6 @@ skip2	inc	dpFROM
 skip1	inc	dpFROM
 skip0	inc	dpFROM
 
-	ldal	$c034
-	inc
-	stal	$c034
-
 	jmp	L92A6
 
 *-----------------------------------
@@ -339,17 +331,27 @@ INK	ldx	theINK
 	lda	o2gsCOLOR,x
 	and	#$ff
 	sta	iigsINK
+
+	PushWord	#0
+	PushWord	#15
 	
-	PushWord	#^blackPATTERN
 	asl
-	asl
-	asl
-	asl
-	asl
-	clc
-	adc	#blackPATTERN
+	tax
+	lda	palette320,x
 	pha
-	_SetPenPat
+	_SetColorEntry
+	
+*	PushWord	#^blackPATTERN
+*	
+*	asl
+*	asl
+*	asl
+*	asl
+*	asl
+*	clc
+*	adc	#blackPATTERN
+*	pha
+*	_SetPenPat
 	rts
 
 *-----------------------------------
@@ -358,11 +360,50 @@ PAPER	ldx	thePAPER
 	lda	o2gsCOLOR,x
 	and	#$ff
 	sta	iigsPAPER
+	
+	PushWord	#0
+	PushWord	#0
+	
+	asl
+	tax
+	lda	palette320,x
+	pha
+	_SetColorEntry
+	
+	ldal	$c034
+	inc
+	stal	$c034
 	rts
 
 *-----------------------------------
 
-FILL	rts	; NADA FOR NOW (FillRgn ou SeedFill)
+resMode	=	%0001_0000000000_10
+
+FILL	rts
+
+	ldx	fillCOLOR	; sets the pattern to use
+	lda	o2gsCOLOR,x
+	and	#$ff
+	asl
+	asl
+	asl
+	asl
+	asl
+	clc
+	adc	#blackPATTERN
+	sta	patternPtr
+
+	PushLong	#srcLocInfoPtr
+	PushLong	#srcRect
+	PushLong	#srcLocInfoPtr
+	PushLong	#srcRect
+	PushWord	fillX
+	PushWord	fillY
+	PushWord	#resMode
+	PushLong	patternPtr
+	PushLong	#leakTblPtr
+	_SeedFill
+	rts
 
 *-----------------------------------
 
@@ -411,29 +452,43 @@ CHAR_ALT	rts
 o2gsCOLOR	dfb	0,7,10,9,4,12,11,15
 o2gsFB	dfb	0,0,2,0
 
-ICI	=	*
-
 curY	ds	2	; cursor position
 curX	ds	2
 
+*----------- IIgs values
+
 iigsINK	ds	2	; translated IIgs data
 iigsPAPER	ds	2
 iigsFB	ds	2
 
+*----------- ORIC values
+
 theINK	ds	2	; original Oric data
 thePAPER	ds	2
 theFB	ds	2
 theX	ds	2
 theY	ds	2
-theX2	ds	2	; global dest X-coord (curX + theX)
-theY2	ds	2	; global dest Y-coord (curY + theY)
+
+*----------- FILL
+
 fillX	ds	2
 fillY	ds	2
 fillCOLOR	ds	2
-theCHAR	ds	2
-theRADIUS	ds	2
 
-nbTOURS	ds	5
+srcLocInfoPtr
+	dw	mode320	; mode 320
+	adrl	ptrE12000
+	dw	160
+srcRect	dw	0,0,159,239
+
+patternPtr	adrl	blackPATTERN ; pointer to pattern
+
+leakTblPtr	dw	1
+	dw	$0000	; color 0 is concerned
+	
+*----------- CIRCLE
+
+theRADIUS	ds	2
 
 circleRECT	ds	2	; Y0
 	ds	2	; X0

leretour/apple2/fr/iigs.s

@@ -22,6 +22,7 @@
 	use	4/Menu.Macs
 	use	4/Misc.Macs
 	use	4/QD.Macs
+	use	4/QDAux.Macs
 	use	4/Util.Macs
 	use	4/Window.Macs
 	
@@ -38,6 +39,9 @@ refIsResource =	$2
 TRUE	=	255
 FALSE	=	0
 
+ptr012000	=	$012000
+ptrE12000	=	$e12000
+
 mode320	=	$00
 mode640	=	$80
 
@@ -144,7 +148,7 @@ SETKBD	=	$FE89
 * DU 16-BITS
 *-----------------------------------
 
-	phk
+ICI	phk
 	plb
 	
 	clc
@@ -207,7 +211,8 @@ SETKBD	=	$FE89
 * AFFICHE UNE IMAGE
 *-----------------------------------
 
-	stz	myINDEX
+	lda	#12
+	sta	myINDEX
 	
 loop	lda	myINDEX
 	jsr	showIMAGE
@@ -221,7 +226,7 @@ loop	lda	myINDEX
 
 	inc	myINDEX
 	lda	myINDEX
-	cmp	#58
+	cmp	#14
 	bcc	loop
 
 *-----------------------------------
@@ -256,6 +261,12 @@ myINDEX	ds	2
 
 *-----------------------------------
 
+palette320	dw	$0000,$0777,$0841,$072C,$000F,$0080,$0F70,$0D00
+	dw	$0FA9,$0FF0,$00E0,$04DF,$0DAF,$078F,$0CCC,$0FFF
+
+palette640	dw	$0000,$000F,$0FF0,$0FFF,$0000,$0D00,$00E0,$0FFF
+	dw	$0000,$000F,$0FF0,$0FFF,$0000,$0D00,$00E0,$0FFF
+	
 blackPATTERN ds	32,$00
 	ds	32,$11
 	ds	32,$22
@@ -281,40 +292,38 @@ toolTBL	dw	$0000
 	dw	$0000
 	dw	$0000
 	ADRL	$00000000
-	dw	$0011
-	dw	$0003
-	dw	$0300
-	dw	$0004
-	dw	$0301
-	dw	$0005
-	dw	$0302
-	dw	$0006
-	dw	$0300
-	dw	$0008
-	dw	$0301
-	dw	$000B
-	dw	$0200
-	dw	$000E
-	dw	$0301
-	dw	$000F
-	dw	$0301
 	dw	$0010
-	dw	$0301
-	dw	$0012
-	dw	$0301
-	dw	$0014
-	dw	$0301
-	dw	$0015
-	dw	$0301
-	dw	$0016
+	dw	$0003	; Miscellaneous Tool
 	dw	$0300
-	dw	$0017
+	dw	$0004	; QuickDraw II
 	dw	$0301
-	dw	$001B
+	dw	$0005	; Desk Manager
+	dw	$0302
+	dw	$0006	; Event Manager
+	dw	$0300
+	dw	$000B	; Integer Math Tool Set
+	dw	$0200
+	dw	$000E	; Window Manager
 	dw	$0301
-	dw	$001C
+	dw	$000F	; Menu Manager
 	dw	$0301
-	dw	$001E
+	dw	$0010	; Control Manager
+	dw	$0301
+	dw	$0012	; QuickDraw II Auxiliary
+	dw	$0301
+	dw	$0014	; LineEdit Tool Set
+	dw	$0301
+	dw	$0015	; Dialog Manager
+	dw	$0301
+	dw	$0016	; Scrap Manager
+	dw	$0300
+	dw	$0017	; Standard File Tool Set
+	dw	$0301
+	dw	$001B	; Font Manager
+	dw	$0301
+	dw	$001C	; List Manager
+	dw	$0301
+	dw	$001E	; Resource Manager
 	dw	$0100
 
 *-----------------------------------