Merge pull request #175 from Smileynator/scoring_variables

Named variables related to score counting and animating

include/global.h

@@ -129,7 +129,7 @@ struct PinballGame
     /*0x018*/ u16 unk18;
     /*0x01A*/ s8 unk1A;
     /*0x01B*/ u8 unk1B;
-    /*0x01C*/ u8 unk1C;
+    /*0x01C*/ bool8 scoreCounterAnimationEnabled;
     /*0x01D*/ u8 unk1D;
     /*0x01E*/ u8 unk1E;
     /*0x01F*/ u8 unk1F;
@@ -150,11 +150,11 @@ struct PinballGame
     /*0x034*/ s8 unk34;
     /*0x035*/ s8 area;
     /*0x036*/ s8 unk36;
-    /*0x038*/ u32 unk38; //score to add every frame until unk3C score has been added to player's total
-    /*0x03C*/ u32 unk3C; //score to add in a bonus field or mode (by completion or other ways, like hitting Duskulls)
-    /*0x040*/ u32 unk40;
-    /*0x044*/ u32 unk44;
-    /*0x048*/ u32 unk48;
+    /*0x038*/ u32 scoreAddStepSize; //score to add every frame until scoreAddedInFrame score has been added to player's total
+    /*0x03C*/ u32 scoreAddedInFrame; //score to add in a bonus field or mode (by completion or other ways, like hitting Duskulls)
+    /*0x040*/ u32 scoreAdditionAccumulator; //score left to be counted up on the score registers
+    /*0x044*/ u32 scoreLo; //counts score until 99_999_999, overflows into scoreHi
+    /*0x048*/ u32 scoreHi; //counts score until 9_999, then freezes total score to 999_999_999_999!
     /*0x04C*/ s16 unk4C;
     /*0x04E*/ s16 unk4E;
     /*0x050*/ u8 filler50[0x4];

include/main.h

@@ -86,8 +86,8 @@ struct Main
     /*0x4C*/ u32 systemFrameCount;
     /*0x50*/ u32 fieldFrameCount;
     /*0x54*/ u32 unk54;
