diff options
| author | Max <mparisi@stevens.edu> | 2020-09-20 14:21:21 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-20 14:21:21 -0400 |
| commit | 94f61df1e672fb3cdc91947b582f028ddf3bf7cd (patch) | |
| tree | a8b49d4e3e0f075c1478ae479a25defadca45705 /asm/SDK/OS/OSExec.s | |
| parent | df637d39af469c45fed750d94a3b16f10be363c5 (diff) | |
| parent | c69681b46b7bc23e0eb42ad85f259d1839bed48d (diff) | |
resolve merge conflict
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 7e3d49a..49b5eb2 100644 --- a/asm/SDK/OS/OSExec.s +++ b/asm/SDK/OS/OSExec.s @@ -8,7 +8,7 @@ PackArgs: /* 8026BB44 002677A4 7C 08 02 A6 */ mflr r0 /* 8026BB48 002677A8 90 01 00 34 */ stw r0, 0x34(r1) /* 8026BB4C 002677AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BB50 002677B0 4B F5 B5 D1 */ bl func_801C7120 +/* 8026BB50 002677B0 4B F5 B5 D1 */ bl _savegpr_25 /* 8026BB54 002677B4 7C 99 23 78 */ mr r25, r4 /* 8026BB58 002677B8 7C BD 2B 78 */ mr r29, r5 /* 8026BB5C 002677BC 7C 7E 1B 78 */ mr r30, r3 |