From 960c685f582cdf9a56dae5da9cd255033e221135 Mon Sep 17 00:00:00 2001 From: XProger Date: Wed, 1 Mar 2023 03:41:34 +0300 Subject: [PATCH] #452 fix proper write --- src/platform/gba/packer/out_GBA.h | 7 +++---- src/platform/gba/sound.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/platform/gba/packer/out_GBA.h b/src/platform/gba/packer/out_GBA.h index bacaa5b..c67fc80 100644 --- a/src/platform/gba/packer/out_GBA.h +++ b/src/platform/gba/packer/out_GBA.h @@ -2199,7 +2199,7 @@ struct out_GBA struct Track { int32 size; - char* data; + uint8* data; }; Track tracks[MAX_TRACKS]; memset(tracks, 0, sizeof(tracks)); @@ -2238,7 +2238,7 @@ struct out_GBA fseek(f, 0, SEEK_END); int32 size = ftell(f); fseek(f, 0, SEEK_SET); - tracks[index].data = new char[size]; + tracks[index].data = new uint8[size]; fread(tracks[index].data, 1, size, f); fclose(f); @@ -2268,8 +2268,7 @@ struct out_GBA { if (tracks[i].size == 0) continue; - ASSERT((tracks[i].size % 4) == 0); - f.write(tracks[i].data, tracks[i].size / 4); + f.write(tracks[i].data, tracks[i].size); delete[] tracks[i].data; } } diff --git a/src/platform/gba/sound.cpp b/src/platform/gba/sound.cpp index 802ed24..bde5290 100644 --- a/src/platform/gba/sound.cpp +++ b/src/platform/gba/sound.cpp @@ -1,6 +1,6 @@ #include "common.h" -uint8_t ADPCM4_ADAPT[] = { // IWRAM ! +uint8 ADPCM4_ADAPT[] = { // IWRAM ! 192,192,136,136,128,128,128,128, // -8..-1 112,128,128,128,128,136,136,192, // 0..+7 };