Use ClearMemory_Bank2 instead of ClearNBytesFromHL

src/engine/duel/ai/common.asm

@@ -405,8 +405,8 @@ CopyListWithFFTerminatorFromHLToDE_Bank8:
 	jr CopyListWithFFTerminatorFromHLToDE_Bank8
 
 ; zeroes a bytes starting from hl.
-; this function is identical to 'ClearNBytesFromHL' in Bank $2,
-; as well as ClearMemory_Bank5' and 'ClearMemory_Bank6'.
+; this function is identical to 'ClearMemory_Bank2',
+; 'ClearMemory_Bank5' and 'ClearMemory_Bank6'.
 ; preserves all registers
 ; input:
 ;	a = number of bytes to clear

src/engine/duel/ai/core.asm

@@ -935,8 +935,8 @@ CheckEnergyNeededForAttackAfterDiscard:
 	ret
 
 ; zeroes a bytes starting from hl.
-; this function is identical to 'ClearNBytesFromHL' in Bank $2,
-; as well as ClearMemory_Bank6' and 'ClearMemory_Bank8'.
+; this function is identical to 'ClearMemory_Bank2',
+; 'ClearMemory_Bank6' and 'ClearMemory_Bank8'.
 ; preserves all registers
 ; input:
 ;	a = number of bytes to clear

src/engine/input_name.asm

@@ -23,8 +23,8 @@ Deck4Data:
 	db $ff
 
 ; zeroes a bytes starting from hl.
-; this function is identical to 'ClearNBytesFromHL' in Bank $2,
-; as well as ClearMemory_Bank5' and 'ClearMemory_Bank8'.
+; this function is identical to 'ClearMemory_Bank2',
+; 'ClearMemory_Bank5' and 'ClearMemory_Bank8'.
 ; preserves all registers
 ; input:
 ;	a = number of bytes to clear

src/engine/menus/card_album.asm

@@ -6,10 +6,10 @@ CreateCardSetList:
 	push af
 	ld a, DECK_SIZE
 	ld hl, wFilteredCardList
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld a, DECK_SIZE
 	ld hl, wOwnedCardsCountList
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	xor a
 	ld [wOwnedPhantomCardFlags], a
 	pop af
@@ -913,7 +913,7 @@ CardAlbum:
 	; set all Card Sets as available
 	ld a, NUM_CARD_SETS
 	ld hl, wUnavailableAlbumCardSets
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 
 	; check whether player has had promotional cards
 	call EnableSRAM

src/engine/menus/deck_configuration.asm

@@ -115,7 +115,7 @@ DrawDecksScreen:
 ; mark all decks as invalid
 	ld a, NUM_DECKS
 	ld hl, wDecksValid
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 
 ; for each deck, check if it has cards and if so
 ; mark is as valid in wDecksValid
@@ -708,11 +708,11 @@ DismantleDeck:
 	or a
 	jr z, .done_dismantle
 	ld a, NAME_BUFFER_LENGTH
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	call GetPointerToDeckCards
 	call AddDeckToCollection
 	ld a, DECK_SIZE
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 .done_dismantle
 	call DisableSRAM
 	add sp, $2
@@ -1050,10 +1050,10 @@ CreateFilteredCardList:
 	push af
 	ld a, DECK_SIZE
 	ld hl, wOwnedCardsCountList
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld a, DECK_SIZE
 	ld hl, wFilteredCardList
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	pop af
 
 ; loops all cards in collection
@@ -1175,10 +1175,15 @@ IsCardInAnyDeck:
 	or a
 	ret
 
+
+; zeroes a bytes starting from hl.
+; this function is identical to 'ClearMemory_Bank5',
+; 'ClearMemory_Bank6' and 'ClearMemory_Bank8'.
 ; preserves all registers
-; hl = start of bytes to set to $0
-; a = number of bytes to set to $0
-ClearNBytesFromHL:
+; input:
+;	a = number of bytes to clear
+;	hl = where to begin erasing
+ClearMemory_Bank2:
 	push af
 	push bc
 	push hl
