Rename "dakuten" to the more general term "diacritic"

This commit is contained in:
Tobias V. Langhoff 2022-10-15 00:38:52 +02:00
parent 13f8e6be70
commit c8e3a1fb77
7 changed files with 16 additions and 16 deletions

View File

@ -16,7 +16,7 @@ AsciiToTileMap::
db $88, $90, $91, $92, $93, $94, $95, $89, $96, $97, $98, $99, $9A, $87, $86, $5A
db $34, $35, $36, $37, $00, $00, $00, $00, $00, $00, $00, $00, $00, $7E, $00, $00
DakutenTable:
DiacriticsTable:
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00

View File

@ -32,7 +32,7 @@ AsciiToTileMap::
; UP DOWN LEFT RIGHT BLANK
db $34, $35, $36, $37, 0 , 0 , $51, 0 , 0 , 0 , 0 , 0 , $4F, $7e, 0 , 0
DakutenTable::
DiacriticsTable::
db 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0
db 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0
db 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0

View File

@ -16,7 +16,7 @@ AsciiToTileMap::
db $88, $90, $91, $92, $93, $94, $95, $89, $96, $97, $98, $99, $9A, $87, $86, $00
db $34, $35, $36, $37, $00, $00, $00, $00, $00, $00, $00, $00, $00, $7E, $00, $00
DakutenTable:
DiacriticsTable:
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $01, $01

View File

@ -778,7 +778,7 @@ ReadTileValueFromAsciiTable::
jr ReadValueInDialogsBank ; $0C28: $18 $03
ReadDialogBankFromTable::
ld hl, DakutenTable ; $0C2A: $21 $41 $47
ld hl, DiacriticsTable ; $0C2A: $21 $41 $47
ReadValueInDialogsBank::
ld a, BANK(AsciiToTileMap) ; or BANK(DialogBankTable) ; $0C2D: $3E $1C

View File

@ -597,13 +597,13 @@ ENDR
ld [hl], $00 ; $2639: $36 $00
push hl ; $263B: $E5
ld a, BANK(DakutenTable) ; $263C: $3E $1C
ld a, BANK(DiacriticsTable) ; $263C: $3E $1C
ld [MBC3SelectBank], a ; current character ; $263E: $EA $00 $21
ldh a, [hMultiPurpose1] ; $2641: $F0 $D8
ld e, a ; $2643: $5F
ld d, $00 ; $2644: $16 $00
IF __DO_CHECK_DAKUTEN__
ld hl, DakutenTable
IF __DO_CHECK_DIACRITICS__
ld hl, DiacriticsTable
add hl, de
ld a, [hl]
ELSE
@ -611,7 +611,7 @@ ELSE
ENDC
pop hl ; $2647: $E1
and a ; $2648: $A7
jr z, .noDakuten ; $2649: $28 $18
jr z, .noDiacritic ; $2649: $28 $18
ld e, a ; $264B: $5F
ld a, [wC175] ; $264C: $FA $75 $C1
ldi [hl], a ; $264F: $22
@ -622,14 +622,14 @@ ENDC
ldi [hl], a ; $2658: $22
ld a, $C9 ; $2659: $3E $C9
rr e ; $265B: $CB $1B
jr c, .handleDakutenTile ; $265D: $38 $01
dec a ; dakuten ($C8) ; $265F: $3D
jr c, .handleDiacriticTile ; $265D: $38 $01
dec a ; diacritic ($C8) ; $265F: $3D
.handleDakutenTile
.handleDiacriticTile
ldi [hl], a ; $2660: $22
ld [hl], $00 ; $2661: $36 $00
.noDakuten
.noDiacritic
ld a, [wDialogCharacterIndex] ; $2663: $FA $70 $C1
add a, $01 ; $2666: $C6 $01
ld [wDialogCharacterIndex], a ; $2668: $EA $70 $C1

View File

@ -32,4 +32,4 @@ AsciiToTileMap::
; UP DOWN LEFT RIGHT BLANK
db $34, $35, $36, $37, 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , $7e, 0 , 0
DakutenTable:
DiacriticsTable:

View File

@ -84,7 +84,7 @@ __PATCH_8__ = FALSE ; Applies to JP1+
__PATCH_9__ = FALSE ; Applies to DE, JP
__PATCH_A__ = 0 ; 1 in JP, 2 in DE
__PATCH_B__ = 0 ; 1 in JP/DE, 2 in FR
__DO_CHECK_DAKUTEN__ = FALSE ; TRUE in JP, DE
__DO_CHECK_DIACRITICS__ = FALSE ; TRUE in JP, DE
__USE_FIXED_DIALOG_BANKS__ = FALSE ; TRUE in JP
; If the Key Cavern map is split into 1F and B1F on the subscreen.
@ -144,7 +144,7 @@ GAMEOVER_OPTION_SAVE_QUIT_Y equ 88
GAMEOVER_OPTION_CONTINUE_Y equ 104
SAVE_OPTION_X equ 36
__USE_FIXED_DIALOG_BANKS__ = TRUE
__DO_CHECK_DAKUTEN__ = TRUE
__DO_CHECK_DIACRITICS__ = TRUE
__PATCH_9__ = TRUE
__PATCH_A__ = 1
__PATCH_B__ = 1
@ -221,7 +221,7 @@ CREDITS_VAR_1 = $20
CREDITS_VAR_2 = $13
DEBUG_SAVE_SWITCH_ARROWS = TRUE
GAMEOVER_OPTION_X equ 20
__DO_CHECK_DAKUTEN__ = TRUE
__DO_CHECK_DIACRITICS__ = TRUE
__PATCH_0__ = TRUE
__PATCH_1__ = TRUE
__PATCH_2__ = TRUE