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/gt2Main.s | |
| parent | df637d39af469c45fed750d94a3b16f10be363c5 (diff) | |
| parent | c69681b46b7bc23e0eb42ad85f259d1839bed48d (diff) | |
resolve merge conflict
Diffstat (limited to 'asm/gt2Main.s')
| -rw-r--r-- | asm/gt2Main.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/gt2Main.s b/asm/gt2Main.s index 33dec25..cc9ab4a 100644 --- a/asm/gt2Main.s +++ b/asm/gt2Main.s @@ -68,7 +68,7 @@ gt2Connect: /* 80349A98 003456F8 7C 08 02 A6 */ mflr r0
/* 80349A9C 003456FC 90 01 00 44 */ stw r0, 0x44(r1)
/* 80349AA0 00345700 39 61 00 40 */ addi r11, r1, 0x40
-/* 80349AA4 00345704 4B E7 D6 7D */ bl func_801C7120
+/* 80349AA4 00345704 4B E7 D6 7D */ bl _savegpr_25
/* 80349AA8 00345708 7C 7E 1B 78 */ mr r30, r3
/* 80349AAC 0034570C 7C 9F 23 78 */ mr r31, r4
/* 80349AB0 00345710 7C A3 2B 78 */ mr r3, r5
|