500th commit special!

mostly edits of no consequence

doc/LOGO_x_PRG.txt

@@ -4,8 +4,8 @@ These types of files represent data for the Neo-Geo CD loading screen. Simple
 loading screens don't require much in the way of code, while custom loading
 screens (e.g. Samurai Shodown IV) do.
 
-Since this is a PRG file, and the format depends on various 68K data widths,
-it's typically best/easiest to use an assembler to generate the LOGO_*.PRG file.
+Since this is a PRG file and the format depends on various 68K data widths, it's
+typically best/easiest to use a 68K assembler to generate the LOGO_*.PRG file.
 
 ================================================================================
 [Basic Layout]

src_68k/header_68k.inc

@@ -18,7 +18,7 @@
 	dc.l $00C0042C ; Uninitialized Interrupt Vector
 
 	; The following addresses differ between CD and Cart systems:
-	ifd		TARGET_CD
+	ifd TARGET_CD
 		dc.l $00C00522 ; Reserved
 		dc.l $00C00528 ; Reserved
 		dc.l $00C0052E ; Reserved

src_68k/header_cart.inc

@@ -5,6 +5,7 @@
 	dc.w $0FFF ; NGH number ($0000 is prohibited)
 
 	dc.l $00080000 ; game prog size in bytes
+	; $00040000 =  2Mbits/256KB
 	; $00080000 =  4Mbits/512KB
 	; $00100000 =  8Mbits/1MB
 	; etc.

src_68k/header_cd.inc

@@ -10,6 +10,7 @@
 	dc.w $0FFF ; NGH number ($0000 is prohibited)
 
 	dc.l $00080000 ; game prog size in bytes
+	; $00040000 =  2Mbits/256KB
 	; $00080000 =  4Mbits/512KB
 	; $00100000 = 16Mbits/1MB
 	; etc.
@@ -20,8 +21,8 @@
 	dc.b $00 ; Eye catcher anim flag (0=BIOS,1=game,2=nothing)
 	dc.b $00 ; Sprite bank for eyecatch if done by BIOS
 
-	dc.l softDips_Japan ; Software dips for Japan
-	dc.l softDips_USA ; Software dips for USA
+	dc.l softDips_Japan  ; Software dips for Japan
+	dc.l softDips_USA    ; Software dips for USA
 	dc.l softDips_Europe ; Software dips for Europe
 
 	jmp USER ; $122

src_68k/inc/input.inc

@@ -102,6 +102,5 @@ INBIT_STATC_SELECT3 equ 5
 INBIT_STATC_START4  equ 6
 INBIT_STATC_SELECT4 equ 7
 
-; todo: mahjong controller, trackball
-
 ;==============================================================================;
+; todo: mahjong controller, trackball

src_68k/inc/mess_defs.inc

@@ -8,8 +8,8 @@ SYMB_RIGHT = $11 ; ▶ Right arrow
 SYMB_UP    = $12 ; ▲ Up arrow
 SYMB_DOWN  = $13 ; ▼ Down arrow
 ;-------;
-SYMB_01 = $5F ; 00 1/2 (see NAM-1975)
-SYMB_02 = $60 ; 00 2/2 (see NAM-1975)
+SYMB_01 = $5F ; 00 1/2 (see NAM-1975 soft dips)
+SYMB_02 = $60 ; 00 2/2 (see NAM-1975 soft dips)
 ;-------;
 SYMB_COPYRIGHT = $7B ; © Copyright symbol
 ;-------;
@@ -225,75 +225,83 @@ KANA_PO  = $78 ; ポ
 
 ; [Kanji]
 ; 難易度時間分秒有
-; 無設定??数
-; ?び
+; 無設定持機数
+; 遊び
 ; 方説
 ; 明
 
-; 難
-;KANJI_x_1 = $00 ; 難 1/2
-;KANJI_x_2 = $01 ; 難 2/2
+; 難 (Nan/"Difficulty")
+;KANJI_NAN_1 = $00 ; 難 1/2
+;KANJI_NAN_2 = $01 ; 難 2/2
 ;--------;
-; 易
-;KANJI_x_1 = $02 ; 易 1/2
-;KANJI_x_2 = $03 ; 易 2/2
+; 易 (Eki/"Easy")
+;KANJI_EKI_1 = $02 ; 易 1/2
+;KANJI_EKI_2 = $03 ; 易 2/2
 ;--------;
-; 度
-;KANJI_x_1 = $04 ; 度 1/2
-;KANJI_x_2 = $05 ; 度 2/2
+; 度 (Do/"Degree")
+;KANJI_DO_1 = $04 ; 度 1/2
+;KANJI_DO_2 = $05 ; 度 2/2
 ;--------;
-; 時/ji
-;KANJI_JI_1 = $06 ; 時 1/2
-;KANJI_JI_2 = $07 ; 時 2/2
+; 時 (Toki/"Time")
+;KANJI_TOKI_1 = $06 ; 時 1/2
+;KANJI_TOKI_2 = $07 ; 時 2/2
 ;--------;
-; 間/kan
+; 間 (kan?)
 ;KANJI_KAN_1 = $08 ; 間 1/2
 ;KANJI_KAN_2 = $09 ; 間 2/2
 ;--------;
-; 分/bun (minute)
+; 分 (bun/"Minute")
 ;KANJI_BUN_1 = $0A ; 分 1/2
 ;KANJI_BUN_2 = $0B ; 分 2/2
 ;--------;
-; 秒/byō (second)
+; 秒 (byō/"Second")
 ;KANJI_BYO_1 = $0C ; 秒 1/2
 ;KANJI_BYO_2 = $0D ; 秒 2/2
 ;--------;
-; 有/yū (yes)
+; 有 (yū/"Yes")
 ;KANJI_YU_1 = $0E ; 有 1/2
 ;KANJI_YU_2 = $0F ; 有 2/2
 ;--------;
-; 無/mu (nothing/no)
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 無 (mu/"Nothing","No")
+;KANJI_MU_1 = $14 ; 無 1/2
+;KANJI_MU_2 = $15 ; 無 2/2
 ;--------;
-; 設
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 設 (?/"Setting")
+;KANJI_x_1 = $16 ; 設 1/2
+;KANJI_x_2 = $17 ; 設 2/2
 ;--------;
-; 定
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 定 (Jō/"Constant")
+;KANJI_x_1 = $18 ; 定 1/2
+;KANJI_x_2 = $19 ; 定 2/2
 ;--------;
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 持? (Ji)
+;KANJI_x_1 = $1A
+;KANJI_x_2 = $1B
 ;--------;
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 機 (Ki/"Machine"?)
+;KANJI_x_1 = $1C
+;KANJI_x_2 = $1D
 ;--------;
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 数 (Kazu/"Number")
+;KANJI_KAZU_1 = $1E
+;KANJI_KAZU_2 = $1F
 ;--------;
-;KANJI_x_1 =
-;KANJI_x_2 =
+; 遊? (Yū)
+;KANJI_x_1 = $7C
+;KANJI_x_2 = $7D
 ;--------;
-;KANJI_x_1 =
-;KANJI_x_2 =
+; び, but not really??
+;KANJI_x_1 = $7E
+;KANJI_x_2 = $7F
 ;--------;
+; 方 (Hō/"Person")
 ;KANJI_x_1 =
 ;KANJI_x_2 =
 ;--------;
+; 説 (Setsu?)
 ;KANJI_x_1 =
 ;KANJI_x_2 =
 ;--------;
+; 明 (Akira?)
 ;KANJI_x_1 =
 ;KANJI_x_2 =

src_68k/inc/ram_bios.inc

@@ -226,7 +226,7 @@ BIOS_GD_STORE equ $10FE26 ; (byte) 32 bytes
 ;===================================;
 BIOS_WORK2 equ $10FE80
 
-BIOS_DEVMODE equ $10FE80 ; (byte)
+BIOS_DEVMODE equ $10FE80 ; (byte) nonzero value = enabled
 ;$10FE81-$10FE87 "Power on ID code"??; typically, code checks for "1streset"
 BIOS_FRAMECOUNT equ $10FE88 ; (long) (a.k.a. "SYS_INT1_TIMER")
 BIOS_SYS_STOPPER equ $10FE8C ; (byte) "system stopper", actually BIOS VBlank flag

src_68k/ram_user.inc

@@ -1,3 +1,7 @@
+; Neo-Geo User RAM template
+;==============================================================================;
+; Note: This isn't using vlink; this will be replaced in the future.
+;==============================================================================;
 ; normal RAM begins at $100000
 RAMBEGIN equ $100000
 
@@ -13,14 +17,5 @@ USER_RAM equ $100000
 flag_VBlank equ USER_RAM   ; (byte) vblank flag
 flag_HBlank equ USER_RAM+1 ; (byte) hblank flag
 
-; <$101000-$10xxxx: Buffers>
-
-; (Palettes)
-PaletteBuffer   equ $101000 ; transferred during VBlank ($2000 bytes)
-PaletteActions  equ $103000 ; Palette Action buffer ($400 bytes)
-
-; (Sprites)
-;BackgroundBuffer equ $103400 ; Background buffer (1280/$500 bytes)
-
 ;==============================================================================;
 ; you'll want to add your own variables to this, of course.