diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s
index fe1417305c..cc36038b0a 100644
--- a/asm/d/com/inf/d_com_inf_game.s
+++ b/asm/d/com/inf/d_com_inf_game.s
@@ -110,7 +110,7 @@ lbl_8002B338:
 /* 8002B340 00028280  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8002B344 00028284  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8002B348 00028288  38 63 01 E0 */	addi r3, r3, 0x1e0
-/* 8002B34C 0002828C  48 00 93 49 */	bl dSv_player_config_c_NS_getVibration
+/* 8002B34C 0002828C  48 00 93 49 */	bl getVibration__19dSv_player_config_cFv
 /* 8002B350 00028290  98 7E 4F 5A */	stb r3, 0x4f5a(r30)
 /* 8002B354 00028294  83 E1 00 0C */	lwz r31, 0xc(r1)
 /* 8002B358 00028298  83 C1 00 08 */	lwz r30, 8(r1)
@@ -2605,7 +2605,7 @@ dComIfGs_isStageTbox:
 /* 8002D5E0 0002A520  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8002D5E4 0002A524  38 63 09 58 */	addi r3, r3, 0x958
 /* 8002D5E8 0002A528  7F E4 FB 78 */	mr r4, r31
-/* 8002D5EC 0002A52C  48 00 71 FD */	bl dSv_memBit_c_NS_isTbox
+/* 8002D5EC 0002A52C  48 00 71 FD */	bl isTbox__12dSv_memBit_cCFi
 /* 8002D5F0 0002A530  48 00 00 20 */	b lbl_8002D610
 lbl_8002D5F4:
 /* 8002D5F4 0002A534  57 C4 28 34 */	slwi r4, r30, 5
@@ -2614,7 +2614,7 @@ lbl_8002D5F4:
 /* 8002D600 0002A540  7C 60 22 14 */	add r3, r0, r4
 /* 8002D604 0002A544  38 63 01 F0 */	addi r3, r3, 0x1f0
 /* 8002D608 0002A548  7F E4 FB 78 */	mr r4, r31
-/* 8002D60C 0002A54C  48 00 71 DD */	bl dSv_memBit_c_NS_isTbox
+/* 8002D60C 0002A54C  48 00 71 DD */	bl isTbox__12dSv_memBit_cCFi
 lbl_8002D610:
 /* 8002D610 0002A550  83 E1 00 0C */	lwz r31, 0xc(r1)
 /* 8002D614 0002A554  83 C1 00 08 */	lwz r30, 8(r1)
diff --git a/asm/d/d_map.s b/asm/d/d_map.s
index ac21043cd1..5f2fe06c41 100644
--- a/asm/d/d_map.s
+++ b/asm/d/d_map.s
@@ -938,7 +938,7 @@ lbl_80029210:
 /* 8002924C 0002618C  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 80029250 00026190  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 80029254 00026194  38 63 09 58 */	addi r3, r3, 0x958
-/* 80029258 00026198  48 00 B5 91 */	bl dSv_memBit_c_NS_isTbox
+/* 80029258 00026198  48 00 B5 91 */	bl isTbox__12dSv_memBit_cCFi
 /* 8002925C 0002619C  2C 03 00 00 */	cmpwi r3, 0
 /* 80029260 000261A0  40 82 04 70 */	bne lbl_800296D0
 /* 80029264 000261A4  57 C0 06 3F */	clrlwi. r0, r30, 0x18
@@ -983,7 +983,7 @@ lbl_800292D0:
 /* 800292F4 00026234  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 800292F8 00026238  38 63 09 58 */	addi r3, r3, 0x958
 /* 800292FC 0002623C  88 9B 00 00 */	lbz r4, 0(r27)
-/* 80029300 00026240  48 00 B4 E9 */	bl dSv_memBit_c_NS_isTbox
+/* 80029300 00026240  48 00 B4 E9 */	bl isTbox__12dSv_memBit_cCFi
 /* 80029304 00026244  2C 03 00 00 */	cmpwi r3, 0
 /* 80029308 00026248  40 82 03 C8 */	bne lbl_800296D0
 /* 8002930C 0002624C  57 C0 06 3F */	clrlwi. r0, r30, 0x18
@@ -1034,7 +1034,7 @@ lbl_80029398:
 /* 800293B0 000262F0  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 800293B4 000262F4  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 800293B8 000262F8  38 63 09 58 */	addi r3, r3, 0x958
-/* 800293BC 000262FC  48 00 B4 2D */	bl dSv_memBit_c_NS_isTbox
+/* 800293BC 000262FC  48 00 B4 2D */	bl isTbox__12dSv_memBit_cCFi
 /* 800293C0 00026300  2C 03 00 00 */	cmpwi r3, 0
 /* 800293C4 00026304  40 82 00 08 */	bne lbl_800293CC
 /* 800293C8 00026308  3A E0 00 01 */	li r23, 1
@@ -1077,7 +1077,7 @@ lbl_80029434:
 /* 8002944C 0002638C  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 80029450 00026390  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 80029454 00026394  38 63 09 58 */	addi r3, r3, 0x958
-/* 80029458 00026398  48 00 B3 91 */	bl dSv_memBit_c_NS_isTbox
+/* 80029458 00026398  48 00 B3 91 */	bl isTbox__12dSv_memBit_cCFi
 /* 8002945C 0002639C  2C 03 00 00 */	cmpwi r3, 0
 /* 80029460 000263A0  40 82 02 70 */	bne lbl_800296D0
 lbl_80029464:
@@ -1135,7 +1135,7 @@ lbl_800294DC:
 /* 80029528 00026468  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8002952C 0002646C  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 80029530 00026470  38 63 09 58 */	addi r3, r3, 0x958
-/* 80029534 00026474  48 00 B2 B5 */	bl dSv_memBit_c_NS_isTbox
+/* 80029534 00026474  48 00 B2 B5 */	bl isTbox__12dSv_memBit_cCFi
 /* 80029538 00026478  2C 03 00 00 */	cmpwi r3, 0
 /* 8002953C 0002647C  40 82 01 94 */	bne lbl_800296D0
 lbl_80029540:
@@ -1151,7 +1151,7 @@ lbl_80029540:
 /* 80029564 000264A4  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 80029568 000264A8  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8002956C 000264AC  38 63 09 58 */	addi r3, r3, 0x958
-/* 80029570 000264B0  48 00 B2 79 */	bl dSv_memBit_c_NS_isTbox
+/* 80029570 000264B0  48 00 B2 79 */	bl isTbox__12dSv_memBit_cCFi
 /* 80029574 000264B4  2C 03 00 00 */	cmpwi r3, 0
 /* 80029578 000264B8  41 82 01 58 */	beq lbl_800296D0
 /* 8002957C 000264BC  57 C0 06 3F */	clrlwi. r0, r30, 0x18
@@ -1177,7 +1177,7 @@ lbl_80029540:
 /* 800295CC 0002650C  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 800295D0 00026510  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 800295D4 00026514  38 63 09 58 */	addi r3, r3, 0x958
-/* 800295D8 00026518  48 00 B2 11 */	bl dSv_memBit_c_NS_isTbox
+/* 800295D8 00026518  48 00 B2 11 */	bl isTbox__12dSv_memBit_cCFi
 /* 800295DC 0002651C  2C 03 00 00 */	cmpwi r3, 0
 /* 800295E0 00026520  40 82 00 F0 */	bne lbl_800296D0
 lbl_800295E4:
