Merge remote-tracking branch 'origin/master' into pikalax_work

7 files changed, 454 insertions, 0 deletions

diff --git a/include/nitro/FX_types.h b/include/nitro/FX_types.h
new file mode 100644
index 00000000..3c48b6c6
--- /dev/null
+++ b/include/nitro/FX_types.h
@@ -0,0 +1,109 @@
+#ifndef GUARD_FX_TYPES_H

+#define GUARD_FX_TYPES_H

+

+#include "nitro/types.h"

+

+

+typedef s16 fx16;

+typedef s32 fx32;

+typedef s64 fx64;

+typedef s64 fx64c;

+

+#define FX16_INT_MASK              0xF000

+#define FX16_INT_ABS_MASK          0x7000

+#define FX16_FRAC_MASK             0x0FFF

+#define FX16_INT_SHIFT             0xC

+

+#define FX32_INT_MASK              0xFFFFF000

+#define FX32_INT_ABS_MASK          0x7FFFF000

+#define FX32_FRAC_MASK             0x00000FFF

+#define FX32_INT_SHIFT             0xC

+

+#define FX64_INT_MASK              0xFFFFFFFFFFFFF000

+#define FX64_INT_ABS_MASK          0x7FFFFFFFFFFFF000

+#define FX64_FRAC_MASK             0x0000000000000FFF

+#define FX64_INT_SHIFT             0xC

+

+#define FX64C_INT_MASK             0xFFFFFFFF00000000

+#define FX64C_INT_ABS_MASK         0x7FFFFFFF00000000

+#define FX64C_FRAC_MASK            0x00000000FFFFFFFF

+#define FX64C_INT_SHIFT            0x20

+

+#define FX_INT(TYPE, x)            (((x) & TYPE ## _INT_MASK) >> TYPE ## _INT_SHIFT)

+#define FX_INT_ABS(TYPE, x)        (((x) & TYPE ## _INT_ABS_MASK) >> TYPE ## _INT_SHIFT)

+#define FX_FRAC(TYPE, x)           ((x) & TYPE ## _FRAC_MASK)

+

+#define FX16_INT(x)                FX_INT(FX16, x)

+#define FX16_INT_ABS(x)            FX_INT_ABS(FX16, x)

+#define FX16_FRAC(x)               FX_FRAC(FX16, x)

+

+#define FX32_INT(x)                FX_INT(FX32, x)

+#define FX32_INT_ABS(x)            FX_INT_ABS(FX32, x)

+#define FX32_FRAC(x)               FX_FRAC(FX32, x)

+

+#define FX64_INT(x)                FX_INT(FX64, x)

+#define FX64_INT_ABS(x)            FX_INT_ABS(FX64, x)

+#define FX64_FRAC(x)               FX_FRAC(FX64, x)

+

+#define FX64C_INT(x)               FX_INT(FX64C, x)

+#define FX64C_INT_ABS(x)           FX_INT_ABS(FX64C, x)

+#define FX64C_FRAC(x)              FX_FRAC(FX64C, x)

+

+//TODO: clean up these macros

+#define FX32_MUL_NO_ROUND(a, b)      ((fx32)(((fx64)(a) * (b)) >> FX32_INT_SHIFT))

+#define FX32_MUL(a, b)               ((fx32)((((fx64)(a) * (b) + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT)))

+#define FX32_MUL_ADD_MUL(a, b, c, d) ((fx32)(((fx64)(a) * (b) + (fx64)c * d) >> FX32_INT_SHIFT))

+//the extra term here is for rounding

+#define FX32_MUL_SUB_MUL(a, b, c, d) ((fx32)(((fx64)(a) * (b) - (fx64)c * d + (1 << (FX32_INT_SHIFT - 1))) >> FX32_INT_SHIFT))

+

+#define FX_MUL_FX32_FX64C(a, b)      ((fx32)((((a) * (b) + ((fx64)1 << (FX64C_INT_SHIFT - 1))) >> FX64C_INT_SHIFT)))

+

+#define FX_FX16_TO_F32(x) ((f32)((x) / (f32)(1 << FX16_SHIFT)))

+#define FX_F32_TO_FX16(x) ((fx16)(((x) > 0) ? \

