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/OS.s | |
| parent | 3c70d4473a7085dadbcb0350c2b8e00f1148c639 (diff) | |
| parent | c209bed1a0e67280b796c7dfb4c84272c8065b9b (diff) | |
resolve more merge conflicts
Diffstat (limited to 'asm/SDK/OS/OS.s')
| -rw-r--r-- | asm/SDK/OS/OS.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/SDK/OS/OS.s b/asm/SDK/OS/OS.s index fc69331..e8a8187 100644 --- a/asm/SDK/OS/OS.s +++ b/asm/SDK/OS/OS.s @@ -1221,7 +1221,7 @@ lbl_802693F0: /* 8026948C 002650EC 4C C6 31 82 */ crclr 6 /* 80269490 002650F0 48 00 DF B9 */ bl func_80277448 /* 80269494 002650F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80269498 002650F8 4B F5 DC C1 */ bl func_801C7158 +/* 80269498 002650F8 4B F5 DC C1 */ bl _restgpr_20 /* 8026949C 002650FC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802694A0 00265100 7C 08 03 A6 */ mtlr r0 /* 802694A4 00265104 38 21 00 40 */ addi r1, r1, 0x40 |