@@ -1212,7 +1212,7 @@ lbl_80029628:
 /* 80029650 00026590  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 80029654 00026594  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 80029658 00026598  38 63 09 58 */	addi r3, r3, 0x958
-/* 8002965C 0002659C  48 00 B1 8D */	bl dSv_memBit_c_NS_isTbox
+/* 8002965C 0002659C  48 00 B1 8D */	bl isTbox__12dSv_memBit_cCFi
 /* 80029660 000265A0  2C 03 00 00 */	cmpwi r3, 0
 /* 80029664 000265A4  41 82 00 6C */	beq lbl_800296D0
 lbl_80029668:
@@ -1234,7 +1234,7 @@ lbl_80029668:
 /* 800296A4 000265E4  28 04 00 FF */	cmplwi r4, 0xff
 /* 800296A8 000265E8  41 82 00 28 */	beq lbl_800296D0
 /* 800296AC 000265EC  7F 23 CB 78 */	mr r3, r25
-/* 800296B0 000265F0  48 00 B1 39 */	bl dSv_memBit_c_NS_isTbox
+/* 800296B0 000265F0  48 00 B1 39 */	bl isTbox__12dSv_memBit_cCFi
 /* 800296B4 000265F4  2C 03 00 00 */	cmpwi r3, 0
 /* 800296B8 000265F8  40 82 00 18 */	bne lbl_800296D0
 /* 800296BC 000265FC  56 E0 06 3F */	clrlwi. r0, r23, 0x18
diff --git a/asm/d/d_save.s b/asm/d/d_save.s
index 2c266ed703..829b193641 100644
--- a/asm/d/d_save.s
+++ b/asm/d/d_save.s
@@ -2,149 +2,6 @@
 
 .section .text, "ax" # 80032918 
 
-.global dSv_player_config_c_NS_checkVibration
-dSv_player_config_c_NS_checkVibration:
-/* 80034644 00031584  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 80034648 00031588  7C 08 02 A6 */	mflr r0
-/* 8003464C 0003158C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80034650 00031590  80 0D 8F 60 */	lwz r0, lbl_804514E0-_SDA_BASE_(r13)
-/* 80034654 00031594  54 00 00 01 */	rlwinm. r0, r0, 0, 0, 0
-/* 80034658 00031598  41 82 00 18 */	beq lbl_80034670
-/* 8003465C 0003159C  3C 60 80 40 */	lis r3, lbl_804061C0@ha
-/* 80034660 000315A0  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
-/* 80034664 000315A4  38 63 0F 38 */	addi r3, r3, 0xf38
-/* 80034668 000315A8  4B FF 6D 49 */	bl dComIfG_play_c_NS_getNowVibration
-/* 8003466C 000315AC  48 00 00 08 */	b lbl_80034674
-lbl_80034670:
-/* 80034670 000315B0  38 60 00 00 */	li r3, 0
-lbl_80034674:
-/* 80034674 000315B4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80034678 000315B8  7C 08 03 A6 */	mtlr r0
-/* 8003467C 000315BC  38 21 00 10 */	addi r1, r1, 0x10
-/* 80034680 000315C0  4E 80 00 20 */	blr 
-
-.global dSv_player_config_c_NS_getSound
-dSv_player_config_c_NS_getSound:
-/* 80034684 000315C4  88 63 00 01 */	lbz r3, 1(r3)
-/* 80034688 000315C8  4E 80 00 20 */	blr 
-
-.global dSv_player_config_c_NS_setSound
-dSv_player_config_c_NS_setSound:
-/* 8003468C 000315CC  98 83 00 01 */	stb r4, 1(r3)
-/* 80034690 000315D0  4E 80 00 20 */	blr 
-
-.global dSv_player_config_c_NS_getVibration
-dSv_player_config_c_NS_getVibration:
-/* 80034694 000315D4  88 63 00 03 */	lbz r3, 3(r3)
-/* 80034698 000315D8  4E 80 00 20 */	blr 
-
-.global dSv_player_config_c_NS_setVibration
-dSv_player_config_c_NS_setVibration:
-/* 8003469C 000315DC  98 83 00 03 */	stb r4, 3(r3)
-/* 800346A0 000315E0  4E 80 00 20 */	blr 
-
-.global dSv_player_c_NS_init
-dSv_player_c_NS_init:
-/* 800346A4 000315E4  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 800346A8 000315E8  7C 08 02 A6 */	mflr r0
-/* 800346AC 000315EC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 800346B0 000315F0  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 800346B4 000315F4  7C 7F 1B 78 */	mr r31, r3
-/* 800346B8 000315F8  4B FF E2 A1 */	bl init__21dSv_player_status_a_cFv
-/* 800346BC 000315FC  38 7F 00 28 */	addi r3, r31, 0x28
-/* 800346C0 00031600  4B FF E4 91 */	bl init__21dSv_player_status_b_cFv
-/* 800346C4 00031604  38 7F 00 40 */	addi r3, r31, 0x40
-/* 800346C8 00031608  4B FF E5 45 */	bl init__17dSv_horse_place_cFv
-/* 800346CC 0003160C  38 7F 00 58 */	addi r3, r31, 0x58
-/* 800346D0 00031610  4B FF E5 F9 */	bl init__25dSv_player_return_place_cFv
-/* 800346D4 00031614  38 7F 00 64 */	addi r3, r31, 0x64
-/* 800346D8 00031618  4B FF E6 89 */	bl init__33dSv_player_field_last_stay_info_cFv
-/* 800346DC 0003161C  38 7F 00 80 */	addi r3, r31, 0x80
-/* 800346E0 00031620  4B FF E7 D1 */	bl init__27dSv_player_last_mark_info_cFv
-/* 800346E4 00031624  38 7F 00 9C */	addi r3, r31, 0x9c
-/* 800346E8 00031628  4B FF E8 A9 */	bl init__17dSv_player_item_cFv
-/* 800346EC 0003162C  38 7F 00 CC */	addi r3, r31, 0xcc
-/* 800346F0 00031630  4B FF F7 51 */	bl init__21dSv_player_get_item_cFv
-/* 800346F4 00031634  38 7F 00 EC */	addi r3, r31, 0xec
-/* 800346F8 00031638  4B FF F8 09 */	bl init__24dSv_player_item_record_cFv
-/* 800346FC 0003163C  38 7F 00 F8 */	addi r3, r31, 0xf8
-/* 80034700 00031640  4B FF F9 41 */	bl init__21dSv_player_item_max_cFv
-/* 80034704 00031644  38 7F 01 00 */	addi r3, r31, 0x100
-/* 80034708 00031648  4B FF FA A5 */	bl init__20dSv_player_collect_cFv
-/* 8003470C 0003164C  38 7F 01 10 */	addi r3, r31, 0x110
-/* 80034710 00031650  4B FF FB A5 */	bl init__17dSv_player_wolf_cFv
-/* 80034714 00031654  38 7F 01 14 */	addi r3, r31, 0x114
-/* 80034718 00031658  4B FF FB C5 */	bl init__16dSv_light_drop_cFv
-/* 8003471C 0003165C  38 7F 01 1C */	addi r3, r31, 0x11c
-/* 80034720 00031660  4B FF FC BD */	bl init__17dSv_letter_info_cFv
-/* 80034724 00031664  38 7F 01 6C */	addi r3, r31, 0x16c
-/* 80034728 00031668  4B FF FD A1 */	bl init__18dSv_fishing_info_cFv
-/* 8003472C 0003166C  38 7F 01 A0 */	addi r3, r31, 0x1a0
-/* 80034730 00031670  4B FF FD E9 */	bl init__17dSv_player_info_cFv
-/* 80034734 00031674  38 7F 01 E0 */	addi r3, r31, 0x1e0
-/* 80034738 00031678  4B FF FE 75 */	bl init__19dSv_player_config_cFv
-/* 8003473C 0003167C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 80034740 00031680  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 80034744 00031684  7C 08 03 A6 */	mtlr r0
-/* 80034748 00031688  38 21 00 10 */	addi r1, r1, 0x10
-/* 8003474C 0003168C  4E 80 00 20 */	blr 
-
-.global dSv_memBit_c_NS_init
-dSv_memBit_c_NS_init:
-/* 80034750 00031690  38 80 00 00 */	li r4, 0
-/* 80034754 00031694  7C 85 23 78 */	mr r5, r4
-/* 80034758 00031698  38 00 00 02 */	li r0, 2
-/* 8003475C 0003169C  7C 09 03 A6 */	mtctr r0
-lbl_80034760:
-/* 80034760 000316A0  7C A3 21 2E */	stwx r5, r3, r4
-/* 80034764 000316A4  38 84 00 04 */	addi r4, r4, 4
-/* 80034768 000316A8  42 00 FF F8 */	bdnz lbl_80034760
-/* 8003476C 000316AC  38 80 00 00 */	li r4, 0
-/* 80034770 000316B0  38 A0 00 00 */	li r5, 0
-/* 80034774 000316B4  38 00 00 04 */	li r0, 4
-/* 80034778 000316B8  7C 09 03 A6 */	mtctr r0
-lbl_8003477C:
-/* 8003477C 000316BC  38 04 00 08 */	addi r0, r4, 8
-/* 80034780 000316C0  7C A3 01 2E */	stwx r5, r3, r0
-/* 80034784 000316C4  38 84 00 04 */	addi r4, r4, 4
-/* 80034788 000316C8  42 00 FF F4 */	bdnz lbl_8003477C
-/* 8003478C 000316CC  38 00 00 00 */	li r0, 0
-/* 80034790 000316D0  90 03 00 18 */	stw r0, 0x18(r3)
-/* 80034794 000316D4  98 03 00 1C */	stb r0, 0x1c(r3)
-/* 80034798 000316D8  98 03 00 1D */	stb r0, 0x1d(r3)
-/* 8003479C 000316DC  4E 80 00 20 */	blr 
-/* 800347A0 000316E0  7C 80 2E 70 */	srawi r0, r4, 5
-/* 800347A4 000316E4  54 07 10 3A */	slwi r7, r0, 2
-/* 800347A8 000316E8  7C C3 38 2E */	lwzx r6, r3, r7
-/* 800347AC 000316EC  38 A0 00 01 */	li r5, 1
-/* 800347B0 000316F0  54 80 06 FE */	clrlwi r0, r4, 0x1b
-/* 800347B4 000316F4  7C A0 00 30 */	slw r0, r5, r0
-/* 800347B8 000316F8  7C C0 03 78 */	or r0, r6, r0
-/* 800347BC 000316FC  7C 03 39 2E */	stwx r0, r3, r7
-/* 800347C0 00031700  4E 80 00 20 */	blr 
-/* 800347C4 00031704  7C 80 2E 70 */	srawi r0, r4, 5
-/* 800347C8 00031708  54 07 10 3A */	slwi r7, r0, 2
-/* 800347CC 0003170C  7C C3 38 2E */	lwzx r6, r3, r7
-/* 800347D0 00031710  38 A0 00 01 */	li r5, 1
-/* 800347D4 00031714  54 80 06 FE */	clrlwi r0, r4, 0x1b
-/* 800347D8 00031718  7C A0 00 30 */	slw r0, r5, r0
-/* 800347DC 0003171C  7C C0 00 78 */	andc r0, r6, r0
-/* 800347E0 00031720  7C 03 39 2E */	stwx r0, r3, r7
-/* 800347E4 00031724  4E 80 00 20 */	blr 
-
-.global dSv_memBit_c_NS_isTbox
-dSv_memBit_c_NS_isTbox:
-/* 800347E8 00031728  38 A0 00 01 */	li r5, 1
-/* 800347EC 0003172C  54 80 06 FE */	clrlwi r0, r4, 0x1b
-/* 800347F0 00031730  7C A5 00 30 */	slw r5, r5, r0
-/* 800347F4 00031734  7C 80 2E 70 */	srawi r0, r4, 5
-/* 800347F8 00031738  54 00 10 3A */	slwi r0, r0, 2
-/* 800347FC 0003173C  7C 03 00 2E */	lwzx r0, r3, r0
-/* 80034800 00031740  7C A3 00 38 */	and r3, r5, r0
-/* 80034804 00031744  30 03 FF FF */	addic r0, r3, -1
-/* 80034808 00031748  7C 60 19 10 */	subfe r3, r0, r3
-/* 8003480C 0003174C  4E 80 00 20 */	blr 
-
 .global dSv_memBit_c_NS_onSwitch
 dSv_memBit_c_NS_onSwitch:
 /* 80034810 00031750  7C 80 2E 70 */	srawi r0, r4, 5
