@@ -184,7 +184,7 @@ void CMemoryCardSys::CCardFileInfo::LockIconToken(CAssetId iconTxtr, kabufuda::E
184184u32 CMemoryCardSys::CCardFileInfo::CalculateBannerDataSize () const {
185185 u32 ret = 68 ;
186186 if (x3c_bannerTex.IsValid ()) {
187- if ((*x40_bannerTok)->GetTextureFormat () == ETexelFormat::RGB5A3) {
187+ if ((*x40_bannerTok)->GetTexelFormat () == ETexelFormat::RGB5A3) {
188188 ret = 6212 ;
189189 } else {
190190 ret = 3652 ;
@@ -193,7 +193,7 @@ u32 CMemoryCardSys::CCardFileInfo::CalculateBannerDataSize() const {
193193
194194 bool paletteTex = false ;
195195 for (const Icon& icon : x50_iconToks) {
196- if (icon.x8_tex ->GetTextureFormat () == ETexelFormat::RGB5A3) {
196+ if (icon.x8_tex ->GetTexelFormat () == ETexelFormat::RGB5A3) {
197197 ret += 2048 ;
198198 } else {
199199 ret += 1024 ;
@@ -236,7 +236,7 @@ void CMemoryCardSys::CCardFileInfo::BuildCardBuffer() {
236236void CMemoryCardSys::CCardFileInfo::WriteBannerData (COutputStream& out) const {
237237 if (x3c_bannerTex.IsValid ()) {
238238 const TLockedToken<CTexture>& tex = *x40_bannerTok;
239- const auto format = tex->GetTextureFormat ();
239+ const auto format = tex->GetTexelFormat ();
240240 const auto * texels = tex->GetConstBitMapData (0 );
241241 if (format == ETexelFormat::RGB5A3) {
242242 out.Put (texels, 6144 );
@@ -252,7 +252,7 @@ void CMemoryCardSys::CCardFileInfo::WriteBannerData(COutputStream& out) const {
252252void CMemoryCardSys::CCardFileInfo::WriteIconData (COutputStream& out) const {
253253 const u8 * palette = nullptr ;
254254 for (const Icon& icon : x50_iconToks) {
255- const auto format = icon.x8_tex ->GetTextureFormat ();
255+ const auto format = icon.x8_tex ->GetTexelFormat ();
256256 const auto * texels = icon.x8_tex ->GetConstBitMapData (0 );
257257 if (format == ETexelFormat::RGB5A3) {
258258 out.Put (texels, 2048 );
@@ -305,7 +305,7 @@ ECardResult CMemoryCardSys::CCardFileInfo::GetStatus(kabufuda::CardStat& stat) c
305305
306306 kabufuda::EImageFormat bannerFmt;
307307 if (x3c_bannerTex.IsValid ()) {
308- if ((*x40_bannerTok)->GetTextureFormat () == ETexelFormat::RGB5A3) {
308+ if ((*x40_bannerTok)->GetTexelFormat () == ETexelFormat::RGB5A3) {
309309 bannerFmt = kabufuda::EImageFormat::RGB5A3;
310310 } else {
311311 bannerFmt = kabufuda::EImageFormat::C8;
@@ -317,7 +317,7 @@ ECardResult CMemoryCardSys::CCardFileInfo::GetStatus(kabufuda::CardStat& stat) c
317317
318318 int idx = 0 ;
319319 for (const Icon& icon : x50_iconToks) {
320- stat.SetIconFormat (icon.x8_tex ->GetTextureFormat () == ETexelFormat::RGB5A3 ? kabufuda::EImageFormat::RGB5A3
320+ stat.SetIconFormat (icon.x8_tex ->GetTexelFormat () == ETexelFormat::RGB5A3 ? kabufuda::EImageFormat::RGB5A3
321321 : kabufuda::EImageFormat::C8,
322322 idx);
323323 stat.SetIconSpeed (icon.x4_speed , idx);
0 commit comments