diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 5fae9368..539b6f97 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -1099,28 +1099,28 @@ func_ov000_02093af0 kind:function(arm,size=0x68) addr:0x2093af0
 func_ov000_02093b58 kind:function(arm,size=0x144) addr:0x2093b58
 func_ov000_02093c9c kind:function(arm,size=0x38) addr:0x2093c9c
 func_ov000_02093cd4 kind:function(arm,size=0xc0) addr:0x2093cd4
-func_ov000_02093d94 kind:function(arm,size=0x14) addr:0x2093d94
+_ZN21TriggerAABB_Unk2_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2093d94
 func_ov000_02093da8 kind:function(arm,size=0x28) addr:0x2093da8
 func_ov000_02093dd0 kind:function(arm,size=0x30) addr:0x2093dd0
 func_ov000_02093e00 kind:function(arm,size=0x2d8) addr:0x2093e00
-func_ov000_020940d8 kind:function(arm,size=0x48) addr:0x20940d8
+_ZN21TriggerAABB_Unk2_Unk18vfunc_14EP4AABBiii kind:function(arm,size=0x48) addr:0x20940d8
 func_ov000_02094120 kind:function(arm,size=0x84) addr:0x2094120
 func_ov000_020941a4 kind:function(arm,size=0x48) addr:0x20941a4
 func_ov000_020941ec kind:function(arm,size=0x30) addr:0x20941ec
 func_ov000_0209421c kind:function(arm,size=0x5ec) addr:0x209421c
 func_ov000_02094808 kind:function(arm,size=0x8) addr:0x2094808
-func_ov000_02094810 kind:function(arm,size=0x14) addr:0x2094810
-func_ov000_02094824 kind:function(arm,size=0x4) addr:0x2094824
-func_ov000_02094828 kind:function(arm,size=0x4) addr:0x2094828
-func_ov000_0209482c kind:function(arm,size=0x4) addr:0x209482c
-func_ov000_02094830 kind:function(arm,size=0x4) addr:0x2094830
-func_ov000_02094834 kind:function(arm,size=0x4) addr:0x2094834
-func_ov000_02094838 kind:function(arm,size=0x4) addr:0x2094838
-func_ov000_0209483c kind:function(arm,size=0x4) addr:0x209483c
-func_ov000_02094840 kind:function(arm,size=0x4) addr:0x2094840
-func_ov000_02094844 kind:function(arm,size=0x4) addr:0x2094844
-func_ov000_02094848 kind:function(arm,size=0x4) addr:0x2094848
-func_ov000_0209484c kind:function(arm,size=0x38) addr:0x209484c
+_ZN24UnkStruct_ov000_020e2f04D0Ev kind:function(arm,size=0x14) addr:0x2094810
+_ZN24UnkStruct_ov000_020e2f04D2Ev kind:function(arm,size=0x4) addr:0x2094824
+_ZN24UnkStruct_ov000_020e2f048vfunc_0cEv kind:function(arm,size=0x4) addr:0x2094828
+_ZN24UnkStruct_ov000_020e2f048vfunc_10Ev kind:function(arm,size=0x4) addr:0x209482c
+_ZN24UnkStruct_ov000_020e2f048vfunc_14EP4AABBiii kind:function(arm,size=0x4) addr:0x2094830
+_ZN24UnkStruct_ov000_020e2f048vfunc_18Ev kind:function(arm,size=0x4) addr:0x2094834
+_ZN24UnkStruct_ov000_020e2f048vfunc_1cEv kind:function(arm,size=0x4) addr:0x2094838
+_ZN24UnkStruct_ov000_020e2f0414SetBoundingBoxEP4AABB kind:function(arm,size=0x4) addr:0x209483c
+_ZN24UnkStruct_ov000_020e2f048vfunc_24Ev kind:function(arm,size=0x4) addr:0x2094840
+_ZN24UnkStruct_ov000_020e2f048vfunc_28Ev kind:function(arm,size=0x4) addr:0x2094844
+_ZN24UnkStruct_ov000_020e2f0414GetBoundingBoxEP4AABB kind:function(arm,size=0x4) addr:0x2094848
+_ZN24UnkStruct_ov000_020e2f048vfunc_58Eiii kind:function(arm,size=0x38) addr:0x209484c
 func_ov000_02094884 kind:function(arm,size=0x24) addr:0x2094884
 func_ov000_020948a8 kind:function(arm,size=0x10) addr:0x20948a8
 func_ov000_020948b8 kind:function(arm,size=0x10) addr:0x20948b8
@@ -1130,10 +1130,10 @@ func_ov000_020948e8 kind:function(arm,size=0x10) addr:0x20948e8
 func_ov000_020948f8 kind:function(arm,size=0x10) addr:0x20948f8
 func_ov000_02094908 kind:function(arm,size=0x10) addr:0x2094908
 func_ov000_02094918 kind:function(arm,size=0x10) addr:0x2094918