@@ -347,7 +204,7 @@ dSv_memory_c_NS_init:
 /* 80034A64 000319A4  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80034A68 000319A8  7C 08 02 A6 */	mflr r0
 /* 80034A6C 000319AC  90 01 00 14 */	stw r0, 0x14(r1)
-/* 80034A70 000319B0  4B FF FC E1 */	bl dSv_memBit_c_NS_init
+/* 80034A70 000319B0  4B FF FC E1 */	bl init__12dSv_memBit_cFv
 /* 80034A74 000319B4  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 80034A78 000319B8  7C 08 03 A6 */	mtlr r0
 /* 80034A7C 000319BC  38 21 00 10 */	addi r1, r1, 0x10
@@ -828,7 +685,7 @@ dSv_save_c_NS_init:
 /* 80035028 00031F68  39 61 00 20 */	addi r11, r1, 0x20
 /* 8003502C 00031F6C  48 32 D1 B1 */	bl _savegpr_29
 /* 80035030 00031F70  7C 7D 1B 78 */	mr r29, r3
-/* 80035034 00031F74  4B FF F6 71 */	bl dSv_player_c_NS_init
+/* 80035034 00031F74  4B FF F6 71 */	bl init__12dSv_player_cFv
 /* 80035038 00031F78  3B C0 00 00 */	li r30, 0
 /* 8003503C 00031F7C  3B E0 00 00 */	li r31, 0
 lbl_80035040:
@@ -1573,7 +1430,7 @@ dSv_info_c_NS_card_to_memory:
 /* 80035A40 00032980  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 80035A44 00032984  38 63 01 E0 */	addi r3, r3, 0x1e0
 /* 80035A48 00032988  38 80 00 00 */	li r4, 0
-/* 80035A4C 0003298C  4B FF EC 41 */	bl dSv_player_config_c_NS_setSound
+/* 80035A4C 0003298C  4B FF EC 41 */	bl setSound__19dSv_player_config_cFUc
 /* 80035A50 00032990  80 6D 8D E8 */	lwz r3, lbl_80451368-_SDA_BASE_(r13)
 /* 80035A54 00032994  38 80 00 00 */	li r4, 0
 /* 80035A58 00032998  48 29 7E 31 */	bl Z2AudioMgr_NS_setOutputMode
