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/OSContext.s | |
| parent | 3c70d4473a7085dadbcb0350c2b8e00f1148c639 (diff) | |
| parent | c209bed1a0e67280b796c7dfb4c84272c8065b9b (diff) | |
resolve more merge conflicts
Diffstat (limited to 'asm/SDK/OS/OSContext.s')
| -rw-r--r-- | asm/SDK/OS/OSContext.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/SDK/OS/OSContext.s b/asm/SDK/OS/OSContext.s index d38163c..718a60b 100644 --- a/asm/SDK/OS/OSContext.s +++ b/asm/SDK/OS/OSContext.s @@ -547,7 +547,7 @@ lbl_8026B398: /* 8026B3B4 00267014 41 80 FF C8 */ blt lbl_8026B37C lbl_8026B3B8: /* 8026B3B8 00267018 39 61 02 F0 */ addi r11, r1, 0x2f0 -/* 8026B3BC 0026701C 4B F5 BD B1 */ bl func_801C716C +/* 8026B3BC 0026701C 4B F5 BD B1 */ bl _restgpr_25 /* 8026B3C0 00267020 80 01 02 F4 */ lwz r0, 0x2f4(r1) /* 8026B3C4 00267024 7C 08 03 A6 */ mtlr r0 /* 8026B3C8 00267028 38 21 02 F0 */ addi r1, r1, 0x2f0 |