diff --git a/include/functions.h b/include/functions.h
index 83bdfbad1d..c377fa25ea 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -525,11 +525,11 @@ void func_800A817C(void); // func_800A817C
 void func_800A81A4(void); // func_800A81A4
 void func_800A81F0(void); // func_800A81F0
 void func_800A8514(void); // func_800A8514
-void func_800A8558(void); // func_800A8558
-void func_800A8610(void); // func_800A8610
-void func_800A8720(void); // func_800A8720
-void func_800A8854(void); // func_800A8854
-void func_800A8860(void); // func_800A8860
+void EffectBlure_Initcommon(EffBlureParams* params); // func_800A8558
+void EffectBlure_Init1(EffBlureParams* params, EffBlureInit1* init); // func_800A8610
+void EffectBlure_Init2(EffBlureParams* params, EffBlureInit2* init); // func_800A8720
+void EffectBlure_Destroy(EffBlureParams* params); // func_800A8854
+s32 EffectBlure_Update(EffBlureParams* params); // func_800A8860
 void func_800A8C78(void); // func_800A8C78
 void func_800A8DE8(void); // func_800A8DE8
 void func_800A92FC(void); // func_800A92FC
@@ -540,16 +540,16 @@ void func_800AA460(void); // func_800AA460
 void func_800AA498(void); // func_800AA498
 void func_800AA700(void); // func_800AA700
 void func_800AABE0(void); // func_800AABE0
-void func_800AB0EC(void); // func_800AB0EC
-void func_800AB5D0(void); // func_800AB5D0
-void func_800AB808(void); // func_800AB808
-void func_800AB894(void); // func_800AB894
-void func_800AB9F8(void); // func_800AB9F8
-void func_800AC718(void); // func_800AC718
-void func_800ACBF0(void); // func_800ACBF0
-void func_800ACFCC(void); // func_800ACFCC
-void func_800ACFD8(void); // func_800ACFD8
-void func_800AD09C(void); // func_800AD09C
+void EffectBlure_Draw(EffBlureParams* params, GraphicsContext* gCtxt); // func_800AB0EC
+void EffectShieldParticle_Init(EffShieldParticleParams* params, EffShieldParticleInit* init); // func_800AB5D0
+void EffectShieldParticle_Destroy(EffShieldParticleParams* params); // func_800AB808
+s32 EffectShieldParticle_Update(EffShieldParticleParams* params); // func_800AB894
+void EffectShieldParticle_CalculateColors(EffShieldParticleParams* params, ColorRGBA8* primColor, ColorRGBA8* envColor); // func_800AB9F8
+void EffectShieldParticle_Draw(EffShieldParticleParams* params, GraphicsContext* gCtxt); // func_800AC718
+void EffectSpark_Init(EffSparkParams* params, EffSparkParams* init); // func_800ACBF0
+void EffectSpark_Destroy(EffSparkParams* params); // func_800ACFCC
+s32 EffectSpark_Update(EffSparkParams* params); // func_800ACFD8
+void EffectSpark_Draw(EffSparkParams* params, GraphicsContext* gCtxt); // func_800AD09C
 void func_800AE2A0(void); // func_800AE2A0
 void func_800AE434(GlobalContext* ctxt, ColorRGBA8* color, short sParm3, short sParm4); // func_800AE434
 void func_800AE5A0(GlobalContext* ctxt); // func_800AE5A0
@@ -558,21 +558,21 @@ void func_800AE778(GlobalContext* ctxt, ColorRGBA8* color, short param_3, short
 void func_800AE8EC(GlobalContext* ctxt); // func_800AE8EC
 void func_800AE930(CollisionContext* bgCtxt, int param_2, float* param_3, float param_4, short param_5, BgPolygon* param_6, int param_7); // func_800AE930
 void func_800AEF44(void); // func_800AEF44
-void func_800AEF70(void); // func_800AEF70
-void func_800AEFA0(void); // func_800AEFA0
-void func_800AF044(void); // func_800AF044
-void func_800AF050(void); // func_800AF050
-void func_800AF284(void); // func_800AF284
-void func_800AF310(void); // func_800AF310
-void func_800AF710(void); // func_800AF710
-void func_800AF720(void); // func_800AF720
-void func_800AF87C(void); // func_800AF87C
-void func_800AF890(GlobalContext* ctxt); // func_800AF890
-void func_800AF960(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE4 param_6); // func_800AF960
-void func_800AFB24(void); // func_800AFB24
-void func_800AFC60(GlobalContext* ctxt); // func_800AFC60
-void func_800AFDCC(GlobalContext* ctxt, int param_2); // func_800AFDCC
-void func_800AFF24(void); // func_800AFF24
+void EffectTireMark_InitParticle(EffTireMarkParticle* particle); // func_800AEF70
+void EffectTireMark_Init(EffTireMarkParams* params, EffTireMarkInit* init); // func_800AEFA0
+void EffectTireMark_Destroy(EffTireMarkParams* params); // func_800AF044
+s32 EffectTireMark_Update(EffTireMarkParams* params); // func_800AF050
+void EffectTireMark_InitVertices(F3DVertexColor* vertices, EffTireMarkParticle* particle, s32 index, s32 alpha); // func_800AF284
+void EffectTireMark_Draw(EffTireMarkParams* params, GraphicsContext* gCtxt); // func_800AF310
+GlobalContext* Effect_GetContext(void); // func_800AF710
+void* Effect_GetParams(s32 index); // func_800AF720
+void Effect_InitCommon(UNK_PTR param_1); // func_800AF87C
+void Effect_Init(GlobalContext* ctxt); // func_800AF890
+void Effect_Create(GlobalContext* ctxt, s32* index, s32 type, UNK_TYPE1 param_4, UNK_TYPE1 param_5, void* initParams); // func_800AF960
+void Effect_DrawAll(GraphicsContext* gCtxt); // func_800AFB24
+void Effect_UpdateAll(GlobalContext* ctxt); // func_800AFC60
+void Effect_Destroy(GlobalContext* ctxt, s32 index); // func_800AFDCC
+void Effect_DestroyAll(void); // func_800AFF24
 void EffectSS_Init(GlobalContext* ctxt, s32 numEntries); // func_800B0050
 void EffectSS_Clear(GlobalContext* ctxt); // func_800B0140
 LoadedParticleEntry* EffectSS_GetTable(void); // func_800B0200
@@ -1515,11 +1515,11 @@ void func_800E8160(void); // func_800E8160
 void func_800E823C(void); // func_800E823C
 void func_800E8318(void); // func_800E8318
 void func_800E8478(void); // func_800E8478
-void func_800E85D4(void); // func_800E85D4
+void func_800E85D4(UNK_TYPE4 param_1, Vec3f* param_2); // func_800E85D4
 void func_800E8668(void); // func_800E8668
 void func_800E8690(void); // func_800E8690
 void func_800E86C0(void); // func_800E86C0
-void func_800E86E0(void); // func_800E86E0
+void func_800E86E0(UNK_TYPE4 param_1, Vec3f* param_2, UNK_TYPE4 param_3); // func_800E86E0
 void func_800E8784(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8); // func_800E8784
 void func_800E8EA0(GlobalContext* ctxt, Actor* actor, u16 param_3); // func_800E8EA0
 s32 nop_800E8ED0(UNK_TYPE4 param_1); // func_800E8ED0
@@ -2324,13 +2324,20 @@ void func_8012BBE8(void); // func_8012BBE8
 void func_8012BC50(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7); // func_8012BC50
 void func_8012BD8C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7); // func_8012BD8C
 void func_8012BF08(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7); // func_8012BF08
-void func_8012BF3C(void); // func_8012BF3C
+Gfx* func_8012BF3C(Gfx* param_1, s32 param_2); // func_8012BF3C
 void func_8012BF78(void); // func_8012BF78
 void func_8012BF98(void); // func_8012BF98
 void func_8012BFC4(void); // func_8012BFC4
+UNK_PTR func_8012BFEC(UNK_PTR param_1); // func_8012BFEC
 void func_8012C014(void); // func_8012C014
+void func_8012C058(int param_1); // func_8012C058
 void func_8012C080(void); // func_8012C080
+void func_8012C0A8(int param_1); // func_8012C0A8
+void func_8012C0D0(int param_1); // func_8012C0D0
+void func_8012C0F8(int param_1); // func_8012C0F8
+void func_8012C120(int param_1); // func_8012C120
 void func_8012C148(void); // func_8012C148
+void func_8012C170(int param_1); // func_8012C170
 void func_8012C198(void); // func_8012C198
 void func_8012C1C0(void); // func_8012C1C0
 void func_8012C1EC(void); // func_8012C1EC
@@ -2341,30 +2348,48 @@ void func_8012C28C(GraphicsContext* gCtxt); // func_8012C28C
 void func_8012C2B4(void); // func_8012C2B4
 void func_8012C2DC(GraphicsContext* gCtxt); // func_8012C2DC
 void func_8012C304(void); // func_8012C304
+void func_8012C32C(int param_1); // func_8012C32C
+void func_8012C354(int param_1); // func_8012C354
+void func_8012C37C(int param_1); // func_8012C37C
 void func_8012C3A4(void); // func_8012C3A4
 void func_8012C3CC(void); // func_8012C3CC
 void func_8012C3F4(void); // func_8012C3F4
+void func_8012C420(int param_1); // func_8012C420
 void func_8012C448(GraphicsContext* gCtxt); // func_8012C448
 void func_8012C470(void); // func_8012C470
+UNK_PTR func_8012C498(UNK_PTR param_1); // func_8012C498
 void func_8012C4C0(void); // func_8012C4C0
-void func_8012C560(void); // func_8012C560
+void func_8012C4E8(int param_1); // func_8012C4E8
+void func_8012C510(int param_1); // func_8012C510
+void func_8012C538(int param_1); // func_8012C538
+void func_8012C560(GraphicsContext* gCtxt); // func_8012C560
 void func_8012C588(void); // func_8012C588
 void func_8012C5B0(void); // func_8012C5B0
+void func_8012C5D8(int param_1); // func_8012C5D8
 void func_8012C600(void); // func_8012C600
 void func_8012C628(GraphicsContext* gCtxt); // func_8012C628
 void func_8012C654(void); // func_8012C654
 void func_8012C680(void); // func_8012C680
 void func_8012C6AC(void); // func_8012C6AC
+void func_8012C6D4(int param_1); // func_8012C6D4
 void func_8012C6FC(void); // func_8012C6FC
 void func_8012C724(void); // func_8012C724
+UNK_PTR func_8012C74C(UNK_PTR param_1); // func_8012C74C
+UNK_PTR func_8012C774(UNK_PTR param_1); // func_8012C774
+UNK_PTR func_8012C7B8(UNK_PTR param_1); // func_8012C7B8
 Gfx* func_8012C7FC(Gfx* puParm1); // func_8012C7FC
+UNK_PTR func_8012C840(UNK_PTR param_1); // func_8012C840
 void func_8012C868(void); // func_8012C868
 void func_8012C8AC(GraphicsContext* gCtxt); // func_8012C8AC
 void func_8012C8D4(void); // func_8012C8D4
+void func_8012C8FC(int param_1); // func_8012C8FC
+void func_8012C924(int param_1); // func_8012C924
 void func_8012C94C(void); // func_8012C94C
 void func_8012C974(void); // func_8012C974
 void func_8012C9BC(void); // func_8012C9BC
+void func_8012C9E4(int param_1); // func_8012C9E4
 void func_8012CA0C(void); // func_8012CA0C
+void func_8012CA38(int param_1); // func_8012CA38
 void func_8012CA60(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5); // func_8012CA60
 void func_8012CB04(void); // func_8012CB04
 void func_8012CB28(void); // func_8012CB28
@@ -2732,7 +2757,7 @@ s32 func_8013FD74(View* view); // func_8013FD74
 s32 func_80140024(View* view); // func_80140024
 s32 func_801400CC(View* view, Gfx** param_2); // func_801400CC
 void func_80140260(void); // func_80140260
-void func_8014026C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE1 param_9, UNK_TYPE4 param_10, UNK_TYPE2 param_11, UNK_TYPE4 param_12, UNK_TYPE4 param_13); // func_8014026C
+void func_8014026C(OSViMode* param_1, UNK_TYPE1 param_2, int param_3, int param_4, int param_5, int param_6, int param_7, int param_8, UNK_TYPE4 param_9, int param_10, short param_11, unsigned int param_12, UNK_TYPE4 param_13); // func_8014026C
 void func_80140730(void); // func_80140730
 void func_80140810(void); // func_80140810
 void func_80140898(void); // func_80140898