-func_ov000_02094928 kind:function(arm,size=0x10) addr:0x2094928
-func_ov000_02094938 kind:function(arm,size=0x10) addr:0x2094938
-func_ov000_02094948 kind:function(arm,size=0x10) addr:0x2094948
-func_ov000_02094958 kind:function(arm,size=0x10) addr:0x2094958
+_ZN21TriggerAABB_Unk2_Unk112ContainsInXZEP5Vec3p kind:function(arm,size=0x10) addr:0x2094928
+_ZN21TriggerAABB_Unk2_Unk18ContainsEP5Vec3p kind:function(arm,size=0x10) addr:0x2094938
+_ZN21TriggerAABB_Unk2_Unk114IntersectsCubeEP4Cube kind:function(arm,size=0x10) addr:0x2094948
+_ZN21TriggerAABB_Unk2_Unk18vfunc_54EP4CubeP5Vec3pPj kind:function(arm,size=0x10) addr:0x2094958
 func_ov000_02094968 kind:function(arm,size=0x14) addr:0x2094968
 func_ov000_0209497c kind:function(arm,size=0x8) addr:0x209497c
 func_ov000_02094984 kind:function(arm,size=0x24) addr:0x2094984
@@ -1158,16 +1158,16 @@ func_ov000_02094b58 kind:function(arm,size=0x1c) addr:0x2094b58
 func_ov000_02094b74 kind:function(arm,size=0x8) addr:0x2094b74
 func_ov000_02094b7c kind:function(arm,size=0x8) addr:0x2094b7c
 func_ov000_02094b84 kind:function(arm,size=0x1c) addr:0x2094b84
-func_ov000_02094ba0 kind:function(arm,size=0x8) addr:0x2094ba0
-func_ov000_02094ba8 kind:function(arm,size=0x34) addr:0x2094ba8
-func_ov000_02094bdc kind:function(arm,size=0x34) addr:0x2094bdc
-func_ov000_02094c10 kind:function(arm,size=0x54) addr:0x2094c10
-func_ov000_02094c64 kind:function(arm,size=0x8) addr:0x2094c64
-func_ov000_02094c6c kind:function(arm,size=0x8) addr:0x2094c6c
-func_ov000_02094c74 kind:function(arm,size=0x10) addr:0x2094c74
-func_ov000_02094c84 kind:function(arm,size=0x2c) addr:0x2094c84
-func_ov000_02094cb0 kind:function(arm,size=0x10) addr:0x2094cb0
-func_ov000_02094cc0 kind:function(arm,size=0x1c) addr:0x2094cc0
+_ZN21TriggerAABB_Unk2_Unk18vfunc_08Ev kind:function(arm,size=0x8) addr:0x2094ba0
+_ZN21TriggerAABB_Unk2_Unk114SetBoundingBoxEP4AABB kind:function(arm,size=0x34) addr:0x2094ba8
+_ZN21TriggerAABB_Unk2_Unk114GetBoundingBoxEP4AABB kind:function(arm,size=0x34) addr:0x2094bdc
+_ZN21TriggerAABB_Unk2_Unk111SetPositionEP5Vec3p kind:function(arm,size=0x54) addr:0x2094c10
+_ZN21TriggerAABB_Unk2_Unk18vfunc_34Ev kind:function(arm,size=0x8) addr:0x2094c64
+_ZN21TriggerAABB_Unk2_Unk18vfunc_38Ev kind:function(arm,size=0x8) addr:0x2094c6c
+_ZN21TriggerAABB_Unk2_Unk111GetPositionEP5Vec3p kind:function(arm,size=0x10) addr:0x2094c74
+_ZN21TriggerAABB_Unk2_Unk19GetSizeXZEv kind:function(arm,size=0x2c) addr:0x2094c84
+_ZN21TriggerAABB_Unk2_Unk19GetHeightEv kind:function(arm,size=0x10) addr:0x2094cb0
+_ZN21TriggerAABB_Unk2_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2094cc0
 func_ov000_02094cdc kind:function(arm,size=0x8) addr:0x2094cdc
 func_ov000_02094ce4 kind:function(arm,size=0x8) addr:0x2094ce4
 func_ov000_02094cec kind:function(arm,size=0x8) addr:0x2094cec
@@ -2735,7 +2735,7 @@ _ZNK9EquipItem8IsUsableEi kind:function(arm,size=0x18) addr:0x20be8e4
 _ZNK9EquipItem7IsInUseEv kind:function(arm,size=0x8) addr:0x20be8fc
 _ZN9EquipItem11UpdateInUseEi kind:function(arm,size=0x60) addr:0x20be904
 _ZN9EquipItem8vfunc_2cEv kind:function(arm,size=0x8) addr:0x20be964
