Docs update, added list of all SFX Ids used in the game. (#217)

* docs

* format

* format plz

* stuff

* more stuff

* more names and such

* torch update

9 files changed, 60 insertions, 61 deletions

diff --git a/include/context.h b/include/context.h
index f41dbb56..8c15ef63 100644
--- a/include/context.h
+++ b/include/context.h
@@ -238,13 +238,13 @@ extern PlayerShot gPlayerShots[16];
 extern TexturedLine gTexturedLines[100];
 extern RadarMark gRadarMarks[65];
 extern BonusText gBonusText[10];
-extern s32 D_ctx_80176550[2];
-extern f32 D_ctx_80176558[2][100];
-extern f32 D_ctx_80176878[2][100];
-extern f32 D_ctx_80176B98[2][100];
-extern f32 D_ctx_80176EB8[2][100];
-extern f32 D_ctx_801771D8[2][100];
-extern f32 D_ctx_80177500[2][100];
+extern s32 gActor194Status[2];
+extern f32 gActor194xPos[2][100];
+extern f32 gActor194yPos[2][100];
+extern f32 gActor194zPos[2][100];
+extern f32 gActor194xRot[2][100];
+extern f32 gActor194yRot[2][100];
+extern f32 gActor194zRot[2][100];
 extern u16 gEnemyShotSpeed; // enemy shot speed?
 extern u8 D_ctx_80177830; // show level complete status overlay
 extern s32 gLevelStatusScreenTimer; // level clear related
diff --git a/include/functions.h b/include/functions.h
index 1ea682f5..939370b7 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -23,7 +23,7 @@ bool AllRange_PlayMessage(u16*, RadioCharacterId);
 void AllRange_GreatFoxRepair(Player*);
 void AllRange_ClearRadio(void);
 void func_360_8002EE64(Actor* this);
-void func_360_8002F180(void);
+void ActorAllRange_SpawnTeam(void);
 void ActorAllRange_PlayMessage(u16* msg, RadioCharacterId character);
 void func_360_8002F69C(Actor*);
 void func_360_8002FC00(Actor*);
@@ -83,13 +83,13 @@ void Cutscene_LevelComplete(Player*);
 void Cutscene_UTurn(Player*);
 void Cutscene_KillPlayer(Player* player);
 void Cutscene_PlayerDown(Player*);
-void func_demo_8004F8AC(Actor*);
-void func_demo_8004FEC0(Actor*);
-void func_demo_800515C4(void);
+void Actor195_Update(Actor*);
+void Actor195_Draw(Actor*);
+void Cutscene_DrawGreatFox(void);
 
 // fox_display
 void func_display_80053658(WingInfo*);
-void func_display_8005465C(s32);
+void Play_DrawEngineGlow(s32);
 void func_display_80057814(Player*);
 void Play_Draw(void);
 
@@ -113,8 +113,8 @@ void FogShadow_Draw(Sprite*);
 void func_edisplay_80059F68(Object_80*);
 void func_edisplay_80059FDC(Object_80*);
 void Actor189_Draw(Actor*);
-void func_edisplay_8005ADAC(Actor*);
-void func_edisplay_8005B1E8(Actor*, s32);
+void Actor_DrawEngineAndContrails(Actor*);
+void Actor_DrawEngineGlow(Actor*, s32);
 void func_edisplay_8005B388(Actor*);
 void func_edisplay_8005B6A4(Actor*);
 void func_edisplay_8005B71C(Actor*);
@@ -154,7 +154,7 @@ void Effect_Initialize(Effect*);
 void func_enmy_80061B68(void);
 void func_enmy_80061CD0(void);
 void func_enmy_80061E48(Actor* , f32 , f32 , f32 );
-void func_enmy_80061F0C(Actor* , ObjectInit* , s32 );
+void ActorEvent_Load(Actor* , ObjectInit* , s32 );
 void Object_Load(ObjectInit* , f32 , f32 , f32 , f32 );
 void func_enmy_80062568(void);
 void func_enmy_80062B60(f32 xPos, f32 zPos, s32 state, f32 scale);
@@ -226,9 +226,9 @@ void Actor189_Update(Actor*);
 void Obj39_Update(Object_80*);
 void func_enmy2_8006ECBC(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
 void func_enmy2_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
-void func_enmy2_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot,
+void func_enmy2_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot,
                    f32 zRot);
-void ActorEvent_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3);
+void ActorEvent_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
 void ActorEvent_8006F254(Actor*);
 void ActorEvent_Update(Actor*);
 s32 Obj111_Draw(Object_80*);
@@ -273,7 +273,6 @@ void func_effect_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_8007968C(Effect*);
-bool func_effect_800798C4(s32 , Gfx** , Vec3f* , Vec3f* , void* ); //OverrideLimbDraw
 void func_effect_800798F0(Effect* );
 void func_effect_8007A28C(Effect* );
 void func_effect_8007A3C0(Effect* );
