diff options
| author | KiritoDv <kiritodev01@gmail.com> | 2024-10-16 12:46:19 -0600 |
|---|---|---|
| committer | KiritoDv <kiritodev01@gmail.com> | 2024-10-16 12:46:19 -0600 |
| commit | e5ed74b97877d30ea7010a76a54c48b3df99ca8b (patch) | |
| tree | 913e619dbf21fdb94a7e23471a3a6143a934d16c /include | |
| parent | d423e04c3fdb14aed21e99656623554f9fcd6ef8 (diff) | |
| parent | 0b23e06b7729ddd38d40cf600caa363e7d0b8253 (diff) | |
Merge branch 'starfield' into interpolation
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 1 | ||||
| -rw-r--r-- | include/sf64thread.h | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/functions.h b/include/functions.h index 887393be..4c253777 100644 --- a/include/functions.h +++ b/include/functions.h @@ -209,6 +209,7 @@ void Effect_Update(Effect*); void TexturedLine_Update(TexturedLine*); void TexturedLine_UpdateAll(void); void Object_Update(void); +float FloatMod(float a, float b); //fox_enmy2 void Actor237_Update(Actor*); diff --git a/include/sf64thread.h b/include/sf64thread.h index cbe8a395..26c8e5b2 100644 --- a/include/sf64thread.h +++ b/include/sf64thread.h @@ -66,12 +66,12 @@ typedef struct { typedef struct { /* 0x00000 */ SPTask task; - /* 0x00050 */ Vp viewports[0x10]; - /* 0x00150 */ Mtx mtx[0x480]; - /* 0x12150 */ Gfx unkDL1[0x180]; - /* 0x12D50 */ Gfx masterDL[0x1380]; - /* 0x1C950 */ Gfx unkDL2[0xD80]; - /* 0x23550 */ Lightsn lights[0x100]; + /* 0x00050 */ Vp viewports[0x10 * 4]; + /* 0x00150 */ Mtx mtx[0x480 * 4]; + /* 0x12150 */ Gfx unkDL1[0x180 * 4]; + /* 0x12D50 */ Gfx masterDL[0x1380 * 4]; + /* 0x1C950 */ Gfx unkDL2[0xD80 * 4]; + /* 0x23550 */ Lightsn lights[0x100 * 4]; } GfxPool; // size = 0x2AD50, 0x8 aligned void Controller_Init(void); |