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/ghttpMain.s | |
| parent | df637d39af469c45fed750d94a3b16f10be363c5 (diff) | |
| parent | c69681b46b7bc23e0eb42ad85f259d1839bed48d (diff) | |
resolve merge conflict
Diffstat (limited to 'asm/ghttpMain.s')
| -rw-r--r-- | asm/ghttpMain.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/ghttpMain.s b/asm/ghttpMain.s index aa694ad..15cdb47 100644 --- a/asm/ghttpMain.s +++ b/asm/ghttpMain.s @@ -264,7 +264,7 @@ ghttpGetExA: /* 80353FBC 0034FC1C 7C 08 02 A6 */ mflr r0
/* 80353FC0 0034FC20 90 01 00 44 */ stw r0, 0x44(r1)
/* 80353FC4 0034FC24 39 61 00 40 */ addi r11, r1, 0x40
-/* 80353FC8 0034FC28 4B E7 31 49 */ bl func_801C7110
+/* 80353FC8 0034FC28 4B E7 31 49 */ bl _savegpr_21
/* 80353FCC 0034FC2C 2C 03 00 00 */ cmpwi r3, 0
/* 80353FD0 0034FC30 83 C1 00 48 */ lwz r30, 0x48(r1)
/* 80353FD4 0034FC34 83 E1 00 4C */ lwz r31, 0x4c(r1)
|