summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax <mparisi@stevens.edu>2020-10-31 16:15:40 -0400
committerMax <mparisi@stevens.edu>2020-10-31 16:15:40 -0400
commit4ff4ced455e64e40df59298370b32f7e8edb5bdc (patch)
treea9da78874351f2e81f6f4542f1eac0d2014529cc
parent4f344c838552548347e714f5ed1cc495b44543f2 (diff)
match func_801DD294
-rw-r--r--asm/sdata_2.s2
-rw-r--r--src/code_801DCE6C.cpp17
2 files changed, 11 insertions, 8 deletions
diff --git a/asm/sdata_2.s b/asm/sdata_2.s
index 364445c..cc4ce9a 100644
--- a/asm/sdata_2.s
+++ b/asm/sdata_2.s
@@ -4,7 +4,7 @@
.global lbl_8063D6FE
lbl_8063D6FE:
- .incbin "baserom.dol", 0x471438, 0x6A
+ .incbin "baserom.dol", 0x47143E, 0x6A
.global lbl_8063D768
lbl_8063D768:
.incbin "baserom.dol", 0x4714A8, 0x38
diff --git a/src/code_801DCE6C.cpp b/src/code_801DCE6C.cpp
index 8096355..c283181 100644
--- a/src/code_801DCE6C.cpp
+++ b/src/code_801DCE6C.cpp
@@ -144,15 +144,18 @@ BOOL func_801DD220(gUnkClass4*, gUnkClass5* fp, void*, u32, s32 offset)
#ifdef NONMATCHING
BOOL func_801DD294(gUnkClass4 *p1, const char *fileName, s32)
{
- gUnkClass6 *r29;
- size_t fileSz;
+ // intended register -> actual register
+ // p1: r24 -> r25
+ // fileName: r25 -> r24
+ gUnkClass6 *r29;
+ //size_t fileSz; // r24 -> r28
NANDFileInfo nandInfo;
- gUnkClass5 *fp;
+ gUnkClass5 *fp; // r28 -> r27
size_t i;
- void *buffer;
- BOOL flag;
+ void *buffer; // r27 -> r26
+ BOOL flag; // r26 -> r25
s32 createResult;
- size_t currOffset;
+ size_t currOffset; // r25 -> r24
size_t maxLength;
size_t length;
s32 readResult;
@@ -180,7 +183,7 @@ BOOL func_801DD294(gUnkClass4 *p1, const char *fileName, s32)
return FALSE;
- fileSz = (func_801DC760(fp) + 0x1F) & (~0x1F);
+ size_t fileSz = (func_801DC760(fp) + 0x1F) & (~0x1F);
if (0 == fileSz)
return FALSE;