@@ -454,7 +453,7 @@ void func_play_800A5D6C(void);
 void func_play_800A5EBC(void);
 void func_play_800A5FA0(f32* , u32 , s32 );
 void func_play_800A6070(f32* , u32 );
-void func_play_800A6148(void);
+void Play_ClearObjectData(void);
 void func_play_800A69F8(s32 , f32 , f32 , f32 );
 void Player_ApplyDamage(Player* player, s32 direction, s32 damage);
 bool func_play_800A73E4(f32* , s32* , f32 xPos, f32 yPos, f32 zPos);
@@ -505,8 +504,6 @@ void OvlMenu_CallFunction(u32, void*);
 void Map_8019E8D0(void);
 
 void Venom1_80198414(void);
-// s32 Venom1_801937F4(s32, Gfx**, Vec3f*, Vec3f*, void*);
-// void Venom1_80193D64(s32, Vec3f*, void*);
 
 void Ending_8018A96C(void);
 void Ending_8018AAC4(void);
diff --git a/include/gfx.h b/include/gfx.h
index 5702f65f..38a54724 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -118,23 +118,23 @@ s32 Animation_GetFrameCount(Animation *animationSegment);
 void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f *min, Vec3f *max, s32 *vtxFound, s32 *vtxCount, Vtx* *vtxList);
 void Animation_GetDListBoundingBox(Gfx *dList, s32 len, Vec3f *min, Vec3f *max);
 void Animation_GetSkeletonBoundingBox(Limb** skeletonSegment, Animation *animationSegment, s32 frame, Vec3f *min, Vec3f* max);
