diff --git a/Makefile b/Makefile index aef267f..85be004 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CL65=cl65 AC=AppleCommander.jar -ADDR=7a00 +ADDR=7800 ADDRDEMO=6000 PGM=weegui diff --git a/WeeGUI_MLI.s b/WeeGUI_MLI.s index f49c4f9..240d839 100644 --- a/WeeGUI_MLI.s +++ b/WeeGUI_MLI.s @@ -21,7 +21,7 @@ PARAM3 = $09 ; WeeGUI entry point ; Set up your call, then do a JSR to this address. ; -WeeGUI = $7a04 +WeeGUI = $7804 ; Offset of WGDispatch from 7800 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/weegui.dsk b/weegui.dsk index f37acc3..690924a 100644 Binary files a/weegui.dsk and b/weegui.dsk differ diff --git a/weegui.s b/weegui.s index dce8272..ce45109 100644 --- a/weegui.s +++ b/weegui.s @@ -7,7 +7,7 @@ ; -.org $7a00 +.org $7800 ; Common definitions @@ -84,7 +84,7 @@ WGInit: ; ; See section 5.1.4 in the ProDOS 8 Technical Reference Manual ; for an explanation of these values. We're reserving memory - ; pages $7b-$95 so that ProDOS won't use our memory for file + ; pages $78-$94 so that ProDOS won't use our memory for file ; buffers, or allow Applesoft to step on us ; ; Byte in System Bitmap : Bit within byte @@ -101,20 +101,20 @@ WGInit: ; 12:100 ; 12:011 ; 12:010 - lda #%00001111 - tsb MEMBITMAP + $0f - lda #%11111111 - tsb MEMBITMAP + $10 - tsb MEMBITMAP + $11 - lda #%11111100 - tsb MEMBITMAP + $12 +; lda #%00001111 +; tsb MEMBITMAP + $0f +; lda #%11111111 +; tsb MEMBITMAP + $10 +; tsb MEMBITMAP + $11 +; lda #%11111100 +; tsb MEMBITMAP + $12 ; Protect us from Applesoft by setting up HIMEM - lda #$79 ; 7a00 (really 79ff) - sta LINNUMH - lda #$ff - sta LINNUML - jsr SETHI +; lda #$77 ; 7800 (really 77ff) +; sta LINNUMH +; lda #$ff +; sta LINNUML +; jsr SETHI jsr WG80 ; Enter 80-col text mode jsr WGInitApplesoft ; Set up Applesoft API @@ -150,19 +150,19 @@ WGExit: sta INVERSE ; Restore HIMEM to ProDOS default - lda #$96 - sta LINNUMH - stz LINNUML - jsr SETHI +; lda #$96 +; sta LINNUMH +; stz LINNUML +; jsr SETHI ; Remove ourselves from ProDOS memory map - lda #%00001111 - trb MEMBITMAP + $0f - lda #$ff - trb MEMBITMAP + $10 - trb MEMBITMAP + $11 - lda #%11111100 - trb MEMBITMAP + $12 +; lda #%00001111 +; trb MEMBITMAP + $0f +; lda #$ff +; trb MEMBITMAP + $10 +; trb MEMBITMAP + $11 +; lda #%11111100 +; trb MEMBITMAP + $12 pla rts