-    /*0x58*/ u32 unk58;
-    /*0x5C*/ u32 unk5C;
+    /*0x58*/ u32 finalScoreLo;
+    /*0x5C*/ u32 finalScoreHi;
 
     /***
      * First index = 'Action'

src/board_process3_dusclops.c

@@ -142,15 +142,15 @@ void DusclopsBoardProcess_3B_33130(void)
             break;
         case 5:
             sub_351A8();
-            if (gCurrentPinballGame->unk1C)
+            if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             {
                 gCurrentPinballGame->unk18 = 181;
             }
             if (gCurrentPinballGame->unk18 == 180)
             {
-                gCurrentPinballGame->unk1C = 1;
-                gCurrentPinballGame->unk38 = 400000;
-                gCurrentPinballGame->unk3C = BONUS_DUSKULL_COMPLETE_POINTS;
+                gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+                gCurrentPinballGame->scoreAddStepSize = 400000;
+                gCurrentPinballGame->scoreAddedInFrame = BONUS_DUSKULL_COMPLETE_POINTS;
             }
             if (gCurrentPinballGame->unk18 < 240)
             {
@@ -422,7 +422,7 @@ void sub_336E0(void) {
             gCurrentPinballGame->unk3A9[i] = 0;
             if (gCurrentPinballGame->unk396 > 0)
                 gCurrentPinballGame->unk396--; //Number of active duskull
-            gCurrentPinballGame->unk3C = 100000;
+            gCurrentPinballGame->scoreAddedInFrame = 100000;
             gCurrentPinballGame->unk385++; // Number hit
             m4aSongNumStart(SE_UNKNOWN_0xF2); //Duskull Death cry
             sub_11B0(7);
@@ -849,8 +849,8 @@ void sub_34450(void)
         }
 
         gCurrentPinballGame->unk385++;
-        gCurrentPinballGame->unk3C = 300000;
-
+        gCurrentPinballGame->scoreAddedInFrame = 300000;
+        
         break;
     }
     case 6:

src/board_process3_groudon.c

@@ -181,14 +181,14 @@ void GroudonBoardProcess_3B_3B49C(void)
         break;
     case 3:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = 50000000;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = 50000000;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -221,14 +221,14 @@ void GroudonBoardProcess_3B_3B49C(void)
         break;
     case 5:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = 50000000;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = 50000000;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -281,7 +281,7 @@ void sub_3B7C4(void)
         if (gCurrentPinballGame->unk452 == 35)
         {
             MPlayStart(&gMPlayInfo_SE1, &gUnknown_086A22D8);
-            gCurrentPinballGame->unk3C = 500000;
+            gCurrentPinballGame->scoreAddedInFrame = 500000;
             sub_11B0(7);
             gCurrentPinballGame->unk385++;
             if (gCurrentPinballGame->unk385 >= gCurrentPinballGame->unk384)

src/board_process3_kecleon.c

@@ -178,14 +178,14 @@ void KecleonBoardProcess_3B_35AA4(void)
         break;
     case 3:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = BONUS_KECLEON_COMPLETE_POINTS;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = BONUS_KECLEON_COMPLETE_POINTS;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -613,7 +613,7 @@ void sub_35D54(void)
         gCurrentPinballGame->unk3E2 = gCurrentPinballGame->unk3DE + 2;
         gCurrentPinballGame->unk3E4 = 0;
         gCurrentPinballGame->unk3FA = 0;
-        gCurrentPinballGame->unk3C = 500000;
+        gCurrentPinballGame->scoreAddedInFrame = 500000;
         gCurrentPinballGame->unk385++;
         MPlayStart(&gMPlayInfo_SE1, &gUnknown_086A1C88);
         sub_11B0(7);
@@ -975,7 +975,7 @@ void sub_372B4(void)
                 gCurrentPinballGame->unk404 = 0;
                 gCurrentPinballGame->unk406 = 1;
                 gCurrentPinballGame->unk408 = 0;
-                gCurrentPinballGame->unk3C = 10000;
+                gCurrentPinballGame->scoreAddedInFrame = 10000;
                 m4aSongNumStart(SE_UNKNOWN_0x106);
             }
 

src/board_process3_kyogre.c

@@ -161,14 +161,14 @@ void KyogreBoardProcess_3B_3869C(void)
         break;
     case 3:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = 50000000;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = 50000000;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -201,14 +201,14 @@ void KyogreBoardProcess_3B_3869C(void)
         break;
     case 5:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = 50000000;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = 50000000;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -263,7 +263,7 @@ void sub_38A20(void)
             {
                 MPlayStart(&gMPlayInfo_SE1, &gUnknown_086A1E74);
                 sub_11B0(7);
-                gCurrentPinballGame->unk3C = 500000;
+                gCurrentPinballGame->scoreAddedInFrame = 500000;
                 gCurrentPinballGame->unk385++;
                 if (gCurrentPinballGame->unk385 >= gCurrentPinballGame->unk384 && gCurrentPinballGame->unk387 == 1)
                     gCurrentPinballGame->unk3DC = 7;

src/board_process3_rayquaza.c

@@ -158,14 +158,14 @@ void RayquazaBoardProcess_3B_3EB2C(void)
         break;
     case 3:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = 99999999;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = 99999999;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -198,14 +198,14 @@ void RayquazaBoardProcess_3B_3EB2C(void)
         break;
     case 5:
         sub_351A8();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = 99999999;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = 99999999;
         }
 
         if (gCurrentPinballGame->unk18 < 240)
@@ -256,7 +256,7 @@ void sub_3EDF0(void)
         if (gCurrentPinballGame->unk452 == 5)
         {
             m4aSongNumStart(SE_UNKNOWN_0x126);
-            gCurrentPinballGame->unk3C = 1000000;
+            gCurrentPinballGame->scoreAddedInFrame = 1000000;
             gCurrentPinballGame->unk385++;
             sub_11B0(7);
             if (gCurrentPinballGame->unk385 >= gCurrentPinballGame->unk384 && gCurrentPinballGame->unk3DC != 6)

src/board_process3_sapphire.c

@@ -173,7 +173,7 @@ void sub_32968(void)
         sub_329F4();
         break;
     case 4:
-        sub_1C5AC();
+        sub_1C5AC(); //Center Hole
         break;
     }
 }
@@ -182,7 +182,7 @@ void sub_329B0(void)
 {
     gCurrentPinballGame->unk28 = 0xB4;
     gCurrentPinballGame->unk1BA = 0xB4;
-    gCurrentPinballGame->unk3C = 500000;
+    gCurrentPinballGame->scoreAddedInFrame = 500000;
     gMain.blendControl = 0xCE;
     gMain.blendBrightness = 0;
     gCurrentPinballGame->unk5F7 = 1;
@@ -260,7 +260,7 @@ void sub_32B74(void)
     gCurrentPinballGame->unk5FC = 0;
     gCurrentPinballGame->unk5FE = 30;
     gCurrentPinballGame->unk5FB = 0;
-    gCurrentPinballGame->unk3C = 50000;
+    gCurrentPinballGame->scoreAddedInFrame = 50000;
 
     m4aSongNumStart(SE_UNKNOWN_0xD5);
     sub_11B0(8);

src/board_process3_spheal.c

@@ -213,14 +213,14 @@ void SphealBoardProcess_3B_43228(void)
         break;
     case 3:
         sub_45E90();
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk18 = 181;
 
         if (gCurrentPinballGame->unk18 == 180 && gCurrentPinballGame->unk544 != 0)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk38 = 400000;
-            gCurrentPinballGame->unk3C = gCurrentPinballGame->unk544;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddStepSize = 400000;
+            gCurrentPinballGame->scoreAddedInFrame = gCurrentPinballGame->unk544;
         }
 
         if (gCurrentPinballGame->unk18 > 189 && JOY_NEW(A_BUTTON))
@@ -292,7 +292,7 @@ void sub_43500(void)
             if (gCurrentPinballGame->unk548[i] == 23)
             {
                 MPlayStart(&gMPlayInfo_SE1, &gUnknown_086A2EAC);
-                gCurrentPinballGame->unk3C = 5000;
+                gCurrentPinballGame->scoreAddedInFrame = 5000;
                 sub_11B0(8);
             }
 
@@ -563,7 +563,7 @@ void sub_4387C(void)
 
                 sub_11B0(7);
                 gCurrentPinballGame->unk54F[i] = 0;
-                gCurrentPinballGame->unk3C = 3000;
+                gCurrentPinballGame->scoreAddedInFrame = 3000;
                 break;
             case 5:
                 if (gCurrentPinballGame->unk562[i] < 10)

src/board_process6.c

@@ -782,13 +782,13 @@ u16 sub_14740(struct Vector16 *arg0, u16 *arg1)
                             gCurrentPinballGame->unk71D[gCurrentPinballGame->unk5A5 - 1] = 3;
                             gCurrentPinballGame->unk5A4 = 2;
                             gCurrentPinballGame->unk5A6 = 0;
-                            gCurrentPinballGame->unk3C = 10000;
+                            gCurrentPinballGame->scoreAddedInFrame = 10000;
                         }
                         else
                         {
                             gCurrentPinballGame->unk71D[gCurrentPinballGame->unk5A5 - 1] = 3;
                             gCurrentPinballGame->unk5A4 = 1;
-                            gCurrentPinballGame->unk3C = 10000;
+                            gCurrentPinballGame->scoreAddedInFrame = 10000;
                         }
 
                         gCurrentPinballGame->unk5AA = 4;
@@ -808,13 +808,13 @@ u16 sub_14740(struct Vector16 *arg0, u16 *arg1)
                             gCurrentPinballGame->unk71D[gCurrentPinballGame->unk5A5 - 1] = 3;
                             gCurrentPinballGame->unk5A4 = 2;
                             gCurrentPinballGame->unk5A6 = 0;
-                            gCurrentPinballGame->unk3C = 10000;
+                            gCurrentPinballGame->scoreAddedInFrame = 10000;
                         }
                         else
                         {
                             gCurrentPinballGame->unk71D[gCurrentPinballGame->unk5A5 - 1] = 3;
                             gCurrentPinballGame->unk5A4 = 1;
-                            gCurrentPinballGame->unk3C = 10000;
+                            gCurrentPinballGame->scoreAddedInFrame = 10000;
                         }
 
                         gCurrentPinballGame->unk5AA = 4;

src/board_process8.c

@@ -19,32 +19,32 @@ void AllBoardProcess_8B_4CEB4(void)
     u32 value;
 
     sub_4D3D0();
-    gCurrentPinballGame->unk40 += (gCurrentPinballGame->ballUpgradeType + 1) * gCurrentPinballGame->unk3C;
-    if (gCurrentPinballGame->unk1C)
+    gCurrentPinballGame->scoreAdditionAccumulator += (gCurrentPinballGame->ballUpgradeType + 1) * gCurrentPinballGame->scoreAddedInFrame;
+    if (gCurrentPinballGame->scoreCounterAnimationEnabled)
     {
         if (gCurrentPinballGame->newButtonActions[1] || JOY_NEW(A_BUTTON))
         {
-            gCurrentPinballGame->unk44 += gCurrentPinballGame->unk40;
-            gCurrentPinballGame->unk40 = 0;
-            gCurrentPinballGame->unk1C = 0;
-            gCurrentPinballGame->unk38 = 40000;
+            gCurrentPinballGame->scoreLo += gCurrentPinballGame->scoreAdditionAccumulator;
+            gCurrentPinballGame->scoreAdditionAccumulator = 0;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = FALSE;
+            gCurrentPinballGame->scoreAddStepSize = 40000;
         }
 
         if (gMain.systemFrameCount % 2 == 0)
         {
-            if (gCurrentPinballGame->unk40)
+            if (gCurrentPinballGame->scoreAdditionAccumulator)
             {
-                if (gCurrentPinballGame->unk40 <= gCurrentPinballGame->unk38)
+                if (gCurrentPinballGame->scoreAdditionAccumulator <= gCurrentPinballGame->scoreAddStepSize)
                 {
-                    gCurrentPinballGame->unk44 += gCurrentPinballGame->unk40;
-                    gCurrentPinballGame->unk40 = 0;
-                    gCurrentPinballGame->unk1C = 0;
-                    gCurrentPinballGame->unk38 = 40000;
+                    gCurrentPinballGame->scoreLo += gCurrentPinballGame->scoreAdditionAccumulator;
+                    gCurrentPinballGame->scoreAdditionAccumulator = 0;
+                    gCurrentPinballGame->scoreCounterAnimationEnabled = FALSE;
+                    gCurrentPinballGame->scoreAddStepSize = 40000;
                 }
                 else
                 {
-                    gCurrentPinballGame->unk44 += gCurrentPinballGame->unk38;
-                    gCurrentPinballGame->unk40 -= gCurrentPinballGame->unk38;
+                    gCurrentPinballGame->scoreLo += gCurrentPinballGame->scoreAddStepSize;
+                    gCurrentPinballGame->scoreAdditionAccumulator -= gCurrentPinballGame->scoreAddStepSize;
                     m4aSongNumStart(SE_UNKNOWN_0x91);
                 }
             }
@@ -52,33 +52,33 @@ void AllBoardProcess_8B_4CEB4(void)
     }
     else
     {
-        gCurrentPinballGame->unk44 += gCurrentPinballGame->unk40;
-        gCurrentPinballGame->unk40 = 0;
+        gCurrentPinballGame->scoreLo += gCurrentPinballGame->scoreAdditionAccumulator;
+        gCurrentPinballGame->scoreAdditionAccumulator = 0;
     }
 
-    if (gCurrentPinballGame->unk44 / 100000000 != 0)
+    if (gCurrentPinballGame->scoreLo / 100000000 != 0)
     {
-        if (gCurrentPinballGame->unk48 < 9999)
+        if (gCurrentPinballGame->scoreHi < 9999)
         {
-            gCurrentPinballGame->unk48++;
-            gCurrentPinballGame->unk44 -= 100000000;
+            gCurrentPinballGame->scoreHi++;
+            gCurrentPinballGame->scoreLo -= 100000000;
         }
         else
         {
-            gCurrentPinballGame->unk48 = 9999;
-            gCurrentPinballGame->unk44 = 99999999;
+            gCurrentPinballGame->scoreHi = 9999;
+            gCurrentPinballGame->scoreLo = 99999999;
         }
     }
 
-    gCurrentPinballGame->unk3C = 0;
+    gCurrentPinballGame->scoreAddedInFrame = 0;
 
-    value = gCurrentPinballGame->unk48;
+    value = gCurrentPinballGame->scoreHi;
     sp0[0] = (value % 10000) / 1000 + 5;
     sp0[1] = (value % 1000) / 100 + 5;
     sp0[2] = (value % 100) / 10 + 19;
     sp0[3] = value % 10 + 5;
 
-    value = gCurrentPinballGame->unk44;
+    value = gCurrentPinballGame->scoreLo;
     sp0[4] = value / 10000000 + 5;
     sp0[5] = (value % 10000000) / 1000000 + 19;
     sp0[6] = (value % 1000000) / 100000 + 5;

src/collision_checks.c

@@ -328,20 +328,20 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
         {
             if (gCurrentPinballGame->ball->positionQ0.x > 131)
             {
-                gCurrentPinballGame->unk3C = 1000;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
 
                 if (gCurrentPinballGame->unk70E <= 98)
                     gCurrentPinballGame->unk70E++;
             }
             else if (gCurrentPinballGame->ball->positionQ0.x > 91)
             {
-                gCurrentPinballGame->unk3C = 2000;
+                gCurrentPinballGame->scoreAddedInFrame = 2000;
                 gCurrentPinballGame->unk174 = 0;
                 gCurrentPinballGame->unk16F = 1;
             }
             else
             {
-                gCurrentPinballGame->unk3C = 1000;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
 
                 if (gCurrentPinballGame->unk2B2 == 0)
                 {
@@ -406,11 +406,11 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
                 if (gCurrentPinballGame->unk13 <= 2 && gCurrentPinballGame->unk72E <= 2)
                 {
                     if (gCurrentPinballGame->unk72E == 0)
-                        gCurrentPinballGame->unk3C = 2000;
+                        gCurrentPinballGame->scoreAddedInFrame = 2000;
                     else if (gCurrentPinballGame->unk72E == 1)
-                        gCurrentPinballGame->unk3C = 5000;
+                        gCurrentPinballGame->scoreAddedInFrame = 5000;
                     else
-                        gCurrentPinballGame->unk3C = 10000;
+                        gCurrentPinballGame->scoreAddedInFrame = 10000;
 
                     gCurrentPinballGame->unk72E++;
 
@@ -433,17 +433,17 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
                 {
                     if(gCurrentPinballGame->unk72B == 0)
                     {
-                        gCurrentPinballGame->unk3C = 2000;
+                        gCurrentPinballGame->scoreAddedInFrame = 2000;
                         gCurrentPinballGame->unk194 = 1;
                     }
                     else if(gCurrentPinballGame->unk72B == 1)
                     {
-                        gCurrentPinballGame->unk3C = 5000;
+                        gCurrentPinballGame->scoreAddedInFrame = 5000;
                         gCurrentPinballGame->unk194 = 5;
                     }
                     else
                     {
-                        gCurrentPinballGame->unk3C = 10000;
+                        gCurrentPinballGame->scoreAddedInFrame = 10000;
                         gCurrentPinballGame->unk194 = 10;
                     }
                     gCurrentPinballGame->unk72B++;
@@ -460,7 +460,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
         if (gCurrentPinballGame->ball->positionQ0.x <= 126)
         {
             if (gCurrentPinballGame->ballPowerUpLight[0] == 0)
-                gCurrentPinballGame->unk3C = 1000;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
 
             gCurrentPinballGame->ballPowerUpLight[0] = 1;
             gCurrentPinballGame->unk732 = 3;
@@ -473,7 +473,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
                 gCurrentPinballGame->unk71B = 1;
                 gCurrentPinballGame->unk71C = 60;
-                gCurrentPinballGame->unk3C = 4000;
+                gCurrentPinballGame->scoreAddedInFrame = 4000;
                 return;
             }
         }
@@ -482,7 +482,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
             if (gCurrentPinballGame->ball->positionQ0.x <= 148)
             {
                 if (gCurrentPinballGame->ballPowerUpLight[1] == 0)
-                    gCurrentPinballGame->unk3C = 1000;
+                    gCurrentPinballGame->scoreAddedInFrame = 1000;
 
                 gCurrentPinballGame->ballPowerUpLight[1] = 1;
                 gCurrentPinballGame->unk732 = 4;
@@ -496,14 +496,14 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
                 gCurrentPinballGame->unk71B = 1;
                 gCurrentPinballGame->unk71C = 60;
-                gCurrentPinballGame->unk3C = 4000;
+                gCurrentPinballGame->scoreAddedInFrame = 4000;
                 return;
             }
 
             if (gCurrentPinballGame->ball->positionQ0.x <= 172)
             {
                 if (gCurrentPinballGame->ballPowerUpLight[2] == 0)
-                    gCurrentPinballGame->unk3C = 1000;
+                    gCurrentPinballGame->scoreAddedInFrame = 1000;
 
                 gCurrentPinballGame->ballPowerUpLight[2] = 1;
                 gCurrentPinballGame->unk732 = 5;
@@ -517,7 +517,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
                 gCurrentPinballGame->unk71B = 1;
                 gCurrentPinballGame->unk71C = 60;
-                gCurrentPinballGame->unk3C = 4000;
+                gCurrentPinballGame->scoreAddedInFrame = 4000;
                 return;
             }
 
@@ -526,11 +526,11 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
                 if (gCurrentPinballGame->unk13 <= 2 && gCurrentPinballGame->unk72F <= 2)
                 {
                     if (gCurrentPinballGame->unk72F == 0)
-                        gCurrentPinballGame->unk3C = 2000;
+                        gCurrentPinballGame->scoreAddedInFrame = 2000;
                     else if (gCurrentPinballGame->unk72F == 1)
-                        gCurrentPinballGame->unk3C = 5000;
+                        gCurrentPinballGame->scoreAddedInFrame = 5000;
                     else
-                        gCurrentPinballGame->unk3C = 10000;
+                        gCurrentPinballGame->scoreAddedInFrame = 10000;
 
                     gCurrentPinballGame->unk72F++;
 
@@ -570,7 +570,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
             if (gCurrentPinballGame->holeIndicators[0] != 0)
                 return;
 
-            gCurrentPinballGame->unk3C = 1000;
+            gCurrentPinballGame->scoreAddedInFrame = 1000;
             gCurrentPinballGame->holeIndicators[0] = 1;
 
             if (gCurrentPinballGame->unk714 != 0)
@@ -583,7 +583,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
             gCurrentPinballGame->unk714 = 1;
             gCurrentPinballGame->unk715 = 126;
-            gCurrentPinballGame->unk3C = 4000;
+            gCurrentPinballGame->scoreAddedInFrame = 4000;
             return;
         }
 
@@ -594,7 +594,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
             if (gCurrentPinballGame->holeIndicators[1] != 0)
                 return;
 
-            gCurrentPinballGame->unk3C = 1000;
+            gCurrentPinballGame->scoreAddedInFrame = 1000;
             gCurrentPinballGame->holeIndicators[1] = 1;
 
             if (gCurrentPinballGame->unk714 != 0)
@@ -607,7 +607,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
             gCurrentPinballGame->unk714 = 1;
             gCurrentPinballGame->unk715 = 126;
-            gCurrentPinballGame->unk3C = 4000;
+            gCurrentPinballGame->scoreAddedInFrame = 4000;
             return;
         }
 
@@ -618,7 +618,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
             if (gCurrentPinballGame->holeIndicators[2] != 0)
                 return;
 
-            gCurrentPinballGame->unk3C = 1000;
+            gCurrentPinballGame->scoreAddedInFrame = 1000;
             gCurrentPinballGame->holeIndicators[2] = 1;
 
             if (gCurrentPinballGame->unk714 != 0)
@@ -631,7 +631,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
             gCurrentPinballGame->unk714 = 1;
             gCurrentPinballGame->unk715 = 126;
-            gCurrentPinballGame->unk3C = 4000;
+            gCurrentPinballGame->scoreAddedInFrame = 4000;
             return;
         }
 
@@ -640,7 +640,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
         if (gCurrentPinballGame->holeIndicators[3] != 0)
             return;
 
-        gCurrentPinballGame->unk3C = 1000;
+        gCurrentPinballGame->scoreAddedInFrame = 1000;
         gCurrentPinballGame->holeIndicators[3] = 1;
 
         if (gCurrentPinballGame->unk714 != 0)
@@ -653,7 +653,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
         gCurrentPinballGame->unk714 = 1;
         gCurrentPinballGame->unk715 = 126;
-        gCurrentPinballGame->unk3C = 4000;
+        gCurrentPinballGame->scoreAddedInFrame = 4000;
         return;
     case 10:
         if (gCurrentPinballGame->unk5B2 == 0)
@@ -674,7 +674,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
                     gCurrentPinballGame->unk2F2 = 5;
                 }
 
-                gCurrentPinballGame->unk3C = 50000;
+                gCurrentPinballGame->scoreAddedInFrame = 50000;
                 return;
             }
 
@@ -763,7 +763,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
 
         *arg2 = 0xD000;
         *arg1 = 1;
-        gCurrentPinballGame->unk3C = 5000;
+        gCurrentPinballGame->scoreAddedInFrame = 5000;
         m4aSongNumStart(SE_UNKNOWN_0xB7);
         sub_11B0(7);
         return;
@@ -785,7 +785,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
         *arg1 = 1;
 
         m4aSongNumStart(SE_UNKNOWN_0xB7);
-        gCurrentPinballGame->unk3C = 5000;
+        gCurrentPinballGame->scoreAddedInFrame = 5000;
         sub_11B0(7);
         return;
     case 14:
@@ -802,7 +802,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
                     gCurrentPinballGame->unk2DA++;
 
                     m4aSongNumStart(SE_UNKNOWN_0xB7);
-                    gCurrentPinballGame->unk3C = 5000;
+                    gCurrentPinballGame->scoreAddedInFrame = 5000;
                     sub_11B0(7);
                     return;
                 }
@@ -830,7 +830,7 @@ void sub_153CC(s32 arg0, s16* arg1, u16* arg2)
             *arg1 = 1;
 
             m4aSongNumStart(SE_UNKNOWN_0xB7);
-            gCurrentPinballGame->unk3C = 5000;
+            gCurrentPinballGame->scoreAddedInFrame = 5000;
             sub_11B0(7);
         }
 
@@ -1097,7 +1097,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                     if (gCurrentPinballGame->unk70E < 99)
                         gCurrentPinballGame->unk70E++;
 
-                    gCurrentPinballGame->unk3C = 5000;
+                    gCurrentPinballGame->scoreAddedInFrame = 5000;
                 }
             }
             else
@@ -1115,7 +1115,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                         gCurrentPinballGame->unk378 = 0;
 
                     gCurrentPinballGame->ball->velocity.y /=2;
-                    gCurrentPinballGame->unk3C = 3000;
+                    gCurrentPinballGame->scoreAddedInFrame = 3000;
                 }
             }
 
@@ -1168,17 +1168,17 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     if (gCurrentPinballGame->unk72B == 0)
                     {
-                        gCurrentPinballGame->unk3C = 2000;
+                        gCurrentPinballGame->scoreAddedInFrame = 2000;
                         gCurrentPinballGame->unk194 = 1;
                     }
                     else if (gCurrentPinballGame->unk72B == 1)
                     {
-                        gCurrentPinballGame->unk3C = 5000;
+                        gCurrentPinballGame->scoreAddedInFrame = 5000;
                         gCurrentPinballGame->unk194 = 5;
                     }
                     else
                     {
-                        gCurrentPinballGame->unk3C = 10000;
+                        gCurrentPinballGame->scoreAddedInFrame = 10000;
                         gCurrentPinballGame->unk194 = 10;
                     }
 
@@ -1200,12 +1200,12 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                     if (gCurrentPinballGame->unk13 < 3 && gCurrentPinballGame->unk72E < 3)
                     {
                         if (gCurrentPinballGame->unk72E == 0)
-                            gCurrentPinballGame->unk3C = 2000;
+                            gCurrentPinballGame->scoreAddedInFrame = 2000;
                         else if (gCurrentPinballGame->unk72E == 1)
-                            gCurrentPinballGame->unk3C = 5000;
+                            gCurrentPinballGame->scoreAddedInFrame = 5000;
                         else
-                            gCurrentPinballGame->unk3C = 10000;
-
+                            gCurrentPinballGame->scoreAddedInFrame = 10000;
+                        
                         gCurrentPinballGame->unk72E++;
                         m4aSongNumStart(SE_UNKNOWN_0x99);
                     }
@@ -1218,8 +1218,8 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
             else if (x0Position <= 98)
             {
                 if (gCurrentPinballGame->ballPowerUpLight[0] == 0)
-                    gCurrentPinballGame->unk3C = 1000;
-
+                    gCurrentPinballGame->scoreAddedInFrame = 1000;
+                
                 gCurrentPinballGame->ballPowerUpLight[0] = 1;
                 gCurrentPinballGame->unk732 = 3;
 
@@ -1227,14 +1227,14 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk71B = 1;
                     gCurrentPinballGame->unk71C = 60;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
             else if (x0Position <= 118)
             {
-                if (gCurrentPinballGame->ballPowerUpLight[1] == 0)
-                    gCurrentPinballGame->unk3C = 1000;
-
+                if (gCurrentPinballGame->ballPowerUpLight[1] == 0) 
+                    gCurrentPinballGame->scoreAddedInFrame = 1000;
+                
                 gCurrentPinballGame->ballPowerUpLight[1] = 1;
                 gCurrentPinballGame->unk732 = 4;
 
@@ -1242,14 +1242,14 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk71B = 1;
                     gCurrentPinballGame->unk71C = 60;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
             else if (x0Position <= 146)
             {
                 if (gCurrentPinballGame->ballPowerUpLight[2] == 0)
-                    gCurrentPinballGame->unk3C = 1000;
-
+                    gCurrentPinballGame->scoreAddedInFrame = 1000;
+                
                 gCurrentPinballGame->ballPowerUpLight[2] = 1;
                 gCurrentPinballGame->unk732 = 5;
 
@@ -1257,7 +1257,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk71B = 1;
                     gCurrentPinballGame->unk71C = 60;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
             else
@@ -1267,12 +1267,12 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                     if (gCurrentPinballGame->unk13 <= 2 && gCurrentPinballGame->unk72F < 3)
                     {
                         if (gCurrentPinballGame->unk72F == 0)
-                            gCurrentPinballGame->unk3C = 2000;
+                            gCurrentPinballGame->scoreAddedInFrame = 2000;
                         else if (gCurrentPinballGame->unk72F == 1)
-                            gCurrentPinballGame->unk3C = 5000;
+                            gCurrentPinballGame->scoreAddedInFrame = 5000;
                         else
-                            gCurrentPinballGame->unk3C = 10000;
-
+                            gCurrentPinballGame->scoreAddedInFrame = 10000;
+                        
                         gCurrentPinballGame->unk72F++;
 
                         if (gCurrentPinballGame->unk1CA == 13)
@@ -1304,7 +1304,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
             gCurrentPinballGame->unk732 = 10;
             if (gCurrentPinballGame->holeIndicators[0] == 0)
             {
-                gCurrentPinballGame->unk3C = 1000;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
                 gCurrentPinballGame->holeIndicators[0] = 1;
                 if (gCurrentPinballGame->unk714 == 0 && (
                     gCurrentPinballGame->holeIndicators[1] &
@@ -1313,7 +1313,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk714 = 1;
                     gCurrentPinballGame->unk715 = 126;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
         }
@@ -1323,8 +1323,8 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
 
             if (gCurrentPinballGame->holeIndicators[1] == 0)
             {
-                gCurrentPinballGame->unk3C = 1000;
-                gCurrentPinballGame->holeIndicators[1] = 1;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
+                gCurrentPinballGame->holeIndicators[1] = 1; 
                 if (gCurrentPinballGame->unk714 == 0 && (
                     gCurrentPinballGame->holeIndicators[0] &
                     gCurrentPinballGame->holeIndicators[2] &
@@ -1332,7 +1332,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk714 = 1;
                     gCurrentPinballGame->unk715 = 126;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
         }
@@ -1341,7 +1341,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
             gCurrentPinballGame->unk732 = 12;
             if (gCurrentPinballGame->holeIndicators[2] == 0)
             {
-                gCurrentPinballGame->unk3C = 1000;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
                 gCurrentPinballGame->holeIndicators[2] = 1;
 
                 if (gCurrentPinballGame->unk714 == 0 && (
@@ -1351,7 +1351,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk714 = 1;
                     gCurrentPinballGame->unk715 = 126;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
         }
@@ -1360,7 +1360,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
             gCurrentPinballGame->unk732 = 13;
             if (gCurrentPinballGame->holeIndicators[3] == 0)
             {
-                gCurrentPinballGame->unk3C = 1000;
+                gCurrentPinballGame->scoreAddedInFrame = 1000;
                 gCurrentPinballGame->holeIndicators[3] = 1;
                 if (gCurrentPinballGame->unk714 == 0 && (
                     gCurrentPinballGame->holeIndicators[0] &
@@ -1369,7 +1369,7 @@ void sub_1642C(u8 arg0, u16* arg1, u16* arg2)
                 {
                     gCurrentPinballGame->unk714 = 1;
                     gCurrentPinballGame->unk715 = 126;
-                    gCurrentPinballGame->unk3C = 4000;
+                    gCurrentPinballGame->scoreAddedInFrame = 4000;
                 }
             }
         }

src/debug_menu.c

@@ -653,8 +653,8 @@ void sub_48190(void)
                 var0 = 100;
                 if (gCurrentPinballGame->unk6B4 || gCurrentPinballGame->unk6B8)
                 {
-                    gCurrentPinballGame->unk44 += gCurrentPinballGame->unk6B4;
-                    gCurrentPinballGame->unk48 += gCurrentPinballGame->unk6B8;
+                    gCurrentPinballGame->scoreLo += gCurrentPinballGame->unk6B4;
+                    gCurrentPinballGame->scoreHi += gCurrentPinballGame->unk6B8;
                     gCurrentPinballGame->unk6B4 = 0;
                     gCurrentPinballGame->unk6B8 = 0;
                     m4aSongNumStart(SE_UNKNOWN_0x91);
@@ -989,19 +989,19 @@ void sub_48190(void)
                 if (gCurrentPinballGame->unk6B4 >= 200000)
                 {
                     gCurrentPinballGame->unk6B4 -= 200000;
-                    gCurrentPinballGame->unk44 += 200000;
+                    gCurrentPinballGame->scoreLo += 200000;
                     m4aSongNumStart(SE_UNKNOWN_0x91);
                 }
                 else if (gCurrentPinballGame->unk6B8 != 0)
                 {
                     gCurrentPinballGame->unk6B8--;
                     gCurrentPinballGame->unk6B4 += 99800000;
-                    gCurrentPinballGame->unk44 += 200000;
+                    gCurrentPinballGame->scoreLo += 200000;
                     m4aSongNumStart(SE_UNKNOWN_0x91);
                 }
                 else if (gCurrentPinballGame->unk6B4 != 0)
                 {
-                    gCurrentPinballGame->unk44 += gCurrentPinballGame->unk6B4;
+                    gCurrentPinballGame->scoreLo += gCurrentPinballGame->unk6B4;
                     gCurrentPinballGame->unk6B4 = 0;
                     m4aSongNumStart(SE_UNKNOWN_0x91);
                 }

src/high_scores.c

@@ -33,16 +33,16 @@ extern s8 gUnknown_02002885;
 
 struct unkStruct_2002858
 {
-    u32 unk0;
-    u32 unk4;
+    u32 newScoreHi;
+    u32 newScoreLo;
     s16 unk8;
     u8 unkA;
-    u8 unkB;
-    s32 unkC;
-    s16 unk10;
+    u8 mainField;
+    s32 highScoreIndex;
+    s16 currentNameCharIndex;
     s16 unk12;
     s16 unk14;
-    s16 unk16;
+    s16 currentNameChar;
     s16 unk18;
     s16 unk1A;
     s16 unk1C;
@@ -122,7 +122,7 @@ void sub_CFD4(void)
             gUnknown_0202C550[i].data.raw[j] = gUnknown_0202C610[i][0].data.raw[j];
         }
     }
-    gUnknown_02002858.unk10 = 0;
+    gUnknown_02002858.currentNameCharIndex = 0;
     gUnknown_02002858.unk12 = 0;
     gUnknown_02002858.unk14 = 0;
     gUnknown_02002858.unk18 = 0;
@@ -140,29 +140,29 @@ void sub_CFD4(void)
     gUnknown_02002885 = 0;
     if(gUnknown_0202C588 == 1)
     {
-        gUnknown_02002858.unk0 = gMain.unk5C;
-        gUnknown_02002858.unk4 = gMain.unk58;
+        gUnknown_02002858.newScoreHi = gMain.finalScoreHi;
+        gUnknown_02002858.newScoreLo = gMain.finalScoreLo;
         if(gMain.selectedField == FIELD_SAPPHIRE)
         {
-            gUnknown_02002858.unkB = 1;
+            gUnknown_02002858.mainField = FIELD_SAPPHIRE;
             gUnknown_02002882 = 0xF0;
             gUnknown_02002880 = 1;
         }
         else
         {
-            gUnknown_02002858.unkB = 0;
+            gUnknown_02002858.mainField = FIELD_RUBY;
             gUnknown_02002882 = 0;
             gUnknown_02002880 = -1;
         }
-        gUnknown_02002858.unkC = GetNewHighScoreIndex(gUnknown_02002858.unk0, gUnknown_02002858.unk4, gUnknown_02002858.unkB);
-        if(gUnknown_02002858.unkC != -1)
+        gUnknown_02002858.highScoreIndex = GetNewHighScoreIndex(gUnknown_02002858.newScoreHi, gUnknown_02002858.newScoreLo, gUnknown_02002858.mainField);
+        if(gUnknown_02002858.highScoreIndex != -1)
         {
-            sub_F434(gUnknown_02002858.unk0, gUnknown_02002858.unk4, gUnknown_02002858.unkB, gUnknown_02002858.unkC);
+            sub_F434(gUnknown_02002858.newScoreHi, gUnknown_02002858.newScoreLo, gUnknown_02002858.mainField, gUnknown_02002858.highScoreIndex);
             for(i = 0; i < HIGH_SCORE_NAME_LENGTH; i++)
             {
-                gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[i] = gHighScoreNameEntry[i];
+                gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[i] = gHighScoreNameEntry[i];
             }
-            gUnknown_02002858.unk16 = gHighScoreNameEntry[0];
+            gUnknown_02002858.currentNameChar = gHighScoreNameEntry[0];
         }
         if(sub_FD20() == 1)
         {
@@ -188,7 +188,7 @@ void sub_CFD4(void)
     }
     else
     {
-        gUnknown_02002858.unkB = 0;
+        gUnknown_02002858.mainField = 0;
         gUnknown_02002882 = 0;
         gUnknown_02002880 = -1;
         sub_E464();
@@ -256,12 +256,12 @@ void HighScore_State2_D308(void)
 {
     if(!gUnknown_02002858.unk1A)
     {
-        if(gUnknown_02002858.unkC == 0)
+        if(gUnknown_02002858.highScoreIndex == 0)
         {
             m4aSongNumStart(SE_UNKNOWN_0x14A);
             gUnknown_02002858.unk18 = 0xA0;
         }
-        else if(gUnknown_02002858.unkC == -1)
+        else if(gUnknown_02002858.highScoreIndex == -1)
         {
             gUnknown_02002858.unk18 = 999;
             gUnknown_02002858.unk1A = 0;
@@ -281,20 +281,20 @@ void HighScore_State2_D308(void)
         if(!gUnknown_02002858.unk12)
         {
             gUnknown_02002858.unk12 = 1;
-            CopyString(6 - (gUnknown_02002858.unkB << 1), gUnknown_08079870[gUnknown_02002858.unkC] + (gUnknown_02002858.unkB << 5), 0, 0x15, 4, 2);
-            CopyString(0, 0x17, 6 - (gUnknown_02002858.unkB << 1), gUnknown_08079870[gUnknown_02002858.unkC] + (gUnknown_02002858.unkB << 5), 4, 2);
+            CopyString(6 - (gUnknown_02002858.mainField << 1), gUnknown_08079870[gUnknown_02002858.highScoreIndex] + (gUnknown_02002858.mainField << 5), 0, 0x15, 4, 2);
+            CopyString(0, 0x17, 6 - (gUnknown_02002858.mainField << 1), gUnknown_08079870[gUnknown_02002858.highScoreIndex] + (gUnknown_02002858.mainField << 5), 4, 2);
         }
         else
         {
             gUnknown_02002858.unk12 = 0;
-            CopyString(0, 0x15, 6 - (gUnknown_02002858.unkB << 1), gUnknown_08079870[gUnknown_02002858.unkC] + (gUnknown_02002858.unkB << 5), 4, 2);
+            CopyString(0, 0x15, 6 - (gUnknown_02002858.mainField << 1), gUnknown_08079870[gUnknown_02002858.highScoreIndex] + (gUnknown_02002858.mainField << 5), 4, 2);
         }
     }
     gUnknown_02002858.unk1E++;
     if(gUnknown_02002858.unk1E > 8)
     {
         gUnknown_02002858.unk1E = 0;
-        sub_F8B0(gUnknown_02002858.unkB, gUnknown_02002858.unkC, gUnknown_02002858.unk1C);
+        sub_F8B0(gUnknown_02002858.mainField, gUnknown_02002858.highScoreIndex, gUnknown_02002858.unk1C);
         gUnknown_02002858.unk1C++;
         if( gUnknown_02002858.unk1C > 2)
         {
@@ -310,7 +310,7 @@ void HighScore_State2_D308(void)
         {
             gUnknown_02002858.unk12 = 0;
             gUnknown_02002858.unk14 = 0;
-            CopyString(0, 0x15, 6 - (gUnknown_02002858.unkB << 1), gUnknown_08079870[gUnknown_02002858.unkC] +(gUnknown_02002858.unkB << 5), 4, 2);
+            CopyString(0, 0x15, 6 - (gUnknown_02002858.mainField << 1), gUnknown_08079870[gUnknown_02002858.highScoreIndex] +(gUnknown_02002858.mainField << 5), 4, 2);
         }
         m4aSongNumStart(MUS_HI_SCORE);
         gMain.subState = 4;
@@ -424,7 +424,7 @@ void HighScore_State4_D664(void)
     if (++gUnknown_02002858.unk1E > 8)
     {
         gUnknown_02002858.unk1E = 0;
-        sub_F8B0(gUnknown_02002858.unkB, gUnknown_02002858.unkC, gUnknown_02002858.unk1C);
+        sub_F8B0(gUnknown_02002858.mainField, gUnknown_02002858.highScoreIndex, gUnknown_02002858.unk1C);
         if (++gUnknown_02002858.unk1C > 2)
             gUnknown_02002858.unk1C = 0;
     }
@@ -434,10 +434,10 @@ void HighScore_State4_D664(void)
         if (gUnknown_02002858.unk20 == 0)
         {
             m4aSongNumStart(SE_UNKNOWN_0x6B);
-            if (--gUnknown_02002858.unk16 < 0)
-                gUnknown_02002858.unk16 = 41;
+            if (--gUnknown_02002858.currentNameChar < 0)
+                gUnknown_02002858.currentNameChar = 41;
 
-            sub_F670(gUnknown_02002858.unk16, gUnknown_02002858.unkC, gUnknown_02002858.unk10, gUnknown_02002858.unkB);
+            sub_F670(gUnknown_02002858.currentNameChar, gUnknown_02002858.highScoreIndex, gUnknown_02002858.currentNameCharIndex, gUnknown_02002858.mainField);
             gUnknown_02002858.unk20 = 9;
         }
     }
@@ -446,17 +446,17 @@ void HighScore_State4_D664(void)
         if (gUnknown_02002858.unk20 == 0)
         {
             m4aSongNumStart(SE_UNKNOWN_0x6B);
-            if (++gUnknown_02002858.unk16 > 41)
-                gUnknown_02002858.unk16 = 0;
+            if (++gUnknown_02002858.currentNameChar > 41)
+                gUnknown_02002858.currentNameChar = 0;
 
-            sub_F670(gUnknown_02002858.unk16, gUnknown_02002858.unkC, gUnknown_02002858.unk10, gUnknown_02002858.unkB);
+            sub_F670(gUnknown_02002858.currentNameChar, gUnknown_02002858.highScoreIndex, gUnknown_02002858.currentNameCharIndex, gUnknown_02002858.mainField);
             gUnknown_02002858.unk20 = 9;
         }
     }
 
     if (JOY_NEW(DPAD_RIGHT))
     {
-        if (gUnknown_02002858.unk10 == HIGH_SCORE_NAME_LENGTH - 1)
+        if (gUnknown_02002858.currentNameCharIndex == HIGH_SCORE_NAME_LENGTH - 1)
         {
             m4aSongNumStart(SE_FAILURE);
         }
@@ -464,15 +464,15 @@ void HighScore_State4_D664(void)
         {
             m4aSongNumStart(SE_SELECT);
             gUnknown_02002858.unk12 = 1;
-            sub_F670(gUnknown_02002858.unk16, gUnknown_02002858.unkC, gUnknown_02002858.unk10, gUnknown_02002858.unkB);
-            gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10] = gUnknown_02002858.unk16;
-            gUnknown_02002858.unk10++;
-            gUnknown_02002858.unk16 = gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10];
+            sub_F670(gUnknown_02002858.currentNameChar, gUnknown_02002858.highScoreIndex, gUnknown_02002858.currentNameCharIndex, gUnknown_02002858.mainField);
+            gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex] = gUnknown_02002858.currentNameChar;
+            gUnknown_02002858.currentNameCharIndex++;
+            gUnknown_02002858.currentNameChar = gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex];
         }
     }
     else if (JOY_NEW(DPAD_LEFT))
     {
-        if (gUnknown_02002858.unk10 == 0)
+        if (gUnknown_02002858.currentNameCharIndex == 0)
         {
             m4aSongNumStart(SE_FAILURE);
         }
@@ -480,24 +480,24 @@ void HighScore_State4_D664(void)
         {
             m4aSongNumStart(SE_SELECT);
             gUnknown_02002858.unk12 = 1;
-            sub_F670(gUnknown_02002858.unk16, gUnknown_02002858.unkC, gUnknown_02002858.unk10, gUnknown_02002858.unkB);
-            gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10] = gUnknown_02002858.unk16;
-            gUnknown_02002858.unk10--;
-            gUnknown_02002858.unk16 = gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10];
+            sub_F670(gUnknown_02002858.currentNameChar, gUnknown_02002858.highScoreIndex, gUnknown_02002858.currentNameCharIndex, gUnknown_02002858.mainField);
+            gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex] = gUnknown_02002858.currentNameChar;
+            gUnknown_02002858.currentNameCharIndex--;
+            gUnknown_02002858.currentNameChar = gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex];
         }
     }
 
     if (JOY_NEW(A_BUTTON))
     {
         gUnknown_02002858.unk12 = 1;
-        sub_F670(gUnknown_02002858.unk16, gUnknown_02002858.unkC, gUnknown_02002858.unk10, gUnknown_02002858.unkB);
-        gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10] = gUnknown_02002858.unk16;
-        if (gUnknown_02002858.unk10 == HIGH_SCORE_NAME_LENGTH - 1)
+        sub_F670(gUnknown_02002858.currentNameChar, gUnknown_02002858.highScoreIndex, gUnknown_02002858.currentNameCharIndex, gUnknown_02002858.mainField);
+        gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex] = gUnknown_02002858.currentNameChar;
+        if (gUnknown_02002858.currentNameCharIndex == HIGH_SCORE_NAME_LENGTH - 1)
         {
             m4aSongNumStart(SE_UNKNOWN_0x65);
-            sub_FAE8(gUnknown_02002858.unkB, gUnknown_02002858.unkC, gUnknown_02002858.unk1C);
+            sub_FAE8(gUnknown_02002858.mainField, gUnknown_02002858.highScoreIndex, gUnknown_02002858.unk1C);
             for (i = 0; i < HIGH_SCORE_NAME_LENGTH; i++)
-                gHighScoreNameEntry[i] = gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[i];
+                gHighScoreNameEntry[i] = gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[i];
 
             for (i = 0; i < MAIN_FIELD_COUNT; i++)
             {
@@ -514,13 +514,13 @@ void HighScore_State4_D664(void)
         else
         {
             m4aSongNumStart(SE_UNKNOWN_0x6A);
-            gUnknown_02002858.unk10++;
-            gUnknown_02002858.unk16 = gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10];
+            gUnknown_02002858.currentNameCharIndex++;
+            gUnknown_02002858.currentNameChar = gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex];
         }
     }
     else if (JOY_NEW(B_BUTTON))
     {
-        if (gUnknown_02002858.unk10 == 0)
+        if (gUnknown_02002858.currentNameCharIndex == 0)
         {
             m4aSongNumStart(SE_FAILURE);
         }
@@ -528,10 +528,10 @@ void HighScore_State4_D664(void)
         {
             m4aSongNumStart(SE_UNKNOWN_0x6A);
             gUnknown_02002858.unk12 = 1;
-            sub_F670(gUnknown_02002858.unk16, gUnknown_02002858.unkC, gUnknown_02002858.unk10, gUnknown_02002858.unkB);
-            gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10] = gUnknown_02002858.unk16;
-            gUnknown_02002858.unk10--;
-            gUnknown_02002858.unk16 = gUnknown_0202C610[gUnknown_02002858.unkB][gUnknown_02002858.unkC].data.parts.name[gUnknown_02002858.unk10];
+            sub_F670(gUnknown_02002858.currentNameChar, gUnknown_02002858.highScoreIndex, gUnknown_02002858.currentNameCharIndex, gUnknown_02002858.mainField);
+            gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex] = gUnknown_02002858.currentNameChar;
+            gUnknown_02002858.currentNameCharIndex--;
+            gUnknown_02002858.currentNameChar = gUnknown_0202C610[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].data.parts.name[gUnknown_02002858.currentNameCharIndex];
         }
     }
 
@@ -746,7 +746,7 @@ void sub_DEB4(void)
     gUnknown_02002858.unk8 = 0;
     gUnknown_02002858.unk1E = 0;
     gUnknown_02002858.unk1C = 0;
-    gUnknown_02002858.unkB = 0;
+    gUnknown_02002858.mainField = 0;
     gUnknown_02002882 = 0;
     gUnknown_02002880 = -1;
     gUnknown_02002858.unk24 = STATE_INTRO;
@@ -925,8 +925,8 @@ void sub_E3A8(void)
     spriteGroup->available = TRUE;
     LoadSpriteSets(gUnknown_086A7DA8, 2, gMain_spriteGroups);
 
-    spriteGroup->baseX = gUnknown_080797F0[gUnknown_02002858.unkB][gUnknown_02002858.unkC].x + gUnknown_02002858.unk10 * 8;
-    spriteGroup->baseY = gUnknown_080797F0[gUnknown_02002858.unkB][gUnknown_02002858.unkC].y;
+    spriteGroup->baseX = gUnknown_080797F0[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].x + gUnknown_02002858.currentNameCharIndex * 8;
+    spriteGroup->baseY = gUnknown_080797F0[gUnknown_02002858.mainField][gUnknown_02002858.highScoreIndex].y;
     for (i = 0; i < 2; i++)
     {
         gOamBuffer[spriteGroup->oam[i].oamId].x = spriteGroup->oam[i].xOffset + spriteGroup->baseX;
@@ -2109,16 +2109,16 @@ u32 sub_F4FC(u32 field)
     return newHighScoreIndex;
 }
 
-void sub_F670(u32 arg0, u32 arg1, s16 arg2, u32 arg3)
+void sub_F670(u32 currNameChar, u32 hsIndex, s16 currNameCharIndex, u32 mainField)
 {
-    arg0 = gUnknown_086A7FAC[arg0];
+    currNameChar = gUnknown_086A7FAC[currNameChar];
     PrintString(
-        gUnknown_08079730[arg3][arg1].unk8 * 32 + 0x80 + arg0,
+        gUnknown_08079730[mainField][hsIndex].unk8 * 32 + 0x80 + currNameChar,
         8,
-        gUnknown_08079730[arg3][arg1].unk0 + arg2,
-        gUnknown_08079730[arg3][arg1].unk4,
+        gUnknown_08079730[mainField][hsIndex].unk0 + currNameCharIndex,
+        gUnknown_08079730[mainField][hsIndex].unk4,
         1,
-        gUnknown_08079730[arg3][arg1].unk8 + 1
+        gUnknown_08079730[mainField][hsIndex].unk8 + 1
     );
 }
 

src/pinball_game_main.c

@@ -364,7 +364,7 @@ void sub_4A518(void)
     if (gMain.mainState != STATE_GAME_IDLE)
         gCurrentPinballGame->ballSpeed = gMain_saveData.ballSpeed;
 
-    gCurrentPinballGame->unk38 = 40000;
+    gCurrentPinballGame->scoreAddStepSize = 40000;
     gCurrentPinballGame->unk1D = 0;
     gCurrentPinballGame->ball = &gCurrentPinballGame->unk1334[0];
     gCurrentPinballGame->unk1330 = &gCurrentPinballGame->unk1334[0];
@@ -868,8 +868,8 @@ void PinballGame_State3_4B20C(void)
     sub_02B4();
     m4aMPlayAllStop();
     sub_0D10();
-    gMain.unk58 = gCurrentPinballGame->unk44;
-    gMain.unk5C = gCurrentPinballGame->unk48;
+    gMain.finalScoreLo = gCurrentPinballGame->scoreLo;
+    gMain.finalScoreHi = gCurrentPinballGame->scoreHi;
     if (gMain.unkE == 2)
         sub_4B654();
 

src/rom_1A98C.c

@@ -75,7 +75,7 @@ void sub_1AA38(void)
     gCurrentPinballGame->unk28 = 113;
 
     m4aSongNumStart(SE_UNKNOWN_0xCE);
-    gCurrentPinballGame->unk3C = 50000;
+    gCurrentPinballGame->scoreAddedInFrame = 50000;
 
     sub_11B0(8);
 }
@@ -243,7 +243,7 @@ void sub_1AAA0(void)
 
 void sub_1AD84(void)
 {
-    gCurrentPinballGame->unk3C = 100000;
+    gCurrentPinballGame->scoreAddedInFrame = 100000;
     if (gCurrentPinballGame->unk2DA == 3)
     {
         gCurrentPinballGame->unk2DA = 4;
@@ -292,7 +292,7 @@ void sub_1ADF4(void)
                 gCurrentPinballGame->unk28++;
             else
             {
-                if (gCurrentPinballGame->unk48 != 0 && gCurrentPinballGame->unk16C == 4)
+                if (gCurrentPinballGame->scoreHi != 0 && gCurrentPinballGame->unk16C == 4)
                     sub_22978();
                 else
                     sub_22C6C();
@@ -300,7 +300,7 @@ void sub_1ADF4(void)
         }
         else
         {
-            if (gCurrentPinballGame->unk48 != 0 && gCurrentPinballGame->unk16C == 4)
+            if (gCurrentPinballGame->scoreHi != 0 && gCurrentPinballGame->unk16C == 4)
                 sub_22A30();
             else
                 sub_22D54();
@@ -342,7 +342,7 @@ void sub_1AF84(void)
     gCurrentPinballGame->unk1B6 = 0;
     gCurrentPinballGame->unk28 = 0xB4;
     gCurrentPinballGame->unk1BA = 0xB4;
-    gCurrentPinballGame->unk3C = 0x7A120;
+    gCurrentPinballGame->scoreAddedInFrame = 500000;
     gMain.blendControl = 0xCE;
     gMain.blendBrightness = 0;
     gCurrentPinballGame->unk5F7 = 1;
@@ -1178,7 +1178,7 @@ void sub_1C560(void)
     gCurrentPinballGame->unk28 = 0x96;
     gMain.unk44[13]->available = 0;
     gCurrentPinballGame->unk5F3 = 0;
-    gCurrentPinballGame->unk3C = 10000;
+    gCurrentPinballGame->scoreAddedInFrame = 10000;
     gCurrentPinballGame->unk5F7 = 1;
     sub_11B0(8);
 }

src/rom_201B8.c

@@ -391,7 +391,7 @@ void sub_1D5D8(void)
         var0 = gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][2];
         m4aSongNumStart(SE_UNKNOWN_0xCF);
         sub_11B0(7);
-        gCurrentPinballGame->unk3C = 50000;
+        gCurrentPinballGame->scoreAddedInFrame = 50000;
         break;
     case 2:
         if (gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][1] > gCurrentPinballGame->unk2FE)
@@ -420,7 +420,7 @@ void sub_1D5D8(void)
         var0 = gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][2];
         m4aSongNumStart(SE_UNKNOWN_0xCF);
         sub_11B0(7);
-        gCurrentPinballGame->unk3C = 100000;
+        gCurrentPinballGame->scoreAddedInFrame = 100000;
         break;
     case 4:
         if (gUnknown_086AD7C0[gCurrentPinballGame->unk2FD][1] > gCurrentPinballGame->unk2FE)
@@ -661,7 +661,7 @@ void sub_1DDDC(void)
             gCurrentPinballGame->unk2A6 = 0;
             gCurrentPinballGame->unk2A2 = 3;
             gCurrentPinballGame->ball->oamPriority = 0;
-            gCurrentPinballGame->unk3C = 5000;
+            gCurrentPinballGame->scoreAddedInFrame = 5000;
             m4aSongNumStart(SE_UNKNOWN_0xD5);
             sub_11B0(7);
             break;
@@ -788,7 +788,7 @@ void sub_1DDDC(void)
             gCurrentPinballGame->unk2A5 = 31;
             gCurrentPinballGame->unk2A6 = 0;
             gCurrentPinballGame->unk2A2 = 8;
-            gCurrentPinballGame->unk3C = 10;
+            gCurrentPinballGame->scoreAddedInFrame = 10;
             m4aSongNumStart(SE_UNKNOWN_0xB6);
             sub_11B0(7);
             if (gCurrentPinballGame->unk724)
@@ -1051,7 +1051,7 @@ void sub_1EC48(void)
     {
         if (gCurrentPinballGame->unk624 == 2)
         {
-            gCurrentPinballGame->unk3C = 500;
+            gCurrentPinballGame->scoreAddedInFrame = 500;
             m4aSongNumStart(SE_UNKNOWN_0xB6);
             sub_11B0(7);
             if (gCurrentPinballGame->unk13 == 4 && gCurrentPinballGame->unk17 == 5 && gCurrentPinballGame->unk625 < 6)
@@ -1259,7 +1259,7 @@ void sub_1F2A4(void)
             if (gCurrentPinballGame->unk1C8 >= 168)
             {
                 MPlayStart(&gMPlayInfo_SE1, &gUnknown_0869F2A0);
-                gCurrentPinballGame->unk3C = 3000;
+                gCurrentPinballGame->scoreAddedInFrame = 3000;
             }
         }
     }
@@ -1281,7 +1281,7 @@ void sub_1F2A4(void)
         {
             gCurrentPinballGame->unk618 = 0;
             MPlayStart(&gUnknown_02032FB0, &gUnknown_0869F240);
-            gCurrentPinballGame->unk3C = 100;
+            gCurrentPinballGame->scoreAddedInFrame = 100;
             if (gCurrentPinballGame->unk1CA < 12 && gCurrentPinballGame->unk61C == 0)
             {
                 gCurrentPinballGame->unk1D0 = 80;
@@ -1312,7 +1312,7 @@ void sub_1F2A4(void)
             {
                 gCurrentPinballGame->unk618 = 0;
                 MPlayStart(&gUnknown_02032FB0, &gUnknown_0869F240);
-                gCurrentPinballGame->unk3C = 100;
+                gCurrentPinballGame->scoreAddedInFrame = 100;
                 if (gCurrentPinballGame->unk1CA < 12 && gCurrentPinballGame->unk61C == 0)
                 {
                     gCurrentPinballGame->unk1D0 = 80;
@@ -1770,7 +1770,7 @@ void sub_1FF0C(void)
         gCurrentPinballGame->unk2E2 = 0;
         sub_11B0(7);
         m4aSongNumStart(SE_UNKNOWN_0xB7);
-        gCurrentPinballGame->unk3C = 3000;
+        gCurrentPinballGame->scoreAddedInFrame = 3000;
         gCurrentPinballGame->unk2E5[0] = 0;
         gCurrentPinballGame->unk2E5[1] = 0;
         gCurrentPinballGame->unk2E8[0] = 0;
@@ -1914,7 +1914,7 @@ void sub_203CC(void)
                     }
 
                     gCurrentPinballGame->unk620 = gCurrentPinballGame->ball->positionQ1;
-                    gCurrentPinballGame->unk3C = 30000;
+                    gCurrentPinballGame->scoreAddedInFrame = 30000;
 
                     if (gCurrentPinballGame->unk62E <= 98)
                         gCurrentPinballGame->unk62E++;
@@ -2016,7 +2016,7 @@ void sub_203CC(void)
             {
                 gCurrentPinballGame->unk714 = 1;
                 gCurrentPinballGame->unk715 = 126;
-                gCurrentPinballGame->unk3C = 4000;
+                gCurrentPinballGame->scoreAddedInFrame = 4000;
             }
 
             sub_11B0(11);

src/rom_27E08.c

@@ -900,7 +900,7 @@ void sub_225F0(void)
                         if (gCurrentPinballGame->coins > 99)
                             gCurrentPinballGame->coins = 99;
 
-                        gCurrentPinballGame->unk3C = (gCurrentPinballGame->unk194 - gCurrentPinballGame->unk193) * 100;
+                        gCurrentPinballGame->scoreAddedInFrame = (gCurrentPinballGame->unk194 - gCurrentPinballGame->unk193) * 100;
                         gCurrentPinballGame->unk196 = (gCurrentPinballGame->unk194 * 9) + 1;
                         gCurrentPinballGame->unk193 = gCurrentPinballGame->unk194;
                     }
@@ -916,7 +916,7 @@ void sub_225F0(void)
                         if (gCurrentPinballGame->coins > 99)
                             gCurrentPinballGame->coins = 99;
 
-                        gCurrentPinballGame->unk3C = 100;
+                        gCurrentPinballGame->scoreAddedInFrame = 100;
                     }
                 }
             }
@@ -1022,7 +1022,7 @@ void sub_22A30(void)
         }
 
         if (gCurrentPinballGame->unk2C3 == 14)
-            gCurrentPinballGame->unk3C = 2000000;
+            gCurrentPinballGame->scoreAddedInFrame = 2000000;
     }
 
     if (gCurrentPinballGame->unk2C3 >= 14 && gCurrentPinballGame->unk2C3 < 38 && gCurrentPinballGame->unk290 % 7 == 0)
@@ -1094,7 +1094,7 @@ void sub_22D54(void)
         }
 
         if (gCurrentPinballGame->unk2C6 == 78)
-            gCurrentPinballGame->unk3C = 100000;
+            gCurrentPinballGame->scoreAddedInFrame = 100000;
 
         DmaCopy16(3, gUnknown_084FD18C[0], (void *)0x06011CE0, 0x200);
     }
@@ -2968,13 +2968,13 @@ void sub_26A10(void)
             if (gCurrentPinballGame->unk18 < 490)
             {
                 sub_2E094();
-                if (gCurrentPinballGame->unk1C && gCurrentPinballGame->unk18 >= 428)
+                if (gCurrentPinballGame->scoreCounterAnimationEnabled && gCurrentPinballGame->unk18 >= 428)
                     gCurrentPinballGame->unk18 = 428;
 
                 if (gCurrentPinballGame->unk18 == 394)
                 {
-                    gCurrentPinballGame->unk1C = 1;
-                    gCurrentPinballGame->unk3C = 500000;
+                    gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+                    gCurrentPinballGame->scoreAddedInFrame = 500000;
                 }
             }
             else
@@ -3231,12 +3231,12 @@ void sub_27080(void)
                         gCurrentPinballGame->unk6C4 = 0;
                     }
 
-                    if (gCurrentPinballGame->unk1C)
+                    if (gCurrentPinballGame->scoreCounterAnimationEnabled)
                         gCurrentPinballGame->unk18 = 181;
 
                     if (gCurrentPinballGame->unk18 == 180) {
-                        gCurrentPinballGame->unk1C = 1;
-                        gCurrentPinballGame->unk3C = 5000000;
+                        gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+                        gCurrentPinballGame->scoreAddedInFrame = 5000000;
                     }
                 }
 
@@ -3440,7 +3440,7 @@ void sub_278F4(void)
             ((gCurrentPinballGame->unk24 == 0 && gCurrentPinballGame->unk25E <= 5) || (gCurrentPinballGame->unk24 == 2 && gCurrentPinballGame->unk25E > 5)) &&
             gCurrentPinballGame->unk26B < 3)
         {
-            gCurrentPinballGame->unk3C = 10000;
+            gCurrentPinballGame->scoreAddedInFrame = 10000;
             MPlayStart(&gMPlayInfo_SE1, &gUnknown_0869F618);
             gCurrentPinballGame->unk17 = 1;
             gCurrentPinballGame->unk71D[gCurrentPinballGame->unk26B] = 5;

src/rom_27F94.c

@@ -68,7 +68,7 @@ void sub_27F94(void)
         break;
     case 1:
         PickSpeciesForCatchEmMode();
-        if (gMain.mainState != 3)
+        if (gMain.mainState != STATE_GAME_IDLE)
             SaveFile_SetPokedexFlags(gCurrentPinballGame->currentSpecies, 1);
 
         gCurrentPinballGame->unk17++;
@@ -765,7 +765,7 @@ void sub_29334(void)
             if (gCurrentPinballGame->unk6C6 + 6 == gCurrentPinballGame->unk625)
             {
                 gCurrentPinballGame->unk6C5 = 2;
-                gCurrentPinballGame->unk3C = 300000;
+                gCurrentPinballGame->scoreAddedInFrame = 300000;
             }
             else
             {
@@ -1441,32 +1441,32 @@ void sub_2A354(void)
     case 30:
     case 31:
     case 32:
-        if (gCurrentPinballGame->unk1C)
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled)
             gCurrentPinballGame->unk6DE = 81;
 
         if (gCurrentPinballGame->unk6DE == 70)
         {
-            gCurrentPinballGame->unk1C = 1;
-            gCurrentPinballGame->unk3C = (gCurrentPinballGame->unk6DC - 23) * 1000000;
+            gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            gCurrentPinballGame->scoreAddedInFrame = (gCurrentPinballGame->unk6DC - 23) * 1000000;
         }
         break;
     case 33:
         if (gCurrentPinballGame->unk6DE == 70)
         {
             m4aSongNumStart(SE_UNKNOWN_0x91);
-            gCurrentPinballGame->unk3C = 100;
+            gCurrentPinballGame->scoreAddedInFrame = 100;
         }
         break;
     case 34:
         if (gCurrentPinballGame->unk6DE == 70) {
             m4aSongNumStart(SE_UNKNOWN_0x91);
-            gCurrentPinballGame->unk3C = 500;
+            gCurrentPinballGame->scoreAddedInFrame = 500;
         }
         break;
     case 35:
         if (gCurrentPinballGame->unk6DE == 70) {
             m4aSongNumStart(SE_UNKNOWN_0x91);
-            gCurrentPinballGame->unk3C = 900;
+            gCurrentPinballGame->scoreAddedInFrame = 900;
         }
         break;
     case 36:
@@ -2191,17 +2191,17 @@ void sub_2AADC(void)
                 }
             }
         }
-
-        if (gCurrentPinballGame->unk1C != 0)
+        
+        if (gCurrentPinballGame->scoreCounterAnimationEnabled) 
             gCurrentPinballGame->unk5A6 = 181;
 
         if (gCurrentPinballGame->unk5A6 == 180)
         {
             if (gCurrentPinballGame->unk13 == 4 || gCurrentPinballGame->unk13 == 8)
             {
-                gCurrentPinballGame->unk1C = 1;
-
-                switch (gCurrentPinballGame->currentSpecies)
+                gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+                
+                switch (gCurrentPinballGame->currentSpecies) 
                 {
                 case 59:
                 case 114:
@@ -2212,46 +2212,46 @@ void sub_2AADC(void)
                 case 144:
                 case 151:
                 case 160:
-                    gCurrentPinballGame->unk38 = 0x13880;
-                    gCurrentPinballGame->unk3C = 0x4C4B40;
+                    gCurrentPinballGame->scoreAddStepSize = 80000;
+                    gCurrentPinballGame->scoreAddedInFrame = 5000000;
                     break;
                 case 195:
                 case 196:
-                    gCurrentPinballGame->unk38 = 0x222E0;
-                    gCurrentPinballGame->unk3C = 0x989680;
+                    gCurrentPinballGame->scoreAddStepSize = 140000;
+                    gCurrentPinballGame->scoreAddedInFrame = 10000000;
                     break;
                 default:
-                    gCurrentPinballGame->unk3C = 0xF4240;
+                    gCurrentPinballGame->scoreAddedInFrame = 1000000;
                     break;
                 }
             }
 
             if (gCurrentPinballGame->unk13 == 5)
             {
-                gCurrentPinballGame->unk1C = 1;
-
+                gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+            
                 if (gCurrentPinballGame->currentSpecies == SPECIES_PICHU)
                 {
-                    gCurrentPinballGame->unk38 = 0x222E0;
-                    gCurrentPinballGame->unk3C = 0x989680;
+                    gCurrentPinballGame->scoreAddStepSize = 140000;
+                    gCurrentPinballGame->scoreAddedInFrame = 10000000;
                 }
                 else
-                    gCurrentPinballGame->unk3C = 0x2DC6C0;
+                    gCurrentPinballGame->scoreAddedInFrame = 3000000;
             }
 
             if (gMain.selectedField > MAIN_FIELD_COUNT)
             {
-                gCurrentPinballGame->unk1C = 1;
-
+                gCurrentPinballGame->scoreCounterAnimationEnabled = TRUE;
+                
                 if (gMain.selectedField == FIELD_RAYQUAZA)
                 {
-                    gCurrentPinballGame->unk38 = 0x61A80;
-                    gCurrentPinballGame->unk3C = 0x01C9C380;
+                    gCurrentPinballGame->scoreAddStepSize = 400000;
+                    gCurrentPinballGame->scoreAddedInFrame = 30000000;
                 }
                 else
                 {
-                    gCurrentPinballGame->unk38 = 0x61A80;
-                    gCurrentPinballGame->unk3C = 0x989680;
+                    gCurrentPinballGame->scoreAddStepSize = 400000;
+                    gCurrentPinballGame->scoreAddedInFrame = 10000000;
                 }
             }
         }

src/rom_2C538.c

@@ -122,7 +122,7 @@ void sub_2C538(void)
             if (gCurrentPinballGame->unk302 <= 0)
             {
                 m4aSongNumStart(SE_UNKNOWN_0xC5);
-                gCurrentPinballGame->unk3C = 10000;
+                gCurrentPinballGame->scoreAddedInFrame = 10000;
                 gCurrentPinballGame->ball->velocity.x = -600;
                 gCurrentPinballGame->ball->velocity.y = -300;
                 gCurrentPinballGame->ball->unk6 = 0;

src/rom_2E67C.c

@@ -943,7 +943,7 @@ void sub_2E6AC(void)
                 gCurrentPinballGame->ball->unk6 = 0;
                 m4aSongNumStart(SE_UNKNOWN_0xE2);
                 sub_11B0(7);
-                gCurrentPinballGame->unk3C = 100000;
+                gCurrentPinballGame->scoreAddedInFrame = 100000;
             }
 
             gCurrentPinballGame->ball->positionQ0.x = 156;
@@ -1273,7 +1273,7 @@ void sub_2F26C(void)
         gCurrentPinballGame->unkE4 = 22;
         DmaCopy16(3, gUnknown_08526DCC, (void *)0x06015800, 0xC00);
         m4aSongNumStart(SE_UNKNOWN_0xEC);
-        gCurrentPinballGame->unk3C = 5000;
+        gCurrentPinballGame->scoreAddedInFrame = 5000;
         break;
     case 3:
         if (gUnknown_086AE496[gCurrentPinballGame->unk37D][1] > gCurrentPinballGame->unk37E)
@@ -1417,7 +1417,7 @@ void sub_2F79C(void)
                 if (gCurrentPinballGame->unk36C[i] == 5)
                 {
                     m4aSongNumStart(SE_UNKNOWN_0xE6);
-                    gCurrentPinballGame->unk3C = 2000;
+                    gCurrentPinballGame->scoreAddedInFrame = 2000;
                 }
             }
 
@@ -1528,7 +1528,7 @@ void sub_2F79C(void)
         if (gCurrentPinballGame->unk368 == 17)
         {
             m4aSongNumStart(SE_UNKNOWN_0xE8);
-            gCurrentPinballGame->unk3C = 10;
+            gCurrentPinballGame->scoreAddedInFrame = 10;
             sub_11B0(13);
         }
 
@@ -1699,7 +1699,7 @@ void sub_30178(void)
     {
         if (gCurrentPinballGame->unk624 == 2)
         {
-            gCurrentPinballGame->unk3C = 500;
+            gCurrentPinballGame->scoreAddedInFrame = 500;
             m4aSongNumStart(SE_UNKNOWN_0xB6);
             sub_11B0(7);
             if (gCurrentPinballGame->unk13 == 4 && gCurrentPinballGame->unk17 == 5)
@@ -1741,7 +1741,7 @@ void sub_30178(void)
             gCurrentPinballGame->unk176++;
             gCurrentPinballGame->unk308++;
             if (gCurrentPinballGame->unk308 == 100)
-                gCurrentPinballGame->unk3C = 50000;
+                gCurrentPinballGame->scoreAddedInFrame = 50000;
         }
 
         gCurrentPinballGame->unk624--;

src/rom_30480.c

@@ -211,7 +211,7 @@ void sub_308DC(void)
         }
 
         gCurrentPinballGame->unk328 = 0;
-        gCurrentPinballGame->unk3C = 3000;
+        gCurrentPinballGame->scoreAddedInFrame = 3000;
     }
 
     for (i = 0; i < 3; i++)

src/rom_31BE8.c

@@ -56,7 +56,7 @@ void sub_31498(void)
                 if (gCurrentPinballGame->unk345 < 3)
                 {
                     gCurrentPinballGame->unk345++;
-                    gCurrentPinballGame->unk3C = 20000;
+                    gCurrentPinballGame->scoreAddedInFrame = 20000;
                     m4aSongNumStart(SE_UNKNOWN_0xDE);
                 }
                 else
@@ -73,7 +73,7 @@ void sub_31498(void)
                     gCurrentPinballGame->unk346 = 1;
                     gCurrentPinballGame->unk348 = 0;
                     m4aMPlayStop(&gMPlayInfo_BGM);
-                    gCurrentPinballGame->unk3C = 200000;
+                    gCurrentPinballGame->scoreAddedInFrame = 200000;
                     m4aSongNumStart(SE_UNKNOWN_0xDF);
                 }
             }
@@ -82,7 +82,7 @@ void sub_31498(void)
                 if (gCurrentPinballGame->unk345 < 3)
                 {
                     gCurrentPinballGame->unk345++;
-                    gCurrentPinballGame->unk3C = 20000;
+                    gCurrentPinballGame->scoreAddedInFrame = 20000;
                     m4aSongNumStart(SE_UNKNOWN_0xDE);
                 }
             }

src/rom_4F258.c

@@ -82,7 +82,7 @@ void sub_4E920(void)
         if (gCurrentPinballGame->unk716 == 3)
         {
             m4aSongNumStart(SE_UNKNOWN_0x73);
-            gCurrentPinballGame->unk3C = 500;
+            gCurrentPinballGame->scoreAddedInFrame = 500;
             sub_11B0(7);
         }
     }

src/rom_50AD4.c

@@ -346,7 +346,7 @@ void sub_4F9F0(void)
         if (gCurrentPinballGame->unk716 == 3)
         {
             m4aSongNumStart(SE_UNKNOWN_0x73);
-            gCurrentPinballGame->unk3C = 500;
+            gCurrentPinballGame->scoreAddedInFrame = 500;
             sub_11B0(7);
         }
     }