diff options
| author | Léo Lam <leo@leolam.fr> | 2022-02-27 12:48:28 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2022-02-27 12:50:52 +0100 |
| commit | df36d656650198b3cbf140e2982752a95b3f2c6d (patch) | |
| tree | 1af53905980b13aa03ab2f78dd548407370eb98c /src/KingSystem/Ecosystem/ecoSystem.cpp | |
| parent | a5641860025aed373da045ef1ac43a6487529932 (diff) | |
Revert "Add #ifdef declarations for NON_MATCHING code"
This reverts commit 42807160cfb33af9f3cf2fa6b0ba98f232208cdb.
It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.
Diffstat (limited to 'src/KingSystem/Ecosystem/ecoSystem.cpp')
| -rw-r--r-- | src/KingSystem/Ecosystem/ecoSystem.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/KingSystem/Ecosystem/ecoSystem.cpp b/src/KingSystem/Ecosystem/ecoSystem.cpp index ec55222f..98a674b1 100644 --- a/src/KingSystem/Ecosystem/ecoSystem.cpp +++ b/src/KingSystem/Ecosystem/ecoSystem.cpp @@ -97,6 +97,7 @@ void Ecosystem::init(sead::Heap* heap) { void Ecosystem::calc() {} +// NON_MATCHING: FP instructions rearranged. s32 Ecosystem::getMapArea(const EcoMapInfo& info, f32 posX, f32 posZ) const { posX = sead::Mathf::clamp(posX, -5000.0f, 4999.0f); posZ = sead::Mathf::clamp(posZ, -4000.0f, 4000.0f); @@ -201,8 +202,7 @@ void Ecosystem::getAreaNameByNum(s32 areaNum, const char** out) const { iter.tryGetStringByKey(out, "Area"); } -// Equivalent, minor conditional differences and register usage -#ifdef NON_MATCHING +// NON_MATCHING: Equivalent, minor conditional differences and register usage void Ecosystem::getStatusEffectInfo(StatusEffect statusEffectIdx, s32 idx, eco::StatusEffectInfo* out) const { al::ByamlIter listIter; @@ -262,7 +262,6 @@ void Ecosystem::getStatusEffectInfo(StatusEffect statusEffectIdx, s32 idx, out->val._f32 = val2; } } -#endif void Ecosystem::getClimateNameByNum(s32 areaNum, const char** out) const { *out = nullptr; |