Merge pull request #590 from CT075/statscreen-rename

[chore] Rename statscreen info structs and move into headers

include/statscreen.h

@@ -383,4 +383,22 @@ extern struct ProcCmd gProcScr_HelpPromptSpr[];
 extern DECL_INFO gHelpInfo_MbpHp;
 extern DECL_INFO gHelpInfo_CbpHp;
 
+extern DECL_INFO sHelpInfo_Char;
+extern DECL_INFO sHelpInfo_Class;
+extern DECL_INFO sHelpInfo_Level;
+extern DECL_INFO sHelpInfo_Exp;
+extern DECL_INFO sHelpInfo_HP;
+extern DECL_INFO gHelpInfo_Ss0Pow;
+extern DECL_INFO sHelpInfo_Ss0Skl;
+extern DECL_INFO sHelpInfo_Ss0Spd;
+extern DECL_INFO sHelpInfo_Ss0Lck;
+extern DECL_INFO sHelpInfo_Ss0Def;
+extern DECL_INFO sHelpInfo_Ss0Res;
+extern DECL_INFO sHelpInfo_Ss0Mov;
+extern DECL_INFO sHelpInfo_Ss0Con;
+extern DECL_INFO sHelpInfo_Ss0Aid;
+extern DECL_INFO sHelpInfo_Ss0Traveler;
+extern DECL_INFO sHelpInfo_Ss0Affinity;
+extern DECL_INFO sHelpInfo_Ss0Status;
+
 #endif // GUARD_STATSCREEN_H

src/statscreen.c

@@ -2458,123 +2458,105 @@ const struct HelpBoxInfo* GetLastHelpBoxInfo(void)
 
 // Stat Screen Page 0 (Core stats & status) (Ss0)
 
