Merge branch 'master' into slot_machine

2 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/m4a_2.c b/src/libs/m4a_2.c
index 2d3c65848..2e5956ef0 100644
--- a/src/libs/m4a_2.c
+++ b/src/libs/m4a_2.c
@@ -85,7 +85,7 @@ void m4aSoundInit(void)
         mplayInfo->memAccArea = gMPlayMemAccArea;
     }
 
-    memcpy(&gPokemonCrySong, &gPokemonCrySongTemplate, sizeof(struct PokemonCrySong));
+    gPokemonCrySong = gPokemonCrySongTemplate;
 
     for (i = 0; i < MAX_POKEMON_CRIES; i++)
     {
diff --git a/src/libs/m4a_4.c b/src/libs/m4a_4.c
index 2e1d140b4..da5550252 100644
--- a/src/libs/m4a_4.c
+++ b/src/libs/m4a_4.c
@@ -445,7 +445,7 @@ start_song:
 #define CRY ((s32)&gPokemonCrySongs + i * sizeof(struct PokemonCrySong))
 #define CRY_OFS(field) offsetof(struct PokemonCrySong, field)
 
-    memcpy((void *)CRY, &gPokemonCrySong, sizeof(struct PokemonCrySong));
+    *(struct PokemonCrySong *)CRY = gPokemonCrySong;
 
     *(u32 *)(CRY + CRY_OFS(tone)) = (u32)tone;
     *(u32 *)(CRY + CRY_OFS(part)) = CRY + CRY_OFS(part0);