@@ -2981,7 +2986,7 @@ GetCardTypeIconPalette:
 PrepareToBuildDeckConfigurationToSend:
 	ld hl, wCurDeckCards
 	ld a, wCurDeckCardsEnd - wCurDeckCards
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld a, $ff
 	ld [wCurDeck], a
 	ld hl, .text

src/engine/menus/deck_machine.asm

@@ -14,7 +14,7 @@ HandleDeckMissingCardsList:
 
 	ld a, NUM_FILTERS
 	ld hl, wCardFilterCounts
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld a, DECK_SIZE
 	ld [wTotalCardCount], a
 	ld hl, wCardFilterCounts
@@ -341,7 +341,7 @@ ShowReceivedCardsList:
 Func_b088:
 	ld a, CARD_COLLECTION_SIZE - 1
 	ld hl, wTempCardCollection
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld de, wDuelTempList
 	call .Func_b0b2
 	ld a, $ff
@@ -379,10 +379,10 @@ Func_b088:
 	push af
 	ld a, DECK_SIZE
 	ld hl, wOwnedCardsCountList
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld a, DECK_SIZE
 	ld hl, wFilteredCardList
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	pop af
 	ld hl, $0
 	ld de, $0
@@ -828,7 +828,7 @@ GetSavedDeckPointers:
 	ld a, NUM_DECK_SAVE_MACHINE_SLOTS
 	add NUM_DECK_SAVE_MACHINE_SLOTS ; add a is better
 	ld hl, wMachineDeckPtrs
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld de, wMachineDeckPtrs
 	ld hl, sSavedDecks
 	ld bc, DECK_STRUCT_SIZE
@@ -1376,7 +1376,7 @@ TryDeleteSavedDeck:
 	call CopyDeckName
 	pop hl
 	ld a, DECK_STRUCT_SIZE
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	call DisableSRAM
 	xor a
 	ld [wTxRam2 + 0], a
@@ -1481,7 +1481,7 @@ HandleDismantleDeckToMakeSpace:
 	call AddDeckToCollection
 	pop hl
 	ld a, DECK_STRUCT_SIZE
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	call DisableSRAM
 
 	; redraw deck screen
@@ -1674,7 +1674,7 @@ TryBuildDeckMachineDeck:
 	call AddDeckToCollection
 	pop hl
 	ld a, DECK_STRUCT_SIZE
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ret
 
 ; collects cards missing from player's collection
@@ -2132,7 +2132,7 @@ HandleAutoDeckMenu:
 .CreateAutoDeckPointerList
 	ld a, 2 * NUM_DECK_MACHINE_SLOTS
 	ld hl, wMachineDeckPtrs
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld de, wMachineDeckPtrs
 	ld hl, sAutoDecks
 	ld bc, DECK_STRUCT_SIZE

src/engine/menus/deck_selection.asm

@@ -198,7 +198,7 @@ OpenDeckConfirmationMenu:
 
 	ld a, NUM_FILTERS
 	ld hl, wCardFilterCounts
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld a, DECK_SIZE
 	ld [wTotalCardCount], a
 	ld hl, wCardFilterCounts
@@ -244,7 +244,7 @@ DeckSelectionSubMenu:
 	call CopyDeckFromSRAM
 	ld a, 20
 	ld hl, wCurDeckName
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld de, wCurDeckName
 	call GetPointerToDeckName
 	call CopyListFromHLToDEInSRAM
@@ -290,7 +290,7 @@ DeckSelectionSubMenu:
 .get_input_deck_name
 	ld a, 20
 	ld hl, wCurDeckName
-	call ClearNBytesFromHL
+	call ClearMemory_Bank2
 	ld de, wCurDeckName
 	call GetPointerToDeckName
 	call CopyListFromHLToDEInSRAM