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/GameSpy/ghttpEncryption.s | |
| parent | 3c70d4473a7085dadbcb0350c2b8e00f1148c639 (diff) | |
| parent | c209bed1a0e67280b796c7dfb4c84272c8065b9b (diff) | |
resolve more merge conflicts
Diffstat (limited to 'asm/GameSpy/ghttpEncryption.s')
| -rw-r--r-- | asm/GameSpy/ghttpEncryption.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/GameSpy/ghttpEncryption.s b/asm/GameSpy/ghttpEncryption.s index 20e2fa3..75d9a00 100644 --- a/asm/GameSpy/ghttpEncryption.s +++ b/asm/GameSpy/ghttpEncryption.s @@ -749,7 +749,7 @@ lbl_8035297C: /* 8035297C 0034E5DC 38 60 00 01 */ li r3, 1
lbl_80352980:
/* 80352980 0034E5E0 39 61 00 90 */ addi r11, r1, 0x90
-/* 80352984 0034E5E4 4B E7 47 ED */ bl func_801C7170
+/* 80352984 0034E5E4 4B E7 47 ED */ bl _restgpr_26
/* 80352988 0034E5E8 80 01 00 94 */ lwz r0, 0x94(r1)
/* 8035298C 0034E5EC 7C 08 03 A6 */ mtlr r0
/* 80352990 0034E5F0 38 21 00 90 */ addi r1, r1, 0x90
@@ -903,7 +903,7 @@ lbl_80352B7C: /* 80352B94 0034E7F4 38 60 00 03 */ li r3, 3
lbl_80352B98:
/* 80352B98 0034E7F8 39 61 00 60 */ addi r11, r1, 0x60
-/* 80352B9C 0034E7FC 4B E7 45 BD */ bl func_801C7158
+/* 80352B9C 0034E7FC 4B E7 45 BD */ bl _restgpr_20
/* 80352BA0 0034E800 80 01 00 64 */ lwz r0, 0x64(r1)
/* 80352BA4 0034E804 7C 08 03 A6 */ mtlr r0
/* 80352BA8 0034E808 38 21 00 60 */ addi r1, r1, 0x60
|