diff options
| author | Max <mparisi@stevens.edu> | 2020-09-26 13:33:28 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-26 13:33:28 -0400 |
| commit | a343859be6918a2ed8e5d0683bdc4f4cbad86397 (patch) | |
| tree | 9b562e4a43efe1b17a030deb54dc01ac46c27329 /asm/SDK/OS/OSExec.s | |
| parent | 3c70d4473a7085dadbcb0350c2b8e00f1148c639 (diff) | |
| parent | c209bed1a0e67280b796c7dfb4c84272c8065b9b (diff) | |
resolve more merge conflicts
Diffstat (limited to 'asm/SDK/OS/OSExec.s')
| -rw-r--r-- | asm/SDK/OS/OSExec.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/SDK/OS/OSExec.s b/asm/SDK/OS/OSExec.s index 49b5eb2..99800ff 100644 --- a/asm/SDK/OS/OSExec.s +++ b/asm/SDK/OS/OSExec.s @@ -103,7 +103,7 @@ lbl_8026BC94: lbl_8026BCA4: /* 8026BCA4 00267904 39 61 00 30 */ addi r11, r1, 0x30 /* 8026BCA8 00267908 38 60 00 01 */ li r3, 1 -/* 8026BCAC 0026790C 4B F5 B4 C1 */ bl func_801C716C +/* 8026BCAC 0026790C 4B F5 B4 C1 */ bl _restgpr_25 /* 8026BCB0 00267910 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026BCB4 00267914 7C 08 03 A6 */ mtlr r0 /* 8026BCB8 00267918 38 21 00 30 */ addi r1, r1, 0x30 |