-_Z8vfunc_34Ps kind:function(arm,size=0x4) addr:0x20be96c
+_ZN9EquipItem8vfunc_34EPs kind:function(arm,size=0x4) addr:0x20be96c
 _ZNK9EquipItem8vfunc_40Ev kind:function(arm,size=0x8) addr:0x20be970
 _ZNK9EquipItem8vfunc_44Ei kind:function(arm,size=0x8) addr:0x20be978
 _ZNK9EquipItem8vfunc_48Ei kind:function(arm,size=0x8) addr:0x20be980
@@ -2747,14 +2747,14 @@ _ZN9EquipItem7GetAmmoEv kind:function(arm,size=0x2c) addr:0x20beb30
 _ZN9EquipItem8GiveAmmoEj kind:function(arm,size=0x34) addr:0x20beb5c
 _ZNK9EquipItem9GetHitboxEP8Cylinder kind:function(arm,size=0x18) addr:0x20beb90
 _ZN24UnkStruct_ov000_020beba8C1Ei kind:function(arm,size=0x18) addr:0x20beba8
-_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x18) addr:0x20bebc0
-_ZN24UnkStruct_ov000_020beba88vfunc_0cEPs kind:function(arm,size=0x84) addr:0x20bebd8
-_ZN24UnkStruct_ov000_020beba88vfunc_10EPi kind:function(arm,size=0x84) addr:0x20bec5c
-_ZN24UnkStruct_ov000_020beba88vfunc_18EPi kind:function(arm,size=0x9c) addr:0x20bece0
-_ZN24UnkStruct_ov000_020beba88vfunc_14EPt kind:function(arm,size=0x50) addr:0x20bed7c
-_ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x98) addr:0x20bedcc
-_ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x14) addr:0x20bee64
-func_ov000_020bee78 kind:function(arm,size=0x1c) addr:0x20bee78
+_ZN24UnkStruct_ov000_020beba8C2Ei kind:function(arm,size=0x18) addr:0x20bebc0
+_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x84) addr:0x20bebd8
+_ZN24UnkStruct_ov000_020beba88vfunc_0cEPs kind:function(arm,size=0x84) addr:0x20bec5c
+_ZN24UnkStruct_ov000_020beba88vfunc_10EPi kind:function(arm,size=0x9c) addr:0x20bece0
+_ZN24UnkStruct_ov000_020beba88vfunc_18EPi kind:function(arm,size=0x50) addr:0x20bed7c
+_ZN24UnkStruct_ov000_020beba88vfunc_14EPt kind:function(arm,size=0x98) addr:0x20bedcc
+_ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x14) addr:0x20bee64
+_ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x1c) addr:0x20bee78
 func_ov000_020bee94 kind:function(arm,size=0x3c) addr:0x20bee94
 func_ov000_020beed0 kind:function(arm,size=0x40) addr:0x20beed0
 func_ov000_020bef10 kind:function(arm,size=0x8) addr:0x20bef10
@@ -4172,9 +4172,9 @@ data_ov000_020e2c54 kind:data(any) addr:0x20e2c54
 data_ov000_020e2ca4 kind:data(any) addr:0x20e2ca4
 data_ov000_020e2cf4 kind:data(any) addr:0x20e2cf4
 data_ov000_020e2d44 kind:data(any) addr:0x20e2d44
-data_ov000_020e2dd8 kind:data(any) addr:0x20e2dd8
+_ZTV21TriggerAABB_Unk2_Unk1 kind:data(any) addr:0x20e2dd8
 data_ov000_020e2e3c kind:data(any) addr:0x20e2e3c
-data_ov000_020e2f04 kind:data(any) addr:0x20e2f04
+_ZTV24UnkStruct_ov000_020e2f04 kind:data(any) addr:0x20e2f04
 data_ov000_020e2f68 kind:data(any) addr:0x20e2f68
 data_ov000_020e2f98 kind:data(any) addr:0x20e2f98
 data_ov000_020e2fa8 kind:data(any) addr:0x20e2fa8
diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt
index 35c5ada9..0e249627 100644
--- a/config/eur/arm9/symbols.txt
+++ b/config/eur/arm9/symbols.txt
@@ -2210,18 +2210,18 @@ func_020420b4 kind:function(thumb,size=0xdc) addr:0x20420b4
 func_02042190 kind:function(thumb,size=0x34) addr:0x2042190
 func_020421c4 kind:function(thumb,size=0x14) addr:0x20421c4
 func_020421d8 kind:function(thumb,size=0x24) addr:0x20421d8