@@ -1583,7 +1440,7 @@ lbl_80035A60:
 /* 80035A64 000329A4  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 80035A68 000329A8  3B E3 01 E0 */	addi r31, r3, 0x1e0
 /* 80035A6C 000329AC  7F E3 FB 78 */	mr r3, r31
-/* 80035A70 000329B0  4B FF EC 15 */	bl dSv_player_config_c_NS_getSound
+/* 80035A70 000329B0  4B FF EC 15 */	bl getSound__19dSv_player_config_cFv
 /* 80035A74 000329B4  54 60 06 3E */	clrlwi r0, r3, 0x18
 /* 80035A78 000329B8  28 00 00 02 */	cmplwi r0, 2
 /* 80035A7C 000329BC  40 82 00 14 */	bne lbl_80035A90
@@ -1594,7 +1451,7 @@ lbl_80035A60:
 lbl_80035A90:
 /* 80035A90 000329D0  7F E3 FB 78 */	mr r3, r31
 /* 80035A94 000329D4  38 80 00 01 */	li r4, 1
-/* 80035A98 000329D8  4B FF EB F5 */	bl dSv_player_config_c_NS_setSound
+/* 80035A98 000329D8  4B FF EB F5 */	bl setSound__19dSv_player_config_cFUc
 /* 80035A9C 000329DC  80 6D 8D E8 */	lwz r3, lbl_80451368-_SDA_BASE_(r13)
 /* 80035AA0 000329E0  38 80 00 01 */	li r4, 1
 /* 80035AA4 000329E4  48 29 7D E5 */	bl Z2AudioMgr_NS_setOutputMode
@@ -1651,7 +1508,7 @@ lbl_80035B60:
 /* 80035B60 00032AA0  7F C3 F3 78 */	mr r3, r30
 /* 80035B64 00032AA4  4B FF D7 95 */	bl setLineUpItem__17dSv_player_item_cFv
 /* 80035B68 00032AA8  38 7F 01 E0 */	addi r3, r31, 0x1e0
-/* 80035B6C 00032AAC  4B FF EB 29 */	bl dSv_player_config_c_NS_getVibration
+/* 80035B6C 00032AAC  4B FF EB 29 */	bl getVibration__19dSv_player_config_cFv
 /* 80035B70 00032AB0  7C 64 1B 78 */	mr r4, r3
 /* 80035B74 00032AB4  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 80035B78 00032AB8  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
diff --git a/asm/d/d_vibration.s b/asm/d/d_vibration.s
index a9a1f1e451..1846223d87 100644
--- a/asm/d/d_vibration.s
+++ b/asm/d/d_vibration.s
@@ -96,7 +96,7 @@ dVibration_c_NS_Run:
 /* 8006F288 0006C1C8  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8006F28C 0006C1CC  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8006F290 0006C1D0  38 63 01 E0 */	addi r3, r3, 0x1e0
-/* 8006F294 0006C1D4  4B FC 53 B1 */	bl dSv_player_config_c_NS_checkVibration
+/* 8006F294 0006C1D4  4B FC 53 B1 */	bl checkVibration__19dSv_player_config_cCFv
 /* 8006F298 0006C1D8  54 60 06 3E */	clrlwi r0, r3, 0x18
 /* 8006F29C 0006C1DC  28 00 00 01 */	cmplwi r0, 1
 /* 8006F2A0 0006C1E0  41 82 00 50 */	beq lbl_8006F2F0
@@ -665,7 +665,7 @@ lbl_8006FAA0:
 /* 8006FAA8 0006C9E8  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8006FAAC 0006C9EC  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8006FAB0 0006C9F0  38 63 01 E0 */	addi r3, r3, 0x1e0
-/* 8006FAB4 0006C9F4  4B FC 4B 91 */	bl dSv_player_config_c_NS_checkVibration
+/* 8006FAB4 0006C9F4  4B FC 4B 91 */	bl checkVibration__19dSv_player_config_cCFv
 /* 8006FAB8 0006C9F8  54 60 06 3E */	clrlwi r0, r3, 0x18
 /* 8006FABC 0006C9FC  28 00 00 01 */	cmplwi r0, 1
 /* 8006FAC0 0006CA00  40 82 00 34 */	bne lbl_8006FAF4
@@ -729,7 +729,7 @@ lbl_8006FB8C:
 /* 8006FB94 0006CAD4  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8006FB98 0006CAD8  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8006FB9C 0006CADC  38 63 01 E0 */	addi r3, r3, 0x1e0
-/* 8006FBA0 0006CAE0  4B FC 4A A5 */	bl dSv_player_config_c_NS_checkVibration
+/* 8006FBA0 0006CAE0  4B FC 4A A5 */	bl checkVibration__19dSv_player_config_cCFv
 /* 8006FBA4 0006CAE4  54 60 06 3E */	clrlwi r0, r3, 0x18
 /* 8006FBA8 0006CAE8  28 00 00 01 */	cmplwi r0, 1
 /* 8006FBAC 0006CAEC  40 82 00 44 */	bne lbl_8006FBF0
@@ -836,7 +836,7 @@ lbl_8006FD24:
 /* 8006FD2C 0006CC6C  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8006FD30 0006CC70  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8006FD34 0006CC74  38 63 01 E0 */	addi r3, r3, 0x1e0
-/* 8006FD38 0006CC78  4B FC 49 0D */	bl dSv_player_config_c_NS_checkVibration
+/* 8006FD38 0006CC78  4B FC 49 0D */	bl checkVibration__19dSv_player_config_cCFv
 /* 8006FD3C 0006CC7C  54 60 06 3E */	clrlwi r0, r3, 0x18
 /* 8006FD40 0006CC80  28 00 00 01 */	cmplwi r0, 1
 /* 8006FD44 0006CC84  40 82 00 34 */	bne lbl_8006FD78
diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s
index 1729f78644..d35570b7da 100644
--- a/asm/d/map/path/d_map_path_fmap.s
+++ b/asm/d/map/path/d_map_path_fmap.s
@@ -1295,7 +1295,7 @@ lbl_8003E8B4:
 /* 8003E910 0003B850  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 8003E914 0003B854  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8003E918 0003B858  38 63 09 58 */	addi r3, r3, 0x958
-/* 8003E91C 0003B85C  4B FF 5E CD */	bl dSv_memBit_c_NS_isTbox
+/* 8003E91C 0003B85C  4B FF 5E CD */	bl isTbox__12dSv_memBit_cCFi
 /* 8003E920 0003B860  2C 03 00 00 */	cmpwi r3, 0
 /* 8003E924 0003B864  40 82 00 08 */	bne lbl_8003E92C
 /* 8003E928 0003B868  3B E0 00 01 */	li r31, 1
diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s
index acef74e2d4..bf59320894 100644
--- a/asm/d/menu/d_menu_option.s
+++ b/asm/d/menu/d_menu_option.s
@@ -3395,11 +3395,11 @@ lbl_801E5020:
 /* 801E507C 001E1FBC  41 82 00 10 */	beq lbl_801E508C
 /* 801E5080 001E1FC0  7F C3 F3 78 */	mr r3, r30
 /* 801E5084 001E1FC4  88 9F 03 EA */	lbz r4, 0x3ea(r31)
