lint: Validate strings (#234)

lib/al/Project/Camera/CameraAngleSwingInfo.cpp

@@ -14,7 +14,7 @@ CameraAngleSwingInfo::CameraAngleSwingInfo() {
 }
 
 void CameraAngleSwingInfo::load(const ByamlIter& iter) {
-    tryGetByamlBool(&mIsInvalidSwing, iter, "IsInvalidString");
+    tryGetByamlBool(&mIsInvalidSwing, iter, "IsInvalidSwing");
     if (mIsInvalidSwing)
         return;
 

src/Layout/ButtonMiiverse.cpp

@@ -18,7 +18,7 @@ NERVE_IMPL(ButtonMiiverse, HoldOff);
 NERVES_MAKE_STRUCT(ButtonMiiverse, Wait, Decide, OnWait, Disable, HoldOn, HoldOff);
 }  // namespace
 
-ButtonMiiverse::ButtonMiiverse() : al::LayoutActor("Miiverse") {}
+ButtonMiiverse::ButtonMiiverse() : al::LayoutActor("Miiverseボタン") {}
 
 void ButtonMiiverse::init(const al::LayoutInitInfo& info) {
     al::initLayoutActor(this, info, "ButtonMiiverse", 0);

src/Layout/MenuSelectParts.cpp

@@ -253,7 +253,7 @@ void MenuSelectParts::exeSelect() {
 
         param.mIsUseController = 1;
         alPadRumbleFunction::startPadRumbleNo3DWithParam(
-            alPadRumbleFunction::getPadRumbleDirector(mLayoutActor), "240Hz", param, -1);
+            alPadRumbleFunction::getPadRumbleDirector(mLayoutActor), "240Hz単発", param, -1);
 
         al::startAction(mLayoutArray[calcPartsIndex(mCursorItemIndex)], "Select", nullptr);
         startActionMarioSelectIndex();

src/Player/PlayerConst.cpp

@@ -178,7 +178,7 @@ PlayerConst::PlayerConst() {
     mSlopeRollingEndBrakeEndSpeed = 10.0;
     mSlopeRollingReStartAccel = 6.0;
     mSlopeRollingReStartMaxAdd = 3.0;
-    mSlopeRollingReStartinterval = 15;
+    mSlopeRollingReStartInterval = 15;
     mSlopeRollingReStartSwing = 0;
     mSlopeRollingReStartCharge = 40;
     mSlopeRollingReStartForce = 60;
@@ -295,7 +295,7 @@ PlayerConst::PlayerConst() {
     mWallCatchMoveDegree = 40.0;
     mWallCatchMoveSpeed = 70.0;
     mWallCatchMoveHeightRange = 70.0;
-    mWallCatchMoveinterpolate = 10;
+    mWallCatchMoveInterpolate = 10;
     mWallCatchMoveFrame = 10;
     mWallCatchMoveFrameFast = 8;
     mWallCatchMoveFrameSwing = 6;
@@ -390,7 +390,7 @@ PlayerConst::PlayerConst() {
     mHipDropSpeedMax = 45.0;
     mHipDropLandCancelFrame = 24;
     mHipDropHeight = 40.0;
-    mHipDropMsginterval = 8;
+    mHipDropMsgInterval = 8;
     mJumpHipDropPower = 40.0;
     mJumpHipDropPermitBeginFrame = 5;
     mJumpHipDropPermitEndFrame = 30;
@@ -516,8 +516,8 @@ PlayerConst::PlayerConst() {
     mOxygenReduceFrame = 1380;
     mOxygenNoReduceFrame = 60;
     mOxygenRecoveryFrame = 30;
-    mOxygenDamageinterval = 300;
-    mIceWaterDamageinterval = 300;
+    mOxygenDamageInterval = 300;
+    mIceWaterDamageInterval = 300;
     mIceWaterRecoveryFrame = 70;
     mMoveAnimSpeedMax = 25.0;
     mAnimFrameRateSpeedMin = 6.0;
@@ -547,9 +547,9 @@ PlayerConst::PlayerConst() {
     mRollingAnimBorderSpeedMax = 35.0;
     mRollingAnimFrameRateMin = 0.2;
     mRollingAnimFrameRateMax = 1.0;
-    mSwimPaddleAniminterval = 32;
-    mSwimPaddleAnimRateintervalMax = 22;
-    mSwimPaddleAnimRateintervalMin = 5;
+    mSwimPaddleAnimInterval = 32;
+    mSwimPaddleAnimRateIntervalMax = 22;
+    mSwimPaddleAnimRateIntervalMin = 5;
     mSwimPaddleAnimMaxRate = 3.0;
     mSwimBentForwardMax = 30.0;
     mSwimBentForwardBlendRate = 0.05;
@@ -590,7 +590,7 @@ PlayerConst::PlayerConst() {
     mMustacheStability = 0.3;
     mMustacheFriction = 0.8;
     mMustacheLimitDegree = 10.0;
-    mCapinterpolateFrame = 15;
+    mCapInterpolateFrame = 15;
     mCapChildLocalOffset = 100.0;
     mCapStability = 0.75;
     mCapFriction = 0.2;
@@ -973,8 +973,8 @@ PlayerConst::PlayerConst(const al::ByamlIter& byaml) {
     byaml.tryGetFloatByKey(&mSlopeRollingReStartAccel, "SlopeRollingReStartAccel");
     mSlopeRollingReStartMaxAdd = 3.0;
     byaml.tryGetFloatByKey(&mSlopeRollingReStartMaxAdd, "SlopeRollingReStartMaxAdd");
-    mSlopeRollingReStartinterval = 15;
-    byaml.tryGetIntByKey(&mSlopeRollingReStartinterval, "SlopeRollingReStartinterval");
+    mSlopeRollingReStartInterval = 15;
+    byaml.tryGetIntByKey(&mSlopeRollingReStartInterval, "SlopeRollingReStartInterval");
     mSlopeRollingReStartSwing = 0;
     byaml.tryGetIntByKey(&mSlopeRollingReStartSwing, "SlopeRollingReStartSwing");
     mSlopeRollingReStartCharge = 40;
@@ -1207,8 +1207,8 @@ PlayerConst::PlayerConst(const al::ByamlIter& byaml) {
     byaml.tryGetFloatByKey(&mWallCatchMoveSpeed, "WallCatchMoveSpeed");
     mWallCatchMoveHeightRange = 70.0;
     byaml.tryGetFloatByKey(&mWallCatchMoveHeightRange, "WallCatchMoveHeightRange");
-    mWallCatchMoveinterpolate = 10;
-    byaml.tryGetIntByKey(&mWallCatchMoveinterpolate, "WallCatchMoveinterpolate");
+    mWallCatchMoveInterpolate = 10;
+    byaml.tryGetIntByKey(&mWallCatchMoveInterpolate, "WallCatchMoveInterpolate");
     mWallCatchMoveFrame = 10;
     byaml.tryGetIntByKey(&mWallCatchMoveFrame, "WallCatchMoveFrame");
     mWallCatchMoveFrameFast = 8;
@@ -1397,8 +1397,8 @@ PlayerConst::PlayerConst(const al::ByamlIter& byaml) {
     byaml.tryGetIntByKey(&mHipDropLandCancelFrame, "HipDropLandCancelFrame");
     mHipDropHeight = 40.0;
     byaml.tryGetFloatByKey(&mHipDropHeight, "HipDropHeight");
-    mHipDropMsginterval = 8;
-    byaml.tryGetIntByKey(&mHipDropMsginterval, "HipDropMsginterval");
+    mHipDropMsgInterval = 8;
+    byaml.tryGetIntByKey(&mHipDropMsgInterval, "HipDropMsgInterval");
     mJumpHipDropPower = 40.0;
     byaml.tryGetFloatByKey(&mJumpHipDropPower, "JumpHipDropPower");
     mJumpHipDropPermitBeginFrame = 5;
@@ -1649,10 +1649,10 @@ PlayerConst::PlayerConst(const al::ByamlIter& byaml) {
     byaml.tryGetIntByKey(&mOxygenNoReduceFrame, "OxygenNoReduceFrame");
     mOxygenRecoveryFrame = 30;
     byaml.tryGetIntByKey(&mOxygenRecoveryFrame, "OxygenRecoveryFrame");
-    mOxygenDamageinterval = 300;
-    byaml.tryGetIntByKey(&mOxygenDamageinterval, "OxygenDamageinterval");
-    mIceWaterDamageinterval = 300;
-    byaml.tryGetIntByKey(&mIceWaterDamageinterval, "IceWaterDamageinterval");
+    mOxygenDamageInterval = 300;
+    byaml.tryGetIntByKey(&mOxygenDamageInterval, "OxygenDamageInterval");
+    mIceWaterDamageInterval = 300;
+    byaml.tryGetIntByKey(&mIceWaterDamageInterval, "IceWaterDamageInterval");
     mIceWaterRecoveryFrame = 70;
     byaml.tryGetIntByKey(&mIceWaterRecoveryFrame, "IceWaterRecoveryFrame");
     mMoveAnimSpeedMax = 25.0;
@@ -1711,12 +1711,12 @@ PlayerConst::PlayerConst(const al::ByamlIter& byaml) {
     byaml.tryGetFloatByKey(&mRollingAnimFrameRateMin, "RollingAnimFrameRateMin");
     mRollingAnimFrameRateMax = 1.0;
     byaml.tryGetFloatByKey(&mRollingAnimFrameRateMax, "RollingAnimFrameRateMax");
-    mSwimPaddleAniminterval = 32;
-    byaml.tryGetIntByKey(&mSwimPaddleAniminterval, "SwimPaddleAniminterval");
-    mSwimPaddleAnimRateintervalMax = 22;
-    byaml.tryGetIntByKey(&mSwimPaddleAnimRateintervalMax, "SwimPaddleAnimRateintervalMax");
-    mSwimPaddleAnimRateintervalMin = 5;
-    byaml.tryGetIntByKey(&mSwimPaddleAnimRateintervalMin, "SwimPaddleAnimRateintervalMin");
+    mSwimPaddleAnimInterval = 32;
+    byaml.tryGetIntByKey(&mSwimPaddleAnimInterval, "SwimPaddleAnimInterval");
+    mSwimPaddleAnimRateIntervalMax = 22;
+    byaml.tryGetIntByKey(&mSwimPaddleAnimRateIntervalMax, "SwimPaddleAnimRateIntervalMax");
+    mSwimPaddleAnimRateIntervalMin = 5;
+    byaml.tryGetIntByKey(&mSwimPaddleAnimRateIntervalMin, "SwimPaddleAnimRateIntervalMin");
     mSwimPaddleAnimMaxRate = 3.0;
     byaml.tryGetFloatByKey(&mSwimPaddleAnimMaxRate, "SwimPaddleAnimMaxRate");
     mSwimBentForwardMax = 30.0;
@@ -1797,8 +1797,8 @@ PlayerConst::PlayerConst(const al::ByamlIter& byaml) {
     byaml.tryGetFloatByKey(&mMustacheFriction, "MustacheFriction");
     mMustacheLimitDegree = 10.0;
     byaml.tryGetFloatByKey(&mMustacheLimitDegree, "MustacheLimitDegree");
-    mCapinterpolateFrame = 15;
-    byaml.tryGetIntByKey(&mCapinterpolateFrame, "CapinterpolateFrame");
+    mCapInterpolateFrame = 15;
+    byaml.tryGetIntByKey(&mCapInterpolateFrame, "CapInterpolateFrame");
     mCapChildLocalOffset = 100.0;
     byaml.tryGetFloatByKey(&mCapChildLocalOffset, "CapChildLocalOffset");
     mCapStability = 0.75;
@@ -2560,7 +2560,7 @@ f32 PlayerConst::getSlopeRollingReStartMaxAdd() const {
 }
 
 s32 PlayerConst::getSlopeRollingReStartInterval() const {
-    return mSlopeRollingReStartinterval;
+    return mSlopeRollingReStartInterval;
 }
 
 s32 PlayerConst::getSlopeRollingReStartSwing() const {
@@ -3028,7 +3028,7 @@ f32 PlayerConst::getWallCatchMoveHeightRange() const {
 }
 
 s32 PlayerConst::getWallCatchMoveInterpolate() const {
-    return mWallCatchMoveinterpolate;
+    return mWallCatchMoveInterpolate;
 }
 
 s32 PlayerConst::getWallCatchMoveFrame() const {
@@ -3408,7 +3408,7 @@ f32 PlayerConst::getHipDropHeight() const {
 }
 
 s32 PlayerConst::getHipDropMsgInterval() const {
-    return mHipDropMsginterval;
+    return mHipDropMsgInterval;
 }
 
 f32 PlayerConst::getJumpHipDropPower() const {
@@ -3912,11 +3912,11 @@ s32 PlayerConst::getOxygenRecoveryFrame() const {
 }
 
 s32 PlayerConst::getOxygenDamageInterval() const {
-    return mOxygenDamageinterval;
+    return mOxygenDamageInterval;
 }
 
 s32 PlayerConst::getIceWaterDamageInterval() const {
-    return mIceWaterDamageinterval;
+    return mIceWaterDamageInterval;
 }
 
 s32 PlayerConst::getIceWaterRecoveryFrame() const {
@@ -4036,15 +4036,15 @@ f32 PlayerConst::getRollingAnimFrameRateMax() const {
 }
 
 s32 PlayerConst::getSwimPaddleAnimInterval() const {
-    return mSwimPaddleAniminterval;
+    return mSwimPaddleAnimInterval;
 }
 
 s32 PlayerConst::getSwimPaddleAnimRateIntervalMax() const {
-    return mSwimPaddleAnimRateintervalMax;
+    return mSwimPaddleAnimRateIntervalMax;
 }
 
 s32 PlayerConst::getSwimPaddleAnimRateIntervalMin() const {
-    return mSwimPaddleAnimRateintervalMin;
+    return mSwimPaddleAnimRateIntervalMin;
 }
 
 f32 PlayerConst::getSwimPaddleAnimMaxRate() const {
@@ -4208,7 +4208,7 @@ f32 PlayerConst::getMustacheLimitDegree() const {
 }
 
 s32 PlayerConst::getCapInterpolateFrame() const {
-    return mCapinterpolateFrame;
+    return mCapInterpolateFrame;
 }
 
 f32 PlayerConst::getCapChildLocalOffset() const {

src/Player/PlayerConst.h

@@ -802,7 +802,7 @@ class PlayerConst : public al::HioNode {
     f32 mSlopeRollingEndBrakeEndSpeed;
     f32 mSlopeRollingReStartAccel;
     f32 mSlopeRollingReStartMaxAdd;
-    s32 mSlopeRollingReStartinterval;
+    s32 mSlopeRollingReStartInterval;
     s32 mSlopeRollingReStartSwing;
     s32 mSlopeRollingReStartCharge;
     s32 mSlopeRollingReStartForce;
@@ -919,7 +919,7 @@ class PlayerConst : public al::HioNode {
     f32 mWallCatchMoveDegree;
     f32 mWallCatchMoveSpeed;
     f32 mWallCatchMoveHeightRange;
-    s32 mWallCatchMoveinterpolate;
+    s32 mWallCatchMoveInterpolate;
     s32 mWallCatchMoveFrame;
     s32 mWallCatchMoveFrameFast;
     s32 mWallCatchMoveFrameSwing;
@@ -1014,7 +1014,7 @@ class PlayerConst : public al::HioNode {
     f32 mHipDropSpeedMax;
     s32 mHipDropLandCancelFrame;
     f32 mHipDropHeight;
-    s32 mHipDropMsginterval;
+    s32 mHipDropMsgInterval;
     f32 mJumpHipDropPower;
     s32 mJumpHipDropPermitBeginFrame;
     s32 mJumpHipDropPermitEndFrame;
@@ -1140,8 +1140,8 @@ class PlayerConst : public al::HioNode {
     s32 mOxygenReduceFrame;
     s32 mOxygenNoReduceFrame;
     s32 mOxygenRecoveryFrame;
-    s32 mOxygenDamageinterval;
-    s32 mIceWaterDamageinterval;
+    s32 mOxygenDamageInterval;
+    s32 mIceWaterDamageInterval;
     s32 mIceWaterRecoveryFrame;
     f32 mMoveAnimSpeedMax;
     f32 mAnimFrameRateSpeedMin;
@@ -1171,9 +1171,9 @@ class PlayerConst : public al::HioNode {
     f32 mRollingAnimBorderSpeedMax;
     f32 mRollingAnimFrameRateMin;
     f32 mRollingAnimFrameRateMax;
-    s32 mSwimPaddleAniminterval;
-    s32 mSwimPaddleAnimRateintervalMax;
-    s32 mSwimPaddleAnimRateintervalMin;
+    s32 mSwimPaddleAnimInterval;
+    s32 mSwimPaddleAnimRateIntervalMax;
+    s32 mSwimPaddleAnimRateIntervalMin;
     f32 mSwimPaddleAnimMaxRate;
     f32 mSwimBentForwardMax;
     f32 mSwimBentForwardBlendRate;
@@ -1214,7 +1214,7 @@ class PlayerConst : public al::HioNode {
     f32 mMustacheStability;
     f32 mMustacheFriction;
     f32 mMustacheLimitDegree;
-    s32 mCapinterpolateFrame;
+    s32 mCapInterpolateFrame;
     f32 mCapChildLocalOffset;
     f32 mCapStability;
     f32 mCapFriction;

tools/check-format.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import argparse
+import csv
 import os
 import re
 from functools import cache
@@ -257,6 +258,30 @@ def common_sead_math_template(c, path):
                 continue
             FAIL("Use short sead types: sead::Vector3f, sead::Mathi and similar!", line, path)
 
+def common_string_finder(c, path):
+    string_table = get_string_table()
+
+    for line in c.splitlines():
+        if "#include" in line:
+            continue
+        if "extern \"C\"" in line:
+            continue
+        if "//" in line:
+            continue
+
+        matches = re.findall(r'"(.+?)"', line)
+
+        for match in matches:
+            if len(match) < 2:
+                continue
+            found = False
+            for x in string_table:
+                if match == x[1]:
+                    found = True
+                    break
+            if not found:
+                FAIL("String not found in binary: \""+match+"\"", line, path)
+
 # Header files
 
 def header_sorted_visibility(c, path):
@@ -395,6 +420,7 @@ def check_source(c, path):
     common_void_params(c, path)
     common_const_type(c, path)
     common_this_prefix(c, path)
+    common_string_finder(c, path)
     common_sead_math_template(c, path)
     source_no_nerve_make(c, path)
 
@@ -422,6 +448,23 @@ def check_file(file_str):
     else:
         FAIL("Must only contain .h and .cpp files!", "NOT APPLICABLE", file_str)
 
+def read_csv_file(path):
+    if not os.path.isfile(path):
+        raise FileNotFoundError('CSV File not found')
+
+    rows = []
+
+    with open(path, "r") as file:
+        reader = csv.reader(file)
+        for row in reader:
+            rows.append(row)
+
+    return rows;
+
+@cache
+def get_string_table():
+    return read_csv_file(project_root / 'data' / "data_strings.csv");
+
 project_root = setup.ROOT
 
 def main():