-func_020421fc kind:function(thumb,size=0x14) addr:0x20421fc
-func_02042210 kind:function(thumb,size=0x28) addr:0x2042210
-func_02042238 kind:function(thumb,size=0x18) addr:0x2042238
-func_02042250 kind:function(thumb,size=0x9c) addr:0x2042250
-func_020422ec kind:function(thumb,size=0xa0) addr:0x20422ec
-func_0204238c kind:function(thumb,size=0x5c) addr:0x204238c
-func_020423e8 kind:function(thumb,size=0x58) addr:0x20423e8
-func_02042440 kind:function(thumb,size=0x94) addr:0x2042440
-func_020424d4 kind:function(thumb,size=0xa4) addr:0x20424d4
-func_02042578 kind:function(thumb,size=0xc) addr:0x2042578
-func_02042584 kind:function(thumb,size=0x30) addr:0x2042584
-func_020425b4 kind:function(thumb,size=0x2c) addr:0x20425b4
+Overlay_FileSize kind:function(thumb,size=0x14) addr:0x20421fc
+Overlay_ClearCacheAndBss kind:function(thumb,size=0x28) addr:0x2042210
+Overlay_func_02042238 kind:function(thumb,size=0x18) addr:0x2042238
+Overlay_func_02042250 kind:function(thumb,size=0x9c) addr:0x2042250
+Overlay_func_020422ec kind:function(thumb,size=0xa0) addr:0x20422ec
+Overlay_func_0204238c kind:function(thumb,size=0x5c) addr:0x204238c
+Overlay_func_020423e8 kind:function(thumb,size=0x58) addr:0x20423e8
+Overlay_Init kind:function(thumb,size=0x94) addr:0x2042440
+Overlay_RunGlobalDestructors kind:function(thumb,size=0xa4) addr:0x20424d4
+Overlay_Destroy kind:function(thumb,size=0xc) addr:0x2042578
+Overlay_Load kind:function(thumb,size=0x30) addr:0x2042584
+Overlay_Unload kind:function(thumb,size=0x2c) addr:0x20425b4
 func_020425e0 kind:function(thumb,size=0x40) addr:0x20425e0
 func_02042620 kind:function(thumb,size=0x48) addr:0x2042620
 func_02042668 kind:function(thumb,size=0x24) addr:0x2042668
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 8106a5f5..6a5f320f 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -1099,28 +1099,28 @@ func_ov000_02093af0 kind:function(arm,size=0x68) addr:0x2093a90
 func_ov000_02093b58 kind:function(arm,size=0x144) addr:0x2093af8
 func_ov000_02093c9c kind:function(arm,size=0x38) addr:0x2093c3c
 func_ov000_02093cd4 kind:function(arm,size=0xc0) addr:0x2093c74
-func_ov000_02093d94 kind:function(arm,size=0x14) addr:0x2093d34
+_ZN21TriggerAABB_Unk2_Unk1D1Ev kind:function(arm,size=0x14) addr:0x2093d34
 func_ov000_02093da8 kind:function(arm,size=0x28) addr:0x2093d48
 func_ov000_02093dd0 kind:function(arm,size=0x30) addr:0x2093d70
 func_ov000_02093e00 kind:function(arm,size=0x2d8) addr:0x2093da0
-func_ov000_020940d8 kind:function(arm,size=0x48) addr:0x2094078
+_ZN21TriggerAABB_Unk2_Unk18vfunc_14EP4AABBiii kind:function(arm,size=0x48) addr:0x2094078
 func_ov000_02094120 kind:function(arm,size=0x84) addr:0x20940c0
 func_ov000_020941a4 kind:function(arm,size=0x48) addr:0x2094144
 func_ov000_020941ec kind:function(arm,size=0x30) addr:0x209418c
 func_ov000_0209421c kind:function(arm,size=0x5ec) addr:0x20941bc
 func_ov000_02094808 kind:function(arm,size=0x8) addr:0x20947a8