-/* 801E5088 001E1FC8  4B E4 F6 15 */	bl dSv_player_config_c_NS_setVibration
+/* 801E5088 001E1FC8  4B E4 F6 15 */	bl setVibration__19dSv_player_config_cFUc
 lbl_801E508C:
 /* 801E508C 001E1FCC  7F C3 F3 78 */	mr r3, r30
 /* 801E5090 001E1FD0  88 9F 03 E9 */	lbz r4, 0x3e9(r31)
-/* 801E5094 001E1FD4  4B E4 F5 F9 */	bl dSv_player_config_c_NS_setSound
+/* 801E5094 001E1FD4  4B E4 F5 F9 */	bl setSound__19dSv_player_config_cFUc
 /* 801E5098 001E1FD8  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 801E509C 001E1FDC  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801E50A0 001E1FE0  38 63 0F 38 */	addi r3, r3, 0xf38
@@ -3433,13 +3433,13 @@ lbl_801E50F0:
 /* 801E5108 001E2048  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801E510C 001E204C  3B C3 01 E0 */	addi r30, r3, 0x1e0
 /* 801E5110 001E2050  7F C3 F3 78 */	mr r3, r30
-/* 801E5114 001E2054  4B E4 F5 71 */	bl dSv_player_config_c_NS_getSound
+/* 801E5114 001E2054  4B E4 F5 71 */	bl getSound__19dSv_player_config_cFv
 /* 801E5118 001E2058  88 9F 03 E9 */	lbz r4, 0x3e9(r31)
 /* 801E511C 001E205C  54 60 06 3E */	clrlwi r0, r3, 0x18
 /* 801E5120 001E2060  7C 04 00 40 */	cmplw r4, r0
 /* 801E5124 001E2064  41 82 00 48 */	beq lbl_801E516C
 /* 801E5128 001E2068  7F C3 F3 78 */	mr r3, r30
-/* 801E512C 001E206C  4B E4 F5 59 */	bl dSv_player_config_c_NS_getSound
+/* 801E512C 001E206C  4B E4 F5 59 */	bl getSound__19dSv_player_config_cFv
 /* 801E5130 001E2070  98 7F 03 E9 */	stb r3, 0x3e9(r31)
 /* 801E5134 001E2074  80 6D 8D E8 */	lwz r3, lbl_80451368-_SDA_BASE_(r13)
 /* 801E5138 001E2078  88 1F 03 E9 */	lbz r0, 0x3e9(r31)
@@ -6813,7 +6813,7 @@ dMenu_Option_c_NS_initialize:
 /* 801E8248 001E5188  98 1F 03 EB */	stb r0, 0x3eb(r31)
 /* 801E824C 001E518C  98 1F 03 E6 */	stb r0, 0x3e6(r31)
 /* 801E8250 001E5190  98 1F 03 E7 */	stb r0, 0x3e7(r31)
-/* 801E8254 001E5194  4B E4 C4 31 */	bl dSv_player_config_c_NS_getSound
+/* 801E8254 001E5194  4B E4 C4 31 */	bl getSound__19dSv_player_config_cFv
 /* 801E8258 001E5198  98 7F 03 E9 */	stb r3, 0x3e9(r31)
 /* 801E825C 001E519C  7F E3 FB 78 */	mr r3, r31
 /* 801E8260 001E51A0  4B FF FE 41 */	bl dMenu_Option_c_NS_isRumbleSupported
diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s
index 9cd6793f95..3953854881 100644
--- a/asm/d/menu/dmap/d_menu_dmap_map.s
+++ b/asm/d/menu/dmap/d_menu_dmap_map.s
@@ -53,7 +53,7 @@ lbl_801C08CC:
 /* 801C0900 001BD840  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 801C0904 001BD844  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801C0908 001BD848  38 63 09 58 */	addi r3, r3, 0x958
-/* 801C090C 001BD84C  4B E7 3E DD */	bl dSv_memBit_c_NS_isTbox
+/* 801C090C 001BD84C  4B E7 3E DD */	bl isTbox__12dSv_memBit_cCFi
 /* 801C0910 001BD850  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0914 001BD854  40 82 02 10 */	bne lbl_801C0B24
 /* 801C0918 001BD858  3B E0 00 01 */	li r31, 1
@@ -64,7 +64,7 @@ lbl_801C08CC:
 /* 801C092C 001BD86C  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801C0930 001BD870  38 63 09 58 */	addi r3, r3, 0x958
 /* 801C0934 001BD874  88 9D 00 00 */	lbz r4, 0(r29)
-/* 801C0938 001BD878  4B E7 3E B1 */	bl dSv_memBit_c_NS_isTbox
+/* 801C0938 001BD878  4B E7 3E B1 */	bl isTbox__12dSv_memBit_cCFi
 /* 801C093C 001BD87C  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0940 001BD880  40 82 01 E4 */	bne lbl_801C0B24
 /* 801C0944 001BD884  3B E0 00 01 */	li r31, 1
@@ -82,7 +82,7 @@ lbl_801C08CC:
 /* 801C0974 001BD8B4  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 801C0978 001BD8B8  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801C097C 001BD8BC  38 63 09 58 */	addi r3, r3, 0x958
-/* 801C0980 001BD8C0  4B E7 3E 69 */	bl dSv_memBit_c_NS_isTbox
+/* 801C0980 001BD8C0  4B E7 3E 69 */	bl isTbox__12dSv_memBit_cCFi
 /* 801C0984 001BD8C4  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0988 001BD8C8  40 82 01 9C */	bne lbl_801C0B24
 lbl_801C098C:
@@ -134,7 +134,7 @@ lbl_801C09FC:
 /* 801C0A38 001BD978  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 801C0A3C 001BD97C  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801C0A40 001BD980  38 63 09 58 */	addi r3, r3, 0x958
-/* 801C0A44 001BD984  4B E7 3D A5 */	bl dSv_memBit_c_NS_isTbox
+/* 801C0A44 001BD984  4B E7 3D A5 */	bl isTbox__12dSv_memBit_cCFi
 /* 801C0A48 001BD988  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0A4C 001BD98C  40 82 00 D8 */	bne lbl_801C0B24
 lbl_801C0A50:
@@ -153,7 +153,7 @@ lbl_801C0A50:
 /* 801C0A80 001BD9C0  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 801C0A84 001BD9C4  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801C0A88 001BD9C8  38 63 09 58 */	addi r3, r3, 0x958
-/* 801C0A8C 001BD9CC  4B E7 3D 5D */	bl dSv_memBit_c_NS_isTbox
+/* 801C0A8C 001BD9CC  4B E7 3D 5D */	bl isTbox__12dSv_memBit_cCFi
 /* 801C0A90 001BD9D0  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0A94 001BD9D4  40 82 00 90 */	bne lbl_801C0B24
 lbl_801C0A98:
@@ -168,7 +168,7 @@ lbl_801C0A98:
 /* 801C0AB8 001BD9F8  3C 60 80 40 */	lis r3, lbl_804061C0@ha
 /* 801C0ABC 001BD9FC  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 801C0AC0 001BDA00  38 63 09 58 */	addi r3, r3, 0x958
-/* 801C0AC4 001BDA04  4B E7 3D 25 */	bl dSv_memBit_c_NS_isTbox
+/* 801C0AC4 001BDA04  4B E7 3D 25 */	bl isTbox__12dSv_memBit_cCFi
 /* 801C0AC8 001BDA08  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0ACC 001BDA0C  41 82 00 58 */	beq lbl_801C0B24
 lbl_801C0AD0:
@@ -189,7 +189,7 @@ lbl_801C0AD0:
 /* 801C0B08 001BDA48  41 82 00 18 */	beq lbl_801C0B20
 /* 801C0B0C 001BDA4C  41 82 00 18 */	beq lbl_801C0B24
 /* 801C0B10 001BDA50  7F C3 F3 78 */	mr r3, r30
-/* 801C0B14 001BDA54  4B E7 3C D5 */	bl dSv_memBit_c_NS_isTbox
+/* 801C0B14 001BDA54  4B E7 3C D5 */	bl isTbox__12dSv_memBit_cCFi
 /* 801C0B18 001BDA58  2C 03 00 00 */	cmpwi r3, 0
 /* 801C0B1C 001BDA5C  40 82 00 08 */	bne lbl_801C0B24
 lbl_801C0B20:
diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s
index 2c0e2555d4..f9c13670a9 100644
--- a/asm/d/msg/d_msg_flow.s
+++ b/asm/d/msg/d_msg_flow.s
@@ -1614,7 +1614,7 @@ lbl_8024B3E8:
 /* 8024B55C 0024849C  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
 /* 8024B560 002484A0  38 63 09 58 */	addi r3, r3, 0x958
 /* 8024B564 002484A4  A0 84 00 04 */	lhz r4, 4(r4)
-/* 8024B568 002484A8  4B DE 92 81 */	bl dSv_memBit_c_NS_isTbox
+/* 8024B568 002484A8  4B DE 92 81 */	bl isTbox__12dSv_memBit_cCFi
 /* 8024B56C 002484AC  7C 60 00 34 */	cntlzw r0, r3
 /* 8024B570 002484B0  54 03 DE 3E */	rlwinm r3, r0, 0x1b, 0x18, 0x1f
 /* 8024B574 002484B4  80 01 00 14 */	lwz r0, 0x14(r1)
diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s
index b01457f9f3..0f01525f37 100644
--- a/asm/d/save/d_save_HIO.s
+++ b/asm/d/save/d_save_HIO.s
@@ -351,7 +351,7 @@ dSvBit_childTbPerfectionHIO_c_NS_init:
 lbl_8025BFC4:
 /* 8025BFC4 00258F04  7F E3 FB 78 */	mr r3, r31
 /* 8025BFC8 00258F08  7F C4 F3 78 */	mr r4, r30
-/* 8025BFCC 00258F0C  4B DD 88 1D */	bl dSv_memBit_c_NS_isTbox
+/* 8025BFCC 00258F0C  4B DD 88 1D */	bl isTbox__12dSv_memBit_cCFi
 /* 8025BFD0 00258F10  7C 9D F2 14 */	add r4, r29, r30
 /* 8025BFD4 00258F14  98 64 00 05 */	stb r3, 5(r4)
 /* 8025BFD8 00258F18  88 04 00 05 */	lbz r0, 5(r4)