-static DECL_INFO sHelpInfo_08A00B38;
-static DECL_INFO sHelpInfo_08A00B54;
-static DECL_INFO sHelpInfo_08A00B70;
-static DECL_INFO sHelpInfo_08A00B8C;
-static DECL_INFO sHelpInfo_08A00BA8;
-extern DECL_INFO gHelpInfo_Ss0Pow;
-static DECL_INFO sHelpInfo_08A00BE0;
-static DECL_INFO sHelpInfo_08A00BFC;
-static DECL_INFO sHelpInfo_08A00C18;
-static DECL_INFO sHelpInfo_08A00C34;
-static DECL_INFO sHelpInfo_08A00C50;
-static DECL_INFO sHelpInfo_08A00C6C;
-static DECL_INFO sHelpInfo_08A00C88;
-static DECL_INFO sHelpInfo_08A00CA4;
-static DECL_INFO sHelpInfo_08A00CC0;
-static DECL_INFO sHelpInfo_08A00CDC;
-static DECL_INFO sHelpInfo_08A00CF8;
-
-static DECL_INFO sHelpInfo_08A00B38 =
-{
-    NULL, &sHelpInfo_08A00B54, NULL, &sHelpInfo_08A00C18,
+DECL_INFO sHelpInfo_Char =
+{
+    NULL, &sHelpInfo_Class, NULL, &sHelpInfo_Ss0Lck,
     24, 80, 0, NULL, HbPopulate_SSCharacter,
 };
 
-static DECL_INFO sHelpInfo_08A00B54 =
+DECL_INFO sHelpInfo_Class =
 {
-    &sHelpInfo_08A00B38, &sHelpInfo_08A00B70, NULL, &sHelpInfo_08A00C50,
+    &sHelpInfo_Char, &sHelpInfo_Level, NULL, &sHelpInfo_Ss0Res,
     6, 104, 0x6E8, NULL, HbPopulate_SSClass,
 };
 
-static DECL_INFO sHelpInfo_08A00B70 =
+DECL_INFO sHelpInfo_Level =
 {
-    &sHelpInfo_08A00B54, &sHelpInfo_08A00BA8, NULL, &sHelpInfo_08A00B8C,
+    &sHelpInfo_Class, &sHelpInfo_HP, NULL, &sHelpInfo_Exp,
     6, 120, 0x542,
 };
 
-static DECL_INFO sHelpInfo_08A00B8C =
+DECL_INFO sHelpInfo_Exp =
 {
-    &sHelpInfo_08A00B54, &sHelpInfo_08A00BA8, &sHelpInfo_08A00B70, &sHelpInfo_08A00C50,
+    &sHelpInfo_Class, &sHelpInfo_HP, &sHelpInfo_Level, &sHelpInfo_Ss0Res,
     38, 120, 0x543,
 };
 
-static DECL_INFO sHelpInfo_08A00BA8 =
+DECL_INFO sHelpInfo_HP =
 {
-    &sHelpInfo_08A00B70, NULL, NULL, &sHelpInfo_08A00C50,
+    &sHelpInfo_Level, NULL, NULL, &sHelpInfo_Ss0Res,
     6, 136, 0x544,
 };
 
 DECL_INFO gHelpInfo_Ss0Pow =
 {
-    NULL, &sHelpInfo_08A00BE0, &sHelpInfo_08A00B38, &sHelpInfo_08A00C6C,
+    NULL, &sHelpInfo_Ss0Skl, &sHelpInfo_Char, &sHelpInfo_Ss0Mov,
     102, 24, 0x546, NULL, HbPopulate_SSPower,
 };
 
-static DECL_INFO sHelpInfo_08A00BE0 =
+DECL_INFO sHelpInfo_Ss0Skl =
 {
-    &gHelpInfo_Ss0Pow, &sHelpInfo_08A00BFC, &sHelpInfo_08A00B38, &sHelpInfo_08A00C88,
+    &gHelpInfo_Ss0Pow, &sHelpInfo_Ss0Spd, &sHelpInfo_Char, &sHelpInfo_Ss0Con,
     105, 40, 0x548,
 };
 
-static DECL_INFO sHelpInfo_08A00BFC =
+DECL_INFO sHelpInfo_Ss0Spd =
 {
-    &sHelpInfo_08A00BE0, &sHelpInfo_08A00C18, &sHelpInfo_08A00B38, &sHelpInfo_08A00CA4,
+    &sHelpInfo_Ss0Skl, &sHelpInfo_Ss0Lck, &sHelpInfo_Char, &sHelpInfo_Ss0Aid,
     102, 56, 0x549,
 };
 
-static DECL_INFO sHelpInfo_08A00C18 =
+DECL_INFO sHelpInfo_Ss0Lck =
 {
-    &sHelpInfo_08A00BFC, &sHelpInfo_08A00C34, &sHelpInfo_08A00B38, &sHelpInfo_08A00CC0,
+    &sHelpInfo_Ss0Spd, &sHelpInfo_Ss0Def, &sHelpInfo_Char, &sHelpInfo_Ss0Traveler,
     102, 72, 0x54A,
 };
 
-static DECL_INFO sHelpInfo_08A00C34 =
+DECL_INFO sHelpInfo_Ss0Def =
 {
-    &sHelpInfo_08A00C18, &sHelpInfo_08A00C50, &sHelpInfo_08A00B38, &sHelpInfo_08A00CDC,
+    &sHelpInfo_Ss0Lck, &sHelpInfo_Ss0Res, &sHelpInfo_Char, &sHelpInfo_Ss0Affinity,
     102, 88, 0x54B,
 };
 
-static DECL_INFO sHelpInfo_08A00C50 =
+DECL_INFO sHelpInfo_Ss0Res =
 {
-    &sHelpInfo_08A00C34, NULL, &sHelpInfo_08A00B54, &sHelpInfo_08A00CF8,
+    &sHelpInfo_Ss0Def, NULL, &sHelpInfo_Class, &sHelpInfo_Ss0Status,
     102, 104, 0x54C,
 };
 
-static DECL_INFO sHelpInfo_08A00C6C =
+DECL_INFO sHelpInfo_Ss0Mov =
 {
-    NULL, &sHelpInfo_08A00C88, &gHelpInfo_Ss0Pow, NULL,
+    NULL, &sHelpInfo_Ss0Con, &gHelpInfo_Ss0Pow, NULL,
     166, 24, 0x54D,
 };
 
-static DECL_INFO sHelpInfo_08A00C88 =
+DECL_INFO sHelpInfo_Ss0Con =
 {
-    &sHelpInfo_08A00C6C, &sHelpInfo_08A00CA4, &sHelpInfo_08A00BE0, NULL,
+    &sHelpInfo_Ss0Mov, &sHelpInfo_Ss0Aid, &sHelpInfo_Ss0Skl, NULL,
     166, 40, 0x54E,
 };
 
-static DECL_INFO sHelpInfo_08A00CA4 =
+DECL_INFO sHelpInfo_Ss0Aid =
 {
-    &sHelpInfo_08A00C88, &sHelpInfo_08A00CC0, &sHelpInfo_08A00BFC, NULL,
+    &sHelpInfo_Ss0Con, &sHelpInfo_Ss0Traveler, &sHelpInfo_Ss0Spd, NULL,
     166, 56, 0x54F,
 };
 
-static DECL_INFO sHelpInfo_08A00CC0 =
+DECL_INFO sHelpInfo_Ss0Traveler =
 {
-    &sHelpInfo_08A00CA4, &sHelpInfo_08A00CDC, &sHelpInfo_08A00C18, NULL,
+    &sHelpInfo_Ss0Aid, &sHelpInfo_Ss0Affinity, &sHelpInfo_Ss0Lck, NULL,
     166, 72, 0x550,
 };
 
-static DECL_INFO sHelpInfo_08A00CDC =
+DECL_INFO sHelpInfo_Ss0Affinity =
 {
-    &sHelpInfo_08A00CC0, &sHelpInfo_08A00CF8, &sHelpInfo_08A00C34, NULL,
+    &sHelpInfo_Ss0Traveler, &sHelpInfo_Ss0Status, &sHelpInfo_Ss0Def, NULL,
     166, 88, 0x551,
 };
 
-static DECL_INFO sHelpInfo_08A00CF8 =
+DECL_INFO sHelpInfo_Ss0Status =
 {
-    &sHelpInfo_08A00CDC, NULL, &sHelpInfo_08A00C50, NULL,
+    &sHelpInfo_Ss0Affinity, NULL, &sHelpInfo_Ss0Res, NULL,
     166, 104, 0, NULL, HbPopulate_SSStatus,
 };