@@ -3739,8 +3764,8 @@ void func_8019AB40(void); // func_8019AB40
 void func_8019AC10(void); // func_8019AC10
 void func_8019ACEC(void); // func_8019ACEC
 void func_8019ADBC(void); // func_8019ADBC
-void FUN_8019ae40(int param_1, int param_2, unsigned int param_3, int param_4); // func_8019AE40
-void FUN_8019aec0(UNK_PTR param_1, UNK_PTR param_2); // func_8019AEC0
+void func_8019AE40(int param_1, int param_2, unsigned int param_3, int param_4); // func_8019AE40
+void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2); // func_8019AEC0
 void func_8019AF00(void); // func_8019AF00
 void func_8019AF58(void); // func_8019AF58
 void func_8019AFE8(void); // func_8019AFE8
@@ -4054,9 +4079,8 @@ void func_8080742C(void); // func_8080742C
 void func_808074B4(void); // func_808074B4
 void func_808077AC(void); // func_808077AC
 void func_80807940(void); // func_80807940
+void func_80807A78(int param_1, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4); // func_80807A78
 void func_80807C58(void); // func_80807C58
-void func_80808000(void); // func_80808000
-void func_80808080(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6); // func_80808080
 void func_80808214(void); // func_80808214
 void func_80808D30(void); // func_80808D30
 void func_80808F1C(void); // func_80808F1C
diff --git a/include/structs.h b/include/structs.h
index 8797b5f51c..9a417f4ea7 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -206,6 +206,49 @@ typedef struct {
 /* 0x1C */ OSMesg notifyMsg; // Completion notification message
 } DmaRequest; // size = 0x20
 