+                                     (fx16)((x) * (1 << FX16_INT_SHIFT) + 0.5f ) : \

+                                     (fx16)((x) * (1 << FX16_INT_SHIFT) - 0.5f )))

+#define FX_F32_TO_FX32(x) ((fx32)(((x) > 0) ? \

+                                     (fx32)((x) * (1 << FX32_INT_SHIFT) + 0.5f ) : \

+                                     (fx32)((x) * (1 << FX32_INT_SHIFT) - 0.5f )))

+#define FX16_CONST(x) FX_F32_TO_FX16(x)

+#define FX32_CONST(x) FX_F32_TO_FX32(x)

+

+#define FX16_ONE ((fx16)0x1000)

+#define FX32_ONE ((fx32)0x00001000L)

+

+typedef struct Vecx32

+{

+    fx32 x;

+    fx32 y;

+    fx32 z;

+} VecFx32;

+

+typedef struct Vecx16

+{

+    fx16 x;

+    fx16 y;

+    fx16 z;

+} VecFx16;

+

+//Matrices are indexed as [column][row]

+typedef struct Mtx44

+{

+    fx32 _[16];

+} MtxFx44;

+

+typedef struct Mtx43

+{

+    fx32 _[12];

+} MtxFx43;

+

+typedef struct Mtx33

+{

+    fx32 _[9];

+} MtxFx33;

+

+typedef struct Mtx22

+{

+    fx32 _[4];

+} MtxFx22;

+

+#endif //GUARD_FX_TYPES_H

diff --git a/include/nitro/NNS_g3d.h b/include/nitro/NNS_g3d.h
new file mode 100644
index 00000000..f9a3a1b8
--- /dev/null
+++ b/include/nitro/NNS_g3d.h
@@ -0,0 +1,89 @@
+#ifndef GUARD_NNS_G3D_H

+#define GUARD_NNS_G3D_H

+

+#include "fx.h"

+

+typedef enum

+{

+    NNS_G3D_GLB_FLAG_FLUSH_WVP              = 0x00000001,

+    NNS_G3D_GLB_FLAG_FLUSH_VP               = 0x00000002,

+    NNS_G3D_GLB_FLAG_INVBASE_UPTODATE       = 0x00000004,

+    NNS_G3D_GLB_FLAG_INVCAMERA_UPTODATE     = 0x00000008,

+    NNS_G3D_GLB_FLAG_INVPROJ_UPTODATE       = 0x00000010,

+    NNS_G3D_GLB_FLAG_INVBASECAMERA_UPTODATE = 0x00000020,

+    NNS_G3D_GLB_FLAG_INVCAMERAPROJ_UPTODATE = 0x00000040,

+

+    NNS_G3D_GLB_FLAG_BASECAMERA_UPTODATE    = 0x00000080,

+

+    NNS_G3D_GLB_FLAG_SRTCAMERA_UPTODATE     = NNS_G3D_GLB_FLAG_BASECAMERA_UPTODATE,

+    NNS_G3D_GLB_FLAG_FLUSH_ALT              = NNS_G3D_GLB_FLAG_FLUSH_WVP

+}

+    NNSG3dGlbFlag;

+

+typedef struct

+{

+    /*0x000*/ u32     cmd0;

+    /*0x004*/ u32     mtxmode_proj;

+    /*0x008*/ MtxFx44 projMtx;

+

+    /*0x048*/ u32     mtxmode_posvec;

+    /*0x04C*/ MtxFx43 cameraMtx;

+

+    /*0x07C*/ u32     cmd1;

+    /*0x080*/ u32     lightVec[4];

+

+    /*0x090*/ u32     cmd2;

+    /*0x094*/ u32     prmMatColor0;

+    /*0x098*/ u32     prmMatColor1;

+    /*0x09C*/ u32     prmPolygonAttr;

+    /*0x0A0*/ u32     prmViewPort;

+

+    /*0x0A4*/ u32     cmd3;

+    /*0x0A8*/ u32     lightColor[4];

+

+    /*0x0B8*/ u32     cmd4;

+    /*0x0BC*/ MtxFx33 prmBaseRot;

+    /*0x0E0*/ VecFx32 prmBaseTrans;

+    /*0x0EC*/ VecFx32 prmBaseScale;

+    /*0x0F8*/ u32     prmTexImageParam;

+

+    /*0x0FC*/ u32 flag;

+    /*0x100*/ MtxFx43 invCameraMtx;

+    /*0x130*/ MtxFx43 srtCameraMtx;

+    /*0x160*/ MtxFx43 invSrtCameraMtx;

+

+    /*0x190*/ MtxFx43 invBaseMtx;

+

+    /*0x1C0*/ MtxFx44 invProjMtx;

+    /*0x200*/ MtxFx44 invCameraProjMtx;

+

+    /*0x240*/ VecFx32 camPos;

+    /*0x24C*/ VecFx32 camUp;

+    /*0x258*/ VecFx32 camTarget;

+}