-void TextureRect_4bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_4bCI_Flip(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_4bCI_MirX(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_4bCI_MirY(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_8bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_16bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_16bRGBA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_8bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_8bIA_FilpMirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_8bIA_FilpMirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_8bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_8bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_16bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_16bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_16bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_16bIA_MirXY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void TextureRect_32bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI_Flip(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI_MirX(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI_MirY(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bCI(Gfx **gfxPtr, u8* texture, u16* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bRGBA(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bRGBA_MirX(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_FilpMirX(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_FilpMirY(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_MirX(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_MirY(Gfx **gfxPtr, u8* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA_MirX(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA_MirY(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA_MirXY(Gfx **gfxPtr, u16* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_32bRGBA(Gfx **gfxPtr, u32* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
 void Graphics_FillRectangle(Gfx **gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8 r, u8 g, u8 b, u8 a);
 u16*  Graphics_SetupTextureRender(Gfx **gfxPtr, u8 width, u8 height);
 void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number);
diff --git a/include/sf64event.h b/include/sf64event.h
index 3e68d542..1516f3f8 100644
--- a/include/sf64event.h
+++ b/include/sf64event.h
@@ -106,6 +106,7 @@
 #define EVENT_DAMAGE_TEAM(teamId, damage) EVENT_CMD(EVOP_DAMAGE_TEAM, damage, teamId)
 #define EVENT_SET_TARGET(teamId, spread) EVENT_CMD(EVOP_SET_TARGET, teamId, spread)
 #define EVENT_CHASE_TARGET(duration, turnRate) EVENT_CMD(EVOP_CHASE_TARGET, duration, turnRate)
+#define EVENT_SET_WAIT(duration) EVENT_CMD(EVOP_SET_WAIT, 0, duration)
 
 typedef enum EventModeZ {
     EMZ_REST,
diff --git a/include/sf64mesg.h b/include/sf64mesg.h
index 924ba659..db1369bf 100644
--- a/include/sf64mesg.h
+++ b/include/sf64mesg.h
@@ -21,10 +21,10 @@ bool Message_IsPrintingChar(u16* msgPtr, s32 charPos);
 typedef enum RadioCharacterId {
     RCID_FOX = 0,
     RCID_FOX_OPEN,
-    RCID_FOX_RED = 5,
-    RCID_FOX_RED_OPEN,
     RCID_STATIC = 2,
     RCID_STATIC_FLIP,
+    RCID_FOX_RED = 5,
+    RCID_FOX_RED_OPEN,
     RCID_FALCO = 10,
     RCID_FALCO_OPEN,
     RCID_FALCO_RED = 15,
@@ -97,6 +97,7 @@ typedef enum RadioCharacterId {
     RCID_TR_OPEN,
     RCID_FOX_EXPERT = 400,
     RCID_FOX_EXPERT_OPEN,
+    RCID_1000 = 1000,
 } RadioCharacterId;
 
 void Radio_PlayMessage(u16*, enum RadioCharacterId);
@@ -119,7 +120,7 @@ typedef enum {
     MSGCHAR_SPC,
     MSGCHAR_QSP,
     MSGCHAR_HSP,
-    MSGCHAR_NPF,
+    MSGCHAR_NXT,
     MSGCHAR_CLF,
     MSGCHAR_CUP,
     MSGCHAR_CRT,
diff --git a/include/sf64player.h b/include/sf64player.h
index 9504ab37..f00437c3 100644
--- a/include/sf64player.h
+++ b/include/sf64player.h
@@ -311,7 +311,7 @@ typedef struct Player {
     /* 0x498 */ s32 timer_498;
     /* 0x49C */ WingInfo wings;
     /* 0x4D8 */ f32 unk_4D8;
-    /* 0x4DC */ s32 unk_4DC;
+    /* 0x4DC */ s32 somersault;
 } Player; // size = 0x4E0
 
 
diff --git a/include/sf64thread.h b/include/sf64thread.h
index 9c43bc72..e56936dd 100644
--- a/include/sf64thread.h
+++ b/include/sf64thread.h
@@ -85,7 +85,7 @@ void Timer_SetValue(s32* address, s32 value);
 void Timer_CompleteTask(TimerTask*);
 void Timer_Wait(u64);
 
-void Fault_ThreadEntry(void*);
+void Fault_ThreadEntry(OSMesg);
 void func_80007FE4(FrameBuffer*, u16, u16);
 void Fault_Init(void);
 
@@ -127,32 +127,32 @@ extern OSMesgQueue gPiMgrCmdQueue; // 800E2010
 extern OSMesg sPiMgrCmdBuff[50]; // 800E2028
 
 extern OSMesgQueue gDmaMsgQueue;
-extern void* sDmaMsgBuff[1];
+extern OSMesg sDmaMsgBuff[1];
 extern OSIoMesg gDmaIOMsg;
 extern OSMesgQueue gSerialEventQueue;
-extern void* sSerialEventBuff[1];
+extern OSMesg sSerialEventBuff[1];
 extern OSMesgQueue gMainThreadMsgQueue;
-extern void* sMainThreadMsgBuff[32];
+extern OSMesg sMainThreadMsgBuff[32];
 extern OSMesgQueue gTaskMsgQueue;
-extern void* sTaskMsgBuff[16];
+extern OSMesg sTaskMsgBuff[16];
 extern OSMesgQueue gAudioVImsgQueue;
-extern void* sAudioVImsgBuff[1];
+extern OSMesg sAudioVImsgBuff[1];
 extern OSMesgQueue gAudioTaskMsgQueue;
-extern void* sAudioTaskMsgBuff[1];
+extern OSMesg sAudioTaskMsgBuff[1];
 extern OSMesgQueue gGfxVImsgQueue;
-extern void* sGfxVImsgBuff[4];
+extern OSMesg sGfxVImsgBuff[4];
 extern OSMesgQueue gGfxTaskMsgQueue;
-extern void* sGfxTaskMsgBuff[2];
+extern OSMesg sGfxTaskMsgBuff[2];
 extern OSMesgQueue gSerialThreadMsgQueue;
-extern void* sSerialThreadMsgBuff[8];
+extern OSMesg sSerialThreadMsgBuff[8];
 extern OSMesgQueue gControllerMsgQueue;
-extern void* sControllerMsgBuff[1];
+extern OSMesg sControllerMsgBuff[1];
 extern OSMesgQueue gSaveMsgQueue;
-extern void* sSaveMsgBuff[1];
+extern OSMesg sSaveMsgBuff[1];
 extern OSMesgQueue gTimerTaskMsgQueue;
-extern void* sTimerTaskMsgBuff[16];
+extern OSMesg sTimerTaskMsgBuff[16];
 extern OSMesgQueue gTimerWaitMsgQueue;
-extern void* sTimerWaitMsgBuff[1];
+extern OSMesg sTimerWaitMsgBuff[1];
 
 extern GfxPool gGfxPools[2]; // 800E23B0
 
diff --git a/include/sys.h b/include/sys.h
index da2c0952..04b1d522 100644
--- a/include/sys.h
+++ b/include/sys.h
@@ -55,8 +55,8 @@ extern u16 D_game_80161A34;
 extern u16 gBgColor;
 extern u8 gBlurAlpha;
 extern u8 D_game_80161A39;
-extern f32 D_game_80161A3C;
-extern f32 D_game_80161A40;
-extern f32 D_game_80161A44;
+extern f32 gFovY;
+extern f32 gProjectNear;
+extern f32 gProjectFar;
 
 #endif
diff --git a/include/variables.h b/include/variables.h
index cd42ca3b..62aade6d 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -22,8 +22,8 @@ extern Vec3f D_tank_800C9F2C;
 // fox_display
 extern s32 D_display_800CA220;
 extern f32 D_display_800CA230;
-extern Actor* D_display_800CA234;
-extern s32 D_display_Timer_800CA238;
+extern Actor* gTeamHelpActor;
+extern s32 gTeamHelpTimer;
 
 // fox_edata
 extern f32 gActor241Hitbox[];