diff --git a/include/d_save.h b/include/d_save.h
index 06640653eb..2b15ad9032 100644
--- a/include/d_save.h
+++ b/include/d_save.h
@@ -259,6 +259,7 @@ class dSv_player_get_item_c {
 
    private:
     u32 pause_menu_bit_fields[4];
+    u8 ok[16];
 };
 
 class dSv_player_item_record_c {
@@ -305,6 +306,7 @@ class dSv_player_collect_c {
     u8 mirror;
     u8 unk11;
     u8 poe_count;
+    u8 padding[3];
 };
 
 class dSv_player_wolf_c {
@@ -425,7 +427,7 @@ class dSv_player_c {
 class dSv_memBit_c {
    public:
     void init(void);
-    void onTBox(int);   // merged with init in the assembly
+    void onTbox(int);   // merged with init in the assembly
     void offTbox(int);  // merged with init in the assembly
     bool isTbox(int) const;
     void onSwitch(int);
diff --git a/include/func_80034644.s b/include/func_80034644.s
new file mode 100644
index 0000000000..2565eaaa8b
--- /dev/null
+++ b/include/func_80034644.s
@@ -0,0 +1,18 @@
+/* 80034644 00031584  94 21 FF F0 */	stwu r1, -0x10(r1)
+/* 80034648 00031588  7C 08 02 A6 */	mflr r0
+/* 8003464C 0003158C  90 01 00 14 */	stw r0, 0x14(r1)
+/* 80034650 00031590  80 0D 8F 60 */	lwz r0, lbl_804514E0-_SDA_BASE_(r13)
+/* 80034654 00031594  54 00 00 01 */	rlwinm. r0, r0, 0, 0, 0
+/* 80034658 00031598  41 82 00 18 */	beq lbl_80034670
+/* 8003465C 0003159C  3C 60 80 40 */	lis r3, lbl_804061C0@ha
+/* 80034660 000315A0  38 63 61 C0 */	addi r3, r3, lbl_804061C0@l
+/* 80034664 000315A4  38 63 0F 38 */	addi r3, r3, 0xf38
+/* 80034668 000315A8  4B FF 6D 49 */	bl dComIfG_play_c_NS_getNowVibration
+/* 8003466C 000315AC  48 00 00 08 */	b lbl_80034674
+lbl_80034670:
+/* 80034670 000315B0  38 60 00 00 */	li r3, 0
+lbl_80034674:
+/* 80034674 000315B4  80 01 00 14 */	lwz r0, 0x14(r1)
+/* 80034678 000315B8  7C 08 03 A6 */	mtlr r0
+/* 8003467C 000315BC  38 21 00 10 */	addi r1, r1, 0x10
+/* 80034680 000315C0  4E 80 00 20 */	blr 
\ No newline at end of file
diff --git a/include/func_800347A0.s b/include/func_800347A0.s
new file mode 100644
index 0000000000..c44ec6966e
--- /dev/null
+++ b/include/func_800347A0.s
@@ -0,0 +1,9 @@
+/* 800347A0 000316E0  7C 80 2E 70 */	srawi r0, r4, 5
+/* 800347A4 000316E4  54 07 10 3A */	slwi r7, r0, 2
+/* 800347A8 000316E8  7C C3 38 2E */	lwzx r6, r3, r7
+/* 800347AC 000316EC  38 A0 00 01 */	li r5, 1
+/* 800347B0 000316F0  54 80 06 FE */	clrlwi r0, r4, 0x1b
+/* 800347B4 000316F4  7C A0 00 30 */	slw r0, r5, r0
+/* 800347B8 000316F8  7C C0 03 78 */	or r0, r6, r0
+/* 800347BC 000316FC  7C 03 39 2E */	stwx r0, r3, r7
+/* 800347C0 00031700  4E 80 00 20 */	blr
\ No newline at end of file
diff --git a/include/func_800347C4.s b/include/func_800347C4.s
new file mode 100644
index 0000000000..91e15bb995
--- /dev/null
+++ b/include/func_800347C4.s
@@ -0,0 +1,9 @@
+/* 800347C4 00031704  7C 80 2E 70 */	srawi r0, r4, 5
+/* 800347C8 00031708  54 07 10 3A */	slwi r7, r0, 2
+/* 800347CC 0003170C  7C C3 38 2E */	lwzx r6, r3, r7
+/* 800347D0 00031710  38 A0 00 01 */	li r5, 1
+/* 800347D4 00031714  54 80 06 FE */	clrlwi r0, r4, 0x1b
+/* 800347D8 00031718  7C A0 00 30 */	slw r0, r5, r0
+/* 800347DC 0003171C  7C C0 00 78 */	andc r0, r6, r0
+/* 800347E0 00031720  7C 03 39 2E */	stwx r0, r3, r7
+/* 800347E4 00031724  4E 80 00 20 */	blr
\ No newline at end of file
diff --git a/include/func_800347E8.s b/include/func_800347E8.s
new file mode 100644
index 0000000000..adb6fc2588
--- /dev/null
+++ b/include/func_800347E8.s
@@ -0,0 +1,10 @@
+/* 800347E8 00031728  38 A0 00 01 */	li r5, 1
+/* 800347EC 0003172C  54 80 06 FE */	clrlwi r0, r4, 0x1b
+/* 800347F0 00031730  7C A5 00 30 */	slw r5, r5, r0
+/* 800347F4 00031734  7C 80 2E 70 */	srawi r0, r4, 5
+/* 800347F8 00031738  54 00 10 3A */	slwi r0, r0, 2
+/* 800347FC 0003173C  7C 03 00 2E */	lwzx r0, r3, r0
+/* 80034800 00031740  7C A3 00 38 */	and r3, r5, r0
+/* 80034804 00031744  30 03 FF FF */	addic r0, r3, -1
+/* 80034808 00031748  7C 60 19 10 */	subfe r3, r0, r3
+/* 8003480C 0003174C  4E 80 00 20 */	blr 
\ No newline at end of file
diff --git a/include/functions.h b/include/functions.h
index f2ef283cad..dc7b9055f7 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -38,4 +38,5 @@ extern "C" {
     void dMeter2Info_c_NS_getString(void);
     u32 OSGetSoundMode(void);
     void Z2AudioMgr_NS_setOutputMode(u32,unsigned long);    
+    void dComIfG_play_c_NS_getNowVibration(void);
 }
\ No newline at end of file
diff --git a/include/variables.h b/include/variables.h
index a22071e50e..1df11f9e12 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -6,4 +6,6 @@ extern u8 lbl_803A7270[24];
 extern u8 lbl_80430188[16];
 extern u8 lbl_803A7288;
 extern u32 lbl_80451368;
+extern u32 lbl_804514E0;
+#define _SDA_BASE_(dummy) 0
 #define _SDA2_BASE_(dummy) 0
\ No newline at end of file
diff --git a/ldscript.lcf b/ldscript.lcf
index 86ce690bfa..ea502bc247 100644
--- a/ldscript.lcf
+++ b/ldscript.lcf
@@ -29,6 +29,8 @@ FORCEACTIVE {
  set__17dSv_horse_place_cFPCcRC4cXyzsSc
  setLightDropNum__16dSv_light_drop_cFUcUc
  addFishCount__18dSv_fishing_info_cFUc
+ onTbox__12dSv_memBit_cFi
+ offTbox__12dSv_memBit_cFi
 }
 /*
 .init 80003100 - 80005600
diff --git a/libs/SComponent/c_API.cpp b/libs/SSystem/SComponent/c_API.cpp
similarity index 100%
rename from libs/SComponent/c_API.cpp
rename to libs/SSystem/SComponent/c_API.cpp
diff --git a/libs/SComponent/c_API_controller_pad.cpp b/libs/SSystem/SComponent/c_API_controller_pad.cpp
similarity index 100%
rename from libs/SComponent/c_API_controller_pad.cpp
rename to libs/SSystem/SComponent/c_API_controller_pad.cpp
diff --git a/libs/SComponent/c_API_graphic.cpp b/libs/SSystem/SComponent/c_API_graphic.cpp
similarity index 100%
rename from libs/SComponent/c_API_graphic.cpp
rename to libs/SSystem/SComponent/c_API_graphic.cpp
diff --git a/libs/SComponent/c_angle.cpp b/libs/SSystem/SComponent/c_angle.cpp
similarity index 100%
rename from libs/SComponent/c_angle.cpp
rename to libs/SSystem/SComponent/c_angle.cpp
diff --git a/libs/SComponent/c_bg_s_chk.cpp b/libs/SSystem/SComponent/c_bg_s_chk.cpp
similarity index 100%
rename from libs/SComponent/c_bg_s_chk.cpp
rename to libs/SSystem/SComponent/c_bg_s_chk.cpp
diff --git a/libs/SComponent/c_bg_s_gnd_chk.cpp b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp
similarity index 100%
rename from libs/SComponent/c_bg_s_gnd_chk.cpp
rename to libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp
diff --git a/libs/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp
similarity index 100%
rename from libs/SComponent/c_bg_s_lin_chk.cpp
rename to libs/SSystem/SComponent/c_bg_s_lin_chk.cpp
diff --git a/libs/SComponent/c_bg_s_poly_info.cpp b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp
similarity index 100%
rename from libs/SComponent/c_bg_s_poly_info.cpp
rename to libs/SSystem/SComponent/c_bg_s_poly_info.cpp
diff --git a/libs/SComponent/c_bg_s_shdw_draw.cpp b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp
similarity index 100%
rename from libs/SComponent/c_bg_s_shdw_draw.cpp
rename to libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp
diff --git a/libs/SComponent/c_bg_w.cpp b/libs/SSystem/SComponent/c_bg_w.cpp
similarity index 100%
rename from libs/SComponent/c_bg_w.cpp
rename to libs/SSystem/SComponent/c_bg_w.cpp
diff --git a/libs/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp
similarity index 100%
rename from libs/SComponent/c_cc_d.cpp
rename to libs/SSystem/SComponent/c_cc_d.cpp
diff --git a/libs/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp
similarity index 100%
rename from libs/SComponent/c_cc_s.cpp
rename to libs/SSystem/SComponent/c_cc_s.cpp
diff --git a/libs/SComponent/c_counter.cpp b/libs/SSystem/SComponent/c_counter.cpp
similarity index 100%
rename from libs/SComponent/c_counter.cpp
rename to libs/SSystem/SComponent/c_counter.cpp
diff --git a/libs/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp
similarity index 100%
rename from libs/SComponent/c_lib.cpp
rename to libs/SSystem/SComponent/c_lib.cpp
diff --git a/libs/SComponent/c_list.cpp b/libs/SSystem/SComponent/c_list.cpp
similarity index 100%
rename from libs/SComponent/c_list.cpp
rename to libs/SSystem/SComponent/c_list.cpp
diff --git a/libs/SComponent/c_list_iter.cpp b/libs/SSystem/SComponent/c_list_iter.cpp
similarity index 100%
rename from libs/SComponent/c_list_iter.cpp
rename to libs/SSystem/SComponent/c_list_iter.cpp
diff --git a/libs/SComponent/c_m2d.cpp b/libs/SSystem/SComponent/c_m2d.cpp
similarity index 100%
rename from libs/SComponent/c_m2d.cpp
rename to libs/SSystem/SComponent/c_m2d.cpp
diff --git a/libs/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp
similarity index 100%
rename from libs/SComponent/c_m3d.cpp
rename to libs/SSystem/SComponent/c_m3d.cpp
diff --git a/libs/SComponent/c_m3d_g_aab.cpp b/libs/SSystem/SComponent/c_m3d_g_aab.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_aab.cpp
rename to libs/SSystem/SComponent/c_m3d_g_aab.cpp
diff --git a/libs/SComponent/c_m3d_g_cir.cpp b/libs/SSystem/SComponent/c_m3d_g_cir.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_cir.cpp
rename to libs/SSystem/SComponent/c_m3d_g_cir.cpp
diff --git a/libs/SComponent/c_m3d_g_cps.cpp b/libs/SSystem/SComponent/c_m3d_g_cps.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_cps.cpp
rename to libs/SSystem/SComponent/c_m3d_g_cps.cpp
diff --git a/libs/SComponent/c_m3d_g_cyl.cpp b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_cyl.cpp
rename to libs/SSystem/SComponent/c_m3d_g_cyl.cpp
diff --git a/libs/SComponent/c_m3d_g_lin.cpp b/libs/SSystem/SComponent/c_m3d_g_lin.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_lin.cpp
rename to libs/SSystem/SComponent/c_m3d_g_lin.cpp
diff --git a/libs/SComponent/c_m3d_g_pla.cpp b/libs/SSystem/SComponent/c_m3d_g_pla.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_pla.cpp
rename to libs/SSystem/SComponent/c_m3d_g_pla.cpp
diff --git a/libs/SComponent/c_m3d_g_sph.cpp b/libs/SSystem/SComponent/c_m3d_g_sph.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_sph.cpp
rename to libs/SSystem/SComponent/c_m3d_g_sph.cpp
diff --git a/libs/SComponent/c_m3d_g_tri.cpp b/libs/SSystem/SComponent/c_m3d_g_tri.cpp
similarity index 100%
rename from libs/SComponent/c_m3d_g_tri.cpp
rename to libs/SSystem/SComponent/c_m3d_g_tri.cpp
diff --git a/libs/SComponent/c_malloc.cpp b/libs/SSystem/SComponent/c_malloc.cpp
similarity index 100%
rename from libs/SComponent/c_malloc.cpp
rename to libs/SSystem/SComponent/c_malloc.cpp
diff --git a/libs/SComponent/c_math.cpp b/libs/SSystem/SComponent/c_math.cpp
similarity index 100%
rename from libs/SComponent/c_math.cpp
rename to libs/SSystem/SComponent/c_math.cpp
diff --git a/libs/SComponent/c_node.cpp b/libs/SSystem/SComponent/c_node.cpp
similarity index 100%
rename from libs/SComponent/c_node.cpp
rename to libs/SSystem/SComponent/c_node.cpp
diff --git a/libs/SComponent/c_node_iter.cpp b/libs/SSystem/SComponent/c_node_iter.cpp
similarity index 100%
rename from libs/SComponent/c_node_iter.cpp
rename to libs/SSystem/SComponent/c_node_iter.cpp
diff --git a/libs/SComponent/c_phase.cpp b/libs/SSystem/SComponent/c_phase.cpp
similarity index 100%
rename from libs/SComponent/c_phase.cpp
rename to libs/SSystem/SComponent/c_phase.cpp
diff --git a/libs/SComponent/c_request.cpp b/libs/SSystem/SComponent/c_request.cpp
similarity index 100%
rename from libs/SComponent/c_request.cpp
rename to libs/SSystem/SComponent/c_request.cpp
diff --git a/libs/SComponent/c_sxyz.cpp b/libs/SSystem/SComponent/c_sxyz.cpp
similarity index 100%
rename from libs/SComponent/c_sxyz.cpp
rename to libs/SSystem/SComponent/c_sxyz.cpp
diff --git a/libs/SComponent/c_tag.cpp b/libs/SSystem/SComponent/c_tag.cpp
similarity index 100%
rename from libs/SComponent/c_tag.cpp
rename to libs/SSystem/SComponent/c_tag.cpp
diff --git a/libs/SComponent/c_tag_iter.cpp b/libs/SSystem/SComponent/c_tag_iter.cpp
similarity index 100%
rename from libs/SComponent/c_tag_iter.cpp
rename to libs/SSystem/SComponent/c_tag_iter.cpp
diff --git a/libs/SComponent/c_tree.cpp b/libs/SSystem/SComponent/c_tree.cpp
similarity index 100%
rename from libs/SComponent/c_tree.cpp
rename to libs/SSystem/SComponent/c_tree.cpp
diff --git a/libs/SComponent/c_tree_iter.cpp b/libs/SSystem/SComponent/c_tree_iter.cpp
similarity index 100%
rename from libs/SComponent/c_tree_iter.cpp
rename to libs/SSystem/SComponent/c_tree_iter.cpp
diff --git a/libs/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp
similarity index 100%
rename from libs/SComponent/c_xyz.cpp
rename to libs/SSystem/SComponent/c_xyz.cpp
diff --git a/libs/SStandard/s_basic.cpp b/libs/SSystem/SStandard/s_basic.cpp
similarity index 100%
rename from libs/SStandard/s_basic.cpp
rename to libs/SSystem/SStandard/s_basic.cpp
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 75a9b2b34e..8d2eff4902 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -899,3 +899,88 @@ void dSv_player_config_c::init(void) {
     this->unk10 = 0;
     this->unk11 = 1;
 }
+
+// a few instructions off
+#ifdef NONMATCHING
+u32 dSv_player_config_c::checkVibration(void) const {
+   return _sRumbleSupported & 0x80000000 ? getNowVibration() : 0;
+}
+#else
+asm u32 dSv_player_config_c::checkVibration(void) const {
+    nofralloc
+    #include "func_80034644.s"
+}
+#endif
+
+u8 dSv_player_config_c::getSound(void) {
+    return this->sound_mode;
+}
+
+void dSv_player_config_c::setSound(u8 i_sound_mode) {
+    this->sound_mode = i_sound_mode;
+}
+
+u8 dSv_player_config_c::getVibration(void) {
+    return this->vibration_status;
+}
+
+void dSv_player_config_c::setVibration(u8 i_vibration_status) {
+    this->vibration_status = i_vibration_status;
+}
+
+void dSv_player_c::init(void) {
+    player_status_a.init();
+    player_status_b.init();
+    horse_place.init();
+    player_return.init();
+    player_last_field.init();
+    player_last_mark.init();
+    player_item.init();
+    player_get_item.init();
+    player_item_record.init();
+    player_item_max.init();
+    player_collect.init();
+    player_wolf.init();
+    light_drop.init();
+    letter_info.init();
+    fishing_info.init();
+    player_info.init();
+    player_config.init();
+}
+
+void dSv_memBit_c::init(void) {
+    for (int i = 0; i < 2; i++) {
+        this->area_flags_bitfields1[i] = 0;
+    }
+
+    for (int i = 0; i < 4; i++) {
+        this->area_flags_bitfields2[i] = 0;
+    }
+
+    this->rupee_flags_bitfields = 0;
+    this->small_key_flags = 0;
+    this->dungeons_flags = 0;
+}
+
+
+asm void dSv_memBit_c::onTbox(int) {
+    nofralloc
+    #include "func_800347A0.s"
+}
+
+asm void dSv_memBit_c::offTbox(int) {
+    nofralloc
+    #include "func_800347C4.s"
+}
+
+// 1 instruction off
+#ifdef NONMATCHING
+bool dSv_memBit_c::isTbox(int param_1) const {
+     return 1 << (param_1 & 0x1f) & this->area_flags_bitfields1[param_1 >> 0x5];
+}
+#else
+asm bool dSv_memBit_c::isTbox(int param_1) const {
+    nofralloc
+    #include "func_800347E8.s"
+}
+#endif
\ No newline at end of file