+NNSG3dGlb;

+

+extern NNSG3dGlb NNS_G3dGlb;

+

+static inline void NNS_G3dGlbLookAt(const VecFx32 * camPos, const VecFx32 * camUp, const VecFx32 * camTarget)

+{

+    NNS_G3dGlb.camPos = *camPos;

+    NNS_G3dGlb.camUp = *camUp;

+    NNS_G3dGlb.camTarget = *camTarget;

+    MTX_LookAt(camPos, camUp, camTarget, &NNS_G3dGlb.cameraMtx);

+    NNS_G3dGlb.flag &= ~(NNS_G3D_GLB_FLAG_INVCAMERA_UPTODATE | NNS_G3D_GLB_FLAG_INVBASECAMERA_UPTODATE | NNS_G3D_GLB_FLAG_INVCAMERAPROJ_UPTODATE | NNS_G3D_GLB_FLAG_BASECAMERA_UPTODATE);

+}

+

+static inline void NNS_G3dGlbPerspective(fx32 fovySin, fx32 fovyCos, fx32 aspect, fx32 n, fx32 f)

+{

+    MTX_Perspective(fovySin, fovyCos, aspect, n, f, &NNS_G3dGlb.projMtx);

+    NNS_G3dGlb.flag &= ~(NNS_G3D_GLB_FLAG_INVPROJ_UPTODATE | NNS_G3D_GLB_FLAG_INVCAMERAPROJ_UPTODATE);

+}

+

+static inline void NNS_G3dGlbOrtho(fx32 t, fx32 b, fx32 l, fx32 r, fx32 n, fx32 f)

+{

+    MTX_Ortho(t, b, l, r, n, f, &NNS_G3dGlb.projMtx);

+    NNS_G3dGlb.flag &= ~(NNS_G3D_GLB_FLAG_INVPROJ_UPTODATE | NNS_G3D_GLB_FLAG_INVCAMERAPROJ_UPTODATE);

+}

+

+#endif //GUARD_NNS_G3D_H

diff --git a/include/nitro/OS_alarm_shared.h b/include/nitro/OS_alarm_shared.h
index fe549351..1a24f139 100644
--- a/include/nitro/OS_alarm_shared.h
+++ b/include/nitro/OS_alarm_shared.h
@@ -15,6 +15,7 @@
 
 #include "nitro/types.h"
 #include "nitro/OS_tick_shared.h"
+#include "nitro/OS_thread_shared.h"
 
 typedef void (*OSAlarmHandler) (void *);
 
diff --git a/include/nitro/OS_thread_shared.h b/include/nitro/OS_thread_shared.h
index a0cce54d..0c0e7f9a 100644
--- a/include/nitro/OS_thread_shared.h
+++ b/include/nitro/OS_thread_shared.h
@@ -15,6 +15,9 @@
 
 #include "nitro/types.h"
 
+/* UGLY HACK: include proc specific header for OSContext */
+#include "OS_context.h"
+
 typedef struct OSiAlarm OSAlarm;
 
 typedef struct _OSThread OSThread;
