swap in memcpy for func_80003540, correct some minor issues in dvd.h and JKRDVDFile.h

This commit is contained in:
Pheenoh
2021-01-03 21:08:33 -05:00
parent da3a142828
commit 6f22d27503
61 changed files with 221 additions and 189 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
/* 80071290 0006E1D0 38 84 03 38 */ addi r4, r4, 0x338
/* 80071294 0006E1D4 7C 9F 22 14 */ add r4, r31, r4
/* 80071298 0006E1D8 38 A0 00 14 */ li r5, 0x14
/* 8007129C 0006E1DC 4B F9 22 A5 */ bl func_80003540
/* 8007129C 0006E1DC 4B F9 22 A5 */ bl memcpy
/* 800712A0 0006E1E0 C0 02 8C 50 */ lfs f0, lbl_80452650-_SDA2_BASE_(r2)
/* 800712A4 0006E1E4 D0 1F 03 38 */ stfs f0, 0x338(r31)
lbl_800712A8:
+9 -9
View File
@@ -30,15 +30,15 @@ lbl_80071710:
/* 80071724 0006E664 38 61 00 08 */ addi r3, r1, 8
/* 80071728 0006E668 7F 44 D3 78 */ mr r4, r26
/* 8007172C 0006E66C 38 A0 00 14 */ li r5, 0x14
/* 80071730 0006E670 4B F9 1E 11 */ bl func_80003540
/* 80071730 0006E670 4B F9 1E 11 */ bl memcpy
/* 80071734 0006E674 7F 43 D3 78 */ mr r3, r26
/* 80071738 0006E678 7F 64 DB 78 */ mr r4, r27
/* 8007173C 0006E67C 38 A0 00 14 */ li r5, 0x14
/* 80071740 0006E680 4B F9 1E 01 */ bl func_80003540
/* 80071740 0006E680 4B F9 1E 01 */ bl memcpy
/* 80071744 0006E684 7F 63 DB 78 */ mr r3, r27
/* 80071748 0006E688 38 81 00 08 */ addi r4, r1, 8
/* 8007174C 0006E68C 38 A0 00 14 */ li r5, 0x14
/* 80071750 0006E690 4B F9 1D F1 */ bl func_80003540
/* 80071750 0006E690 4B F9 1D F1 */ bl memcpy
lbl_80071754:
/* 80071754 0006E694 3A F7 00 01 */ addi r23, r23, 1
/* 80071758 0006E698 3B DE 00 14 */ addi r30, r30, 0x14
@@ -71,15 +71,15 @@ lbl_8007179C:
/* 800717B0 0006E6F0 38 61 00 08 */ addi r3, r1, 8
/* 800717B4 0006E6F4 7F 44 D3 78 */ mr r4, r26
/* 800717B8 0006E6F8 38 A0 00 14 */ li r5, 0x14
/* 800717BC 0006E6FC 4B F9 1D 85 */ bl func_80003540
/* 800717BC 0006E6FC 4B F9 1D 85 */ bl memcpy
/* 800717C0 0006E700 7F 43 D3 78 */ mr r3, r26
/* 800717C4 0006E704 7F 64 DB 78 */ mr r4, r27
/* 800717C8 0006E708 38 A0 00 14 */ li r5, 0x14
/* 800717CC 0006E70C 4B F9 1D 75 */ bl func_80003540
/* 800717CC 0006E70C 4B F9 1D 75 */ bl memcpy
/* 800717D0 0006E710 7F 63 DB 78 */ mr r3, r27
/* 800717D4 0006E714 38 81 00 08 */ addi r4, r1, 8
/* 800717D8 0006E718 38 A0 00 14 */ li r5, 0x14
/* 800717DC 0006E71C 4B F9 1D 65 */ bl func_80003540
/* 800717DC 0006E71C 4B F9 1D 65 */ bl memcpy
lbl_800717E0:
/* 800717E0 0006E720 3A D6 00 01 */ addi r22, r22, 1
/* 800717E4 0006E724 3B BD 00 14 */ addi r29, r29, 0x14
@@ -111,15 +111,15 @@ lbl_80071828:
/* 8007183C 0006E77C 38 61 00 08 */ addi r3, r1, 8
/* 80071840 0006E780 7F 44 D3 78 */ mr r4, r26
/* 80071844 0006E784 38 A0 00 14 */ li r5, 0x14
/* 80071848 0006E788 4B F9 1C F9 */ bl func_80003540
/* 80071848 0006E788 4B F9 1C F9 */ bl memcpy
/* 8007184C 0006E78C 7F 43 D3 78 */ mr r3, r26
/* 80071850 0006E790 7F 64 DB 78 */ mr r4, r27
/* 80071854 0006E794 38 A0 00 14 */ li r5, 0x14
/* 80071858 0006E798 4B F9 1C E9 */ bl func_80003540
/* 80071858 0006E798 4B F9 1C E9 */ bl memcpy
/* 8007185C 0006E79C 7F 63 DB 78 */ mr r3, r27
/* 80071860 0006E7A0 38 81 00 08 */ addi r4, r1, 8
/* 80071864 0006E7A4 38 A0 00 14 */ li r5, 0x14
/* 80071868 0006E7A8 4B F9 1C D9 */ bl func_80003540
/* 80071868 0006E7A8 4B F9 1C D9 */ bl memcpy
lbl_8007186C:
/* 8007186C 0006E7AC 3A F7 00 01 */ addi r23, r23, 1
/* 80071870 0006E7B0 3B DE 00 14 */ addi r30, r30, 0x14
+1 -1
View File
@@ -528,7 +528,7 @@ lbl_801A4BBC:
/* 801A4BE0 001A1B20 38 63 00 18 */ addi r3, r3, 0x18
/* 801A4BE4 001A1B24 38 84 10 AC */ addi r4, r4, 0x10ac
/* 801A4BE8 001A1B28 38 A0 00 14 */ li r5, 0x14
/* 801A4BEC 001A1B2C 4B E5 E9 55 */ bl func_80003540
/* 801A4BEC 001A1B2C 4B E5 E9 55 */ bl memcpy
lbl_801A4BF0:
/* 801A4BF0 001A1B30 39 61 00 90 */ addi r11, r1, 0x90
/* 801A4BF4 001A1B34 48 1B D6 19 */ bl _restgpr_22
+1 -1
View File
@@ -13,7 +13,7 @@
/* 801A7A70 001A49B0 38 63 07 64 */ addi r3, r3, 0x764
/* 801A7A74 001A49B4 7C A4 2B 78 */ mr r4, r5
/* 801A7A78 001A49B8 38 A0 00 20 */ li r5, 0x20
/* 801A7A7C 001A49BC 4B E5 BA C5 */ bl func_80003540
/* 801A7A7C 001A49BC 4B E5 BA C5 */ bl memcpy
/* 801A7A80 001A49C0 38 9E 00 01 */ addi r4, r30, 1
/* 801A7A84 001A49C4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha
/* 801A7A88 001A49C8 38 03 CA 54 */ addi r0, r3, lbl_8042CA54@l
@@ -50,7 +50,7 @@ lbl_8021C2DC:
/* 8021C30C 0021924C 7F E3 FB 78 */ mr r3, r31
/* 8021C310 00219250 38 9B 00 10 */ addi r4, r27, 0x10
/* 8021C314 00219254 38 A0 00 14 */ li r5, 0x14
/* 8021C318 00219258 4B DE 72 29 */ bl func_80003540
/* 8021C318 00219258 4B DE 72 29 */ bl memcpy
/* 8021C31C 0021925C 48 00 00 3C */ b lbl_8021C358
lbl_8021C320:
/* 8021C320 00219260 38 C6 00 01 */ addi r6, r6, 1
@@ -103,7 +103,7 @@ lbl_8021C4D8:
/* 8021C4E0 00219420 7F E3 FB 78 */ mr r3, r31
/* 8021C4E4 00219424 38 85 00 10 */ addi r4, r5, 0x10
/* 8021C4E8 00219428 38 A0 00 14 */ li r5, 0x14
/* 8021C4EC 0021942C 4B DE 70 55 */ bl func_80003540
/* 8021C4EC 0021942C 4B DE 70 55 */ bl memcpy
/* 8021C4F0 00219430 48 00 00 3C */ b lbl_8021C52C
lbl_8021C4F4:
/* 8021C4F4 00219434 38 E7 00 01 */ addi r7, r7, 1
@@ -70,7 +70,7 @@ lbl_8021C638:
/* 8021C640 00219580 7F E3 FB 78 */ mr r3, r31
/* 8021C644 00219584 38 84 00 10 */ addi r4, r4, 0x10
/* 8021C648 00219588 38 A0 00 14 */ li r5, 0x14
/* 8021C64C 0021958C 4B DE 6E F5 */ bl func_80003540
/* 8021C64C 0021958C 4B DE 6E F5 */ bl memcpy
/* 8021C650 00219590 48 00 00 3C */ b lbl_8021C68C
lbl_8021C654:
/* 8021C654 00219594 38 E7 00 01 */ addi r7, r7, 1
+1 -1
View File
@@ -107,7 +107,7 @@ lbl_80035928:
/* 80035934 00032874 7F 83 E3 78 */ mr r3, r28
/* 80035938 00032878 7F 04 C3 78 */ mr r4, r24
/* 8003593C 0003287C 38 A0 09 58 */ li r5, 0x958
/* 80035940 00032880 4B FC DC 01 */ bl func_80003540
/* 80035940 00032880 4B FC DC 01 */ bl memcpy
/* 80035944 00032884 3C 60 80 38 */ lis r3, lbl_80379234@ha
/* 80035948 00032888 38 63 92 34 */ addi r3, r3, lbl_80379234@l
/* 8003594C 0003288C 38 63 00 29 */ addi r3, r3, 0x29
+1 -1
View File
@@ -8,7 +8,7 @@
/* 80035A20 00032960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80035A24 00032964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80035A28 00032968 38 A0 09 58 */ li r5, 0x958
/* 80035A2C 0003296C 4B FC DB 15 */ bl func_80003540
/* 80035A2C 0003296C 4B FC DB 15 */ bl memcpy
/* 80035A30 00032970 48 30 AB 61 */ bl OSGetSoundMode
/* 80035A34 00032974 28 03 00 00 */ cmplwi r3, 0
/* 80035A38 00032978 40 82 00 28 */ bne lbl_80035A60
+1 -1
View File
@@ -31,7 +31,7 @@
/* 80035C48 00032B88 7F E3 FB 78 */ mr r3, r31
/* 80035C4C 00032B8C 38 81 00 08 */ addi r4, r1, 8
/* 80035C50 00032B90 38 A0 09 58 */ li r5, 0x958
/* 80035C54 00032B94 4B FC D8 ED */ bl func_80003540
/* 80035C54 00032B94 4B FC D8 ED */ bl memcpy
/* 80035C58 00032B98 3C 60 80 38 */ lis r3, lbl_80379234@ha
/* 80035C5C 00032B9C 38 63 92 34 */ addi r3, r3, lbl_80379234@l
/* 80035C60 00032BA0 38 63 00 54 */ addi r3, r3, 0x54
@@ -1,5 +1,5 @@
/* 8025BB78 00258AB8 3C 80 80 3C */ lis r4, lbl_803C3384@ha
/* 8025BB7C 00258ABC 38 04 33 84 */ addi r0, r4, lbl_803C3384@l
/* 8025BB78 00258AB8 3C 80 80 3C */ lis r4, HeapCheckTable@ha
/* 8025BB7C 00258ABC 38 04 33 84 */ addi r0, r4, HeapCheckTable@l
/* 8025BB80 00258AC0 90 03 00 00 */ stw r0, 0(r3)
/* 8025BB84 00258AC4 38 C0 00 00 */ li r6, 0
/* 8025BB88 00258AC8 38 80 00 00 */ li r4, 0
+1
View File
@@ -2,6 +2,7 @@
#define D_SAVE_HIO_H_
#include "dolphin/types.h"
#include "m_Do/m_Do_main/m_Do_main.h"
struct dSvBit_childSwPerfectionHIO_c_vtable {
u32* unk0;