-func_ov000_02094810 kind:function(arm,size=0x14) addr:0x20947b0
-func_ov000_02094824 kind:function(arm,size=0x4) addr:0x20947c4
-func_ov000_02094828 kind:function(arm,size=0x4) addr:0x20947c8
-func_ov000_0209482c kind:function(arm,size=0x4) addr:0x20947cc
-func_ov000_02094830 kind:function(arm,size=0x4) addr:0x20947d0
-func_ov000_02094834 kind:function(arm,size=0x4) addr:0x20947d4
-func_ov000_02094838 kind:function(arm,size=0x4) addr:0x20947d8
-func_ov000_0209483c kind:function(arm,size=0x4) addr:0x20947dc
-func_ov000_02094840 kind:function(arm,size=0x4) addr:0x20947e0
-func_ov000_02094844 kind:function(arm,size=0x4) addr:0x20947e4
-func_ov000_02094848 kind:function(arm,size=0x4) addr:0x20947e8
-func_ov000_0209484c kind:function(arm,size=0x38) addr:0x20947ec
+_ZN24UnkStruct_ov000_020e2f04D0Ev kind:function(arm,size=0x14) addr:0x20947b0
+_ZN24UnkStruct_ov000_020e2f04D2Ev kind:function(arm,size=0x4) addr:0x20947c4
+_ZN24UnkStruct_ov000_020e2f048vfunc_0cEv kind:function(arm,size=0x4) addr:0x20947c8
+_ZN24UnkStruct_ov000_020e2f048vfunc_10Ev kind:function(arm,size=0x4) addr:0x20947cc
+_ZN24UnkStruct_ov000_020e2f048vfunc_14EP4AABBiii kind:function(arm,size=0x4) addr:0x20947d0
+_ZN24UnkStruct_ov000_020e2f048vfunc_18Ev kind:function(arm,size=0x4) addr:0x20947d4
+_ZN24UnkStruct_ov000_020e2f048vfunc_1cEv kind:function(arm,size=0x4) addr:0x20947d8
+_ZN24UnkStruct_ov000_020e2f0414SetBoundingBoxEP4AABB kind:function(arm,size=0x4) addr:0x20947dc
+_ZN24UnkStruct_ov000_020e2f048vfunc_24Ev kind:function(arm,size=0x4) addr:0x20947e0
+_ZN24UnkStruct_ov000_020e2f048vfunc_28Ev kind:function(arm,size=0x4) addr:0x20947e4
+_ZN24UnkStruct_ov000_020e2f0414GetBoundingBoxEP4AABB kind:function(arm,size=0x4) addr:0x20947e8
+_ZN24UnkStruct_ov000_020e2f048vfunc_58Eiii kind:function(arm,size=0x38) addr:0x20947ec
 func_ov000_02094884 kind:function(arm,size=0x24) addr:0x2094824
 func_ov000_020948a8 kind:function(arm,size=0x10) addr:0x2094848
 func_ov000_020948b8 kind:function(arm,size=0x10) addr:0x2094858
@@ -1130,10 +1130,10 @@ func_ov000_020948e8 kind:function(arm,size=0x10) addr:0x2094888
 func_ov000_020948f8 kind:function(arm,size=0x10) addr:0x2094898
 func_ov000_02094908 kind:function(arm,size=0x10) addr:0x20948a8
 func_ov000_02094918 kind:function(arm,size=0x10) addr:0x20948b8
-func_ov000_02094928 kind:function(arm,size=0x10) addr:0x20948c8
-func_ov000_02094938 kind:function(arm,size=0x10) addr:0x20948d8
-func_ov000_02094948 kind:function(arm,size=0x10) addr:0x20948e8
-func_ov000_02094958 kind:function(arm,size=0x10) addr:0x20948f8
+_ZN21TriggerAABB_Unk2_Unk112ContainsInXZEP5Vec3p kind:function(arm,size=0x10) addr:0x20948c8
+_ZN21TriggerAABB_Unk2_Unk18ContainsEP5Vec3p kind:function(arm,size=0x10) addr:0x20948d8
+_ZN21TriggerAABB_Unk2_Unk114IntersectsCubeEP4Cube kind:function(arm,size=0x10) addr:0x20948e8
+_ZN21TriggerAABB_Unk2_Unk18vfunc_54EP4CubeP5Vec3pPj kind:function(arm,size=0x10) addr:0x20948f8
 func_ov000_02094968 kind:function(arm,size=0x14) addr:0x2094908
 func_ov000_0209497c kind:function(arm,size=0x8) addr:0x209491c
 func_ov000_02094984 kind:function(arm,size=0x24) addr:0x2094924
@@ -1158,16 +1158,16 @@ func_ov000_02094b58 kind:function(arm,size=0x1c) addr:0x2094af8
 func_ov000_02094b74 kind:function(arm,size=0x8) addr:0x2094b14
 func_ov000_02094b7c kind:function(arm,size=0x8) addr:0x2094b1c
 func_ov000_02094b84 kind:function(arm,size=0x1c) addr:0x2094b24
