diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
commit | f6527d12428c8a8bd2561c3da50ebb36968e061c (patch) | |
tree | 1882d862a18e61ddddf94dee1f9b4dae43336538 /src/libs/m4a_4.c | |
parent | cbd3aa95d12bab05042025bd143a2a7cacf0b86d (diff) | |
parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) |
Merge branch 'master' into cable_car
Diffstat (limited to 'src/libs/m4a_4.c')
-rw-r--r-- | src/libs/m4a_4.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |