0x00128a84,CFESEditPlayer::SetupEditMode_NUMBER, bugfix

jni/CFESEditPlayer.cpp

@@ -1,41 +1,40 @@
 #include "CFESEditPlayer.h"
-#include "GU.h"
-#include "GM.h"
-#include "XMATH.h"
-#include "CPlayerManager.h"
-#include "UNITROT.h"
-#include "CBallProj.h"
 #include "CBall.h"
-#include "GFXCAMERA.h"
-#include "CUIMsgShopButton.h"
-#include "FESU.h"
-#include "CStageManager.h"
-#include "CStoryCore.h"
-#include "FREE.h"
+#include "CBallProj.h"
+#include "CFE.h"
 #include "CFE3DPlayer.h"
+#include "CFEKeyboard.h"
+#include "CFESShopHelper.h"
+#include "CFTTCamera.h"
+#include "CFTTTextureCache.h"
 #include "CFTTTextureManager.h"
-#include "CFE.h"
+#include "CGFXSpec.h"
+#include "CGfxCharacter.h"
+#include "CGfxPlayer.h"
+#include "CGfxPostProcess.h"
+#include "CGfxShadowMapManager.h"
+#include "CGfxSubBoard.h"
 #include "CGraphicsTexLoadOptions.h"
+#include "CMessageBoxHandler.h"
+#include "CPlayerManager.h"
 #include "CPlayerShader.h"
-#include "Matrix.h"
-#include "CGfxShadowMapManager.h"
-#include "CFTTCamera.h"
-#include "CGFXSpec.h"
-#include "GFXRENDER.h"
+#include "CStageManager.h"
+#include "CStoryCore.h"
+#include "CUIMsgShopButton.h"
 #include "CUITileItemSelector.h"
-#include "SNDFE.h"
+#include "FESU.h"
+#include "FREE.h"
+#include "GFXCAMERA.h"
+#include "GFXRENDER.h"
+#include "GM.h"
+#include "GU.h"
 #include "LOCstring.h"
-#include "CMessageBoxHandler.h"
+#include "Matrix.h"
+#include "SNDFE.h"
 #include "SYSCORE.h"
-#include "CFTTTextureCache.h"
-#include "CGfxPostProcess.h"
-#include "CFTTBatchModelManager.h"
-#include "CGfxPlayer.h"
-#include "CGfxSubBoard.h"
 #include "TStoryConfig.h"
-#include "CFEKeyboard.h"
-#include "CGfxCharacter.h"
-#include "CFESShopHelper.h"
+
+#include "CFTTBatchModelManager.h"
 #include "memctrl.h"
 
 CFTTVector32 s_vCamTarget[6];  // 00350770
@@ -51,7 +50,8 @@ CFEKeyboard* CFESEditPlayer::ms_pKeyboard;  // 003507B8
 int m_iHairColourPosition[] = {0, 2, 1, 4, 3, 5, 6, 7};
 
 // 00336390
-int m_iHairStylePosition[] = {0, 2, 5, 6, 10, 12, 18, 19, 1, 3, 13, 7, 9, 17, 11, 4, 14, 15, 16};
+int m_iHairStylePosition[] = {0,  2, 5, 6,  10, 12, 18, 19, 1, 3,
+                              13, 7, 9, 17, 11, 4,  14, 15, 16};
 
 // 00336400
 int m_iFacialHairPosition[] = {1, 6, 3, 2, 7, 4, 5};
@@ -72,47 +72,26 @@ static int unk_2FE238[] = {20, 20, 2, 2, 2, 9, 13};
 static int unk_2FE254[] = {0, -8192, 6553, 6553, 2048, 0, 32};
 
 // 002FE270
-static float unk_2FE270[] = {0.10000000149011612f, 0.10000000149011612f,
-                             0.20000000298023224f, 0.20000000298023224f,
-                             0.10000000149011612f, 0.10000000149011612f,
+static float unk_2FE270[] = {0.10000000149011612f,
+                             0.10000000149011612f,
+                             0.20000000298023224f,
+                             0.20000000298023224f,
+                             0.10000000149011612f,
+                             0.10000000149011612f,
                              0.0f};
 
 static const int dword_2FE1F0[6] = {1, 2, 4, 5, 7, 8};
 
 // 0033632C
 int s_iPlayerRot[6] = {0, 0, 0, 0, 0x2000, 0x2000};
-void test111(){
-  m_iHairStylePosition[0]=rand();
-  m_iHairStylePosition[1]=rand();
-  m_iHairStylePosition[2]=rand();
-
-  m_iHairStylePosition[3]=rand();
-  m_iHairStylePosition[4]=rand();
-  m_iHairStylePosition[5]=rand();
-  m_iHairStylePosition[6]=rand();
-  m_iHairStylePosition[7]=rand();
-  m_iHairStylePosition[8]=rand();
-  m_iHairStylePosition[9]=rand();
-  m_iHairStylePosition[10]=rand();
-   m_iHairStylePosition[11]=rand();
-  m_iHairStylePosition[12]=rand();
-
-  m_iHairStylePosition[13]=rand();
-  m_iHairStylePosition[14]=rand();
-  m_iHairStylePosition[15]=rand();
-  m_iHairStylePosition[16]=rand();
-  m_iHairStylePosition[17]=rand();
-  m_iHairStylePosition[18]=rand();
-  m_iHairStylePosition[19]=rand();
-}
+
 //-------------------------------------------------------------------------------------------------
 // 00128200 //^_^
 //单元测试等级:目测游戏表现
 //测试内容：启动游戏到第6关传球射门
 //测试结果: 游戏表现正常无崩溃且无明显变化,未检测到日志输出
 //测试分支: 无
-CFESEditPlayer::~CFESEditPlayer() {
-}
+CFESEditPlayer::~CFESEditPlayer() {}
 //-------------------------------------------------------------------------------------------------
 // 00129A5C //^_^
 //单元测试等级:目测游戏表现
@@ -430,7 +409,7 @@ void CFESEditPlayer::Init(void) {
 
     this->vector32_114.float_0 = 0;
     this->vector32_114.float_4 = 0;
-   this->vector32_114.float_8 = 0;
+    this->vector32_114.float_8 = 0;
     this->field_120 = 0;
 
     this->field_124 = 0;
@@ -450,15 +429,18 @@ void CFESEditPlayer::Init(void) {
     CStoryCore::SetupStage(r0_i);
     CStoryCore::m_cProfile.ApplyUserPlayer(&this->m_tPlayerInfo_14);
     this->RevertToProfile();
-    CFEKeyboard* r0_keyboard = new CFEKeyboard(0, this->m_pName_D0,
-                                               EKeyboardType_0, -1, 1);
+    CFEKeyboard* r0_keyboard =
+        new CFEKeyboard(0, this->m_pName_D0, EKeyboardType_0, -1, 1);
     CFESEditPlayer::ms_pKeyboard = r0_keyboard;
     CFESEditPlayer::ms_pKeyboard->SetMaxNumChars(17);
     CFESEditPlayer::ms_pKeyboard->HideTextField();
 
-    CGfxKits::LoadKitTeamTextures(&tGame.CTeam_2C60[0], &this->m_tTextures_9C, g_tGlobalTexLoadOptions.mTexLoadOptions_4, 0x200);
+    CGfxKits::LoadKitTeamTextures(&tGame.CTeam_2C60[0], &this->m_tTextures_9C,
+                                  g_tGlobalTexLoadOptions.mTexLoadOptions_4,
+                                  0x200);
     CGfxKits::BeginBuildKit(0);
-    CFTTTexture* r0_texutre = CGfxKits::GetTexture(this->field_164, &this->m_tTextures_9C, 1, EKitTextureType_0, NULL);
+    CFTTTexture* r0_texutre = CGfxKits::GetTexture(
+        this->field_164, &this->m_tTextures_9C, 1, EKitTextureType_0, NULL);
     CGfxKits::EndBuildKit();
     this->m_p3DPlayer_98 = NULL;
     this->SetupPlayer();
@@ -504,7 +486,8 @@ void CFESEditPlayer::PreRender3D(void) {
   this->SetupCamera(true);
   this->m_pHeroScene_160->PreRender(*this);  //->m_tPostProcessRender_10
   CPlayerShader::s_tInstance.SetCinematic(EPlayerShader_Cinematic_0);
-  CPlayerShader::s_tInstance.SetQuality(GFXSPEC_pSpecification->ePlayerLightingQuality_44);
+  CPlayerShader::s_tInstance.SetQuality(
+      GFXSPEC_pSpecification->ePlayerLightingQuality_44);
 }
 //-------------------------------------------------------------------------------------------------
 // 001296D8 //^_^
@@ -544,9 +527,7 @@ void CFESEditPlayer::ProcessPlayer(void) {
 //测试内容：启动游戏到第6关传球射门
 //测试结果: 游戏表现正常无崩溃且无明显变化,检测到日志输出
 //测试分支: 无
-void CFESEditPlayer::Render2D(void) {
-  this->m_pUITileManager_4->Render();
-}
+void CFESEditPlayer::Render2D(void) { this->m_pUITileManager_4->Render(); }
 //-------------------------------------------------------------------------------------------------
 // 0012A314 //^_^
 //单元测试等级:目测游戏表现
@@ -570,9 +551,7 @@ void CFESEditPlayer::Render2DHUD(void) {
 //测试内容：启动游戏到第6关传球射门
 //测试结果: 游戏表现正常无崩溃且无明显变化,检测到日志输出
 //测试分支: 无
-void CFESEditPlayer::Render3D(void) {
-  GFXRENDER_pPostProcess->Render(*this);
-}
+void CFESEditPlayer::Render3D(void) { GFXRENDER_pPostProcess->Render(*this); }
 //-------------------------------------------------------------------------------------------------
 // 00128374 //^_^
 //单元测试等级:目测游戏表现
@@ -650,7 +629,8 @@ void CFESEditPlayer::SetupHighlight(void) {
       // loc_128A04
       while (r1_i <= 63) {
         // loc_1289F2
-        if (this->field_CC == STY_tConfig.PlayerCustomisationShirtNumbers_59E8[r1_i]) {
+        if (this->field_CC ==
+            STY_tConfig.PlayerCustomisationShirtNumbers_59E8[r1_i]) {
           // loc_128A0A
           v = r1_i;
           break;
@@ -721,7 +701,8 @@ void CFESEditPlayer::SetupPlayer(void) {
     this->m_p3DPlayer_98->UpdatePlayerAtlas(&this->m_tPlayerInfo_14, 0);
   } else {
     // loc_128438
-    r7_i = CStoryCore::m_tStageManager.IsInternational(CStoryCore::m_tStageManager.tStoryStage_0.t_0.TournamentType_70);
+    r7_i = CStoryCore::m_tStageManager.IsInternational(
+        CStoryCore::m_tStageManager.tStoryStage_0.t_0.TournamentType_70);
     CFE3DPlayer* r6_p3dPlayer = new CFE3DPlayer;
     this->m_p3DPlayer_98 = r6_p3dPlayer;
     if (r7_i != 0) {
@@ -731,8 +712,8 @@ void CFESEditPlayer::SetupPlayer(void) {
       r0_i = CStoryCore::GetClubTeam();
     }
 
-    r6_p3dPlayer->Init(r0_i, 0, &this->m_tPlayerInfo_14, EPlayerKitID_0,
-                       0, &this->m_tTextures_9C, 2);
+    r6_p3dPlayer->Init(r0_i, 0, &this->m_tPlayerInfo_14, EPlayerKitID_0, 0,
+                       &this->m_tTextures_9C, 2);
     CPlayer* r5_player = &this->m_p3DPlayer_98->tPlayer_10;
     r5_player->SetAnim(27);
     r5_player->Update();
@@ -759,9 +740,8 @@ void CFESEditPlayer::SetupEditMode_SLEEVELENGTH(void) {
     int r10_i = CUITileManager::UITILE_ADBAR_H;
     char var_128[256];
     snprintf(var_128, 256, "shirt%i.png", r7_i);
-    CUITileItemSelector* r4_selector = new CUITileItemSelector(96, 96, -8355712,
-                                                               var_128, EUITileAction_62,
-                                                               dword_2FE1F0[r7_i]);
+    CUITileItemSelector* r4_selector = new CUITileItemSelector(
+        96, 96, -8355712, var_128, EUITileAction_62, dword_2FE1F0[r7_i]);
 
     int r0_i = ((uint)r7_i * 128) & 0x80u;
     r0_i = r0_i + r8_i;
@@ -772,50 +752,39 @@ void CFESEditPlayer::SetupEditMode_SLEEVELENGTH(void) {
     r1_i = r1_i - 128;
     float s0_f = r1_i;
     float s2_f = r0_i;
-    this->m_pUITileManager_4->AddTile(s0_f,
-                                      s2_f,
-                                      r4_selector, 1, -1, EHUDPosition_0);
+    this->m_pUITileManager_4->AddTile(s0_f, s2_f, r4_selector, 1, -1,
+                                      EHUDPosition_0);
     r7_i++;
   }
 }
 //-------------------------------------------------------------------------------------------------
 // 00128A84
 void CFESEditPlayer::SetupEditMode_NUMBER(void) {
-  int r1_i = 5;
   // var1dc = r0
   this->field_F8 = 5;
   int r10_i = 0;
-  float s16_f = -2.8e2;
+  float s16_f = -280.0f;
   // r3 = STY_tConfig
   // var1e0 = adbar
   // var1e4 = safe
   // var1e8 = scr_wid
   // var1ec = ai
   // loc_128BF0
+  int r1_i;
   while (r10_i < STY_tConfig.PlayerCustomisationNumberCount_59D4[0]) {
     // loc_128AC6
     wchar_t var_B0[64];
     int r9_i = CUITileManager::UITILE_ADBAR_H;
     int r5_i = SCR_SAFE_BOTTOM;
     int r4_i = SCR_WID;
-    xsnprintf(var_B0, 64, L"%i", STY_tConfig.PlayerCustomisationShirtNumbers_59E8[r10_i]);
-
-    TUITBText var_1D8(var_B0, -1, 0, 1.25, EFontAlign_2,
-                      32, 12, 55, 55, 0);
-    r1_i = 63;
-    // 1f8 = r1,r10
-    r1_i = 128;
-    wchar_t var_320[64];
-    int i = 0;
-    while (1) {
-      var_320[i] = var_1D8.wbuf_0[i];
-      r1_i = r1_i - 4;
-      if (r1_i == 0) {
-        break;
-      }
-      i++;
-    }
-    CUITileItemSelector* r7_selector = new CUITileItemSelector(64, 64, -12566464, var_1D8, EUITileAction_63, r10_i);
+    xsnprintf(var_B0, 64, L"%i",
+              STY_tConfig.PlayerCustomisationShirtNumbers_59E8[r10_i]);
+    LOGE("STY_tConfig.PlayerCustomisationShirtNumbers_59E8[r10_i]=%x",STY_tConfig.PlayerCustomisationShirtNumbers_59E8[r10_i]);
+    TUITBText var_1D8(var_B0, -1, 0, 1.25, EFontAlign_2, 32, 12, 0, 55, 0);
+    // r1_i = 63;
+    //  1f8 = r1,r10
+    CUITileItemSelector* r7_selector = new CUITileItemSelector(
+        64, 64, -12566464, var_1D8, EUITileAction_63, r10_i);
 
     r1_i = r10_i & 0x7;
     float r3_f = -1;
@@ -823,8 +792,8 @@ void CFESEditPlayer::SetupEditMode_NUMBER(void) {
     int r0_i = SCR_WID / 2;
     r1_i = r1_i * 5;
     float s0_f = r0_i;
-    r0_i = r10_i >> 3u;
-    r1_i = r1_i << 4;
+    r0_i = (uint)r10_i >> 3u;
+    r1_i = (uint)r1_i << 4;
     r0_i = r0_i * 5;
     float s2_f = r1_i;
     r0_i = r5_i + r0_i * 16;
@@ -838,21 +807,21 @@ void CFESEditPlayer::SetupEditMode_NUMBER(void) {
     r1_i = 32 - r10_i;
     int r2_i = r10_i - 32;
     r1_i = (uint)r4_i >> (uint)r1_i;
-    uint64 r0r3_ull = CStoryProfile::m_tData.field_210[0];
+    int* pr0r3 = (int*)&CStoryProfile::m_tData.field_210[0];
     if (r2_i >= 0) {
       r1_i = (uint)r4_i << (uint)r2_i;
     }
     r2_i = (uint)r4_i << (uint)r10_i;
-    r1_i = r1_i & (r0r3_ull >> 32u);
-    if (r2_i >= 0) {
+    r1_i = r1_i & pr0r3[1];
+    if (r10_i >= 0x0) {
       r2_i = 0;
     }
-    r0_i = r0r3_ull & r2_i;
+    r0_i = pr0r3[0] & r2_i;
     r0_i = r0_i | r1_i;
     if (r0_i == 0) {
       r0_i = STY_tConfig.PlayerCustomisationNumber_54D4[0][r10_i];
       // r7_selector->358 = r0
-      r7_selector->i_1A0 = r0_i;
+      r7_selector->m_i_358=r0_i;
     }
     // loc_128BEA
     r10_i++;
@@ -975,9 +944,8 @@ void CFESEditPlayer::SetupEditMode_HAIRCOLOUR(void) {
     int r8_i = CUITileManager::UITILE_ADBAR_H;
     int r7_i = m_iHairColourPosition[r11_i];
 
-    CUITileItemSelector* r5_pTileItemSelector =
-        new CUITileItemSelector(96, 96, s_uHairColours[r7_i],
-                                EUITileAction_60, r7_i);
+    CUITileItemSelector* r5_pTileItemSelector = new CUITileItemSelector(
+        96, 96, s_uHairColours[r7_i], EUITileAction_60, r7_i);
     /*
      * 此处应该被转换成等价操作
      * 原始汇编：   MOV             R0, #0xFFFFFF80
@@ -997,8 +965,8 @@ void CFESEditPlayer::SetupEditMode_HAIRCOLOUR(void) {
     r1_i = r1_i - 192;
 
     CUITileManager* r0_pTitleManager = this->m_pUITileManager_4;
-    r0_pTitleManager->AddTile(r1_i, r0_i, r5_pTileItemSelector,
-                              true, -1, EHUDPosition_0);
+    r0_pTitleManager->AddTile(r1_i, r0_i, r5_pTileItemSelector, true, -1,
+                              EHUDPosition_0);
     r0_i = 32 - r7_i;
     r1_i = r7_i - 32;
     r0_i = 1u << r0_i;
@@ -1020,7 +988,9 @@ void CFESEditPlayer::SetupEditMode_HAIRCOLOUR(void) {
     // 00128EBE
     if (r0_i == 0) {
       // 00128EC2
-      r5_pTileItemSelector->m_i_358 = STY_tConfig.PlayerCustomisationNumber_54D4[2][m_iHairColourPosition[r11_i]];
+      r5_pTileItemSelector->m_i_358 =
+          STY_tConfig
+              .PlayerCustomisationNumber_54D4[2][m_iHairColourPosition[r11_i]];
     }
     // loc_128ED2
     r11_i++;
@@ -1047,9 +1017,9 @@ void CFESEditPlayer::SetupEditMode_HAIRSTYLE(void) {
     int r7_i = m_iHairStylePosition[r11_i];
     char var_128[256];
     snprintf(var_128, 256, "H%i.png", r7_i);
-    CUITileItemSelector* r4_pTileItemSelector =
-        new CUITileItemSelector(80, 80, -8355712, var_128, EUITileAction_58, r7_i);
-   
+    CUITileItemSelector* r4_pTileItemSelector = new CUITileItemSelector(
+        80, 80, -8355712, var_128, EUITileAction_58, r7_i);
+
     uint r0_i = r11_i / 5u;
     int r1_i = r0_i * 3;
     r0_i = r0_i * 5;
@@ -1063,8 +1033,8 @@ void CFESEditPlayer::SetupEditMode_HAIRSTYLE(void) {
     float s0_f = r0_i;
     r0_i = r1_i - 432;
     float s2_f = r0_i;
-    this->m_pUITileManager_4->AddTile(s0_f, s2_f, r4_pTileItemSelector,
-                                      r6_i, -1, EHUDPosition_0);
+    this->m_pUITileManager_4->AddTile(s0_f, s2_f, r4_pTileItemSelector, r6_i,
+                                      -1, EHUDPosition_0);
     r1_i = 32 - r7_i;
     int r2_i = r7_i - 32;
     r1_i = r6_i >> r1_i;
@@ -1085,7 +1055,8 @@ void CFESEditPlayer::SetupEditMode_HAIRSTYLE(void) {
     r0_i = pr0r3[0] & r2_i;
     r0_i = r0_i | r1_i;
     if (r0_i == 0) {
-      r4_pTileItemSelector->m_i_358 = STY_tConfig.PlayerCustomisationNumber_54D4[1][r7_i];
+      r4_pTileItemSelector->m_i_358 =
+          STY_tConfig.PlayerCustomisationNumber_54D4[1][r7_i];
     }
     // loc_128D76
     r11_i++;
@@ -1110,9 +1081,8 @@ void CFESEditPlayer::SetupEditMode_FACIALHAIR(void) {
     int r6_i = CUITileManager::UITILE_ADBAR_H;
     char var_128[256];
     snprintf(var_128, 256, "B%i.png", r7_i);
-    CUITileItemSelector* r4_pTileItemSelector =
-        new CUITileItemSelector(96, 96, -8355712,
-                                var_128, EUITileAction_59, r7_i);
+    CUITileItemSelector* r4_pTileItemSelector = new CUITileItemSelector(
+        96, 96, -8355712, var_128, EUITileAction_59, r7_i);
     int r2_i = (r10_i * 128) & 0x180;
     // int r0_i  =-128;
     int r0_i = (r10_i * 32) & 0xFFFFFF80;
@@ -1122,8 +1092,8 @@ void CFESEditPlayer::SetupEditMode_FACIALHAIR(void) {
     int r1_i = r2_i + r8_i / 2;
     r1_i = r1_i - 192;
     bool r5_b = 1u;
-    this->m_pUITileManager_4->AddTile(r1_i, r0_i, r4_pTileItemSelector,
-                                      r5_b, -1, EHUDPosition_0);
+    this->m_pUITileManager_4->AddTile(r1_i, r0_i, r4_pTileItemSelector, r5_b,
+                                      -1, EHUDPosition_0);
 
     r1_i = 32 - r7_i;
     r2_i = r7_i - 32;
@@ -1148,7 +1118,8 @@ void CFESEditPlayer::SetupEditMode_FACIALHAIR(void) {
     r0_i = r0_i | r1_i;
     if (r0_i == 0) {
       // 0012901E
-      r4_pTileItemSelector->m_i_358 = STY_tConfig.PlayerCustomisationNumber_54D4[3][r7_i];
+      r4_pTileItemSelector->m_i_358 =
+          STY_tConfig.PlayerCustomisationNumber_54D4[3][r7_i];
     }
     // loc_129032
     r10_i++;
@@ -1173,9 +1144,8 @@ void CFESEditPlayer::SetupEditMode_BOOTS(void) {
     int r7_i = SCR_WID;
     int r9_i = SCR_SAFE_BOTTOM;
     int r6_i = CUITileManager::UITILE_ADBAR_H;
-    CUITileItemSelector* r5_pTileItemSelector =
-        new CUITileItemSelector(96, 96, unk_2FE208[r4_i],
-                                EUITileAction_61, r4_i);
+    CUITileItemSelector* r5_pTileItemSelector = new CUITileItemSelector(
+        96, 96, unk_2FE208[r4_i], EUITileAction_61, r4_i);
     int r0_i = (r8_i * 32) & 0xFFFFFF80;
     int r2_i = (r8_i * 128) & 0x180;
     r0_i = r0_i + r9_i;
@@ -1183,8 +1153,8 @@ void CFESEditPlayer::SetupEditMode_BOOTS(void) {
     r0_i = r0_i - 432;
     int r1_i = r2_i + r7_i / 2;
     r1_i = r1_i - 192;
-    this->m_pUITileManager_4->AddTile(r1_i, r0_i, r5_pTileItemSelector,
-                                      r11_i, -1, EHUDPosition_0);
+    this->m_pUITileManager_4->AddTile(r1_i, r0_i, r5_pTileItemSelector, r11_i,
+                                      -1, EHUDPosition_0);
     r0_i = 32 - r4_i;
     r1_i = r4_i - 32;
     r0_i = (uint)r11_i >> r0_i;
@@ -1205,7 +1175,8 @@ void CFESEditPlayer::SetupEditMode_BOOTS(void) {
     // 00129294
     if (r0_i == 0) {
       // 00129298
-      r5_pTileItemSelector->m_i_358 = STY_tConfig.PlayerCustomisationNumber_54D4[4][r4_i];
+      r5_pTileItemSelector->m_i_358 =
+          STY_tConfig.PlayerCustomisationNumber_54D4[4][r4_i];
     }
     // loc_1292AC
     r8_i++;
@@ -1250,9 +1221,9 @@ void CFESEditPlayer::Process() {
         wchar_t var_118[128];
         xsnprintf(var_118, 128, r5_pwc, r3_pwc, this->field_15C);
 
-        CMessageBoxHandler::NewMessageBox(CFESEditPlayer::ConfirmUnlockCB,
-                                          this, EMessageBoxType_1,
-                                          var_118, 0, 0, 128, 1, 1, 0, 0, 0, 1, 1);
+        CMessageBoxHandler::NewMessageBox(CFESEditPlayer::ConfirmUnlockCB, this,
+                                          EMessageBoxType_1, var_118, 0, 0, 128,
+                                          1, 1, 0, 0, 0, 1, 1);
         // loc_129B8A
         this->ProcessEditMode(14);
         // def_129B3C
@@ -1327,7 +1298,8 @@ void CFESEditPlayer::Process() {
         }
         case 63: {
           // loc_129BFA
-          this->field_CC = STY_tConfig.PlayerCustomisationShirtNumbers_59E8[var_18];
+          this->field_CC =
+              STY_tConfig.PlayerCustomisationShirtNumbers_59E8[var_18];
           this->SetupPlayer();
           this->CheckUnlocked(0, var_18);
           SNDFE_PlaySFX(7, 0, 1);
@@ -1382,8 +1354,8 @@ void CFESEditPlayer::RenderLines(void) {
       // loc_129D1E
       CUITileItemSelector* r11_i = this->m_pTileItemSelectors_134[r8_i];
       // oc_129D1E
-      this->m_p3DPlayer_98->tPlayer_10.GetBonePosition(
-          unk_2FE238[r8_i], &var_8C);
+      this->m_p3DPlayer_98->tPlayer_10.GetBonePosition(unk_2FE238[r8_i],
+                                                       &var_8C);
       float s0_f = var_8C.point_0.dx_0;
       float s2_f = var_8C.point_0.dy_4;
       float s4_f = unk_2FE254[r8_i] + var_8C.dz_8;
@@ -1409,7 +1381,8 @@ void CFESEditPlayer::RenderLines(void) {
       s0_f = s0_f + s26_f * s17_f;
       s22_f = s2_f + s0_f;
       s0_f = (var_74.float_8 + (float)s22_f * var_A4.float_8) * (float)3.2768e4;
-      s2_f = -(var_74.float_0 + (float)s22_f * var_A4.float_0) * (float)3.2768e4;
+      s2_f =
+          -(var_74.float_0 + (float)s22_f * var_A4.float_0) * (float)3.2768e4;
       s4_f = (var_74.float_4 + (float)s22_f * var_A4.float_4) * (float)3.2768e4;
       var_8C.point_0.dx_0 = s2_f;
       var_8C.point_0.dy_4 = s0_f;
@@ -1419,10 +1392,11 @@ void CFESEditPlayer::RenderLines(void) {
 
       var_B8.dx_0 = s0_f;
       var_B8.dy_4 = s2_f;
-      GFXCAMERA_ScreenToWorldRay(&var_B8,
-                                 var_98, var_B0);
+      GFXCAMERA_ScreenToWorldRay(&var_B8, var_98, var_B0);
       TPoint3D var_C4;
-      s2_f = (float)var_B0.float_0 * var_80.float_0 + (float)var_B0.float_4 * var_80.float_4 + (float)var_B0.float_8 * var_80.float_8;
+      s2_f = (float)var_B0.float_0 * var_80.float_0 +
+             (float)var_B0.float_4 * var_80.float_4 +
+             (float)var_B0.float_8 * var_80.float_8;
       s0_f = s22_f / s2_f;
 
       s4_f = var_B0.float_0 * s0_f;
@@ -1561,16 +1535,19 @@ void CFESEditPlayer::SetupCamera(bool b1) {
 
   GFXCAMERA_fYOffset = r4_f;
   /*
-   * 此处赋值的方式有点不一样，原始的有VLDR D16, 自已的是LDRD.W  R0, R5，很难掌握为什么，
-   * 也拆分写能不同形式，但也不是可以完全一致。伤脑筋
+   * 此处赋值的方式有点不一样，原始的有VLDR D16, 自已的是LDRD.W  R0,
+   * R5，很难掌握为什么， 也拆分写能不同形式，但也不是可以完全一致。伤脑筋
    */
 
   GFXCAMERA_vPos = var_30;
   GFXCAMERA_vTarget = var_40;
 
-  s2_f = (float)(var_40.float_4 - var_30.float_4) * (var_40.float_4 - var_30.float_4) +
-         (float)(var_40.float_8 - var_30.float_8) * (var_40.float_8 - var_30.float_8) +
-         (float)(var_40.float_0 - var_30.float_0) * (var_40.float_0 - var_30.float_0);
+  s2_f = (float)(var_40.float_4 - var_30.float_4) *
+             (var_40.float_4 - var_30.float_4) +
+         (float)(var_40.float_8 - var_30.float_8) *
+             (var_40.float_8 - var_30.float_8) +
+         (float)(var_40.float_0 - var_30.float_0) *
+             (var_40.float_0 - var_30.float_0);
   // 00129FD0
   if (b1) {
     // 0012A000
@@ -1622,8 +1599,7 @@ void CFESEditPlayer::SetupEditMode(int i1) {
           this->m_pUITileManager_4->ull_90 | 0x2000;
       this->m_pUITileManager_4->ull_98 =
           this->m_pUITileManager_4->ull_98 & 0xFFFFFFFFFFFFDFFF;
-      CUIMsgShopButton* r5_pMsgShopButton = new CUIMsgShopButton(
-          116, 76);
+      CUIMsgShopButton* r5_pMsgShopButton = new CUIMsgShopButton(116, 76);
       r7_i = 2;
       this->m_pMsgShopButton_130 = r5_pMsgShopButton;
       r0_i = SCR_WID;
@@ -1632,8 +1608,8 @@ void CFESEditPlayer::SetupEditMode(int i1) {
       float s0_f = r0_i;
       r0_i = r1_i - 46;
       float s2_f = r0_i;
-      this->m_pUITileManager_4->AddTile(
-          s0_f, s2_f, r5_pMsgShopButton, r6_i, -1, EHUDPosition_2);
+      this->m_pUITileManager_4->AddTile(s0_f, s2_f, r5_pMsgShopButton, r6_i, -1,
+                                        EHUDPosition_2);
       r0_i = this->field_F4;
       r1_i = -1;
       this->field_154 = -1;
@@ -1738,7 +1714,8 @@ void CFESEditPlayer::SetupEditMode(int i1) {
     // loc_12869A
     while (r5_i != 7) {
       // loc_128638
-      CUITileItemSelector* r3_pUITitleItemSelector = CFESEditPlayer::GetCustomiseTile(r5_i);
+      CUITileItemSelector* r3_pUITitleItemSelector =
+          CFESEditPlayer::GetCustomiseTile(r5_i);
       this->m_pTileItemSelectors_134[r5_i] = r3_pUITitleItemSelector;
       float s0_f = var_70[r5_i * 2];
       float s2_f = var_70[r5_i * 2 + 1];
@@ -1752,9 +1729,8 @@ void CFESEditPlayer::SetupEditMode(int i1) {
       s2_f = s2_f * s18_f;
       int var_80 = r7_i;
       r7_i = 1;
-      this->m_pUITileManager_4->AddTile(
-          s0_f, s2_f, r3_pUITitleItemSelector,
-          var_80, -1, EHUDPosition_0);
+      this->m_pUITileManager_4->AddTile(s0_f, s2_f, r3_pUITitleItemSelector,
+                                        var_80, -1, EHUDPosition_0);
       r5_i++;
     }
     // 0012869E
@@ -1785,18 +1761,9 @@ void CFESEditPlayer::SetupEditMode(int i1) {
 //测试内容：启动游戏到第6关传球射门
 //测试结果: 游戏表现正常无崩溃且无明显变化,检测到日志输出
 //测试分支: 00191AB0
-void AddBoard(CFTTVector32* pVector0,
-              CFTTVector32* pVector1,
-              float* pf2,
-              int& i3,
-              ushort* pus4,
-              int& i5,
-              int i6,
-              int i7,
-              int i8,
-              int i9,
-              float& f10,
-              float f11) {
+void AddBoard(CFTTVector32* pVector0, CFTTVector32* pVector1, float* pf2,
+              int& i3, ushort* pus4, int& i5, int i6, int i7, int i8, int i9,
+              float& f10, float f11) {
   // 00191AB0
   CFTTVector32 var_74;
   CFTTVector32 var_80;
@@ -2196,11 +2163,11 @@ void CFESEditPlayer::UpdatePosition() {
     float s6_f = this->field_120;
     float s2_f = this->field_10C;
     float s8_f = this->field_124;
-        s0_f =  s0_f +s6_f;
+    s0_f = s0_f + s6_f;
     float s4_f = this->field_110;
     float s10_f = this->field_128;
-        s2_f =  s2_f +s8_f ;
-        s4_f =    s4_f +s10_f;
+    s2_f = s2_f + s8_f;
+    s4_f = s4_f + s10_f;
     this->field_108 = s0_f;
     this->field_10C = s2_f;
     this->field_110 = s4_f;
@@ -2311,37 +2278,37 @@ void CFESEditPlayer::CompleteUnlock() {
 }
 //-------------------------------------------------------------------------------------------------
 
-//00129358
+// 00129358
 void CFESEditPlayer::ProcessEditMode_NAME() {
-    LOGX("ProcessEditMode_NAME %p",this);
+  LOGX("ProcessEditMode_NAME %p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//0012944C
+// 0012944C
 void CFESEditPlayer::ProcessEditMode_NUMBER() {
-    LOGX("ProcessEditMode_NUMBER %p",this);
+  LOGX("ProcessEditMode_NUMBER %p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//0012944E
+// 0012944E
 void CFESEditPlayer::ProcessEditMode_HAIRSTYLE() {
-    LOGX("ProcessEditMode_HAIRSTYLE %p",this);
+  LOGX("ProcessEditMode_HAIRSTYLE %p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//0012946E
+// 0012946E
 void CFESEditPlayer::ProcessEditMode_HAIRCOLOUR() {
-    LOGX("ProcessEditMode_HAIRCOLOUR %p",this);
+  LOGX("ProcessEditMode_HAIRCOLOUR %p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//0012948E
+// 0012948E
 void CFESEditPlayer::ProcessEditMode_FACIALHAIR() {
-    LOGX("ProcessEditMode_FACIALHAIR %p",this);
+  LOGX("ProcessEditMode_FACIALHAIR %p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//001294AE
+// 001294AE
 void CFESEditPlayer::ProcessEditMode_SLEEVELENGTH() {
-    LOGX("ProcessEditMode_SLEEVELENGTH %p",this);
+  LOGX("ProcessEditMode_SLEEVELENGTH %p", this);
 }
 //-------------------------------------------------------------------------------------------------
-//001294B0
+// 001294B0
 void CFESEditPlayer::ProcessEditMode_BOOTS() {
-    LOGX("ProcessEditMode_BOOTS %p",this);
+  LOGX("ProcessEditMode_BOOTS %p", this);
 }

jni/CUITile.cpp

@@ -27,6 +27,8 @@ TUITBText::TUITBText(wchar_t const *p_wc_r1_arg,
                      float f_arg_8, float f_arg_c,
                      float f_arg_10, float f_arg_14,
                      bool b_arg_18) {
+    LOGE("%p%x%x%f%x%f%f%f",p_wc_r1_arg,ud_r2_arg,ud_r3_arg,f_arg_0,efontalign_arg_4,f_arg_8,f_arg_c,f_arg_10);
+    LOGE("TUITBText%f%f%p",f_arg_14,b_arg_18,this);
 }
 //-------------------------------------------------------------------------------------------------
 TUITBText::TUITBText() {

jni/CUITile.h

@@ -128,39 +128,7 @@ public:
   TUITBText(wchar_t const *, uint, uint, float, EFontAlign, float, float, float, float, bool);
   TUITBText();
 
-  wchar_t wbuf_0[64];
-  int field_80;
-  int field_84;
-  int field_88;
-  int field_8C;
-  int field_90;
-  int field_94;
-  int field_98;
-  int field_9C;
-  int field_A0;
-  int field_A4;
-  int field_A8;
-  int field_AC;
-  int field_B0;
-  int field_B4;
-  int field_B8;
-  int field_BC;
-  int field_C0;
-  int field_C4;
-  int field_C8;
-  int field_CC;
-  int field_D0;
-  int field_D4;
-  int field_D8;
-  int field_DC;
-  int field_E0;
-  int field_E4;
-  int field_E8;
-  int field_EC;
-  int field_F0;
-  int field_F4;
-  int field_F8;
-  int field_FC;
+  wchar_t wbuf_0[0x80];
   uint colour_100;
   int field_104;
   float f_108;

jni/CUITileItemSelector.cpp

@@ -6,7 +6,9 @@ CUITileItemSelector::CUITileItemSelector(int, int, int, EUITileAction, int) {
 }
 //-------------------------------------------------------------------------------------------------
 //0013D684
-CUITileItemSelector::CUITileItemSelector(int, int, int, TUITBText, EUITileAction, int) {
+CUITileItemSelector::CUITileItemSelector(int a1, int a2, int a3, TUITBText a4, EUITileAction a5, int a6) {
+LOGE("CUITileItemSelector%p%x%x%x%p%x%x",this,a1,a2,a3,&a4,a5,a6);
+LOGE("%x%x",a4.colour_100,a4.eAlign_118);
 }
 //-------------------------------------------------------------------------------------------------
 //0013D6E4

obj/local/armeabi-v7a/objs/cpufeatures/archiver.list.tmp

@@ -0,0 +1 @@
+./obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o