From 3a0759d458a711196739a7397248cdf1d34069e9 Mon Sep 17 00:00:00 2001
From: sbird <sbird@no.tld>
Date: Wed, 7 Sep 2022 14:37:03 +0200
Subject: [PATCH] [doc] fix misnamed dma <--> aslr

---
 include/load_save.h | 18 +++++++++---------
 src/load_save.c     | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/load_save.h b/include/load_save.h
index 309e62e2b..389bd5a2b 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -10,24 +10,24 @@
  * toolchains. If this is not done, the ClearSav functions will end up erasing
  * the wrong memory leading to various glitches.
  */
-struct SaveBlock2DMA {
+struct SaveBlock2ASLR {
     struct SaveBlock2 block;
-    u8 dma[SAVEBLOCK_MOVE_RANGE];
+    u8 aslr[SAVEBLOCK_MOVE_RANGE];
 };
 
-struct SaveBlock1DMA {
+struct SaveBlock1ASLR {
     struct SaveBlock1 block;
-    u8 dma[SAVEBLOCK_MOVE_RANGE];
+    u8 aslr[SAVEBLOCK_MOVE_RANGE];
 };
 
-struct PokemonStorageDMA {
+struct PokemonStorageASLR {
     struct PokemonStorage block;
-    u8 dma[SAVEBLOCK_MOVE_RANGE];
+    u8 aslr[SAVEBLOCK_MOVE_RANGE];
 };
 
-extern struct SaveBlock1DMA gSaveblock1;
-extern struct SaveBlock2DMA gSaveblock2;
-extern struct PokemonStorageDMA gPokemonStorage;
+extern struct SaveBlock1ASLR gSaveblock1;
+extern struct SaveBlock2ASLR gSaveblock2;
+extern struct PokemonStorageASLR gPokemonStorage;
 
 extern bool32 gFlashMemoryPresent;
 extern struct SaveBlock1 *gSaveBlock1Ptr;
diff --git a/src/load_save.c b/src/load_save.c
index 494a61bcf..44e08b5e9 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -29,9 +29,9 @@ struct LoadedSaveData
 };
 
 // EWRAM DATA
-EWRAM_DATA struct SaveBlock2DMA gSaveblock2 = {0};
-EWRAM_DATA struct SaveBlock1DMA gSaveblock1 = {0};
-EWRAM_DATA struct PokemonStorageDMA gPokemonStorage = {0};
+EWRAM_DATA struct SaveBlock2ASLR gSaveblock2 = {0};
+EWRAM_DATA struct SaveBlock1ASLR gSaveblock1 = {0};
+EWRAM_DATA struct PokemonStorageASLR gPokemonStorage = {0};
 
 EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
 EWRAM_DATA u32 gLastEncryptionKey = 0;
@@ -58,12 +58,12 @@ void CheckForFlashMemory(void)
 
 void ClearSav2(void)
 {
-    CpuFill16(0, &gSaveblock2, sizeof(struct SaveBlock2DMA));
+    CpuFill16(0, &gSaveblock2, sizeof(struct SaveBlock2ASLR));
 }
 
 void ClearSav1(void)
 {
-    CpuFill16(0, &gSaveblock1, sizeof(struct SaveBlock1DMA));
+    CpuFill16(0, &gSaveblock1, sizeof(struct SaveBlock1ASLR));
 }
 
 // Offset is the sum of the trainer id bytes