From 99ec579debc63991f16e08ef906111ad556edad5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Mar 2021 16:29:33 -0400 Subject: Name symbols in battle_anim_special.c --- src/load_save.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index f17d31f37..a825061f5 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -23,14 +23,14 @@ struct LoadedSaveData }; // EWRAM DATA -EWRAM_DATA struct SaveBlock2 gSaveBlock2 = {0}; -EWRAM_DATA u8 gSaveBlock2_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; +EWRAM_DATA HERE struct SaveBlock2 gSaveBlock2 = {0}; +EWRAM_DATA HERE u8 gSaveBlock2_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; -EWRAM_DATA struct SaveBlock1 gSaveBlock1 = {0}; -EWRAM_DATA u8 gSaveBlock1_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; +EWRAM_DATA HERE struct SaveBlock1 gSaveBlock1 = {0}; +EWRAM_DATA HERE u8 gSaveBlock1_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; -EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; -EWRAM_DATA u8 gSaveBlock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; +EWRAM_DATA HERE struct PokemonStorage gPokemonStorage = {0}; +EWRAM_DATA HERE u8 gSaveBlock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0}; EWRAM_DATA u32 gLastEncryptionKey = 0; @@ -70,7 +70,7 @@ void SetSaveBlocksPointers(void) struct SaveBlock1** sav1_LocalVar = &gSaveBlock1Ptr; void *oldSave = (void *)gSaveBlock1Ptr; - offset = (Random()) & (SAVEBLOCK_MOVE_RANGE - 4); + offset = (Random()) & ((SAVEBLOCK_MOVE_RANGE - 1) & ~3); gSaveBlock2Ptr = (void*)(&gSaveBlock2) + offset; *sav1_LocalVar = (void*)(&gSaveBlock1) + offset; -- cgit v1.2.3 From df9bed0548bd6b9468894ab3e3711b423a1afaf1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 08:33:37 -0400 Subject: Revert HERE and USED macros --- src/load_save.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/load_save.c') diff --git a/src/load_save.c b/src/load_save.c index a825061f5..499c93916 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -23,14 +23,14 @@ struct LoadedSaveData }; // EWRAM DATA -EWRAM_DATA HERE struct SaveBlock2 gSaveBlock2 = {0}; -EWRAM_DATA HERE u8 gSaveBlock2_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; +EWRAM_DATA struct SaveBlock2 gSaveBlock2 = {0}; +EWRAM_DATA u8 gSaveBlock2_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; -EWRAM_DATA HERE struct SaveBlock1 gSaveBlock1 = {0}; -EWRAM_DATA HERE u8 gSaveBlock1_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; +EWRAM_DATA struct SaveBlock1 gSaveBlock1 = {0}; +EWRAM_DATA u8 gSaveBlock1_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; -EWRAM_DATA HERE struct PokemonStorage gPokemonStorage = {0}; -EWRAM_DATA HERE u8 gSaveBlock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; +EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; +EWRAM_DATA u8 gSaveBlock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0}; EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0}; EWRAM_DATA u32 gLastEncryptionKey = 0; -- cgit v1.2.3