diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-03-07 19:23:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 20:23:18 -0700 |
| commit | ba4847e9cc2514fd722d45e54f7af87ee9de5bbd (patch) | |
| tree | b84de84c303d05af80777f79c7f0579c9b9fadb2 /include/JSystem | |
| parent | 22e941fd8c506a8b8ee0d963c5e50dae7ba379bc (diff) | |
d_a_shop_item, d_a_b_go, d_a_b_gos OK (#2085)
* d_a_shop_item OK
* d_a_b_go OK
* d_a_b_gos OK
* remove asm
* some work on d_a_b_oh / d_a_b_zant_sima
* d_a_startAndGoal done
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/JGadget/search.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JMath/JMATrigonometric.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio/functionvalue.h | 1 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio/stb.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index a7b3510800..0ef191d046 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -1,7 +1,7 @@ #ifndef SEARCH_H #define SEARCH_H -#include "global.h" +#include "dolphin/os.h" namespace JGadget { diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index 48107ab04d..206cc47077 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/include/JSystem/JMath/JMATrigonometric.h @@ -15,8 +15,8 @@ struct TAngleConstant_<f32> { struct TSinCosTable { std::pair<f32, f32> table[0x2000]; - f32 sinShort(s16 v) const { return table[static_cast<u16>(v) >> 3].first; } - f32 cosShort(s16 v) const { return table[static_cast<u16>(v) >> 3].second; } + f32 sinShort(s16 v) const { return table[(u16)v >> 3U].first; } + f32 cosShort(s16 v) const { return table[(u16)v >> 3U].second; } inline f32 sinLap(f32 v) { if (v < 0.0f) { diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 9dd8d9abd0..cc03e765d6 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -3,6 +3,7 @@ #include "JSystem/JGadget/search.h" #include "JSystem/JGadget/vector.h" +#include "dolphin/os.h" #include "global.h" namespace JStudio { diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index dd56bce92a..00b5e6fe17 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JStudio/JStudio/object-id.h" #include "JSystem/JStudio/JStudio/stb-data-parse.h" -#include "global.h" +#include "dolphin/os.h" namespace JStudio { struct TObject; |