diff --git a/asm/J2DGraph/J2DMaterialFactory.s b/asm/J2DGraph/J2DMaterialFactory.s index 6ab626b29a..b96307c0dc 100644 --- a/asm/J2DGraph/J2DMaterialFactory.s +++ b/asm/J2DGraph/J2DMaterialFactory.s @@ -168,7 +168,7 @@ J2DMaterialFactory_NS_create: /* 802F2D20 002EFC60 7C 08 02 A6 */ mflr r0 /* 802F2D24 002EFC64 90 01 03 D4 */ stw r0, 0x3d4(r1) /* 802F2D28 002EFC68 39 61 03 D0 */ addi r11, r1, 0x3d0 -/* 802F2D2C 002EFC6C 48 06 F4 89 */ bl func_803621B4 +/* 802F2D2C 002EFC6C 48 06 F4 89 */ bl _savegpr_19 /* 802F2D30 002EFC70 7C 7E 1B 78 */ mr r30, r3 /* 802F2D34 002EFC74 7C 9F 23 78 */ mr r31, r4 /* 802F2D38 002EFC78 7C BD 2B 78 */ mr r29, r5 @@ -780,7 +780,7 @@ lbl_802F3604: lbl_802F3610: /* 802F3610 002F0550 7F E3 FB 78 */ mr r3, r31 /* 802F3614 002F0554 39 61 03 D0 */ addi r11, r1, 0x3d0 -/* 802F3618 002F0558 48 06 EB E9 */ bl func_80362200 +/* 802F3618 002F0558 48 06 EB E9 */ bl _restgpr_19 /* 802F361C 002F055C 80 01 03 D4 */ lwz r0, 0x3d4(r1) /* 802F3620 002F0560 7C 08 03 A6 */ mtlr r0 /* 802F3624 002F0564 38 21 03 D0 */ addi r1, r1, 0x3d0 diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index 3f43504af2..8e8fb419d6 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -868,7 +868,7 @@ lbl_802FCC90: /* 802FCCBC 002F9BFC 7D 89 03 A6 */ mtctr r12 /* 802FCCC0 002F9C00 4E 80 04 21 */ bctrl /* 802FCCC4 002F9C04 39 61 00 80 */ addi r11, r1, 0x80 -/* 802FCCC8 002F9C08 48 06 55 45 */ bl func_8036220C +/* 802FCCC8 002F9C08 48 06 55 45 */ bl _restgpr_22 /* 802FCCCC 002F9C0C 80 01 00 84 */ lwz r0, 0x84(r1) /* 802FCCD0 002F9C10 7C 08 03 A6 */ mtlr r0 /* 802FCCD4 002F9C14 38 21 00 80 */ addi r1, r1, 0x80 @@ -2416,7 +2416,7 @@ lbl_802FE348: /* 802FE3A4 002FB2E4 DB 81 00 80 */ stfd f28, 0x80(r1) /* 802FE3A8 002FB2E8 F3 81 00 88 */ psq_st f28, 136(r1), 0, qr0 /* 802FE3AC 002FB2EC 39 61 00 80 */ addi r11, r1, 0x80 -/* 802FE3B0 002FB2F0 48 06 3E 0D */ bl func_803621BC +/* 802FE3B0 002FB2F0 48 06 3E 0D */ bl _savegpr_21 /* 802FE3B4 002FB2F4 7C 75 1B 78 */ mr r21, r3 /* 802FE3B8 002FB2F8 FF 80 08 90 */ fmr f28, f1 /* 802FE3BC 002FB2FC FF A0 10 90 */ fmr f29, f2 @@ -2550,7 +2550,7 @@ lbl_802FE598: /* 802FE5B0 002FB4F0 E3 81 00 88 */ psq_l f28, 136(r1), 0, qr0 /* 802FE5B4 002FB4F4 CB 81 00 80 */ lfd f28, 0x80(r1) /* 802FE5B8 002FB4F8 39 61 00 80 */ addi r11, r1, 0x80 -/* 802FE5BC 002FB4FC 48 06 3C 4D */ bl func_80362208 +/* 802FE5BC 002FB4FC 48 06 3C 4D */ bl _restgpr_21 /* 802FE5C0 002FB500 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802FE5C4 002FB504 7C 08 03 A6 */ mtlr r0 /* 802FE5C8 002FB508 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index 28c993950c..cb24e2773d 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -538,7 +538,7 @@ lbl_80303E24: /* 80303E3C 00300D7C E3 81 00 88 */ psq_l f28, 136(r1), 0, qr0 /* 80303E40 00300D80 CB 81 00 80 */ lfd f28, 0x80(r1) /* 80303E44 00300D84 39 61 00 80 */ addi r11, r1, 0x80 -/* 80303E48 00300D88 48 05 E3 C9 */ bl func_80362210 +/* 80303E48 00300D88 48 05 E3 C9 */ bl _restgpr_23 /* 80303E4C 00300D8C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80303E50 00300D90 7C 08 03 A6 */ mtlr r0 /* 80303E54 00300D94 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index 5f6d79d615..df7f07a8b7 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -616,7 +616,7 @@ J2DPrint_NS_parse: /* 802F4BA0 002F1AE0 DA C1 00 80 */ stfd f22, 0x80(r1) /* 802F4BA4 002F1AE4 F2 C1 00 88 */ psq_st f22, 136(r1), 0, qr0 /* 802F4BA8 002F1AE8 39 61 00 80 */ addi r11, r1, 0x80 -/* 802F4BAC 002F1AEC 48 06 D6 0D */ bl func_803621B8 +/* 802F4BAC 002F1AEC 48 06 D6 0D */ bl _savegpr_20 /* 802F4BB0 002F1AF0 7C 74 1B 78 */ mr r20, r3 /* 802F4BB4 002F1AF4 90 81 00 08 */ stw r4, 8(r1) /* 802F4BB8 002F1AF8 7C B5 2B 78 */ mr r21, r5 @@ -1106,7 +1106,7 @@ lbl_802F5280: /* 802F52C8 002F2208 E2 C1 00 88 */ psq_l f22, 136(r1), 0, qr0 /* 802F52CC 002F220C CA C1 00 80 */ lfd f22, 0x80(r1) /* 802F52D0 002F2210 39 61 00 80 */ addi r11, r1, 0x80 -/* 802F52D4 002F2214 48 06 CF 31 */ bl func_80362204 +/* 802F52D4 002F2214 48 06 CF 31 */ bl _restgpr_20 /* 802F52D8 002F2218 80 01 01 24 */ lwz r0, 0x124(r1) /* 802F52DC 002F221C 7C 08 03 A6 */ mtlr r0 /* 802F52E0 002F2220 38 21 01 20 */ addi r1, r1, 0x120 diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index 99eef795c1..87504a9959 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -1870,7 +1870,7 @@ lbl_8030285C: /* 80302878 002FF7B8 7C 08 02 A6 */ mflr r0 /* 8030287C 002FF7BC 90 01 00 54 */ stw r0, 0x54(r1) /* 80302880 002FF7C0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80302884 002FF7C4 48 05 F9 35 */ bl func_803621B8 +/* 80302884 002FF7C4 48 05 F9 35 */ bl _savegpr_20 /* 80302888 002FF7C8 7C 7D 1B 78 */ mr r29, r3 /* 8030288C 002FF7CC 7C 9E 23 78 */ mr r30, r4 /* 80302890 002FF7D0 7C BF 2B 78 */ mr r31, r5 @@ -1989,7 +1989,7 @@ lbl_80302A30: /* 80302A30 002FF970 38 60 00 01 */ li r3, 1 lbl_80302A34: /* 80302A34 002FF974 39 61 00 50 */ addi r11, r1, 0x50 -/* 80302A38 002FF978 48 05 F7 CD */ bl func_80362204 +/* 80302A38 002FF978 48 05 F7 CD */ bl _restgpr_20 /* 80302A3C 002FF97C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80302A40 002FF980 7C 08 03 A6 */ mtlr r0 /* 80302A44 002FF984 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/J3DGraphAnimator/J3DCluster.s b/asm/J3DGraphAnimator/J3DCluster.s index 007d94cb41..e08cb4b5ac 100644 --- a/asm/J3DGraphAnimator/J3DCluster.s +++ b/asm/J3DGraphAnimator/J3DCluster.s @@ -321,7 +321,7 @@ J3DDeformer_NS_deform_VtxNrmF32: /* 8032E638 0032B578 DB 61 00 50 */ stfd f27, 0x50(r1) /* 8032E63C 0032B57C F3 61 00 58 */ psq_st f27, 88(r1), 0, qr0 /* 8032E640 0032B580 39 61 00 50 */ addi r11, r1, 0x50 -/* 8032E644 0032B584 48 03 3B 79 */ bl func_803621BC +/* 8032E644 0032B584 48 03 3B 79 */ bl _savegpr_21 /* 8032E648 0032B588 7C BF 2B 78 */ mr r31, r5 /* 8032E64C 0032B58C 7C D6 33 78 */ mr r22, r6 /* 8032E650 0032B590 7C F5 3B 78 */ mr r21, r7 @@ -626,7 +626,7 @@ lbl_8032EA68: /* 8032EA94 0032B9D4 E3 61 00 58 */ psq_l f27, 88(r1), 0, qr0 /* 8032EA98 0032B9D8 CB 61 00 50 */ lfd f27, 0x50(r1) /* 8032EA9C 0032B9DC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8032EAA0 0032B9E0 48 03 37 69 */ bl func_80362208 +/* 8032EAA0 0032B9E0 48 03 37 69 */ bl _restgpr_21 /* 8032EAA4 0032B9E4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8032EAA8 0032B9E8 7C 08 03 A6 */ mtlr r0 /* 8032EAAC 0032B9EC 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/asm/J3DGraphAnimator/J3DJointTree.s b/asm/J3DGraphAnimator/J3DJointTree.s index d172c7289b..4dca9a646c 100644 --- a/asm/J3DGraphAnimator/J3DJointTree.s +++ b/asm/J3DGraphAnimator/J3DJointTree.s @@ -132,7 +132,7 @@ lbl_80325BD0: /* 80325BE4 00322B24 4B FF FE E4 */ b lbl_80325AC8 lbl_80325BE8: /* 80325BE8 00322B28 39 61 00 30 */ addi r11, r1, 0x30 -/* 80325BEC 00322B2C 48 03 C6 25 */ bl func_80362210 +/* 80325BEC 00322B2C 48 03 C6 25 */ bl _restgpr_23 /* 80325BF0 00322B30 80 01 00 34 */ lwz r0, 0x34(r1) /* 80325BF4 00322B34 7C 08 03 A6 */ mtlr r0 /* 80325BF8 00322B38 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DMaterialAttach.s b/asm/J3DGraphAnimator/J3DMaterialAttach.s index e95ee2d0cf..774bdd85d4 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAttach.s +++ b/asm/J3DGraphAnimator/J3DMaterialAttach.s @@ -658,7 +658,7 @@ lbl_8032FE48: /* 8032FE54 0032CD94 7F 83 E3 78 */ mr r3, r28 lbl_8032FE58: /* 8032FE58 0032CD98 39 61 00 40 */ addi r11, r1, 0x40 -/* 8032FE5C 0032CD9C 48 03 23 B1 */ bl func_8036220C +/* 8032FE5C 0032CD9C 48 03 23 B1 */ bl _restgpr_22 /* 8032FE60 0032CDA0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032FE64 0032CDA4 7C 08 03 A6 */ mtlr r0 /* 8032FE68 0032CDA8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index 0346a4eee0..822bb6c3a2 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -371,7 +371,7 @@ lbl_803275D4: /* 803275E0 00324520 38 60 00 00 */ li r3, 0 lbl_803275E4: /* 803275E4 00324524 39 61 00 30 */ addi r11, r1, 0x30 -/* 803275E8 00324528 48 03 AC 29 */ bl func_80362210 +/* 803275E8 00324528 48 03 AC 29 */ bl _restgpr_23 /* 803275EC 0032452C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803275F0 00324530 7C 08 03 A6 */ mtlr r0 /* 803275F4 00324534 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DMtxBuffer.s b/asm/J3DGraphAnimator/J3DMtxBuffer.s index 65b798ff99..6744b99198 100644 --- a/asm/J3DGraphAnimator/J3DMtxBuffer.s +++ b/asm/J3DGraphAnimator/J3DMtxBuffer.s @@ -336,7 +336,7 @@ J3DMtxBuffer_NS_createBumpMtxArray: /* 80326668 003235A8 7C 08 02 A6 */ mflr r0 /* 8032666C 003235AC 90 01 00 44 */ stw r0, 0x44(r1) /* 80326670 003235B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80326674 003235B4 48 03 BB 41 */ bl func_803621B4 +/* 80326674 003235B4 48 03 BB 41 */ bl _savegpr_19 /* 80326678 003235B8 7C 77 1B 78 */ mr r23, r3 /* 8032667C 003235BC 7C 98 23 78 */ mr r24, r4 /* 80326680 003235C0 7C B9 2B 78 */ mr r25, r5 @@ -503,7 +503,7 @@ lbl_803268B8: /* 803268B8 003237F8 38 60 00 00 */ li r3, 0 lbl_803268BC: /* 803268BC 003237FC 39 61 00 40 */ addi r11, r1, 0x40 -/* 803268C0 00323800 48 03 B9 41 */ bl func_80362200 +/* 803268C0 00323800 48 03 B9 41 */ bl _restgpr_19 /* 803268C4 00323804 80 01 00 44 */ lwz r0, 0x44(r1) /* 803268C8 00323808 7C 08 03 A6 */ mtlr r0 /* 803268CC 0032380C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index eac108e062..a5a550a018 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -596,7 +596,7 @@ J3DSkinDeform_NS_initMtxIndexArray: /* 8032CF48 00329E88 7C 08 02 A6 */ mflr r0 /* 8032CF4C 00329E8C 90 01 00 74 */ stw r0, 0x74(r1) /* 8032CF50 00329E90 39 61 00 70 */ addi r11, r1, 0x70 -/* 8032CF54 00329E94 48 03 52 4D */ bl func_803621A0 +/* 8032CF54 00329E94 48 03 52 4D */ bl _savegpr_14 /* 8032CF58 00329E98 7C 6F 1B 78 */ mr r15, r3 /* 8032CF5C 00329E9C 7C 90 23 78 */ mr r16, r4 /* 8032CF60 00329EA0 80 03 00 04 */ lwz r0, 4(r3) @@ -893,7 +893,7 @@ lbl_8032D350: /* 8032D35C 0032A29C 38 60 00 00 */ li r3, 0 lbl_8032D360: /* 8032D360 0032A2A0 39 61 00 70 */ addi r11, r1, 0x70 -/* 8032D364 0032A2A4 48 03 4E 89 */ bl func_803621EC +/* 8032D364 0032A2A4 48 03 4E 89 */ bl _restgpr_14 /* 8032D368 0032A2A8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8032D36C 0032A2AC 7C 08 03 A6 */ mtlr r0 /* 8032D370 0032A2B0 38 21 00 70 */ addi r1, r1, 0x70 @@ -905,7 +905,7 @@ J3DSkinDeform_NS_changeFastSkinDL: /* 8032D37C 0032A2BC 7C 08 02 A6 */ mflr r0 /* 8032D380 0032A2C0 90 01 00 64 */ stw r0, 0x64(r1) /* 8032D384 0032A2C4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8032D388 0032A2C8 48 03 4E 25 */ bl func_803621AC +/* 8032D388 0032A2C8 48 03 4E 25 */ bl _savegpr_17 /* 8032D38C 0032A2CC 7C 9F 23 78 */ mr r31, r4 /* 8032D390 0032A2D0 3A E0 00 00 */ li r23, 0 /* 8032D394 0032A2D4 3B C1 00 08 */ addi r30, r1, 8 @@ -1064,7 +1064,7 @@ lbl_8032D59C: /* 8032D5A4 0032A4E4 7C 03 00 40 */ cmplw r3, r0 /* 8032D5A8 0032A4E8 41 80 FF 94 */ blt lbl_8032D53C /* 8032D5AC 0032A4EC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8032D5B0 0032A4F0 48 03 4C 49 */ bl func_803621F8 +/* 8032D5B0 0032A4F0 48 03 4C 49 */ bl _restgpr_17 /* 8032D5B4 0032A4F4 80 01 00 64 */ lwz r0, 0x64(r1) /* 8032D5B8 0032A4F8 7C 08 03 A6 */ mtlr r0 /* 8032D5BC 0032A4FC 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/J3DGraphBase/J3DGD.s b/asm/J3DGraphBase/J3DGD.s index d0ea0c9771..0330869cac 100644 --- a/asm/J3DGraphBase/J3DGD.s +++ b/asm/J3DGraphBase/J3DGD.s @@ -700,7 +700,7 @@ J3DGDSetVtxAttrFmtv: /* 8030DB08 0030AA48 7C 08 02 A6 */ mflr r0 /* 8030DB0C 0030AA4C 90 01 00 A4 */ stw r0, 0xa4(r1) /* 8030DB10 0030AA50 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8030DB14 0030AA54 48 05 46 8D */ bl func_803621A0 +/* 8030DB14 0030AA54 48 05 46 8D */ bl _savegpr_14 /* 8030DB18 0030AA58 7C 6F 1B 78 */ mr r15, r3 /* 8030DB1C 0030AA5C 38 00 00 01 */ li r0, 1 /* 8030DB20 0030AA60 90 01 00 48 */ stw r0, 0x48(r1) @@ -1041,7 +1041,7 @@ lbl_8030DD5C: /* 8030E044 0030AF84 90 04 00 08 */ stw r0, 8(r4) /* 8030E048 0030AF88 98 C3 00 00 */ stb r6, 0(r3) /* 8030E04C 0030AF8C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8030E050 0030AF90 48 05 41 9D */ bl func_803621EC +/* 8030E050 0030AF90 48 05 41 9D */ bl _restgpr_14 /* 8030E054 0030AF94 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8030E058 0030AF98 7C 08 03 A6 */ mtlr r0 /* 8030E05C 0030AF9C 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -2166,7 +2166,7 @@ lbl_8030F078: /* 8030F0E8 0030C028 90 04 00 08 */ stw r0, 8(r4) /* 8030F0EC 0030C02C 98 C3 00 00 */ stb r6, 0(r3) /* 8030F0F0 0030C030 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030F0F4 0030C034 48 05 31 1D */ bl func_80362210 +/* 8030F0F4 0030C034 48 05 31 1D */ bl _restgpr_23 /* 8030F0F8 0030C038 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030F0FC 0030C03C 7C 08 03 A6 */ mtlr r0 /* 8030F100 0030C040 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DShapeDraw.s b/asm/J3DGraphBase/J3DShapeDraw.s index 172fa6689a..a9e1e92e05 100644 --- a/asm/J3DGraphBase/J3DShapeDraw.s +++ b/asm/J3DGraphBase/J3DShapeDraw.s @@ -36,7 +36,7 @@ J3DShapeDraw_NS_addTexMtxIndexInDL: /* 80314978 003118B8 7C 08 02 A6 */ mflr r0 /* 8031497C 003118BC 90 01 00 44 */ stw r0, 0x44(r1) /* 80314980 003118C0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80314984 003118C4 48 04 D8 2D */ bl func_803621B0 +/* 80314984 003118C4 48 04 D8 2D */ bl _savegpr_18 /* 80314988 003118C8 7C 79 1B 78 */ mr r25, r3 /* 8031498C 003118CC 7C 9A 23 78 */ mr r26, r4 /* 80314990 003118D0 7C BB 2B 78 */ mr r27, r5 @@ -117,7 +117,7 @@ lbl_80314A84: /* 80314A9C 003119DC 80 99 00 04 */ lwz r4, 4(r25) /* 80314AA0 003119E0 48 02 6B 3D */ bl DCStoreRange /* 80314AA4 003119E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80314AA8 003119E8 48 04 D7 55 */ bl func_803621FC +/* 80314AA8 003119E8 48 04 D7 55 */ bl _restgpr_18 /* 80314AAC 003119EC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80314AB0 003119F0 7C 08 03 A6 */ mtlr r0 /* 80314AB4 003119F4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index 23e6e1db96..a73124641f 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -1142,7 +1142,7 @@ lbl_8031417C: /* 80314180 003110C0 41 80 FF 50 */ blt lbl_803140D0 lbl_80314184: /* 80314184 003110C4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80314188 003110C8 48 04 E0 85 */ bl func_8036220C +/* 80314188 003110C8 48 04 E0 85 */ bl _restgpr_22 /* 8031418C 003110CC 80 01 00 54 */ lwz r0, 0x54(r1) /* 80314190 003110D0 7C 08 03 A6 */ mtlr r0 /* 80314194 003110D4 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/J3DGraphLoader/J3DClusterLoader.s b/asm/J3DGraphLoader/J3DClusterLoader.s index 737732dcfa..9ee0be19ba 100644 --- a/asm/J3DGraphLoader/J3DClusterLoader.s +++ b/asm/J3DGraphLoader/J3DClusterLoader.s @@ -345,7 +345,7 @@ lbl_803345C8: /* 803345DC 0033151C 7F E4 FB 78 */ mr r4, r31 /* 803345E0 00331520 48 00 6F FD */ bl DCStoreRange /* 803345E4 00331524 39 61 00 30 */ addi r11, r1, 0x30 -/* 803345E8 00331528 48 02 DC 29 */ bl func_80362210 +/* 803345E8 00331528 48 02 DC 29 */ bl _restgpr_23 /* 803345EC 0033152C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803345F0 00331530 7C 08 03 A6 */ mtlr r0 /* 803345F4 00331534 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphLoader/J3DMaterialFactory.s b/asm/J3DGraphLoader/J3DMaterialFactory.s index 072607fc65..4cde79dc4d 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory.s @@ -319,7 +319,7 @@ J3DMaterialFactory_NS_createNormalMaterial: /* 80330444 0032D384 7C 08 02 A6 */ mflr r0 /* 80330448 0032D388 90 01 01 24 */ stw r0, 0x124(r1) /* 8033044C 0032D38C 39 61 01 20 */ addi r11, r1, 0x120 -/* 80330450 0032D390 48 03 1D 65 */ bl func_803621B4 +/* 80330450 0032D390 48 03 1D 65 */ bl _savegpr_19 /* 80330454 0032D394 7C 7E 1B 78 */ mr r30, r3 /* 80330458 0032D398 7C 9F 23 78 */ mr r31, r4 /* 8033045C 0032D39C 7C BD 2B 78 */ mr r29, r5 @@ -949,7 +949,7 @@ lbl_80330D68: /* 80330D68 0032DCA8 7F E3 FB 78 */ mr r3, r31 lbl_80330D6C: /* 80330D6C 0032DCAC 39 61 01 20 */ addi r11, r1, 0x120 -/* 80330D70 0032DCB0 48 03 14 91 */ bl func_80362200 +/* 80330D70 0032DCB0 48 03 14 91 */ bl _restgpr_19 /* 80330D74 0032DCB4 80 01 01 24 */ lwz r0, 0x124(r1) /* 80330D78 0032DCB8 7C 08 03 A6 */ mtlr r0 /* 80330D7C 0032DCBC 38 21 01 20 */ addi r1, r1, 0x120 @@ -961,7 +961,7 @@ J3DMaterialFactory_NS_createPatchedMaterial: /* 80330D88 0032DCC8 7C 08 02 A6 */ mflr r0 /* 80330D8C 0032DCCC 90 01 00 F4 */ stw r0, 0xf4(r1) /* 80330D90 0032DCD0 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80330D94 0032DCD4 48 03 14 1D */ bl func_803621B0 +/* 80330D94 0032DCD4 48 03 14 1D */ bl _savegpr_18 /* 80330D98 0032DCD8 7C 7E 1B 78 */ mr r30, r3 /* 80330D9C 0032DCDC 7C 9F 23 79 */ or. r31, r4, r4 /* 80330DA0 0032DCE0 7C BD 2B 78 */ mr r29, r5 @@ -1576,7 +1576,7 @@ lbl_80331664: lbl_80331670: /* 80331670 0032E5B0 7F E3 FB 78 */ mr r3, r31 /* 80331674 0032E5B4 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80331678 0032E5B8 48 03 0B 85 */ bl func_803621FC +/* 80331678 0032E5B8 48 03 0B 85 */ bl _restgpr_18 /* 8033167C 0032E5BC 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80331680 0032E5C0 7C 08 03 A6 */ mtlr r0 /* 80331684 0032E5C4 38 21 00 F0 */ addi r1, r1, 0xf0 diff --git a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s index aa0a68410b..fd737a26c8 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s @@ -205,7 +205,7 @@ J3DMaterialFactory_v21_NS_create: /* 8033306C 0032FFAC 7C 08 02 A6 */ mflr r0 /* 80333070 0032FFB0 90 01 00 F4 */ stw r0, 0xf4(r1) /* 80333074 0032FFB4 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80333078 0032FFB8 48 02 F1 3D */ bl func_803621B4 +/* 80333078 0032FFB8 48 02 F1 3D */ bl _savegpr_19 /* 8033307C 0032FFBC 7C 7E 1B 78 */ mr r30, r3 /* 80333080 0032FFC0 7C 9F 23 78 */ mr r31, r4 /* 80333084 0032FFC4 7C BD 2B 78 */ mr r29, r5 @@ -705,7 +705,7 @@ lbl_803337B0: /* 803337B8 003306F8 41 80 FF B0 */ blt lbl_80333768 /* 803337BC 003306FC 7F E3 FB 78 */ mr r3, r31 /* 803337C0 00330700 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 803337C4 00330704 48 02 EA 3D */ bl func_80362200 +/* 803337C4 00330704 48 02 EA 3D */ bl _restgpr_19 /* 803337C8 00330708 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 803337CC 0033070C 7C 08 03 A6 */ mtlr r0 /* 803337D0 00330710 38 21 00 F0 */ addi r1, r1, 0xf0 diff --git a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s index d96945464a..39f3f2dc85 100644 --- a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s +++ b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s @@ -376,7 +376,7 @@ lbl_80336CB4: /* 80336CB8 00333BF8 41 80 FE 24 */ blt lbl_80336ADC /* 80336CBC 00333BFC 7F 63 DB 78 */ mr r3, r27 /* 80336CC0 00333C00 39 61 00 30 */ addi r11, r1, 0x30 -/* 80336CC4 00333C04 48 02 B5 49 */ bl func_8036220C +/* 80336CC4 00333C04 48 02 B5 49 */ bl _restgpr_22 /* 80336CC8 00333C08 80 01 00 34 */ lwz r0, 0x34(r1) /* 80336CCC 00333C0C 7C 08 03 A6 */ mtlr r0 /* 80336CD0 00333C10 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index 4e94f4b9fb..cf5b9a4b3a 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -1421,7 +1421,7 @@ JASAramStream_NS_channelStart: /* 8029766C 002945AC DB C1 00 50 */ stfd f30, 0x50(r1) /* 80297670 002945B0 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80297674 002945B4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80297678 002945B8 48 0C AB 3D */ bl func_803621B4 +/* 80297678 002945B8 48 0C AB 3D */ bl _savegpr_19 /* 8029767C 002945BC 7C 7D 1B 78 */ mr r29, r3 /* 80297680 002945C0 A0 03 01 58 */ lhz r0, 0x158(r3) /* 80297684 002945C4 2C 00 00 01 */ cmpwi r0, 1 @@ -1554,7 +1554,7 @@ lbl_80297834: /* 80297850 00294790 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 80297854 00294794 CB C1 00 50 */ lfd f30, 0x50(r1) /* 80297858 00294798 39 61 00 50 */ addi r11, r1, 0x50 -/* 8029785C 0029479C 48 0C A9 A5 */ bl func_80362200 +/* 8029785C 0029479C 48 0C A9 A5 */ bl _restgpr_19 /* 80297860 002947A0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80297864 002947A4 7C 08 03 A6 */ mtlr r0 /* 80297868 002947A8 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/JAudio2/JASBNKParser.s b/asm/JAudio2/JASBNKParser.s index d89d1dd3b8..2835e7e90b 100644 --- a/asm/JAudio2/JASBNKParser.s +++ b/asm/JAudio2/JASBNKParser.s @@ -89,7 +89,7 @@ JASBNKParser_NS_Ver1_NS_createBasicBank: /* 80299640 00296580 7C 08 02 A6 */ mflr r0 /* 80299644 00296584 90 01 00 54 */ stw r0, 0x54(r1) /* 80299648 00296588 39 61 00 50 */ addi r11, r1, 0x50 -/* 8029964C 0029658C 48 0C 8B 69 */ bl func_803621B4 +/* 8029964C 0029658C 48 0C 8B 69 */ bl _savegpr_19 /* 80299650 00296590 7C 7E 1B 78 */ mr r30, r3 /* 80299654 00296594 7C 9F 23 79 */ or. r31, r4, r4 /* 80299658 00296598 40 82 00 08 */ bne lbl_80299660 @@ -365,7 +365,7 @@ lbl_80299A14: /* 80299A20 00296960 7F 63 DB 78 */ mr r3, r27 lbl_80299A24: /* 80299A24 00296964 39 61 00 50 */ addi r11, r1, 0x50 -/* 80299A28 00296968 48 0C 87 D9 */ bl func_80362200 +/* 80299A28 00296968 48 0C 87 D9 */ bl _restgpr_19 /* 80299A2C 0029696C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80299A30 00296970 7C 08 03 A6 */ mtlr r0 /* 80299A34 00296974 38 21 00 50 */ addi r1, r1, 0x50 @@ -377,7 +377,7 @@ JASBNKParser_NS_Ver0_NS_createBasicBank: /* 80299A40 00296980 7C 08 02 A6 */ mflr r0 /* 80299A44 00296984 90 01 00 54 */ stw r0, 0x54(r1) /* 80299A48 00296988 39 61 00 50 */ addi r11, r1, 0x50 -/* 80299A4C 0029698C 48 0C 87 61 */ bl func_803621AC +/* 80299A4C 0029698C 48 0C 87 61 */ bl _savegpr_17 /* 80299A50 00296990 7C 9E 23 79 */ or. r30, r4, r4 /* 80299A54 00296994 40 82 00 08 */ bne lbl_80299A5C /* 80299A58 00296998 83 CD 8C 90 */ lwz r30, lbl_80451210-_SDA_BASE_(r13) @@ -659,7 +659,7 @@ lbl_80299E3C: /* 80299E4C 00296D8C 7F A3 EB 78 */ mr r3, r29 lbl_80299E50: /* 80299E50 00296D90 39 61 00 50 */ addi r11, r1, 0x50 -/* 80299E54 00296D94 48 0C 83 A5 */ bl func_803621F8 +/* 80299E54 00296D94 48 0C 83 A5 */ bl _restgpr_17 /* 80299E58 00296D98 80 01 00 54 */ lwz r0, 0x54(r1) /* 80299E5C 00296D9C 7C 08 03 A6 */ mtlr r0 /* 80299E60 00296DA0 38 21 00 50 */ addi r1, r1, 0x50 @@ -740,7 +740,7 @@ lbl_80299F60: /* 80299F70 00296EB0 38 60 00 00 */ li r3, 0 lbl_80299F74: /* 80299F74 00296EB4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80299F78 00296EB8 48 0C 82 99 */ bl func_80362210 +/* 80299F78 00296EB8 48 0C 82 99 */ bl _restgpr_23 /* 80299F7C 00296EBC 80 01 00 54 */ lwz r0, 0x54(r1) /* 80299F80 00296EC0 7C 08 03 A6 */ mtlr r0 /* 80299F84 00296EC4 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/JAudio2/JASBank.s b/asm/JAudio2/JASBank.s index 66e963ec2a..29802d3035 100644 --- a/asm/JAudio2/JASBank.s +++ b/asm/JAudio2/JASBank.s @@ -213,7 +213,7 @@ lbl_80297C24: /* 80297C24 00294B64 38 60 00 00 */ li r3, 0 lbl_80297C28: /* 80297C28 00294B68 39 61 00 60 */ addi r11, r1, 0x60 -/* 80297C2C 00294B6C 48 0C A5 E5 */ bl func_80362210 +/* 80297C2C 00294B6C 48 0C A5 E5 */ bl _restgpr_23 /* 80297C30 00294B70 80 01 00 64 */ lwz r0, 0x64(r1) /* 80297C34 00294B74 7C 08 03 A6 */ mtlr r0 /* 80297C38 00294B78 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JAudio2/JASTrack.s b/asm/JAudio2/JASTrack.s index 1320aabfbf..62f83b9a4d 100644 --- a/asm/JAudio2/JASTrack.s +++ b/asm/JAudio2/JASTrack.s @@ -1011,7 +1011,7 @@ lbl_80291FE0: /* 80291FEC 0028EF2C 7F 83 E3 78 */ mr r3, r28 lbl_80291FF0: /* 80291FF0 0028EF30 39 61 00 30 */ addi r11, r1, 0x30 -/* 80291FF4 0028EF34 48 0D 02 1D */ bl func_80362210 +/* 80291FF4 0028EF34 48 0D 02 1D */ bl _restgpr_23 /* 80291FF8 0028EF38 80 01 00 34 */ lwz r0, 0x34(r1) /* 80291FFC 0028EF3C 7C 08 03 A6 */ mtlr r0 /* 80292000 0028EF40 38 21 00 30 */ addi r1, r1, 0x30 @@ -1025,7 +1025,7 @@ JASTrack_NS_gateOn: /* 80292014 0028EF54 DB E1 00 40 */ stfd f31, 0x40(r1) /* 80292018 0028EF58 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8029201C 0028EF5C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80292020 0028EF60 48 0D 01 99 */ bl func_803621B8 +/* 80292020 0028EF60 48 0D 01 99 */ bl _savegpr_20 /* 80292024 0028EF64 7C 76 1B 78 */ mr r22, r3 /* 80292028 0028EF68 7C 97 23 78 */ mr r23, r4 /* 8029202C 0028EF6C 7C B8 2B 78 */ mr r24, r5 @@ -1122,7 +1122,7 @@ lbl_80292158: /* 80292178 0028F0B8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8029217C 0028F0BC CB E1 00 40 */ lfd f31, 0x40(r1) /* 80292180 0028F0C0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80292184 0028F0C4 48 0D 00 81 */ bl func_80362204 +/* 80292184 0028F0C4 48 0D 00 81 */ bl _restgpr_20 /* 80292188 0028F0C8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8029218C 0028F0CC 7C 08 03 A6 */ mtlr r0 /* 80292190 0028F0D0 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/JAudio2/JASWSParser.s b/asm/JAudio2/JASWSParser.s index b8e18e6bef..313a1b0f83 100644 --- a/asm/JAudio2/JASWSParser.s +++ b/asm/JAudio2/JASWSParser.s @@ -50,7 +50,7 @@ JASWSParser_NS_createBasicWaveBank: /* 80299038 00295F78 7C 08 02 A6 */ mflr r0 /* 8029903C 00295F7C 90 01 00 64 */ stw r0, 0x64(r1) /* 80299040 00295F80 39 61 00 60 */ addi r11, r1, 0x60 -/* 80299044 00295F84 48 0C 91 75 */ bl func_803621B8 +/* 80299044 00295F84 48 0C 91 75 */ bl _savegpr_20 /* 80299048 00295F88 7C 74 1B 78 */ mr r20, r3 /* 8029904C 00295F8C 7C 96 23 79 */ or. r22, r4, r4 /* 80299050 00295F90 40 82 00 08 */ bne lbl_80299058 @@ -189,7 +189,7 @@ lbl_80299224: /* 80299248 00296188 7F 83 E3 78 */ mr r3, r28 lbl_8029924C: /* 8029924C 0029618C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80299250 00296190 48 0C 8F B5 */ bl func_80362204 +/* 80299250 00296190 48 0C 8F B5 */ bl _restgpr_20 /* 80299254 00296194 80 01 00 64 */ lwz r0, 0x64(r1) /* 80299258 00296198 7C 08 03 A6 */ mtlr r0 /* 8029925C 0029619C 38 21 00 60 */ addi r1, r1, 0x60 @@ -341,7 +341,7 @@ lbl_80299444: /* 80299474 002963B4 7F A3 EB 78 */ mr r3, r29 lbl_80299478: /* 80299478 002963B8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8029947C 002963BC 48 0C 8D 95 */ bl func_80362210 +/* 8029947C 002963BC 48 0C 8D 95 */ bl _restgpr_23 /* 80299480 002963C0 80 01 00 64 */ lwz r0, 0x64(r1) /* 80299484 002963C4 7C 08 03 A6 */ mtlr r0 /* 80299488 002963C8 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index 84166cf6e5..13c4fe6f2d 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -3877,7 +3877,7 @@ lbl_8027A330: /* 8027A3B8 002772F8 E1 C1 00 B8 */ psq_l f14, 184(r1), 0, qr0 /* 8027A3BC 002772FC C9 C1 00 B0 */ lfd f14, 0xb0(r1) /* 8027A3C0 00277300 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8027A3C4 00277304 48 0E 7E 49 */ bl func_8036220C +/* 8027A3C4 00277304 48 0E 7E 49 */ bl _restgpr_22 /* 8027A3C8 00277308 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 8027A3CC 0027730C 7C 08 03 A6 */ mtlr r0 /* 8027A3D0 00277310 38 21 01 D0 */ addi r1, r1, 0x1d0 diff --git a/asm/JParticle/JPAResource.s b/asm/JParticle/JPAResource.s index 43c766e019..0bc9b05494 100644 --- a/asm/JParticle/JPAResource.s +++ b/asm/JParticle/JPAResource.s @@ -40,7 +40,7 @@ JPAResource_NS_init: /* 80274084 00270FC4 7C 08 02 A6 */ mflr r0 /* 80274088 00270FC8 90 01 00 64 */ stw r0, 0x64(r1) /* 8027408C 00270FCC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80274090 00270FD0 48 0E E1 11 */ bl func_803621A0 +/* 80274090 00270FD0 48 0E E1 11 */ bl _savegpr_14 /* 80274094 00270FD4 7C 6F 1B 78 */ mr r15, r3 /* 80274098 00270FD8 7C 90 23 78 */ mr r16, r4 /* 8027409C 00270FDC 80 63 00 1C */ lwz r3, 0x1c(r3) @@ -1763,7 +1763,7 @@ lbl_802755BC: /* 802755CC 0027250C 7C A4 01 2E */ stwx r5, r4, r0 lbl_802755D0: /* 802755D0 00272510 39 61 00 60 */ addi r11, r1, 0x60 -/* 802755D4 00272514 48 0E CC 19 */ bl func_803621EC +/* 802755D4 00272514 48 0E CC 19 */ bl _restgpr_14 /* 802755D8 00272518 80 01 00 64 */ lwz r0, 0x64(r1) /* 802755DC 0027251C 7C 08 03 A6 */ mtlr r0 /* 802755E0 00272520 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JParticle/JPAResourceLoader.s b/asm/JParticle/JPAResourceLoader.s index 7eddced291..875e17defb 100644 --- a/asm/JParticle/JPAResourceLoader.s +++ b/asm/JParticle/JPAResourceLoader.s @@ -29,7 +29,7 @@ JPAResourceLoader_NS_load_jpc: /* 8027D8E4 0027A824 7C 08 02 A6 */ mflr r0 /* 8027D8E8 0027A828 90 01 00 44 */ stw r0, 0x44(r1) /* 8027D8EC 0027A82C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027D8F0 0027A830 48 0E 48 C1 */ bl func_803621B0 +/* 8027D8F0 0027A830 48 0E 48 C1 */ bl _savegpr_18 /* 8027D8F4 0027A834 7C 9C 23 78 */ mr r28, r4 /* 8027D8F8 0027A838 7C BD 2B 78 */ mr r29, r5 /* 8027D8FC 0027A83C 83 C5 00 00 */ lwz r30, 0(r5) @@ -291,7 +291,7 @@ lbl_8027DC80: /* 8027DC80 0027ABC0 7C 15 90 00 */ cmpw r21, r18 /* 8027DC84 0027ABC4 41 80 FF C0 */ blt lbl_8027DC44 /* 8027DC88 0027ABC8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027DC8C 0027ABCC 48 0E 45 71 */ bl func_803621FC +/* 8027DC8C 0027ABCC 48 0E 45 71 */ bl _restgpr_18 /* 8027DC90 0027ABD0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8027DC94 0027ABD4 7C 08 03 A6 */ mtlr r0 /* 8027DC98 0027ABD8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JStudio/functionvalue.s b/asm/JStudio/functionvalue.s index 8e80da9f57..db93c2782b 100644 --- a/asm/JStudio/functionvalue.s +++ b/asm/JStudio/functionvalue.s @@ -290,7 +290,7 @@ JStudio_NS_TFunctionValueAttribute_range_NS_range_getParameter: /* 80281A0C 0027E94C 7C 08 02 A6 */ mflr r0 /* 80281A10 0027E950 90 01 00 34 */ stw r0, 0x34(r1) /* 80281A14 0027E954 39 61 00 30 */ addi r11, r1, 0x30 -/* 80281A18 0027E958 48 0E 07 2D */ bl func_80362144 +/* 80281A18 0027E958 48 0E 07 2D */ bl _savefpr_29 /* 80281A1C 0027E95C 93 E1 00 14 */ stw r31, 0x14(r1) /* 80281A20 0027E960 7C 7F 1B 78 */ mr r31, r3 /* 80281A24 0027E964 FF E0 10 90 */ fmr f31, f2 @@ -493,7 +493,7 @@ lbl_80281CDC: /* 80281CF8 0027EC38 FC 3F 00 2A */ fadd f1, f31, f0 lbl_80281CFC: /* 80281CFC 0027EC3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80281D00 0027EC40 48 0E 04 91 */ bl func_80362190 +/* 80281D00 0027EC40 48 0E 04 91 */ bl _restfpr_29 /* 80281D04 0027EC44 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80281D08 0027EC48 80 01 00 34 */ lwz r0, 0x34(r1) /* 80281D0C 0027EC4C 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio/fvb.s b/asm/JStudio/fvb.s index 4f804445f6..f38f9d5656 100644 --- a/asm/JStudio/fvb.s +++ b/asm/JStudio/fvb.s @@ -168,7 +168,7 @@ lbl_802841B8: /* 802841CC 0028110C 7D 89 03 A6 */ mtctr r12 /* 802841D0 00281110 4E 80 04 21 */ bctrl /* 802841D4 00281114 39 61 00 60 */ addi r11, r1, 0x60 -/* 802841D8 00281118 48 0D E0 39 */ bl func_80362210 +/* 802841D8 00281118 48 0D E0 39 */ bl _restgpr_23 /* 802841DC 0028111C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802841E0 00281120 7C 08 03 A6 */ mtlr r0 /* 802841E4 00281124 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JUtility/JUTCacheFont.s b/asm/JUtility/JUTCacheFont.s index 77ea40cc03..38b1723fd2 100644 --- a/asm/JUtility/JUTCacheFont.s +++ b/asm/JUtility/JUTCacheFont.s @@ -139,7 +139,7 @@ JUTCacheFont_NS_getMemorySize: /* 802DD360 002DA2A0 7C 08 02 A6 */ mflr r0 /* 802DD364 002DA2A4 90 01 00 54 */ stw r0, 0x54(r1) /* 802DD368 002DA2A8 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DD36C 002DA2AC 48 08 4E 35 */ bl func_803621A0 +/* 802DD36C 002DA2AC 48 08 4E 35 */ bl _savegpr_14 /* 802DD370 002DA2B0 7C 99 23 79 */ or. r25, r4, r4 /* 802DD374 002DA2B4 7C BA 2B 78 */ mr r26, r5 /* 802DD378 002DA2B8 7C DB 33 78 */ mr r27, r6 @@ -247,7 +247,7 @@ lbl_802DD4D0: /* 802DD4D0 002DA410 38 60 00 01 */ li r3, 1 lbl_802DD4D4: /* 802DD4D4 002DA414 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DD4D8 002DA418 48 08 4D 15 */ bl func_803621EC +/* 802DD4D8 002DA418 48 08 4D 15 */ bl _restgpr_14 /* 802DD4DC 002DA41C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802DD4E0 002DA420 7C 08 03 A6 */ mtlr r0 /* 802DD4E4 002DA424 38 21 00 50 */ addi r1, r1, 0x50 @@ -547,7 +547,7 @@ lbl_802DD8D8: /* 802DD8F0 002DA830 7C 08 02 A6 */ mflr r0 /* 802DD8F4 002DA834 90 01 00 44 */ stw r0, 0x44(r1) /* 802DD8F8 002DA838 39 61 00 40 */ addi r11, r1, 0x40 -/* 802DD8FC 002DA83C 48 08 48 C1 */ bl func_803621BC +/* 802DD8FC 002DA83C 48 08 48 C1 */ bl _savegpr_21 /* 802DD900 002DA840 7C 78 1B 78 */ mr r24, r3 /* 802DD904 002DA844 3A E0 00 00 */ li r23, 0 /* 802DD908 002DA848 3A C0 00 00 */ li r22, 0 @@ -686,7 +686,7 @@ lbl_802DDAE4: /* 802DDAEC 002DAA2C 7C 19 00 40 */ cmplw r25, r0 /* 802DDAF0 002DAA30 41 80 FE 58 */ blt lbl_802DD948 /* 802DDAF4 002DAA34 39 61 00 40 */ addi r11, r1, 0x40 -/* 802DDAF8 002DAA38 48 08 47 11 */ bl func_80362208 +/* 802DDAF8 002DAA38 48 08 47 11 */ bl _restgpr_21 /* 802DDAFC 002DAA3C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DDB00 002DAA40 7C 08 03 A6 */ mtlr r0 /* 802DDB04 002DAA44 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JUtility/JUTConsole.s b/asm/JUtility/JUTConsole.s index 2a7d14c2f9..58dc194b47 100644 --- a/asm/JUtility/JUTConsole.s +++ b/asm/JUtility/JUTConsole.s @@ -232,7 +232,7 @@ JUTConsole_NS_doDraw: /* 802E7674 002E45B4 DB 61 02 60 */ stfd f27, 0x260(r1) /* 802E7678 002E45B8 F3 61 02 68 */ psq_st f27, 616(r1), 0, qr0 /* 802E767C 002E45BC 39 61 02 60 */ addi r11, r1, 0x260 -/* 802E7680 002E45C0 48 07 AB 39 */ bl func_803621B8 +/* 802E7680 002E45C0 48 07 AB 39 */ bl _savegpr_20 /* 802E7684 002E45C4 7C 79 1B 78 */ mr r25, r3 /* 802E7688 002E45C8 7C 9A 23 78 */ mr r26, r4 /* 802E768C 002E45CC 88 03 00 68 */ lbz r0, 0x68(r3) @@ -577,7 +577,7 @@ lbl_802E7B78: /* 802E7B98 002E4AD8 E3 61 02 68 */ psq_l f27, 616(r1), 0, qr0 /* 802E7B9C 002E4ADC CB 61 02 60 */ lfd f27, 0x260(r1) /* 802E7BA0 002E4AE0 39 61 02 60 */ addi r11, r1, 0x260 -/* 802E7BA4 002E4AE4 48 07 A6 61 */ bl func_80362204 +/* 802E7BA4 002E4AE4 48 07 A6 61 */ bl _restgpr_20 /* 802E7BA8 002E4AE8 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 802E7BAC 002E4AEC 7C 08 03 A6 */ mtlr r0 /* 802E7BB0 002E4AF0 38 21 02 B0 */ addi r1, r1, 0x2b0 diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index 87e5b4d791..ca2a02368e 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -1697,7 +1697,7 @@ lbl_802E34A0: lbl_802E34A4: /* 802E34A4 002E03E4 7E E3 BB 78 */ mr r3, r23 /* 802E34A8 002E03E8 39 61 03 A0 */ addi r11, r1, 0x3a0 -/* 802E34AC 002E03EC 48 07 ED 61 */ bl func_8036220C +/* 802E34AC 002E03EC 48 07 ED 61 */ bl _restgpr_22 /* 802E34B0 002E03F0 80 01 03 A4 */ lwz r0, 0x3a4(r1) /* 802E34B4 002E03F4 7C 08 03 A6 */ mtlr r0 /* 802E34B8 002E03F8 38 21 03 A0 */ addi r1, r1, 0x3a0 @@ -2034,7 +2034,7 @@ lbl_802E3930: /* 802E3964 002E08A4 4B FF FF 68 */ b lbl_802E38CC lbl_802E3968: /* 802E3968 002E08A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E396C 002E08AC 48 07 E8 A1 */ bl func_8036220C +/* 802E396C 002E08AC 48 07 E8 A1 */ bl _restgpr_22 /* 802E3970 002E08B0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802E3974 002E08B4 7C 08 03 A6 */ mtlr r0 /* 802E3978 002E08B8 38 21 00 40 */ addi r1, r1, 0x40 @@ -2272,7 +2272,7 @@ JUTException_NS_queryMapAddress_single: /* 802E3C94 002E0BD4 7C 08 02 A6 */ mflr r0 /* 802E3C98 002E0BD8 90 01 0A D4 */ stw r0, 0xad4(r1) /* 802E3C9C 002E0BDC 39 61 0A D0 */ addi r11, r1, 0xad0 -/* 802E3CA0 002E0BE0 48 07 E5 09 */ bl func_803621A8 +/* 802E3CA0 002E0BE0 48 07 E5 09 */ bl _savegpr_16 /* 802E3CA4 002E0BE4 7C 70 1B 79 */ or. r16, r3, r3 /* 802E3CA8 002E0BE8 7C 98 23 78 */ mr r24, r4 /* 802E3CAC 002E0BEC 7C B9 2B 78 */ mr r25, r5 @@ -2503,7 +2503,7 @@ lbl_802E3FB0: /* 802E3FD0 002E0F10 7E 03 83 78 */ mr r3, r16 lbl_802E3FD4: /* 802E3FD4 002E0F14 39 61 0A D0 */ addi r11, r1, 0xad0 -/* 802E3FD8 002E0F18 48 07 E2 1D */ bl func_803621F4 +/* 802E3FD8 002E0F18 48 07 E2 1D */ bl _restgpr_16 /* 802E3FDC 002E0F1C 80 01 0A D4 */ lwz r0, 0xad4(r1) /* 802E3FE0 002E0F20 7C 08 03 A6 */ mtlr r0 /* 802E3FE4 002E0F24 38 21 0A D0 */ addi r1, r1, 0xad0 diff --git a/asm/JUtility/JUTProcBar.s b/asm/JUtility/JUTProcBar.s index 429a3ff56b..b55e127571 100644 --- a/asm/JUtility/JUTProcBar.s +++ b/asm/JUtility/JUTProcBar.s @@ -417,7 +417,7 @@ JUTProcBar_NS_drawProcessBar: /* 802E5E48 002E2D88 DB E1 01 60 */ stfd f31, 0x160(r1) /* 802E5E4C 002E2D8C F3 E1 01 68 */ psq_st f31, 360(r1), 0, qr0 /* 802E5E50 002E2D90 39 61 01 60 */ addi r11, r1, 0x160 -/* 802E5E54 002E2D94 48 07 C3 69 */ bl func_803621BC +/* 802E5E54 002E2D94 48 07 C3 69 */ bl _savegpr_21 /* 802E5E58 002E2D98 7C 7F 1B 78 */ mr r31, r3 /* 802E5E5C 002E2D9C 88 03 01 0C */ lbz r0, 0x10c(r3) /* 802E5E60 002E2DA0 28 00 00 00 */ cmplwi r0, 0 @@ -1401,7 +1401,7 @@ lbl_802E6D1C: /* 802E6D1C 002E3C5C E3 E1 01 68 */ psq_l f31, 360(r1), 0, qr0 /* 802E6D20 002E3C60 CB E1 01 60 */ lfd f31, 0x160(r1) /* 802E6D24 002E3C64 39 61 01 60 */ addi r11, r1, 0x160 -/* 802E6D28 002E3C68 48 07 B4 E1 */ bl func_80362208 +/* 802E6D28 002E3C68 48 07 B4 E1 */ bl _restgpr_21 /* 802E6D2C 002E3C6C 80 01 01 74 */ lwz r0, 0x174(r1) /* 802E6D30 002E3C70 7C 08 03 A6 */ mtlr r0 /* 802E6D34 002E3C74 38 21 01 70 */ addi r1, r1, 0x170 diff --git a/asm/SComponent/c/cc/c_cc_s.s b/asm/SComponent/c/cc/c_cc_s.s index fe532030ad..0fef35532f 100644 --- a/asm/SComponent/c/cc/c_cc_s.s +++ b/asm/SComponent/c/cc/c_cc_s.s @@ -691,7 +691,7 @@ cCcS_NS_SetAtTgCommonHitInf: /* 802653CC 0026230C 7C 08 02 A6 */ mflr r0 /* 802653D0 00262310 90 01 00 54 */ stw r0, 0x54(r1) /* 802653D4 00262314 39 61 00 50 */ addi r11, r1, 0x50 -/* 802653D8 00262318 48 0F CD E5 */ bl func_803621BC +/* 802653D8 00262318 48 0F CD E5 */ bl _savegpr_21 /* 802653DC 0026231C 7C 7A 1B 78 */ mr r26, r3 /* 802653E0 00262320 7C 9B 23 78 */ mr r27, r4 /* 802653E4 00262324 7C BC 2B 78 */ mr r28, r5 @@ -822,7 +822,7 @@ lbl_80265524: /* 802655C8 00262508 4E 80 04 21 */ bctrl lbl_802655CC: /* 802655CC 0026250C 39 61 00 50 */ addi r11, r1, 0x50 -/* 802655D0 00262510 48 0F CC 39 */ bl func_80362208 +/* 802655D0 00262510 48 0F CC 39 */ bl _restgpr_21 /* 802655D4 00262514 80 01 00 54 */ lwz r0, 0x54(r1) /* 802655D8 00262518 7C 08 03 A6 */ mtlr r0 /* 802655DC 0026251C 38 21 00 50 */ addi r1, r1, 0x50 @@ -919,7 +919,7 @@ lbl_8026569C: /* 80265730 00262670 4E 80 04 21 */ bctrl /* 80265734 00262674 CB E1 00 38 */ lfd f31, 0x38(r1) /* 80265738 00262678 39 61 00 38 */ addi r11, r1, 0x38 -/* 8026573C 0026267C 48 0F CA D1 */ bl func_8036220C +/* 8026573C 0026267C 48 0F CA D1 */ bl _restgpr_22 /* 80265740 00262680 80 01 00 44 */ lwz r0, 0x44(r1) /* 80265744 00262684 7C 08 03 A6 */ mtlr r0 /* 80265748 00262688 38 21 00 40 */ addi r1, r1, 0x40 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 diff --git a/asm/c/c_dylink.s b/asm/c/c_dylink.s index f96366e95b..c34fa88655 100644 --- a/asm/c/c_dylink.s +++ b/asm/c/c_dylink.s @@ -96,7 +96,7 @@ lbl_80018500: /* 80018524 00015464 98 0D 87 28 */ stb r0, lbl_80450CA8-_SDA_BASE_(r13) /* 80018528 00015468 38 60 00 01 */ li r3, 1 /* 8001852C 0001546C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80018530 00015470 48 34 9C E1 */ bl func_80362210 +/* 80018530 00015470 48 34 9C E1 */ bl _restgpr_23 /* 80018534 00015474 80 01 00 34 */ lwz r0, 0x34(r1) /* 80018538 00015478 7C 08 03 A6 */ mtlr r0 /* 8001853C 0001547C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/clib.s b/asm/clib.s index f1f1a3a407..f08a38163c 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -456,24 +456,24 @@ lbl_80362100: /* 8036212C 0035F06C DA EB FF B8 */ stfd f23, -0x48(r11) /* 80362130 0035F070 DB 0B FF C0 */ stfd f24, -0x40(r11) -.global func_80362134 -func_80362134: +.global _savefpr_25 +_savefpr_25: /* 80362134 0035F074 DB 2B FF C8 */ stfd f25, -0x38(r11) -.global func_80362138 -func_80362138: +.global _savefpr_26 +_savefpr_26: /* 80362138 0035F078 DB 4B FF D0 */ stfd f26, -0x30(r11) -.global func_8036213C -func_8036213C: +.global _savefpr_27 +_savefpr_27: /* 8036213C 0035F07C DB 6B FF D8 */ stfd f27, -0x28(r11) -.global func_80362140 -func_80362140: +.global _savefpr_28 +_savefpr_28: /* 80362140 0035F080 DB 8B FF E0 */ stfd f28, -0x20(r11) -.global func_80362144 -func_80362144: +.global _savefpr_29 +_savefpr_29: /* 80362144 0035F084 DB AB FF E8 */ stfd f29, -0x18(r11) /* 80362148 0035F088 DB CB FF F0 */ stfd f30, -0x10(r11) /* 8036214C 0035F08C DB EB FF F8 */ stfd f31, -8(r11) @@ -490,59 +490,59 @@ func_80362144: /* 80362178 0035F0B8 CA EB FF B8 */ lfd f23, -0x48(r11) /* 8036217C 0035F0BC CB 0B FF C0 */ lfd f24, -0x40(r11) -.global func_80362180 -func_80362180: +.global _restfpr_25 +_restfpr_25: /* 80362180 0035F0C0 CB 2B FF C8 */ lfd f25, -0x38(r11) -.global func_80362184 -func_80362184: +.global _restfpr_26 +_restfpr_26: /* 80362184 0035F0C4 CB 4B FF D0 */ lfd f26, -0x30(r11) -.global func_80362188 -func_80362188: +.global _restfpr_27 +_restfpr_27: /* 80362188 0035F0C8 CB 6B FF D8 */ lfd f27, -0x28(r11) -.global func_8036218C -func_8036218C: +.global _restfpr_28 +_restfpr_28: /* 8036218C 0035F0CC CB 8B FF E0 */ lfd f28, -0x20(r11) -.global func_80362190 -func_80362190: +.global _restfpr_29 +_restfpr_29: /* 80362190 0035F0D0 CB AB FF E8 */ lfd f29, -0x18(r11) /* 80362194 0035F0D4 CB CB FF F0 */ lfd f30, -0x10(r11) /* 80362198 0035F0D8 CB EB FF F8 */ lfd f31, -8(r11) /* 8036219C 0035F0DC 4E 80 00 20 */ blr -.global func_803621A0 -func_803621A0: +.global _savegpr_14 +_savegpr_14: /* 803621A0 0035F0E0 91 CB FF B8 */ stw r14, -0x48(r11) -.global func_803621A4 -func_803621A4: +.global _savegpr_15 +_savegpr_15: /* 803621A4 0035F0E4 91 EB FF BC */ stw r15, -0x44(r11) -.global func_803621A8 -func_803621A8: +.global _savegpr_16 +_savegpr_16: /* 803621A8 0035F0E8 92 0B FF C0 */ stw r16, -0x40(r11) -.global func_803621AC -func_803621AC: +.global _savegpr_17 +_savegpr_17: /* 803621AC 0035F0EC 92 2B FF C4 */ stw r17, -0x3c(r11) -.global func_803621B0 -func_803621B0: +.global _savegpr_18 +_savegpr_18: /* 803621B0 0035F0F0 92 4B FF C8 */ stw r18, -0x38(r11) -.global func_803621B4 -func_803621B4: +.global _savegpr_19 +_savegpr_19: /* 803621B4 0035F0F4 92 6B FF CC */ stw r19, -0x34(r11) -.global func_803621B8 -func_803621B8: +.global _savegpr_20 +_savegpr_20: /* 803621B8 0035F0F8 92 8B FF D0 */ stw r20, -0x30(r11) -.global func_803621BC -func_803621BC: +.global _savegpr_21 +_savegpr_21: /* 803621BC 0035F0FC 92 AB FF D4 */ stw r21, -0x2c(r11) .global _savegpr_22 @@ -580,44 +580,44 @@ _savegpr_29: /* 803621E4 0035F124 93 EB FF FC */ stw r31, -4(r11) /* 803621E8 0035F128 4E 80 00 20 */ blr -.global func_803621EC -func_803621EC: +.global _restgpr_14 +_restgpr_14: /* 803621EC 0035F12C 81 CB FF B8 */ lwz r14, -0x48(r11) -.global func_803621F0 -func_803621F0: +.global _restgpr_15 +_restgpr_15: /* 803621F0 0035F130 81 EB FF BC */ lwz r15, -0x44(r11) -.global func_803621F4 -func_803621F4: +.global _restgpr_16 +_restgpr_16: /* 803621F4 0035F134 82 0B FF C0 */ lwz r16, -0x40(r11) -.global func_803621F8 -func_803621F8: +.global _restgpr_17 +_restgpr_17: /* 803621F8 0035F138 82 2B FF C4 */ lwz r17, -0x3c(r11) -.global func_803621FC -func_803621FC: +.global _restgpr_18 +_restgpr_18: /* 803621FC 0035F13C 82 4B FF C8 */ lwz r18, -0x38(r11) -.global func_80362200 -func_80362200: +.global _restgpr_19 +_restgpr_19: /* 80362200 0035F140 82 6B FF CC */ lwz r19, -0x34(r11) -.global func_80362204 -func_80362204: +.global _restgpr_20 +_restgpr_20: /* 80362204 0035F144 82 8B FF D0 */ lwz r20, -0x30(r11) -.global func_80362208 -func_80362208: +.global _restgpr_21 +_restgpr_21: /* 80362208 0035F148 82 AB FF D4 */ lwz r21, -0x2c(r11) -.global func_8036220C -func_8036220C: +.global _restgpr_22 +_restgpr_22: /* 8036220C 0035F14C 82 CB FF D8 */ lwz r22, -0x28(r11) -.global func_80362210 -func_80362210: +.global _restgpr_23 +_restgpr_23: /* 80362210 0035F150 82 EB FF DC */ lwz r23, -0x24(r11) .global _restgpr_24 @@ -10802,7 +10802,7 @@ func_8036AB9C: /* 8036ABA0 00367AE0 7C 08 02 A6 */ mflr r0 /* 8036ABA4 00367AE4 90 01 02 D4 */ stw r0, 0x2d4(r1) /* 8036ABA8 00367AE8 39 61 02 D0 */ addi r11, r1, 0x2d0 -/* 8036ABAC 00367AEC 4B FF 75 89 */ bl func_80362134 +/* 8036ABAC 00367AEC 4B FF 75 89 */ bl _savefpr_25 /* 8036ABB0 00367AF0 BE 01 02 58 */ stmw r16, 0x258(r1) /* 8036ABB4 00367AF4 3D 20 2A AB */ lis r9, 0x2AAAAAAB@ha /* 8036ABB8 00367AF8 7C F7 3B 78 */ mr r23, r7 @@ -11798,7 +11798,7 @@ lbl_8036B9B0: lbl_8036B9D0: /* 8036B9D0 00368910 57 63 07 7E */ clrlwi r3, r27, 0x1d /* 8036B9D4 00368914 39 61 02 D0 */ addi r11, r1, 0x2d0 -/* 8036B9D8 00368918 4B FF 67 A9 */ bl func_80362180 +/* 8036B9D8 00368918 4B FF 67 A9 */ bl _restfpr_25 /* 8036B9DC 0036891C BA 01 02 58 */ lmw r16, 0x258(r1) /* 8036B9E0 00368920 80 01 02 D4 */ lwz r0, 0x2d4(r1) /* 8036B9E4 00368924 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/a/d_a_itembase.s b/asm/d/a/d_a_itembase.s index 964f29e31a..ebad29c5c2 100644 --- a/asm/d/a/d_a_itembase.s +++ b/asm/d/a/d_a_itembase.s @@ -26,7 +26,7 @@ daItemBase_c_NS_CreateItemHeap: /* 80144760 001416A0 7C 08 02 A6 */ mflr r0 /* 80144764 001416A4 90 01 00 44 */ stw r0, 0x44(r1) /* 80144768 001416A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014476C 001416AC 48 21 DA 51 */ bl func_803621BC +/* 8014476C 001416AC 48 21 DA 51 */ bl _savegpr_21 /* 80144770 001416B0 7C 7F 1B 78 */ mr r31, r3 /* 80144774 001416B4 7C 9E 23 78 */ mr r30, r4 /* 80144778 001416B8 7C D7 33 78 */ mr r23, r6 @@ -310,7 +310,7 @@ lbl_80144B60: /* 80144B78 00141AB8 7C 60 19 10 */ subfe r3, r0, r3 lbl_80144B7C: /* 80144B7C 00141ABC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80144B80 00141AC0 48 21 D6 89 */ bl func_80362208 +/* 80144B80 00141AC0 48 21 D6 89 */ bl _restgpr_21 /* 80144B84 00141AC4 80 01 00 44 */ lwz r0, 0x44(r1) /* 80144B88 00141AC8 7C 08 03 A6 */ mtlr r0 /* 80144B8C 00141ACC 38 21 00 40 */ addi r1, r1, 0x40 @@ -634,7 +634,7 @@ daItemBase_c_NS_animPlay: /* 80145040 00141F80 7C 08 02 A6 */ mflr r0 /* 80145044 00141F84 90 01 00 44 */ stw r0, 0x44(r1) /* 80145048 00141F88 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014504C 00141F8C 48 21 D0 F1 */ bl func_8036213C +/* 8014504C 00141F8C 48 21 D0 F1 */ bl _savefpr_27 /* 80145050 00141F90 93 E1 00 14 */ stw r31, 0x14(r1) /* 80145054 00141F94 7C 7F 1B 78 */ mr r31, r3 /* 80145058 00141F98 FF 60 08 90 */ fmr f27, f1 @@ -695,7 +695,7 @@ lbl_80145110: /* 80145124 00142064 4B EC 83 05 */ bl mDoExt_baseAnm_NS_play lbl_80145128: /* 80145128 00142068 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014512C 0014206C 48 21 D0 5D */ bl func_80362188 +/* 8014512C 0014206C 48 21 D0 5D */ bl _restfpr_27 /* 80145130 00142070 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80145134 00142074 80 01 00 44 */ lwz r0, 0x44(r1) /* 80145138 00142078 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 3a09e7064f..ee6a9d7562 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -1501,7 +1501,7 @@ lbl_80146C70: /* 80146C7C 00143BBC 54 03 0F FE */ srwi r3, r0, 0x1f lbl_80146C80: /* 80146C80 00143BC0 39 61 00 80 */ addi r11, r1, 0x80 -/* 80146C84 00143BC4 48 21 B5 89 */ bl func_8036220C +/* 80146C84 00143BC4 48 21 B5 89 */ bl _restgpr_22 /* 80146C88 00143BC8 80 01 00 84 */ lwz r0, 0x84(r1) /* 80146C8C 00143BCC 7C 08 03 A6 */ mtlr r0 /* 80146C90 00143BD0 38 21 00 80 */ addi r1, r1, 0x80 @@ -3664,7 +3664,7 @@ lbl_80148C48: /* 80148C50 00145B90 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 80148C54 00145B94 CB C1 00 40 */ lfd f30, 0x40(r1) /* 80148C58 00145B98 39 61 00 40 */ addi r11, r1, 0x40 -/* 80148C5C 00145B9C 48 21 95 B1 */ bl func_8036220C +/* 80148C5C 00145B9C 48 21 95 B1 */ bl _restgpr_22 /* 80148C60 00145BA0 80 01 00 64 */ lwz r0, 0x64(r1) /* 80148C64 00145BA4 7C 08 03 A6 */ mtlr r0 /* 80148C68 00145BA8 38 21 00 60 */ addi r1, r1, 0x60 @@ -7730,7 +7730,7 @@ lbl_8014C6E4: /* 8014C70C 0014964C DB E1 00 80 */ stfd f31, 0x80(r1) /* 8014C710 00149650 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 8014C714 00149654 39 61 00 80 */ addi r11, r1, 0x80 -/* 8014C718 00149658 48 21 5A 99 */ bl func_803621B0 +/* 8014C718 00149658 48 21 5A 99 */ bl _savegpr_18 /* 8014C71C 0014965C 7C 77 1B 78 */ mr r23, r3 /* 8014C720 00149660 7C 98 23 78 */ mr r24, r4 /* 8014C724 00149664 7C B9 2B 78 */ mr r25, r5 @@ -7933,7 +7933,7 @@ lbl_8014C9F4: /* 8014C9F8 00149938 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 8014C9FC 0014993C CB E1 00 80 */ lfd f31, 0x80(r1) /* 8014CA00 00149940 39 61 00 80 */ addi r11, r1, 0x80 -/* 8014CA04 00149944 48 21 57 F9 */ bl func_803621FC +/* 8014CA04 00149944 48 21 57 F9 */ bl _restgpr_18 /* 8014CA08 00149948 80 01 00 94 */ lwz r0, 0x94(r1) /* 8014CA0C 0014994C 7C 08 03 A6 */ mtlr r0 /* 8014CA10 00149950 38 21 00 90 */ addi r1, r1, 0x90 @@ -9184,7 +9184,7 @@ lbl_8014DBA8: /* 8014DBC8 0014AB08 DB C1 02 20 */ stfd f30, 0x220(r1) /* 8014DBCC 0014AB0C F3 C1 02 28 */ psq_st f30, 552(r1), 0, qr0 /* 8014DBD0 0014AB10 39 61 02 20 */ addi r11, r1, 0x220 -/* 8014DBD4 0014AB14 48 21 45 D5 */ bl func_803621A8 +/* 8014DBD4 0014AB14 48 21 45 D5 */ bl _savegpr_16 /* 8014DBD8 0014AB18 7C 7E 1B 78 */ mr r30, r3 /* 8014DBDC 0014AB1C 7C 90 23 78 */ mr r16, r4 /* 8014DBE0 0014AB20 7C DF 33 78 */ mr r31, r6 @@ -9898,7 +9898,7 @@ lbl_8014E60C: /* 8014E614 0014B554 E3 C1 02 28 */ psq_l f30, 552(r1), 0, qr0 /* 8014E618 0014B558 CB C1 02 20 */ lfd f30, 0x220(r1) /* 8014E61C 0014B55C 39 61 02 20 */ addi r11, r1, 0x220 -/* 8014E620 0014B560 48 21 3B D5 */ bl func_803621F4 +/* 8014E620 0014B560 48 21 3B D5 */ bl _restgpr_16 /* 8014E624 0014B564 80 01 02 44 */ lwz r0, 0x244(r1) /* 8014E628 0014B568 7C 08 03 A6 */ mtlr r0 /* 8014E62C 0014B56C 38 21 02 40 */ addi r1, r1, 0x240 @@ -11220,7 +11220,7 @@ daBaseNpc_putNurbs: /* 8014F8E0 0014C820 DB A1 02 60 */ stfd f29, 0x260(r1) /* 8014F8E4 0014C824 F3 A1 02 68 */ psq_st f29, 616(r1), 0, qr0 /* 8014F8E8 0014C828 39 61 02 60 */ addi r11, r1, 0x260 -/* 8014F8EC 0014C82C 48 21 28 BD */ bl func_803621A8 +/* 8014F8EC 0014C82C 48 21 28 BD */ bl _savegpr_16 /* 8014F8F0 0014C830 7C 73 1B 78 */ mr r19, r3 /* 8014F8F4 0014C834 7C 94 23 78 */ mr r20, r4 /* 8014F8F8 0014C838 7C B5 2B 78 */ mr r21, r5 @@ -11374,7 +11374,7 @@ lbl_8014FAF4: /* 8014FB08 0014CA48 E3 A1 02 68 */ psq_l f29, 616(r1), 0, qr0 /* 8014FB0C 0014CA4C CB A1 02 60 */ lfd f29, 0x260(r1) /* 8014FB10 0014CA50 39 61 02 60 */ addi r11, r1, 0x260 -/* 8014FB14 0014CA54 48 21 26 E1 */ bl func_803621F4 +/* 8014FB14 0014CA54 48 21 26 E1 */ bl _restgpr_16 /* 8014FB18 0014CA58 80 01 02 94 */ lwz r0, 0x294(r1) /* 8014FB1C 0014CA5C 7C 08 03 A6 */ mtlr r0 /* 8014FB20 0014CA60 38 21 02 90 */ addi r1, r1, 0x290 @@ -13234,7 +13234,7 @@ lbl_801515A0: /* 801515B4 0014E4F4 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, qr0 /* 801515B8 0014E4F8 CB E1 00 E0 */ lfd f31, 0xe0(r1) /* 801515BC 0014E4FC 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 801515C0 0014E500 48 21 0C 4D */ bl func_8036220C +/* 801515C0 0014E500 48 21 0C 4D */ bl _restgpr_22 /* 801515C4 0014E504 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801515C8 0014E508 7C 08 03 A6 */ mtlr r0 /* 801515CC 0014E50C 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -13554,7 +13554,7 @@ lbl_80151A14: /* 80151A34 0014E974 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, qr0 /* 80151A38 0014E978 CB C1 00 B0 */ lfd f30, 0xb0(r1) /* 80151A3C 0014E97C 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80151A40 0014E980 48 21 07 D1 */ bl func_80362210 +/* 80151A40 0014E980 48 21 07 D1 */ bl _restgpr_23 /* 80151A44 0014E984 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80151A48 0014E988 7C 08 03 A6 */ mtlr r0 /* 80151A4C 0014E98C 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -13568,7 +13568,7 @@ daNpcF_Lookat_c_NS_update: /* 80151A60 0014E9A0 DB E1 00 80 */ stfd f31, 0x80(r1) /* 80151A64 0014E9A4 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 80151A68 0014E9A8 39 61 00 80 */ addi r11, r1, 0x80 -/* 80151A6C 0014E9AC 48 21 07 4D */ bl func_803621B8 +/* 80151A6C 0014E9AC 48 21 07 4D */ bl _savegpr_20 /* 80151A70 0014E9B0 7C 79 1B 78 */ mr r25, r3 /* 80151A74 0014E9B4 7C 9A 23 78 */ mr r26, r4 /* 80151A78 0014E9B8 7C BB 2B 78 */ mr r27, r5 @@ -13627,7 +13627,7 @@ lbl_80151AB4: /* 80151B48 0014EA88 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 80151B4C 0014EA8C CB E1 00 80 */ lfd f31, 0x80(r1) /* 80151B50 0014EA90 39 61 00 80 */ addi r11, r1, 0x80 -/* 80151B54 0014EA94 48 21 06 B1 */ bl func_80362204 +/* 80151B54 0014EA94 48 21 06 B1 */ bl _restgpr_20 /* 80151B58 0014EA98 80 01 00 94 */ lwz r0, 0x94(r1) /* 80151B5C 0014EA9C 7C 08 03 A6 */ mtlr r0 /* 80151B60 0014EAA0 38 21 00 90 */ addi r1, r1, 0x90 @@ -16403,7 +16403,7 @@ lbl_80154354: /* 80154398 001512D8 DB 61 00 80 */ stfd f27, 0x80(r1) /* 8015439C 001512DC F3 61 00 88 */ psq_st f27, 136(r1), 0, qr0 /* 801543A0 001512E0 39 61 00 80 */ addi r11, r1, 0x80 -/* 801543A4 001512E4 48 20 DE 11 */ bl func_803621B4 +/* 801543A4 001512E4 48 20 DE 11 */ bl _savegpr_19 /* 801543A8 001512E8 7C 78 1B 78 */ mr r24, r3 /* 801543AC 001512EC 7C 99 23 78 */ mr r25, r4 /* 801543B0 001512F0 7C BA 2B 78 */ mr r26, r5 @@ -16642,7 +16642,7 @@ lbl_801546EC: /* 80154710 00151650 E3 61 00 88 */ psq_l f27, 136(r1), 0, qr0 /* 80154714 00151654 CB 61 00 80 */ lfd f27, 0x80(r1) /* 80154718 00151658 39 61 00 80 */ addi r11, r1, 0x80 -/* 8015471C 0015165C 48 20 DA E5 */ bl func_80362200 +/* 8015471C 0015165C 48 20 DA E5 */ bl _restgpr_19 /* 80154720 00151660 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80154724 00151664 7C 08 03 A6 */ mtlr r0 /* 80154728 00151668 38 21 00 D0 */ addi r1, r1, 0xd0 diff --git a/asm/d/a/npc/d_a_npc_cd.s b/asm/d/a/npc/d_a_npc_cd.s index b63e61f1b7..ebfb67d6e6 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -1609,7 +1609,7 @@ lbl_80157728: /* 80157780 001546C0 41 80 FF 94 */ blt lbl_80157714 /* 80157784 001546C4 7F C3 F3 78 */ mr r3, r30 /* 80157788 001546C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015778C 001546CC 48 20 AA 81 */ bl func_8036220C +/* 8015778C 001546CC 48 20 AA 81 */ bl _restgpr_22 /* 80157790 001546D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80157794 001546D4 7C 08 03 A6 */ mtlr r0 /* 80157798 001546D8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index f64877835d..a85f09ed3f 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -2912,7 +2912,7 @@ lbl_8015A600: /* 8015A658 00157598 41 80 FF 94 */ blt lbl_8015A5EC /* 8015A65C 0015759C 7F C3 F3 78 */ mr r3, r30 /* 8015A660 001575A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015A664 001575A4 48 20 7B A9 */ bl func_8036220C +/* 8015A664 001575A4 48 20 7B A9 */ bl _restgpr_22 /* 8015A668 001575A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8015A66C 001575AC 7C 08 03 A6 */ mtlr r0 /* 8015A670 001575B0 38 21 00 30 */ addi r1, r1, 0x30 @@ -3121,7 +3121,7 @@ lbl_8015A8F0: /* 8015A910 00157850 7C 08 02 A6 */ mflr r0 /* 8015A914 00157854 90 01 00 E4 */ stw r0, 0xe4(r1) /* 8015A918 00157858 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8015A91C 0015785C 48 20 78 85 */ bl func_803621A0 +/* 8015A91C 0015785C 48 20 78 85 */ bl _savegpr_14 /* 8015A920 00157860 3C 60 80 39 */ lis r3, lbl_80393250@ha /* 8015A924 00157864 38 C3 32 50 */ addi r6, r3, lbl_80393250@l /* 8015A928 00157868 3C 60 80 3B */ lis r3, lbl_803B61C0@ha @@ -3418,7 +3418,7 @@ lbl_8015A8F0: /* 8015ADAC 00157CEC 38 A5 86 10 */ addi r5, r5, lbl_80428610@l /* 8015ADB0 00157CF0 48 20 6E 75 */ bl func_80361C24 /* 8015ADB4 00157CF4 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8015ADB8 00157CF8 48 20 74 35 */ bl func_803621EC +/* 8015ADB8 00157CF8 48 20 74 35 */ bl _restgpr_14 /* 8015ADBC 00157CFC 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8015ADC0 00157D00 7C 08 03 A6 */ mtlr r0 /* 8015ADC4 00157D04 38 21 00 E0 */ addi r1, r1, 0xe0 diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index 4a8c4e9027..6774b2dfac 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -1762,7 +1762,7 @@ lbl_80075808: /* 80075864 000727A4 4E 80 04 21 */ bctrl lbl_80075868: /* 80075868 000727A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007586C 000727AC 48 2E C9 A1 */ bl func_8036220C +/* 8007586C 000727AC 48 2E C9 A1 */ bl _restgpr_22 /* 80075870 000727B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80075874 000727B4 7C 08 03 A6 */ mtlr r0 /* 80075878 000727B8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index 68cba8b0ca..7c5bb6056d 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -3423,7 +3423,7 @@ lbl_8007C1D8: /* 8007C214 00079154 E3 01 00 78 */ psq_l f24, 120(r1), 0, qr0 /* 8007C218 00079158 CB 01 00 70 */ lfd f24, 0x70(r1) /* 8007C21C 0007915C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007C220 00079160 48 2E 5F ED */ bl func_8036220C +/* 8007C220 00079160 48 2E 5F ED */ bl _restgpr_22 /* 8007C224 00079164 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8007C228 00079168 7C 08 03 A6 */ mtlr r0 /* 8007C22C 0007916C 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -4436,7 +4436,7 @@ lbl_8007D078: /* 8007D0BC 00079FFC E2 E1 00 78 */ psq_l f23, 120(r1), 0, qr0 /* 8007D0C0 0007A000 CA E1 00 70 */ lfd f23, 0x70(r1) /* 8007D0C4 0007A004 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007D0C8 0007A008 48 2E 51 49 */ bl func_80362210 +/* 8007D0C8 0007A008 48 2E 51 49 */ bl _restgpr_23 /* 8007D0CC 0007A00C 80 01 01 04 */ lwz r0, 0x104(r1) /* 8007D0D0 0007A010 7C 08 03 A6 */ mtlr r0 /* 8007D0D4 0007A014 38 21 01 00 */ addi r1, r1, 0x100 @@ -5257,7 +5257,7 @@ lbl_8007DC3C: /* 8007DC50 0007AB90 90 01 00 18 */ stw r0, 0x18(r1) /* 8007DC54 0007AB94 7F 63 DB 78 */ mr r3, r27 /* 8007DC58 0007AB98 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007DC5C 0007AB9C 48 2E 45 B5 */ bl func_80362210 +/* 8007DC5C 0007AB9C 48 2E 45 B5 */ bl _restgpr_23 /* 8007DC60 0007ABA0 80 01 00 74 */ lwz r0, 0x74(r1) /* 8007DC64 0007ABA4 7C 08 03 A6 */ mtlr r0 /* 8007DC68 0007ABA8 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index dae4840792..5108274bcd 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -529,7 +529,7 @@ lbl_8007EE1C: /* 8007EE70 0007BDB0 DB 21 01 40 */ stfd f25, 0x140(r1) /* 8007EE74 0007BDB4 F3 21 01 48 */ psq_st f25, 328(r1), 0, qr0 /* 8007EE78 0007BDB8 39 61 01 40 */ addi r11, r1, 0x140 -/* 8007EE7C 0007BDBC 48 2E 33 25 */ bl func_803621A0 +/* 8007EE7C 0007BDBC 48 2E 33 25 */ bl _savegpr_14 /* 8007EE80 0007BDC0 7C 6F 1B 78 */ mr r15, r3 /* 8007EE84 0007BDC4 7C 90 23 78 */ mr r16, r4 /* 8007EE88 0007BDC8 39 D0 00 24 */ addi r14, r16, 0x24 @@ -1055,7 +1055,7 @@ lbl_8007F5D8: /* 8007F608 0007C548 E3 21 01 48 */ psq_l f25, 328(r1), 0, qr0 /* 8007F60C 0007C54C CB 21 01 40 */ lfd f25, 0x140(r1) /* 8007F610 0007C550 39 61 01 40 */ addi r11, r1, 0x140 -/* 8007F614 0007C554 48 2E 2B D9 */ bl func_803621EC +/* 8007F614 0007C554 48 2E 2B D9 */ bl _restgpr_14 /* 8007F618 0007C558 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 8007F61C 0007C55C 7C 08 03 A6 */ mtlr r0 /* 8007F620 0007C560 38 21 01 B0 */ addi r1, r1, 0x1b0 @@ -1068,7 +1068,7 @@ lbl_8007F5D8: /* 8007F63C 0007C57C DB C1 00 80 */ stfd f30, 0x80(r1) /* 8007F640 0007C580 F3 C1 00 88 */ psq_st f30, 136(r1), 0, qr0 /* 8007F644 0007C584 39 61 00 80 */ addi r11, r1, 0x80 -/* 8007F648 0007C588 48 2E 2B 6D */ bl func_803621B4 +/* 8007F648 0007C588 48 2E 2B 6D */ bl _savegpr_19 /* 8007F64C 0007C58C 7C 7E 1B 78 */ mr r30, r3 /* 8007F650 0007C590 7C 9F 23 78 */ mr r31, r4 /* 8007F654 0007C594 3B 5F 00 24 */ addi r26, r31, 0x24 @@ -1291,7 +1291,7 @@ lbl_8007F97C: /* 8007F984 0007C8C4 E3 C1 00 88 */ psq_l f30, 136(r1), 0, qr0 /* 8007F988 0007C8C8 CB C1 00 80 */ lfd f30, 0x80(r1) /* 8007F98C 0007C8CC 39 61 00 80 */ addi r11, r1, 0x80 -/* 8007F990 0007C8D0 48 2E 28 71 */ bl func_80362200 +/* 8007F990 0007C8D0 48 2E 28 71 */ bl _restgpr_19 /* 8007F994 0007C8D4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8007F998 0007C8D8 7C 08 03 A6 */ mtlr r0 /* 8007F99C 0007C8DC 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -1300,7 +1300,7 @@ lbl_8007F97C: /* 8007F9A8 0007C8E8 7C 08 02 A6 */ mflr r0 /* 8007F9AC 0007C8EC 90 01 09 04 */ stw r0, 0x904(r1) /* 8007F9B0 0007C8F0 39 61 09 00 */ addi r11, r1, 0x900 -/* 8007F9B4 0007C8F4 48 2E 27 ED */ bl func_803621A0 +/* 8007F9B4 0007C8F4 48 2E 27 ED */ bl _savegpr_14 /* 8007F9B8 0007C8F8 7C 6F 1B 78 */ mr r15, r3 /* 8007F9BC 0007C8FC 90 81 00 08 */ stw r4, 8(r1) /* 8007F9C0 0007C900 7C 83 23 78 */ mr r3, r4 @@ -1656,7 +1656,7 @@ lbl_8007FEB0: /* 8007FEE4 0007CE24 40 81 FC 64 */ ble lbl_8007FB48 lbl_8007FEE8: /* 8007FEE8 0007CE28 39 61 09 00 */ addi r11, r1, 0x900 -/* 8007FEEC 0007CE2C 48 2E 23 01 */ bl func_803621EC +/* 8007FEEC 0007CE2C 48 2E 23 01 */ bl _restgpr_14 /* 8007FEF0 0007CE30 80 01 09 04 */ lwz r0, 0x904(r1) /* 8007FEF4 0007CE34 7C 08 03 A6 */ mtlr r0 /* 8007FEF8 0007CE38 38 21 09 00 */ addi r1, r1, 0x900 @@ -1678,7 +1678,7 @@ lbl_8007FF14: /* 8007FF28 0007CE68 DB E1 00 E0 */ stfd f31, 0xe0(r1) /* 8007FF2C 0007CE6C F3 E1 00 E8 */ psq_st f31, 232(r1), 0, qr0 /* 8007FF30 0007CE70 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8007FF34 0007CE74 48 2E 22 6D */ bl func_803621A0 +/* 8007FF34 0007CE74 48 2E 22 6D */ bl _savegpr_14 /* 8007FF38 0007CE78 7C 6F 1B 78 */ mr r15, r3 /* 8007FF3C 0007CE7C 7C 90 23 78 */ mr r16, r4 /* 8007FF40 0007CE80 C0 24 00 2C */ lfs f1, 0x2c(r4) @@ -1946,7 +1946,7 @@ lbl_80080310: /* 80080310 0007D250 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, qr0 /* 80080314 0007D254 CB E1 00 E0 */ lfd f31, 0xe0(r1) /* 80080318 0007D258 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8008031C 0007D25C 48 2E 1E D1 */ bl func_803621EC +/* 8008031C 0007D25C 48 2E 1E D1 */ bl _restgpr_14 /* 80080320 0007D260 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80080324 0007D264 7C 08 03 A6 */ mtlr r0 /* 80080328 0007D268 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -1973,7 +1973,7 @@ lbl_80080310: /* 8008037C 0007D2BC DA E1 01 20 */ stfd f23, 0x120(r1) /* 80080380 0007D2C0 F2 E1 01 28 */ psq_st f23, 296(r1), 0, qr0 /* 80080384 0007D2C4 39 61 01 20 */ addi r11, r1, 0x120 -/* 80080388 0007D2C8 48 2E 1E 19 */ bl func_803621A0 +/* 80080388 0007D2C8 48 2E 1E 19 */ bl _savegpr_14 /* 8008038C 0007D2CC 7C 7E 1B 78 */ mr r30, r3 /* 80080390 0007D2D0 7C 9F 23 78 */ mr r31, r4 /* 80080394 0007D2D4 38 00 00 00 */ li r0, 0 @@ -2935,7 +2935,7 @@ lbl_80081140: /* 80081180 0007E0C0 E2 E1 01 28 */ psq_l f23, 296(r1), 0, qr0 /* 80081184 0007E0C4 CA E1 01 20 */ lfd f23, 0x120(r1) /* 80081188 0007E0C8 39 61 01 20 */ addi r11, r1, 0x120 -/* 8008118C 0007E0CC 48 2E 10 61 */ bl func_803621EC +/* 8008118C 0007E0CC 48 2E 10 61 */ bl _restgpr_14 /* 80081190 0007E0D0 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 80081194 0007E0D4 7C 08 03 A6 */ mtlr r0 /* 80081198 0007E0D8 38 21 01 B0 */ addi r1, r1, 0x1b0 @@ -2960,7 +2960,7 @@ lbl_80081140: /* 800811E4 0007E124 DB 01 01 10 */ stfd f24, 0x110(r1) /* 800811E8 0007E128 F3 01 01 18 */ psq_st f24, 280(r1), 0, qr0 /* 800811EC 0007E12C 39 61 01 10 */ addi r11, r1, 0x110 -/* 800811F0 0007E130 48 2E 0F B1 */ bl func_803621A0 +/* 800811F0 0007E130 48 2E 0F B1 */ bl _savegpr_14 /* 800811F4 0007E134 7C 6F 1B 78 */ mr r15, r3 /* 800811F8 0007E138 7C 90 23 78 */ mr r16, r4 /* 800811FC 0007E13C 38 00 00 00 */ li r0, 0 @@ -3789,7 +3789,7 @@ lbl_80081DC0: /* 80081DF8 0007ED38 E3 01 01 18 */ psq_l f24, 280(r1), 0, qr0 /* 80081DFC 0007ED3C CB 01 01 10 */ lfd f24, 0x110(r1) /* 80081E00 0007ED40 39 61 01 10 */ addi r11, r1, 0x110 -/* 80081E04 0007ED44 48 2E 03 E9 */ bl func_803621EC +/* 80081E04 0007ED44 48 2E 03 E9 */ bl _restgpr_14 /* 80081E08 0007ED48 80 01 01 94 */ lwz r0, 0x194(r1) /* 80081E0C 0007ED4C 7C 08 03 A6 */ mtlr r0 /* 80081E10 0007ED50 38 21 01 90 */ addi r1, r1, 0x190 @@ -3800,7 +3800,7 @@ lbl_80081DC0: /* 80081E24 0007ED64 DB E1 00 90 */ stfd f31, 0x90(r1) /* 80081E28 0007ED68 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 80081E2C 0007ED6C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80081E30 0007ED70 48 2E 03 85 */ bl func_803621B4 +/* 80081E30 0007ED70 48 2E 03 85 */ bl _savegpr_19 /* 80081E34 0007ED74 7C 7E 1B 78 */ mr r30, r3 /* 80081E38 0007ED78 7C 9F 23 78 */ mr r31, r4 /* 80081E3C 0007ED7C 3B 5F 00 3C */ addi r26, r31, 0x3c @@ -4020,7 +4020,7 @@ lbl_80082164: /* 80082164 0007F0A4 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 80082168 0007F0A8 CB E1 00 90 */ lfd f31, 0x90(r1) /* 8008216C 0007F0AC 39 61 00 90 */ addi r11, r1, 0x90 -/* 80082170 0007F0B0 48 2E 00 91 */ bl func_80362200 +/* 80082170 0007F0B0 48 2E 00 91 */ bl _restgpr_19 /* 80082174 0007F0B4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80082178 0007F0B8 7C 08 03 A6 */ mtlr r0 /* 8008217C 0007F0BC 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -4031,7 +4031,7 @@ lbl_80082164: /* 80082190 0007F0D0 DB E1 00 80 */ stfd f31, 0x80(r1) /* 80082194 0007F0D4 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 80082198 0007F0D8 39 61 00 80 */ addi r11, r1, 0x80 -/* 8008219C 0007F0DC 48 2E 00 19 */ bl func_803621B4 +/* 8008219C 0007F0DC 48 2E 00 19 */ bl _savegpr_19 /* 800821A0 0007F0E0 7C 7E 1B 78 */ mr r30, r3 /* 800821A4 0007F0E4 7C 9F 23 78 */ mr r31, r4 /* 800821A8 0007F0E8 3B 5F 00 3C */ addi r26, r31, 0x3c @@ -4251,7 +4251,7 @@ lbl_800824CC: /* 800824CC 0007F40C E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 800824D0 0007F410 CB E1 00 80 */ lfd f31, 0x80(r1) /* 800824D4 0007F414 39 61 00 80 */ addi r11, r1, 0x80 -/* 800824D8 0007F418 48 2D FD 29 */ bl func_80362200 +/* 800824D8 0007F418 48 2D FD 29 */ bl _restgpr_19 /* 800824DC 0007F41C 80 01 00 94 */ lwz r0, 0x94(r1) /* 800824E0 0007F420 7C 08 03 A6 */ mtlr r0 /* 800824E4 0007F424 38 21 00 90 */ addi r1, r1, 0x90 @@ -4260,7 +4260,7 @@ lbl_800824CC: /* 800824F0 0007F430 7C 08 02 A6 */ mflr r0 /* 800824F4 0007F434 90 01 01 24 */ stw r0, 0x124(r1) /* 800824F8 0007F438 39 61 01 20 */ addi r11, r1, 0x120 -/* 800824FC 0007F43C 48 2D FC A5 */ bl func_803621A0 +/* 800824FC 0007F43C 48 2D FC A5 */ bl _savegpr_14 /* 80082500 0007F440 7C 6F 1B 78 */ mr r15, r3 /* 80082504 0007F444 7C 90 23 78 */ mr r16, r4 /* 80082508 0007F448 90 A1 00 08 */ stw r5, 8(r1) @@ -4578,7 +4578,7 @@ lbl_80082964: /* 80082990 0007F8D0 7E C3 B3 78 */ mr r3, r22 lbl_80082994: /* 80082994 0007F8D4 39 61 01 20 */ addi r11, r1, 0x120 -/* 80082998 0007F8D8 48 2D F8 55 */ bl func_803621EC +/* 80082998 0007F8D8 48 2D F8 55 */ bl _restgpr_14 /* 8008299C 0007F8DC 80 01 01 24 */ lwz r0, 0x124(r1) /* 800829A0 0007F8E0 7C 08 03 A6 */ mtlr r0 /* 800829A4 0007F8E4 38 21 01 20 */ addi r1, r1, 0x120 diff --git a/asm/d/bright/d_bright_check.s b/asm/d/bright/d_bright_check.s index 404ad20157..44c80091a7 100644 --- a/asm/d/bright/d_bright_check.s +++ b/asm/d/bright/d_bright_check.s @@ -384,7 +384,7 @@ lbl_801934A0: /* 801934B0 001903F0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 801934B4 001903F4 CB E1 00 50 */ lfd f31, 0x50(r1) /* 801934B8 001903F8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801934BC 001903FC 48 1C ED 51 */ bl func_8036220C +/* 801934BC 001903FC 48 1C ED 51 */ bl _restgpr_22 /* 801934C0 00190400 80 01 00 64 */ lwz r0, 0x64(r1) /* 801934C4 00190404 7C 08 03 A6 */ mtlr r0 /* 801934C8 00190408 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index fb982ee3b9..8e006e3357 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -848,7 +848,7 @@ lbl_80086AA8: /* 80086AC4 00083A04 7C 08 02 A6 */ mflr r0 /* 80086AC8 00083A08 90 01 00 64 */ stw r0, 0x64(r1) /* 80086ACC 00083A0C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086AD0 00083A10 48 2D B6 DD */ bl func_803621AC +/* 80086AD0 00083A10 48 2D B6 DD */ bl _savegpr_17 /* 80086AD4 00083A14 7C 76 1B 78 */ mr r22, r3 /* 80086AD8 00083A18 7C 97 23 78 */ mr r23, r4 /* 80086ADC 00083A1C 7C B8 2B 78 */ mr r24, r5 @@ -1030,7 +1030,7 @@ lbl_80086D2C: /* 80086D70 00083CB0 4B FF FA ED */ bl dCcS_NS_ProcAtTgHitmark lbl_80086D74: /* 80086D74 00083CB4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086D78 00083CB8 48 2D B4 81 */ bl func_803621F8 +/* 80086D78 00083CB8 48 2D B4 81 */ bl _restgpr_17 /* 80086D7C 00083CBC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80086D80 00083CC0 7C 08 03 A6 */ mtlr r0 /* 80086D84 00083CC4 38 21 00 60 */ addi r1, r1, 0x60 @@ -1179,7 +1179,7 @@ lbl_80086F54: lbl_80086FA0: /* 80086FA0 00083EE0 CB E1 00 88 */ lfd f31, 0x88(r1) /* 80086FA4 00083EE4 39 61 00 88 */ addi r11, r1, 0x88 -/* 80086FA8 00083EE8 48 2D B2 69 */ bl func_80362210 +/* 80086FA8 00083EE8 48 2D B2 69 */ bl _restgpr_23 /* 80086FAC 00083EEC 80 01 00 94 */ lwz r0, 0x94(r1) /* 80086FB0 00083EF0 7C 08 03 A6 */ mtlr r0 /* 80086FB4 00083EF4 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/cc/mass/d_cc_mass_s.s b/asm/d/cc/mass/d_cc_mass_s.s index ec3534ea99..55552d3d62 100644 --- a/asm/d/cc/mass/d_cc_mass_s.s +++ b/asm/d/cc/mass/d_cc_mass_s.s @@ -705,7 +705,7 @@ lbl_80085CC0: /* 80085CD0 00082C10 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 80085CD4 00082C14 CB E1 00 70 */ lfd f31, 0x70(r1) /* 80085CD8 00082C18 39 61 00 70 */ addi r11, r1, 0x70 -/* 80085CDC 00082C1C 48 2D C5 35 */ bl func_80362210 +/* 80085CDC 00082C1C 48 2D C5 35 */ bl _restgpr_23 /* 80085CE0 00082C20 80 01 00 84 */ lwz r0, 0x84(r1) /* 80085CE4 00082C24 7C 08 03 A6 */ mtlr r0 /* 80085CE8 00082C28 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index adafbe292f..ddcc5bb207 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -2331,7 +2331,7 @@ dComIfGp_setNextStage: /* 8002D308 0002A248 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8002D30C 0002A24C F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8002D310 0002A250 39 61 00 60 */ addi r11, r1, 0x60 -/* 8002D314 0002A254 48 33 4E A9 */ bl func_803621BC +/* 8002D314 0002A254 48 33 4E A9 */ bl _savegpr_21 /* 8002D318 0002A258 7C 77 1B 78 */ mr r23, r3 /* 8002D31C 0002A25C 7C 98 23 78 */ mr r24, r4 /* 8002D320 0002A260 7C B9 2B 78 */ mr r25, r5 @@ -2485,7 +2485,7 @@ lbl_8002D534: /* 8002D534 0002A474 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8002D538 0002A478 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8002D53C 0002A47C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8002D540 0002A480 48 33 4C C9 */ bl func_80362208 +/* 8002D540 0002A480 48 33 4C C9 */ bl _restgpr_21 /* 8002D544 0002A484 80 01 00 74 */ lwz r0, 0x74(r1) /* 8002D548 0002A488 7C 08 03 A6 */ mtlr r0 /* 8002D54C 0002A48C 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index 079153831a..cb7e851530 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -4697,7 +4697,7 @@ dCamera_c_NS_nextType: /* 80163D60 00160CA0 7C 08 02 A6 */ mflr r0 /* 80163D64 00160CA4 90 01 00 44 */ stw r0, 0x44(r1) /* 80163D68 00160CA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80163D6C 00160CAC 48 1F E4 51 */ bl func_803621BC +/* 80163D6C 00160CAC 48 1F E4 51 */ bl _savegpr_21 /* 80163D70 00160CB0 7C 77 1B 78 */ mr r23, r3 /* 80163D74 00160CB4 7C 98 23 78 */ mr r24, r4 /* 80163D78 00160CB8 7F 1D C3 78 */ mr r29, r24 @@ -5177,7 +5177,7 @@ lbl_80164404: lbl_80164430: /* 80164430 00161370 7F A3 EB 78 */ mr r3, r29 /* 80164434 00161374 39 61 00 40 */ addi r11, r1, 0x40 -/* 80164438 00161378 48 1F DD D1 */ bl func_80362208 +/* 80164438 00161378 48 1F DD D1 */ bl _restgpr_21 /* 8016443C 0016137C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80164440 00161380 7C 08 03 A6 */ mtlr r0 /* 80164444 00161384 38 21 00 40 */ addi r1, r1, 0x40 @@ -9033,7 +9033,7 @@ lbl_80167B30: /* 80167B9C 00164ADC E3 21 06 08 */ psq_l f25, 1544(r1), 0, qr0 /* 80167BA0 00164AE0 CB 21 06 00 */ lfd f25, 0x600(r1) /* 80167BA4 00164AE4 39 61 06 00 */ addi r11, r1, 0x600 -/* 80167BA8 00164AE8 48 1F A6 65 */ bl func_8036220C +/* 80167BA8 00164AE8 48 1F A6 65 */ bl _restgpr_22 /* 80167BAC 00164AEC 80 01 06 74 */ lwz r0, 0x674(r1) /* 80167BB0 00164AF0 7C 08 03 A6 */ mtlr r0 /* 80167BB4 00164AF4 38 21 06 70 */ addi r1, r1, 0x670 @@ -9877,7 +9877,7 @@ dCamera_c_NS_chaseCamera: /* 801687D8 00165718 D9 C1 06 20 */ stfd f14, 0x620(r1) /* 801687DC 0016571C F1 C1 06 28 */ psq_st f14, 1576(r1), 0, qr0 /* 801687E0 00165720 39 61 06 20 */ addi r11, r1, 0x620 -/* 801687E4 00165724 48 1F 99 C5 */ bl func_803621A8 +/* 801687E4 00165724 48 1F 99 C5 */ bl _savegpr_16 /* 801687E8 00165728 7C 7F 1B 78 */ mr r31, r3 /* 801687EC 0016572C 7C 9E 23 78 */ mr r30, r4 /* 801687F0 00165730 88 0D 8A B8 */ lbz r0, lbl_80451038-_SDA_BASE_(r13) @@ -13850,7 +13850,7 @@ lbl_8016C1B4: /* 8016C23C 0016917C E1 C1 06 28 */ psq_l f14, 1576(r1), 0, qr0 /* 8016C240 00169180 C9 C1 06 20 */ lfd f14, 0x620(r1) /* 8016C244 00169184 39 61 06 20 */ addi r11, r1, 0x620 -/* 8016C248 00169188 48 1F 5F AD */ bl func_803621F4 +/* 8016C248 00169188 48 1F 5F AD */ bl _restgpr_16 /* 8016C24C 0016918C 80 01 07 44 */ lwz r0, 0x744(r1) /* 8016C250 00169190 7C 08 03 A6 */ mtlr r0 /* 8016C254 00169194 38 21 07 40 */ addi r1, r1, 0x740 @@ -13991,7 +13991,7 @@ _unnamed_d_camera_cpp__NS_check_owner_action: /* 8016C418 00169358 D9 C1 04 30 */ stfd f14, 0x430(r1) /* 8016C41C 0016935C F1 C1 04 38 */ psq_st f14, 1080(r1), 0, qr0 /* 8016C420 00169360 39 61 04 30 */ addi r11, r1, 0x430 -/* 8016C424 00169364 48 1F 5D 8D */ bl func_803621B0 +/* 8016C424 00169364 48 1F 5D 8D */ bl _savegpr_18 /* 8016C428 00169368 7C 7E 1B 78 */ mr r30, r3 /* 8016C42C 0016936C 7C 9F 23 78 */ mr r31, r4 /* 8016C430 00169370 C3 C3 0A 40 */ lfs f30, 0xa40(r3) @@ -16141,7 +16141,7 @@ lbl_8016E2B0: /* 8016E3F0 0016B330 E1 C1 04 38 */ psq_l f14, 1080(r1), 0, qr0 /* 8016E3F4 0016B334 C9 C1 04 30 */ lfd f14, 0x430(r1) /* 8016E3F8 0016B338 39 61 04 30 */ addi r11, r1, 0x430 -/* 8016E3FC 0016B33C 48 1F 3E 01 */ bl func_803621FC +/* 8016E3FC 0016B33C 48 1F 3E 01 */ bl _restgpr_18 /* 8016E400 0016B340 80 01 05 54 */ lwz r0, 0x554(r1) /* 8016E404 0016B344 7C 08 03 A6 */ mtlr r0 /* 8016E408 0016B348 38 21 05 50 */ addi r1, r1, 0x550 @@ -23168,7 +23168,7 @@ lbl_80174D4C: /* 80174DF8 00171D38 12 21 00 0C */ psq_lx f17, r1, r0, 0, qr0 /* 80174DFC 00171D3C CA 21 14 A0 */ lfd f17, 0x14a0(r1) /* 80174E00 00171D40 39 61 14 A0 */ addi r11, r1, 0x14a0 -/* 80174E04 00171D44 48 1E D4 09 */ bl func_8036220C +/* 80174E04 00171D44 48 1E D4 09 */ bl _restgpr_22 /* 80174E08 00171D48 80 01 15 94 */ lwz r0, 0x1594(r1) /* 80174E0C 00171D4C 7C 08 03 A6 */ mtlr r0 /* 80174E10 00171D50 38 21 15 90 */ addi r1, r1, 0x1590 @@ -23267,7 +23267,7 @@ lbl_80174EC4: /* 80174F50 00171E90 DA 21 03 B0 */ stfd f17, 0x3b0(r1) /* 80174F54 00171E94 F2 21 03 B8 */ psq_st f17, 952(r1), 0, qr0 /* 80174F58 00171E98 39 61 03 B0 */ addi r11, r1, 0x3b0 -/* 80174F5C 00171E9C 48 1E D2 61 */ bl func_803621BC +/* 80174F5C 00171E9C 48 1E D2 61 */ bl _savegpr_21 /* 80174F60 00171EA0 7C 7F 1B 78 */ mr r31, r3 /* 80174F64 00171EA4 7C 96 23 78 */ mr r22, r4 /* 80174F68 00171EA8 80 03 0A F4 */ lwz r0, 0xaf4(r3) @@ -24419,7 +24419,7 @@ lbl_80175FE4: /* 80176054 00172F94 E2 21 03 B8 */ psq_l f17, 952(r1), 0, qr0 /* 80176058 00172F98 CA 21 03 B0 */ lfd f17, 0x3b0(r1) /* 8017605C 00172F9C 39 61 03 B0 */ addi r11, r1, 0x3b0 -/* 80176060 00172FA0 48 1E C1 A9 */ bl func_80362208 +/* 80176060 00172FA0 48 1E C1 A9 */ bl _restgpr_21 /* 80176064 00172FA4 80 01 04 A4 */ lwz r0, 0x4a4(r1) /* 80176068 00172FA8 7C 08 03 A6 */ mtlr r0 /* 8017606C 00172FAC 38 21 04 A0 */ addi r1, r1, 0x4a0 @@ -27464,7 +27464,7 @@ lbl_80178DA8: /* 80178E30 00175D70 E1 C1 04 78 */ psq_l f14, 1144(r1), 0, qr0 /* 80178E34 00175D74 C9 C1 04 70 */ lfd f14, 0x470(r1) /* 80178E38 00175D78 39 61 04 70 */ addi r11, r1, 0x470 -/* 80178E3C 00175D7C 48 1E 93 D1 */ bl func_8036220C +/* 80178E3C 00175D7C 48 1E 93 D1 */ bl _restgpr_22 /* 80178E40 00175D80 80 01 05 94 */ lwz r0, 0x594(r1) /* 80178E44 00175D84 7C 08 03 A6 */ mtlr r0 /* 80178E48 00175D88 38 21 05 90 */ addi r1, r1, 0x590 @@ -29577,7 +29577,7 @@ lbl_8017AD48: /* 8017ADA0 00177CE0 E2 81 02 98 */ psq_l f20, 664(r1), 0, qr0 /* 8017ADA4 00177CE4 CA 81 02 90 */ lfd f20, 0x290(r1) /* 8017ADA8 00177CE8 39 61 02 90 */ addi r11, r1, 0x290 -/* 8017ADAC 00177CEC 48 1E 74 65 */ bl func_80362210 +/* 8017ADAC 00177CEC 48 1E 74 65 */ bl _restgpr_23 /* 8017ADB0 00177CF0 80 01 03 54 */ lwz r0, 0x354(r1) /* 8017ADB4 00177CF4 7C 08 03 A6 */ mtlr r0 /* 8017ADB8 00177CF8 38 21 03 50 */ addi r1, r1, 0x350 @@ -36398,7 +36398,7 @@ dCamera_c_NS_SetBlurePosition: /* 80181224 0017E164 7C 08 02 A6 */ mflr r0 /* 80181228 0017E168 90 01 00 34 */ stw r0, 0x34(r1) /* 8018122C 0017E16C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80181230 0017E170 48 1E 0F 15 */ bl func_80362144 +/* 80181230 0017E170 48 1E 0F 15 */ bl _savefpr_29 /* 80181234 0017E174 93 E1 00 14 */ stw r31, 0x14(r1) /* 80181238 0017E178 7C 7F 1B 78 */ mr r31, r3 /* 8018123C 0017E17C FF A0 08 90 */ fmr f29, f1 @@ -36410,7 +36410,7 @@ dCamera_c_NS_SetBlurePosition: /* 80181254 0017E194 D3 DF 07 1C */ stfs f30, 0x71c(r31) /* 80181258 0017E198 D3 FF 07 20 */ stfs f31, 0x720(r31) /* 8018125C 0017E19C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80181260 0017E1A0 48 1E 0F 31 */ bl func_80362190 +/* 80181260 0017E1A0 48 1E 0F 31 */ bl _restfpr_29 /* 80181264 0017E1A4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80181268 0017E1A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018126C 0017E1AC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index eb36a6637a..c947f3677c 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -536,7 +536,7 @@ lbl_80038508: /* 8003851C 0003545C 7C 08 02 A6 */ mflr r0 /* 80038520 00035460 90 01 00 54 */ stw r0, 0x54(r1) /* 80038524 00035464 39 61 00 50 */ addi r11, r1, 0x50 -/* 80038528 00035468 48 32 9C 95 */ bl func_803621BC +/* 80038528 00035468 48 32 9C 95 */ bl _savegpr_21 /* 8003852C 0003546C 7C 77 1B 78 */ mr r23, r3 /* 80038530 00035470 7C 95 23 78 */ mr r21, r4 /* 80038534 00035474 7C B8 2B 78 */ mr r24, r5 @@ -704,7 +704,7 @@ lbl_8003878C: /* 8003878C 000356CC 38 60 00 01 */ li r3, 1 lbl_80038790: /* 80038790 000356D0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80038794 000356D4 48 32 9A 75 */ bl func_80362208 +/* 80038794 000356D4 48 32 9A 75 */ bl _restgpr_21 /* 80038798 000356D8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003879C 000356DC 7C 08 03 A6 */ mtlr r0 /* 800387A0 000356E0 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index 5cc0ec3d66..96ee52dc71 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -1100,7 +1100,7 @@ dDlst_2DT2_c_NS_init: /* 80052B50 0004FA90 7C 08 02 A6 */ mflr r0 /* 80052B54 0004FA94 90 01 00 54 */ stw r0, 0x54(r1) /* 80052B58 0004FA98 39 61 00 50 */ addi r11, r1, 0x50 -/* 80052B5C 0004FA9C 48 30 F5 DD */ bl func_80362138 +/* 80052B5C 0004FA9C 48 30 F5 DD */ bl _savefpr_26 /* 80052B60 0004FAA0 39 61 00 20 */ addi r11, r1, 0x20 /* 80052B64 0004FAA4 48 30 F6 75 */ bl _savegpr_28 /* 80052B68 0004FAA8 7C 7C 1B 78 */ mr r28, r3 @@ -1158,7 +1158,7 @@ lbl_80052C0C: lbl_80052C34: /* 80052C34 0004FB74 9B BC 00 46 */ stb r29, 0x46(r28) /* 80052C38 0004FB78 39 61 00 50 */ addi r11, r1, 0x50 -/* 80052C3C 0004FB7C 48 30 F5 49 */ bl func_80362184 +/* 80052C3C 0004FB7C 48 30 F5 49 */ bl _restfpr_26 /* 80052C40 0004FB80 39 61 00 20 */ addi r11, r1, 0x20 /* 80052C44 0004FB84 48 30 F5 E1 */ bl _restgpr_28 /* 80052C48 0004FB88 80 01 00 54 */ lwz r0, 0x54(r1) @@ -1469,7 +1469,7 @@ lbl_80052C34: /* 8005310C 0005004C 7D 89 03 A6 */ mtctr r12 /* 80053110 00050050 4E 80 04 21 */ bctrl /* 80053114 00050054 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80053118 00050058 48 30 F0 F5 */ bl func_8036220C +/* 80053118 00050058 48 30 F0 F5 */ bl _restgpr_22 /* 8005311C 0005005C 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80053120 00050060 7C 08 03 A6 */ mtlr r0 /* 80053124 00050064 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -1799,7 +1799,7 @@ lbl_800533AC: /* 8005362C 0005056C E3 C1 00 B8 */ psq_l f30, 184(r1), 0, qr0 /* 80053630 00050570 CB C1 00 B0 */ lfd f30, 0xb0(r1) /* 80053634 00050574 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80053638 00050578 48 30 EB D9 */ bl func_80362210 +/* 80053638 00050578 48 30 EB D9 */ bl _restgpr_23 /* 8005363C 0005057C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80053640 00050580 7C 08 03 A6 */ mtlr r0 /* 80053644 00050584 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -2588,7 +2588,7 @@ lbl_800541CC: /* 800541D4 00051114 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 800541D8 00051118 CB E1 00 70 */ lfd f31, 0x70(r1) /* 800541DC 0005111C 39 61 00 70 */ addi r11, r1, 0x70 -/* 800541E0 00051120 48 30 E0 31 */ bl func_80362210 +/* 800541E0 00051120 48 30 E0 31 */ bl _restgpr_23 /* 800541E4 00051124 80 01 00 84 */ lwz r0, 0x84(r1) /* 800541E8 00051128 7C 08 03 A6 */ mtlr r0 /* 800541EC 0005112C 38 21 00 80 */ addi r1, r1, 0x80 @@ -4274,7 +4274,7 @@ lbl_800559EC: /* 800559F4 00052934 38 60 00 01 */ li r3, 1 /* 800559F8 00052938 48 30 A3 E1 */ bl GXSetDither /* 800559FC 0005293C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80055A00 00052940 48 30 C8 11 */ bl func_80362210 +/* 80055A00 00052940 48 30 C8 11 */ bl _restgpr_23 /* 80055A04 00052944 80 01 00 54 */ lwz r0, 0x54(r1) /* 80055A08 00052948 7C 08 03 A6 */ mtlr r0 /* 80055A0C 0005294C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_envse.s b/asm/d/d_envse.s index d7cbc942d5..18a0d9c0e7 100644 --- a/asm/d/d_envse.s +++ b/asm/d/d_envse.s @@ -470,7 +470,7 @@ lbl_80183460: /* 80183460 001803A0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 80183464 001803A4 CB E1 00 60 */ lfd f31, 0x60(r1) /* 80183468 001803A8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8018346C 001803AC 48 1D ED A1 */ bl func_8036220C +/* 8018346C 001803AC 48 1D ED A1 */ bl _restgpr_22 /* 80183470 001803B0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80183474 001803B4 7C 08 03 A6 */ mtlr r0 /* 80183478 001803B8 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index 3f81666772..d3664233f6 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -252,7 +252,7 @@ lbl_800417DC: /* 800417E8 0003E728 38 60 00 01 */ li r3, 1 lbl_800417EC: /* 800417EC 0003E72C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800417F0 0003E730 48 32 0A 1D */ bl func_8036220C +/* 800417F0 0003E730 48 32 0A 1D */ bl _restgpr_22 /* 800417F4 0003E734 80 01 00 34 */ lwz r0, 0x34(r1) /* 800417F8 0003E738 7C 08 03 A6 */ mtlr r0 /* 800417FC 0003E73C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 0cab9cd39b..1b28f875ac 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -1245,7 +1245,7 @@ lbl_80029668: lbl_800296D0: /* 800296D0 00026610 7F E3 FB 78 */ mr r3, r31 /* 800296D4 00026614 39 61 00 30 */ addi r11, r1, 0x30 -/* 800296D8 00026618 48 33 8B 35 */ bl func_8036220C +/* 800296D8 00026618 48 33 8B 35 */ bl _restgpr_22 /* 800296DC 0002661C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800296E0 00026620 7C 08 03 A6 */ mtlr r0 /* 800296E4 00026624 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_name.s b/asm/d/d_name.s index 8cbbf4935e..5e6b7d0add 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -2383,7 +2383,7 @@ dName_c_NS_screenSet: /* 802505D0 0024D510 7C 08 02 A6 */ mflr r0 /* 802505D4 0024D514 90 01 00 E4 */ stw r0, 0xe4(r1) /* 802505D8 0024D518 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 802505DC 0024D51C 48 11 1B D9 */ bl func_803621B4 +/* 802505DC 0024D51C 48 11 1B D9 */ bl _savegpr_19 /* 802505E0 0024D520 7C 7F 1B 78 */ mr r31, r3 /* 802505E4 0024D524 3C 60 80 3C */ lis r3, lbl_803C1F50@ha /* 802505E8 0024D528 3B C3 1F 50 */ addi r30, r3, lbl_803C1F50@l @@ -2843,7 +2843,7 @@ lbl_80250C2C: /* 80250CCC 0024DC0C C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) /* 80250CD0 0024DC10 4B F4 45 D1 */ bl dSelect_cursor_c_NS_setAlphaRate /* 80250CD4 0024DC14 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80250CD8 0024DC18 48 11 15 29 */ bl func_80362200 +/* 80250CD8 0024DC18 48 11 15 29 */ bl _restgpr_19 /* 80250CDC 0024DC1C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80250CE0 0024DC20 7C 08 03 A6 */ mtlr r0 /* 80250CE4 0024DC24 38 21 00 E0 */ addi r1, r1, 0xe0 diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index d3ac833f47..4eb2123a92 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -1338,7 +1338,7 @@ lbl_8004A664: /* 8004A790 000476D0 38 60 00 01 */ li r3, 1 lbl_8004A794: /* 8004A794 000476D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004A798 000476D8 48 31 7A 79 */ bl func_80362210 +/* 8004A798 000476D8 48 31 7A 79 */ bl _restgpr_23 /* 8004A79C 000476DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004A7A0 000476E0 7C 08 03 A6 */ mtlr r0 /* 8004A7A4 000476E4 38 21 00 30 */ addi r1, r1, 0x30 @@ -3867,7 +3867,7 @@ lbl_8004CA50: /* 8004CA70 000499B0 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 8004CA74 000499B4 CB E1 00 70 */ lfd f31, 0x70(r1) /* 8004CA78 000499B8 39 61 00 70 */ addi r11, r1, 0x70 -/* 8004CA7C 000499BC 48 31 57 91 */ bl func_8036220C +/* 8004CA7C 000499BC 48 31 57 91 */ bl _restgpr_22 /* 8004CA80 000499C0 80 01 00 84 */ lwz r0, 0x84(r1) /* 8004CA84 000499C4 7C 08 03 A6 */ mtlr r0 /* 8004CA88 000499C8 38 21 00 80 */ addi r1, r1, 0x80 @@ -3881,7 +3881,7 @@ dPa_control_c_NS_set: /* 8004CA9C 000499DC DB E1 00 80 */ stfd f31, 0x80(r1) /* 8004CAA0 000499E0 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 8004CAA4 000499E4 39 61 00 80 */ addi r11, r1, 0x80 -/* 8004CAA8 000499E8 48 31 57 11 */ bl func_803621B8 +/* 8004CAA8 000499E8 48 31 57 11 */ bl _savegpr_20 /* 8004CAAC 000499EC 98 81 00 08 */ stb r4, 8(r1) /* 8004CAB0 000499F0 7C B6 2B 78 */ mr r22, r5 /* 8004CAB4 000499F4 7C D7 33 78 */ mr r23, r6 @@ -4212,7 +4212,7 @@ lbl_8004CF70: /* 8004CF70 00049EB0 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 8004CF74 00049EB4 CB E1 00 80 */ lfd f31, 0x80(r1) /* 8004CF78 00049EB8 39 61 00 80 */ addi r11, r1, 0x80 -/* 8004CF7C 00049EBC 48 31 52 89 */ bl func_80362204 +/* 8004CF7C 00049EBC 48 31 52 89 */ bl _restgpr_20 /* 8004CF80 00049EC0 80 01 00 94 */ lwz r0, 0x94(r1) /* 8004CF84 00049EC4 7C 08 03 A6 */ mtlr r0 /* 8004CF88 00049EC8 38 21 00 90 */ addi r1, r1, 0x90 @@ -4326,7 +4326,7 @@ lbl_8004D10C: /* 8004D10C 0004A04C 38 60 00 00 */ li r3, 0 lbl_8004D110: /* 8004D110 0004A050 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004D114 0004A054 48 31 50 FD */ bl func_80362210 +/* 8004D114 0004A054 48 31 50 FD */ bl _restgpr_23 /* 8004D118 0004A058 80 01 00 64 */ lwz r0, 0x64(r1) /* 8004D11C 0004A05C 7C 08 03 A6 */ mtlr r0 /* 8004D120 0004A060 38 21 00 60 */ addi r1, r1, 0x60 @@ -4597,7 +4597,7 @@ dPa_control_c_NS_set_X1_: /* 8004D4D8 0004A418 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8004D4DC 0004A41C F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8004D4E0 0004A420 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004D4E4 0004A424 48 31 4C C9 */ bl func_803621AC +/* 8004D4E4 0004A424 48 31 4C C9 */ bl _savegpr_17 /* 8004D4E8 0004A428 7C 75 1B 78 */ mr r21, r3 /* 8004D4EC 0004A42C 7C B6 2B 78 */ mr r22, r5 /* 8004D4F0 0004A430 7C D7 33 78 */ mr r23, r6 @@ -4711,7 +4711,7 @@ lbl_8004D684: /* 8004D684 0004A5C4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8004D688 0004A5C8 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8004D68C 0004A5CC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004D690 0004A5D0 48 31 4B 69 */ bl func_803621F8 +/* 8004D690 0004A5D0 48 31 4B 69 */ bl _restgpr_17 /* 8004D694 0004A5D4 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004D698 0004A5D8 7C 08 03 A6 */ mtlr r0 /* 8004D69C 0004A5DC 38 21 00 70 */ addi r1, r1, 0x70 @@ -4767,7 +4767,7 @@ lbl_8004D754: /* 8004D754 0004A694 38 60 00 00 */ li r3, 0 lbl_8004D758: /* 8004D758 0004A698 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004D75C 0004A69C 48 31 4A B1 */ bl func_8036220C +/* 8004D75C 0004A69C 48 31 4A B1 */ bl _restgpr_22 /* 8004D760 0004A6A0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8004D764 0004A6A4 7C 08 03 A6 */ mtlr r0 /* 8004D768 0004A6A8 38 21 00 60 */ addi r1, r1, 0x60 @@ -4805,7 +4805,7 @@ dPa_control_c_NS_setSimpleFoot: /* 8004D7C8 0004A708 7C 08 02 A6 */ mflr r0 /* 8004D7CC 0004A70C 90 01 00 74 */ stw r0, 0x74(r1) /* 8004D7D0 0004A710 39 61 00 70 */ addi r11, r1, 0x70 -/* 8004D7D4 0004A714 48 31 49 E1 */ bl func_803621B4 +/* 8004D7D4 0004A714 48 31 49 E1 */ bl _savegpr_19 /* 8004D7D8 0004A718 7C 7E 1B 78 */ mr r30, r3 /* 8004D7DC 0004A71C 7C 9C 23 78 */ mr r28, r4 /* 8004D7E0 0004A720 7C BF 2B 78 */ mr r31, r5 @@ -4914,7 +4914,7 @@ lbl_8004D96C: /* 8004D96C 0004A8AC 7F 83 E3 78 */ mr r3, r28 lbl_8004D970: /* 8004D970 0004A8B0 39 61 00 70 */ addi r11, r1, 0x70 -/* 8004D974 0004A8B4 48 31 48 8D */ bl func_80362200 +/* 8004D974 0004A8B4 48 31 48 8D */ bl _restgpr_19 /* 8004D978 0004A8B8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004D97C 0004A8BC 7C 08 03 A6 */ mtlr r0 /* 8004D980 0004A8C0 38 21 00 70 */ addi r1, r1, 0x70 @@ -4926,7 +4926,7 @@ dPa_control_c_NS_setCommonPoly: /* 8004D98C 0004A8CC 7C 08 02 A6 */ mflr r0 /* 8004D990 0004A8D0 90 01 00 94 */ stw r0, 0x94(r1) /* 8004D994 0004A8D4 39 61 00 90 */ addi r11, r1, 0x90 -/* 8004D998 0004A8D8 48 31 48 09 */ bl func_803621A0 +/* 8004D998 0004A8D8 48 31 48 09 */ bl _savegpr_14 /* 8004D99C 0004A8DC 7C 6F 1B 78 */ mr r15, r3 /* 8004D9A0 0004A8E0 7C 90 23 78 */ mr r16, r4 /* 8004D9A4 0004A8E4 7C B1 2B 78 */ mr r17, r5 @@ -5103,7 +5103,7 @@ lbl_8004DBF8: /* 8004DC0C 0004AB4C 7E A3 AB 78 */ mr r3, r21 lbl_8004DC10: /* 8004DC10 0004AB50 39 61 00 90 */ addi r11, r1, 0x90 -/* 8004DC14 0004AB54 48 31 45 D9 */ bl func_803621EC +/* 8004DC14 0004AB54 48 31 45 D9 */ bl _restgpr_14 /* 8004DC18 0004AB58 80 01 00 94 */ lwz r0, 0x94(r1) /* 8004DC1C 0004AB5C 7C 08 03 A6 */ mtlr r0 /* 8004DC20 0004AB60 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index d0aab57865..300fa87cd3 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -419,7 +419,7 @@ addWarpMaterial: /* 8003A844 00037784 7C 08 02 A6 */ mflr r0 /* 8003A848 00037788 90 01 00 54 */ stw r0, 0x54(r1) /* 8003A84C 0003778C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003A850 00037790 48 32 79 69 */ bl func_803621B8 +/* 8003A850 00037790 48 32 79 69 */ bl _savegpr_20 /* 8003A854 00037794 7C 77 1B 78 */ mr r23, r3 /* 8003A858 00037798 3C 60 80 38 */ lis r3, lbl_803798B8@ha /* 8003A85C 0003779C 38 63 98 B8 */ addi r3, r3, lbl_803798B8@l @@ -576,7 +576,7 @@ lbl_8003AAA4: /* 8003AAAC 000379EC 7C 03 00 40 */ cmplw r3, r0 /* 8003AAB0 000379F0 41 80 FE 20 */ blt lbl_8003A8D0 /* 8003AAB4 000379F4 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003AAB8 000379F8 48 32 77 4D */ bl func_80362204 +/* 8003AAB8 000379F8 48 32 77 4D */ bl _restgpr_20 /* 8003AABC 000379FC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003AAC0 00037A00 7C 08 03 A6 */ mtlr r0 /* 8003AAC4 00037A04 38 21 00 50 */ addi r1, r1, 0x50 @@ -1202,7 +1202,7 @@ dRes_info_c_NS_loadResource: /* 8003B310 00038250 7C 08 02 A6 */ mflr r0 /* 8003B314 00038254 90 01 00 54 */ stw r0, 0x54(r1) /* 8003B318 00038258 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003B31C 0003825C 48 32 6E 9D */ bl func_803621B8 +/* 8003B31C 0003825C 48 32 6E 9D */ bl _savegpr_20 /* 8003B320 00038260 7C 7E 1B 78 */ mr r30, r3 /* 8003B324 00038264 80 63 00 14 */ lwz r3, 0x14(r3) /* 8003B328 00038268 80 63 00 44 */ lwz r3, 0x44(r3) @@ -1619,7 +1619,7 @@ lbl_8003B8A0: /* 8003B8B4 000387F4 38 60 00 00 */ li r3, 0 lbl_8003B8B8: /* 8003B8B8 000387F8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003B8BC 000387FC 48 32 69 49 */ bl func_80362204 +/* 8003B8BC 000387FC 48 32 69 49 */ bl _restgpr_20 /* 8003B8C0 00038800 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003B8C4 00038804 7C 08 03 A6 */ mtlr r0 /* 8003B8C8 00038808 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index c2b4f60f89..f498b48000 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -350,7 +350,7 @@ lbl_80193B64: lbl_80193B74: /* 80193B74 00190AB4 7F C3 F3 78 */ mr r3, r30 /* 80193B78 00190AB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80193B7C 00190ABC 48 1C E6 95 */ bl func_80362210 +/* 80193B7C 00190ABC 48 1C E6 95 */ bl _restgpr_23 /* 80193B80 00190AC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80193B84 00190AC4 7C 08 03 A6 */ mtlr r0 /* 80193B88 00190AC8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index fc8f974b5f..7cb5b41897 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -2765,7 +2765,7 @@ lbl_8025F0E4: /* 8025F164 0025C0A4 B2 C3 00 16 */ sth r22, 0x16(r3) lbl_8025F168: /* 8025F168 0025C0A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025F16C 0025C0AC 48 10 30 A1 */ bl func_8036220C +/* 8025F16C 0025C0AC 48 10 30 A1 */ bl _restgpr_22 /* 8025F170 0025C0B0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8025F174 0025C0B4 7C 08 03 A6 */ mtlr r0 /* 8025F178 0025C0B8 38 21 00 40 */ addi r1, r1, 0x40 @@ -4562,7 +4562,7 @@ dDlst_TimerScrnDraw_c_NS_drawPikari: /* 80260B98 0025DAD8 DB 01 00 90 */ stfd f24, 0x90(r1) /* 80260B9C 0025DADC F3 01 00 98 */ psq_st f24, 152(r1), 0, qr0 /* 80260BA0 0025DAE0 39 61 00 90 */ addi r11, r1, 0x90 -/* 80260BA4 0025DAE4 48 10 16 19 */ bl func_803621BC +/* 80260BA4 0025DAE4 48 10 16 19 */ bl _savegpr_21 /* 80260BA8 0025DAE8 7C 7F 1B 78 */ mr r31, r3 /* 80260BAC 0025DAEC 54 9A 20 36 */ slwi r26, r4, 4 /* 80260BB0 0025DAF0 7F 3F D2 14 */ add r25, r31, r26 @@ -4783,7 +4783,7 @@ lbl_80260E94: /* 80260EE4 0025DE24 E3 01 00 98 */ psq_l f24, 152(r1), 0, qr0 /* 80260EE8 0025DE28 CB 01 00 90 */ lfd f24, 0x90(r1) /* 80260EEC 0025DE2C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80260EF0 0025DE30 48 10 13 19 */ bl func_80362208 +/* 80260EF0 0025DE30 48 10 13 19 */ bl _restgpr_21 /* 80260EF4 0025DE34 80 01 01 14 */ lwz r0, 0x114(r1) /* 80260EF8 0025DE38 7C 08 03 A6 */ mtlr r0 /* 80260EFC 0025DE3C 38 21 01 10 */ addi r1, r1, 0x110 @@ -4829,7 +4829,7 @@ dTimer_createTimer: /* 80260F90 0025DED0 7C 08 02 A6 */ mflr r0 /* 80260F94 0025DED4 90 01 00 44 */ stw r0, 0x44(r1) /* 80260F98 0025DED8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80260F9C 0025DEDC 48 10 11 A5 */ bl func_80362140 +/* 80260F9C 0025DEDC 48 10 11 A5 */ bl _savefpr_28 /* 80260FA0 0025DEE0 39 61 00 20 */ addi r11, r1, 0x20 /* 80260FA4 0025DEE4 48 10 12 35 */ bl _savegpr_28 /* 80260FA8 0025DEE8 7C 7C 1B 78 */ mr r28, r3 @@ -4862,7 +4862,7 @@ lbl_80261010: /* 80261010 0025DF50 38 60 FF FF */ li r3, -1 lbl_80261014: /* 80261014 0025DF54 39 61 00 40 */ addi r11, r1, 0x40 -/* 80261018 0025DF58 48 10 11 75 */ bl func_8036218C +/* 80261018 0025DF58 48 10 11 75 */ bl _restfpr_28 /* 8026101C 0025DF5C 39 61 00 20 */ addi r11, r1, 0x20 /* 80261020 0025DF60 48 10 12 05 */ bl _restgpr_28 /* 80261024 0025DF64 80 01 00 44 */ lwz r0, 0x44(r1) diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index b467c097c0..08ea9fdf78 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -230,7 +230,7 @@ dEvDt_Next_Stage: /* 80043A28 00040968 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80043A2C 0004096C F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80043A30 00040970 39 61 00 50 */ addi r11, r1, 0x50 -/* 80043A34 00040974 48 31 E7 81 */ bl func_803621B4 +/* 80043A34 00040974 48 31 E7 81 */ bl _savegpr_19 /* 80043A38 00040978 7C 77 1B 78 */ mr r23, r3 /* 80043A3C 0004097C 3A A0 00 00 */ li r21, 0 /* 80043A40 00040980 7C 9B 07 74 */ extsb r27, r4 @@ -443,7 +443,7 @@ lbl_80043D34: /* 80043D40 00040C80 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 80043D44 00040C84 CB C1 00 50 */ lfd f30, 0x50(r1) /* 80043D48 00040C88 39 61 00 50 */ addi r11, r1, 0x50 -/* 80043D4C 00040C8C 48 31 E4 B5 */ bl func_80362200 +/* 80043D4C 00040C8C 48 31 E4 B5 */ bl _restgpr_19 /* 80043D50 00040C90 80 01 00 74 */ lwz r0, 0x74(r1) /* 80043D54 00040C94 7C 08 03 A6 */ mtlr r0 /* 80043D58 00040C98 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index fdf2c6f306..10655f7588 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -1571,7 +1571,7 @@ lbl_80047904: /* 80047914 00044854 38 60 FF FF */ li r3, -1 lbl_80047918: /* 80047918 00044858 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004791C 0004485C 48 31 A8 F1 */ bl func_8036220C +/* 8004791C 0004485C 48 31 A8 F1 */ bl _restgpr_22 /* 80047920 00044860 80 01 00 64 */ lwz r0, 0x64(r1) /* 80047924 00044864 7C 08 03 A6 */ mtlr r0 /* 80047928 00044868 38 21 00 60 */ addi r1, r1, 0x60 @@ -1730,7 +1730,7 @@ dEvent_manager_c_NS_getMyStaffId: /* 80047B20 00044A60 7C 08 02 A6 */ mflr r0 /* 80047B24 00044A64 90 01 00 54 */ stw r0, 0x54(r1) /* 80047B28 00044A68 39 61 00 50 */ addi r11, r1, 0x50 -/* 80047B2C 00044A6C 48 31 A6 8D */ bl func_803621B8 +/* 80047B2C 00044A6C 48 31 A6 8D */ bl _savegpr_20 /* 80047B30 00044A70 7C 75 1B 78 */ mr r21, r3 /* 80047B34 00044A74 7C 96 23 78 */ mr r22, r4 /* 80047B38 00044A78 7C D7 33 78 */ mr r23, r6 @@ -1881,7 +1881,7 @@ lbl_80047D30: /* 80047D30 00044C70 38 60 FF FF */ li r3, -1 lbl_80047D34: /* 80047D34 00044C74 39 61 00 50 */ addi r11, r1, 0x50 -/* 80047D38 00044C78 48 31 A4 CD */ bl func_80362204 +/* 80047D38 00044C78 48 31 A4 CD */ bl _restgpr_20 /* 80047D3C 00044C7C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80047D40 00044C80 7C 08 03 A6 */ mtlr r0 /* 80047D44 00044C84 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index 4f729ddff1..ec6e75a76d 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -1724,7 +1724,7 @@ dFile_select_c_NS_dataSelectInAnmSet: /* 80184E3C 00181D7C 7C 08 02 A6 */ mflr r0 /* 80184E40 00181D80 90 01 00 54 */ stw r0, 0x54(r1) /* 80184E44 00181D84 39 61 00 50 */ addi r11, r1, 0x50 -/* 80184E48 00181D88 48 1D D3 6D */ bl func_803621B4 +/* 80184E48 00181D88 48 1D D3 6D */ bl _savegpr_19 /* 80184E4C 00181D8C 7C 76 1B 78 */ mr r22, r3 /* 80184E50 00181D90 48 00 81 F5 */ bl dFile_select_c_NS_setSaveData /* 80184E54 00181D94 3B 56 03 B8 */ addi r26, r22, 0x3b8 @@ -1850,7 +1850,7 @@ lbl_80184FB4: /* 80185020 00181F60 39 00 00 00 */ li r8, 0 /* 80185024 00181F64 48 12 69 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 80185028 00181F68 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018502C 00181F6C 48 1D D1 D5 */ bl func_80362200 +/* 8018502C 00181F6C 48 1D D1 D5 */ bl _restgpr_19 /* 80185030 00181F70 80 01 00 54 */ lwz r0, 0x54(r1) /* 80185034 00181F74 7C 08 03 A6 */ mtlr r0 /* 80185038 00181F78 38 21 00 50 */ addi r1, r1, 0x50 @@ -9281,7 +9281,7 @@ lbl_8018BE68: /* 8018BEC0 00188E00 E3 A1 00 B8 */ psq_l f29, 184(r1), 0, qr0 /* 8018BEC4 00188E04 CB A1 00 B0 */ lfd f29, 0xb0(r1) /* 8018BEC8 00188E08 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8018BECC 00188E0C 48 1D 63 41 */ bl func_8036220C +/* 8018BECC 00188E0C 48 1D 63 41 */ bl _restgpr_22 /* 8018BED0 00188E10 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8018BED4 00188E14 7C 08 03 A6 */ mtlr r0 /* 8018BED8 00188E18 38 21 00 E0 */ addi r1, r1, 0xe0 diff --git a/asm/d/jnt/d_jnt_col.s b/asm/d/jnt/d_jnt_col.s index 13075e644c..df3e0c5e50 100644 --- a/asm/d/jnt/d_jnt_col.s +++ b/asm/d/jnt/d_jnt_col.s @@ -108,7 +108,7 @@ dJntCol_c_NS_searchNearPos: /* 80035DEC 00032D2C DB 81 02 70 */ stfd f28, 0x270(r1) /* 80035DF0 00032D30 F3 81 02 78 */ psq_st f28, 632(r1), 0, qr0 /* 80035DF4 00032D34 39 61 02 70 */ addi r11, r1, 0x270 -/* 80035DF8 00032D38 48 32 C3 BD */ bl func_803621B4 +/* 80035DF8 00032D38 48 32 C3 BD */ bl _savegpr_19 /* 80035DFC 00032D3C 7C 7A 1B 78 */ mr r26, r3 /* 80035E00 00032D40 7C 9E 23 78 */ mr r30, r4 /* 80035E04 00032D44 7C BD 2B 78 */ mr r29, r5 @@ -952,7 +952,7 @@ lbl_800369E8: /* 80036A3C 0003397C E3 81 02 78 */ psq_l f28, 632(r1), 0, qr0 /* 80036A40 00033980 CB 81 02 70 */ lfd f28, 0x270(r1) /* 80036A44 00033984 39 61 02 70 */ addi r11, r1, 0x270 -/* 80036A48 00033988 48 32 B7 B9 */ bl func_80362200 +/* 80036A48 00033988 48 32 B7 B9 */ bl _restgpr_19 /* 80036A4C 0003398C 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 80036A50 00033990 7C 08 03 A6 */ mtlr r0 /* 80036A54 00033994 38 21 02 B0 */ addi r1, r1, 0x2b0 diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index 9fb896d71b..1187c0fa86 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -2216,7 +2216,7 @@ renderingPlusDoorAndCursor_c_NS_drawTreasure: /* 80040B14 0003DA54 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80040B18 0003DA58 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80040B1C 0003DA5C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80040B20 0003DA60 48 32 16 99 */ bl func_803621B8 +/* 80040B20 0003DA60 48 32 16 99 */ bl _savegpr_20 /* 80040B24 0003DA64 7C 7F 1B 78 */ mr r31, r3 /* 80040B28 0003DA68 81 83 00 00 */ lwz r12, 0(r3) /* 80040B2C 0003DA6C 81 8C 00 7C */ lwz r12, 0x7c(r12) @@ -2437,7 +2437,7 @@ lbl_80040E44: /* 80040E64 0003DDA4 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 80040E68 0003DDA8 CB C1 00 50 */ lfd f30, 0x50(r1) /* 80040E6C 0003DDAC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80040E70 0003DDB0 48 32 13 95 */ bl func_80362204 +/* 80040E70 0003DDB0 48 32 13 95 */ bl _restgpr_20 /* 80040E74 0003DDB4 80 01 00 74 */ lwz r0, 0x74(r1) /* 80040E78 0003DDB8 7C 08 03 A6 */ mtlr r0 /* 80040E7C 0003DDBC 38 21 00 70 */ addi r1, r1, 0x70 @@ -2453,7 +2453,7 @@ renderingPlusDoorAndCursor_c_NS_drawTreasureAfterPlayer: /* 80040E98 0003DDD8 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80040E9C 0003DDDC F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80040EA0 0003DDE0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80040EA4 0003DDE4 48 32 13 15 */ bl func_803621B8 +/* 80040EA4 0003DDE4 48 32 13 15 */ bl _savegpr_20 /* 80040EA8 0003DDE8 7C 7F 1B 78 */ mr r31, r3 /* 80040EAC 0003DDEC 81 83 00 00 */ lwz r12, 0(r3) /* 80040EB0 0003DDF0 81 8C 00 7C */ lwz r12, 0x7c(r12) @@ -2674,7 +2674,7 @@ lbl_800411C8: /* 800411E8 0003E128 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 800411EC 0003E12C CB C1 00 50 */ lfd f30, 0x50(r1) /* 800411F0 0003E130 39 61 00 50 */ addi r11, r1, 0x50 -/* 800411F4 0003E134 48 32 10 11 */ bl func_80362204 +/* 800411F4 0003E134 48 32 10 11 */ bl _restgpr_20 /* 800411F8 0003E138 80 01 00 74 */ lwz r0, 0x74(r1) /* 800411FC 0003E13C 7C 08 03 A6 */ mtlr r0 /* 80041200 0003E140 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index 9bc5fe7c30..4ed2f66488 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -314,7 +314,7 @@ dMenu_Fmap_region_data_c_NS_getPointStagePathInnerNo: /* 8003DB9C 0003AADC DB 61 00 B0 */ stfd f27, 0xb0(r1) /* 8003DBA0 0003AAE0 F3 61 00 B8 */ psq_st f27, 184(r1), 0, qr0 /* 8003DBA4 0003AAE4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8003DBA8 0003AAE8 48 32 45 F9 */ bl func_803621A0 +/* 8003DBA8 0003AAE8 48 32 45 F9 */ bl _savegpr_14 /* 8003DBAC 0003AAEC 7C 6F 1B 78 */ mr r15, r3 /* 8003DBB0 0003AAF0 FF A0 08 90 */ fmr f29, f1 /* 8003DBB4 0003AAF4 FF C0 10 90 */ fmr f30, f2 @@ -538,7 +538,7 @@ lbl_8003DE9C: /* 8003DEC0 0003AE00 E3 61 00 B8 */ psq_l f27, 184(r1), 0, qr0 /* 8003DEC4 0003AE04 CB 61 00 B0 */ lfd f27, 0xb0(r1) /* 8003DEC8 0003AE08 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8003DECC 0003AE0C 48 32 43 21 */ bl func_803621EC +/* 8003DECC 0003AE0C 48 32 43 21 */ bl _restgpr_14 /* 8003DED0 0003AE10 80 01 01 04 */ lwz r0, 0x104(r1) /* 8003DED4 0003AE14 7C 08 03 A6 */ mtlr r0 /* 8003DED8 0003AE18 38 21 01 00 */ addi r1, r1, 0x100 @@ -1541,7 +1541,7 @@ lbl_8003EC64: lbl_8003EC74: /* 8003EC74 0003BBB4 7E C3 B3 78 */ mr r3, r22 /* 8003EC78 0003BBB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003EC7C 0003BBBC 48 32 35 91 */ bl func_8036220C +/* 8003EC7C 0003BBBC 48 32 35 91 */ bl _restgpr_22 /* 8003EC80 0003BBC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003EC84 0003BBC4 7C 08 03 A6 */ mtlr r0 /* 8003EC88 0003BBC8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index e8e372be20..3e957476d7 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -718,7 +718,7 @@ dMenu_Collect2D_c_NS_screenSet: /* 801B0750 001AD690 7C 08 02 A6 */ mflr r0 /* 801B0754 001AD694 90 01 00 54 */ stw r0, 0x54(r1) /* 801B0758 001AD698 39 61 00 50 */ addi r11, r1, 0x50 -/* 801B075C 001AD69C 48 1B 1A 51 */ bl func_803621AC +/* 801B075C 001AD69C 48 1B 1A 51 */ bl _savegpr_17 /* 801B0760 001AD6A0 7C 7F 1B 78 */ mr r31, r3 /* 801B0764 001AD6A4 3C 60 80 39 */ lis r3, lbl_80394F78@ha /* 801B0768 001AD6A8 3A C3 4F 78 */ addi r22, r3, lbl_80394F78@l @@ -2114,7 +2114,7 @@ lbl_801B1BB0: /* 801B1C1C 001AEB5C 7F E3 FB 78 */ mr r3, r31 /* 801B1C20 001AEB60 48 00 1A ED */ bl dMenu_Collect2D_c_NS_setPohMaxNum /* 801B1C24 001AEB64 39 61 00 50 */ addi r11, r1, 0x50 -/* 801B1C28 001AEB68 48 1B 05 D1 */ bl func_803621F8 +/* 801B1C28 001AEB68 48 1B 05 D1 */ bl _restgpr_17 /* 801B1C2C 001AEB6C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801B1C30 001AEB70 7C 08 03 A6 */ mtlr r0 /* 801B1C34 001AEB74 38 21 00 50 */ addi r1, r1, 0x50 @@ -2932,7 +2932,7 @@ lbl_801B27BC: /* 801B27D0 001AF710 41 80 FE BC */ blt lbl_801B268C lbl_801B27D4: /* 801B27D4 001AF714 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B27D8 001AF718 48 1A FA 39 */ bl func_80362210 +/* 801B27D8 001AF718 48 1A FA 39 */ bl _restgpr_23 /* 801B27DC 001AF71C 80 01 00 64 */ lwz r0, 0x64(r1) /* 801B27E0 001AF720 7C 08 03 A6 */ mtlr r0 /* 801B27E4 001AF724 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index 56850c7c36..95994456bd 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -992,7 +992,7 @@ lbl_801B8DBC: /* 801B8DC4 001B5D04 C0 42 A5 E8 */ lfs f2, lbl_80453FE8-_SDA2_BASE_(r2) /* 801B8DC8 001B5D08 48 09 B7 E9 */ bl CPaneMgr_NS_paneTrans /* 801B8DCC 001B5D0C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B8DD0 001B5D10 48 1A 94 3D */ bl func_8036220C +/* 801B8DD0 001B5D10 48 1A 94 3D */ bl _restgpr_22 /* 801B8DD4 001B5D14 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B8DD8 001B5D18 7C 08 03 A6 */ mtlr r0 /* 801B8DDC 001B5D1C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index cbba69956c..ea7a4aeb23 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -209,7 +209,7 @@ lbl_801C5020: lbl_801C5030: /* 801C5030 001C1F70 7F C3 F3 78 */ mr r3, r30 /* 801C5034 001C1F74 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C5038 001C1F78 48 19 D1 D9 */ bl func_80362210 +/* 801C5038 001C1F78 48 19 D1 D9 */ bl _restgpr_23 /* 801C503C 001C1F7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C5040 001C1F80 7C 08 03 A6 */ mtlr r0 /* 801C5044 001C1F84 38 21 00 30 */ addi r1, r1, 0x30 @@ -612,7 +612,7 @@ dMenu_Fishing_c_NS_screenSetBase: /* 801C55DC 001C251C 7C 08 02 A6 */ mflr r0 /* 801C55E0 001C2520 90 01 00 54 */ stw r0, 0x54(r1) /* 801C55E4 001C2524 39 61 00 50 */ addi r11, r1, 0x50 -/* 801C55E8 001C2528 48 19 CB C9 */ bl func_803621B0 +/* 801C55E8 001C2528 48 19 CB C9 */ bl _savegpr_18 /* 801C55EC 001C252C 7C 7F 1B 78 */ mr r31, r3 /* 801C55F0 001C2530 3C 60 80 39 */ lis r3, lbl_80395D90@ha /* 801C55F4 001C2534 3B C3 5D 90 */ addi r30, r3, lbl_80395D90@l @@ -1090,7 +1090,7 @@ lbl_801C5A24: /* 801C5D1C 001C2C5C 38 C0 00 00 */ li r6, 0 /* 801C5D20 001C2C60 48 05 68 25 */ bl dMeter2Info_c_NS_getStringKanji /* 801C5D24 001C2C64 39 61 00 50 */ addi r11, r1, 0x50 -/* 801C5D28 001C2C68 48 19 C4 D5 */ bl func_803621FC +/* 801C5D28 001C2C68 48 19 C4 D5 */ bl _restgpr_18 /* 801C5D2C 001C2C6C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801C5D30 001C2C70 7C 08 03 A6 */ mtlr r0 /* 801C5D34 001C2C74 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 1ac6c30f4d..66ab351d7d 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -5226,7 +5226,7 @@ dMenu_Fmap_c_NS_isRoomCheck: /* 801CB2C4 001C8204 7C 08 02 A6 */ mflr r0 /* 801CB2C8 001C8208 90 01 01 34 */ stw r0, 0x134(r1) /* 801CB2CC 001C820C 39 61 01 30 */ addi r11, r1, 0x130 -/* 801CB2D0 001C8210 48 19 6E E5 */ bl func_803621B4 +/* 801CB2D0 001C8210 48 19 6E E5 */ bl _savegpr_19 /* 801CB2D4 001C8214 7C 76 1B 78 */ mr r22, r3 /* 801CB2D8 001C8218 7C 97 23 78 */ mr r23, r4 /* 801CB2DC 001C821C 7C B8 2B 78 */ mr r24, r5 @@ -5413,7 +5413,7 @@ lbl_801CB554: /* 801CB554 001C8494 38 60 00 00 */ li r3, 0 lbl_801CB558: /* 801CB558 001C8498 39 61 01 30 */ addi r11, r1, 0x130 -/* 801CB55C 001C849C 48 19 6C A5 */ bl func_80362200 +/* 801CB55C 001C849C 48 19 6C A5 */ bl _restgpr_19 /* 801CB560 001C84A0 80 01 01 34 */ lwz r0, 0x134(r1) /* 801CB564 001C84A4 7C 08 03 A6 */ mtlr r0 /* 801CB568 001C84A8 38 21 01 30 */ addi r1, r1, 0x130 @@ -5710,7 +5710,7 @@ dMenu_Fmap_c_NS_readAreaData: /* 801CB94C 001C888C DB C1 01 10 */ stfd f30, 0x110(r1) /* 801CB950 001C8890 F3 C1 01 18 */ psq_st f30, 280(r1), 0, qr0 /* 801CB954 001C8894 39 61 01 10 */ addi r11, r1, 0x110 -/* 801CB958 001C8898 48 19 68 49 */ bl func_803621A0 +/* 801CB958 001C8898 48 19 68 49 */ bl _savegpr_14 /* 801CB95C 001C889C 7C 6F 1B 78 */ mr r15, r3 /* 801CB960 001C88A0 7C 90 23 78 */ mr r16, r4 /* 801CB964 001C88A4 7C B1 2B 78 */ mr r17, r5 @@ -6104,7 +6104,7 @@ lbl_801CBEDC: /* 801CBEE4 001C8E24 E3 C1 01 18 */ psq_l f30, 280(r1), 0, qr0 /* 801CBEE8 001C8E28 CB C1 01 10 */ lfd f30, 0x110(r1) /* 801CBEEC 001C8E2C 39 61 01 10 */ addi r11, r1, 0x110 -/* 801CBEF0 001C8E30 48 19 62 FD */ bl func_803621EC +/* 801CBEF0 001C8E30 48 19 62 FD */ bl _restgpr_14 /* 801CBEF4 001C8E34 80 01 01 34 */ lwz r0, 0x134(r1) /* 801CBEF8 001C8E38 7C 08 03 A6 */ mtlr r0 /* 801CBEFC 001C8E3C 38 21 01 30 */ addi r1, r1, 0x130 @@ -6375,7 +6375,7 @@ dMenu_Fmap_c_NS_decodeFieldMapData: /* 801CC2B4 001C91F4 7C 08 02 A6 */ mflr r0 /* 801CC2B8 001C91F8 90 01 00 74 */ stw r0, 0x74(r1) /* 801CC2BC 001C91FC 39 61 00 70 */ addi r11, r1, 0x70 -/* 801CC2C0 001C9200 48 19 5E E5 */ bl func_803621A4 +/* 801CC2C0 001C9200 48 19 5E E5 */ bl _savegpr_15 /* 801CC2C4 001C9204 7C 79 1B 78 */ mr r25, r3 /* 801CC2C8 001C9208 80 83 00 8C */ lwz r4, 0x8c(r3) /* 801CC2CC 001C920C 80 04 00 08 */ lwz r0, 8(r4) @@ -6517,7 +6517,7 @@ lbl_801CC48C: /* 801CC4CC 001C940C A0 84 02 18 */ lhz r4, 0x218(r4) /* 801CC4D0 001C9410 48 00 03 B1 */ bl dMenu_Fmap_c_NS_setAreaName /* 801CC4D4 001C9414 39 61 00 70 */ addi r11, r1, 0x70 -/* 801CC4D8 001C9418 48 19 5D 19 */ bl func_803621F0 +/* 801CC4D8 001C9418 48 19 5D 19 */ bl _restgpr_15 /* 801CC4DC 001C941C 80 01 00 74 */ lwz r0, 0x74(r1) /* 801CC4E0 001C9420 7C 08 03 A6 */ mtlr r0 /* 801CC4E4 001C9424 38 21 00 70 */ addi r1, r1, 0x70 @@ -7413,7 +7413,7 @@ lbl_801CD0E0: lbl_801CD0F0: /* 801CD0F0 001CA030 7F 03 C3 78 */ mr r3, r24 /* 801CD0F4 001CA034 39 61 00 80 */ addi r11, r1, 0x80 -/* 801CD0F8 001CA038 48 19 51 19 */ bl func_80362210 +/* 801CD0F8 001CA038 48 19 51 19 */ bl _restgpr_23 /* 801CD0FC 001CA03C 80 01 00 84 */ lwz r0, 0x84(r1) /* 801CD100 001CA040 7C 08 03 A6 */ mtlr r0 /* 801CD104 001CA044 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index b4c0ca26cd..ab799c5494 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -3869,7 +3869,7 @@ lbl_801D2D78: /* 801D2D8C 001CFCCC D0 1B 00 00 */ stfs f0, 0(r27) lbl_801D2D90: /* 801D2D90 001CFCD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D2D94 001CFCD4 48 18 F4 7D */ bl func_80362210 +/* 801D2D94 001CFCD4 48 18 F4 7D */ bl _restgpr_23 /* 801D2D98 001CFCD8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D2D9C 001CFCDC 7C 08 03 A6 */ mtlr r0 /* 801D2DA0 001CFCE0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index fbc2fb105a..cece1fa0d6 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -2357,7 +2357,7 @@ dMenu_Letter_c_NS_screenSetMenu: /* 801DF014 001DBF54 7C 08 02 A6 */ mflr r0 /* 801DF018 001DBF58 90 01 00 84 */ stw r0, 0x84(r1) /* 801DF01C 001DBF5C 39 61 00 80 */ addi r11, r1, 0x80 -/* 801DF020 001DBF60 48 18 31 81 */ bl func_803621A0 +/* 801DF020 001DBF60 48 18 31 81 */ bl _savegpr_14 /* 801DF024 001DBF64 7C 7E 1B 78 */ mr r30, r3 /* 801DF028 001DBF68 3C 60 80 39 */ lis r3, lbl_803969C8@ha /* 801DF02C 001DBF6C 3B E3 69 C8 */ addi r31, r3, lbl_803969C8@l @@ -3012,7 +3012,7 @@ lbl_801DF944: /* 801DFA08 001DC948 39 EF 00 08 */ addi r15, r15, 8 /* 801DFA0C 001DC94C 41 80 FF 38 */ blt lbl_801DF944 /* 801DFA10 001DC950 39 61 00 80 */ addi r11, r1, 0x80 -/* 801DFA14 001DC954 48 18 27 D9 */ bl func_803621EC +/* 801DFA14 001DC954 48 18 27 D9 */ bl _restgpr_14 /* 801DFA18 001DC958 80 01 00 84 */ lwz r0, 0x84(r1) /* 801DFA1C 001DC95C 7C 08 03 A6 */ mtlr r0 /* 801DFA20 001DC960 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index 04b5fa4829..af0139f573 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -3820,7 +3820,7 @@ dMenu_Option_c_NS_screenSet: /* 801E5684 001E25C4 DB E1 00 90 */ stfd f31, 0x90(r1) /* 801E5688 001E25C8 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 801E568C 001E25CC 39 61 00 90 */ addi r11, r1, 0x90 -/* 801E5690 001E25D0 48 17 CB 29 */ bl func_803621B8 +/* 801E5690 001E25D0 48 17 CB 29 */ bl _savegpr_20 /* 801E5694 001E25D4 7C 7F 1B 78 */ mr r31, r3 /* 801E5698 001E25D8 3C 60 80 39 */ lis r3, lbl_80396EA8@ha /* 801E569C 001E25DC 3B C3 6E A8 */ addi r30, r3, lbl_80396EA8@l @@ -5493,7 +5493,7 @@ lbl_801E6F7C: /* 801E6F9C 001E3EDC E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 801E6FA0 001E3EE0 CB E1 00 90 */ lfd f31, 0x90(r1) /* 801E6FA4 001E3EE4 39 61 00 90 */ addi r11, r1, 0x90 -/* 801E6FA8 001E3EE8 48 17 B2 5D */ bl func_80362204 +/* 801E6FA8 001E3EE8 48 17 B2 5D */ bl _restgpr_20 /* 801E6FAC 001E3EEC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801E6FB0 001E3EF0 7C 08 03 A6 */ mtlr r0 /* 801E6FB4 001E3EF4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -6130,7 +6130,7 @@ lbl_801E788C: /* 801E7898 001E47D8 3B 5A 00 04 */ addi r26, r26, 4 /* 801E789C 001E47DC 41 80 FE AC */ blt lbl_801E7748 /* 801E78A0 001E47E0 39 61 00 50 */ addi r11, r1, 0x50 -/* 801E78A4 001E47E4 48 17 A9 6D */ bl func_80362210 +/* 801E78A4 001E47E4 48 17 A9 6D */ bl _restgpr_23 /* 801E78A8 001E47E8 80 01 00 54 */ lwz r0, 0x54(r1) /* 801E78AC 001E47EC 7C 08 03 A6 */ mtlr r0 /* 801E78B0 001E47F0 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index 505663467c..bb1feaa126 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -11,7 +11,7 @@ dMenu_Ring_c: /* 801E9124 001E6064 DB E1 00 90 */ stfd f31, 0x90(r1) /* 801E9128 001E6068 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 801E912C 001E606C 39 61 00 90 */ addi r11, r1, 0x90 -/* 801E9130 001E6070 48 17 90 81 */ bl func_803621B0 +/* 801E9130 001E6070 48 17 90 81 */ bl _savegpr_18 /* 801E9134 001E6074 7C 7F 1B 78 */ mr r31, r3 /* 801E9138 001E6078 7C BA 2B 78 */ mr r26, r5 /* 801E913C 001E607C 3C 60 80 39 */ lis r3, lbl_80397738@ha @@ -1476,7 +1476,7 @@ lbl_801EA6E4: /* 801EA6E8 001E7628 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 801EA6EC 001E762C CB E1 00 90 */ lfd f31, 0x90(r1) /* 801EA6F0 001E7630 39 61 00 90 */ addi r11, r1, 0x90 -/* 801EA6F4 001E7634 48 17 7B 09 */ bl func_803621FC +/* 801EA6F4 001E7634 48 17 7B 09 */ bl _restgpr_18 /* 801EA6F8 001E7638 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801EA6FC 001E763C 7C 08 03 A6 */ mtlr r0 /* 801EA700 001E7640 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -1485,7 +1485,7 @@ lbl_801EA6E4: /* 801EA70C 001E764C 7C 08 02 A6 */ mflr r0 /* 801EA710 001E7650 90 01 00 54 */ stw r0, 0x54(r1) /* 801EA714 001E7654 39 61 00 50 */ addi r11, r1, 0x50 -/* 801EA718 001E7658 48 17 7A 95 */ bl func_803621AC +/* 801EA718 001E7658 48 17 7A 95 */ bl _savegpr_17 /* 801EA71C 001E765C 7C 7F 1B 79 */ or. r31, r3, r3 /* 801EA720 001E7660 7C 9E 23 78 */ mr r30, r4 /* 801EA724 001E7664 41 82 04 3C */ beq lbl_801EAB60 @@ -1792,7 +1792,7 @@ lbl_801EAB2C: lbl_801EAB60: /* 801EAB60 001E7AA0 7F E3 FB 78 */ mr r3, r31 /* 801EAB64 001E7AA4 39 61 00 50 */ addi r11, r1, 0x50 -/* 801EAB68 001E7AA8 48 17 76 91 */ bl func_803621F8 +/* 801EAB68 001E7AA8 48 17 76 91 */ bl _restgpr_17 /* 801EAB6C 001E7AAC 80 01 00 54 */ lwz r0, 0x54(r1) /* 801EAB70 001E7AB0 7C 08 03 A6 */ mtlr r0 /* 801EAB74 001E7AB4 38 21 00 50 */ addi r1, r1, 0x50 @@ -4038,7 +4038,7 @@ dMenu_Ring_c_NS_drawItem: /* 801ECB38 001E9A78 DB 81 00 80 */ stfd f28, 0x80(r1) /* 801ECB3C 001E9A7C F3 81 00 88 */ psq_st f28, 136(r1), 0, qr0 /* 801ECB40 001E9A80 39 61 00 80 */ addi r11, r1, 0x80 -/* 801ECB44 001E9A84 48 17 56 69 */ bl func_803621AC +/* 801ECB44 001E9A84 48 17 56 69 */ bl _savegpr_17 /* 801ECB48 001E9A88 7C 7B 1B 78 */ mr r27, r3 /* 801ECB4C 001E9A8C A8 63 06 84 */ lha r3, 0x684(r3) /* 801ECB50 001E9A90 38 03 00 01 */ addi r0, r3, 1 @@ -4326,7 +4326,7 @@ lbl_801ECF58: /* 801ECF7C 001E9EBC E3 81 00 88 */ psq_l f28, 136(r1), 0, qr0 /* 801ECF80 001E9EC0 CB 81 00 80 */ lfd f28, 0x80(r1) /* 801ECF84 001E9EC4 39 61 00 80 */ addi r11, r1, 0x80 -/* 801ECF88 001E9EC8 48 17 52 71 */ bl func_803621F8 +/* 801ECF88 001E9EC8 48 17 52 71 */ bl _restgpr_17 /* 801ECF8C 001E9ECC 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801ECF90 001E9ED0 7C 08 03 A6 */ mtlr r0 /* 801ECF94 001E9ED4 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -4342,7 +4342,7 @@ dMenu_Ring_c_NS_drawItem2: /* 801ECFB0 001E9EF0 DB C1 00 50 */ stfd f30, 0x50(r1) /* 801ECFB4 001E9EF4 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 801ECFB8 001E9EF8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801ECFBC 001E9EFC 48 17 51 FD */ bl func_803621B8 +/* 801ECFBC 001E9EFC 48 17 51 FD */ bl _savegpr_20 /* 801ECFC0 001E9F00 7C 77 1B 78 */ mr r23, r3 /* 801ECFC4 001E9F04 8B 23 06 A8 */ lbz r25, 0x6a8(r3) /* 801ECFC8 001E9F08 88 03 06 B0 */ lbz r0, 0x6b0(r3) @@ -4538,7 +4538,7 @@ lbl_801ED294: /* 801ED29C 001EA1DC E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 801ED2A0 001EA1E0 CB C1 00 50 */ lfd f30, 0x50(r1) /* 801ED2A4 001EA1E4 39 61 00 50 */ addi r11, r1, 0x50 -/* 801ED2A8 001EA1E8 48 17 4F 5D */ bl func_80362204 +/* 801ED2A8 001EA1E8 48 17 4F 5D */ bl _restgpr_20 /* 801ED2AC 001EA1EC 80 01 00 74 */ lwz r0, 0x74(r1) /* 801ED2B0 001EA1F0 7C 08 03 A6 */ mtlr r0 /* 801ED2B4 001EA1F4 38 21 00 70 */ addi r1, r1, 0x70 @@ -5236,7 +5236,7 @@ dMenu_Ring_c_NS_drawSelectItem: /* 801EDCCC 001EAC0C DB 41 00 60 */ stfd f26, 0x60(r1) /* 801EDCD0 001EAC10 F3 41 00 68 */ psq_st f26, 104(r1), 0, qr0 /* 801EDCD4 001EAC14 39 61 00 60 */ addi r11, r1, 0x60 -/* 801EDCD8 001EAC18 48 17 44 E5 */ bl func_803621BC +/* 801EDCD8 001EAC18 48 17 44 E5 */ bl _savegpr_21 /* 801EDCDC 001EAC1C 7C 7D 1B 78 */ mr r29, r3 /* 801EDCE0 001EAC20 3B C0 00 00 */ li r30, 0 /* 801EDCE4 001EAC24 3B 80 00 00 */ li r28, 0 @@ -5387,7 +5387,7 @@ lbl_801EDECC: /* 801EDF0C 001EAE4C E3 41 00 68 */ psq_l f26, 104(r1), 0, qr0 /* 801EDF10 001EAE50 CB 41 00 60 */ lfd f26, 0x60(r1) /* 801EDF14 001EAE54 39 61 00 60 */ addi r11, r1, 0x60 -/* 801EDF18 001EAE58 48 17 42 F1 */ bl func_80362208 +/* 801EDF18 001EAE58 48 17 42 F1 */ bl _restgpr_21 /* 801EDF1C 001EAE5C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801EDF20 001EAE60 7C 08 03 A6 */ mtlr r0 /* 801EDF24 001EAE64 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -6914,7 +6914,7 @@ lbl_801EF41C: /* 801EF464 001EC3A4 E3 21 00 48 */ psq_l f25, 72(r1), 0, qr0 /* 801EF468 001EC3A8 CB 21 00 40 */ lfd f25, 0x40(r1) /* 801EF46C 001EC3AC 39 61 00 40 */ addi r11, r1, 0x40 -/* 801EF470 001EC3B0 48 17 2D A1 */ bl func_80362210 +/* 801EF470 001EC3B0 48 17 2D A1 */ bl _restgpr_23 /* 801EF474 001EC3B4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801EF478 001EC3B8 7C 08 03 A6 */ mtlr r0 /* 801EF47C 001EC3BC 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index fd439b7739..7b219acb10 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -1264,7 +1264,7 @@ lbl_801F0904: /* 801F0918 001ED858 E3 A1 00 98 */ psq_l f29, 152(r1), 0, qr0 /* 801F091C 001ED85C CB A1 00 90 */ lfd f29, 0x90(r1) /* 801F0920 001ED860 39 61 00 90 */ addi r11, r1, 0x90 -/* 801F0924 001ED864 48 17 18 ED */ bl func_80362210 +/* 801F0924 001ED864 48 17 18 ED */ bl _restgpr_23 /* 801F0928 001ED868 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801F092C 001ED86C 7C 08 03 A6 */ mtlr r0 /* 801F0930 001ED870 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index f6135c576e..fb117b4d95 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -1207,7 +1207,7 @@ dMenu_Skill_c_NS_screenSetMenu: /* 801F838C 001F52CC 7C 08 02 A6 */ mflr r0 /* 801F8390 001F52D0 90 01 00 74 */ stw r0, 0x74(r1) /* 801F8394 001F52D4 39 61 00 70 */ addi r11, r1, 0x70 -/* 801F8398 001F52D8 48 16 9E 09 */ bl func_803621A0 +/* 801F8398 001F52D8 48 16 9E 09 */ bl _savegpr_14 /* 801F839C 001F52DC 7C 7F 1B 78 */ mr r31, r3 /* 801F83A0 001F52E0 3C 60 80 39 */ lis r3, lbl_80397A18@ha /* 801F83A4 001F52E4 3A E3 7A 18 */ addi r23, r3, lbl_80397A18@l @@ -1630,7 +1630,7 @@ lbl_801F8940: /* 801F89F8 001F5938 7D 89 03 A6 */ mtctr r12 /* 801F89FC 001F593C 4E 80 04 21 */ bctrl /* 801F8A00 001F5940 39 61 00 70 */ addi r11, r1, 0x70 -/* 801F8A04 001F5944 48 16 97 E9 */ bl func_803621EC +/* 801F8A04 001F5944 48 16 97 E9 */ bl _restgpr_14 /* 801F8A08 001F5948 80 01 00 74 */ lwz r0, 0x74(r1) /* 801F8A0C 001F594C 7C 08 03 A6 */ mtlr r0 /* 801F8A10 001F5950 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index 4141878018..ce2423c7b2 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -419,7 +419,7 @@ lbl_801C0DA4: /* 801C0E2C 001BDD6C 3B DE 00 04 */ addi r30, r30, 4 /* 801C0E30 001BDD70 41 80 FF 74 */ blt lbl_801C0DA4 /* 801C0E34 001BDD74 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C0E38 001BDD78 48 1A 13 D5 */ bl func_8036220C +/* 801C0E38 001BDD78 48 1A 13 D5 */ bl _restgpr_22 /* 801C0E3C 001BDD7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C0E40 001BDD80 7C 08 03 A6 */ mtlr r0 /* 801C0E44 001BDD84 38 21 00 30 */ addi r1, r1, 0x30 @@ -431,7 +431,7 @@ dMenu_DmapMap_c_NS_setPos: /* 801C0E50 001BDD90 7C 08 02 A6 */ mflr r0 /* 801C0E54 001BDD94 90 01 00 34 */ stw r0, 0x34(r1) /* 801C0E58 001BDD98 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C0E5C 001BDD9C 48 1A 12 E5 */ bl func_80362140 +/* 801C0E5C 001BDD9C 48 1A 12 E5 */ bl _savefpr_28 /* 801C0E60 001BDDA0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C0E64 001BDDA4 93 C1 00 08 */ stw r30, 8(r1) /* 801C0E68 001BDDA8 7C 7E 1B 78 */ mr r30, r3 @@ -457,7 +457,7 @@ dMenu_DmapMap_c_NS_setPos: /* 801C0EB8 001BDDF8 7F E5 07 74 */ extsb r5, r31 /* 801C0EBC 001BDDFC 4B E7 EE 4D */ bl renderingDAmap_c_NS_entry /* 801C0EC0 001BDE00 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C0EC4 001BDE04 48 1A 12 C9 */ bl func_8036218C +/* 801C0EC4 001BDE04 48 1A 12 C9 */ bl _restfpr_28 /* 801C0EC8 001BDE08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C0ECC 001BDE0C 83 C1 00 08 */ lwz r30, 8(r1) /* 801C0ED0 001BDE10 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1320,7 +1320,7 @@ lbl_801C1ADC: /* 801C1AF4 001BEA34 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 801C1AF8 001BEA38 CB 81 00 40 */ lfd f28, 0x40(r1) /* 801C1AFC 001BEA3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C1B00 001BEA40 48 1A 07 0D */ bl func_8036220C +/* 801C1B00 001BEA40 48 1A 07 0D */ bl _restgpr_22 /* 801C1B04 001BEA44 80 01 00 84 */ lwz r0, 0x84(r1) /* 801C1B08 001BEA48 7C 08 03 A6 */ mtlr r0 /* 801C1B0C 001BEA4C 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 0e50c3f7c8..3f87ffb7f5 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -23,7 +23,7 @@ dMenu_ItemExplain_c: /* 801DA790 001D76D0 DB 21 00 80 */ stfd f25, 0x80(r1) /* 801DA794 001D76D4 F3 21 00 88 */ psq_st f25, 136(r1), 0, qr0 /* 801DA798 001D76D8 39 61 00 80 */ addi r11, r1, 0x80 -/* 801DA79C 001D76DC 48 18 7A 21 */ bl func_803621BC +/* 801DA79C 001D76DC 48 18 7A 21 */ bl _savegpr_21 /* 801DA7A0 001D76E0 7C 7F 1B 78 */ mr r31, r3 /* 801DA7A4 001D76E4 7C B5 2B 78 */ mr r21, r5 /* 801DA7A8 001D76E8 7C DE 33 78 */ mr r30, r6 @@ -576,7 +576,7 @@ lbl_801DAF9C: /* 801DAFD0 001D7F10 E3 21 00 88 */ psq_l f25, 136(r1), 0, qr0 /* 801DAFD4 001D7F14 CB 21 00 80 */ lfd f25, 0x80(r1) /* 801DAFD8 001D7F18 39 61 00 80 */ addi r11, r1, 0x80 -/* 801DAFDC 001D7F1C 48 18 72 2D */ bl func_80362208 +/* 801DAFDC 001D7F1C 48 18 72 2D */ bl _restgpr_21 /* 801DAFE0 001D7F20 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801DAFE4 001D7F24 7C 08 03 A6 */ mtlr r0 /* 801DAFE8 001D7F28 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -2207,7 +2207,7 @@ lbl_801DC6F8: lbl_801DC71C: /* 801DC71C 001D965C 7F A3 EB 78 */ mr r3, r29 /* 801DC720 001D9660 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DC724 001D9664 48 18 5A E9 */ bl func_8036220C +/* 801DC724 001D9664 48 18 5A E9 */ bl _restgpr_22 /* 801DC728 001D9668 80 01 00 34 */ lwz r0, 0x34(r1) /* 801DC72C 001D966C 7C 08 03 A6 */ mtlr r0 /* 801DC730 001D9670 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 9deeb25c85..b8ec0a7cb3 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -7964,7 +7964,7 @@ jmessage_tRenderingProcessor_NS_getCharInfo: /* 8022F788 0022C6C8 7C 08 02 A6 */ mflr r0 /* 8022F78C 0022C6CC 90 01 00 44 */ stw r0, 0x44(r1) /* 8022F790 0022C6D0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022F794 0022C6D4 48 13 29 A9 */ bl func_8036213C +/* 8022F794 0022C6D4 48 13 29 A9 */ bl _savefpr_27 /* 8022F798 0022C6D8 93 E1 00 14 */ stw r31, 0x14(r1) /* 8022F79C 0022C6DC 93 C1 00 10 */ stw r30, 0x10(r1) /* 8022F7A0 0022C6E0 7C 7E 1B 78 */ mr r30, r3 @@ -8034,7 +8034,7 @@ lbl_8022F890: /* 8022F89C 0022C7DC B0 04 00 00 */ sth r0, 0(r4) lbl_8022F8A0: /* 8022F8A0 0022C7E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022F8A4 0022C7E4 48 13 28 E5 */ bl func_80362188 +/* 8022F8A4 0022C7E4 48 13 28 E5 */ bl _restfpr_27 /* 8022F8A8 0022C7E8 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8022F8AC 0022C7EC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8022F8B0 0022C7F0 80 01 00 44 */ lwz r0, 0x44(r1) diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 4edb09517c..86cf7d224c 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -4915,7 +4915,7 @@ lbl_8023708C: /* 8023708C 00233FCC 38 60 00 00 */ li r3, 0 lbl_80237090: /* 80237090 00233FD0 39 61 04 50 */ addi r11, r1, 0x450 -/* 80237094 00233FD4 48 12 B1 79 */ bl func_8036220C +/* 80237094 00233FD4 48 12 B1 79 */ bl _restgpr_22 /* 80237098 00233FD8 80 01 04 54 */ lwz r0, 0x454(r1) /* 8023709C 00233FDC 7C 08 03 A6 */ mtlr r0 /* 802370A0 00233FE0 38 21 04 50 */ addi r1, r1, 0x450 @@ -5564,7 +5564,7 @@ lbl_80237898: /* 8023789C 002347DC 98 1C 04 D3 */ stb r0, 0x4d3(r28) lbl_802378A0: /* 802378A0 002347E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802378A4 002347E4 48 12 A9 6D */ bl func_80362210 +/* 802378A4 002347E4 48 12 A9 6D */ bl _restgpr_23 /* 802378A8 002347E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802378AC 002347EC 7C 08 03 A6 */ mtlr r0 /* 802378B0 002347F0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index 6fd5e354b5..d7cfc99971 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -11,7 +11,7 @@ dMsgScrn3Select_c: /* 802390C0 00236000 DB E1 00 50 */ stfd f31, 0x50(r1) /* 802390C4 00236004 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 802390C8 00236008 39 61 00 50 */ addi r11, r1, 0x50 -/* 802390CC 0023600C 48 12 90 ED */ bl func_803621B8 +/* 802390CC 0023600C 48 12 90 ED */ bl _savegpr_20 /* 802390D0 00236010 7C 7F 1B 78 */ mr r31, r3 /* 802390D4 00236014 3C 80 80 3C */ lis r4, lbl_803C0CE8@ha /* 802390D8 00236018 38 04 0C E8 */ addi r0, r4, lbl_803C0CE8@l @@ -535,7 +535,7 @@ lbl_802395DC: /* 802398AC 002367EC E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 802398B0 002367F0 CB E1 00 50 */ lfd f31, 0x50(r1) /* 802398B4 002367F4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802398B8 002367F8 48 12 89 4D */ bl func_80362204 +/* 802398B8 002367F8 48 12 89 4D */ bl _restgpr_20 /* 802398BC 002367FC 80 01 00 64 */ lwz r0, 0x64(r1) /* 802398C0 00236800 7C 08 03 A6 */ mtlr r0 /* 802398C4 00236804 38 21 00 60 */ addi r1, r1, 0x60 @@ -752,7 +752,7 @@ lbl_80239B9C: lbl_80239BC4: /* 80239BC4 00236B04 7F C3 F3 78 */ mr r3, r30 /* 80239BC8 00236B08 39 61 00 30 */ addi r11, r1, 0x30 -/* 80239BCC 00236B0C 48 12 86 45 */ bl func_80362210 +/* 80239BCC 00236B0C 48 12 86 45 */ bl _restgpr_23 /* 80239BD0 00236B10 80 01 00 34 */ lwz r0, 0x34(r1) /* 80239BD4 00236B14 7C 08 03 A6 */ mtlr r0 /* 80239BD8 00236B18 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index 70304afa91..b655193de6 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -928,7 +928,7 @@ lbl_80241748: /* 80241764 0023E6A4 E3 A1 01 F8 */ psq_l f29, 504(r1), 0, qr0 /* 80241768 0023E6A8 CB A1 01 F0 */ lfd f29, 0x1f0(r1) /* 8024176C 0023E6AC 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 80241770 0023E6B0 48 12 0A A1 */ bl func_80362210 +/* 80241770 0023E6B0 48 12 0A A1 */ bl _restgpr_23 /* 80241774 0023E6B4 80 01 02 24 */ lwz r0, 0x224(r1) /* 80241778 0023E6B8 7C 08 03 A6 */ mtlr r0 /* 8024177C 0023E6BC 38 21 02 20 */ addi r1, r1, 0x220 @@ -1666,7 +1666,7 @@ dMsgScrnHowl_c_NS_drawWave: /* 80242214 0023F154 DA 21 00 70 */ stfd f17, 0x70(r1) /* 80242218 0023F158 F2 21 00 78 */ psq_st f17, 120(r1), 0, qr0 /* 8024221C 0023F15C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80242220 0023F160 48 11 FF 9D */ bl func_803621BC +/* 80242220 0023F160 48 11 FF 9D */ bl _savegpr_21 /* 80242224 0023F164 7C 79 1B 78 */ mr r25, r3 /* 80242228 0023F168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -2032,7 +2032,7 @@ lbl_80242718: /* 80242788 0023F6C8 E2 21 00 78 */ psq_l f17, 120(r1), 0, qr0 /* 8024278C 0023F6CC CA 21 00 70 */ lfd f17, 0x70(r1) /* 80242790 0023F6D0 39 61 00 70 */ addi r11, r1, 0x70 -/* 80242794 0023F6D4 48 11 FA 75 */ bl func_80362208 +/* 80242794 0023F6D4 48 11 FA 75 */ bl _restgpr_21 /* 80242798 0023F6D8 80 01 01 64 */ lwz r0, 0x164(r1) /* 8024279C 0023F6DC 7C 08 03 A6 */ mtlr r0 /* 802427A0 0023F6E0 38 21 01 60 */ addi r1, r1, 0x160 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index 0481f3be91..72a2ec2067 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -340,7 +340,7 @@ lbl_80244A40: /* 80244A54 00241994 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80244A58 00241998 CB E1 00 40 */ lfd f31, 0x40(r1) /* 80244A5C 0024199C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244A60 002419A0 48 11 D7 B1 */ bl func_80362210 +/* 80244A60 002419A0 48 11 D7 B1 */ bl _restgpr_23 /* 80244A64 002419A4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80244A68 002419A8 7C 08 03 A6 */ mtlr r0 /* 80244A6C 002419AC 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index 86f9a1eea9..9b901e7a7d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -997,7 +997,7 @@ lbl_80247E20: /* 80247E58 00244D98 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80247E5C 00244D9C F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 80247E60 00244DA0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80247E64 00244DA4 48 11 A3 59 */ bl func_803621BC +/* 80247E64 00244DA4 48 11 A3 59 */ bl _savegpr_21 /* 80247E68 00244DA8 7C 78 1B 78 */ mr r24, r3 /* 80247E6C 00244DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80247E70 00244DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1167,7 +1167,7 @@ lbl_802480C8: /* 802480D0 00245010 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 802480D4 00245014 CB E1 00 50 */ lfd f31, 0x50(r1) /* 802480D8 00245018 39 61 00 50 */ addi r11, r1, 0x50 -/* 802480DC 0024501C 48 11 A1 2D */ bl func_80362208 +/* 802480DC 0024501C 48 11 A1 2D */ bl _restgpr_21 /* 802480E0 00245020 80 01 00 64 */ lwz r0, 0x64(r1) /* 802480E4 00245024 7C 08 03 A6 */ mtlr r0 /* 802480E8 00245028 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 80addc2a0d..7324fe5dc0 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -460,7 +460,7 @@ lbl_80249A24: /* 80249A28 00246968 90 03 00 10 */ stw r0, 0x10(r3) /* 80249A2C 0024696C C0 22 B3 70 */ lfs f1, lbl_80454D70-_SDA2_BASE_(r2) /* 80249A30 00246970 39 61 00 40 */ addi r11, r1, 0x40 -/* 80249A34 00246974 48 11 87 DD */ bl func_80362210 +/* 80249A34 00246974 48 11 87 DD */ bl _restgpr_23 /* 80249A38 00246978 80 01 00 44 */ lwz r0, 0x44(r1) /* 80249A3C 0024697C 7C 08 03 A6 */ mtlr r0 /* 80249A40 00246980 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/npc/d_npc_lib.s b/asm/d/npc/d_npc_lib.s index 92ee443d1e..935b887429 100644 --- a/asm/d/npc/d_npc_lib.s +++ b/asm/d/npc/d_npc_lib.s @@ -157,7 +157,7 @@ lbl_8025146C: /* 80251518 0024E458 41 80 FF 54 */ blt lbl_8025146C lbl_8025151C: /* 8025151C 0024E45C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80251520 0024E460 48 11 0C ED */ bl func_8036220C +/* 80251520 0024E460 48 11 0C ED */ bl _restgpr_22 /* 80251524 0024E464 80 01 00 34 */ lwz r0, 0x34(r1) /* 80251528 0024E468 7C 08 03 A6 */ mtlr r0 /* 8025152C 0024E46C 38 21 00 30 */ addi r1, r1, 0x30 @@ -579,7 +579,7 @@ lbl_80251B04: /* 80251B40 0024EA80 E3 C1 01 28 */ psq_l f30, 296(r1), 0, qr0 /* 80251B44 0024EA84 CB C1 01 20 */ lfd f30, 0x120(r1) /* 80251B48 0024EA88 39 61 01 20 */ addi r11, r1, 0x120 -/* 80251B4C 0024EA8C 48 11 06 C1 */ bl func_8036220C +/* 80251B4C 0024EA8C 48 11 06 C1 */ bl _restgpr_22 /* 80251B50 0024EA90 80 01 01 44 */ lwz r0, 0x144(r1) /* 80251B54 0024EA94 7C 08 03 A6 */ mtlr r0 /* 80251B58 0024EA98 38 21 01 40 */ addi r1, r1, 0x140 @@ -912,7 +912,7 @@ lbl_80251FEC: /* 80251FF8 0024EF38 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 80251FFC 0024EF3C CB E1 00 80 */ lfd f31, 0x80(r1) /* 80252000 0024EF40 39 61 00 80 */ addi r11, r1, 0x80 -/* 80252004 0024EF44 48 11 02 0D */ bl func_80362210 +/* 80252004 0024EF44 48 11 02 0D */ bl _restgpr_23 /* 80252008 0024EF48 80 01 00 94 */ lwz r0, 0x94(r1) /* 8025200C 0024EF4C 7C 08 03 A6 */ mtlr r0 /* 80252010 0024EF50 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index 8bef15e27e..f63eafcf1f 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -421,7 +421,7 @@ lbl_8005126C: lbl_80051278: /* 80051278 0004E1B8 7F 63 DB 78 */ mr r3, r27 /* 8005127C 0004E1BC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80051280 0004E1C0 48 31 0F 8D */ bl func_8036220C +/* 80051280 0004E1C0 48 31 0F 8D */ bl _restgpr_22 /* 80051284 0004E1C4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80051288 0004E1C8 7C 08 03 A6 */ mtlr r0 /* 8005128C 0004E1CC 38 21 00 50 */ addi r1, r1, 0x50 @@ -530,7 +530,7 @@ lbl_800513FC: lbl_80051408: /* 80051408 0004E348 7F 63 DB 78 */ mr r3, r27 /* 8005140C 0004E34C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80051410 0004E350 48 31 0D FD */ bl func_8036220C +/* 80051410 0004E350 48 31 0D FD */ bl _restgpr_22 /* 80051414 0004E354 80 01 00 54 */ lwz r0, 0x54(r1) /* 80051418 0004E358 7C 08 03 A6 */ mtlr r0 /* 8005141C 0004E35C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index 9ebe0de2e3..0dab029fa7 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -553,7 +553,7 @@ lbl_801949BC: /* 801949CC 0019190C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801949D0 00191910 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801949D4 00191914 39 61 00 30 */ addi r11, r1, 0x30 -/* 801949D8 00191918 48 1C D8 39 */ bl func_80362210 +/* 801949D8 00191918 48 1C D8 39 */ bl _restgpr_23 /* 801949DC 0019191C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801949E0 00191920 7C 08 03 A6 */ mtlr r0 /* 801949E4 00191924 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index 68ae6d772e..374f4d5b6c 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -3725,7 +3725,7 @@ dShopSystem_c_NS_searchItemActor: /* 8019A5DC 0019751C DB E1 00 B0 */ stfd f31, 0xb0(r1) /* 8019A5E0 00197520 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, qr0 /* 8019A5E4 00197524 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8019A5E8 00197528 48 1C 7B D5 */ bl func_803621BC +/* 8019A5E8 00197528 48 1C 7B D5 */ bl _savegpr_21 /* 8019A5EC 0019752C 7C 7E 1B 78 */ mr r30, r3 /* 8019A5F0 00197530 80 6D 8A DC */ lwz r3, lbl_8045105C-_SDA_BASE_(r13) /* 8019A5F4 00197534 2C 03 FF FF */ cmpwi r3, -1 @@ -4078,7 +4078,7 @@ lbl_8019AAE0: /* 8019AAE0 00197A20 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 /* 8019AAE4 00197A24 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 8019AAE8 00197A28 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8019AAEC 00197A2C 48 1C 77 1D */ bl func_80362208 +/* 8019AAEC 00197A2C 48 1C 77 1D */ bl _restgpr_21 /* 8019AAF0 00197A30 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8019AAF4 00197A34 7C 08 03 A6 */ mtlr r0 /* 8019AAF8 00197A38 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/d/shop/item/d_shop_item_ctrl.s b/asm/d/shop/item/d_shop_item_ctrl.s index cf09ce18f3..48f911b5a1 100644 --- a/asm/d/shop/item/d_shop_item_ctrl.s +++ b/asm/d/shop/item/d_shop_item_ctrl.s @@ -545,7 +545,7 @@ lbl_80197070: /* 80197078 00193FB8 3A F7 00 04 */ addi r23, r23, 4 /* 8019707C 00193FBC 41 80 FB 58 */ blt lbl_80196BD4 /* 80197080 00193FC0 39 61 00 80 */ addi r11, r1, 0x80 -/* 80197084 00193FC4 48 1C B1 8D */ bl func_80362210 +/* 80197084 00193FC4 48 1C B1 8D */ bl _restgpr_23 /* 80197088 00193FC8 80 01 00 84 */ lwz r0, 0x84(r1) /* 8019708C 00193FCC 7C 08 03 A6 */ mtlr r0 /* 80197090 00193FD0 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index e9dba3b9d4..bad31b1555 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -634,7 +634,7 @@ lbl_8001A108: /* 8001A11C 0001705C 48 00 9C 79 */ bl fpcSCtRq_Request lbl_8001A120: /* 8001A120 00017060 39 61 00 60 */ addi r11, r1, 0x60 -/* 8001A124 00017064 48 34 80 ED */ bl func_80362210 +/* 8001A124 00017064 48 34 80 ED */ bl _restgpr_23 /* 8001A128 00017068 80 01 00 64 */ lwz r0, 0x64(r1) /* 8001A12C 0001706C 7C 08 03 A6 */ mtlr r0 /* 8001A130 00017070 38 21 00 60 */ addi r1, r1, 0x60 @@ -2346,7 +2346,7 @@ lbl_8001B898: /* 8001B8C4 00018804 48 02 5D A5 */ bl dEvt_control_c_NS_order lbl_8001B8C8: /* 8001B8C8 00018808 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001B8CC 0001880C 48 34 69 45 */ bl func_80362210 +/* 8001B8CC 0001880C 48 34 69 45 */ bl _restgpr_23 /* 8001B8D0 00018810 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001B8D4 00018814 7C 08 03 A6 */ mtlr r0 /* 8001B8D8 00018818 38 21 00 40 */ addi r1, r1, 0x40 @@ -2747,7 +2747,7 @@ lbl_8001BDFC: /* 8001BE18 00018D58 7C 08 02 A6 */ mflr r0 /* 8001BE1C 00018D5C 90 01 00 54 */ stw r0, 0x54(r1) /* 8001BE20 00018D60 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001BE24 00018D64 48 34 63 91 */ bl func_803621B4 +/* 8001BE24 00018D64 48 34 63 91 */ bl _savegpr_19 /* 8001BE28 00018D68 7C 95 23 78 */ mr r21, r4 /* 8001BE2C 00018D6C 7C B6 2B 78 */ mr r22, r5 /* 8001BE30 00018D70 7C D7 33 78 */ mr r23, r6 @@ -2830,7 +2830,7 @@ lbl_8001BF1C: /* 8001BF48 00018E88 48 00 00 1D */ bl fopAcM_createItemFromTable lbl_8001BF4C: /* 8001BF4C 00018E8C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001BF50 00018E90 48 34 62 B1 */ bl func_80362200 +/* 8001BF50 00018E90 48 34 62 B1 */ bl _restgpr_19 /* 8001BF54 00018E94 80 01 00 54 */ lwz r0, 0x54(r1) /* 8001BF58 00018E98 7C 08 03 A6 */ mtlr r0 /* 8001BF5C 00018E9C 38 21 00 50 */ addi r1, r1, 0x50 @@ -2909,7 +2909,7 @@ lbl_8001C05C: /* 8001C05C 00018F9C 38 60 FF FF */ li r3, -1 lbl_8001C060: /* 8001C060 00018FA0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C064 00018FA4 48 34 61 AD */ bl func_80362210 +/* 8001C064 00018FA4 48 34 61 AD */ bl _restgpr_23 /* 8001C068 00018FA8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001C06C 00018FAC 7C 08 03 A6 */ mtlr r0 /* 8001C070 00018FB0 38 21 00 40 */ addi r1, r1, 0x40 @@ -3295,7 +3295,7 @@ fopAcM_fastCreateItem: /* 8001C5B4 000194F4 7C 08 02 A6 */ mflr r0 /* 8001C5B8 000194F8 90 01 00 54 */ stw r0, 0x54(r1) /* 8001C5BC 000194FC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001C5C0 00019500 48 34 5B FD */ bl func_803621BC +/* 8001C5C0 00019500 48 34 5B FD */ bl _savegpr_21 /* 8001C5C4 00019504 7C 76 1B 78 */ mr r22, r3 /* 8001C5C8 00019508 7C 9E 23 78 */ mr r30, r4 /* 8001C5CC 0001950C 7C B7 2B 78 */ mr r23, r5 @@ -3478,7 +3478,7 @@ lbl_8001C848: /* 8001C854 00019794 D0 03 04 FC */ stfs f0, 0x4fc(r3) lbl_8001C858: /* 8001C858 00019798 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001C85C 0001979C 48 34 59 AD */ bl func_80362208 +/* 8001C85C 0001979C 48 34 59 AD */ bl _restgpr_21 /* 8001C860 000197A0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8001C864 000197A4 7C 08 03 A6 */ mtlr r0 /* 8001C868 000197A8 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/m/Do/m_Do_MemCardRWmng.s b/asm/m/Do/m_Do_MemCardRWmng.s index 03bbc8a36f..e308f9aabf 100644 --- a/asm/m/Do/m_Do_MemCardRWmng.s +++ b/asm/m/Do/m_Do_MemCardRWmng.s @@ -151,7 +151,7 @@ mDoMemCdRWm_Restore: /* 800176A0 000145E0 7C 08 02 A6 */ mflr r0 /* 800176A4 000145E4 90 01 00 44 */ stw r0, 0x44(r1) /* 800176A8 000145E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 800176AC 000145EC 48 34 AB 0D */ bl func_803621B8 +/* 800176AC 000145EC 48 34 AB 0D */ bl _savegpr_20 /* 800176B0 000145F0 7C 74 1B 78 */ mr r20, r3 /* 800176B4 000145F4 7C 95 23 78 */ mr r21, r4 /* 800176B8 000145F8 7C B6 2B 78 */ mr r22, r5 @@ -271,7 +271,7 @@ lbl_8001781C: /* 80017860 000147A0 38 60 00 00 */ li r3, 0 lbl_80017864: /* 80017864 000147A4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80017868 000147A8 48 34 A9 9D */ bl func_80362204 +/* 80017868 000147A8 48 34 A9 9D */ bl _restgpr_20 /* 8001786C 000147AC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80017870 000147B0 7C 08 03 A6 */ mtlr r0 /* 80017874 000147B4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index 5d4fd5070c..5fdddd0c4b 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -1842,7 +1842,7 @@ lbl_8000EA58: /* 8000EA64 0000B9A4 41 80 FF 9C */ blt lbl_8000EA00 lbl_8000EA68: /* 8000EA68 0000B9A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8000EA6C 0000B9AC 48 35 37 A1 */ bl func_8036220C +/* 8000EA6C 0000B9AC 48 35 37 A1 */ bl _restgpr_22 /* 8000EA70 0000B9B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000EA74 0000B9B4 7C 08 03 A6 */ mtlr r0 /* 8000EA78 0000B9B8 38 21 00 30 */ addi r1, r1, 0x30 @@ -3152,7 +3152,7 @@ lbl_8000FC30: /* 8000FC54 0000CB94 90 01 00 54 */ stw r0, 0x54(r1) /* 8000FC58 0000CB98 DB E1 00 48 */ stfd f31, 0x48(r1) /* 8000FC5C 0000CB9C 39 61 00 48 */ addi r11, r1, 0x48 -/* 8000FC60 0000CBA0 48 35 25 59 */ bl func_803621B8 +/* 8000FC60 0000CBA0 48 35 25 59 */ bl _savegpr_20 /* 8000FC64 0000CBA4 7C 74 1B 78 */ mr r20, r3 /* 8000FC68 0000CBA8 7C 95 23 78 */ mr r21, r4 /* 8000FC6C 0000CBAC 7C B6 2B 78 */ mr r22, r5 @@ -3191,7 +3191,7 @@ lbl_8000FC30: /* 8000FCF0 0000CC30 7E 83 A3 78 */ mr r3, r20 /* 8000FCF4 0000CC34 CB E1 00 48 */ lfd f31, 0x48(r1) /* 8000FCF8 0000CC38 39 61 00 48 */ addi r11, r1, 0x48 -/* 8000FCFC 0000CC3C 48 35 25 09 */ bl func_80362204 +/* 8000FCFC 0000CC3C 48 35 25 09 */ bl _restgpr_20 /* 8000FD00 0000CC40 80 01 00 54 */ lwz r0, 0x54(r1) /* 8000FD04 0000CC44 7C 08 03 A6 */ mtlr r0 /* 8000FD08 0000CC48 38 21 00 50 */ addi r1, r1, 0x50 @@ -3240,7 +3240,7 @@ mDoExt_McaMorf_NS_create: /* 8000FDA0 0000CCE0 DB E1 00 50 */ stfd f31, 0x50(r1) /* 8000FDA4 0000CCE4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8000FDA8 0000CCE8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000FDAC 0000CCEC 48 35 24 11 */ bl func_803621BC +/* 8000FDAC 0000CCEC 48 35 24 11 */ bl _savegpr_21 /* 8000FDB0 0000CCF0 7C 75 1B 78 */ mr r21, r3 /* 8000FDB4 0000CCF4 7C 96 23 79 */ or. r22, r4, r4 /* 8000FDB8 0000CCF8 7C B7 2B 78 */ mr r23, r5 @@ -3429,7 +3429,7 @@ lbl_80010054: /* 80010054 0000CF94 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 80010058 0000CF98 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8001005C 0000CF9C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80010060 0000CFA0 48 35 21 A9 */ bl func_80362208 +/* 80010060 0000CFA0 48 35 21 A9 */ bl _restgpr_21 /* 80010064 0000CFA4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80010068 0000CFA8 7C 08 03 A6 */ mtlr r0 /* 8001006C 0000CFAC 38 21 00 60 */ addi r1, r1, 0x60 @@ -3952,7 +3952,7 @@ mDoExt_McaMorfSO: /* 800107D8 0000D718 90 01 00 54 */ stw r0, 0x54(r1) /* 800107DC 0000D71C DB E1 00 48 */ stfd f31, 0x48(r1) /* 800107E0 0000D720 39 61 00 48 */ addi r11, r1, 0x48 -/* 800107E4 0000D724 48 35 19 D9 */ bl func_803621BC +/* 800107E4 0000D724 48 35 19 D9 */ bl _savegpr_21 /* 800107E8 0000D728 7C 75 1B 78 */ mr r21, r3 /* 800107EC 0000D72C 7C 96 23 78 */ mr r22, r4 /* 800107F0 0000D730 7C B7 2B 78 */ mr r23, r5 @@ -3988,7 +3988,7 @@ mDoExt_McaMorfSO: /* 80010868 0000D7A8 7E A3 AB 78 */ mr r3, r21 /* 8001086C 0000D7AC CB E1 00 48 */ lfd f31, 0x48(r1) /* 80010870 0000D7B0 39 61 00 48 */ addi r11, r1, 0x48 -/* 80010874 0000D7B4 48 35 19 95 */ bl func_80362208 +/* 80010874 0000D7B4 48 35 19 95 */ bl _restgpr_21 /* 80010878 0000D7B8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8001087C 0000D7BC 7C 08 03 A6 */ mtlr r0 /* 80010880 0000D7C0 38 21 00 50 */ addi r1, r1, 0x50 @@ -4189,7 +4189,7 @@ lbl_80010B48: /* 80010B48 0000DA88 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80010B4C 0000DA8C CB E1 00 40 */ lfd f31, 0x40(r1) /* 80010B50 0000DA90 39 61 00 40 */ addi r11, r1, 0x40 -/* 80010B54 0000DA94 48 35 16 B9 */ bl func_8036220C +/* 80010B54 0000DA94 48 35 16 B9 */ bl _restgpr_22 /* 80010B58 0000DA98 80 01 00 54 */ lwz r0, 0x54(r1) /* 80010B5C 0000DA9C 7C 08 03 A6 */ mtlr r0 /* 80010B60 0000DAA0 38 21 00 50 */ addi r1, r1, 0x50 @@ -4754,7 +4754,7 @@ lbl_80011338: /* 80011350 0000E290 90 01 00 54 */ stw r0, 0x54(r1) /* 80011354 0000E294 DB E1 00 48 */ stfd f31, 0x48(r1) /* 80011358 0000E298 39 61 00 48 */ addi r11, r1, 0x48 -/* 8001135C 0000E29C 48 35 0E 5D */ bl func_803621B8 +/* 8001135C 0000E29C 48 35 0E 5D */ bl _savegpr_20 /* 80011360 0000E2A0 7C 74 1B 78 */ mr r20, r3 /* 80011364 0000E2A4 7C 95 23 78 */ mr r21, r4 /* 80011368 0000E2A8 7C B6 2B 78 */ mr r22, r5 @@ -4789,7 +4789,7 @@ lbl_80011338: /* 800113DC 0000E31C 7E 83 A3 78 */ mr r3, r20 /* 800113E0 0000E320 CB E1 00 48 */ lfd f31, 0x48(r1) /* 800113E4 0000E324 39 61 00 48 */ addi r11, r1, 0x48 -/* 800113E8 0000E328 48 35 0E 1D */ bl func_80362204 +/* 800113E8 0000E328 48 35 0E 1D */ bl _restgpr_20 /* 800113EC 0000E32C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800113F0 0000E330 7C 08 03 A6 */ mtlr r0 /* 800113F4 0000E334 38 21 00 50 */ addi r1, r1, 0x50 @@ -4830,7 +4830,7 @@ mDoExt_McaMorf2_NS_create: /* 80011470 0000E3B0 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80011474 0000E3B4 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 80011478 0000E3B8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001147C 0000E3BC 48 35 0D 41 */ bl func_803621BC +/* 8001147C 0000E3BC 48 35 0D 41 */ bl _savegpr_21 /* 80011480 0000E3C0 7C 75 1B 78 */ mr r21, r3 /* 80011484 0000E3C4 7C 96 23 79 */ or. r22, r4, r4 /* 80011488 0000E3C8 7C B7 2B 78 */ mr r23, r5 @@ -4977,7 +4977,7 @@ lbl_80011694: /* 80011694 0000E5D4 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 80011698 0000E5D8 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8001169C 0000E5DC 39 61 00 50 */ addi r11, r1, 0x50 -/* 800116A0 0000E5E0 48 35 0B 69 */ bl func_80362208 +/* 800116A0 0000E5E0 48 35 0B 69 */ bl _restgpr_21 /* 800116A4 0000E5E4 80 01 00 64 */ lwz r0, 0x64(r1) /* 800116A8 0000E5E8 7C 08 03 A6 */ mtlr r0 /* 800116AC 0000E5EC 38 21 00 60 */ addi r1, r1, 0x60 @@ -6219,7 +6219,7 @@ lbl_80012844: /* 80012898 0000F7D8 DB 81 01 60 */ stfd f28, 0x160(r1) /* 8001289C 0000F7DC F3 81 01 68 */ psq_st f28, 360(r1), 0, qr0 /* 800128A0 0000F7E0 39 61 01 60 */ addi r11, r1, 0x160 -/* 800128A4 0000F7E4 48 34 F9 0D */ bl func_803621B0 +/* 800128A4 0000F7E4 48 34 F9 0D */ bl _savegpr_18 /* 800128A8 0000F7E8 7C 72 1B 78 */ mr r18, r3 /* 800128AC 0000F7EC FF 80 08 90 */ fmr f28, f1 /* 800128B0 0000F7F0 88 05 00 00 */ lbz r0, 0(r5) @@ -6584,7 +6584,7 @@ lbl_80012DF8: /* 80012E1C 0000FD5C E3 81 01 68 */ psq_l f28, 360(r1), 0, qr0 /* 80012E20 0000FD60 CB 81 01 60 */ lfd f28, 0x160(r1) /* 80012E24 0000FD64 39 61 01 60 */ addi r11, r1, 0x160 -/* 80012E28 0000FD68 48 34 F3 D5 */ bl func_803621FC +/* 80012E28 0000FD68 48 34 F3 D5 */ bl _restgpr_18 /* 80012E2C 0000FD6C 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 80012E30 0000FD70 7C 08 03 A6 */ mtlr r0 /* 80012E34 0000FD74 38 21 01 A0 */ addi r1, r1, 0x1a0 @@ -6595,7 +6595,7 @@ lbl_80012DF8: /* 80012E48 0000FD88 DB E1 01 60 */ stfd f31, 0x160(r1) /* 80012E4C 0000FD8C F3 E1 01 68 */ psq_st f31, 360(r1), 0, qr0 /* 80012E50 0000FD90 39 61 01 60 */ addi r11, r1, 0x160 -/* 80012E54 0000FD94 48 34 F3 5D */ bl func_803621B0 +/* 80012E54 0000FD94 48 34 F3 5D */ bl _savegpr_18 /* 80012E58 0000FD98 7C 72 1B 78 */ mr r18, r3 /* 80012E5C 0000FD9C 88 05 00 00 */ lbz r0, 0(r5) /* 80012E60 0000FDA0 98 03 00 08 */ stb r0, 8(r3) @@ -6920,7 +6920,7 @@ lbl_80013334: /* 80013340 00010280 E3 E1 01 68 */ psq_l f31, 360(r1), 0, qr0 /* 80013344 00010284 CB E1 01 60 */ lfd f31, 0x160(r1) /* 80013348 00010288 39 61 01 60 */ addi r11, r1, 0x160 -/* 8001334C 0001028C 48 34 EE B1 */ bl func_803621FC +/* 8001334C 0001028C 48 34 EE B1 */ bl _restgpr_18 /* 80013350 00010290 80 01 01 74 */ lwz r0, 0x174(r1) /* 80013354 00010294 7C 08 03 A6 */ mtlr r0 /* 80013358 00010298 38 21 01 70 */ addi r1, r1, 0x170 @@ -7204,7 +7204,7 @@ lbl_800136F8: /* 80013780 000106C0 DB 01 01 80 */ stfd f24, 0x180(r1) /* 80013784 000106C4 F3 01 01 88 */ psq_st f24, 392(r1), 0, qr0 /* 80013788 000106C8 39 61 01 80 */ addi r11, r1, 0x180 -/* 8001378C 000106CC 48 34 EA 19 */ bl func_803621A4 +/* 8001378C 000106CC 48 34 EA 19 */ bl _savegpr_15 /* 80013790 000106D0 7C 6F 1B 78 */ mr r15, r3 /* 80013794 000106D4 FF 00 08 90 */ fmr f24, f1 /* 80013798 000106D8 88 05 00 00 */ lbz r0, 0(r5) @@ -7754,7 +7754,7 @@ lbl_80013F4C: /* 80013F90 00010ED0 E3 01 01 88 */ psq_l f24, 392(r1), 0, qr0 /* 80013F94 00010ED4 CB 01 01 80 */ lfd f24, 0x180(r1) /* 80013F98 00010ED8 39 61 01 80 */ addi r11, r1, 0x180 -/* 80013F9C 00010EDC 48 34 E2 55 */ bl func_803621F0 +/* 80013F9C 00010EDC 48 34 E2 55 */ bl _restgpr_15 /* 80013FA0 00010EE0 80 01 02 04 */ lwz r0, 0x204(r1) /* 80013FA4 00010EE4 7C 08 03 A6 */ mtlr r0 /* 80013FA8 00010EE8 38 21 02 00 */ addi r1, r1, 0x200 @@ -7773,7 +7773,7 @@ lbl_80013F4C: /* 80013FDC 00010F1C DB 61 01 80 */ stfd f27, 0x180(r1) /* 80013FE0 00010F20 F3 61 01 88 */ psq_st f27, 392(r1), 0, qr0 /* 80013FE4 00010F24 39 61 01 80 */ addi r11, r1, 0x180 -/* 80013FE8 00010F28 48 34 E1 BD */ bl func_803621A4 +/* 80013FE8 00010F28 48 34 E1 BD */ bl _savegpr_15 /* 80013FEC 00010F2C 7C 6F 1B 78 */ mr r15, r3 /* 80013FF0 00010F30 88 05 00 00 */ lbz r0, 0(r5) /* 80013FF4 00010F34 98 03 00 28 */ stb r0, 0x28(r3) @@ -8261,7 +8261,7 @@ lbl_800146EC: /* 80014718 00011658 E3 61 01 88 */ psq_l f27, 392(r1), 0, qr0 /* 8001471C 0001165C CB 61 01 80 */ lfd f27, 0x180(r1) /* 80014720 00011660 39 61 01 80 */ addi r11, r1, 0x180 -/* 80014724 00011664 48 34 DA CD */ bl func_803621F0 +/* 80014724 00011664 48 34 DA CD */ bl _restgpr_15 /* 80014728 00011668 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 8001472C 0001166C 7C 08 03 A6 */ mtlr r0 /* 80014730 00011670 38 21 01 D0 */ addi r1, r1, 0x1d0 diff --git a/asm/m/Do/m_Do_graphic.s b/asm/m/Do/m_Do_graphic.s index 68c4b8d618..e19cddf5ae 100644 --- a/asm/m/Do/m_Do_graphic.s +++ b/asm/m/Do/m_Do_graphic.s @@ -611,7 +611,7 @@ drawDepth2: /* 80008644 00005584 DB C1 01 10 */ stfd f30, 0x110(r1) /* 80008648 00005588 F3 C1 01 18 */ psq_st f30, 280(r1), 0, qr0 /* 8000864C 0000558C 39 61 01 10 */ addi r11, r1, 0x110 -/* 80008650 00005590 48 35 9B 5D */ bl func_803621AC +/* 80008650 00005590 48 35 9B 5D */ bl _savegpr_17 /* 80008654 00005594 7C 7F 1B 78 */ mr r31, r3 /* 80008658 00005598 7C 99 23 78 */ mr r25, r4 /* 8000865C 0000559C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1352,7 +1352,7 @@ lbl_8000915C: /* 80009164 000060A4 E3 C1 01 18 */ psq_l f30, 280(r1), 0, qr0 /* 80009168 000060A8 CB C1 01 10 */ lfd f30, 0x110(r1) /* 8000916C 000060AC 39 61 01 10 */ addi r11, r1, 0x110 -/* 80009170 000060B0 48 35 90 89 */ bl func_803621F8 +/* 80009170 000060B0 48 35 90 89 */ bl _restgpr_17 /* 80009174 000060B4 80 01 01 34 */ lwz r0, 0x134(r1) /* 80009178 000060B8 7C 08 03 A6 */ mtlr r0 /* 8000917C 000060BC 38 21 01 30 */ addi r1, r1, 0x130 @@ -2724,7 +2724,7 @@ drawItem3D: /* 8000A618 00007558 DB C1 03 C0 */ stfd f30, 0x3c0(r1) /* 8000A61C 0000755C F3 C1 03 C8 */ psq_st f30, 968(r1), 0, qr0 /* 8000A620 00007560 39 61 03 C0 */ addi r11, r1, 0x3c0 -/* 8000A624 00007564 48 35 7B 99 */ bl func_803621BC +/* 8000A624 00007564 48 35 7B 99 */ bl _savegpr_21 /* 8000A628 00007568 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8000A62C 0000756C 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 8000A630 00007570 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) @@ -3451,7 +3451,7 @@ lbl_8000B0B0: /* 8000B0F8 00008038 E3 C1 03 C8 */ psq_l f30, 968(r1), 0, qr0 /* 8000B0FC 0000803C CB C1 03 C0 */ lfd f30, 0x3c0(r1) /* 8000B100 00008040 39 61 03 C0 */ addi r11, r1, 0x3c0 -/* 8000B104 00008044 48 35 71 05 */ bl func_80362208 +/* 8000B104 00008044 48 35 71 05 */ bl _restgpr_21 /* 8000B108 00008048 80 01 03 E4 */ lwz r0, 0x3e4(r1) /* 8000B10C 0000804C 7C 08 03 A6 */ mtlr r0 /* 8000B110 00008050 38 21 03 E0 */ addi r1, r1, 0x3e0 diff --git a/asm/m/Do/machine/m_Do_machine_exception.s b/asm/m/Do/machine/m_Do_machine_exception.s index b04b886f86..294d4b83a8 100644 --- a/asm/m/Do/machine/m_Do_machine_exception.s +++ b/asm/m/Do/machine/m_Do_machine_exception.s @@ -140,7 +140,7 @@ lbl_80017F20: /* 80017F6C 00014EAC 7D 89 03 A6 */ mtctr r12 /* 80017F70 00014EB0 4E 80 04 21 */ bctrl /* 80017F74 00014EB4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80017F78 00014EB8 48 34 A2 99 */ bl func_80362210 +/* 80017F78 00014EB8 48 34 A2 99 */ bl _restgpr_23 /* 80017F7C 00014EBC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80017F80 00014EC0 7C 08 03 A6 */ mtlr r0 /* 80017F84 00014EC4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h index 35d90e7b20..1355ccc768 100644 --- a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h @@ -3,6 +3,6 @@ #include "global.h" -class J2DPicture{}; +class J2DPicture {}; #endif \ No newline at end of file diff --git a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h index 15d6edf34c..d5055148f3 100644 --- a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h @@ -3,6 +3,6 @@ #include "global.h" -class J2DTextBox{}; +class J2DTextBox {}; #endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s b/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s index 5501214b51..9addc12d7a 100644 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s +++ b/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s @@ -177,7 +177,7 @@ lbl_802D2590: /* 802D2598 002CF4D8 93 FC 00 00 */ stw r31, 0(r28) lbl_802D259C: /* 802D259C 002CF4DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D25A0 002CF4E0 48 08 FC 71 */ bl func_80362210 +/* 802D25A0 002CF4E0 48 08 FC 71 */ bl _restgpr_23 /* 802D25A4 002CF4E4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D25A8 002CF4E8 7C 08 03 A6 */ mtlr r0 /* 802D25AC 002CF4EC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s b/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s index ec0652f155..ca7128a24b 100644 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s +++ b/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s @@ -172,7 +172,7 @@ lbl_802D2814: /* 802D2814 002CF754 7F 43 D3 78 */ mr r3, r26 lbl_802D2818: /* 802D2818 002CF758 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D281C 002CF75C 48 08 F9 F1 */ bl func_8036220C +/* 802D281C 002CF75C 48 08 F9 F1 */ bl _restgpr_22 /* 802D2820 002CF760 80 01 00 74 */ lwz r0, 0x74(r1) /* 802D2824 002CF764 7C 08 03 A6 */ mtlr r0 /* 802D2828 002CF768 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s index fa5b19aa5a..118b59f377 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s @@ -177,7 +177,7 @@ lbl_802DB3BC: /* 802DB3CC 002D830C 38 60 00 00 */ li r3, 0 lbl_802DB3D0: /* 802DB3D0 002D8310 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DB3D4 002D8314 48 08 6E 3D */ bl func_80362210 +/* 802DB3D4 002D8314 48 08 6E 3D */ bl _restgpr_23 /* 802DB3D8 002D8318 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DB3DC 002D831C 7C 08 03 A6 */ mtlr r0 /* 802DB3E0 002D8320 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s index aa5c22e22b..804b88def1 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s @@ -44,7 +44,7 @@ lbl_802D9C00: /* 802D9C38 002D6B78 7F E3 FB 78 */ mr r3, r31 lbl_802D9C3C: /* 802D9C3C 002D6B7C 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D9C40 002D6B80 48 08 85 D1 */ bl func_80362210 +/* 802D9C40 002D6B80 48 08 85 D1 */ bl _restgpr_23 /* 802D9C44 002D6B84 80 01 01 34 */ lwz r0, 0x134(r1) /* 802D9C48 002D6B88 7C 08 03 A6 */ mtlr r0 /* 802D9C4C 002D6B8C 38 21 01 30 */ addi r1, r1, 0x130 diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s index 9d7eeebecb..b61001b794 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s @@ -44,7 +44,7 @@ lbl_802D9CBC: /* 802D9CF4 002D6C34 7F E3 FB 78 */ mr r3, r31 lbl_802D9CF8: /* 802D9CF8 002D6C38 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D9CFC 002D6C3C 48 08 85 15 */ bl func_80362210 +/* 802D9CFC 002D6C3C 48 08 85 15 */ bl _restgpr_23 /* 802D9D00 002D6C40 80 01 01 34 */ lwz r0, 0x134(r1) /* 802D9D04 002D6C44 7C 08 03 A6 */ mtlr r0 /* 802D9D08 002D6C48 38 21 01 30 */ addi r1, r1, 0x130 diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s index 8df2e794c7..903a0154d5 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s @@ -4,7 +4,7 @@ /* 802D9D14 002D6C54 7C 08 02 A6 */ mflr r0 /* 802D9D18 002D6C58 90 01 00 C4 */ stw r0, 0xc4(r1) /* 802D9D1C 002D6C5C 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 802D9D20 002D6C60 48 08 84 91 */ bl func_803621B0 +/* 802D9D20 002D6C60 48 08 84 91 */ bl _savegpr_18 /* 802D9D24 002D6C64 7C 76 1B 78 */ mr r22, r3 /* 802D9D28 002D6C68 7C 9C 23 78 */ mr r28, r4 /* 802D9D2C 002D6C6C 7C B5 2B 78 */ mr r21, r5 @@ -350,7 +350,7 @@ lbl_802DA1C8: /* 802DA1C8 002D7108 38 60 00 00 */ li r3, 0 lbl_802DA1CC: /* 802DA1CC 002D710C 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 802DA1D0 002D7110 48 08 80 2D */ bl func_803621FC +/* 802DA1D0 002D7110 48 08 80 2D */ bl _restgpr_18 /* 802DA1D4 002D7114 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802DA1D8 002D7118 7C 08 03 A6 */ mtlr r0 /* 802DA1DC 002D711C 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s index 155f8fe411..088b749f98 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s @@ -189,7 +189,7 @@ lbl_802E0B9C: /* 802E0B9C 002DDADC 48 00 04 09 */ bl checkResetSwitch__10JUTGamePadFv /* 802E0BA0 002DDAE0 80 6D 8F 60 */ lwz r3, _sRumbleSupported-_SDA_BASE_(r13) /* 802E0BA4 002DDAE4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E0BA8 002DDAE8 48 08 16 65 */ bl func_8036220C +/* 802E0BA8 002DDAE8 48 08 16 65 */ bl _restgpr_22 /* 802E0BAC 002DDAEC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802E0BB0 002DDAF0 7C 08 03 A6 */ mtlr r0 /* 802E0BB4 002DDAF4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/SComponent/c_cc_s/c_cc_s.h b/include/SComponent/c_cc_s/c_cc_s.h index 06ce04692a..eee254b996 100644 --- a/include/SComponent/c_cc_s/c_cc_s.h +++ b/include/SComponent/c_cc_s/c_cc_s.h @@ -1,8 +1,8 @@ #ifndef __C_CC_S_H_ #define __C_CC_S_H_ -#include "global.h" #include "SComponent/c_cc_d/c_cc_d.h" +#include "global.h" class cCcS { public: diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s index 0c94afac0e..0b916e6722 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s @@ -4,7 +4,7 @@ /* 802B6B04 002B3A44 DB E1 02 80 */ stfd f31, 0x280(r1) /* 802B6B08 002B3A48 F3 E1 02 88 */ psq_st f31, 648(r1), 0, 0 /* 802B6B0C 002B3A4C 39 61 02 80 */ addi r11, r1, 0x280 -/* 802B6B10 002B3A50 48 0A B6 99 */ bl func_803621A8 +/* 802B6B10 002B3A50 48 0A B6 99 */ bl _savegpr_16 /* 802B6B14 002B3A54 7C 7B 1B 78 */ mr r27, r3 /* 802B6B18 002B3A58 7C 92 23 78 */ mr r18, r4 /* 802B6B1C 002B3A5C 7C BA 2B 78 */ mr r26, r5 @@ -3191,7 +3191,7 @@ lbl_802B9938: /* 802B993C 002B687C E3 E1 02 88 */ psq_l f31, 648(r1), 0, 0 /* 802B9940 002B6880 CB E1 02 80 */ lfd f31, 0x280(r1) /* 802B9944 002B6884 39 61 02 80 */ addi r11, r1, 0x280 -/* 802B9948 002B6888 48 0A 88 AD */ bl func_803621F4 +/* 802B9948 002B6888 48 0A 88 AD */ bl _restgpr_16 /* 802B994C 002B688C 80 01 02 94 */ lwz r0, 0x294(r1) /* 802B9950 002B6890 7C 08 03 A6 */ mtlr r0 /* 802B9954 002B6894 38 21 02 90 */ addi r1, r1, 0x290 diff --git a/include/d/d_a/d_a_alink/asm/func_8009F034.s b/include/d/d_a/d_a_alink/asm/func_8009F034.s index d9b92c6af4..00b39a207d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009F034.s +++ b/include/d/d_a/d_a_alink/asm/func_8009F034.s @@ -12,7 +12,7 @@ /* 8009F060 0009BFA0 DB 61 01 30 */ stfd f27, 0x130(r1) /* 8009F064 0009BFA4 F3 61 01 38 */ psq_st f27, 312(r1), 0, 0 /* 8009F068 0009BFA8 39 61 01 30 */ addi r11, r1, 0x130 -/* 8009F06C 0009BFAC 48 2C 31 4D */ bl func_803621B8 +/* 8009F06C 0009BFAC 48 2C 31 4D */ bl _savegpr_20 /* 8009F070 0009BFB0 7C 7F 1B 78 */ mr r31, r3 /* 8009F074 0009BFB4 80 63 20 60 */ lwz r3, 0x2060(r3) /* 8009F078 0009BFB8 88 03 00 00 */ lbz r0, 0(r3) @@ -1099,7 +1099,7 @@ lbl_8009FFB8: /* 8009FFD8 0009CF18 E3 61 01 38 */ psq_l f27, 312(r1), 0, 0 /* 8009FFDC 0009CF1C CB 61 01 30 */ lfd f27, 0x130(r1) /* 8009FFE0 0009CF20 39 61 01 30 */ addi r11, r1, 0x130 -/* 8009FFE4 0009CF24 48 2C 22 21 */ bl func_80362204 +/* 8009FFE4 0009CF24 48 2C 22 21 */ bl _restgpr_20 /* 8009FFE8 0009CF28 80 01 01 84 */ lwz r0, 0x184(r1) /* 8009FFEC 0009CF2C 7C 08 03 A6 */ mtlr r0 /* 8009FFF0 0009CF30 38 21 01 80 */ addi r1, r1, 0x180 diff --git a/include/d/d_a/d_a_alink/asm/func_800A142C.s b/include/d/d_a/d_a_alink/asm/func_800A142C.s index e82e4ce1b6..4604a1b9f5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A142C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A142C.s @@ -2,7 +2,7 @@ /* 800A1430 0009E370 7C 08 02 A6 */ mflr r0 /* 800A1434 0009E374 90 01 00 A4 */ stw r0, 0xa4(r1) /* 800A1438 0009E378 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800A143C 0009E37C 48 2C 0D 7D */ bl func_803621B8 +/* 800A143C 0009E37C 48 2C 0D 7D */ bl _savegpr_20 /* 800A1440 0009E380 7C 7F 1B 78 */ mr r31, r3 /* 800A1444 0009E384 7C 99 23 78 */ mr r25, r4 /* 800A1448 0009E388 7C BB 2B 78 */ mr r27, r5 @@ -474,7 +474,7 @@ lbl_800A1AC8: lbl_800A1AD0: /* 800A1AD0 0009EA10 7F 03 C3 78 */ mr r3, r24 /* 800A1AD4 0009EA14 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800A1AD8 0009EA18 48 2C 07 2D */ bl func_80362204 +/* 800A1AD8 0009EA18 48 2C 07 2D */ bl _restgpr_20 /* 800A1ADC 0009EA1C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800A1AE0 0009EA20 7C 08 03 A6 */ mtlr r0 /* 800A1AE4 0009EA24 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A2710.s b/include/d/d_a/d_a_alink/asm/func_800A2710.s index 09a0aa96a6..0dc47d62f1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2710.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2710.s @@ -2,7 +2,7 @@ /* 800A2714 0009F654 7C 08 02 A6 */ mflr r0 /* 800A2718 0009F658 90 01 00 64 */ stw r0, 0x64(r1) /* 800A271C 0009F65C 39 61 00 60 */ addi r11, r1, 0x60 -/* 800A2720 0009F660 48 2B FA 89 */ bl func_803621A8 +/* 800A2720 0009F660 48 2B FA 89 */ bl _savegpr_16 /* 800A2724 0009F664 7C 79 1B 78 */ mr r25, r3 /* 800A2728 0009F668 3A 79 2A 4C */ addi r19, r25, 0x2a4c /* 800A272C 0009F66C 3A 80 00 00 */ li r20, 0 @@ -180,7 +180,7 @@ lbl_800A282C: /* 800A29C0 0009F900 38 60 00 01 */ li r3, 1 lbl_800A29C4: /* 800A29C4 0009F904 39 61 00 60 */ addi r11, r1, 0x60 -/* 800A29C8 0009F908 48 2B F8 2D */ bl func_803621F4 +/* 800A29C8 0009F908 48 2B F8 2D */ bl _restgpr_16 /* 800A29CC 0009F90C 80 01 00 64 */ lwz r0, 0x64(r1) /* 800A29D0 0009F910 7C 08 03 A6 */ mtlr r0 /* 800A29D4 0009F914 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_a/d_a_alink/asm/func_800A3430.s b/include/d/d_a/d_a_alink/asm/func_800A3430.s index 4616833188..2ad1060757 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3430.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3430.s @@ -376,7 +376,7 @@ lbl_800A3988: /* 800A3998 000A08D8 E3 A1 00 E8 */ psq_l f29, 232(r1), 0, 0 /* 800A399C 000A08DC CB A1 00 E0 */ lfd f29, 0xe0(r1) /* 800A39A0 000A08E0 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 800A39A4 000A08E4 48 2B E8 6D */ bl func_80362210 +/* 800A39A4 000A08E4 48 2B E8 6D */ bl _restgpr_23 /* 800A39A8 000A08E8 80 01 01 14 */ lwz r0, 0x114(r1) /* 800A39AC 000A08EC 7C 08 03 A6 */ mtlr r0 /* 800A39B0 000A08F0 38 21 01 10 */ addi r1, r1, 0x110 diff --git a/include/d/d_a/d_a_alink/asm/func_800A39B8.s b/include/d/d_a/d_a_alink/asm/func_800A39B8.s index b8fa807147..c9c72faf7e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A39B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A39B8.s @@ -187,7 +187,7 @@ lbl_800A3C6C: /* 800A3C6C 000A0BAC E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 800A3C70 000A0BB0 CB E1 00 70 */ lfd f31, 0x70(r1) /* 800A3C74 000A0BB4 39 61 00 70 */ addi r11, r1, 0x70 -/* 800A3C78 000A0BB8 48 2B E5 99 */ bl func_80362210 +/* 800A3C78 000A0BB8 48 2B E5 99 */ bl _restgpr_23 /* 800A3C7C 000A0BBC 80 01 00 84 */ lwz r0, 0x84(r1) /* 800A3C80 000A0BC0 7C 08 03 A6 */ mtlr r0 /* 800A3C84 000A0BC4 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s index 04e9c8715f..be8461a65f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s @@ -557,7 +557,7 @@ lbl_800A54D0: /* 800A54D8 000A2418 90 17 05 7C */ stw r0, 0x57c(r23) lbl_800A54DC: /* 800A54DC 000A241C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800A54E0 000A2420 48 2B CD 2D */ bl func_8036220C +/* 800A54E0 000A2420 48 2B CD 2D */ bl _restgpr_22 /* 800A54E4 000A2424 80 01 00 34 */ lwz r0, 0x34(r1) /* 800A54E8 000A2428 7C 08 03 A6 */ mtlr r0 /* 800A54EC 000A242C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800ADE14.s b/include/d/d_a/d_a_alink/asm/func_800ADE14.s index 3c1989fb11..3bb67bc2b1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADE14.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADE14.s @@ -18,7 +18,7 @@ /* 800ADE58 000AAD98 DB 01 00 80 */ stfd f24, 0x80(r1) /* 800ADE5C 000AAD9C F3 01 00 88 */ psq_st f24, 136(r1), 0, 0 /* 800ADE60 000AADA0 39 61 00 80 */ addi r11, r1, 0x80 -/* 800ADE64 000AADA4 48 2B 43 59 */ bl func_803621BC +/* 800ADE64 000AADA4 48 2B 43 59 */ bl _savegpr_21 /* 800ADE68 000AADA8 7C 7F 1B 78 */ mr r31, r3 /* 800ADE6C 000AADAC FF 20 08 90 */ fmr f25, f1 /* 800ADE70 000AADB0 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -866,7 +866,7 @@ lbl_800AEA18: /* 800AEA50 000AB990 E3 01 00 88 */ psq_l f24, 136(r1), 0, 0 /* 800AEA54 000AB994 CB 01 00 80 */ lfd f24, 0x80(r1) /* 800AEA58 000AB998 39 61 00 80 */ addi r11, r1, 0x80 -/* 800AEA5C 000AB99C 48 2B 37 AD */ bl func_80362208 +/* 800AEA5C 000AB99C 48 2B 37 AD */ bl _restgpr_21 /* 800AEA60 000AB9A0 80 01 01 04 */ lwz r0, 0x104(r1) /* 800AEA64 000AB9A4 7C 08 03 A6 */ mtlr r0 /* 800AEA68 000AB9A8 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/include/d/d_a/d_a_alink/asm/func_800B02BC.s b/include/d/d_a/d_a_alink/asm/func_800B02BC.s index db7d5fa9dc..69deeefe35 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B02BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B02BC.s @@ -1218,7 +1218,7 @@ lbl_800B140C: /* 800B144C 000AE38C E2 E1 00 E8 */ psq_l f23, 232(r1), 0, 0 /* 800B1450 000AE390 CA E1 00 E0 */ lfd f23, 0xe0(r1) /* 800B1454 000AE394 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 800B1458 000AE398 48 2B 0D B9 */ bl func_80362210 +/* 800B1458 000AE398 48 2B 0D B9 */ bl _restgpr_23 /* 800B145C 000AE39C 80 01 01 74 */ lwz r0, 0x174(r1) /* 800B1460 000AE3A0 7C 08 03 A6 */ mtlr r0 /* 800B1464 000AE3A4 38 21 01 70 */ addi r1, r1, 0x170 diff --git a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s index c38648a601..31166d3fcb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s @@ -1080,7 +1080,7 @@ lbl_800CD770: /* 800CD770 000CA6B0 38 60 00 01 */ li r3, 1 lbl_800CD774: /* 800CD774 000CA6B4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800CD778 000CA6B8 48 29 4A 99 */ bl func_80362210 +/* 800CD778 000CA6B8 48 29 4A 99 */ bl _restgpr_23 /* 800CD77C 000CA6BC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800CD780 000CA6C0 7C 08 03 A6 */ mtlr r0 /* 800CD784 000CA6C4 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CE294.s b/include/d/d_a/d_a_alink/asm/func_800CE294.s index b96edf01e5..5ebba76a34 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE294.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE294.s @@ -118,7 +118,7 @@ lbl_800CE41C: lbl_800CE44C: /* 800CE44C 000CB38C 7F E3 FB 78 */ mr r3, r31 /* 800CE450 000CB390 39 61 00 30 */ addi r11, r1, 0x30 -/* 800CE454 000CB394 48 29 3D B9 */ bl func_8036220C +/* 800CE454 000CB394 48 29 3D B9 */ bl _restgpr_22 /* 800CE458 000CB398 80 01 00 34 */ lwz r0, 0x34(r1) /* 800CE45C 000CB39C 7C 08 03 A6 */ mtlr r0 /* 800CE460 000CB3A0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800CE468.s b/include/d/d_a/d_a_alink/asm/func_800CE468.s index bff409dc49..5710d05c52 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE468.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE468.s @@ -118,7 +118,7 @@ lbl_800CE600: lbl_800CE60C: /* 800CE60C 000CB54C 7F E3 FB 78 */ mr r3, r31 /* 800CE610 000CB550 39 61 00 30 */ addi r11, r1, 0x30 -/* 800CE614 000CB554 48 29 3B FD */ bl func_80362210 +/* 800CE614 000CB554 48 29 3B FD */ bl _restgpr_23 /* 800CE618 000CB558 80 01 00 34 */ lwz r0, 0x34(r1) /* 800CE61C 000CB55C 7C 08 03 A6 */ mtlr r0 /* 800CE620 000CB560 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800D7C40.s b/include/d/d_a/d_a_alink/asm/func_800D7C40.s index f60172650b..cfb7ee333a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7C40.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7C40.s @@ -1316,7 +1316,7 @@ lbl_800D8EF4: /* 800D8F20 000D5E60 48 05 14 11 */ bl daAlink_c_NS_checkWolfBarrierHitReverse lbl_800D8F24: /* 800D8F24 000D5E64 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 800D8F28 000D5E68 48 28 92 E9 */ bl func_80362210 +/* 800D8F28 000D5E68 48 28 92 E9 */ bl _restgpr_23 /* 800D8F2C 000D5E6C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800D8F30 000D5E70 7C 08 03 A6 */ mtlr r0 /* 800D8F34 000D5E74 38 21 00 E0 */ addi r1, r1, 0xe0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D96DC.s b/include/d/d_a/d_a_alink/asm/func_800D96DC.s index 68bc28e341..e4716d87e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D96DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D96DC.s @@ -2,7 +2,7 @@ /* 800D96E0 000D6620 7C 08 02 A6 */ mflr r0 /* 800D96E4 000D6624 90 01 00 54 */ stw r0, 0x54(r1) /* 800D96E8 000D6628 39 61 00 50 */ addi r11, r1, 0x50 -/* 800D96EC 000D662C 48 28 8A D1 */ bl func_803621BC +/* 800D96EC 000D662C 48 28 8A D1 */ bl _savegpr_21 /* 800D96F0 000D6630 7C 75 1B 78 */ mr r21, r3 /* 800D96F4 000D6634 7C 96 23 78 */ mr r22, r4 /* 800D96F8 000D6638 7C B7 2B 78 */ mr r23, r5 @@ -541,7 +541,7 @@ lbl_800D9E6C: /* 800D9E6C 000D6DAC 38 60 00 01 */ li r3, 1 lbl_800D9E70: /* 800D9E70 000D6DB0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800D9E74 000D6DB4 48 28 83 95 */ bl func_80362208 +/* 800D9E74 000D6DB4 48 28 83 95 */ bl _restgpr_21 /* 800D9E78 000D6DB8 80 01 00 54 */ lwz r0, 0x54(r1) /* 800D9E7C 000D6DBC 7C 08 03 A6 */ mtlr r0 /* 800D9E80 000D6DC0 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_80107900.s b/include/d/d_a/d_a_alink/asm/func_80107900.s index 372ae0d20c..247ac3cf5a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107900.s +++ b/include/d/d_a/d_a_alink/asm/func_80107900.s @@ -16,7 +16,7 @@ /* 8010793C 0010487C DB 21 00 F0 */ stfd f25, 0xf0(r1) /* 80107940 00104880 F3 21 00 F8 */ psq_st f25, 248(r1), 0, 0 /* 80107944 00104884 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80107948 00104888 48 25 A8 75 */ bl func_803621BC +/* 80107948 00104888 48 25 A8 75 */ bl _savegpr_21 /* 8010794C 0010488C 83 A3 00 0C */ lwz r29, 0xc(r3) /* 80107950 00104890 80 9D 07 68 */ lwz r4, 0x768(r29) /* 80107954 00104894 80 64 00 60 */ lwz r3, 0x60(r4) @@ -738,7 +738,7 @@ lbl_80108378: /* 801083A8 001052E8 E3 21 00 F8 */ psq_l f25, 248(r1), 0, 0 /* 801083AC 001052EC CB 21 00 F0 */ lfd f25, 0xf0(r1) /* 801083B0 001052F0 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 801083B4 001052F4 48 25 9E 55 */ bl func_80362208 +/* 801083B4 001052F4 48 25 9E 55 */ bl _restgpr_21 /* 801083B8 001052F8 80 01 01 64 */ lwz r0, 0x164(r1) /* 801083BC 001052FC 7C 08 03 A6 */ mtlr r0 /* 801083C0 00105300 38 21 01 60 */ addi r1, r1, 0x160 diff --git a/include/d/d_a/d_a_alink/asm/func_801171F4.s b/include/d/d_a/d_a_alink/asm/func_801171F4.s index 7bf45c25cc..50382a49ca 100644 --- a/include/d/d_a/d_a_alink/asm/func_801171F4.s +++ b/include/d/d_a/d_a_alink/asm/func_801171F4.s @@ -671,7 +671,7 @@ lbl_80117B58: /* 80117B74 00114AB4 4B F9 81 49 */ bl daAlink_c_NS_resetFacePriAnime lbl_80117B78: /* 80117B78 00114AB8 39 61 00 90 */ addi r11, r1, 0x90 -/* 80117B7C 00114ABC 48 24 A6 95 */ bl func_80362210 +/* 80117B7C 00114ABC 48 24 A6 95 */ bl _restgpr_23 /* 80117B80 00114AC0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80117B84 00114AC4 7C 08 03 A6 */ mtlr r0 /* 80117B88 00114AC8 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/include/d/d_a/d_a_alink/asm/func_80120880.s b/include/d/d_a/d_a_alink/asm/func_80120880.s index 021ca7a2f9..9709a8d456 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120880.s +++ b/include/d/d_a/d_a_alink/asm/func_80120880.s @@ -166,7 +166,7 @@ lbl_80120AC4: /* 80120AE0 0011DA20 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 80120AE4 0011DA24 CB E1 00 50 */ lfd f31, 0x50(r1) /* 80120AE8 0011DA28 39 61 00 50 */ addi r11, r1, 0x50 -/* 80120AEC 0011DA2C 48 24 17 25 */ bl func_80362210 +/* 80120AEC 0011DA2C 48 24 17 25 */ bl _restgpr_23 /* 80120AF0 0011DA30 80 01 00 64 */ lwz r0, 0x64(r1) /* 80120AF4 0011DA34 7C 08 03 A6 */ mtlr r0 /* 80120AF8 0011DA38 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_a/d_a_alink/asm/func_80120B00.s b/include/d/d_a/d_a_alink/asm/func_80120B00.s index 9f8711a2aa..cea250f421 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120B00.s +++ b/include/d/d_a/d_a_alink/asm/func_80120B00.s @@ -176,7 +176,7 @@ lbl_80120D6C: /* 80120D90 0011DCD0 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* 80120D94 0011DCD4 CB C1 00 60 */ lfd f30, 0x60(r1) /* 80120D98 0011DCD8 39 61 00 60 */ addi r11, r1, 0x60 -/* 80120D9C 0011DCDC 48 24 14 71 */ bl func_8036220C +/* 80120D9C 0011DCDC 48 24 14 71 */ bl _restgpr_22 /* 80120DA0 0011DCE0 80 01 00 84 */ lwz r0, 0x84(r1) /* 80120DA4 0011DCE4 7C 08 03 A6 */ mtlr r0 /* 80120DA8 0011DCE8 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_a/d_a_alink/asm/func_80120DB0.s b/include/d/d_a/d_a_alink/asm/func_80120DB0.s index 56d9a43afb..d6647aa2d3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120DB0.s +++ b/include/d/d_a/d_a_alink/asm/func_80120DB0.s @@ -149,7 +149,7 @@ lbl_80120FBC: /* 80120FE0 0011DF20 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* 80120FE4 0011DF24 CB C1 00 60 */ lfd f30, 0x60(r1) /* 80120FE8 0011DF28 39 61 00 60 */ addi r11, r1, 0x60 -/* 80120FEC 0011DF2C 48 24 12 21 */ bl func_8036220C +/* 80120FEC 0011DF2C 48 24 12 21 */ bl _restgpr_22 /* 80120FF0 0011DF30 80 01 00 84 */ lwz r0, 0x84(r1) /* 80120FF4 0011DF34 7C 08 03 A6 */ mtlr r0 /* 80120FF8 0011DF38 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_a/d_a_alink/asm/func_80121004.s b/include/d/d_a/d_a_alink/asm/func_80121004.s index 2a1c53ffe0..9317a67cec 100644 --- a/include/d/d_a/d_a_alink/asm/func_80121004.s +++ b/include/d/d_a/d_a_alink/asm/func_80121004.s @@ -112,7 +112,7 @@ lbl_8012118C: /* 801211A0 0011E0E0 3B 9C 00 0C */ addi r28, r28, 0xc /* 801211A4 0011E0E4 41 80 FE 98 */ blt lbl_8012103C /* 801211A8 0011E0E8 39 61 00 70 */ addi r11, r1, 0x70 -/* 801211AC 0011E0EC 48 24 10 61 */ bl func_8036220C +/* 801211AC 0011E0EC 48 24 10 61 */ bl _restgpr_22 /* 801211B0 0011E0F0 80 01 00 74 */ lwz r0, 0x74(r1) /* 801211B4 0011E0F4 7C 08 03 A6 */ mtlr r0 /* 801211B8 0011E0F8 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_a/d_a_alink/asm/func_80122F78.s b/include/d/d_a/d_a_alink/asm/func_80122F78.s index 01e6b43d4a..813afc1d21 100644 --- a/include/d/d_a/d_a_alink/asm/func_80122F78.s +++ b/include/d/d_a/d_a_alink/asm/func_80122F78.s @@ -278,7 +278,7 @@ lbl_80123384: /* 80123388 001202C8 41 80 FE 9C */ blt lbl_80123224 lbl_8012338C: /* 8012338C 001202CC 39 61 00 80 */ addi r11, r1, 0x80 -/* 80123390 001202D0 48 23 EE 7D */ bl func_8036220C +/* 80123390 001202D0 48 23 EE 7D */ bl _restgpr_22 /* 80123394 001202D4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80123398 001202D8 7C 08 03 A6 */ mtlr r0 /* 8012339C 001202DC 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_a/d_a_alink/asm/func_8012589C.s b/include/d/d_a/d_a_alink/asm/func_8012589C.s index 8d251a1617..a6cb604174 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012589C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012589C.s @@ -152,7 +152,7 @@ lbl_80125AE4: /* 80125AEC 00122A2C E3 C1 00 E8 */ psq_l f30, 232(r1), 0, 0 /* 80125AF0 00122A30 CB C1 00 E0 */ lfd f30, 0xe0(r1) /* 80125AF4 00122A34 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80125AF8 00122A38 48 23 C7 15 */ bl func_8036220C +/* 80125AF8 00122A38 48 23 C7 15 */ bl _restgpr_22 /* 80125AFC 00122A3C 80 01 01 04 */ lwz r0, 0x104(r1) /* 80125B00 00122A40 7C 08 03 A6 */ mtlr r0 /* 80125B04 00122A44 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/include/d/d_a/d_a_alink/asm/func_8012AD1C.s b/include/d/d_a/d_a_alink/asm/func_8012AD1C.s index 18e215cbcf..4698f24b06 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012AD1C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012AD1C.s @@ -700,7 +700,7 @@ lbl_8012B704: /* 8012B704 00128644 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* 8012B708 00128648 CB E1 00 90 */ lfd f31, 0x90(r1) /* 8012B70C 0012864C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8012B710 00128650 48 23 6A FD */ bl func_8036220C +/* 8012B710 00128650 48 23 6A FD */ bl _restgpr_22 /* 8012B714 00128654 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8012B718 00128658 7C 08 03 A6 */ mtlr r0 /* 8012B71C 0012865C 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012B724.s b/include/d/d_a/d_a_alink/asm/func_8012B724.s index 060f6c770a..e73b2df4e6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012B724.s +++ b/include/d/d_a/d_a_alink/asm/func_8012B724.s @@ -14,7 +14,7 @@ /* 8012B758 00128698 DB 41 01 10 */ stfd f26, 0x110(r1) /* 8012B75C 0012869C F3 41 01 18 */ psq_st f26, 280(r1), 0, 0 /* 8012B760 001286A0 39 61 01 10 */ addi r11, r1, 0x110 -/* 8012B764 001286A4 48 23 6A 3D */ bl func_803621A0 +/* 8012B764 001286A4 48 23 6A 3D */ bl _savegpr_14 /* 8012B768 001286A8 7C 6F 1B 78 */ mr r15, r3 /* 8012B76C 001286AC 80 63 20 60 */ lwz r3, 0x2060(r3) /* 8012B770 001286B0 88 03 00 00 */ lbz r0, 0(r3) @@ -587,7 +587,7 @@ lbl_8012BF60: /* 8012BF88 00128EC8 E3 41 01 18 */ psq_l f26, 280(r1), 0, 0 /* 8012BF8C 00128ECC CB 41 01 10 */ lfd f26, 0x110(r1) /* 8012BF90 00128ED0 39 61 01 10 */ addi r11, r1, 0x110 -/* 8012BF94 00128ED4 48 23 62 59 */ bl func_803621EC +/* 8012BF94 00128ED4 48 23 62 59 */ bl _restgpr_14 /* 8012BF98 00128ED8 80 01 01 74 */ lwz r0, 0x174(r1) /* 8012BF9C 00128EDC 7C 08 03 A6 */ mtlr r0 /* 8012BFA0 00128EE0 38 21 01 70 */ addi r1, r1, 0x170 diff --git a/include/d/d_a/d_a_alink/asm/func_8012C30C.s b/include/d/d_a/d_a_alink/asm/func_8012C30C.s index 0408a33901..3eb59158bc 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012C30C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012C30C.s @@ -14,7 +14,7 @@ /* 8012C340 00129280 DB 41 00 F0 */ stfd f26, 0xf0(r1) /* 8012C344 00129284 F3 41 00 F8 */ psq_st f26, 248(r1), 0, 0 /* 8012C348 00129288 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8012C34C 0012928C 48 23 5E 59 */ bl func_803621A4 +/* 8012C34C 0012928C 48 23 5E 59 */ bl _savegpr_15 /* 8012C350 00129290 7C 7C 1B 78 */ mr r28, r3 /* 8012C354 00129294 88 03 2F BF */ lbz r0, 0x2fbf(r3) /* 8012C358 00129298 28 00 00 00 */ cmplwi r0, 0 @@ -546,7 +546,7 @@ lbl_8012CAC4: /* 8012CAEC 00129A2C E3 41 00 F8 */ psq_l f26, 248(r1), 0, 0 /* 8012CAF0 00129A30 CB 41 00 F0 */ lfd f26, 0xf0(r1) /* 8012CAF4 00129A34 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8012CAF8 00129A38 48 23 56 F9 */ bl func_803621F0 +/* 8012CAF8 00129A38 48 23 56 F9 */ bl _restgpr_15 /* 8012CAFC 00129A3C 80 01 01 54 */ lwz r0, 0x154(r1) /* 8012CB00 00129A40 7C 08 03 A6 */ mtlr r0 /* 8012CB04 00129A44 38 21 01 50 */ addi r1, r1, 0x150 diff --git a/include/d/d_attention/asm/func_80070E90.s b/include/d/d_attention/asm/func_80070E90.s index 168acdf576..64e2af91a3 100644 --- a/include/d/d_attention/asm/func_80070E90.s +++ b/include/d/d_attention/asm/func_80070E90.s @@ -8,7 +8,7 @@ /* 80070EAC 0006DDEC DB A1 00 40 */ stfd f29, 0x40(r1) /* 80070EB0 0006DDF0 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* 80070EB4 0006DDF4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80070EB8 0006DDF8 48 2F 13 05 */ bl func_803621BC +/* 80070EB8 0006DDF8 48 2F 13 05 */ bl _savegpr_21 /* 80070EBC 0006DDFC 7C 77 1B 78 */ mr r23, r3 /* 80070EC0 0006DE00 7C B8 2B 78 */ mr r24, r5 /* 80070EC4 0006DE04 FF A0 08 90 */ fmr f29, f1 @@ -151,7 +151,7 @@ lbl_80071090: /* 800710A0 0006DFE0 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* 800710A4 0006DFE4 CB A1 00 40 */ lfd f29, 0x40(r1) /* 800710A8 0006DFE8 39 61 00 40 */ addi r11, r1, 0x40 -/* 800710AC 0006DFEC 48 2F 11 5D */ bl func_80362208 +/* 800710AC 0006DFEC 48 2F 11 5D */ bl _restgpr_21 /* 800710B0 0006DFF0 80 01 00 74 */ lwz r0, 0x74(r1) /* 800710B4 0006DFF4 7C 08 03 A6 */ mtlr r0 /* 800710B8 0006DFF8 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_attention/asm/func_800716B8.s b/include/d/d_attention/asm/func_800716B8.s index 0917161487..faaa882703 100644 --- a/include/d/d_attention/asm/func_800716B8.s +++ b/include/d/d_attention/asm/func_800716B8.s @@ -132,7 +132,7 @@ lbl_80071884: /* 80071884 0006E7C4 7C 19 E8 00 */ cmpw r25, r29 /* 80071888 0006E7C8 41 80 FF 90 */ blt lbl_80071818 /* 8007188C 0006E7CC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80071890 0006E7D0 48 2F 09 7D */ bl func_8036220C +/* 80071890 0006E7D0 48 2F 09 7D */ bl _restgpr_22 /* 80071894 0006E7D4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80071898 0006E7D8 7C 08 03 A6 */ mtlr r0 /* 8007189C 0006E7DC 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_camera/asm/func_80163D5C.s b/include/d/d_camera/asm/func_80163D5C.s index 503d159360..70e117cb0a 100644 --- a/include/d/d_camera/asm/func_80163D5C.s +++ b/include/d/d_camera/asm/func_80163D5C.s @@ -2,7 +2,7 @@ /* 80163D60 00160CA0 7C 08 02 A6 */ mflr r0 /* 80163D64 00160CA4 90 01 00 44 */ stw r0, 0x44(r1) /* 80163D68 00160CA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80163D6C 00160CAC 48 1F E4 51 */ bl func_803621BC +/* 80163D6C 00160CAC 48 1F E4 51 */ bl _savegpr_21 /* 80163D70 00160CB0 7C 77 1B 78 */ mr r23, r3 /* 80163D74 00160CB4 7C 98 23 78 */ mr r24, r4 /* 80163D78 00160CB8 7F 1D C3 78 */ mr r29, r24 @@ -482,7 +482,7 @@ lbl_80164404: lbl_80164430: /* 80164430 00161370 7F A3 EB 78 */ mr r3, r29 /* 80164434 00161374 39 61 00 40 */ addi r11, r1, 0x40 -/* 80164438 00161378 48 1F DD D1 */ bl func_80362208 +/* 80164438 00161378 48 1F DD D1 */ bl _restgpr_21 /* 8016443C 0016137C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80164440 00161380 7C 08 03 A6 */ mtlr r0 /* 80164444 00161384 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_camera/asm/func_80166764.s b/include/d/d_camera/asm/func_80166764.s index 6c0c5f94b1..0fa8cd4849 100644 --- a/include/d/d_camera/asm/func_80166764.s +++ b/include/d/d_camera/asm/func_80166764.s @@ -1376,7 +1376,7 @@ lbl_80167B30: /* 80167B9C 00164ADC E3 21 06 08 */ psq_l f25, 1544(r1), 0, 0 /* 80167BA0 00164AE0 CB 21 06 00 */ lfd f25, 0x600(r1) /* 80167BA4 00164AE4 39 61 06 00 */ addi r11, r1, 0x600 -/* 80167BA8 00164AE8 48 1F A6 65 */ bl func_8036220C +/* 80167BA8 00164AE8 48 1F A6 65 */ bl _restgpr_22 /* 80167BAC 00164AEC 80 01 06 74 */ lwz r0, 0x674(r1) /* 80167BB0 00164AF0 7C 08 03 A6 */ mtlr r0 /* 80167BB4 00164AF4 38 21 06 70 */ addi r1, r1, 0x670 diff --git a/include/d/d_camera/asm/func_80168744.s b/include/d/d_camera/asm/func_80168744.s index b0db037b30..fed6db50a9 100644 --- a/include/d/d_camera/asm/func_80168744.s +++ b/include/d/d_camera/asm/func_80168744.s @@ -38,7 +38,7 @@ /* 801687D8 00165718 D9 C1 06 20 */ stfd f14, 0x620(r1) /* 801687DC 0016571C F1 C1 06 28 */ psq_st f14, 1576(r1), 0, 0 /* 801687E0 00165720 39 61 06 20 */ addi r11, r1, 0x620 -/* 801687E4 00165724 48 1F 99 C5 */ bl func_803621A8 +/* 801687E4 00165724 48 1F 99 C5 */ bl _savegpr_16 /* 801687E8 00165728 7C 7F 1B 78 */ mr r31, r3 /* 801687EC 0016572C 7C 9E 23 78 */ mr r30, r4 /* 801687F0 00165730 88 0D 8A B8 */ lbz r0, lbl_80451038-_SDA_BASE_(r13) @@ -4011,7 +4011,7 @@ lbl_8016C1B4: /* 8016C23C 0016917C E1 C1 06 28 */ psq_l f14, 1576(r1), 0, 0 /* 8016C240 00169180 C9 C1 06 20 */ lfd f14, 0x620(r1) /* 8016C244 00169184 39 61 06 20 */ addi r11, r1, 0x620 -/* 8016C248 00169188 48 1F 5F AD */ bl func_803621F4 +/* 8016C248 00169188 48 1F 5F AD */ bl _restgpr_16 /* 8016C24C 0016918C 80 01 07 44 */ lwz r0, 0x744(r1) /* 8016C250 00169190 7C 08 03 A6 */ mtlr r0 /* 8016C254 00169194 38 21 07 40 */ addi r1, r1, 0x740 diff --git a/include/d/d_camera/asm/func_8016C384.s b/include/d/d_camera/asm/func_8016C384.s index 3e3d4ac72b..d676c87d95 100644 --- a/include/d/d_camera/asm/func_8016C384.s +++ b/include/d/d_camera/asm/func_8016C384.s @@ -38,7 +38,7 @@ /* 8016C418 00169358 D9 C1 04 30 */ stfd f14, 0x430(r1) /* 8016C41C 0016935C F1 C1 04 38 */ psq_st f14, 1080(r1), 0, 0 /* 8016C420 00169360 39 61 04 30 */ addi r11, r1, 0x430 -/* 8016C424 00169364 48 1F 5D 8D */ bl func_803621B0 +/* 8016C424 00169364 48 1F 5D 8D */ bl _savegpr_18 /* 8016C428 00169368 7C 7E 1B 78 */ mr r30, r3 /* 8016C42C 0016936C 7C 9F 23 78 */ mr r31, r4 /* 8016C430 00169370 C3 C3 0A 40 */ lfs f30, 0xa40(r3) @@ -2188,7 +2188,7 @@ lbl_8016E2B0: /* 8016E3F0 0016B330 E1 C1 04 38 */ psq_l f14, 1080(r1), 0, 0 /* 8016E3F4 0016B334 C9 C1 04 30 */ lfd f14, 0x430(r1) /* 8016E3F8 0016B338 39 61 04 30 */ addi r11, r1, 0x430 -/* 8016E3FC 0016B33C 48 1F 3E 01 */ bl func_803621FC +/* 8016E3FC 0016B33C 48 1F 3E 01 */ bl _restgpr_18 /* 8016E400 0016B340 80 01 05 54 */ lwz r0, 0x554(r1) /* 8016E404 0016B344 7C 08 03 A6 */ mtlr r0 /* 8016E408 0016B348 38 21 05 50 */ addi r1, r1, 0x550 diff --git a/include/d/d_camera/asm/func_8016E4F4.s b/include/d/d_camera/asm/func_8016E4F4.s index b80934c2ab..8d61e26162 100644 --- a/include/d/d_camera/asm/func_8016E4F4.s +++ b/include/d/d_camera/asm/func_8016E4F4.s @@ -6942,7 +6942,7 @@ lbl_80174D4C: /* 80174DF8 00171D38 12 21 00 0C */ psq_lx f17, r1, r0, 0, 0 /* 80174DFC 00171D3C CA 21 14 A0 */ lfd f17, 0x14a0(r1) /* 80174E00 00171D40 39 61 14 A0 */ addi r11, r1, 0x14a0 -/* 80174E04 00171D44 48 1E D4 09 */ bl func_8036220C +/* 80174E04 00171D44 48 1E D4 09 */ bl _restgpr_22 /* 80174E08 00171D48 80 01 15 94 */ lwz r0, 0x1594(r1) /* 80174E0C 00171D4C 7C 08 03 A6 */ mtlr r0 /* 80174E10 00171D50 38 21 15 90 */ addi r1, r1, 0x1590 diff --git a/include/d/d_camera/asm/func_80174ED4.s b/include/d/d_camera/asm/func_80174ED4.s index 3cc32f1db7..0884c709dd 100644 --- a/include/d/d_camera/asm/func_80174ED4.s +++ b/include/d/d_camera/asm/func_80174ED4.s @@ -32,7 +32,7 @@ /* 80174F50 00171E90 DA 21 03 B0 */ stfd f17, 0x3b0(r1) /* 80174F54 00171E94 F2 21 03 B8 */ psq_st f17, 952(r1), 0, 0 /* 80174F58 00171E98 39 61 03 B0 */ addi r11, r1, 0x3b0 -/* 80174F5C 00171E9C 48 1E D2 61 */ bl func_803621BC +/* 80174F5C 00171E9C 48 1E D2 61 */ bl _savegpr_21 /* 80174F60 00171EA0 7C 7F 1B 78 */ mr r31, r3 /* 80174F64 00171EA4 7C 96 23 78 */ mr r22, r4 /* 80174F68 00171EA8 80 03 0A F4 */ lwz r0, 0xaf4(r3) @@ -1184,7 +1184,7 @@ lbl_80175FE4: /* 80176054 00172F94 E2 21 03 B8 */ psq_l f17, 952(r1), 0, 0 /* 80176058 00172F98 CA 21 03 B0 */ lfd f17, 0x3b0(r1) /* 8017605C 00172F9C 39 61 03 B0 */ addi r11, r1, 0x3b0 -/* 80176060 00172FA0 48 1E C1 A9 */ bl func_80362208 +/* 80176060 00172FA0 48 1E C1 A9 */ bl _restgpr_21 /* 80176064 00172FA4 80 01 04 A4 */ lwz r0, 0x4a4(r1) /* 80176068 00172FA8 7C 08 03 A6 */ mtlr r0 /* 8017606C 00172FAC 38 21 04 A0 */ addi r1, r1, 0x4a0 diff --git a/include/d/d_camera/asm/func_80176E00.s b/include/d/d_camera/asm/func_80176E00.s index add7c60b2b..a979a70d16 100644 --- a/include/d/d_camera/asm/func_80176E00.s +++ b/include/d/d_camera/asm/func_80176E00.s @@ -2143,7 +2143,7 @@ lbl_80178DA8: /* 80178E30 00175D70 E1 C1 04 78 */ psq_l f14, 1144(r1), 0, 0 /* 80178E34 00175D74 C9 C1 04 70 */ lfd f14, 0x470(r1) /* 80178E38 00175D78 39 61 04 70 */ addi r11, r1, 0x470 -/* 80178E3C 00175D7C 48 1E 93 D1 */ bl func_8036220C +/* 80178E3C 00175D7C 48 1E 93 D1 */ bl _restgpr_22 /* 80178E40 00175D80 80 01 05 94 */ lwz r0, 0x594(r1) /* 80178E44 00175D84 7C 08 03 A6 */ mtlr r0 /* 80178E48 00175D88 38 21 05 90 */ addi r1, r1, 0x590 diff --git a/include/d/d_camera/asm/func_8017A2A0.s b/include/d/d_camera/asm/func_8017A2A0.s index 22af78ace8..1043556749 100644 --- a/include/d/d_camera/asm/func_8017A2A0.s +++ b/include/d/d_camera/asm/func_8017A2A0.s @@ -743,7 +743,7 @@ lbl_8017AD48: /* 8017ADA0 00177CE0 E2 81 02 98 */ psq_l f20, 664(r1), 0, 0 /* 8017ADA4 00177CE4 CA 81 02 90 */ lfd f20, 0x290(r1) /* 8017ADA8 00177CE8 39 61 02 90 */ addi r11, r1, 0x290 -/* 8017ADAC 00177CEC 48 1E 74 65 */ bl func_80362210 +/* 8017ADAC 00177CEC 48 1E 74 65 */ bl _restgpr_23 /* 8017ADB0 00177CF0 80 01 03 54 */ lwz r0, 0x354(r1) /* 8017ADB4 00177CF4 7C 08 03 A6 */ mtlr r0 /* 8017ADB8 00177CF8 38 21 03 50 */ addi r1, r1, 0x350 diff --git a/include/d/d_camera/asm/func_80181220.s b/include/d/d_camera/asm/func_80181220.s index 5663cfa0f8..198245f489 100644 --- a/include/d/d_camera/asm/func_80181220.s +++ b/include/d/d_camera/asm/func_80181220.s @@ -2,7 +2,7 @@ /* 80181224 0017E164 7C 08 02 A6 */ mflr r0 /* 80181228 0017E168 90 01 00 34 */ stw r0, 0x34(r1) /* 8018122C 0017E16C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80181230 0017E170 48 1E 0F 15 */ bl func_80362144 +/* 80181230 0017E170 48 1E 0F 15 */ bl _savefpr_29 /* 80181234 0017E174 93 E1 00 14 */ stw r31, 0x14(r1) /* 80181238 0017E178 7C 7F 1B 78 */ mr r31, r3 /* 8018123C 0017E17C FF A0 08 90 */ fmr f29, f1 @@ -14,7 +14,7 @@ /* 80181254 0017E194 D3 DF 07 1C */ stfs f30, 0x71c(r31) /* 80181258 0017E198 D3 FF 07 20 */ stfs f31, 0x720(r31) /* 8018125C 0017E19C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80181260 0017E1A0 48 1E 0F 31 */ bl func_80362190 +/* 80181260 0017E1A0 48 1E 0F 31 */ bl _restfpr_29 /* 80181264 0017E1A4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80181268 0017E1A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018126C 0017E1AC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_cc/d_cc_s/d_cc_s.h b/include/d/d_cc/d_cc_s/d_cc_s.h index f64125be22..3ba173d647 100644 --- a/include/d/d_cc/d_cc_s/d_cc_s.h +++ b/include/d/d_cc/d_cc_s/d_cc_s.h @@ -1,9 +1,9 @@ #ifndef __D_CC_S_H_ #define __D_CC_S_H_ -#include "global.h" #include "SComponent/c_cc_s/c_cc_s.h" #include "d/d_cc/d_cc_mass_s/d_cc_mass_s.h" +#include "global.h" class dCcS { public: diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index 366f9764dc..ca36e86907 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -66,6 +66,7 @@ public: dStage_roomControl_c& getRoomControl() { return room_control; } item_func& getGiveItem() { return give_item; } u8& getUnkHeart() { return unk_heart; } + private: /* 0x00000 */ dBgS dbgs; /* 0x0143C */ dCcS dccs; @@ -165,7 +166,8 @@ extern dComIfG_inf_c g_dComIfG_gameInfo; // } // void dComIfGs_setItem(int item_slot, u8 item_id) { -// g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(item_slot, item_id); +// g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(item_slot, +// item_id); // } // u16 dComIfGs_getOil(void) { diff --git a/include/d/d_event/d_event_manager/d_event_manager.h b/include/d/d_event/d_event_manager/d_event_manager.h index d1c91ae401..376785e4d2 100644 --- a/include/d/d_event/d_event_manager/d_event_manager.h +++ b/include/d/d_event/d_event_manager/d_event_manager.h @@ -1,8 +1,8 @@ #ifndef __D_EVENT_MANAGER_H_ #define __D_EVENT_MANAGER_H_ -#include "dolphin/types.h" #include "d/d_event/d_event_data/d_event_data.h" +#include "dolphin/types.h" class dEvent_exception_c { public: diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s b/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s index e64e5beb88..ca22b74d8b 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s @@ -89,7 +89,7 @@ lbl_80192BDC: /* 80192BE8 0018FB28 3A D6 00 08 */ addi r22, r22, 8 /* 80192BEC 0018FB2C 41 80 FF 20 */ blt lbl_80192B0C /* 80192BF0 0018FB30 39 61 00 80 */ addi r11, r1, 0x80 -/* 80192BF4 0018FB34 48 1C F6 19 */ bl func_8036220C +/* 80192BF4 0018FB34 48 1C F6 19 */ bl _restgpr_22 /* 80192BF8 0018FB38 80 01 00 84 */ lwz r0, 0x84(r1) /* 80192BFC 0018FB3C 7C 08 03 A6 */ mtlr r0 /* 80192C00 0018FB40 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_item/d_item/asm/func_8009B940.s b/include/d/d_item/d_item/asm/func_8009B940.s index b6dd3d166d..e54977ad70 100644 --- a/include/d/d_item/d_item/asm/func_8009B940.s +++ b/include/d/d_item/d_item/asm/func_8009B940.s @@ -2,7 +2,7 @@ /* 8009B944 00098884 7C 08 02 A6 */ mflr r0 /* 8009B948 00098888 90 01 00 54 */ stw r0, 0x54(r1) /* 8009B94C 0009888C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8009B950 00098890 48 2C 68 69 */ bl func_803621B8 +/* 8009B950 00098890 48 2C 68 69 */ bl _savegpr_20 /* 8009B954 00098894 7C 7E 1B 78 */ mr r30, r3 /* 8009B958 00098898 7C 9F 23 78 */ mr r31, r4 /* 8009B95C 0009889C 3B 20 00 00 */ li r25, 0 @@ -178,7 +178,7 @@ lbl_8009BBB0: /* 8009BBBC 00098AFC 57 E3 06 3E */ clrlwi r3, r31, 0x18 lbl_8009BBC0: /* 8009BBC0 00098B00 39 61 00 50 */ addi r11, r1, 0x50 -/* 8009BBC4 00098B04 48 2C 66 41 */ bl func_80362204 +/* 8009BBC4 00098B04 48 2C 66 41 */ bl _restgpr_20 /* 8009BBC8 00098B08 80 01 00 54 */ lwz r0, 0x54(r1) /* 8009BBCC 00098B0C 7C 08 03 A6 */ mtlr r0 /* 8009BBD0 00098B10 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_kankyo/asm/func_8019DD6C.s b/include/d/d_kankyo/asm/func_8019DD6C.s index 9987f2c904..1e5203b23b 100644 --- a/include/d/d_kankyo/asm/func_8019DD6C.s +++ b/include/d/d_kankyo/asm/func_8019DD6C.s @@ -6,7 +6,7 @@ /* 8019DD80 0019ACC0 DB C1 00 40 */ stfd f30, 0x40(r1) /* 8019DD84 0019ACC4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* 8019DD88 0019ACC8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8019DD8C 0019ACCC 48 1C 44 31 */ bl func_803621BC +/* 8019DD8C 0019ACCC 48 1C 44 31 */ bl _savegpr_21 /* 8019DD90 0019ACD0 7C 76 1B 78 */ mr r22, r3 /* 8019DD94 0019ACD4 7C 97 23 78 */ mr r23, r4 /* 8019DD98 0019ACD8 C3 E2 A2 70 */ lfs f31, lbl_80453C70-_SDA2_BASE_(r2) @@ -271,7 +271,7 @@ lbl_8019E114: /* 8019E11C 0019B05C E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* 8019E120 0019B060 CB C1 00 40 */ lfd f30, 0x40(r1) /* 8019E124 0019B064 39 61 00 40 */ addi r11, r1, 0x40 -/* 8019E128 0019B068 48 1C 40 E1 */ bl func_80362208 +/* 8019E128 0019B068 48 1C 40 E1 */ bl _restgpr_21 /* 8019E12C 0019B06C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8019E130 0019B070 7C 08 03 A6 */ mtlr r0 /* 8019E134 0019B074 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_kankyo/asm/func_8019E13C.s b/include/d/d_kankyo/asm/func_8019E13C.s index 1d6b6b9406..260afd5f84 100644 --- a/include/d/d_kankyo/asm/func_8019E13C.s +++ b/include/d/d_kankyo/asm/func_8019E13C.s @@ -196,7 +196,7 @@ lbl_8019E3E4: /* 8019E3E4 0019B324 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 8019E3E8 0019B328 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8019E3EC 0019B32C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8019E3F0 0019B330 48 1C 3E 21 */ bl func_80362210 +/* 8019E3F0 0019B330 48 1C 3E 21 */ bl _restgpr_23 /* 8019E3F4 0019B334 80 01 00 54 */ lwz r0, 0x54(r1) /* 8019E3F8 0019B338 7C 08 03 A6 */ mtlr r0 /* 8019E3FC 0019B33C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_kankyo/asm/func_8019E874.s b/include/d/d_kankyo/asm/func_8019E874.s index 10df002084..dfc8f82845 100644 --- a/include/d/d_kankyo/asm/func_8019E874.s +++ b/include/d/d_kankyo/asm/func_8019E874.s @@ -2,7 +2,7 @@ /* 8019E878 0019B7B8 7C 08 02 A6 */ mflr r0 /* 8019E87C 0019B7BC 90 01 00 54 */ stw r0, 0x54(r1) /* 8019E880 0019B7C0 39 61 00 50 */ addi r11, r1, 0x50 -/* 8019E884 0019B7C4 48 1C 39 39 */ bl func_803621BC +/* 8019E884 0019B7C4 48 1C 39 39 */ bl _savegpr_21 /* 8019E888 0019B7C8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019E88C 0019B7CC 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l /* 8019E890 0019B7D0 38 60 00 00 */ li r3, 0 @@ -134,7 +134,7 @@ lbl_8019EA70: /* 8019EA80 0019B9C0 38 E7 00 0C */ addi r7, r7, 0xc /* 8019EA84 0019B9C4 42 00 FE 54 */ bdnz lbl_8019E8D8 /* 8019EA88 0019B9C8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8019EA8C 0019B9CC 48 1C 37 7D */ bl func_80362208 +/* 8019EA8C 0019B9CC 48 1C 37 7D */ bl _restgpr_21 /* 8019EA90 0019B9D0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8019EA94 0019B9D4 7C 08 03 A6 */ mtlr r0 /* 8019EA98 0019B9D8 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_kankyo/asm/func_8019FBD4.s b/include/d/d_kankyo/asm/func_8019FBD4.s index 7ab4888b53..9779db413b 100644 --- a/include/d/d_kankyo/asm/func_8019FBD4.s +++ b/include/d/d_kankyo/asm/func_8019FBD4.s @@ -2,7 +2,7 @@ /* 8019FBD8 0019CB18 7C 08 02 A6 */ mflr r0 /* 8019FBDC 0019CB1C 90 01 00 54 */ stw r0, 0x54(r1) /* 8019FBE0 0019CB20 39 61 00 50 */ addi r11, r1, 0x50 -/* 8019FBE4 0019CB24 48 1C 25 C5 */ bl func_803621A8 +/* 8019FBE4 0019CB24 48 1C 25 C5 */ bl _savegpr_16 /* 8019FBE8 0019CB28 7C 95 23 78 */ mr r21, r4 /* 8019FBEC 0019CB2C 7C B6 2B 78 */ mr r22, r5 /* 8019FBF0 0019CB30 7C D7 33 78 */ mr r23, r6 @@ -525,7 +525,7 @@ lbl_801A0314: /* 801A0324 0019D264 98 1C 00 00 */ stb r0, 0(r28) lbl_801A0328: /* 801A0328 0019D268 39 61 00 50 */ addi r11, r1, 0x50 -/* 801A032C 0019D26C 48 1C 1E C9 */ bl func_803621F4 +/* 801A032C 0019D26C 48 1C 1E C9 */ bl _restgpr_16 /* 801A0330 0019D270 80 01 00 54 */ lwz r0, 0x54(r1) /* 801A0334 0019D274 7C 08 03 A6 */ mtlr r0 /* 801A0338 0019D278 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_kankyo/asm/func_801A0340.s b/include/d/d_kankyo/asm/func_801A0340.s index 2907b4b353..3bb8af9baf 100644 --- a/include/d/d_kankyo/asm/func_801A0340.s +++ b/include/d/d_kankyo/asm/func_801A0340.s @@ -2,7 +2,7 @@ /* 801A0344 0019D284 7C 08 02 A6 */ mflr r0 /* 801A0348 0019D288 90 01 00 44 */ stw r0, 0x44(r1) /* 801A034C 0019D28C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801A0350 0019D290 48 1C 1D F5 */ bl func_80362144 +/* 801A0350 0019D290 48 1C 1D F5 */ bl _savefpr_29 /* 801A0354 0019D294 39 61 00 28 */ addi r11, r1, 0x28 /* 801A0358 0019D298 48 1C 1E 79 */ bl _savegpr_26 /* 801A035C 0019D29C 7C 7A 1B 78 */ mr r26, r3 @@ -42,7 +42,7 @@ /* 801A03E4 0019D324 4B FF D2 A9 */ bl kankyo_color_ratio_set /* 801A03E8 0019D328 B0 7A 00 04 */ sth r3, 4(r26) /* 801A03EC 0019D32C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801A03F0 0019D330 48 1C 1D A1 */ bl func_80362190 +/* 801A03F0 0019D330 48 1C 1D A1 */ bl _restfpr_29 /* 801A03F4 0019D334 39 61 00 28 */ addi r11, r1, 0x28 /* 801A03F8 0019D338 48 1C 1E 25 */ bl _restgpr_26 /* 801A03FC 0019D33C 80 01 00 44 */ lwz r0, 0x44(r1) diff --git a/include/d/d_kankyo/asm/func_801A040C.s b/include/d/d_kankyo/asm/func_801A040C.s index 836329aa48..9f22a6ec92 100644 --- a/include/d/d_kankyo/asm/func_801A040C.s +++ b/include/d/d_kankyo/asm/func_801A040C.s @@ -6,7 +6,7 @@ /* 801A0420 0019D360 DB C1 01 30 */ stfd f30, 0x130(r1) /* 801A0424 0019D364 F3 C1 01 38 */ psq_st f30, 312(r1), 0, 0 /* 801A0428 0019D368 39 61 01 30 */ addi r11, r1, 0x130 -/* 801A042C 0019D36C 48 1C 1D 75 */ bl func_803621A0 +/* 801A042C 0019D36C 48 1C 1D 75 */ bl _savegpr_14 /* 801A0430 0019D370 7C 6F 1B 78 */ mr r15, r3 /* 801A0434 0019D374 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A0438 0019D378 38 83 CA 54 */ addi r4, r3, lbl_8042CA54@l @@ -1000,7 +1000,7 @@ lbl_801A1314: /* 801A131C 0019E25C E3 C1 01 38 */ psq_l f30, 312(r1), 0, 0 /* 801A1320 0019E260 CB C1 01 30 */ lfd f30, 0x130(r1) /* 801A1324 0019E264 39 61 01 30 */ addi r11, r1, 0x130 -/* 801A1328 0019E268 48 1C 0E C5 */ bl func_803621EC +/* 801A1328 0019E268 48 1C 0E C5 */ bl _restgpr_14 /* 801A132C 0019E26C 80 01 01 54 */ lwz r0, 0x154(r1) /* 801A1330 0019E270 7C 08 03 A6 */ mtlr r0 /* 801A1334 0019E274 38 21 01 50 */ addi r1, r1, 0x150 diff --git a/include/d/d_kankyo/asm/func_801A133C.s b/include/d/d_kankyo/asm/func_801A133C.s index 930bd9357e..975fde1f30 100644 --- a/include/d/d_kankyo/asm/func_801A133C.s +++ b/include/d/d_kankyo/asm/func_801A133C.s @@ -2,7 +2,7 @@ /* 801A1340 0019E280 7C 08 02 A6 */ mflr r0 /* 801A1344 0019E284 90 01 00 C4 */ stw r0, 0xc4(r1) /* 801A1348 0019E288 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 801A134C 0019E28C 48 1C 0E 5D */ bl func_803621A8 +/* 801A134C 0019E28C 48 1C 0E 5D */ bl _savegpr_16 /* 801A1350 0019E290 7C 73 1B 78 */ mr r19, r3 /* 801A1354 0019E294 7C 94 23 78 */ mr r20, r4 /* 801A1358 0019E298 7C BC 2B 78 */ mr r28, r5 @@ -226,7 +226,7 @@ lbl_801A1570: /* 801A16A4 0019E5E4 4B FF B6 39 */ bl dKy_WolfPowerup_FogNearFar lbl_801A16A8: /* 801A16A8 0019E5E8 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 801A16AC 0019E5EC 48 1C 0B 49 */ bl func_803621F4 +/* 801A16AC 0019E5EC 48 1C 0B 49 */ bl _restgpr_16 /* 801A16B0 0019E5F0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801A16B4 0019E5F4 7C 08 03 A6 */ mtlr r0 /* 801A16B8 0019E5F8 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/include/d/d_kankyo/asm/func_801A16C0.s b/include/d/d_kankyo/asm/func_801A16C0.s index 8e3b1205b8..0542ef6409 100644 --- a/include/d/d_kankyo/asm/func_801A16C0.s +++ b/include/d/d_kankyo/asm/func_801A16C0.s @@ -2,7 +2,7 @@ /* 801A16C4 0019E604 7C 08 02 A6 */ mflr r0 /* 801A16C8 0019E608 90 01 01 04 */ stw r0, 0x104(r1) /* 801A16CC 0019E60C 39 61 01 00 */ addi r11, r1, 0x100 -/* 801A16D0 0019E610 48 1C 0A D9 */ bl func_803621A8 +/* 801A16D0 0019E610 48 1C 0A D9 */ bl _savegpr_16 /* 801A16D4 0019E614 7C 76 1B 78 */ mr r22, r3 /* 801A16D8 0019E618 7C 97 23 78 */ mr r23, r4 /* 801A16DC 0019E61C 7C B8 2B 78 */ mr r24, r5 @@ -442,7 +442,7 @@ lbl_801A1D24: /* 801A1D48 0019EC88 4B FF AF 95 */ bl dKy_WolfPowerup_FogNearFar lbl_801A1D4C: /* 801A1D4C 0019EC8C 39 61 01 00 */ addi r11, r1, 0x100 -/* 801A1D50 0019EC90 48 1C 04 A5 */ bl func_803621F4 +/* 801A1D50 0019EC90 48 1C 04 A5 */ bl _restgpr_16 /* 801A1D54 0019EC94 80 01 01 04 */ lwz r0, 0x104(r1) /* 801A1D58 0019EC98 7C 08 03 A6 */ mtlr r0 /* 801A1D5C 0019EC9C 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/include/d/d_kankyo/asm/func_801A2128.s b/include/d/d_kankyo/asm/func_801A2128.s index cc1182106a..fae9c4bc35 100644 --- a/include/d/d_kankyo/asm/func_801A2128.s +++ b/include/d/d_kankyo/asm/func_801A2128.s @@ -8,7 +8,7 @@ /* 801A2144 0019F084 DB A1 01 30 */ stfd f29, 0x130(r1) /* 801A2148 0019F088 F3 A1 01 38 */ psq_st f29, 312(r1), 0, 0 /* 801A214C 0019F08C 39 61 01 30 */ addi r11, r1, 0x130 -/* 801A2150 0019F090 48 1C 00 65 */ bl func_803621B4 +/* 801A2150 0019F090 48 1C 00 65 */ bl _savegpr_19 /* 801A2154 0019F094 7C 74 1B 78 */ mr r20, r3 /* 801A2158 0019F098 7C 95 23 79 */ or. r21, r4, r4 /* 801A215C 0019F09C 7C B6 2B 78 */ mr r22, r5 @@ -1567,7 +1567,7 @@ lbl_801A3794: /* 801A37A4 001A06E4 E3 A1 01 38 */ psq_l f29, 312(r1), 0, 0 /* 801A37A8 001A06E8 CB A1 01 30 */ lfd f29, 0x130(r1) /* 801A37AC 001A06EC 39 61 01 30 */ addi r11, r1, 0x130 -/* 801A37B0 001A06F0 48 1B EA 51 */ bl func_80362200 +/* 801A37B0 001A06F0 48 1B EA 51 */ bl _restgpr_19 /* 801A37B4 001A06F4 80 01 01 64 */ lwz r0, 0x164(r1) /* 801A37B8 001A06F8 7C 08 03 A6 */ mtlr r0 /* 801A37BC 001A06FC 38 21 01 60 */ addi r1, r1, 0x160 diff --git a/include/d/d_kankyo/asm/func_801A4420.s b/include/d/d_kankyo/asm/func_801A4420.s index c10bfaafee..535361b7b2 100644 --- a/include/d/d_kankyo/asm/func_801A4420.s +++ b/include/d/d_kankyo/asm/func_801A4420.s @@ -531,7 +531,7 @@ lbl_801A4BBC: /* 801A4BEC 001A1B2C 4B E5 E9 55 */ bl func_80003540 lbl_801A4BF0: /* 801A4BF0 001A1B30 39 61 00 90 */ addi r11, r1, 0x90 -/* 801A4BF4 001A1B34 48 1B D6 19 */ bl func_8036220C +/* 801A4BF4 001A1B34 48 1B D6 19 */ bl _restgpr_22 /* 801A4BF8 001A1B38 80 01 00 94 */ lwz r0, 0x94(r1) /* 801A4BFC 001A1B3C 7C 08 03 A6 */ mtlr r0 /* 801A4C00 001A1B40 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/include/d/d_kankyo/asm/func_801A5E54.s b/include/d/d_kankyo/asm/func_801A5E54.s index 2bd55d3b20..22b7f1e33b 100644 --- a/include/d/d_kankyo/asm/func_801A5E54.s +++ b/include/d/d_kankyo/asm/func_801A5E54.s @@ -152,7 +152,7 @@ lbl_801A6058: /* 801A609C 001A2FDC E3 A1 00 D8 */ psq_l f29, 216(r1), 0, 0 /* 801A60A0 001A2FE0 CB A1 00 D0 */ lfd f29, 0xd0(r1) /* 801A60A4 001A2FE4 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 801A60A8 001A2FE8 48 1B C1 65 */ bl func_8036220C +/* 801A60A8 001A2FE8 48 1B C1 65 */ bl _restgpr_22 /* 801A60AC 001A2FEC 80 01 01 04 */ lwz r0, 0x104(r1) /* 801A60B0 001A2FF0 7C 08 03 A6 */ mtlr r0 /* 801A60B4 001A2FF4 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/include/d/d_kankyo/asm/func_801A6278.s b/include/d/d_kankyo/asm/func_801A6278.s index 02cfc79e12..567ad5e896 100644 --- a/include/d/d_kankyo/asm/func_801A6278.s +++ b/include/d/d_kankyo/asm/func_801A6278.s @@ -4,7 +4,7 @@ /* 801A6284 001A31C4 DB E1 00 70 */ stfd f31, 0x70(r1) /* 801A6288 001A31C8 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* 801A628C 001A31CC 39 61 00 70 */ addi r11, r1, 0x70 -/* 801A6290 001A31D0 48 1B BF 1D */ bl func_803621AC +/* 801A6290 001A31D0 48 1B BF 1D */ bl _savegpr_17 /* 801A6294 001A31D4 7C 76 1B 78 */ mr r22, r3 /* 801A6298 001A31D8 FF E0 08 90 */ fmr f31, f1 /* 801A629C 001A31DC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -650,7 +650,7 @@ lbl_801A6C00: /* 801A6C00 001A3B40 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 801A6C04 001A3B44 CB E1 00 70 */ lfd f31, 0x70(r1) /* 801A6C08 001A3B48 39 61 00 70 */ addi r11, r1, 0x70 -/* 801A6C0C 001A3B4C 48 1B B5 ED */ bl func_803621F8 +/* 801A6C0C 001A3B4C 48 1B B5 ED */ bl _restgpr_17 /* 801A6C10 001A3B50 80 01 00 84 */ lwz r0, 0x84(r1) /* 801A6C14 001A3B54 7C 08 03 A6 */ mtlr r0 /* 801A6C18 001A3B58 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_kankyo/asm/func_801A6E9C.s b/include/d/d_kankyo/asm/func_801A6E9C.s index 0419f2451b..1063101446 100644 --- a/include/d/d_kankyo/asm/func_801A6E9C.s +++ b/include/d/d_kankyo/asm/func_801A6E9C.s @@ -6,7 +6,7 @@ /* 801A6EB0 001A3DF0 DB C1 00 90 */ stfd f30, 0x90(r1) /* 801A6EB4 001A3DF4 F3 C1 00 98 */ psq_st f30, 152(r1), 0, 0 /* 801A6EB8 001A3DF8 39 61 00 90 */ addi r11, r1, 0x90 -/* 801A6EBC 001A3DFC 48 1B B2 F9 */ bl func_803621B4 +/* 801A6EBC 001A3DFC 48 1B B2 F9 */ bl _savegpr_19 /* 801A6EC0 001A3E00 7C 77 1B 78 */ mr r23, r3 /* 801A6EC4 001A3E04 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A6EC8 001A3E08 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l @@ -480,7 +480,7 @@ lbl_801A7598: /* 801A75A0 001A44E0 E3 C1 00 98 */ psq_l f30, 152(r1), 0, 0 /* 801A75A4 001A44E4 CB C1 00 90 */ lfd f30, 0x90(r1) /* 801A75A8 001A44E8 39 61 00 90 */ addi r11, r1, 0x90 -/* 801A75AC 001A44EC 48 1B AC 55 */ bl func_80362200 +/* 801A75AC 001A44EC 48 1B AC 55 */ bl _restgpr_19 /* 801A75B0 001A44F0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801A75B4 001A44F4 7C 08 03 A6 */ mtlr r0 /* 801A75B8 001A44F8 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/include/d/d_kankyo/asm/func_801A8E20.s b/include/d/d_kankyo/asm/func_801A8E20.s index f3001e1148..3429da4a52 100644 --- a/include/d/d_kankyo/asm/func_801A8E20.s +++ b/include/d/d_kankyo/asm/func_801A8E20.s @@ -8,7 +8,7 @@ /* 801A8E3C 001A5D7C DB A1 01 40 */ stfd f29, 0x140(r1) /* 801A8E40 001A5D80 F3 A1 01 48 */ psq_st f29, 328(r1), 0, 0 /* 801A8E44 001A5D84 39 61 01 40 */ addi r11, r1, 0x140 -/* 801A8E48 001A5D88 48 1B 93 59 */ bl func_803621A0 +/* 801A8E48 001A5D88 48 1B 93 59 */ bl _savegpr_14 /* 801A8E4C 001A5D8C 7C 6E 1B 78 */ mr r14, r3 /* 801A8E50 001A5D90 7C 99 23 78 */ mr r25, r4 /* 801A8E54 001A5D94 7C BA 2B 78 */ mr r26, r5 @@ -920,7 +920,7 @@ lbl_801A9994: /* 801A9BC4 001A6B04 E3 A1 01 48 */ psq_l f29, 328(r1), 0, 0 /* 801A9BC8 001A6B08 CB A1 01 40 */ lfd f29, 0x140(r1) /* 801A9BCC 001A6B0C 39 61 01 40 */ addi r11, r1, 0x140 -/* 801A9BD0 001A6B10 48 1B 86 1D */ bl func_803621EC +/* 801A9BD0 001A6B10 48 1B 86 1D */ bl _restgpr_14 /* 801A9BD4 001A6B14 80 01 01 74 */ lwz r0, 0x174(r1) /* 801A9BD8 001A6B18 7C 08 03 A6 */ mtlr r0 /* 801A9BDC 001A6B1C 38 21 01 70 */ addi r1, r1, 0x170 diff --git a/include/d/d_kankyo/asm/func_801A9D60.s b/include/d/d_kankyo/asm/func_801A9D60.s index 823f3043ec..aa3b522f50 100644 --- a/include/d/d_kankyo/asm/func_801A9D60.s +++ b/include/d/d_kankyo/asm/func_801A9D60.s @@ -6,7 +6,7 @@ /* 801A9D74 001A6CB4 DB C1 00 60 */ stfd f30, 0x60(r1) /* 801A9D78 001A6CB8 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* 801A9D7C 001A6CBC 39 61 00 60 */ addi r11, r1, 0x60 -/* 801A9D80 001A6CC0 48 1B 84 3D */ bl func_803621BC +/* 801A9D80 001A6CC0 48 1B 84 3D */ bl _savegpr_21 /* 801A9D84 001A6CC4 7C 76 1B 78 */ mr r22, r3 /* 801A9D88 001A6CC8 7C 97 23 78 */ mr r23, r4 /* 801A9D8C 001A6CCC FF E0 08 90 */ fmr f31, f1 @@ -643,7 +643,7 @@ lbl_801AA63C: /* 801AA644 001A7584 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* 801AA648 001A7588 CB C1 00 60 */ lfd f30, 0x60(r1) /* 801AA64C 001A758C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801AA650 001A7590 48 1B 7B B9 */ bl func_80362208 +/* 801AA650 001A7590 48 1B 7B B9 */ bl _restgpr_21 /* 801AA654 001A7594 80 01 00 84 */ lwz r0, 0x84(r1) /* 801AA658 001A7598 7C 08 03 A6 */ mtlr r0 /* 801AA65C 001A759C 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_kankyo/asm/func_801AA664.s b/include/d/d_kankyo/asm/func_801AA664.s index 150100992b..9a930cffe4 100644 --- a/include/d/d_kankyo/asm/func_801AA664.s +++ b/include/d/d_kankyo/asm/func_801AA664.s @@ -12,7 +12,7 @@ /* 801AA690 001A75D0 DB 61 00 50 */ stfd f27, 0x50(r1) /* 801AA694 001A75D4 F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* 801AA698 001A75D8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801AA69C 001A75DC 48 1B 7B 21 */ bl func_803621BC +/* 801AA69C 001A75DC 48 1B 7B 21 */ bl _savegpr_21 /* 801AA6A0 001A75E0 7C 76 1B 78 */ mr r22, r3 /* 801AA6A4 001A75E4 FF 60 08 90 */ fmr f27, f1 /* 801AA6A8 001A75E8 FF 80 10 90 */ fmr f28, f2 @@ -418,7 +418,7 @@ lbl_801AAC18: /* 801AAC3C 001A7B7C E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* 801AAC40 001A7B80 CB 61 00 50 */ lfd f27, 0x50(r1) /* 801AAC44 001A7B84 39 61 00 50 */ addi r11, r1, 0x50 -/* 801AAC48 001A7B88 48 1B 75 C1 */ bl func_80362208 +/* 801AAC48 001A7B88 48 1B 75 C1 */ bl _restgpr_21 /* 801AAC4C 001A7B8C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801AAC50 001A7B90 7C 08 03 A6 */ mtlr r0 /* 801AAC54 001A7B94 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_kankyo/asm/func_801ACD24.s b/include/d/d_kankyo/asm/func_801ACD24.s index 29fa644b20..ce62950d14 100644 --- a/include/d/d_kankyo/asm/func_801ACD24.s +++ b/include/d/d_kankyo/asm/func_801ACD24.s @@ -8,7 +8,7 @@ /* 801ACD40 001A9C80 DB A1 02 00 */ stfd f29, 0x200(r1) /* 801ACD44 001A9C84 F3 A1 02 08 */ psq_st f29, 520(r1), 0, 0 /* 801ACD48 001A9C88 39 61 02 00 */ addi r11, r1, 0x200 -/* 801ACD4C 001A9C8C 48 1B 54 5D */ bl func_803621A8 +/* 801ACD4C 001A9C8C 48 1B 54 5D */ bl _savegpr_16 /* 801ACD50 001A9C90 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801ACD54 001A9C94 3B A4 CA 54 */ addi r29, r4, lbl_8042CA54@l /* 801ACD58 001A9C98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -975,7 +975,7 @@ lbl_801ADB8C: /* 801ADB9C 001AAADC E3 A1 02 08 */ psq_l f29, 520(r1), 0, 0 /* 801ADBA0 001AAAE0 CB A1 02 00 */ lfd f29, 0x200(r1) /* 801ADBA4 001AAAE4 39 61 02 00 */ addi r11, r1, 0x200 -/* 801ADBA8 001AAAE8 48 1B 46 4D */ bl func_803621F4 +/* 801ADBA8 001AAAE8 48 1B 46 4D */ bl _restgpr_16 /* 801ADBAC 001AAAEC 80 01 02 34 */ lwz r0, 0x234(r1) /* 801ADBB0 001AAAF0 7C 08 03 A6 */ mtlr r0 /* 801ADBB4 001AAAF4 38 21 02 30 */ addi r1, r1, 0x230 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s index 455866d156..53ccb59391 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s @@ -10,7 +10,7 @@ /* 8005BF2C 00058E6C DB 81 01 60 */ stfd f28, 0x160(r1) /* 8005BF30 00058E70 F3 81 01 68 */ psq_st f28, 360(r1), 0, 0 /* 8005BF34 00058E74 39 61 01 60 */ addi r11, r1, 0x160 -/* 8005BF38 00058E78 48 30 62 75 */ bl func_803621AC +/* 8005BF38 00058E78 48 30 62 75 */ bl _savegpr_17 /* 8005BF3C 00058E7C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005BF40 00058E80 3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l /* 8005BF44 00058E84 83 1D 0E 74 */ lwz r24, 0xe74(r29) @@ -900,7 +900,7 @@ lbl_8005CC24: /* 8005CC3C 00059B7C E3 81 01 68 */ psq_l f28, 360(r1), 0, 0 /* 8005CC40 00059B80 CB 81 01 60 */ lfd f28, 0x160(r1) /* 8005CC44 00059B84 39 61 01 60 */ addi r11, r1, 0x160 -/* 8005CC48 00059B88 48 30 55 B1 */ bl func_803621F8 +/* 8005CC48 00059B88 48 30 55 B1 */ bl _restgpr_17 /* 8005CC4C 00059B8C 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 8005CC50 00059B90 7C 08 03 A6 */ mtlr r0 /* 8005CC54 00059B94 38 21 01 A0 */ addi r1, r1, 0x1a0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s index 8d978e6926..1390149c08 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s @@ -8,7 +8,7 @@ /* 8005D1A8 0005A0E8 DB A1 01 40 */ stfd f29, 0x140(r1) /* 8005D1AC 0005A0EC F3 A1 01 48 */ psq_st f29, 328(r1), 0, 0 /* 8005D1B0 0005A0F0 39 61 01 40 */ addi r11, r1, 0x140 -/* 8005D1B4 0005A0F4 48 30 4F FD */ bl func_803621B0 +/* 8005D1B4 0005A0F4 48 30 4F FD */ bl _savegpr_18 /* 8005D1B8 0005A0F8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005D1BC 0005A0FC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005D1C0 0005A100 83 43 0E 84 */ lwz r26, 0xe84(r3) @@ -1633,7 +1633,7 @@ lbl_8005E880: /* 8005E890 0005B7D0 E3 A1 01 48 */ psq_l f29, 328(r1), 0, 0 /* 8005E894 0005B7D4 CB A1 01 40 */ lfd f29, 0x140(r1) /* 8005E898 0005B7D8 39 61 01 40 */ addi r11, r1, 0x140 -/* 8005E89C 0005B7DC 48 30 39 61 */ bl func_803621FC +/* 8005E89C 0005B7DC 48 30 39 61 */ bl _restgpr_18 /* 8005E8A0 0005B7E0 80 01 01 74 */ lwz r0, 0x174(r1) /* 8005E8A4 0005B7E4 7C 08 03 A6 */ mtlr r0 /* 8005E8A8 0005B7E8 38 21 01 70 */ addi r1, r1, 0x170 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s index b461001e1e..c0fcba4bb4 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s @@ -1323,7 +1323,7 @@ lbl_8005FB7C: /* 8005FBBC 0005CAFC E2 E1 01 C8 */ psq_l f23, 456(r1), 0, 0 /* 8005FBC0 0005CB00 CA E1 01 C0 */ lfd f23, 0x1c0(r1) /* 8005FBC4 0005CB04 39 61 01 C0 */ addi r11, r1, 0x1c0 -/* 8005FBC8 0005CB08 48 30 26 45 */ bl func_8036220C +/* 8005FBC8 0005CB08 48 30 26 45 */ bl _restgpr_22 /* 8005FBCC 0005CB0C 80 01 02 54 */ lwz r0, 0x254(r1) /* 8005FBD0 0005CB10 7C 08 03 A6 */ mtlr r0 /* 8005FBD4 0005CB14 38 21 02 50 */ addi r1, r1, 0x250 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s index 53aa4cfa9e..fabd559caf 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s @@ -28,7 +28,7 @@ /* 8005FDB4 0005CCF4 DA 61 01 80 */ stfd f19, 0x180(r1) /* 8005FDB8 0005CCF8 F2 61 01 88 */ psq_st f19, 392(r1), 0, 0 /* 8005FDBC 0005CCFC 39 61 01 80 */ addi r11, r1, 0x180 -/* 8005FDC0 0005CD00 48 30 23 FD */ bl func_803621BC +/* 8005FDC0 0005CD00 48 30 23 FD */ bl _savegpr_21 /* 8005FDC4 0005CD04 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005FDC8 0005CD08 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005FDCC 0005CD0C 83 03 0E 94 */ lwz r24, 0xe94(r3) @@ -1525,7 +1525,7 @@ lbl_800612A4: /* 80061304 0005E244 E2 61 01 88 */ psq_l f19, 392(r1), 0, 0 /* 80061308 0005E248 CA 61 01 80 */ lfd f19, 0x180(r1) /* 8006130C 0005E24C 39 61 01 80 */ addi r11, r1, 0x180 -/* 80061310 0005E250 48 30 0E F9 */ bl func_80362208 +/* 80061310 0005E250 48 30 0E F9 */ bl _restgpr_21 /* 80061314 0005E254 80 01 02 54 */ lwz r0, 0x254(r1) /* 80061318 0005E258 7C 08 03 A6 */ mtlr r0 /* 8006131C 0005E25C 38 21 02 50 */ addi r1, r1, 0x250 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s index 469db8ca39..0f7d3bf7f3 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s @@ -22,7 +22,7 @@ /* 8006148C 0005E3CC DA C1 00 C0 */ stfd f22, 0xc0(r1) /* 80061490 0005E3D0 F2 C1 00 C8 */ psq_st f22, 200(r1), 0, 0 /* 80061494 0005E3D4 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80061498 0005E3D8 48 30 0D 21 */ bl func_803621B8 +/* 80061498 0005E3D8 48 30 0D 21 */ bl _savegpr_20 /* 8006149C 0005E3DC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800614A0 0005E3E0 3B 63 CA 54 */ addi r27, r3, lbl_8042CA54@l /* 800614A4 0005E3E4 83 1B 0E C0 */ lwz r24, 0xec0(r27) @@ -866,7 +866,7 @@ lbl_80062044: /* 8006208C 0005EFCC E2 C1 00 C8 */ psq_l f22, 200(r1), 0, 0 /* 80062090 0005EFD0 CA C1 00 C0 */ lfd f22, 0xc0(r1) /* 80062094 0005EFD4 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80062098 0005EFD8 48 30 01 6D */ bl func_80362204 +/* 80062098 0005EFD8 48 30 01 6D */ bl _restgpr_20 /* 8006209C 0005EFDC 80 01 01 64 */ lwz r0, 0x164(r1) /* 800620A0 0005EFE0 7C 08 03 A6 */ mtlr r0 /* 800620A4 0005EFE4 38 21 01 60 */ addi r1, r1, 0x160 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s index 932f2ca345..ada42cd2b5 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s @@ -703,7 +703,7 @@ lbl_80062A3C: /* 80062ABC 0005F9FC E2 81 00 88 */ psq_l f20, 136(r1), 0, 0 /* 80062AC0 0005FA00 CA 81 00 80 */ lfd f20, 0x80(r1) /* 80062AC4 0005FA04 39 61 00 80 */ addi r11, r1, 0x80 -/* 80062AC8 0005FA08 48 2F F7 49 */ bl func_80362210 +/* 80062AC8 0005FA08 48 2F F7 49 */ bl _restgpr_23 /* 80062ACC 0005FA0C 80 01 01 44 */ lwz r0, 0x144(r1) /* 80062AD0 0005FA10 7C 08 03 A6 */ mtlr r0 /* 80062AD4 0005FA14 38 21 01 40 */ addi r1, r1, 0x140 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s index 639ae56419..d3505bed8a 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s @@ -22,7 +22,7 @@ /* 800636C4 00060604 DA C1 01 80 */ stfd f22, 0x180(r1) /* 800636C8 00060608 F2 C1 01 88 */ psq_st f22, 392(r1), 0, 0 /* 800636CC 0006060C 39 61 01 80 */ addi r11, r1, 0x180 -/* 800636D0 00060610 48 2F EA E9 */ bl func_803621B8 +/* 800636D0 00060610 48 2F EA E9 */ bl _savegpr_20 /* 800636D4 00060614 7C 7B 1B 78 */ mr r27, r3 /* 800636D8 00060618 7C 95 23 78 */ mr r21, r4 /* 800636DC 0006061C 7C DC 33 78 */ mr r28, r6 @@ -916,7 +916,7 @@ lbl_800643E4: /* 8006442C 0006136C E2 C1 01 88 */ psq_l f22, 392(r1), 0, 0 /* 80064430 00061370 CA C1 01 80 */ lfd f22, 0x180(r1) /* 80064434 00061374 39 61 01 80 */ addi r11, r1, 0x180 -/* 80064438 00061378 48 2F DD CD */ bl func_80362204 +/* 80064438 00061378 48 2F DD CD */ bl _restgpr_20 /* 8006443C 0006137C 80 01 02 24 */ lwz r0, 0x224(r1) /* 80064440 00061380 7C 08 03 A6 */ mtlr r0 /* 80064444 00061384 38 21 02 20 */ addi r1, r1, 0x220 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s index 24490c13ae..39c1210e7f 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s @@ -38,7 +38,7 @@ /* 800644E0 00061420 D9 C1 01 F0 */ stfd f14, 0x1f0(r1) /* 800644E4 00061424 F1 C1 01 F8 */ psq_st f14, 504(r1), 0, 0 /* 800644E8 00061428 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 800644EC 0006142C 48 2F DC D1 */ bl func_803621BC +/* 800644EC 0006142C 48 2F DC D1 */ bl _savegpr_21 /* 800644F0 00061430 7C 78 1B 78 */ mr r24, r3 /* 800644F4 00061434 7C 96 23 78 */ mr r22, r4 /* 800644F8 00061438 7C D7 33 78 */ mr r23, r6 @@ -1187,7 +1187,7 @@ lbl_80065584: /* 8006560C 0006254C E1 C1 01 F8 */ psq_l f14, 504(r1), 0, 0 /* 80065610 00062550 C9 C1 01 F0 */ lfd f14, 0x1f0(r1) /* 80065614 00062554 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 80065618 00062558 48 2F CB F1 */ bl func_80362208 +/* 80065618 00062558 48 2F CB F1 */ bl _restgpr_21 /* 8006561C 0006255C 80 01 03 14 */ lwz r0, 0x314(r1) /* 80065620 00062560 7C 08 03 A6 */ mtlr r0 /* 80065624 00062564 38 21 03 10 */ addi r1, r1, 0x310 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s index 697c48e494..7505bf524b 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s @@ -30,7 +30,7 @@ /* 800656A0 000625E0 DA 41 01 A0 */ stfd f18, 0x1a0(r1) /* 800656A4 000625E4 F2 41 01 A8 */ psq_st f18, 424(r1), 0, 0 /* 800656A8 000625E8 39 61 01 A0 */ addi r11, r1, 0x1a0 -/* 800656AC 000625EC 48 2F CB 09 */ bl func_803621B4 +/* 800656AC 000625EC 48 2F CB 09 */ bl _savegpr_19 /* 800656B0 000625F0 7C 75 1B 78 */ mr r21, r3 /* 800656B4 000625F4 7C 93 23 78 */ mr r19, r4 /* 800656B8 000625F8 3C 60 80 42 */ lis r3, lbl_80424950@ha @@ -661,7 +661,7 @@ lbl_80065FC0: /* 80066028 00062F68 E2 41 01 A8 */ psq_l f18, 424(r1), 0, 0 /* 8006602C 00062F6C CA 41 01 A0 */ lfd f18, 0x1a0(r1) /* 80066030 00062F70 39 61 01 A0 */ addi r11, r1, 0x1a0 -/* 80066034 00062F74 48 2F C1 CD */ bl func_80362200 +/* 80066034 00062F74 48 2F C1 CD */ bl _restgpr_19 /* 80066038 00062F78 80 01 02 84 */ lwz r0, 0x284(r1) /* 8006603C 00062F7C 7C 08 03 A6 */ mtlr r0 /* 80066040 00062F80 38 21 02 80 */ addi r1, r1, 0x280 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s index e99017e3a5..089430844f 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s @@ -18,7 +18,7 @@ /* 80066580 000634C0 DB 01 02 60 */ stfd f24, 0x260(r1) /* 80066584 000634C4 F3 01 02 68 */ psq_st f24, 616(r1), 0, 0 /* 80066588 000634C8 39 61 02 60 */ addi r11, r1, 0x260 -/* 8006658C 000634CC 48 2F BC 21 */ bl func_803621AC +/* 8006658C 000634CC 48 2F BC 21 */ bl _savegpr_17 /* 80066590 000634D0 7C 78 1B 78 */ mr r24, r3 /* 80066594 000634D4 7C 97 23 78 */ mr r23, r4 /* 80066598 000634D8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -1018,7 +1018,7 @@ lbl_80067430: /* 80067468 000643A8 E3 01 02 68 */ psq_l f24, 616(r1), 0, 0 /* 8006746C 000643AC CB 01 02 60 */ lfd f24, 0x260(r1) /* 80067470 000643B0 39 61 02 60 */ addi r11, r1, 0x260 -/* 80067474 000643B4 48 2F AD 85 */ bl func_803621F8 +/* 80067474 000643B4 48 2F AD 85 */ bl _restgpr_17 /* 80067478 000643B8 80 01 02 E4 */ lwz r0, 0x2e4(r1) /* 8006747C 000643BC 7C 08 03 A6 */ mtlr r0 /* 80067480 000643C0 38 21 02 E0 */ addi r1, r1, 0x2e0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s index e541a26cbf..e6166e4723 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s @@ -38,7 +38,7 @@ /* 8006751C 0006445C D9 C1 02 00 */ stfd f14, 0x200(r1) /* 80067520 00064460 F1 C1 02 08 */ psq_st f14, 520(r1), 0, 0 /* 80067524 00064464 39 61 02 00 */ addi r11, r1, 0x200 -/* 80067528 00064468 48 2F AC 79 */ bl func_803621A0 +/* 80067528 00064468 48 2F AC 79 */ bl _savegpr_14 /* 8006752C 0006446C 7C 70 1B 78 */ mr r16, r3 /* 80067530 00064470 7C 8F 23 78 */ mr r15, r4 /* 80067534 00064474 3C 60 80 42 */ lis r3, lbl_80424950@ha @@ -1147,7 +1147,7 @@ lbl_80068534: /* 800685BC 000654FC E1 C1 02 08 */ psq_l f14, 520(r1), 0, 0 /* 800685C0 00065500 C9 C1 02 00 */ lfd f14, 0x200(r1) /* 800685C4 00065504 39 61 02 00 */ addi r11, r1, 0x200 -/* 800685C8 00065508 48 2F 9C 25 */ bl func_803621EC +/* 800685C8 00065508 48 2F 9C 25 */ bl _restgpr_14 /* 800685CC 0006550C 80 01 03 24 */ lwz r0, 0x324(r1) /* 800685D0 00065510 7C 08 03 A6 */ mtlr r0 /* 800685D4 00065514 38 21 03 20 */ addi r1, r1, 0x320 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s index d5de9c507c..949b1c97ee 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s @@ -28,7 +28,7 @@ /* 80068648 00065588 DA 61 01 E0 */ stfd f19, 0x1e0(r1) /* 8006864C 0006558C F2 61 01 E8 */ psq_st f19, 488(r1), 0, 0 /* 80068650 00065590 39 61 01 E0 */ addi r11, r1, 0x1e0 -/* 80068654 00065594 48 2F 9B 65 */ bl func_803621B8 +/* 80068654 00065594 48 2F 9B 65 */ bl _savegpr_20 /* 80068658 00065598 7C 78 1B 78 */ mr r24, r3 /* 8006865C 0006559C 3C 60 80 42 */ lis r3, lbl_80424950@ha /* 80068660 000655A0 3B E3 49 50 */ addi r31, r3, lbl_80424950@l @@ -1027,7 +1027,7 @@ lbl_8006948C: /* 800694EC 0006642C E2 61 01 E8 */ psq_l f19, 488(r1), 0, 0 /* 800694F0 00066430 CA 61 01 E0 */ lfd f19, 0x1e0(r1) /* 800694F4 00066434 39 61 01 E0 */ addi r11, r1, 0x1e0 -/* 800694F8 00066438 48 2F 8D 0D */ bl func_80362204 +/* 800694F8 00066438 48 2F 8D 0D */ bl _restgpr_20 /* 800694FC 0006643C 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 80069500 00066440 7C 08 03 A6 */ mtlr r0 /* 80069504 00066444 38 21 02 B0 */ addi r1, r1, 0x2b0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s index 4670bb9dfc..7b5d853db7 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s @@ -24,7 +24,7 @@ /* 8006A0EC 0006702C DA A1 01 F0 */ stfd f21, 0x1f0(r1) /* 8006A0F0 00067030 F2 A1 01 F8 */ psq_st f21, 504(r1), 0, 0 /* 8006A0F4 00067034 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 8006A0F8 00067038 48 2F 80 A9 */ bl func_803621A0 +/* 8006A0F8 00067038 48 2F 80 A9 */ bl _savegpr_14 /* 8006A0FC 0006703C 7C 7C 1B 78 */ mr r28, r3 /* 8006A100 00067040 7C 9D 23 78 */ mr r29, r4 /* 8006A104 00067044 7C AE 2B 78 */ mr r14, r5 @@ -1128,7 +1128,7 @@ lbl_8006B120: /* 8006B170 000680B0 E2 A1 01 F8 */ psq_l f21, 504(r1), 0, 0 /* 8006B174 000680B4 CA A1 01 F0 */ lfd f21, 0x1f0(r1) /* 8006B178 000680B8 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 8006B17C 000680BC 48 2F 70 71 */ bl func_803621EC +/* 8006B17C 000680BC 48 2F 70 71 */ bl _restgpr_14 /* 8006B180 000680C0 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 8006B184 000680C4 7C 08 03 A6 */ mtlr r0 /* 8006B188 000680C8 38 21 02 A0 */ addi r1, r1, 0x2a0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s index 1e8ce59c91..1a21d299d3 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s @@ -644,7 +644,7 @@ lbl_8006E3C8: /* 8006E428 0006B368 E2 61 01 88 */ psq_l f19, 392(r1), 0, 0 /* 8006E42C 0006B36C CA 61 01 80 */ lfd f19, 0x180(r1) /* 8006E430 0006B370 39 61 01 80 */ addi r11, r1, 0x180 -/* 8006E434 0006B374 48 2F 3D DD */ bl func_80362210 +/* 8006E434 0006B374 48 2F 3D DD */ bl _restgpr_23 /* 8006E438 0006B378 80 01 02 54 */ lwz r0, 0x254(r1) /* 8006E43C 0006B37C 7C 08 03 A6 */ mtlr r0 /* 8006E440 0006B380 38 21 02 50 */ addi r1, r1, 0x250 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s index 59bd94224a..93bec20ece 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s @@ -708,7 +708,7 @@ lbl_8006F128: /* 8006F140 0006C080 E3 81 01 78 */ psq_l f28, 376(r1), 0, 0 /* 8006F144 0006C084 CB 81 01 70 */ lfd f28, 0x170(r1) /* 8006F148 0006C088 39 61 01 70 */ addi r11, r1, 0x170 -/* 8006F14C 0006C08C 48 2F 30 C1 */ bl func_8036220C +/* 8006F14C 0006C08C 48 2F 30 C1 */ bl _restgpr_22 /* 8006F150 0006C090 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 8006F154 0006C094 7C 08 03 A6 */ mtlr r0 /* 8006F158 0006C098 38 21 01 B0 */ addi r1, r1, 0x1b0 diff --git a/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s b/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s index c471717b1c..f73b855823 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s @@ -2,7 +2,7 @@ /* 801FE734 001FB674 7C 08 02 A6 */ mflr r0 /* 801FE738 001FB678 90 01 00 44 */ stw r0, 0x44(r1) /* 801FE73C 001FB67C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801FE740 001FB680 48 16 3A 71 */ bl func_803621B0 +/* 801FE740 001FB680 48 16 3A 71 */ bl _savegpr_18 /* 801FE744 001FB684 3C 80 80 39 */ lis r4, lbl_80397E50@ha /* 801FE748 001FB688 39 04 7E 50 */ addi r8, r4, lbl_80397E50@l /* 801FE74C 001FB68C 3C 80 80 3C */ lis r4, lbl_803BF16C@ha @@ -101,7 +101,7 @@ lbl_801FE7C8: /* 801FE8BC 001FB7FC C0 02 AB 4C */ lfs f0, lbl_8045454C-_SDA2_BASE_(r2) /* 801FE8C0 001FB800 D0 03 02 10 */ stfs f0, 0x210(r3) /* 801FE8C4 001FB804 39 61 00 40 */ addi r11, r1, 0x40 -/* 801FE8C8 001FB808 48 16 39 35 */ bl func_803621FC +/* 801FE8C8 001FB808 48 16 39 35 */ bl _restgpr_18 /* 801FE8CC 001FB80C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801FE8D0 001FB810 7C 08 03 A6 */ mtlr r0 /* 801FE8D4 001FB814 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_meter/d_meter_button/asm/func_80201404.s b/include/d/d_meter/d_meter_button/asm/func_80201404.s index b6d6bc5bdb..7c0856b6f4 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80201404.s +++ b/include/d/d_meter/d_meter_button/asm/func_80201404.s @@ -4,7 +4,7 @@ /* 80201410 001FE350 DB E1 00 70 */ stfd f31, 0x70(r1) /* 80201414 001FE354 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* 80201418 001FE358 39 61 00 70 */ addi r11, r1, 0x70 -/* 8020141C 001FE35C 48 16 0D 85 */ bl func_803621A0 +/* 8020141C 001FE35C 48 16 0D 85 */ bl _savegpr_14 /* 80201420 001FE360 7C 6F 1B 78 */ mr r15, r3 /* 80201424 001FE364 7C 8E 23 78 */ mr r14, r4 /* 80201428 001FE368 7C B1 2B 78 */ mr r17, r5 @@ -975,7 +975,7 @@ lbl_802021FC: /* 80202220 001FF160 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 80202224 001FF164 CB E1 00 70 */ lfd f31, 0x70(r1) /* 80202228 001FF168 39 61 00 70 */ addi r11, r1, 0x70 -/* 8020222C 001FF16C 48 15 FF C1 */ bl func_803621EC +/* 8020222C 001FF16C 48 15 FF C1 */ bl _restgpr_14 /* 80202230 001FF170 80 01 00 84 */ lwz r0, 0x84(r1) /* 80202234 001FF174 7C 08 03 A6 */ mtlr r0 /* 80202238 001FF178 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_meter/d_meter_button/asm/func_80202240.s b/include/d/d_meter/d_meter_button/asm/func_80202240.s index 0cdbc7a66e..c9a746a304 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80202240.s +++ b/include/d/d_meter/d_meter_button/asm/func_80202240.s @@ -8,7 +8,7 @@ /* 8020225C 001FF19C DB A1 03 30 */ stfd f29, 0x330(r1) /* 80202260 001FF1A0 F3 A1 03 38 */ psq_st f29, 824(r1), 0, 0 /* 80202264 001FF1A4 39 61 03 30 */ addi r11, r1, 0x330 -/* 80202268 001FF1A8 48 15 FF 55 */ bl func_803621BC +/* 80202268 001FF1A8 48 15 FF 55 */ bl _savegpr_21 /* 8020226C 001FF1AC 7C 7E 1B 78 */ mr r30, r3 /* 80202270 001FF1B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80202274 001FF1B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -560,7 +560,7 @@ lbl_80202A50: /* 80202A7C 001FF9BC E3 A1 03 38 */ psq_l f29, 824(r1), 0, 0 /* 80202A80 001FF9C0 CB A1 03 30 */ lfd f29, 0x330(r1) /* 80202A84 001FF9C4 39 61 03 30 */ addi r11, r1, 0x330 -/* 80202A88 001FF9C8 48 15 F7 81 */ bl func_80362208 +/* 80202A88 001FF9C8 48 15 F7 81 */ bl _restgpr_21 /* 80202A8C 001FF9CC 80 01 03 64 */ lwz r0, 0x364(r1) /* 80202A90 001FF9D0 7C 08 03 A6 */ mtlr r0 /* 80202A94 001FF9D4 38 21 03 60 */ addi r1, r1, 0x360 diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s index 3c9ad70dd9..be5b974e92 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s @@ -237,7 +237,7 @@ lbl_8020FA18: /* 8020FA68 0020C9A8 E3 01 00 88 */ psq_l f24, 136(r1), 0, 0 /* 8020FA6C 0020C9AC CB 01 00 80 */ lfd f24, 0x80(r1) /* 8020FA70 0020C9B0 39 61 00 80 */ addi r11, r1, 0x80 -/* 8020FA74 0020C9B4 48 15 27 9D */ bl func_80362210 +/* 8020FA74 0020C9B4 48 15 27 9D */ bl _restgpr_23 /* 8020FA78 0020C9B8 80 01 01 04 */ lwz r0, 0x104(r1) /* 8020FA7C 0020C9BC 7C 08 03 A6 */ mtlr r0 /* 8020FA80 0020C9C0 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/include/d/d_meter2/d_meter2/asm/func_80221244.s b/include/d/d_meter2/d_meter2/asm/func_80221244.s index b96be935ed..91670f2381 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80221244.s +++ b/include/d/d_meter2/d_meter2/asm/func_80221244.s @@ -6,7 +6,7 @@ /* 80221258 0021E198 DB C1 00 50 */ stfd f30, 0x50(r1) /* 8022125C 0021E19C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* 80221260 0021E1A0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80221264 0021E1A4 48 14 0F 59 */ bl func_803621BC +/* 80221264 0021E1A4 48 14 0F 59 */ bl _savegpr_21 /* 80221268 0021E1A8 7C 7B 1B 78 */ mr r27, r3 /* 8022126C 0021E1AC 3B C0 00 00 */ li r30, 0 /* 80221270 0021E1B0 3B A0 00 00 */ li r29, 0 @@ -390,7 +390,7 @@ lbl_802217CC: /* 802217D4 0021E714 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* 802217D8 0021E718 CB C1 00 50 */ lfd f30, 0x50(r1) /* 802217DC 0021E71C 39 61 00 50 */ addi r11, r1, 0x50 -/* 802217E0 0021E720 48 14 0A 29 */ bl func_80362208 +/* 802217E0 0021E720 48 14 0A 29 */ bl _restgpr_21 /* 802217E4 0021E724 80 01 00 74 */ lwz r0, 0x74(r1) /* 802217E8 0021E728 7C 08 03 A6 */ mtlr r0 /* 802217EC 0021E72C 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_meter2/d_meter2/asm/func_802217F4.s b/include/d/d_meter2/d_meter2/asm/func_802217F4.s index fc279e1864..423c424370 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802217F4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802217F4.s @@ -6,7 +6,7 @@ /* 80221808 0021E748 DB C1 00 50 */ stfd f30, 0x50(r1) /* 8022180C 0021E74C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* 80221810 0021E750 39 61 00 50 */ addi r11, r1, 0x50 -/* 80221814 0021E754 48 14 09 A9 */ bl func_803621BC +/* 80221814 0021E754 48 14 09 A9 */ bl _savegpr_21 /* 80221818 0021E758 7C 7B 1B 78 */ mr r27, r3 /* 8022181C 0021E75C 3B C0 00 00 */ li r30, 0 /* 80221820 0021E760 3B A0 00 00 */ li r29, 0 @@ -473,7 +473,7 @@ lbl_80221EA0: /* 80221EA8 0021EDE8 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* 80221EAC 0021EDEC CB C1 00 50 */ lfd f30, 0x50(r1) /* 80221EB0 0021EDF0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80221EB4 0021EDF4 48 14 03 55 */ bl func_80362208 +/* 80221EB4 0021EDF4 48 14 03 55 */ bl _restgpr_21 /* 80221EB8 0021EDF8 80 01 00 74 */ lwz r0, 0x74(r1) /* 80221EBC 0021EDFC 7C 08 03 A6 */ mtlr r0 /* 80221EC0 0021EE00 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_meter2/d_meter2/asm/func_802231C8.s b/include/d/d_meter2/d_meter2/asm/func_802231C8.s index e75488b8d6..f01ad9b45c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802231C8.s +++ b/include/d/d_meter2/d_meter2/asm/func_802231C8.s @@ -2,7 +2,7 @@ /* 802231CC 0022010C 7C 08 02 A6 */ mflr r0 /* 802231D0 00220110 90 01 00 84 */ stw r0, 0x84(r1) /* 802231D4 00220114 39 61 00 80 */ addi r11, r1, 0x80 -/* 802231D8 00220118 48 13 EF DD */ bl func_803621B4 +/* 802231D8 00220118 48 13 EF DD */ bl _savegpr_19 /* 802231DC 0022011C 7C 7F 1B 78 */ mr r31, r3 /* 802231E0 00220120 38 00 00 00 */ li r0, 0 /* 802231E4 00220124 98 03 02 01 */ stb r0, 0x201(r3) @@ -397,7 +397,7 @@ lbl_802237AC: /* 802237B8 002206F8 4B DE BA 15 */ bl mDoExt_setCurrentHeap lbl_802237BC: /* 802237BC 002206FC 39 61 00 80 */ addi r11, r1, 0x80 -/* 802237C0 00220700 48 13 EA 41 */ bl func_80362200 +/* 802237C0 00220700 48 13 EA 41 */ bl _restgpr_19 /* 802237C4 00220704 80 01 00 84 */ lwz r0, 0x84(r1) /* 802237C8 00220708 7C 08 03 A6 */ mtlr r0 /* 802237CC 0022070C 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_meter2/d_meter2/asm/func_80223E00.s b/include/d/d_meter2/d_meter2/asm/func_80223E00.s index f16d9d2013..b800c2d9cb 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80223E00.s +++ b/include/d/d_meter2/d_meter2/asm/func_80223E00.s @@ -2,7 +2,7 @@ /* 80223E04 00220D44 7C 08 02 A6 */ mflr r0 /* 80223E08 00220D48 90 01 00 44 */ stw r0, 0x44(r1) /* 80223E0C 00220D4C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80223E10 00220D50 48 13 E3 A1 */ bl func_803621B0 +/* 80223E10 00220D50 48 13 E3 A1 */ bl _savegpr_18 /* 80223E14 00220D54 7C 75 1B 78 */ mr r21, r3 /* 80223E18 00220D58 3A E0 00 00 */ li r23, 0 /* 80223E1C 00220D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -295,7 +295,7 @@ lbl_80224234: /* 80224238 00221178 2C 12 00 02 */ cmpwi r18, 2 /* 8022423C 0022117C 41 80 FF 68 */ blt lbl_802241A4 /* 80224240 00221180 39 61 00 40 */ addi r11, r1, 0x40 -/* 80224244 00221184 48 13 DF B9 */ bl func_803621FC +/* 80224244 00221184 48 13 DF B9 */ bl _restgpr_18 /* 80224248 00221188 80 01 00 44 */ lwz r0, 0x44(r1) /* 8022424C 0022118C 7C 08 03 A6 */ mtlr r0 /* 80224250 00221190 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224258.s b/include/d/d_meter2/d_meter2/asm/func_80224258.s index d18ef3671d..d539ed50bd 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224258.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224258.s @@ -60,7 +60,7 @@ lbl_80224330: /* 80224334 00221274 2C 1F 00 04 */ cmpwi r31, 4 /* 80224338 00221278 41 80 FF 4C */ blt lbl_80224284 /* 8022433C 0022127C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80224340 00221280 48 13 DE D1 */ bl func_80362210 +/* 80224340 00221280 48 13 DE D1 */ bl _restgpr_23 /* 80224344 00221284 80 01 00 34 */ lwz r0, 0x34(r1) /* 80224348 00221288 7C 08 03 A6 */ mtlr r0 /* 8022434C 0022128C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s index f663c6a175..f96095866b 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s @@ -556,7 +556,7 @@ lbl_802102B0: /* 802102D8 0020D218 90 1F 03 6C */ stw r0, 0x36c(r31) /* 802102DC 0020D21C 7F E3 FB 78 */ mr r3, r31 /* 802102E0 0020D220 39 61 00 70 */ addi r11, r1, 0x70 -/* 802102E4 0020D224 48 15 1F 29 */ bl func_8036220C +/* 802102E4 0020D224 48 15 1F 29 */ bl _restgpr_22 /* 802102E8 0020D228 80 01 00 74 */ lwz r0, 0x74(r1) /* 802102EC 0020D22C 7C 08 03 A6 */ mtlr r0 /* 802102F0 0020D230 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s index 4402e56c82..c9dfb82daf 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s @@ -2,7 +2,7 @@ /* 802102FC 0020D23C 7C 08 02 A6 */ mflr r0 /* 80210300 0020D240 90 01 00 44 */ stw r0, 0x44(r1) /* 80210304 0020D244 39 61 00 40 */ addi r11, r1, 0x40 -/* 80210308 0020D248 48 15 1E B1 */ bl func_803621B8 +/* 80210308 0020D248 48 15 1E B1 */ bl _savegpr_20 /* 8021030C 0020D24C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80210310 0020D250 7C 9E 23 78 */ mr r30, r4 /* 80210314 0020D254 41 82 0C 80 */ beq lbl_80210F94 @@ -900,7 +900,7 @@ lbl_80210F74: lbl_80210F94: /* 80210F94 0020DED4 7F E3 FB 78 */ mr r3, r31 /* 80210F98 0020DED8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80210F9C 0020DEDC 48 15 12 69 */ bl func_80362204 +/* 80210F9C 0020DEDC 48 15 12 69 */ bl _restgpr_20 /* 80210FA0 0020DEE0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80210FA4 0020DEE4 7C 08 03 A6 */ mtlr r0 /* 80210FA8 0020DEE8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s index 0584097288..fad6f9f656 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s @@ -10,7 +10,7 @@ /* 80211540 0020E480 DB 81 00 E0 */ stfd f28, 0xe0(r1) /* 80211544 0020E484 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0 /* 80211548 0020E488 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8021154C 0020E48C 48 15 0C 71 */ bl func_803621BC +/* 8021154C 0020E48C 48 15 0C 71 */ bl _savegpr_21 /* 80211550 0020E490 7C 79 1B 78 */ mr r25, r3 /* 80211554 0020E494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80211558 0020E498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -452,7 +452,7 @@ lbl_80211BB4: /* 80211BCC 0020EB0C E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0 /* 80211BD0 0020EB10 CB 81 00 E0 */ lfd f28, 0xe0(r1) /* 80211BD4 0020EB14 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80211BD8 0020EB18 48 15 06 31 */ bl func_80362208 +/* 80211BD8 0020EB18 48 15 06 31 */ bl _restgpr_21 /* 80211BDC 0020EB1C 80 01 01 24 */ lwz r0, 0x124(r1) /* 80211BE0 0020EB20 7C 08 03 A6 */ mtlr r0 /* 80211BE4 0020EB24 38 21 01 20 */ addi r1, r1, 0x120 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s index a046e50320..3c923cb01b 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s @@ -949,7 +949,7 @@ lbl_80213364: /* 802134EC 0021042C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 802134F0 00210430 48 04 22 E1 */ bl CPaneMgrAlpha_NS_setAlphaRate /* 802134F4 00210434 39 61 00 70 */ addi r11, r1, 0x70 -/* 802134F8 00210438 48 14 ED 15 */ bl func_8036220C +/* 802134F8 00210438 48 14 ED 15 */ bl _restgpr_22 /* 802134FC 0021043C 80 01 00 74 */ lwz r0, 0x74(r1) /* 80213500 00210440 7C 08 03 A6 */ mtlr r0 /* 80213504 00210444 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s index 9f6952e782..148d7a78c9 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s @@ -2,7 +2,7 @@ /* 8021878C 002156CC 7C 08 02 A6 */ mflr r0 /* 80218790 002156D0 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80218794 002156D4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80218798 002156D8 48 14 9A 0D */ bl func_803621A4 +/* 80218798 002156D8 48 14 9A 0D */ bl _savegpr_15 /* 8021879C 002156DC 7C 72 1B 78 */ mr r18, r3 /* 802187A0 002156E0 7C 93 23 78 */ mr r19, r4 /* 802187A4 002156E4 3B A0 00 00 */ li r29, 0 @@ -604,7 +604,7 @@ lbl_80218F30: /* 80219000 00215F40 98 03 01 0B */ stb r0, 0x10b(r3) lbl_80219004: /* 80219004 00215F44 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80219008 00215F48 48 14 91 E9 */ bl func_803621F0 +/* 80219008 00215F48 48 14 91 E9 */ bl _restgpr_15 /* 8021900C 00215F4C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80219010 00215F50 7C 08 03 A6 */ mtlr r0 /* 80219014 00215F54 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s b/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s index 7cb9e26503..69576e3af3 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s @@ -2,7 +2,7 @@ /* 8021CF0C 00219E4C 7C 08 02 A6 */ mflr r0 /* 8021CF10 00219E50 90 01 00 44 */ stw r0, 0x44(r1) /* 8021CF14 00219E54 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021CF18 00219E58 48 14 52 9D */ bl func_803621B4 +/* 8021CF18 00219E58 48 14 52 9D */ bl _savegpr_19 /* 8021CF1C 00219E5C 7C 7F 1B 78 */ mr r31, r3 /* 8021CF20 00219E60 7C 94 23 78 */ mr r20, r4 /* 8021CF24 00219E64 7C B6 2B 78 */ mr r22, r5 @@ -293,7 +293,7 @@ lbl_8021D34C: lbl_8021D350: /* 8021D350 0021A290 7E 63 9B 78 */ mr r3, r19 /* 8021D354 0021A294 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021D358 0021A298 48 14 4E A9 */ bl func_80362200 +/* 8021D358 0021A298 48 14 4E A9 */ bl _restgpr_19 /* 8021D35C 0021A29C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021D360 0021A2A0 7C 08 03 A6 */ mtlr r0 /* 8021D364 0021A2A4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_meter2/d_meter2_info/d_meter2_info.h b/include/d/d_meter2/d_meter2_info/d_meter2_info.h index 8fdbdf61a0..5238aa141a 100644 --- a/include/d/d_meter2/d_meter2_info/d_meter2_info.h +++ b/include/d/d_meter2/d_meter2_info/d_meter2_info.h @@ -1,12 +1,12 @@ #ifndef __D_METER2_INFO_H_ #define __D_METER2_INFO_H_ -#include "JSystem/JMessage/control/control.h" -#include "dolphin/types.h" #include "JSystem/J2DGraph/J2DPicture/J2DPicture.h" #include "JSystem/J2DGraph/J2DScreen/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox/J2DTextBox.h" +#include "JSystem/JMessage/control/control.h" #include "JSystem/JUtility/JUTFont/JUTFont.h" +#include "dolphin/types.h" struct dMeter2Info_c_vtable { u32* addr1; diff --git a/include/d/d_save/d_save/asm/func_80035798.s b/include/d/d_save/d_save/asm/func_80035798.s index a35449de64..2f10db059e 100644 --- a/include/d/d_save/d_save/asm/func_80035798.s +++ b/include/d/d_save/d_save/asm/func_80035798.s @@ -154,7 +154,7 @@ lbl_800359D0: /* 800359E4 00032924 48 33 0E 99 */ bl func_8036687C /* 800359E8 00032928 38 60 00 00 */ li r3, 0 /* 800359EC 0003292C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800359F0 00032930 48 32 C8 1D */ bl func_8036220C +/* 800359F0 00032930 48 32 C8 1D */ bl _restgpr_22 /* 800359F4 00032934 80 01 00 34 */ lwz r0, 0x34(r1) /* 800359F8 00032938 7C 08 03 A6 */ mtlr r0 /* 800359FC 0003293C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index 060c470cc9..595c33bcb8 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -865,7 +865,7 @@ private: dSv_reserve_c reserve; dSv_MiniGame_c minigame_flags; }; -#pragma pack(push,1) +#pragma pack(push, 1) class dSv_info_c { public: void init(void); diff --git a/include/functions.h b/include/functions.h index f6f406982b..ce2b01f85f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -20,11 +20,11 @@ void PSMTXScale(void); void screenSet__12dFile_info_cFv(void); void dFile_info_c_NS_screenSet(void); void mDoExt_removeMesgFont(void); -void func_80362210(void); + void JKRAramHeap_NS_getTotalFreeSize(void); void JKRAramHeap_NS_getFreeSize(void); void heapDisplay__9HeapCheckCFv(void); -void _savegpr_23(void); + void init__20dSv_player_collect_cFv(void); void dComIfGp_setSelectItem(int); void getUsedCount__9HeapCheckCFv(void); @@ -32,25 +32,11 @@ void isEventBit__11dSv_event_cCFUs(void); char* strcpy(char*, const char*); int strcmp(char*, char*); void setBombNum__21dSv_player_item_max_cFUcUc(void); -void func_80362224(void); -void func_803621D8(void); -void _savegpr_25(void); -void _restgpr_25(void); -void _restgpr_26(void); -void _savegpr_26(void); -void func_8036221C(void); -void func_803621D0(void); + void func_803620AC(void); void func_803626BC(void); void func_803664DC(void); -void _restgpr_29(void); -void _savegpr_29(void); -void _restgpr_28(void); -void _savegpr_28(void); -void _restgpr_27(void); -void _savegpr_27(void); -void _savegpr_26(void); -void _restgpr_26(void); + void JKRAramHeap_NS_dump(void); void dRes_control_c_NS_dump(void); void JUTConsole_NS_getLineOffset(void); @@ -60,7 +46,7 @@ void JUTConsole_NS_clear(void); void JUTReport_X1_(void); void JUTAssertion_NS_setMessageCount(void); void DynamicModuleControlBase_NS_dump(void); -void _restgpr_25(void); + unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); void setLineUpItem__17dSv_player_item_cFv(void); void dMeter2Info_c_NS_setHotSpringTimer(void); @@ -103,18 +89,17 @@ void isItem__12dSv_memBit_cCFi(void); void isItem__12dSv_danBit_cCFi(void); void off__15dSv_zoneActor_cFi(void); void is__15dSv_zoneActor_cCFi(void); -void func_8036220C(void); + void onEventBit__11dSv_event_cFUs(void); void func_8036687C(void); void func_80003540(void); void func_80362324(void); -void func_8036221C(void); -void func_8036221C(void); + void countUsed__FP10JKRExpHeap(void); void JUTReport(void); -void func_803621D0(void); + void offEventBit__11dSv_event_cFUs(void); -void _savegpr_22(void); + void dMeter2Info_c_NS_setSaveStageName(void); void dComIfG_play_c_NS_setNowVibration(void); void getVibration__19dSv_player_config_cFv(void); @@ -177,18 +162,9 @@ void JUTReportConsole_f(void); void JUTWarningConsole(void); void JUTWarningConsole_f(void); -void _savegpr_25(void); void VIWaitForRetrace(void); void func_80361C24(void); -void _restgpr_26(void); -void _restgpr_27(void); -void _restgpr_28(void); -void _restgpr_29(void); -void _savegpr_26(void); -void _savegpr_27(void); -void _savegpr_28(void); -void _savegpr_29(void); void func_80003540(void); void func_80365470(void); void func_803688DC(void); @@ -196,13 +172,8 @@ void func_80368ABC(void); void func_80368BE4(void); void JKRArchive_NS_getDirEntry(void); -void _restgpr_29(void); -void _savegpr_29(void); void func_80361C24(void); -void _savegpr_25(void); -void _restgpr_25(void); - void JKRArchive_NS_findDirectory(void); void JKRArchive_NS_findFsResource(void); void JKRArchive_NS_findIdResource(void); @@ -217,8 +188,7 @@ void func_80365470(void); void DCInvalidateRange(void); void JKRDvdRipper_NS_loadToMainRAM_X1_(void); void func_80003458(void); -void _savegpr_25(void); -void _restgpr_25(void); + void func_803650D0(void); void JKRDecomp_NS_orderSync(void); @@ -235,12 +205,6 @@ void DCStoreRangeNoSync(void); void __RAS_OSDisableInterrupts_begin(void); void func_80003540(void); void func_80361C24(void); -void func_803621B0(void); -void _savegpr_23(void); -void _savegpr_24(void); -void func_803621FC(void); -void func_80362210(void); -void _restgpr_24(void); void ARQPostRequest(void); void DCStoreRange(void); @@ -294,42 +258,26 @@ void PSMTXScale(void); void screenSet__12dFile_info_cFv(void); void dFile_info_c_NS_screenSet(void); void mDoExt_removeMesgFont(void); -void func_80362210(void); + void JKRAramHeap_NS_getTotalFreeSize(void); void JKRAramHeap_NS_getFreeSize(void); void heapDisplay__9HeapCheckCFv(void); -void _savegpr_23(void); + void init__20dSv_player_collect_cFv(void); void dComIfGp_setSelectItem(int); void getUsedCount__9HeapCheckCFv(void); void isEventBit__11dSv_event_cCFUs(void); -void dComIfGs_setMixItemIndex(int,u8); -void dComIfGs_setSelectItemIndex(int,u8); +void dComIfGs_setMixItemIndex(int, u8); +void dComIfGs_setSelectItemIndex(int, u8); void dComIfGs_getMixItemIndex(int); char* strcpy(char*, const char*); int strcmp(char*, char*); void setBombNum__21dSv_player_item_max_cFUcUc(void); -void func_80362224(void); -void func_803621D8(void); -void _savegpr_25(void); -void _restgpr_25(void); -void _restgpr_26(void); -void _savegpr_26(void); -void _savegpr_25(void); -void _restgpr_25(void); -void func_8036221C(void); -void func_803621D0(void); + void func_803620AC(void); void func_803626BC(void); void func_803664DC(void); -void _restgpr_29(void); -void _savegpr_29(void); -void _restgpr_28(void); -void _savegpr_28(void); -void _restgpr_27(void); -void _savegpr_27(void); -void _savegpr_26(void); -void _restgpr_26(void); + void JKRAramHeap_NS_dump(void); void dRes_control_c_NS_dump(void); void JUTConsole_NS_getLineOffset(void); @@ -339,7 +287,7 @@ void JUTConsole_NS_clear(void); void JUTReport_X1_(void); void JUTAssertion_NS_setMessageCount(void); void DynamicModuleControlBase_NS_dump(void); -void _restgpr_25(void); + unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); void setLineUpItem__17dSv_player_item_cFv(void); void dMeter2Info_c_NS_setHotSpringTimer(void); @@ -367,7 +315,7 @@ void init__10dSv_info_cFvZone(void); void init__10dSv_zone_cFi(void); void onOneSwitch__13dSv_zoneBit_cFi(void); void onSwitch__13dSv_zoneBit_cFi(void); -int dStage_roomControl_c_NS_getZoneNo(int,int); +int dStage_roomControl_c_NS_getZoneNo(int, int); void onSwitch__12dSv_danBit_cFi(void); void onSwitch__12dSv_memBit_cFi(void); void revOneSwitch__13dSv_zoneBit_cFi(void); @@ -384,18 +332,17 @@ void isItem__12dSv_memBit_cCFi(void); void isItem__12dSv_danBit_cCFi(void); void off__15dSv_zoneActor_cFi(void); void is__15dSv_zoneActor_cCFi(void); -void func_8036220C(void); + void onEventBit__11dSv_event_cFUs(void); void func_8036687C(void); void func_80003540(void); void func_80362324(void); -void func_8036221C(void); -void func_8036221C(void); + void countUsed__FP10JKRExpHeap(void); void JUTReport(void); -void func_803621D0(void); + void offEventBit__11dSv_event_cFUs(void); -void _savegpr_22(void); + void dMeter2Info_c_NS_setSaveStageName(void); void dComIfG_play_c_NS_setNowVibration(void); void getVibration__19dSv_player_config_cFv(void); @@ -459,17 +406,8 @@ void JUTReportConsole_f(void); void JUTWarningConsole(void); void JUTWarningConsole_f(void); -void _savegpr_25(void); void func_80361C24(void); -void _restgpr_26(void); -void _restgpr_27(void); -void _restgpr_28(void); -void _restgpr_29(void); -void _savegpr_26(void); -void _savegpr_27(void); -void _savegpr_28(void); -void _savegpr_29(void); void func_80003540(void); void func_80365470(void); void func_803688DC(void); @@ -477,13 +415,8 @@ void func_80368ABC(void); void func_80368BE4(void); void JKRArchive_NS_getDirEntry(void); -void _restgpr_29(void); -void _savegpr_29(void); void func_80361C24(void); -void _savegpr_25(void); -void _restgpr_25(void); - // void JKRAramArchive(void); void JKRArchive_NS_findDirectory(void); void JKRArchive_NS_findFsResource(void); @@ -499,8 +432,7 @@ void func_80365470(void); void DCInvalidateRange(void); void JKRDvdRipper_NS_loadToMainRAM_X1_(void); void func_80003458(void); -void _savegpr_25(void); -void _restgpr_25(void); + void func_803650D0(void); void JKRDecomp_NS_orderSync(void); @@ -517,12 +449,6 @@ void DCStoreRangeNoSync(void); void __RAS_OSDisableInterrupts_begin(void); void func_80003540(void); void func_80361C24(void); -void func_803621B0(void); -void _savegpr_23(void); -void _savegpr_24(void); -void func_803621FC(void); -void func_80362210(void); -void _restgpr_24(void); void ARQPostRequest(void); void DCStoreRange(void); @@ -708,7 +634,7 @@ void resetFilterAll__10Z2SoundMgrFv(void); void moveVolume__18JAISoundParamsMoveFfUl(void); void Z2SeqMgr_NS_setBattleBgmOff(void); void setSceneExist__10Z2SceneMgrFb(void); -void func_803621F4(void); + void Z2SceneMgr_NS_sceneChange(void); void __ct__10JAISoundIDFRC10JAISoundID(void); void Z2EnvSeMgr_NS_initSceneEnvSe(void); @@ -735,7 +661,7 @@ void Z2SeqMgr_NS_setTwilightGateVol(void); void Z2SeqMgr_NS_setWindStoneVol(void); void Z2SeqMgr_NS_resetBattleBgmParams(void); void JAISoundID_X1_(void); -void func_803621A8(void); + void moveVolume__18JAISoundParamsMoveFfUl(void); class Z2SoundMgr; void Z2SoundMgr_NS_pauseAllGameSound(Z2SoundMgr*, bool); @@ -807,12 +733,12 @@ void item_func_BEE_CHILD(void); int func_80368954(char*, char*, u32); void dComIfG_play_c_NS_getLayerNo(int); u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8); -void func_80362204(void); + void dComIfG_play_c_NS_setItemBombNumCount(u8, s16); void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool); u32 getBombNum__21dSv_player_item_max_cCFUc(u8); u8 getBombNum__24dSv_player_item_record_cCFUc(u8); -void func_803621B8(void); + int checkItemGet__FUci(u8, int); } @@ -1263,7 +1189,7 @@ void dAttention_c_NS_stockAttention(void); void distace_angle_adjust(void); void dAttDraw_c_NS_draw(void); void dAttCatch_c_NS_convPId(void); -void func_80362208(void); + void dAttDraw_c_NS_setAnm(void); void dAttention_c_NS_lockSoundStart(void); void fopAcM_searchActorDistance(void); @@ -1324,7 +1250,7 @@ void dAttention_c_NS_ActionTarget(void); void cSAngle_NS___mi_X2_(void); void dAttention_c_NS_GetLockonList(void); void dAttHint_c_NS_init(void); -//void dAttention_c(void); +// void dAttention_c(void); void PSMTXTrans(void); void dAttention_c_NS_makeList(void); void mDoExt_bpkAnm_NS_entry(void); @@ -1347,8 +1273,7 @@ void dAttDrawParam_c_NS_dtor(void); void dAttDraw_c_NS_alphaAnm(void); void dAttention_c_NS_LockonReleaseDistanse(void); void dAttention_c_NS_runDebugDisp(void); -void func_803621BC(void); -//void dAttParam_c(void); + void dAttention_c_NS_judgementStatus4Hold(void); void dAttention_c_NS_calcWeight(void); void dAttHint_c_NS_getPId(void); @@ -1407,7 +1332,7 @@ void func_801119D8(void); void daAlink_c_NS_setLandPassiveData(void); void func_800D0290(void); void daAlink_c_NS_setCutTurnEffect(void); -void func_80362208(void); + void func_8014190C(void); void daAlink_c_NS_checkHorseGetOffDirection(void); void func_80101534(void); @@ -1668,7 +1593,7 @@ void daAlink_c_NS_getSwimMaxFallSpeed(void); void JPAParticleCallBack_NS_dtor(void); void func_801417D4(void); void func_8011E960(void); -void func_803621EC(void); + void setLinkBootsType__14Z2CreatureLinkFl(void); void cM_atan2s(void); void daAlink_c_NS_setLastSceneMode(void); @@ -2004,7 +1929,7 @@ void dStage_stagInfo_GetSaveTbl(void); void daAlink_c_NS_setWolfScreamWaitAnime(void); void daObjSwHang_c_NS_getHangPos(void); void func_800C4514(void); -void func_803621F0(void); + void daAlink_c_NS_checkAtnWaitAnime(void); void dKy_plight_cut(void); void Z2Creature_NS_updateAnime(void); @@ -2203,7 +2128,7 @@ void func_800D0688(void); void daAlink_c_NS_checkHangStartSideWall(void); void daAlink_c_NS_setDrawHand(void); void cM_rnd(void); -void func_803621BC(void); + void dCcD_GObjInf_NS_GetAtHitGObj(void); void dBgS_RoofChk(void); void daAlink_c_NS_getCutDirection(void); @@ -2301,7 +2226,7 @@ void func_801391DC(void); void daAlink_c_NS_setWolfAnmVoice(void); void func_80362018(void); void daAlink_c_NS_resetWolfAtCollision(void); -void func_803621A4(void); + void func_800EA4CC(void); void daAlink_c_NS_getLadderMoveAnmSpeed(void); void daAlink_c_NS_checkBoomerangCatchAction(void); @@ -2929,7 +2854,7 @@ void func_80140038(void); void daAlink_c_NS_seStartSwordCut(void); void daAlink_c_NS_checkItemButtonChange(void); void daAlink_c_NS_setOctaIealHangPos(void); -void func_803621A0(void); + void daAlink_c_NS_procCutJumpInit(void); void func_8011A5CC(void); void daAlink_c_NS_checkWolfComboCnt(void); @@ -4211,7 +4136,7 @@ void dComIfGs_setWarpItemData_X1_(void); void dMeter2Info_setNewLetterSender(void); void dMeter2Info_getNewLetterNum(void); void dMsgFlow_c_NS_getMsgNo(void); -void func_80362200(void); + void func_8021C11C(void); void dMeter2Info_c_NS_isFloatingMessageVisible(void); void dMeter2Info_c_NS_changeWater(void); @@ -4238,7 +4163,7 @@ void dMeter2Info_c_NS_resetMeterString(void); void offFirstBit__21dSv_player_get_item_cFUc(void); void dComIfGs_setWarpMarkFlag(void); void func_8021C7F4(void); -void func_803621B4(void); + void dMeter2Info_c_NS_decMsgKeyWaitTimer(void); void dMeter2Info_c_NS_getItemType(void); void isLetterGetFlag__17dSv_letter_info_cCFi(void); @@ -4778,7 +4703,7 @@ void dKy_efplight_cut(void); void forward_overhead_bg_chk(void); void dKy_set_bgcol_ratio(void); void dKy_GxFog_set(void); -void func_80362200(void); + void GXSetZCompLoc(void); void dKyr_moon_arrival_check(void); void PSVECAdd(Vec*, Vec*, Vec*); @@ -4786,7 +4711,7 @@ void dKy_set_vrboxcol_ratio(void); void func_8036C590(void); void dBgS_CamGndChk_Wtr_NS_dtor(void); void func_8006F160(void); -void func_803621F8(void); + void dBgS_ObjGndChk_All_NS_dtor(void); void dKy_bg_addcol_amb_set(void); void dKy_set_fogcol_ratio(void); @@ -4810,7 +4735,7 @@ void vectle_calc_X1_(void); void dKy_vrbox_addcol_sky0_set(void); void dKy_efplight_set(void); void dKy_set_actcol_ratio(void); -void func_803621B4(void); + void PSMTXRotRad(void); void daPy_py_c_NS_checkNowWolfEyeUp(void); void dKyr_near_bosslight_check(void); @@ -4828,7 +4753,6 @@ void func_8036C028(void); void C_MTXLightPerspective(void); void cM3d_VectorProduct2d(void); void dCcMassS_Mng_NS_Prepare(void); -void func_803621AC(void); } // additional symbols needed for d_kankyo.cpp @@ -4961,7 +4885,7 @@ void func_801A7814(void); void func_801A789C(void); void dKy_bg3_addcol_amb_set(void); void dScnKy_env_light_c_NS_Eflight_flush_proc(void); -void func_80362144(void); + void func_801A441C(void); void BOSS_LIGHT_NS_dtor(void); void dKy_Outdoor_check(void); @@ -4978,7 +4902,7 @@ void dKy_ParticleColor_get_base(void); void dScnKy_env_light_c_NS_setSunpos(void); void dKy_ParticleColor_get_actor(void); void dKy_pol_eff2_ratio_get(void); -void func_80362190(void); + void dKy_darkworld_Area_set(void); void dKy_shadow_mode_check(void); void mDoGph_gInf_c_NS_bloom_c_NS_create(void); diff --git a/include/global.h b/include/global.h index ce61a31439..bdfdf01300 100644 --- a/include/global.h +++ b/include/global.h @@ -8,8 +8,8 @@ struct Vec { }; #include "dolphin/types.h" - #include "functions.h" +#include "mwcc.h" #include "os/OS.h" #include "variables.h" diff --git a/include/m_Do/m_Do_main/asm/func_80005AD8.s b/include/m_Do/m_Do_main/asm/func_80005AD8.s index 4fe782b51a..9048c2b44f 100644 --- a/include/m_Do/m_Do_main/asm/func_80005AD8.s +++ b/include/m_Do/m_Do_main/asm/func_80005AD8.s @@ -160,7 +160,7 @@ lbl_80005CD8: /* 80005D30 00002C70 41 80 FF 08 */ blt lbl_80005C38 lbl_80005D34: /* 80005D34 00002C74 39 61 00 30 */ addi r11, r1, 0x30 -/* 80005D38 00002C78 48 35 C4 D9 */ bl func_80362210 +/* 80005D38 00002C78 48 35 C4 D9 */ bl _restgpr_23 /* 80005D3C 00002C7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80005D40 00002C80 7C 08 03 A6 */ mtlr r0 /* 80005D44 00002C84 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/mwcc.h b/include/mwcc.h new file mode 100644 index 0000000000..07c5536be5 --- /dev/null +++ b/include/mwcc.h @@ -0,0 +1,52 @@ +#ifndef _MWCC_H_ +#define _MWCC_H_ + +extern "C" { +void _savegpr_14(void); +void _savegpr_15(void); +void _savegpr_16(void); +void _savegpr_17(void); +void _savegpr_18(void); +void _savegpr_19(void); +void _savegpr_20(void); +void _savegpr_21(void); +void _savegpr_22(void); +void _savegpr_23(void); +void _savegpr_24(void); +void _savegpr_25(void); +void _savegpr_26(void); +void _savegpr_27(void); +void _savegpr_28(void); +void _savegpr_29(void); + +void _restgpr_14(void); +void _restgpr_15(void); +void _restgpr_16(void); +void _restgpr_17(void); +void _restgpr_18(void); +void _restgpr_19(void); +void _restgpr_20(void); +void _restgpr_21(void); +void _restgpr_22(void); +void _restgpr_23(void); +void _restgpr_24(void); +void _restgpr_25(void); +void _restgpr_26(void); +void _restgpr_27(void); +void _restgpr_28(void); +void _restgpr_29(void); + +void _savefpr_25(void); +void _savefpr_26(void); +void _savefpr_27(void); +void _savefpr_28(void); +void _savefpr_29(void); + +void _restfpr_25(void); +void _restfpr_26(void); +void _restfpr_27(void); +void _restfpr_28(void); +void _restfpr_29(void); +} + +#endif \ No newline at end of file diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index db33662477..46c3e9ac4b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -66,8 +66,7 @@ asm void CheckHeap(u32 param_1) { } #endif -asm int countUsed(JKRExpHeap* heap) { - nofralloc +asm int countUsed(JKRExpHeap* heap){nofralloc #include "m_Do/m_Do_main/asm/func_80005848.s" }