summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2024-06-25 07:34:59 -0700
committerGitHub <noreply@github.com>2024-06-25 08:34:59 -0600
commitd923917b39f99ca74bd2ee2f609e8ff193f5c48a (patch)
tree380aeb1dc2527f54e23f7b63ede46b2ce24ff0a8 /asm
parent3c82015f69403d22f7ee3809425cb217f5bdc3b5 (diff)
work on d_camera / d_ev_camera (#2170)
Diffstat (limited to 'asm')
-rw-r--r--asm/d/d_camera/Center__9dCamera_cFv.s14
-rw-r--r--asm/d/d_camera/ChangeModeOK__9dCamera_cFl.s26
-rw-r--r--asm/d/d_camera/Draw__9dCamera_cFv.s11
-rw-r--r--asm/d/d_camera/Eye__9dCamera_cFv.s14
-rw-r--r--asm/d/d_camera/GetCameraTypeFromCameraName__9dCamera_cFPCc.s50
-rw-r--r--asm/d/d_camera/GetCameraTypeFromMapToolID__9dCamera_cFll.s150
-rw-r--r--asm/d/d_camera/GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class.s24
-rw-r--r--asm/d/d_camera/ModeFix__9dCamera_cFl.s4
-rw-r--r--asm/d/d_camera/QuickStart__9dCamera_cFv.s4
-rw-r--r--asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s24
-rw-r--r--asm/d/d_camera/SetTrimSize__9dCamera_cFl.s8
-rw-r--r--asm/d/d_camera/SetTrimTypeForce__9dCamera_cFl.s4
-rw-r--r--asm/d/d_camera/Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc.s125
-rw-r--r--asm/d/d_camera/Start__9dCamera_cFv.s7
-rw-r--r--asm/d/d_camera/Stay__9dCamera_cFv.s4
-rw-r--r--asm/d/d_camera/Stop__9dCamera_cFv.s7
-rw-r--r--asm/d/d_camera/U__9dCamera_cFv.s17
-rw-r--r--asm/d/d_camera/Up__9dCamera_cFv.s19
-rw-r--r--asm/d/d_camera/V__9dCamera_cFv.s9
-rw-r--r--asm/d/d_camera/camera_create__FP12camera_class.s13
-rw-r--r--asm/d/d_camera/func_8015FA2C.s10
-rw-r--r--asm/d/d_camera/func_8015FADC.s24
-rw-r--r--asm/d/d_camera/func_8015FB28.s61
-rw-r--r--asm/d/d_camera/getParamTargetActor__9dCamera_cFl.s59
-rw-r--r--asm/d/d_camera/getUSOAngle__9dCamera_cF7cSAngle.s10
-rw-r--r--asm/d/d_camera/init_phase1__FP12camera_class.s33
-rw-r--r--asm/d/d_camera/onRoomChange__9dCamera_cFl.s54
-rw-r--r--asm/d/d_camera/popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c.s33
-rw-r--r--asm/d/d_camera/pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs.s19
-rw-r--r--asm/d/d_camera/setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall.s15
-rw-r--r--asm/d/d_camera/setUSOAngle__9dCamera_cFv.s22
-rw-r--r--asm/d/d_ev_camera/func_800889F8.s38
-rw-r--r--asm/d/d_ev_camera/func_8008E750.s11
-rw-r--r--asm/d/d_ev_camera/getEvActor__9dCamera_cFPc.s87
-rw-r--r--asm/d/d_ev_camera/getEvActor__9dCamera_cFPcPc.s89
-rw-r--r--asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPc.s56
-rw-r--r--asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPcf.s60
-rw-r--r--asm/d/d_ev_camera/getEvFloatListData__9dCamera_cFPPfPc.s55
-rw-r--r--asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPc.s63
-rw-r--r--asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPci.s56
-rw-r--r--asm/d/d_ev_camera/getEvStringData__9dCamera_cFPcPcPc.s62
-rw-r--r--asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPc.s48
-rw-r--r--asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPcPc.s47
-rw-r--r--asm/d/d_ev_camera/getEvXyzData__9dCamera_cFP4cXyzPc4cXyz.s74
-rw-r--r--asm/d/d_ev_camera/getEvXyzListData__9dCamera_cFPP4cXyzPc.s55
-rw-r--r--asm/d/d_ev_camera/pauseEvCamera__9dCamera_cFv.s51
-rw-r--r--asm/d/d_ev_camera/saveEvCamera__9dCamera_cFv.s50
-rw-r--r--asm/d/d_ev_camera/uniformAcceleEvCamera__9dCamera_cFv.s10
-rw-r--r--asm/d/d_ev_camera/uniformBrakeEvCamera__9dCamera_cFv.s10
-rw-r--r--asm/d/d_ev_camera/uniformTransEvCamera__9dCamera_cFv.s10
50 files changed, 0 insertions, 1806 deletions
diff --git a/asm/d/d_camera/Center__9dCamera_cFv.s b/asm/d/d_camera/Center__9dCamera_cFv.s
deleted file mode 100644
index 3b0dea165c..0000000000
--- a/asm/d/d_camera/Center__9dCamera_cFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_80181E98:
-/* 80181E98 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80181E9C 7C 08 02 A6 */ mflr r0
-/* 80181EA0 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80181EA4 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80181EA8 7C 85 23 78 */ mr r5, r4
-/* 80181EAC 38 85 00 30 */ addi r4, r5, 0x30
-/* 80181EB0 38 A5 06 DC */ addi r5, r5, 0x6dc
-/* 80181EB4 48 0E 4C 31 */ bl __pl__4cXyzCFRC3Vec
-/* 80181EB8 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80181EBC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80181EC0 7C 08 03 A6 */ mtlr r0
-/* 80181EC4 38 21 00 10 */ addi r1, r1, 0x10
-/* 80181EC8 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/ChangeModeOK__9dCamera_cFl.s b/asm/d/d_camera/ChangeModeOK__9dCamera_cFl.s
deleted file mode 100644
index e9384d137b..0000000000
--- a/asm/d/d_camera/ChangeModeOK__9dCamera_cFl.s
+++ /dev/null
@@ -1,26 +0,0 @@
-lbl_801614F4:
-/* 801614F4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801614F8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801614FC 80 05 51 84 */ lwz r0, 0x5184(r5)
-/* 80161500 2C 00 00 00 */ cmpwi r0, 0
-/* 80161504 40 82 00 10 */ bne lbl_80161514
-/* 80161508 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 8016150C 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80161510 41 82 00 0C */ beq lbl_8016151C
-lbl_80161514:
-/* 80161514 38 60 00 00 */ li r3, 0
-/* 80161518 4E 80 00 20 */ blr
-lbl_8016151C:
-/* 8016151C 80 A3 06 84 */ lwz r5, 0x684(r3)
-/* 80161520 80 03 06 8C */ lwz r0, 0x68c(r3)
-/* 80161524 1C 00 00 44 */ mulli r0, r0, 0x44
-/* 80161528 7C A5 02 14 */ add r5, r5, r0
-/* 8016152C 80 03 01 90 */ lwz r0, 0x190(r3)
-/* 80161530 1C 00 00 16 */ mulli r0, r0, 0x16
-/* 80161534 7C 65 02 14 */ add r3, r5, r0
-/* 80161538 54 80 08 3C */ slwi r0, r4, 1
-/* 8016153C 7C 63 02 14 */ add r3, r3, r0
-/* 80161540 A8 03 00 18 */ lha r0, 0x18(r3)
-/* 80161544 54 00 0F FE */ srwi r0, r0, 0x1f
-/* 80161548 68 03 00 01 */ xori r3, r0, 1
-/* 8016154C 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Draw__9dCamera_cFv.s b/asm/d/d_camera/Draw__9dCamera_cFv.s
deleted file mode 100644
index 6ca8b8a08f..0000000000
--- a/asm/d/d_camera/Draw__9dCamera_cFv.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_80163154:
-/* 80163154 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80163158 7C 08 02 A6 */ mflr r0
-/* 8016315C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80163160 38 63 02 28 */ addi r3, r3, 0x228
-/* 80163164 48 01 F3 FD */ bl Draw__14dCamForcusLineFv
-/* 80163168 38 60 00 01 */ li r3, 1
-/* 8016316C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80163170 7C 08 03 A6 */ mtlr r0
-/* 80163174 38 21 00 10 */ addi r1, r1, 0x10
-/* 80163178 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Eye__9dCamera_cFv.s b/asm/d/d_camera/Eye__9dCamera_cFv.s
deleted file mode 100644
index 1000254645..0000000000
--- a/asm/d/d_camera/Eye__9dCamera_cFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_80181E64:
-/* 80181E64 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80181E68 7C 08 02 A6 */ mflr r0
-/* 80181E6C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80181E70 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80181E74 7C 85 23 78 */ mr r5, r4
-/* 80181E78 38 85 00 3C */ addi r4, r5, 0x3c
-/* 80181E7C 38 A5 06 E8 */ addi r5, r5, 0x6e8
-/* 80181E80 48 0E 4C 65 */ bl __pl__4cXyzCFRC3Vec
-/* 80181E84 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80181E88 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80181E8C 7C 08 03 A6 */ mtlr r0
-/* 80181E90 38 21 00 10 */ addi r1, r1, 0x10
-/* 80181E94 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/GetCameraTypeFromCameraName__9dCamera_cFPCc.s b/asm/d/d_camera/GetCameraTypeFromCameraName__9dCamera_cFPCc.s
deleted file mode 100644
index 496c011694..0000000000
--- a/asm/d/d_camera/GetCameraTypeFromCameraName__9dCamera_cFPCc.s
+++ /dev/null
@@ -1,50 +0,0 @@
-lbl_80164B64:
-/* 80164B64 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80164B68 7C 08 02 A6 */ mflr r0
-/* 80164B6C 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80164B70 39 61 00 20 */ addi r11, r1, 0x20
-/* 80164B74 48 1F D6 65 */ bl _savegpr_28
-/* 80164B78 7C 7C 1B 78 */ mr r28, r3
-/* 80164B7C 7C 9D 23 78 */ mr r29, r4
-/* 80164B80 7F A3 EB 78 */ mr r3, r29
-/* 80164B84 80 9C 06 84 */ lwz r4, 0x684(r28)
-/* 80164B88 80 1C 06 8C */ lwz r0, 0x68c(r28)
-/* 80164B8C 1C 00 00 44 */ mulli r0, r0, 0x44
-/* 80164B90 7C 84 02 14 */ add r4, r4, r0
-/* 80164B94 48 20 3E 01 */ bl strcmp
-/* 80164B98 2C 03 00 00 */ cmpwi r3, 0
-/* 80164B9C 40 82 00 0C */ bne lbl_80164BA8
-/* 80164BA0 80 7C 06 8C */ lwz r3, 0x68c(r28)
-/* 80164BA4 48 00 00 54 */ b lbl_80164BF8
-lbl_80164BA8:
-/* 80164BA8 3B C0 00 00 */ li r30, 0
-/* 80164BAC 3B E0 00 00 */ li r31, 0
-/* 80164BB0 48 00 00 24 */ b lbl_80164BD4
-lbl_80164BB4:
-/* 80164BB4 7F A3 EB 78 */ mr r3, r29
-/* 80164BB8 80 1C 06 84 */ lwz r0, 0x684(r28)
-/* 80164BBC 7C 80 FA 14 */ add r4, r0, r31
-/* 80164BC0 48 20 3D D5 */ bl strcmp
-/* 80164BC4 2C 03 00 00 */ cmpwi r3, 0
-/* 80164BC8 41 82 00 18 */ beq lbl_80164BE0
-/* 80164BCC 3B DE 00 01 */ addi r30, r30, 1
-/* 80164BD0 3B FF 00 44 */ addi r31, r31, 0x44
-lbl_80164BD4:
-/* 80164BD4 80 1C 06 88 */ lwz r0, 0x688(r28)
-/* 80164BD8 7C 1E 00 00 */ cmpw r30, r0
-/* 80164BDC 41 80 FF D8 */ blt lbl_80164BB4
-lbl_80164BE0:
-/* 80164BE0 80 1C 06 88 */ lwz r0, 0x688(r28)
-/* 80164BE4 7C 1E 00 00 */ cmpw r30, r0
-/* 80164BE8 40 82 00 0C */ bne lbl_80164BF4
-/* 80164BEC 38 60 00 FF */ li r3, 0xff
-/* 80164BF0 48 00 00 08 */ b lbl_80164BF8
-lbl_80164BF4:
-/* 80164BF4 7F C3 F3 78 */ mr r3, r30
-lbl_80164BF8:
-/* 80164BF8 39 61 00 20 */ addi r11, r1, 0x20
-/* 80164BFC 48 1F D6 29 */ bl _restgpr_28
-/* 80164C00 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80164C04 7C 08 03 A6 */ mtlr r0
-/* 80164C08 38 21 00 20 */ addi r1, r1, 0x20
-/* 80164C0C 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/GetCameraTypeFromMapToolID__9dCamera_cFll.s b/asm/d/d_camera/GetCameraTypeFromMapToolID__9dCamera_cFll.s
deleted file mode 100644
index 9752caacd7..0000000000
--- a/asm/d/d_camera/GetCameraTypeFromMapToolID__9dCamera_cFll.s
+++ /dev/null
@@ -1,150 +0,0 @@
-lbl_80164944:
-/* 80164944 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 80164948 7C 08 02 A6 */ mflr r0
-/* 8016494C 90 01 00 34 */ stw r0, 0x34(r1)
-/* 80164950 39 61 00 30 */ addi r11, r1, 0x30
-/* 80164954 48 1F D8 79 */ bl _savegpr_25
-/* 80164958 7C 7C 1B 78 */ mr r28, r3
-/* 8016495C 7C 9D 23 78 */ mr r29, r4
-/* 80164960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80164964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80164968 3B 43 4E 20 */ addi r26, r3, 0x4e20
-/* 8016496C 2C 05 FF FF */ cmpwi r5, -1
-/* 80164970 40 82 00 38 */ bne lbl_801649A8
-/* 80164974 7F 43 D3 78 */ mr r3, r26
-/* 80164978 81 9A 00 00 */ lwz r12, 0(r26)
-/* 8016497C 81 8C 00 10 */ lwz r12, 0x10(r12)
-/* 80164980 7D 89 03 A6 */ mtctr r12
-/* 80164984 4E 80 04 21 */ bctrl
-/* 80164988 7C 79 1B 78 */ mr r25, r3
-/* 8016498C 7F 43 D3 78 */ mr r3, r26
-/* 80164990 81 9A 00 00 */ lwz r12, 0(r26)
-/* 80164994 81 8C 00 18 */ lwz r12, 0x18(r12)
-/* 80164998 7D 89 03 A6 */ mtctr r12
-/* 8016499C 4E 80 04 21 */ bctrl
-/* 801649A0 7C 7E 1B 78 */ mr r30, r3
-/* 801649A4 48 00 00 30 */ b lbl_801649D4
-lbl_801649A8:
-/* 801649A8 7C BB 2B 78 */ mr r27, r5
-/* 801649AC 7F 63 DB 78 */ mr r3, r27
-/* 801649B0 4B EC 88 AD */ bl dComIfGp_getRoomCamera__Fi
-/* 801649B4 7C 79 1B 78 */ mr r25, r3
-/* 801649B8 7F 63 DB 78 */ mr r3, r27
-/* 801649BC 4B EC 88 F1 */ bl dComIfGp_getRoomArrow__Fi
-/* 801649C0 7C 7E 1B 78 */ mr r30, r3
-/* 801649C4 28 19 00 00 */ cmplwi r25, 0
-/* 801649C8 40 82 00 0C */ bne lbl_801649D4
-/* 801649CC 38 60 00 FF */ li r3, 0xff
-/* 801649D0 48 00 01 7C */ b lbl_80164B4C
-lbl_801649D4:
-/* 801649D4 2C 1D 00 00 */ cmpwi r29, 0
-/* 801649D8 41 80 00 1C */ blt lbl_801649F4
-/* 801649DC 28 19 00 00 */ cmplwi r25, 0
-/* 801649E0 41 82 00 14 */ beq lbl_801649F4
-/* 801649E4 41 82 00 18 */ beq lbl_801649FC
-/* 801649E8 80 19 00 00 */ lwz r0, 0(r25)
-/* 801649EC 7C 1D 00 00 */ cmpw r29, r0
-/* 801649F0 41 80 00 0C */ blt lbl_801649FC
-lbl_801649F4:
-/* 801649F4 38 60 00 FF */ li r3, 0xff
-/* 801649F8 48 00 01 54 */ b lbl_80164B4C
-lbl_801649FC:
-/* 801649FC 3B E0 00 00 */ li r31, 0
-/* 80164A00 3B 60 00 00 */ li r27, 0
-/* 80164A04 1F 5D 00 18 */ mulli r26, r29, 0x18
-/* 80164A08 48 00 00 28 */ b lbl_80164A30
-lbl_80164A0C:
-/* 80164A0C 80 19 00 04 */ lwz r0, 4(r25)
-/* 80164A10 7C 60 D2 14 */ add r3, r0, r26
-/* 80164A14 80 1C 06 84 */ lwz r0, 0x684(r28)
-/* 80164A18 7C 80 DA 14 */ add r4, r0, r27
-/* 80164A1C 48 20 3F 79 */ bl strcmp
-/* 80164A20 2C 03 00 00 */ cmpwi r3, 0
-/* 80164A24 41 82 00 18 */ beq lbl_80164A3C
-/* 80164A28 3B FF 00 01 */ addi r31, r31, 1
-/* 80164A2C 3B 7B 00 44 */ addi r27, r27, 0x44
-lbl_80164A30:
-/* 80164A30 80 1C 06 88 */ lwz r0, 0x688(r28)
-/* 80164A34 7C 1F 00 00 */ cmpw r31, r0
-/* 80164A38 41 80 FF D4 */ blt lbl_80164A0C
-lbl_80164A3C:
-/* 80164A3C 80 1C 06 88 */ lwz r0, 0x688(r28)
-/* 80164A40 7C 1F 00 00 */ cmpw r31, r0
-/* 80164A44 40 82 00 0C */ bne lbl_80164A50
-/* 80164A48 38 60 00 FF */ li r3, 0xff
-/* 80164A4C 48 00 01 00 */ b lbl_80164B4C
-lbl_80164A50:
-/* 80164A50 80 19 00 04 */ lwz r0, 4(r25)
-/* 80164A54 7C 80 D2 14 */ add r4, r0, r26
-/* 80164A58 80 64 00 00 */ lwz r3, 0(r4)
-/* 80164A5C 80 04 00 04 */ lwz r0, 4(r4)
-/* 80164A60 90 7C 07 AC */ stw r3, 0x7ac(r28)
-/* 80164A64 90 1C 07 B0 */ stw r0, 0x7b0(r28)
-/* 80164A68 80 64 00 08 */ lwz r3, 8(r4)
-/* 80164A6C 80 04 00 0C */ lwz r0, 0xc(r4)
-/* 80164A70 90 7C 07 B4 */ stw r3, 0x7b4(r28)
-/* 80164A74 90 1C 07 B8 */ stw r0, 0x7b8(r28)
-/* 80164A78 88 04 00 10 */ lbz r0, 0x10(r4)
-/* 80164A7C 98 1C 07 BC */ stb r0, 0x7bc(r28)
-/* 80164A80 88 04 00 11 */ lbz r0, 0x11(r4)
-/* 80164A84 98 1C 07 BD */ stb r0, 0x7bd(r28)
-/* 80164A88 88 04 00 12 */ lbz r0, 0x12(r4)
-/* 80164A8C 98 1C 07 BE */ stb r0, 0x7be(r28)
-/* 80164A90 88 04 00 13 */ lbz r0, 0x13(r4)
-/* 80164A94 98 1C 07 BF */ stb r0, 0x7bf(r28)
-/* 80164A98 A0 04 00 14 */ lhz r0, 0x14(r4)
-/* 80164A9C B0 1C 07 C0 */ sth r0, 0x7c0(r28)
-/* 80164AA0 A0 04 00 16 */ lhz r0, 0x16(r4)
-/* 80164AA4 B0 1C 07 C2 */ sth r0, 0x7c2(r28)
-/* 80164AA8 93 BC 07 DC */ stw r29, 0x7dc(r28)
-/* 80164AAC A0 1C 07 C0 */ lhz r0, 0x7c0(r28)
-/* 80164AB0 54 00 97 BE */ rlwinm r0, r0, 0x12, 0x1e, 0x1f
-/* 80164AB4 98 1C 07 E6 */ stb r0, 0x7e6(r28)
-/* 80164AB8 A0 7C 07 C0 */ lhz r3, 0x7c0(r28)
-/* 80164ABC 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12
-/* 80164AC0 41 82 00 10 */ beq lbl_80164AD0
-/* 80164AC4 60 60 C0 00 */ ori r0, r3, 0xc000
-/* 80164AC8 B0 1C 07 C0 */ sth r0, 0x7c0(r28)
-/* 80164ACC 48 00 00 0C */ b lbl_80164AD8
-lbl_80164AD0:
-/* 80164AD0 54 60 04 BE */ clrlwi r0, r3, 0x12
-/* 80164AD4 B0 1C 07 C0 */ sth r0, 0x7c0(r28)
-lbl_80164AD8:
-/* 80164AD8 88 1C 07 BC */ lbz r0, 0x7bc(r28)
-/* 80164ADC 90 1C 07 D8 */ stw r0, 0x7d8(r28)
-/* 80164AE0 80 9C 07 D8 */ lwz r4, 0x7d8(r28)
-/* 80164AE4 2C 04 FF FF */ cmpwi r4, -1
-/* 80164AE8 41 82 00 58 */ beq lbl_80164B40
-/* 80164AEC 80 1E 00 00 */ lwz r0, 0(r30)
-/* 80164AF0 7C 04 00 00 */ cmpw r4, r0
-/* 80164AF4 40 80 00 4C */ bge lbl_80164B40
-/* 80164AF8 80 7E 00 04 */ lwz r3, 4(r30)
-/* 80164AFC 1C 04 00 14 */ mulli r0, r4, 0x14
-/* 80164B00 7C 63 02 14 */ add r3, r3, r0
-/* 80164B04 C0 03 00 00 */ lfs f0, 0(r3)
-/* 80164B08 D0 1C 07 C4 */ stfs f0, 0x7c4(r28)
-/* 80164B0C C0 03 00 04 */ lfs f0, 4(r3)
-/* 80164B10 D0 1C 07 C8 */ stfs f0, 0x7c8(r28)
-/* 80164B14 C0 03 00 08 */ lfs f0, 8(r3)
-/* 80164B18 D0 1C 07 CC */ stfs f0, 0x7cc(r28)
-/* 80164B1C A8 03 00 0C */ lha r0, 0xc(r3)
-/* 80164B20 B0 1C 07 D0 */ sth r0, 0x7d0(r28)
-/* 80164B24 A8 03 00 0E */ lha r0, 0xe(r3)
-/* 80164B28 B0 1C 07 D2 */ sth r0, 0x7d2(r28)
-/* 80164B2C A8 03 00 10 */ lha r0, 0x10(r3)
-/* 80164B30 B0 1C 07 D4 */ sth r0, 0x7d4(r28)
-/* 80164B34 A8 03 00 12 */ lha r0, 0x12(r3)
-/* 80164B38 B0 1C 07 D6 */ sth r0, 0x7d6(r28)
-/* 80164B3C 48 00 00 0C */ b lbl_80164B48
-lbl_80164B40:
-/* 80164B40 38 00 00 FF */ li r0, 0xff
-/* 80164B44 90 1C 07 D8 */ stw r0, 0x7d8(r28)
-lbl_80164B48:
-/* 80164B48 7F E3 FB 78 */ mr r3, r31
-lbl_80164B4C:
-/* 80164B4C 39 61 00 30 */ addi r11, r1, 0x30
-/* 80164B50 48 1F D6 C9 */ bl _restgpr_25
-/* 80164B54 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 80164B58 7C 08 03 A6 */ mtlr r0
-/* 80164B5C 38 21 00 30 */ addi r1, r1, 0x30
-/* 80164B60 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class.s b/asm/d/d_camera/GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class.s
deleted file mode 100644
index 94d103d2c4..0000000000
--- a/asm/d/d_camera/GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_80164C10:
-/* 80164C10 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80164C14 7C 08 02 A6 */ mflr r0
-/* 80164C18 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80164C1C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80164C20 7C 9F 23 78 */ mr r31, r4
-/* 80164C24 A0 04 00 16 */ lhz r0, 0x16(r4)
-/* 80164C28 28 00 FF FF */ cmplwi r0, 0xffff
-/* 80164C2C 41 82 00 0C */ beq lbl_80164C38
-/* 80164C30 7C 03 03 78 */ mr r3, r0
-/* 80164C34 48 00 00 1C */ b lbl_80164C50
-lbl_80164C38:
-/* 80164C38 4B FF FF 2D */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc
-/* 80164C3C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */
-/* 80164C40 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */
-/* 80164C44 7C 03 00 00 */ cmpw r3, r0
-/* 80164C48 40 80 00 08 */ bge lbl_80164C50
-/* 80164C4C B0 7F 00 16 */ sth r3, 0x16(r31)
-lbl_80164C50:
-/* 80164C50 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80164C54 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80164C58 7C 08 03 A6 */ mtlr r0
-/* 80164C5C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80164C60 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/ModeFix__9dCamera_cFl.s b/asm/d/d_camera/ModeFix__9dCamera_cFl.s
deleted file mode 100644
index 8bf9c03d18..0000000000
--- a/asm/d/d_camera/ModeFix__9dCamera_cFl.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_80163D50:
-/* 80163D50 90 83 01 AC */ stw r4, 0x1ac(r3)
-/* 80163D54 38 60 00 01 */ li r3, 1
-/* 80163D58 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/QuickStart__9dCamera_cFv.s b/asm/d/d_camera/QuickStart__9dCamera_cFv.s
deleted file mode 100644
index d6ed4d2490..0000000000
--- a/asm/d/d_camera/QuickStart__9dCamera_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_801614C4:
-/* 801614C4 38 00 00 00 */ li r0, 0
-/* 801614C8 90 03 00 24 */ stw r0, 0x24(r3)
-/* 801614CC 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s b/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s
deleted file mode 100644
index 4afac980e8..0000000000
--- a/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_80163558:
-/* 80163558 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8016355C 7C 08 02 A6 */ mflr r0
-/* 80163560 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80163564 7C 8A 23 79 */ or. r10, r4, r4
-/* 80163568 7C C9 33 78 */ mr r9, r6
-/* 8016356C 7C E8 3B 78 */ mr r8, r7
-/* 80163570 7C A4 2B 78 */ mr r4, r5
-/* 80163574 38 63 08 60 */ addi r3, r3, 0x860
-/* 80163578 41 82 00 10 */ beq lbl_80163588
-/* 8016357C 88 0A 04 E2 */ lbz r0, 0x4e2(r10)
-/* 80163580 7C 05 07 74 */ extsb r5, r0
-/* 80163584 48 00 00 0C */ b lbl_80163590
-lbl_80163588:
-/* 80163588 88 AD 87 E4 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0(r13)
-/* 8016358C 7C A5 07 74 */ extsb r5, r5
-lbl_80163590:
-/* 80163590 7D 46 53 78 */ mr r6, r10
-/* 80163594 7D 27 4B 78 */ mr r7, r9
-/* 80163598 4B FF C9 21 */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc
-/* 8016359C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 801635A0 7C 08 03 A6 */ mtlr r0
-/* 801635A4 38 21 00 10 */ addi r1, r1, 0x10
-/* 801635A8 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/SetTrimSize__9dCamera_cFl.s b/asm/d/d_camera/SetTrimSize__9dCamera_cFl.s
deleted file mode 100644
index 36970fd591..0000000000
--- a/asm/d/d_camera/SetTrimSize__9dCamera_cFl.s
+++ /dev/null
@@ -1,8 +0,0 @@
-lbl_8016300C:
-/* 8016300C 80 03 09 24 */ lwz r0, 0x924(r3)
-/* 80163010 7C A0 20 50 */ subf r5, r0, r4
-/* 80163014 30 05 FF FF */ addic r0, r5, -1
-/* 80163018 7C 00 29 10 */ subfe r0, r0, r5
-/* 8016301C 90 83 09 24 */ stw r4, 0x924(r3)
-/* 80163020 7C 03 03 78 */ mr r3, r0
-/* 80163024 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/SetTrimTypeForce__9dCamera_cFl.s b/asm/d/d_camera/SetTrimTypeForce__9dCamera_cFl.s
deleted file mode 100644
index dcabff8fc5..0000000000
--- a/asm/d/d_camera/SetTrimTypeForce__9dCamera_cFl.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_80163028:
-/* 80163028 90 83 09 28 */ stw r4, 0x928(r3)
-/* 8016302C 38 60 00 01 */ li r3, 1
-/* 80163030 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc.s b/asm/d/d_camera/Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc.s
deleted file mode 100644
index 276d80bdfb..0000000000
--- a/asm/d/d_camera/Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc.s
+++ /dev/null
@@ -1,125 +0,0 @@
-lbl_8015FEB8:
-/* 8015FEB8 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 8015FEBC 7C 08 02 A6 */ mflr r0
-/* 8015FEC0 90 01 00 34 */ stw r0, 0x34(r1)
-/* 8015FEC4 39 61 00 30 */ addi r11, r1, 0x30
-/* 8015FEC8 48 20 23 01 */ bl _savegpr_24
-/* 8015FECC 7C 7B 1B 78 */ mr r27, r3
-/* 8015FED0 7C 98 23 78 */ mr r24, r4
-/* 8015FED4 7C DC 33 78 */ mr r28, r6
-/* 8015FED8 7D 1D 43 78 */ mr r29, r8
-/* 8015FEDC 54 FF 04 3E */ clrlwi r31, r7, 0x10
-/* 8015FEE0 54 FE 06 3E */ clrlwi r30, r7, 0x18
-/* 8015FEE4 A0 03 00 38 */ lhz r0, 0x38(r3)
-/* 8015FEE8 7C 1E 00 00 */ cmpw r30, r0
-/* 8015FEEC 40 81 00 0C */ ble lbl_8015FEF8
-/* 8015FEF0 38 60 00 00 */ li r3, 0
-/* 8015FEF4 48 00 01 80 */ b lbl_80160074
-lbl_8015FEF8:
-/* 8015FEF8 7C B9 2B 78 */ mr r25, r5
-/* 8015FEFC 7F 23 CB 78 */ mr r3, r25
-/* 8015FF00 4B EC D3 5D */ bl dComIfGp_getRoomCamera__Fi
-/* 8015FF04 7C 7A 1B 78 */ mr r26, r3
-/* 8015FF08 7F 23 CB 78 */ mr r3, r25
-/* 8015FF0C 4B EC D3 A1 */ bl dComIfGp_getRoomArrow__Fi
-/* 8015FF10 28 1A 00 00 */ cmplwi r26, 0
-/* 8015FF14 41 82 01 5C */ beq lbl_80160070
-/* 8015FF18 2C 18 00 00 */ cmpwi r24, 0
-/* 8015FF1C 41 80 01 54 */ blt lbl_80160070
-/* 8015FF20 80 1A 00 00 */ lwz r0, 0(r26)
-/* 8015FF24 7C 18 00 00 */ cmpw r24, r0
-/* 8015FF28 40 80 01 48 */ bge lbl_80160070
-/* 8015FF2C 38 80 00 FF */ li r4, 0xff
-/* 8015FF30 90 9B 00 2C */ stw r4, 0x2c(r27)
-/* 8015FF34 90 9B 00 30 */ stw r4, 0x30(r27)
-/* 8015FF38 38 00 00 00 */ li r0, 0
-/* 8015FF3C 98 1B 00 3A */ stb r0, 0x3a(r27)
-/* 8015FF40 90 1B 00 34 */ stw r0, 0x34(r27)
-/* 8015FF44 98 9B 00 3B */ stb r4, 0x3b(r27)
-/* 8015FF48 B0 9B 00 38 */ sth r4, 0x38(r27)
-/* 8015FF4C 93 1B 00 30 */ stw r24, 0x30(r27)
-/* 8015FF50 80 9A 00 04 */ lwz r4, 4(r26)
-/* 8015FF54 80 1B 00 30 */ lwz r0, 0x30(r27)
-/* 8015FF58 1C 00 00 18 */ mulli r0, r0, 0x18
-/* 8015FF5C 7C A4 02 14 */ add r5, r4, r0
-/* 8015FF60 80 85 00 00 */ lwz r4, 0(r5)
-/* 8015FF64 80 05 00 04 */ lwz r0, 4(r5)
-/* 8015FF68 90 9B 00 00 */ stw r4, 0(r27)
-/* 8015FF6C 90 1B 00 04 */ stw r0, 4(r27)
-/* 8015FF70 80 85 00 08 */ lwz r4, 8(r5)
-/* 8015FF74 80 05 00 0C */ lwz r0, 0xc(r5)
-/* 8015FF78 90 9B 00 08 */ stw r4, 8(r27)
-/* 8015FF7C 90 1B 00 0C */ stw r0, 0xc(r27)
-/* 8015FF80 88 05 00 10 */ lbz r0, 0x10(r5)
-/* 8015FF84 98 1B 00 10 */ stb r0, 0x10(r27)
-/* 8015FF88 88 05 00 11 */ lbz r0, 0x11(r5)
-/* 8015FF8C 98 1B 00 11 */ stb r0, 0x11(r27)
-/* 8015FF90 88 05 00 12 */ lbz r0, 0x12(r5)
-/* 8015FF94 98 1B 00 12 */ stb r0, 0x12(r27)
-/* 8015FF98 88 05 00 13 */ lbz r0, 0x13(r5)
-/* 8015FF9C 98 1B 00 13 */ stb r0, 0x13(r27)
-/* 8015FFA0 A0 05 00 14 */ lhz r0, 0x14(r5)
-/* 8015FFA4 B0 1B 00 14 */ sth r0, 0x14(r27)
-/* 8015FFA8 A0 05 00 16 */ lhz r0, 0x16(r5)
-/* 8015FFAC B0 1B 00 16 */ sth r0, 0x16(r27)
-/* 8015FFB0 A0 1B 00 14 */ lhz r0, 0x14(r27)
-/* 8015FFB4 54 00 97 BE */ rlwinm r0, r0, 0x12, 0x1e, 0x1f
-/* 8015FFB8 98 1B 00 3A */ stb r0, 0x3a(r27)
-/* 8015FFBC 57 E0 04 21 */ rlwinm. r0, r31, 0, 0x10, 0x10
-/* 8015FFC0 41 82 00 10 */ beq lbl_8015FFD0
-/* 8015FFC4 88 1B 00 3A */ lbz r0, 0x3a(r27)
-/* 8015FFC8 60 00 00 10 */ ori r0, r0, 0x10
-/* 8015FFCC 98 1B 00 3A */ stb r0, 0x3a(r27)
-lbl_8015FFD0:
-/* 8015FFD0 A0 9B 00 14 */ lhz r4, 0x14(r27)
-/* 8015FFD4 54 80 04 A5 */ rlwinm. r0, r4, 0, 0x12, 0x12
-/* 8015FFD8 41 82 00 10 */ beq lbl_8015FFE8
-/* 8015FFDC 60 80 C0 00 */ ori r0, r4, 0xc000
-/* 8015FFE0 B0 1B 00 14 */ sth r0, 0x14(r27)
-/* 8015FFE4 48 00 00 0C */ b lbl_8015FFF0
-lbl_8015FFE8:
-/* 8015FFE8 54 80 04 BE */ clrlwi r0, r4, 0x12
-/* 8015FFEC B0 1B 00 14 */ sth r0, 0x14(r27)
-lbl_8015FFF0:
-/* 8015FFF0 88 1B 00 10 */ lbz r0, 0x10(r27)
-/* 8015FFF4 90 1B 00 2C */ stw r0, 0x2c(r27)
-/* 8015FFF8 28 03 00 00 */ cmplwi r3, 0
-/* 8015FFFC 41 82 00 60 */ beq lbl_8016005C
-/* 80160000 80 9B 00 2C */ lwz r4, 0x2c(r27)
-/* 80160004 2C 04 00 00 */ cmpwi r4, 0
-/* 80160008 41 80 00 54 */ blt lbl_8016005C
-/* 8016000C 80 03 00 00 */ lwz r0, 0(r3)
-/* 80160010 7C 04 00 00 */ cmpw r4, r0
-/* 80160014 40 80 00 48 */ bge lbl_8016005C
-/* 80160018 80 63 00 04 */ lwz r3, 4(r3)
-/* 8016001C 1C 04 00 14 */ mulli r0, r4, 0x14
-/* 80160020 7C 63 02 14 */ add r3, r3, r0
-/* 80160024 C0 03 00 00 */ lfs f0, 0(r3)
-/* 80160028 D0 1B 00 18 */ stfs f0, 0x18(r27)
-/* 8016002C C0 03 00 04 */ lfs f0, 4(r3)
-/* 80160030 D0 1B 00 1C */ stfs f0, 0x1c(r27)
-/* 80160034 C0 03 00 08 */ lfs f0, 8(r3)
-/* 80160038 D0 1B 00 20 */ stfs f0, 0x20(r27)
-/* 8016003C A8 03 00 0C */ lha r0, 0xc(r3)
-/* 80160040 B0 1B 00 24 */ sth r0, 0x24(r27)
-/* 80160044 A8 03 00 0E */ lha r0, 0xe(r3)
-/* 80160048 B0 1B 00 26 */ sth r0, 0x26(r27)
-/* 8016004C A8 03 00 10 */ lha r0, 0x10(r3)
-/* 80160050 B0 1B 00 28 */ sth r0, 0x28(r27)
-/* 80160054 A8 03 00 12 */ lha r0, 0x12(r3)
-/* 80160058 B0 1B 00 2A */ sth r0, 0x2a(r27)
-lbl_8016005C:
-/* 8016005C 93 9B 00 34 */ stw r28, 0x34(r27)
-/* 80160060 9B BB 00 3B */ stb r29, 0x3b(r27)
-/* 80160064 B3 DB 00 38 */ sth r30, 0x38(r27)
-/* 80160068 38 60 00 01 */ li r3, 1
-/* 8016006C 48 00 00 08 */ b lbl_80160074
-lbl_80160070:
-/* 80160070 38 60 00 00 */ li r3, 0
-lbl_80160074:
-/* 80160074 39 61 00 30 */ addi r11, r1, 0x30
-/* 80160078 48 20 21 9D */ bl _restgpr_24
-/* 8016007C 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 80160080 7C 08 03 A6 */ mtlr r0
-/* 80160084 38 21 00 30 */ addi r1, r1, 0x30
-/* 80160088 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Start__9dCamera_cFv.s b/asm/d/d_camera/Start__9dCamera_cFv.s
deleted file mode 100644
index f007e37a54..0000000000
--- a/asm/d/d_camera/Start__9dCamera_cFv.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_801614AC:
-/* 801614AC 80 03 00 24 */ lwz r0, 0x24(r3)
-/* 801614B0 2C 00 00 00 */ cmpwi r0, 0
-/* 801614B4 4D 82 00 20 */ beqlr
-/* 801614B8 38 00 00 02 */ li r0, 2
-/* 801614BC 90 03 00 24 */ stw r0, 0x24(r3)
-/* 801614C0 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Stay__9dCamera_cFv.s b/asm/d/d_camera/Stay__9dCamera_cFv.s
deleted file mode 100644
index 9d04c42dd0..0000000000
--- a/asm/d/d_camera/Stay__9dCamera_cFv.s
+++ /dev/null
@@ -1,4 +0,0 @@
-lbl_801614E8:
-/* 801614E8 38 00 00 01 */ li r0, 1
-/* 801614EC 90 03 00 24 */ stw r0, 0x24(r3)
-/* 801614F0 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Stop__9dCamera_cFv.s b/asm/d/d_camera/Stop__9dCamera_cFv.s
deleted file mode 100644
index 4851c8da35..0000000000
--- a/asm/d/d_camera/Stop__9dCamera_cFv.s
+++ /dev/null
@@ -1,7 +0,0 @@
-lbl_801614D0:
-/* 801614D0 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 801614D4 54 00 02 D2 */ rlwinm r0, r0, 0, 0xb, 9
-/* 801614D8 90 03 06 0C */ stw r0, 0x60c(r3)
-/* 801614DC 38 00 00 03 */ li r0, 3
-/* 801614E0 90 03 00 24 */ stw r0, 0x24(r3)
-/* 801614E4 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/U__9dCamera_cFv.s b/asm/d/d_camera/U__9dCamera_cFv.s
deleted file mode 100644
index 625fb4eb74..0000000000
--- a/asm/d/d_camera/U__9dCamera_cFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_80162FD4:
-/* 80162FD4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80162FD8 7C 08 02 A6 */ mflr r0
-/* 80162FDC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80162FE0 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80162FE4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
-/* 80162FE8 41 82 00 0C */ beq lbl_80162FF4
-/* 80162FEC A8 63 07 6A */ lha r3, 0x76a(r3)
-/* 80162FF0 48 00 00 0C */ b lbl_80162FFC
-lbl_80162FF4:
-/* 80162FF4 38 63 00 2E */ addi r3, r3, 0x2e
-/* 80162FF8 48 10 E0 F1 */ bl Inv__7cSAngleCFv
-lbl_80162FFC:
-/* 80162FFC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80163000 7C 08 03 A6 */ mtlr r0
-/* 80163004 38 21 00 10 */ addi r1, r1, 0x10
-/* 80163008 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/Up__9dCamera_cFv.s b/asm/d/d_camera/Up__9dCamera_cFv.s
deleted file mode 100644
index 139773cc34..0000000000
--- a/asm/d/d_camera/Up__9dCamera_cFv.s
+++ /dev/null
@@ -1,19 +0,0 @@
-lbl_80181E20:
-/* 80181E20 80 04 06 0C */ lwz r0, 0x60c(r4)
-/* 80181E24 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
-/* 80181E28 41 82 00 20 */ beq lbl_80181E48
-/* 80181E2C C0 04 07 58 */ lfs f0, 0x758(r4)
-/* 80181E30 D0 03 00 00 */ stfs f0, 0(r3)
-/* 80181E34 C0 04 07 5C */ lfs f0, 0x75c(r4)
-/* 80181E38 D0 03 00 04 */ stfs f0, 4(r3)
-/* 80181E3C C0 04 07 60 */ lfs f0, 0x760(r4)
-/* 80181E40 D0 03 00 08 */ stfs f0, 8(r3)
-/* 80181E44 4E 80 00 20 */ blr
-lbl_80181E48:
-/* 80181E48 C0 04 00 48 */ lfs f0, 0x48(r4)
-/* 80181E4C D0 03 00 00 */ stfs f0, 0(r3)
-/* 80181E50 C0 04 00 4C */ lfs f0, 0x4c(r4)
-/* 80181E54 D0 03 00 04 */ stfs f0, 4(r3)
-/* 80181E58 C0 04 00 50 */ lfs f0, 0x50(r4)
-/* 80181E5C D0 03 00 08 */ stfs f0, 8(r3)
-/* 80181E60 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/V__9dCamera_cFv.s b/asm/d/d_camera/V__9dCamera_cFv.s
deleted file mode 100644
index 28b8aff601..0000000000
--- a/asm/d/d_camera/V__9dCamera_cFv.s
+++ /dev/null
@@ -1,9 +0,0 @@
-lbl_80162FB8:
-/* 80162FB8 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80162FBC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
-/* 80162FC0 41 82 00 0C */ beq lbl_80162FCC
-/* 80162FC4 A8 63 07 68 */ lha r3, 0x768(r3)
-/* 80162FC8 4E 80 00 20 */ blr
-lbl_80162FCC:
-/* 80162FCC A8 63 00 2C */ lha r3, 0x2c(r3)
-/* 80162FD0 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/camera_create__FP12camera_class.s b/asm/d/d_camera/camera_create__FP12camera_class.s
deleted file mode 100644
index 10b0e836dd..0000000000
--- a/asm/d/d_camera/camera_create__FP12camera_class.s
+++ /dev/null
@@ -1,13 +0,0 @@
-lbl_80182454:
-/* 80182454 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80182458 7C 08 02 A6 */ mflr r0
-/* 8018245C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80182460 7C 65 1B 78 */ mr r5, r3
-/* 80182464 38 65 02 40 */ addi r3, r5, 0x240
-/* 80182468 3C 80 80 3C */ lis r4, l_method@ha /* 0x803BA6D8@ha */
-/* 8018246C 38 84 A6 D8 */ addi r4, r4, l_method@l /* 0x803BA6D8@l */
-/* 80182470 4B EA D6 B1 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv
-/* 80182474 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80182478 7C 08 03 A6 */ mtlr r0
-/* 8018247C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80182480 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/func_8015FA2C.s b/asm/d/d_camera/func_8015FA2C.s
deleted file mode 100644
index 90e44423b6..0000000000
--- a/asm/d/d_camera/func_8015FA2C.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8015FA2C:
-/* 8015FA2C FC 01 18 40 */ fcmpo cr0, f1, f3
-/* 8015FA30 40 81 00 0C */ ble lbl_8015FA3C
-/* 8015FA34 FC 20 18 90 */ fmr f1, f3
-/* 8015FA38 4E 80 00 20 */ blr
-lbl_8015FA3C:
-/* 8015FA3C FC 01 10 40 */ fcmpo cr0, f1, f2
-/* 8015FA40 4C 80 00 20 */ bgelr
-/* 8015FA44 FC 20 10 90 */ fmr f1, f2
-/* 8015FA48 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/func_8015FADC.s b/asm/d/d_camera/func_8015FADC.s
deleted file mode 100644
index d1050cbbfd..0000000000
--- a/asm/d/d_camera/func_8015FADC.s
+++ /dev/null
@@ -1,24 +0,0 @@
-lbl_8015FADC:
-/* 8015FADC FC 01 10 40 */ fcmpo cr0, f1, f2
-/* 8015FAE0 40 80 00 0C */ bge lbl_8015FAEC
-/* 8015FAE4 FC 60 10 90 */ fmr f3, f2
-/* 8015FAE8 48 00 00 0C */ b lbl_8015FAF4
-lbl_8015FAEC:
-/* 8015FAEC FC 60 08 90 */ fmr f3, f1
-/* 8015FAF0 FC 20 10 90 */ fmr f1, f2
-lbl_8015FAF4:
-/* 8015FAF4 C0 03 00 00 */ lfs f0, 0(r3)
-/* 8015FAF8 FC 00 18 40 */ fcmpo cr0, f0, f3
-/* 8015FAFC 40 81 00 10 */ ble lbl_8015FB0C
-/* 8015FB00 D0 63 00 00 */ stfs f3, 0(r3)
-/* 8015FB04 38 60 00 00 */ li r3, 0
-/* 8015FB08 4E 80 00 20 */ blr
-lbl_8015FB0C:
-/* 8015FB0C FC 00 08 40 */ fcmpo cr0, f0, f1
-/* 8015FB10 40 80 00 10 */ bge lbl_8015FB20
-/* 8015FB14 D0 23 00 00 */ stfs f1, 0(r3)
-/* 8015FB18 38 60 00 00 */ li r3, 0
-/* 8015FB1C 4E 80 00 20 */ blr
-lbl_8015FB20:
-/* 8015FB20 38 60 00 01 */ li r3, 1
-/* 8015FB24 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/func_8015FB28.s b/asm/d/d_camera/func_8015FB28.s
deleted file mode 100644
index 839dd69cc2..0000000000
--- a/asm/d/d_camera/func_8015FB28.s
+++ /dev/null
@@ -1,61 +0,0 @@
-lbl_8015FB28:
-/* 8015FB28 C0 03 00 00 */ lfs f0, 0(r3)
-/* 8015FB2C C0 24 00 00 */ lfs f1, 0(r4)
-/* 8015FB30 FC 00 08 40 */ fcmpo cr0, f0, f1
-/* 8015FB34 4C 40 13 82 */ cror 2, 0, 2
-/* 8015FB38 40 82 00 28 */ bne lbl_8015FB60
-/* 8015FB3C C0 45 00 00 */ lfs f2, 0(r5)
-/* 8015FB40 FC 02 00 40 */ fcmpo cr0, f2, f0
-/* 8015FB44 40 80 00 0C */ bge lbl_8015FB50
-/* 8015FB48 38 60 00 00 */ li r3, 0
-/* 8015FB4C 4E 80 00 20 */ blr
-lbl_8015FB50:
-/* 8015FB50 FC 02 08 40 */ fcmpo cr0, f2, f1
-/* 8015FB54 40 81 00 38 */ ble lbl_8015FB8C
-/* 8015FB58 38 60 00 00 */ li r3, 0
-/* 8015FB5C 4E 80 00 20 */ blr
-lbl_8015FB60:
-/* 8015FB60 C0 45 00 00 */ lfs f2, 0(r5)
-/* 8015FB64 FC 02 08 40 */ fcmpo cr0, f2, f1
-/* 8015FB68 4C 40 13 82 */ cror 2, 0, 2
-/* 8015FB6C 40 82 00 0C */ bne lbl_8015FB78
-/* 8015FB70 38 60 00 00 */ li r3, 0
-/* 8015FB74 4E 80 00 20 */ blr
-lbl_8015FB78:
-/* 8015FB78 FC 02 00 40 */ fcmpo cr0, f2, f0
-/* 8015FB7C 4C 41 13 82 */ cror 2, 1, 2
-/* 8015FB80 40 82 00 0C */ bne lbl_8015FB8C
-/* 8015FB84 38 60 00 00 */ li r3, 0
-/* 8015FB88 4E 80 00 20 */ blr
-lbl_8015FB8C:
-/* 8015FB8C C0 03 00 08 */ lfs f0, 8(r3)
-/* 8015FB90 C0 24 00 08 */ lfs f1, 8(r4)
-/* 8015FB94 FC 00 08 40 */ fcmpo cr0, f0, f1
-/* 8015FB98 4C 40 13 82 */ cror 2, 0, 2
-/* 8015FB9C 40 82 00 28 */ bne lbl_8015FBC4
-/* 8015FBA0 C0 45 00 08 */ lfs f2, 8(r5)
-/* 8015FBA4 FC 02 00 40 */ fcmpo cr0, f2, f0
-/* 8015FBA8 40 80 00 0C */ bge lbl_8015FBB4
-/* 8015FBAC 38 60 00 00 */ li r3, 0
-/* 8015FBB0 4E 80 00 20 */ blr
-lbl_8015FBB4:
-/* 8015FBB4 FC 02 08 40 */ fcmpo cr0, f2, f1
-/* 8015FBB8 40 81 00 38 */ ble lbl_8015FBF0
-/* 8015FBBC 38 60 00 00 */ li r3, 0
-/* 8015FBC0 4E 80 00 20 */ blr
-lbl_8015FBC4:
-/* 8015FBC4 C0 45 00 08 */ lfs f2, 8(r5)
-/* 8015FBC8 FC 02 08 40 */ fcmpo cr0, f2, f1
-/* 8015FBCC 4C 40 13 82 */ cror 2, 0, 2
-/* 8015FBD0 40 82 00 0C */ bne lbl_8015FBDC
-/* 8015FBD4 38 60 00 00 */ li r3, 0
-/* 8015FBD8 4E 80 00 20 */ blr
-lbl_8015FBDC:
-/* 8015FBDC FC 02 00 40 */ fcmpo cr0, f2, f0
-/* 8015FBE0 4C 41 13 82 */ cror 2, 1, 2
-/* 8015FBE4 40 82 00 0C */ bne lbl_8015FBF0
-/* 8015FBE8 38 60 00 00 */ li r3, 0
-/* 8015FBEC 4E 80 00 20 */ blr
-lbl_8015FBF0:
-/* 8015FBF0 38 60 00 01 */ li r3, 1
-/* 8015FBF4 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/getParamTargetActor__9dCamera_cFl.s b/asm/d/d_camera/getParamTargetActor__9dCamera_cFl.s
deleted file mode 100644
index 8a4c691c43..0000000000
--- a/asm/d/d_camera/getParamTargetActor__9dCamera_cFl.s
+++ /dev/null
@@ -1,59 +0,0 @@
-lbl_80164878:
-/* 80164878 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8016487C 7C 08 02 A6 */ mflr r0
-/* 80164880 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80164884 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80164888 38 C5 61 C0 */ addi r6, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8016488C 80 E6 5D B4 */ lwz r7, 0x5db4(r6)
-/* 80164890 80 03 06 84 */ lwz r0, 0x684(r3)
-/* 80164894 1C 64 00 44 */ mulli r3, r4, 0x44
-/* 80164898 38 63 00 10 */ addi r3, r3, 0x10
-/* 8016489C 7C 60 1A 14 */ add r3, r0, r3
-/* 801648A0 80 A3 00 00 */ lwz r5, 0(r3)
-/* 801648A4 3C 80 40 43 */ lis r4, 0x4043 /* 0x40435059@ha */
-/* 801648A8 38 04 50 59 */ addi r0, r4, 0x5059 /* 0x40435059@l */
-/* 801648AC 7C 05 00 00 */ cmpw r5, r0
-/* 801648B0 41 82 00 70 */ beq lbl_80164920
-/* 801648B4 40 80 00 28 */ bge lbl_801648DC
-/* 801648B8 38 04 48 4B */ addi r0, r4, 0x484b
-/* 801648BC 7C 05 00 00 */ cmpw r5, r0
-/* 801648C0 41 82 00 50 */ beq lbl_80164910
-/* 801648C4 40 80 00 68 */ bge lbl_8016492C
-/* 801648C8 3C 80 40 41 */ lis r4, 0x4041 /* 0x40414354@ha */
-/* 801648CC 38 04 43 54 */ addi r0, r4, 0x4354 /* 0x40414354@l */
-/* 801648D0 7C 05 00 00 */ cmpw r5, r0
-/* 801648D4 41 82 00 2C */ beq lbl_80164900
-/* 801648D8 48 00 00 54 */ b lbl_8016492C
-lbl_801648DC:
-/* 801648DC 3C 80 40 4C */ lis r4, 0x404C /* 0x404C4F43@ha */
-/* 801648E0 38 04 4F 43 */ addi r0, r4, 0x4F43 /* 0x404C4F43@l */
-/* 801648E4 7C 05 00 00 */ cmpw r5, r0
-/* 801648E8 41 82 00 08 */ beq lbl_801648F0
-/* 801648EC 48 00 00 40 */ b lbl_8016492C
-lbl_801648F0:
-/* 801648F0 38 66 56 B8 */ addi r3, r6, 0x56b8
-/* 801648F4 38 80 00 00 */ li r4, 0
-/* 801648F8 4B F0 EC 45 */ bl LockonTarget__12dAttention_cFl
-/* 801648FC 48 00 00 38 */ b lbl_80164934
-lbl_80164900:
-/* 80164900 38 66 56 B8 */ addi r3, r6, 0x56b8
-/* 80164904 38 80 00 00 */ li r4, 0
-/* 80164908 4B F0 EE 2D */ bl ActionTarget__12dAttention_cFl
-/* 8016490C 48 00 00 28 */ b lbl_80164934
-lbl_80164910:
-/* 80164910 38 66 56 B8 */ addi r3, r6, 0x56b8
-/* 80164914 38 80 00 00 */ li r4, 0
-/* 80164918 4B F0 EE 75 */ bl CheckObjectTarget__12dAttention_cFl
-/* 8016491C 48 00 00 18 */ b lbl_80164934
-lbl_80164920:
-/* 80164920 7C E3 3B 78 */ mr r3, r7
-/* 80164924 4B F7 CA 6D */ bl getCopyRodCameraActor__9daAlink_cFv
-/* 80164928 48 00 00 0C */ b lbl_80164934
-lbl_8016492C:
-/* 8016492C 38 80 FF FF */ li r4, -1
-/* 80164930 4B EB 8E 71 */ bl fopAcM_searchFromName4Event__FPCcs
-lbl_80164934:
-/* 80164934 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80164938 7C 08 03 A6 */ mtlr r0
-/* 8016493C 38 21 00 10 */ addi r1, r1, 0x10
-/* 80164940 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/getUSOAngle__9dCamera_cF7cSAngle.s b/asm/d/d_camera/getUSOAngle__9dCamera_cF7cSAngle.s
deleted file mode 100644
index 5adaca3001..0000000000
--- a/asm/d/d_camera/getUSOAngle__9dCamera_cF7cSAngle.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_80165158:
-/* 80165158 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8016515C 7C 08 02 A6 */ mflr r0
-/* 80165160 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80165164 38 84 02 9A */ addi r4, r4, 0x29a
-/* 80165168 48 10 BE 01 */ bl __ct__7cSAngleFRC7cSAngle
-/* 8016516C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80165170 7C 08 03 A6 */ mtlr r0
-/* 80165174 38 21 00 10 */ addi r1, r1, 0x10
-/* 80165178 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/init_phase1__FP12camera_class.s b/asm/d/d_camera/init_phase1__FP12camera_class.s
deleted file mode 100644
index cc89182961..0000000000
--- a/asm/d/d_camera/init_phase1__FP12camera_class.s
+++ /dev/null
@@ -1,33 +0,0 @@
-lbl_801821E0:
-/* 801821E0 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 801821E4 7C 08 02 A6 */ mflr r0
-/* 801821E8 90 01 00 14 */ stw r0, 0x14(r1)
-/* 801821EC 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 801821F0 7C 7F 1B 78 */ mr r31, r3
-/* 801821F4 4B E9 C1 15 */ bl fopCamM_GetParam__FP12camera_class
-/* 801821F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801821FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80182200 1C 03 00 38 */ mulli r0, r3, 0x38
-/* 80182204 7C 64 02 14 */ add r3, r4, r0
-/* 80182208 93 E3 5D 74 */ stw r31, 0x5d74(r3)
-/* 8018220C 88 03 5D 78 */ lbz r0, 0x5d78(r3)
-/* 80182210 7C 00 07 74 */ extsb r0, r0
-/* 80182214 98 1F 02 2C */ stb r0, 0x22c(r31)
-/* 80182218 88 03 5D 79 */ lbz r0, 0x5d79(r3)
-/* 8018221C 7C 00 07 74 */ extsb r0, r0
-/* 80182220 98 1F 02 2D */ stb r0, 0x22d(r31)
-/* 80182224 88 03 5D 7A */ lbz r0, 0x5d7a(r3)
-/* 80182228 7C 00 07 74 */ extsb r0, r0
-/* 8018222C 98 1F 02 2E */ stb r0, 0x22e(r31)
-/* 80182230 38 60 00 00 */ li r3, 0
-/* 80182234 98 64 5D 44 */ stb r3, 0x5d44(r4)
-/* 80182238 90 7F 02 38 */ stw r3, 0x238(r31)
-/* 8018223C 38 00 00 47 */ li r0, 0x47
-/* 80182240 98 1F 02 2F */ stb r0, 0x22f(r31)
-/* 80182244 98 7F 0D 54 */ stb r3, 0xd54(r31)
-/* 80182248 38 60 00 02 */ li r3, 2
-/* 8018224C 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80182250 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80182254 7C 08 03 A6 */ mtlr r0
-/* 80182258 38 21 00 10 */ addi r1, r1, 0x10
-/* 8018225C 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/onRoomChange__9dCamera_cFl.s b/asm/d/d_camera/onRoomChange__9dCamera_cFl.s
deleted file mode 100644
index b4fc40d660..0000000000
--- a/asm/d/d_camera/onRoomChange__9dCamera_cFl.s
+++ /dev/null
@@ -1,54 +0,0 @@
-lbl_801647B0:
-/* 801647B0 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 801647B4 7C 08 02 A6 */ mflr r0
-/* 801647B8 90 01 00 24 */ stw r0, 0x24(r1)
-/* 801647BC 39 61 00 20 */ addi r11, r1, 0x20
-/* 801647C0 48 1F DA 1D */ bl _savegpr_29
-/* 801647C4 7C 7D 1B 78 */ mr r29, r3
-/* 801647C8 7C 9E 23 78 */ mr r30, r4
-/* 801647CC 93 C3 00 04 */ stw r30, 4(r3)
-/* 801647D0 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 801647D4 60 00 10 00 */ ori r0, r0, 0x1000
-/* 801647D8 90 03 06 0C */ stw r0, 0x60c(r3)
-/* 801647DC 3B E0 00 FF */ li r31, 0xff
-/* 801647E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 801647E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 801647E8 38 63 4E C4 */ addi r3, r3, 0x4ec4
-/* 801647EC 4B EB FB 99 */ bl getStatusRoomDt__20dStage_roomControl_cFi
-/* 801647F0 28 03 00 00 */ cmplwi r3, 0
-/* 801647F4 41 82 00 20 */ beq lbl_80164814
-/* 801647F8 81 83 00 00 */ lwz r12, 0(r3)
-/* 801647FC 81 8C 01 0C */ lwz r12, 0x10c(r12)
-/* 80164800 7D 89 03 A6 */ mtctr r12
-/* 80164804 4E 80 04 21 */ bctrl
-/* 80164808 28 03 00 00 */ cmplwi r3, 0
-/* 8016480C 41 82 00 08 */ beq lbl_80164814
-/* 80164810 8B E3 00 1A */ lbz r31, 0x1a(r3)
-lbl_80164814:
-/* 80164814 2C 1F 00 FF */ cmpwi r31, 0xff
-/* 80164818 41 82 00 24 */ beq lbl_8016483C
-/* 8016481C 38 7D 08 24 */ addi r3, r29, 0x824
-/* 80164820 7F E4 FB 78 */ mr r4, r31
-/* 80164824 7F C5 F3 78 */ mr r5, r30
-/* 80164828 38 C0 00 00 */ li r6, 0
-/* 8016482C 38 E0 00 FF */ li r7, 0xff
-/* 80164830 39 00 00 FF */ li r8, 0xff
-/* 80164834 4B FF B6 85 */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc
-/* 80164838 48 00 00 24 */ b lbl_8016485C
-lbl_8016483C:
-/* 8016483C 38 60 00 FF */ li r3, 0xff
-/* 80164840 90 7D 08 50 */ stw r3, 0x850(r29)
-/* 80164844 90 7D 08 54 */ stw r3, 0x854(r29)
-/* 80164848 38 00 00 00 */ li r0, 0
-/* 8016484C 98 1D 08 5E */ stb r0, 0x85e(r29)
-/* 80164850 90 1D 08 58 */ stw r0, 0x858(r29)
-/* 80164854 98 7D 08 5F */ stb r3, 0x85f(r29)
-/* 80164858 B0 7D 08 5C */ sth r3, 0x85c(r29)
-lbl_8016485C:
-/* 8016485C 38 60 00 01 */ li r3, 1
-/* 80164860 39 61 00 20 */ addi r11, r1, 0x20
-/* 80164864 48 1F D9 C5 */ bl _restgpr_29
-/* 80164868 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8016486C 7C 08 03 A6 */ mtlr r0
-/* 80164870 38 21 00 20 */ addi r1, r1, 0x20
-/* 80164874 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c.s b/asm/d/d_camera/popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c.s
deleted file mode 100644
index 299dd93fcf..0000000000
--- a/asm/d/d_camera/popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c.s
+++ /dev/null
@@ -1,33 +0,0 @@
-lbl_80164CAC:
-/* 80164CAC C0 04 00 00 */ lfs f0, 0(r4)
-/* 80164CB0 D0 03 00 64 */ stfs f0, 0x64(r3)
-/* 80164CB4 C0 04 00 04 */ lfs f0, 4(r4)
-/* 80164CB8 D0 03 00 68 */ stfs f0, 0x68(r3)
-/* 80164CBC C0 04 00 08 */ lfs f0, 8(r4)
-/* 80164CC0 D0 03 00 6C */ stfs f0, 0x6c(r3)
-/* 80164CC4 C0 03 00 64 */ lfs f0, 0x64(r3)
-/* 80164CC8 D0 03 00 30 */ stfs f0, 0x30(r3)
-/* 80164CCC C0 03 00 68 */ lfs f0, 0x68(r3)
-/* 80164CD0 D0 03 00 34 */ stfs f0, 0x34(r3)
-/* 80164CD4 C0 03 00 6C */ lfs f0, 0x6c(r3)
-/* 80164CD8 D0 03 00 38 */ stfs f0, 0x38(r3)
-/* 80164CDC C0 04 00 0C */ lfs f0, 0xc(r4)
-/* 80164CE0 D0 03 00 70 */ stfs f0, 0x70(r3)
-/* 80164CE4 C0 04 00 10 */ lfs f0, 0x10(r4)
-/* 80164CE8 D0 03 00 74 */ stfs f0, 0x74(r3)
-/* 80164CEC C0 04 00 14 */ lfs f0, 0x14(r4)
-/* 80164CF0 D0 03 00 78 */ stfs f0, 0x78(r3)
-/* 80164CF4 C0 03 00 70 */ lfs f0, 0x70(r3)
-/* 80164CF8 D0 03 00 3C */ stfs f0, 0x3c(r3)
-/* 80164CFC C0 03 00 74 */ lfs f0, 0x74(r3)
-/* 80164D00 D0 03 00 40 */ stfs f0, 0x40(r3)
-/* 80164D04 C0 03 00 78 */ lfs f0, 0x78(r3)
-/* 80164D08 D0 03 00 44 */ stfs f0, 0x44(r3)
-/* 80164D0C C0 04 00 18 */ lfs f0, 0x18(r4)
-/* 80164D10 D0 03 00 80 */ stfs f0, 0x80(r3)
-/* 80164D14 D0 03 00 58 */ stfs f0, 0x58(r3)
-/* 80164D18 A8 04 00 1C */ lha r0, 0x1c(r4)
-/* 80164D1C B0 03 00 7C */ sth r0, 0x7c(r3)
-/* 80164D20 A8 03 00 7C */ lha r0, 0x7c(r3)
-/* 80164D24 B0 03 00 54 */ sth r0, 0x54(r3)
-/* 80164D28 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs.s b/asm/d/d_camera/pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs.s
deleted file mode 100644
index a600ea3a87..0000000000
--- a/asm/d/d_camera/pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs.s
+++ /dev/null
@@ -1,19 +0,0 @@
-lbl_80164C64:
-/* 80164C64 C0 03 00 30 */ lfs f0, 0x30(r3)
-/* 80164C68 D0 04 00 00 */ stfs f0, 0(r4)
-/* 80164C6C C0 03 00 34 */ lfs f0, 0x34(r3)
-/* 80164C70 D0 04 00 04 */ stfs f0, 4(r4)
-/* 80164C74 C0 03 00 38 */ lfs f0, 0x38(r3)
-/* 80164C78 D0 04 00 08 */ stfs f0, 8(r4)
-/* 80164C7C C0 03 00 3C */ lfs f0, 0x3c(r3)
-/* 80164C80 D0 04 00 0C */ stfs f0, 0xc(r4)
-/* 80164C84 C0 03 00 40 */ lfs f0, 0x40(r3)
-/* 80164C88 D0 04 00 10 */ stfs f0, 0x10(r4)
-/* 80164C8C C0 03 00 44 */ lfs f0, 0x44(r3)
-/* 80164C90 D0 04 00 14 */ stfs f0, 0x14(r4)
-/* 80164C94 C0 03 00 58 */ lfs f0, 0x58(r3)
-/* 80164C98 D0 04 00 18 */ stfs f0, 0x18(r4)
-/* 80164C9C A8 03 00 54 */ lha r0, 0x54(r3)
-/* 80164CA0 B0 04 00 1C */ sth r0, 0x1c(r4)
-/* 80164CA4 B0 A4 00 1E */ sth r5, 0x1e(r4)
-/* 80164CA8 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall.s b/asm/d/d_camera/setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall.s
deleted file mode 100644
index edb412c22b..0000000000
--- a/asm/d/d_camera/setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall.s
+++ /dev/null
@@ -1,15 +0,0 @@
-lbl_801635AC:
-/* 801635AC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 801635B0 7C 08 02 A6 */ mflr r0
-/* 801635B4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 801635B8 7C 83 23 78 */ mr r3, r4
-/* 801635BC 7C A4 2B 78 */ mr r4, r5
-/* 801635C0 7C C5 33 78 */ mr r5, r6
-/* 801635C4 38 C0 00 00 */ li r6, 0
-/* 801635C8 38 E0 00 FF */ li r7, 0xff
-/* 801635CC 39 00 00 FF */ li r8, 0xff
-/* 801635D0 4B FF C8 E9 */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc
-/* 801635D4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 801635D8 7C 08 03 A6 */ mtlr r0
-/* 801635DC 38 21 00 10 */ addi r1, r1, 0x10
-/* 801635E0 4E 80 00 20 */ blr
diff --git a/asm/d/d_camera/setUSOAngle__9dCamera_cFv.s b/asm/d/d_camera/setUSOAngle__9dCamera_cFv.s
deleted file mode 100644
index 1469fe6593..0000000000
--- a/asm/d/d_camera/setUSOAngle__9dCamera_cFv.s
+++ /dev/null
@@ -1,22 +0,0 @@
-lbl_80165104:
-/* 80165104 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80165108 7C 08 02 A6 */ mflr r0
-/* 8016510C 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80165110 93 E1 00 1C */ stw r31, 0x1c(r1)
-/* 80165114 7C 7F 1B 78 */ mr r31, r3
-/* 80165118 38 00 00 01 */ li r0, 1
-/* 8016511C 98 03 02 98 */ stb r0, 0x298(r3)
-/* 80165120 38 7F 00 2E */ addi r3, r31, 0x2e
-/* 80165124 48 10 BF C5 */ bl Inv__7cSAngleCFv
-/* 80165128 7C 64 1B 78 */ mr r4, r3
-/* 8016512C 38 61 00 08 */ addi r3, r1, 8
-/* 80165130 48 10 BE 69 */ bl __ct__7cSAngleFs
-/* 80165134 A8 01 00 08 */ lha r0, 8(r1)
-/* 80165138 B0 1F 02 9A */ sth r0, 0x29a(r31)
-/* 8016513C A8 1F 01 D4 */ lha r0, 0x1d4(r31)
-/* 80165140 B0 1F 02 9C */ sth r0, 0x29c(r31)
-/* 80165144 83 E1 00 1C */ lwz r31, 0x1c(r1)
-/* 80165148 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 8016514C 7C 08 03 A6 */ mtlr r0
-/* 80165150 38 21 00 20 */ addi r1, r1, 0x20
-/* 80165154 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/func_800889F8.s b/asm/d/d_ev_camera/func_800889F8.s
deleted file mode 100644
index 8e614afff9..0000000000
--- a/asm/d/d_ev_camera/func_800889F8.s
+++ /dev/null
@@ -1,38 +0,0 @@
-lbl_800889F8:
-/* 800889F8 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800889FC 7C 08 02 A6 */ mflr r0
-/* 80088A00 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80088A04 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80088A08 7C 7F 1B 78 */ mr r31, r3
-/* 80088A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80088A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80088A14 85 83 4E 20 */ lwzu r12, 0x4e20(r3)
-/* 80088A18 81 8C 00 FC */ lwz r12, 0xfc(r12)
-/* 80088A1C 7D 89 03 A6 */ mtctr r12
-/* 80088A20 4E 80 04 21 */ bctrl
-/* 80088A24 28 03 00 00 */ cmplwi r3, 0
-/* 80088A28 41 82 00 3C */ beq lbl_80088A64
-/* 80088A2C 38 80 00 00 */ li r4, 0
-/* 80088A30 80 03 00 00 */ lwz r0, 0(r3)
-/* 80088A34 7C 09 03 A6 */ mtctr r0
-/* 80088A38 2C 00 00 00 */ cmpwi r0, 0
-/* 80088A3C 40 81 00 28 */ ble lbl_80088A64
-lbl_80088A40:
-/* 80088A40 80 A3 00 04 */ lwz r5, 4(r3)
-/* 80088A44 38 04 00 04 */ addi r0, r4, 4
-/* 80088A48 7C 05 00 AE */ lbzx r0, r5, r0
-/* 80088A4C 7C 1F 00 00 */ cmpw r31, r0
-/* 80088A50 40 82 00 0C */ bne lbl_80088A5C
-/* 80088A54 38 60 00 01 */ li r3, 1
-/* 80088A58 48 00 00 10 */ b lbl_80088A68
-lbl_80088A5C:
-/* 80088A5C 38 84 00 1C */ addi r4, r4, 0x1c
-/* 80088A60 42 00 FF E0 */ bdnz lbl_80088A40
-lbl_80088A64:
-/* 80088A64 38 60 00 00 */ li r3, 0
-lbl_80088A68:
-/* 80088A68 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 80088A6C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80088A70 7C 08 03 A6 */ mtlr r0
-/* 80088A74 38 21 00 10 */ addi r1, r1, 0x10
-/* 80088A78 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/func_8008E750.s b/asm/d/d_ev_camera/func_8008E750.s
deleted file mode 100644
index b5cdbe51ba..0000000000
--- a/asm/d/d_ev_camera/func_8008E750.s
+++ /dev/null
@@ -1,11 +0,0 @@
-lbl_8008E750:
-/* 8008E750 38 80 00 00 */ li r4, 0
-/* 8008E754 7C 60 07 74 */ extsb r0, r3
-/* 8008E758 2C 00 00 2D */ cmpwi r0, 0x2d
-/* 8008E75C 41 82 00 10 */ beq lbl_8008E76C
-/* 8008E760 2C 00 00 78 */ cmpwi r0, 0x78
-/* 8008E764 41 82 00 08 */ beq lbl_8008E76C
-/* 8008E768 38 80 00 01 */ li r4, 1
-lbl_8008E76C:
-/* 8008E76C 7C 83 23 78 */ mr r3, r4
-/* 8008E770 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvActor__9dCamera_cFPc.s b/asm/d/d_ev_camera/getEvActor__9dCamera_cFPc.s
deleted file mode 100644
index 85d6ffaa7f..0000000000
--- a/asm/d/d_ev_camera/getEvActor__9dCamera_cFPc.s
+++ /dev/null
@@ -1,87 +0,0 @@
-lbl_800894C4:
-/* 800894C4 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 800894C8 7C 08 02 A6 */ mflr r0
-/* 800894CC 90 01 00 14 */ stw r0, 0x14(r1)
-/* 800894D0 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 800894D4 7C 7F 1B 78 */ mr r31, r3
-/* 800894D8 4B FF FB 09 */ bl getEvStringPntData__9dCamera_cFPc
-/* 800894DC 28 03 00 00 */ cmplwi r3, 0
-/* 800894E0 40 82 00 0C */ bne lbl_800894EC
-/* 800894E4 38 60 00 00 */ li r3, 0
-/* 800894E8 48 00 00 F8 */ b lbl_800895E0
-lbl_800894EC:
-/* 800894EC 80 A3 00 00 */ lwz r5, 0(r3)
-/* 800894F0 3C 85 BF B0 */ addis r4, r5, 0xbfb0
-/* 800894F4 28 04 4C 41 */ cmplwi r4, 0x4c41
-/* 800894F8 40 82 00 0C */ bne lbl_80089504
-/* 800894FC 80 7F 01 80 */ lwz r3, 0x180(r31)
-/* 80089500 48 00 00 E0 */ b lbl_800895E0
-lbl_80089504:
-/* 80089504 3C 05 BF AD */ addis r0, r5, 0xbfad
-/* 80089508 28 00 54 41 */ cmplwi r0, 0x5441
-/* 8008950C 40 82 00 1C */ bne lbl_80089528
-/* 80089510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089514 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089518 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 8008951C 80 84 4F 8C */ lwz r4, 0x4f8c(r4)
-/* 80089520 4B FB 9D CD */ bl convPId__14dEvt_control_cFUi
-/* 80089524 48 00 00 BC */ b lbl_800895E0
-lbl_80089528:
-/* 80089528 28 04 41 52 */ cmplwi r4, 0x4152
-/* 8008952C 40 82 00 1C */ bne lbl_80089548
-/* 80089530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089534 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089538 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 8008953C 80 84 4F 90 */ lwz r4, 0x4f90(r4)
-/* 80089540 4B FB 9D AD */ bl convPId__14dEvt_control_cFUi
-/* 80089544 48 00 00 9C */ b lbl_800895E0
-lbl_80089548:
-/* 80089548 3C 85 BF AC */ addis r4, r5, 0xbfac
-/* 8008954C 28 04 41 4C */ cmplwi r4, 0x414c
-/* 80089550 40 82 00 1C */ bne lbl_8008956C
-/* 80089554 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089558 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8008955C 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 80089560 80 84 4F 94 */ lwz r4, 0x4f94(r4)
-/* 80089564 4B FB 9D 89 */ bl convPId__14dEvt_control_cFUi
-/* 80089568 48 00 00 78 */ b lbl_800895E0
-lbl_8008956C:
-/* 8008956C 3C 05 BF BC */ addis r0, r5, 0xbfbc
-/* 80089570 28 00 4F 4F */ cmplwi r0, 0x4f4f
-/* 80089574 40 82 00 1C */ bne lbl_80089590
-/* 80089578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 8008957C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089580 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 80089584 80 84 4F 9C */ lwz r4, 0x4f9c(r4)
-/* 80089588 4B FB 9D 65 */ bl convPId__14dEvt_control_cFUi
-/* 8008958C 48 00 00 54 */ b lbl_800895E0
-lbl_80089590:
-/* 80089590 28 04 41 52 */ cmplwi r4, 0x4152
-/* 80089594 41 82 00 10 */ beq lbl_800895A4
-/* 80089598 3C 05 BF B7 */ addis r0, r5, 0xbfb7
-/* 8008959C 28 00 54 45 */ cmplwi r0, 0x5445
-/* 800895A0 40 82 00 1C */ bne lbl_800895BC
-lbl_800895A4:
-/* 800895A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800895A8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800895AC 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 800895B0 80 84 4F 98 */ lwz r4, 0x4f98(r4)
-/* 800895B4 4B FB 9D 39 */ bl convPId__14dEvt_control_cFUi
-/* 800895B8 48 00 00 28 */ b lbl_800895E0
-lbl_800895BC:
-/* 800895BC 3C 05 B3 97 */ addis r0, r5, 0xb397
-/* 800895C0 28 00 6E 6B */ cmplwi r0, 0x6e6b
-/* 800895C4 40 82 00 14 */ bne lbl_800895D8
-/* 800895C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800895CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800895D0 80 63 5D B4 */ lwz r3, 0x5db4(r3)
-/* 800895D4 48 00 00 0C */ b lbl_800895E0
-lbl_800895D8:
-/* 800895D8 38 80 FF FF */ li r4, -1
-/* 800895DC 4B F9 41 C5 */ bl fopAcM_searchFromName4Event__FPCcs
-lbl_800895E0:
-/* 800895E0 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 800895E4 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800895E8 7C 08 03 A6 */ mtlr r0
-/* 800895EC 38 21 00 10 */ addi r1, r1, 0x10
-/* 800895F0 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvActor__9dCamera_cFPcPc.s b/asm/d/d_ev_camera/getEvActor__9dCamera_cFPcPc.s
deleted file mode 100644
index 350f93178f..0000000000
--- a/asm/d/d_ev_camera/getEvActor__9dCamera_cFPcPc.s
+++ /dev/null
@@ -1,89 +0,0 @@
-lbl_800895F4:
-/* 800895F4 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 800895F8 7C 08 02 A6 */ mflr r0
-/* 800895FC 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80089600 93 E1 00 1C */ stw r31, 0x1c(r1)
-/* 80089604 7C 7F 1B 78 */ mr r31, r3
-/* 80089608 7C 87 23 78 */ mr r7, r4
-/* 8008960C 7C A6 2B 78 */ mr r6, r5
-/* 80089610 38 00 00 00 */ li r0, 0
-/* 80089614 98 01 00 08 */ stb r0, 8(r1)
-/* 80089618 38 81 00 08 */ addi r4, r1, 8
-/* 8008961C 7C E5 3B 78 */ mr r5, r7
-/* 80089620 4B FF FD 1D */ bl getEvStringData__9dCamera_cFPcPcPc
-/* 80089624 38 61 00 08 */ addi r3, r1, 8
-/* 80089628 80 A1 00 08 */ lwz r5, 8(r1)
-/* 8008962C 3C 85 BF B0 */ addis r4, r5, 0xbfb0
-/* 80089630 28 04 4C 41 */ cmplwi r4, 0x4c41
-/* 80089634 40 82 00 0C */ bne lbl_80089640
-/* 80089638 80 7F 01 80 */ lwz r3, 0x180(r31)
-/* 8008963C 48 00 00 E0 */ b lbl_8008971C
-lbl_80089640:
-/* 80089640 3C 05 BF AD */ addis r0, r5, 0xbfad
-/* 80089644 28 00 54 41 */ cmplwi r0, 0x5441
-/* 80089648 40 82 00 1C */ bne lbl_80089664
-/* 8008964C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089650 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089654 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 80089658 80 84 4F 8C */ lwz r4, 0x4f8c(r4)
-/* 8008965C 4B FB 9C 91 */ bl convPId__14dEvt_control_cFUi
-/* 80089660 48 00 00 BC */ b lbl_8008971C
-lbl_80089664:
-/* 80089664 28 04 41 52 */ cmplwi r4, 0x4152
-/* 80089668 40 82 00 1C */ bne lbl_80089684
-/* 8008966C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089670 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089674 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 80089678 80 84 4F 90 */ lwz r4, 0x4f90(r4)
-/* 8008967C 4B FB 9C 71 */ bl convPId__14dEvt_control_cFUi
-/* 80089680 48 00 00 9C */ b lbl_8008971C
-lbl_80089684:
-/* 80089684 3C 85 BF AC */ addis r4, r5, 0xbfac
-/* 80089688 28 04 41 4C */ cmplwi r4, 0x414c
-/* 8008968C 40 82 00 1C */ bne lbl_800896A8
-/* 80089690 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089694 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089698 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 8008969C 80 84 4F 94 */ lwz r4, 0x4f94(r4)
-/* 800896A0 4B FB 9C 4D */ bl convPId__14dEvt_control_cFUi
-/* 800896A4 48 00 00 78 */ b lbl_8008971C
-lbl_800896A8:
-/* 800896A8 3C 05 BF BC */ addis r0, r5, 0xbfbc
-/* 800896AC 28 00 4F 4F */ cmplwi r0, 0x4f4f
-/* 800896B0 40 82 00 1C */ bne lbl_800896CC
-/* 800896B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800896B8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800896BC 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 800896C0 80 84 4F 9C */ lwz r4, 0x4f9c(r4)
-/* 800896C4 4B FB 9C 29 */ bl convPId__14dEvt_control_cFUi
-/* 800896C8 48 00 00 54 */ b lbl_8008971C
-lbl_800896CC:
-/* 800896CC 28 04 41 52 */ cmplwi r4, 0x4152
-/* 800896D0 41 82 00 10 */ beq lbl_800896E0
-/* 800896D4 3C 05 BF B7 */ addis r0, r5, 0xbfb7
-/* 800896D8 28 00 54 45 */ cmplwi r0, 0x5445
-/* 800896DC 40 82 00 1C */ bne lbl_800896F8
-lbl_800896E0:
-/* 800896E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800896E4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800896E8 38 64 4E C8 */ addi r3, r4, 0x4ec8
-/* 800896EC 80 84 4F 98 */ lwz r4, 0x4f98(r4)
-/* 800896F0 4B FB 9B FD */ bl convPId__14dEvt_control_cFUi
-/* 800896F4 48 00 00 28 */ b lbl_8008971C
-lbl_800896F8:
-/* 800896F8 3C 05 B3 97 */ addis r0, r5, 0xb397
-/* 800896FC 28 00 6E 6B */ cmplwi r0, 0x6e6b
-/* 80089700 40 82 00 14 */ bne lbl_80089714
-/* 80089704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8008970C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
-/* 80089710 48 00 00 0C */ b lbl_8008971C
-lbl_80089714:
-/* 80089714 38 80 FF FF */ li r4, -1
-/* 80089718 4B F9 40 89 */ bl fopAcM_searchFromName4Event__FPCcs
-lbl_8008971C:
-/* 8008971C 83 E1 00 1C */ lwz r31, 0x1c(r1)
-/* 80089720 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80089724 7C 08 03 A6 */ mtlr r0
-/* 80089728 38 21 00 20 */ addi r1, r1, 0x20
-/* 8008972C 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPc.s b/asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPc.s
deleted file mode 100644
index 0cbd019ca2..0000000000
--- a/asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPc.s
+++ /dev/null
@@ -1,56 +0,0 @@
-lbl_80088D90:
-/* 80088D90 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80088D94 7C 08 02 A6 */ mflr r0
-/* 80088D98 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80088D9C 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088DA0 48 2D 94 39 */ bl _savegpr_28
-/* 80088DA4 7C 7C 1B 78 */ mr r28, r3
-/* 80088DA8 7C 9D 23 78 */ mr r29, r4
-/* 80088DAC 7C BE 2B 78 */ mr r30, r5
-/* 80088DB0 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80088DB4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80088DB8 41 82 00 34 */ beq lbl_80088DEC
-/* 80088DBC 7F C4 F3 78 */ mr r4, r30
-/* 80088DC0 4B FF FE 65 */ bl searchEventArgData__9dCamera_cFPc
-/* 80088DC4 2C 03 FF FF */ cmpwi r3, -1
-/* 80088DC8 40 82 00 0C */ bne lbl_80088DD4
-/* 80088DCC 38 60 00 00 */ li r3, 0
-/* 80088DD0 48 00 00 70 */ b lbl_80088E40
-lbl_80088DD4:
-/* 80088DD4 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 80088DD8 7C 7C 02 14 */ add r3, r28, r0
-/* 80088DDC 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 80088DE0 C0 03 00 00 */ lfs f0, 0(r3)
-/* 80088DE4 D0 1D 00 00 */ stfs f0, 0(r29)
-/* 80088DE8 48 00 00 54 */ b lbl_80088E3C
-lbl_80088DEC:
-/* 80088DEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80088DF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80088DF4 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 80088DF8 7F E3 FB 78 */ mr r3, r31
-/* 80088DFC 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 80088E00 4B FB F3 45 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80088E04 2C 03 00 00 */ cmpwi r3, 0
-/* 80088E08 41 82 00 24 */ beq lbl_80088E2C
-/* 80088E0C 7F E3 FB 78 */ mr r3, r31
-/* 80088E10 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 80088E14 7F C5 F3 78 */ mr r5, r30
-/* 80088E18 38 C0 00 00 */ li r6, 0
-/* 80088E1C 4B FB F2 D1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 80088E20 C0 03 00 00 */ lfs f0, 0(r3)
-/* 80088E24 D0 1D 00 00 */ stfs f0, 0(r29)
-/* 80088E28 48 00 00 14 */ b lbl_80088E3C
-lbl_80088E2C:
-/* 80088E2C 38 00 00 01 */ li r0, 1
-/* 80088E30 98 1C 04 F8 */ stb r0, 0x4f8(r28)
-/* 80088E34 38 60 00 00 */ li r3, 0
-/* 80088E38 48 00 00 08 */ b lbl_80088E40
-lbl_80088E3C:
-/* 80088E3C 38 60 00 01 */ li r3, 1
-lbl_80088E40:
-/* 80088E40 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088E44 48 2D 93 E1 */ bl _restgpr_28
-/* 80088E48 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80088E4C 7C 08 03 A6 */ mtlr r0
-/* 80088E50 38 21 00 20 */ addi r1, r1, 0x20
-/* 80088E54 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPcf.s b/asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPcf.s
deleted file mode 100644
index 3651e74bdb..0000000000
--- a/asm/d/d_ev_camera/getEvFloatData__9dCamera_cFPfPcf.s
+++ /dev/null
@@ -1,60 +0,0 @@
-lbl_80089154:
-/* 80089154 94 21 FF D0 */ stwu r1, -0x30(r1)
-/* 80089158 7C 08 02 A6 */ mflr r0
-/* 8008915C 90 01 00 34 */ stw r0, 0x34(r1)
-/* 80089160 DB E1 00 20 */ stfd f31, 0x20(r1)
-/* 80089164 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */
-/* 80089168 39 61 00 20 */ addi r11, r1, 0x20
-/* 8008916C 48 2D 90 6D */ bl _savegpr_28
-/* 80089170 7C 7C 1B 78 */ mr r28, r3
-/* 80089174 7C 9D 23 78 */ mr r29, r4
-/* 80089178 7C BE 2B 78 */ mr r30, r5
-/* 8008917C FF E0 08 90 */ fmr f31, f1
-/* 80089180 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80089184 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80089188 41 82 00 34 */ beq lbl_800891BC
-/* 8008918C 7F C4 F3 78 */ mr r4, r30
-/* 80089190 4B FF FA 95 */ bl searchEventArgData__9dCamera_cFPc
-/* 80089194 2C 03 FF FF */ cmpwi r3, -1
-/* 80089198 40 82 00 0C */ bne lbl_800891A4
-/* 8008919C D3 FD 00 00 */ stfs f31, 0(r29)
-/* 800891A0 48 00 00 68 */ b lbl_80089208
-lbl_800891A4:
-/* 800891A4 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 800891A8 7C 7C 02 14 */ add r3, r28, r0
-/* 800891AC 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 800891B0 C0 03 00 00 */ lfs f0, 0(r3)
-/* 800891B4 D0 1D 00 00 */ stfs f0, 0(r29)
-/* 800891B8 48 00 00 50 */ b lbl_80089208
-lbl_800891BC:
-/* 800891BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800891C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800891C4 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 800891C8 7F E3 FB 78 */ mr r3, r31
-/* 800891CC 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 800891D0 4B FB EF 75 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 800891D4 2C 03 00 00 */ cmpwi r3, 0
-/* 800891D8 41 82 00 24 */ beq lbl_800891FC
-/* 800891DC 7F E3 FB 78 */ mr r3, r31
-/* 800891E0 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 800891E4 7F C5 F3 78 */ mr r5, r30
-/* 800891E8 38 C0 00 00 */ li r6, 0
-/* 800891EC 4B FB EF 01 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 800891F0 C0 03 00 00 */ lfs f0, 0(r3)
-/* 800891F4 D0 1D 00 00 */ stfs f0, 0(r29)
-/* 800891F8 48 00 00 10 */ b lbl_80089208
-lbl_800891FC:
-/* 800891FC D3 FD 00 00 */ stfs f31, 0(r29)
-/* 80089200 38 60 00 00 */ li r3, 0
-/* 80089204 48 00 00 08 */ b lbl_8008920C
-lbl_80089208:
-/* 80089208 38 60 00 01 */ li r3, 1
-lbl_8008920C:
-/* 8008920C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */
-/* 80089210 CB E1 00 20 */ lfd f31, 0x20(r1)
-/* 80089214 39 61 00 20 */ addi r11, r1, 0x20
-/* 80089218 48 2D 90 0D */ bl _restgpr_28
-/* 8008921C 80 01 00 34 */ lwz r0, 0x34(r1)
-/* 80089220 7C 08 03 A6 */ mtlr r0
-/* 80089224 38 21 00 30 */ addi r1, r1, 0x30
-/* 80089228 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvFloatListData__9dCamera_cFPPfPc.s b/asm/d/d_ev_camera/getEvFloatListData__9dCamera_cFPPfPc.s
deleted file mode 100644
index bb79ea2e57..0000000000
--- a/asm/d/d_ev_camera/getEvFloatListData__9dCamera_cFPPfPc.s
+++ /dev/null
@@ -1,55 +0,0 @@
-lbl_80088E58:
-/* 80088E58 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80088E5C 7C 08 02 A6 */ mflr r0
-/* 80088E60 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80088E64 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088E68 48 2D 93 6D */ bl _savegpr_27
-/* 80088E6C 7C 7B 1B 78 */ mr r27, r3
-/* 80088E70 7C 9C 23 78 */ mr r28, r4
-/* 80088E74 7C BD 2B 78 */ mr r29, r5
-/* 80088E78 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80088E7C 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80088E80 41 82 00 34 */ beq lbl_80088EB4
-/* 80088E84 7F A4 EB 78 */ mr r4, r29
-/* 80088E88 4B FF FD 9D */ bl searchEventArgData__9dCamera_cFPc
-/* 80088E8C 2C 03 FF FF */ cmpwi r3, -1
-/* 80088E90 40 82 00 0C */ bne lbl_80088E9C
-/* 80088E94 38 60 00 00 */ li r3, 0
-/* 80088E98 48 00 00 6C */ b lbl_80088F04
-lbl_80088E9C:
-/* 80088E9C 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 80088EA0 7C 7B 02 14 */ add r3, r27, r0
-/* 80088EA4 80 03 05 28 */ lwz r0, 0x528(r3)
-/* 80088EA8 90 1C 00 00 */ stw r0, 0(r28)
-/* 80088EAC 83 C3 05 24 */ lwz r30, 0x524(r3)
-/* 80088EB0 48 00 00 50 */ b lbl_80088F00
-lbl_80088EB4:
-/* 80088EB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80088EB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80088EBC 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 80088EC0 7F E3 FB 78 */ mr r3, r31
-/* 80088EC4 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 80088EC8 4B FB F2 7D */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80088ECC 7C 7E 1B 79 */ or. r30, r3, r3
-/* 80088ED0 41 82 00 20 */ beq lbl_80088EF0
-/* 80088ED4 7F E3 FB 78 */ mr r3, r31
-/* 80088ED8 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 80088EDC 7F A5 EB 78 */ mr r5, r29
-/* 80088EE0 38 C0 00 00 */ li r6, 0
-/* 80088EE4 4B FB F2 09 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 80088EE8 90 7C 00 00 */ stw r3, 0(r28)
-/* 80088EEC 48 00 00 14 */ b lbl_80088F00
-lbl_80088EF0:
-/* 80088EF0 38 00 00 01 */ li r0, 1
-/* 80088EF4 98 1B 04 F8 */ stb r0, 0x4f8(r27)
-/* 80088EF8 38 60 00 00 */ li r3, 0
-/* 80088EFC 48 00 00 08 */ b lbl_80088F04
-lbl_80088F00:
-/* 80088F00 7F C3 F3 78 */ mr r3, r30
-lbl_80088F04:
-/* 80088F04 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088F08 48 2D 93 19 */ bl _restgpr_27
-/* 80088F0C 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80088F10 7C 08 03 A6 */ mtlr r0
-/* 80088F14 38 21 00 20 */ addi r1, r1, 0x20
-/* 80088F18 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPc.s b/asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPc.s
deleted file mode 100644
index 3eb89d41ee..0000000000
--- a/asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPc.s
+++ /dev/null
@@ -1,63 +0,0 @@
-lbl_80088CB0:
-/* 80088CB0 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80088CB4 7C 08 02 A6 */ mflr r0
-/* 80088CB8 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80088CBC 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088CC0 48 2D 95 19 */ bl _savegpr_28
-/* 80088CC4 7C 7C 1B 78 */ mr r28, r3
-/* 80088CC8 7C 9D 23 78 */ mr r29, r4
-/* 80088CCC 7C BE 2B 78 */ mr r30, r5
-/* 80088CD0 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80088CD4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80088CD8 41 82 00 4C */ beq lbl_80088D24
-/* 80088CDC 7F C4 F3 78 */ mr r4, r30
-/* 80088CE0 4B FF FF 45 */ bl searchEventArgData__9dCamera_cFPc
-/* 80088CE4 2C 03 FF FF */ cmpwi r3, -1
-/* 80088CE8 40 82 00 0C */ bne lbl_80088CF4
-/* 80088CEC 38 60 00 00 */ li r3, 0
-/* 80088CF0 48 00 00 88 */ b lbl_80088D78
-lbl_80088CF4:
-/* 80088CF4 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 80088CF8 7C 7C 02 14 */ add r3, r28, r0
-/* 80088CFC 80 03 05 24 */ lwz r0, 0x524(r3)
-/* 80088D00 2C 00 00 00 */ cmpwi r0, 0
-/* 80088D04 40 80 00 10 */ bge lbl_80088D14
-/* 80088D08 80 03 05 28 */ lwz r0, 0x528(r3)
-/* 80088D0C 90 1D 00 00 */ stw r0, 0(r29)
-/* 80088D10 48 00 00 64 */ b lbl_80088D74
-lbl_80088D14:
-/* 80088D14 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 80088D18 80 03 00 00 */ lwz r0, 0(r3)
-/* 80088D1C 90 1D 00 00 */ stw r0, 0(r29)
-/* 80088D20 48 00 00 54 */ b lbl_80088D74
-lbl_80088D24:
-/* 80088D24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80088D28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80088D2C 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 80088D30 7F E3 FB 78 */ mr r3, r31
-/* 80088D34 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 80088D38 4B FB F4 0D */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80088D3C 2C 03 00 00 */ cmpwi r3, 0
-/* 80088D40 41 82 00 24 */ beq lbl_80088D64
-/* 80088D44 7F E3 FB 78 */ mr r3, r31
-/* 80088D48 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 80088D4C 7F C5 F3 78 */ mr r5, r30
-/* 80088D50 38 C0 00 03 */ li r6, 3
-/* 80088D54 4B FB F3 99 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 80088D58 80 03 00 00 */ lwz r0, 0(r3)
-/* 80088D5C 90 1D 00 00 */ stw r0, 0(r29)
-/* 80088D60 48 00 00 14 */ b lbl_80088D74
-lbl_80088D64:
-/* 80088D64 38 00 00 01 */ li r0, 1
-/* 80088D68 98 1C 04 F8 */ stb r0, 0x4f8(r28)
-/* 80088D6C 38 60 00 00 */ li r3, 0
-/* 80088D70 48 00 00 08 */ b lbl_80088D78
-lbl_80088D74:
-/* 80088D74 38 60 00 01 */ li r3, 1
-lbl_80088D78:
-/* 80088D78 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088D7C 48 2D 94 A9 */ bl _restgpr_28
-/* 80088D80 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80088D84 7C 08 03 A6 */ mtlr r0
-/* 80088D88 38 21 00 20 */ addi r1, r1, 0x20
-/* 80088D8C 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPci.s b/asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPci.s
deleted file mode 100644
index d8b371bc49..0000000000
--- a/asm/d/d_ev_camera/getEvIntData__9dCamera_cFPiPci.s
+++ /dev/null
@@ -1,56 +0,0 @@
-lbl_8008908C:
-/* 8008908C 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80089090 7C 08 02 A6 */ mflr r0
-/* 80089094 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80089098 39 61 00 20 */ addi r11, r1, 0x20
-/* 8008909C 48 2D 91 39 */ bl _savegpr_27
-/* 800890A0 7C 7B 1B 78 */ mr r27, r3
-/* 800890A4 7C 9C 23 78 */ mr r28, r4
-/* 800890A8 7C BD 2B 78 */ mr r29, r5
-/* 800890AC 7C DE 33 78 */ mr r30, r6
-/* 800890B0 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 800890B4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 800890B8 41 82 00 34 */ beq lbl_800890EC
-/* 800890BC 7F A4 EB 78 */ mr r4, r29
-/* 800890C0 4B FF FB 65 */ bl searchEventArgData__9dCamera_cFPc
-/* 800890C4 2C 03 FF FF */ cmpwi r3, -1
-/* 800890C8 40 82 00 0C */ bne lbl_800890D4
-/* 800890CC 93 DC 00 00 */ stw r30, 0(r28)
-/* 800890D0 48 00 00 68 */ b lbl_80089138
-lbl_800890D4:
-/* 800890D4 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 800890D8 7C 7B 02 14 */ add r3, r27, r0
-/* 800890DC 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 800890E0 80 03 00 00 */ lwz r0, 0(r3)
-/* 800890E4 90 1C 00 00 */ stw r0, 0(r28)
-/* 800890E8 48 00 00 50 */ b lbl_80089138
-lbl_800890EC:
-/* 800890EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800890F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800890F4 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 800890F8 7F E3 FB 78 */ mr r3, r31
-/* 800890FC 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 80089100 4B FB F0 45 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80089104 2C 03 00 00 */ cmpwi r3, 0
-/* 80089108 41 82 00 24 */ beq lbl_8008912C
-/* 8008910C 7F E3 FB 78 */ mr r3, r31
-/* 80089110 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 80089114 7F A5 EB 78 */ mr r5, r29
-/* 80089118 38 C0 00 03 */ li r6, 3
-/* 8008911C 4B FB EF D1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 80089120 80 03 00 00 */ lwz r0, 0(r3)
-/* 80089124 90 1C 00 00 */ stw r0, 0(r28)
-/* 80089128 48 00 00 10 */ b lbl_80089138
-lbl_8008912C:
-/* 8008912C 93 DC 00 00 */ stw r30, 0(r28)
-/* 80089130 38 60 00 00 */ li r3, 0
-/* 80089134 48 00 00 08 */ b lbl_8008913C
-lbl_80089138:
-/* 80089138 38 60 00 01 */ li r3, 1
-lbl_8008913C:
-/* 8008913C 39 61 00 20 */ addi r11, r1, 0x20
-/* 80089140 48 2D 90 E1 */ bl _restgpr_27
-/* 80089144 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80089148 7C 08 03 A6 */ mtlr r0
-/* 8008914C 38 21 00 20 */ addi r1, r1, 0x20
-/* 80089150 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvStringData__9dCamera_cFPcPcPc.s b/asm/d/d_ev_camera/getEvStringData__9dCamera_cFPcPcPc.s
deleted file mode 100644
index 8207cae852..0000000000
--- a/asm/d/d_ev_camera/getEvStringData__9dCamera_cFPcPcPc.s
+++ /dev/null
@@ -1,62 +0,0 @@
-lbl_8008933C:
-/* 8008933C 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80089340 7C 08 02 A6 */ mflr r0
-/* 80089344 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80089348 39 61 00 20 */ addi r11, r1, 0x20
-/* 8008934C 48 2D 8E 89 */ bl _savegpr_27
-/* 80089350 7C 7B 1B 78 */ mr r27, r3
-/* 80089354 7C 9C 23 78 */ mr r28, r4
-/* 80089358 7C BD 2B 78 */ mr r29, r5
-/* 8008935C 7C DE 33 78 */ mr r30, r6
-/* 80089360 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80089364 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80089368 41 82 00 40 */ beq lbl_800893A8
-/* 8008936C 7F A4 EB 78 */ mr r4, r29
-/* 80089370 4B FF F8 B5 */ bl searchEventArgData__9dCamera_cFPc
-/* 80089374 7C 60 1B 78 */ mr r0, r3
-/* 80089378 2C 00 FF FF */ cmpwi r0, -1
-/* 8008937C 40 82 00 14 */ bne lbl_80089390
-/* 80089380 7F 83 E3 78 */ mr r3, r28
-/* 80089384 7F C4 F3 78 */ mr r4, r30
-/* 80089388 48 2D F7 A5 */ bl strcpy
-/* 8008938C 48 00 00 74 */ b lbl_80089400
-lbl_80089390:
-/* 80089390 7F 83 E3 78 */ mr r3, r28
-/* 80089394 1C 00 00 18 */ mulli r0, r0, 0x18
-/* 80089398 7C 9B 02 14 */ add r4, r27, r0
-/* 8008939C 80 84 05 28 */ lwz r4, 0x528(r4)
-/* 800893A0 48 2D F7 8D */ bl strcpy
-/* 800893A4 48 00 00 5C */ b lbl_80089400
-lbl_800893A8:
-/* 800893A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800893AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800893B0 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 800893B4 7F E3 FB 78 */ mr r3, r31
-/* 800893B8 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 800893BC 4B FB ED 89 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 800893C0 2C 03 00 00 */ cmpwi r3, 0
-/* 800893C4 41 82 00 28 */ beq lbl_800893EC
-/* 800893C8 7F E3 FB 78 */ mr r3, r31
-/* 800893CC 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 800893D0 7F A5 EB 78 */ mr r5, r29
-/* 800893D4 38 C0 00 04 */ li r6, 4
-/* 800893D8 4B FB ED 15 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 800893DC 7C 64 1B 78 */ mr r4, r3
-/* 800893E0 7F 83 E3 78 */ mr r3, r28
-/* 800893E4 48 2D F7 49 */ bl strcpy
-/* 800893E8 48 00 00 18 */ b lbl_80089400
-lbl_800893EC:
-/* 800893EC 7F 83 E3 78 */ mr r3, r28
-/* 800893F0 7F C4 F3 78 */ mr r4, r30
-/* 800893F4 48 2D F7 39 */ bl strcpy
-/* 800893F8 38 60 00 00 */ li r3, 0
-/* 800893FC 48 00 00 08 */ b lbl_80089404
-lbl_80089400:
-/* 80089400 38 60 00 01 */ li r3, 1
-lbl_80089404:
-/* 80089404 39 61 00 20 */ addi r11, r1, 0x20
-/* 80089408 48 2D 8E 19 */ bl _restgpr_27
-/* 8008940C 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80089410 7C 08 03 A6 */ mtlr r0
-/* 80089414 38 21 00 20 */ addi r1, r1, 0x20
-/* 80089418 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPc.s b/asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPc.s
deleted file mode 100644
index aed340499b..0000000000
--- a/asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPc.s
+++ /dev/null
@@ -1,48 +0,0 @@
-lbl_80088FE0:
-/* 80088FE0 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80088FE4 7C 08 02 A6 */ mflr r0
-/* 80088FE8 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80088FEC 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088FF0 48 2D 91 ED */ bl _savegpr_29
-/* 80088FF4 7C 7D 1B 78 */ mr r29, r3
-/* 80088FF8 7C 9E 23 78 */ mr r30, r4
-/* 80088FFC 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80089000 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80089004 41 82 00 28 */ beq lbl_8008902C
-/* 80089008 4B FF FC 1D */ bl searchEventArgData__9dCamera_cFPc
-/* 8008900C 2C 03 FF FF */ cmpwi r3, -1
-/* 80089010 40 82 00 0C */ bne lbl_8008901C
-/* 80089014 38 60 00 00 */ li r3, 0
-/* 80089018 48 00 00 5C */ b lbl_80089074
-lbl_8008901C:
-/* 8008901C 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 80089020 7C 7D 02 14 */ add r3, r29, r0
-/* 80089024 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 80089028 48 00 00 4C */ b lbl_80089074
-lbl_8008902C:
-/* 8008902C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089030 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089034 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 80089038 7F E3 FB 78 */ mr r3, r31
-/* 8008903C 80 9D 04 EC */ lwz r4, 0x4ec(r29)
-/* 80089040 7F C5 F3 78 */ mr r5, r30
-/* 80089044 4B FB F1 01 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80089048 2C 03 00 00 */ cmpwi r3, 0
-/* 8008904C 41 82 00 1C */ beq lbl_80089068
-/* 80089050 7F E3 FB 78 */ mr r3, r31
-/* 80089054 80 9D 04 EC */ lwz r4, 0x4ec(r29)
-/* 80089058 7F C5 F3 78 */ mr r5, r30
-/* 8008905C 38 C0 00 04 */ li r6, 4
-/* 80089060 4B FB F0 8D */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 80089064 48 00 00 10 */ b lbl_80089074
-lbl_80089068:
-/* 80089068 38 00 00 01 */ li r0, 1
-/* 8008906C 98 1D 04 F8 */ stb r0, 0x4f8(r29)
-/* 80089070 38 60 00 00 */ li r3, 0
-lbl_80089074:
-/* 80089074 39 61 00 20 */ addi r11, r1, 0x20
-/* 80089078 48 2D 91 B1 */ bl _restgpr_29
-/* 8008907C 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80089080 7C 08 03 A6 */ mtlr r0
-/* 80089084 38 21 00 20 */ addi r1, r1, 0x20
-/* 80089088 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPcPc.s b/asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPcPc.s
deleted file mode 100644
index b10651660f..0000000000
--- a/asm/d/d_ev_camera/getEvStringPntData__9dCamera_cFPcPc.s
+++ /dev/null
@@ -1,47 +0,0 @@
-lbl_8008941C:
-/* 8008941C 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80089420 7C 08 02 A6 */ mflr r0
-/* 80089424 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80089428 39 61 00 20 */ addi r11, r1, 0x20
-/* 8008942C 48 2D 8D AD */ bl _savegpr_28
-/* 80089430 7C 7C 1B 78 */ mr r28, r3
-/* 80089434 7C 9D 23 78 */ mr r29, r4
-/* 80089438 7C BE 2B 78 */ mr r30, r5
-/* 8008943C 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80089440 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80089444 41 82 00 28 */ beq lbl_8008946C
-/* 80089448 4B FF F7 DD */ bl searchEventArgData__9dCamera_cFPc
-/* 8008944C 2C 03 FF FF */ cmpwi r3, -1
-/* 80089450 40 82 00 0C */ bne lbl_8008945C
-/* 80089454 7F C3 F3 78 */ mr r3, r30
-/* 80089458 48 00 00 54 */ b lbl_800894AC
-lbl_8008945C:
-/* 8008945C 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 80089460 7C 7C 02 14 */ add r3, r28, r0
-/* 80089464 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 80089468 48 00 00 44 */ b lbl_800894AC
-lbl_8008946C:
-/* 8008946C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80089470 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80089474 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 80089478 7F E3 FB 78 */ mr r3, r31
-/* 8008947C 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 80089480 7F A5 EB 78 */ mr r5, r29
-/* 80089484 4B FB EC C1 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80089488 2C 03 00 00 */ cmpwi r3, 0
-/* 8008948C 41 82 00 1C */ beq lbl_800894A8
-/* 80089490 7F E3 FB 78 */ mr r3, r31
-/* 80089494 80 9C 04 EC */ lwz r4, 0x4ec(r28)
-/* 80089498 7F A5 EB 78 */ mr r5, r29
-/* 8008949C 38 C0 00 04 */ li r6, 4
-/* 800894A0 4B FB EC 4D */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 800894A4 48 00 00 08 */ b lbl_800894AC
-lbl_800894A8:
-/* 800894A8 7F C3 F3 78 */ mr r3, r30
-lbl_800894AC:
-/* 800894AC 39 61 00 20 */ addi r11, r1, 0x20
-/* 800894B0 48 2D 8D 75 */ bl _restgpr_28
-/* 800894B4 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 800894B8 7C 08 03 A6 */ mtlr r0
-/* 800894BC 38 21 00 20 */ addi r1, r1, 0x20
-/* 800894C0 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvXyzData__9dCamera_cFP4cXyzPc4cXyz.s b/asm/d/d_ev_camera/getEvXyzData__9dCamera_cFP4cXyzPc4cXyz.s
deleted file mode 100644
index 057a8ee4aa..0000000000
--- a/asm/d/d_ev_camera/getEvXyzData__9dCamera_cFP4cXyzPc4cXyz.s
+++ /dev/null
@@ -1,74 +0,0 @@
-lbl_8008922C:
-/* 8008922C 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80089230 7C 08 02 A6 */ mflr r0
-/* 80089234 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80089238 39 61 00 20 */ addi r11, r1, 0x20
-/* 8008923C 48 2D 8F 99 */ bl _savegpr_27
-/* 80089240 7C 7B 1B 78 */ mr r27, r3
-/* 80089244 7C 9C 23 78 */ mr r28, r4
-/* 80089248 7C BD 2B 78 */ mr r29, r5
-/* 8008924C 7C DE 33 78 */ mr r30, r6
-/* 80089250 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80089254 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80089258 41 82 00 58 */ beq lbl_800892B0
-/* 8008925C 7F A4 EB 78 */ mr r4, r29
-/* 80089260 4B FF F9 C5 */ bl searchEventArgData__9dCamera_cFPc
-/* 80089264 2C 03 FF FF */ cmpwi r3, -1
-/* 80089268 40 82 00 20 */ bne lbl_80089288
-/* 8008926C C0 1E 00 00 */ lfs f0, 0(r30)
-/* 80089270 D0 1C 00 00 */ stfs f0, 0(r28)
-/* 80089274 C0 1E 00 04 */ lfs f0, 4(r30)
-/* 80089278 D0 1C 00 04 */ stfs f0, 4(r28)
-/* 8008927C C0 1E 00 08 */ lfs f0, 8(r30)
-/* 80089280 D0 1C 00 08 */ stfs f0, 8(r28)
-/* 80089284 48 00 00 9C */ b lbl_80089320
-lbl_80089288:
-/* 80089288 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 8008928C 7C 7B 02 14 */ add r3, r27, r0
-/* 80089290 80 63 05 28 */ lwz r3, 0x528(r3)
-/* 80089294 C0 03 00 00 */ lfs f0, 0(r3)
-/* 80089298 D0 1C 00 00 */ stfs f0, 0(r28)
-/* 8008929C C0 03 00 04 */ lfs f0, 4(r3)
-/* 800892A0 D0 1C 00 04 */ stfs f0, 4(r28)
-/* 800892A4 C0 03 00 08 */ lfs f0, 8(r3)
-/* 800892A8 D0 1C 00 08 */ stfs f0, 8(r28)
-/* 800892AC 48 00 00 74 */ b lbl_80089320
-lbl_800892B0:
-/* 800892B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 800892B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 800892B8 3B E3 4F F8 */ addi r31, r3, 0x4ff8
-/* 800892BC 7F E3 FB 78 */ mr r3, r31
-/* 800892C0 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 800892C4 4B FB EE 81 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 800892C8 2C 03 00 00 */ cmpwi r3, 0
-/* 800892CC 41 82 00 34 */ beq lbl_80089300
-/* 800892D0 7F E3 FB 78 */ mr r3, r31
-/* 800892D4 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 800892D8 7F A5 EB 78 */ mr r5, r29
-/* 800892DC 38 C0 00 01 */ li r6, 1
-/* 800892E0 4B FB EE 0D */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 800892E4 C0 03 00 00 */ lfs f0, 0(r3)
-/* 800892E8 D0 1C 00 00 */ stfs f0, 0(r28)
-/* 800892EC C0 03 00 04 */ lfs f0, 4(r3)
-/* 800892F0 D0 1C 00 04 */ stfs f0, 4(r28)
-/* 800892F4 C0 03 00 08 */ lfs f0, 8(r3)
-/* 800892F8 D0 1C 00 08 */ stfs f0, 8(r28)
-/* 800892FC 48 00 00 24 */ b lbl_80089320
-lbl_80089300:
-/* 80089300 C0 1E 00 00 */ lfs f0, 0(r30)
-/* 80089304 D0 1C 00 00 */ stfs f0, 0(r28)
-/* 80089308 C0 1E 00 04 */ lfs f0, 4(r30)
-/* 8008930C D0 1C 00 04 */ stfs f0, 4(r28)
-/* 80089310 C0 1E 00 08 */ lfs f0, 8(r30)
-/* 80089314 D0 1C 00 08 */ stfs f0, 8(r28)
-/* 80089318 38 60 00 00 */ li r3, 0
-/* 8008931C 48 00 00 08 */ b lbl_80089324
-lbl_80089320:
-/* 80089320 38 60 00 01 */ li r3, 1
-lbl_80089324:
-/* 80089324 39 61 00 20 */ addi r11, r1, 0x20
-/* 80089328 48 2D 8E F9 */ bl _restgpr_27
-/* 8008932C 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80089330 7C 08 03 A6 */ mtlr r0
-/* 80089334 38 21 00 20 */ addi r1, r1, 0x20
-/* 80089338 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/getEvXyzListData__9dCamera_cFPP4cXyzPc.s b/asm/d/d_ev_camera/getEvXyzListData__9dCamera_cFPP4cXyzPc.s
deleted file mode 100644
index f5824ef224..0000000000
--- a/asm/d/d_ev_camera/getEvXyzListData__9dCamera_cFPP4cXyzPc.s
+++ /dev/null
@@ -1,55 +0,0 @@
-lbl_80088F1C:
-/* 80088F1C 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80088F20 7C 08 02 A6 */ mflr r0
-/* 80088F24 90 01 00 24 */ stw r0, 0x24(r1)
-/* 80088F28 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088F2C 48 2D 92 A9 */ bl _savegpr_27
-/* 80088F30 7C 7B 1B 78 */ mr r27, r3
-/* 80088F34 7C 9C 23 78 */ mr r28, r4
-/* 80088F38 7C BD 2B 78 */ mr r29, r5
-/* 80088F3C 80 03 06 0C */ lwz r0, 0x60c(r3)
-/* 80088F40 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2
-/* 80088F44 41 82 00 34 */ beq lbl_80088F78
-/* 80088F48 7F A4 EB 78 */ mr r4, r29
-/* 80088F4C 4B FF FC D9 */ bl searchEventArgData__9dCamera_cFPc
-/* 80088F50 2C 03 FF FF */ cmpwi r3, -1
-/* 80088F54 40 82 00 0C */ bne lbl_80088F60
-/* 80088F58 38 60 00 00 */ li r3, 0
-/* 80088F5C 48 00 00 6C */ b lbl_80088FC8
-lbl_80088F60:
-/* 80088F60 1C 03 00 18 */ mulli r0, r3, 0x18
-/* 80088F64 7C 7B 02 14 */ add r3, r27, r0
-/* 80088F68 80 03 05 28 */ lwz r0, 0x528(r3)
-/* 80088F6C 90 1C 00 00 */ stw r0, 0(r28)
-/* 80088F70 80 63 05 24 */ lwz r3, 0x524(r3)
-/* 80088F74 48 00 00 54 */ b lbl_80088FC8
-lbl_80088F78:
-/* 80088F78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80088F7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 80088F80 3B C3 4F F8 */ addi r30, r3, 0x4ff8
-/* 80088F84 7F C3 F3 78 */ mr r3, r30
-/* 80088F88 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 80088F8C 4B FB F1 B9 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc
-/* 80088F90 7C 7F 1B 79 */ or. r31, r3, r3
-/* 80088F94 41 82 00 20 */ beq lbl_80088FB4
-/* 80088F98 7F C3 F3 78 */ mr r3, r30
-/* 80088F9C 80 9B 04 EC */ lwz r4, 0x4ec(r27)
-/* 80088FA0 7F A5 EB 78 */ mr r5, r29
-/* 80088FA4 38 C0 00 01 */ li r6, 1
-/* 80088FA8 4B FB F1 45 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
-/* 80088FAC 90 7C 00 00 */ stw r3, 0(r28)
-/* 80088FB0 48 00 00 14 */ b lbl_80088FC4
-lbl_80088FB4:
-/* 80088FB4 38 00 00 01 */ li r0, 1
-/* 80088FB8 98 1B 04 F8 */ stb r0, 0x4f8(r27)
-/* 80088FBC 38 60 00 00 */ li r3, 0
-/* 80088FC0 48 00 00 08 */ b lbl_80088FC8
-lbl_80088FC4:
-/* 80088FC4 7F E3 FB 78 */ mr r3, r31
-lbl_80088FC8:
-/* 80088FC8 39 61 00 20 */ addi r11, r1, 0x20
-/* 80088FCC 48 2D 92 55 */ bl _restgpr_27
-/* 80088FD0 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80088FD4 7C 08 03 A6 */ mtlr r0
-/* 80088FD8 38 21 00 20 */ addi r1, r1, 0x20
-/* 80088FDC 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/pauseEvCamera__9dCamera_cFv.s b/asm/d/d_ev_camera/pauseEvCamera__9dCamera_cFv.s
deleted file mode 100644
index 14a0234481..0000000000
--- a/asm/d/d_ev_camera/pauseEvCamera__9dCamera_cFv.s
+++ /dev/null
@@ -1,51 +0,0 @@
-lbl_80089730:
-/* 80089730 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80089734 7C 08 02 A6 */ mflr r0
-/* 80089738 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8008973C 93 E1 00 0C */ stw r31, 0xc(r1)
-/* 80089740 7C 7F 1B 78 */ mr r31, r3
-/* 80089744 80 03 01 74 */ lwz r0, 0x174(r3)
-/* 80089748 28 00 00 00 */ cmplwi r0, 0
-/* 8008974C 40 82 00 48 */ bne lbl_80089794
-/* 80089750 48 0F 75 19 */ bl Reset__9dCamera_cFv
-/* 80089754 38 00 00 01 */ li r0, 1
-/* 80089758 98 1F 01 58 */ stb r0, 0x158(r31)
-/* 8008975C 7F E3 FB 78 */ mr r3, r31
-/* 80089760 38 9F 03 F0 */ addi r4, r31, 0x3f0
-/* 80089764 3C A0 80 38 */ lis r5, d_d_ev_camera__stringBase0@ha /* 0x8037AAF4@ha */
-/* 80089768 38 A5 AA F4 */ addi r5, r5, d_d_ev_camera__stringBase0@l /* 0x8037AAF4@l */
-/* 8008976C 38 C0 FF FF */ li r6, -1
-/* 80089770 4B FF F9 1D */ bl getEvIntData__9dCamera_cFPiPci
-/* 80089774 98 7F 03 E8 */ stb r3, 0x3e8(r31)
-/* 80089778 7F E3 FB 78 */ mr r3, r31
-/* 8008977C 38 9F 03 EC */ addi r4, r31, 0x3ec
-/* 80089780 3C A0 80 38 */ lis r5, d_d_ev_camera__stringBase0@ha /* 0x8037AAF4@ha */
-/* 80089784 38 A5 AA F4 */ addi r5, r5, d_d_ev_camera__stringBase0@l /* 0x8037AAF4@l */
-/* 80089788 38 A5 00 06 */ addi r5, r5, 6
-/* 8008978C 38 C0 00 00 */ li r6, 0
-/* 80089790 4B FF F8 FD */ bl getEvIntData__9dCamera_cFPiPci
-lbl_80089794:
-/* 80089794 80 1F 03 EC */ lwz r0, 0x3ec(r31)
-/* 80089798 2C 00 00 00 */ cmpwi r0, 0
-/* 8008979C 41 82 00 10 */ beq lbl_800897AC
-/* 800897A0 80 1F 06 0C */ lwz r0, 0x60c(r31)
-/* 800897A4 60 00 00 01 */ ori r0, r0, 1
-/* 800897A8 90 1F 06 0C */ stw r0, 0x60c(r31)
-lbl_800897AC:
-/* 800897AC 88 1F 03 E8 */ lbz r0, 0x3e8(r31)
-/* 800897B0 28 00 00 00 */ cmplwi r0, 0
-/* 800897B4 41 82 00 1C */ beq lbl_800897D0
-/* 800897B8 80 7F 01 74 */ lwz r3, 0x174(r31)
-/* 800897BC 80 1F 03 F0 */ lwz r0, 0x3f0(r31)
-/* 800897C0 7C 03 00 40 */ cmplw r3, r0
-/* 800897C4 40 80 00 0C */ bge lbl_800897D0
-/* 800897C8 38 60 00 00 */ li r3, 0
-/* 800897CC 48 00 00 08 */ b lbl_800897D4
-lbl_800897D0:
-/* 800897D0 38 60 00 01 */ li r3, 1
-lbl_800897D4:
-/* 800897D4 83 E1 00 0C */ lwz r31, 0xc(r1)
-/* 800897D8 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 800897DC 7C 08 03 A6 */ mtlr r0
-/* 800897E0 38 21 00 10 */ addi r1, r1, 0x10
-/* 800897E4 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/saveEvCamera__9dCamera_cFv.s b/asm/d/d_ev_camera/saveEvCamera__9dCamera_cFv.s
deleted file mode 100644
index e7f6a8f86b..0000000000
--- a/asm/d/d_ev_camera/saveEvCamera__9dCamera_cFv.s
+++ /dev/null
@@ -1,50 +0,0 @@
-lbl_800924D0:
-/* 800924D0 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 800924D4 7C 08 02 A6 */ mflr r0
-/* 800924D8 90 01 00 24 */ stw r0, 0x24(r1)
-/* 800924DC 93 E1 00 1C */ stw r31, 0x1c(r1)
-/* 800924E0 7C 7F 1B 78 */ mr r31, r3
-/* 800924E4 38 81 00 08 */ addi r4, r1, 8
-/* 800924E8 3C A0 80 38 */ lis r5, d_d_ev_camera__stringBase0@ha /* 0x8037AAF4@ha */
-/* 800924EC 38 A5 AA F4 */ addi r5, r5, d_d_ev_camera__stringBase0@l /* 0x8037AAF4@l */
-/* 800924F0 38 A5 01 80 */ addi r5, r5, 0x180
-/* 800924F4 38 C0 00 00 */ li r6, 0
-/* 800924F8 4B FF 6B 95 */ bl getEvIntData__9dCamera_cFPiPci
-/* 800924FC 80 01 00 08 */ lwz r0, 8(r1)
-/* 80092500 2C 00 00 09 */ cmpwi r0, 9
-/* 80092504 40 82 00 50 */ bne lbl_80092554
-/* 80092508 A8 1F 00 7C */ lha r0, 0x7c(r31)
-/* 8009250C C0 3F 00 80 */ lfs f1, 0x80(r31)
-/* 80092510 C0 1F 00 64 */ lfs f0, 0x64(r31)
-/* 80092514 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
-/* 80092518 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
-/* 8009251C D0 03 5D 8C */ stfs f0, 0x5d8c(r3)
-/* 80092520 C0 1F 00 68 */ lfs f0, 0x68(r31)
-/* 80092524 D0 03 5D 90 */ stfs f0, 0x5d90(r3)
-/* 80092528 C0 1F 00 6C */ lfs f0, 0x6c(r31)
-/* 8009252C D0 03 5D 94 */ stfs f0, 0x5d94(r3)
-/* 80092530 C0 1F 00 70 */ lfs f0, 0x70(r31)
-/* 80092534 D0 03 5D 98 */ stfs f0, 0x5d98(r3)
-/* 80092538 C0 1F 00 74 */ lfs f0, 0x74(r31)
-/* 8009253C D0 03 5D 9C */ stfs f0, 0x5d9c(r3)
-/* 80092540 C0 1F 00 78 */ lfs f0, 0x78(r31)
-/* 80092544 D0 03 5D A0 */ stfs f0, 0x5da0(r3)
-/* 80092548 D0 23 5D A4 */ stfs f1, 0x5da4(r3)
-/* 8009254C B0 03 5D A8 */ sth r0, 0x5da8(r3)
-/* 80092550 48 00 00 1C */ b lbl_8009256C
-lbl_80092554:
-/* 80092554 7F E3 FB 78 */ mr r3, r31
-/* 80092558 54 04 28 34 */ slwi r4, r0, 5
-/* 8009255C 38 84 00 D0 */ addi r4, r4, 0xd0
-/* 80092560 7C 9F 22 14 */ add r4, r31, r4
-/* 80092564 38 A0 00 01 */ li r5, 1
-/* 80092568 48 0D 26 FD */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs
-lbl_8009256C:
-/* 8009256C 38 00 00 01 */ li r0, 1
-/* 80092570 98 1F 01 58 */ stb r0, 0x158(r31)
-/* 80092574 38 60 00 01 */ li r3, 1
-/* 80092578 83 E1 00 1C */ lwz r31, 0x1c(r1)
-/* 8009257C 80 01 00 24 */ lwz r0, 0x24(r1)
-/* 80092580 7C 08 03 A6 */ mtlr r0
-/* 80092584 38 21 00 20 */ addi r1, r1, 0x20
-/* 80092588 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/uniformAcceleEvCamera__9dCamera_cFv.s b/asm/d/d_ev_camera/uniformAcceleEvCamera__9dCamera_cFv.s
deleted file mode 100644
index c54af8cc35..0000000000
--- a/asm/d/d_ev_camera/uniformAcceleEvCamera__9dCamera_cFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8008BE74:
-/* 8008BE74 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8008BE78 7C 08 02 A6 */ mflr r0
-/* 8008BE7C 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8008BE80 38 80 00 03 */ li r4, 3
-/* 8008BE84 48 00 00 15 */ bl transEvCamera__9dCamera_cFi
-/* 8008BE88 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8008BE8C 7C 08 03 A6 */ mtlr r0
-/* 8008BE90 38 21 00 10 */ addi r1, r1, 0x10
-/* 8008BE94 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/uniformBrakeEvCamera__9dCamera_cFv.s b/asm/d/d_ev_camera/uniformBrakeEvCamera__9dCamera_cFv.s
deleted file mode 100644
index bc0396ecd8..0000000000
--- a/asm/d/d_ev_camera/uniformBrakeEvCamera__9dCamera_cFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8008BE50:
-/* 8008BE50 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8008BE54 7C 08 02 A6 */ mflr r0
-/* 8008BE58 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8008BE5C 38 80 00 02 */ li r4, 2
-/* 8008BE60 48 00 00 39 */ bl transEvCamera__9dCamera_cFi
-/* 8008BE64 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8008BE68 7C 08 03 A6 */ mtlr r0
-/* 8008BE6C 38 21 00 10 */ addi r1, r1, 0x10
-/* 8008BE70 4E 80 00 20 */ blr
diff --git a/asm/d/d_ev_camera/uniformTransEvCamera__9dCamera_cFv.s b/asm/d/d_ev_camera/uniformTransEvCamera__9dCamera_cFv.s
deleted file mode 100644
index 83cb5a1084..0000000000
--- a/asm/d/d_ev_camera/uniformTransEvCamera__9dCamera_cFv.s
+++ /dev/null
@@ -1,10 +0,0 @@
-lbl_8008BE2C:
-/* 8008BE2C 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 8008BE30 7C 08 02 A6 */ mflr r0
-/* 8008BE34 90 01 00 14 */ stw r0, 0x14(r1)
-/* 8008BE38 38 80 00 01 */ li r4, 1
-/* 8008BE3C 48 00 00 5D */ bl transEvCamera__9dCamera_cFi
-/* 8008BE40 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 8008BE44 7C 08 03 A6 */ mtlr r0
-/* 8008BE48 38 21 00 10 */ addi r1, r1, 0x10
-/* 8008BE4C 4E 80 00 20 */ blr