-func_ov000_02094ba0 kind:function(arm,size=0x8) addr:0x2094b40
-func_ov000_02094ba8 kind:function(arm,size=0x34) addr:0x2094b48
-func_ov000_02094bdc kind:function(arm,size=0x34) addr:0x2094b7c
-func_ov000_02094c10 kind:function(arm,size=0x54) addr:0x2094bb0
-func_ov000_02094c64 kind:function(arm,size=0x8) addr:0x2094c04
-func_ov000_02094c6c kind:function(arm,size=0x8) addr:0x2094c0c
-func_ov000_02094c74 kind:function(arm,size=0x10) addr:0x2094c14
-func_ov000_02094c84 kind:function(arm,size=0x2c) addr:0x2094c24
-func_ov000_02094cb0 kind:function(arm,size=0x10) addr:0x2094c50
-func_ov000_02094cc0 kind:function(arm,size=0x1c) addr:0x2094c60
+_ZN21TriggerAABB_Unk2_Unk18vfunc_08Ev kind:function(arm,size=0x8) addr:0x2094b40
+_ZN21TriggerAABB_Unk2_Unk114SetBoundingBoxEP4AABB kind:function(arm,size=0x34) addr:0x2094b48
+_ZN21TriggerAABB_Unk2_Unk114GetBoundingBoxEP4AABB kind:function(arm,size=0x34) addr:0x2094b7c
+_ZN21TriggerAABB_Unk2_Unk111SetPositionEP5Vec3p kind:function(arm,size=0x54) addr:0x2094bb0
+_ZN21TriggerAABB_Unk2_Unk18vfunc_34Ev kind:function(arm,size=0x8) addr:0x2094c04
+_ZN21TriggerAABB_Unk2_Unk18vfunc_38Ev kind:function(arm,size=0x8) addr:0x2094c0c
+_ZN21TriggerAABB_Unk2_Unk111GetPositionEP5Vec3p kind:function(arm,size=0x10) addr:0x2094c14
+_ZN21TriggerAABB_Unk2_Unk19GetSizeXZEv kind:function(arm,size=0x2c) addr:0x2094c24
+_ZN21TriggerAABB_Unk2_Unk19GetHeightEv kind:function(arm,size=0x10) addr:0x2094c50
+_ZN21TriggerAABB_Unk2_Unk1D0Ev kind:function(arm,size=0x1c) addr:0x2094c60
 func_ov000_02094cdc kind:function(arm,size=0x8) addr:0x2094c7c
 func_ov000_02094ce4 kind:function(arm,size=0x8) addr:0x2094c84
 func_ov000_02094cec kind:function(arm,size=0x8) addr:0x2094c8c
@@ -2637,7 +2637,7 @@ _ZNK9EquipItem8IsUsableEi kind:function(arm,size=0x18) addr:0x20be884
 _ZNK9EquipItem7IsInUseEv kind:function(arm,size=0x8) addr:0x20be89c
 _ZN9EquipItem11UpdateInUseEi kind:function(arm,size=0x60) addr:0x20be8a4
 _ZN9EquipItem8vfunc_2cEv kind:function(arm,size=0x8) addr:0x20be904
-_Z8vfunc_34Ps kind:function(arm,size=0x4) addr:0x20be90c
+_ZN9EquipItem8vfunc_34EPs kind:function(arm,size=0x4) addr:0x20be90c
 _ZNK9EquipItem8vfunc_40Ev kind:function(arm,size=0x8) addr:0x20be910
 _ZNK9EquipItem8vfunc_44Ei kind:function(arm,size=0x8) addr:0x20be918
 _ZNK9EquipItem8vfunc_48Ei kind:function(arm,size=0x8) addr:0x20be920
@@ -2649,14 +2649,14 @@ _ZN9EquipItem7GetAmmoEv kind:function(arm,size=0x2c) addr:0x20bead0
 _ZN9EquipItem8GiveAmmoEj kind:function(arm,size=0x34) addr:0x20beafc
 _ZNK9EquipItem9GetHitboxEP8Cylinder kind:function(arm,size=0x18) addr:0x20beb30
 _ZN24UnkStruct_ov000_020beba8C1Ei kind:function(arm,size=0x18) addr:0x20beb48
-_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x18) addr:0x20beb60
-_ZN24UnkStruct_ov000_020beba88vfunc_0cEPs kind:function(arm,size=0x84) addr:0x20beb78
-_ZN24UnkStruct_ov000_020beba88vfunc_10EPi kind:function(arm,size=0x84) addr:0x20bebfc
-_ZN24UnkStruct_ov000_020beba88vfunc_18EPi kind:function(arm,size=0x9c) addr:0x20bec80
-_ZN24UnkStruct_ov000_020beba88vfunc_14EPt kind:function(arm,size=0x50) addr:0x20bed1c
-_ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x98) addr:0x20bed6c
-_ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x14) addr:0x20bee04
-func_ov000_020bee78 kind:function(arm,size=0x1c) addr:0x20bee18
+_ZN24UnkStruct_ov000_020beba8C2Ei kind:function(arm,size=0x18) addr:0x20beb60
+_ZN24UnkStruct_ov000_020beba88vfunc_08EPs kind:function(arm,size=0x84) addr:0x20beb78
+_ZN24UnkStruct_ov000_020beba88vfunc_0cEPs kind:function(arm,size=0x84) addr:0x20bebfc
+_ZN24UnkStruct_ov000_020beba88vfunc_10EPi kind:function(arm,size=0x9c) addr:0x20bec80
+_ZN24UnkStruct_ov000_020beba88vfunc_18EPi kind:function(arm,size=0x50) addr:0x20bed1c
+_ZN24UnkStruct_ov000_020beba88vfunc_14EPt kind:function(arm,size=0x98) addr:0x20bed6c
+_ZN24UnkStruct_ov000_020beba8D1Ev kind:function(arm,size=0x14) addr:0x20bee04
+_ZN24UnkStruct_ov000_020beba8D0Ev kind:function(arm,size=0x1c) addr:0x20bee18
 func_ov000_020bee94 kind:function(arm,size=0x3c) addr:0x20bee34
 func_ov000_020beed0 kind:function(arm,size=0x40) addr:0x20bee70
 func_ov000_020bef10 kind:function(arm,size=0x8) addr:0x20beeb0
