From cd601606ee38f810f85c92935ec13d201063aa9d Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 2 Jan 2021 19:09:04 -0500 Subject: [PATCH] adjust gameinfo sizing, rename inline register funcs --- asm/J2DGraph/J2DMatBlock.s | 16 +++--- asm/J2DGraph/J2DPane.s | 2 +- asm/J2DGraph/J2DPicture.s | 4 +- asm/J2DGraph/J2DPictureEx.s | 6 +-- asm/J2DGraph/J2DPrint.s | 4 +- asm/J2DGraph/J2DScreen.s | 4 +- asm/J2DGraph/J2DTextBox.s | 2 +- asm/J2DGraph/J2DTextBoxEx.s | 4 +- asm/J2DGraph/J2DWindow.s | 2 +- asm/J2DGraph/J2DWindowEx.s | 8 +-- asm/J3DGraphAnimator/J3DAnimation.s | 2 +- asm/J3DGraphAnimator/J3DJointTree.s | 2 +- asm/J3DGraphAnimator/J3DMaterialAttach.s | 2 +- asm/J3DGraphAnimator/J3DModel.s | 6 +-- asm/J3DGraphAnimator/J3DShapeTable.s | 2 +- asm/J3DGraphAnimator/J3DSkinDeform.s | 4 +- asm/J3DGraphBase/J3DGD.s | 6 +-- asm/J3DGraphBase/J3DMatBlock.s | 12 ++--- asm/J3DGraphBase/J3DShapeMtx.s | 6 +-- asm/J3DGraphBase/J3DSys.s | 2 +- asm/J3DGraphLoader/J3DClusterLoader.s | 2 +- asm/J3DGraphLoader/J3DModelLoader.s | 2 +- asm/J3DGraphLoader/J3DModelLoaderCalcSize.s | 6 +-- asm/JAudio2/JAISeMgr.s | 2 +- asm/JAudio2/JAISeqMgr.s | 2 +- asm/JAudio2/JAIStreamMgr.s | 2 +- asm/JAudio2/JASAiCtrl.s | 2 +- asm/JAudio2/JASAramStream.s | 2 +- asm/JAudio2/JASBNKParser.s | 2 +- asm/JAudio2/JASBank.s | 4 +- asm/JAudio2/JASBasicWaveBank.s | 2 +- asm/JAudio2/JASSeqParser.s | 4 +- asm/JAudio2/JASTrack.s | 2 +- asm/JAudio2/JASWSParser.s | 2 +- asm/JAudio2/JAUSeqDataBlockMgr.s | 2 +- asm/JKernel/JKRExpHeap.s | 6 +-- asm/JParticle/JPABaseShape.s | 2 +- asm/JParticle/JPAResource.s | 2 +- asm/JStudio/fvb.s | 2 +- asm/JStudio/jstudio-object.s | 2 +- asm/JStudio/stb.s | 2 +- asm/JUtility/JUTDbPrint.s | 2 +- asm/JUtility/JUTException.s | 6 +-- asm/JUtility/JUTProcBar.s | 2 +- asm/SComponent/c/cc/c_cc_s.s | 8 +-- asm/SComponent/c/m3d/g/c_m3d_g_cyl.s | 4 +- asm/Z2AudioLib/Z2Audience.s | 2 +- asm/Z2AudioLib/Z2AudioMgr.s | 2 +- asm/Z2AudioLib/Z2Creature.s | 4 +- asm/Z2AudioLib/Z2FxLineMgr.s | 2 +- asm/Z2AudioLib/Z2SoundMgr.s | 2 +- asm/Z2AudioLib/Z2SoundObjMgr.s | 2 +- asm/Z2AudioLib/Z2SoundObject.s | 2 +- asm/c/c_dylink.s | 2 +- asm/clib.s | 10 ++-- asm/d/a/d_a_npc.s | 20 ++++---- asm/d/a/d_a_obj.s | 2 +- asm/d/a/npc/d_a_npc_cd.s | 2 +- asm/d/a/npc/d_a_npc_cd2.s | 2 +- asm/d/bg/d_bg_s.s | 4 +- asm/d/bg/d_bg_w.s | 8 +-- asm/d/bg/s/d_bg_s_acch.s | 2 +- asm/d/bg/w/d_bg_w_kcol.s | 2 +- asm/d/bright/d_bright_check.s | 2 +- asm/d/cc/d_cc_s.s | 6 +-- asm/d/cc/d_cc_uty.s | 2 +- asm/d/cc/mass/d_cc_mass_s.s | 4 +- asm/d/com/inf/d_com_inf_game.s | 6 +-- asm/d/d_camera.s | 50 +++++++++---------- asm/d/d_drawlist.s | 16 +++--- asm/d/d_envse.s | 2 +- asm/d/d_event.s | 4 +- asm/d/d_map.s | 2 +- asm/d/d_particle.s | 12 ++--- asm/d/d_resorce.s | 6 +-- asm/d/d_scope.s | 2 +- asm/d/d_stage.s | 2 +- asm/d/d_timer.s | 2 +- asm/d/ev/d_ev_camera.s | 4 +- asm/d/event/d_event_data.s | 2 +- asm/d/event/d_event_manager.s | 4 +- asm/d/file/d_file_select.s | 12 ++--- asm/d/map/path/d_map_path_dmap.s | 2 +- asm/d/map/path/d_map_path_fmap.s | 2 +- asm/d/menu/d_menu_collect.s | 2 +- asm/d/menu/d_menu_dmap.s | 2 +- asm/d/menu/d_menu_fishing.s | 4 +- asm/d/menu/d_menu_fmap.s | 6 +-- asm/d/menu/d_menu_fmap2D.s | 14 +++--- asm/d/menu/d_menu_letter.s | 6 +-- asm/d/menu/d_menu_option.s | 6 +-- asm/d/menu/d_menu_ring.s | 2 +- asm/d/menu/d_menu_save.s | 6 +-- asm/d/menu/d_menu_skill.s | 2 +- asm/d/menu/dmap/d_menu_dmap_map.s | 8 +-- asm/d/menu/item/d_menu_item_explain.s | 2 +- asm/d/msg/d_msg_class.s | 2 +- asm/d/msg/d_msg_flow.s | 2 +- asm/d/msg/d_msg_object.s | 4 +- asm/d/msg/scrn/d_msg_scrn_3select.s | 2 +- asm/d/msg/scrn/d_msg_scrn_howl.s | 2 +- asm/d/msg/scrn/d_msg_scrn_item.s | 4 +- asm/d/msg/scrn/d_msg_scrn_jimaku.s | 2 +- asm/d/msg/string/d_msg_string_base.s | 4 +- asm/d/npc/d_npc_lib.s | 8 +-- asm/d/pane/d_pane_class.s | 2 +- asm/d/particle/d_particle_copoly.s | 6 +-- asm/d/s/d_s_room.s | 2 +- asm/d/select/d_select_cursor.s | 2 +- asm/d/shop/item/d_shop_item_ctrl.s | 2 +- asm/d/simple/d_simple_model.s | 2 +- asm/f/ap/f_ap_game.s | 2 +- asm/f/op/actor/f_op_actor_mng.s | 16 +++--- asm/m/Do/dvd/m_Do_dvd_thread.s | 2 +- asm/m/Do/m_Do_ext.s | 10 ++-- asm/m/Do/machine/m_Do_machine_exception.s | 2 +- .../JKernel/JKRAram/asm/func_802D233C.s | 2 +- .../JKernel/JKRAram/asm/func_802D25B4.s | 2 +- .../JKernel/JKRAram/asm/func_802D2830.s | 2 +- .../JKernel/JKRAramPiece/asm/func_802D3614.s | 2 +- .../JKRCompArchive/asm/func_802D89BC.s | 2 +- .../JKRDvdAramRipper/asm/func_802DAA74.s | 2 +- .../JKRDvdAramRipper/asm/func_802DB160.s | 2 +- .../JKernel/JKRDvdArchive/asm/func_802D8474.s | 2 +- .../JKernel/JKRDvdRipper/asm/func_802D9B98.s | 2 +- .../JKernel/JKRDvdRipper/asm/func_802D9C54.s | 2 +- .../JKernel/JKRExpHeap/asm/func_802CF234.s | 2 +- .../JKernel/JKRExpHeap/asm/func_802D03B8.s | 2 +- .../JKernel/JKRExpHeap/asm/func_802D05CC.s | 2 +- .../JKernel/JKRThread/asm/func_802D1C74.s | 2 +- .../JUtility/JUTGamePad/asm/func_802E08E4.s | 2 +- .../JUtility/asm/JUTResFont__setBlock.s | 2 +- include/SComponent/c_angle/c_angle.h | 2 + include/d/d_a/d_a_alink/asm/func_800A3430.s | 2 +- include/d/d_a/d_a_alink/asm/func_800A39B8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800A4CB4.s | 2 +- include/d/d_a/d_a_alink/asm/func_800AD3D8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B02BC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B3500.s | 2 +- include/d/d_a/d_a_alink/asm/func_800C1F6C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CC7FC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CE294.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CE468.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D1540.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D34D8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D7C40.s | 2 +- include/d/d_a/d_a_alink/asm/func_800DA180.s | 2 +- include/d/d_a/d_a_alink/asm/func_800DC678.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E3F50.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EF95C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F81C0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F9474.s | 2 +- include/d/d_a/d_a_alink/asm/func_80109BDC.s | 2 +- include/d/d_a/d_a_alink/asm/func_80111A9C.s | 2 +- include/d/d_a/d_a_alink/asm/func_801171F4.s | 2 +- include/d/d_a/d_a_alink/asm/func_801191C4.s | 2 +- include/d/d_a/d_a_alink/asm/func_80120880.s | 2 +- include/d/d_a/d_a_alink/asm/func_80120B00.s | 2 +- include/d/d_a/d_a_alink/asm/func_80120DB0.s | 2 +- include/d/d_a/d_a_alink/asm/func_80121004.s | 2 +- include/d/d_a/d_a_alink/asm/func_80122F78.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012589C.s | 2 +- include/d/d_a/d_a_alink/asm/func_80126F3C.s | 2 +- include/d/d_a/d_a_alink/asm/func_80127F50.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012948C.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012A498.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012AD1C.s | 2 +- include/d/d_a/d_a_alink/asm/func_80130BC4.s | 2 +- include/d/d_a/d_a_alink/asm/func_80136624.s | 2 +- include/d/d_attention/asm/func_800716B8.s | 2 +- include/d/d_camera/asm/func_8015FEB8.s | 4 +- include/d/d_camera/asm/func_801622B4.s | 4 +- include/d/d_camera/asm/func_801635E4.s | 4 +- include/d/d_camera/asm/func_80164944.s | 4 +- include/d/d_camera/asm/func_80165B60.s | 2 +- include/d/d_camera/asm/func_80165CE0.s | 4 +- include/d/d_camera/asm/func_80166764.s | 4 +- include/d/d_camera/asm/func_80168744.s | 6 +-- include/d/d_camera/asm/func_8016E4F4.s | 24 ++++----- include/d/d_camera/asm/func_80176E00.s | 2 +- include/d/d_camera/asm/func_80178E50.s | 4 +- include/d/d_camera/asm/func_80179590.s | 4 +- include/d/d_camera/asm/func_8017A2A0.s | 2 +- .../d/d_com/d_com_inf_game/d_com_inf_game.h | 18 ++++--- .../d_file_sel_info/asm/func_80192AA0.s | 2 +- include/d/d_kankyo/asm/func_8019E13C.s | 2 +- include/d/d_kankyo/asm/func_8019EC98.s | 4 +- include/d/d_kankyo/asm/func_801A37C4.s | 4 +- include/d/d_kankyo/asm/func_801A4420.s | 2 +- include/d/d_kankyo/asm/func_801A4C10.s | 4 +- include/d/d_kankyo/asm/func_801A5288.s | 4 +- include/d/d_kankyo/asm/func_801A5E54.s | 2 +- include/d/d_kankyo/asm/func_801A60E0.s | 4 +- include/d/d_kankyo/asm/func_801A81C0.s | 4 +- include/d/d_kankyo/asm/func_801AC70C.s | 4 +- .../d_kankyo_rain/asm/func_8005E8F8.s | 2 +- .../d_kankyo_rain/asm/func_800620AC.s | 2 +- .../d_kankyo_rain/asm/func_80062B4C.s | 4 +- .../d_kankyo_rain/asm/func_8006BE0C.s | 4 +- .../d_kankyo_rain/asm/func_8006C85C.s | 4 +- .../d_kankyo_rain/asm/func_8006D01C.s | 4 +- .../d_kankyo_rain/asm/func_8006DA7C.s | 2 +- .../d_kankyo_rain/asm/func_8006E6B0.s | 2 +- .../d_kankyo_wether/asm/func_8005A5C0.s | 4 +- .../d_kankyo_wether/asm/func_8005AE90.s | 4 +- .../d_meter_button/asm/func_802047E8.s | 4 +- .../d_meter_button/asm/func_802095C0.s | 4 +- .../d_meter_hakusha/asm/func_8020C850.s | 4 +- .../d_meter_string/asm/func_8020F6EC.s | 2 +- .../d/d_meter2/d_meter2/asm/func_8021EA14.s | 4 +- .../d/d_meter2/d_meter2/asm/func_80222518.s | 4 +- .../d/d_meter2/d_meter2/asm/func_80224258.s | 2 +- .../d_meter2_draw/asm/func_8020FAB4.s | 2 +- .../d_meter2_draw/asm/func_80211BEC.s | 4 +- .../d_meter2_draw/asm/func_80212190.s | 4 +- .../d_meter2_draw/asm/func_802126E4.s | 2 +- .../d_meter2_draw/asm/func_80213FF0.s | 4 +- .../d_meter2_draw/asm/func_802140DC.s | 4 +- .../d_meter2_draw/asm/func_80214C20.s | 4 +- .../d_meter2_draw/asm/func_80215B18.s | 4 +- .../d_meter2_draw/asm/func_80215F88.s | 4 +- .../d_meter2_draw/asm/func_8021632C.s | 4 +- .../d_meter2_draw/asm/func_80216684.s | 4 +- .../d_meter2_draw/asm/func_802170E4.s | 4 +- .../d_meter2_draw/asm/func_80217AB4.s | 4 +- .../d_meter2_draw/asm/func_80219788.s | 4 +- .../d_meter2_draw/asm/func_80219E98.s | 4 +- .../d_meter2_draw/asm/func_8021A71C.s | 4 +- .../d_meter2_draw/asm/func_8021AB84.s | 4 +- include/d/d_save/d_save/asm/func_80035798.s | 2 +- include/d/d_save/d_save/d_save.h | 3 +- include/functions.h | 43 ++++++++-------- include/m_Do/m_Do_main/asm/func_80005AD8.s | 2 +- src/d/d_camera.cpp | 3 +- src/f/f_pc/f_pc_manager.cpp | 2 +- 235 files changed, 465 insertions(+), 464 deletions(-) diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s index eb491fc591..32adf35281 100644 --- a/asm/J2DGraph/J2DMatBlock.s +++ b/asm/J2DGraph/J2DMatBlock.s @@ -1857,7 +1857,7 @@ lbl_802ECDA8: /* 802ECDCC 002E9D0C 38 60 00 01 */ li r3, 1 lbl_802ECDD0: /* 802ECDD0 002E9D10 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ECDD4 002E9D14 48 07 54 45 */ bl func_80362218 +/* 802ECDD4 002E9D14 48 07 54 45 */ bl _restgpr_25 /* 802ECDD8 002E9D18 80 01 00 34 */ lwz r0, 0x34(r1) /* 802ECDDC 002E9D1C 7C 08 03 A6 */ mtlr r0 /* 802ECDE0 002E9D20 38 21 00 30 */ addi r1, r1, 0x30 @@ -2106,7 +2106,7 @@ lbl_802ED128: /* 802ED150 002EA090 38 60 00 01 */ li r3, 1 lbl_802ED154: /* 802ED154 002EA094 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ED158 002EA098 48 07 50 C1 */ bl func_80362218 +/* 802ED158 002EA098 48 07 50 C1 */ bl _restgpr_25 /* 802ED15C 002EA09C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802ED160 002EA0A0 7C 08 03 A6 */ mtlr r0 /* 802ED164 002EA0A4 38 21 00 30 */ addi r1, r1, 0x30 @@ -3264,7 +3264,7 @@ lbl_802EE194: /* 802EE1B8 002EB0F8 38 60 00 01 */ li r3, 1 lbl_802EE1BC: /* 802EE1BC 002EB0FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EE1C0 002EB100 48 07 40 59 */ bl func_80362218 +/* 802EE1C0 002EB100 48 07 40 59 */ bl _restgpr_25 /* 802EE1C4 002EB104 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EE1C8 002EB108 7C 08 03 A6 */ mtlr r0 /* 802EE1CC 002EB10C 38 21 00 30 */ addi r1, r1, 0x30 @@ -3557,7 +3557,7 @@ lbl_802EE5AC: /* 802EE5D4 002EB514 38 60 00 01 */ li r3, 1 lbl_802EE5D8: /* 802EE5D8 002EB518 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EE5DC 002EB51C 48 07 3C 3D */ bl func_80362218 +/* 802EE5DC 002EB51C 48 07 3C 3D */ bl _restgpr_25 /* 802EE5E0 002EB520 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EE5E4 002EB524 7C 08 03 A6 */ mtlr r0 /* 802EE5E8 002EB528 38 21 00 30 */ addi r1, r1, 0x30 @@ -4725,7 +4725,7 @@ lbl_802EF63C: /* 802EF660 002EC5A0 38 60 00 01 */ li r3, 1 lbl_802EF664: /* 802EF664 002EC5A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EF668 002EC5A8 48 07 2B B1 */ bl func_80362218 +/* 802EF668 002EC5A8 48 07 2B B1 */ bl _restgpr_25 /* 802EF66C 002EC5AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EF670 002EC5B0 7C 08 03 A6 */ mtlr r0 /* 802EF674 002EC5B4 38 21 00 30 */ addi r1, r1, 0x30 @@ -5018,7 +5018,7 @@ lbl_802EFA54: /* 802EFA7C 002EC9BC 38 60 00 01 */ li r3, 1 lbl_802EFA80: /* 802EFA80 002EC9C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EFA84 002EC9C4 48 07 27 95 */ bl func_80362218 +/* 802EFA84 002EC9C4 48 07 27 95 */ bl _restgpr_25 /* 802EFA88 002EC9C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EFA8C 002EC9CC 7C 08 03 A6 */ mtlr r0 /* 802EFA90 002EC9D0 38 21 00 30 */ addi r1, r1, 0x30 @@ -6175,7 +6175,7 @@ lbl_802F0ABC: /* 802F0AE0 002EDA20 38 60 00 01 */ li r3, 1 lbl_802F0AE4: /* 802F0AE4 002EDA24 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F0AE8 002EDA28 48 07 17 31 */ bl func_80362218 +/* 802F0AE8 002EDA28 48 07 17 31 */ bl _restgpr_25 /* 802F0AEC 002EDA2C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0AF0 002EDA30 7C 08 03 A6 */ mtlr r0 /* 802F0AF4 002EDA34 38 21 00 30 */ addi r1, r1, 0x30 @@ -6468,7 +6468,7 @@ lbl_802F0ED4: /* 802F0EFC 002EDE3C 38 60 00 01 */ li r3, 1 lbl_802F0F00: /* 802F0F00 002EDE40 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F0F04 002EDE44 48 07 13 15 */ bl func_80362218 +/* 802F0F04 002EDE44 48 07 13 15 */ bl _restgpr_25 /* 802F0F08 002EDE48 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0F0C 002EDE4C 7C 08 03 A6 */ mtlr r0 /* 802F0F10 002EDE50 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J2DGraph/J2DPane.s b/asm/J2DGraph/J2DPane.s index bcf7dcec84..b46b4a3ee0 100644 --- a/asm/J2DGraph/J2DPane.s +++ b/asm/J2DGraph/J2DPane.s @@ -124,7 +124,7 @@ J2DPane_X1_: /* 802F5DB0 002F2CF0 48 00 00 21 */ bl J2DPane_NS_initialize /* 802F5DB4 002F2CF4 7F 23 CB 78 */ mr r3, r25 /* 802F5DB8 002F2CF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F5DBC 002F2CFC 48 06 C4 5D */ bl func_80362218 +/* 802F5DBC 002F2CFC 48 06 C4 5D */ bl _restgpr_25 /* 802F5DC0 002F2D00 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F5DC4 002F2D04 7C 08 03 A6 */ mtlr r0 /* 802F5DC8 002F2D08 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index 4c9b6acd00..3f43504af2 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -463,7 +463,7 @@ lbl_802FC664: /* 802FC6E8 002F9628 4E 80 04 21 */ bctrl /* 802FC6EC 002F962C 7F E3 FB 78 */ mr r3, r31 /* 802FC6F0 002F9630 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 802FC6F4 002F9634 48 06 5B 25 */ bl func_80362218 +/* 802FC6F4 002F9634 48 06 5B 25 */ bl _restgpr_25 /* 802FC6F8 002F9638 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802FC6FC 002F963C 7C 08 03 A6 */ mtlr r0 /* 802FC700 002F9640 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -612,7 +612,7 @@ J2DPicture_NS_private_readStream: /* 802FC8EC 002F982C 7C 08 02 A6 */ mflr r0 /* 802FC8F0 002F9830 90 01 00 84 */ stw r0, 0x84(r1) /* 802FC8F4 002F9834 39 61 00 80 */ addi r11, r1, 0x80 -/* 802FC8F8 002F9838 48 06 58 C9 */ bl func_803621C0 +/* 802FC8F8 002F9838 48 06 58 C9 */ bl _savegpr_22 /* 802FC8FC 002F983C 7C 78 1B 78 */ mr r24, r3 /* 802FC900 002F9840 7C 97 23 78 */ mr r23, r4 /* 802FC904 002F9844 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index d868d583df..28c993950c 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -391,7 +391,7 @@ lbl_80303B58: /* 80303C00 00300B40 DB 81 00 80 */ stfd f28, 0x80(r1) /* 80303C04 00300B44 F3 81 00 88 */ psq_st f28, 136(r1), 0, qr0 /* 80303C08 00300B48 39 61 00 80 */ addi r11, r1, 0x80 -/* 80303C0C 00300B4C 48 05 E5 B9 */ bl func_803621C4 +/* 80303C0C 00300B4C 48 05 E5 B9 */ bl _savegpr_23 /* 80303C10 00300B50 7C 77 1B 78 */ mr r23, r3 /* 80303C14 00300B54 FF 80 08 90 */ fmr f28, f1 /* 80303C18 00300B58 FF A0 10 90 */ fmr f29, f2 @@ -889,7 +889,7 @@ lbl_803042F4: /* 8030435C 0030129C E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 80304360 003012A0 CB E1 00 90 */ lfd f31, 0x90(r1) /* 80304364 003012A4 39 61 00 90 */ addi r11, r1, 0x90 -/* 80304368 003012A8 48 05 DE B1 */ bl func_80362218 +/* 80304368 003012A8 48 05 DE B1 */ bl _restgpr_25 /* 8030436C 003012AC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80304370 003012B0 7C 08 03 A6 */ mtlr r0 /* 80304374 003012B4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -3420,7 +3420,7 @@ lbl_80306808: /* 80306808 00303748 38 60 00 01 */ li r3, 1 lbl_8030680C: /* 8030680C 0030374C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80306810 00303750 48 05 BA 09 */ bl func_80362218 +/* 80306810 00303750 48 05 BA 09 */ bl _restgpr_25 /* 80306814 00303754 80 01 00 44 */ lwz r0, 0x44(r1) /* 80306818 00303758 7C 08 03 A6 */ mtlr r0 /* 8030681C 0030375C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index 232d2053cd..5f6d79d615 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -238,7 +238,7 @@ lbl_802F4628: /* 802F4638 002F1578 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 802F463C 002F157C CB C1 00 40 */ lfd f30, 0x40(r1) /* 802F4640 002F1580 39 61 00 40 */ addi r11, r1, 0x40 -/* 802F4644 002F1584 48 06 DB D5 */ bl func_80362218 +/* 802F4644 002F1584 48 06 DB D5 */ bl _restgpr_25 /* 802F4648 002F1588 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F464C 002F158C 7C 08 03 A6 */ mtlr r0 /* 802F4650 002F1590 38 21 00 60 */ addi r1, r1, 0x60 @@ -584,7 +584,7 @@ lbl_802F4B04: /* 802F4B2C 002F1A6C E3 41 02 58 */ psq_l f26, 600(r1), 0, qr0 /* 802F4B30 002F1A70 CB 41 02 50 */ lfd f26, 0x250(r1) /* 802F4B34 002F1A74 39 61 02 50 */ addi r11, r1, 0x250 -/* 802F4B38 002F1A78 48 06 D6 E1 */ bl func_80362218 +/* 802F4B38 002F1A78 48 06 D6 E1 */ bl _restgpr_25 /* 802F4B3C 002F1A7C 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 802F4B40 002F1A80 7C 08 03 A6 */ mtlr r0 /* 802F4B44 002F1A84 38 21 02 B0 */ addi r1, r1, 0x2b0 diff --git a/asm/J2DGraph/J2DScreen.s b/asm/J2DGraph/J2DScreen.s index 9de93a9060..07d19afeed 100644 --- a/asm/J2DGraph/J2DScreen.s +++ b/asm/J2DGraph/J2DScreen.s @@ -503,7 +503,7 @@ lbl_802F8B70: /* 802F8B7C 002F5ABC 38 60 00 02 */ li r3, 2 lbl_802F8B80: /* 802F8B80 002F5AC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F8B84 002F5AC4 48 06 96 95 */ bl func_80362218 +/* 802F8B84 002F5AC4 48 06 96 95 */ bl _restgpr_25 /* 802F8B88 002F5AC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F8B8C 002F5ACC 7C 08 03 A6 */ mtlr r0 /* 802F8B90 002F5AD0 38 21 00 30 */ addi r1, r1, 0x30 @@ -1240,7 +1240,7 @@ lbl_802F95D4: /* 802F95E4 002F6524 38 60 00 00 */ li r3, 0 lbl_802F95E8: /* 802F95E8 002F6528 39 61 00 90 */ addi r11, r1, 0x90 -/* 802F95EC 002F652C 48 06 8C 2D */ bl func_80362218 +/* 802F95EC 002F652C 48 06 8C 2D */ bl _restgpr_25 /* 802F95F0 002F6530 80 01 00 94 */ lwz r0, 0x94(r1) /* 802F95F4 002F6534 7C 08 03 A6 */ mtlr r0 /* 802F95F8 002F6538 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s index 0222a8f1d2..2c89cbd20c 100644 --- a/asm/J2DGraph/J2DTextBox.s +++ b/asm/J2DGraph/J2DTextBox.s @@ -358,7 +358,7 @@ lbl_802FFB94: /* 802FFBA4 002FCAE4 98 1B 01 31 */ stb r0, 0x131(r27) /* 802FFBA8 002FCAE8 7F 63 DB 78 */ mr r3, r27 /* 802FFBAC 002FCAEC 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FFBB0 002FCAF0 48 06 26 69 */ bl func_80362218 +/* 802FFBB0 002FCAF0 48 06 26 69 */ bl _restgpr_25 /* 802FFBB4 002FCAF4 80 01 00 94 */ lwz r0, 0x94(r1) /* 802FFBB8 002FCAF8 7C 08 03 A6 */ mtlr r0 /* 802FFBBC 002FCAFC 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/J2DGraph/J2DTextBoxEx.s b/asm/J2DGraph/J2DTextBoxEx.s index 9866decbb4..04c5a9183c 100644 --- a/asm/J2DGraph/J2DTextBoxEx.s +++ b/asm/J2DGraph/J2DTextBoxEx.s @@ -211,7 +211,7 @@ lbl_803074BC: /* 803074FC 0030443C 98 1B 01 40 */ stb r0, 0x140(r27) /* 80307500 00304440 7F 63 DB 78 */ mr r3, r27 /* 80307504 00304444 39 61 00 80 */ addi r11, r1, 0x80 -/* 80307508 00304448 48 05 AD 11 */ bl func_80362218 +/* 80307508 00304448 48 05 AD 11 */ bl _restgpr_25 /* 8030750C 0030444C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80307510 00304450 7C 08 03 A6 */ mtlr r0 /* 80307514 00304454 38 21 00 80 */ addi r1, r1, 0x80 @@ -1393,7 +1393,7 @@ lbl_8030864C: /* 8030864C 0030558C 38 60 00 01 */ li r3, 1 lbl_80308650: /* 80308650 00305590 39 61 00 40 */ addi r11, r1, 0x40 -/* 80308654 00305594 48 05 9B C5 */ bl func_80362218 +/* 80308654 00305594 48 05 9B C5 */ bl _restgpr_25 /* 80308658 00305598 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030865C 0030559C 7C 08 03 A6 */ mtlr r0 /* 80308660 003055A0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J2DGraph/J2DWindow.s b/asm/J2DGraph/J2DWindow.s index fa68487588..1803585f4f 100644 --- a/asm/J2DGraph/J2DWindow.s +++ b/asm/J2DGraph/J2DWindow.s @@ -770,7 +770,7 @@ lbl_802FA5B8: /* 802FA5E4 002F7524 E3 A1 00 98 */ psq_l f29, 152(r1), 0, qr0 /* 802FA5E8 002F7528 CB A1 00 90 */ lfd f29, 0x90(r1) /* 802FA5EC 002F752C 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FA5F0 002F7530 48 06 7C 29 */ bl func_80362218 +/* 802FA5F0 002F7530 48 06 7C 29 */ bl _restgpr_25 /* 802FA5F4 002F7534 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802FA5F8 002F7538 7C 08 03 A6 */ mtlr r0 /* 802FA5FC 002F753C 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index 995d458dcf..99eef795c1 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -851,7 +851,7 @@ lbl_8030194C: /* 80301974 002FE8B4 E3 41 00 D8 */ psq_l f26, 216(r1), 0, qr0 /* 80301978 002FE8B8 CB 41 00 D0 */ lfd f26, 0xd0(r1) /* 8030197C 002FE8BC 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 80301980 002FE8C0 48 06 08 99 */ bl func_80362218 +/* 80301980 002FE8C0 48 06 08 99 */ bl _restgpr_25 /* 80301984 002FE8C4 80 01 01 34 */ lwz r0, 0x134(r1) /* 80301988 002FE8C8 7C 08 03 A6 */ mtlr r0 /* 8030198C 002FE8CC 38 21 01 30 */ addi r1, r1, 0x130 @@ -1267,7 +1267,7 @@ lbl_80301F90: /* 80301FA8 002FEEE8 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 80301FAC 002FEEEC CB 81 00 40 */ lfd f28, 0x40(r1) /* 80301FB0 002FEEF0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80301FB4 002FEEF4 48 06 02 65 */ bl func_80362218 +/* 80301FB4 002FEEF4 48 06 02 65 */ bl _restgpr_25 /* 80301FB8 002FEEF8 80 01 00 84 */ lwz r0, 0x84(r1) /* 80301FBC 002FEEFC 7C 08 03 A6 */ mtlr r0 /* 80301FC0 002FEF00 38 21 00 80 */ addi r1, r1, 0x80 @@ -1523,7 +1523,7 @@ lbl_80302364: /* 80302368 002FF2A8 28 00 00 02 */ cmplwi r0, 2 /* 8030236C 002FF2AC 41 80 FF 70 */ blt lbl_803022DC /* 80302370 002FF2B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302374 002FF2B4 48 05 FE A5 */ bl func_80362218 +/* 80302374 002FF2B4 48 05 FE A5 */ bl _restgpr_25 /* 80302378 002FF2B8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030237C 002FF2BC 7C 08 03 A6 */ mtlr r0 /* 80302380 002FF2C0 38 21 00 40 */ addi r1, r1, 0x40 @@ -2099,7 +2099,7 @@ lbl_80302BCC: /* 80302BCC 002FFB0C 38 60 00 01 */ li r3, 1 lbl_80302BD0: /* 80302BD0 002FFB10 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302BD4 002FFB14 48 05 F6 45 */ bl func_80362218 +/* 80302BD4 002FFB14 48 05 F6 45 */ bl _restgpr_25 /* 80302BD8 002FFB18 80 01 00 44 */ lwz r0, 0x44(r1) /* 80302BDC 002FFB1C 7C 08 03 A6 */ mtlr r0 /* 80302BE0 002FFB20 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphAnimator/J3DAnimation.s b/asm/J3DGraphAnimator/J3DAnimation.s index d1511e985c..54f43da4e6 100644 --- a/asm/J3DGraphAnimator/J3DAnimation.s +++ b/asm/J3DGraphAnimator/J3DAnimation.s @@ -1552,7 +1552,7 @@ lbl_80329A14: /* 80329A14 00326954 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80329A18 00326958 CB E1 00 40 */ lfd f31, 0x40(r1) /* 80329A1C 0032695C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80329A20 00326960 48 03 87 F9 */ bl func_80362218 +/* 80329A20 00326960 48 03 87 F9 */ bl _restgpr_25 /* 80329A24 00326964 80 01 00 54 */ lwz r0, 0x54(r1) /* 80329A28 00326968 7C 08 03 A6 */ mtlr r0 /* 80329A2C 0032696C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/J3DGraphAnimator/J3DJointTree.s b/asm/J3DGraphAnimator/J3DJointTree.s index 8cc7323f36..d172c7289b 100644 --- a/asm/J3DGraphAnimator/J3DJointTree.s +++ b/asm/J3DGraphAnimator/J3DJointTree.s @@ -45,7 +45,7 @@ J3DJointTree_NS_makeHierarchy: /* 80325AA0 003229E0 7C 08 02 A6 */ mflr r0 /* 80325AA4 003229E4 90 01 00 34 */ stw r0, 0x34(r1) /* 80325AA8 003229E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80325AAC 003229EC 48 03 C7 19 */ bl func_803621C4 +/* 80325AAC 003229EC 48 03 C7 19 */ bl _savegpr_23 /* 80325AB0 003229F0 7C 77 1B 78 */ mr r23, r3 /* 80325AB4 003229F4 7C 98 23 78 */ mr r24, r4 /* 80325AB8 003229F8 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/J3DGraphAnimator/J3DMaterialAttach.s b/asm/J3DGraphAnimator/J3DMaterialAttach.s index 4a5d86789e..e95ee2d0cf 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAttach.s +++ b/asm/J3DGraphAnimator/J3DMaterialAttach.s @@ -550,7 +550,7 @@ J3DMaterialTable_NS_entryTexMtxAnimator: /* 8032FCC8 0032CC08 7C 08 02 A6 */ mflr r0 /* 8032FCCC 0032CC0C 90 01 00 44 */ stw r0, 0x44(r1) /* 8032FCD0 0032CC10 39 61 00 40 */ addi r11, r1, 0x40 -/* 8032FCD4 0032CC14 48 03 24 ED */ bl func_803621C0 +/* 8032FCD4 0032CC14 48 03 24 ED */ bl _savegpr_22 /* 8032FCD8 0032CC18 7C 78 1B 78 */ mr r24, r3 /* 8032FCDC 0032CC1C 7C 99 23 78 */ mr r25, r4 /* 8032FCE0 0032CC20 A0 A4 00 14 */ lhz r5, 0x14(r4) diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index 5a0110e882..0346a4eee0 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -220,7 +220,7 @@ J3DModel_NS_createMatPacket: /* 803273D0 00324310 7C 08 02 A6 */ mflr r0 /* 803273D4 00324314 90 01 00 34 */ stw r0, 0x34(r1) /* 803273D8 00324318 39 61 00 30 */ addi r11, r1, 0x30 -/* 803273DC 0032431C 48 03 AD E9 */ bl func_803621C4 +/* 803273DC 0032431C 48 03 AD E9 */ bl _savegpr_23 /* 803273E0 00324320 7C 78 1B 78 */ mr r24, r3 /* 803273E4 00324324 7C 99 23 78 */ mr r25, r4 /* 803273E8 00324328 7C BA 2B 78 */ mr r26, r5 @@ -637,7 +637,7 @@ lbl_8032797C: /* 80327980 003248C0 7C 00 F8 40 */ cmplw r0, r31 /* 80327984 003248C4 41 80 FF 70 */ blt lbl_803278F4 /* 80327988 003248C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032798C 003248CC 48 03 A8 8D */ bl func_80362218 +/* 8032798C 003248CC 48 03 A8 8D */ bl _restgpr_25 /* 80327990 003248D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80327994 003248D4 7C 08 03 A6 */ mtlr r0 /* 80327998 003248D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1282,7 +1282,7 @@ lbl_80328294: /* 8032829C 003251DC 41 80 FF 50 */ blt lbl_803281EC lbl_803282A0: /* 803282A0 003251E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 803282A4 003251E4 48 03 9F 75 */ bl func_80362218 +/* 803282A4 003251E4 48 03 9F 75 */ bl _restgpr_25 /* 803282A8 003251E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 803282AC 003251EC 7C 08 03 A6 */ mtlr r0 /* 803282B0 003251F0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DShapeTable.s b/asm/J3DGraphAnimator/J3DShapeTable.s index f6143929c5..39a536c97d 100644 --- a/asm/J3DGraphAnimator/J3DShapeTable.s +++ b/asm/J3DGraphAnimator/J3DShapeTable.s @@ -109,7 +109,7 @@ lbl_803259F4: /* 803259F8 00322938 7C 00 E0 40 */ cmplw r0, r28 /* 803259FC 0032293C 41 80 FF A4 */ blt lbl_803259A0 /* 80325A00 00322940 39 61 00 30 */ addi r11, r1, 0x30 -/* 80325A04 00322944 48 03 C8 15 */ bl func_80362218 +/* 80325A04 00322944 48 03 C8 15 */ bl _restgpr_25 /* 80325A08 00322948 80 01 00 34 */ lwz r0, 0x34(r1) /* 80325A0C 0032294C 7C 08 03 A6 */ mtlr r0 /* 80325A10 00322950 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index a4b9667f01..eac108e062 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -1377,7 +1377,7 @@ lbl_8032D9EC: /* 8032D9FC 0032A93C 48 00 DB E1 */ bl DCStoreRange /* 8032DA00 0032A940 93 DC 00 2C */ stw r30, 0x2c(r28) /* 8032DA04 0032A944 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032DA08 0032A948 48 03 48 11 */ bl func_80362218 +/* 8032DA08 0032A948 48 03 48 11 */ bl _restgpr_25 /* 8032DA0C 0032A94C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032DA10 0032A950 7C 08 03 A6 */ mtlr r0 /* 8032DA14 0032A954 38 21 00 30 */ addi r1, r1, 0x30 @@ -1465,7 +1465,7 @@ lbl_8032DB20: /* 8032DB30 0032AA70 48 00 DA AD */ bl DCStoreRange /* 8032DB34 0032AA74 93 DC 00 30 */ stw r30, 0x30(r28) /* 8032DB38 0032AA78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032DB3C 0032AA7C 48 03 46 DD */ bl func_80362218 +/* 8032DB3C 0032AA7C 48 03 46 DD */ bl _restgpr_25 /* 8032DB40 0032AA80 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032DB44 0032AA84 7C 08 03 A6 */ mtlr r0 /* 8032DB48 0032AA88 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DGD.s b/asm/J3DGraphBase/J3DGD.s index bf1d303f5b..d0ea0c9771 100644 --- a/asm/J3DGraphBase/J3DGD.s +++ b/asm/J3DGraphBase/J3DGD.s @@ -1301,7 +1301,7 @@ lbl_8030E280: /* 8030E418 0030B358 90 04 00 08 */ stw r0, 8(r4) /* 8030E41C 0030B35C 98 C3 00 00 */ stb r6, 0(r3) /* 8030E420 0030B360 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030E424 0030B364 48 05 3D F5 */ bl func_80362218 +/* 8030E424 0030B364 48 05 3D F5 */ bl _restgpr_25 /* 8030E428 0030B368 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030E42C 0030B36C 7C 08 03 A6 */ mtlr r0 /* 8030E430 0030B370 38 21 00 30 */ addi r1, r1, 0x30 @@ -2038,7 +2038,7 @@ J3DGDSetIndTexOrder: /* 8030EF0C 0030BE4C 7C 08 02 A6 */ mflr r0 /* 8030EF10 0030BE50 90 01 00 34 */ stw r0, 0x34(r1) /* 8030EF14 0030BE54 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030EF18 0030BE58 48 05 32 AD */ bl func_803621C4 +/* 8030EF18 0030BE58 48 05 32 AD */ bl _savegpr_23 /* 8030EF1C 0030BE5C 7C 7F 1B 78 */ mr r31, r3 /* 8030EF20 0030BE60 7C 97 23 78 */ mr r23, r4 /* 8030EF24 0030BE64 7C B8 2B 78 */ mr r24, r5 @@ -2273,7 +2273,7 @@ lbl_8030F1E8: /* 8030F274 0030C1B4 90 04 00 08 */ stw r0, 8(r4) /* 8030F278 0030C1B8 98 C3 00 00 */ stb r6, 0(r3) /* 8030F27C 0030C1BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030F280 0030C1C0 48 05 2F 99 */ bl func_80362218 +/* 8030F280 0030C1C0 48 05 2F 99 */ bl _restgpr_25 /* 8030F284 0030C1C4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030F288 0030C1C8 7C 08 03 A6 */ mtlr r0 /* 8030F28C 0030C1CC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DMatBlock.s b/asm/J3DGraphBase/J3DMatBlock.s index a125a8538f..d57237b26d 100644 --- a/asm/J3DGraphBase/J3DMatBlock.s +++ b/asm/J3DGraphBase/J3DMatBlock.s @@ -4603,7 +4603,7 @@ lbl_8031B83C: /* 8031B9E4 00318924 38 A5 00 04 */ addi r5, r5, 4 /* 8031B9E8 00318928 42 00 FE 54 */ bdnz lbl_8031B83C /* 8031B9EC 0031892C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031B9F0 00318930 48 04 68 29 */ bl func_80362218 +/* 8031B9F0 00318930 48 04 68 29 */ bl _restgpr_25 /* 8031B9F4 00318934 80 01 00 44 */ lwz r0, 0x44(r1) /* 8031B9F8 00318938 7C 08 03 A6 */ mtlr r0 /* 8031B9FC 0031893C 38 21 00 40 */ addi r1, r1, 0x40 @@ -4950,7 +4950,7 @@ lbl_8031BD80: /* 8031BF2C 00318E6C 38 C6 00 04 */ addi r6, r6, 4 /* 8031BF30 00318E70 42 00 FE 50 */ bdnz lbl_8031BD80 /* 8031BF34 00318E74 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031BF38 00318E78 48 04 62 E1 */ bl func_80362218 +/* 8031BF38 00318E78 48 04 62 E1 */ bl _restgpr_25 /* 8031BF3C 00318E7C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8031BF40 00318E80 7C 08 03 A6 */ mtlr r0 /* 8031BF44 00318E84 38 21 00 40 */ addi r1, r1, 0x40 @@ -7093,7 +7093,7 @@ lbl_8031DF78: /* 8031DF94 0031AED4 7C 9A 00 50 */ subf r4, r26, r0 /* 8031DF98 0031AED8 48 01 D6 45 */ bl DCStoreRange /* 8031DF9C 0031AEDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DFA0 0031AEE0 48 04 42 79 */ bl func_80362218 +/* 8031DFA0 0031AEE0 48 04 42 79 */ bl _restgpr_25 /* 8031DFA4 0031AEE4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031DFA8 0031AEE8 7C 08 03 A6 */ mtlr r0 /* 8031DFAC 0031AEEC 38 21 00 30 */ addi r1, r1, 0x30 @@ -7152,7 +7152,7 @@ lbl_8031E05C: /* 8031E078 0031AFB8 7C 9A 00 50 */ subf r4, r26, r0 /* 8031E07C 0031AFBC 48 01 D5 61 */ bl DCStoreRange /* 8031E080 0031AFC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031E084 0031AFC4 48 04 41 95 */ bl func_80362218 +/* 8031E084 0031AFC4 48 04 41 95 */ bl _restgpr_25 /* 8031E088 0031AFC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031E08C 0031AFCC 7C 08 03 A6 */ mtlr r0 /* 8031E090 0031AFD0 38 21 00 30 */ addi r1, r1, 0x30 @@ -10648,7 +10648,7 @@ lbl_80321558: /* 80321564 0031E4A4 3B 39 00 04 */ addi r25, r25, 4 /* 80321568 0031E4A8 41 80 FE 88 */ blt lbl_803213F0 /* 8032156C 0031E4AC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80321570 0031E4B0 48 04 0C A9 */ bl func_80362218 +/* 80321570 0031E4B0 48 04 0C A9 */ bl _restgpr_25 /* 80321574 0031E4B4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80321578 0031E4B8 7C 08 03 A6 */ mtlr r0 /* 8032157C 0031E4BC 38 21 00 60 */ addi r1, r1, 0x60 @@ -10738,7 +10738,7 @@ lbl_803216AC: /* 803216B8 0031E5F8 3B 39 00 04 */ addi r25, r25, 4 /* 803216BC 0031E5FC 41 80 FE F8 */ blt lbl_803215B4 /* 803216C0 0031E600 39 61 00 60 */ addi r11, r1, 0x60 -/* 803216C4 0031E604 48 04 0B 55 */ bl func_80362218 +/* 803216C4 0031E604 48 04 0B 55 */ bl _restgpr_25 /* 803216C8 0031E608 80 01 00 64 */ lwz r0, 0x64(r1) /* 803216CC 0031E60C 7C 08 03 A6 */ mtlr r0 /* 803216D0 0031E610 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index 4d18781059..23e6e1db96 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -509,7 +509,7 @@ lbl_80313804: /* 8031380C 0031074C 41 80 FD 1C */ blt lbl_80313528 lbl_80313810: /* 80313810 00310750 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80313814 00310754 48 04 EA 05 */ bl func_80362218 +/* 80313814 00310754 48 04 EA 05 */ bl _restgpr_25 /* 80313818 00310758 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8031381C 0031075C 7C 08 03 A6 */ mtlr r0 /* 80313820 00310760 38 21 00 E0 */ addi r1, r1, 0xe0 @@ -1007,7 +1007,7 @@ lbl_80313F84: /* 80313F84 00310EC4 7C 1D F0 00 */ cmpw r29, r30 /* 80313F88 00310EC8 41 80 FF 98 */ blt lbl_80313F20 /* 80313F8C 00310ECC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80313F90 00310ED0 48 04 E2 89 */ bl func_80362218 +/* 80313F90 00310ED0 48 04 E2 89 */ bl _restgpr_25 /* 80313F94 00310ED4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80313F98 00310ED8 7C 08 03 A6 */ mtlr r0 /* 80313F9C 00310EDC 38 21 00 30 */ addi r1, r1, 0x30 @@ -1016,7 +1016,7 @@ lbl_80313F84: /* 80313FA8 00310EE8 7C 08 02 A6 */ mflr r0 /* 80313FAC 00310EEC 90 01 00 54 */ stw r0, 0x54(r1) /* 80313FB0 00310EF0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80313FB4 00310EF4 48 04 E2 0D */ bl func_803621C0 +/* 80313FB4 00310EF4 48 04 E2 0D */ bl _savegpr_22 /* 80313FB8 00310EF8 7C 77 1B 78 */ mr r23, r3 /* 80313FBC 00310EFC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80313FC0 00310F00 3B 83 4A C8 */ addi r28, r3, lbl_80434AC8@l diff --git a/asm/J3DGraphBase/J3DSys.s b/asm/J3DGraphBase/J3DSys.s index 59ab35036d..3f67da872f 100644 --- a/asm/J3DGraphBase/J3DSys.s +++ b/asm/J3DGraphBase/J3DSys.s @@ -200,7 +200,7 @@ lbl_8031009C: /* 803100A0 0030CFE0 41 80 FF B4 */ blt lbl_80310054 lbl_803100A4: /* 803100A4 0030CFE4 39 61 00 50 */ addi r11, r1, 0x50 -/* 803100A8 0030CFE8 48 05 21 71 */ bl func_80362218 +/* 803100A8 0030CFE8 48 05 21 71 */ bl _restgpr_25 /* 803100AC 0030CFEC 80 01 00 54 */ lwz r0, 0x54(r1) /* 803100B0 0030CFF0 7C 08 03 A6 */ mtlr r0 /* 803100B4 0030CFF4 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/J3DGraphLoader/J3DClusterLoader.s b/asm/J3DGraphLoader/J3DClusterLoader.s index 7d4275ba79..737732dcfa 100644 --- a/asm/J3DGraphLoader/J3DClusterLoader.s +++ b/asm/J3DGraphLoader/J3DClusterLoader.s @@ -146,7 +146,7 @@ J3DClusterLoader_v15_NS_readCluster: /* 803342FC 0033123C 7C 08 02 A6 */ mflr r0 /* 80334300 00331240 90 01 00 34 */ stw r0, 0x34(r1) /* 80334304 00331244 39 61 00 30 */ addi r11, r1, 0x30 -/* 80334308 00331248 48 02 DE BD */ bl func_803621C4 +/* 80334308 00331248 48 02 DE BD */ bl _savegpr_23 /* 8033430C 0033124C 7C 7B 1B 78 */ mr r27, r3 /* 80334310 00331250 7C 9C 23 78 */ mr r28, r4 /* 80334314 00331254 A0 04 00 08 */ lhz r0, 8(r4) diff --git a/asm/J3DGraphLoader/J3DModelLoader.s b/asm/J3DGraphLoader/J3DModelLoader.s index 07d32659e0..2fc8dc7cd6 100644 --- a/asm/J3DGraphLoader/J3DModelLoader.s +++ b/asm/J3DGraphLoader/J3DModelLoader.s @@ -299,7 +299,7 @@ lbl_80334A8C: lbl_80334AA0: /* 80334AA0 003319E0 80 7B 00 04 */ lwz r3, 4(r27) /* 80334AA4 003319E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80334AA8 003319E8 48 02 D7 71 */ bl func_80362218 +/* 80334AA8 003319E8 48 02 D7 71 */ bl _restgpr_25 /* 80334AAC 003319EC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80334AB0 003319F0 7C 08 03 A6 */ mtlr r0 /* 80334AB4 003319F4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s index 345b9c1ad4..d96945464a 100644 --- a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s +++ b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s @@ -146,7 +146,7 @@ lbl_8033697C: /* 80336980 003338C0 41 80 FE 8C */ blt lbl_8033680C /* 80336984 003338C4 7F A3 EB 78 */ mr r3, r29 /* 80336988 003338C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8033698C 003338CC 48 02 B8 8D */ bl func_80362218 +/* 8033698C 003338CC 48 02 B8 8D */ bl _restgpr_25 /* 80336990 003338D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80336994 003338D4 7C 08 03 A6 */ mtlr r0 /* 80336998 003338D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -216,7 +216,7 @@ lbl_80336A68: lbl_80336A7C: /* 80336A7C 003339BC 7F A3 EB 78 */ mr r3, r29 /* 80336A80 003339C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80336A84 003339C4 48 02 B7 95 */ bl func_80362218 +/* 80336A84 003339C4 48 02 B7 95 */ bl _restgpr_25 /* 80336A88 003339C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80336A8C 003339CC 7C 08 03 A6 */ mtlr r0 /* 80336A90 003339D0 38 21 00 30 */ addi r1, r1, 0x30 @@ -225,7 +225,7 @@ lbl_80336A7C: /* 80336A9C 003339DC 7C 08 02 A6 */ mflr r0 /* 80336AA0 003339E0 90 01 00 34 */ stw r0, 0x34(r1) /* 80336AA4 003339E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80336AA8 003339E8 48 02 B7 19 */ bl func_803621C0 +/* 80336AA8 003339E8 48 02 B7 19 */ bl _savegpr_22 /* 80336AAC 003339EC 7C 77 1B 78 */ mr r23, r3 /* 80336AB0 003339F0 7C B8 2B 78 */ mr r24, r5 /* 80336AB4 003339F4 3B 44 00 20 */ addi r26, r4, 0x20 diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index a9ba542bc0..8eb846d8ec 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -1215,7 +1215,7 @@ lbl_802A08B4: /* 802A08B4 0029D7F4 38 60 00 01 */ li r3, 1 lbl_802A08B8: /* 802A08B8 0029D7F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A08BC 0029D7FC 48 0C 19 5D */ bl func_80362218 +/* 802A08BC 0029D7FC 48 0C 19 5D */ bl _restgpr_25 /* 802A08C0 0029D800 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A08C4 0029D804 7C 08 03 A6 */ mtlr r0 /* 802A08C8 0029D808 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JAudio2/JAISeqMgr.s b/asm/JAudio2/JAISeqMgr.s index 6d0aea394e..901342a3e8 100644 --- a/asm/JAudio2/JAISeqMgr.s +++ b/asm/JAudio2/JAISeqMgr.s @@ -330,7 +330,7 @@ lbl_802A1C74: /* 802A1C74 0029EBB4 38 60 00 00 */ li r3, 0 lbl_802A1C78: /* 802A1C78 0029EBB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A1C7C 0029EBBC 48 0C 05 9D */ bl func_80362218 +/* 802A1C7C 0029EBBC 48 0C 05 9D */ bl _restgpr_25 /* 802A1C80 0029EBC0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A1C84 0029EBC4 7C 08 03 A6 */ mtlr r0 /* 802A1C88 0029EBC8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JAudio2/JAIStreamMgr.s b/asm/JAudio2/JAIStreamMgr.s index 70706565e0..8cfbd13dbb 100644 --- a/asm/JAudio2/JAIStreamMgr.s +++ b/asm/JAudio2/JAIStreamMgr.s @@ -141,7 +141,7 @@ lbl_802A3D54: /* 802A3D54 002A0C94 38 60 00 00 */ li r3, 0 lbl_802A3D58: /* 802A3D58 002A0C98 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A3D5C 002A0C9C 48 0B E4 BD */ bl func_80362218 +/* 802A3D5C 002A0C9C 48 0B E4 BD */ bl _restgpr_25 /* 802A3D60 002A0CA0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A3D64 002A0CA4 7C 08 03 A6 */ mtlr r0 /* 802A3D68 002A0CA8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JAudio2/JASAiCtrl.s b/asm/JAudio2/JASAiCtrl.s index 37bb6b5a85..5f70373b54 100644 --- a/asm/JAudio2/JASAiCtrl.s +++ b/asm/JAudio2/JASAiCtrl.s @@ -90,7 +90,7 @@ lbl_8029C470: /* 8029C4C4 00299404 7F E3 FB 78 */ mr r3, r31 /* 8029C4C8 00299408 48 0B 37 A9 */ bl AIRegisterDMACallback /* 8029C4CC 0029940C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029C4D0 00299410 48 0C 5D 49 */ bl func_80362218 +/* 8029C4D0 00299410 48 0C 5D 49 */ bl _restgpr_25 /* 8029C4D4 00299414 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029C4D8 00299418 7C 08 03 A6 */ mtlr r0 /* 8029C4DC 0029941C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index ddbcab3d2c..4e94f4b9fb 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -1278,7 +1278,7 @@ lbl_80297484: /* 80297490 002943D0 98 1C 00 04 */ stb r0, 4(r28) lbl_80297494: /* 80297494 002943D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80297498 002943D8 48 0C AD 81 */ bl func_80362218 +/* 80297498 002943D8 48 0C AD 81 */ bl _restgpr_25 /* 8029749C 002943DC 80 01 00 54 */ lwz r0, 0x54(r1) /* 802974A0 002943E0 7C 08 03 A6 */ mtlr r0 /* 802974A4 002943E4 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/JAudio2/JASBNKParser.s b/asm/JAudio2/JASBNKParser.s index 25eef96971..d89d1dd3b8 100644 --- a/asm/JAudio2/JASBNKParser.s +++ b/asm/JAudio2/JASBNKParser.s @@ -671,7 +671,7 @@ JASBNKParser_NS_Ver0_NS_findOscPtr: /* 80299E6C 00296DAC 7C 08 02 A6 */ mflr r0 /* 80299E70 00296DB0 90 01 00 54 */ stw r0, 0x54(r1) /* 80299E74 00296DB4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80299E78 00296DB8 48 0C 83 4D */ bl func_803621C4 +/* 80299E78 00296DB8 48 0C 83 4D */ bl _savegpr_23 /* 80299E7C 00296DBC 7C 77 1B 78 */ mr r23, r3 /* 80299E80 00296DC0 7C 98 23 78 */ mr r24, r4 /* 80299E84 00296DC4 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/JAudio2/JASBank.s b/asm/JAudio2/JASBank.s index 1e05829ca4..66e963ec2a 100644 --- a/asm/JAudio2/JASBank.s +++ b/asm/JAudio2/JASBank.s @@ -9,7 +9,7 @@ JASBank_NS_noteOn: /* 80297934 00294874 7C 08 02 A6 */ mflr r0 /* 80297938 00294878 90 01 00 64 */ stw r0, 0x64(r1) /* 8029793C 0029487C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80297940 00294880 48 0C A8 85 */ bl func_803621C4 +/* 80297940 00294880 48 0C A8 85 */ bl _savegpr_23 /* 80297944 00294884 7C 7A 1B 78 */ mr r26, r3 /* 80297948 00294888 7C DB 33 78 */ mr r27, r6 /* 8029794C 0029488C 7C FC 3B 78 */ mr r28, r7 @@ -301,7 +301,7 @@ lbl_80297D5C: /* 80297D5C 00294C9C 38 60 00 00 */ li r3, 0 lbl_80297D60: /* 80297D60 00294CA0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80297D64 00294CA4 48 0C A4 B5 */ bl func_80362218 +/* 80297D64 00294CA4 48 0C A4 B5 */ bl _restgpr_25 /* 80297D68 00294CA8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80297D6C 00294CAC 7C 08 03 A6 */ mtlr r0 /* 80297D70 00294CB0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JASBasicWaveBank.s b/asm/JAudio2/JASBasicWaveBank.s index 8b8f8733b3..8148ed5311 100644 --- a/asm/JAudio2/JASBasicWaveBank.s +++ b/asm/JAudio2/JASBasicWaveBank.s @@ -295,7 +295,7 @@ lbl_802988B0: /* 802988BC 002957FC 80 61 00 08 */ lwz r3, 8(r1) /* 802988C0 00295800 48 0A 68 5D */ bl OSUnlockMutex /* 802988C4 00295804 39 61 00 30 */ addi r11, r1, 0x30 -/* 802988C8 00295808 48 0C 99 51 */ bl func_80362218 +/* 802988C8 00295808 48 0C 99 51 */ bl _restgpr_25 /* 802988CC 0029580C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802988D0 00295810 7C 08 03 A6 */ mtlr r0 /* 802988D4 00295814 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JASSeqParser.s b/asm/JAudio2/JASSeqParser.s index 056fac7b64..197093c271 100644 --- a/asm/JAudio2/JASSeqParser.s +++ b/asm/JAudio2/JASSeqParser.s @@ -1587,7 +1587,7 @@ lbl_80295458: /* 80295478 002923B8 4B FF BA ED */ bl JASReport /* 8029547C 002923BC 38 60 00 00 */ li r3, 0 /* 80295480 002923C0 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80295484 002923C4 48 0C CD 95 */ bl func_80362218 +/* 80295484 002923C4 48 0C CD 95 */ bl _restgpr_25 /* 80295488 002923C8 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8029548C 002923CC 7C 08 03 A6 */ mtlr r0 /* 80295490 002923D0 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -1859,7 +1859,7 @@ lbl_80295810: /* 80295848 00292788 4E 80 04 21 */ bctrl lbl_8029584C: /* 8029584C 0029278C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80295850 00292790 48 0C C9 C9 */ bl func_80362218 +/* 80295850 00292790 48 0C C9 C9 */ bl _restgpr_25 /* 80295854 00292794 80 01 00 64 */ lwz r0, 0x64(r1) /* 80295858 00292798 7C 08 03 A6 */ mtlr r0 /* 8029585C 0029279C 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JAudio2/JASTrack.s b/asm/JAudio2/JASTrack.s index c8fe93f7b0..1320aabfbf 100644 --- a/asm/JAudio2/JASTrack.s +++ b/asm/JAudio2/JASTrack.s @@ -962,7 +962,7 @@ JASTrack_NS_noteOn: /* 80291F3C 0028EE7C 7C 08 02 A6 */ mflr r0 /* 80291F40 0028EE80 90 01 00 34 */ stw r0, 0x34(r1) /* 80291F44 0028EE84 39 61 00 30 */ addi r11, r1, 0x30 -/* 80291F48 0028EE88 48 0D 02 7D */ bl func_803621C4 +/* 80291F48 0028EE88 48 0D 02 7D */ bl _savegpr_23 /* 80291F4C 0028EE8C 7C 77 1B 78 */ mr r23, r3 /* 80291F50 0028EE90 7C 98 23 78 */ mr r24, r4 /* 80291F54 0028EE94 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/JAudio2/JASWSParser.s b/asm/JAudio2/JASWSParser.s index a1056d46b5..b8e18e6bef 100644 --- a/asm/JAudio2/JASWSParser.s +++ b/asm/JAudio2/JASWSParser.s @@ -201,7 +201,7 @@ JASWSParser_NS_createSimpleWaveBank: /* 80299268 002961A8 7C 08 02 A6 */ mflr r0 /* 8029926C 002961AC 90 01 00 64 */ stw r0, 0x64(r1) /* 80299270 002961B0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80299274 002961B4 48 0C 8F 51 */ bl func_803621C4 +/* 80299274 002961B4 48 0C 8F 51 */ bl _savegpr_23 /* 80299278 002961B8 7C 77 1B 78 */ mr r23, r3 /* 8029927C 002961BC 7C 99 23 79 */ or. r25, r4, r4 /* 80299280 002961C0 40 82 00 08 */ bne lbl_80299288 diff --git a/asm/JAudio2/JAUSeqDataBlockMgr.s b/asm/JAudio2/JAUSeqDataBlockMgr.s index dcd645bef1..20c390c544 100644 --- a/asm/JAudio2/JAUSeqDataBlockMgr.s +++ b/asm/JAudio2/JAUSeqDataBlockMgr.s @@ -334,7 +334,7 @@ lbl_802A6CD8: /* 802A6D2C 002A3C6C 38 60 00 01 */ li r3, 1 lbl_802A6D30: /* 802A6D30 002A3C70 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A6D34 002A3C74 48 0B B4 E5 */ bl func_80362218 +/* 802A6D34 002A3C74 48 0B B4 E5 */ bl _restgpr_25 /* 802A6D38 002A3C78 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A6D3C 002A3C7C 7C 08 03 A6 */ mtlr r0 /* 802A6D40 002A3C80 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JKernel/JKRExpHeap.s b/asm/JKernel/JKRExpHeap.s index f56c582786..aecfbb9b87 100644 --- a/asm/JKernel/JKRExpHeap.s +++ b/asm/JKernel/JKRExpHeap.s @@ -489,7 +489,7 @@ lbl_802CF474: /* 802CF474 002CC3B4 38 60 00 00 */ li r3, 0 lbl_802CF478: /* 802CF478 002CC3B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CF47C 002CC3BC 48 09 2D 9D */ bl func_80362218 +/* 802CF47C 002CC3BC 48 09 2D 9D */ bl _restgpr_25 /* 802CF480 002CC3C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CF484 002CC3C4 7C 08 03 A6 */ mtlr r0 /* 802CF488 002CC3C8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1729,7 +1729,7 @@ lbl_802D0548: /* 802D05AC 002CD4EC 48 06 EB 71 */ bl OSUnlockMutex /* 802D05B0 002CD4F0 7F E3 FB 78 */ mr r3, r31 /* 802D05B4 002CD4F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D05B8 002CD4F8 48 09 1C 61 */ bl func_80362218 +/* 802D05B8 002CD4F8 48 09 1C 61 */ bl _restgpr_25 /* 802D05BC 002CD4FC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D05C0 002CD500 7C 08 03 A6 */ mtlr r0 /* 802D05C4 002CD504 38 21 00 40 */ addi r1, r1, 0x40 @@ -1885,7 +1885,7 @@ lbl_802D078C: /* 802D07F0 002CD730 48 06 E9 2D */ bl OSUnlockMutex /* 802D07F4 002CD734 7F C3 F3 78 */ mr r3, r30 /* 802D07F8 002CD738 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D07FC 002CD73C 48 09 1A 1D */ bl func_80362218 +/* 802D07FC 002CD73C 48 09 1A 1D */ bl _restgpr_25 /* 802D0800 002CD740 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D0804 002CD744 7C 08 03 A6 */ mtlr r0 /* 802D0808 002CD748 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index 5af68da8e8..84166cf6e5 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -3222,7 +3222,7 @@ JPADrawStripeX: /* 80279A00 00276940 D9 C1 00 B0 */ stfd f14, 0xb0(r1) /* 80279A04 00276944 F1 C1 00 B8 */ psq_st f14, 184(r1), 0, qr0 /* 80279A08 00276948 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80279A0C 0027694C 48 0E 87 B5 */ bl func_803621C0 +/* 80279A0C 0027694C 48 0E 87 B5 */ bl _savegpr_22 /* 80279A10 00276950 7C 79 1B 78 */ mr r25, r3 /* 80279A14 00276954 80 63 00 04 */ lwz r3, 4(r3) /* 80279A18 00276958 80 63 00 1C */ lwz r3, 0x1c(r3) diff --git a/asm/JParticle/JPAResource.s b/asm/JParticle/JPAResource.s index 5ee3487cad..43c766e019 100644 --- a/asm/JParticle/JPAResource.s +++ b/asm/JParticle/JPAResource.s @@ -2783,7 +2783,7 @@ lbl_8027640C: /* 8027640C 0027334C 7F A3 EB 78 */ mr r3, r29 /* 80276410 00273350 48 0E 59 ED */ bl GXSetNumTexGens /* 80276414 00273354 39 61 00 30 */ addi r11, r1, 0x30 -/* 80276418 00273358 48 0E BE 01 */ bl func_80362218 +/* 80276418 00273358 48 0E BE 01 */ bl _restgpr_25 /* 8027641C 0027335C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80276420 00273360 7C 08 03 A6 */ mtlr r0 /* 80276424 00273364 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/fvb.s b/asm/JStudio/fvb.s index e94a446d10..4f804445f6 100644 --- a/asm/JStudio/fvb.s +++ b/asm/JStudio/fvb.s @@ -31,7 +31,7 @@ JStudio_NS_fvb_NS_TObject_NS_prepare: /* 80283FCC 00280F0C 7C 08 02 A6 */ mflr r0 /* 80283FD0 00280F10 90 01 00 64 */ stw r0, 0x64(r1) /* 80283FD4 00280F14 39 61 00 60 */ addi r11, r1, 0x60 -/* 80283FD8 00280F18 48 0D E1 ED */ bl func_803621C4 +/* 80283FD8 00280F18 48 0D E1 ED */ bl _savegpr_23 /* 80283FDC 00280F1C 7C 7A 1B 78 */ mr r26, r3 /* 80283FE0 00280F20 7C 97 23 78 */ mr r23, r4 /* 80283FE4 00280F24 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/JStudio/jstudio-object.s b/asm/JStudio/jstudio-object.s index 54dd75999d..3a33155a4e 100644 --- a/asm/JStudio/jstudio-object.s +++ b/asm/JStudio/jstudio-object.s @@ -290,7 +290,7 @@ lbl_802861A0: /* 802861A4 002830E4 40 82 FF D4 */ bne lbl_80286178 lbl_802861A8: /* 802861A8 002830E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802861AC 002830EC 48 0D C0 6D */ bl func_80362218 +/* 802861AC 002830EC 48 0D C0 6D */ bl _restgpr_25 /* 802861B0 002830F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802861B4 002830F4 7C 08 03 A6 */ mtlr r0 /* 802861B8 002830F8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/stb.s b/asm/JStudio/stb.s index c6f4879561..298cd01acb 100644 --- a/asm/JStudio/stb.s +++ b/asm/JStudio/stb.s @@ -827,7 +827,7 @@ lbl_80289564: /* 80289594 002864D4 90 1B 00 1C */ stw r0, 0x1c(r27) /* 80289598 002864D8 7F E3 FB 78 */ mr r3, r31 /* 8028959C 002864DC 39 61 00 60 */ addi r11, r1, 0x60 -/* 802895A0 002864E0 48 0D 8C 79 */ bl func_80362218 +/* 802895A0 002864E0 48 0D 8C 79 */ bl _restgpr_25 /* 802895A4 002864E4 80 01 00 64 */ lwz r0, 0x64(r1) /* 802895A8 002864E8 7C 08 03 A6 */ mtlr r0 /* 802895AC 002864EC 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JUtility/JUTDbPrint.s b/asm/JUtility/JUTDbPrint.s index 5bece595fa..7a80beedf7 100644 --- a/asm/JUtility/JUTDbPrint.s +++ b/asm/JUtility/JUTDbPrint.s @@ -103,7 +103,7 @@ JUTDbPrint_NS_enter: /* 802E0288 002DD1C8 93 F9 00 00 */ stw r31, 0(r25) lbl_802E028C: /* 802E028C 002DD1CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E0290 002DD1D0 48 08 1F 89 */ bl func_80362218 +/* 802E0290 002DD1D0 48 08 1F 89 */ bl _restgpr_25 /* 802E0294 002DD1D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E0298 002DD1D8 7C 08 03 A6 */ mtlr r0 /* 802E029C 002DD1DC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index aca65411f9..87e5b4d791 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -1181,7 +1181,7 @@ lbl_802E2D68: /* 802E2D90 002DFCD0 48 00 4E A9 */ bl JUTConsole_NS_print lbl_802E2D94: /* 802E2D94 002DFCD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E2D98 002DFCD8 48 07 F4 81 */ bl func_80362218 +/* 802E2D98 002DFCD8 48 07 F4 81 */ bl _restgpr_25 /* 802E2D9C 002DFCDC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E2DA0 002DFCE0 7C 08 03 A6 */ mtlr r0 /* 802E2DA4 002DFCE4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1319,7 +1319,7 @@ JUTException_NS_readPad: /* 802E2F58 002DFE98 7C 08 02 A6 */ mflr r0 /* 802E2F5C 002DFE9C 90 01 03 A4 */ stw r0, 0x3a4(r1) /* 802E2F60 002DFEA0 39 61 03 A0 */ addi r11, r1, 0x3a0 -/* 802E2F64 002DFEA4 48 07 F2 5D */ bl func_803621C0 +/* 802E2F64 002DFEA4 48 07 F2 5D */ bl _savegpr_22 /* 802E2F68 002DFEA8 7C 7D 1B 78 */ mr r29, r3 /* 802E2F6C 002DFEAC 7C 99 23 78 */ mr r25, r4 /* 802E2F70 002DFEB0 7C B8 2B 78 */ mr r24, r5 @@ -1709,7 +1709,7 @@ JUTException_NS_printContext: /* 802E34C4 002E0404 7C 08 02 A6 */ mflr r0 /* 802E34C8 002E0408 90 01 00 44 */ stw r0, 0x44(r1) /* 802E34CC 002E040C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E34D0 002E0410 48 07 EC F1 */ bl func_803621C0 +/* 802E34D0 002E0410 48 07 EC F1 */ bl _savegpr_22 /* 802E34D4 002E0414 7C 79 1B 78 */ mr r25, r3 /* 802E34D8 002E0418 7C 9A 23 78 */ mr r26, r4 /* 802E34DC 002E041C 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/JUtility/JUTProcBar.s b/asm/JUtility/JUTProcBar.s index 6509b70d62..429a3ff56b 100644 --- a/asm/JUtility/JUTProcBar.s +++ b/asm/JUtility/JUTProcBar.s @@ -1801,7 +1801,7 @@ lbl_802E7304: /* 802E7324 002E4264 4B FF FA E9 */ bl heapBar lbl_802E7328: /* 802E7328 002E4268 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 802E732C 002E426C 48 07 AE ED */ bl func_80362218 +/* 802E732C 002E426C 48 07 AE ED */ bl _restgpr_25 /* 802E7330 002E4270 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 802E7334 002E4274 7C 08 03 A6 */ mtlr r0 /* 802E7338 002E4278 38 21 00 F0 */ addi r1, r1, 0xf0 diff --git a/asm/SComponent/c/cc/c_cc_s.s b/asm/SComponent/c/cc/c_cc_s.s index cfa3d4f549..fe532030ad 100644 --- a/asm/SComponent/c/cc/c_cc_s.s +++ b/asm/SComponent/c/cc/c_cc_s.s @@ -507,7 +507,7 @@ lbl_80265130: /* 8026513C 0026207C 7C 1C 00 40 */ cmplw r28, r0 /* 80265140 00262080 41 80 FE 44 */ blt lbl_80264F84 /* 80265144 00262084 39 61 00 30 */ addi r11, r1, 0x30 -/* 80265148 00262088 48 0F D0 D1 */ bl func_80362218 +/* 80265148 00262088 48 0F D0 D1 */ bl _restgpr_25 /* 8026514C 0026208C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80265150 00262090 7C 08 03 A6 */ mtlr r0 /* 80265154 00262094 38 21 00 30 */ addi r1, r1, 0x30 @@ -669,7 +669,7 @@ lbl_80265380: /* 80265384 002622C4 41 80 FE EC */ blt lbl_80265270 lbl_80265388: /* 80265388 002622C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026538C 002622CC 48 0F CE 8D */ bl func_80362218 +/* 8026538C 002622CC 48 0F CE 8D */ bl _restgpr_25 /* 80265390 002622D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80265394 002622D4 7C 08 03 A6 */ mtlr r0 /* 80265398 002622D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -835,7 +835,7 @@ cCcS_NS_SetCoCommonHitInf: /* 802655EC 0026252C 90 01 00 44 */ stw r0, 0x44(r1) /* 802655F0 00262530 DB E1 00 38 */ stfd f31, 0x38(r1) /* 802655F4 00262534 39 61 00 38 */ addi r11, r1, 0x38 -/* 802655F8 00262538 48 0F CB C9 */ bl func_803621C0 +/* 802655F8 00262538 48 0F CB C9 */ bl _savegpr_22 /* 802655FC 0026253C 7C 79 1B 78 */ mr r25, r3 /* 80265600 00262540 7C 9A 23 78 */ mr r26, r4 /* 80265604 00262544 7C BB 2B 78 */ mr r27, r5 @@ -1226,7 +1226,7 @@ lbl_80265B84: /* 80265B94 00262AD4 E3 A1 00 58 */ psq_l f29, 88(r1), 0, qr0 /* 80265B98 00262AD8 CB A1 00 50 */ lfd f29, 0x50(r1) /* 80265B9C 00262ADC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80265BA0 00262AE0 48 0F C6 79 */ bl func_80362218 +/* 80265BA0 00262AE0 48 0F C6 79 */ bl _restgpr_25 /* 80265BA4 00262AE4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80265BA8 00262AE8 7C 08 03 A6 */ mtlr r0 /* 80265BAC 00262AEC 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/SComponent/c/m3d/g/c_m3d_g_cyl.s b/asm/SComponent/c/m3d/g/c_m3d_g_cyl.s index 7cc9b631a3..9f50dbcda9 100644 --- a/asm/SComponent/c/m3d/g/c_m3d_g_cyl.s +++ b/asm/SComponent/c/m3d/g/c_m3d_g_cyl.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8026f0a8 -.global cM3dGCyl -cM3dGCyl: +.global __ct__8cM3dGCylFPC4cXyzff +__ct__8cM3dGCylFPC4cXyzff: /* 8026F0A8 0026BFE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8026F0AC 0026BFEC 7C 08 02 A6 */ mflr r0 /* 8026F0B0 0026BFF0 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/Z2AudioLib/Z2Audience.s b/asm/Z2AudioLib/Z2Audience.s index 9b4f65c053..8fe8d21982 100644 --- a/asm/Z2AudioLib/Z2Audience.s +++ b/asm/Z2AudioLib/Z2Audience.s @@ -1865,7 +1865,7 @@ lbl_802BD6E8: /* 802BD6E8 002BA628 7F C3 F3 78 */ mr r3, r30 lbl_802BD6EC: /* 802BD6EC 002BA62C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BD6F0 002BA630 48 0A 4B 29 */ bl func_80362218 +/* 802BD6F0 002BA630 48 0A 4B 29 */ bl _restgpr_25 /* 802BD6F4 002BA634 80 01 00 34 */ lwz r0, 0x34(r1) /* 802BD6F8 002BA638 7C 08 03 A6 */ mtlr r0 /* 802BD6FC 002BA63C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2AudioMgr.s b/asm/Z2AudioLib/Z2AudioMgr.s index 0a725f66e3..612207e9ee 100644 --- a/asm/Z2AudioLib/Z2AudioMgr.s +++ b/asm/Z2AudioLib/Z2AudioMgr.s @@ -807,7 +807,7 @@ lbl_802CDDA0: /* 802CDDAC 002CACEC 38 60 00 00 */ li r3, 0 lbl_802CDDB0: /* 802CDDB0 002CACF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CDDB4 002CACF4 48 09 44 65 */ bl func_80362218 +/* 802CDDB4 002CACF4 48 09 44 65 */ bl _restgpr_25 /* 802CDDB8 002CACF8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CDDBC 002CACFC 7C 08 03 A6 */ mtlr r0 /* 802CDDC0 002CAD00 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s index f92f28d21a..5607cdea19 100644 --- a/asm/Z2AudioLib/Z2Creature.s +++ b/asm/Z2AudioLib/Z2Creature.s @@ -1961,7 +1961,7 @@ lbl_802C1F3C: /* 802C2000 002BEF40 7C 08 02 A6 */ mflr r0 /* 802C2004 002BEF44 90 01 00 34 */ stw r0, 0x34(r1) /* 802C2008 002BEF48 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C200C 002BEF4C 48 0A 01 B9 */ bl func_803621C4 +/* 802C200C 002BEF4C 48 0A 01 B9 */ bl _savegpr_23 /* 802C2010 002BEF50 7C 77 1B 78 */ mr r23, r3 /* 802C2014 002BEF54 7C D8 33 78 */ mr r24, r6 /* 802C2018 002BEF58 7C F9 3B 78 */ mr r25, r7 @@ -2805,7 +2805,7 @@ lbl_802C2C5C: /* 802C2C64 002BFBA4 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 802C2C68 002BFBA8 CB C1 00 50 */ lfd f30, 0x50(r1) /* 802C2C6C 002BFBAC 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C2C70 002BFBB0 48 09 F5 A9 */ bl func_80362218 +/* 802C2C70 002BFBB0 48 09 F5 A9 */ bl _restgpr_25 /* 802C2C74 002BFBB4 80 01 00 74 */ lwz r0, 0x74(r1) /* 802C2C78 002BFBB8 7C 08 03 A6 */ mtlr r0 /* 802C2C7C 002BFBBC 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/Z2AudioLib/Z2FxLineMgr.s b/asm/Z2AudioLib/Z2FxLineMgr.s index 09c7d70d64..95b52a2d39 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr.s +++ b/asm/Z2AudioLib/Z2FxLineMgr.s @@ -20,7 +20,7 @@ Z2FxLineMgr_NS_initDataArc: /* 802BA800 002B7740 7C 08 02 A6 */ mflr r0 /* 802BA804 002B7744 90 01 00 54 */ stw r0, 0x54(r1) /* 802BA808 002B7748 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BA80C 002B774C 48 0A 79 B5 */ bl func_803621C0 +/* 802BA80C 002B774C 48 0A 79 B5 */ bl _savegpr_22 /* 802BA810 002B7750 7C 77 1B 78 */ mr r23, r3 /* 802BA814 002B7754 7C 98 23 78 */ mr r24, r4 /* 802BA818 002B7758 7C B6 2B 78 */ mr r22, r5 diff --git a/asm/Z2AudioLib/Z2SoundMgr.s b/asm/Z2AudioLib/Z2SoundMgr.s index de087a81d2..f8cddba6a2 100644 --- a/asm/Z2AudioLib/Z2SoundMgr.s +++ b/asm/Z2AudioLib/Z2SoundMgr.s @@ -529,7 +529,7 @@ lbl_802AA314: /* 802AA320 002A7260 41 80 FF 90 */ blt lbl_802AA2B0 lbl_802AA324: /* 802AA324 002A7264 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AA328 002A7268 48 0B 7E F1 */ bl func_80362218 +/* 802AA328 002A7268 48 0B 7E F1 */ bl _restgpr_25 /* 802AA32C 002A726C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AA330 002A7270 7C 08 03 A6 */ mtlr r0 /* 802AA334 002A7274 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2SoundObjMgr.s b/asm/Z2AudioLib/Z2SoundObjMgr.s index 8248f2c52d..e598117471 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr.s @@ -50,7 +50,7 @@ Z2SoundObjMgr_NS_searchEnemy: /* 802BF9B0 002BC8F0 DB A1 00 60 */ stfd f29, 0x60(r1) /* 802BF9B4 002BC8F4 F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 802BF9B8 002BC8F8 39 61 00 60 */ addi r11, r1, 0x60 -/* 802BF9BC 002BC8FC 48 0A 28 09 */ bl func_803621C4 +/* 802BF9BC 002BC8FC 48 0A 28 09 */ bl _savegpr_23 /* 802BF9C0 002BC900 7C 77 1B 78 */ mr r23, r3 /* 802BF9C4 002BC904 38 00 00 00 */ li r0, 0 /* 802BF9C8 002BC908 98 03 00 1B */ stb r0, 0x1b(r3) diff --git a/asm/Z2AudioLib/Z2SoundObject.s b/asm/Z2AudioLib/Z2SoundObject.s index 8135f398de..213839f3fd 100644 --- a/asm/Z2AudioLib/Z2SoundObject.s +++ b/asm/Z2AudioLib/Z2SoundObject.s @@ -1686,7 +1686,7 @@ Z2SoundObjAnime_NS_startSoundInner: /* 802BF66C 002BC5AC DB E1 00 50 */ stfd f31, 0x50(r1) /* 802BF670 002BC5B0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 802BF674 002BC5B4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BF678 002BC5B8 48 0A 2B 4D */ bl func_803621C4 +/* 802BF678 002BC5B8 48 0A 2B 4D */ bl _savegpr_23 /* 802BF67C 002BC5BC 7C 78 1B 78 */ mr r24, r3 /* 802BF680 002BC5C0 7C 99 23 78 */ mr r25, r4 /* 802BF684 002BC5C4 FF E0 08 90 */ fmr f31, f1 diff --git a/asm/c/c_dylink.s b/asm/c/c_dylink.s index c659bbc9cd..f96366e95b 100644 --- a/asm/c/c_dylink.s +++ b/asm/c/c_dylink.s @@ -9,7 +9,7 @@ cCc_Init: /* 800183E0 00015320 7C 08 02 A6 */ mflr r0 /* 800183E4 00015324 90 01 00 34 */ stw r0, 0x34(r1) /* 800183E8 00015328 39 61 00 30 */ addi r11, r1, 0x30 -/* 800183EC 0001532C 48 34 9D D9 */ bl func_803621C4 +/* 800183EC 0001532C 48 34 9D D9 */ bl _savegpr_23 /* 800183F0 00015330 4B FF 69 FD */ bl mDoExt_getArchiveHeap /* 800183F4 00015334 7C 64 1B 78 */ mr r4, r3 /* 800183F8 00015338 3C 60 00 01 */ lis r3, 0x00008820@ha diff --git a/asm/clib.s b/asm/clib.s index c0f6e2e9fe..f1f1a3a407 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -545,12 +545,12 @@ func_803621B8: func_803621BC: /* 803621BC 0035F0FC 92 AB FF D4 */ stw r21, -0x2c(r11) -.global func_803621C0 -func_803621C0: +.global _savegpr_22 +_savegpr_22: /* 803621C0 0035F100 92 CB FF D8 */ stw r22, -0x28(r11) -.global func_803621C4 -func_803621C4: +.global _savegpr_23 +_savegpr_23: /* 803621C4 0035F104 92 EB FF DC */ stw r23, -0x24(r11) .global _savegpr_24 @@ -626,8 +626,6 @@ _restgpr_24: .global _restgpr_25 _restgpr_25: -.global func_80362218 -func_80362218: /* 80362218 0035F158 83 2B FF E4 */ lwz r25, -0x1c(r11) .global _restgpr_26 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index ada0e96d8f..3a09e7064f 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -1305,7 +1305,7 @@ daNpcT_chkPassed: /* 80146990 001438D0 7C 08 02 A6 */ mflr r0 /* 80146994 001438D4 90 01 00 84 */ stw r0, 0x84(r1) /* 80146998 001438D8 39 61 00 80 */ addi r11, r1, 0x80 -/* 8014699C 001438DC 48 21 B8 25 */ bl func_803621C0 +/* 8014699C 001438DC 48 21 B8 25 */ bl _savegpr_22 /* 801469A0 001438E0 7C 78 1B 78 */ mr r24, r3 /* 801469A4 001438E4 7C 99 23 78 */ mr r25, r4 /* 801469A8 001438E8 7C BA 2B 78 */ mr r26, r5 @@ -2540,7 +2540,7 @@ lbl_80147BC0: /* 80147C18 00144B58 3B BD 00 0C */ addi r29, r29, 0xc /* 80147C1C 00144B5C 41 80 FE 7C */ blt lbl_80147A98 /* 80147C20 00144B60 39 61 00 70 */ addi r11, r1, 0x70 -/* 80147C24 00144B64 48 21 A5 F5 */ bl func_80362218 +/* 80147C24 00144B64 48 21 A5 F5 */ bl _restgpr_25 /* 80147C28 00144B68 80 01 00 74 */ lwz r0, 0x74(r1) /* 80147C2C 00144B6C 7C 08 03 A6 */ mtlr r0 /* 80147C30 00144B70 38 21 00 70 */ addi r1, r1, 0x70 @@ -2771,7 +2771,7 @@ lbl_80147F84: /* 80147F84 00144EC4 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 80147F88 00144EC8 CB E1 00 50 */ lfd f31, 0x50(r1) /* 80147F8C 00144ECC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80147F90 00144ED0 48 21 A2 89 */ bl func_80362218 +/* 80147F90 00144ED0 48 21 A2 89 */ bl _restgpr_25 /* 80147F94 00144ED4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80147F98 00144ED8 7C 08 03 A6 */ mtlr r0 /* 80147F9C 00144EDC 38 21 00 60 */ addi r1, r1, 0x60 @@ -3398,7 +3398,7 @@ lbl_80148828: /* 80148880 001457C0 DB C1 00 40 */ stfd f30, 0x40(r1) /* 80148884 001457C4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 80148888 001457C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014888C 001457CC 48 21 99 35 */ bl func_803621C0 +/* 8014888C 001457CC 48 21 99 35 */ bl _savegpr_22 /* 80148890 001457D0 7C 77 1B 78 */ mr r23, r3 /* 80148894 001457D4 7C 98 23 78 */ mr r24, r4 /* 80148898 001457D8 7C B9 2B 78 */ mr r25, r5 @@ -5048,7 +5048,7 @@ lbl_8014A02C: /* 8014A03C 00146F7C E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 8014A040 00146F80 CB C1 00 70 */ lfd f30, 0x70(r1) /* 8014A044 00146F84 39 61 00 70 */ addi r11, r1, 0x70 -/* 8014A048 00146F88 48 21 81 D1 */ bl func_80362218 +/* 8014A048 00146F88 48 21 81 D1 */ bl _restgpr_25 /* 8014A04C 00146F8C 80 01 00 94 */ lwz r0, 0x94(r1) /* 8014A050 00146F90 7C 08 03 A6 */ mtlr r0 /* 8014A054 00146F94 38 21 00 90 */ addi r1, r1, 0x90 @@ -7640,7 +7640,7 @@ lbl_8014C5A4: lbl_8014C5C4: /* 8014C5C4 00149504 7F C3 F3 78 */ mr r3, r30 /* 8014C5C8 00149508 39 61 00 30 */ addi r11, r1, 0x30 -/* 8014C5CC 0014950C 48 21 5C 4D */ bl func_80362218 +/* 8014C5CC 0014950C 48 21 5C 4D */ bl _restgpr_25 /* 8014C5D0 00149510 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014C5D4 00149514 7C 08 03 A6 */ mtlr r0 /* 8014C5D8 00149518 38 21 00 30 */ addi r1, r1, 0x30 @@ -8914,7 +8914,7 @@ lbl_8014D7DC: /* 8014D7E4 0014A724 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 8014D7E8 0014A728 CB C1 00 50 */ lfd f30, 0x50(r1) /* 8014D7EC 0014A72C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8014D7F0 0014A730 48 21 4A 29 */ bl func_80362218 +/* 8014D7F0 0014A730 48 21 4A 29 */ bl _restgpr_25 /* 8014D7F4 0014A734 80 01 00 74 */ lwz r0, 0x74(r1) /* 8014D7F8 0014A738 7C 08 03 A6 */ mtlr r0 /* 8014D7FC 0014A73C 38 21 00 70 */ addi r1, r1, 0x70 @@ -13075,7 +13075,7 @@ lbl_80151178: /* 8015135C 0014E29C DB E1 00 E0 */ stfd f31, 0xe0(r1) /* 80151360 0014E2A0 F3 E1 00 E8 */ psq_st f31, 232(r1), 0, qr0 /* 80151364 0014E2A4 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80151368 0014E2A8 48 21 0E 59 */ bl func_803621C0 +/* 80151368 0014E2A8 48 21 0E 59 */ bl _savegpr_22 /* 8015136C 0014E2AC 7C 78 1B 78 */ mr r24, r3 /* 80151370 0014E2B0 7C D9 33 78 */ mr r25, r6 /* 80151374 0014E2B4 7C FA 3B 78 */ mr r26, r7 @@ -13285,7 +13285,7 @@ daNpcF_Lookat_c_NS_initCalc: /* 8015165C 0014E59C DB C1 00 B0 */ stfd f30, 0xb0(r1) /* 80151660 0014E5A0 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, qr0 /* 80151664 0014E5A4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80151668 0014E5A8 48 21 0B 5D */ bl func_803621C4 +/* 80151668 0014E5A8 48 21 0B 5D */ bl _savegpr_23 /* 8015166C 0014E5AC 7C 7A 1B 78 */ mr r26, r3 /* 80151670 0014E5B0 7C 9F 23 78 */ mr r31, r4 /* 80151674 0014E5B4 7C DB 33 78 */ mr r27, r6 @@ -17837,7 +17837,7 @@ lbl_80155818: lbl_80155838: /* 80155838 00152778 7F C3 F3 78 */ mr r3, r30 /* 8015583C 0015277C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80155840 00152780 48 20 C9 D9 */ bl func_80362218 +/* 80155840 00152780 48 20 C9 D9 */ bl _restgpr_25 /* 80155844 00152784 80 01 00 34 */ lwz r0, 0x34(r1) /* 80155848 00152788 7C 08 03 A6 */ mtlr r0 /* 8015584C 0015278C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/a/d_a_obj.s b/asm/d/a/d_a_obj.s index c377c79246..ac50a7ea8e 100644 --- a/asm/d/a/d_a_obj.s +++ b/asm/d/a/d_a_obj.s @@ -677,7 +677,7 @@ lbl_800379F8: /* 80037A30 00034970 48 27 3F 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_80037A34: /* 80037A34 00034974 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037A38 00034978 48 32 A7 E1 */ bl func_80362218 +/* 80037A38 00034978 48 32 A7 E1 */ bl _restgpr_25 /* 80037A3C 0003497C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80037A40 00034980 7C 08 03 A6 */ mtlr r0 /* 80037A44 00034984 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/a/npc/d_a_npc_cd.s b/asm/d/a/npc/d_a_npc_cd.s index c686af4dfe..b63e61f1b7 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -1502,7 +1502,7 @@ daNpcCd_HIO_c: /* 80157604 00154544 7C 08 02 A6 */ mflr r0 /* 80157608 00154548 90 01 00 34 */ stw r0, 0x34(r1) /* 8015760C 0015454C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80157610 00154550 48 20 AB B1 */ bl func_803621C0 +/* 80157610 00154550 48 20 AB B1 */ bl _savegpr_22 /* 80157614 00154554 7C 7E 1B 78 */ mr r30, r3 /* 80157618 00154558 3C 60 80 3B */ lis r3, lbl_803B3B80@ha /* 8015761C 0015455C 3B E3 3B 80 */ addi r31, r3, lbl_803B3B80@l diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index 4e41c53e16..f64877835d 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -2805,7 +2805,7 @@ daNpcCd2_HIO_c: /* 8015A4DC 0015741C 7C 08 02 A6 */ mflr r0 /* 8015A4E0 00157420 90 01 00 34 */ stw r0, 0x34(r1) /* 8015A4E4 00157424 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015A4E8 00157428 48 20 7C D9 */ bl func_803621C0 +/* 8015A4E8 00157428 48 20 7C D9 */ bl _savegpr_22 /* 8015A4EC 0015742C 7C 7E 1B 78 */ mr r30, r3 /* 8015A4F0 00157430 3C 60 80 3B */ lis r3, lbl_803B61C0@ha /* 8015A4F4 00157434 3B E3 61 C0 */ addi r31, r3, lbl_803B61C0@l diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index 23df41c91f..4a8c4e9027 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -1700,7 +1700,7 @@ dBgS_NS_MoveBgCrrPos: /* 80075778 000726B8 7C 08 02 A6 */ mflr r0 /* 8007577C 000726BC 90 01 00 34 */ stw r0, 0x34(r1) /* 80075780 000726C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075784 000726C4 48 2E CA 3D */ bl func_803621C0 +/* 80075784 000726C4 48 2E CA 3D */ bl _savegpr_22 /* 80075788 000726C8 7C 7A 1B 78 */ mr r26, r3 /* 8007578C 000726CC 7C 9B 23 78 */ mr r27, r4 /* 80075790 000726D0 7C BC 2B 78 */ mr r28, r5 @@ -1957,7 +1957,7 @@ lbl_80075AC0: /* 80075B24 00072A64 7F E9 FB 78 */ mr r9, r31 /* 80075B28 00072A68 4B FF FF 7D */ bl dBgS_MoveBGProc_RotY /* 80075B2C 00072A6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075B30 00072A70 48 2E C6 E9 */ bl func_80362218 +/* 80075B30 00072A70 48 2E C6 E9 */ bl _restgpr_25 /* 80075B34 00072A74 80 01 00 34 */ lwz r0, 0x34(r1) /* 80075B38 00072A78 7C 08 03 A6 */ mtlr r0 /* 80075B3C 00072A7C 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 5b8b9e4ab9..68cba8b0ca 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -2911,7 +2911,7 @@ dBgW_NS_RwgWallCorrect: /* 8007BA84 000789C4 DB 01 00 70 */ stfd f24, 0x70(r1) /* 8007BA88 000789C8 F3 01 00 78 */ psq_st f24, 120(r1), 0, qr0 /* 8007BA8C 000789CC 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007BA90 000789D0 48 2E 67 31 */ bl func_803621C0 +/* 8007BA90 000789D0 48 2E 67 31 */ bl _savegpr_22 /* 8007BA94 000789D4 7C 77 1B 78 */ mr r23, r3 /* 8007BA98 000789D8 7C 98 23 78 */ mr r24, r4 /* 8007BA9C 000789DC 3B 80 00 00 */ li r28, 0 @@ -3938,7 +3938,7 @@ lbl_8007C8F8: /* 8007C95C 0007989C DA E1 00 70 */ stfd f23, 0x70(r1) /* 8007C960 000798A0 F2 E1 00 78 */ psq_st f23, 120(r1), 0, qr0 /* 8007C964 000798A4 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007C968 000798A8 48 2E 58 5D */ bl func_803621C4 +/* 8007C968 000798A8 48 2E 58 5D */ bl _savegpr_23 /* 8007C96C 000798AC 7C 78 1B 78 */ mr r24, r3 /* 8007C970 000798B0 7C 99 23 78 */ mr r25, r4 /* 8007C974 000798B4 38 00 00 00 */ li r0, 0 @@ -5179,7 +5179,7 @@ dBgW_NS_RwgSphChk: /* 8007DB24 0007AA64 7C 08 02 A6 */ mflr r0 /* 8007DB28 0007AA68 90 01 00 74 */ stw r0, 0x74(r1) /* 8007DB2C 0007AA6C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8007DB30 0007AA70 48 2E 46 95 */ bl func_803621C4 +/* 8007DB30 0007AA70 48 2E 46 95 */ bl _savegpr_23 /* 8007DB34 0007AA74 7C 78 1B 78 */ mr r24, r3 /* 8007DB38 0007AA78 7C B9 2B 78 */ mr r25, r5 /* 8007DB3C 0007AA7C 7C DA 33 78 */ mr r26, r6 @@ -5360,7 +5360,7 @@ lbl_8007DDB4: /* 8007DDC4 0007AD04 7F C3 F3 78 */ mr r3, r30 lbl_8007DDC8: /* 8007DDC8 0007AD08 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007DDCC 0007AD0C 48 2E 44 4D */ bl func_80362218 +/* 8007DDCC 0007AD0C 48 2E 44 4D */ bl _restgpr_25 /* 8007DDD0 0007AD10 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007DDD4 0007AD14 7C 08 03 A6 */ mtlr r0 /* 8007DDD8 0007AD18 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index 5b478e4af6..c3a4c9b1b9 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -846,7 +846,7 @@ lbl_80076A78: /* 80076A8C 000739CC E3 C1 01 78 */ psq_l f30, 376(r1), 0, qr0 /* 80076A90 000739D0 CB C1 01 70 */ lfd f30, 0x170(r1) /* 80076A94 000739D4 39 61 01 70 */ addi r11, r1, 0x170 -/* 80076A98 000739D8 48 2E B7 81 */ bl func_80362218 +/* 80076A98 000739D8 48 2E B7 81 */ bl _restgpr_25 /* 80076A9C 000739DC 80 01 01 94 */ lwz r0, 0x194(r1) /* 80076AA0 000739E0 7C 08 03 A6 */ mtlr r0 /* 80076AA4 000739E4 38 21 01 90 */ addi r1, r1, 0x190 diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index 5212c9c7f9..dae4840792 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -287,7 +287,7 @@ lbl_8007EAE8: /* 8007EB0C 0007BA4C 38 60 00 01 */ li r3, 1 lbl_8007EB10: /* 8007EB10 0007BA50 39 61 00 40 */ addi r11, r1, 0x40 -/* 8007EB14 0007BA54 48 2E 37 05 */ bl func_80362218 +/* 8007EB14 0007BA54 48 2E 37 05 */ bl _restgpr_25 /* 8007EB18 0007BA58 80 01 00 44 */ lwz r0, 0x44(r1) /* 8007EB1C 0007BA5C 7C 08 03 A6 */ mtlr r0 /* 8007EB20 0007BA60 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/bright/d_bright_check.s b/asm/d/bright/d_bright_check.s index ee500ab68f..404ad20157 100644 --- a/asm/d/bright/d_bright_check.s +++ b/asm/d/bright/d_bright_check.s @@ -90,7 +90,7 @@ dBrightCheck_c_NS_screenSet: /* 8019303C 0018FF7C DB E1 00 50 */ stfd f31, 0x50(r1) /* 80193040 0018FF80 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 80193044 0018FF84 39 61 00 50 */ addi r11, r1, 0x50 -/* 80193048 0018FF88 48 1C F1 79 */ bl func_803621C0 +/* 80193048 0018FF88 48 1C F1 79 */ bl _savegpr_22 /* 8019304C 0018FF8C 7C 7E 1B 78 */ mr r30, r3 /* 80193050 0018FF90 3C 60 80 39 */ lis r3, lbl_80394910@ha /* 80193054 0018FF94 3B E3 49 10 */ addi r31, r3, lbl_80394910@l diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index 0878d6cfd5..fb982ee3b9 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -321,7 +321,7 @@ lbl_80086308: /* 80086344 00083284 4E 80 04 21 */ bctrl lbl_80086348: /* 80086348 00083288 39 61 00 30 */ addi r11, r1, 0x30 -/* 8008634C 0008328C 48 2D BE CD */ bl func_80362218 +/* 8008634C 0008328C 48 2D BE CD */ bl _restgpr_25 /* 80086350 00083290 80 01 00 34 */ lwz r0, 0x34(r1) /* 80086354 00083294 7C 08 03 A6 */ mtlr r0 /* 80086358 00083298 38 21 00 30 */ addi r1, r1, 0x30 @@ -598,7 +598,7 @@ lbl_80086724: /* 80086734 00083674 E3 A1 00 68 */ psq_l f29, 104(r1), 0, qr0 /* 80086738 00083678 CB A1 00 60 */ lfd f29, 0x60(r1) /* 8008673C 0008367C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086740 00083680 48 2D BA D9 */ bl func_80362218 +/* 80086740 00083680 48 2D BA D9 */ bl _restgpr_25 /* 80086744 00083684 80 01 00 94 */ lwz r0, 0x94(r1) /* 80086748 00083688 7C 08 03 A6 */ mtlr r0 /* 8008674C 0008368C 38 21 00 90 */ addi r1, r1, 0x90 @@ -1043,7 +1043,7 @@ dCcS_NS_ChkCamera: /* 80086D94 00083CD4 90 01 00 94 */ stw r0, 0x94(r1) /* 80086D98 00083CD8 DB E1 00 88 */ stfd f31, 0x88(r1) /* 80086D9C 00083CDC 39 61 00 88 */ addi r11, r1, 0x88 -/* 80086DA0 00083CE0 48 2D B4 25 */ bl func_803621C4 +/* 80086DA0 00083CE0 48 2D B4 25 */ bl _savegpr_23 /* 80086DA4 00083CE4 7C 79 1B 78 */ mr r25, r3 /* 80086DA8 00083CE8 7C 97 23 78 */ mr r23, r4 /* 80086DAC 00083CEC 7C B8 2B 78 */ mr r24, r5 diff --git a/asm/d/cc/d_cc_uty.s b/asm/d/cc/d_cc_uty.s index df4f085e0a..950ee99014 100644 --- a/asm/d/cc/d_cc_uty.s +++ b/asm/d/cc/d_cc_uty.s @@ -1013,7 +1013,7 @@ lbl_80088108: /* 80088114 00085054 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 80088118 00085058 CB C1 00 40 */ lfd f30, 0x40(r1) /* 8008811C 0008505C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80088120 00085060 48 2D A0 F9 */ bl func_80362218 +/* 80088120 00085060 48 2D A0 F9 */ bl _restgpr_25 /* 80088124 00085064 80 01 00 64 */ lwz r0, 0x64(r1) /* 80088128 00085068 7C 08 03 A6 */ mtlr r0 /* 8008812C 0008506C 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/cc/mass/d_cc_mass_s.s b/asm/d/cc/mass/d_cc_mass_s.s index cddebb0af3..ec3534ea99 100644 --- a/asm/d/cc/mass/d_cc_mass_s.s +++ b/asm/d/cc/mass/d_cc_mass_s.s @@ -428,7 +428,7 @@ lbl_8008585C: /* 800858B8 000827F8 DB E1 00 70 */ stfd f31, 0x70(r1) /* 800858BC 000827FC F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 800858C0 00082800 39 61 00 70 */ addi r11, r1, 0x70 -/* 800858C4 00082804 48 2D C9 01 */ bl func_803621C4 +/* 800858C4 00082804 48 2D C9 01 */ bl _savegpr_23 /* 800858C8 00082808 7C 78 1B 78 */ mr r24, r3 /* 800858CC 0008280C 7C 99 23 78 */ mr r25, r4 /* 800858D0 00082810 7C BA 2B 78 */ mr r26, r5 @@ -813,7 +813,7 @@ lbl_80085E4C: /* 80085E4C 00082D8C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80085E50 00082D90 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80085E54 00082D94 39 61 00 30 */ addi r11, r1, 0x30 -/* 80085E58 00082D98 48 2D C3 C1 */ bl func_80362218 +/* 80085E58 00082D98 48 2D C3 C1 */ bl _restgpr_25 /* 80085E5C 00082D9C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80085E60 00082DA0 7C 08 03 A6 */ mtlr r0 /* 80085E64 00082DA4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index 99cadf40b2..adafbe292f 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -3654,7 +3654,7 @@ lbl_8002E4A0: /* 8002E4AC 0002B3EC 41 80 FF C0 */ blt lbl_8002E46C /* 8002E4B0 0002B3F0 7F 63 DB 78 */ mr r3, r27 /* 8002E4B4 0002B3F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002E4B8 0002B3F8 48 33 3D 61 */ bl func_80362218 +/* 8002E4B8 0002B3F8 48 33 3D 61 */ bl _restgpr_25 /* 8002E4BC 0002B3FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8002E4C0 0002B400 7C 08 03 A6 */ mtlr r0 /* 8002E4C4 0002B404 38 21 00 30 */ addi r1, r1, 0x30 @@ -4202,7 +4202,7 @@ lbl_8002EC24: /* 8002EC34 0002BB74 4E 80 04 21 */ bctrl /* 8002EC38 0002BB78 81 41 00 00 */ lwz r10, 0(r1) /* 8002EC3C 0002BB7C 7D 4B 53 78 */ mr r11, r10 -/* 8002EC40 0002BB80 48 33 35 D9 */ bl func_80362218 +/* 8002EC40 0002BB80 48 33 35 D9 */ bl _restgpr_25 /* 8002EC44 0002BB84 80 0A 00 04 */ lwz r0, 4(r10) /* 8002EC48 0002BB88 7C 08 03 A6 */ mtlr r0 /* 8002EC4C 0002BB8C 7D 41 53 78 */ mr r1, r10 @@ -4316,7 +4316,7 @@ lbl_8002EDC0: lbl_8002EDC4: /* 8002EDC4 0002BD04 81 41 00 00 */ lwz r10, 0(r1) /* 8002EDC8 0002BD08 7D 4B 53 78 */ mr r11, r10 -/* 8002EDCC 0002BD0C 48 33 34 4D */ bl func_80362218 +/* 8002EDCC 0002BD0C 48 33 34 4D */ bl _restgpr_25 /* 8002EDD0 0002BD10 80 0A 00 04 */ lwz r0, 4(r10) /* 8002EDD4 0002BD14 7C 08 03 A6 */ mtlr r0 /* 8002EDD8 0002BD18 7D 41 53 78 */ mr r1, r10 diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index e4661c64c1..079153831a 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -3522,7 +3522,7 @@ lbl_80162CC8: /* 80162D18 0015FC58 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 80162D1C 0015FC5C CB E1 00 90 */ lfd f31, 0x90(r1) /* 80162D20 0015FC60 39 61 00 90 */ addi r11, r1, 0x90 -/* 80162D24 0015FC64 48 1F F4 F5 */ bl func_80362218 +/* 80162D24 0015FC64 48 1F F4 F5 */ bl _restgpr_25 /* 80162D28 0015FC68 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80162D2C 0015FC6C 7C 08 03 A6 */ mtlr r0 /* 80162D30 0015FC70 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -4603,7 +4603,7 @@ lbl_80163C10: lbl_80163C1C: /* 80163C1C 00160B5C 7F 83 E3 78 */ mr r3, r28 /* 80163C20 00160B60 39 61 00 40 */ addi r11, r1, 0x40 -/* 80163C24 00160B64 48 1F E5 F5 */ bl func_80362218 +/* 80163C24 00160B64 48 1F E5 F5 */ bl _restgpr_25 /* 80163C28 00160B68 80 01 00 44 */ lwz r0, 0x44(r1) /* 80163C2C 00160B6C 7C 08 03 A6 */ mtlr r0 /* 80163C30 00160B70 38 21 00 40 */ addi r1, r1, 0x40 @@ -5680,7 +5680,7 @@ lbl_80164B48: /* 80164B48 00161A88 7F E3 FB 78 */ mr r3, r31 lbl_80164B4C: /* 80164B4C 00161A8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80164B50 00161A90 48 1F D6 C9 */ bl func_80362218 +/* 80164B50 00161A90 48 1F D6 C9 */ bl _restgpr_25 /* 80164B54 00161A94 80 01 00 34 */ lwz r0, 0x34(r1) /* 80164B58 00161A98 7C 08 03 A6 */ mtlr r0 /* 80164B5C 00161A9C 38 21 00 30 */ addi r1, r1, 0x30 @@ -7673,7 +7673,7 @@ dCamera_c_NS_bumpCheck: /* 801667A0 001636E0 DB 21 06 00 */ stfd f25, 0x600(r1) /* 801667A4 001636E4 F3 21 06 08 */ psq_st f25, 1544(r1), 0, qr0 /* 801667A8 001636E8 39 61 06 00 */ addi r11, r1, 0x600 -/* 801667AC 001636EC 48 1F BA 15 */ bl func_803621C0 +/* 801667AC 001636EC 48 1F BA 15 */ bl _savegpr_22 /* 801667B0 001636F0 7C 7C 1B 78 */ mr r28, r3 /* 801667B4 001636F4 7C 9D 23 78 */ mr r29, r4 /* 801667B8 001636F8 3B E0 00 00 */ li r31, 0 @@ -8818,7 +8818,7 @@ lbl_80167860: /* 8016786C 001647AC 38 81 03 10 */ addi r4, r1, 0x310 /* 80167870 001647B0 FC 20 E8 90 */ fmr f1, f29 /* 80167874 001647B4 FC 40 E0 90 */ fmr f2, f28 -/* 80167878 001647B8 48 10 78 31 */ bl cM3dGCyl +/* 80167878 001647B8 48 10 78 31 */ bl __ct__8cM3dGCylFPC4cXyzff /* 8016787C 001647BC 38 61 03 AC */ addi r3, r1, 0x3ac /* 80167880 001647C0 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80167884 001647C4 38 A1 03 94 */ addi r5, r1, 0x394 @@ -11210,7 +11210,7 @@ lbl_80169B10: /* 80169B40 00166A80 4B E9 F6 45 */ bl cXyz_NS_dtor lbl_80169B44: /* 80169B44 00166A84 38 61 00 CC */ addi r3, r1, 0xcc -/* 80169B48 00166A88 48 01 8F 01 */ bl cSAngle +/* 80169B48 00166A88 48 01 8F 01 */ bl __ct__7cSAngleFv /* 80169B4C 00166A8C 7F E3 FB 78 */ mr r3, r31 /* 80169B50 00166A90 3C 80 00 10 */ lis r4, 0x10 /* 80169B54 00166A94 48 01 8E 2D */ bl dCamera_c_NS_chkFlag @@ -12913,7 +12913,7 @@ lbl_8016B480: /* 8016B484 001683C4 90 1F 03 FC */ stw r0, 0x3fc(r31) lbl_8016B488: /* 8016B488 001683C8 38 61 00 BC */ addi r3, r1, 0xbc -/* 8016B48C 001683CC 48 01 75 BD */ bl cSAngle +/* 8016B48C 001683CC 48 01 75 BD */ bl __ct__7cSAngleFv /* 8016B490 001683D0 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016B494 001683D4 48 01 75 75 */ bl cSGlobe_NS_V_X1_ /* 8016B498 001683D8 48 10 5C 89 */ bl cSAngle_NS_Cos @@ -13294,7 +13294,7 @@ lbl_8016B9B8: /* 8016BA24 00168964 4B EC 4A ED */ bl cSAngle_NS_dtor lbl_8016BA28: /* 8016BA28 00168968 38 61 00 B8 */ addi r3, r1, 0xb8 -/* 8016BA2C 0016896C 48 01 70 1D */ bl cSAngle +/* 8016BA2C 0016896C 48 01 70 1D */ bl __ct__7cSAngleFv /* 8016BA30 00168970 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 8016BA34 00168974 41 82 00 90 */ beq lbl_8016BAC4 /* 8016BA38 00168978 56 40 06 3F */ clrlwi. r0, r18, 0x18 @@ -16273,7 +16273,7 @@ lbl_8016E4EC: /* 8016E5AC 0016B4EC DA 21 14 A0 */ stfd f17, 0x14a0(r1) /* 8016E5B0 0016B4F0 12 21 00 0E */ psq_stx f17, r1, r0, 0, qr0 /* 8016E5B4 0016B4F4 39 61 14 A0 */ addi r11, r1, 0x14a0 -/* 8016E5B8 0016B4F8 48 1F 3C 09 */ bl func_803621C0 +/* 8016E5B8 0016B4F8 48 1F 3C 09 */ bl _savegpr_22 /* 8016E5BC 0016B4FC 7C 7F 1B 78 */ mr r31, r3 /* 8016E5C0 0016B500 7C 9C 23 78 */ mr r28, r4 /* 8016E5C4 0016B504 38 7F 0A EC */ addi r3, r31, 0xaec @@ -16636,7 +16636,7 @@ lbl_8016EAD8: /* 8016EB0C 0016BA4C 28 00 00 00 */ cmplwi r0, 0 /* 8016EB10 0016BA50 40 82 17 C4 */ bne lbl_801702D4 /* 8016EB14 0016BA54 38 61 02 34 */ addi r3, r1, 0x234 -/* 8016EB18 0016BA58 48 01 3F 31 */ bl cSAngle +/* 8016EB18 0016BA58 48 01 3F 31 */ bl __ct__7cSAngleFv /* 8016EB1C 0016BA5C 38 61 14 54 */ addi r3, r1, 0x1454 /* 8016EB20 0016BA60 4B EA 3A BD */ bl cXyz_NS_ctor /* 8016EB24 0016BA64 38 61 11 B4 */ addi r3, r1, 0x11b4 @@ -17036,9 +17036,9 @@ lbl_8016F114: /* 8016F11C 0016C05C 90 1F 04 30 */ stw r0, 0x430(r31) lbl_8016F120: /* 8016F120 0016C060 38 61 02 30 */ addi r3, r1, 0x230 -/* 8016F124 0016C064 48 01 39 25 */ bl cSAngle +/* 8016F124 0016C064 48 01 39 25 */ bl __ct__7cSAngleFv /* 8016F128 0016C068 38 61 02 2C */ addi r3, r1, 0x22c -/* 8016F12C 0016C06C 48 01 39 1D */ bl cSAngle +/* 8016F12C 0016C06C 48 01 39 1D */ bl __ct__7cSAngleFv /* 8016F130 0016C070 C0 3F 04 44 */ lfs f1, 0x444(r31) /* 8016F134 0016C074 C0 02 9E 28 */ lfs f0, lbl_80453828-_SDA2_BASE_(r2) /* 8016F138 0016C078 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -17518,7 +17518,7 @@ lbl_8016F6FC: /* 8016F870 0016C7B0 38 80 FF FF */ li r4, -1 /* 8016F874 0016C7B4 4B EC 0C 9D */ bl cSAngle_NS_dtor /* 8016F878 0016C7B8 38 61 02 20 */ addi r3, r1, 0x220 -/* 8016F87C 0016C7BC 48 01 31 CD */ bl cSAngle +/* 8016F87C 0016C7BC 48 01 31 CD */ bl __ct__7cSAngleFv /* 8016F880 0016C7C0 C0 02 9E 14 */ lfs f0, lbl_80453814-_SDA2_BASE_(r2) /* 8016F884 0016C7C4 C0 3F 04 48 */ lfs f1, 0x448(r31) /* 8016F888 0016C7C8 FC 00 08 00 */ fcmpu cr0, f0, f1 @@ -17585,7 +17585,7 @@ lbl_8016F96C: /* 8016F970 0016C8B0 38 81 02 20 */ addi r4, r1, 0x220 /* 8016F974 0016C8B4 4B F2 00 E5 */ bl cSGlobe_NS_V /* 8016F978 0016C8B8 38 61 02 1C */ addi r3, r1, 0x21c -/* 8016F97C 0016C8BC 48 01 30 CD */ bl cSAngle +/* 8016F97C 0016C8BC 48 01 30 CD */ bl __ct__7cSAngleFv /* 8016F980 0016C8C0 7F 43 D3 78 */ mr r3, r26 /* 8016F984 0016C8C4 48 01 31 55 */ bl daPy_py_c_NS_checkRide /* 8016F988 0016C8C8 28 03 00 00 */ cmplwi r3, 0 @@ -17787,7 +17787,7 @@ lbl_8016FC54: /* 8016FC7C 0016CBBC 4B F1 EC 19 */ bl cSGlobe_NS_U lbl_8016FC80: /* 8016FC80 0016CBC0 38 61 02 18 */ addi r3, r1, 0x218 -/* 8016FC84 0016CBC4 48 01 2D C5 */ bl cSAngle +/* 8016FC84 0016CBC4 48 01 2D C5 */ bl __ct__7cSAngleFv /* 8016FC88 0016CBC8 3A E0 00 00 */ li r23, 0 /* 8016FC8C 0016CBCC 38 61 13 D0 */ addi r3, r1, 0x13d0 /* 8016FC90 0016CBD0 3C 80 80 43 */ lis r4, lbl_80430CF4@ha @@ -21139,7 +21139,7 @@ lbl_80172EC8: /* 80172F10 0016FE50 38 80 FF FF */ li r4, -1 /* 80172F14 0016FE54 4B E9 62 71 */ bl cXyz_NS_dtor /* 80172F18 0016FE58 38 61 02 04 */ addi r3, r1, 0x204 -/* 80172F1C 0016FE5C 48 00 FB 2D */ bl cSAngle +/* 80172F1C 0016FE5C 48 00 FB 2D */ bl __ct__7cSAngleFv /* 80172F20 0016FE60 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80172F24 0016FE64 2C 00 00 00 */ cmpwi r0, 0 /* 80172F28 0016FE68 41 82 00 2C */ beq lbl_80172F54 @@ -21276,7 +21276,7 @@ lbl_801730D8: /* 80173120 00170060 38 9F 03 EC */ addi r4, r31, 0x3ec /* 80173124 00170064 4B F2 46 B5 */ bl cXyz_NS___as /* 80173128 00170068 38 61 02 00 */ addi r3, r1, 0x200 -/* 8017312C 0017006C 48 00 F9 1D */ bl cSAngle +/* 8017312C 0017006C 48 00 F9 1D */ bl __ct__7cSAngleFv /* 80173130 00170070 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80173134 00170074 2C 00 00 00 */ cmpwi r0, 0 /* 80173138 00170078 41 82 00 38 */ beq lbl_80173170 @@ -21529,7 +21529,7 @@ lbl_80173470: /* 801734EC 0017042C 38 81 12 38 */ addi r4, r1, 0x1238 /* 801734F0 00170430 48 0F E3 91 */ bl cSGlobe_X4_ /* 801734F4 00170434 38 61 01 F8 */ addi r3, r1, 0x1f8 -/* 801734F8 00170438 48 00 F5 51 */ bl cSAngle +/* 801734F8 00170438 48 00 F5 51 */ bl __ct__7cSAngleFv /* 801734FC 0017043C 38 61 12 50 */ addi r3, r1, 0x1250 /* 80173500 00170440 38 81 12 44 */ addi r4, r1, 0x1244 /* 80173504 00170444 4B F1 4E E9 */ bl dCamMath_NS_xyzHorizontalDistance @@ -22057,7 +22057,7 @@ lbl_80173BDC: /* 80173CFC 00170C3C 38 80 FF FF */ li r4, -1 /* 80173D00 00170C40 4B E9 54 85 */ bl cXyz_NS_dtor /* 80173D04 00170C44 38 61 01 F4 */ addi r3, r1, 0x1f4 -/* 80173D08 00170C48 48 00 ED 41 */ bl cSAngle +/* 80173D08 00170C48 48 00 ED 41 */ bl __ct__7cSAngleFv /* 80173D0C 00170C4C 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80173D10 00170C50 2C 00 00 00 */ cmpwi r0, 0 /* 80173D14 00170C54 41 82 00 74 */ beq lbl_80173D88 @@ -22680,7 +22680,7 @@ lbl_801745EC: /* 80174690 001715D0 38 80 FF FF */ li r4, -1 /* 80174694 001715D4 4B E9 4A F1 */ bl cXyz_NS_dtor /* 80174698 001715D8 38 61 01 F0 */ addi r3, r1, 0x1f0 -/* 8017469C 001715DC 48 00 E3 AD */ bl cSAngle +/* 8017469C 001715DC 48 00 E3 AD */ bl __ct__7cSAngleFv /* 801746A0 001715E0 2C 1C 00 24 */ cmpwi r28, 0x24 /* 801746A4 001715E4 40 82 00 60 */ bne lbl_80174704 /* 801746A8 001715E8 38 61 01 F0 */ addi r3, r1, 0x1f0 @@ -25359,7 +25359,7 @@ lbl_80176D78: /* 80176E94 00173DD4 D9 C1 04 70 */ stfd f14, 0x470(r1) /* 80176E98 00173DD8 F1 C1 04 78 */ psq_st f14, 1144(r1), 0, qr0 /* 80176E9C 00173DDC 39 61 04 70 */ addi r11, r1, 0x470 -/* 80176EA0 00173DE0 48 1E B3 21 */ bl func_803621C0 +/* 80176EA0 00173DE0 48 1E B3 21 */ bl _savegpr_22 /* 80176EA4 00173DE4 7C 78 1B 78 */ mr r24, r3 /* 80176EA8 00173DE8 7C 99 23 78 */ mr r25, r4 /* 80176EAC 00173DEC 38 61 00 FC */ addi r3, r1, 0xfc @@ -27951,7 +27951,7 @@ lbl_80179558: /* 80179570 001764B0 E3 81 02 28 */ psq_l f28, 552(r1), 0, qr0 /* 80179574 001764B4 CB 81 02 20 */ lfd f28, 0x220(r1) /* 80179578 001764B8 39 61 02 20 */ addi r11, r1, 0x220 -/* 8017957C 001764BC 48 1E 8C 9D */ bl func_80362218 +/* 8017957C 001764BC 48 1E 8C 9D */ bl _restgpr_25 /* 80179580 001764C0 80 01 02 64 */ lwz r0, 0x264(r1) /* 80179584 001764C4 7C 08 03 A6 */ mtlr r0 /* 80179588 001764C8 38 21 02 60 */ addi r1, r1, 0x260 @@ -28860,7 +28860,7 @@ lbl_8017A218: /* 8017A304 00177244 DA 81 02 90 */ stfd f20, 0x290(r1) /* 8017A308 00177248 F2 81 02 98 */ psq_st f20, 664(r1), 0, qr0 /* 8017A30C 0017724C 39 61 02 90 */ addi r11, r1, 0x290 -/* 8017A310 00177250 48 1E 7E B5 */ bl func_803621C4 +/* 8017A310 00177250 48 1E 7E B5 */ bl _savegpr_23 /* 8017A314 00177254 7C 79 1B 78 */ mr r25, r3 /* 8017A318 00177258 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 8017A31C 0017725C 1F C4 00 78 */ mulli r30, r4, 0x78 @@ -38162,8 +38162,8 @@ std_NS_fabsf: /* 80182A40 0017F980 FC 20 00 18 */ frsp f1, f0 /* 80182A44 0017F984 4E 80 00 20 */ blr -.global cSAngle -cSAngle: +.global __ct__7cSAngleFv +__ct__7cSAngleFv: /* 80182A48 0017F988 4E 80 00 20 */ blr .global cSGlobe_NS_R diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index 7b70ea17c0..5cc0ec3d66 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -1169,7 +1169,7 @@ lbl_80052C34: /* 80052C5C 0004FB9C 7C 08 02 A6 */ mflr r0 /* 80052C60 0004FBA0 90 01 00 F4 */ stw r0, 0xf4(r1) /* 80052C64 0004FBA4 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80052C68 0004FBA8 48 30 F5 59 */ bl func_803621C0 +/* 80052C68 0004FBA8 48 30 F5 59 */ bl _savegpr_22 /* 80052C6C 0004FBAC 7C 77 1B 78 */ mr r23, r3 /* 80052C70 0004FBB0 AB E3 00 22 */ lha r31, 0x22(r3) /* 80052C74 0004FBB4 AB C3 00 24 */ lha r30, 0x24(r3) @@ -1482,7 +1482,7 @@ lbl_80052C34: /* 80053140 00050080 DB C1 00 B0 */ stfd f30, 0xb0(r1) /* 80053144 00050084 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, qr0 /* 80053148 00050088 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8005314C 0005008C 48 30 F0 79 */ bl func_803621C4 +/* 8005314C 0005008C 48 30 F0 79 */ bl _savegpr_23 /* 80053150 00050090 7C 77 1B 78 */ mr r23, r3 /* 80053154 00050094 AB E3 00 48 */ lha r31, 0x48(r3) /* 80053158 00050098 AB C3 00 4A */ lha r30, 0x4a(r3) @@ -2099,7 +2099,7 @@ dDlst_2D_c: /* 80053A7C 000509BC 9B F9 01 60 */ stb r31, 0x160(r25) /* 80053A80 000509C0 7F 23 CB 78 */ mr r3, r25 /* 80053A84 000509C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80053A88 000509C8 48 30 E7 91 */ bl func_80362218 +/* 80053A88 000509C8 48 30 E7 91 */ bl _restgpr_25 /* 80053A8C 000509CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80053A90 000509D0 7C 08 03 A6 */ mtlr r0 /* 80053A94 000509D4 38 21 00 30 */ addi r1, r1, 0x30 @@ -2383,7 +2383,7 @@ cM_rnd_c_NS_getValue: /* 80053EA8 00050DE8 DB E1 00 70 */ stfd f31, 0x70(r1) /* 80053EAC 00050DEC F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 80053EB0 00050DF0 39 61 00 70 */ addi r11, r1, 0x70 -/* 80053EB4 00050DF4 48 30 E3 11 */ bl func_803621C4 +/* 80053EB4 00050DF4 48 30 E3 11 */ bl _savegpr_23 /* 80053EB8 00050DF8 7C 7D 1B 78 */ mr r29, r3 /* 80053EBC 00050DFC 38 60 00 00 */ li r3, 0 /* 80053EC0 00050E00 38 80 00 09 */ li r4, 9 @@ -2708,7 +2708,7 @@ lbl_800542D8: /* 80054398 000512D8 38 60 00 01 */ li r3, 1 lbl_8005439C: /* 8005439C 000512DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 800543A0 000512E0 48 30 DE 79 */ bl func_80362218 +/* 800543A0 000512E0 48 30 DE 79 */ bl _restgpr_25 /* 800543A4 000512E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 800543A8 000512E8 7C 08 03 A6 */ mtlr r0 /* 800543AC 000512EC 38 21 00 40 */ addi r1, r1, 0x40 @@ -4090,7 +4090,7 @@ lbl_800556AC: /* 80055748 00052688 3B BD 00 02 */ addi r29, r29, 2 /* 8005574C 0005268C 41 80 FF 60 */ blt lbl_800556AC /* 80055750 00052690 39 61 00 30 */ addi r11, r1, 0x30 -/* 80055754 00052694 48 30 CA C5 */ bl func_80362218 +/* 80055754 00052694 48 30 CA C5 */ bl _restgpr_25 /* 80055758 00052698 80 01 00 34 */ lwz r0, 0x34(r1) /* 8005575C 0005269C 7C 08 03 A6 */ mtlr r0 /* 80055760 000526A0 38 21 00 30 */ addi r1, r1, 0x30 @@ -4130,7 +4130,7 @@ dDlst_shadowControl_c_NS_imageDraw: /* 800557CC 0005270C 7C 08 02 A6 */ mflr r0 /* 800557D0 00052710 90 01 00 54 */ stw r0, 0x54(r1) /* 800557D4 00052714 39 61 00 50 */ addi r11, r1, 0x50 -/* 800557D8 00052718 48 30 C9 ED */ bl func_803621C4 +/* 800557D8 00052718 48 30 C9 ED */ bl _savegpr_23 /* 800557DC 0005271C 7C 78 1B 78 */ mr r24, r3 /* 800557E0 00052720 7C 99 23 78 */ mr r25, r4 /* 800557E4 00052724 3C 60 80 3B */ lis r3, lbl_803A8D00@ha @@ -4631,7 +4631,7 @@ lbl_80055EE4: /* 80055EFC 00052E3C E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 80055F00 00052E40 CB 81 00 40 */ lfd f28, 0x40(r1) /* 80055F04 00052E44 39 61 00 40 */ addi r11, r1, 0x40 -/* 80055F08 00052E48 48 30 C3 11 */ bl func_80362218 +/* 80055F08 00052E48 48 30 C3 11 */ bl _restgpr_25 /* 80055F0C 00052E4C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80055F10 00052E50 7C 08 03 A6 */ mtlr r0 /* 80055F14 00052E54 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/d_envse.s b/asm/d/d_envse.s index 5fb485444e..d7cbc942d5 100644 --- a/asm/d/d_envse.s +++ b/asm/d/d_envse.s @@ -154,7 +154,7 @@ dEnvSe_c_NS_execute_common: /* 80182FE4 0017FF24 DB E1 00 60 */ stfd f31, 0x60(r1) /* 80182FE8 0017FF28 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 80182FEC 0017FF2C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80182FF0 0017FF30 48 1D F1 D1 */ bl func_803621C0 +/* 80182FF0 0017FF30 48 1D F1 D1 */ bl _savegpr_22 /* 80182FF4 0017FF34 7C 7E 1B 78 */ mr r30, r3 /* 80182FF8 0017FF38 7C BD 2B 78 */ mr r29, r5 /* 80182FFC 0017FF3C 7C D6 33 78 */ mr r22, r6 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index 6ee56a7acf..3f81666772 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -137,7 +137,7 @@ dEvt_control_c_NS_orderOld: /* 80041648 0003E588 7F E9 FB 78 */ mr r9, r31 /* 8004164C 0003E58C 48 00 00 1D */ bl dEvt_control_c_NS_order /* 80041650 0003E590 39 61 00 30 */ addi r11, r1, 0x30 -/* 80041654 0003E594 48 32 0B C5 */ bl func_80362218 +/* 80041654 0003E594 48 32 0B C5 */ bl _restgpr_25 /* 80041658 0003E598 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004165C 0003E59C 7C 08 03 A6 */ mtlr r0 /* 80041660 0003E5A0 38 21 00 30 */ addi r1, r1, 0x30 @@ -149,7 +149,7 @@ dEvt_control_c_NS_order: /* 8004166C 0003E5AC 7C 08 02 A6 */ mflr r0 /* 80041670 0003E5B0 90 01 00 34 */ stw r0, 0x34(r1) /* 80041674 0003E5B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80041678 0003E5B8 48 32 0B 49 */ bl func_803621C0 +/* 80041678 0003E5B8 48 32 0B 49 */ bl _savegpr_22 /* 8004167C 0003E5BC 7C 78 1B 78 */ mr r24, r3 /* 80041680 0003E5C0 7C 99 23 78 */ mr r25, r4 /* 80041684 0003E5C4 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 9a5fc2f28a..0cab9cd39b 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -891,7 +891,7 @@ renderingAmap_c_NS_getStayType: /* 80029194 000260D4 7C 08 02 A6 */ mflr r0 /* 80029198 000260D8 90 01 00 34 */ stw r0, 0x34(r1) /* 8002919C 000260DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800291A0 000260E0 48 33 90 21 */ bl func_803621C0 +/* 800291A0 000260E0 48 33 90 21 */ bl _savegpr_22 /* 800291A4 000260E4 7C 77 1B 78 */ mr r23, r3 /* 800291A8 000260E8 7C 9B 23 78 */ mr r27, r4 /* 800291AC 000260EC 7C BE 2B 78 */ mr r30, r5 diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index 626b4f3ed6..d3ac833f47 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -1239,7 +1239,7 @@ dPa_modelEcallBack_NS_model_c_NS_set: /* 8004A60C 0004754C 7C 08 02 A6 */ mflr r0 /* 8004A610 00047550 90 01 00 34 */ stw r0, 0x34(r1) /* 8004A614 00047554 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004A618 00047558 48 31 7B AD */ bl func_803621C4 +/* 8004A618 00047558 48 31 7B AD */ bl _savegpr_23 /* 8004A61C 0004755C 7C 7A 1B 78 */ mr r26, r3 /* 8004A620 00047560 7C BB 2B 78 */ mr r27, r5 /* 8004A624 00047564 7C DC 33 78 */ mr r28, r6 @@ -1697,7 +1697,7 @@ lbl_8004AC74: /* 8004AC74 00047BB4 38 60 00 00 */ li r3, 0 lbl_8004AC78: /* 8004AC78 00047BB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004AC7C 00047BBC 48 31 75 9D */ bl func_80362218 +/* 8004AC7C 00047BBC 48 31 75 9D */ bl _restgpr_25 /* 8004AC80 00047BC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004AC84 00047BC4 7C 08 03 A6 */ mtlr r0 /* 8004AC88 00047BC8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1924,7 +1924,7 @@ lbl_8004AF68: /* 8004AF74 00047EB4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8004AF78 00047EB8 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8004AF7C 00047EBC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8004AF80 00047EC0 48 31 72 99 */ bl func_80362218 +/* 8004AF80 00047EC0 48 31 72 99 */ bl _restgpr_25 /* 8004AF84 00047EC4 80 01 00 54 */ lwz r0, 0x54(r1) /* 8004AF88 00047EC8 7C 08 03 A6 */ mtlr r0 /* 8004AF8C 00047ECC 38 21 00 50 */ addi r1, r1, 0x50 @@ -3715,7 +3715,7 @@ dPa_control_c_NS_setWaterRipple: /* 8004C844 00049784 DB E1 00 70 */ stfd f31, 0x70(r1) /* 8004C848 00049788 F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 8004C84C 0004978C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8004C850 00049790 48 31 59 71 */ bl func_803621C0 +/* 8004C850 00049790 48 31 59 71 */ bl _savegpr_22 /* 8004C854 00049794 7C 79 1B 78 */ mr r25, r3 /* 8004C858 00049798 7C 9A 23 78 */ mr r26, r4 /* 8004C85C 0004979C 7C BB 2B 78 */ mr r27, r5 @@ -4285,7 +4285,7 @@ dPa_control_c_NS_setPoly: /* 8004D06C 00049FAC 7C 08 02 A6 */ mflr r0 /* 8004D070 00049FB0 90 01 00 64 */ stw r0, 0x64(r1) /* 8004D074 00049FB4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004D078 00049FB8 48 31 51 4D */ bl func_803621C4 +/* 8004D078 00049FB8 48 31 51 4D */ bl _savegpr_23 /* 8004D07C 00049FBC 7C 77 1B 78 */ mr r23, r3 /* 8004D080 00049FC0 7C 98 23 78 */ mr r24, r4 /* 8004D084 00049FC4 7C D9 33 78 */ mr r25, r6 @@ -4723,7 +4723,7 @@ dPa_control_c_NS_setPoly_X1_: /* 8004D6A8 0004A5E8 7C 08 02 A6 */ mflr r0 /* 8004D6AC 0004A5EC 90 01 00 64 */ stw r0, 0x64(r1) /* 8004D6B0 0004A5F0 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004D6B4 0004A5F4 48 31 4B 0D */ bl func_803621C0 +/* 8004D6B4 0004A5F4 48 31 4B 0D */ bl _savegpr_22 /* 8004D6B8 0004A5F8 7C 76 1B 78 */ mr r22, r3 /* 8004D6BC 0004A5FC 7C 97 23 78 */ mr r23, r4 /* 8004D6C0 0004A600 7C B8 2B 78 */ mr r24, r5 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index 9653523704..d0aab57865 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -2015,7 +2015,7 @@ lbl_8003BE18: /* 8003BE18 00038D58 7C 1C F8 00 */ cmpw r28, r31 /* 8003BE1C 00038D5C 41 80 FF 64 */ blt lbl_8003BD80 /* 8003BE20 00038D60 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BE24 00038D64 48 32 63 F5 */ bl func_80362218 +/* 8003BE24 00038D64 48 32 63 F5 */ bl _restgpr_25 /* 8003BE28 00038D68 80 01 00 44 */ lwz r0, 0x44(r1) /* 8003BE2C 00038D6C 7C 08 03 A6 */ mtlr r0 /* 8003BE30 00038D70 38 21 00 40 */ addi r1, r1, 0x40 @@ -2115,7 +2115,7 @@ lbl_8003BF38: /* 8003BF90 00038ED0 4C C6 32 42 */ crset 6 /* 8003BF94 00038ED4 48 2A C6 35 */ bl JUTReportConsole_f /* 8003BF98 00038ED8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BF9C 00038EDC 48 32 62 7D */ bl func_80362218 +/* 8003BF9C 00038EDC 48 32 62 7D */ bl _restgpr_25 /* 8003BFA0 00038EE0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8003BFA4 00038EE4 7C 08 03 A6 */ mtlr r0 /* 8003BFA8 00038EE8 38 21 00 40 */ addi r1, r1, 0x40 @@ -2235,7 +2235,7 @@ lbl_8003C138: /* 8003C144 00039084 38 60 00 01 */ li r3, 1 lbl_8003C148: /* 8003C148 00039088 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003C14C 0003908C 48 32 60 CD */ bl func_80362218 +/* 8003C14C 0003908C 48 32 60 CD */ bl _restgpr_25 /* 8003C150 00039090 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003C154 00039094 7C 08 03 A6 */ mtlr r0 /* 8003C158 00039098 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index b7b5a2a069..c2b4f60f89 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -203,7 +203,7 @@ JUtility_NS_TColor: /* 80193970 001908B0 7C 08 02 A6 */ mflr r0 /* 80193974 001908B4 90 01 00 34 */ stw r0, 0x34(r1) /* 80193978 001908B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019397C 001908BC 48 1C E8 49 */ bl func_803621C4 +/* 8019397C 001908BC 48 1C E8 49 */ bl _savegpr_23 /* 80193980 001908C0 7C 7E 1B 79 */ or. r30, r3, r3 /* 80193984 001908C4 7C 9F 23 78 */ mr r31, r4 /* 80193988 001908C8 41 82 01 EC */ beq lbl_80193B74 diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index a5a853f7d3..03b81562cf 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -3746,7 +3746,7 @@ lbl_800272C0: /* 800272C0 00024200 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 800272C4 00024204 CB E1 00 40 */ lfd f31, 0x40(r1) /* 800272C8 00024208 39 61 00 40 */ addi r11, r1, 0x40 -/* 800272CC 0002420C 48 33 AF 4D */ bl func_80362218 +/* 800272CC 0002420C 48 33 AF 4D */ bl _restgpr_25 /* 800272D0 00024210 80 01 00 54 */ lwz r0, 0x54(r1) /* 800272D4 00024214 7C 08 03 A6 */ mtlr r0 /* 800272D8 00024218 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 3022402aaa..fc8f974b5f 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -2598,7 +2598,7 @@ dDlst_TimerScrnDraw_c_NS_setTimer: /* 8025EEF4 0025BE34 7C 08 02 A6 */ mflr r0 /* 8025EEF8 0025BE38 90 01 00 44 */ stw r0, 0x44(r1) /* 8025EEFC 0025BE3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025EF00 0025BE40 48 10 32 C1 */ bl func_803621C0 +/* 8025EF00 0025BE40 48 10 32 C1 */ bl _savegpr_22 /* 8025EF04 0025BE44 7C 79 1B 78 */ mr r25, r3 /* 8025EF08 0025BE48 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8025EF0C 0025BE4C 38 63 01 88 */ addi r3, r3, lbl_80430188@l diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 74a7f864d7..a393e1072f 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -7708,7 +7708,7 @@ lbl_8008FA38: /* 8008FA38 0008C978 E3 E1 03 88 */ psq_l f31, 904(r1), 0, qr0 /* 8008FA3C 0008C97C CB E1 03 80 */ lfd f31, 0x380(r1) /* 8008FA40 0008C980 39 61 03 80 */ addi r11, r1, 0x380 -/* 8008FA44 0008C984 48 2D 27 D5 */ bl func_80362218 +/* 8008FA44 0008C984 48 2D 27 D5 */ bl _restgpr_25 /* 8008FA48 0008C988 80 01 03 94 */ lwz r0, 0x394(r1) /* 8008FA4C 0008C98C 7C 08 03 A6 */ mtlr r0 /* 8008FA50 0008C990 38 21 03 90 */ addi r1, r1, 0x390 @@ -12514,7 +12514,7 @@ lbl_80094218: /* 80094220 00091160 E3 C1 02 C8 */ psq_l f30, 712(r1), 0, qr0 /* 80094224 00091164 CB C1 02 C0 */ lfd f30, 0x2c0(r1) /* 80094228 00091168 39 61 02 C0 */ addi r11, r1, 0x2c0 -/* 8009422C 0009116C 48 2C DF ED */ bl func_80362218 +/* 8009422C 0009116C 48 2C DF ED */ bl _restgpr_25 /* 80094230 00091170 80 01 02 E4 */ lwz r0, 0x2e4(r1) /* 80094234 00091174 7C 08 03 A6 */ mtlr r0 /* 80094238 00091178 38 21 02 E0 */ addi r1, r1, 0x2e0 diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index 6c3f516e16..b467c097c0 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -2552,7 +2552,7 @@ lbl_80045ADC: /* 80045ADC 00042A1C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80045AE0 00042A20 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80045AE4 00042A24 39 61 00 30 */ addi r11, r1, 0x30 -/* 80045AE8 00042A28 48 31 C7 31 */ bl func_80362218 +/* 80045AE8 00042A28 48 31 C7 31 */ bl _restgpr_25 /* 80045AEC 00042A2C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80045AF0 00042A30 7C 08 03 A6 */ mtlr r0 /* 80045AF4 00042A34 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index a8ba4cc87c..fdf2c6f306 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -1451,7 +1451,7 @@ dEvent_manager_c_NS_getEventIdx_X2_: /* 8004775C 0004469C 7C 08 02 A6 */ mflr r0 /* 80047760 000446A0 90 01 00 64 */ stw r0, 0x64(r1) /* 80047764 000446A4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80047768 000446A8 48 31 AA 59 */ bl func_803621C0 +/* 80047768 000446A8 48 31 AA 59 */ bl _savegpr_22 /* 8004776C 000446AC 7C 7A 1B 78 */ mr r26, r3 /* 80047770 000446B0 7C 9B 23 78 */ mr r27, r4 /* 80047774 000446B4 7C BC 2B 78 */ mr r28, r5 @@ -2041,7 +2041,7 @@ lbl_80047F30: /* 80047F40 00044E80 38 60 00 00 */ li r3, 0 lbl_80047F44: /* 80047F44 00044E84 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047F48 00044E88 48 31 A2 D1 */ bl func_80362218 +/* 80047F48 00044E88 48 31 A2 D1 */ bl _restgpr_25 /* 80047F4C 00044E8C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80047F50 00044E90 7C 08 03 A6 */ mtlr r0 /* 80047F54 00044E94 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index e5401d74e3..4f729ddff1 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -1984,7 +1984,7 @@ lbl_80185170: /* 80185214 00182154 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80185218: /* 80185218 00182158 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018521C 0018215C 48 1D CF FD */ bl func_80362218 +/* 8018521C 0018215C 48 1D CF FD */ bl _restgpr_25 /* 80185220 00182160 80 01 00 34 */ lwz r0, 0x34(r1) /* 80185224 00182164 7C 08 03 A6 */ mtlr r0 /* 80185228 00182168 38 21 00 30 */ addi r1, r1, 0x30 @@ -8050,7 +8050,7 @@ lbl_8018AC1C: /* 8018AC20 00187B60 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_8018AC24: /* 8018AC24 00187B64 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018AC28 00187B68 48 1D 75 F1 */ bl func_80362218 +/* 8018AC28 00187B68 48 1D 75 F1 */ bl _restgpr_25 /* 8018AC2C 00187B6C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018AC30 00187B70 7C 08 03 A6 */ mtlr r0 /* 8018AC34 00187B74 38 21 00 30 */ addi r1, r1, 0x30 @@ -8162,7 +8162,7 @@ dFile_select_c_NS_screenSet: /* 8018ADBC 00187CFC DB A1 00 B0 */ stfd f29, 0xb0(r1) /* 8018ADC0 00187D00 F3 A1 00 B8 */ psq_st f29, 184(r1), 0, qr0 /* 8018ADC4 00187D04 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8018ADC8 00187D08 48 1D 73 F9 */ bl func_803621C0 +/* 8018ADC8 00187D08 48 1D 73 F9 */ bl _savegpr_22 /* 8018ADCC 00187D0C 7C 7F 1B 78 */ mr r31, r3 /* 8018ADD0 00187D10 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018ADD4 00187D14 3B C3 A8 48 */ addi r30, r3, lbl_803BA848@l @@ -9695,7 +9695,7 @@ lbl_8018C4BC: /* 8018C504 00189444 38 00 00 00 */ li r0, 0 /* 8018C508 00189448 98 1F 00 3C */ stb r0, 0x3c(r31) /* 8018C50C 0018944C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8018C510 00189450 48 1D 5D 09 */ bl func_80362218 +/* 8018C510 00189450 48 1D 5D 09 */ bl _restgpr_25 /* 8018C514 00189454 80 01 00 44 */ lwz r0, 0x44(r1) /* 8018C518 00189458 7C 08 03 A6 */ mtlr r0 /* 8018C51C 0018945C 38 21 00 40 */ addi r1, r1, 0x40 @@ -11139,7 +11139,7 @@ dFile_select_c_NS_menuWakuAlpahAnm: lbl_8018D9F4: /* 8018D9F4 0018A934 7F E3 FB 78 */ mr r3, r31 /* 8018D9F8 0018A938 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018D9FC 0018A93C 48 1D 48 1D */ bl func_80362218 +/* 8018D9FC 0018A93C 48 1D 48 1D */ bl _restgpr_25 /* 8018DA00 0018A940 80 01 00 54 */ lwz r0, 0x54(r1) /* 8018DA04 0018A944 7C 08 03 A6 */ mtlr r0 /* 8018DA08 0018A948 38 21 00 50 */ addi r1, r1, 0x50 @@ -11353,7 +11353,7 @@ lbl_8018DCE8: lbl_8018DD1C: /* 8018DD1C 0018AC5C 7F A3 EB 78 */ mr r3, r29 /* 8018DD20 0018AC60 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018DD24 0018AC64 48 1D 44 F5 */ bl func_80362218 +/* 8018DD24 0018AC64 48 1D 44 F5 */ bl _restgpr_25 /* 8018DD28 0018AC68 80 01 00 54 */ lwz r0, 0x54(r1) /* 8018DD2C 0018AC6C 7C 08 03 A6 */ mtlr r0 /* 8018DD30 0018AC70 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index fe1617d313..9fb896d71b 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -1918,7 +1918,7 @@ lbl_800406E8: /* 800406F0 0003D630 7F 23 CB 78 */ mr r3, r25 /* 800406F4 0003D634 4B FF C7 85 */ bl dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor /* 800406F8 0003D638 39 61 00 30 */ addi r11, r1, 0x30 -/* 800406FC 0003D63C 48 32 1B 1D */ bl func_80362218 +/* 800406FC 0003D63C 48 32 1B 1D */ bl _restgpr_25 /* 80040700 0003D640 80 01 00 34 */ lwz r0, 0x34(r1) /* 80040704 0003D644 7C 08 03 A6 */ mtlr r0 /* 80040708 0003D648 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index e4eb545e25..9bc5fe7c30 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -1468,7 +1468,7 @@ fmpTresTypeGroupData_c_NS_dtor: /* 8003EB74 0003BAB4 7C 08 02 A6 */ mflr r0 /* 8003EB78 0003BAB8 90 01 00 34 */ stw r0, 0x34(r1) /* 8003EB7C 0003BABC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003EB80 0003BAC0 48 32 36 41 */ bl func_803621C0 +/* 8003EB80 0003BAC0 48 32 36 41 */ bl _savegpr_22 /* 8003EB84 0003BAC4 7C 76 1B 79 */ or. r22, r3, r3 /* 8003EB88 0003BAC8 7C 97 23 78 */ mr r23, r4 /* 8003EB8C 0003BACC 41 82 00 E8 */ beq lbl_8003EC74 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index c453688993..e8e372be20 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -2363,7 +2363,7 @@ dMenu_Collect2D_c_NS_cursorMove: /* 801B1FB0 001AEEF0 7C 08 02 A6 */ mflr r0 /* 801B1FB4 001AEEF4 90 01 00 64 */ stw r0, 0x64(r1) /* 801B1FB8 001AEEF8 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B1FBC 001AEEFC 48 1B 02 09 */ bl func_803621C4 +/* 801B1FBC 001AEEFC 48 1B 02 09 */ bl _savegpr_23 /* 801B1FC0 001AEF00 7C 7D 1B 78 */ mr r29, r3 /* 801B1FC4 001AEF04 8B E3 02 57 */ lbz r31, 0x257(r3) /* 801B1FC8 001AEF08 8B C3 02 58 */ lbz r30, 0x258(r3) diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index 9e40df99ae..56850c7c36 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -746,7 +746,7 @@ dMenu_DmapBg_c_NS_buttonIconScreenInit: /* 801B8A10 001B5950 7C 08 02 A6 */ mflr r0 /* 801B8A14 001B5954 90 01 00 34 */ stw r0, 0x34(r1) /* 801B8A18 001B5958 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B8A1C 001B595C 48 1A 97 A5 */ bl func_803621C0 +/* 801B8A1C 001B595C 48 1A 97 A5 */ bl _savegpr_22 /* 801B8A20 001B5960 7C 7E 1B 78 */ mr r30, r3 /* 801B8A24 001B5964 3C 60 80 39 */ lis r3, lbl_80395518@ha /* 801B8A28 001B5968 3B E3 55 18 */ addi r31, r3, lbl_80395518@l diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index 3da20e85f1..cbba69956c 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -26,7 +26,7 @@ dMenu_Fishing_c: /* 801C4D9C 001C1CDC 7C 08 02 A6 */ mflr r0 /* 801C4DA0 001C1CE0 90 01 00 34 */ stw r0, 0x34(r1) /* 801C4DA4 001C1CE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C4DA8 001C1CE8 48 19 D4 1D */ bl func_803621C4 +/* 801C4DA8 001C1CE8 48 19 D4 1D */ bl _savegpr_23 /* 801C4DAC 001C1CEC 7C 7E 1B 79 */ or. r30, r3, r3 /* 801C4DB0 001C1CF0 7C 9F 23 78 */ mr r31, r4 /* 801C4DB4 001C1CF4 41 82 02 7C */ beq lbl_801C5030 @@ -1671,7 +1671,7 @@ lbl_801C6538: /* 801C6580 001C34C0 4E 80 04 21 */ bctrl lbl_801C6584: /* 801C6584 001C34C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6588 001C34C8 48 19 BC 91 */ bl func_80362218 +/* 801C6588 001C34C8 48 19 BC 91 */ bl _restgpr_25 /* 801C658C 001C34CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C6590 001C34D0 7C 08 03 A6 */ mtlr r0 /* 801C6594 001C34D4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 41ed809b7c..1ac6c30f4d 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -6352,7 +6352,7 @@ lbl_801CC268: /* 801CC268 001C91A8 38 60 00 01 */ li r3, 1 lbl_801CC26C: /* 801CC26C 001C91AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CC270 001C91B0 48 19 5F A9 */ bl func_80362218 +/* 801CC270 001C91B0 48 19 5F A9 */ bl _restgpr_25 /* 801CC274 001C91B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CC278 001C91B8 7C 08 03 A6 */ mtlr r0 /* 801CC27C 001C91BC 38 21 00 30 */ addi r1, r1, 0x30 @@ -6928,7 +6928,7 @@ lbl_801CCA48: /* 801CCA50 001C9990 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 801CCA54 001C9994 CB C1 00 40 */ lfd f30, 0x40(r1) /* 801CCA58 001C9998 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CCA5C 001C999C 48 19 57 BD */ bl func_80362218 +/* 801CCA5C 001C999C 48 19 57 BD */ bl _restgpr_25 /* 801CCA60 001C99A0 80 01 00 64 */ lwz r0, 0x64(r1) /* 801CCA64 001C99A4 7C 08 03 A6 */ mtlr r0 /* 801CCA68 001C99A8 38 21 00 60 */ addi r1, r1, 0x60 @@ -7351,7 +7351,7 @@ dMenu_Fmap_c_NS_searchIcon: /* 801CD004 001C9F44 7C 08 02 A6 */ mflr r0 /* 801CD008 001C9F48 90 01 00 84 */ stw r0, 0x84(r1) /* 801CD00C 001C9F4C 39 61 00 80 */ addi r11, r1, 0x80 -/* 801CD010 001C9F50 48 19 51 B5 */ bl func_803621C4 +/* 801CD010 001C9F50 48 19 51 B5 */ bl _savegpr_23 /* 801CD014 001C9F54 7C 7C 1B 78 */ mr r28, r3 /* 801CD018 001C9F58 7C 97 23 78 */ mr r23, r4 /* 801CD01C 001C9F5C 7C BD 2B 78 */ mr r29, r5 diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index 5b4f07a990..b4c0ca26cd 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -1238,7 +1238,7 @@ lbl_801D0728: /* 801D07E4 001CD724 E3 A1 01 18 */ psq_l f29, 280(r1), 0, qr0 /* 801D07E8 001CD728 CB A1 01 10 */ lfd f29, 0x110(r1) /* 801D07EC 001CD72C 39 61 01 10 */ addi r11, r1, 0x110 -/* 801D07F0 001CD730 48 19 1A 29 */ bl func_80362218 +/* 801D07F0 001CD730 48 19 1A 29 */ bl _restgpr_25 /* 801D07F4 001CD734 80 01 01 44 */ lwz r0, 0x144(r1) /* 801D07F8 001CD738 7C 08 03 A6 */ mtlr r0 /* 801D07FC 001CD73C 38 21 01 40 */ addi r1, r1, 0x140 @@ -1508,7 +1508,7 @@ lbl_801D0BCC: /* 801D0BD8 001CDB18 3B DE 00 04 */ addi r30, r30, 4 /* 801D0BDC 001CDB1C 41 80 FF 18 */ blt lbl_801D0AF4 /* 801D0BE0 001CDB20 39 61 00 40 */ addi r11, r1, 0x40 -/* 801D0BE4 001CDB24 48 19 16 35 */ bl func_80362218 +/* 801D0BE4 001CDB24 48 19 16 35 */ bl _restgpr_25 /* 801D0BE8 001CDB28 80 01 00 44 */ lwz r0, 0x44(r1) /* 801D0BEC 001CDB2C 7C 08 03 A6 */ mtlr r0 /* 801D0BF0 001CDB30 38 21 00 40 */ addi r1, r1, 0x40 @@ -3817,7 +3817,7 @@ dMenu_Fmap2DBack_c_NS_calcOffset: /* 801D2CCC 001CFC0C 7C 08 02 A6 */ mflr r0 /* 801D2CD0 001CFC10 90 01 00 34 */ stw r0, 0x34(r1) /* 801D2CD4 001CFC14 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D2CD8 001CFC18 48 18 F4 ED */ bl func_803621C4 +/* 801D2CD8 001CFC18 48 18 F4 ED */ bl _savegpr_23 /* 801D2CDC 001CFC1C 7C 77 1B 78 */ mr r23, r3 /* 801D2CE0 001CFC20 7C 98 23 78 */ mr r24, r4 /* 801D2CE4 001CFC24 7C B9 2B 78 */ mr r25, r5 @@ -4068,7 +4068,7 @@ lbl_801D306C: /* 801D3074 001CFFB4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 /* 801D3078 001CFFB8 CB C1 00 60 */ lfd f30, 0x60(r1) /* 801D307C 001CFFBC 39 61 00 60 */ addi r11, r1, 0x60 -/* 801D3080 001CFFC0 48 18 F1 99 */ bl func_80362218 +/* 801D3080 001CFFC0 48 18 F1 99 */ bl _restgpr_25 /* 801D3084 001CFFC4 80 01 00 84 */ lwz r0, 0x84(r1) /* 801D3088 001CFFC8 7C 08 03 A6 */ mtlr r0 /* 801D308C 001CFFCC 38 21 00 80 */ addi r1, r1, 0x80 @@ -8536,7 +8536,7 @@ lbl_801D71F4: /* 801D71F4 001D4134 9B FD 00 C2 */ stb r31, 0xc2(r29) lbl_801D71F8: /* 801D71F8 001D4138 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D71FC 001D413C 48 18 B0 1D */ bl func_80362218 +/* 801D71FC 001D413C 48 18 B0 1D */ bl _restgpr_25 /* 801D7200 001D4140 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D7204 001D4144 7C 08 03 A6 */ mtlr r0 /* 801D7208 001D4148 38 21 00 30 */ addi r1, r1, 0x30 @@ -8592,7 +8592,7 @@ lbl_801D72B8: /* 801D72B8 001D41F8 9B 79 00 C1 */ stb r27, 0xc1(r25) lbl_801D72BC: /* 801D72BC 001D41FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D72C0 001D4200 48 18 AF 59 */ bl func_80362218 +/* 801D72C0 001D4200 48 18 AF 59 */ bl _restgpr_25 /* 801D72C4 001D4204 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D72C8 001D4208 7C 08 03 A6 */ mtlr r0 /* 801D72CC 001D420C 38 21 00 30 */ addi r1, r1, 0x30 @@ -8648,7 +8648,7 @@ lbl_801D737C: /* 801D737C 001D42BC 9B 79 00 C0 */ stb r27, 0xc0(r25) lbl_801D7380: /* 801D7380 001D42C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D7384 001D42C4 48 18 AE 95 */ bl func_80362218 +/* 801D7384 001D42C4 48 18 AE 95 */ bl _restgpr_25 /* 801D7388 001D42C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D738C 001D42CC 7C 08 03 A6 */ mtlr r0 /* 801D7390 001D42D0 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 5484df4c94..fbc2fb105a 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -4489,7 +4489,7 @@ lbl_801E1010: /* 801E1018 001DDF58 3B 7B 00 14 */ addi r27, r27, 0x14 /* 801E101C 001DDF5C 41 80 FF 90 */ blt lbl_801E0FAC /* 801E1020 001DDF60 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E1024 001DDF64 48 18 11 F5 */ bl func_80362218 +/* 801E1024 001DDF64 48 18 11 F5 */ bl _restgpr_25 /* 801E1028 001DDF68 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E102C 001DDF6C 7C 08 03 A6 */ mtlr r0 /* 801E1030 001DDF70 38 21 00 30 */ addi r1, r1, 0x30 @@ -4607,7 +4607,7 @@ lbl_801E11C4: /* 801E11CC 001DE10C 3B 7B 00 14 */ addi r27, r27, 0x14 /* 801E11D0 001DE110 41 80 FF 90 */ blt lbl_801E1160 /* 801E11D4 001DE114 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E11D8 001DE118 48 18 10 41 */ bl func_80362218 +/* 801E11D8 001DE118 48 18 10 41 */ bl _restgpr_25 /* 801E11DC 001DE11C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E11E0 001DE120 7C 08 03 A6 */ mtlr r0 /* 801E11E4 001DE124 38 21 00 30 */ addi r1, r1, 0x30 @@ -5380,7 +5380,7 @@ lbl_801E1CAC: /* 801E1CF4 001DEC34 4E 80 04 21 */ bctrl lbl_801E1CF8: /* 801E1CF8 001DEC38 39 61 00 60 */ addi r11, r1, 0x60 -/* 801E1CFC 001DEC3C 48 18 05 1D */ bl func_80362218 +/* 801E1CFC 001DEC3C 48 18 05 1D */ bl _restgpr_25 /* 801E1D00 001DEC40 80 01 00 64 */ lwz r0, 0x64(r1) /* 801E1D04 001DEC44 7C 08 03 A6 */ mtlr r0 /* 801E1D08 001DEC48 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index 957c0d5ccd..04b5fa4829 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -6002,7 +6002,7 @@ lbl_801E76C0: /* 801E76CC 001E460C 3B 5A 00 08 */ addi r26, r26, 8 /* 801E76D0 001E4610 41 80 FD 34 */ blt lbl_801E7404 /* 801E76D4 001E4614 39 61 00 60 */ addi r11, r1, 0x60 -/* 801E76D8 001E4618 48 17 AB 41 */ bl func_80362218 +/* 801E76D8 001E4618 48 17 AB 41 */ bl _restgpr_25 /* 801E76DC 001E461C 80 01 00 64 */ lwz r0, 0x64(r1) /* 801E76E0 001E4620 7C 08 03 A6 */ mtlr r0 /* 801E76E4 001E4624 38 21 00 60 */ addi r1, r1, 0x60 @@ -6029,7 +6029,7 @@ dMenu_Option_c_NS_changeBarColor: /* 801E771C 001E465C 7C 08 02 A6 */ mflr r0 /* 801E7720 001E4660 90 01 00 54 */ stw r0, 0x54(r1) /* 801E7724 001E4664 39 61 00 50 */ addi r11, r1, 0x50 -/* 801E7728 001E4668 48 17 AA 9D */ bl func_803621C4 +/* 801E7728 001E4668 48 17 AA 9D */ bl _savegpr_23 /* 801E772C 001E466C 7C 7C 1B 78 */ mr r28, r3 /* 801E7730 001E4670 7C 9D 23 78 */ mr r29, r4 /* 801E7734 001E4674 4B FF FF B9 */ bl dMenu_Option_c_NS_getSelectType @@ -7644,7 +7644,7 @@ lbl_801E8E1C: lbl_801E8E50: /* 801E8E50 001E5D90 7F A3 EB 78 */ mr r3, r29 /* 801E8E54 001E5D94 39 61 00 50 */ addi r11, r1, 0x50 -/* 801E8E58 001E5D98 48 17 93 C1 */ bl func_80362218 +/* 801E8E58 001E5D98 48 17 93 C1 */ bl _restgpr_25 /* 801E8E5C 001E5D9C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801E8E60 001E5DA0 7C 08 03 A6 */ mtlr r0 /* 801E8E64 001E5DA4 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 b7842ca16d..505663467c 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -6746,7 +6746,7 @@ dMenu_Ring_c_NS_clacEllipsePlotAverage: /* 801EF1DC 001EC11C DB 21 00 40 */ stfd f25, 0x40(r1) /* 801EF1E0 001EC120 F3 21 00 48 */ psq_st f25, 72(r1), 0, qr0 /* 801EF1E4 001EC124 39 61 00 40 */ addi r11, r1, 0x40 -/* 801EF1E8 001EC128 48 17 2F DD */ bl func_803621C4 +/* 801EF1E8 001EC128 48 17 2F DD */ bl _savegpr_23 /* 801EF1EC 001EC12C 7C 7B 1B 78 */ mr r27, r3 /* 801EF1F0 001EC130 7C 9C 23 78 */ mr r28, r4 /* 801EF1F4 001EC134 FF 20 08 90 */ fmr f25, f1 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 353531cb20..fd439b7739 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -209,7 +209,7 @@ dMenu_save_c_NS_screenSet: /* 801EF920 001EC860 DB A1 00 90 */ stfd f29, 0x90(r1) /* 801EF924 001EC864 F3 A1 00 98 */ psq_st f29, 152(r1), 0, qr0 /* 801EF928 001EC868 39 61 00 90 */ addi r11, r1, 0x90 -/* 801EF92C 001EC86C 48 17 28 99 */ bl func_803621C4 +/* 801EF92C 001EC86C 48 17 28 99 */ bl _savegpr_23 /* 801EF930 001EC870 7C 7F 1B 78 */ mr r31, r3 /* 801EF934 001EC874 3C 60 80 3C */ lis r3, lbl_803BDF78@ha /* 801EF938 001EC878 3B C3 DF 78 */ addi r30, r3, lbl_803BDF78@l @@ -7789,7 +7789,7 @@ lbl_801F679C: /* 801F679C 001F36DC 7F E3 FB 78 */ mr r3, r31 lbl_801F67A0: /* 801F67A0 001F36E0 39 61 00 50 */ addi r11, r1, 0x50 -/* 801F67A4 001F36E4 48 16 BA 75 */ bl func_80362218 +/* 801F67A4 001F36E4 48 16 BA 75 */ bl _restgpr_25 /* 801F67A8 001F36E8 80 01 00 54 */ lwz r0, 0x54(r1) /* 801F67AC 001F36EC 7C 08 03 A6 */ mtlr r0 /* 801F67B0 001F36F0 38 21 00 50 */ addi r1, r1, 0x50 @@ -7906,7 +7906,7 @@ lbl_801F6928: /* 801F6934 001F3874 3B 5A 00 04 */ addi r26, r26, 4 /* 801F6938 001F3878 41 80 FE E4 */ blt lbl_801F681C /* 801F693C 001F387C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F6940 001F3880 48 16 B8 D9 */ bl func_80362218 +/* 801F6940 001F3880 48 16 B8 D9 */ bl _restgpr_25 /* 801F6944 001F3884 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F6948 001F3888 7C 08 03 A6 */ mtlr r0 /* 801F694C 001F388C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index ab14f56434..f6135c576e 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -2189,7 +2189,7 @@ lbl_801F923C: /* 801F9240 001F6180 7C 1A 00 00 */ cmpw r26, r0 /* 801F9244 001F6184 41 80 FF 38 */ blt lbl_801F917C /* 801F9248 001F6188 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F924C 001F618C 48 16 8F CD */ bl func_80362218 +/* 801F924C 001F618C 48 16 8F CD */ bl _restgpr_25 /* 801F9250 001F6190 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F9254 001F6194 7C 08 03 A6 */ mtlr r0 /* 801F9258 001F6198 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index 94dbf07dc3..4141878018 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -197,7 +197,7 @@ lbl_801C0B20: lbl_801C0B24: /* 801C0B24 001BDA64 7F E3 FB 78 */ mr r3, r31 /* 801C0B28 001BDA68 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C0B2C 001BDA6C 48 1A 16 ED */ bl func_80362218 +/* 801C0B2C 001BDA6C 48 1A 16 ED */ bl _restgpr_25 /* 801C0B30 001BDA70 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C0B34 001BDA74 7C 08 03 A6 */ mtlr r0 /* 801C0B38 001BDA78 38 21 00 30 */ addi r1, r1, 0x30 @@ -372,7 +372,7 @@ dMenu_DmapMap_c_NS_setTexture: /* 801C0D74 001BDCB4 7C 08 02 A6 */ mflr r0 /* 801C0D78 001BDCB8 90 01 00 34 */ stw r0, 0x34(r1) /* 801C0D7C 001BDCBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C0D80 001BDCC0 48 1A 14 41 */ bl func_803621C0 +/* 801C0D80 001BDCC0 48 1A 14 41 */ bl _savegpr_22 /* 801C0D84 001BDCC4 7C 76 1B 78 */ mr r22, r3 /* 801C0D88 001BDCC8 7C 97 23 78 */ mr r23, r4 /* 801C0D8C 001BDCCC 7C B8 2B 78 */ mr r24, r5 @@ -635,7 +635,7 @@ lbl_801C10F8: lbl_801C110C: /* 801C110C 001BE04C 7F 23 CB 78 */ mr r3, r25 /* 801C1110 001BE050 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C1114 001BE054 48 1A 11 05 */ bl func_80362218 +/* 801C1114 001BE054 48 1A 11 05 */ bl _restgpr_25 /* 801C1118 001BE058 80 01 00 44 */ lwz r0, 0x44(r1) /* 801C111C 001BE05C 7C 08 03 A6 */ mtlr r0 /* 801C1120 001BE060 38 21 00 40 */ addi r1, r1, 0x40 @@ -1171,7 +1171,7 @@ lbl_801C185C: /* 801C18E4 001BE824 DB 81 00 40 */ stfd f28, 0x40(r1) /* 801C18E8 001BE828 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 801C18EC 001BE82C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C18F0 001BE830 48 1A 08 D1 */ bl func_803621C0 +/* 801C18F0 001BE830 48 1A 08 D1 */ bl _savegpr_22 /* 801C18F4 001BE834 7C 78 1B 78 */ mr r24, r3 /* 801C18F8 001BE838 7C 99 23 78 */ mr r25, r4 /* 801C18FC 001BE83C 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index e7c1743e81..0e50c3f7c8 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -1977,7 +1977,7 @@ dMenu_ItemExplain_c_NS_openExplainDmap: /* 801DC3CC 001D930C 7C 08 02 A6 */ mflr r0 /* 801DC3D0 001D9310 90 01 00 34 */ stw r0, 0x34(r1) /* 801DC3D4 001D9314 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DC3D8 001D9318 48 18 5D E9 */ bl func_803621C0 +/* 801DC3D8 001D9318 48 18 5D E9 */ bl _savegpr_22 /* 801DC3DC 001D931C 7C 77 1B 78 */ mr r23, r3 /* 801DC3E0 001D9320 7C 98 23 78 */ mr r24, r4 /* 801DC3E4 001D9324 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index c040485d6f..9deeb25c85 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -7670,7 +7670,7 @@ lbl_8022F35C: /* 8022F364 0022C2A4 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 8022F368 0022C2A8 CB C1 00 50 */ lfd f30, 0x50(r1) /* 8022F36C 0022C2AC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022F370 0022C2B0 48 13 2E A9 */ bl func_80362218 +/* 8022F370 0022C2B0 48 13 2E A9 */ bl _restgpr_25 /* 8022F374 0022C2B4 80 01 00 74 */ lwz r0, 0x74(r1) /* 8022F378 0022C2B8 7C 08 03 A6 */ mtlr r0 /* 8022F37C 0022C2BC 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 84e1bf95b2..dcce4dfa15 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -272,7 +272,7 @@ lbl_8024A2BC: /* 8024A2BC 002471FC 7F E3 FB 78 */ mr r3, r31 lbl_8024A2C0: /* 8024A2C0 00247200 39 61 00 30 */ addi r11, r1, 0x30 -/* 8024A2C4 00247204 48 11 7F 55 */ bl func_80362218 +/* 8024A2C4 00247204 48 11 7F 55 */ bl _restgpr_25 /* 8024A2C8 00247208 80 01 00 34 */ lwz r0, 0x34(r1) /* 8024A2CC 0024720C 7C 08 03 A6 */ mtlr r0 /* 8024A2D0 00247210 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 292e08e969..4edb09517c 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -4732,7 +4732,7 @@ dMsgObject_c_NS_getStringLocal: /* 80236DE8 00233D28 7C 08 02 A6 */ mflr r0 /* 80236DEC 00233D2C 90 01 04 54 */ stw r0, 0x454(r1) /* 80236DF0 00233D30 39 61 04 50 */ addi r11, r1, 0x450 -/* 80236DF4 00233D34 48 12 B3 CD */ bl func_803621C0 +/* 80236DF4 00233D34 48 12 B3 CD */ bl _savegpr_22 /* 80236DF8 00233D38 7C 78 1B 78 */ mr r24, r3 /* 80236DFC 00233D3C 7C 99 23 78 */ mr r25, r4 /* 80236E00 00233D40 7C BA 2B 78 */ mr r26, r5 @@ -5471,7 +5471,7 @@ dMsgObject_c_NS_updateEquipBombInfoLocal: /* 8023774C 0023468C 7C 08 02 A6 */ mflr r0 /* 80237750 00234690 90 01 00 34 */ stw r0, 0x34(r1) /* 80237754 00234694 39 61 00 30 */ addi r11, r1, 0x30 -/* 80237758 00234698 48 12 AA 6D */ bl func_803621C4 +/* 80237758 00234698 48 12 AA 6D */ bl _savegpr_23 /* 8023775C 0023469C 7C 7C 1B 78 */ mr r28, r3 /* 80237760 002346A0 88 03 04 D3 */ lbz r0, 0x4d3(r3) /* 80237764 002346A4 28 00 00 00 */ cmplwi r0, 0 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index 3ddf6c153d..6fd5e354b5 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -544,7 +544,7 @@ lbl_802395DC: /* 802398D0 00236810 7C 08 02 A6 */ mflr r0 /* 802398D4 00236814 90 01 00 34 */ stw r0, 0x34(r1) /* 802398D8 00236818 39 61 00 30 */ addi r11, r1, 0x30 -/* 802398DC 0023681C 48 12 88 E9 */ bl func_803621C4 +/* 802398DC 0023681C 48 12 88 E9 */ bl _savegpr_23 /* 802398E0 00236820 7C 7E 1B 79 */ or. r30, r3, r3 /* 802398E4 00236824 7C 9F 23 78 */ mr r31, r4 /* 802398E8 00236828 41 82 02 DC */ beq lbl_80239BC4 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index 425c99106d..70304afa91 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -15,7 +15,7 @@ dMsgScrnHowl_c: /* 80240988 0023D8C8 DB A1 01 F0 */ stfd f29, 0x1f0(r1) /* 8024098C 0023D8CC F3 A1 01 F8 */ psq_st f29, 504(r1), 0, qr0 /* 80240990 0023D8D0 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 80240994 0023D8D4 48 12 18 31 */ bl func_803621C4 +/* 80240994 0023D8D4 48 12 18 31 */ bl _savegpr_23 /* 80240998 0023D8D8 7C 7F 1B 78 */ mr r31, r3 /* 8024099C 0023D8DC 3C 80 80 3C */ lis r4, lbl_803C0FD0@ha /* 802409A0 0023D8E0 3B C4 0F D0 */ addi r30, r4, lbl_803C0FD0@l diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 85b9688145..21597311b1 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -924,7 +924,7 @@ lbl_8023F4B8: /* 8023F4FC 0023C43C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8023F500 0023C440 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8023F504 0023C444 39 61 00 50 */ addi r11, r1, 0x50 -/* 8023F508 0023C448 48 12 2D 11 */ bl func_80362218 +/* 8023F508 0023C448 48 12 2D 11 */ bl _restgpr_25 /* 8023F50C 0023C44C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8023F510 0023C450 7C 08 03 A6 */ mtlr r0 /* 8023F514 0023C454 38 21 00 60 */ addi r1, r1, 0x60 @@ -1620,7 +1620,7 @@ lbl_8023FF00: /* 8023FF10 0023CE50 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8023FF14 0023CE54 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8023FF18 0023CE58 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023FF1C 0023CE5C 48 12 22 FD */ bl func_80362218 +/* 8023FF1C 0023CE5C 48 12 22 FD */ bl _restgpr_25 /* 8023FF20 0023CE60 80 01 00 44 */ lwz r0, 0x44(r1) /* 8023FF24 0023CE64 7C 08 03 A6 */ mtlr r0 /* 8023FF28 0023CE68 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index bb8f52016b..0481f3be91 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -11,7 +11,7 @@ dMsgScrnJimaku_c: /* 80244564 002414A4 DB E1 00 40 */ stfd f31, 0x40(r1) /* 80244568 002414A8 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8024456C 002414AC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244570 002414B0 48 11 DC 55 */ bl func_803621C4 +/* 80244570 002414B0 48 11 DC 55 */ bl _savegpr_23 /* 80244574 002414B4 7C 7F 1B 78 */ mr r31, r3 /* 80244578 002414B8 7C 98 23 78 */ mr r24, r4 /* 8024457C 002414BC 7C B7 2B 78 */ mr r23, r5 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index ab1e9d3ca0..80addc2a0d 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -361,7 +361,7 @@ lbl_802498B0: /* 802498B8 002467F8 FC 20 F8 90 */ fmr f1, f31 /* 802498BC 002467FC CB E1 00 38 */ lfd f31, 0x38(r1) /* 802498C0 00246800 39 61 00 38 */ addi r11, r1, 0x38 -/* 802498C4 00246804 48 11 89 55 */ bl func_80362218 +/* 802498C4 00246804 48 11 89 55 */ bl _restgpr_25 /* 802498C8 00246808 80 01 00 44 */ lwz r0, 0x44(r1) /* 802498CC 0024680C 7C 08 03 A6 */ mtlr r0 /* 802498D0 00246810 38 21 00 40 */ addi r1, r1, 0x40 @@ -373,7 +373,7 @@ dMsgStringBase_c_NS_getStringPageLocal: /* 802498DC 0024681C 7C 08 02 A6 */ mflr r0 /* 802498E0 00246820 90 01 00 44 */ stw r0, 0x44(r1) /* 802498E4 00246824 39 61 00 40 */ addi r11, r1, 0x40 -/* 802498E8 00246828 48 11 88 DD */ bl func_803621C4 +/* 802498E8 00246828 48 11 88 DD */ bl _savegpr_23 /* 802498EC 0024682C 7C 78 1B 78 */ mr r24, r3 /* 802498F0 00246830 7C 99 23 78 */ mr r25, r4 /* 802498F4 00246834 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/d/npc/d_npc_lib.s b/asm/d/npc/d_npc_lib.s index 27ebc5fff2..92ee443d1e 100644 --- a/asm/d/npc/d_npc_lib.s +++ b/asm/d/npc/d_npc_lib.s @@ -89,7 +89,7 @@ /* 80251410 0024E350 7C 08 02 A6 */ mflr r0 /* 80251414 0024E354 90 01 00 34 */ stw r0, 0x34(r1) /* 80251418 0024E358 39 61 00 30 */ addi r11, r1, 0x30 -/* 8025141C 0024E35C 48 11 0D A5 */ bl func_803621C0 +/* 8025141C 0024E35C 48 11 0D A5 */ bl _savegpr_22 /* 80251420 0024E360 7C 78 1B 78 */ mr r24, r3 /* 80251424 0024E364 7C 99 23 78 */ mr r25, r4 /* 80251428 0024E368 7C BA 2B 78 */ mr r26, r5 @@ -170,7 +170,7 @@ lbl_8025151C: /* 80251548 0024E488 DB C1 01 20 */ stfd f30, 0x120(r1) /* 8025154C 0024E48C F3 C1 01 28 */ psq_st f30, 296(r1), 0, qr0 /* 80251550 0024E490 39 61 01 20 */ addi r11, r1, 0x120 -/* 80251554 0024E494 48 11 0C 6D */ bl func_803621C0 +/* 80251554 0024E494 48 11 0C 6D */ bl _savegpr_22 /* 80251558 0024E498 7C 7E 1B 78 */ mr r30, r3 /* 8025155C 0024E49C 7C 9F 23 78 */ mr r31, r4 /* 80251560 0024E4A0 7C BB 2B 78 */ mr r27, r5 @@ -835,7 +835,7 @@ lbl_80251EBC: /* 80251ED8 0024EE18 E3 A1 00 88 */ psq_l f29, 136(r1), 0, qr0 /* 80251EDC 0024EE1C CB A1 00 80 */ lfd f29, 0x80(r1) /* 80251EE0 0024EE20 39 61 00 80 */ addi r11, r1, 0x80 -/* 80251EE4 0024EE24 48 11 03 35 */ bl func_80362218 +/* 80251EE4 0024EE24 48 11 03 35 */ bl _restgpr_25 /* 80251EE8 0024EE28 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80251EEC 0024EE2C 7C 08 03 A6 */ mtlr r0 /* 80251EF0 0024EE30 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -849,7 +849,7 @@ dNpcLib_lookat_c_NS_update: /* 80251F04 0024EE44 DB E1 00 80 */ stfd f31, 0x80(r1) /* 80251F08 0024EE48 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 80251F0C 0024EE4C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80251F10 0024EE50 48 11 02 B5 */ bl func_803621C4 +/* 80251F10 0024EE50 48 11 02 B5 */ bl _savegpr_23 /* 80251F14 0024EE54 7C 7D 1B 78 */ mr r29, r3 /* 80251F18 0024EE58 80 0D 8B E0 */ lwz r0, lbl_80451160-_SDA_BASE_(r13) /* 80251F1C 0024EE5C 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index 0999edc1fb..173d56625e 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -1759,7 +1759,7 @@ lbl_8025529C: /* 8025529C 002521DC 38 60 00 00 */ li r3, 0 lbl_802552A0: /* 802552A0 002521E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802552A4 002521E4 48 10 CF 75 */ bl func_80362218 +/* 802552A4 002521E4 48 10 CF 75 */ bl _restgpr_25 /* 802552A8 002521E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 802552AC 002521EC 7C 08 03 A6 */ mtlr r0 /* 802552B0 002521F0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index a5c8d0deee..8bef15e27e 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -130,7 +130,7 @@ lbl_80050E4C: /* 80050E5C 0004DD9C E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 80050E60 0004DDA0 CB A1 00 30 */ lfd f29, 0x30(r1) /* 80050E64 0004DDA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80050E68 0004DDA8 48 31 13 B1 */ bl func_80362218 +/* 80050E68 0004DDA8 48 31 13 B1 */ bl _restgpr_25 /* 80050E6C 0004DDAC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80050E70 0004DDB0 7C 08 03 A6 */ mtlr r0 /* 80050E74 0004DDB4 38 21 00 60 */ addi r1, r1, 0x60 @@ -349,7 +349,7 @@ dPaPoT_c_NS_setEffectTwo: /* 80051160 0004E0A0 7C 08 02 A6 */ mflr r0 /* 80051164 0004E0A4 90 01 00 54 */ stw r0, 0x54(r1) /* 80051168 0004E0A8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8005116C 0004E0AC 48 31 10 55 */ bl func_803621C0 +/* 8005116C 0004E0AC 48 31 10 55 */ bl _savegpr_22 /* 80051170 0004E0B0 7C 7C 1B 78 */ mr r28, r3 /* 80051174 0004E0B4 7C 9D 23 78 */ mr r29, r4 /* 80051178 0004E0B8 7C B6 2B 78 */ mr r22, r5 @@ -457,7 +457,7 @@ dPaPoF_c_NS_setEffectFour: /* 800512EC 0004E22C 7C 08 02 A6 */ mflr r0 /* 800512F0 0004E230 90 01 00 54 */ stw r0, 0x54(r1) /* 800512F4 0004E234 39 61 00 50 */ addi r11, r1, 0x50 -/* 800512F8 0004E238 48 31 0E C9 */ bl func_803621C0 +/* 800512F8 0004E238 48 31 0E C9 */ bl _savegpr_22 /* 800512FC 0004E23C 7C 7C 1B 78 */ mr r28, r3 /* 80051300 0004E240 7C 9D 23 78 */ mr r29, r4 /* 80051304 0004E244 7C B6 2B 78 */ mr r22, r5 diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index 8c79e118ae..9294cbc40e 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -76,7 +76,7 @@ lbl_8025AF00: /* 8025AF08 00257E48 7F A3 EB 78 */ mr r3, r29 lbl_8025AF0C: /* 8025AF0C 00257E4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8025AF10 00257E50 48 10 73 09 */ bl func_80362218 +/* 8025AF10 00257E50 48 10 73 09 */ bl _restgpr_25 /* 8025AF14 00257E54 80 01 00 34 */ lwz r0, 0x34(r1) /* 8025AF18 00257E58 7C 08 03 A6 */ mtlr r0 /* 8025AF1C 00257E5C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index da0f6ec7e5..9ebe0de2e3 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -29,7 +29,7 @@ dSelect_cursor_c: /* 8019422C 0019116C DB E1 00 30 */ stfd f31, 0x30(r1) /* 80194230 00191170 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80194234 00191174 39 61 00 30 */ addi r11, r1, 0x30 -/* 80194238 00191178 48 1C DF 8D */ bl func_803621C4 +/* 80194238 00191178 48 1C DF 8D */ bl _savegpr_23 /* 8019423C 0019117C 7C 7F 1B 78 */ mr r31, r3 /* 80194240 00191180 7C 97 23 78 */ mr r23, r4 /* 80194244 00191184 FF E0 08 90 */ fmr f31, f1 diff --git a/asm/d/shop/item/d_shop_item_ctrl.s b/asm/d/shop/item/d_shop_item_ctrl.s index 63166a89c5..cf09ce18f3 100644 --- a/asm/d/shop/item/d_shop_item_ctrl.s +++ b/asm/d/shop/item/d_shop_item_ctrl.s @@ -200,7 +200,7 @@ dShopItemCtrl_c_NS_setZoomAnime: /* 80196BA8 00193AE8 7C 08 02 A6 */ mflr r0 /* 80196BAC 00193AEC 90 01 00 84 */ stw r0, 0x84(r1) /* 80196BB0 00193AF0 39 61 00 80 */ addi r11, r1, 0x80 -/* 80196BB4 00193AF4 48 1C B6 11 */ bl func_803621C4 +/* 80196BB4 00193AF4 48 1C B6 11 */ bl _savegpr_23 /* 80196BB8 00193AF8 7C 78 1B 78 */ mr r24, r3 /* 80196BBC 00193AFC 7C 99 23 78 */ mr r25, r4 /* 80196BC0 00193B00 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index 31e926531a..93df1a813c 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -291,7 +291,7 @@ lbl_8004902C: /* 8004903C 00045F7C 38 60 00 00 */ li r3, 0 lbl_80049040: /* 80049040 00045F80 39 61 00 30 */ addi r11, r1, 0x30 -/* 80049044 00045F84 48 31 91 D5 */ bl func_80362218 +/* 80049044 00045F84 48 31 91 D5 */ bl _restgpr_25 /* 80049048 00045F88 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004904C 00045F8C 7C 08 03 A6 */ mtlr r0 /* 80049050 00045F90 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/f/ap/f_ap_game.s b/asm/f/ap/f_ap_game.s index 125a93ac13..8e404fadfc 100644 --- a/asm/f/ap/f_ap_game.s +++ b/asm/f/ap/f_ap_game.s @@ -94,7 +94,7 @@ fapGm_Execute: /* 80018A7C 000159BC 3C 80 80 02 */ lis r4, fapGm_After@ha .global fapGm_After /* 80018A80 000159C0 38 84 8A 44 */ addi r4, r4, fapGm_After@l -/* 80018A84 000159C4 48 00 96 D5 */ bl fpcM_Management +/* 80018A84 000159C4 48 00 96 D5 */ bl fpcM_Management__FPFv_vPFv_v /* 80018A88 000159C8 38 60 00 00 */ li r3, 0 /* 80018A8C 000159CC 48 24 D3 91 */ bl cCt_Counter /* 80018A90 000159D0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index 60765df131..e9dba3b9d4 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -475,7 +475,7 @@ lbl_80019EB0: /* 80019ED4 00016E14 4B FF FF 31 */ bl fopAcM_fastCreate lbl_80019ED8: /* 80019ED8 00016E18 39 61 00 30 */ addi r11, r1, 0x30 -/* 80019EDC 00016E1C 48 34 83 3D */ bl func_80362218 +/* 80019EDC 00016E1C 48 34 83 3D */ bl _restgpr_25 /* 80019EE0 00016E20 80 01 00 34 */ lwz r0, 0x34(r1) /* 80019EE4 00016E24 7C 08 03 A6 */ mtlr r0 /* 80019EE8 00016E28 38 21 00 30 */ addi r1, r1, 0x30 @@ -523,7 +523,7 @@ lbl_80019F60: /* 80019F7C 00016EBC 7C 08 02 A6 */ mflr r0 /* 80019F80 00016EC0 90 01 00 64 */ stw r0, 0x64(r1) /* 80019F84 00016EC4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80019F88 00016EC8 48 34 82 3D */ bl func_803621C4 +/* 80019F88 00016EC8 48 34 82 3D */ bl _savegpr_23 /* 80019F8C 00016ECC 7C 79 1B 78 */ mr r25, r3 /* 80019F90 00016ED0 7C 9A 23 78 */ mr r26, r4 /* 80019F94 00016ED4 7C BB 2B 78 */ mr r27, r5 @@ -2051,7 +2051,7 @@ lbl_8001B494: /* 8001B4C4 00018404 48 02 61 A5 */ bl dEvt_control_c_NS_order lbl_8001B4C8: /* 8001B4C8 00018408 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B4CC 0001840C 48 34 6D 4D */ bl func_80362218 +/* 8001B4CC 0001840C 48 34 6D 4D */ bl _restgpr_25 /* 8001B4D0 00018410 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001B4D4 00018414 7C 08 03 A6 */ mtlr r0 /* 8001B4D8 00018418 38 21 00 30 */ addi r1, r1, 0x30 @@ -2271,7 +2271,7 @@ fopAcM_orderMapToolEvent: /* 8001B7B8 000186F8 7C 08 02 A6 */ mflr r0 /* 8001B7BC 000186FC 90 01 00 44 */ stw r0, 0x44(r1) /* 8001B7C0 00018700 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001B7C4 00018704 48 34 6A 01 */ bl func_803621C4 +/* 8001B7C4 00018704 48 34 6A 01 */ bl _savegpr_23 /* 8001B7C8 00018708 7C 78 1B 78 */ mr r24, r3 /* 8001B7CC 0001870C 7C 99 23 78 */ mr r25, r4 /* 8001B7D0 00018710 7C BA 2B 78 */ mr r26, r5 @@ -2618,7 +2618,7 @@ lbl_8001BC3C: /* 8001BC58 00018B98 48 00 04 21 */ bl fopAcM_createDemoItem lbl_8001BC5C: /* 8001BC5C 00018B9C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001BC60 00018BA0 48 34 65 B9 */ bl func_80362218 +/* 8001BC60 00018BA0 48 34 65 B9 */ bl _restgpr_25 /* 8001BC64 00018BA4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001BC68 00018BA8 7C 08 03 A6 */ mtlr r0 /* 8001BC6C 00018BAC 38 21 00 30 */ addi r1, r1, 0x30 @@ -2842,7 +2842,7 @@ fopAcM_createItemFromTable: /* 8001BF68 00018EA8 7C 08 02 A6 */ mflr r0 /* 8001BF6C 00018EAC 90 01 00 44 */ stw r0, 0x44(r1) /* 8001BF70 00018EB0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001BF74 00018EB4 48 34 62 51 */ bl func_803621C4 +/* 8001BF74 00018EB4 48 34 62 51 */ bl _savegpr_23 /* 8001BF78 00018EB8 7C 77 1B 78 */ mr r23, r3 /* 8001BF7C 00018EBC 7C B8 2B 78 */ mr r24, r5 /* 8001BF80 00018EC0 7C D9 33 78 */ mr r25, r6 @@ -3154,7 +3154,7 @@ lbl_8001C3A8: /* 8001C3C4 00019304 4B FF D9 D5 */ bl fopAcM_create_X1_ lbl_8001C3C8: /* 8001C3C8 00019308 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C3CC 0001930C 48 34 5E 4D */ bl func_80362218 +/* 8001C3CC 0001930C 48 34 5E 4D */ bl _restgpr_25 /* 8001C3D0 00019310 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001C3D4 00019314 7C 08 03 A6 */ mtlr r0 /* 8001C3D8 00019318 38 21 00 40 */ addi r1, r1, 0x40 @@ -3283,7 +3283,7 @@ lbl_8001C56C: /* 8001C594 000194D4 4B FF D8 71 */ bl fopAcM_fastCreate lbl_8001C598: /* 8001C598 000194D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C59C 000194DC 48 34 5C 7D */ bl func_80362218 +/* 8001C59C 000194DC 48 34 5C 7D */ bl _restgpr_25 /* 8001C5A0 000194E0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001C5A4 000194E4 7C 08 03 A6 */ mtlr r0 /* 8001C5A8 000194E8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/m/Do/dvd/m_Do_dvd_thread.s b/asm/m/Do/dvd/m_Do_dvd_thread.s index 4d62607c3d..b0052bc40e 100644 --- a/asm/m/Do/dvd/m_Do_dvd_thread.s +++ b/asm/m/Do/dvd/m_Do_dvd_thread.s @@ -665,7 +665,7 @@ lbl_800160D8: /* 800160E8 00013028 7C 00 19 10 */ subfe r0, r0, r3 /* 800160EC 0001302C 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 800160F0 00013030 39 61 00 30 */ addi r11, r1, 0x30 -/* 800160F4 00013034 48 34 C1 25 */ bl func_80362218 +/* 800160F4 00013034 48 34 C1 25 */ bl _restgpr_25 /* 800160F8 00013038 80 01 00 34 */ lwz r0, 0x34(r1) /* 800160FC 0001303C 7C 08 03 A6 */ mtlr r0 /* 80016100 00013040 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index a8d4bc07ff..5d4fd5070c 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -1657,7 +1657,7 @@ lbl_8000E798: /* 8000E7A4 0000B6E4 41 80 FF D8 */ blt lbl_8000E77C lbl_8000E7A8: /* 8000E7A8 0000B6E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8000E7AC 0000B6EC 48 35 3A 6D */ bl func_80362218 +/* 8000E7AC 0000B6EC 48 35 3A 6D */ bl _restgpr_25 /* 8000E7B0 0000B6F0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000E7B4 0000B6F4 7C 08 03 A6 */ mtlr r0 /* 8000E7B8 0000B6F8 38 21 00 40 */ addi r1, r1, 0x40 @@ -1695,7 +1695,7 @@ lbl_8000E7A8: /* 8000E838 0000B778 7C 08 02 A6 */ mflr r0 /* 8000E83C 0000B77C 90 01 00 34 */ stw r0, 0x34(r1) /* 8000E840 0000B780 39 61 00 30 */ addi r11, r1, 0x30 -/* 8000E844 0000B784 48 35 39 7D */ bl func_803621C0 +/* 8000E844 0000B784 48 35 39 7D */ bl _savegpr_22 /* 8000E848 0000B788 7C 78 1B 78 */ mr r24, r3 /* 8000E84C 0000B78C 83 E3 00 6C */ lwz r31, 0x6c(r3) /* 8000E850 0000B790 83 C3 00 70 */ lwz r30, 0x70(r3) @@ -4029,7 +4029,7 @@ mDoExt_McaMorfSO_NS_create: /* 800108FC 0000D83C DB E1 00 40 */ stfd f31, 0x40(r1) /* 80010900 0000D840 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80010904 0000D844 39 61 00 40 */ addi r11, r1, 0x40 -/* 80010908 0000D848 48 35 18 B9 */ bl func_803621C0 +/* 80010908 0000D848 48 35 18 B9 */ bl _savegpr_22 /* 8001090C 0000D84C 7C 77 1B 78 */ mr r23, r3 /* 80010910 0000D850 7C 98 23 79 */ or. r24, r4, r4 /* 80010914 0000D854 7C B9 2B 78 */ mr r25, r5 @@ -5429,7 +5429,7 @@ lbl_80011D48: /* 80011D50 0000EC90 E3 C1 01 48 */ psq_l f30, 328(r1), 0, qr0 /* 80011D54 0000EC94 CB C1 01 40 */ lfd f30, 0x140(r1) /* 80011D58 0000EC98 39 61 01 40 */ addi r11, r1, 0x140 -/* 80011D5C 0000EC9C 48 35 04 BD */ bl func_80362218 +/* 80011D5C 0000EC9C 48 35 04 BD */ bl _restgpr_25 /* 80011D60 0000ECA0 80 01 01 64 */ lwz r0, 0x164(r1) /* 80011D64 0000ECA4 7C 08 03 A6 */ mtlr r0 /* 80011D68 0000ECA8 38 21 01 60 */ addi r1, r1, 0x160 @@ -7029,7 +7029,7 @@ lbl_80013410: /* 800134DC 0001041C 38 60 00 01 */ li r3, 1 lbl_800134E0: /* 800134E0 00010420 39 61 00 40 */ addi r11, r1, 0x40 -/* 800134E4 00010424 48 34 ED 35 */ bl func_80362218 +/* 800134E4 00010424 48 34 ED 35 */ bl _restgpr_25 /* 800134E8 00010428 80 01 00 44 */ lwz r0, 0x44(r1) /* 800134EC 0001042C 7C 08 03 A6 */ mtlr r0 /* 800134F0 00010430 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/m/Do/machine/m_Do_machine_exception.s b/asm/m/Do/machine/m_Do_machine_exception.s index e2eed8ad28..b04b886f86 100644 --- a/asm/m/Do/machine/m_Do_machine_exception.s +++ b/asm/m/Do/machine/m_Do_machine_exception.s @@ -61,7 +61,7 @@ dispHeapInfo: /* 80017E34 00014D74 7C 08 02 A6 */ mflr r0 /* 80017E38 00014D78 90 01 00 34 */ stw r0, 0x34(r1) /* 80017E3C 00014D7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80017E40 00014D80 48 34 A3 85 */ bl func_803621C4 +/* 80017E40 00014D80 48 34 A3 85 */ bl _savegpr_23 /* 80017E44 00014D84 80 6D 86 AC */ lwz r3, lbl_80450C2C-_SDA_BASE_(r13) /* 80017E48 00014D88 7C 7F 1B 78 */ mr r31, r3 /* 80017E4C 00014D8C 83 CD 86 A8 */ lwz r30, lbl_80450C28-_SDA_BASE_(r13) diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s b/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s index ae27dc2a59..5501214b51 100644 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s +++ b/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s @@ -4,7 +4,7 @@ /* 802D2340 002CF280 7C 08 02 A6 */ mflr r0 /* 802D2344 002CF284 90 01 00 34 */ stw r0, 0x34(r1) /* 802D2348 002CF288 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D234C 002CF28C 48 08 FE 79 */ bl func_803621C4 +/* 802D234C 002CF28C 48 08 FE 79 */ bl _savegpr_23 /* 802D2350 002CF290 7C 7E 1B 78 */ mr r30, r3 /* 802D2354 002CF294 7C 98 23 78 */ mr r24, r4 /* 802D2358 002CF298 7C BF 2B 78 */ mr r31, r5 diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s b/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s index 6306af973b..ec0652f155 100644 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s +++ b/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s @@ -4,7 +4,7 @@ /* 802D25B8 002CF4F8 7C 08 02 A6 */ mflr r0 /* 802D25BC 002CF4FC 90 01 00 74 */ stw r0, 0x74(r1) /* 802D25C0 002CF500 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D25C4 002CF504 48 08 FB FD */ bl func_803621C0 +/* 802D25C4 002CF504 48 08 FB FD */ bl _savegpr_22 /* 802D25C8 002CF508 7C 79 1B 78 */ mr r25, r3 /* 802D25CC 002CF50C 7C 9A 23 78 */ mr r26, r4 /* 802D25D0 002CF510 7C BB 2B 78 */ mr r27, r5 diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s index 84e5d17878..9e50333fa4 100644 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s +++ b/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s @@ -94,7 +94,7 @@ lbl_802D2968: /* 802D2980 002CF8C0 48 06 C7 9D */ bl OSUnlockMutex /* 802D2984 002CF8C4 38 60 00 00 */ li r3, 0 /* 802D2988 002CF8C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D298C 002CF8CC 48 08 F8 8D */ bl func_80362218 +/* 802D298C 002CF8CC 48 08 F8 8D */ bl _restgpr_25 /* 802D2990 002CF8D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D2994 002CF8D4 7C 08 03 A6 */ mtlr r0 /* 802D2998 002CF8D8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s index 18cac1905e..b7b92f63b1 100644 --- a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s +++ b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s @@ -85,7 +85,7 @@ lbl_802D3748: /* 802D3750 002D0690 48 06 B9 CD */ bl OSUnlockMutex /* 802D3754 002D0694 7F 43 D3 78 */ mr r3, r26 /* 802D3758 002D0698 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D375C 002D069C 48 08 EA BD */ bl func_80362218 +/* 802D375C 002D069C 48 08 EA BD */ bl _restgpr_25 /* 802D3760 002D06A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D3764 002D06A4 7C 08 03 A6 */ mtlr r0 /* 802D3768 002D06A8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s index ad0584f715..5b664dd9da 100644 --- a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s +++ b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s @@ -374,7 +374,7 @@ lbl_802D8F24: /* 802D8F24 002D5E64 38 60 00 01 */ li r3, 1 lbl_802D8F28: /* 802D8F28 002D5E68 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D8F2C 002D5E6C 48 08 92 ED */ bl func_80362218 +/* 802D8F2C 002D5E6C 48 08 92 ED */ bl _restgpr_25 /* 802D8F30 002D5E70 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D8F34 002D5E74 7C 08 03 A6 */ mtlr r0 /* 802D8F38 002D5E78 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s index 5d13010788..470747e608 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s @@ -237,7 +237,7 @@ lbl_802DADBC: /* 802DADBC 002D7CFC 38 60 00 00 */ li r3, 0 lbl_802DADC0: /* 802DADC0 002D7D00 39 61 00 70 */ addi r11, r1, 0x70 -/* 802DADC4 002D7D04 48 08 74 55 */ bl func_80362218 +/* 802DADC4 002D7D04 48 08 74 55 */ bl _restgpr_25 /* 802DADC8 002D7D08 80 01 00 74 */ lwz r0, 0x74(r1) /* 802DADCC 002D7D0C 7C 08 03 A6 */ mtlr r0 /* 802DADD0 002D7D10 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 efe9c68887..fa5b19aa5a 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s @@ -4,7 +4,7 @@ /* 802DB164 002D80A4 7C 08 02 A6 */ mflr r0 /* 802DB168 002D80A8 90 01 00 34 */ stw r0, 0x34(r1) /* 802DB16C 002D80AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DB170 002D80B0 48 08 70 55 */ bl func_803621C4 +/* 802DB170 002D80B0 48 08 70 55 */ bl _savegpr_23 /* 802DB174 002D80B4 7C 98 23 78 */ mr r24, r4 /* 802DB178 002D80B8 3B A0 00 00 */ li r29, 0 /* 802DB17C 002D80BC 3B 80 00 00 */ li r28, 0 diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s index 9620f15949..1f7728e518 100644 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s +++ b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s @@ -140,7 +140,7 @@ lbl_802D8660: /* 802D867C 002D55BC 38 60 00 00 */ li r3, 0 lbl_802D8680: /* 802D8680 002D55C0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D8684 002D55C4 48 08 9B 95 */ bl func_80362218 +/* 802D8684 002D55C4 48 08 9B 95 */ bl _restgpr_25 /* 802D8688 002D55C8 80 01 00 74 */ lwz r0, 0x74(r1) /* 802D868C 002D55CC 7C 08 03 A6 */ mtlr r0 /* 802D8690 002D55D0 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s index 12ba889071..aa5c22e22b 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s @@ -4,7 +4,7 @@ /* 802D9B9C 002D6ADC 7C 08 02 A6 */ mflr r0 /* 802D9BA0 002D6AE0 90 01 01 34 */ stw r0, 0x134(r1) /* 802D9BA4 002D6AE4 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D9BA8 002D6AE8 48 08 86 1D */ bl func_803621C4 +/* 802D9BA8 002D6AE8 48 08 86 1D */ bl _savegpr_23 /* 802D9BAC 002D6AEC 7C 77 1B 78 */ mr r23, r3 /* 802D9BB0 002D6AF0 7C 98 23 78 */ mr r24, r4 /* 802D9BB4 002D6AF4 7C B9 2B 78 */ mr r25, r5 diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s index e4ee008da8..9d7eeebecb 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s @@ -4,7 +4,7 @@ /* 802D9C58 002D6B98 7C 08 02 A6 */ mflr r0 /* 802D9C5C 002D6B9C 90 01 01 34 */ stw r0, 0x134(r1) /* 802D9C60 002D6BA0 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D9C64 002D6BA4 48 08 85 61 */ bl func_803621C4 +/* 802D9C64 002D6BA4 48 08 85 61 */ bl _savegpr_23 /* 802D9C68 002D6BA8 7C 77 1B 78 */ mr r23, r3 /* 802D9C6C 002D6BAC 7C 98 23 78 */ mr r24, r4 /* 802D9C70 002D6BB0 7C B9 2B 78 */ mr r25, r5 diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s index 556672dc51..9c952509f8 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s @@ -161,7 +161,7 @@ lbl_802CF474: /* 802CF474 002CC3B4 38 60 00 00 */ li r3, 0 lbl_802CF478: /* 802CF478 002CC3B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CF47C 002CC3BC 48 09 2D 9D */ bl func_80362218 +/* 802CF47C 002CC3BC 48 09 2D 9D */ bl _restgpr_25 /* 802CF480 002CC3C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CF484 002CC3C4 7C 08 03 A6 */ mtlr r0 /* 802CF488 002CC3C8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s index 2a610361c4..4954167e7f 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s @@ -137,7 +137,7 @@ lbl_802D0548: /* 802D05AC 002CD4EC 48 06 EB 71 */ bl OSUnlockMutex /* 802D05B0 002CD4F0 7F E3 FB 78 */ mr r3, r31 /* 802D05B4 002CD4F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D05B8 002CD4F8 48 09 1C 61 */ bl func_80362218 +/* 802D05B8 002CD4F8 48 09 1C 61 */ bl _restgpr_25 /* 802D05BC 002CD4FC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D05C0 002CD500 7C 08 03 A6 */ mtlr r0 /* 802D05C4 002CD504 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s index e7af7e2b81..121f8481b1 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s @@ -151,7 +151,7 @@ lbl_802D078C: /* 802D07F0 002CD730 48 06 E9 2D */ bl OSUnlockMutex /* 802D07F4 002CD734 7F C3 F3 78 */ mr r3, r30 /* 802D07F8 002CD738 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D07FC 002CD73C 48 09 1A 1D */ bl func_80362218 +/* 802D07FC 002CD73C 48 09 1A 1D */ bl _restgpr_25 /* 802D0800 002CD740 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D0804 002CD744 7C 08 03 A6 */ mtlr r0 /* 802D0808 002CD748 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s index d5b4811bc5..269610592b 100644 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s +++ b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s @@ -106,7 +106,7 @@ lbl_802D1DEC: /* 802D1DF4 002CED34 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 802D1DF8 002CED38 CB E1 00 40 */ lfd f31, 0x40(r1) /* 802D1DFC 002CED3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D1E00 002CED40 48 09 04 19 */ bl _restgpr_25 // func_80362218 +/* 802D1E00 002CED40 48 09 04 19 */ bl _restgpr_25 // _restgpr_25 /* 802D1E04 002CED44 80 01 00 54 */ lwz r0, 0x54(r1) /* 802D1E08 002CED48 7C 08 03 A6 */ mtlr r0 /* 802D1E0C 002CED4C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s index 946c19c7ff..155f8fe411 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s @@ -2,7 +2,7 @@ /* 802E08E8 002DD828 7C 08 02 A6 */ mflr r0 /* 802E08EC 002DD82C 90 01 00 44 */ stw r0, 0x44(r1) /* 802E08F0 002DD830 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E08F4 002DD834 48 08 18 CD */ bl func_803621C0 +/* 802E08F4 002DD834 48 08 18 CD */ bl _savegpr_22 /* 802E08F8 002DD838 3C 60 80 43 */ lis r3, lbl_804343D8@ha /* 802E08FC 002DD83C 3B E3 43 D8 */ addi r31, r3, lbl_804343D8@l /* 802E0900 002DD840 38 7F 00 18 */ addi r3, r31, 0x18 diff --git a/include/JSystem/JUtility/asm/JUTResFont__setBlock.s b/include/JSystem/JUtility/asm/JUTResFont__setBlock.s index 94a17a9da3..b2f526fe61 100644 --- a/include/JSystem/JUtility/asm/JUTResFont__setBlock.s +++ b/include/JSystem/JUtility/asm/JUTResFont__setBlock.s @@ -85,7 +85,7 @@ lbl_802DF464: /* 802DF46C 002DC3AC 7C 1D 00 40 */ cmplw r29, r0 /* 802DF470 002DC3B0 41 80 FF 1C */ blt lbl_802DF38C /* 802DF474 002DC3B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DF478 002DC3B8 48 08 2D A1 */ bl func_80362218 +/* 802DF478 002DC3B8 48 08 2D A1 */ bl _restgpr_25 /* 802DF47C 002DC3BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DF480 002DC3C0 7C 08 03 A6 */ mtlr r0 /* 802DF484 002DC3C4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/SComponent/c_angle/c_angle.h b/include/SComponent/c_angle/c_angle.h index 03ae0e541a..c73747ca47 100644 --- a/include/SComponent/c_angle/c_angle.h +++ b/include/SComponent/c_angle/c_angle.h @@ -5,6 +5,8 @@ class cSAngle { public: + cSAngle(); + private: s16 value; }; 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 a56ad9f485..4616833188 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 @@ -8,7 +8,7 @@ /* 800A344C 000A038C DB A1 00 E0 */ stfd f29, 0xe0(r1) /* 800A3450 000A0390 F3 A1 00 E8 */ psq_st f29, 232(r1), 0, 0 /* 800A3454 000A0394 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 800A3458 000A0398 48 2B ED 6D */ bl func_803621C4 +/* 800A3458 000A0398 48 2B ED 6D */ bl _savegpr_23 /* 800A345C 000A039C 7C 79 1B 78 */ mr r25, r3 /* 800A3460 000A03A0 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800A3464 000A03A4 3B E3 D6 58 */ addi r31, r3, lbl_8038D658@l 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 a2f8c5a754..b8fa807147 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 @@ -4,7 +4,7 @@ /* 800A39C4 000A0904 DB E1 00 70 */ stfd f31, 0x70(r1) /* 800A39C8 000A0908 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* 800A39CC 000A090C 39 61 00 70 */ addi r11, r1, 0x70 -/* 800A39D0 000A0910 48 2B E7 F5 */ bl func_803621C4 +/* 800A39D0 000A0910 48 2B E7 F5 */ bl _savegpr_23 /* 800A39D4 000A0914 7C 7C 1B 78 */ mr r28, r3 /* 800A39D8 000A0918 80 83 20 60 */ lwz r4, 0x2060(r3) /* 800A39DC 000A091C 88 04 00 00 */ lbz r0, 0(r4) 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 d3648cb76e..04e9c8715f 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 @@ -2,7 +2,7 @@ /* 800A4CB8 000A1BF8 7C 08 02 A6 */ mflr r0 /* 800A4CBC 000A1BFC 90 01 00 34 */ stw r0, 0x34(r1) /* 800A4CC0 000A1C00 39 61 00 30 */ addi r11, r1, 0x30 -/* 800A4CC4 000A1C04 48 2B D4 FD */ bl func_803621C0 +/* 800A4CC4 000A1C04 48 2B D4 FD */ bl _savegpr_22 /* 800A4CC8 000A1C08 7C 77 1B 78 */ mr r23, r3 /* 800A4CCC 000A1C0C 3C 60 80 3B */ lis r3, lbl_803AF990@ha /* 800A4CD0 000A1C10 3B 63 F9 90 */ addi r27, r3, lbl_803AF990@l diff --git a/include/d/d_a/d_a_alink/asm/func_800AD3D8.s b/include/d/d_a/d_a_alink/asm/func_800AD3D8.s index 3253365c2f..4c72fb2932 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD3D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD3D8.s @@ -212,7 +212,7 @@ lbl_800AD6A8: /* 800AD6D0 000AA610 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* 800AD6D4 000AA614 CB 81 00 30 */ lfd f28, 0x30(r1) /* 800AD6D8 000AA618 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AD6DC 000AA61C 48 2B 4B 3D */ bl func_80362218 +/* 800AD6DC 000AA61C 48 2B 4B 3D */ bl _restgpr_25 /* 800AD6E0 000AA620 80 01 00 74 */ lwz r0, 0x74(r1) /* 800AD6E4 000AA624 7C 08 03 A6 */ mtlr r0 /* 800AD6E8 000AA628 38 21 00 70 */ addi r1, r1, 0x70 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 c7bab7ef09..db7d5fa9dc 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 @@ -20,7 +20,7 @@ /* 800B0308 000AD248 DA E1 00 E0 */ stfd f23, 0xe0(r1) /* 800B030C 000AD24C F2 E1 00 E8 */ psq_st f23, 232(r1), 0, 0 /* 800B0310 000AD250 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 800B0314 000AD254 48 2B 1E B1 */ bl func_803621C4 +/* 800B0314 000AD254 48 2B 1E B1 */ bl _savegpr_23 /* 800B0318 000AD258 7C 78 1B 78 */ mr r24, r3 /* 800B031C 000AD25C 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800B0320 000AD260 3B C3 D6 58 */ addi r30, r3, lbl_8038D658@l diff --git a/include/d/d_a/d_a_alink/asm/func_800B3500.s b/include/d/d_a/d_a_alink/asm/func_800B3500.s index 3818855066..07aec6931e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3500.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3500.s @@ -79,7 +79,7 @@ lbl_800B35FC: lbl_800B3614: /* 800B3614 000B0554 7F E3 FB 78 */ mr r3, r31 /* 800B3618 000B0558 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B361C 000B055C 48 2A EB FD */ bl func_80362218 +/* 800B361C 000B055C 48 2A EB FD */ bl _restgpr_25 /* 800B3620 000B0560 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B3624 000B0564 7C 08 03 A6 */ mtlr r0 /* 800B3628 000B0568 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800C1F6C.s b/include/d/d_a/d_a_alink/asm/func_800C1F6C.s index 7014d012a7..a5b9e4cc9d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1F6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1F6C.s @@ -1004,7 +1004,7 @@ lbl_800C2D7C: /* 800C2D88 000BFCC8 98 1A 07 74 */ stb r0, 0x774(r26) lbl_800C2D8C: /* 800C2D8C 000BFCCC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800C2D90 000BFCD0 48 29 F4 89 */ bl func_80362218 +/* 800C2D90 000BFCD0 48 29 F4 89 */ bl _restgpr_25 /* 800C2D94 000BFCD4 80 01 00 34 */ lwz r0, 0x34(r1) /* 800C2D98 000BFCD8 7C 08 03 A6 */ mtlr r0 /* 800C2D9C 000BFCDC 38 21 00 30 */ addi r1, r1, 0x30 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 a1c3f62958..c38648a601 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 @@ -2,7 +2,7 @@ /* 800CC800 000C9740 7C 08 02 A6 */ mflr r0 /* 800CC804 000C9744 90 01 00 A4 */ stw r0, 0xa4(r1) /* 800CC808 000C9748 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800CC80C 000C974C 48 29 59 B9 */ bl func_803621C4 +/* 800CC80C 000C974C 48 29 59 B9 */ bl _savegpr_23 /* 800CC810 000C9750 7C 7C 1B 78 */ mr r28, r3 /* 800CC814 000C9754 80 03 05 74 */ lwz r0, 0x574(r3) /* 800CC818 000C9758 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 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 5c4d3b07ad..b96edf01e5 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 @@ -2,7 +2,7 @@ /* 800CE298 000CB1D8 7C 08 02 A6 */ mflr r0 /* 800CE29C 000CB1DC 90 01 00 34 */ stw r0, 0x34(r1) /* 800CE2A0 000CB1E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800CE2A4 000CB1E4 48 29 3F 1D */ bl func_803621C0 +/* 800CE2A4 000CB1E4 48 29 3F 1D */ bl _savegpr_22 /* 800CE2A8 000CB1E8 7C 7A 1B 78 */ mr r26, r3 /* 800CE2AC 000CB1EC 3B E0 00 01 */ li r31, 1 /* 800CE2B0 000CB1F0 7F FE FB 78 */ mr r30, r31 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 faf5a40645..bff409dc49 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 @@ -2,7 +2,7 @@ /* 800CE46C 000CB3AC 7C 08 02 A6 */ mflr r0 /* 800CE470 000CB3B0 90 01 00 34 */ stw r0, 0x34(r1) /* 800CE474 000CB3B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800CE478 000CB3B8 48 29 3D 4D */ bl func_803621C4 +/* 800CE478 000CB3B8 48 29 3D 4D */ bl _savegpr_23 /* 800CE47C 000CB3BC 7C 7C 1B 78 */ mr r28, r3 /* 800CE480 000CB3C0 3B E0 00 00 */ li r31, 0 /* 800CE484 000CB3C4 7F FE FB 78 */ mr r30, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800D1540.s b/include/d/d_a/d_a_alink/asm/func_800D1540.s index 6556ff71a4..d7f7b426b5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1540.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1540.s @@ -85,7 +85,7 @@ lbl_800D1650: lbl_800D166C: /* 800D166C 000CE5AC CB E1 00 28 */ lfd f31, 0x28(r1) /* 800D1670 000CE5B0 39 61 00 28 */ addi r11, r1, 0x28 -/* 800D1674 000CE5B4 48 29 0B A5 */ bl func_80362218 +/* 800D1674 000CE5B4 48 29 0B A5 */ bl _restgpr_25 /* 800D1678 000CE5B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800D167C 000CE5BC 7C 08 03 A6 */ mtlr r0 /* 800D1680 000CE5C0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800D34D8.s b/include/d/d_a/d_a_alink/asm/func_800D34D8.s index eb5de770b8..af0253557e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D34D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D34D8.s @@ -230,7 +230,7 @@ lbl_800D3808: /* 800D380C 000D074C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 800D3810 000D0750 CB E1 00 30 */ lfd f31, 0x30(r1) /* 800D3814 000D0754 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D3818 000D0758 48 28 EA 01 */ bl func_80362218 +/* 800D3818 000D0758 48 28 EA 01 */ bl _restgpr_25 /* 800D381C 000D075C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D3820 000D0760 7C 08 03 A6 */ mtlr r0 /* 800D3824 000D0764 38 21 00 40 */ addi r1, r1, 0x40 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 4764781455..f60172650b 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 @@ -2,7 +2,7 @@ /* 800D7C44 000D4B84 7C 08 02 A6 */ mflr r0 /* 800D7C48 000D4B88 90 01 00 E4 */ stw r0, 0xe4(r1) /* 800D7C4C 000D4B8C 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 800D7C50 000D4B90 48 28 A5 75 */ bl func_803621C4 +/* 800D7C50 000D4B90 48 28 A5 75 */ bl _savegpr_23 /* 800D7C54 000D4B94 7C 7F 1B 78 */ mr r31, r3 /* 800D7C58 000D4B98 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800D7C5C 000D4B9C 3B A3 D6 58 */ addi r29, r3, lbl_8038D658@l diff --git a/include/d/d_a/d_a_alink/asm/func_800DA180.s b/include/d/d_a/d_a_alink/asm/func_800DA180.s index 1be6a0c707..26ca2efb5d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA180.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA180.s @@ -255,7 +255,7 @@ lbl_800DA4CC: /* 800DA538 000D7478 38 60 00 01 */ li r3, 1 lbl_800DA53C: /* 800DA53C 000D747C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800DA540 000D7480 48 28 7C D9 */ bl func_80362218 +/* 800DA540 000D7480 48 28 7C D9 */ bl _restgpr_25 /* 800DA544 000D7484 80 01 00 44 */ lwz r0, 0x44(r1) /* 800DA548 000D7488 7C 08 03 A6 */ mtlr r0 /* 800DA54C 000D748C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC678.s b/include/d/d_a/d_a_alink/asm/func_800DC678.s index 66c7ac3d52..dd875def8f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC678.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC678.s @@ -74,7 +74,7 @@ lbl_800DC774: lbl_800DC780: /* 800DC780 000D96C0 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 800DC784 000D96C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DC788 000D96C8 48 28 5A 91 */ bl func_80362218 +/* 800DC788 000D96C8 48 28 5A 91 */ bl _restgpr_25 /* 800DC78C 000D96CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DC790 000D96D0 7C 08 03 A6 */ mtlr r0 /* 800DC794 000D96D4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800E3F50.s b/include/d/d_a/d_a_alink/asm/func_800E3F50.s index bfcda997d5..59e5080ed9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3F50.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3F50.s @@ -848,7 +848,7 @@ lbl_800E4BB4: /* 800E4BB4 000E1AF4 E3 E1 01 88 */ psq_l f31, 392(r1), 0, 0 /* 800E4BB8 000E1AF8 CB E1 01 80 */ lfd f31, 0x180(r1) /* 800E4BBC 000E1AFC 39 61 01 80 */ addi r11, r1, 0x180 -/* 800E4BC0 000E1B00 48 27 D6 59 */ bl func_80362218 +/* 800E4BC0 000E1B00 48 27 D6 59 */ bl _restgpr_25 /* 800E4BC4 000E1B04 80 01 01 94 */ lwz r0, 0x194(r1) /* 800E4BC8 000E1B08 7C 08 03 A6 */ mtlr r0 /* 800E4BCC 000E1B0C 38 21 01 90 */ addi r1, r1, 0x190 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF95C.s b/include/d/d_a/d_a_alink/asm/func_800EF95C.s index 702985e366..2567258d20 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF95C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF95C.s @@ -289,7 +289,7 @@ lbl_800EFD14: /* 800EFDA4 000ECCE4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* 800EFDA8 000ECCE8 CB C1 00 60 */ lfd f30, 0x60(r1) /* 800EFDAC 000ECCEC 39 61 00 60 */ addi r11, r1, 0x60 -/* 800EFDB0 000ECCF0 48 27 24 69 */ bl func_80362218 +/* 800EFDB0 000ECCF0 48 27 24 69 */ bl _restgpr_25 /* 800EFDB4 000ECCF4 80 01 00 84 */ lwz r0, 0x84(r1) /* 800EFDB8 000ECCF8 7C 08 03 A6 */ mtlr r0 /* 800EFDBC 000ECCFC 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_a/d_a_alink/asm/func_800F81C0.s b/include/d/d_a/d_a_alink/asm/func_800F81C0.s index b84d4ebfe0..68cc19238e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F81C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F81C0.s @@ -273,7 +273,7 @@ lbl_800F85A4: /* 800F85A4 000F54E4 38 60 00 00 */ li r3, 0 lbl_800F85A8: /* 800F85A8 000F54E8 39 61 00 90 */ addi r11, r1, 0x90 -/* 800F85AC 000F54EC 48 26 9C 6D */ bl func_80362218 +/* 800F85AC 000F54EC 48 26 9C 6D */ bl _restgpr_25 /* 800F85B0 000F54F0 80 01 00 94 */ lwz r0, 0x94(r1) /* 800F85B4 000F54F4 7C 08 03 A6 */ mtlr r0 /* 800F85B8 000F54F8 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/include/d/d_a/d_a_alink/asm/func_800F9474.s b/include/d/d_a/d_a_alink/asm/func_800F9474.s index 7f8d8300d2..9c6819401c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9474.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9474.s @@ -80,7 +80,7 @@ lbl_800F9594: /* 800F9598 000F64D8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 800F959C 000F64DC CB E1 00 30 */ lfd f31, 0x30(r1) /* 800F95A0 000F64E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F95A4 000F64E4 48 26 8C 75 */ bl func_80362218 +/* 800F95A4 000F64E4 48 26 8C 75 */ bl _restgpr_25 /* 800F95A8 000F64E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 800F95AC 000F64EC 7C 08 03 A6 */ mtlr r0 /* 800F95B0 000F64F0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_80109BDC.s b/include/d/d_a/d_a_alink/asm/func_80109BDC.s index 3303937219..3a6ec40fca 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109BDC.s +++ b/include/d/d_a/d_a_alink/asm/func_80109BDC.s @@ -1585,7 +1585,7 @@ lbl_8010B274: /* 8010B2BC 001081FC E3 A1 02 18 */ psq_l f29, 536(r1), 0, 0 /* 8010B2C0 00108200 CB A1 02 10 */ lfd f29, 0x210(r1) /* 8010B2C4 00108204 39 61 02 10 */ addi r11, r1, 0x210 -/* 8010B2C8 00108208 48 25 6F 51 */ bl func_80362218 +/* 8010B2C8 00108208 48 25 6F 51 */ bl _restgpr_25 /* 8010B2CC 0010820C 80 01 02 44 */ lwz r0, 0x244(r1) /* 8010B2D0 00108210 7C 08 03 A6 */ mtlr r0 /* 8010B2D4 00108214 38 21 02 40 */ addi r1, r1, 0x240 diff --git a/include/d/d_a/d_a_alink/asm/func_80111A9C.s b/include/d/d_a/d_a_alink/asm/func_80111A9C.s index 624cff3e32..67a28a4e65 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_80111A9C.s @@ -133,7 +133,7 @@ lbl_80111C74: /* 80111C88 0010EBC8 38 60 00 01 */ li r3, 1 lbl_80111C8C: /* 80111C8C 0010EBCC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80111C90 0010EBD0 48 25 05 89 */ bl func_80362218 +/* 80111C90 0010EBD0 48 25 05 89 */ bl _restgpr_25 /* 80111C94 0010EBD4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80111C98 0010EBD8 7C 08 03 A6 */ mtlr r0 /* 80111C9C 0010EBDC 38 21 00 30 */ addi r1, r1, 0x30 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 d1e050239a..7bf45c25cc 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 @@ -2,7 +2,7 @@ /* 801171F8 00114138 7C 08 02 A6 */ mflr r0 /* 801171FC 0011413C 90 01 00 94 */ stw r0, 0x94(r1) /* 80117200 00114140 39 61 00 90 */ addi r11, r1, 0x90 -/* 80117204 00114144 48 24 AF C1 */ bl func_803621C4 +/* 80117204 00114144 48 24 AF C1 */ bl _savegpr_23 /* 80117208 00114148 7C 7F 1B 78 */ mr r31, r3 /* 8011720C 0011414C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80117210 00114150 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_801191C4.s b/include/d/d_a/d_a_alink/asm/func_801191C4.s index 4ffdc72144..e59ca3768f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801191C4.s +++ b/include/d/d_a/d_a_alink/asm/func_801191C4.s @@ -182,7 +182,7 @@ lbl_80119444: /* 80119444 00116384 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80119448 00116388 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8011944C 0011638C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80119450 00116390 48 24 8D C9 */ bl func_80362218 +/* 80119450 00116390 48 24 8D C9 */ bl _restgpr_25 /* 80119454 00116394 80 01 00 44 */ lwz r0, 0x44(r1) /* 80119458 00116398 7C 08 03 A6 */ mtlr r0 /* 8011945C 0011639C 38 21 00 40 */ addi r1, r1, 0x40 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 10e459ed52..021ca7a2f9 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 @@ -4,7 +4,7 @@ /* 8012088C 0011D7CC DB E1 00 50 */ stfd f31, 0x50(r1) /* 80120890 0011D7D0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* 80120894 0011D7D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80120898 0011D7D8 48 24 19 2D */ bl func_803621C4 +/* 80120898 0011D7D8 48 24 19 2D */ bl _savegpr_23 /* 8012089C 0011D7DC 7C 78 1B 78 */ mr r24, r3 /* 801208A0 0011D7E0 3B 20 00 00 */ li r25, 0 /* 801208A4 0011D7E4 3A E0 00 00 */ li r23, 0 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 fa964beee6..9f8711a2aa 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 @@ -6,7 +6,7 @@ /* 80120B14 0011DA54 DB C1 00 60 */ stfd f30, 0x60(r1) /* 80120B18 0011DA58 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* 80120B1C 0011DA5C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80120B20 0011DA60 48 24 16 A1 */ bl func_803621C0 +/* 80120B20 0011DA60 48 24 16 A1 */ bl _savegpr_22 /* 80120B24 0011DA64 7C 7D 1B 78 */ mr r29, r3 /* 80120B28 0011DA68 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80120B2C 0011DA6C 3B 23 D6 58 */ addi r25, r3, lbl_8038D658@l 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 953898ee30..56d9a43afb 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 @@ -6,7 +6,7 @@ /* 80120DC4 0011DD04 DB C1 00 60 */ stfd f30, 0x60(r1) /* 80120DC8 0011DD08 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* 80120DCC 0011DD0C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80120DD0 0011DD10 48 24 13 F1 */ bl func_803621C0 +/* 80120DD0 0011DD10 48 24 13 F1 */ bl _savegpr_22 /* 80120DD4 0011DD14 7C 78 1B 78 */ mr r24, r3 /* 80120DD8 0011DD18 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80120DDC 0011DD1C 3B A3 D6 58 */ addi r29, r3, lbl_8038D658@l 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 e9db841582..2a1c53ffe0 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 @@ -2,7 +2,7 @@ /* 80121008 0011DF48 7C 08 02 A6 */ mflr r0 /* 8012100C 0011DF4C 90 01 00 74 */ stw r0, 0x74(r1) /* 80121010 0011DF50 39 61 00 70 */ addi r11, r1, 0x70 -/* 80121014 0011DF54 48 24 11 AD */ bl func_803621C0 +/* 80121014 0011DF54 48 24 11 AD */ bl _savegpr_22 /* 80121018 0011DF58 7C 7D 1B 78 */ mr r29, r3 /* 8012101C 0011DF5C 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80121020 0011DF60 3B 03 D6 58 */ addi r24, r3, lbl_8038D658@l 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 fc93c56d19..01e6b43d4a 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 @@ -2,7 +2,7 @@ /* 80122F7C 0011FEBC 7C 08 02 A6 */ mflr r0 /* 80122F80 0011FEC0 90 01 00 84 */ stw r0, 0x84(r1) /* 80122F84 0011FEC4 39 61 00 80 */ addi r11, r1, 0x80 -/* 80122F88 0011FEC8 48 23 F2 39 */ bl func_803621C0 +/* 80122F88 0011FEC8 48 23 F2 39 */ bl _savegpr_22 /* 80122F8C 0011FECC 7C 76 1B 78 */ mr r22, r3 /* 80122F90 0011FED0 3C 60 80 3B */ lis r3, lbl_803AF990@ha /* 80122F94 0011FED4 3B E3 F9 90 */ addi r31, r3, lbl_803AF990@l 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 ec019c2b53..8d251a1617 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 @@ -6,7 +6,7 @@ /* 801258B0 001227F0 DB C1 00 E0 */ stfd f30, 0xe0(r1) /* 801258B4 001227F4 F3 C1 00 E8 */ psq_st f30, 232(r1), 0, 0 /* 801258B8 001227F8 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 801258BC 001227FC 48 23 C9 05 */ bl func_803621C0 +/* 801258BC 001227FC 48 23 C9 05 */ bl _savegpr_22 /* 801258C0 00122800 7C 7C 1B 78 */ mr r28, r3 /* 801258C4 00122804 7C 9D 23 78 */ mr r29, r4 /* 801258C8 00122808 7C BE 2B 78 */ mr r30, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_80126F3C.s b/include/d/d_a/d_a_alink/asm/func_80126F3C.s index 74276911fa..21ac925599 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126F3C.s +++ b/include/d/d_a/d_a_alink/asm/func_80126F3C.s @@ -860,7 +860,7 @@ lbl_80127BC8: /* 80127C38 00124B78 90 1F 07 A8 */ stw r0, 0x7a8(r31) lbl_80127C3C: /* 80127C3C 00124B7C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80127C40 00124B80 48 23 A5 D9 */ bl func_80362218 +/* 80127C40 00124B80 48 23 A5 D9 */ bl _restgpr_25 /* 80127C44 00124B84 80 01 00 44 */ lwz r0, 0x44(r1) /* 80127C48 00124B88 7C 08 03 A6 */ mtlr r0 /* 80127C4C 00124B8C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_80127F50.s b/include/d/d_a/d_a_alink/asm/func_80127F50.s index 20bfc27bfb..5ecbf05b42 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127F50.s +++ b/include/d/d_a/d_a_alink/asm/func_80127F50.s @@ -351,7 +351,7 @@ lbl_80128430: /* 80128458 00125398 E3 41 00 58 */ psq_l f26, 88(r1), 0, 0 /* 8012845C 0012539C CB 41 00 50 */ lfd f26, 0x50(r1) /* 80128460 001253A0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80128464 001253A4 48 23 9D B5 */ bl func_80362218 +/* 80128464 001253A4 48 23 9D B5 */ bl _restgpr_25 /* 80128468 001253A8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8012846C 001253AC 7C 08 03 A6 */ mtlr r0 /* 80128470 001253B0 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012948C.s b/include/d/d_a/d_a_alink/asm/func_8012948C.s index 786024c53b..ba1fa7a0af 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012948C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012948C.s @@ -126,7 +126,7 @@ lbl_8012961C: /* 80129658 00126598 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* 8012965C 0012659C CB 81 00 30 */ lfd f28, 0x30(r1) /* 80129660 001265A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80129664 001265A4 48 23 8B B5 */ bl func_80362218 +/* 80129664 001265A4 48 23 8B B5 */ bl _restgpr_25 /* 80129668 001265A8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8012966C 001265AC 7C 08 03 A6 */ mtlr r0 /* 80129670 001265B0 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A498.s b/include/d/d_a/d_a_alink/asm/func_8012A498.s index 9b717b60fe..53d853da73 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A498.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A498.s @@ -566,7 +566,7 @@ lbl_8012AC8C: /* 8012ACAC 00127BEC E3 61 00 98 */ psq_l f27, 152(r1), 0, 0 /* 8012ACB0 00127BF0 CB 61 00 90 */ lfd f27, 0x90(r1) /* 8012ACB4 00127BF4 39 61 00 90 */ addi r11, r1, 0x90 -/* 8012ACB8 00127BF8 48 23 75 61 */ bl func_80362218 +/* 8012ACB8 00127BF8 48 23 75 61 */ bl _restgpr_25 /* 8012ACBC 00127BFC 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8012ACC0 00127C00 7C 08 03 A6 */ mtlr r0 /* 8012ACC4 00127C04 38 21 00 E0 */ addi r1, r1, 0xe0 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 9078d838f7..18e215cbcf 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 @@ -4,7 +4,7 @@ /* 8012AD28 00127C68 DB E1 00 90 */ stfd f31, 0x90(r1) /* 8012AD2C 00127C6C F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* 8012AD30 00127C70 39 61 00 90 */ addi r11, r1, 0x90 -/* 8012AD34 00127C74 48 23 74 8D */ bl func_803621C0 +/* 8012AD34 00127C74 48 23 74 8D */ bl _savegpr_22 /* 8012AD38 00127C78 7C 7F 1B 78 */ mr r31, r3 /* 8012AD3C 00127C7C 3B 3F 29 04 */ addi r25, r31, 0x2904 /* 8012AD40 00127C80 3B 40 00 00 */ li r26, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80130BC4.s b/include/d/d_a/d_a_alink/asm/func_80130BC4.s index 1be2d4de80..0a1367f113 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130BC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80130BC4.s @@ -498,7 +498,7 @@ lbl_801312A8: /* 801312A8 0012E1E8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 801312AC 0012E1EC CB E1 00 40 */ lfd f31, 0x40(r1) /* 801312B0 0012E1F0 39 61 00 40 */ addi r11, r1, 0x40 -/* 801312B4 0012E1F4 48 23 0F 65 */ bl func_80362218 +/* 801312B4 0012E1F4 48 23 0F 65 */ bl _restgpr_25 /* 801312B8 0012E1F8 80 01 00 54 */ lwz r0, 0x54(r1) /* 801312BC 0012E1FC 7C 08 03 A6 */ mtlr r0 /* 801312C0 0012E200 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_80136624.s b/include/d/d_a/d_a_alink/asm/func_80136624.s index 6fdac20a4c..29654dd87e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136624.s +++ b/include/d/d_a/d_a_alink/asm/func_80136624.s @@ -251,7 +251,7 @@ lbl_80136950: /* 801369C8 00133908 38 60 00 01 */ li r3, 1 lbl_801369CC: /* 801369CC 0013390C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801369D0 00133910 48 22 B8 49 */ bl func_80362218 +/* 801369D0 00133910 48 22 B8 49 */ bl _restgpr_25 /* 801369D4 00133914 80 01 00 44 */ lwz r0, 0x44(r1) /* 801369D8 00133918 7C 08 03 A6 */ mtlr r0 /* 801369DC 0013391C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_attention/asm/func_800716B8.s b/include/d/d_attention/asm/func_800716B8.s index 4a0f8ca99f..0917161487 100644 --- a/include/d/d_attention/asm/func_800716B8.s +++ b/include/d/d_attention/asm/func_800716B8.s @@ -2,7 +2,7 @@ /* 800716BC 0006E5FC 7C 08 02 A6 */ mflr r0 /* 800716C0 0006E600 90 01 00 54 */ stw r0, 0x54(r1) /* 800716C4 0006E604 39 61 00 50 */ addi r11, r1, 0x50 -/* 800716C8 0006E608 48 2F 0A F9 */ bl func_803621C0 +/* 800716C8 0006E608 48 2F 0A F9 */ bl _savegpr_22 /* 800716CC 0006E60C 7C 7F 1B 78 */ mr r31, r3 /* 800716D0 0006E610 80 03 03 34 */ lwz r0, 0x334(r3) /* 800716D4 0006E614 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 diff --git a/include/d/d_camera/asm/func_8015FEB8.s b/include/d/d_camera/asm/func_8015FEB8.s index f4539466d8..d1daadb267 100644 --- a/include/d/d_camera/asm/func_8015FEB8.s +++ b/include/d/d_camera/asm/func_8015FEB8.s @@ -2,7 +2,7 @@ /* 8015FEBC 0015CDFC 7C 08 02 A6 */ mflr r0 /* 8015FEC0 0015CE00 90 01 00 34 */ stw r0, 0x34(r1) /* 8015FEC4 0015CE04 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015FEC8 0015CE08 48 20 23 01 */ bl func_803621C8 +/* 8015FEC8 0015CE08 48 20 23 01 */ bl _savegpr_24 /* 8015FECC 0015CE0C 7C 7B 1B 78 */ mr r27, r3 /* 8015FED0 0015CE10 7C 98 23 78 */ mr r24, r4 /* 8015FED4 0015CE14 7C DC 33 78 */ mr r28, r6 @@ -117,7 +117,7 @@ lbl_80160070: /* 80160070 0015CFB0 38 60 00 00 */ li r3, 0 lbl_80160074: /* 80160074 0015CFB4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80160078 0015CFB8 48 20 21 9D */ bl func_80362214 +/* 80160078 0015CFB8 48 20 21 9D */ bl _restgpr_24 /* 8016007C 0015CFBC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80160080 0015CFC0 7C 08 03 A6 */ mtlr r0 /* 80160084 0015CFC4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_camera/asm/func_801622B4.s b/include/d/d_camera/asm/func_801622B4.s index 6f3e26b938..d0e181a865 100644 --- a/include/d/d_camera/asm/func_801622B4.s +++ b/include/d/d_camera/asm/func_801622B4.s @@ -4,7 +4,7 @@ /* 801622C0 0015F200 DB E1 00 90 */ stfd f31, 0x90(r1) /* 801622C4 0015F204 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* 801622C8 0015F208 39 61 00 90 */ addi r11, r1, 0x90 -/* 801622CC 0015F20C 48 1F FF 01 */ bl func_803621CC +/* 801622CC 0015F20C 48 1F FF 01 */ bl _savegpr_25 /* 801622D0 0015F210 7C 7F 1B 78 */ mr r31, r3 /* 801622D4 0015F214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801622D8 0015F218 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l @@ -720,7 +720,7 @@ lbl_80162CC8: /* 80162D18 0015FC58 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* 80162D1C 0015FC5C CB E1 00 90 */ lfd f31, 0x90(r1) /* 80162D20 0015FC60 39 61 00 90 */ addi r11, r1, 0x90 -/* 80162D24 0015FC64 48 1F F4 F5 */ bl func_80362218 +/* 80162D24 0015FC64 48 1F F4 F5 */ bl _restgpr_25 /* 80162D28 0015FC68 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80162D2C 0015FC6C 7C 08 03 A6 */ mtlr r0 /* 80162D30 0015FC70 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_camera/asm/func_801635E4.s b/include/d/d_camera/asm/func_801635E4.s index 88b9a233b7..24a48ad287 100644 --- a/include/d/d_camera/asm/func_801635E4.s +++ b/include/d/d_camera/asm/func_801635E4.s @@ -2,7 +2,7 @@ /* 801635E8 00160528 7C 08 02 A6 */ mflr r0 /* 801635EC 0016052C 90 01 00 44 */ stw r0, 0x44(r1) /* 801635F0 00160530 39 61 00 40 */ addi r11, r1, 0x40 -/* 801635F4 00160534 48 1F EB D9 */ bl func_803621CC +/* 801635F4 00160534 48 1F EB D9 */ bl _savegpr_25 /* 801635F8 00160538 7C 7A 1B 78 */ mr r26, r3 /* 801635FC 0016053C 7C 9B 23 78 */ mr r27, r4 /* 80163600 00160540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -448,7 +448,7 @@ lbl_80163C10: lbl_80163C1C: /* 80163C1C 00160B5C 7F 83 E3 78 */ mr r3, r28 /* 80163C20 00160B60 39 61 00 40 */ addi r11, r1, 0x40 -/* 80163C24 00160B64 48 1F E5 F5 */ bl func_80362218 +/* 80163C24 00160B64 48 1F E5 F5 */ bl _restgpr_25 /* 80163C28 00160B68 80 01 00 44 */ lwz r0, 0x44(r1) /* 80163C2C 00160B6C 7C 08 03 A6 */ mtlr r0 /* 80163C30 00160B70 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_camera/asm/func_80164944.s b/include/d/d_camera/asm/func_80164944.s index 1ea64f0a58..b25d1364fe 100644 --- a/include/d/d_camera/asm/func_80164944.s +++ b/include/d/d_camera/asm/func_80164944.s @@ -2,7 +2,7 @@ /* 80164948 00161888 7C 08 02 A6 */ mflr r0 /* 8016494C 0016188C 90 01 00 34 */ stw r0, 0x34(r1) /* 80164950 00161890 39 61 00 30 */ addi r11, r1, 0x30 -/* 80164954 00161894 48 1F D8 79 */ bl func_803621CC +/* 80164954 00161894 48 1F D8 79 */ bl _savegpr_25 /* 80164958 00161898 7C 7C 1B 78 */ mr r28, r3 /* 8016495C 0016189C 7C 9D 23 78 */ mr r29, r4 /* 80164960 001618A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -142,7 +142,7 @@ lbl_80164B48: /* 80164B48 00161A88 7F E3 FB 78 */ mr r3, r31 lbl_80164B4C: /* 80164B4C 00161A8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80164B50 00161A90 48 1F D6 C9 */ bl func_80362218 +/* 80164B50 00161A90 48 1F D6 C9 */ bl _restgpr_25 /* 80164B54 00161A94 80 01 00 34 */ lwz r0, 0x34(r1) /* 80164B58 00161A98 7C 08 03 A6 */ mtlr r0 /* 80164B5C 00161A9C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_camera/asm/func_80165B60.s b/include/d/d_camera/asm/func_80165B60.s index 1d79f62736..3803696bbd 100644 --- a/include/d/d_camera/asm/func_80165B60.s +++ b/include/d/d_camera/asm/func_80165B60.s @@ -24,7 +24,7 @@ lbl_80165BAC: /* 80165BB4 00162AF4 63 DE 00 04 */ ori r30, r30, 4 lbl_80165BB8: /* 80165BB8 00162AF8 38 61 00 08 */ addi r3, r1, 8 -/* 80165BBC 00162AFC 48 10 93 CD */ bl cM3dGCps +/* 80165BBC 00162AFC 48 10 93 CD */ bl __ct__8cM3dGCpsFv /* 80165BC0 00162B00 38 61 00 08 */ addi r3, r1, 8 /* 80165BC4 00162B04 7F 84 E3 78 */ mr r4, r28 /* 80165BC8 00162B08 7F A5 EB 78 */ mr r5, r29 diff --git a/include/d/d_camera/asm/func_80165CE0.s b/include/d/d_camera/asm/func_80165CE0.s index cc8ecbd223..502a19b5e0 100644 --- a/include/d/d_camera/asm/func_80165CE0.s +++ b/include/d/d_camera/asm/func_80165CE0.s @@ -4,7 +4,7 @@ /* 80165CEC 00162C2C DB E1 00 B0 */ stfd f31, 0xb0(r1) /* 80165CF0 00162C30 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, 0 /* 80165CF4 00162C34 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80165CF8 00162C38 48 1F C4 D1 */ bl func_803621C8 +/* 80165CF8 00162C38 48 1F C4 D1 */ bl _savegpr_24 /* 80165CFC 00162C3C 7C 7F 1B 78 */ mr r31, r3 /* 80165D00 00162C40 7C BD 2B 78 */ mr r29, r5 /* 80165D04 00162C44 7C D8 33 78 */ mr r24, r6 @@ -98,7 +98,7 @@ lbl_80165E14: /* 80165E54 00162D94 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* 80165E58 00162D98 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 80165E5C 00162D9C 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80165E60 00162DA0 48 1F C3 B5 */ bl func_80362214 +/* 80165E60 00162DA0 48 1F C3 B5 */ bl _restgpr_24 /* 80165E64 00162DA4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80165E68 00162DA8 7C 08 03 A6 */ mtlr r0 /* 80165E6C 00162DAC 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/include/d/d_camera/asm/func_80166764.s b/include/d/d_camera/asm/func_80166764.s index 1c6725c6a3..6c0c5f94b1 100644 --- a/include/d/d_camera/asm/func_80166764.s +++ b/include/d/d_camera/asm/func_80166764.s @@ -16,7 +16,7 @@ /* 801667A0 001636E0 DB 21 06 00 */ stfd f25, 0x600(r1) /* 801667A4 001636E4 F3 21 06 08 */ psq_st f25, 1544(r1), 0, 0 /* 801667A8 001636E8 39 61 06 00 */ addi r11, r1, 0x600 -/* 801667AC 001636EC 48 1F BA 15 */ bl func_803621C0 +/* 801667AC 001636EC 48 1F BA 15 */ bl _savegpr_22 /* 801667B0 001636F0 7C 7C 1B 78 */ mr r28, r3 /* 801667B4 001636F4 7C 9D 23 78 */ mr r29, r4 /* 801667B8 001636F8 3B E0 00 00 */ li r31, 0 @@ -1161,7 +1161,7 @@ lbl_80167860: /* 8016786C 001647AC 38 81 03 10 */ addi r4, r1, 0x310 /* 80167870 001647B0 FC 20 E8 90 */ fmr f1, f29 /* 80167874 001647B4 FC 40 E0 90 */ fmr f2, f28 -/* 80167878 001647B8 48 10 78 31 */ bl cM3dGCyl +/* 80167878 001647B8 48 10 78 31 */ bl __ct__8cM3dGCylFPC4cXyzff /* 8016787C 001647BC 38 61 03 AC */ addi r3, r1, 0x3ac /* 80167880 001647C0 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80167884 001647C4 38 A1 03 94 */ addi r5, r1, 0x394 diff --git a/include/d/d_camera/asm/func_80168744.s b/include/d/d_camera/asm/func_80168744.s index e630e4b55b..b0db037b30 100644 --- a/include/d/d_camera/asm/func_80168744.s +++ b/include/d/d_camera/asm/func_80168744.s @@ -1371,7 +1371,7 @@ lbl_80169B10: /* 80169B40 00166A80 4B E9 F6 45 */ bl cXyz_NS_dtor lbl_80169B44: /* 80169B44 00166A84 38 61 00 CC */ addi r3, r1, 0xcc -/* 80169B48 00166A88 48 01 8F 01 */ bl cSAngle +/* 80169B48 00166A88 48 01 8F 01 */ bl __ct__7cSAngleFv /* 80169B4C 00166A8C 7F E3 FB 78 */ mr r3, r31 /* 80169B50 00166A90 3C 80 00 10 */ lis r4, 0x10 /* 80169B54 00166A94 48 01 8E 2D */ bl dCamera_c_NS_chkFlag @@ -3074,7 +3074,7 @@ lbl_8016B480: /* 8016B484 001683C4 90 1F 03 FC */ stw r0, 0x3fc(r31) lbl_8016B488: /* 8016B488 001683C8 38 61 00 BC */ addi r3, r1, 0xbc -/* 8016B48C 001683CC 48 01 75 BD */ bl cSAngle +/* 8016B48C 001683CC 48 01 75 BD */ bl __ct__7cSAngleFv /* 8016B490 001683D0 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016B494 001683D4 48 01 75 75 */ bl cSGlobe_NS_V_X1_ /* 8016B498 001683D8 48 10 5C 89 */ bl cSAngle_NS_Cos @@ -3455,7 +3455,7 @@ lbl_8016B9B8: /* 8016BA24 00168964 4B EC 4A ED */ bl cSAngle_NS_dtor lbl_8016BA28: /* 8016BA28 00168968 38 61 00 B8 */ addi r3, r1, 0xb8 -/* 8016BA2C 0016896C 48 01 70 1D */ bl cSAngle +/* 8016BA2C 0016896C 48 01 70 1D */ bl __ct__7cSAngleFv /* 8016BA30 00168970 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 8016BA34 00168974 41 82 00 90 */ beq lbl_8016BAC4 /* 8016BA38 00168978 56 40 06 3F */ clrlwi. r0, r18, 0x18 diff --git a/include/d/d_camera/asm/func_8016E4F4.s b/include/d/d_camera/asm/func_8016E4F4.s index 47fed5d57f..b80934c2ab 100644 --- a/include/d/d_camera/asm/func_8016E4F4.s +++ b/include/d/d_camera/asm/func_8016E4F4.s @@ -47,7 +47,7 @@ /* 8016E5AC 0016B4EC DA 21 14 A0 */ stfd f17, 0x14a0(r1) /* 8016E5B0 0016B4F0 12 21 00 0E */ psq_stx f17, r1, r0, 0, 0 /* 8016E5B4 0016B4F4 39 61 14 A0 */ addi r11, r1, 0x14a0 -/* 8016E5B8 0016B4F8 48 1F 3C 09 */ bl func_803621C0 +/* 8016E5B8 0016B4F8 48 1F 3C 09 */ bl _savegpr_22 /* 8016E5BC 0016B4FC 7C 7F 1B 78 */ mr r31, r3 /* 8016E5C0 0016B500 7C 9C 23 78 */ mr r28, r4 /* 8016E5C4 0016B504 38 7F 0A EC */ addi r3, r31, 0xaec @@ -410,7 +410,7 @@ lbl_8016EAD8: /* 8016EB0C 0016BA4C 28 00 00 00 */ cmplwi r0, 0 /* 8016EB10 0016BA50 40 82 17 C4 */ bne lbl_801702D4 /* 8016EB14 0016BA54 38 61 02 34 */ addi r3, r1, 0x234 -/* 8016EB18 0016BA58 48 01 3F 31 */ bl cSAngle +/* 8016EB18 0016BA58 48 01 3F 31 */ bl __ct__7cSAngleFv /* 8016EB1C 0016BA5C 38 61 14 54 */ addi r3, r1, 0x1454 /* 8016EB20 0016BA60 4B EA 3A BD */ bl cXyz_NS_ctor /* 8016EB24 0016BA64 38 61 11 B4 */ addi r3, r1, 0x11b4 @@ -810,9 +810,9 @@ lbl_8016F114: /* 8016F11C 0016C05C 90 1F 04 30 */ stw r0, 0x430(r31) lbl_8016F120: /* 8016F120 0016C060 38 61 02 30 */ addi r3, r1, 0x230 -/* 8016F124 0016C064 48 01 39 25 */ bl cSAngle +/* 8016F124 0016C064 48 01 39 25 */ bl __ct__7cSAngleFv /* 8016F128 0016C068 38 61 02 2C */ addi r3, r1, 0x22c -/* 8016F12C 0016C06C 48 01 39 1D */ bl cSAngle +/* 8016F12C 0016C06C 48 01 39 1D */ bl __ct__7cSAngleFv /* 8016F130 0016C070 C0 3F 04 44 */ lfs f1, 0x444(r31) /* 8016F134 0016C074 C0 02 9E 28 */ lfs f0, lbl_80453828-_SDA2_BASE_(r2) /* 8016F138 0016C078 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1292,7 +1292,7 @@ lbl_8016F6FC: /* 8016F870 0016C7B0 38 80 FF FF */ li r4, -1 /* 8016F874 0016C7B4 4B EC 0C 9D */ bl cSAngle_NS_dtor /* 8016F878 0016C7B8 38 61 02 20 */ addi r3, r1, 0x220 -/* 8016F87C 0016C7BC 48 01 31 CD */ bl cSAngle +/* 8016F87C 0016C7BC 48 01 31 CD */ bl __ct__7cSAngleFv /* 8016F880 0016C7C0 C0 02 9E 14 */ lfs f0, lbl_80453814-_SDA2_BASE_(r2) /* 8016F884 0016C7C4 C0 3F 04 48 */ lfs f1, 0x448(r31) /* 8016F888 0016C7C8 FC 00 08 00 */ fcmpu cr0, f0, f1 @@ -1359,7 +1359,7 @@ lbl_8016F96C: /* 8016F970 0016C8B0 38 81 02 20 */ addi r4, r1, 0x220 /* 8016F974 0016C8B4 4B F2 00 E5 */ bl cSGlobe_NS_V /* 8016F978 0016C8B8 38 61 02 1C */ addi r3, r1, 0x21c -/* 8016F97C 0016C8BC 48 01 30 CD */ bl cSAngle +/* 8016F97C 0016C8BC 48 01 30 CD */ bl __ct__7cSAngleFv /* 8016F980 0016C8C0 7F 43 D3 78 */ mr r3, r26 /* 8016F984 0016C8C4 48 01 31 55 */ bl daPy_py_c_NS_checkRide /* 8016F988 0016C8C8 28 03 00 00 */ cmplwi r3, 0 @@ -1561,7 +1561,7 @@ lbl_8016FC54: /* 8016FC7C 0016CBBC 4B F1 EC 19 */ bl cSGlobe_NS_U lbl_8016FC80: /* 8016FC80 0016CBC0 38 61 02 18 */ addi r3, r1, 0x218 -/* 8016FC84 0016CBC4 48 01 2D C5 */ bl cSAngle +/* 8016FC84 0016CBC4 48 01 2D C5 */ bl __ct__7cSAngleFv /* 8016FC88 0016CBC8 3A E0 00 00 */ li r23, 0 /* 8016FC8C 0016CBCC 38 61 13 D0 */ addi r3, r1, 0x13d0 /* 8016FC90 0016CBD0 3C 80 80 43 */ lis r4, lbl_80430CF4@ha @@ -4913,7 +4913,7 @@ lbl_80172EC8: /* 80172F10 0016FE50 38 80 FF FF */ li r4, -1 /* 80172F14 0016FE54 4B E9 62 71 */ bl cXyz_NS_dtor /* 80172F18 0016FE58 38 61 02 04 */ addi r3, r1, 0x204 -/* 80172F1C 0016FE5C 48 00 FB 2D */ bl cSAngle +/* 80172F1C 0016FE5C 48 00 FB 2D */ bl __ct__7cSAngleFv /* 80172F20 0016FE60 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80172F24 0016FE64 2C 00 00 00 */ cmpwi r0, 0 /* 80172F28 0016FE68 41 82 00 2C */ beq lbl_80172F54 @@ -5050,7 +5050,7 @@ lbl_801730D8: /* 80173120 00170060 38 9F 03 EC */ addi r4, r31, 0x3ec /* 80173124 00170064 4B F2 46 B5 */ bl cXyz_NS___as /* 80173128 00170068 38 61 02 00 */ addi r3, r1, 0x200 -/* 8017312C 0017006C 48 00 F9 1D */ bl cSAngle +/* 8017312C 0017006C 48 00 F9 1D */ bl __ct__7cSAngleFv /* 80173130 00170070 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80173134 00170074 2C 00 00 00 */ cmpwi r0, 0 /* 80173138 00170078 41 82 00 38 */ beq lbl_80173170 @@ -5303,7 +5303,7 @@ lbl_80173470: /* 801734EC 0017042C 38 81 12 38 */ addi r4, r1, 0x1238 /* 801734F0 00170430 48 0F E3 91 */ bl cSGlobe_X4_ /* 801734F4 00170434 38 61 01 F8 */ addi r3, r1, 0x1f8 -/* 801734F8 00170438 48 00 F5 51 */ bl cSAngle +/* 801734F8 00170438 48 00 F5 51 */ bl __ct__7cSAngleFv /* 801734FC 0017043C 38 61 12 50 */ addi r3, r1, 0x1250 /* 80173500 00170440 38 81 12 44 */ addi r4, r1, 0x1244 /* 80173504 00170444 4B F1 4E E9 */ bl dCamMath_NS_xyzHorizontalDistance @@ -5831,7 +5831,7 @@ lbl_80173BDC: /* 80173CFC 00170C3C 38 80 FF FF */ li r4, -1 /* 80173D00 00170C40 4B E9 54 85 */ bl cXyz_NS_dtor /* 80173D04 00170C44 38 61 01 F4 */ addi r3, r1, 0x1f4 -/* 80173D08 00170C48 48 00 ED 41 */ bl cSAngle +/* 80173D08 00170C48 48 00 ED 41 */ bl __ct__7cSAngleFv /* 80173D0C 00170C4C 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80173D10 00170C50 2C 00 00 00 */ cmpwi r0, 0 /* 80173D14 00170C54 41 82 00 74 */ beq lbl_80173D88 @@ -6454,7 +6454,7 @@ lbl_801745EC: /* 80174690 001715D0 38 80 FF FF */ li r4, -1 /* 80174694 001715D4 4B E9 4A F1 */ bl cXyz_NS_dtor /* 80174698 001715D8 38 61 01 F0 */ addi r3, r1, 0x1f0 -/* 8017469C 001715DC 48 00 E3 AD */ bl cSAngle +/* 8017469C 001715DC 48 00 E3 AD */ bl __ct__7cSAngleFv /* 801746A0 001715E0 2C 1C 00 24 */ cmpwi r28, 0x24 /* 801746A4 001715E4 40 82 00 60 */ bne lbl_80174704 /* 801746A8 001715E8 38 61 01 F0 */ addi r3, r1, 0x1f0 diff --git a/include/d/d_camera/asm/func_80176E00.s b/include/d/d_camera/asm/func_80176E00.s index f8479bf6c4..add7c60b2b 100644 --- a/include/d/d_camera/asm/func_80176E00.s +++ b/include/d/d_camera/asm/func_80176E00.s @@ -38,7 +38,7 @@ /* 80176E94 00173DD4 D9 C1 04 70 */ stfd f14, 0x470(r1) /* 80176E98 00173DD8 F1 C1 04 78 */ psq_st f14, 1144(r1), 0, 0 /* 80176E9C 00173DDC 39 61 04 70 */ addi r11, r1, 0x470 -/* 80176EA0 00173DE0 48 1E B3 21 */ bl func_803621C0 +/* 80176EA0 00173DE0 48 1E B3 21 */ bl _savegpr_22 /* 80176EA4 00173DE4 7C 78 1B 78 */ mr r24, r3 /* 80176EA8 00173DE8 7C 99 23 78 */ mr r25, r4 /* 80176EAC 00173DEC 38 61 00 FC */ addi r3, r1, 0xfc diff --git a/include/d/d_camera/asm/func_80178E50.s b/include/d/d_camera/asm/func_80178E50.s index a22151c718..b204f8ef31 100644 --- a/include/d/d_camera/asm/func_80178E50.s +++ b/include/d/d_camera/asm/func_80178E50.s @@ -10,7 +10,7 @@ /* 80178E74 00175DB4 DB 81 02 20 */ stfd f28, 0x220(r1) /* 80178E78 00175DB8 F3 81 02 28 */ psq_st f28, 552(r1), 0, 0 /* 80178E7C 00175DBC 39 61 02 20 */ addi r11, r1, 0x220 -/* 80178E80 00175DC0 48 1E 93 4D */ bl func_803621CC +/* 80178E80 00175DC0 48 1E 93 4D */ bl _savegpr_25 /* 80178E84 00175DC4 7C 7A 1B 78 */ mr r26, r3 /* 80178E88 00175DC8 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 80178E8C 00175DCC 1F C4 00 78 */ mulli r30, r4, 0x78 @@ -480,7 +480,7 @@ lbl_80179558: /* 80179570 001764B0 E3 81 02 28 */ psq_l f28, 552(r1), 0, 0 /* 80179574 001764B4 CB 81 02 20 */ lfd f28, 0x220(r1) /* 80179578 001764B8 39 61 02 20 */ addi r11, r1, 0x220 -/* 8017957C 001764BC 48 1E 8C 9D */ bl func_80362218 +/* 8017957C 001764BC 48 1E 8C 9D */ bl _restgpr_25 /* 80179580 001764C0 80 01 02 64 */ lwz r0, 0x264(r1) /* 80179584 001764C4 7C 08 03 A6 */ mtlr r0 /* 80179588 001764C8 38 21 02 60 */ addi r1, r1, 0x260 diff --git a/include/d/d_camera/asm/func_80179590.s b/include/d/d_camera/asm/func_80179590.s index 0a649a06b7..8177fc8862 100644 --- a/include/d/d_camera/asm/func_80179590.s +++ b/include/d/d_camera/asm/func_80179590.s @@ -30,7 +30,7 @@ /* 80179604 00176544 DA 41 02 D0 */ stfd f18, 0x2d0(r1) /* 80179608 00176548 F2 41 02 D8 */ psq_st f18, 728(r1), 0, 0 /* 8017960C 0017654C 39 61 02 D0 */ addi r11, r1, 0x2d0 -/* 80179610 00176550 48 1E 8B B9 */ bl func_803621C8 +/* 80179610 00176550 48 1E 8B B9 */ bl _savegpr_24 /* 80179614 00176554 7C 7C 1B 78 */ mr r28, r3 /* 80179618 00176558 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 8017961C 0017655C 1F C4 00 78 */ mulli r30, r4, 0x78 @@ -869,7 +869,7 @@ lbl_8017A218: /* 8017A280 001771C0 E2 41 02 D8 */ psq_l f18, 728(r1), 0, 0 /* 8017A284 001771C4 CA 41 02 D0 */ lfd f18, 0x2d0(r1) /* 8017A288 001771C8 39 61 02 D0 */ addi r11, r1, 0x2d0 -/* 8017A28C 001771CC 48 1E 7F 89 */ bl func_80362214 +/* 8017A28C 001771CC 48 1E 7F 89 */ bl _restgpr_24 /* 8017A290 001771D0 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 8017A294 001771D4 7C 08 03 A6 */ mtlr r0 /* 8017A298 001771D8 38 21 03 B0 */ addi r1, r1, 0x3b0 diff --git a/include/d/d_camera/asm/func_8017A2A0.s b/include/d/d_camera/asm/func_8017A2A0.s index a7b90a72bf..22af78ace8 100644 --- a/include/d/d_camera/asm/func_8017A2A0.s +++ b/include/d/d_camera/asm/func_8017A2A0.s @@ -26,7 +26,7 @@ /* 8017A304 00177244 DA 81 02 90 */ stfd f20, 0x290(r1) /* 8017A308 00177248 F2 81 02 98 */ psq_st f20, 664(r1), 0, 0 /* 8017A30C 0017724C 39 61 02 90 */ addi r11, r1, 0x290 -/* 8017A310 00177250 48 1E 7E B5 */ bl func_803621C4 +/* 8017A310 00177250 48 1E 7E B5 */ bl _savegpr_23 /* 8017A314 00177254 7C 79 1B 78 */ mr r25, r3 /* 8017A318 00177258 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 8017A31C 0017725C 1F C4 00 78 */ mulli r30, r4, 0x78 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 4f216a36ad..366f9764dc 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 @@ -113,17 +113,19 @@ private: class dComIfG_inf_c { public: + // temp until we map the item short function names item_func& getPlayGiveItem() { return play.getGiveItem(); } u8& getPlayUnkHeart() { return play.getUnkHeart(); } /* 0x00000 */ dSv_info_c info; - /* 0x00EEC */ u8 field_0xeec[0x3C]; - /* 0x00F28 */ u32 saveTotalTime; - /* 0x00F2C */ u32 saveStartTime; - /* 0x00F30 */ u32 field_0xf30; - /* 0x00F34 */ u32 field_0xf34; - /* 0x00F38 */ dComIfG_play_c play; - /* 0x05FD8 */ u8 unk35[0x1612C]; - /* 0x1C104 */ u8 unk18[0x1F4]; // might be part of dDlst_list_c + /* 0x00EEB */ u8 field_0xeeb[0x39]; + /* 0x00F24 */ u32 saveTotalTime; + /* 0x00F28 */ u32 saveStartTime; + /* 0x00F2C */ u32 field_0xf30; + /* 0x00F30 */ u32 field_0xf34; + /* 0x00F34 */ dComIfG_play_c play; + /* 0x05F60 */ u8 field_0x5f60[0x10]; + /* 0x05F70 */ dDlst_list_c draw_list_list; + /* 0x1C110 */ u8 field_0x1C114[0x1E8]; /* 0x1C2F8 */ dRes_info_c resource_info1; /* 0x1C31C */ u8 unk19[0x11DC]; /* 0x1D4F8 */ dRes_info_c resource_info2; 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 b6f556438b..e64e5beb88 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 @@ -2,7 +2,7 @@ /* 80192AA4 0018F9E4 7C 08 02 A6 */ mflr r0 /* 80192AA8 0018F9E8 90 01 00 84 */ stw r0, 0x84(r1) /* 80192AAC 0018F9EC 39 61 00 80 */ addi r11, r1, 0x80 -/* 80192AB0 0018F9F0 48 1C F7 11 */ bl func_803621C0 +/* 80192AB0 0018F9F0 48 1C F7 11 */ bl _savegpr_22 /* 80192AB4 0018F9F4 7C 78 1B 78 */ mr r24, r3 /* 80192AB8 0018F9F8 7C 99 23 78 */ mr r25, r4 /* 80192ABC 0018F9FC A0 84 00 02 */ lhz r4, 2(r4) diff --git a/include/d/d_kankyo/asm/func_8019E13C.s b/include/d/d_kankyo/asm/func_8019E13C.s index cf56b23e31..1d6b6b9406 100644 --- a/include/d/d_kankyo/asm/func_8019E13C.s +++ b/include/d/d_kankyo/asm/func_8019E13C.s @@ -4,7 +4,7 @@ /* 8019E148 0019B088 DB E1 00 40 */ stfd f31, 0x40(r1) /* 8019E14C 0019B08C F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* 8019E150 0019B090 39 61 00 40 */ addi r11, r1, 0x40 -/* 8019E154 0019B094 48 1C 40 71 */ bl func_803621C4 +/* 8019E154 0019B094 48 1C 40 71 */ bl _savegpr_23 /* 8019E158 0019B098 7C 78 1B 78 */ mr r24, r3 /* 8019E15C 0019B09C 7C 99 23 78 */ mr r25, r4 /* 8019E160 0019B0A0 C3 E2 A2 70 */ lfs f31, lbl_80453C70-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/asm/func_8019EC98.s b/include/d/d_kankyo/asm/func_8019EC98.s index 15c1b033e0..ff9197e812 100644 --- a/include/d/d_kankyo/asm/func_8019EC98.s +++ b/include/d/d_kankyo/asm/func_8019EC98.s @@ -4,7 +4,7 @@ /* 8019ECA4 0019BBE4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8019ECA8 0019BBE8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 8019ECAC 0019BBEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019ECB0 0019BBF0 48 1C 35 1D */ bl func_803621CC +/* 8019ECB0 0019BBF0 48 1C 35 1D */ bl _savegpr_25 /* 8019ECB4 0019BBF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8019ECB8 0019BBF8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8019ECBC 0019BBFC 3B 3F 4E 20 */ addi r25, r31, 0x4e20 @@ -383,7 +383,7 @@ lbl_8019F224: /* 8019F244 0019C184 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 8019F248 0019C188 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8019F24C 0019C18C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019F250 0019C190 48 1C 2F C9 */ bl func_80362218 +/* 8019F250 0019C190 48 1C 2F C9 */ bl _restgpr_25 /* 8019F254 0019C194 80 01 00 44 */ lwz r0, 0x44(r1) /* 8019F258 0019C198 7C 08 03 A6 */ mtlr r0 /* 8019F25C 0019C19C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_kankyo/asm/func_801A37C4.s b/include/d/d_kankyo/asm/func_801A37C4.s index eb0fcdeecb..e28215dc89 100644 --- a/include/d/d_kankyo/asm/func_801A37C4.s +++ b/include/d/d_kankyo/asm/func_801A37C4.s @@ -4,7 +4,7 @@ /* 801A37D0 001A0710 DB E1 01 00 */ stfd f31, 0x100(r1) /* 801A37D4 001A0714 F3 E1 01 08 */ psq_st f31, 264(r1), 0, 0 /* 801A37D8 001A0718 39 61 01 00 */ addi r11, r1, 0x100 -/* 801A37DC 001A071C 48 1B E9 F1 */ bl func_803621CC +/* 801A37DC 001A071C 48 1B E9 F1 */ bl _savegpr_25 /* 801A37E0 001A0720 7C 7A 1B 78 */ mr r26, r3 /* 801A37E4 001A0724 7C 9B 23 78 */ mr r27, r4 /* 801A37E8 001A0728 7C BD 2B 78 */ mr r29, r5 @@ -831,7 +831,7 @@ lbl_801A43A4: /* 801A43FC 001A133C E3 E1 01 08 */ psq_l f31, 264(r1), 0, 0 /* 801A4400 001A1340 CB E1 01 00 */ lfd f31, 0x100(r1) /* 801A4404 001A1344 39 61 01 00 */ addi r11, r1, 0x100 -/* 801A4408 001A1348 48 1B DE 11 */ bl func_80362218 +/* 801A4408 001A1348 48 1B DE 11 */ bl _restgpr_25 /* 801A440C 001A134C 80 01 01 14 */ lwz r0, 0x114(r1) /* 801A4410 001A1350 7C 08 03 A6 */ mtlr r0 /* 801A4414 001A1354 38 21 01 10 */ addi r1, r1, 0x110 diff --git a/include/d/d_kankyo/asm/func_801A4420.s b/include/d/d_kankyo/asm/func_801A4420.s index c004cf2fdc..c10bfaafee 100644 --- a/include/d/d_kankyo/asm/func_801A4420.s +++ b/include/d/d_kankyo/asm/func_801A4420.s @@ -2,7 +2,7 @@ /* 801A4424 001A1364 7C 08 02 A6 */ mflr r0 /* 801A4428 001A1368 90 01 00 94 */ stw r0, 0x94(r1) /* 801A442C 001A136C 39 61 00 90 */ addi r11, r1, 0x90 -/* 801A4430 001A1370 48 1B DD 91 */ bl func_803621C0 +/* 801A4430 001A1370 48 1B DD 91 */ bl _savegpr_22 /* 801A4434 001A1374 7C 78 1B 78 */ mr r24, r3 /* 801A4438 001A1378 7C 99 23 79 */ or. r25, r4, r4 /* 801A443C 001A137C 7C BA 2B 78 */ mr r26, r5 diff --git a/include/d/d_kankyo/asm/func_801A4C10.s b/include/d/d_kankyo/asm/func_801A4C10.s index 0a55a42e04..12b37d9a08 100644 --- a/include/d/d_kankyo/asm/func_801A4C10.s +++ b/include/d/d_kankyo/asm/func_801A4C10.s @@ -2,7 +2,7 @@ /* 801A4C14 001A1B54 7C 08 02 A6 */ mflr r0 /* 801A4C18 001A1B58 90 01 00 34 */ stw r0, 0x34(r1) /* 801A4C1C 001A1B5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A4C20 001A1B60 48 1B D5 AD */ bl func_803621CC +/* 801A4C20 001A1B60 48 1B D5 AD */ bl _savegpr_25 /* 801A4C24 001A1B64 7C 79 1B 78 */ mr r25, r3 /* 801A4C28 001A1B68 7C 9A 23 78 */ mr r26, r4 /* 801A4C2C 001A1B6C 7C BB 2B 78 */ mr r27, r5 @@ -100,7 +100,7 @@ lbl_801A4D80: /* 801A4D80 001A1CC0 2C 1C 00 00 */ cmpwi r28, 0 /* 801A4D84 001A1CC4 40 80 FE C4 */ bge lbl_801A4C48 /* 801A4D88 001A1CC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A4D8C 001A1CCC 48 1B D4 8D */ bl func_80362218 +/* 801A4D8C 001A1CCC 48 1B D4 8D */ bl _restgpr_25 /* 801A4D90 001A1CD0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A4D94 001A1CD4 7C 08 03 A6 */ mtlr r0 /* 801A4D98 001A1CD8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_kankyo/asm/func_801A5288.s b/include/d/d_kankyo/asm/func_801A5288.s index ce9b79cb19..620e5ed02f 100644 --- a/include/d/d_kankyo/asm/func_801A5288.s +++ b/include/d/d_kankyo/asm/func_801A5288.s @@ -2,7 +2,7 @@ /* 801A528C 001A21CC 7C 08 02 A6 */ mflr r0 /* 801A5290 001A21D0 90 01 00 34 */ stw r0, 0x34(r1) /* 801A5294 001A21D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A5298 001A21D8 48 1B CF 35 */ bl func_803621CC +/* 801A5298 001A21D8 48 1B CF 35 */ bl _savegpr_25 /* 801A529C 001A21DC 7C 7F 1B 78 */ mr r31, r3 /* 801A52A0 001A21E0 3B 60 00 00 */ li r27, 0 /* 801A52A4 001A21E4 3B C0 00 00 */ li r30, 0 @@ -286,7 +286,7 @@ lbl_801A56A4: /* 801A56C0 001A2600 48 0C A2 BD */ bl cLib_addCalc lbl_801A56C4: /* 801A56C4 001A2604 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A56C8 001A2608 48 1B CB 51 */ bl func_80362218 +/* 801A56C8 001A2608 48 1B CB 51 */ bl _restgpr_25 /* 801A56CC 001A260C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A56D0 001A2610 7C 08 03 A6 */ mtlr r0 /* 801A56D4 001A2614 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_kankyo/asm/func_801A5E54.s b/include/d/d_kankyo/asm/func_801A5E54.s index 2446576e6c..2bd55d3b20 100644 --- a/include/d/d_kankyo/asm/func_801A5E54.s +++ b/include/d/d_kankyo/asm/func_801A5E54.s @@ -8,7 +8,7 @@ /* 801A5E70 001A2DB0 DB A1 00 D0 */ stfd f29, 0xd0(r1) /* 801A5E74 001A2DB4 F3 A1 00 D8 */ psq_st f29, 216(r1), 0, 0 /* 801A5E78 001A2DB8 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 801A5E7C 001A2DBC 48 1B C3 45 */ bl func_803621C0 +/* 801A5E7C 001A2DBC 48 1B C3 45 */ bl _savegpr_22 /* 801A5E80 001A2DC0 38 A0 00 00 */ li r5, 0 /* 801A5E84 001A2DC4 38 C0 00 00 */ li r6, 0 /* 801A5E88 001A2DC8 3C 60 80 3C */ lis r3, lbl_803BBDC4@ha diff --git a/include/d/d_kankyo/asm/func_801A60E0.s b/include/d/d_kankyo/asm/func_801A60E0.s index af4f127261..46955d2a43 100644 --- a/include/d/d_kankyo/asm/func_801A60E0.s +++ b/include/d/d_kankyo/asm/func_801A60E0.s @@ -4,7 +4,7 @@ /* 801A60EC 001A302C DB E1 00 80 */ stfd f31, 0x80(r1) /* 801A60F0 001A3030 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* 801A60F4 001A3034 39 61 00 80 */ addi r11, r1, 0x80 -/* 801A60F8 001A3038 48 1B C0 D5 */ bl func_803621CC +/* 801A60F8 001A3038 48 1B C0 D5 */ bl _savegpr_25 /* 801A60FC 001A303C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801A6100 001A3040 38 03 4A C8 */ addi r0, r3, lbl_80434AC8@l /* 801A6104 001A3044 7C 1B 03 78 */ mr r27, r0 @@ -64,7 +64,7 @@ lbl_801A6190: /* 801A61D4 001A3114 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 801A61D8 001A3118 CB E1 00 80 */ lfd f31, 0x80(r1) /* 801A61DC 001A311C 39 61 00 80 */ addi r11, r1, 0x80 -/* 801A61E0 001A3120 48 1B C0 39 */ bl func_80362218 +/* 801A61E0 001A3120 48 1B C0 39 */ bl _restgpr_25 /* 801A61E4 001A3124 80 01 00 94 */ lwz r0, 0x94(r1) /* 801A61E8 001A3128 7C 08 03 A6 */ mtlr r0 /* 801A61EC 001A312C 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/include/d/d_kankyo/asm/func_801A81C0.s b/include/d/d_kankyo/asm/func_801A81C0.s index 2c4d7e1c07..1678778c14 100644 --- a/include/d/d_kankyo/asm/func_801A81C0.s +++ b/include/d/d_kankyo/asm/func_801A81C0.s @@ -4,7 +4,7 @@ /* 801A81CC 001A510C DB E1 00 30 */ stfd f31, 0x30(r1) /* 801A81D0 001A5110 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 801A81D4 001A5114 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A81D8 001A5118 48 1B 9F F5 */ bl func_803621CC +/* 801A81D8 001A5118 48 1B 9F F5 */ bl _savegpr_25 /* 801A81DC 001A511C 7C 79 1B 78 */ mr r25, r3 /* 801A81E0 001A5120 7C 9A 23 78 */ mr r26, r4 /* 801A81E4 001A5124 7C BB 2B 78 */ mr r27, r5 @@ -188,7 +188,7 @@ lbl_801A8454: /* 801A8454 001A5394 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 801A8458 001A5398 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801A845C 001A539C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A8460 001A53A0 48 1B 9D B9 */ bl func_80362218 +/* 801A8460 001A53A0 48 1B 9D B9 */ bl _restgpr_25 /* 801A8464 001A53A4 80 01 00 44 */ lwz r0, 0x44(r1) /* 801A8468 001A53A8 7C 08 03 A6 */ mtlr r0 /* 801A846C 001A53AC 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_kankyo/asm/func_801AC70C.s b/include/d/d_kankyo/asm/func_801AC70C.s index dea5f8dc62..acfc5c0dbe 100644 --- a/include/d/d_kankyo/asm/func_801AC70C.s +++ b/include/d/d_kankyo/asm/func_801AC70C.s @@ -2,7 +2,7 @@ /* 801AC710 001A9650 7C 08 02 A6 */ mflr r0 /* 801AC714 001A9654 90 01 00 34 */ stw r0, 0x34(r1) /* 801AC718 001A9658 39 61 00 30 */ addi r11, r1, 0x30 -/* 801AC71C 001A965C 48 1B 5A B1 */ bl func_803621CC +/* 801AC71C 001A965C 48 1B 5A B1 */ bl _savegpr_25 /* 801AC720 001A9660 7C 79 1B 78 */ mr r25, r3 /* 801AC724 001A9664 7C 9A 23 78 */ mr r26, r4 /* 801AC728 001A9668 4B EA A3 49 */ bl dKyd_darkworld_tbl_getp @@ -51,7 +51,7 @@ lbl_801AC7B4: lbl_801AC7C4: /* 801AC7C4 001A9704 7F 83 E3 78 */ mr r3, r28 /* 801AC7C8 001A9708 39 61 00 30 */ addi r11, r1, 0x30 -/* 801AC7CC 001A970C 48 1B 5A 4D */ bl func_80362218 +/* 801AC7CC 001A970C 48 1B 5A 4D */ bl _restgpr_25 /* 801AC7D0 001A9710 80 01 00 34 */ lwz r0, 0x34(r1) /* 801AC7D4 001A9714 7C 08 03 A6 */ mtlr r0 /* 801AC7D8 001A9718 38 21 00 30 */ addi r1, r1, 0x30 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 3be2d2bf58..b461001e1e 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 @@ -20,7 +20,7 @@ /* 8005E944 0005B884 DA E1 01 C0 */ stfd f23, 0x1c0(r1) /* 8005E948 0005B888 F2 E1 01 C8 */ psq_st f23, 456(r1), 0, 0 /* 8005E94C 0005B88C 39 61 01 C0 */ addi r11, r1, 0x1c0 -/* 8005E950 0005B890 48 30 38 71 */ bl func_803621C0 +/* 8005E950 0005B890 48 30 38 71 */ bl _savegpr_22 /* 8005E954 0005B894 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005E958 0005B898 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005E95C 0005B89C 83 43 0E B0 */ lwz r26, 0xeb0(r3) 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 d2891006b0..932f2ca345 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 @@ -26,7 +26,7 @@ /* 80062110 0005F050 DA 81 00 80 */ stfd f20, 0x80(r1) /* 80062114 0005F054 F2 81 00 88 */ psq_st f20, 136(r1), 0, 0 /* 80062118 0005F058 39 61 00 80 */ addi r11, r1, 0x80 -/* 8006211C 0005F05C 48 30 00 A9 */ bl func_803621C4 +/* 8006211C 0005F05C 48 30 00 A9 */ bl _savegpr_23 /* 80062120 0005F060 38 61 00 14 */ addi r3, r1, 0x14 /* 80062124 0005F064 4B FF 89 DD */ bl dKyw_get_wind_vecpow /* 80062128 0005F068 C0 01 00 14 */ lfs f0, 0x14(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s index 8e0a4f6d59..82d062c375 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s @@ -22,7 +22,7 @@ /* 80062BA0 0005FAE0 DA C1 01 70 */ stfd f22, 0x170(r1) /* 80062BA4 0005FAE4 F2 C1 01 78 */ psq_st f22, 376(r1), 0, 0 /* 80062BA8 0005FAE8 39 61 01 70 */ addi r11, r1, 0x170 -/* 80062BAC 0005FAEC 48 2F F6 21 */ bl func_803621CC +/* 80062BAC 0005FAEC 48 2F F6 21 */ bl _savegpr_25 /* 80062BB0 0005FAF0 7C 7A 1B 78 */ mr r26, r3 /* 80062BB4 0005FAF4 7C 9B 23 78 */ mr r27, r4 /* 80062BB8 0005FAF8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -726,7 +726,7 @@ lbl_80063608: /* 80063650 00060590 E2 C1 01 78 */ psq_l f22, 376(r1), 0, 0 /* 80063654 00060594 CA C1 01 70 */ lfd f22, 0x170(r1) /* 80063658 00060598 39 61 01 70 */ addi r11, r1, 0x170 -/* 8006365C 0006059C 48 2F EB BD */ bl func_80362218 +/* 8006365C 0006059C 48 2F EB BD */ bl _restgpr_25 /* 80063660 000605A0 80 01 02 14 */ lwz r0, 0x214(r1) /* 80063664 000605A4 7C 08 03 A6 */ mtlr r0 /* 80063668 000605A8 38 21 02 10 */ addi r1, r1, 0x210 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s index 0709299c13..e34ed9042b 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s @@ -6,7 +6,7 @@ /* 8006BE20 00068D60 DB C1 01 C0 */ stfd f30, 0x1c0(r1) /* 8006BE24 00068D64 F3 C1 01 C8 */ psq_st f30, 456(r1), 0, 0 /* 8006BE28 00068D68 39 61 01 C0 */ addi r11, r1, 0x1c0 -/* 8006BE2C 00068D6C 48 2F 63 A1 */ bl func_803621CC +/* 8006BE2C 00068D6C 48 2F 63 A1 */ bl _savegpr_25 /* 8006BE30 00068D70 7C 7B 1B 78 */ mr r27, r3 /* 8006BE34 00068D74 7C 9C 23 78 */ mr r28, r4 /* 8006BE38 00068D78 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -628,7 +628,7 @@ lbl_8006C768: /* 8006C770 000696B0 E3 C1 01 C8 */ psq_l f30, 456(r1), 0, 0 /* 8006C774 000696B4 CB C1 01 C0 */ lfd f30, 0x1c0(r1) /* 8006C778 000696B8 39 61 01 C0 */ addi r11, r1, 0x1c0 -/* 8006C77C 000696BC 48 2F 5A 9D */ bl func_80362218 +/* 8006C77C 000696BC 48 2F 5A 9D */ bl _restgpr_25 /* 8006C780 000696C0 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 8006C784 000696C4 7C 08 03 A6 */ mtlr r0 /* 8006C788 000696C8 38 21 01 E0 */ addi r1, r1, 0x1e0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s index 3879b95ced..06258bf177 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s @@ -10,7 +10,7 @@ /* 8006C880 000697C0 DB 81 00 E0 */ stfd f28, 0xe0(r1) /* 8006C884 000697C4 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0 /* 8006C888 000697C8 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8006C88C 000697CC 48 2F 59 41 */ bl func_803621CC +/* 8006C88C 000697CC 48 2F 59 41 */ bl _savegpr_25 /* 8006C890 000697D0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006C894 000697D4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006C898 000697D8 83 C3 10 4C */ lwz r30, 0x104c(r3) @@ -532,7 +532,7 @@ lbl_8006CFE4: /* 8006CFFC 00069F3C E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0 /* 8006D000 00069F40 CB 81 00 E0 */ lfd f28, 0xe0(r1) /* 8006D004 00069F44 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8006D008 00069F48 48 2F 52 11 */ bl func_80362218 +/* 8006D008 00069F48 48 2F 52 11 */ bl _restgpr_25 /* 8006D00C 00069F4C 80 01 01 24 */ lwz r0, 0x124(r1) /* 8006D010 00069F50 7C 08 03 A6 */ mtlr r0 /* 8006D014 00069F54 38 21 01 20 */ addi r1, r1, 0x120 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s index e27f414219..5eb4532256 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s @@ -18,7 +18,7 @@ /* 8006D060 00069FA0 DB 01 01 70 */ stfd f24, 0x170(r1) /* 8006D064 00069FA4 F3 01 01 78 */ psq_st f24, 376(r1), 0, 0 /* 8006D068 00069FA8 39 61 01 70 */ addi r11, r1, 0x170 -/* 8006D06C 00069FAC 48 2F 51 61 */ bl func_803621CC +/* 8006D06C 00069FAC 48 2F 51 61 */ bl _savegpr_25 /* 8006D070 00069FB0 7C 7A 1B 78 */ mr r26, r3 /* 8006D074 00069FB4 7C 9B 23 78 */ mr r27, r4 /* 8006D078 00069FB8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -580,7 +580,7 @@ lbl_8006D8BC: /* 8006D8F4 0006A834 E3 01 01 78 */ psq_l f24, 376(r1), 0, 0 /* 8006D8F8 0006A838 CB 01 01 70 */ lfd f24, 0x170(r1) /* 8006D8FC 0006A83C 39 61 01 70 */ addi r11, r1, 0x170 -/* 8006D900 0006A840 48 2F 49 19 */ bl func_80362218 +/* 8006D900 0006A840 48 2F 49 19 */ bl _restgpr_25 /* 8006D904 0006A844 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 8006D908 0006A848 7C 08 03 A6 */ mtlr r0 /* 8006D90C 0006A84C 38 21 01 F0 */ addi r1, r1, 0x1f0 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 76c46c704e..1e8ce59c91 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 @@ -28,7 +28,7 @@ /* 8006DAE8 0006AA28 DA 61 01 80 */ stfd f19, 0x180(r1) /* 8006DAEC 0006AA2C F2 61 01 88 */ psq_st f19, 392(r1), 0, 0 /* 8006DAF0 0006AA30 39 61 01 80 */ addi r11, r1, 0x180 -/* 8006DAF4 0006AA34 48 2F 46 D1 */ bl func_803621C4 +/* 8006DAF4 0006AA34 48 2F 46 D1 */ bl _savegpr_23 /* 8006DAF8 0006AA38 7C 79 1B 78 */ mr r25, r3 /* 8006DAFC 0006AA3C 7C 98 23 78 */ mr r24, r4 /* 8006DB00 0006AA40 3C 60 80 43 */ lis r3, lbl_8042CA54@ha 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 2a61c19a44..59bd94224a 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 @@ -10,7 +10,7 @@ /* 8006E6D4 0006B614 DB 81 01 70 */ stfd f28, 0x170(r1) /* 8006E6D8 0006B618 F3 81 01 78 */ psq_st f28, 376(r1), 0, 0 /* 8006E6DC 0006B61C 39 61 01 70 */ addi r11, r1, 0x170 -/* 8006E6E0 0006B620 48 2F 3A E1 */ bl func_803621C0 +/* 8006E6E0 0006B620 48 2F 3A E1 */ bl _savegpr_22 /* 8006E6E4 0006B624 7C 78 1B 78 */ mr r24, r3 /* 8006E6E8 0006B628 7C 99 23 78 */ mr r25, r4 /* 8006E6EC 0006B62C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s index 6857d212b6..4b27ae4971 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s @@ -4,7 +4,7 @@ /* 8005A5CC 0005750C DB E1 00 50 */ stfd f31, 0x50(r1) /* 8005A5D0 00057510 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* 8005A5D4 00057514 39 61 00 50 */ addi r11, r1, 0x50 -/* 8005A5D8 00057518 48 30 7B F5 */ bl func_803621CC +/* 8005A5D8 00057518 48 30 7B F5 */ bl _savegpr_25 /* 8005A5DC 0005751C 3B 80 00 00 */ li r28, 0 /* 8005A5E0 00057520 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A5E4 00057524 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -357,7 +357,7 @@ lbl_8005AAC0: /* 8005AAC0 00057A00 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 8005AAC4 00057A04 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8005AAC8 00057A08 39 61 00 50 */ addi r11, r1, 0x50 -/* 8005AACC 00057A0C 48 30 77 4D */ bl func_80362218 +/* 8005AACC 00057A0C 48 30 77 4D */ bl _restgpr_25 /* 8005AAD0 00057A10 80 01 00 64 */ lwz r0, 0x64(r1) /* 8005AAD4 00057A14 7C 08 03 A6 */ mtlr r0 /* 8005AAD8 00057A18 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s index e278e9ce27..f77fb345eb 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s @@ -2,7 +2,7 @@ /* 8005AE94 00057DD4 7C 08 02 A6 */ mflr r0 /* 8005AE98 00057DD8 90 01 00 44 */ stw r0, 0x44(r1) /* 8005AE9C 00057DDC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8005AEA0 00057DE0 48 30 73 29 */ bl func_803621C8 +/* 8005AEA0 00057DE0 48 30 73 29 */ bl _savegpr_24 /* 8005AEA4 00057DE4 7C 79 1B 78 */ mr r25, r3 /* 8005AEA8 00057DE8 7C 9A 23 78 */ mr r26, r4 /* 8005AEAC 00057DEC 7C BB 2B 78 */ mr r27, r5 @@ -254,7 +254,7 @@ lbl_8005B214: /* 8005B220 00058160 41 80 FC B8 */ blt lbl_8005AED8 lbl_8005B224: /* 8005B224 00058164 39 61 00 40 */ addi r11, r1, 0x40 -/* 8005B228 00058168 48 30 6F ED */ bl func_80362214 +/* 8005B228 00058168 48 30 6F ED */ bl _restgpr_24 /* 8005B22C 0005816C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8005B230 00058170 7C 08 03 A6 */ mtlr r0 /* 8005B234 00058174 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_meter/d_meter_button/asm/func_802047E8.s b/include/d/d_meter/d_meter_button/asm/func_802047E8.s index 8a87e124a6..c8f556b1cb 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802047E8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802047E8.s @@ -4,7 +4,7 @@ /* 802047F4 00201734 DB E1 02 00 */ stfd f31, 0x200(r1) /* 802047F8 00201738 F3 E1 02 08 */ psq_st f31, 520(r1), 0, 0 /* 802047FC 0020173C 39 61 02 00 */ addi r11, r1, 0x200 -/* 80204800 00201740 48 15 D9 C9 */ bl func_803621C8 +/* 80204800 00201740 48 15 D9 C9 */ bl _savegpr_24 /* 80204804 00201744 7C 7F 1B 78 */ mr r31, r3 /* 80204808 00201748 38 60 01 18 */ li r3, 0x118 /* 8020480C 0020174C 48 0C A4 41 */ bl __nw__FUl @@ -1067,7 +1067,7 @@ lbl_802057F4: /* 80205814 00202754 E3 E1 02 08 */ psq_l f31, 520(r1), 0, 0 /* 80205818 00202758 CB E1 02 00 */ lfd f31, 0x200(r1) /* 8020581C 0020275C 39 61 02 00 */ addi r11, r1, 0x200 -/* 80205820 00202760 48 15 C9 F5 */ bl func_80362214 +/* 80205820 00202760 48 15 C9 F5 */ bl _restgpr_24 /* 80205824 00202764 80 01 02 14 */ lwz r0, 0x214(r1) /* 80205828 00202768 7C 08 03 A6 */ mtlr r0 /* 8020582C 0020276C 38 21 02 10 */ addi r1, r1, 0x210 diff --git a/include/d/d_meter/d_meter_button/asm/func_802095C0.s b/include/d/d_meter/d_meter_button/asm/func_802095C0.s index 7d44831830..ca82b47c0e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802095C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802095C0.s @@ -2,7 +2,7 @@ /* 802095C4 00206504 7C 08 02 A6 */ mflr r0 /* 802095C8 00206508 90 01 00 34 */ stw r0, 0x34(r1) /* 802095CC 0020650C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802095D0 00206510 48 15 8B FD */ bl func_803621CC +/* 802095D0 00206510 48 15 8B FD */ bl _savegpr_25 /* 802095D4 00206514 7C 79 1B 78 */ mr r25, r3 /* 802095D8 00206518 7C 9A 23 78 */ mr r26, r4 /* 802095DC 0020651C 7C BB 2B 78 */ mr r27, r5 @@ -512,7 +512,7 @@ lbl_80209CB0: /* 80209CD0 00206C10 41 80 FF E0 */ blt lbl_80209CB0 lbl_80209CD4: /* 80209CD4 00206C14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80209CD8 00206C18 48 15 85 41 */ bl func_80362218 +/* 80209CD8 00206C18 48 15 85 41 */ bl _restgpr_25 /* 80209CDC 00206C1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80209CE0 00206C20 7C 08 03 A6 */ mtlr r0 /* 80209CE4 00206C24 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s index 7cec055e11..f600f5968c 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s @@ -2,7 +2,7 @@ /* 8020C854 00209794 7C 08 02 A6 */ mflr r0 /* 8020C858 00209798 90 01 00 64 */ stw r0, 0x64(r1) /* 8020C85C 0020979C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8020C860 002097A0 48 15 59 69 */ bl func_803621C8 +/* 8020C860 002097A0 48 15 59 69 */ bl _savegpr_24 /* 8020C864 002097A4 7C 7A 1B 78 */ mr r26, r3 /* 8020C868 002097A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8020C86C 002097AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -156,7 +156,7 @@ lbl_8020CA94: /* 8020CA9C 002099DC 7C 1B 18 00 */ cmpw r27, r3 /* 8020CAA0 002099E0 41 80 FE 44 */ blt lbl_8020C8E4 /* 8020CAA4 002099E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8020CAA8 002099E8 48 15 57 6D */ bl func_80362214 +/* 8020CAA8 002099E8 48 15 57 6D */ bl _restgpr_24 /* 8020CAAC 002099EC 80 01 00 64 */ lwz r0, 0x64(r1) /* 8020CAB0 002099F0 7C 08 03 A6 */ mtlr r0 /* 8020CAB4 002099F4 38 21 00 60 */ addi r1, r1, 0x60 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 723673d25f..3c9ad70dd9 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 @@ -18,7 +18,7 @@ /* 8020F730 0020C670 DB 01 00 80 */ stfd f24, 0x80(r1) /* 8020F734 0020C674 F3 01 00 88 */ psq_st f24, 136(r1), 0, 0 /* 8020F738 0020C678 39 61 00 80 */ addi r11, r1, 0x80 -/* 8020F73C 0020C67C 48 15 2A 89 */ bl func_803621C4 +/* 8020F73C 0020C67C 48 15 2A 89 */ bl _savegpr_23 /* 8020F740 0020C680 7C 7F 1B 78 */ mr r31, r3 /* 8020F744 0020C684 C3 C3 00 30 */ lfs f30, 0x30(r3) /* 8020F748 0020C688 80 83 00 14 */ lwz r4, 0x14(r3) diff --git a/include/d/d_meter2/d_meter2/asm/func_8021EA14.s b/include/d/d_meter2/d_meter2/asm/func_8021EA14.s index e218da0165..016e2b7dd5 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021EA14.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021EA14.s @@ -2,7 +2,7 @@ /* 8021EA18 0021B958 7C 08 02 A6 */ mflr r0 /* 8021EA1C 0021B95C 90 01 00 34 */ stw r0, 0x34(r1) /* 8021EA20 0021B960 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021EA24 0021B964 48 14 37 A9 */ bl func_803621CC +/* 8021EA24 0021B964 48 14 37 A9 */ bl _savegpr_25 /* 8021EA28 0021B968 7C 7F 1B 78 */ mr r31, r3 /* 8021EA2C 0021B96C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021EA30 0021B970 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l @@ -472,7 +472,7 @@ lbl_8021F0B8: /* 8021F108 0021C048 4B DF 00 C5 */ bl mDoExt_setCurrentHeap /* 8021F10C 0021C04C 38 60 00 04 */ li r3, 4 /* 8021F110 0021C050 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021F114 0021C054 48 14 31 05 */ bl func_80362218 +/* 8021F114 0021C054 48 14 31 05 */ bl _restgpr_25 /* 8021F118 0021C058 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021F11C 0021C05C 7C 08 03 A6 */ mtlr r0 /* 8021F120 0021C060 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter2/d_meter2/asm/func_80222518.s b/include/d/d_meter2/d_meter2/asm/func_80222518.s index cec41e6d28..2e8c9eb665 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222518.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222518.s @@ -2,7 +2,7 @@ /* 8022251C 0021F45C 7C 08 02 A6 */ mflr r0 /* 80222520 0021F460 90 01 00 34 */ stw r0, 0x34(r1) /* 80222524 0021F464 39 61 00 30 */ addi r11, r1, 0x30 -/* 80222528 0021F468 48 13 FC A5 */ bl func_803621CC +/* 80222528 0021F468 48 13 FC A5 */ bl _savegpr_25 /* 8022252C 0021F46C 7C 7C 1B 78 */ mr r28, r3 /* 80222530 0021F470 38 A0 00 00 */ li r5, 0 /* 80222534 0021F474 38 81 00 0C */ addi r4, r1, 0xc @@ -659,7 +659,7 @@ lbl_80222E44: /* 80222E68 0021FDA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80222E6C 0021FDAC 98 03 00 B8 */ stb r0, 0xb8(r3) /* 80222E70 0021FDB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80222E74 0021FDB4 48 13 F3 A5 */ bl func_80362218 +/* 80222E74 0021FDB4 48 13 F3 A5 */ bl _restgpr_25 /* 80222E78 0021FDB8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80222E7C 0021FDBC 7C 08 03 A6 */ mtlr r0 /* 80222E80 0021FDC0 38 21 00 30 */ addi r1, r1, 0x30 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 0ae1e979c2..d18ef3671d 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224258.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224258.s @@ -2,7 +2,7 @@ /* 8022425C 0022119C 7C 08 02 A6 */ mflr r0 /* 80224260 002211A0 90 01 00 34 */ stw r0, 0x34(r1) /* 80224264 002211A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80224268 002211A8 48 13 DF 5D */ bl func_803621C4 +/* 80224268 002211A8 48 13 DF 5D */ bl _savegpr_23 /* 8022426C 002211AC 7C 7E 1B 78 */ mr r30, r3 /* 80224270 002211B0 3B E0 00 00 */ li r31, 0 /* 80224274 002211B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha 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 9824859b43..f663c6a175 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 @@ -2,7 +2,7 @@ /* 8020FAB8 0020C9F8 7C 08 02 A6 */ mflr r0 /* 8020FABC 0020C9FC 90 01 00 74 */ stw r0, 0x74(r1) /* 8020FAC0 0020CA00 39 61 00 70 */ addi r11, r1, 0x70 -/* 8020FAC4 0020CA04 48 15 26 FD */ bl func_803621C0 +/* 8020FAC4 0020CA04 48 15 26 FD */ bl _savegpr_22 /* 8020FAC8 0020CA08 7C 7F 1B 78 */ mr r31, r3 /* 8020FACC 0020CA0C 3C A0 80 3A */ lis r5, lbl_80398258@ha /* 8020FAD0 0020CA10 3B 05 82 58 */ addi r24, r5, lbl_80398258@l diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s b/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s index b9b3b197dd..d703bdb1d6 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s @@ -2,7 +2,7 @@ /* 80211BF0 0020EB30 7C 08 02 A6 */ mflr r0 /* 80211BF4 0020EB34 90 01 00 34 */ stw r0, 0x34(r1) /* 80211BF8 0020EB38 39 61 00 30 */ addi r11, r1, 0x30 -/* 80211BFC 0020EB3C 48 15 05 D1 */ bl func_803621CC +/* 80211BFC 0020EB3C 48 15 05 D1 */ bl _savegpr_25 /* 80211C00 0020EB40 7C 7C 1B 78 */ mr r28, r3 /* 80211C04 0020EB44 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 80211C08 0020EB48 3B C3 82 58 */ addi r30, r3, lbl_80398258@l @@ -161,7 +161,7 @@ lbl_80211E14: /* 80211E44 0020ED84 38 80 00 01 */ li r4, 1 /* 80211E48 0020ED88 48 00 2D D9 */ bl dMeter2Draw_c_NS_setAlphaLifeChange /* 80211E4C 0020ED8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80211E50 0020ED90 48 15 03 C9 */ bl func_80362218 +/* 80211E50 0020ED90 48 15 03 C9 */ bl _restgpr_25 /* 80211E54 0020ED94 80 01 00 34 */ lwz r0, 0x34(r1) /* 80211E58 0020ED98 7C 08 03 A6 */ mtlr r0 /* 80211E5C 0020ED9C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s b/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s index 02ea28cb97..7d184c5ce6 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s @@ -2,7 +2,7 @@ /* 80212194 0020F0D4 7C 08 02 A6 */ mflr r0 /* 80212198 0020F0D8 90 01 00 34 */ stw r0, 0x34(r1) /* 8021219C 0020F0DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802121A0 0020F0E0 48 15 00 2D */ bl func_803621CC +/* 802121A0 0020F0E0 48 15 00 2D */ bl _savegpr_25 /* 802121A4 0020F0E4 7C 7E 1B 78 */ mr r30, r3 /* 802121A8 0020F0E8 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 802121AC 0020F0EC 3B 63 82 58 */ addi r27, r3, lbl_80398258@l @@ -160,7 +160,7 @@ lbl_80212390: /* 802123E4 0020F324 38 80 00 01 */ li r4, 1 /* 802123E8 0020F328 48 00 39 BD */ bl dMeter2Draw_c_NS_setAlphaLightDropChange /* 802123EC 0020F32C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802123F0 0020F330 48 14 FE 29 */ bl func_80362218 +/* 802123F0 0020F330 48 14 FE 29 */ bl _restgpr_25 /* 802123F4 0020F334 80 01 00 34 */ lwz r0, 0x34(r1) /* 802123F8 0020F338 7C 08 03 A6 */ mtlr r0 /* 802123FC 0020F33C 38 21 00 30 */ addi r1, r1, 0x30 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 54d286a740..a046e50320 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 @@ -2,7 +2,7 @@ /* 802126E8 0020F628 7C 08 02 A6 */ mflr r0 /* 802126EC 0020F62C 90 01 00 74 */ stw r0, 0x74(r1) /* 802126F0 0020F630 39 61 00 70 */ addi r11, r1, 0x70 -/* 802126F4 0020F634 48 14 FA CD */ bl func_803621C0 +/* 802126F4 0020F634 48 14 FA CD */ bl _savegpr_22 /* 802126F8 0020F638 7C 7F 1B 78 */ mr r31, r3 /* 802126FC 0020F63C 38 60 00 01 */ li r3, 1 /* 80212700 0020F640 98 7F 07 61 */ stb r3, 0x761(r31) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s b/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s index edb061835d..4f247b4c58 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s @@ -6,7 +6,7 @@ /* 80214004 00210F44 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80214008 00210F48 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* 8021400C 00210F4C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214010 00210F50 48 14 E1 BD */ bl func_803621CC +/* 80214010 00210F50 48 14 E1 BD */ bl _savegpr_25 /* 80214014 00210F54 7C 79 1B 78 */ mr r25, r3 /* 80214018 00210F58 7C BA 2B 78 */ mr r26, r5 /* 8021401C 00210F5C FF C0 08 90 */ fmr f30, f1 @@ -52,7 +52,7 @@ /* 802140BC 00210FFC E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* 802140C0 00211000 CB C1 00 50 */ lfd f30, 0x50(r1) /* 802140C4 00211004 39 61 00 50 */ addi r11, r1, 0x50 -/* 802140C8 00211008 48 14 E1 51 */ bl func_80362218 +/* 802140C8 00211008 48 14 E1 51 */ bl _restgpr_25 /* 802140CC 0021100C 80 01 00 74 */ lwz r0, 0x74(r1) /* 802140D0 00211010 7C 08 03 A6 */ mtlr r0 /* 802140D4 00211014 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s b/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s index 115d355f30..f9d485c4c4 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s @@ -12,7 +12,7 @@ /* 80214108 00211048 DB 61 00 50 */ stfd f27, 0x50(r1) /* 8021410C 0021104C F3 61 00 58 */ psq_st f27, 88(r1), 0, 0 /* 80214110 00211050 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214114 00211054 48 14 E0 B9 */ bl func_803621CC +/* 80214114 00211054 48 14 E0 B9 */ bl _savegpr_25 /* 80214118 00211058 7C 79 1B 78 */ mr r25, r3 /* 8021411C 0021105C FF 60 08 90 */ fmr f27, f1 /* 80214120 00211060 FF 80 10 90 */ fmr f28, f2 @@ -348,7 +348,7 @@ lbl_802145EC: /* 8021460C 0021154C E3 61 00 58 */ psq_l f27, 88(r1), 0, 0 /* 80214610 00211550 CB 61 00 50 */ lfd f27, 0x50(r1) /* 80214614 00211554 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214618 00211558 48 14 DC 01 */ bl func_80362218 +/* 80214618 00211558 48 14 DC 01 */ bl _restgpr_25 /* 8021461C 0021155C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80214620 00211560 7C 08 03 A6 */ mtlr r0 /* 80214624 00211564 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s b/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s index 543eb03527..c897e64319 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s @@ -2,7 +2,7 @@ /* 80214C24 00211B64 7C 08 02 A6 */ mflr r0 /* 80214C28 00211B68 90 01 00 34 */ stw r0, 0x34(r1) /* 80214C2C 00211B6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80214C30 00211B70 48 14 D5 9D */ bl func_803621CC +/* 80214C30 00211B70 48 14 D5 9D */ bl _savegpr_25 /* 80214C34 00211B74 7C 7A 1B 78 */ mr r26, r3 /* 80214C38 00211B78 7C 9B 23 78 */ mr r27, r4 /* 80214C3C 00211B7C 3B E0 00 00 */ li r31, 0 @@ -128,7 +128,7 @@ lbl_80214DC8: /* 80214DD8 00211D18 48 04 09 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate lbl_80214DDC: /* 80214DDC 00211D1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80214DE0 00211D20 48 14 D4 39 */ bl func_80362218 +/* 80214DE0 00211D20 48 14 D4 39 */ bl _restgpr_25 /* 80214DE4 00211D24 80 01 00 34 */ lwz r0, 0x34(r1) /* 80214DE8 00211D28 7C 08 03 A6 */ mtlr r0 /* 80214DEC 00211D2C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s index 51da0f65f8..c7c9662123 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s @@ -10,7 +10,7 @@ /* 80215B3C 00212A7C DB 81 00 40 */ stfd f28, 0x40(r1) /* 80215B40 00212A80 F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* 80215B44 00212A84 39 61 00 40 */ addi r11, r1, 0x40 -/* 80215B48 00212A88 48 14 C6 85 */ bl func_803621CC +/* 80215B48 00212A88 48 14 C6 85 */ bl _savegpr_25 /* 80215B4C 00212A8C 7C 7A 1B 78 */ mr r26, r3 /* 80215B50 00212A90 FF C0 08 90 */ fmr f30, f1 /* 80215B54 00212A94 FF E0 10 90 */ fmr f31, f2 @@ -163,7 +163,7 @@ lbl_80215D28: /* 80215D84 00212CC4 E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* 80215D88 00212CC8 CB 81 00 40 */ lfd f28, 0x40(r1) /* 80215D8C 00212CCC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80215D90 00212CD0 48 14 C4 89 */ bl func_80362218 +/* 80215D90 00212CD0 48 14 C4 89 */ bl _restgpr_25 /* 80215D94 00212CD4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80215D98 00212CD8 7C 08 03 A6 */ mtlr r0 /* 80215D9C 00212CDC 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s index 67258c3a15..df64be362c 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s @@ -4,7 +4,7 @@ /* 80215F94 00212ED4 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80215F98 00212ED8 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* 80215F9C 00212EDC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80215FA0 00212EE0 48 14 C2 2D */ bl func_803621CC +/* 80215FA0 00212EE0 48 14 C2 2D */ bl _savegpr_25 /* 80215FA4 00212EE4 7C 7D 1B 78 */ mr r29, r3 /* 80215FA8 00212EE8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80215FAC 00212EEC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -240,7 +240,7 @@ lbl_802162FC: /* 8021630C 0021324C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 80216310 00213250 CB E1 00 50 */ lfd f31, 0x50(r1) /* 80216314 00213254 39 61 00 50 */ addi r11, r1, 0x50 -/* 80216318 00213258 48 14 BF 01 */ bl func_80362218 +/* 80216318 00213258 48 14 BF 01 */ bl _restgpr_25 /* 8021631C 0021325C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80216320 00213260 7C 08 03 A6 */ mtlr r0 /* 80216324 00213264 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s index 670515da1f..5af05b45ce 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s @@ -2,7 +2,7 @@ /* 80216330 00213270 7C 08 02 A6 */ mflr r0 /* 80216334 00213274 90 01 00 34 */ stw r0, 0x34(r1) /* 80216338 00213278 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021633C 0021327C 48 14 BE 8D */ bl func_803621C8 +/* 8021633C 0021327C 48 14 BE 8D */ bl _savegpr_24 /* 80216340 00213280 7C 7F 1B 78 */ mr r31, r3 /* 80216344 00213284 7C 98 23 78 */ mr r24, r4 /* 80216348 00213288 80 63 02 D8 */ lwz r3, 0x2d8(r3) @@ -211,7 +211,7 @@ lbl_80216614: /* 80216664 002135A4 3B DE 00 08 */ addi r30, r30, 8 /* 80216668 002135A8 41 80 FF A0 */ blt lbl_80216608 /* 8021666C 002135AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216670 002135B0 48 14 BB A5 */ bl func_80362214 +/* 80216670 002135B0 48 14 BB A5 */ bl _restgpr_24 /* 80216674 002135B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80216678 002135B8 7C 08 03 A6 */ mtlr r0 /* 8021667C 002135BC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s index 685edbfffc..8d4cc4531a 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s @@ -2,7 +2,7 @@ /* 80216688 002135C8 7C 08 02 A6 */ mflr r0 /* 8021668C 002135CC 90 01 00 34 */ stw r0, 0x34(r1) /* 80216690 002135D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216694 002135D4 48 14 BB 39 */ bl func_803621CC +/* 80216694 002135D4 48 14 BB 39 */ bl _savegpr_25 /* 80216698 002135D8 7C 79 1B 78 */ mr r25, r3 /* 8021669C 002135DC 7C 9A 23 78 */ mr r26, r4 /* 802166A0 002135E0 3B E0 00 00 */ li r31, 0 @@ -160,7 +160,7 @@ lbl_80216870: /* 802168B4 002137F4 41 80 FF B0 */ blt lbl_80216864 lbl_802168B8: /* 802168B8 002137F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802168BC 002137FC 48 14 B9 5D */ bl func_80362218 +/* 802168BC 002137FC 48 14 B9 5D */ bl _restgpr_25 /* 802168C0 00213800 80 01 00 34 */ lwz r0, 0x34(r1) /* 802168C4 00213804 7C 08 03 A6 */ mtlr r0 /* 802168C8 00213808 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s index 7e3ace79be..4351497a6e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s @@ -16,7 +16,7 @@ /* 80217120 00214060 DB 21 00 30 */ stfd f25, 0x30(r1) /* 80217124 00214064 F3 21 00 38 */ psq_st f25, 56(r1), 0, 0 /* 80217128 00214068 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021712C 0021406C 48 14 B0 A1 */ bl func_803621CC +/* 8021712C 0021406C 48 14 B0 A1 */ bl _savegpr_25 /* 80217130 00214070 7C 7A 1B 78 */ mr r26, r3 /* 80217134 00214074 7C 9B 23 78 */ mr r27, r4 /* 80217138 00214078 7C BC 2B 78 */ mr r28, r5 @@ -358,7 +358,7 @@ lbl_80217444: /* 8021762C 0021456C E3 21 00 38 */ psq_l f25, 56(r1), 0, 0 /* 80217630 00214570 CB 21 00 30 */ lfd f25, 0x30(r1) /* 80217634 00214574 39 61 00 30 */ addi r11, r1, 0x30 -/* 80217638 00214578 48 14 AB E1 */ bl func_80362218 +/* 80217638 00214578 48 14 AB E1 */ bl _restgpr_25 /* 8021763C 0021457C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80217640 00214580 7C 08 03 A6 */ mtlr r0 /* 80217644 00214584 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s index d37da780cb..58d580ef3e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s @@ -4,7 +4,7 @@ /* 80217AC0 00214A00 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80217AC4 00214A04 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 80217AC8 00214A08 39 61 00 30 */ addi r11, r1, 0x30 -/* 80217ACC 00214A0C 48 14 A7 01 */ bl func_803621CC +/* 80217ACC 00214A0C 48 14 A7 01 */ bl _savegpr_25 /* 80217AD0 00214A10 7C 7F 1B 78 */ mr r31, r3 /* 80217AD4 00214A14 7C 9B 23 78 */ mr r27, r4 /* 80217AD8 00214A18 7C B9 2B 78 */ mr r25, r5 @@ -498,7 +498,7 @@ lbl_80218218: /* 80218218 00215158 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 8021821C 0021515C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80218220 00215160 39 61 00 30 */ addi r11, r1, 0x30 -/* 80218224 00215164 48 14 9F F5 */ bl func_80362218 +/* 80218224 00215164 48 14 9F F5 */ bl _restgpr_25 /* 80218228 00215168 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021822C 0021516C 7C 08 03 A6 */ mtlr r0 /* 80218230 00215170 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s index 09a07101f5..2837342129 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s @@ -6,7 +6,7 @@ /* 8021979C 002166DC DB C1 00 60 */ stfd f30, 0x60(r1) /* 802197A0 002166E0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* 802197A4 002166E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 802197A8 002166E8 48 14 8A 25 */ bl func_803621CC +/* 802197A8 002166E8 48 14 8A 25 */ bl _savegpr_25 /* 802197AC 002166EC 7C 7D 1B 78 */ mr r29, r3 /* 802197B0 002166F0 7C DE 33 78 */ mr r30, r6 /* 802197B4 002166F4 80 63 03 28 */ lwz r3, 0x328(r3) @@ -192,7 +192,7 @@ lbl_80219A5C: /* 80219A64 002169A4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* 80219A68 002169A8 CB C1 00 60 */ lfd f30, 0x60(r1) /* 80219A6C 002169AC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80219A70 002169B0 48 14 87 A9 */ bl func_80362218 +/* 80219A70 002169B0 48 14 87 A9 */ bl _restgpr_25 /* 80219A74 002169B4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80219A78 002169B8 7C 08 03 A6 */ mtlr r0 /* 80219A7C 002169BC 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s index 485ef5e804..758828cbba 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s @@ -6,7 +6,7 @@ /* 80219EAC 00216DEC DB C1 00 60 */ stfd f30, 0x60(r1) /* 80219EB0 00216DF0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* 80219EB4 00216DF4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80219EB8 00216DF8 48 14 83 11 */ bl func_803621C8 +/* 80219EB8 00216DF8 48 14 83 11 */ bl _savegpr_24 /* 80219EBC 00216DFC 7C 78 1B 78 */ mr r24, r3 /* 80219EC0 00216E00 7C 99 23 78 */ mr r25, r4 /* 80219EC4 00216E04 54 9F 10 3A */ slwi r31, r4, 2 @@ -266,7 +266,7 @@ lbl_8021A274: /* 8021A27C 002171BC E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* 8021A280 002171C0 CB C1 00 60 */ lfd f30, 0x60(r1) /* 8021A284 002171C4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A288 002171C8 48 14 7F 8D */ bl func_80362214 +/* 8021A288 002171C8 48 14 7F 8D */ bl _restgpr_24 /* 8021A28C 002171CC 80 01 00 84 */ lwz r0, 0x84(r1) /* 8021A290 002171D0 7C 08 03 A6 */ mtlr r0 /* 8021A294 002171D4 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s index 22b763aae5..a86e934b92 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s @@ -2,7 +2,7 @@ /* 8021A720 00217660 7C 08 02 A6 */ mflr r0 /* 8021A724 00217664 90 01 00 64 */ stw r0, 0x64(r1) /* 8021A728 00217668 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A72C 0021766C 48 14 7A A1 */ bl func_803621CC +/* 8021A72C 0021766C 48 14 7A A1 */ bl _savegpr_25 /* 8021A730 00217670 7C 79 1B 78 */ mr r25, r3 /* 8021A734 00217674 7C 9A 23 78 */ mr r26, r4 /* 8021A738 00217678 7C BB 2B 78 */ mr r27, r5 @@ -173,7 +173,7 @@ lbl_8021A994: /* 8021A9A8 002178E8 7D 89 03 A6 */ mtctr r12 /* 8021A9AC 002178EC 4E 80 04 21 */ bctrl /* 8021A9B0 002178F0 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A9B4 002178F4 48 14 78 65 */ bl func_80362218 +/* 8021A9B4 002178F4 48 14 78 65 */ bl _restgpr_25 /* 8021A9B8 002178F8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8021A9BC 002178FC 7C 08 03 A6 */ mtlr r0 /* 8021A9C0 00217900 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s index 2c2f7c075c..e7d993b846 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s @@ -2,7 +2,7 @@ /* 8021AB88 00217AC8 7C 08 02 A6 */ mflr r0 /* 8021AB8C 00217ACC 90 01 00 44 */ stw r0, 0x44(r1) /* 8021AB90 00217AD0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021AB94 00217AD4 48 14 76 35 */ bl func_803621C8 +/* 8021AB94 00217AD4 48 14 76 35 */ bl _savegpr_24 /* 8021AB98 00217AD8 7C 7F 1B 78 */ mr r31, r3 /* 8021AB9C 00217ADC 7C BC 2B 78 */ mr r28, r5 /* 8021ABA0 00217AE0 54 A3 06 3E */ clrlwi r3, r5, 0x18 @@ -209,7 +209,7 @@ lbl_8021AD90: /* 8021AEAC 00217DEC 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_8021AEB0: /* 8021AEB0 00217DF0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021AEB4 00217DF4 48 14 73 61 */ bl func_80362214 +/* 8021AEB4 00217DF4 48 14 73 61 */ bl _restgpr_24 /* 8021AEB8 00217DF8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021AEBC 00217DFC 7C 08 03 A6 */ mtlr r0 /* 8021AEC0 00217E00 38 21 00 40 */ addi r1, r1, 0x40 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 88a1e1dc4b..a35449de64 100644 --- a/include/d/d_save/d_save/asm/func_80035798.s +++ b/include/d/d_save/d_save/asm/func_80035798.s @@ -2,7 +2,7 @@ /* 8003579C 000326DC 7C 08 02 A6 */ mflr r0 /* 800357A0 000326E0 90 01 00 34 */ stw r0, 0x34(r1) /* 800357A4 000326E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800357A8 000326E8 48 32 CA 19 */ bl func_803621C0 +/* 800357A8 000326E8 48 32 CA 19 */ bl _savegpr_22 /* 800357AC 000326EC 7C 9C 23 78 */ mr r28, r4 /* 800357B0 000326F0 7C B8 2B 78 */ mr r24, r5 /* 800357B4 000326F4 3A C0 00 00 */ li r22, 0 diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index efb050a582..060c470cc9 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) class dSv_info_c { public: void init(void); @@ -899,6 +899,7 @@ private: /* 0xDD8 */ dSv_event_c events; /* 0xED8 */ dSv_turnRestart_c turn_restart; }; +#pragma pack(pop) // u8 dMeter2Info_getOilGaugeBackUp() { // return g_meter2_info.getDirectUseItem(); diff --git a/include/functions.h b/include/functions.h index 992f8053ba..f6f406982b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -24,21 +24,18 @@ void func_80362210(void); void JKRAramHeap_NS_getTotalFreeSize(void); void JKRAramHeap_NS_getFreeSize(void); void heapDisplay__9HeapCheckCFv(void); -void func_803621C4(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(void); -void dComIfGs_setSelectItemIndex(void); -void dComIfGs_getMixItemIndex(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 func_803621CC(void); -void func_80362218(void); +void _savegpr_25(void); +void _restgpr_25(void); void _restgpr_26(void); void _savegpr_26(void); void func_8036221C(void); @@ -117,7 +114,7 @@ void countUsed__FP10JKRExpHeap(void); void JUTReport(void); void func_803621D0(void); void offEventBit__11dSv_event_cFUs(void); -void func_803621C0(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); @@ -180,7 +177,7 @@ void JUTReportConsole_f(void); void JUTWarningConsole(void); void JUTWarningConsole_f(void); -void func_803621CC(void); +void _savegpr_25(void); void VIWaitForRetrace(void); void func_80361C24(void); @@ -203,8 +200,8 @@ void _restgpr_29(void); void _savegpr_29(void); void func_80361C24(void); -void func_803621CC(void); -void func_80362218(void); +void _savegpr_25(void); +void _restgpr_25(void); void JKRArchive_NS_findDirectory(void); void JKRArchive_NS_findFsResource(void); @@ -220,8 +217,8 @@ void func_80365470(void); void DCInvalidateRange(void); void JKRDvdRipper_NS_loadToMainRAM_X1_(void); void func_80003458(void); -void func_803621CC(void); -void func_80362218(void); +void _savegpr_25(void); +void _restgpr_25(void); void func_803650D0(void); void JKRDecomp_NS_orderSync(void); @@ -239,11 +236,11 @@ void __RAS_OSDisableInterrupts_begin(void); void func_80003540(void); void func_80361C24(void); void func_803621B0(void); -void func_803621C4(void); -void func_803621C8(void); +void _savegpr_23(void); +void _savegpr_24(void); void func_803621FC(void); void func_80362210(void); -void func_80362214(void); +void _restgpr_24(void); void ARQPostRequest(void); void DCStoreRange(void); @@ -301,7 +298,7 @@ void func_80362210(void); void JKRAramHeap_NS_getTotalFreeSize(void); void JKRAramHeap_NS_getFreeSize(void); void heapDisplay__9HeapCheckCFv(void); -void func_803621C4(void); +void _savegpr_23(void); void init__20dSv_player_collect_cFv(void); void dComIfGp_setSelectItem(int); void getUsedCount__9HeapCheckCFv(void); @@ -315,7 +312,7 @@ void setBombNum__21dSv_player_item_max_cFUcUc(void); void func_80362224(void); void func_803621D8(void); void _savegpr_25(void); -void func_80362218(void); +void _restgpr_25(void); void _restgpr_26(void); void _savegpr_26(void); void _savegpr_25(void); @@ -398,7 +395,7 @@ void countUsed__FP10JKRExpHeap(void); void JUTReport(void); void func_803621D0(void); void offEventBit__11dSv_event_cFUs(void); -void func_803621C0(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); @@ -485,7 +482,7 @@ void _savegpr_29(void); void func_80361C24(void); void _savegpr_25(void); -void func_80362218(void); +void _restgpr_25(void); // void JKRAramArchive(void); void JKRArchive_NS_findDirectory(void); @@ -503,7 +500,7 @@ void DCInvalidateRange(void); void JKRDvdRipper_NS_loadToMainRAM_X1_(void); void func_80003458(void); void _savegpr_25(void); -void func_80362218(void); +void _restgpr_25(void); void func_803650D0(void); void JKRDecomp_NS_orderSync(void); @@ -521,7 +518,7 @@ void __RAS_OSDisableInterrupts_begin(void); void func_80003540(void); void func_80361C24(void); void func_803621B0(void); -void func_803621C4(void); +void _savegpr_23(void); void _savegpr_24(void); void func_803621FC(void); void func_80362210(void); @@ -5366,8 +5363,8 @@ void cXyz_NS_norm(void); void cM3dGLin(void); void cM3dGSph_NS_Set(void); void cSAngle_NS___mi(void); -void cM3dGCyl(void); -void cSAngle(void); +void __ct__8cM3dGCylFPC4cXyzff(void); +void __ct__7cSAngleFv(void); void cXyz_NS___pl(void); void cSAngle_NS___pl_short(void); // c_angle.o void cSAngle_NS___mi_short(void); 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 feb4224288..4fe782b51a 100644 --- a/include/m_Do/m_Do_main/asm/func_80005AD8.s +++ b/include/m_Do/m_Do_main/asm/func_80005AD8.s @@ -2,7 +2,7 @@ /* 80005ADC 00002A1C 7C 08 02 A6 */ mflr r0 /* 80005AE0 00002A20 90 01 00 34 */ stw r0, 0x34(r1) /* 80005AE4 00002A24 39 61 00 30 */ addi r11, r1, 0x30 -/* 80005AE8 00002A28 48 35 C6 DD */ bl func_803621C4 +/* 80005AE8 00002A28 48 35 C6 DD */ bl _savegpr_23 /* 80005AEC 00002A2C 3C 60 80 3A */ lis r3, lbl_803A2EE0@ha /* 80005AF0 00002A30 3B 23 2E E0 */ addi r25, r3, lbl_803A2EE0@l /* 80005AF4 00002A34 88 0D 85 99 */ lbz r0, lbl_80450B19-_SDA_BASE_(r13) diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 6cf4b2c96a..5c7148f9e2 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -1,5 +1,6 @@ /* d_camera.cpp autogenerated by split.py v0.3 at 2021-01-02 08:13:10.853821 */ +#include "SComponent/c_angle/c_angle.h" #include "SComponent/c_bg_w.h" #include "SComponent/c_xyz.h" #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h" @@ -1333,7 +1334,7 @@ asm void std_NS_fabsf(void) { // __ct__7cSAngleFv // cSAngle::cSAngle(void) -asm void cSAngle(void) { +asm cSAngle::cSAngle() { nofralloc #include "d/d_camera/asm/func_80182A48.s" } diff --git a/src/f/f_pc/f_pc_manager.cpp b/src/f/f_pc/f_pc_manager.cpp index 942039fccb..9f165bc10d 100644 --- a/src/f/f_pc/f_pc_manager.cpp +++ b/src/f/f_pc/f_pc_manager.cpp @@ -33,6 +33,7 @@ extern void fpcDw_Handler(void*, void*); extern base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, FastCreateReqFunc param_3, void* param_4, void* pData); extern void* fpcCtIt_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData); +} void fpcM_Draw(void* pProc) { fpcDw_Execute((base_process_class*)pProc); @@ -128,5 +129,4 @@ void* fpcM_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData) { } else { return NULL; } -} } \ No newline at end of file