Normalized coding style.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5498 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
ol.sc
2012-02-08 15:54:44 +00:00
parent d30ecfbd0e
commit 9aac71b74a
76 changed files with 297 additions and 373 deletions

View File

@@ -7,11 +7,11 @@
C_OBJS += messagebox.o
S_OBJS += dodlgbox.o \
rstrfrmdialogue.o \
dbget2lines.o \
dlgboxyesno.o \
dlgboxokcancel.o \
dlgboxok.o \
S_OBJS += dbget2lines.o \
dlgboxgetstring.o \
dlgboxfileselect.o
dlgboxfileselect.o \
dlgboxok.o \
dlgboxokcancel.o \
dlgboxyesno.o \
dodlgbox.o \
rstrfrmdialogue.o

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -11,27 +10,27 @@
.code
DB_get2lines:
sta ptr4 ; fetch line 2
stx ptr4+1
jsr popax
sta ptr3 ; fetch line 1
stx ptr3+1
ldx #ptr3
jsr checknull
ldx #ptr4
jmp checknull
sta ptr4 ; fetch line 2
stx ptr4+1
jsr popax
sta ptr3 ; fetch line 1
stx ptr3+1
ldx #ptr3
jsr checknull
ldx #ptr4
jmp checknull
checknull:
lda $0,x
ora $1,x
bne cn_end
lda #<nullstring
sta $0,x
lda #>nullstring
sta $1,x
cn_end: rts
lda $0,x
ora $1,x
bne cn_end
lda #<nullstring
sta $0,x
lda #>nullstring
sta $1,x
cn_end: rts
.rodata
nullstring:
.byte 0
.byte 0

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -18,42 +17,45 @@
.code
_DlgBoxFileSelect:
sta tmp_r5
stx tmp_r5+1
jsr popa
sta tmp_r7L
jsr popax
sta tmp_r10
stx tmp_r10+1
sta tmp_r5
stx tmp_r5+1
jsr popa
sta tmp_r7L
jsr popax
sta tmp_r10
stx tmp_r10+1
DB_FS_reload:
MoveW tmp_r5, r5
MoveW tmp_r10, r10
MoveB tmp_r7L, r7L
MoveW tmp_r5, r5
MoveW tmp_r10, r10
MoveB tmp_r7L, r7L
lda #<paramStrFileSelect
ldx #>paramStrFileSelect
jsr _DoDlgBox
cmp #DISK
bne DB_FS_Fin
jsr OpenDisk
txa
beq DB_FS_reload
DB_FS_Fin: rts
lda #<paramStrFileSelect
ldx #>paramStrFileSelect
jsr _DoDlgBox
cmp #DISK
bne DB_FS_Fin
jsr OpenDisk
txa
beq DB_FS_reload
DB_FS_Fin:
rts
.rodata
paramStrFileSelect:
.byte DEF_DB_POS | 1
.byte DBGETFILES, 4, 4
.byte OPEN, DBI_X_2, DBI_Y_0+16
.byte DISK, DBI_X_2, DBI_Y_0+32+1
.byte CANCEL, DBI_X_2, DBI_Y_0+64+3
.byte NULL
.byte DEF_DB_POS | 1
.byte DBGETFILES, 4, 4
.byte OPEN, DBI_X_2, DBI_Y_0+16
.byte DISK, DBI_X_2, DBI_Y_0+32+1
.byte CANCEL, DBI_X_2, DBI_Y_0+64+3
.byte NULL
.bss
tmp_r5: .res 2
tmp_r7L: .res 1
tmp_r10: .res 2
tmp_r5:
.res 2
tmp_r7L:
.res 1
tmp_r10:
.res 2

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -17,23 +16,24 @@
.code
_DlgBoxGetString:
jsr DB_get2lines
jsr popa
sta DB_strlen
jsr popax
sta ptr2
stx ptr2+1
lda #<paramStrGetString
ldx #>paramStrGetString
jmp _DoDlgBox
jsr DB_get2lines
jsr popa
sta DB_strlen
jsr popax
sta ptr2
stx ptr2+1
lda #<paramStrGetString
ldx #>paramStrGetString
jmp _DoDlgBox
.data
paramStrGetString:
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_1_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr4
.byte DBGETSTRING, TXT_LN_X, TXT_LN_3_Y, ptr2
DB_strlen: .byte 17
.byte CANCEL, DBI_X_2, DBI_Y_2
.byte NULL
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_1_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr4
.byte DBGETSTRING, TXT_LN_X, TXT_LN_3_Y, ptr2
DB_strlen:
.byte 17
.byte CANCEL, DBI_X_2, DBI_Y_2
.byte NULL

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -16,16 +15,16 @@
.code
_DlgBoxOk:
jsr DB_get2lines
lda #<paramStrOk
ldx #>paramStrOk
jmp _DoDlgBox
jsr DB_get2lines
lda #<paramStrOk
ldx #>paramStrOk
jmp _DoDlgBox
.rodata
paramStrOk:
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4
.byte OK, DBI_X_0, DBI_Y_2
.byte NULL
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4
.byte OK, DBI_X_0, DBI_Y_2
.byte NULL

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -16,17 +15,17 @@
.code
_DlgBoxOkCancel:
jsr DB_get2lines
lda #<paramStrOkCancel
ldx #>paramStrOkCancel
jmp _DoDlgBox
jsr DB_get2lines
lda #<paramStrOkCancel
ldx #>paramStrOkCancel
jmp _DoDlgBox
.rodata
paramStrOkCancel:
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4
.byte OK, DBI_X_0, DBI_Y_2
.byte CANCEL, DBI_X_2, DBI_Y_2
.byte NULL
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4
.byte OK, DBI_X_0, DBI_Y_2
.byte CANCEL, DBI_X_2, DBI_Y_2
.byte NULL

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -16,17 +15,17 @@
.code
_DlgBoxYesNo:
jsr DB_get2lines
lda #<paramStrYesNo
ldx #>paramStrYesNo
jmp _DoDlgBox
jsr DB_get2lines
lda #<paramStrYesNo
ldx #>paramStrYesNo
jmp _DoDlgBox
.rodata
paramStrYesNo:
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4
.byte YES, DBI_X_0, DBI_Y_2
.byte NO, DBI_X_2, DBI_Y_2
.byte NULL
.byte DEF_DB_POS | 1
.byte DBVARSTR, TXT_LN_X, TXT_LN_2_Y, ptr3
.byte DBVARSTR, TXT_LN_X, TXT_LN_3_Y, ptr4
.byte YES, DBI_X_0, DBI_Y_2
.byte NO, DBI_X_2, DBI_Y_2
.byte NULL

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Elysium' Witkowiak
;
@@ -12,9 +11,9 @@
.include "geossym.inc"
_DoDlgBox:
sta r0L
stx r0H
jsr DoDlgBox
ldx #0
lda r0L
rts
sta r0L
stx r0H
jsr DoDlgBox
ldx #0
lda r0L
rts

View File

@@ -1,4 +1,3 @@
;
; Maciej 'YTM/Alliance' Witkowiak
;
@@ -10,4 +9,4 @@
.include "jumptab.inc"
_RstrFrmDialogue = RstrFrmDialogue
_RstrFrmDialogue = RstrFrmDialogue