@@ -4074,9 +4074,9 @@ data_ov000_020e2c54 kind:data(any) addr:0x20e2bf4
 data_ov000_020e2ca4 kind:data(any) addr:0x20e2c44
 data_ov000_020e2cf4 kind:data(any) addr:0x20e2c94
 data_ov000_020e2d44 kind:data(any) addr:0x20e2ce4
-data_ov000_020e2dd8 kind:data(any) addr:0x20e2d78
+_ZTV21TriggerAABB_Unk2_Unk1 kind:data(any) addr:0x20e2d78
 data_ov000_020e2e3c kind:data(any) addr:0x20e2ddc
-data_ov000_020e2f04 kind:data(any) addr:0x20e2ea4
+_ZTV24UnkStruct_ov000_020e2f04 kind:data(any) addr:0x20e2ea4
 data_ov000_020e2f68 kind:data(any) addr:0x20e2f08
 data_ov000_020e2f98 kind:data(any) addr:0x20e2f38
 data_ov000_020e2fa8 kind:data(any) addr:0x20e2f48
diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt
index b71c1e36..111028e3 100644
--- a/config/usa/arm9/symbols.txt
+++ b/config/usa/arm9/symbols.txt
@@ -2210,18 +2210,18 @@ func_020420b4 kind:function(thumb,size=0xdc) addr:0x2042070
 func_02042190 kind:function(thumb,size=0x34) addr:0x204214c
 func_020421c4 kind:function(thumb,size=0x14) addr:0x2042180
 func_020421d8 kind:function(thumb,size=0x24) addr:0x2042194
-func_020421fc kind:function(thumb,size=0x14) addr:0x20421b8
-func_02042210 kind:function(thumb,size=0x28) addr:0x20421cc
-func_02042238 kind:function(thumb,size=0x18) addr:0x20421f4
-func_02042250 kind:function(thumb,size=0x9c) addr:0x204220c
-func_020422ec kind:function(thumb,size=0xa0) addr:0x20422a8
-func_0204238c kind:function(thumb,size=0x5c) addr:0x2042348
-func_020423e8 kind:function(thumb,size=0x58) addr:0x20423a4
-func_02042440 kind:function(thumb,size=0x94) addr:0x20423fc
-func_020424d4 kind:function(thumb,size=0xa4) addr:0x2042490
-func_02042578 kind:function(thumb,size=0xc) addr:0x2042534
-func_02042584 kind:function(thumb,size=0x30) addr:0x2042540
-func_020425b4 kind:function(thumb,size=0x2c) addr:0x2042570
+Overlay_FileSize kind:function(thumb,size=0x14) addr:0x20421b8
+Overlay_ClearCacheAndBss kind:function(thumb,size=0x28) addr:0x20421cc
+Overlay_func_02042238 kind:function(thumb,size=0x18) addr:0x20421f4
+Overlay_func_02042250 kind:function(thumb,size=0x9c) addr:0x204220c
+Overlay_func_020422ec kind:function(thumb,size=0xa0) addr:0x20422a8
+Overlay_func_0204238c kind:function(thumb,size=0x5c) addr:0x2042348
+Overlay_func_020423e8 kind:function(thumb,size=0x58) addr:0x20423a4
+Overlay_Init kind:function(thumb,size=0x94) addr:0x20423fc
+Overlay_RunGlobalDestructors kind:function(thumb,size=0xa4) addr:0x2042490
+Overlay_Destroy kind:function(thumb,size=0xc) addr:0x2042534
+Overlay_Load kind:function(thumb,size=0x30) addr:0x2042540
+Overlay_Unload kind:function(thumb,size=0x2c) addr:0x2042570
 func_020425e0 kind:function(thumb,size=0x40) addr:0x204259c
 func_02042620 kind:function(thumb,size=0x48) addr:0x20425dc
 func_02042668 kind:function(thumb,size=0x24) addr:0x2042624