diff --git a/include/nitro/SND_alarm_shared.h b/include/nitro/SND_alarm_shared.h
new file mode 100644
index 00000000..a1e8ed9d
--- /dev/null
+++ b/include/nitro/SND_alarm_shared.h
@@ -0,0 +1,30 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include SND_alarm.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_SND_ALARM_SHARED_H
+#define POKEDIAMOND_SND_ALARM_SHARED_H
+
+#include "nitro/OS_tick_shared.h"
+#include "nitro/OS_alarm_shared.h"
+
+struct SNDAlarm {
+    u8 enable;      // 0x00
+    u8 id;          // 0x01
+    u16 unk_2;      // 0x02
+    OSTick tick;    // 0x04
+    OSTick period;  // 0x0C
+    OSAlarm alarm;  // 0x14
+};  // size = 0x40
+
+#define SND_ALARM_COUNT 8
+
+#endif //POKEDIAMOND_SND_ALARM_SHARED_H
diff --git a/include/nitro/SND_main_shared.h b/include/nitro/SND_main_shared.h
new file mode 100644
index 00000000..d77273ed
--- /dev/null
+++ b/include/nitro/SND_main_shared.h
@@ -0,0 +1,176 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include SND_main.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_SND_MAIN_SHARED_H
+#define POKEDIAMOND_SND_MAIN_SHARED_H
+
+struct SNDWaveParam {
+    u8 format;      // 0x0
+    u8 loopEnabled; // 0x1
+    u16 samplerate; // 0x2
+    u16 timer;      // 0x4
+    u16 loopStart;  // 0x6
+    u32 loopLength; // 0x8
+}; // size = 0xC
+
+struct SNDLfoParam {
+    u8 target;  // 0x0
+    u8 speed;   // 0x1
+    u8 depth;   // 0x2
+    u8 range;   // 0x3
+    u16 delay;  // 0x4
+}; // size = 0x6
+
+struct SNDLfo {
+    struct SNDLfoParam param;   // 0x0
+    u16 delayCounter;           // 0x6
+    u16 counter;                // 0x8
+}; // size = 0xA
+
+struct SNDExChannel {
+    u8 id;              // 0x00
+    u8 type;            // 0x01
+    u8 envStatus;       // 0x02
+
+    struct {
+        u8 active : 1;
+        u8 start : 1;
+        u8 autoSweep : 1;
+        u8 syncFlag : 5;
+    } flags;            // 0x03
+
+    u8 panRange;        // 0x04
+    u8 rootMidiKey;     // 0x05
+    s16 userDecay2;     // 0x06
+
+    u8 midiKey;         // 0x08
+    u8 velocity;        // 0x09
+    s8 initPan;         // 0x0A
+    s8 userPan;         // 0x0B
+
+    s16 userDecay;      // 0x0C
+    s16 userPitch;      // 0x0E
+
+    s32 envAttenuation; // 0x10
+    s32 sweepCounter;   // 0x14
+    s32 sweepLength;    // 0x18
+
+    u8 envAttack;       // 0x1C
+    u8 envSustain;      // 0x1D
+    u16 envDecay;       // 0x1E
+    u16 envRelease;     // 0x20
+    u8 priority;        // 0x22
+    u8 pan;             // 0x23
+    u16 volume;         // 0x24
+    u16 timer;          // 0x26
+
+    struct SNDLfo lfo;  // 0x28
+
+    s16 sweepPitch;     // 0x32
+
+    s32 length;         // 0x34
+
+    struct SNDWaveParam waveParam;  // 0x38
+
+    union {
+        const void *waveDataPtr;
+        u32 dutyCycle;
+    };                  // 0x44
+
+    void (*callback)(struct SNDExChannel *chn, u32 status, void *userData); // 0x48
+    void *callbackUserData; // 0x4C
+
+    struct SNDExChannel *channelLLNext; // 0x50
+};  // size = 0x54
+
+#define SND_TRACK_COUNT_PER_PLAYER 16
+#define SND_INVALID_TRACK_INDEX 0xFF
+
+struct SNDBankData;
+
+struct SNDPlayer {
+    struct {
+        u8 active : 1;
+        u8 prepared : 1;
+        u8 paused : 1;
+    } flags;            // 0x0
+
+    u8 playerId;        // 0x1
+    u8 unk_2[2];        // 0x2
+
+    u8 prio;            // 0x4
+    u8 volume;          // 0x5
+    s16 extFader;       // 0x6
+
+    u8 tracks[SND_TRACK_COUNT_PER_PLAYER];  // 0x8
+
+    u16 tempo;          // 0x18
+    u16 tempoRatio;     // 0x1A
+    u16 tempoCounter;   // 0x1C
+    u8 unk_1E[2];       // 0x1E
+
+    struct SNDBankData *bank;   // 0x20
+};  // size = 0x24
+
+#define SND_TRACK_MAX_CALL 3
+
+struct SNDTrack {
+    struct {
+        u8 active : 1;
+        u8 noteWait : 1;
+        u8 muted : 1;
+        u8 tie : 1;
+        u8 noteFinishWait : 1;
+        u8 portamento : 1;
+        u8 cmp : 1; // ???
+        u8 channelMask : 1;
+    } flags;        // 0x00
+
+    u8 panRange;    // 0x01
+    u16 program;    // 0x02
+
+    u8 volume;      // 0x04
+    u8 expression;  // 0x05
+    s8 pitchBend;   // 0x06
+    u8 bendRange;   // 0x07
+
+    s8 pan;         // 0x08
+    s8 extPan;      // 0x09
+    s16 extFader;   // 0x0A
+    s16 extPitch;   // 0x0C
+    u8 envAttack;   // 0x0E
+    u8 envDecay;    // 0x0F
+    u8 envSustain;  // 0x10
+    u8 envRelease;  // 0x11
+    u8 priority;    // 0x12
+    s8 transpose;   // 0x13
+
+    u8 portamentoKey;           // 0x14
+    u8 portamentoTime;          // 0x15
+    s16 sweepPitch;             // 0x16
+
+    struct SNDLfoParam mod;     // 0x18
+    u16 channelMask;            // 0x1E
+
+    s32 wait;                   // 0x20
+
+    const u8 *trackDataStart;   // 0x24
+    const u8 *trackDataPos;     // 0x28
+    const u8 *posCallStack[SND_TRACK_MAX_CALL]; // 0x34
+    u8 loopCount[SND_TRACK_MAX_CALL];           // 0x38
+    u8 callStackDepth;                          // 0x3B
+
+    struct SNDExChannel *channelLLHead; // 0x3C
+};  // size = 0x40
+ 
+ #endif //POKEDIAMOND_SND_MAIN_SHARED_H
+ 
\ No newline at end of file
diff --git a/include/nitro/SND_work_shared.h b/include/nitro/SND_work_shared.h
new file mode 100644
index 00000000..0de3981e
--- /dev/null
+++ b/include/nitro/SND_work_shared.h
@@ -0,0 +1,46 @@
+/*
+ * NOTE:
+ * This file is shared between ARM9 and ARM7
+ * DO NOT PUT PROC SPECIFIC CODE IN HERE
+ * Thank You!
+ */
+
+/*
+ * DO NOT INCLUDE THIS FILE DIRECTLY
+ * Include SND_work.h from the specific proc's lib
+ */
+
+#ifndef POKEDIAMOND_SND_WORK_SHARED_H
+#define POKEDIAMOND_SND_WORK_SHARED_H
+
+#include "nitro/SND_alarm_shared.h"
+#include "nitro/SND_main_shared.h"
+ 
+#define SND_PLAYER_COUNT 16
+#define SND_CHANNEL_COUNT 16
+#define SND_TRACK_COUNT 32
+
+struct SNDWork {
+    struct SNDExChannel channels[SND_CHANNEL_COUNT];    // 0x00
+    struct SNDPlayer players[SND_PLAYER_COUNT];         // 0x540
+    struct SNDTrack tracks[SND_TRACK_COUNT];            // 0x780
+    struct SNDAlarm alarms[SND_ALARM_COUNT];            // 0xF80
+};  // size = 0x1180
+
+struct SNDSharedWork {
+    u32 finishedCommandTag;                 // 0x0
+    u32 playerStatus;                       // 0x4
+    u16 channelStatus;                      // 0x8
+    u16 captureStatus;                      // 0xA
+    u8 unk_C[0x14];                         // 0xC
+    struct {
+        s16 localVars[16];  // local 0x0
+        u32 tickCounter;    // local 0x20
+    } players[SND_PLAYER_COUNT];            // 0x20
+    s16 globalVars[16];                     // 0x260
+};  // size = 0x280
+
+extern struct SNDWork SNDi_Work;
+extern struct SNDSharedWork *SNDi_SharedWork;
+ 
+ #endif //POKEDIAMOND_SND_WORK_SHARED_H