+typedef struct {
+/* 0x000 */ UNK_TYPE1 pad0[0x184];
+/* 0x184 */ ColorRGBA8 unk184;
+/* 0x188 */ ColorRGBA8 unk188;
+/* 0x18C */ ColorRGBA8 unk18C;
+/* 0x190 */ ColorRGBA8 unk190;
+/* 0x194 */ UNK_TYPE1 pad194[0xC];
+} EffBlureInit1; // size = 0x1A0
+
+typedef struct {
+/* 0x00 */ UNK_TYPE1 pad0[0x8];
+/* 0x08 */ ColorRGBA8 unk8;
+/* 0x0C */ ColorRGBA8 unkC;
+/* 0x10 */ ColorRGBA8 unk10;
+/* 0x14 */ ColorRGBA8 unk14;
+/* 0x18 */ UNK_TYPE1 pad18[0xC];
+} EffBlureInit2; // size = 0x24
+
+typedef struct {
+/* 0x00 */ UNK_TYPE1 pad0[0x18];
+} EffBlureParticle; // size = 0x18
+
+typedef struct {
+/* 0x0 */ u8 active;
+/* 0x1 */ UNK_TYPE1 pad1[0x3];
+} EffCommon; // size = 0x4
+
+typedef struct {
+/* 0x00 */ f32 startSpeed;
+/* 0x04 */ f32 endXChange;
+/* 0x08 */ f32 endX;
+/* 0x0C */ f32 startXChange;
+/* 0x10 */ f32 startX;
+/* 0x14 */ s16 rotationY;
+/* 0x16 */ s16 rotationZ;
+} EffShieldParticleParticle; // size = 0x18
+
+typedef struct {
+/* 0x0 */ s16 unk0;
+/* 0x2 */ s16 maxLife;
+/* 0x4 */ ColorRGBA8 color;
+} EffTireMarkInit; // size = 0x8
+
 typedef enum EffectSSType {
     EFFECT_SS2_TYPE_DUST = 0x0,
     EFFECT_SS2_TYPE_SPARKLE = 0x1,
@@ -678,6 +721,14 @@ typedef struct {
 
 typedef void(*actor_init_var_func)(u8*, ActorInitVar*);
 
+typedef void(*eff_destroy_func)(void* params);
+
+typedef void(*eff_draw_func)(void* params, GraphicsContext* gCtxt);
+
+typedef void(*eff_init_func)(void* params, void* init);
+
+typedef s32(*eff_update_func)(void* params);
+
 typedef void*(*fault_address_converter_func)(void* addr, void* arg);
 
 typedef void(*fault_client_func)(void* arg1, void* arg2);
@@ -896,6 +947,64 @@ typedef struct {
 /* 0x18 */ Vec3f unk18;
 } ColTriParamsInit; // size = 0x24
 
+typedef struct {
+/* 0x000 */ EffBlureParticle particles[16];
+/* 0x180 */ UNK_TYPE1 pad180[0x4];
+/* 0x184 */ f32 unk184;
+/* 0x188 */ u16 unk188;
+/* 0x18A */ UNK_TYPE1 pad18A[0x4];
+/* 0x18E */ ColorRGBA8 unk18E;
+/* 0x192 */ ColorRGBA8 unk192;
+/* 0x196 */ ColorRGBA8 unk196;
+/* 0x19A */ ColorRGBA8 unk19A;
+/* 0x19E */ u8 unk19E;
+/* 0x19F */ u8 unk19F;
+/* 0x1A0 */ u8 unk1A0;
+/* 0x1A1 */ u8 unk1A1;
+/* 0x1A2 */ UNK_TYPE1 pad1A2[0xA];
+} EffBlureParams; // size = 0x1AC
+
+typedef struct {
+/* 0x00 */ u32 paramsSize;
+/* 0x04 */ eff_init_func init;
+/* 0x08 */ eff_destroy_func destroy;
+/* 0x0C */ eff_update_func update;
+/* 0x10 */ eff_draw_func draw;
+} EffInfo; // size = 0x14
+
+typedef struct {
+/* 0x00 */ u8 numParticles;
+/* 0x02 */ Vec3s position;
+/* 0x08 */ ColorRGBA8 primColorStart;
+/* 0x0C */ ColorRGBA8 envColorStart;
+/* 0x10 */ ColorRGBA8 primColorMid;
+/* 0x14 */ ColorRGBA8 envColorMid;
+/* 0x18 */ ColorRGBA8 primColorEnd;
+/* 0x1C */ ColorRGBA8 envColorEnd;
+/* 0x20 */ f32 acceleration;
+/* 0x24 */ f32 maxInitialSpeed;
+/* 0x28 */ f32 lengthCutoff;
+/* 0x2C */ u8 duration;
+/* 0x2E */ LightInfoPositionalParams lightParams;
+/* 0x3C */ s32 hasLight;
+} EffShieldParticleInit; // size = 0x40
+
+typedef struct {
+/* 0x00 */ Vec3f velocity;
+/* 0x0C */ Vec3f position;
+/* 0x18 */ Vec3s unk18;
+/* 0x1E */ Vec3s unk1E;
+} EffSparkParticle; // size = 0x24
+
+typedef struct {
+/* 0x00 */ UNK_TYPE2 active;
+/* 0x02 */ Vec3s position1;
+/* 0x08 */ Vec3s position2;
+/* 0x0E */ s16 life;
+/* 0x10 */ UNK_TYPE1 pad10[0x4];
+/* 0x14 */ UNK_TYPE4 unk14;
+} EffTireMarkParticle; // size = 0x18
+
 typedef struct {
 /* 0x00 */ Vec3f position;
 /* 0x0C */ Vec3f velocity;
@@ -1128,6 +1237,34 @@ typedef struct {
 /* 0x18 */ ColTriParamsInit params;
 } ColTriInit; // size = 0x3C
 
+typedef struct {
+/* 0x000 */ EffCommon base;
+/* 0x004 */ EffBlureParams params;
+} EffBlure; // size = 0x1B0
+
+typedef struct {
+/* 0x000 */ Vec3s position;
+/* 0x008 */ s32 numParticles; // Will be calculated as particleFactor1 * particleFactor2 + 2
+/* 0x00C */ EffSparkParticle particles[32];
+/* 0x48C */ f32 velocity;
+/* 0x490 */ f32 gravity;
+/* 0x494 */ u32 particleFactor1;
+/* 0x498 */ u32 particleFactor2;
+/* 0x49C */ ColorRGBA8 colorStart[4];
+/* 0x4AC */ ColorRGBA8 colorEnd[4];
+/* 0x4BC */ s32 age;
+/* 0x4C0 */ s32 duration;
+} EffSparkParams; // size = 0x4C4
+
+typedef struct {
+/* 0x000 */ EffTireMarkParticle particles[64];
+/* 0x600 */ s16 unk600;
+/* 0x602 */ s16 numParticles;
+/* 0x604 */ s16 maxLife;
+/* 0x606 */ ColorRGBA8 color;
+/* 0x60A */ UNK_TYPE1 pad60A[0x2];
+} EffTireMarkParams; // size = 0x60C
+
 typedef struct {
 /* 0x000 */ View view;
 /* 0x168 */ UNK_TYPE1 pad168[0x84];
@@ -1399,6 +1536,16 @@ typedef struct {
 /* 0xC */ ColTriInit* elemInit;
 } ColTriGroupInit; // size = 0x10
 
+typedef struct {
+/* 0x000 */ EffCommon base;
+/* 0x004 */ EffSparkParams params;
+} EffSpark; // size = 0x4C8
+
+typedef struct {
+/* 0x000 */ EffCommon base;
+/* 0x004 */ EffTireMarkParams params;
+} EffTireMark; // size = 0x610
+
 typedef struct {
 /* 0x00 */ s8 num;
 /* 0x01 */ u8 unk1;
@@ -1586,6 +1733,12 @@ typedef struct ActorBgIknvObj ActorBgIknvObj;
 
 typedef struct EffFootmark EffFootmark;
 
+typedef struct EffShieldParticle EffShieldParticle;
+
+typedef struct EffShieldParticleParams EffShieldParticleParams;
+
+typedef struct EffTables EffTables;
+
 typedef struct EffectTableInfo EffectTableInfo;
 
 typedef struct FaultAddrConvClient FaultAddrConvClient;
@@ -1947,6 +2100,28 @@ typedef struct s800B948C s800B948C;
 
 typedef struct z_Light z_Light;
 
+struct EffShieldParticleParams {
+/* 0x000 */ EffShieldParticleParticle particles[16];
+/* 0x180 */ u8 numParticles;
+/* 0x181 */ UNK_TYPE1 pad181[0x1];
+/* 0x182 */ Vec3s position;
+/* 0x188 */ ColorRGBA8 primColorStart;
+/* 0x18C */ ColorRGBA8 envColorStart;
+/* 0x190 */ ColorRGBA8 primColorMid;
+/* 0x194 */ ColorRGBA8 envColorMid;
+/* 0x198 */ ColorRGBA8 primColorEnd;
+/* 0x19C */ ColorRGBA8 envColorEnd;
+/* 0x1A0 */ f32 acceleration;
+/* 0x1A4 */ UNK_TYPE1 pad1A4[0x4];
+/* 0x1A8 */ f32 maxInitialSpeed;
+/* 0x1AC */ f32 lengthCutoff;
+/* 0x1B0 */ u8 duration;
+/* 0x1B1 */ u8 age;
+/* 0x1B2 */ LightInfo lightInfo;
+/* 0x1C0 */ z_Light* light;
+/* 0x1C4 */ s32 hasLight;
+}; // size = 0x1C8
+
 struct FireObjLight {
 /* 0x00 */ z_Light* light;
 /* 0x04 */ LightInfoPositional lightInfo;
@@ -1971,6 +2146,19 @@ struct z_Light {
 /* 0x8 */ z_Light* next;
 }; // size = 0xC
 
+struct EffShieldParticle {
+/* 0x000 */ EffCommon base;
+/* 0x004 */ EffShieldParticleParams params;
+}; // size = 0x1CC
+
+struct EffTables {
+/* 0x0000 */ GlobalContext* ctxt;
+/* 0x0004 */ EffSpark sparks[3];
+/* 0x0E5C */ EffBlure blures[25];
+/* 0x388C */ EffShieldParticle shieldParticles[3];
+/* 0x3DF0 */ EffTireMark tireMarks[15];
+}; // size = 0x98E0
+
 struct LightsList {
 /* 0x000 */ int numOccupied;
 /* 0x004 */ int nextFree;
diff --git a/include/variables.h b/include/variables.h
index 3e1bdd9c5c..d421bd1aa1 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -371,7 +371,7 @@ extern s32 D_801AE194[32]; // D_801AE194
 extern u8 D_801AE214[32]; // D_801AE214
 extern UNK_TYPE4 D_801AE240; // D_801AE240
 extern UNK_TYPE4 D_801AE250; // D_801AE250
-extern UNK_TYPE1 D_801AE260; // D_801AE260
+extern UNK_PTR D_801AE260[3]; // D_801AE260
 extern UNK_TYPE4 D_801AE26C; // D_801AE26C
 extern UNK_TYPE4 D_801AE27C; // D_801AE27C
 extern UNK_TYPE4 D_801AE28C; // D_801AE28C
@@ -380,13 +380,8 @@ extern UNK_TYPE4 D_801AE2AC; // D_801AE2AC
 extern UNK_TYPE4 D_801AE2BC; // D_801AE2BC
 extern UNK_TYPE4 D_801AE2CC; // D_801AE2CC
 extern UNK_TYPE4 D_801AE2DC; // D_801AE2DC
-extern UNK_TYPE1 D_801AE2F0; // D_801AE2F0
-extern UNK_TYPE1 D_801AE330; // D_801AE330
-extern UNK_TYPE1 D_801AE334; // D_801AE334
-extern UNK_PTR D_801AE338; // D_801AE338
-extern UNK_PTR D_801AE34C; // D_801AE34C
-extern UNK_PTR D_801AE374; // D_801AE374
-extern UNK_PTR D_801AE388; // D_801AE388
+extern F3DVertex sEffectShieldParticleVertices[4]; // D_801AE2F0
+extern EffInfo sEffInfoTable[5]; // D_801AE330
 extern EffectTableInfo EffectSS2Info; // D_801AE3A0
 extern UNK_TYPE1 D_801AE3B0; // D_801AE3B0
 extern UNK_TYPE1 D_801AE3B4; // D_801AE3B4
@@ -880,20 +875,14 @@ extern collision_func collisionFuncTableOTwithOT[25]; // D_801BA420
 extern ActorA0 D_801BA484; // D_801BA484
 extern UNK_PTR D_801BA4A0; // D_801BA4A0
 extern UNK_TYPE1 D_801BA4B4; // D_801BA4B4
-extern UNK_TYPE1 D_801BA4C8; // D_801BA4C8
-extern UNK_TYPE2 D_801BA4CA; // D_801BA4CA
-extern UNK_TYPE2 D_801BA4CC; // D_801BA4CC
-extern UNK_TYPE2 D_801BA4CE; // D_801BA4CE
-extern UNK_TYPE2 D_801BA4F6; // D_801BA4F6
-extern UNK_TYPE2 D_801BA4F8; // D_801BA4F8
-extern UNK_TYPE2 D_801BA4FA; // D_801BA4FA
-extern UNK_TYPE1 D_801BA508; // D_801BA508
-extern UNK_TYPE2 D_801BA50A; // D_801BA50A
-extern UNK_TYPE2 D_801BA50C; // D_801BA50C
-extern UNK_TYPE2 D_801BA50E; // D_801BA50E
-extern UNK_TYPE2 D_801BA536; // D_801BA536
-extern UNK_TYPE2 D_801BA538; // D_801BA538
-extern UNK_TYPE2 D_801BA53A; // D_801BA53A
+extern EffShieldParticleInit D_801BA4C8; // D_801BA4C8
+extern UNK_TYPE1 D_801BA4F6; // D_801BA4F6
+extern UNK_TYPE1 D_801BA4F8; // D_801BA4F8
+extern UNK_TYPE1 D_801BA4FA; // D_801BA4FA
+extern EffShieldParticleInit D_801BA508; // D_801BA508
+extern UNK_TYPE1 D_801BA536; // D_801BA536
+extern UNK_TYPE1 D_801BA538; // D_801BA538
+extern UNK_TYPE1 D_801BA53A; // D_801BA53A
 extern UNK_TYPE1 D_801BA550; // D_801BA550
 extern UNK_TYPE1 D_801BA750; // D_801BA750
 extern UNK_TYPE1 D_801BA790; // D_801BA790
@@ -910,7 +899,7 @@ extern UNK_TYPE1 D_801BAFB8; // D_801BAFB8
 extern UNK_TYPE1 D_801BAFF8; // D_801BAFF8
 extern UNK_TYPE1 D_801BB010; // D_801BB010
 extern UNK_TYPE1 D_801BB018; // D_801BB018
-extern UNK_PTR D_801BB050; // D_801BB050
+extern UNK_TYPE1 D_801BB050; // D_801BB050
 extern UNK_TYPE1 D_801BB058; // D_801BB058
 extern UNK_TYPE2 D_801BB068; // D_801BB068
 extern UNK_TYPE1 D_801BB08C; // D_801BB08C
@@ -2395,11 +2384,11 @@ extern f32 D_801D1570[13]; // D_801D1570
 extern Vec3f D_801D15B0; // D_801D15B0
 extern UNK_TYPE4 D_801D15BC; // D_801D15BC
 extern s16 atan_first_8th_array[1025]; // D_801D15D0
-extern UNK_TYPE1 D_801D1DE0; // D_801D1DE0
+extern RSPMatrix D_801D1DE0; // D_801D1DE0
 extern z_Matrix D_801D1E20; // D_801D1E20
 extern UNK_PTR D_801D1E60; // D_801D1E60
 extern UNK_PTR D_801D1E64; // D_801D1E64
-extern UNK_PTR D_801D1E70; // D_801D1E70
+extern UNK_TYPE1 D_801D1E70; // D_801D1E70
 extern UNK_TYPE1 D_801D2E80; // D_801D2E80
 extern UNK_TYPE1 D_801D2F80; // D_801D2F80
 extern UNK_TYPE1 D_801D3070; // D_801D3070
@@ -3866,19 +3855,11 @@ extern UNK_TYPE1 D_801E2160; // D_801E2160
 extern UNK_TYPE1 D_801E3790; // D_801E3790
 extern UNK_TYPE1 D_801E3F40; // D_801E3F40
 extern UNK_TYPE1 D_801E3FA0; // D_801E3FA0
-extern UNK_TYPE1 D_801E3FB0; // D_801E3FB0
-extern UNK_TYPE1 D_801E3FB4; // D_801E3FB4
-extern UNK_TYPE1 D_801E3FB8; // D_801E3FB8
+extern EffTables sEffTable; // D_801E3FB0
 extern UNK_TYPE1 D_801E4514; // D_801E4514
 extern UNK_TYPE1 D_801E4E08; // D_801E4E08
-extern UNK_TYPE1 D_801E4E0C; // D_801E4E0C
-extern UNK_TYPE1 D_801E4E10; // D_801E4E10
 extern UNK_TYPE1 D_801E531C; // D_801E531C
 extern UNK_TYPE1 D_801E69E0; // D_801E69E0
-extern UNK_TYPE1 D_801E783C; // D_801E783C
-extern UNK_TYPE1 D_801E7840; // D_801E7840
-extern UNK_TYPE1 D_801E7DA0; // D_801E7DA0
-extern UNK_TYPE1 D_801E7DA4; // D_801E7DA4
 extern UNK_TYPE1 D_801E9AA0; // D_801E9AA0
 extern UNK_TYPE1 D_801ED4C0; // D_801ED4C0
 extern UNK_TYPE1 D_801ED890; // D_801ED890
@@ -3990,45 +3971,12 @@ extern UNK_TYPE1 D_801EE1E8; // D_801EE1E8
 extern UNK_TYPE1 D_801EE1F0; // D_801EE1F0
 extern UNK_TYPE1 D_801EE1F4; // D_801EE1F4
 extern UNK_TYPE1 D_801EE1F8; // D_801EE1F8
-extern UNK_TYPE1 D_801EE200; // D_801EE200
-extern UNK_TYPE1 D_801EE202; // D_801EE202
-extern UNK_TYPE1 D_801EE204; // D_801EE204
-extern UNK_TYPE1 D_801EE68C; // D_801EE68C
-extern UNK_TYPE1 D_801EE690; // D_801EE690
-extern UNK_TYPE1 D_801EE694; // D_801EE694
-extern UNK_TYPE1 D_801EE698; // D_801EE698
-extern UNK_TYPE1 D_801EE6BC; // D_801EE6BC
-extern UNK_TYPE1 D_801EE6C0; // D_801EE6C0
+extern EffSparkParams D_801EE200; // D_801EE200
 extern ColTriParams D_801EE6C8; // D_801EE6C8
 extern ColTriParams D_801EE700; // D_801EE700
-extern UNK_TYPE1 D_801EE738; // D_801EE738
-extern UNK_TYPE1 D_801EE73A; // D_801EE73A
-extern UNK_TYPE1 D_801EE73C; // D_801EE73C
-extern UNK_TYPE1 D_801EEBC4; // D_801EEBC4
-extern UNK_TYPE1 D_801EEBC8; // D_801EEBC8
-extern UNK_TYPE1 D_801EEBCC; // D_801EEBCC
-extern UNK_TYPE1 D_801EEBD0; // D_801EEBD0
-extern UNK_TYPE1 D_801EEBF4; // D_801EEBF4
-extern UNK_TYPE1 D_801EEBF8; // D_801EEBF8
-extern UNK_TYPE1 D_801EEC00; // D_801EEC00
-extern UNK_TYPE1 D_801EEC02; // D_801EEC02
-extern UNK_TYPE1 D_801EEC04; // D_801EEC04
-extern UNK_TYPE1 D_801EF08C; // D_801EF08C
-extern UNK_TYPE1 D_801EF090; // D_801EF090
-extern UNK_TYPE1 D_801EF094; // D_801EF094
-extern UNK_TYPE1 D_801EF098; // D_801EF098
-extern UNK_TYPE1 D_801EF0BC; // D_801EF0BC
-extern UNK_TYPE1 D_801EF0C0; // D_801EF0C0
-extern UNK_TYPE1 D_801EF0C8; // D_801EF0C8
-extern UNK_TYPE1 D_801EF0CA; // D_801EF0CA
-extern UNK_TYPE1 D_801EF0CC; // D_801EF0CC
-extern UNK_TYPE1 D_801EF51D; // D_801EF51D
-extern UNK_TYPE1 D_801EF554; // D_801EF554
-extern UNK_TYPE1 D_801EF558; // D_801EF558
-extern UNK_TYPE1 D_801EF55C; // D_801EF55C
-extern UNK_TYPE1 D_801EF560; // D_801EF560
-extern UNK_TYPE1 D_801EF584; // D_801EF584
-extern UNK_TYPE1 D_801EF588; // D_801EF588
+extern EffSparkParams D_801EE738; // D_801EE738
+extern EffSparkParams D_801EEC00; // D_801EEC00
+extern EffSparkParams D_801EF0C8; // D_801EF0C8
 extern UNK_TYPE1 D_801EF590; // D_801EF590
 extern UNK_TYPE1 D_801EF5C8; // D_801EF5C8
 extern ColTriParams D_801EF600; // D_801EF600
@@ -4256,7 +4204,7 @@ extern UNK_TYPE1 D_801FBB10; // D_801FBB10
 extern UNK_TYPE1 D_801FBB14; // D_801FBB14
 extern UNK_TYPE1 D_801FBB20; // D_801FBB20
 extern UNK_TYPE1 D_801FBB28; // D_801FBB28
-extern UNK_TYPE1 D_801FBB30; // D_801FBB30
+extern OSViMode D_801FBB30; // D_801FBB30
 extern u32* gFramebuffers[2]; // D_801FBB80
 extern OSViMode* D_801FBB88; // D_801FBB88
 extern UNK_TYPE1 D_801FBB8C; // D_801FBB8C
@@ -4520,16 +4468,16 @@ extern UNK_TYPE1 D_802023FC; // D_802023FC
 extern UNK_TYPE1 D_80202878; // D_80202878
 extern UNK_TYPE1 D_80202880; // D_80202880
 extern UNK_TYPE1 D_802028BC; // D_802028BC
-extern UNK_TYPE1 D_80202980; // D_80202980
+extern OSMesgQueue D_80202980; // D_80202980
 extern UNK_TYPE1 D_802029D8; // D_802029D8
-extern UNK_TYPE1 D_80202AB0; // D_80202AB0
-extern UNK_TYPE1 D_80202AC8; // D_80202AC8
-extern UNK_TYPE1 D_80202B08; // D_80202B08
-extern UNK_TYPE1 D_80202B20; // D_80202B20
-extern UNK_TYPE1 D_80202B60; // D_80202B60
-extern UNK_TYPE1 D_80202B78; // D_80202B78
-extern UNK_TYPE1 D_80203278; // D_80203278
-extern UNK_TYPE1 D_80203290; // D_80203290
+extern OSMesgQueue D_80202AB0; // D_80202AB0
+extern OSMesg D_80202AC8[16]; // D_80202AC8
+extern OSMesgQueue D_80202B08; // D_80202B08
+extern OSMesg D_80202B20[16]; // D_80202B20
+extern OSMesgQueue D_80202B60; // D_80202B60
+extern OSMesg D_80202B78[64]; // D_80202B78
+extern OSMesgQueue D_80203278; // D_80203278
+extern OSMesg D_80203290[1]; // D_80203290
 extern UNK_TYPE1 D_80203294; // D_80203294
 extern UNK_TYPE1 D_802034C0; // D_802034C0
 extern UNK_TYPE1 D_802034C4; // D_802034C4
@@ -4633,11 +4581,11 @@ extern UNK_TYPE1 D_80208E9C; // D_80208E9C
 extern UNK_TYPE1 D_80208EA0; // D_80208EA0
 extern UNK_TYPE1 D_80209AA0; // D_80209AA0
 extern GfxPool gGfxPools[2]; // D_80209EA0
-extern UNK_TYPE1 D_8024A4C0; // D_8024A4C0
-extern u32 heap[1046224]; // D_803824C0
-extern UNK_TYPE1 D_80780000; // D_80780000
-extern UNK_TYPE1 D_80784600; // D_80784600
-extern UNK_TYPE1 D_807DA800; // D_807DA800
+extern u8 gAudioHeap[1277952]; // D_8024A4C0
+extern u32 gSystemHeap[1046224]; // D_803824C0
+extern u8 D_80780000[17920]; // D_80780000
+extern u8 D_80784600[352768]; // D_80784600
+extern u16 D_807DA800[76800]; // D_807DA800
 extern s16 titleRotation; // D_80800860
 extern UNK_TYPE1 D_80800868; // D_80800868
 extern UNK_TYPE1 D_80800870; // D_80800870
@@ -5406,9 +5354,8 @@ extern UNK_TYPE1 D_8085D2B4; // D_8085D2B4
 extern ActorInitVar D_8085D2C0; // D_8085D2C0
 extern UNK_TYPE4 D_8085D2C4; // D_8085D2C4
 extern UNK_PTR D_8085D2CC; // D_8085D2CC
-extern UNK_TYPE1 D_8085D30C; // D_8085D30C
-extern UNK_TYPE1 D_8085D330; // D_8085D330
-extern UNK_TYPE4 D_8085D334; // D_8085D334
+extern EffBlureInit2 D_8085D30C; // D_8085D30C
+extern EffTireMarkInit D_8085D330; // D_8085D330
 extern UNK_TYPE4 D_8085D338; // D_8085D338
 extern UNK_TYPE4 D_8085D33C; // D_8085D33C
 extern UNK_TYPE1 D_8085D340; // D_8085D340
@@ -6090,7 +6037,7 @@ extern UNK_TYPE1 D_808792C4; // D_808792C4
 extern UNK_TYPE1 D_808792D4; // D_808792D4
 extern UNK_TYPE1 D_808792F4; // D_808792F4
 extern UNK_TYPE1 D_808792FC; // D_808792FC
-extern UNK_TYPE1 D_80879308; // D_80879308
+extern EffBlureInit2 D_80879308; // D_80879308
 extern UNK_TYPE1 D_8087932C; // D_8087932C
 extern UNK_TYPE1 D_80879330; // D_80879330
 extern UNK_TYPE1 D_80879334; // D_80879334
@@ -6324,11 +6271,10 @@ extern u32 enHorseOverlayInfoOffset; // D_8088A23C
 extern UNK_TYPE1 D_8088C1C0; // D_8088C1C0
 extern UNK_TYPE1 D_8088C1E0; // D_8088C1E0
 extern UNK_TYPE1 D_8088C230; // D_8088C230
-extern UNK_TYPE1 D_8088C234; // D_8088C234
-extern UNK_TYPE1 D_8088C24C; // D_8088C24C
-extern UNK_TYPE1 D_8088C258; // D_8088C258
-extern UNK_TYPE1 D_8088C27C; // D_8088C27C
-extern UNK_TYPE1 D_8088C2A0; // D_8088C2A0
+extern EffBlureInit2 D_8088C234; // D_8088C234
+extern EffBlureInit2 D_8088C258; // D_8088C258
+extern EffBlureInit2 D_8088C27C; // D_8088C27C
+extern EffBlureInit2 D_8088C2A0; // D_8088C2A0
 extern UNK_TYPE4 D_8088C2C4; // D_8088C2C4
 extern UNK_TYPE1 D_8088C2CC; // D_8088C2CC
 extern UNK_TYPE1 D_8088C2D8; // D_8088C2D8
@@ -6550,7 +6496,7 @@ extern UNK_TYPE2 D_8089E34C; // D_8089E34C
 extern UNK_TYPE4 D_8089E350; // D_8089E350
 extern UNK_TYPE1 D_8089E354; // D_8089E354
 extern UNK_TYPE4 D_8089E364; // D_8089E364
-extern UNK_TYPE1 D_8089E368; // D_8089E368
+extern EffBlureInit2 D_8089E368; // D_8089E368
 extern UNK_TYPE1 D_8089E38C; // D_8089E38C
 extern UNK_TYPE1 D_8089E398; // D_8089E398
 extern UNK_TYPE1 D_8089E3A4; // D_8089E3A4
@@ -7122,7 +7068,7 @@ extern UNK_TYPE1 D_808C99B0; // D_808C99B0
 extern UNK_TYPE1 D_808C99C0; // D_808C99C0
 extern UNK_TYPE1 D_808C9A10; // D_808C9A10
 extern UNK_TYPE1 D_808C9A30; // D_808C9A30
-extern UNK_TYPE1 D_808C9A3C; // D_808C9A3C
+extern EffBlureInit2 D_808C9A3C; // D_808C9A3C
 extern UNK_TYPE1 D_808C9A60; // D_808C9A60
 extern UNK_TYPE1 D_808C9A70; // D_808C9A70
 extern UNK_TYPE1 D_808C9A7C; // D_808C9A7C
@@ -7747,7 +7693,7 @@ extern u32 enInOverlayInfoOffset; // D_808F74AC
 extern UNK_TYPE1 D_808F88C0; // D_808F88C0
 extern UNK_TYPE1 D_808F88E0; // D_808F88E0
 extern UNK_TYPE2 D_808F8908; // D_808F8908
-extern UNK_TYPE1 D_808F8914; // D_808F8914
+extern EffBlureInit2 D_808F8914; // D_808F8914
 extern UNK_TYPE1 D_808F8938; // D_808F8938
 extern UNK_TYPE1 D_808F8944; // D_808F8944
 extern UNK_TYPE1 D_808F8950; // D_808F8950
@@ -8596,7 +8542,7 @@ extern UNK_TYPE1 D_8092C120; // D_8092C120
 extern UNK_TYPE1 D_8092C140; // D_8092C140
 extern UNK_TYPE1 D_8092C160; // D_8092C160
 extern UNK_TYPE1 D_8092C168; // D_8092C168
-extern UNK_TYPE1 D_8092C174; // D_8092C174
+extern EffBlureInit2 D_8092C174; // D_8092C174
 extern UNK_TYPE4 D_8092C198; // D_8092C198
 extern UNK_TYPE1 D_8092C19C; // D_8092C19C
 extern UNK_TYPE1 D_8092C1A8; // D_8092C1A8
@@ -8948,7 +8894,7 @@ extern UNK_TYPE1 D_80942E54; // D_80942E54
 extern UNK_TYPE1 D_80942E60; // D_80942E60
 extern UNK_TYPE1 D_80942E6C; // D_80942E6C
 extern UNK_TYPE1 D_80942E78; // D_80942E78
-extern UNK_TYPE1 D_80942E8C; // D_80942E8C
+extern EffTireMarkInit D_80942E8C; // D_80942E8C
 extern UNK_TYPE1 D_80942E94; // D_80942E94
 extern UNK_TYPE1 D_80942E9C; // D_80942E9C
 extern UNK_TYPE1 D_80942EAC; // D_80942EAC
@@ -11378,8 +11324,8 @@ extern UNK_TYPE1 D_80A07F08; // D_80A07F08
 extern UNK_TYPE1 D_80A07F0C; // D_80A07F0C
 extern UNK_TYPE1 D_80A07F3C; // D_80A07F3C
 extern UNK_TYPE2 D_80A07F54; // D_80A07F54
-extern UNK_TYPE1 D_80A07F5C; // D_80A07F5C
-extern UNK_TYPE1 D_80A07F64; // D_80A07F64
+extern EffTireMarkInit D_80A07F5C; // D_80A07F5C
+extern EffTireMarkInit D_80A07F64; // D_80A07F64
 extern UNK_TYPE4 D_80A07F6C; // D_80A07F6C
 extern UNK_TYPE4 D_80A07FA8; // D_80A07FA8
 extern UNK_TYPE4 D_80A07FB4; // D_80A07FB4
@@ -11699,7 +11645,7 @@ extern UNK_TYPE1 D_80A166A4; // D_80A166A4
 extern UNK_TYPE1 D_80A166B0; // D_80A166B0
 extern UNK_TYPE1 D_80A166BC; // D_80A166BC
 extern UNK_TYPE1 D_80A166D4; // D_80A166D4
-extern UNK_TYPE4 D_80A166DC; // D_80A166DC
+extern EffTireMarkInit D_80A166DC; // D_80A166DC
 extern UNK_TYPE4 D_80A166E4; // D_80A166E4
 extern UNK_TYPE1 D_80A16704; // D_80A16704
 extern UNK_TYPE1 D_80A1670C; // D_80A1670C
@@ -12453,8 +12399,8 @@ extern UNK_TYPE1 D_80A4168C; // D_80A4168C
 extern UNK_PTR D_80A4169C; // D_80A4169C
 extern UNK_PTR D_80A416C0; // D_80A416C0
 extern UNK_TYPE1 D_80A416E0; // D_80A416E0
-extern UNK_TYPE1 D_80A417BC; // D_80A417BC
-extern UNK_TYPE1 D_80A417E0; // D_80A417E0
+extern EffBlureInit2 D_80A417BC; // D_80A417BC
+extern EffTireMarkInit D_80A417E0; // D_80A417E0
 extern UNK_TYPE1 D_80A417E8; // D_80A417E8
 extern UNK_PTR D_80A417EC; // D_80A417EC
 extern UNK_TYPE1 D_80A41828; // D_80A41828
@@ -12816,7 +12762,7 @@ extern UNK_TYPE1 D_80A5842C; // D_80A5842C
 extern UNK_TYPE1 D_80A5844C; // D_80A5844C
 extern UNK_TYPE4 D_80A58454; // D_80A58454
 extern UNK_TYPE1 D_80A58464; // D_80A58464
-extern UNK_TYPE1 D_80A58470; // D_80A58470
+extern EffBlureInit2 D_80A58470; // D_80A58470
 extern UNK_TYPE4 D_80A58494; // D_80A58494
 extern UNK_TYPE1 D_80A58498; // D_80A58498
 extern UNK_TYPE1 D_80A584A4; // D_80A584A4
@@ -15662,13 +15608,10 @@ extern u32 bgGoronOyuOverlayRelocations[20]; // D_80B407A4
 extern u32 bgGoronOyuOverlayInfoOffset; // D_80B407FC
 extern UNK_TYPE1 D_80B43250; // D_80B43250
 extern UNK_TYPE1 D_80B43270; // D_80B43270
-extern UNK_TYPE1 D_80B43298; // D_80B43298
-extern UNK_TYPE2 D_80B4329A; // D_80B4329A
-extern UNK_TYPE2 D_80B4329C; // D_80B4329C
-extern UNK_TYPE2 D_80B4329E; // D_80B4329E
-extern UNK_TYPE2 D_80B432C6; // D_80B432C6
-extern UNK_TYPE2 D_80B432C8; // D_80B432C8
-extern UNK_TYPE2 D_80B432CA; // D_80B432CA
+extern EffShieldParticleInit D_80B43298; // D_80B43298
+extern UNK_TYPE1 D_80B432C6; // D_80B432C6
+extern UNK_TYPE1 D_80B432C8; // D_80B432C8
+extern UNK_TYPE1 D_80B432CA; // D_80B432CA
 extern UNK_TYPE1 D_80B432D8; // D_80B432D8
 extern UNK_TYPE1 D_80B432E4; // D_80B432E4
 extern UNK_TYPE4 D_80B432F0; // D_80B432F0
@@ -16974,7 +16917,7 @@ extern UNK_TYPE1 D_80BB3EC8; // D_80BB3EC8
 extern UNK_TYPE1 D_80BB3ED4; // D_80BB3ED4
 extern UNK_TYPE1 D_80BB3EF4; // D_80BB3EF4
 extern UNK_TYPE1 D_80BB4044; // D_80BB4044
-extern UNK_TYPE4 D_80BB405C; // D_80BB405C
+extern EffTireMarkInit D_80BB405C; // D_80BB405C
 extern UNK_TYPE4 D_80BB4064; // D_80BB4064
 extern UNK_TYPE4 D_80BB4070; // D_80BB4070
 extern UNK_TYPE1 D_80BB407C; // D_80BB407C
@@ -17760,7 +17703,7 @@ extern UNK_TYPE1 D_80BF5934; // D_80BF5934
 extern UNK_TYPE1 D_80BF5954; // D_80BF5954
 extern UNK_TYPE1 D_80BF5960; // D_80BF5960
 extern UNK_TYPE1 D_80BF596C; // D_80BF596C
-extern UNK_TYPE1 D_80BF59F0; // D_80BF59F0
+extern EffTireMarkInit D_80BF59F0; // D_80BF59F0
 extern UNK_TYPE1 D_80BF59F8; // D_80BF59F8
 extern UNK_TYPE4 D_80BF5A10; // D_80BF5A10
 extern UNK_TYPE4 D_80BF5A14; // D_80BF5A14
diff --git a/tables/functions.txt b/tables/functions.txt
index 738f564414..625171361b 100644
--- a/tables/functions.txt
+++ b/tables/functions.txt
@@ -522,11 +522,11 @@
     0x800A81A4:("func_800A81A4","void","void"),
     0x800A81F0:("func_800A81F0","void","void"),
     0x800A8514:("func_800A8514","void","void"),
-    0x800A8558:("func_800A8558","void","void"),
-    0x800A8610:("func_800A8610","void","void"),
-    0x800A8720:("func_800A8720","void","void"),
-    0x800A8854:("func_800A8854","void","void"),
-    0x800A8860:("func_800A8860","void","void"),
+    0x800A8558:("EffectBlure_Initcommon","void","EffBlureParams* params"),
+    0x800A8610:("EffectBlure_Init1","void","EffBlureParams* params, EffBlureInit1* init"),
+    0x800A8720:("EffectBlure_Init2","void","EffBlureParams* params, EffBlureInit2* init"),
+    0x800A8854:("EffectBlure_Destroy","void","EffBlureParams* params"),
+    0x800A8860:("EffectBlure_Update","s32","EffBlureParams* params"),
     0x800A8C78:("func_800A8C78","void","void"),
     0x800A8DE8:("func_800A8DE8","void","void"),
     0x800A92FC:("func_800A92FC","void","void"),
@@ -537,16 +537,16 @@
     0x800AA498:("func_800AA498","void","void"),
     0x800AA700:("func_800AA700","void","void"),
     0x800AABE0:("func_800AABE0","void","void"),
-    0x800AB0EC:("func_800AB0EC","void","void"),
-    0x800AB5D0:("func_800AB5D0","void","void"),
-    0x800AB808:("func_800AB808","void","void"),
-    0x800AB894:("func_800AB894","void","void"),
-    0x800AB9F8:("func_800AB9F8","void","void"),
-    0x800AC718:("func_800AC718","void","void"),
-    0x800ACBF0:("func_800ACBF0","void","void"),
-    0x800ACFCC:("func_800ACFCC","void","void"),
-    0x800ACFD8:("func_800ACFD8","void","void"),
-    0x800AD09C:("func_800AD09C","void","void"),
+    0x800AB0EC:("EffectBlure_Draw","void","EffBlureParams* params, GraphicsContext* gCtxt"),
+    0x800AB5D0:("EffectShieldParticle_Init","void","EffShieldParticleParams* params, EffShieldParticleInit* init"),
+    0x800AB808:("EffectShieldParticle_Destroy","void","EffShieldParticleParams* params"),
+    0x800AB894:("EffectShieldParticle_Update","s32","EffShieldParticleParams* params"),
+    0x800AB9F8:("EffectShieldParticle_CalculateColors","void","EffShieldParticleParams* params, ColorRGBA8* primColor, ColorRGBA8* envColor"),
+    0x800AC718:("EffectShieldParticle_Draw","void","EffShieldParticleParams* params, GraphicsContext* gCtxt"),
+    0x800ACBF0:("EffectSpark_Init","void","EffSparkParams* params, EffSparkParams* init"),
+    0x800ACFCC:("EffectSpark_Destroy","void","EffSparkParams* params"),
+    0x800ACFD8:("EffectSpark_Update","s32","EffSparkParams* params"),
+    0x800AD09C:("EffectSpark_Draw","void","EffSparkParams* params, GraphicsContext* gCtxt"),
     0x800AE2A0:("func_800AE2A0","void","void"),
     0x800AE434:("func_800AE434","void","GlobalContext* ctxt, ColorRGBA8* color, short sParm3, short sParm4"),
     0x800AE5A0:("func_800AE5A0","void","GlobalContext* ctxt"),
@@ -555,21 +555,21 @@
     0x800AE8EC:("func_800AE8EC","void","GlobalContext* ctxt"),
     0x800AE930:("func_800AE930","void","CollisionContext* bgCtxt, int param_2, float* param_3, float param_4, short param_5, BgPolygon* param_6, int param_7"),
     0x800AEF44:("func_800AEF44","void","void"),
-    0x800AEF70:("func_800AEF70","void","void"),
-    0x800AEFA0:("func_800AEFA0","void","void"),
-    0x800AF044:("func_800AF044","void","void"),
-    0x800AF050:("func_800AF050","void","void"),
-    0x800AF284:("func_800AF284","void","void"),
-    0x800AF310:("func_800AF310","void","void"),
-    0x800AF710:("func_800AF710","void","void"),
-    0x800AF720:("func_800AF720","void","void"),
-    0x800AF87C:("func_800AF87C","void","void"),
-    0x800AF890:("func_800AF890","void","GlobalContext* ctxt"),
-    0x800AF960:("func_800AF960","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE4 param_6"),
-    0x800AFB24:("func_800AFB24","void","void"),
-    0x800AFC60:("func_800AFC60","void","GlobalContext* ctxt"),
-    0x800AFDCC:("func_800AFDCC","void","GlobalContext* ctxt, int param_2"),
-    0x800AFF24:("func_800AFF24","void","void"),
+    0x800AEF70:("EffectTireMark_InitParticle","void","EffTireMarkParticle* particle"),
+    0x800AEFA0:("EffectTireMark_Init","void","EffTireMarkParams* params, EffTireMarkInit* init"),
+    0x800AF044:("EffectTireMark_Destroy","void","EffTireMarkParams* params"),
+    0x800AF050:("EffectTireMark_Update","s32","EffTireMarkParams* params"),
+    0x800AF284:("EffectTireMark_InitVertices","void","F3DVertexColor* vertices, EffTireMarkParticle* particle, s32 index, s32 alpha"),
+    0x800AF310:("EffectTireMark_Draw","void","EffTireMarkParams* params, GraphicsContext* gCtxt"),
+    0x800AF710:("Effect_GetContext","GlobalContext*","void"),
+    0x800AF720:("Effect_GetParams","void*","s32 index"),
+    0x800AF87C:("Effect_InitCommon","void","UNK_PTR param_1"),
+    0x800AF890:("Effect_Init","void","GlobalContext* ctxt"),
+    0x800AF960:("Effect_Create","void","GlobalContext* ctxt, s32* index, s32 type, UNK_TYPE1 param_4, UNK_TYPE1 param_5, void* initParams"),
+    0x800AFB24:("Effect_DrawAll","void","GraphicsContext* gCtxt"),
+    0x800AFC60:("Effect_UpdateAll","void","GlobalContext* ctxt"),
+    0x800AFDCC:("Effect_Destroy","void","GlobalContext* ctxt, s32 index"),
+    0x800AFF24:("Effect_DestroyAll","void","void"),
     0x800B0050:("EffectSS_Init","void","GlobalContext* ctxt, s32 numEntries"),
     0x800B0140:("EffectSS_Clear","void","GlobalContext* ctxt"),
     0x800B0200:("EffectSS_GetTable","LoadedParticleEntry*","void"),
@@ -1512,11 +1512,11 @@
     0x800E823C:("func_800E823C","void","void"),
     0x800E8318:("func_800E8318","void","void"),
     0x800E8478:("func_800E8478","void","void"),
-    0x800E85D4:("func_800E85D4","void","void"),
+    0x800E85D4:("func_800E85D4","void","UNK_TYPE4 param_1, Vec3f* param_2"),
     0x800E8668:("func_800E8668","void","void"),
     0x800E8690:("func_800E8690","void","void"),
     0x800E86C0:("func_800E86C0","void","void"),
-    0x800E86E0:("func_800E86E0","void","void"),
+    0x800E86E0:("func_800E86E0","void","UNK_TYPE4 param_1, Vec3f* param_2, UNK_TYPE4 param_3"),
     0x800E8784:("func_800E8784","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8"),
     0x800E8EA0:("func_800E8EA0","void","GlobalContext* ctxt, Actor* actor, u16 param_3"),
     0x800E8ED0:("nop_800E8ED0","s32","UNK_TYPE4 param_1"),
@@ -2321,13 +2321,20 @@
     0x8012BC50:("func_8012BC50","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7"),
     0x8012BD8C:("func_8012BD8C","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7"),
     0x8012BF08:("func_8012BF08","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7"),
-    0x8012BF3C:("func_8012BF3C","void","void"),
+    0x8012BF3C:("func_8012BF3C","Gfx*","Gfx* param_1, s32 param_2"),
     0x8012BF78:("func_8012BF78","void","void"),
     0x8012BF98:("func_8012BF98","void","void"),
     0x8012BFC4:("func_8012BFC4","void","void"),
+    0x8012BFEC:("func_8012BFEC","UNK_PTR","UNK_PTR param_1"),
     0x8012C014:("func_8012C014","void","void"),
+    0x8012C058:("func_8012C058","void","int param_1"),
     0x8012C080:("func_8012C080","void","void"),
+    0x8012C0A8:("func_8012C0A8","void","int param_1"),
+    0x8012C0D0:("func_8012C0D0","void","int param_1"),
+    0x8012C0F8:("func_8012C0F8","void","int param_1"),
+    0x8012C120:("func_8012C120","void","int param_1"),
     0x8012C148:("func_8012C148","void","void"),
+    0x8012C170:("func_8012C170","void","int param_1"),
     0x8012C198:("func_8012C198","void","void"),
     0x8012C1C0:("func_8012C1C0","void","void"),
     0x8012C1EC:("func_8012C1EC","void","void"),
@@ -2338,30 +2345,48 @@
     0x8012C2B4:("func_8012C2B4","void","void"),
     0x8012C2DC:("func_8012C2DC","void","GraphicsContext* gCtxt"),
     0x8012C304:("func_8012C304","void","void"),
+    0x8012C32C:("func_8012C32C","void","int param_1"),
+    0x8012C354:("func_8012C354","void","int param_1"),
+    0x8012C37C:("func_8012C37C","void","int param_1"),
     0x8012C3A4:("func_8012C3A4","void","void"),
     0x8012C3CC:("func_8012C3CC","void","void"),
     0x8012C3F4:("func_8012C3F4","void","void"),
+    0x8012C420:("func_8012C420","void","int param_1"),
     0x8012C448:("func_8012C448","void","GraphicsContext* gCtxt"),
     0x8012C470:("func_8012C470","void","void"),
+    0x8012C498:("func_8012C498","UNK_PTR","UNK_PTR param_1"),
     0x8012C4C0:("func_8012C4C0","void","void"),
-    0x8012C560:("func_8012C560","void","void"),
+    0x8012C4E8:("func_8012C4E8","void","int param_1"),
+    0x8012C510:("func_8012C510","void","int param_1"),
+    0x8012C538:("func_8012C538","void","int param_1"),
+    0x8012C560:("func_8012C560","void","GraphicsContext* gCtxt"),
     0x8012C588:("func_8012C588","void","void"),
     0x8012C5B0:("func_8012C5B0","void","void"),
+    0x8012C5D8:("func_8012C5D8","void","int param_1"),
     0x8012C600:("func_8012C600","void","void"),
     0x8012C628:("func_8012C628","void","GraphicsContext* gCtxt"),
     0x8012C654:("func_8012C654","void","void"),
     0x8012C680:("func_8012C680","void","void"),
     0x8012C6AC:("func_8012C6AC","void","void"),
+    0x8012C6D4:("func_8012C6D4","void","int param_1"),
     0x8012C6FC:("func_8012C6FC","void","void"),
     0x8012C724:("func_8012C724","void","void"),
+    0x8012C74C:("func_8012C74C","UNK_PTR","UNK_PTR param_1"),
+    0x8012C774:("func_8012C774","UNK_PTR","UNK_PTR param_1"),
+    0x8012C7B8:("func_8012C7B8","UNK_PTR","UNK_PTR param_1"),
     0x8012C7FC:("func_8012C7FC","Gfx*","Gfx* puParm1"),
+    0x8012C840:("func_8012C840","UNK_PTR","UNK_PTR param_1"),
     0x8012C868:("func_8012C868","void","void"),
     0x8012C8AC:("func_8012C8AC","void","GraphicsContext* gCtxt"),
     0x8012C8D4:("func_8012C8D4","void","void"),
+    0x8012C8FC:("func_8012C8FC","void","int param_1"),
+    0x8012C924:("func_8012C924","void","int param_1"),
     0x8012C94C:("func_8012C94C","void","void"),
     0x8012C974:("func_8012C974","void","void"),
     0x8012C9BC:("func_8012C9BC","void","void"),
+    0x8012C9E4:("func_8012C9E4","void","int param_1"),
     0x8012CA0C:("func_8012CA0C","void","void"),
+    0x8012CA38:("func_8012CA38","void","int param_1"),
     0x8012CA60:("func_8012CA60","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5"),
     0x8012CB04:("func_8012CB04","void","void"),
     0x8012CB28:("func_8012CB28","void","void"),
@@ -2729,7 +2754,7 @@
     0x80140024:("func_80140024","s32","View* view"),
     0x801400CC:("func_801400CC","s32","View* view, Gfx** param_2"),
     0x80140260:("func_80140260","void","void"),
-    0x8014026C:("func_8014026C","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE1 param_9, UNK_TYPE4 param_10, UNK_TYPE2 param_11, UNK_TYPE4 param_12, UNK_TYPE4 param_13"),
+    0x8014026C:("func_8014026C","void","OSViMode* param_1, UNK_TYPE1 param_2, int param_3, int param_4, int param_5, int param_6, int param_7, int param_8, UNK_TYPE4 param_9, int param_10, short param_11, unsigned int param_12, UNK_TYPE4 param_13"),
     0x80140730:("func_80140730","void","void"),
     0x80140810:("func_80140810","void","void"),
     0x80140898:("func_80140898","void","void"),
@@ -3736,8 +3761,8 @@
     0x8019AC10:("func_8019AC10","void","void"),
     0x8019ACEC:("func_8019ACEC","void","void"),
     0x8019ADBC:("func_8019ADBC","void","void"),
-    0x8019AE40:("FUN_8019ae40","void","int param_1, int param_2, unsigned int param_3, int param_4"),
-    0x8019AEC0:("FUN_8019aec0","void","UNK_PTR param_1, UNK_PTR param_2"),
+    0x8019AE40:("func_8019AE40","void","int param_1, int param_2, unsigned int param_3, int param_4"),
+    0x8019AEC0:("func_8019AEC0","void","UNK_PTR param_1, UNK_PTR param_2"),
     0x8019AF00:("func_8019AF00","void","void"),
     0x8019AF58:("func_8019AF58","void","void"),
     0x8019AFE8:("func_8019AFE8","void","void"),
@@ -4051,9 +4076,8 @@
     0x808074B4:("func_808074B4","void","void"),
     0x808077AC:("func_808077AC","void","void"),
     0x80807940:("func_80807940","void","void"),
+    0x80807A78:("func_80807A78","void","int param_1, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4"),
     0x80807C58:("func_80807C58","void","void"),
-    0x80808000:("func_80808000","void","void"),
-    0x80808080:("func_80808080","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6"),
     0x80808214:("func_80808214","void","void"),
     0x80808D30:("func_80808D30","void","void"),
     0x80808F1C:("func_80808F1C","void","void"),
diff --git a/tables/variables.txt b/tables/variables.txt
index 8dacbcfb28..fa19f8a26b 100644
--- a/tables/variables.txt
+++ b/tables/variables.txt
@@ -368,7 +368,7 @@
     0x801AE214:("D_801AE214","u8","[32]",0x20),
     0x801AE240:("D_801AE240","UNK_TYPE4","",0x4),
     0x801AE250:("D_801AE250","UNK_TYPE4","",0x4),
-    0x801AE260:("D_801AE260","UNK_TYPE1","",0x1),
+    0x801AE260:("D_801AE260","UNK_PTR","[3]",0xc),
     0x801AE26C:("D_801AE26C","UNK_TYPE4","",0x4),
     0x801AE27C:("D_801AE27C","UNK_TYPE4","",0x4),
     0x801AE28C:("D_801AE28C","UNK_TYPE4","",0x4),
@@ -377,13 +377,8 @@
     0x801AE2BC:("D_801AE2BC","UNK_TYPE4","",0x4),
     0x801AE2CC:("D_801AE2CC","UNK_TYPE4","",0x4),
     0x801AE2DC:("D_801AE2DC","UNK_TYPE4","",0x4),
-    0x801AE2F0:("D_801AE2F0","UNK_TYPE1","",0x1),
-    0x801AE330:("D_801AE330","UNK_TYPE1","",0x1),
-    0x801AE334:("D_801AE334","UNK_TYPE1","",0x1),
-    0x801AE338:("D_801AE338","UNK_PTR","",0x4),
-    0x801AE34C:("D_801AE34C","UNK_PTR","",0x4),
-    0x801AE374:("D_801AE374","UNK_PTR","",0x4),
-    0x801AE388:("D_801AE388","UNK_PTR","",0x4),
+    0x801AE2F0:("sEffectShieldParticleVertices","F3DVertex","[4]",0x40),
+    0x801AE330:("sEffInfoTable","EffInfo","[5]",0x64),
     0x801AE3A0:("EffectSS2Info","EffectTableInfo","",0xc),
     0x801AE3B0:("D_801AE3B0","UNK_TYPE1","",0x1),
     0x801AE3B4:("D_801AE3B4","UNK_TYPE1","",0x1),
@@ -877,20 +872,14 @@
     0x801BA484:("D_801BA484","ActorA0","",0x1c),
     0x801BA4A0:("D_801BA4A0","UNK_PTR","",0x4),
     0x801BA4B4:("D_801BA4B4","UNK_TYPE1","",0x1),
-    0x801BA4C8:("D_801BA4C8","UNK_TYPE1","",0x1),
-    0x801BA4CA:("D_801BA4CA","UNK_TYPE2","",0x2),
-    0x801BA4CC:("D_801BA4CC","UNK_TYPE2","",0x2),
-    0x801BA4CE:("D_801BA4CE","UNK_TYPE2","",0x2),
-    0x801BA4F6:("D_801BA4F6","UNK_TYPE2","",0x2),
-    0x801BA4F8:("D_801BA4F8","UNK_TYPE2","",0x2),
-    0x801BA4FA:("D_801BA4FA","UNK_TYPE2","",0x2),
-    0x801BA508:("D_801BA508","UNK_TYPE1","",0x1),
-    0x801BA50A:("D_801BA50A","UNK_TYPE2","",0x2),
-    0x801BA50C:("D_801BA50C","UNK_TYPE2","",0x2),
-    0x801BA50E:("D_801BA50E","UNK_TYPE2","",0x2),
-    0x801BA536:("D_801BA536","UNK_TYPE2","",0x2),
-    0x801BA538:("D_801BA538","UNK_TYPE2","",0x2),
-    0x801BA53A:("D_801BA53A","UNK_TYPE2","",0x2),
+    0x801BA4C8:("D_801BA4C8","EffShieldParticleInit","",0x40),
+    0x801BA4F6:("D_801BA4F6","UNK_TYPE1","",0x1),
+    0x801BA4F8:("D_801BA4F8","UNK_TYPE1","",0x1),
+    0x801BA4FA:("D_801BA4FA","UNK_TYPE1","",0x1),
+    0x801BA508:("D_801BA508","EffShieldParticleInit","",0x40),
+    0x801BA536:("D_801BA536","UNK_TYPE1","",0x1),
+    0x801BA538:("D_801BA538","UNK_TYPE1","",0x1),
+    0x801BA53A:("D_801BA53A","UNK_TYPE1","",0x1),
     0x801BA550:("D_801BA550","UNK_TYPE1","",0x1),
     0x801BA750:("D_801BA750","UNK_TYPE1","",0x1),
     0x801BA790:("D_801BA790","UNK_TYPE1","",0x1),
@@ -907,7 +896,7 @@
     0x801BAFF8:("D_801BAFF8","UNK_TYPE1","",0x1),
     0x801BB010:("D_801BB010","UNK_TYPE1","",0x1),
     0x801BB018:("D_801BB018","UNK_TYPE1","",0x1),
-    0x801BB050:("D_801BB050","UNK_PTR","",0x4),
+    0x801BB050:("D_801BB050","UNK_TYPE1","",0x1),
     0x801BB058:("D_801BB058","UNK_TYPE1","",0x1),
     0x801BB068:("D_801BB068","UNK_TYPE2","",0x2),
     0x801BB08C:("D_801BB08C","UNK_TYPE1","",0x1),
@@ -2392,11 +2381,11 @@
     0x801D15B0:("D_801D15B0","Vec3f","",0xc),
     0x801D15BC:("D_801D15BC","UNK_TYPE4","",0x4),
     0x801D15D0:("atan_first_8th_array","s16","[1025]",0x802),
-    0x801D1DE0:("D_801D1DE0","UNK_TYPE1","",0x1),
+    0x801D1DE0:("D_801D1DE0","RSPMatrix","",0x40),
     0x801D1E20:("D_801D1E20","z_Matrix","",0x40),
     0x801D1E60:("D_801D1E60","UNK_PTR","",0x4),
     0x801D1E64:("D_801D1E64","UNK_PTR","",0x4),
-    0x801D1E70:("D_801D1E70","UNK_PTR","",0x4),
+    0x801D1E70:("D_801D1E70","UNK_TYPE1","",0x1),
     0x801D2E80:("D_801D2E80","UNK_TYPE1","",0x1),
     0x801D2F80:("D_801D2F80","UNK_TYPE1","",0x1),
     0x801D3070:("D_801D3070","UNK_TYPE1","",0x1),
@@ -3985,19 +3974,11 @@
     0x801E3790:("D_801E3790","UNK_TYPE1","",0x1),
     0x801E3F40:("D_801E3F40","UNK_TYPE1","",0x1),
     0x801E3FA0:("D_801E3FA0","UNK_TYPE1","",0x1),
-    0x801E3FB0:("D_801E3FB0","UNK_TYPE1","",0x1),
-    0x801E3FB4:("D_801E3FB4","UNK_TYPE1","",0x1),
-    0x801E3FB8:("D_801E3FB8","UNK_TYPE1","",0x1),
+    0x801E3FB0:("sEffTable","EffTables","",0x98e0),
     0x801E4514:("D_801E4514","UNK_TYPE1","",0x1),
     0x801E4E08:("D_801E4E08","UNK_TYPE1","",0x1),
-    0x801E4E0C:("D_801E4E0C","UNK_TYPE1","",0x1),
-    0x801E4E10:("D_801E4E10","UNK_TYPE1","",0x1),
     0x801E531C:("D_801E531C","UNK_TYPE1","",0x1),
     0x801E69E0:("D_801E69E0","UNK_TYPE1","",0x1),
-    0x801E783C:("D_801E783C","UNK_TYPE1","",0x1),
-    0x801E7840:("D_801E7840","UNK_TYPE1","",0x1),
-    0x801E7DA0:("D_801E7DA0","UNK_TYPE1","",0x1),
-    0x801E7DA4:("D_801E7DA4","UNK_TYPE1","",0x1),
     0x801E9AA0:("D_801E9AA0","UNK_TYPE1","",0x1),
     0x801ED4C0:("D_801ED4C0","UNK_TYPE1","",0x1),
     0x801ED890:("D_801ED890","UNK_TYPE1","",0x1),
@@ -4109,45 +4090,12 @@
     0x801EE1F0:("D_801EE1F0","UNK_TYPE1","",0x1),
     0x801EE1F4:("D_801EE1F4","UNK_TYPE1","",0x1),
     0x801EE1F8:("D_801EE1F8","UNK_TYPE1","",0x1),
-    0x801EE200:("D_801EE200","UNK_TYPE1","",0x1),
-    0x801EE202:("D_801EE202","UNK_TYPE1","",0x1),
-    0x801EE204:("D_801EE204","UNK_TYPE1","",0x1),
-    0x801EE68C:("D_801EE68C","UNK_TYPE1","",0x1),
-    0x801EE690:("D_801EE690","UNK_TYPE1","",0x1),
-    0x801EE694:("D_801EE694","UNK_TYPE1","",0x1),
-    0x801EE698:("D_801EE698","UNK_TYPE1","",0x1),
-    0x801EE6BC:("D_801EE6BC","UNK_TYPE1","",0x1),
-    0x801EE6C0:("D_801EE6C0","UNK_TYPE1","",0x1),
+    0x801EE200:("D_801EE200","EffSparkParams","",0x4c4),
     0x801EE6C8:("D_801EE6C8","ColTriParams","",0x34),
     0x801EE700:("D_801EE700","ColTriParams","",0x34),
-    0x801EE738:("D_801EE738","UNK_TYPE1","",0x1),
-    0x801EE73A:("D_801EE73A","UNK_TYPE1","",0x1),
-    0x801EE73C:("D_801EE73C","UNK_TYPE1","",0x1),
-    0x801EEBC4:("D_801EEBC4","UNK_TYPE1","",0x1),
-    0x801EEBC8:("D_801EEBC8","UNK_TYPE1","",0x1),
-    0x801EEBCC:("D_801EEBCC","UNK_TYPE1","",0x1),
-    0x801EEBD0:("D_801EEBD0","UNK_TYPE1","",0x1),
-    0x801EEBF4:("D_801EEBF4","UNK_TYPE1","",0x1),
-    0x801EEBF8:("D_801EEBF8","UNK_TYPE1","",0x1),
-    0x801EEC00:("D_801EEC00","UNK_TYPE1","",0x1),
-    0x801EEC02:("D_801EEC02","UNK_TYPE1","",0x1),
-    0x801EEC04:("D_801EEC04","UNK_TYPE1","",0x1),
-    0x801EF08C:("D_801EF08C","UNK_TYPE1","",0x1),
-    0x801EF090:("D_801EF090","UNK_TYPE1","",0x1),
-    0x801EF094:("D_801EF094","UNK_TYPE1","",0x1),
-    0x801EF098:("D_801EF098","UNK_TYPE1","",0x1),
-    0x801EF0BC:("D_801EF0BC","UNK_TYPE1","",0x1),
-    0x801EF0C0:("D_801EF0C0","UNK_TYPE1","",0x1),
-    0x801EF0C8:("D_801EF0C8","UNK_TYPE1","",0x1),
-    0x801EF0CA:("D_801EF0CA","UNK_TYPE1","",0x1),
-    0x801EF0CC:("D_801EF0CC","UNK_TYPE1","",0x1),
-    0x801EF51D:("D_801EF51D","UNK_TYPE1","",0x1),
-    0x801EF554:("D_801EF554","UNK_TYPE1","",0x1),
-    0x801EF558:("D_801EF558","UNK_TYPE1","",0x1),
-    0x801EF55C:("D_801EF55C","UNK_TYPE1","",0x1),
-    0x801EF560:("D_801EF560","UNK_TYPE1","",0x1),
-    0x801EF584:("D_801EF584","UNK_TYPE1","",0x1),
-    0x801EF588:("D_801EF588","UNK_TYPE1","",0x1),
+    0x801EE738:("D_801EE738","EffSparkParams","",0x4c4),
+    0x801EEC00:("D_801EEC00","EffSparkParams","",0x4c4),
+    0x801EF0C8:("D_801EF0C8","EffSparkParams","",0x4c4),
     0x801EF590:("D_801EF590","UNK_TYPE1","",0x1),
     0x801EF5C8:("D_801EF5C8","UNK_TYPE1","",0x1),
     0x801EF600:("D_801EF600","ColTriParams","",0x34),
@@ -4375,7 +4323,7 @@
     0x801FBB14:("D_801FBB14","UNK_TYPE1","",0x1),
     0x801FBB20:("D_801FBB20","UNK_TYPE1","",0x1),
     0x801FBB28:("D_801FBB28","UNK_TYPE1","",0x1),
-    0x801FBB30:("D_801FBB30","UNK_TYPE1","",0x1),
+    0x801FBB30:("D_801FBB30","OSViMode","",0x50),
     0x801FBB80:("gFramebuffers","u32*","[2]",0x8),
     0x801FBB88:("D_801FBB88","OSViMode*","",0x4),
     0x801FBB8C:("D_801FBB8C","UNK_TYPE1","",0x1),
@@ -4639,16 +4587,16 @@
     0x80202878:("D_80202878","UNK_TYPE1","",0x1),
     0x80202880:("D_80202880","UNK_TYPE1","",0x1),
     0x802028BC:("D_802028BC","UNK_TYPE1","",0x1),
-    0x80202980:("D_80202980","UNK_TYPE1","",0x1),
+    0x80202980:("D_80202980","OSMesgQueue","",0x18),
     0x802029D8:("D_802029D8","UNK_TYPE1","",0x1),
-    0x80202AB0:("D_80202AB0","UNK_TYPE1","",0x1),
-    0x80202AC8:("D_80202AC8","UNK_TYPE1","",0x1),
-    0x80202B08:("D_80202B08","UNK_TYPE1","",0x1),
-    0x80202B20:("D_80202B20","UNK_TYPE1","",0x1),
-    0x80202B60:("D_80202B60","UNK_TYPE1","",0x1),
-    0x80202B78:("D_80202B78","UNK_TYPE1","",0x1),
-    0x80203278:("D_80203278","UNK_TYPE1","",0x1),
-    0x80203290:("D_80203290","UNK_TYPE1","",0x1),
+    0x80202AB0:("D_80202AB0","OSMesgQueue","",0x18),
+    0x80202AC8:("D_80202AC8","OSMesg","[16]",0x40),
+    0x80202B08:("D_80202B08","OSMesgQueue","",0x18),
+    0x80202B20:("D_80202B20","OSMesg","[16]",0x40),
+    0x80202B60:("D_80202B60","OSMesgQueue","",0x18),
+    0x80202B78:("D_80202B78","OSMesg","[64]",0x100),
+    0x80203278:("D_80203278","OSMesgQueue","",0x18),
+    0x80203290:("D_80203290","OSMesg","[1]",0x4),
     0x80203294:("D_80203294","UNK_TYPE1","",0x1),
     0x802034C0:("D_802034C0","UNK_TYPE1","",0x1),
     0x802034C4:("D_802034C4","UNK_TYPE1","",0x1),
@@ -4752,11 +4700,11 @@
     0x80208EA0:("D_80208EA0","UNK_TYPE1","",0x1),
     0x80209AA0:("D_80209AA0","UNK_TYPE1","",0x1),
     0x80209EA0:("gGfxPools","GfxPool","[2]",0x40620),
-    0x8024A4C0:("D_8024A4C0","UNK_TYPE1","",0x1),
-    0x803824C0:("heap","u32","[1046224]",0x3fdb40),
-    0x80780000:("D_80780000","UNK_TYPE1","",0x1),
-    0x80784600:("D_80784600","UNK_TYPE1","",0x1),
-    0x807DA800:("D_807DA800","UNK_TYPE1","",0x1),
+    0x8024A4C0:("gAudioHeap","u8","[1277952]",0x138000),
+    0x803824C0:("gSystemHeap","u32","[1046224]",0x3fdb40),
+    0x80780000:("D_80780000","u8","[17920]",0x4600),
+    0x80784600:("D_80784600","u8","[352768]",0x56200),
+    0x807DA800:("D_807DA800","u16","[76800]",0x25800),
     0x80800860:("titleRotation","s16","",0x2),
     0x80800868:("D_80800868","UNK_TYPE1","",0x1),
     0x80800870:("D_80800870","UNK_TYPE1","",0x1),
@@ -5529,9 +5477,8 @@
     0x8085D2C0:("D_8085D2C0","ActorInitVar","",0x4),
     0x8085D2C4:("D_8085D2C4","UNK_TYPE4","",0x4),
     0x8085D2CC:("D_8085D2CC","UNK_PTR","",0x4),
-    0x8085D30C:("D_8085D30C","UNK_TYPE1","",0x1),
-    0x8085D330:("D_8085D330","UNK_TYPE1","",0x1),
-    0x8085D334:("D_8085D334","UNK_TYPE4","",0x4),
+    0x8085D30C:("D_8085D30C","EffBlureInit2","",0x24),
+    0x8085D330:("D_8085D330","EffTireMarkInit","",0x8),
     0x8085D338:("D_8085D338","UNK_TYPE4","",0x4),
     0x8085D33C:("D_8085D33C","UNK_TYPE4","",0x4),
     0x8085D340:("D_8085D340","UNK_TYPE1","",0x1),
@@ -6214,7 +6161,7 @@
     0x808792D4:("D_808792D4","UNK_TYPE1","",0x1),
     0x808792F4:("D_808792F4","UNK_TYPE1","",0x1),
     0x808792FC:("D_808792FC","UNK_TYPE1","",0x1),
-    0x80879308:("D_80879308","UNK_TYPE1","",0x1),
+    0x80879308:("D_80879308","EffBlureInit2","",0x24),
     0x8087932C:("D_8087932C","UNK_TYPE1","",0x1),
     0x80879330:("D_80879330","UNK_TYPE1","",0x1),
     0x80879334:("D_80879334","UNK_TYPE1","",0x1),
@@ -6448,11 +6395,10 @@
     0x8088C1C0:("D_8088C1C0","UNK_TYPE1","",0x1),
     0x8088C1E0:("D_8088C1E0","UNK_TYPE1","",0x1),
     0x8088C230:("D_8088C230","UNK_TYPE1","",0x1),
-    0x8088C234:("D_8088C234","UNK_TYPE1","",0x1),
-    0x8088C24C:("D_8088C24C","UNK_TYPE1","",0x1),
-    0x8088C258:("D_8088C258","UNK_TYPE1","",0x1),
-    0x8088C27C:("D_8088C27C","UNK_TYPE1","",0x1),
-    0x8088C2A0:("D_8088C2A0","UNK_TYPE1","",0x1),
+    0x8088C234:("D_8088C234","EffBlureInit2","",0x24),
+    0x8088C258:("D_8088C258","EffBlureInit2","",0x24),
+    0x8088C27C:("D_8088C27C","EffBlureInit2","",0x24),
+    0x8088C2A0:("D_8088C2A0","EffBlureInit2","",0x24),
     0x8088C2C4:("D_8088C2C4","UNK_TYPE4","",0x4),
     0x8088C2CC:("D_8088C2CC","UNK_TYPE1","",0x1),
     0x8088C2D8:("D_8088C2D8","UNK_TYPE1","",0x1),
@@ -6679,7 +6625,7 @@
     0x8089E350:("D_8089E350","UNK_TYPE4","",0x4),
     0x8089E354:("D_8089E354","UNK_TYPE1","",0x1),
     0x8089E364:("D_8089E364","UNK_TYPE4","",0x4),
-    0x8089E368:("D_8089E368","UNK_TYPE1","",0x1),
+    0x8089E368:("D_8089E368","EffBlureInit2","",0x24),
     0x8089E38C:("D_8089E38C","UNK_TYPE1","",0x1),
     0x8089E398:("D_8089E398","UNK_TYPE1","",0x1),
     0x8089E3A4:("D_8089E3A4","UNK_TYPE1","",0x1),
@@ -7260,7 +7206,7 @@
     0x808C99C0:("D_808C99C0","UNK_TYPE1","",0x1),
     0x808C9A10:("D_808C9A10","UNK_TYPE1","",0x1),
     0x808C9A30:("D_808C9A30","UNK_TYPE1","",0x1),
-    0x808C9A3C:("D_808C9A3C","UNK_TYPE1","",0x1),
+    0x808C9A3C:("D_808C9A3C","EffBlureInit2","",0x24),
     0x808C9A60:("D_808C9A60","UNK_TYPE1","",0x1),
     0x808C9A70:("D_808C9A70","UNK_TYPE1","",0x1),
     0x808C9A7C:("D_808C9A7C","UNK_TYPE1","",0x1),
@@ -7903,7 +7849,7 @@
     0x808F88C0:("D_808F88C0","UNK_TYPE1","",0x1),
     0x808F88E0:("D_808F88E0","UNK_TYPE1","",0x1),
     0x808F8908:("D_808F8908","UNK_TYPE2","",0x2),
-    0x808F8914:("D_808F8914","UNK_TYPE1","",0x1),
+    0x808F8914:("D_808F8914","EffBlureInit2","",0x24),
     0x808F8938:("D_808F8938","UNK_TYPE1","",0x1),
     0x808F8944:("D_808F8944","UNK_TYPE1","",0x1),
     0x808F8950:("D_808F8950","UNK_TYPE1","",0x1),
@@ -8760,7 +8706,7 @@
     0x8092C140:("D_8092C140","UNK_TYPE1","",0x1),
     0x8092C160:("D_8092C160","UNK_TYPE1","",0x1),
     0x8092C168:("D_8092C168","UNK_TYPE1","",0x1),
-    0x8092C174:("D_8092C174","UNK_TYPE1","",0x1),
+    0x8092C174:("D_8092C174","EffBlureInit2","",0x24),
     0x8092C198:("D_8092C198","UNK_TYPE4","",0x4),
     0x8092C19C:("D_8092C19C","UNK_TYPE1","",0x1),
     0x8092C1A8:("D_8092C1A8","UNK_TYPE1","",0x1),
@@ -9115,7 +9061,7 @@
     0x80942E60:("D_80942E60","UNK_TYPE1","",0x1),
     0x80942E6C:("D_80942E6C","UNK_TYPE1","",0x1),
     0x80942E78:("D_80942E78","UNK_TYPE1","",0x1),
-    0x80942E8C:("D_80942E8C","UNK_TYPE1","",0x1),
+    0x80942E8C:("D_80942E8C","EffTireMarkInit","",0x8),
     0x80942E94:("D_80942E94","UNK_TYPE1","",0x1),
     0x80942E9C:("D_80942E9C","UNK_TYPE1","",0x1),
     0x80942EAC:("D_80942EAC","UNK_TYPE1","",0x1),
@@ -11611,8 +11557,8 @@
     0x80A07F0C:("D_80A07F0C","UNK_TYPE1","",0x1),
     0x80A07F3C:("D_80A07F3C","UNK_TYPE1","",0x1),
     0x80A07F54:("D_80A07F54","UNK_TYPE2","",0x2),
-    0x80A07F5C:("D_80A07F5C","UNK_TYPE1","",0x1),
-    0x80A07F64:("D_80A07F64","UNK_TYPE1","",0x1),
+    0x80A07F5C:("D_80A07F5C","EffTireMarkInit","",0x8),
+    0x80A07F64:("D_80A07F64","EffTireMarkInit","",0x8),
     0x80A07F6C:("D_80A07F6C","UNK_TYPE4","",0x4),
     0x80A07FA8:("D_80A07FA8","UNK_TYPE4","",0x4),
     0x80A07FB4:("D_80A07FB4","UNK_TYPE4","",0x4),
@@ -11945,7 +11891,7 @@
     0x80A166B0:("D_80A166B0","UNK_TYPE1","",0x1),
     0x80A166BC:("D_80A166BC","UNK_TYPE1","",0x1),
     0x80A166D4:("D_80A166D4","UNK_TYPE1","",0x1),
-    0x80A166DC:("D_80A166DC","UNK_TYPE4","",0x4),
+    0x80A166DC:("D_80A166DC","EffTireMarkInit","",0x8),
     0x80A166E4:("D_80A166E4","UNK_TYPE4","",0x4),
     0x80A16704:("D_80A16704","UNK_TYPE1","",0x1),
     0x80A1670C:("D_80A1670C","UNK_TYPE1","",0x1),
@@ -12706,8 +12652,8 @@
     0x80A4169C:("D_80A4169C","UNK_PTR","",0x4),
     0x80A416C0:("D_80A416C0","UNK_PTR","",0x4),
     0x80A416E0:("D_80A416E0","UNK_TYPE1","",0x1),
-    0x80A417BC:("D_80A417BC","UNK_TYPE1","",0x1),
-    0x80A417E0:("D_80A417E0","UNK_TYPE1","",0x1),
+    0x80A417BC:("D_80A417BC","EffBlureInit2","",0x24),
+    0x80A417E0:("D_80A417E0","EffTireMarkInit","",0x8),
     0x80A417E8:("D_80A417E8","UNK_TYPE1","",0x1),
     0x80A417EC:("D_80A417EC","UNK_PTR","",0x4),
     0x80A41828:("D_80A41828","UNK_TYPE1","",0x1),
@@ -13073,7 +13019,7 @@
     0x80A5844C:("D_80A5844C","UNK_TYPE1","",0x1),
     0x80A58454:("D_80A58454","UNK_TYPE4","",0x4),
     0x80A58464:("D_80A58464","UNK_TYPE1","",0x1),
-    0x80A58470:("D_80A58470","UNK_TYPE1","",0x1),
+    0x80A58470:("D_80A58470","EffBlureInit2","",0x24),
     0x80A58494:("D_80A58494","UNK_TYPE4","",0x4),
     0x80A58498:("D_80A58498","UNK_TYPE1","",0x1),
     0x80A584A4:("D_80A584A4","UNK_TYPE1","",0x1),
@@ -16069,13 +16015,10 @@
     0x80B407FC:("bgGoronOyuOverlayInfoOffset","u32","",0x4),
     0x80B43250:("D_80B43250","UNK_TYPE1","",0x1),
     0x80B43270:("D_80B43270","UNK_TYPE1","",0x1),
-    0x80B43298:("D_80B43298","UNK_TYPE1","",0x1),
-    0x80B4329A:("D_80B4329A","UNK_TYPE2","",0x2),
-    0x80B4329C:("D_80B4329C","UNK_TYPE2","",0x2),
-    0x80B4329E:("D_80B4329E","UNK_TYPE2","",0x2),
-    0x80B432C6:("D_80B432C6","UNK_TYPE2","",0x2),
-    0x80B432C8:("D_80B432C8","UNK_TYPE2","",0x2),
-    0x80B432CA:("D_80B432CA","UNK_TYPE2","",0x2),
+    0x80B43298:("D_80B43298","EffShieldParticleInit","",0x40),
+    0x80B432C6:("D_80B432C6","UNK_TYPE1","",0x1),
+    0x80B432C8:("D_80B432C8","UNK_TYPE1","",0x1),
+    0x80B432CA:("D_80B432CA","UNK_TYPE1","",0x1),
     0x80B432D8:("D_80B432D8","UNK_TYPE1","",0x1),
     0x80B432E4:("D_80B432E4","UNK_TYPE1","",0x1),
     0x80B432F0:("D_80B432F0","UNK_TYPE4","",0x4),
@@ -17478,7 +17421,7 @@
     0x80BB3ED4:("D_80BB3ED4","UNK_TYPE1","",0x1),
     0x80BB3EF4:("D_80BB3EF4","UNK_TYPE1","",0x1),
     0x80BB4044:("D_80BB4044","UNK_TYPE1","",0x1),
-    0x80BB405C:("D_80BB405C","UNK_TYPE4","",0x4),
+    0x80BB405C:("D_80BB405C","EffTireMarkInit","",0x8),
     0x80BB4064:("D_80BB4064","UNK_TYPE4","",0x4),
     0x80BB4070:("D_80BB4070","UNK_TYPE4","",0x4),
     0x80BB407C:("D_80BB407C","UNK_TYPE1","",0x1),
@@ -18313,7 +18256,7 @@
     0x80BF5954:("D_80BF5954","UNK_TYPE1","",0x1),
     0x80BF5960:("D_80BF5960","UNK_TYPE1","",0x1),
     0x80BF596C:("D_80BF596C","UNK_TYPE1","",0x1),
-    0x80BF59F0:("D_80BF59F0","UNK_TYPE1","",0x1),
+    0x80BF59F0:("D_80BF59F0","EffTireMarkInit","",0x8),
     0x80BF59F8:("D_80BF59F8","UNK_TYPE1","",0x1),
     0x80BF5A10:("D_80BF5A10","UNK_TYPE4","",0x4),
     0x80BF5A14:("D_80BF5A14","UNK_TYPE4","",0x4),
diff --git a/undef.txt b/undef.txt
index 6297663c40..10ccf12489 100644
--- a/undef.txt
+++ b/undef.txt
@@ -86,19 +86,11 @@ viCounterMsg = boot_bss_start + 0x00006388;
 vimgrRetrace = boot_bss_start + 0x000063A0;
 dmadata = boot_bss_start + 0x000063B0;
 D_801E3FA0 = code_bss_start + 0x00000000;
-D_801E3FB0 = code_bss_start + 0x00000010;
-D_801E3FB4 = code_bss_start + 0x00000014;
-D_801E3FB8 = code_bss_start + 0x00000018;
+sEffTable = code_bss_start + 0x00000010;
 D_801E4514 = code_bss_start + 0x00000574;
 D_801E4E08 = code_bss_start + 0x00000E68;
-D_801E4E0C = code_bss_start + 0x00000E6C;
-D_801E4E10 = code_bss_start + 0x00000E70;
 D_801E531C = code_bss_start + 0x0000137C;
 D_801E69E0 = code_bss_start + 0x00002A40;
-D_801E783C = code_bss_start + 0x0000389C;
-D_801E7840 = code_bss_start + 0x000038A0;
-D_801E7DA0 = code_bss_start + 0x00003E00;
-D_801E7DA4 = code_bss_start + 0x00003E04;
 D_801E9AA0 = code_bss_start + 0x00005B00;
 D_801ED4C0 = code_bss_start + 0x00009520;
 D_801ED890 = code_bss_start + 0x000098F0;
@@ -211,44 +203,11 @@ D_801EE1F0 = code_bss_start + 0x0000A250;
 D_801EE1F4 = code_bss_start + 0x0000A254;
 D_801EE1F8 = code_bss_start + 0x0000A258;
 D_801EE200 = code_bss_start + 0x0000A260;
-D_801EE202 = code_bss_start + 0x0000A262;
-D_801EE204 = code_bss_start + 0x0000A264;
-D_801EE68C = code_bss_start + 0x0000A6EC;
-D_801EE690 = code_bss_start + 0x0000A6F0;
-D_801EE694 = code_bss_start + 0x0000A6F4;
-D_801EE698 = code_bss_start + 0x0000A6F8;
-D_801EE6BC = code_bss_start + 0x0000A71C;
-D_801EE6C0 = code_bss_start + 0x0000A720;
 D_801EE6C8 = code_bss_start + 0x0000A728;
 D_801EE700 = code_bss_start + 0x0000A760;
 D_801EE738 = code_bss_start + 0x0000A798;
-D_801EE73A = code_bss_start + 0x0000A79A;
-D_801EE73C = code_bss_start + 0x0000A79C;
-D_801EEBC4 = code_bss_start + 0x0000AC24;
-D_801EEBC8 = code_bss_start + 0x0000AC28;
-D_801EEBCC = code_bss_start + 0x0000AC2C;
-D_801EEBD0 = code_bss_start + 0x0000AC30;
-D_801EEBF4 = code_bss_start + 0x0000AC54;
-D_801EEBF8 = code_bss_start + 0x0000AC58;
 D_801EEC00 = code_bss_start + 0x0000AC60;
-D_801EEC02 = code_bss_start + 0x0000AC62;
-D_801EEC04 = code_bss_start + 0x0000AC64;
-D_801EF08C = code_bss_start + 0x0000B0EC;
-D_801EF090 = code_bss_start + 0x0000B0F0;
-D_801EF094 = code_bss_start + 0x0000B0F4;
-D_801EF098 = code_bss_start + 0x0000B0F8;
-D_801EF0BC = code_bss_start + 0x0000B11C;
-D_801EF0C0 = code_bss_start + 0x0000B120;
 D_801EF0C8 = code_bss_start + 0x0000B128;
-D_801EF0CA = code_bss_start + 0x0000B12A;
-D_801EF0CC = code_bss_start + 0x0000B12C;
-D_801EF51D = code_bss_start + 0x0000B57D;
-D_801EF554 = code_bss_start + 0x0000B5B4;
-D_801EF558 = code_bss_start + 0x0000B5B8;
-D_801EF55C = code_bss_start + 0x0000B5BC;
-D_801EF560 = code_bss_start + 0x0000B5C0;
-D_801EF584 = code_bss_start + 0x0000B5E4;
-D_801EF588 = code_bss_start + 0x0000B5E8;
 D_801EF590 = code_bss_start + 0x0000B5F0;
 D_801EF5C8 = code_bss_start + 0x0000B628;
 D_801EF600 = code_bss_start + 0x0000B660;
@@ -853,8 +812,8 @@ D_80208E9C = code_bss_start + 0x00024EFC;
 D_80208EA0 = code_bss_start + 0x00024F00;
 D_80209AA0 = code_bss_start + 0x00025B00;
 gGfxPools = code_bss_start + 0x00025F00;
-D_8024A4C0 = code_bss_start + 0x00066520;
-heap = code_bss_start + 0x0019E520;
+gAudioHeap = code_bss_start + 0x00066520;
+gSystemHeap = code_bss_start + 0x0019E520;
 D_80780000 = code_bss_start + 0x0059C060;
 D_80784600 = code_bss_start + 0x005A0660;
 D_807DA800 = code_bss_start + 0x005F6860;