diff --git a/include/Unknown/UnkStruct_ov000_020e2f04.hpp b/include/Unknown/UnkStruct_ov000_020e2f04.hpp
index f3e226a6..74739291 100644
--- a/include/Unknown/UnkStruct_ov000_020e2f04.hpp
+++ b/include/Unknown/UnkStruct_ov000_020e2f04.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <nds/math.H>
+
+#include "Physics/AABB.hpp"
 #include "global.h"
 #include "types.h"
 
diff --git a/src/00_Core/Map/TriggerAABB_Unk2_Unk1_1.cpp b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_1.cpp
new file mode 100644
index 00000000..6a44f466
--- /dev/null
+++ b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_1.cpp
@@ -0,0 +1,6 @@
+#include "Map/TriggerAABB_Unk2.hpp"
+
+bool TriggerAABB_Unk2_Unk1::ContainsInXZ(Vec3p *pos) {}
+bool TriggerAABB_Unk2_Unk1::Contains(Vec3p *pos) {}
+bool TriggerAABB_Unk2_Unk1::IntersectsCube(Cube *cube) {}
+void TriggerAABB_Unk2_Unk1::vfunc_54(Cube *param1, Vec3p *param2, u32 *param3) {}
diff --git a/src/00_Core/Map/TriggerAABB_Unk2_Unk1_2.cpp b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_2.cpp
new file mode 100644
index 00000000..0879387b
--- /dev/null
+++ b/src/00_Core/Map/TriggerAABB_Unk2_Unk1_2.cpp
@@ -0,0 +1,12 @@
+#include "Map/TriggerAABB_Unk2.hpp"
+
+unk32 TriggerAABB_Unk2_Unk1::vfunc_08() {}
+void TriggerAABB_Unk2_Unk1::SetBoundingBox(AABB *param1) {}
+void TriggerAABB_Unk2_Unk1::GetBoundingBox(AABB *bbox) {}
+void TriggerAABB_Unk2_Unk1::SetPosition(Vec3p *pos) {}
+void TriggerAABB_Unk2_Unk1::vfunc_34() {}
+void TriggerAABB_Unk2_Unk1::vfunc_38() {}
+void TriggerAABB_Unk2_Unk1::GetPosition(Vec3p *pos) {}
+q20 TriggerAABB_Unk2_Unk1::GetSizeXZ() {}
+q20 TriggerAABB_Unk2_Unk1::GetHeight() {}
+TriggerAABB_Unk2_Unk1::~TriggerAABB_Unk2_Unk1() {}
diff --git a/src/00_Core/Player/EquipItem.cpp b/src/00_Core/Player/EquipItem.cpp
index 893f17a7..9256b13a 100644
--- a/src/00_Core/Player/EquipItem.cpp
+++ b/src/00_Core/Player/EquipItem.cpp
@@ -6,7 +6,7 @@ bool EquipItem::IsUsable(unk32 param1) const {}
 bool EquipItem::IsInUse() const {}
 bool EquipItem::UpdateInUse(unk32 param1) {}
 u32 EquipItem::vfunc_2c() {}
-void vfunc_34(unk16 *param1) {}
+void EquipItem::vfunc_34(unk16 *param1) {}
 unk32 EquipItem::vfunc_40() const {}
 unk32 EquipItem::vfunc_44(unk32 param1) const {}
 unk32 EquipItem::vfunc_48(unk32 param1) const {}
diff --git a/src/00_Core/Unknown/UnkStruct_ov000_020e2f04.cpp b/src/00_Core/Unknown/UnkStruct_ov000_020e2f04.cpp
new file mode 100644
index 00000000..52e9cfd6
--- /dev/null
+++ b/src/00_Core/Unknown/UnkStruct_ov000_020e2f04.cpp
@@ -0,0 +1,13 @@
+#include "Unknown/UnkStruct_ov000_020e2f04.hpp"
+
+UnkStruct_ov000_020e2f04::~UnkStruct_ov000_020e2f04() {}
+void UnkStruct_ov000_020e2f04::vfunc_0c() {}
+void UnkStruct_ov000_020e2f04::vfunc_10() {}
+void UnkStruct_ov000_020e2f04::vfunc_14(AABB *param1, unk32 param2, unk32 param3, unk32 param4) {}
+void UnkStruct_ov000_020e2f04::vfunc_18() {}
+void UnkStruct_ov000_020e2f04::vfunc_1c() {}
+void UnkStruct_ov000_020e2f04::SetBoundingBox(AABB *param1) {}
+void UnkStruct_ov000_020e2f04::vfunc_24() {}
+void UnkStruct_ov000_020e2f04::vfunc_28() {}
+void UnkStruct_ov000_020e2f04::GetBoundingBox(AABB *bbox) {}
+void UnkStruct_ov000_020e2f04::vfunc_58(unk32 param1, unk32 param2, s32 param3) {}