diff options
| author | Max <mparisi@stevens.edu> | 2020-10-31 11:31:27 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-10-31 11:31:27 -0400 |
| commit | b65c4ed97a77f5f8e690051cf36abb61427cfcc7 (patch) | |
| tree | 262297e53ff588a66410ef64110b29da8378c907 | |
| parent | 6fcf5988b136a20f15d29424547adb6c35d8735d (diff) | |
match loop body in func_801DD294
| -rw-r--r-- | asm/sdata_2.s | 6 | ||||
| -rw-r--r-- | src/code_801DCE6C.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/asm/sdata_2.s b/asm/sdata_2.s index fd701fb..364445c 100644 --- a/asm/sdata_2.s +++ b/asm/sdata_2.s @@ -2,9 +2,9 @@ .section .sdata, "wa" # 0x8063D2C0 - 0x8063E8E0
-.global lbl_8063D6F8
-lbl_8063D6F8:
- .incbin "baserom.dol", 0x471438, 0x70
+.global lbl_8063D6FE
+lbl_8063D6FE:
+ .incbin "baserom.dol", 0x471438, 0x6A
.global lbl_8063D768
lbl_8063D768:
.incbin "baserom.dol", 0x4714A8, 0x38
diff --git a/src/code_801DCE6C.cpp b/src/code_801DCE6C.cpp index 1e42ff9..7e27b5f 100644 --- a/src/code_801DCE6C.cpp +++ b/src/code_801DCE6C.cpp @@ -149,13 +149,13 @@ BOOL func_801DD294(gUnkClass4* p1, const char* fileName, s32) // check if already open
if (func_801DCEB4(p1, fileName))
return TRUE;
- // TODO: unroll this loop
- gUnkClass6* r29 = p1->arr - 1;
+
+ gUnkClass6* r29;
size_t i;
for (i = 0; i < 8; i++) {
- r29++;
+ r29 = p1->arr + i;
if (!p1->arr[i].unk0) {
- r29 = &p1->arr[i];
+ r29 = p1->arr + i;
break;
}
}
|