diff options
| author | Jonathan Wase <jonathan@familjenwase.se> | 2021-01-03 05:15:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 23:15:12 -0500 |
| commit | d2e9db37484e64f05830aad7b7e59f48139639f2 (patch) | |
| tree | 9c0b5d84e6305a71901b3cca22f320228d4cf02b /asm/Z2AudioLib | |
| parent | 609891bc25ed4341312a056b869f0a9b5619d875 (diff) | |
Fixed _savegpr etc. (#54)
* renamed func_XXX to _savegpr_XX
* renamed func_XXX to _restgpr_XX
* renamed func_XXX to _savefpr_XX
* renamed func_XXX to _restfpr_XX
* cleanup functions.h and moved intrisics to mwcc.h
* formatting
* cleanup functions.h
* fix bad-formatting from master
Co-authored-by: Julgodis <>
Diffstat (limited to 'asm/Z2AudioLib')
| -rw-r--r-- | asm/Z2AudioLib/Z2Creature.s | 6 | ||||
| -rw-r--r-- | asm/Z2AudioLib/Z2FxLineMgr.s | 2 | ||||
| -rw-r--r-- | asm/Z2AudioLib/Z2SoundObjMgr.s | 2 | ||||
| -rw-r--r-- | asm/Z2AudioLib/Z2SoundObject.s | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s index 5607cdea19..b5af6a29c6 100644 --- a/asm/Z2AudioLib/Z2Creature.s +++ b/asm/Z2AudioLib/Z2Creature.s @@ -2015,7 +2015,7 @@ lbl_802C20AC: /* 802C20CC 002BF00C 4E 80 04 21 */ bctrl lbl_802C20D0: /* 802C20D0 002BF010 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C20D4 002BF014 48 0A 01 3D */ bl func_80362210 +/* 802C20D4 002BF014 48 0A 01 3D */ bl _restgpr_23 /* 802C20D8 002BF018 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C20DC 002BF01C 7C 08 03 A6 */ mtlr r0 /* 802C20E0 002BF020 38 21 00 30 */ addi r1, r1, 0x30 @@ -2405,7 +2405,7 @@ lbl_802C2560: /* 802C2674 002BF5B4 7C 08 02 A6 */ mflr r0 /* 802C2678 002BF5B8 90 01 00 44 */ stw r0, 0x44(r1) /* 802C267C 002BF5BC 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C2680 002BF5C0 48 09 FB 39 */ bl func_803621B8 +/* 802C2680 002BF5C0 48 09 FB 39 */ bl _savegpr_20 /* 802C2684 002BF5C4 7C 74 1B 78 */ mr r20, r3 /* 802C2688 002BF5C8 7C D5 33 78 */ mr r21, r6 /* 802C268C 002BF5CC 7C F6 3B 78 */ mr r22, r7 @@ -2532,7 +2532,7 @@ lbl_802C2828: /* 802C2848 002BF788 4E 80 04 21 */ bctrl lbl_802C284C: /* 802C284C 002BF78C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C2850 002BF790 48 09 F9 B5 */ bl func_80362204 +/* 802C2850 002BF790 48 09 F9 B5 */ bl _restgpr_20 /* 802C2854 002BF794 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C2858 002BF798 7C 08 03 A6 */ mtlr r0 /* 802C285C 002BF79C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/Z2AudioLib/Z2FxLineMgr.s b/asm/Z2AudioLib/Z2FxLineMgr.s index 95b52a2d39..188dd8eac8 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr.s +++ b/asm/Z2AudioLib/Z2FxLineMgr.s @@ -280,7 +280,7 @@ lbl_802BABD8: /* 802BAC08 002B7B48 38 C0 00 00 */ li r6, 0 /* 802BAC0C 002B7B4C 48 00 00 1D */ bl Z2FxLineMgr_NS_setLineID /* 802BAC10 002B7B50 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BAC14 002B7B54 48 0A 75 F9 */ bl func_8036220C +/* 802BAC14 002B7B54 48 0A 75 F9 */ bl _restgpr_22 /* 802BAC18 002B7B58 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BAC1C 002B7B5C 7C 08 03 A6 */ mtlr r0 /* 802BAC20 002B7B60 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/Z2AudioLib/Z2SoundObjMgr.s b/asm/Z2AudioLib/Z2SoundObjMgr.s index e598117471..33e8495580 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr.s @@ -480,7 +480,7 @@ lbl_802BFFBC: /* 802BFFCC 002BCF0C E3 A1 00 68 */ psq_l f29, 104(r1), 0, qr0 /* 802BFFD0 002BCF10 CB A1 00 60 */ lfd f29, 0x60(r1) /* 802BFFD4 002BCF14 39 61 00 60 */ addi r11, r1, 0x60 -/* 802BFFD8 002BCF18 48 0A 22 39 */ bl func_80362210 +/* 802BFFD8 002BCF18 48 0A 22 39 */ bl _restgpr_23 /* 802BFFDC 002BCF1C 80 01 00 94 */ lwz r0, 0x94(r1) /* 802BFFE0 002BCF20 7C 08 03 A6 */ mtlr r0 /* 802BFFE4 002BCF24 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/Z2AudioLib/Z2SoundObject.s b/asm/Z2AudioLib/Z2SoundObject.s index 213839f3fd..fec486972f 100644 --- a/asm/Z2AudioLib/Z2SoundObject.s +++ b/asm/Z2AudioLib/Z2SoundObject.s @@ -1823,7 +1823,7 @@ lbl_802BF870: /* 802BF870 002BC7B0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 802BF874 002BC7B4 CB E1 00 50 */ lfd f31, 0x50(r1) /* 802BF878 002BC7B8 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BF87C 002BC7BC 48 0A 29 95 */ bl func_80362210 +/* 802BF87C 002BC7BC 48 0A 29 95 */ bl _restgpr_23 /* 802BF880 002BC7C0 80 01 00 64 */ lwz r0, 0x64(r1) /* 802BF884 002BC7C4 7C 08 03 A6 */ mtlr r0 /* 802BF888 002BC7C8 38 21 00 60 */ addi r1, r1, 0x60 |