From 6359c5f82bb2efc81562e36295891c1907332ba9 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 13 Sep 2020 02:51:05 -0400 Subject: [PATCH] Migrate many functions from d_save.s --- asm/DynamicLink.s | 8 +- asm/J2DGraph/J2DAnimation.s | 8 +- asm/J2DGraph/J2DAnmLoader.s | 8 +- asm/J2DGraph/J2DMatBlock.s | 76 +- asm/J2DGraph/J2DMaterialFactory.s | 4 +- asm/J2DGraph/J2DPane.s | 28 +- asm/J2DGraph/J2DPicture.s | 40 +- asm/J2DGraph/J2DPictureEx.s | 48 +- asm/J2DGraph/J2DPrint.s | 8 +- asm/J2DGraph/J2DScreen.s | 28 +- asm/J2DGraph/J2DTextBox.s | 10 +- asm/J2DGraph/J2DTextBoxEx.s | 4 +- asm/J2DGraph/J2DWindow.s | 4 +- asm/J2DGraph/J2DWindowEx.s | 16 +- asm/J3DGraphAnimator/J3DAnimation.s | 24 +- asm/J3DGraphAnimator/J3DCluster.s | 4 +- asm/J3DGraphAnimator/J3DJoint.s | 20 +- asm/J3DGraphAnimator/J3DMaterialAnm.s | 4 +- asm/J3DGraphAnimator/J3DMaterialAttach.s | 16 +- asm/J3DGraphAnimator/J3DModel.s | 12 +- asm/J3DGraphAnimator/J3DModelData.s | 8 +- asm/J3DGraphAnimator/J3DMtxBuffer.s | 12 +- asm/J3DGraphAnimator/J3DShapeTable.s | 4 +- asm/J3DGraphAnimator/J3DSkinDeform.s | 12 +- asm/J3DGraphBase/J3DDrawBuffer.s | 12 +- asm/J3DGraphBase/J3DGD.s | 8 +- asm/J3DGraphBase/J3DMatBlock.s | 132 +-- asm/J3DGraphBase/J3DMaterial.s | 4 +- asm/J3DGraphBase/J3DPacket.s | 4 +- asm/J3DGraphBase/J3DShape.s | 20 +- asm/J3DGraphBase/J3DShapeMtx.s | 8 +- asm/J3DGraphBase/J3DSys.s | 4 +- asm/J3DGraphBase/J3DTevs.s | 4 +- asm/J3DGraphBase/J3DTexture.s | 4 +- asm/J3DGraphBase/J3DVertex.s | 8 +- asm/J3DGraphLoader/J3DAnmLoader.s | 8 +- asm/J3DGraphLoader/J3DMaterialFactory.s | 12 +- asm/J3DGraphLoader/J3DModelLoader.s | 48 +- asm/J3DGraphLoader/J3DModelLoaderCalcSize.s | 20 +- asm/JAudio2/JAISe.s | 8 +- asm/JAudio2/JAISeMgr.s | 20 +- asm/JAudio2/JAISeq.s | 16 +- asm/JAudio2/JAIStream.s | 8 +- asm/JAudio2/JASAiCtrl.s | 12 +- asm/JAudio2/JASAramStream.s | 4 +- asm/JAudio2/JASBNKParser.s | 4 +- asm/JAudio2/JASCallback.s | 4 +- asm/JAudio2/JASChannel.s | 16 +- asm/JAudio2/JASDSPChannel.s | 8 +- asm/JAudio2/JASDSPInterface.s | 4 +- asm/JAudio2/JASDriverIF.s | 4 +- asm/JAudio2/JASHeapCtrl.s | 12 +- asm/JAudio2/JASResArcLoader.s | 4 +- asm/JAudio2/JASSeqParser.s | 12 +- asm/JAudio2/JASTaskThread.s | 18 +- asm/JAudio2/JASTrack.s | 36 +- asm/JAudio2/JASWaveArcLoader.s | 8 +- asm/JAudio2/JAUSectionHeap.s | 56 +- asm/JAudio2/JAUSeqDataBlockMgr.s | 8 +- asm/JAudio2/JAUSoundAnimator.s | 8 +- asm/JFramework/JFWDisplay.s | 12 +- asm/JGadget/linklist.s | 8 +- asm/JGadget/std-vector.s | 4 +- asm/JKernel/JKRAram.s | 12 +- asm/JKernel/JKRAramArchive.s | 16 +- asm/JKernel/JKRAramBlock.s | 4 +- asm/JKernel/JKRAramPiece.s | 4 +- asm/JKernel/JKRArchivePri.s | 20 +- asm/JKernel/JKRArchivePub.s | 8 +- asm/JKernel/JKRCompArchive.s | 12 +- asm/JKernel/JKRDecomp.s | 12 +- asm/JKernel/JKRDvdArchive.s | 16 +- asm/JKernel/JKRDvdFile.s | 4 +- asm/JKernel/JKRDvdRipper.s | 4 +- asm/JKernel/JKRExpHeap.s | 24 +- asm/JKernel/JKRFile.s | 4 +- asm/JKernel/JKRFileCache.s | 42 +- asm/JKernel/JKRFileLoader.s | 2 +- asm/JKernel/JKRHeap.s | 8 +- asm/JKernel/JKRMemArchive.s | 4 +- asm/JKernel/JKRSolidHeap.s | 8 +- asm/JKernel/JKRThread.s | 12 +- asm/JMath/JMATrigonometric.s | 4 +- asm/JMessage/control.s | 16 +- asm/JMessage/processor.s | 4 +- asm/JMessage/resource.s | 8 +- asm/JParticle/JPABaseShape.s | 8 +- asm/JParticle/JPAEmitterManager.s | 4 +- asm/JParticle/JPAMath.s | 4 +- asm/JParticle/JPAResource.s | 32 +- asm/JStudio/ctb.s | 4 +- asm/JStudio/fvb.s | 4 +- asm/JStudio/jstudio-control.s | 4 +- asm/JStudio/jstudio-math.s | 4 +- asm/JStudio/jstudio-object.s | 4 +- asm/JStudio/stb.s | 4 +- asm/JStudio_JParticle/object-particle.s | 4 +- asm/JStudio_JStage/control.s | 24 +- asm/JStudio_JStage/object-actor.s | 12 +- asm/JStudio_JStage/object-camera.s | 4 +- asm/JStudio_JStage/object-fog.s | 4 +- asm/JSupport/JSUFileStream.s | 4 +- asm/JSupport/JSUInputStream.s | 4 +- asm/JUtility/JUTCacheFont.s | 20 +- asm/JUtility/JUTConsole.s | 12 +- asm/JUtility/JUTDbPrint.s | 10 +- asm/JUtility/JUTDirectFile.s | 4 +- asm/JUtility/JUTDirectPrint.s | 4 +- asm/JUtility/JUTException.s | 26 +- asm/JUtility/JUTFont.s | 4 +- asm/JUtility/JUTGamePad.s | 8 +- asm/JUtility/JUTProcBar.s | 4 +- asm/JUtility/JUTResFont.s | 12 +- asm/JUtility/JUTResource.s | 4 +- asm/JUtility/JUTXfb.s | 8 +- asm/SComponent/c/c_m3d.s | 52 +- asm/SComponent/c/cc/c_cc_d.s | 8 +- asm/SComponent/c/cc/c_cc_s.s | 8 +- asm/SComponent/c/m3d/g/c_m3d_g_pla.s | 4 +- asm/SComponent/c/node/c_node_iter.s | 4 +- asm/SComponent/c/tree/c_tree_iter.s | 8 +- asm/Z2AudioLib/Z2Audience.s | 12 +- asm/Z2AudioLib/Z2AudioMgr.s | 4 +- asm/Z2AudioLib/Z2Creature.s | 12 +- asm/Z2AudioLib/Z2EnvSeMgr.s | 12 +- asm/Z2AudioLib/Z2FxLineMgr.s | 4 +- asm/Z2AudioLib/Z2LinkMgr.s | 4 +- asm/Z2AudioLib/Z2SeMgr.s | 12 +- asm/Z2AudioLib/Z2SeqMgr.s | 12 +- asm/Z2AudioLib/Z2SoundHandles.s | 4 +- asm/Z2AudioLib/Z2SoundInfo.s | 12 +- asm/Z2AudioLib/Z2SoundMgr.s | 12 +- asm/Z2AudioLib/Z2SoundObjMgr.s | 4 +- asm/Z2AudioLib/Z2SoundObject.s | 12 +- asm/Z2AudioLib/Z2SpeechMgr2.s | 4 +- asm/Z2AudioLib/Z2WolfHowlMgr.s | 4 +- asm/clib.s | 52 +- asm/d/a/d_a_alink.s | 648 +++++------ asm/d/a/d_a_npc.s | 124 +- asm/d/a/d_a_obj.s | 4 +- asm/d/a/d_a_player.s | 4 +- asm/d/a/no/chg/d_a_no_chg_room.s | 4 +- asm/d/a/npc/d_a_npc_cd.s | 12 +- asm/d/a/npc/d_a_npc_cd2.s | 20 +- asm/d/a/obj/d_a_obj_item.s | 4 +- asm/d/bg/d_bg_s.s | 20 +- asm/d/bg/d_bg_w.s | 72 +- asm/d/bg/s/movebg/d_bg_s_movebg_actor.s | 4 +- asm/d/bg/w/d_bg_w_sv.s | 8 +- asm/d/com/d_com_static.s | 8 +- asm/d/com/inf/d_com_inf_game.s | 80 +- asm/d/d_attention.s | 28 +- asm/d/d_camera.s | 60 +- asm/d/d_demo.s | 12 +- asm/d/d_drawlist.s | 32 +- asm/d/d_envse.s | 4 +- asm/d/d_event.s | 22 +- asm/d/d_gameover.s | 10 +- asm/d/d_item.s | 248 ++-- asm/d/d_kankyo.s | 66 +- asm/d/d_map.s | 20 +- asm/d/d_meter2.s | 28 +- asm/d/d_model.s | 8 +- asm/d/d_name.s | 20 +- asm/d/d_particle.s | 28 +- asm/d/d_resorce.s | 28 +- asm/d/d_save.s | 1124 +------------------ asm/d/d_stage.s | 82 +- asm/d/d_timer.s | 20 +- asm/d/d_tresure.s | 16 +- asm/d/error/d_error_msg.s | 4 +- asm/d/ev/d_ev_camera.s | 74 +- asm/d/event/d_event_data.s | 36 +- asm/d/event/d_event_manager.s | 24 +- asm/d/eye/d_eye_hl.s | 4 +- asm/d/file/d_file_select.s | 104 +- asm/d/file/sel/d_file_sel_info.s | 12 +- asm/d/jnt/d_jnt_col.s | 12 +- asm/d/k/d_k_wpillar.s | 4 +- asm/d/kankyo/d_kankyo_rain.s | 24 +- asm/d/kankyo/d_kankyo_wether.s | 8 +- asm/d/ky/d_ky_thunder.s | 4 +- asm/d/map/d_map_path.s | 16 +- asm/d/map/path/d_map_path_dmap.s | 16 +- asm/d/map/path/d_map_path_fmap.s | 20 +- asm/d/menu/d_menu_calibration.s | 24 +- asm/d/menu/d_menu_collect.s | 48 +- asm/d/menu/d_menu_dmap.s | 42 +- asm/d/menu/d_menu_fishing.s | 28 +- asm/d/menu/d_menu_fmap.s | 66 +- asm/d/menu/d_menu_fmap2D.s | 76 +- asm/d/menu/d_menu_insect.s | 32 +- asm/d/menu/d_menu_letter.s | 52 +- asm/d/menu/d_menu_option.s | 36 +- asm/d/menu/d_menu_ring.s | 86 +- asm/d/menu/d_menu_save.s | 52 +- asm/d/menu/d_menu_skill.s | 26 +- asm/d/menu/d_menu_window.s | 4 +- asm/d/menu/dmap/d_menu_dmap_map.s | 12 +- asm/d/menu/fmap/d_menu_fmap_map.s | 12 +- asm/d/menu/item/d_menu_item_explain.s | 10 +- asm/d/meter/d_meter_button.s | 38 +- asm/d/meter/d_meter_hakusha.s | 8 +- asm/d/meter/d_meter_map.s | 8 +- asm/d/meter/d_meter_string.s | 4 +- asm/d/meter2/d_meter2_draw.s | 106 +- asm/d/meter2/d_meter2_info.s | 76 +- asm/d/msg/d_msg_class.s | 82 +- asm/d/msg/d_msg_flow.s | 96 +- asm/d/msg/d_msg_object.s | 56 +- asm/d/msg/scrn/d_msg_scrn_3select.s | 48 +- asm/d/msg/scrn/d_msg_scrn_base.s | 18 +- asm/d/msg/scrn/d_msg_scrn_explain.s | 22 +- asm/d/msg/scrn/d_msg_scrn_howl.s | 20 +- asm/d/msg/scrn/d_msg_scrn_item.s | 4 +- asm/d/msg/scrn/d_msg_scrn_jimaku.s | 8 +- asm/d/msg/scrn/d_msg_scrn_kanban.s | 12 +- asm/d/msg/scrn/d_msg_scrn_talk.s | 12 +- asm/d/msg/scrn/d_msg_scrn_tree.s | 12 +- asm/d/msg/string/d_msg_string_base.s | 6 +- asm/d/pane/class/d_pane_class_alpha.s | 4 +- asm/d/pane/d_pane_class.s | 8 +- asm/d/s/d_s_logo.s | 20 +- asm/d/s/d_s_name.s | 8 +- asm/d/s/d_s_play.s | 26 +- asm/d/s/d_s_room.s | 12 +- asm/d/save/d_save_HIO.s | 4 +- asm/d/select/d_select_cursor.s | 8 +- asm/d/shop/d_shop_camera.s | 4 +- asm/d/shop/d_shop_system.s | 28 +- asm/d/shop/item/d_shop_item_ctrl.s | 4 +- asm/d/simple/d_simple_model.s | 12 +- asm/f/op/actor/f_op_actor_mng.s | 22 +- asm/f/op/kankyo/f_op_kankyo_mng.s | 4 +- asm/f/op/msg/f_op_msg_mng.s | 8 +- asm/f/pc/f_pc_layer.s | 4 +- asm/f/pc/f_pc_manager.s | 8 +- asm/f/pc/f_pc_priority.s | 4 +- asm/f/pc/layer/f_pc_layer_iter.s | 4 +- asm/f/pc/layer/f_pc_layer_tag.s | 8 +- asm/f/pc/line/f_pc_line_iter.s | 4 +- asm/f/pc/node/f_pc_node_req.s | 8 +- asm/f/pc/stdcreate/f_pc_stdcreate_req.s | 4 +- asm/gf/GFPixel.s | 4 +- asm/m/Do/dvd/m_Do_dvd_thread.s | 12 +- asm/m/Do/m_Do_MemCard.s | 8 +- asm/m/Do/m_Do_MemCardRWmng.s | 8 +- asm/m/Do/m_Do_Reset.s | 2 +- asm/m/Do/m_Do_ext.s | 80 +- asm/m/Do/m_Do_graphic.s | 12 +- asm/m/Do/m_Do_machine.s | 6 +- asm/m/Do/m_Do_main.s | 8 +- asm/os/OSExec.s | 2 +- include/d_save.h | 535 ++++++++- ldscript.lcf | 3 + src/d/d_save/d_save.cpp | 1055 ++++++++++++++++- 256 files changed, 4307 insertions(+), 3864 deletions(-) diff --git a/asm/DynamicLink.s b/asm/DynamicLink.s index c1070baa45..5ffa4c795f 100644 --- a/asm/DynamicLink.s +++ b/asm/DynamicLink.s @@ -461,7 +461,7 @@ lbl_802627D8: /* 802627EC 0025F72C 7C 08 02 A6 */ mflr r0 /* 802627F0 0025F730 90 01 00 64 */ stw r0, 0x64(r1) /* 802627F4 0025F734 39 61 00 60 */ addi r11, r1, 0x60 -/* 802627F8 0025F738 48 0F F9 E1 */ bl func_803621D8 +/* 802627F8 0025F738 48 0F F9 E1 */ bl _savegpr_28 /* 802627FC 0025F73C 7C 7C 1B 78 */ mr r28, r3 /* 80262800 0025F740 80 03 00 10 */ lwz r0, 0x10(r3) /* 80262804 0025F744 28 00 00 00 */ cmplwi r0, 0 @@ -664,7 +664,7 @@ lbl_80262AE0: /* 80262AE0 0025FA20 38 60 00 01 */ li r3, 1 lbl_80262AE4: /* 80262AE4 0025FA24 39 61 00 60 */ addi r11, r1, 0x60 -/* 80262AE8 0025FA28 48 0F F7 3D */ bl func_80362224 +/* 80262AE8 0025FA28 48 0F F7 3D */ bl _restgpr_28 /* 80262AEC 0025FA2C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80262AF0 0025FA30 7C 08 03 A6 */ mtlr r0 /* 80262AF4 0025FA34 38 21 00 60 */ addi r1, r1, 0x60 @@ -770,7 +770,7 @@ lbl_80262C4C: /* 80262C60 0025FBA0 7C 08 02 A6 */ mflr r0 /* 80262C64 0025FBA4 90 01 00 24 */ stw r0, 0x24(r1) /* 80262C68 0025FBA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80262C6C 0025FBAC 48 0F F5 6D */ bl func_803621D8 +/* 80262C6C 0025FBAC 48 0F F5 6D */ bl _savegpr_28 /* 80262C70 0025FBB0 7C 7F 1B 78 */ mr r31, r3 /* 80262C74 0025FBB4 48 0D FA 89 */ bl OSGetTime /* 80262C78 0025FBB8 80 1F 00 10 */ lwz r0, 0x10(r31) @@ -953,7 +953,7 @@ lbl_80262F0C: /* 80262F0C 0025FE4C 38 60 00 00 */ li r3, 0 lbl_80262F10: /* 80262F10 0025FE50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80262F14 0025FE54 48 0F F3 11 */ bl func_80362224 +/* 80262F14 0025FE54 48 0F F3 11 */ bl _restgpr_28 /* 80262F18 0025FE58 80 01 00 24 */ lwz r0, 0x24(r1) /* 80262F1C 0025FE5C 7C 08 03 A6 */ mtlr r0 /* 80262F20 0025FE60 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DAnimation.s b/asm/J2DGraph/J2DAnimation.s index 4c5ad762ff..28c1e752d6 100644 --- a/asm/J2DGraph/J2DAnimation.s +++ b/asm/J2DGraph/J2DAnimation.s @@ -383,7 +383,7 @@ lbl_8030AAF4: /* 8030AB08 00307A48 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8030AB0C 00307A4C F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8030AB10 00307A50 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030AB14 00307A54 48 05 76 C1 */ bl func_803621D4 +/* 8030AB14 00307A54 48 05 76 C1 */ bl _savegpr_27 /* 8030AB18 00307A58 7C 7B 1B 78 */ mr r27, r3 /* 8030AB1C 00307A5C FF E0 08 90 */ fmr f31, f1 /* 8030AB20 00307A60 7C BC 2B 78 */ mr r28, r5 @@ -674,7 +674,7 @@ lbl_8030AF04: /* 8030AF04 00307E44 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8030AF08 00307E48 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8030AF0C 00307E4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030AF10 00307E50 48 05 73 11 */ bl func_80362220 +/* 8030AF10 00307E50 48 05 73 11 */ bl _restgpr_27 /* 8030AF14 00307E54 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030AF18 00307E58 7C 08 03 A6 */ mtlr r0 /* 8030AF1C 00307E5C 38 21 00 40 */ addi r1, r1, 0x40 @@ -1456,7 +1456,7 @@ J2DAnmTextureSRTKey_NS_calcTransform: /* 8030B9FC 0030893C DB E1 00 30 */ stfd f31, 0x30(r1) /* 8030BA00 00308940 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8030BA04 00308944 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030BA08 00308948 48 05 67 CD */ bl func_803621D4 +/* 8030BA08 00308948 48 05 67 CD */ bl _savegpr_27 /* 8030BA0C 0030894C 7C 7B 1B 78 */ mr r27, r3 /* 8030BA10 00308950 FF E0 08 90 */ fmr f31, f1 /* 8030BA14 00308954 7C BC 2B 78 */ mr r28, r5 @@ -1621,7 +1621,7 @@ lbl_8030BC40: /* 8030BC40 00308B80 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8030BC44 00308B84 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8030BC48 00308B88 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030BC4C 00308B8C 48 05 65 D5 */ bl func_80362220 +/* 8030BC4C 00308B8C 48 05 65 D5 */ bl _restgpr_27 /* 8030BC50 00308B90 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030BC54 00308B94 7C 08 03 A6 */ mtlr r0 /* 8030BC58 00308B98 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J2DGraph/J2DAnmLoader.s b/asm/J2DGraph/J2DAnmLoader.s index 5aa322f689..ac86010eb4 100644 --- a/asm/J2DGraph/J2DAnmLoader.s +++ b/asm/J2DGraph/J2DAnmLoader.s @@ -607,7 +607,7 @@ J2DAnmKeyLoader_v15_NS_load: /* 8030930C 0030624C 7C 08 02 A6 */ mflr r0 /* 80309310 00306250 90 01 00 24 */ stw r0, 0x24(r1) /* 80309314 00306254 39 61 00 20 */ addi r11, r1, 0x20 -/* 80309318 00306258 48 05 8E BD */ bl func_803621D4 +/* 80309318 00306258 48 05 8E BD */ bl _savegpr_27 /* 8030931C 0030625C 7C 7B 1B 78 */ mr r27, r3 /* 80309320 00306260 3B A4 00 20 */ addi r29, r4, 0x20 /* 80309324 00306264 3B 80 00 00 */ li r28, 0 @@ -674,7 +674,7 @@ lbl_803093F0: /* 803093F4 00306334 41 80 FF 44 */ blt lbl_80309338 /* 803093F8 00306338 80 7B 00 04 */ lwz r3, 4(r27) /* 803093FC 0030633C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80309400 00306340 48 05 8E 21 */ bl func_80362220 +/* 80309400 00306340 48 05 8E 21 */ bl _restgpr_27 /* 80309404 00306344 80 01 00 24 */ lwz r0, 0x24(r1) /* 80309408 00306348 7C 08 03 A6 */ mtlr r0 /* 8030940C 0030634C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1135,7 +1135,7 @@ J2DAnmFullLoader_v15_NS_load: /* 80309A84 003069C4 7C 08 02 A6 */ mflr r0 /* 80309A88 003069C8 90 01 00 24 */ stw r0, 0x24(r1) /* 80309A8C 003069CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80309A90 003069D0 48 05 87 45 */ bl func_803621D4 +/* 80309A90 003069D0 48 05 87 45 */ bl _savegpr_27 /* 80309A94 003069D4 7C 7B 1B 78 */ mr r27, r3 /* 80309A98 003069D8 3B A4 00 20 */ addi r29, r4, 0x20 /* 80309A9C 003069DC 3B 80 00 00 */ li r28, 0 @@ -1202,7 +1202,7 @@ lbl_80309B68: /* 80309B6C 00306AAC 41 80 FF 44 */ blt lbl_80309AB0 /* 80309B70 00306AB0 80 7B 00 04 */ lwz r3, 4(r27) /* 80309B74 00306AB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80309B78 00306AB8 48 05 86 A9 */ bl func_80362220 +/* 80309B78 00306AB8 48 05 86 A9 */ bl _restgpr_27 /* 80309B7C 00306ABC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80309B80 00306AC0 7C 08 03 A6 */ mtlr r0 /* 80309B84 00306AC4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s index 19063dca15..5875b14485 100644 --- a/asm/J2DGraph/J2DMatBlock.s +++ b/asm/J2DGraph/J2DMatBlock.s @@ -50,7 +50,7 @@ J2DColorBlock_NS_setGX: /* 802EB428 002E8368 7C 08 02 A6 */ mflr r0 /* 802EB42C 002E836C 90 01 00 44 */ stw r0, 0x44(r1) /* 802EB430 002E8370 39 61 00 40 */ addi r11, r1, 0x40 -/* 802EB434 002E8374 48 07 6D A1 */ bl func_803621D4 +/* 802EB434 002E8374 48 07 6D A1 */ bl _savegpr_27 /* 802EB438 002E8378 7C 7F 1B 78 */ mr r31, r3 /* 802EB43C 002E837C 3B 80 00 00 */ li r28, 0 /* 802EB440 002E8380 3B A0 00 00 */ li r29, 0 @@ -103,7 +103,7 @@ lbl_802EB4E0: /* 802EB4F0 002E8430 88 7F 00 12 */ lbz r3, 0x12(r31) /* 802EB4F4 002E8434 48 07 14 91 */ bl GXSetCullMode /* 802EB4F8 002E8438 39 61 00 40 */ addi r11, r1, 0x40 -/* 802EB4FC 002E843C 48 07 6D 25 */ bl func_80362220 +/* 802EB4FC 002E843C 48 07 6D 25 */ bl _restgpr_27 /* 802EB500 002E8440 80 01 00 44 */ lwz r0, 0x44(r1) /* 802EB504 002E8444 7C 08 03 A6 */ mtlr r0 /* 802EB508 002E8448 38 21 00 40 */ addi r1, r1, 0x40 @@ -196,7 +196,7 @@ J2DTexGenBlock_NS_dtor: /* 802EB624 002E8564 7C 08 02 A6 */ mflr r0 /* 802EB628 002E8568 90 01 00 24 */ stw r0, 0x24(r1) /* 802EB62C 002E856C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EB630 002E8570 48 07 6B A9 */ bl func_803621D8 +/* 802EB630 002E8570 48 07 6B A9 */ bl _savegpr_28 /* 802EB634 002E8574 7C 7C 1B 79 */ or. r28, r3, r3 /* 802EB638 002E8578 7C 9D 23 78 */ mr r29, r4 /* 802EB63C 002E857C 41 82 00 4C */ beq lbl_802EB688 @@ -223,7 +223,7 @@ lbl_802EB668: lbl_802EB688: /* 802EB688 002E85C8 7F 83 E3 78 */ mr r3, r28 /* 802EB68C 002E85CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EB690 002E85D0 48 07 6B 95 */ bl func_80362224 +/* 802EB690 002E85D0 48 07 6B 95 */ bl _restgpr_28 /* 802EB694 002E85D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EB698 002E85D8 7C 08 03 A6 */ mtlr r0 /* 802EB69C 002E85DC 38 21 00 20 */ addi r1, r1, 0x20 @@ -661,7 +661,7 @@ lbl_802EBCA8: /* 802EBCC4 002E8C04 7C 08 02 A6 */ mflr r0 /* 802EBCC8 002E8C08 90 01 00 24 */ stw r0, 0x24(r1) /* 802EBCCC 002E8C0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EBCD0 002E8C10 48 07 65 09 */ bl func_803621D8 +/* 802EBCD0 002E8C10 48 07 65 09 */ bl _savegpr_28 /* 802EBCD4 002E8C14 7C 7C 1B 78 */ mr r28, r3 /* 802EBCD8 002E8C18 7C BD 2B 78 */ mr r29, r5 /* 802EBCDC 002E8C1C 7C DE 33 78 */ mr r30, r6 @@ -734,7 +734,7 @@ lbl_802EBDA4: /* 802EBDC8 002E8D08 38 60 00 01 */ li r3, 1 lbl_802EBDCC: /* 802EBDCC 002E8D0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EBDD0 002E8D10 48 07 64 55 */ bl func_80362224 +/* 802EBDD0 002E8D10 48 07 64 55 */ bl _restgpr_28 /* 802EBDD4 002E8D14 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EBDD8 002E8D18 7C 08 03 A6 */ mtlr r0 /* 802EBDDC 002E8D1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1117,7 +1117,7 @@ lbl_802EC300: /* 802EC32C 002E926C 7C 08 02 A6 */ mflr r0 /* 802EC330 002E9270 90 01 00 34 */ stw r0, 0x34(r1) /* 802EC334 002E9274 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EC338 002E9278 48 07 5E A1 */ bl func_803621D8 +/* 802EC338 002E9278 48 07 5E A1 */ bl _savegpr_28 /* 802EC33C 002E927C 7C 7F 1B 78 */ mr r31, r3 /* 802EC340 002E9280 38 80 00 00 */ li r4, 0 /* 802EC344 002E9284 38 A0 00 00 */ li r5, 0 @@ -1262,7 +1262,7 @@ lbl_802EC520: /* 802EC550 002E9490 38 80 00 00 */ li r4, 0 /* 802EC554 002E9494 4B FF DA F1 */ bl J2DIndTevStage_NS_load /* 802EC558 002E9498 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EC55C 002E949C 48 07 5C C9 */ bl func_80362224 +/* 802EC55C 002E949C 48 07 5C C9 */ bl _restgpr_28 /* 802EC560 002E94A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EC564 002E94A4 7C 08 03 A6 */ mtlr r0 /* 802EC568 002E94A8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1591,7 +1591,7 @@ lbl_802EC8C4: /* 802ECA1C 002E995C 7C 08 02 A6 */ mflr r0 /* 802ECA20 002E9960 90 01 00 24 */ stw r0, 0x24(r1) /* 802ECA24 002E9964 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECA28 002E9968 48 07 57 B1 */ bl func_803621D8 +/* 802ECA28 002E9968 48 07 57 B1 */ bl _savegpr_28 /* 802ECA2C 002E996C 7C 7C 1B 78 */ mr r28, r3 /* 802ECA30 002E9970 3B A0 00 00 */ li r29, 0 /* 802ECA34 002E9974 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -1641,7 +1641,7 @@ lbl_802ECAC0: /* 802ECACC 002E9A0C 38 60 00 01 */ li r3, 1 lbl_802ECAD0: /* 802ECAD0 002E9A10 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECAD4 002E9A14 48 07 57 51 */ bl func_80362224 +/* 802ECAD4 002E9A14 48 07 57 51 */ bl _restgpr_28 /* 802ECAD8 002E9A18 80 01 00 24 */ lwz r0, 0x24(r1) /* 802ECADC 002E9A1C 7C 08 03 A6 */ mtlr r0 /* 802ECAE0 002E9A20 38 21 00 20 */ addi r1, r1, 0x20 @@ -2115,7 +2115,7 @@ lbl_802ED154: /* 802ED170 002EA0B0 7C 08 02 A6 */ mflr r0 /* 802ED174 002EA0B4 90 01 00 24 */ stw r0, 0x24(r1) /* 802ED178 002EA0B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED17C 002EA0BC 48 07 50 59 */ bl func_803621D4 +/* 802ED17C 002EA0BC 48 07 50 59 */ bl _savegpr_27 /* 802ED180 002EA0C0 7C 7B 1B 78 */ mr r27, r3 /* 802ED184 002EA0C4 7C 9C 23 78 */ mr r28, r4 /* 802ED188 002EA0C8 7C BD 2B 78 */ mr r29, r5 @@ -2153,7 +2153,7 @@ lbl_802ED1C4: /* 802ED200 002EA140 38 60 00 01 */ li r3, 1 lbl_802ED204: /* 802ED204 002EA144 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED208 002EA148 48 07 50 19 */ bl func_80362220 +/* 802ED208 002EA148 48 07 50 19 */ bl _restgpr_27 /* 802ED20C 002EA14C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802ED210 002EA150 7C 08 03 A6 */ mtlr r0 /* 802ED214 002EA154 38 21 00 20 */ addi r1, r1, 0x20 @@ -2401,7 +2401,7 @@ lbl_802ED574: /* 802ED588 002EA4C8 7C 08 02 A6 */ mflr r0 /* 802ED58C 002EA4CC 90 01 00 34 */ stw r0, 0x34(r1) /* 802ED590 002EA4D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ED594 002EA4D4 48 07 4C 45 */ bl func_803621D8 +/* 802ED594 002EA4D4 48 07 4C 45 */ bl _savegpr_28 /* 802ED598 002EA4D8 7C 7F 1B 78 */ mr r31, r3 /* 802ED59C 002EA4DC 3B 80 00 00 */ li r28, 0 lbl_802ED5A0: @@ -2597,7 +2597,7 @@ lbl_802ED84C: /* 802ED854 002EA794 7C 03 00 40 */ cmplw r3, r0 /* 802ED858 002EA798 41 80 FF DC */ blt lbl_802ED834 /* 802ED85C 002EA79C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ED860 002EA7A0 48 07 49 C5 */ bl func_80362224 +/* 802ED860 002EA7A0 48 07 49 C5 */ bl _restgpr_28 /* 802ED864 002EA7A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802ED868 002EA7A8 7C 08 03 A6 */ mtlr r0 /* 802ED86C 002EA7AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -2713,7 +2713,7 @@ lbl_802ED9A0: /* 802ED9E8 002EA928 7C 08 02 A6 */ mflr r0 /* 802ED9EC 002EA92C 90 01 00 24 */ stw r0, 0x24(r1) /* 802ED9F0 002EA930 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED9F4 002EA934 48 07 47 E1 */ bl func_803621D4 +/* 802ED9F4 002EA934 48 07 47 E1 */ bl _savegpr_27 /* 802ED9F8 002EA938 7C 7B 1B 79 */ or. r27, r3, r3 /* 802ED9FC 002EA93C 7C 9C 23 78 */ mr r28, r4 /* 802EDA00 002EA940 41 82 00 A8 */ beq lbl_802EDAA8 @@ -2765,7 +2765,7 @@ lbl_802EDA98: lbl_802EDAA8: /* 802EDAA8 002EA9E8 7F 63 DB 78 */ mr r3, r27 /* 802EDAAC 002EA9EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EDAB0 002EA9F0 48 07 47 71 */ bl func_80362220 +/* 802EDAB0 002EA9F0 48 07 47 71 */ bl _restgpr_27 /* 802EDAB4 002EA9F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EDAB8 002EA9F8 7C 08 03 A6 */ mtlr r0 /* 802EDABC 002EA9FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2939,7 +2939,7 @@ lbl_802EDD10: /* 802EDD38 002EAC78 7C 08 02 A6 */ mflr r0 /* 802EDD3C 002EAC7C 90 01 00 24 */ stw r0, 0x24(r1) /* 802EDD40 002EAC80 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EDD44 002EAC84 48 07 44 95 */ bl func_803621D8 +/* 802EDD44 002EAC84 48 07 44 95 */ bl _savegpr_28 /* 802EDD48 002EAC88 7C 7C 1B 78 */ mr r28, r3 /* 802EDD4C 002EAC8C 3B A0 00 00 */ li r29, 0 /* 802EDD50 002EAC90 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -2989,7 +2989,7 @@ lbl_802EDDDC: /* 802EDDE8 002EAD28 38 60 00 01 */ li r3, 1 lbl_802EDDEC: /* 802EDDEC 002EAD2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EDDF0 002EAD30 48 07 44 35 */ bl func_80362224 +/* 802EDDF0 002EAD30 48 07 44 35 */ bl _restgpr_28 /* 802EDDF4 002EAD34 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EDDF8 002EAD38 7C 08 03 A6 */ mtlr r0 /* 802EDDFC 002EAD3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3566,7 +3566,7 @@ lbl_802EE5D8: /* 802EE5F4 002EB534 7C 08 02 A6 */ mflr r0 /* 802EE5F8 002EB538 90 01 00 24 */ stw r0, 0x24(r1) /* 802EE5FC 002EB53C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE600 002EB540 48 07 3B D5 */ bl func_803621D4 +/* 802EE600 002EB540 48 07 3B D5 */ bl _savegpr_27 /* 802EE604 002EB544 7C 7B 1B 78 */ mr r27, r3 /* 802EE608 002EB548 7C 9C 23 78 */ mr r28, r4 /* 802EE60C 002EB54C 7C BD 2B 78 */ mr r29, r5 @@ -3604,7 +3604,7 @@ lbl_802EE648: /* 802EE684 002EB5C4 38 60 00 01 */ li r3, 1 lbl_802EE688: /* 802EE688 002EB5C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE68C 002EB5CC 48 07 3B 95 */ bl func_80362220 +/* 802EE68C 002EB5CC 48 07 3B 95 */ bl _restgpr_27 /* 802EE690 002EB5D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EE694 002EB5D4 7C 08 03 A6 */ mtlr r0 /* 802EE698 002EB5D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3862,7 +3862,7 @@ lbl_802EEA1C: /* 802EEA30 002EB970 7C 08 02 A6 */ mflr r0 /* 802EEA34 002EB974 90 01 00 34 */ stw r0, 0x34(r1) /* 802EEA38 002EB978 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EEA3C 002EB97C 48 07 37 9D */ bl func_803621D8 +/* 802EEA3C 002EB97C 48 07 37 9D */ bl _savegpr_28 /* 802EEA40 002EB980 7C 7F 1B 78 */ mr r31, r3 /* 802EEA44 002EB984 3B 80 00 00 */ li r28, 0 lbl_802EEA48: @@ -4058,7 +4058,7 @@ lbl_802EECF4: /* 802EECFC 002EBC3C 7C 03 00 40 */ cmplw r3, r0 /* 802EED00 002EBC40 41 80 FF DC */ blt lbl_802EECDC /* 802EED04 002EBC44 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EED08 002EBC48 48 07 35 1D */ bl func_80362224 +/* 802EED08 002EBC48 48 07 35 1D */ bl _restgpr_28 /* 802EED0C 002EBC4C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EED10 002EBC50 7C 08 03 A6 */ mtlr r0 /* 802EED14 002EBC54 38 21 00 30 */ addi r1, r1, 0x30 @@ -4174,7 +4174,7 @@ lbl_802EEE48: /* 802EEE90 002EBDD0 7C 08 02 A6 */ mflr r0 /* 802EEE94 002EBDD4 90 01 00 24 */ stw r0, 0x24(r1) /* 802EEE98 002EBDD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EEE9C 002EBDDC 48 07 33 39 */ bl func_803621D4 +/* 802EEE9C 002EBDDC 48 07 33 39 */ bl _savegpr_27 /* 802EEEA0 002EBDE0 7C 7B 1B 79 */ or. r27, r3, r3 /* 802EEEA4 002EBDE4 7C 9C 23 78 */ mr r28, r4 /* 802EEEA8 002EBDE8 41 82 00 A8 */ beq lbl_802EEF50 @@ -4226,7 +4226,7 @@ lbl_802EEF40: lbl_802EEF50: /* 802EEF50 002EBE90 7F 63 DB 78 */ mr r3, r27 /* 802EEF54 002EBE94 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EEF58 002EBE98 48 07 32 C9 */ bl func_80362220 +/* 802EEF58 002EBE98 48 07 32 C9 */ bl _restgpr_27 /* 802EEF5C 002EBE9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EEF60 002EBEA0 7C 08 03 A6 */ mtlr r0 /* 802EEF64 002EBEA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -4401,7 +4401,7 @@ lbl_802EF1B8: /* 802EF1E4 002EC124 7C 08 02 A6 */ mflr r0 /* 802EF1E8 002EC128 90 01 00 24 */ stw r0, 0x24(r1) /* 802EF1EC 002EC12C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF1F0 002EC130 48 07 2F E9 */ bl func_803621D8 +/* 802EF1F0 002EC130 48 07 2F E9 */ bl _savegpr_28 /* 802EF1F4 002EC134 7C 7C 1B 78 */ mr r28, r3 /* 802EF1F8 002EC138 3B A0 00 00 */ li r29, 0 /* 802EF1FC 002EC13C 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -4451,7 +4451,7 @@ lbl_802EF288: /* 802EF294 002EC1D4 38 60 00 01 */ li r3, 1 lbl_802EF298: /* 802EF298 002EC1D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF29C 002EC1DC 48 07 2F 89 */ bl func_80362224 +/* 802EF29C 002EC1DC 48 07 2F 89 */ bl _restgpr_28 /* 802EF2A0 002EC1E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EF2A4 002EC1E4 7C 08 03 A6 */ mtlr r0 /* 802EF2A8 002EC1E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5027,7 +5027,7 @@ lbl_802EFA80: /* 802EFA9C 002EC9DC 7C 08 02 A6 */ mflr r0 /* 802EFAA0 002EC9E0 90 01 00 24 */ stw r0, 0x24(r1) /* 802EFAA4 002EC9E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFAA8 002EC9E8 48 07 27 2D */ bl func_803621D4 +/* 802EFAA8 002EC9E8 48 07 27 2D */ bl _savegpr_27 /* 802EFAAC 002EC9EC 7C 7B 1B 78 */ mr r27, r3 /* 802EFAB0 002EC9F0 7C 9C 23 78 */ mr r28, r4 /* 802EFAB4 002EC9F4 7C BD 2B 78 */ mr r29, r5 @@ -5065,7 +5065,7 @@ lbl_802EFAF0: /* 802EFB2C 002ECA6C 38 60 00 01 */ li r3, 1 lbl_802EFB30: /* 802EFB30 002ECA70 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFB34 002ECA74 48 07 26 ED */ bl func_80362220 +/* 802EFB34 002ECA74 48 07 26 ED */ bl _restgpr_27 /* 802EFB38 002ECA78 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EFB3C 002ECA7C 7C 08 03 A6 */ mtlr r0 /* 802EFB40 002ECA80 38 21 00 20 */ addi r1, r1, 0x20 @@ -5312,7 +5312,7 @@ lbl_802EFE74: /* 802EFEB0 002ECDF0 7C 08 02 A6 */ mflr r0 /* 802EFEB4 002ECDF4 90 01 00 34 */ stw r0, 0x34(r1) /* 802EFEB8 002ECDF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EFEBC 002ECDFC 48 07 23 1D */ bl func_803621D8 +/* 802EFEBC 002ECDFC 48 07 23 1D */ bl _savegpr_28 /* 802EFEC0 002ECE00 7C 7F 1B 78 */ mr r31, r3 /* 802EFEC4 002ECE04 3B 80 00 00 */ li r28, 0 lbl_802EFEC8: @@ -5508,7 +5508,7 @@ lbl_802F0174: /* 802F017C 002ED0BC 7C 03 00 40 */ cmplw r3, r0 /* 802F0180 002ED0C0 41 80 FF DC */ blt lbl_802F015C /* 802F0184 002ED0C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F0188 002ED0C8 48 07 20 9D */ bl func_80362224 +/* 802F0188 002ED0C8 48 07 20 9D */ bl _restgpr_28 /* 802F018C 002ED0CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0190 002ED0D0 7C 08 03 A6 */ mtlr r0 /* 802F0194 002ED0D4 38 21 00 30 */ addi r1, r1, 0x30 @@ -5624,7 +5624,7 @@ lbl_802F02C8: /* 802F0310 002ED250 7C 08 02 A6 */ mflr r0 /* 802F0314 002ED254 90 01 00 24 */ stw r0, 0x24(r1) /* 802F0318 002ED258 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F031C 002ED25C 48 07 1E B9 */ bl func_803621D4 +/* 802F031C 002ED25C 48 07 1E B9 */ bl _savegpr_27 /* 802F0320 002ED260 7C 7B 1B 79 */ or. r27, r3, r3 /* 802F0324 002ED264 7C 9C 23 78 */ mr r28, r4 /* 802F0328 002ED268 41 82 00 A8 */ beq lbl_802F03D0 @@ -5676,7 +5676,7 @@ lbl_802F03C0: lbl_802F03D0: /* 802F03D0 002ED310 7F 63 DB 78 */ mr r3, r27 /* 802F03D4 002ED314 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F03D8 002ED318 48 07 1E 49 */ bl func_80362220 +/* 802F03D8 002ED318 48 07 1E 49 */ bl _restgpr_27 /* 802F03DC 002ED31C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F03E0 002ED320 7C 08 03 A6 */ mtlr r0 /* 802F03E4 002ED324 38 21 00 20 */ addi r1, r1, 0x20 @@ -5851,7 +5851,7 @@ lbl_802F0638: /* 802F0664 002ED5A4 7C 08 02 A6 */ mflr r0 /* 802F0668 002ED5A8 90 01 00 24 */ stw r0, 0x24(r1) /* 802F066C 002ED5AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0670 002ED5B0 48 07 1B 69 */ bl func_803621D8 +/* 802F0670 002ED5B0 48 07 1B 69 */ bl _savegpr_28 /* 802F0674 002ED5B4 7C 7C 1B 78 */ mr r28, r3 /* 802F0678 002ED5B8 3B A0 00 00 */ li r29, 0 /* 802F067C 002ED5BC 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -5901,7 +5901,7 @@ lbl_802F0708: /* 802F0714 002ED654 38 60 00 01 */ li r3, 1 lbl_802F0718: /* 802F0718 002ED658 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F071C 002ED65C 48 07 1B 09 */ bl func_80362224 +/* 802F071C 002ED65C 48 07 1B 09 */ bl _restgpr_28 /* 802F0720 002ED660 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F0724 002ED664 7C 08 03 A6 */ mtlr r0 /* 802F0728 002ED668 38 21 00 20 */ addi r1, r1, 0x20 @@ -6477,7 +6477,7 @@ lbl_802F0F00: /* 802F0F1C 002EDE5C 7C 08 02 A6 */ mflr r0 /* 802F0F20 002EDE60 90 01 00 24 */ stw r0, 0x24(r1) /* 802F0F24 002EDE64 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0F28 002EDE68 48 07 12 AD */ bl func_803621D4 +/* 802F0F28 002EDE68 48 07 12 AD */ bl _savegpr_27 /* 802F0F2C 002EDE6C 7C 7B 1B 78 */ mr r27, r3 /* 802F0F30 002EDE70 7C 9C 23 78 */ mr r28, r4 /* 802F0F34 002EDE74 7C BD 2B 78 */ mr r29, r5 @@ -6515,7 +6515,7 @@ lbl_802F0F70: /* 802F0FAC 002EDEEC 38 60 00 01 */ li r3, 1 lbl_802F0FB0: /* 802F0FB0 002EDEF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0FB4 002EDEF4 48 07 12 6D */ bl func_80362220 +/* 802F0FB4 002EDEF4 48 07 12 6D */ bl _restgpr_27 /* 802F0FB8 002EDEF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F0FBC 002EDEFC 7C 08 03 A6 */ mtlr r0 /* 802F0FC0 002EDF00 38 21 00 20 */ addi r1, r1, 0x20 @@ -6762,7 +6762,7 @@ lbl_802F12F4: /* 802F1330 002EE270 7C 08 02 A6 */ mflr r0 /* 802F1334 002EE274 90 01 00 34 */ stw r0, 0x34(r1) /* 802F1338 002EE278 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F133C 002EE27C 48 07 0E 9D */ bl func_803621D8 +/* 802F133C 002EE27C 48 07 0E 9D */ bl _savegpr_28 /* 802F1340 002EE280 7C 7F 1B 78 */ mr r31, r3 /* 802F1344 002EE284 3B 80 00 00 */ li r28, 0 lbl_802F1348: @@ -6958,7 +6958,7 @@ lbl_802F15F4: /* 802F15FC 002EE53C 7C 03 00 40 */ cmplw r3, r0 /* 802F1600 002EE540 41 80 FF DC */ blt lbl_802F15DC /* 802F1604 002EE544 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F1608 002EE548 48 07 0C 1D */ bl func_80362224 +/* 802F1608 002EE548 48 07 0C 1D */ bl _restgpr_28 /* 802F160C 002EE54C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F1610 002EE550 7C 08 03 A6 */ mtlr r0 /* 802F1614 002EE554 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J2DGraph/J2DMaterialFactory.s b/asm/J2DGraph/J2DMaterialFactory.s index 6ed8df1407..0a937fd1f6 100644 --- a/asm/J2DGraph/J2DMaterialFactory.s +++ b/asm/J2DGraph/J2DMaterialFactory.s @@ -315,7 +315,7 @@ lbl_802F2F40: /* 802F2F5C 002EFE9C 48 01 9F E9 */ bl J2DResReference_NS_getName /* 802F2F60 002EFEA0 7C 64 1B 78 */ mr r4, r3 /* 802F2F64 002EFEA4 38 61 01 90 */ addi r3, r1, 0x190 -/* 802F2F68 002EFEA8 48 07 5B C5 */ bl func_80368B2C +/* 802F2F68 002EFEA8 48 07 5B C5 */ bl strcpy /* 802F2F6C 002EFEAC 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13) /* 802F2F70 002EFEB0 38 81 01 90 */ addi r4, r1, 0x190 /* 802F2F74 002EFEB4 48 01 9E A5 */ bl J2DDataManage_NS_get @@ -393,7 +393,7 @@ lbl_802F3058: /* 802F3088 002EFFC8 48 01 9E BD */ bl J2DResReference_NS_getName /* 802F308C 002EFFCC 7C 64 1B 78 */ mr r4, r3 /* 802F3090 002EFFD0 38 61 00 8C */ addi r3, r1, 0x8c -/* 802F3094 002EFFD4 48 07 5A 99 */ bl func_80368B2C +/* 802F3094 002EFFD4 48 07 5A 99 */ bl strcpy /* 802F3098 002EFFD8 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13) /* 802F309C 002EFFDC 38 81 00 8C */ addi r4, r1, 0x8c /* 802F30A0 002EFFE0 48 01 9D 79 */ bl J2DDataManage_NS_get diff --git a/asm/J2DGraph/J2DPane.s b/asm/J2DGraph/J2DPane.s index 169e3e97c0..cdd9c7518d 100644 --- a/asm/J2DGraph/J2DPane.s +++ b/asm/J2DGraph/J2DPane.s @@ -187,7 +187,7 @@ J2DPane_X2_: /* 802F5E8C 002F2DCC 7C 08 02 A6 */ mflr r0 /* 802F5E90 002F2DD0 90 01 00 24 */ stw r0, 0x24(r1) /* 802F5E94 002F2DD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F5E98 002F2DD8 48 06 C3 3D */ bl func_803621D4 +/* 802F5E98 002F2DD8 48 06 C3 3D */ bl _savegpr_27 /* 802F5E9C 002F2DDC 7C 7B 1B 78 */ mr r27, r3 /* 802F5EA0 002F2DE0 7C BE 2B 78 */ mr r30, r5 /* 802F5EA4 002F2DE4 7C DD 33 78 */ mr r29, r6 @@ -210,7 +210,7 @@ J2DPane_X2_: /* 802F5EE8 002F2E28 48 00 00 21 */ bl J2DPane_NS_initialize_X1_ /* 802F5EEC 002F2E2C 7F 63 DB 78 */ mr r3, r27 /* 802F5EF0 002F2E30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F5EF4 002F2E34 48 06 C3 2D */ bl func_80362220 +/* 802F5EF4 002F2E34 48 06 C3 2D */ bl _restgpr_27 /* 802F5EF8 002F2E38 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F5EFC 002F2E3C 7C 08 03 A6 */ mtlr r0 /* 802F5F00 002F2E40 38 21 00 20 */ addi r1, r1, 0x20 @@ -262,7 +262,7 @@ J2DPane_X3_: /* 802F5FA0 002F2EE0 7C 08 02 A6 */ mflr r0 /* 802F5FA4 002F2EE4 90 01 00 34 */ stw r0, 0x34(r1) /* 802F5FA8 002F2EE8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F5FAC 002F2EEC 48 06 C2 29 */ bl func_803621D4 +/* 802F5FAC 002F2EEC 48 06 C2 29 */ bl _savegpr_27 /* 802F5FB0 002F2EF0 7C 7B 1B 78 */ mr r27, r3 /* 802F5FB4 002F2EF4 7C 9D 23 78 */ mr r29, r4 /* 802F5FB8 002F2EF8 7C BE 2B 78 */ mr r30, r5 @@ -329,7 +329,7 @@ lbl_802F6050: lbl_802F60A8: /* 802F60A8 002F2FE8 7F 63 DB 78 */ mr r3, r27 /* 802F60AC 002F2FEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F60B0 002F2FF0 48 06 C1 71 */ bl func_80362220 +/* 802F60B0 002F2FF0 48 06 C1 71 */ bl _restgpr_27 /* 802F60B4 002F2FF4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F60B8 002F2FF8 7C 08 03 A6 */ mtlr r0 /* 802F60BC 002F2FFC 38 21 00 30 */ addi r1, r1, 0x30 @@ -732,7 +732,7 @@ J2DPane_NS_appendChild: /* 802F6670 002F35B0 7C 08 02 A6 */ mflr r0 /* 802F6674 002F35B4 90 01 00 24 */ stw r0, 0x24(r1) /* 802F6678 002F35B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F667C 002F35BC 48 06 BB 5D */ bl func_803621D8 +/* 802F667C 002F35BC 48 06 BB 5D */ bl _savegpr_28 /* 802F6680 002F35C0 7C 7C 1B 78 */ mr r28, r3 /* 802F6684 002F35C4 7C 9D 23 79 */ or. r29, r4, r4 /* 802F6688 002F35C8 40 82 00 0C */ bne lbl_802F6694 @@ -769,7 +769,7 @@ lbl_802F66F8: /* 802F66F8 002F3638 7F C3 F3 78 */ mr r3, r30 lbl_802F66FC: /* 802F66FC 002F363C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F6700 002F3640 48 06 BB 25 */ bl func_80362224 +/* 802F6700 002F3640 48 06 BB 25 */ bl _restgpr_28 /* 802F6704 002F3644 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F6708 002F3648 7C 08 03 A6 */ mtlr r0 /* 802F670C 002F364C 38 21 00 20 */ addi r1, r1, 0x20 @@ -781,7 +781,7 @@ J2DPane_NS_insertChild: /* 802F6718 002F3658 7C 08 02 A6 */ mflr r0 /* 802F671C 002F365C 90 01 00 24 */ stw r0, 0x24(r1) /* 802F6720 002F3660 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F6724 002F3664 48 06 BA B5 */ bl func_803621D8 +/* 802F6724 002F3664 48 06 BA B5 */ bl _savegpr_28 /* 802F6728 002F3668 7C 7C 1B 78 */ mr r28, r3 /* 802F672C 002F366C 7C 9E 23 78 */ mr r30, r4 /* 802F6730 002F3670 7C BD 2B 79 */ or. r29, r5, r5 @@ -830,7 +830,7 @@ lbl_802F67C4: /* 802F67C4 002F3704 7F C3 F3 78 */ mr r3, r30 lbl_802F67C8: /* 802F67C8 002F3708 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F67CC 002F370C 48 06 BA 59 */ bl func_80362224 +/* 802F67CC 002F370C 48 06 BA 59 */ bl _restgpr_28 /* 802F67D0 002F3710 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F67D4 002F3714 7C 08 03 A6 */ mtlr r0 /* 802F67D8 002F3718 38 21 00 20 */ addi r1, r1, 0x20 @@ -846,7 +846,7 @@ J2DPane_NS_draw: /* 802F67F4 002F3734 DB C1 00 F0 */ stfd f30, 0xf0(r1) /* 802F67F8 002F3738 F3 C1 00 F8 */ psq_st f30, 248(r1), 0, qr0 /* 802F67FC 002F373C 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 802F6800 002F3740 48 06 B9 D5 */ bl func_803621D4 +/* 802F6800 002F3740 48 06 B9 D5 */ bl _savegpr_27 /* 802F6804 002F3744 7C 7B 1B 78 */ mr r27, r3 /* 802F6808 002F3748 FF C0 08 90 */ fmr f30, f1 /* 802F680C 002F374C FF E0 10 90 */ fmr f31, f2 @@ -1188,7 +1188,7 @@ lbl_802F6CF0: /* 802F6CF8 002F3C38 E3 C1 00 F8 */ psq_l f30, 248(r1), 0, qr0 /* 802F6CFC 002F3C3C CB C1 00 F0 */ lfd f30, 0xf0(r1) /* 802F6D00 002F3C40 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 802F6D04 002F3C44 48 06 B5 1D */ bl func_80362220 +/* 802F6D04 002F3C44 48 06 B5 1D */ bl _restgpr_27 /* 802F6D08 002F3C48 80 01 01 14 */ lwz r0, 0x114(r1) /* 802F6D0C 002F3C4C 7C 08 03 A6 */ mtlr r0 /* 802F6D10 002F3C50 38 21 01 10 */ addi r1, r1, 0x110 @@ -1969,7 +1969,7 @@ J2DPane_NS_setInfluencedAlpha: /* 802F77E4 002F4724 DB C1 00 30 */ stfd f30, 0x30(r1) /* 802F77E8 002F4728 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802F77EC 002F472C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F77F0 002F4730 48 06 A9 E9 */ bl func_803621D8 +/* 802F77F0 002F4730 48 06 A9 E9 */ bl _savegpr_28 /* 802F77F4 002F4734 7C 7E 1B 78 */ mr r30, r3 /* 802F77F8 002F4738 7C 9F 23 78 */ mr r31, r4 /* 802F77FC 002F473C 54 A0 06 3F */ clrlwi. r0, r5, 0x18 @@ -2083,7 +2083,7 @@ lbl_802F797C: /* 802F7988 002F48C8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 802F798C 002F48CC CB C1 00 30 */ lfd f30, 0x30(r1) /* 802F7990 002F48D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F7994 002F48D4 48 06 A8 91 */ bl func_80362224 +/* 802F7994 002F48D4 48 06 A8 91 */ bl _restgpr_28 /* 802F7998 002F48D8 80 01 00 54 */ lwz r0, 0x54(r1) /* 802F799C 002F48DC 7C 08 03 A6 */ mtlr r0 /* 802F79A0 002F48E0 38 21 00 50 */ addi r1, r1, 0x50 @@ -2400,7 +2400,7 @@ J2DPane_NS_getPointer: /* 802F7DBC 002F4CFC 7C 08 02 A6 */ mflr r0 /* 802F7DC0 002F4D00 90 01 01 24 */ stw r0, 0x124(r1) /* 802F7DC4 002F4D04 39 61 01 20 */ addi r11, r1, 0x120 -/* 802F7DC8 002F4D08 48 06 A4 11 */ bl func_803621D8 +/* 802F7DC8 002F4D08 48 06 A4 11 */ bl _savegpr_28 /* 802F7DCC 002F4D0C 7C 9C 23 78 */ mr r28, r4 /* 802F7DD0 002F4D10 7C BD 2B 78 */ mr r29, r5 /* 802F7DD4 002F4D14 7C DE 33 79 */ or. r30, r6, r6 @@ -2474,7 +2474,7 @@ lbl_802F7EAC: /* 802F7ED8 002F4E18 48 01 4F A5 */ bl J2DDataManage_NS_get_X1_ lbl_802F7EDC: /* 802F7EDC 002F4E1C 39 61 01 20 */ addi r11, r1, 0x120 -/* 802F7EE0 002F4E20 48 06 A3 45 */ bl func_80362224 +/* 802F7EE0 002F4E20 48 06 A3 45 */ bl _restgpr_28 /* 802F7EE4 002F4E24 80 01 01 24 */ lwz r0, 0x124(r1) /* 802F7EE8 002F4E28 7C 08 03 A6 */ mtlr r0 /* 802F7EEC 002F4E2C 38 21 01 20 */ addi r1, r1, 0x120 diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index a2f5474504..c41005f981 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -67,7 +67,7 @@ J2DPicture_X1_: /* 802FC11C 002F905C 7C 08 02 A6 */ mflr r0 /* 802FC120 002F9060 90 01 00 24 */ stw r0, 0x24(r1) /* 802FC124 002F9064 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FC128 002F9068 48 06 60 B1 */ bl func_803621D8 +/* 802FC128 002F9068 48 06 60 B1 */ bl _savegpr_28 /* 802FC12C 002F906C 7C 7C 1B 78 */ mr r28, r3 /* 802FC130 002F9070 7C 9D 23 78 */ mr r29, r4 /* 802FC134 002F9074 7C BE 2B 78 */ mr r30, r5 @@ -109,7 +109,7 @@ J2DPicture_X1_: /* 802FC1B4 002F90F4 48 00 07 35 */ bl J2DPicture_NS_private_readStream /* 802FC1B8 002F90F8 7F 83 E3 78 */ mr r3, r28 /* 802FC1BC 002F90FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FC1C0 002F9100 48 06 60 65 */ bl func_80362224 +/* 802FC1C0 002F9100 48 06 60 65 */ bl _restgpr_28 /* 802FC1C4 002F9104 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FC1C8 002F9108 7C 08 03 A6 */ mtlr r0 /* 802FC1CC 002F910C 38 21 00 20 */ addi r1, r1, 0x20 @@ -918,7 +918,7 @@ J2DPicture_NS_private_initiate: /* 802FCD74 002F9CB4 7C 08 02 A6 */ mflr r0 /* 802FCD78 002F9CB8 90 01 00 24 */ stw r0, 0x24(r1) /* 802FCD7C 002F9CBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FCD80 002F9CC0 48 06 54 59 */ bl func_803621D8 +/* 802FCD80 002F9CC0 48 06 54 59 */ bl _savegpr_28 /* 802FCD84 002F9CC4 7C 7E 1B 78 */ mr r30, r3 /* 802FCD88 002F9CC8 7C 9C 23 78 */ mr r28, r4 /* 802FCD8C 002F9CCC 7C BF 2B 78 */ mr r31, r5 @@ -989,7 +989,7 @@ lbl_802FCE6C: /* 802FCE80 002F9DC0 4B FE 17 31 */ bl JUTTexture_NS_attachPalette lbl_802FCE84: /* 802FCE84 002F9DC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FCE88 002F9DC8 48 06 53 9D */ bl func_80362224 +/* 802FCE88 002F9DC8 48 06 53 9D */ bl _restgpr_28 /* 802FCE8C 002F9DCC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FCE90 002F9DD0 7C 08 03 A6 */ mtlr r0 /* 802FCE94 002F9DD4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1089,7 +1089,7 @@ J2DPicture_NS_dtor: /* 802FCFF4 002F9F34 7C 08 02 A6 */ mflr r0 /* 802FCFF8 002F9F38 90 01 00 24 */ stw r0, 0x24(r1) /* 802FCFFC 002F9F3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD000 002F9F40 48 06 51 D5 */ bl func_803621D4 +/* 802FD000 002F9F40 48 06 51 D5 */ bl _savegpr_27 /* 802FD004 002F9F44 7C 7B 1B 79 */ or. r27, r3, r3 /* 802FD008 002F9F48 7C 9C 23 78 */ mr r28, r4 /* 802FD00C 002F9F4C 41 82 00 70 */ beq lbl_802FD07C @@ -1125,7 +1125,7 @@ lbl_802FD048: lbl_802FD07C: /* 802FD07C 002F9FBC 7F 63 DB 78 */ mr r3, r27 /* 802FD080 002F9FC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD084 002F9FC4 48 06 51 9D */ bl func_80362220 +/* 802FD084 002F9FC4 48 06 51 9D */ bl _restgpr_27 /* 802FD088 002F9FC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FD08C 002F9FCC 7C 08 03 A6 */ mtlr r0 /* 802FD090 002F9FD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1134,7 +1134,7 @@ lbl_802FD07C: /* 802FD09C 002F9FDC 7C 08 02 A6 */ mflr r0 /* 802FD0A0 002F9FE0 90 01 00 24 */ stw r0, 0x24(r1) /* 802FD0A4 002F9FE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD0A8 002F9FE8 48 06 51 31 */ bl func_803621D8 +/* 802FD0A8 002F9FE8 48 06 51 31 */ bl _savegpr_28 /* 802FD0AC 002F9FEC 7C 7C 1B 78 */ mr r28, r3 /* 802FD0B0 002F9FF0 3B A0 00 00 */ li r29, 0 /* 802FD0B4 002F9FF4 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -1184,7 +1184,7 @@ lbl_802FD140: /* 802FD14C 002FA08C 38 60 00 01 */ li r3, 1 lbl_802FD150: /* 802FD150 002FA090 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD154 002FA094 48 06 50 D1 */ bl func_80362224 +/* 802FD154 002FA094 48 06 50 D1 */ bl _restgpr_28 /* 802FD158 002FA098 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FD15C 002FA09C 7C 08 03 A6 */ mtlr r0 /* 802FD160 002FA0A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1575,7 +1575,7 @@ lbl_802FD6D4: /* 802FD6F8 002FA638 7C 08 02 A6 */ mflr r0 /* 802FD6FC 002FA63C 90 01 00 24 */ stw r0, 0x24(r1) /* 802FD700 002FA640 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD704 002FA644 48 06 4A D5 */ bl func_803621D8 +/* 802FD704 002FA644 48 06 4A D5 */ bl _savegpr_28 /* 802FD708 002FA648 7C 7F 1B 78 */ mr r31, r3 /* 802FD70C 002FA64C 7C 9C 23 78 */ mr r28, r4 /* 802FD710 002FA650 88 03 01 08 */ lbz r0, 0x108(r3) @@ -1644,7 +1644,7 @@ lbl_802FD78C: /* 802FD7F8 002FA738 38 60 00 01 */ li r3, 1 lbl_802FD7FC: /* 802FD7FC 002FA73C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD800 002FA740 48 06 4A 25 */ bl func_80362224 +/* 802FD800 002FA740 48 06 4A 25 */ bl _restgpr_28 /* 802FD804 002FA744 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FD808 002FA748 7C 08 03 A6 */ mtlr r0 /* 802FD80C 002FA74C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1680,7 +1680,7 @@ lbl_802FD850: /* 802FD878 002FA7B8 7C 08 02 A6 */ mflr r0 /* 802FD87C 002FA7BC 90 01 00 24 */ stw r0, 0x24(r1) /* 802FD880 002FA7C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD884 002FA7C4 48 06 49 51 */ bl func_803621D4 +/* 802FD884 002FA7C4 48 06 49 51 */ bl _savegpr_27 /* 802FD888 002FA7C8 7C 7B 1B 78 */ mr r27, r3 /* 802FD88C 002FA7CC 7C 9C 23 78 */ mr r28, r4 /* 802FD890 002FA7D0 7C BD 2B 78 */ mr r29, r5 @@ -1736,7 +1736,7 @@ lbl_802FD934: /* 802FD948 002FA888 38 60 00 00 */ li r3, 0 lbl_802FD94C: /* 802FD94C 002FA88C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FD950 002FA890 48 06 48 D1 */ bl func_80362220 +/* 802FD950 002FA890 48 06 48 D1 */ bl _restgpr_27 /* 802FD954 002FA894 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FD958 002FA898 7C 08 03 A6 */ mtlr r0 /* 802FD95C 002FA89C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1958,7 +1958,7 @@ J2DPicture_NS_draw: /* 802FDC94 002FABD4 DB 81 00 70 */ stfd f28, 0x70(r1) /* 802FDC98 002FABD8 F3 81 00 78 */ psq_st f28, 120(r1), 0, qr0 /* 802FDC9C 002FABDC 39 61 00 70 */ addi r11, r1, 0x70 -/* 802FDCA0 002FABE0 48 06 45 35 */ bl func_803621D4 +/* 802FDCA0 002FABE0 48 06 45 35 */ bl _savegpr_27 /* 802FDCA4 002FABE4 7C 7B 1B 78 */ mr r27, r3 /* 802FDCA8 002FABE8 FF 80 08 90 */ fmr f28, f1 /* 802FDCAC 002FABEC FF A0 10 90 */ fmr f29, f2 @@ -2142,7 +2142,7 @@ lbl_802FDF50: /* 802FDF68 002FAEA8 E3 81 00 78 */ psq_l f28, 120(r1), 0, qr0 /* 802FDF6C 002FAEAC CB 81 00 70 */ lfd f28, 0x70(r1) /* 802FDF70 002FAEB0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802FDF74 002FAEB4 48 06 42 AD */ bl func_80362220 +/* 802FDF74 002FAEB4 48 06 42 AD */ bl _restgpr_27 /* 802FDF78 002FAEB8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802FDF7C 002FAEBC 7C 08 03 A6 */ mtlr r0 /* 802FDF80 002FAEC0 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -2159,7 +2159,7 @@ lbl_802FDF50: /* 802FDFAC 002FAEEC DB 81 00 B0 */ stfd f28, 0xb0(r1) /* 802FDFB0 002FAEF0 F3 81 00 B8 */ psq_st f28, 184(r1), 0, qr0 /* 802FDFB4 002FAEF4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 802FDFB8 002FAEF8 48 06 42 21 */ bl func_803621D8 +/* 802FDFB8 002FAEF8 48 06 42 21 */ bl _savegpr_28 /* 802FDFBC 002FAEFC 7C 7C 1B 78 */ mr r28, r3 /* 802FDFC0 002FAF00 7C 9F 23 78 */ mr r31, r4 /* 802FDFC4 002FAF04 7C BD 2B 78 */ mr r29, r5 @@ -2399,7 +2399,7 @@ lbl_802FE348: /* 802FE360 002FB2A0 E3 81 00 B8 */ psq_l f28, 184(r1), 0, qr0 /* 802FE364 002FB2A4 CB 81 00 B0 */ lfd f28, 0xb0(r1) /* 802FE368 002FB2A8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 802FE36C 002FB2AC 48 06 3E B9 */ bl func_80362224 +/* 802FE36C 002FB2AC 48 06 3E B9 */ bl _restgpr_28 /* 802FE370 002FB2B0 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 802FE374 002FB2B4 7C 08 03 A6 */ mtlr r0 /* 802FE378 002FB2B8 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -2562,7 +2562,7 @@ J2DPicture_NS_setTevMode: /* 802FE5D4 002FB514 7C 08 02 A6 */ mflr r0 /* 802FE5D8 002FB518 90 01 00 34 */ stw r0, 0x34(r1) /* 802FE5DC 002FB51C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FE5E0 002FB520 48 06 3B F9 */ bl func_803621D8 +/* 802FE5E0 002FB520 48 06 3B F9 */ bl _savegpr_28 /* 802FE5E4 002FB524 7C 7E 1B 78 */ mr r30, r3 /* 802FE5E8 002FB528 3B 80 00 00 */ li r28, 0 /* 802FE5EC 002FB52C 48 00 00 1C */ b lbl_802FE608 @@ -2862,7 +2862,7 @@ lbl_802FEA34: /* 802FEA40 002FB980 2C 1C 00 10 */ cmpwi r28, 0x10 /* 802FEA44 002FB984 41 80 FF F0 */ blt lbl_802FEA34 /* 802FEA48 002FB988 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FEA4C 002FB98C 48 06 37 D9 */ bl func_80362224 +/* 802FEA4C 002FB98C 48 06 37 D9 */ bl _restgpr_28 /* 802FEA50 002FB990 80 01 00 34 */ lwz r0, 0x34(r1) /* 802FEA54 002FB994 7C 08 03 A6 */ mtlr r0 /* 802FEA58 002FB998 38 21 00 30 */ addi r1, r1, 0x30 @@ -3100,7 +3100,7 @@ J2DPicture_NS_setTexCoord_X1_: /* 802FED88 002FBCC8 7C 08 02 A6 */ mflr r0 /* 802FED8C 002FBCCC 90 01 00 44 */ stw r0, 0x44(r1) /* 802FED90 002FBCD0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802FED94 002FBCD4 48 06 34 41 */ bl func_803621D4 +/* 802FED94 002FBCD4 48 06 34 41 */ bl _savegpr_27 /* 802FED98 002FBCD8 7C 9D 23 78 */ mr r29, r4 /* 802FED9C 002FBCDC 7C FE 3B 78 */ mr r30, r7 /* 802FEDA0 002FBCE0 7D 1F 43 78 */ mr r31, r8 @@ -3325,7 +3325,7 @@ lbl_802FF064: /* 802FF080 002FBFC0 B3 DD 00 0E */ sth r30, 0xe(r29) lbl_802FF084: /* 802FF084 002FBFC4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802FF088 002FBFC8 48 06 31 99 */ bl func_80362220 +/* 802FF088 002FBFC8 48 06 31 99 */ bl _restgpr_27 /* 802FF08C 002FBFCC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802FF090 002FBFD0 7C 08 03 A6 */ mtlr r0 /* 802FF094 002FBFD4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index e80d7a7990..92f3638c6c 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -246,7 +246,7 @@ lbl_803039B0: /* 803039D0 00300910 7C 08 02 A6 */ mflr r0 /* 803039D4 00300914 90 01 00 74 */ stw r0, 0x74(r1) /* 803039D8 00300918 39 61 00 70 */ addi r11, r1, 0x70 -/* 803039DC 0030091C 48 05 E7 FD */ bl func_803621D8 +/* 803039DC 0030091C 48 05 E7 FD */ bl _savegpr_28 /* 803039E0 00300920 7C 7C 1B 78 */ mr r28, r3 /* 803039E4 00300924 7C 9F 23 78 */ mr r31, r4 /* 803039E8 00300928 80 63 01 50 */ lwz r3, 0x150(r3) @@ -299,7 +299,7 @@ lbl_80303A8C: /* 80303A98 003009D8 38 60 00 01 */ li r3, 1 lbl_80303A9C: /* 80303A9C 003009DC 39 61 00 70 */ addi r11, r1, 0x70 -/* 80303AA0 003009E0 48 05 E7 85 */ bl func_80362224 +/* 80303AA0 003009E0 48 05 E7 85 */ bl _restgpr_28 /* 80303AA4 003009E4 80 01 00 74 */ lwz r0, 0x74(r1) /* 80303AA8 003009E8 7C 08 03 A6 */ mtlr r0 /* 80303AAC 003009EC 38 21 00 70 */ addi r1, r1, 0x70 @@ -608,7 +608,7 @@ lbl_80303F24: /* 80303F3C 00300E7C 90 01 00 24 */ stw r0, 0x24(r1) /* 80303F40 00300E80 DB E1 00 18 */ stfd f31, 0x18(r1) /* 80303F44 00300E84 39 61 00 18 */ addi r11, r1, 0x18 -/* 80303F48 00300E88 48 05 E2 91 */ bl func_803621D8 +/* 80303F48 00300E88 48 05 E2 91 */ bl _savegpr_28 /* 80303F4C 00300E8C 7C 7C 1B 78 */ mr r28, r3 /* 80303F50 00300E90 7C 9D 23 79 */ or. r29, r4, r4 /* 80303F54 00300E94 7C BE 2B 78 */ mr r30, r5 @@ -642,7 +642,7 @@ lbl_80303F84: lbl_80303FBC: /* 80303FBC 00300EFC CB E1 00 18 */ lfd f31, 0x18(r1) /* 80303FC0 00300F00 39 61 00 18 */ addi r11, r1, 0x18 -/* 80303FC4 00300F04 48 05 E2 61 */ bl func_80362224 +/* 80303FC4 00300F04 48 05 E2 61 */ bl _restgpr_28 /* 80303FC8 00300F08 80 01 00 24 */ lwz r0, 0x24(r1) /* 80303FCC 00300F0C 7C 08 03 A6 */ mtlr r0 /* 80303FD0 00300F10 38 21 00 20 */ addi r1, r1, 0x20 @@ -968,7 +968,7 @@ lbl_80304454: /* 80304470 003013B0 7C 08 02 A6 */ mflr r0 /* 80304474 003013B4 90 01 00 24 */ stw r0, 0x24(r1) /* 80304478 003013B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030447C 003013BC 48 05 DD 59 */ bl func_803621D4 +/* 8030447C 003013BC 48 05 DD 59 */ bl _savegpr_27 /* 80304480 003013C0 7C 7D 1B 78 */ mr r29, r3 /* 80304484 003013C4 7C 9B 23 78 */ mr r27, r4 /* 80304488 003013C8 48 00 02 A1 */ bl J2DPictureEx_NS_isRemove @@ -1066,7 +1066,7 @@ lbl_80304570: /* 803045EC 0030152C 38 60 00 01 */ li r3, 1 lbl_803045F0: /* 803045F0 00301530 39 61 00 20 */ addi r11, r1, 0x20 -/* 803045F4 00301534 48 05 DC 2D */ bl func_80362220 +/* 803045F4 00301534 48 05 DC 2D */ bl _restgpr_27 /* 803045F8 00301538 80 01 00 24 */ lwz r0, 0x24(r1) /* 803045FC 0030153C 7C 08 03 A6 */ mtlr r0 /* 80304600 00301540 38 21 00 20 */ addi r1, r1, 0x20 @@ -1103,7 +1103,7 @@ lbl_8030465C: /* 80304670 003015B0 7C 08 02 A6 */ mflr r0 /* 80304674 003015B4 90 01 00 24 */ stw r0, 0x24(r1) /* 80304678 003015B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030467C 003015BC 48 05 DB 5D */ bl func_803621D8 +/* 8030467C 003015BC 48 05 DB 5D */ bl _savegpr_28 /* 80304680 003015C0 7C 7C 1B 78 */ mr r28, r3 /* 80304684 003015C4 7C 9D 23 78 */ mr r29, r4 /* 80304688 003015C8 80 63 01 50 */ lwz r3, 0x150(r3) @@ -1147,7 +1147,7 @@ lbl_803046F8: /* 8030470C 0030164C 4E 80 04 21 */ bctrl lbl_80304710: /* 80304710 00301650 39 61 00 20 */ addi r11, r1, 0x20 -/* 80304714 00301654 48 05 DB 11 */ bl func_80362224 +/* 80304714 00301654 48 05 DB 11 */ bl _restgpr_28 /* 80304718 00301658 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030471C 0030165C 7C 08 03 A6 */ mtlr r0 /* 80304720 00301660 38 21 00 20 */ addi r1, r1, 0x20 @@ -1188,7 +1188,7 @@ lbl_80304774: /* 80304790 003016D0 DB C1 00 30 */ stfd f30, 0x30(r1) /* 80304794 003016D4 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 80304798 003016D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030479C 003016DC 48 05 DA 3D */ bl func_803621D8 +/* 8030479C 003016DC 48 05 DA 3D */ bl _savegpr_28 /* 803047A0 003016E0 7C 7C 1B 78 */ mr r28, r3 /* 803047A4 003016E4 FF C0 08 90 */ fmr f30, f1 /* 803047A8 003016E8 FF E0 10 90 */ fmr f31, f2 @@ -1245,7 +1245,7 @@ lbl_80304868: /* 80304870 003017B0 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 80304874 003017B4 CB C1 00 30 */ lfd f30, 0x30(r1) /* 80304878 003017B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030487C 003017BC 48 05 D9 A9 */ bl func_80362224 +/* 8030487C 003017BC 48 05 D9 A9 */ bl _restgpr_28 /* 80304880 003017C0 80 01 00 54 */ lwz r0, 0x54(r1) /* 80304884 003017C4 7C 08 03 A6 */ mtlr r0 /* 80304888 003017C8 38 21 00 50 */ addi r1, r1, 0x50 @@ -1262,7 +1262,7 @@ lbl_80304868: /* 803048B4 003017F4 DB 81 00 60 */ stfd f28, 0x60(r1) /* 803048B8 003017F8 F3 81 00 68 */ psq_st f28, 104(r1), 0, qr0 /* 803048BC 003017FC 39 61 00 60 */ addi r11, r1, 0x60 -/* 803048C0 00301800 48 05 D9 19 */ bl func_803621D8 +/* 803048C0 00301800 48 05 D9 19 */ bl _savegpr_28 /* 803048C4 00301804 7C 7C 1B 78 */ mr r28, r3 /* 803048C8 00301808 FF 80 08 90 */ fmr f28, f1 /* 803048CC 0030180C FF A0 10 90 */ fmr f29, f2 @@ -1577,7 +1577,7 @@ lbl_80304D50: /* 80304D68 00301CA8 E3 81 00 68 */ psq_l f28, 104(r1), 0, qr0 /* 80304D6C 00301CAC CB 81 00 60 */ lfd f28, 0x60(r1) /* 80304D70 00301CB0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80304D74 00301CB4 48 05 D4 B1 */ bl func_80362224 +/* 80304D74 00301CB4 48 05 D4 B1 */ bl _restgpr_28 /* 80304D78 00301CB8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80304D7C 00301CBC 7C 08 03 A6 */ mtlr r0 /* 80304D80 00301CC0 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -1926,7 +1926,7 @@ J2DPictureEx_NS_setTevOrder: /* 803052B0 003021F0 7C 08 02 A6 */ mflr r0 /* 803052B4 003021F4 90 01 00 44 */ stw r0, 0x44(r1) /* 803052B8 003021F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 803052BC 003021FC 48 05 CF 1D */ bl func_803621D8 +/* 803052BC 003021FC 48 05 CF 1D */ bl _savegpr_28 /* 803052C0 00302200 7C 7F 1B 78 */ mr r31, r3 /* 803052C4 00302204 54 88 06 3E */ clrlwi r8, r4, 0x18 /* 803052C8 00302208 28 08 00 01 */ cmplwi r8, 1 @@ -2002,7 +2002,7 @@ lbl_803053BC: /* 803053C0 00302300 7C 00 F0 40 */ cmplw r0, r30 /* 803053C4 00302304 41 80 FF B4 */ blt lbl_80305378 /* 803053C8 00302308 39 61 00 40 */ addi r11, r1, 0x40 -/* 803053CC 0030230C 48 05 CE 59 */ bl func_80362224 +/* 803053CC 0030230C 48 05 CE 59 */ bl _restgpr_28 /* 803053D0 00302310 80 01 00 44 */ lwz r0, 0x44(r1) /* 803053D4 00302314 7C 08 03 A6 */ mtlr r0 /* 803053D8 00302318 38 21 00 40 */ addi r1, r1, 0x40 @@ -2014,7 +2014,7 @@ J2DPictureEx_NS_setTevStage: /* 803053E4 00302324 7C 08 02 A6 */ mflr r0 /* 803053E8 00302328 90 01 00 24 */ stw r0, 0x24(r1) /* 803053EC 0030232C 39 61 00 20 */ addi r11, r1, 0x20 -/* 803053F0 00302330 48 05 CD E9 */ bl func_803621D8 +/* 803053F0 00302330 48 05 CD E9 */ bl _savegpr_28 /* 803053F4 00302334 7C 7F 1B 78 */ mr r31, r3 /* 803053F8 00302338 7C 9E 23 78 */ mr r30, r4 /* 803053FC 0030233C 7C DC 33 78 */ mr r28, r6 @@ -2186,7 +2186,7 @@ lbl_80305608: /* 8030566C 003025AC 48 00 00 1D */ bl J2DPictureEx_NS_setStage lbl_80305670: /* 80305670 003025B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80305674 003025B4 48 05 CB B1 */ bl func_80362224 +/* 80305674 003025B4 48 05 CB B1 */ bl _restgpr_28 /* 80305678 003025B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030567C 003025BC 7C 08 03 A6 */ mtlr r0 /* 80305680 003025C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2198,7 +2198,7 @@ J2DPictureEx_NS_setStage: /* 8030568C 003025CC 7C 08 02 A6 */ mflr r0 /* 80305690 003025D0 90 01 00 84 */ stw r0, 0x84(r1) /* 80305694 003025D4 39 61 00 80 */ addi r11, r1, 0x80 -/* 80305698 003025D8 48 05 CB 41 */ bl func_803621D8 +/* 80305698 003025D8 48 05 CB 41 */ bl _savegpr_28 /* 8030569C 003025DC 3C 60 80 3A */ lis r3, lbl_803A1D50@ha /* 803056A0 003025E0 39 03 1D 50 */ addi r8, r3, lbl_803A1D50@l /* 803056A4 003025E4 38 E1 00 24 */ addi r7, r1, 0x24 @@ -2364,7 +2364,7 @@ lbl_803058EC: /* 80305908 00302848 50 60 06 BE */ rlwimi r0, r3, 0, 0x1a, 0x1f /* 8030590C 0030284C 98 04 00 05 */ stb r0, 5(r4) /* 80305910 00302850 39 61 00 80 */ addi r11, r1, 0x80 -/* 80305914 00302854 48 05 C9 11 */ bl func_80362224 +/* 80305914 00302854 48 05 C9 11 */ bl _restgpr_28 /* 80305918 00302858 80 01 00 84 */ lwz r0, 0x84(r1) /* 8030591C 0030285C 7C 08 03 A6 */ mtlr r0 /* 80305920 00302860 38 21 00 80 */ addi r1, r1, 0x80 @@ -2840,7 +2840,7 @@ lbl_80305F84: /* 80305F98 00302ED8 7C 08 02 A6 */ mflr r0 /* 80305F9C 00302EDC 90 01 00 24 */ stw r0, 0x24(r1) /* 80305FA0 00302EE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80305FA4 00302EE4 48 05 C2 31 */ bl func_803621D4 +/* 80305FA4 00302EE4 48 05 C2 31 */ bl _savegpr_27 /* 80305FA8 00302EE8 7C 7B 1B 78 */ mr r27, r3 /* 80305FAC 00302EEC 7C 9C 23 78 */ mr r28, r4 /* 80305FB0 00302EF0 7C BD 2B 78 */ mr r29, r5 @@ -2921,7 +2921,7 @@ lbl_803060A4: /* 803060C0 00303000 38 60 00 00 */ li r3, 0 lbl_803060C4: /* 803060C4 00303004 39 61 00 20 */ addi r11, r1, 0x20 -/* 803060C8 00303008 48 05 C1 59 */ bl func_80362220 +/* 803060C8 00303008 48 05 C1 59 */ bl _restgpr_27 /* 803060CC 0030300C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803060D0 00303010 7C 08 03 A6 */ mtlr r0 /* 803060D4 00303014 38 21 00 20 */ addi r1, r1, 0x20 @@ -3735,7 +3735,7 @@ lbl_80306C64: /* 80306C74 00303BB4 7C 08 02 A6 */ mflr r0 /* 80306C78 00303BB8 90 01 00 24 */ stw r0, 0x24(r1) /* 80306C7C 00303BBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80306C80 00303BC0 48 05 B5 59 */ bl func_803621D8 +/* 80306C80 00303BC0 48 05 B5 59 */ bl _savegpr_28 /* 80306C84 00303BC4 7C 7C 1B 78 */ mr r28, r3 /* 80306C88 00303BC8 7C 9D 23 78 */ mr r29, r4 /* 80306C8C 00303BCC 80 63 01 94 */ lwz r3, 0x194(r3) @@ -3823,7 +3823,7 @@ lbl_80306DA4: /* 80306DA8 00303CE8 7F A4 EB 78 */ mr r4, r29 /* 80306DAC 00303CEC 4B FF 14 7D */ bl J2DPane_NS_animationPane /* 80306DB0 00303CF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80306DB4 00303CF4 48 05 B4 71 */ bl func_80362224 +/* 80306DB4 00303CF4 48 05 B4 71 */ bl _restgpr_28 /* 80306DB8 00303CF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80306DBC 00303CFC 7C 08 03 A6 */ mtlr r0 /* 80306DC0 00303D00 38 21 00 20 */ addi r1, r1, 0x20 @@ -3832,7 +3832,7 @@ lbl_80306DA4: /* 80306DCC 00303D0C 7C 08 02 A6 */ mflr r0 /* 80306DD0 00303D10 90 01 00 24 */ stw r0, 0x24(r1) /* 80306DD4 00303D14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80306DD8 00303D18 48 05 B3 FD */ bl func_803621D4 +/* 80306DD8 00303D18 48 05 B3 FD */ bl _savegpr_27 /* 80306DDC 00303D1C 7C 7F 1B 78 */ mr r31, r3 /* 80306DE0 00303D20 80 63 01 50 */ lwz r3, 0x150(r3) /* 80306DE4 00303D24 83 A3 00 28 */ lwz r29, 0x28(r3) @@ -3898,7 +3898,7 @@ lbl_80306EAC: /* 80306EB8 00303DF8 38 60 00 00 */ li r3, 0 lbl_80306EBC: /* 80306EBC 00303DFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80306EC0 00303E00 48 05 B3 61 */ bl func_80362220 +/* 80306EC0 00303E00 48 05 B3 61 */ bl _restgpr_27 /* 80306EC4 00303E04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80306EC8 00303E08 7C 08 03 A6 */ mtlr r0 /* 80306ECC 00303E0C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index cc5a8743e3..9df17bf621 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -9,7 +9,7 @@ J2DPrint_print_alpha_va: /* 802F42F4 002F1234 7C 08 02 A6 */ mflr r0 /* 802F42F8 002F1238 90 01 00 24 */ stw r0, 0x24(r1) /* 802F42FC 002F123C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F4300 002F1240 48 06 DE D9 */ bl func_803621D8 +/* 802F4300 002F1240 48 06 DE D9 */ bl _savegpr_28 /* 802F4304 002F1244 7C 7C 1B 78 */ mr r28, r3 /* 802F4308 002F1248 7C 9D 23 78 */ mr r29, r4 /* 802F430C 002F124C 7C BE 2B 78 */ mr r30, r5 @@ -44,7 +44,7 @@ lbl_802F4354: /* 802F4378 002F12B8 C0 21 00 08 */ lfs f1, 8(r1) lbl_802F437C: /* 802F437C 002F12BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F4380 002F12C0 48 06 DE A5 */ bl func_80362224 +/* 802F4380 002F12C0 48 06 DE A5 */ bl _restgpr_28 /* 802F4384 002F12C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F4388 002F12C8 7C 08 03 A6 */ mtlr r0 /* 802F438C 002F12CC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1598,7 +1598,7 @@ J2DPrint_NS_getNumberS32: /* 802F59C4 002F2904 7C 08 02 A6 */ mflr r0 /* 802F59C8 002F2908 90 01 00 24 */ stw r0, 0x24(r1) /* 802F59CC 002F290C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F59D0 002F2910 48 06 C8 09 */ bl func_803621D8 +/* 802F59D0 002F2910 48 06 C8 09 */ bl _savegpr_28 /* 802F59D4 002F2914 7C 9E 23 78 */ mr r30, r4 /* 802F59D8 002F2918 7C BF 2B 78 */ mr r31, r5 /* 802F59DC 002F291C 7C DC 33 78 */ mr r28, r6 @@ -1661,7 +1661,7 @@ lbl_802F5AA4: /* 802F5AA8 002F29E8 90 1E 00 00 */ stw r0, 0(r30) lbl_802F5AAC: /* 802F5AAC 002F29EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F5AB0 002F29F0 48 06 C7 75 */ bl func_80362224 +/* 802F5AB0 002F29F0 48 06 C7 75 */ bl _restgpr_28 /* 802F5AB4 002F29F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F5AB8 002F29F8 7C 08 03 A6 */ mtlr r0 /* 802F5ABC 002F29FC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DScreen.s b/asm/J2DGraph/J2DScreen.s index 5cd296e082..6ac5b63ea5 100644 --- a/asm/J2DGraph/J2DScreen.s +++ b/asm/J2DGraph/J2DScreen.s @@ -128,7 +128,7 @@ J2DScreen_NS_setPriority: /* 802F864C 002F558C 7C 08 02 A6 */ mflr r0 /* 802F8650 002F5590 90 01 00 34 */ stw r0, 0x34(r1) /* 802F8654 002F5594 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F8658 002F5598 48 06 9B 81 */ bl func_803621D8 +/* 802F8658 002F5598 48 06 9B 81 */ bl _savegpr_28 /* 802F865C 002F559C 7C 7D 1B 78 */ mr r29, r3 /* 802F8660 002F55A0 7C BE 2B 78 */ mr r30, r5 /* 802F8664 002F55A4 7C DF 33 79 */ or. r31, r6, r6 @@ -186,7 +186,7 @@ lbl_802F872C: /* 802F872C 002F566C 38 60 00 00 */ li r3, 0 lbl_802F8730: /* 802F8730 002F5670 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F8734 002F5674 48 06 9A F1 */ bl func_80362224 +/* 802F8734 002F5674 48 06 9A F1 */ bl _restgpr_28 /* 802F8738 002F5678 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F873C 002F567C 7C 08 03 A6 */ mtlr r0 /* 802F8740 002F5680 38 21 00 30 */ addi r1, r1, 0x30 @@ -215,7 +215,7 @@ J2DScreen_NS_private_set: /* 802F877C 002F56BC 7C 08 02 A6 */ mflr r0 /* 802F8780 002F56C0 90 01 00 24 */ stw r0, 0x24(r1) /* 802F8784 002F56C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8788 002F56C8 48 06 9A 51 */ bl func_803621D8 +/* 802F8788 002F56C8 48 06 9A 51 */ bl _savegpr_28 /* 802F878C 002F56CC 7C 7C 1B 78 */ mr r28, r3 /* 802F8790 002F56D0 7C 9D 23 78 */ mr r29, r4 /* 802F8794 002F56D4 7C BE 2B 78 */ mr r30, r5 @@ -258,7 +258,7 @@ lbl_802F8818: /* 802F8818 002F5758 38 60 00 00 */ li r3, 0 lbl_802F881C: /* 802F881C 002F575C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8820 002F5760 48 06 9A 05 */ bl func_80362224 +/* 802F8820 002F5760 48 06 9A 05 */ bl _restgpr_28 /* 802F8824 002F5764 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F8828 002F5768 7C 08 03 A6 */ mtlr r0 /* 802F882C 002F576C 38 21 00 20 */ addi r1, r1, 0x20 @@ -999,7 +999,7 @@ J2DScreen_NS_getResReference: /* 802F9284 002F61C4 7C 08 02 A6 */ mflr r0 /* 802F9288 002F61C8 90 01 00 34 */ stw r0, 0x34(r1) /* 802F928C 002F61CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F9290 002F61D0 48 06 8F 45 */ bl func_803621D4 +/* 802F9290 002F61D0 48 06 8F 45 */ bl _savegpr_27 /* 802F9294 002F61D4 7C 9B 23 78 */ mr r27, r4 /* 802F9298 002F61D8 7C BC 2B 78 */ mr r28, r5 /* 802F929C 002F61DC 7F 63 DB 78 */ mr r3, r27 @@ -1056,7 +1056,7 @@ lbl_802F9348: lbl_802F9360: /* 802F9360 002F62A0 7F C3 F3 78 */ mr r3, r30 /* 802F9364 002F62A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F9368 002F62A8 48 06 8E B9 */ bl func_80362220 +/* 802F9368 002F62A8 48 06 8E B9 */ bl _restgpr_27 /* 802F936C 002F62AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F9370 002F62B0 7C 08 03 A6 */ mtlr r0 /* 802F9374 002F62B4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1323,7 +1323,7 @@ lbl_802F96DC: /* 802F9708 002F6648 7C 08 02 A6 */ mflr r0 /* 802F970C 002F664C 90 01 00 24 */ stw r0, 0x24(r1) /* 802F9710 002F6650 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9714 002F6654 48 06 8A C5 */ bl func_803621D8 +/* 802F9714 002F6654 48 06 8A C5 */ bl _savegpr_28 /* 802F9718 002F6658 7C 7C 1B 78 */ mr r28, r3 /* 802F971C 002F665C 7C 9D 23 78 */ mr r29, r4 /* 802F9720 002F6660 7F A3 EB 78 */ mr r3, r29 @@ -1354,7 +1354,7 @@ lbl_802F9774: /* 802F9778 002F66B8 7C 00 F8 40 */ cmplw r0, r31 /* 802F977C 002F66BC 41 80 FF C8 */ blt lbl_802F9744 /* 802F9780 002F66C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9784 002F66C4 48 06 8A A1 */ bl func_80362224 +/* 802F9784 002F66C4 48 06 8A A1 */ bl _restgpr_28 /* 802F9788 002F66C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F978C 002F66CC 7C 08 03 A6 */ mtlr r0 /* 802F9790 002F66D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1363,7 +1363,7 @@ lbl_802F9774: /* 802F979C 002F66DC 7C 08 02 A6 */ mflr r0 /* 802F97A0 002F66E0 90 01 00 24 */ stw r0, 0x24(r1) /* 802F97A4 002F66E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F97A8 002F66E8 48 06 8A 31 */ bl func_803621D8 +/* 802F97A8 002F66E8 48 06 8A 31 */ bl _savegpr_28 /* 802F97AC 002F66EC 7C 7C 1B 78 */ mr r28, r3 /* 802F97B0 002F66F0 7C 9D 23 78 */ mr r29, r4 /* 802F97B4 002F66F4 7F A3 EB 78 */ mr r3, r29 @@ -1397,7 +1397,7 @@ lbl_802F9814: /* 802F9818 002F6758 7C 00 F8 40 */ cmplw r0, r31 /* 802F981C 002F675C 41 80 FF C8 */ blt lbl_802F97E4 /* 802F9820 002F6760 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9824 002F6764 48 06 8A 01 */ bl func_80362224 +/* 802F9824 002F6764 48 06 8A 01 */ bl _restgpr_28 /* 802F9828 002F6768 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F982C 002F676C 7C 08 03 A6 */ mtlr r0 /* 802F9830 002F6770 38 21 00 20 */ addi r1, r1, 0x20 @@ -1406,7 +1406,7 @@ lbl_802F9814: /* 802F983C 002F677C 7C 08 02 A6 */ mflr r0 /* 802F9840 002F6780 90 01 00 24 */ stw r0, 0x24(r1) /* 802F9844 002F6784 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9848 002F6788 48 06 89 91 */ bl func_803621D8 +/* 802F9848 002F6788 48 06 89 91 */ bl _savegpr_28 /* 802F984C 002F678C 7C 7C 1B 78 */ mr r28, r3 /* 802F9850 002F6790 7C 9D 23 78 */ mr r29, r4 /* 802F9854 002F6794 7F A3 EB 78 */ mr r3, r29 @@ -1437,7 +1437,7 @@ lbl_802F98A8: /* 802F98AC 002F67EC 7C 00 F8 40 */ cmplw r0, r31 /* 802F98B0 002F67F0 41 80 FF C8 */ blt lbl_802F9878 /* 802F98B4 002F67F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F98B8 002F67F8 48 06 89 6D */ bl func_80362224 +/* 802F98B8 002F67F8 48 06 89 6D */ bl _restgpr_28 /* 802F98BC 002F67FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F98C0 002F6800 7C 08 03 A6 */ mtlr r0 /* 802F98C4 002F6804 38 21 00 20 */ addi r1, r1, 0x20 @@ -1446,7 +1446,7 @@ lbl_802F98A8: /* 802F98D0 002F6810 7C 08 02 A6 */ mflr r0 /* 802F98D4 002F6814 90 01 00 24 */ stw r0, 0x24(r1) /* 802F98D8 002F6818 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F98DC 002F681C 48 06 88 FD */ bl func_803621D8 +/* 802F98DC 002F681C 48 06 88 FD */ bl _savegpr_28 /* 802F98E0 002F6820 7C 7E 1B 78 */ mr r30, r3 /* 802F98E4 002F6824 7C 9F 23 78 */ mr r31, r4 /* 802F98E8 002F6828 7F E3 FB 78 */ mr r3, r31 @@ -1498,7 +1498,7 @@ lbl_802F9984: /* 802F9988 002F68C8 7C 00 E8 40 */ cmplw r0, r29 /* 802F998C 002F68CC 41 80 FF C8 */ blt lbl_802F9954 /* 802F9990 002F68D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9994 002F68D4 48 06 88 91 */ bl func_80362224 +/* 802F9994 002F68D4 48 06 88 91 */ bl _restgpr_28 /* 802F9998 002F68D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F999C 002F68DC 7C 08 03 A6 */ mtlr r0 /* 802F99A0 002F68E0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s index 6e09fc0743..bbfc3c7397 100644 --- a/asm/J2DGraph/J2DTextBox.s +++ b/asm/J2DGraph/J2DTextBox.s @@ -42,7 +42,7 @@ J2DTextBox_X1_: /* 802FF6DC 002FC61C 7C 08 02 A6 */ mflr r0 /* 802FF6E0 002FC620 90 01 00 24 */ stw r0, 0x24(r1) /* 802FF6E4 002FC624 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FF6E8 002FC628 48 06 2A F1 */ bl func_803621D8 +/* 802FF6E8 002FC628 48 06 2A F1 */ bl _savegpr_28 /* 802FF6EC 002FC62C 7C 7C 1B 78 */ mr r28, r3 /* 802FF6F0 002FC630 7C 9D 23 78 */ mr r29, r4 /* 802FF6F4 002FC634 7C BE 2B 78 */ mr r30, r5 @@ -66,7 +66,7 @@ J2DTextBox_X1_: /* 802FF73C 002FC67C 48 00 07 4D */ bl J2DTextBox_NS_private_readStream /* 802FF740 002FC680 7F 83 E3 78 */ mr r3, r28 /* 802FF744 002FC684 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FF748 002FC688 48 06 2A DD */ bl func_80362224 +/* 802FF748 002FC688 48 06 2A DD */ bl _restgpr_28 /* 802FF74C 002FC68C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FF750 002FC690 7C 08 03 A6 */ mtlr r0 /* 802FF754 002FC694 38 21 00 20 */ addi r1, r1, 0x20 @@ -1149,7 +1149,7 @@ lbl_803006FC: /* 80300720 002FD660 B0 1D 01 32 */ sth r0, 0x132(r29) /* 80300724 002FD664 80 7D 01 24 */ lwz r3, 0x124(r29) /* 80300728 002FD668 7F C4 F3 78 */ mr r4, r30 -/* 8030072C 002FD66C 48 06 84 01 */ bl func_80368B2C +/* 8030072C 002FD66C 48 06 84 01 */ bl strcpy lbl_80300730: /* 80300730 002FD670 7F E3 FB 78 */ mr r3, r31 /* 80300734 002FD674 39 61 00 90 */ addi r11, r1, 0x90 @@ -1165,7 +1165,7 @@ J2DTextBox_NS_setString_X1_: /* 80300750 002FD690 7C 08 02 A6 */ mflr r0 /* 80300754 002FD694 90 01 00 94 */ stw r0, 0x94(r1) /* 80300758 002FD698 39 61 00 90 */ addi r11, r1, 0x90 -/* 8030075C 002FD69C 48 06 1A 79 */ bl func_803621D4 +/* 8030075C 002FD69C 48 06 1A 79 */ bl _savegpr_27 /* 80300760 002FD6A0 7C 7F 1B 78 */ mr r31, r3 /* 80300764 002FD6A4 7C 9B 23 78 */ mr r27, r4 /* 80300768 002FD6A8 7C BE 2B 78 */ mr r30, r5 @@ -1234,7 +1234,7 @@ lbl_80300824: lbl_80300854: /* 80300854 002FD794 7F A3 EB 78 */ mr r3, r29 /* 80300858 002FD798 39 61 00 90 */ addi r11, r1, 0x90 -/* 8030085C 002FD79C 48 06 19 C5 */ bl func_80362220 +/* 8030085C 002FD79C 48 06 19 C5 */ bl _restgpr_27 /* 80300860 002FD7A0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80300864 002FD7A4 7C 08 03 A6 */ mtlr r0 /* 80300868 002FD7A8 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/J2DGraph/J2DTextBoxEx.s b/asm/J2DGraph/J2DTextBoxEx.s index fc5a592759..6afc29875d 100644 --- a/asm/J2DGraph/J2DTextBoxEx.s +++ b/asm/J2DGraph/J2DTextBoxEx.s @@ -1189,7 +1189,7 @@ lbl_80308334: /* 80308350 00305290 7C 08 02 A6 */ mflr r0 /* 80308354 00305294 90 01 00 34 */ stw r0, 0x34(r1) /* 80308358 00305298 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030835C 0030529C 48 05 9E 7D */ bl func_803621D8 +/* 8030835C 0030529C 48 05 9E 7D */ bl _savegpr_28 /* 80308360 003052A0 7C 7D 1B 78 */ mr r29, r3 /* 80308364 003052A4 7C 9E 23 78 */ mr r30, r4 /* 80308368 003052A8 7C BF 2B 78 */ mr r31, r5 @@ -1283,7 +1283,7 @@ lbl_803084B0: /* 803084B0 003053F0 38 60 00 01 */ li r3, 1 lbl_803084B4: /* 803084B4 003053F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 803084B8 003053F8 48 05 9D 6D */ bl func_80362224 +/* 803084B8 003053F8 48 05 9D 6D */ bl _restgpr_28 /* 803084BC 003053FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 803084C0 00305400 7C 08 03 A6 */ mtlr r0 /* 803084C4 00305404 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J2DGraph/J2DWindow.s b/asm/J2DGraph/J2DWindow.s index f65abb207a..f5cc6c3811 100644 --- a/asm/J2DGraph/J2DWindow.s +++ b/asm/J2DGraph/J2DWindow.s @@ -74,7 +74,7 @@ J2DWindow_X1_: /* 802F9B78 002F6AB8 7C 08 02 A6 */ mflr r0 /* 802F9B7C 002F6ABC 90 01 00 24 */ stw r0, 0x24(r1) /* 802F9B80 002F6AC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9B84 002F6AC4 48 06 86 55 */ bl func_803621D8 +/* 802F9B84 002F6AC4 48 06 86 55 */ bl _savegpr_28 /* 802F9B88 002F6AC8 7C 7C 1B 78 */ mr r28, r3 /* 802F9B8C 002F6ACC 7C 9D 23 78 */ mr r29, r4 /* 802F9B90 002F6AD0 7C BE 2B 78 */ mr r30, r5 @@ -104,7 +104,7 @@ J2DWindow_X1_: /* 802F9BF0 002F6B30 48 00 05 29 */ bl J2DWindow_NS_private_readStream /* 802F9BF4 002F6B34 7F 83 E3 78 */ mr r3, r28 /* 802F9BF8 002F6B38 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F9BFC 002F6B3C 48 06 86 29 */ bl func_80362224 +/* 802F9BFC 002F6B3C 48 06 86 29 */ bl _restgpr_28 /* 802F9C00 002F6B40 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F9C04 002F6B44 7C 08 03 A6 */ mtlr r0 /* 802F9C08 002F6B48 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index cf0789644e..6bdc72d4e6 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -316,7 +316,7 @@ lbl_8030112C: /* 80301148 002FE088 7C 08 02 A6 */ mflr r0 /* 8030114C 002FE08C 90 01 00 24 */ stw r0, 0x24(r1) /* 80301150 002FE090 39 61 00 20 */ addi r11, r1, 0x20 -/* 80301154 002FE094 48 06 10 85 */ bl func_803621D8 +/* 80301154 002FE094 48 06 10 85 */ bl _savegpr_28 /* 80301158 002FE098 7C 7C 1B 79 */ or. r28, r3, r3 /* 8030115C 002FE09C 7C 9D 23 78 */ mr r29, r4 /* 80301160 002FE0A0 41 82 00 B0 */ beq lbl_80301210 @@ -370,7 +370,7 @@ lbl_803011F4: lbl_80301210: /* 80301210 002FE150 7F 83 E3 78 */ mr r3, r28 /* 80301214 002FE154 39 61 00 20 */ addi r11, r1, 0x20 -/* 80301218 002FE158 48 06 10 0D */ bl func_80362224 +/* 80301218 002FE158 48 06 10 0D */ bl _restgpr_28 /* 8030121C 002FE15C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80301220 002FE160 7C 08 03 A6 */ mtlr r0 /* 80301224 002FE164 38 21 00 20 */ addi r1, r1, 0x20 @@ -1619,7 +1619,7 @@ J2DWindowEx_NS_setStage: /* 803024B8 002FF3F8 7C 08 02 A6 */ mflr r0 /* 803024BC 002FF3FC 90 01 00 74 */ stw r0, 0x74(r1) /* 803024C0 002FF400 39 61 00 70 */ addi r11, r1, 0x70 -/* 803024C4 002FF404 48 05 FD 15 */ bl func_803621D8 +/* 803024C4 002FF404 48 05 FD 15 */ bl _savegpr_28 /* 803024C8 002FF408 3C 60 80 3A */ lis r3, lbl_803A1C60@ha /* 803024CC 002FF40C 39 03 1C 60 */ addi r8, r3, lbl_803A1C60@l /* 803024D0 002FF410 38 E1 00 3C */ addi r7, r1, 0x3c @@ -1789,7 +1789,7 @@ lbl_80302728: /* 80302744 002FF684 50 60 06 BE */ rlwimi r0, r3, 0, 0x1a, 0x1f /* 80302748 002FF688 98 04 00 05 */ stb r0, 5(r4) /* 8030274C 002FF68C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80302750 002FF690 48 05 FA D5 */ bl func_80362224 +/* 80302750 002FF690 48 05 FA D5 */ bl _restgpr_28 /* 80302754 002FF694 80 01 00 74 */ lwz r0, 0x74(r1) /* 80302758 002FF698 7C 08 03 A6 */ mtlr r0 /* 8030275C 002FF69C 38 21 00 70 */ addi r1, r1, 0x70 @@ -2317,7 +2317,7 @@ lbl_80302EC8: /* 80302EE0 002FFE20 7C 08 02 A6 */ mflr r0 /* 80302EE4 002FFE24 90 01 00 24 */ stw r0, 0x24(r1) /* 80302EE8 002FFE28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302EEC 002FFE2C 48 05 F2 E9 */ bl func_803621D4 +/* 80302EEC 002FFE2C 48 05 F2 E9 */ bl _savegpr_27 /* 80302EF0 002FFE30 7C 7B 1B 78 */ mr r27, r3 /* 80302EF4 002FFE34 7C 9C 23 78 */ mr r28, r4 /* 80302EF8 002FFE38 3B C0 00 00 */ li r30, 0 @@ -2389,7 +2389,7 @@ lbl_80302FD8: /* 80302FE0 002FFF20 4B FF 44 51 */ bl J2DPane_NS_isUsed lbl_80302FE4: /* 80302FE4 002FFF24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302FE8 002FFF28 48 05 F2 39 */ bl func_80362220 +/* 80302FE8 002FFF28 48 05 F2 39 */ bl _restgpr_27 /* 80302FEC 002FFF2C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80302FF0 002FFF30 7C 08 03 A6 */ mtlr r0 /* 80302FF4 002FFF34 38 21 00 20 */ addi r1, r1, 0x20 @@ -2651,7 +2651,7 @@ lbl_80303364: /* 80303374 003002B4 7C 08 02 A6 */ mflr r0 /* 80303378 003002B8 90 01 00 34 */ stw r0, 0x34(r1) /* 8030337C 003002BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80303380 003002C0 48 05 EE 59 */ bl func_803621D8 +/* 80303380 003002C0 48 05 EE 59 */ bl _savegpr_28 /* 80303384 003002C4 7C 7C 1B 78 */ mr r28, r3 /* 80303388 003002C8 7C 9D 23 78 */ mr r29, r4 /* 8030338C 003002CC 80 63 01 74 */ lwz r3, 0x174(r3) @@ -2757,7 +2757,7 @@ lbl_803034EC: /* 803034F0 00300430 7F A4 EB 78 */ mr r4, r29 /* 803034F4 00300434 4B FF 4D 35 */ bl J2DPane_NS_animationPane /* 803034F8 00300438 39 61 00 30 */ addi r11, r1, 0x30 -/* 803034FC 0030043C 48 05 ED 29 */ bl func_80362224 +/* 803034FC 0030043C 48 05 ED 29 */ bl _restgpr_28 /* 80303500 00300440 80 01 00 34 */ lwz r0, 0x34(r1) /* 80303504 00300444 7C 08 03 A6 */ mtlr r0 /* 80303508 00300448 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DAnimation.s b/asm/J3DGraphAnimator/J3DAnimation.s index 94916c00c4..c7e188e249 100644 --- a/asm/J3DGraphAnimator/J3DAnimation.s +++ b/asm/J3DGraphAnimator/J3DAnimation.s @@ -1566,7 +1566,7 @@ J3DAnmTransformKey_NS_calcTransform: /* 80329A40 00326980 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80329A44 00326984 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80329A48 00326988 39 61 00 30 */ addi r11, r1, 0x30 -/* 80329A4C 0032698C 48 03 87 89 */ bl func_803621D4 +/* 80329A4C 0032698C 48 03 87 89 */ bl _savegpr_27 /* 80329A50 00326990 7C 7B 1B 78 */ mr r27, r3 /* 80329A54 00326994 FF E0 08 90 */ fmr f31, f1 /* 80329A58 00326998 7C BC 2B 78 */ mr r28, r5 @@ -1857,7 +1857,7 @@ lbl_80329E3C: /* 80329E3C 00326D7C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80329E40 00326D80 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80329E44 00326D84 39 61 00 30 */ addi r11, r1, 0x30 -/* 80329E48 00326D88 48 03 83 D9 */ bl func_80362220 +/* 80329E48 00326D88 48 03 83 D9 */ bl _restgpr_27 /* 80329E4C 00326D8C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80329E50 00326D90 7C 08 03 A6 */ mtlr r0 /* 80329E54 00326D94 38 21 00 40 */ addi r1, r1, 0x40 @@ -1920,7 +1920,7 @@ J3DAnmTextureSRTKey_NS_calcTransform: /* 80329F20 00326E60 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80329F24 00326E64 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80329F28 00326E68 39 61 00 30 */ addi r11, r1, 0x30 -/* 80329F2C 00326E6C 48 03 82 A9 */ bl func_803621D4 +/* 80329F2C 00326E6C 48 03 82 A9 */ bl _savegpr_27 /* 80329F30 00326E70 7C 7B 1B 78 */ mr r27, r3 /* 80329F34 00326E74 FF E0 08 90 */ fmr f31, f1 /* 80329F38 00326E78 7C BC 2B 78 */ mr r28, r5 @@ -2085,7 +2085,7 @@ lbl_8032A164: /* 8032A164 003270A4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8032A168 003270A8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8032A16C 003270AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032A170 003270B0 48 03 80 B1 */ bl func_80362220 +/* 8032A170 003270B0 48 03 80 B1 */ bl _restgpr_27 /* 8032A174 003270B4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032A178 003270B8 7C 08 03 A6 */ mtlr r0 /* 8032A17C 003270BC 38 21 00 40 */ addi r1, r1, 0x40 @@ -2609,7 +2609,7 @@ J3DAnmColor_NS_searchUpdateMaterialID: /* 8032A8A8 003277E8 7C 08 02 A6 */ mflr r0 /* 8032A8AC 003277EC 90 01 00 24 */ stw r0, 0x24(r1) /* 8032A8B0 003277F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032A8B4 003277F4 48 03 79 25 */ bl func_803621D8 +/* 8032A8B4 003277F4 48 03 79 25 */ bl _savegpr_28 /* 8032A8B8 003277F8 7C 7C 1B 78 */ mr r28, r3 /* 8032A8BC 003277FC 7C 9D 23 78 */ mr r29, r4 /* 8032A8C0 00327800 3B C0 00 00 */ li r30, 0 @@ -2642,7 +2642,7 @@ lbl_8032A914: /* 8032A91C 0032785C 7C 03 00 40 */ cmplw r3, r0 /* 8032A920 00327860 41 80 FF A8 */ blt lbl_8032A8C8 /* 8032A924 00327864 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032A928 00327868 48 03 78 FD */ bl func_80362224 +/* 8032A928 00327868 48 03 78 FD */ bl _restgpr_28 /* 8032A92C 0032786C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032A930 00327870 7C 08 03 A6 */ mtlr r0 /* 8032A934 00327874 38 21 00 20 */ addi r1, r1, 0x20 @@ -3139,7 +3139,7 @@ J3DAnmTexPattern_NS_searchUpdateMaterialID: /* 8032B008 00327F48 7C 08 02 A6 */ mflr r0 /* 8032B00C 00327F4C 90 01 00 24 */ stw r0, 0x24(r1) /* 8032B010 00327F50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032B014 00327F54 48 03 71 C5 */ bl func_803621D8 +/* 8032B014 00327F54 48 03 71 C5 */ bl _savegpr_28 /* 8032B018 00327F58 7C 7C 1B 78 */ mr r28, r3 /* 8032B01C 00327F5C 7C 9D 23 78 */ mr r29, r4 /* 8032B020 00327F60 3B C0 00 00 */ li r30, 0 @@ -3172,7 +3172,7 @@ lbl_8032B074: /* 8032B07C 00327FBC 7C 03 00 40 */ cmplw r3, r0 /* 8032B080 00327FC0 41 80 FF A8 */ blt lbl_8032B028 /* 8032B084 00327FC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032B088 00327FC8 48 03 71 9D */ bl func_80362224 +/* 8032B088 00327FC8 48 03 71 9D */ bl _restgpr_28 /* 8032B08C 00327FCC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032B090 00327FD0 7C 08 03 A6 */ mtlr r0 /* 8032B094 00327FD4 38 21 00 20 */ addi r1, r1, 0x20 @@ -3196,7 +3196,7 @@ J3DAnmTextureSRTKey_NS_searchUpdateMaterialID: /* 8032B0C4 00328004 7C 08 02 A6 */ mflr r0 /* 8032B0C8 00328008 90 01 00 24 */ stw r0, 0x24(r1) /* 8032B0CC 0032800C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032B0D0 00328010 48 03 71 09 */ bl func_803621D8 +/* 8032B0D0 00328010 48 03 71 09 */ bl _savegpr_28 /* 8032B0D4 00328014 7C 7E 1B 78 */ mr r30, r3 /* 8032B0D8 00328018 7C 9F 23 78 */ mr r31, r4 /* 8032B0DC 0032801C 3B 80 00 00 */ li r28, 0 @@ -3264,7 +3264,7 @@ lbl_8032B1A0: /* 8032B1B4 003280F4 7C 04 00 40 */ cmplw r4, r0 /* 8032B1B8 003280F8 41 80 FF 9C */ blt lbl_8032B154 /* 8032B1BC 003280FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032B1C0 00328100 48 03 70 65 */ bl func_80362224 +/* 8032B1C0 00328100 48 03 70 65 */ bl _restgpr_28 /* 8032B1C4 00328104 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032B1C8 00328108 7C 08 03 A6 */ mtlr r0 /* 8032B1CC 0032810C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3696,7 +3696,7 @@ J3DAnmTevRegKey_NS_searchUpdateMaterialID: /* 8032B784 003286C4 7C 08 02 A6 */ mflr r0 /* 8032B788 003286C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8032B78C 003286CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032B790 003286D0 48 03 6A 49 */ bl func_803621D8 +/* 8032B790 003286D0 48 03 6A 49 */ bl _savegpr_28 /* 8032B794 003286D4 7C 7E 1B 78 */ mr r30, r3 /* 8032B798 003286D8 7C 9F 23 78 */ mr r31, r4 /* 8032B79C 003286DC 3B 80 00 00 */ li r28, 0 @@ -3758,7 +3758,7 @@ lbl_8032B854: /* 8032B85C 0032879C 7C 03 00 40 */ cmplw r3, r0 /* 8032B860 003287A0 41 80 FF A8 */ blt lbl_8032B808 /* 8032B864 003287A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032B868 003287A8 48 03 69 BD */ bl func_80362224 +/* 8032B868 003287A8 48 03 69 BD */ bl _restgpr_28 /* 8032B86C 003287AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032B870 003287B0 7C 08 03 A6 */ mtlr r0 /* 8032B874 003287B4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DCluster.s b/asm/J3DGraphAnimator/J3DCluster.s index 1367d095cf..6468c4124a 100644 --- a/asm/J3DGraphAnimator/J3DCluster.s +++ b/asm/J3DGraphAnimator/J3DCluster.s @@ -638,7 +638,7 @@ J3DDeformer_NS_deform_X1_: /* 8032EAB8 0032B9F8 7C 08 02 A6 */ mflr r0 /* 8032EABC 0032B9FC 90 01 00 24 */ stw r0, 0x24(r1) /* 8032EAC0 0032BA00 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032EAC4 0032BA04 48 03 37 11 */ bl func_803621D4 +/* 8032EAC4 0032BA04 48 03 37 11 */ bl _savegpr_27 /* 8032EAC8 0032BA08 7C 7D 1B 78 */ mr r29, r3 /* 8032EACC 0032BA0C 7C 9E 23 78 */ mr r30, r4 /* 8032EAD0 0032BA10 7C DF 33 78 */ mr r31, r6 @@ -702,7 +702,7 @@ lbl_8032EB30: /* 8032EBB0 0032BAF0 4B FF FA 5D */ bl J3DDeformer_NS_deform_VtxNrmF32 lbl_8032EBB4: /* 8032EBB4 0032BAF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032EBB8 0032BAF8 48 03 36 69 */ bl func_80362220 +/* 8032EBB8 0032BAF8 48 03 36 69 */ bl _restgpr_27 /* 8032EBBC 0032BAFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032EBC0 0032BB00 7C 08 03 A6 */ mtlr r0 /* 8032EBC4 0032BB04 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DJoint.s b/asm/J3DGraphAnimator/J3DJoint.s index 6e2e6943e0..0f5b97b8ac 100644 --- a/asm/J3DGraphAnimator/J3DJoint.s +++ b/asm/J3DGraphAnimator/J3DJoint.s @@ -81,7 +81,7 @@ J3DMtxCalcCalcTransformBasic_NS_calcTransform: /* 8032ED34 0032BC74 7C 08 02 A6 */ mflr r0 /* 8032ED38 0032BC78 90 01 00 24 */ stw r0, 0x24(r1) /* 8032ED3C 0032BC7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032ED40 0032BC80 48 03 34 95 */ bl func_803621D4 +/* 8032ED40 0032BC80 48 03 34 95 */ bl _savegpr_27 /* 8032ED44 0032BC84 7C 7B 1B 78 */ mr r27, r3 /* 8032ED48 0032BC88 83 8D 90 70 */ lwz r28, lbl_804515F0-_SDA_BASE_(r13) /* 8032ED4C 0032BC8C 80 8D 90 74 */ lwz r4, lbl_804515F4-_SDA_BASE_(r13) @@ -148,7 +148,7 @@ lbl_8032EE14: /* 8032EE30 0032BD70 7F A4 EB 78 */ mr r4, r29 /* 8032EE34 0032BD74 48 01 76 7D */ bl PSMTXCopy /* 8032EE38 0032BD78 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032EE3C 0032BD7C 48 03 33 E5 */ bl func_80362220 +/* 8032EE3C 0032BD7C 48 03 33 E5 */ bl _restgpr_27 /* 8032EE40 0032BD80 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032EE44 0032BD84 7C 08 03 A6 */ mtlr r0 /* 8032EE48 0032BD88 38 21 00 20 */ addi r1, r1, 0x20 @@ -160,7 +160,7 @@ J3DMtxCalcCalcTransformSoftimage_NS_calcTransform: /* 8032EE54 0032BD94 7C 08 02 A6 */ mflr r0 /* 8032EE58 0032BD98 90 01 00 24 */ stw r0, 0x24(r1) /* 8032EE5C 0032BD9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032EE60 0032BDA0 48 03 33 75 */ bl func_803621D4 +/* 8032EE60 0032BDA0 48 03 33 75 */ bl _savegpr_27 /* 8032EE64 0032BDA4 7C 7B 1B 78 */ mr r27, r3 /* 8032EE68 0032BDA8 83 8D 90 70 */ lwz r28, lbl_804515F0-_SDA_BASE_(r13) /* 8032EE6C 0032BDAC 80 6D 90 74 */ lwz r3, lbl_804515F4-_SDA_BASE_(r13) @@ -246,7 +246,7 @@ lbl_8032EF88: /* 8032EFA0 0032BEE0 48 01 75 11 */ bl PSMTXCopy lbl_8032EFA4: /* 8032EFA4 0032BEE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032EFA8 0032BEE8 48 03 32 79 */ bl func_80362220 +/* 8032EFA8 0032BEE8 48 03 32 79 */ bl _restgpr_27 /* 8032EFAC 0032BEEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032EFB0 0032BEF0 7C 08 03 A6 */ mtlr r0 /* 8032EFB4 0032BEF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -258,7 +258,7 @@ J3DMtxCalcCalcTransformMaya_NS_calcTransform: /* 8032EFC0 0032BF00 7C 08 02 A6 */ mflr r0 /* 8032EFC4 0032BF04 90 01 00 24 */ stw r0, 0x24(r1) /* 8032EFC8 0032BF08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032EFCC 0032BF0C 48 03 32 09 */ bl func_803621D4 +/* 8032EFCC 0032BF0C 48 03 32 09 */ bl _savegpr_27 /* 8032EFD0 0032BF10 7C 7F 1B 78 */ mr r31, r3 /* 8032EFD4 0032BF14 83 8D 90 74 */ lwz r28, lbl_804515F4-_SDA_BASE_(r13) /* 8032EFD8 0032BF18 83 6D 90 70 */ lwz r27, lbl_804515F0-_SDA_BASE_(r13) @@ -348,7 +348,7 @@ lbl_8032F0E4: /* 8032F11C 0032C05C C0 1F 00 08 */ lfs f0, 8(r31) /* 8032F120 0032C060 D0 03 00 08 */ stfs f0, 8(r3) /* 8032F124 0032C064 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F128 0032C068 48 03 30 F9 */ bl func_80362220 +/* 8032F128 0032C068 48 03 30 F9 */ bl _restgpr_27 /* 8032F12C 0032C06C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032F130 0032C070 7C 08 03 A6 */ mtlr r0 /* 8032F134 0032C074 38 21 00 20 */ addi r1, r1, 0x20 @@ -440,7 +440,7 @@ J3DJoint_NS_entryIn: /* 8032F258 0032C198 7C 08 02 A6 */ mflr r0 /* 8032F25C 0032C19C 90 01 00 24 */ stw r0, 0x24(r1) /* 8032F260 0032C1A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F264 0032C1A4 48 03 2F 71 */ bl func_803621D4 +/* 8032F264 0032C1A4 48 03 2F 71 */ bl _savegpr_27 /* 8032F268 0032C1A8 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 8032F26C 0032C1AC 3B E4 4A C8 */ addi r31, r4, lbl_80434AC8@l /* 8032F270 0032C1B0 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -548,7 +548,7 @@ lbl_8032F3D8: /* 8032F3D8 0032C318 28 1C 00 00 */ cmplwi r28, 0 /* 8032F3DC 0032C31C 40 82 FE C4 */ bne lbl_8032F2A0 /* 8032F3E0 0032C320 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F3E4 0032C324 48 03 2E 3D */ bl func_80362220 +/* 8032F3E4 0032C324 48 03 2E 3D */ bl _restgpr_27 /* 8032F3E8 0032C328 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032F3EC 0032C32C 7C 08 03 A6 */ mtlr r0 /* 8032F3F0 0032C330 38 21 00 20 */ addi r1, r1, 0x20 @@ -572,7 +572,7 @@ J3DJoint_NS_recursiveCalc: /* 8032F42C 0032C36C DB 41 00 50 */ stfd f26, 0x50(r1) /* 8032F430 0032C370 F3 41 00 58 */ psq_st f26, 88(r1), 0, qr0 /* 8032F434 0032C374 39 61 00 50 */ addi r11, r1, 0x50 -/* 8032F438 0032C378 48 03 2D 9D */ bl func_803621D4 +/* 8032F438 0032C378 48 03 2D 9D */ bl _savegpr_27 /* 8032F43C 0032C37C 7C 7E 1B 78 */ mr r30, r3 /* 8032F440 0032C380 3B E0 00 00 */ li r31, 0 /* 8032F444 0032C384 3C 60 80 43 */ lis r3, lbl_80434BE4@ha @@ -666,7 +666,7 @@ lbl_8032F560: /* 8032F588 0032C4C8 E3 41 00 58 */ psq_l f26, 88(r1), 0, qr0 /* 8032F58C 0032C4CC CB 41 00 50 */ lfd f26, 0x50(r1) /* 8032F590 0032C4D0 39 61 00 50 */ addi r11, r1, 0x50 -/* 8032F594 0032C4D4 48 03 2C 8D */ bl func_80362220 +/* 8032F594 0032C4D4 48 03 2C 8D */ bl _restgpr_27 /* 8032F598 0032C4D8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8032F59C 0032C4DC 7C 08 03 A6 */ mtlr r0 /* 8032F5A0 0032C4E0 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/J3DGraphAnimator/J3DMaterialAnm.s b/asm/J3DGraphAnimator/J3DMaterialAnm.s index 2d2bd7cf75..3c36a48dd2 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAnm.s +++ b/asm/J3DGraphAnimator/J3DMaterialAnm.s @@ -58,7 +58,7 @@ J3DMaterialAnm_NS_calc: /* 8032C3C8 00329308 7C 08 02 A6 */ mflr r0 /* 8032C3CC 0032930C 90 01 00 34 */ stw r0, 0x34(r1) /* 8032C3D0 00329310 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032C3D4 00329314 48 03 5E 01 */ bl func_803621D4 +/* 8032C3D4 00329314 48 03 5E 01 */ bl _savegpr_27 /* 8032C3D8 00329318 7C 7E 1B 78 */ mr r30, r3 /* 8032C3DC 0032931C 7C 9F 23 78 */ mr r31, r4 /* 8032C3E0 00329320 3B 60 00 00 */ li r27, 0 @@ -179,7 +179,7 @@ lbl_8032C57C: /* 8032C584 003294C4 3B BD 00 08 */ addi r29, r29, 8 /* 8032C588 003294C8 41 80 FF B4 */ blt lbl_8032C53C /* 8032C58C 003294CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032C590 003294D0 48 03 5C 91 */ bl func_80362220 +/* 8032C590 003294D0 48 03 5C 91 */ bl _restgpr_27 /* 8032C594 003294D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032C598 003294D8 7C 08 03 A6 */ mtlr r0 /* 8032C59C 003294DC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DMaterialAttach.s b/asm/J3DGraphAnimator/J3DMaterialAttach.s index a257682e53..034a4bfec5 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAttach.s +++ b/asm/J3DGraphAnimator/J3DMaterialAttach.s @@ -60,7 +60,7 @@ J3DMaterialTable_NS_removeMatColorAnimator: /* 8032F650 0032C590 7C 08 02 A6 */ mflr r0 /* 8032F654 0032C594 90 01 00 24 */ stw r0, 0x24(r1) /* 8032F658 0032C598 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F65C 0032C59C 48 03 2B 79 */ bl func_803621D4 +/* 8032F65C 0032C59C 48 03 2B 79 */ bl _savegpr_27 /* 8032F660 0032C5A0 7C 7B 1B 78 */ mr r27, r3 /* 8032F664 0032C5A4 7C 9C 23 78 */ mr r28, r4 /* 8032F668 0032C5A8 3B C0 00 00 */ li r30, 0 @@ -100,7 +100,7 @@ lbl_8032F6D0: /* 8032F6D8 0032C618 41 80 FF A0 */ blt lbl_8032F678 /* 8032F6DC 0032C61C 7F C3 F3 78 */ mr r3, r30 /* 8032F6E0 0032C620 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F6E4 0032C624 48 03 2B 3D */ bl func_80362220 +/* 8032F6E4 0032C624 48 03 2B 3D */ bl _restgpr_27 /* 8032F6E8 0032C628 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032F6EC 0032C62C 7C 08 03 A6 */ mtlr r0 /* 8032F6F0 0032C630 38 21 00 20 */ addi r1, r1, 0x20 @@ -168,7 +168,7 @@ J3DMaterialTable_NS_removeTexMtxAnimator: /* 8032F7B8 0032C6F8 7C 08 02 A6 */ mflr r0 /* 8032F7BC 0032C6FC 90 01 00 24 */ stw r0, 0x24(r1) /* 8032F7C0 0032C700 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F7C4 0032C704 48 03 2A 11 */ bl func_803621D4 +/* 8032F7C4 0032C704 48 03 2A 11 */ bl _savegpr_27 /* 8032F7C8 0032C708 7C 7C 1B 78 */ mr r28, r3 /* 8032F7CC 0032C70C 7C 9D 23 78 */ mr r29, r4 /* 8032F7D0 0032C710 3B E0 00 00 */ li r31, 0 @@ -216,7 +216,7 @@ lbl_8032F858: /* 8032F860 0032C7A0 41 80 FF 8C */ blt lbl_8032F7EC /* 8032F864 0032C7A4 7F E3 FB 78 */ mr r3, r31 /* 8032F868 0032C7A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032F86C 0032C7AC 48 03 29 B5 */ bl func_80362220 +/* 8032F86C 0032C7AC 48 03 29 B5 */ bl _restgpr_27 /* 8032F870 0032C7B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032F874 0032C7B4 7C 08 03 A6 */ mtlr r0 /* 8032F878 0032C7B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -412,7 +412,7 @@ J3DMaterialTable_NS_entryMatColorAnimator: /* 8032FAF8 0032CA38 7C 08 02 A6 */ mflr r0 /* 8032FAFC 0032CA3C 90 01 00 34 */ stw r0, 0x34(r1) /* 8032FB00 0032CA40 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032FB04 0032CA44 48 03 26 D1 */ bl func_803621D4 +/* 8032FB04 0032CA44 48 03 26 D1 */ bl _savegpr_27 /* 8032FB08 0032CA48 7C 7E 1B 78 */ mr r30, r3 /* 8032FB0C 0032CA4C 7C 9F 23 78 */ mr r31, r4 /* 8032FB10 0032CA50 3B 80 00 00 */ li r28, 0 @@ -464,7 +464,7 @@ lbl_8032FBA0: /* 8032FBAC 0032CAEC 7F 83 E3 78 */ mr r3, r28 lbl_8032FBB0: /* 8032FBB0 0032CAF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032FBB4 0032CAF4 48 03 26 6D */ bl func_80362220 +/* 8032FBB4 0032CAF4 48 03 26 6D */ bl _restgpr_27 /* 8032FBB8 0032CAF8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032FBBC 0032CAFC 7C 08 03 A6 */ mtlr r0 /* 8032FBC0 0032CB00 38 21 00 30 */ addi r1, r1, 0x30 @@ -476,7 +476,7 @@ J3DMaterialTable_NS_entryTexNoAnimator: /* 8032FBCC 0032CB0C 7C 08 02 A6 */ mflr r0 /* 8032FBD0 0032CB10 90 01 00 34 */ stw r0, 0x34(r1) /* 8032FBD4 0032CB14 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032FBD8 0032CB18 48 03 25 FD */ bl func_803621D4 +/* 8032FBD8 0032CB18 48 03 25 FD */ bl _savegpr_27 /* 8032FBDC 0032CB1C 7C 7C 1B 78 */ mr r28, r3 /* 8032FBE0 0032CB20 7C 9D 23 78 */ mr r29, r4 /* 8032FBE4 0032CB24 3B E0 00 00 */ li r31, 0 @@ -538,7 +538,7 @@ lbl_8032FC9C: /* 8032FCA8 0032CBE8 7F E3 FB 78 */ mr r3, r31 lbl_8032FCAC: /* 8032FCAC 0032CBEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032FCB0 0032CBF0 48 03 25 71 */ bl func_80362220 +/* 8032FCB0 0032CBF0 48 03 25 71 */ bl _restgpr_27 /* 8032FCB4 0032CBF4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032FCB8 0032CBF8 7C 08 03 A6 */ mtlr r0 /* 8032FCBC 0032CBFC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index 8b43975115..6f750281e9 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -45,7 +45,7 @@ J3DModel_NS_entryModelData: /* 80327188 003240C8 7C 08 02 A6 */ mflr r0 /* 8032718C 003240CC 90 01 00 24 */ stw r0, 0x24(r1) /* 80327190 003240D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80327194 003240D4 48 03 B0 41 */ bl func_803621D4 +/* 80327194 003240D4 48 03 B0 41 */ bl _savegpr_27 /* 80327198 003240D8 7C 7E 1B 78 */ mr r30, r3 /* 8032719C 003240DC 7C 9B 23 78 */ mr r27, r4 /* 803271A0 003240E0 7C BF 2B 78 */ mr r31, r5 @@ -145,7 +145,7 @@ lbl_803272E4: /* 803272E4 00324224 38 60 00 00 */ li r3, 0 lbl_803272E8: /* 803272E8 00324228 39 61 00 20 */ addi r11, r1, 0x20 -/* 803272EC 0032422C 48 03 AF 35 */ bl func_80362220 +/* 803272EC 0032422C 48 03 AF 35 */ bl _restgpr_27 /* 803272F0 00324230 80 01 00 24 */ lwz r0, 0x24(r1) /* 803272F4 00324234 7C 08 03 A6 */ mtlr r0 /* 803272F8 00324238 38 21 00 20 */ addi r1, r1, 0x20 @@ -383,7 +383,7 @@ J3DModel_NS_newDifferedDisplayList: /* 80327600 00324540 7C 08 02 A6 */ mflr r0 /* 80327604 00324544 90 01 00 24 */ stw r0, 0x24(r1) /* 80327608 00324548 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032760C 0032454C 48 03 AB CD */ bl func_803621D8 +/* 8032760C 0032454C 48 03 AB CD */ bl _savegpr_28 /* 80327610 00324550 7C 7C 1B 78 */ mr r28, r3 /* 80327614 00324554 7C 9D 23 78 */ mr r29, r4 /* 80327618 00324558 93 A3 00 0C */ stw r29, 0xc(r3) @@ -410,7 +410,7 @@ lbl_80327654: /* 80327660 003245A0 38 60 00 00 */ li r3, 0 lbl_80327664: /* 80327664 003245A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80327668 003245A8 48 03 AB BD */ bl func_80362224 +/* 80327668 003245A8 48 03 AB BD */ bl _restgpr_28 /* 8032766C 003245AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80327670 003245B0 7C 08 03 A6 */ mtlr r0 /* 80327674 003245B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -649,7 +649,7 @@ J3DModel_NS_diff: /* 803279A4 003248E4 7C 08 02 A6 */ mflr r0 /* 803279A8 003248E8 90 01 00 24 */ stw r0, 0x24(r1) /* 803279AC 003248EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803279B0 003248F0 48 03 A8 29 */ bl func_803621D8 +/* 803279B0 003248F0 48 03 A8 29 */ bl _savegpr_28 /* 803279B4 003248F4 7C 7C 1B 78 */ mr r28, r3 /* 803279B8 003248F8 80 63 00 04 */ lwz r3, 4(r3) /* 803279BC 003248FC A3 E3 00 5C */ lhz r31, 0x5c(r3) @@ -677,7 +677,7 @@ lbl_80327A08: /* 80327A0C 0032494C 7C 00 F8 40 */ cmplw r0, r31 /* 80327A10 00324950 41 80 FF C0 */ blt lbl_803279D0 /* 80327A14 00324954 39 61 00 20 */ addi r11, r1, 0x20 -/* 80327A18 00324958 48 03 A8 0D */ bl func_80362224 +/* 80327A18 00324958 48 03 A8 0D */ bl _restgpr_28 /* 80327A1C 0032495C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80327A20 00324960 7C 08 03 A6 */ mtlr r0 /* 80327A24 00324964 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DModelData.s b/asm/J3DGraphAnimator/J3DModelData.s index 2940c27767..ff2784548e 100644 --- a/asm/J3DGraphAnimator/J3DModelData.s +++ b/asm/J3DGraphAnimator/J3DModelData.s @@ -50,7 +50,7 @@ J3DModelData_NS_newSharedDisplayList: /* 80325E18 00322D58 7C 08 02 A6 */ mflr r0 /* 80325E1C 00322D5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80325E20 00322D60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325E24 00322D64 48 03 C3 B1 */ bl func_803621D4 +/* 80325E24 00322D64 48 03 C3 B1 */ bl _savegpr_27 /* 80325E28 00322D68 7C 7B 1B 78 */ mr r27, r3 /* 80325E2C 00322D6C A3 E3 00 5C */ lhz r31, 0x5c(r3) /* 80325E30 00322D70 3B 80 00 00 */ li r28, 0 @@ -91,7 +91,7 @@ lbl_80325EA0: /* 80325EAC 00322DEC 38 60 00 00 */ li r3, 0 lbl_80325EB0: /* 80325EB0 00322DF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325EB4 00322DF4 48 03 C3 6D */ bl func_80362220 +/* 80325EB4 00322DF4 48 03 C3 6D */ bl _restgpr_27 /* 80325EB8 00322DF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80325EBC 00322DFC 7C 08 03 A6 */ mtlr r0 /* 80325EC0 00322E00 38 21 00 20 */ addi r1, r1, 0x20 @@ -103,7 +103,7 @@ J3DModelData_NS_indexToPtr: /* 80325ECC 00322E0C 7C 08 02 A6 */ mflr r0 /* 80325ED0 00322E10 90 01 00 34 */ stw r0, 0x34(r1) /* 80325ED4 00322E14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80325ED8 00322E18 48 03 C2 FD */ bl func_803621D4 +/* 80325ED8 00322E18 48 03 C2 FD */ bl _savegpr_27 /* 80325EDC 00322E1C 7C 7B 1B 78 */ mr r27, r3 /* 80325EE0 00322E20 80 03 00 6C */ lwz r0, 0x6c(r3) /* 80325EE4 00322E24 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -148,7 +148,7 @@ lbl_80325F5C: /* 80325F74 00322EB4 80 6D 90 68 */ lwz r3, lbl_804515E8-_SDA_BASE_(r13) /* 80325F78 00322EB8 48 01 77 A5 */ bl OSRestoreInterrupts /* 80325F7C 00322EBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80325F80 00322EC0 48 03 C2 A1 */ bl func_80362220 +/* 80325F80 00322EC0 48 03 C2 A1 */ bl _restgpr_27 /* 80325F84 00322EC4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80325F88 00322EC8 7C 08 03 A6 */ mtlr r0 /* 80325F8C 00322ECC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DMtxBuffer.s b/asm/J3DGraphAnimator/J3DMtxBuffer.s index cfa4c15a24..1a8a515e93 100644 --- a/asm/J3DGraphAnimator/J3DMtxBuffer.s +++ b/asm/J3DGraphAnimator/J3DMtxBuffer.s @@ -29,7 +29,7 @@ J3DMtxBuffer_NS_create: /* 8032625C 0032319C 7C 08 02 A6 */ mflr r0 /* 80326260 003231A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80326264 003231A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80326268 003231A8 48 03 BF 71 */ bl func_803621D8 +/* 80326268 003231A8 48 03 BF 71 */ bl _savegpr_28 /* 8032626C 003231AC 7C 7C 1B 78 */ mr r28, r3 /* 80326270 003231B0 7C 9D 23 78 */ mr r29, r4 /* 80326274 003231B4 7C BE 2B 78 */ mr r30, r5 @@ -97,7 +97,7 @@ lbl_80326348: /* 80326348 00323288 7F E3 FB 78 */ mr r3, r31 lbl_8032634C: /* 8032634C 0032328C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80326350 00323290 48 03 BE D5 */ bl func_80362224 +/* 80326350 00323290 48 03 BE D5 */ bl _restgpr_28 /* 80326354 00323294 80 01 00 24 */ lwz r0, 0x24(r1) /* 80326358 00323298 7C 08 03 A6 */ mtlr r0 /* 8032635C 0032329C 38 21 00 20 */ addi r1, r1, 0x20 @@ -647,7 +647,7 @@ J3DMtxBuffer_NS_calcDrawMtx: /* 80326AD0 00323A10 7C 08 02 A6 */ mflr r0 /* 80326AD4 00323A14 90 01 00 54 */ stw r0, 0x54(r1) /* 80326AD8 00323A18 39 61 00 50 */ addi r11, r1, 0x50 -/* 80326ADC 00323A1C 48 03 B6 F9 */ bl func_803621D4 +/* 80326ADC 00323A1C 48 03 B6 F9 */ bl _savegpr_27 /* 80326AE0 00323A20 7C 7C 1B 78 */ mr r28, r3 /* 80326AE4 00323A24 2C 04 00 01 */ cmpwi r4, 1 /* 80326AE8 00323A28 41 82 00 D0 */ beq lbl_80326BB8 @@ -807,7 +807,7 @@ lbl_80326CDC: /* 80326D20 00323C60 4B FE B2 51 */ bl J3DPSMtxArrayConcat lbl_80326D24: /* 80326D24 00323C64 39 61 00 50 */ addi r11, r1, 0x50 -/* 80326D28 00323C68 48 03 B4 F9 */ bl func_80362220 +/* 80326D28 00323C68 48 03 B4 F9 */ bl _restgpr_27 /* 80326D2C 00323C6C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80326D30 00323C70 7C 08 03 A6 */ mtlr r0 /* 80326D34 00323C74 38 21 00 50 */ addi r1, r1, 0x50 @@ -937,7 +937,7 @@ J3DMtxBuffer_NS_calcBBoardMtx: /* 80326EF4 00323E34 7C 08 02 A6 */ mflr r0 /* 80326EF8 00323E38 90 01 00 24 */ stw r0, 0x24(r1) /* 80326EFC 00323E3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80326F00 00323E40 48 03 B2 D5 */ bl func_803621D4 +/* 80326F00 00323E40 48 03 B2 D5 */ bl _savegpr_27 /* 80326F04 00323E44 7C 7D 1B 78 */ mr r29, r3 /* 80326F08 00323E48 80 63 00 00 */ lwz r3, 0(r3) /* 80326F0C 00323E4C A3 83 00 34 */ lhz r28, 0x34(r3) @@ -1018,7 +1018,7 @@ lbl_80327024: /* 80327028 00323F68 7C 00 E0 40 */ cmplw r0, r28 /* 8032702C 00323F6C 41 80 FE EC */ blt lbl_80326F18 /* 80327030 00323F70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80327034 00323F74 48 03 B1 ED */ bl func_80362220 +/* 80327034 00323F74 48 03 B1 ED */ bl _restgpr_27 /* 80327038 00323F78 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032703C 00323F7C 7C 08 03 A6 */ mtlr r0 /* 80327040 00323F80 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DShapeTable.s b/asm/J3DGraphAnimator/J3DShapeTable.s index 8380d78620..ced6298372 100644 --- a/asm/J3DGraphAnimator/J3DShapeTable.s +++ b/asm/J3DGraphAnimator/J3DShapeTable.s @@ -42,7 +42,7 @@ J3DShapeTable_NS_initShapeNodes: /* 80325914 00322854 7C 08 02 A6 */ mflr r0 /* 80325918 00322858 90 01 00 24 */ stw r0, 0x24(r1) /* 8032591C 0032285C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325920 00322860 48 03 C8 B5 */ bl func_803621D4 +/* 80325920 00322860 48 03 C8 B5 */ bl _savegpr_27 /* 80325924 00322864 7C 7B 1B 78 */ mr r27, r3 /* 80325928 00322868 7C 9C 23 78 */ mr r28, r4 /* 8032592C 0032286C 7C BD 2B 78 */ mr r29, r5 @@ -62,7 +62,7 @@ lbl_80325958: /* 8032595C 0032289C 7C 00 F8 40 */ cmplw r0, r31 /* 80325960 003228A0 41 80 FF DC */ blt lbl_8032593C /* 80325964 003228A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325968 003228A8 48 03 C8 B9 */ bl func_80362220 +/* 80325968 003228A8 48 03 C8 B9 */ bl _restgpr_27 /* 8032596C 003228AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80325970 003228B0 7C 08 03 A6 */ mtlr r0 /* 80325974 003228B4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index b0e70296b7..46726e65bd 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -207,7 +207,7 @@ J3DSkinDeform_NS_initSkinInfo: /* 8032C9B4 003298F4 7C 08 02 A6 */ mflr r0 /* 8032C9B8 003298F8 90 01 00 24 */ stw r0, 0x24(r1) /* 8032C9BC 003298FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032C9C0 00329900 48 03 58 19 */ bl func_803621D8 +/* 8032C9C0 00329900 48 03 58 19 */ bl _savegpr_28 /* 8032C9C4 00329904 7C 7C 1B 78 */ mr r28, r3 /* 8032C9C8 00329908 7C 9D 23 78 */ mr r29, r4 /* 8032C9CC 0032990C A0 04 00 2E */ lhz r0, 0x2e(r4) @@ -584,7 +584,7 @@ lbl_8032CF20: /* 8032CF24 00329E64 7C 03 00 40 */ cmplw r3, r0 /* 8032CF28 00329E68 41 80 FE D4 */ blt lbl_8032CDFC /* 8032CF2C 00329E6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032CF30 00329E70 48 03 52 F5 */ bl func_80362224 +/* 8032CF30 00329E70 48 03 52 F5 */ bl _restgpr_28 /* 8032CF34 00329E74 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032CF38 00329E78 7C 08 03 A6 */ mtlr r0 /* 8032CF3C 00329E7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1076,7 +1076,7 @@ J3DSkinDeform_NS_calcNrmMtx: /* 8032D5C8 0032A508 7C 08 02 A6 */ mflr r0 /* 8032D5CC 0032A50C 90 01 00 24 */ stw r0, 0x24(r1) /* 8032D5D0 0032A510 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032D5D4 0032A514 48 03 4C 01 */ bl func_803621D4 +/* 8032D5D4 0032A514 48 03 4C 01 */ bl _savegpr_27 /* 8032D5D8 0032A518 7C 7C 1B 78 */ mr r28, r3 /* 8032D5DC 0032A51C 7C 9D 23 78 */ mr r29, r4 /* 8032D5E0 0032A520 83 E4 00 00 */ lwz r31, 0(r4) @@ -1166,7 +1166,7 @@ lbl_8032D714: /* 8032D718 0032A658 7C 00 D8 40 */ cmplw r0, r27 /* 8032D71C 0032A65C 41 80 FE D4 */ blt lbl_8032D5F0 /* 8032D720 0032A660 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032D724 0032A664 48 03 4A FD */ bl func_80362220 +/* 8032D724 0032A664 48 03 4A FD */ bl _restgpr_27 /* 8032D728 0032A668 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032D72C 0032A66C 7C 08 03 A6 */ mtlr r0 /* 8032D730 0032A670 38 21 00 20 */ addi r1, r1, 0x20 @@ -1555,7 +1555,7 @@ J3DSkinDeform_NS_deformVtxPos_S16: /* 8032DC78 0032ABB8 7C 08 02 A6 */ mflr r0 /* 8032DC7C 0032ABBC 90 01 00 24 */ stw r0, 0x24(r1) /* 8032DC80 0032ABC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032DC84 0032ABC4 48 03 45 55 */ bl func_803621D8 +/* 8032DC84 0032ABC4 48 03 45 55 */ bl _savegpr_28 /* 8032DC88 0032ABC8 7C 7C 1B 78 */ mr r28, r3 /* 8032DC8C 0032ABCC 7C 9E 23 78 */ mr r30, r4 /* 8032DC90 0032ABD0 7C BD 2B 78 */ mr r29, r5 @@ -1629,7 +1629,7 @@ lbl_8032DD88: /* 8032DD98 0032ACD8 48 00 D8 45 */ bl DCStoreRange /* 8032DD9C 0032ACDC 93 FE 00 2C */ stw r31, 0x2c(r30) /* 8032DDA0 0032ACE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032DDA4 0032ACE4 48 03 44 81 */ bl func_80362224 +/* 8032DDA4 0032ACE4 48 03 44 81 */ bl _restgpr_28 /* 8032DDA8 0032ACE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032DDAC 0032ACEC 7C 08 03 A6 */ mtlr r0 /* 8032DDB0 0032ACF0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DDrawBuffer.s b/asm/J3DGraphBase/J3DDrawBuffer.s index 3276d85e00..73aa1e2fb3 100644 --- a/asm/J3DGraphBase/J3DDrawBuffer.s +++ b/asm/J3DGraphBase/J3DDrawBuffer.s @@ -127,7 +127,7 @@ J3DDrawBuffer_NS_entryMatSort: /* 803250A0 00321FE0 7C 08 02 A6 */ mflr r0 /* 803250A4 00321FE4 90 01 00 24 */ stw r0, 0x24(r1) /* 803250A8 00321FE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 803250AC 00321FEC 48 03 D1 2D */ bl func_803621D8 +/* 803250AC 00321FEC 48 03 D1 2D */ bl _savegpr_28 /* 803250B0 00321FF0 7C 7E 1B 78 */ mr r30, r3 /* 803250B4 00321FF4 7C 9F 23 78 */ mr r31, r4 /* 803250B8 00321FF8 38 00 00 00 */ li r0, 0 @@ -208,7 +208,7 @@ lbl_803251AC: /* 803251C8 00322108 38 60 00 01 */ li r3, 1 lbl_803251CC: /* 803251CC 0032210C 39 61 00 20 */ addi r11, r1, 0x20 -/* 803251D0 00322110 48 03 D0 55 */ bl func_80362224 +/* 803251D0 00322110 48 03 D0 55 */ bl _restgpr_28 /* 803251D4 00322114 80 01 00 24 */ lwz r0, 0x24(r1) /* 803251D8 00322118 7C 08 03 A6 */ mtlr r0 /* 803251DC 0032211C 38 21 00 20 */ addi r1, r1, 0x20 @@ -435,7 +435,7 @@ J3DDrawBuffer_NS_draw: /* 80325504 00322444 7C 08 02 A6 */ mflr r0 /* 80325508 00322448 90 01 00 24 */ stw r0, 0x24(r1) /* 8032550C 0032244C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325510 00322450 48 03 CC C5 */ bl func_803621D4 +/* 80325510 00322450 48 03 CC C5 */ bl _savegpr_27 /* 80325514 00322454 83 C3 00 04 */ lwz r30, 4(r3) /* 80325518 00322458 83 A3 00 00 */ lwz r29, 0(r3) /* 8032551C 0032245C 3B 80 00 00 */ li r28, 0 @@ -460,7 +460,7 @@ lbl_80325558: /* 80325558 00322498 7C 1C F0 40 */ cmplw r28, r30 /* 8032555C 0032249C 41 80 FF CC */ blt lbl_80325528 /* 80325560 003224A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325564 003224A4 48 03 CC BD */ bl func_80362220 +/* 80325564 003224A4 48 03 CC BD */ bl _restgpr_27 /* 80325568 003224A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032556C 003224AC 7C 08 03 A6 */ mtlr r0 /* 80325570 003224B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -469,7 +469,7 @@ lbl_80325558: /* 8032557C 003224BC 7C 08 02 A6 */ mflr r0 /* 80325580 003224C0 90 01 00 24 */ stw r0, 0x24(r1) /* 80325584 003224C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325588 003224C8 48 03 CC 51 */ bl func_803621D8 +/* 80325588 003224C8 48 03 CC 51 */ bl _savegpr_28 /* 8032558C 003224CC 80 83 00 04 */ lwz r4, 4(r3) /* 80325590 003224D0 3B A4 FF FF */ addi r29, r4, -1 /* 80325594 003224D4 83 C3 00 00 */ lwz r30, 0(r3) @@ -494,7 +494,7 @@ lbl_803255D0: /* 803255D0 00322510 2C 1D 00 00 */ cmpwi r29, 0 /* 803255D4 00322514 40 80 FF CC */ bge lbl_803255A0 /* 803255D8 00322518 39 61 00 20 */ addi r11, r1, 0x20 -/* 803255DC 0032251C 48 03 CC 49 */ bl func_80362224 +/* 803255DC 0032251C 48 03 CC 49 */ bl _restgpr_28 /* 803255E0 00322520 80 01 00 24 */ lwz r0, 0x24(r1) /* 803255E4 00322524 7C 08 03 A6 */ mtlr r0 /* 803255E8 00322528 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DGD.s b/asm/J3DGraphBase/J3DGD.s index da8e218503..16d9e5fa32 100644 --- a/asm/J3DGraphBase/J3DGD.s +++ b/asm/J3DGraphBase/J3DGD.s @@ -9,7 +9,7 @@ J3DGDSetGenMode: /* 8030D09C 00309FDC 7C 08 02 A6 */ mflr r0 /* 8030D0A0 00309FE0 90 01 00 24 */ stw r0, 0x24(r1) /* 8030D0A4 00309FE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030D0A8 00309FE8 48 05 51 2D */ bl func_803621D4 +/* 8030D0A8 00309FE8 48 05 51 2D */ bl _savegpr_27 /* 8030D0AC 00309FEC 7C 7B 1B 78 */ mr r27, r3 /* 8030D0B0 00309FF0 7C 9C 23 78 */ mr r28, r4 /* 8030D0B4 00309FF4 7C BD 2B 78 */ mr r29, r5 @@ -95,7 +95,7 @@ lbl_8030D0DC: /* 8030D1F0 0030A130 90 04 00 08 */ stw r0, 8(r4) /* 8030D1F4 0030A134 98 C3 00 00 */ stb r6, 0(r3) /* 8030D1F8 0030A138 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030D1FC 0030A13C 48 05 50 25 */ bl func_80362220 +/* 8030D1FC 0030A13C 48 05 50 25 */ bl _restgpr_27 /* 8030D200 0030A140 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030D204 0030A144 7C 08 03 A6 */ mtlr r0 /* 8030D208 0030A148 38 21 00 20 */ addi r1, r1, 0x20 @@ -1972,7 +1972,7 @@ J3DGDSetIndTexCoordScale: /* 8030EE14 0030BD54 7C 08 02 A6 */ mflr r0 /* 8030EE18 0030BD58 90 01 00 24 */ stw r0, 0x24(r1) /* 8030EE1C 0030BD5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030EE20 0030BD60 48 05 33 B5 */ bl func_803621D4 +/* 8030EE20 0030BD60 48 05 33 B5 */ bl _savegpr_27 /* 8030EE24 0030BD64 7C 7B 1B 78 */ mr r27, r3 /* 8030EE28 0030BD68 7C 9C 23 78 */ mr r28, r4 /* 8030EE2C 0030BD6C 7C BD 2B 78 */ mr r29, r5 @@ -2026,7 +2026,7 @@ lbl_8030EE54: /* 8030EEE8 0030BE28 90 04 00 08 */ stw r0, 8(r4) /* 8030EEEC 0030BE2C 98 C3 00 00 */ stb r6, 0(r3) /* 8030EEF0 0030BE30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030EEF4 0030BE34 48 05 33 2D */ bl func_80362220 +/* 8030EEF4 0030BE34 48 05 33 2D */ bl _restgpr_27 /* 8030EEF8 0030BE38 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030EEFC 0030BE3C 7C 08 03 A6 */ mtlr r0 /* 8030EF00 0030BE40 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DMatBlock.s b/asm/J3DGraphBase/J3DMatBlock.s index c75db9cbf8..19722e542b 100644 --- a/asm/J3DGraphBase/J3DMatBlock.s +++ b/asm/J3DGraphBase/J3DMatBlock.s @@ -2300,7 +2300,7 @@ lbl_80319580: /* 803196E4 00316624 7C 08 02 A6 */ mflr r0 /* 803196E8 00316628 90 01 00 34 */ stw r0, 0x34(r1) /* 803196EC 0031662C 39 61 00 30 */ addi r11, r1, 0x30 -/* 803196F0 00316630 48 04 8A E9 */ bl func_803621D8 +/* 803196F0 00316630 48 04 8A E9 */ bl _savegpr_28 /* 803196F4 00316634 7C 7F 1B 78 */ mr r31, r3 /* 803196F8 00316638 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 803196FC 0031663C 80 64 00 00 */ lwz r3, 0(r4) @@ -2581,7 +2581,7 @@ lbl_80319B10: /* 80319B2C 00316A6C 7C 9E 00 50 */ subf r4, r30, r0 /* 80319B30 00316A70 48 02 1A AD */ bl DCStoreRange /* 80319B34 00316A74 39 61 00 30 */ addi r11, r1, 0x30 -/* 80319B38 00316A78 48 04 86 ED */ bl func_80362224 +/* 80319B38 00316A78 48 04 86 ED */ bl _restgpr_28 /* 80319B3C 00316A7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80319B40 00316A80 7C 08 03 A6 */ mtlr r0 /* 80319B44 00316A84 38 21 00 30 */ addi r1, r1, 0x30 @@ -3478,7 +3478,7 @@ lbl_8031A85C: /* 8031A8E4 00317824 7C 08 02 A6 */ mflr r0 /* 8031A8E8 00317828 90 01 00 24 */ stw r0, 0x24(r1) /* 8031A8EC 0031782C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A8F0 00317830 48 04 78 E9 */ bl func_803621D8 +/* 8031A8F0 00317830 48 04 78 E9 */ bl _savegpr_28 /* 8031A8F4 00317834 7C 7C 1B 78 */ mr r28, r3 /* 8031A8F8 00317838 7C 9D 23 78 */ mr r29, r4 /* 8031A8FC 0031783C 3B C0 00 00 */ li r30, 0 @@ -3498,7 +3498,7 @@ lbl_8031A928: /* 8031A928 00317868 7C 1E E8 40 */ cmplw r30, r29 /* 8031A92C 0031786C 41 80 FF DC */ blt lbl_8031A908 /* 8031A930 00317870 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A934 00317874 48 04 78 F1 */ bl func_80362224 +/* 8031A934 00317874 48 04 78 F1 */ bl _restgpr_28 /* 8031A938 00317878 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031A93C 0031787C 7C 08 03 A6 */ mtlr r0 /* 8031A940 00317880 38 21 00 20 */ addi r1, r1, 0x20 @@ -3507,7 +3507,7 @@ lbl_8031A928: /* 8031A94C 0031788C 7C 08 02 A6 */ mflr r0 /* 8031A950 00317890 90 01 00 24 */ stw r0, 0x24(r1) /* 8031A954 00317894 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A958 00317898 48 04 78 81 */ bl func_803621D8 +/* 8031A958 00317898 48 04 78 81 */ bl _savegpr_28 /* 8031A95C 0031789C 7C 7C 1B 78 */ mr r28, r3 /* 8031A960 003178A0 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031A964 003178A4 80 64 00 00 */ lwz r3, 0(r4) @@ -3541,7 +3541,7 @@ lbl_8031A9A8: /* 8031A9CC 0031790C 48 00 8C 79 */ bl loadTexCoordGens lbl_8031A9D0: /* 8031A9D0 00317910 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A9D4 00317914 48 04 78 51 */ bl func_80362224 +/* 8031A9D4 00317914 48 04 78 51 */ bl _restgpr_28 /* 8031A9D8 00317918 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031A9DC 0031791C 7C 08 03 A6 */ mtlr r0 /* 8031A9E0 00317920 38 21 00 20 */ addi r1, r1, 0x20 @@ -3550,7 +3550,7 @@ lbl_8031A9D0: /* 8031A9EC 0031792C 7C 08 02 A6 */ mflr r0 /* 8031A9F0 00317930 90 01 00 24 */ stw r0, 0x24(r1) /* 8031A9F4 00317934 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031A9F8 00317938 48 04 77 E1 */ bl func_803621D8 +/* 8031A9F8 00317938 48 04 77 E1 */ bl _savegpr_28 /* 8031A9FC 0031793C 7C 7C 1B 78 */ mr r28, r3 /* 8031AA00 00317940 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031AA04 00317944 80 64 00 00 */ lwz r3, 0(r4) @@ -3584,7 +3584,7 @@ lbl_8031AA48: /* 8031AA6C 003179AC 48 00 8B D9 */ bl loadTexCoordGens lbl_8031AA70: /* 8031AA70 003179B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AA74 003179B4 48 04 77 B1 */ bl func_80362224 +/* 8031AA74 003179B4 48 04 77 B1 */ bl _restgpr_28 /* 8031AA78 003179B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031AA7C 003179BC 7C 08 03 A6 */ mtlr r0 /* 8031AA80 003179C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3593,7 +3593,7 @@ lbl_8031AA70: /* 8031AA8C 003179CC 7C 08 02 A6 */ mflr r0 /* 8031AA90 003179D0 90 01 00 24 */ stw r0, 0x24(r1) /* 8031AA94 003179D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AA98 003179D8 48 04 77 41 */ bl func_803621D8 +/* 8031AA98 003179D8 48 04 77 41 */ bl _savegpr_28 /* 8031AA9C 003179DC 7C 7C 1B 78 */ mr r28, r3 /* 8031AAA0 003179E0 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031AAA4 003179E4 80 64 00 00 */ lwz r3, 0(r4) @@ -3622,7 +3622,7 @@ lbl_8031AADC: /* 8031AAF8 00317A38 7C 9E 00 50 */ subf r4, r30, r0 /* 8031AAFC 00317A3C 48 02 0A E1 */ bl DCStoreRange /* 8031AB00 00317A40 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AB04 00317A44 48 04 77 21 */ bl func_80362224 +/* 8031AB04 00317A44 48 04 77 21 */ bl _restgpr_28 /* 8031AB08 00317A48 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031AB0C 00317A4C 7C 08 03 A6 */ mtlr r0 /* 8031AB10 00317A50 38 21 00 20 */ addi r1, r1, 0x20 @@ -3631,7 +3631,7 @@ lbl_8031AADC: /* 8031AB1C 00317A5C 7C 08 02 A6 */ mflr r0 /* 8031AB20 00317A60 90 01 00 24 */ stw r0, 0x24(r1) /* 8031AB24 00317A64 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AB28 00317A68 48 04 76 AD */ bl func_803621D4 +/* 8031AB28 00317A68 48 04 76 AD */ bl _savegpr_27 /* 8031AB2C 00317A6C 7C 7B 1B 78 */ mr r27, r3 /* 8031AB30 00317A70 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031AB34 00317A74 80 64 00 00 */ lwz r3, 0(r4) @@ -3666,7 +3666,7 @@ lbl_8031AB80: /* 8031ABA0 00317AE0 7C 9D 00 50 */ subf r4, r29, r0 /* 8031ABA4 00317AE4 48 02 0A 39 */ bl DCStoreRange /* 8031ABA8 00317AE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031ABAC 00317AEC 48 04 76 75 */ bl func_80362220 +/* 8031ABAC 00317AEC 48 04 76 75 */ bl _restgpr_27 /* 8031ABB0 00317AF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031ABB4 00317AF4 7C 08 03 A6 */ mtlr r0 /* 8031ABB8 00317AF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3675,7 +3675,7 @@ lbl_8031AB80: /* 8031ABC4 00317B04 7C 08 02 A6 */ mflr r0 /* 8031ABC8 00317B08 90 01 00 24 */ stw r0, 0x24(r1) /* 8031ABCC 00317B0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031ABD0 00317B10 48 04 76 05 */ bl func_803621D4 +/* 8031ABD0 00317B10 48 04 76 05 */ bl _savegpr_27 /* 8031ABD4 00317B14 7C 7B 1B 78 */ mr r27, r3 /* 8031ABD8 00317B18 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031ABDC 00317B1C 80 64 00 00 */ lwz r3, 0(r4) @@ -3710,7 +3710,7 @@ lbl_8031AC28: /* 8031AC48 00317B88 7C 9D 00 50 */ subf r4, r29, r0 /* 8031AC4C 00317B8C 48 02 09 91 */ bl DCStoreRange /* 8031AC50 00317B90 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AC54 00317B94 48 04 75 CD */ bl func_80362220 +/* 8031AC54 00317B94 48 04 75 CD */ bl _restgpr_27 /* 8031AC58 00317B98 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031AC5C 00317B9C 7C 08 03 A6 */ mtlr r0 /* 8031AC60 00317BA0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3932,7 +3932,7 @@ lbl_8031ADC0: /* 8031AFA8 00317EE8 7C 08 02 A6 */ mflr r0 /* 8031AFAC 00317EEC 90 01 00 34 */ stw r0, 0x34(r1) /* 8031AFB0 00317EF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031AFB4 00317EF4 48 04 72 25 */ bl func_803621D8 +/* 8031AFB4 00317EF4 48 04 72 25 */ bl _savegpr_28 /* 8031AFB8 00317EF8 7C 7E 1B 78 */ mr r30, r3 /* 8031AFBC 00317EFC 8B E3 00 34 */ lbz r31, 0x34(r3) /* 8031AFC0 00317F00 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) @@ -4257,7 +4257,7 @@ lbl_8031B2F8: /* 8031B4A0 003183E0 38 A5 00 04 */ addi r5, r5, 4 /* 8031B4A4 003183E4 42 00 FE 54 */ bdnz lbl_8031B2F8 /* 8031B4A8 003183E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031B4AC 003183EC 48 04 6D 79 */ bl func_80362224 +/* 8031B4AC 003183EC 48 04 6D 79 */ bl _restgpr_28 /* 8031B4B0 003183F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031B4B4 003183F4 7C 08 03 A6 */ mtlr r0 /* 8031B4B8 003183F8 38 21 00 30 */ addi r1, r1, 0x30 @@ -4959,7 +4959,7 @@ lbl_8031BD80: /* 8031BF50 00318E90 7C 08 02 A6 */ mflr r0 /* 8031BF54 00318E94 90 01 00 24 */ stw r0, 0x24(r1) /* 8031BF58 00318E98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031BF5C 00318E9C 48 04 62 7D */ bl func_803621D8 +/* 8031BF5C 00318E9C 48 04 62 7D */ bl _savegpr_28 /* 8031BF60 00318EA0 7C 7C 1B 78 */ mr r28, r3 /* 8031BF64 00318EA4 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031BF68 00318EA8 80 64 00 00 */ lwz r3, 0(r4) @@ -4989,7 +4989,7 @@ lbl_8031BFA4: /* 8031BFC0 00318F00 7C 9E 00 50 */ subf r4, r30, r0 /* 8031BFC4 00318F04 48 01 F6 19 */ bl DCStoreRange /* 8031BFC8 00318F08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031BFCC 00318F0C 48 04 62 59 */ bl func_80362224 +/* 8031BFCC 00318F0C 48 04 62 59 */ bl _restgpr_28 /* 8031BFD0 00318F10 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031BFD4 00318F14 7C 08 03 A6 */ mtlr r0 /* 8031BFD8 00318F18 38 21 00 20 */ addi r1, r1, 0x20 @@ -4998,7 +4998,7 @@ lbl_8031BFA4: /* 8031BFE4 00318F24 7C 08 02 A6 */ mflr r0 /* 8031BFE8 00318F28 90 01 00 34 */ stw r0, 0x34(r1) /* 8031BFEC 00318F2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031BFF0 00318F30 48 04 61 E9 */ bl func_803621D8 +/* 8031BFF0 00318F30 48 04 61 E9 */ bl _savegpr_28 /* 8031BFF4 00318F34 7C 7C 1B 78 */ mr r28, r3 /* 8031BFF8 00318F38 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031BFFC 00318F3C 80 64 00 00 */ lwz r3, 0(r4) @@ -5042,7 +5042,7 @@ lbl_8031C058: /* 8031C08C 00318FCC 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C090 00318FD0 48 01 F5 4D */ bl DCStoreRange /* 8031C094 00318FD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C098 00318FD8 48 04 61 8D */ bl func_80362224 +/* 8031C098 00318FD8 48 04 61 8D */ bl _restgpr_28 /* 8031C09C 00318FDC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031C0A0 00318FE0 7C 08 03 A6 */ mtlr r0 /* 8031C0A4 00318FE4 38 21 00 30 */ addi r1, r1, 0x30 @@ -5268,7 +5268,7 @@ lbl_8031C334: /* 8031C3FC 0031933C 7C 08 02 A6 */ mflr r0 /* 8031C400 00319340 90 01 00 24 */ stw r0, 0x24(r1) /* 8031C404 00319344 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C408 00319348 48 04 5D D1 */ bl func_803621D8 +/* 8031C408 00319348 48 04 5D D1 */ bl _savegpr_28 /* 8031C40C 0031934C 7C 7C 1B 78 */ mr r28, r3 /* 8031C410 00319350 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C414 00319354 80 64 00 00 */ lwz r3, 0(r4) @@ -5298,7 +5298,7 @@ lbl_8031C450: /* 8031C46C 003193AC 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C470 003193B0 48 01 F1 6D */ bl DCStoreRange /* 8031C474 003193B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C478 003193B8 48 04 5D AD */ bl func_80362224 +/* 8031C478 003193B8 48 04 5D AD */ bl _restgpr_28 /* 8031C47C 003193BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031C480 003193C0 7C 08 03 A6 */ mtlr r0 /* 8031C484 003193C4 38 21 00 20 */ addi r1, r1, 0x20 @@ -5307,7 +5307,7 @@ lbl_8031C450: /* 8031C490 003193D0 7C 08 02 A6 */ mflr r0 /* 8031C494 003193D4 90 01 00 34 */ stw r0, 0x34(r1) /* 8031C498 003193D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C49C 003193DC 48 04 5D 3D */ bl func_803621D8 +/* 8031C49C 003193DC 48 04 5D 3D */ bl _savegpr_28 /* 8031C4A0 003193E0 7C 7C 1B 78 */ mr r28, r3 /* 8031C4A4 003193E4 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C4A8 003193E8 80 64 00 00 */ lwz r3, 0(r4) @@ -5351,7 +5351,7 @@ lbl_8031C504: /* 8031C538 00319478 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C53C 0031947C 48 01 F0 A1 */ bl DCStoreRange /* 8031C540 00319480 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C544 00319484 48 04 5C E1 */ bl func_80362224 +/* 8031C544 00319484 48 04 5C E1 */ bl _restgpr_28 /* 8031C548 00319488 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031C54C 0031948C 7C 08 03 A6 */ mtlr r0 /* 8031C550 00319490 38 21 00 30 */ addi r1, r1, 0x30 @@ -5360,7 +5360,7 @@ lbl_8031C504: /* 8031C55C 0031949C 7C 08 02 A6 */ mflr r0 /* 8031C560 003194A0 90 01 00 24 */ stw r0, 0x24(r1) /* 8031C564 003194A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C568 003194A8 48 04 5C 71 */ bl func_803621D8 +/* 8031C568 003194A8 48 04 5C 71 */ bl _savegpr_28 /* 8031C56C 003194AC 7C 7E 1B 78 */ mr r30, r3 /* 8031C570 003194B0 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C574 003194B4 80 64 00 00 */ lwz r3, 0(r4) @@ -5437,7 +5437,7 @@ lbl_8031C5B0: /* 8031C688 003195C8 7C 9F 00 50 */ subf r4, r31, r0 /* 8031C68C 003195CC 48 01 EF 51 */ bl DCStoreRange /* 8031C690 003195D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C694 003195D4 48 04 5B 91 */ bl func_80362224 +/* 8031C694 003195D4 48 04 5B 91 */ bl _restgpr_28 /* 8031C698 003195D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031C69C 003195DC 7C 08 03 A6 */ mtlr r0 /* 8031C6A0 003195E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -5465,7 +5465,7 @@ lbl_8031C5B0: /* 8031C6F8 00319638 7C 08 02 A6 */ mflr r0 /* 8031C6FC 0031963C 90 01 00 24 */ stw r0, 0x24(r1) /* 8031C700 00319640 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C704 00319644 48 04 5A D5 */ bl func_803621D8 +/* 8031C704 00319644 48 04 5A D5 */ bl _savegpr_28 /* 8031C708 00319648 7C 7C 1B 78 */ mr r28, r3 /* 8031C70C 0031964C 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C710 00319650 80 64 00 00 */ lwz r3, 0(r4) @@ -5495,7 +5495,7 @@ lbl_8031C74C: /* 8031C768 003196A8 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C76C 003196AC 48 01 EE 71 */ bl DCStoreRange /* 8031C770 003196B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031C774 003196B4 48 04 5A B1 */ bl func_80362224 +/* 8031C774 003196B4 48 04 5A B1 */ bl _restgpr_28 /* 8031C778 003196B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031C77C 003196BC 7C 08 03 A6 */ mtlr r0 /* 8031C780 003196C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -5504,7 +5504,7 @@ lbl_8031C74C: /* 8031C78C 003196CC 7C 08 02 A6 */ mflr r0 /* 8031C790 003196D0 90 01 00 34 */ stw r0, 0x34(r1) /* 8031C794 003196D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C798 003196D8 48 04 5A 41 */ bl func_803621D8 +/* 8031C798 003196D8 48 04 5A 41 */ bl _savegpr_28 /* 8031C79C 003196DC 7C 7C 1B 78 */ mr r28, r3 /* 8031C7A0 003196E0 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C7A4 003196E4 80 64 00 00 */ lwz r3, 0(r4) @@ -5548,7 +5548,7 @@ lbl_8031C800: /* 8031C834 00319774 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C838 00319778 48 01 ED A5 */ bl DCStoreRange /* 8031C83C 0031977C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C840 00319780 48 04 59 E5 */ bl func_80362224 +/* 8031C840 00319780 48 04 59 E5 */ bl _restgpr_28 /* 8031C844 00319784 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031C848 00319788 7C 08 03 A6 */ mtlr r0 /* 8031C84C 0031978C 38 21 00 30 */ addi r1, r1, 0x30 @@ -5675,7 +5675,7 @@ lbl_8031C99C: /* 8031CA20 00319960 7C 08 02 A6 */ mflr r0 /* 8031CA24 00319964 90 01 00 24 */ stw r0, 0x24(r1) /* 8031CA28 00319968 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CA2C 0031996C 48 04 57 AD */ bl func_803621D8 +/* 8031CA2C 0031996C 48 04 57 AD */ bl _savegpr_28 /* 8031CA30 00319970 7C 7C 1B 78 */ mr r28, r3 /* 8031CA34 00319974 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031CA38 00319978 80 64 00 00 */ lwz r3, 0(r4) @@ -5705,7 +5705,7 @@ lbl_8031CA74: /* 8031CA90 003199D0 7C 9E 00 50 */ subf r4, r30, r0 /* 8031CA94 003199D4 48 01 EB 49 */ bl DCStoreRange /* 8031CA98 003199D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CA9C 003199DC 48 04 57 89 */ bl func_80362224 +/* 8031CA9C 003199DC 48 04 57 89 */ bl _restgpr_28 /* 8031CAA0 003199E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031CAA4 003199E4 7C 08 03 A6 */ mtlr r0 /* 8031CAA8 003199E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5714,7 +5714,7 @@ lbl_8031CA74: /* 8031CAB4 003199F4 7C 08 02 A6 */ mflr r0 /* 8031CAB8 003199F8 90 01 00 34 */ stw r0, 0x34(r1) /* 8031CABC 003199FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CAC0 00319A00 48 04 57 19 */ bl func_803621D8 +/* 8031CAC0 00319A00 48 04 57 19 */ bl _savegpr_28 /* 8031CAC4 00319A04 7C 7C 1B 78 */ mr r28, r3 /* 8031CAC8 00319A08 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031CACC 00319A0C 80 64 00 00 */ lwz r3, 0(r4) @@ -5758,7 +5758,7 @@ lbl_8031CB28: /* 8031CB5C 00319A9C 7C 9E 00 50 */ subf r4, r30, r0 /* 8031CB60 00319AA0 48 01 EA 7D */ bl DCStoreRange /* 8031CB64 00319AA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CB68 00319AA8 48 04 56 BD */ bl func_80362224 +/* 8031CB68 00319AA8 48 04 56 BD */ bl _restgpr_28 /* 8031CB6C 00319AAC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031CB70 00319AB0 7C 08 03 A6 */ mtlr r0 /* 8031CB74 00319AB4 38 21 00 30 */ addi r1, r1, 0x30 @@ -6119,7 +6119,7 @@ lbl_8031D084: /* 8031D0C8 0031A008 7C 08 02 A6 */ mflr r0 /* 8031D0CC 0031A00C 90 01 00 24 */ stw r0, 0x24(r1) /* 8031D0D0 0031A010 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D0D4 0031A014 48 04 51 01 */ bl func_803621D4 +/* 8031D0D4 0031A014 48 04 51 01 */ bl _savegpr_27 /* 8031D0D8 0031A018 7C 7C 1B 78 */ mr r28, r3 /* 8031D0DC 0031A01C 8B C3 00 D0 */ lbz r30, 0xd0(r3) /* 8031D0E0 0031A020 3B A0 00 00 */ li r29, 0 @@ -6174,7 +6174,7 @@ lbl_8031D19C: /* 8031D19C 0031A0DC 7C 1D F0 40 */ cmplw r29, r30 /* 8031D1A0 0031A0E0 41 80 FF 54 */ blt lbl_8031D0F4 /* 8031D1A4 0031A0E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D1A8 0031A0E8 48 04 50 79 */ bl func_80362220 +/* 8031D1A8 0031A0E8 48 04 50 79 */ bl _restgpr_27 /* 8031D1AC 0031A0EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031D1B0 0031A0F0 7C 08 03 A6 */ mtlr r0 /* 8031D1B4 0031A0F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -6732,7 +6732,7 @@ lbl_8031D984: /* 8031DA20 0031A960 7C 08 02 A6 */ mflr r0 /* 8031DA24 0031A964 90 01 00 24 */ stw r0, 0x24(r1) /* 8031DA28 0031A968 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DA2C 0031A96C 48 04 47 A9 */ bl func_803621D4 +/* 8031DA2C 0031A96C 48 04 47 A9 */ bl _savegpr_27 /* 8031DA30 0031A970 7C 7C 1B 78 */ mr r28, r3 /* 8031DA34 0031A974 8B C3 00 20 */ lbz r30, 0x20(r3) /* 8031DA38 0031A978 3B A0 00 00 */ li r29, 0 @@ -6787,7 +6787,7 @@ lbl_8031DAF4: /* 8031DAF4 0031AA34 7C 1D F0 40 */ cmplw r29, r30 /* 8031DAF8 0031AA38 41 80 FF 54 */ blt lbl_8031DA4C /* 8031DAFC 0031AA3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DB00 0031AA40 48 04 47 21 */ bl func_80362220 +/* 8031DB00 0031AA40 48 04 47 21 */ bl _restgpr_27 /* 8031DB04 0031AA44 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031DB08 0031AA48 7C 08 03 A6 */ mtlr r0 /* 8031DB0C 0031AA4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6979,7 +6979,7 @@ lbl_8031DD40: /* 8031DDDC 0031AD1C 7C 08 02 A6 */ mflr r0 /* 8031DDE0 0031AD20 90 01 00 24 */ stw r0, 0x24(r1) /* 8031DDE4 0031AD24 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DDE8 0031AD28 48 04 43 ED */ bl func_803621D4 +/* 8031DDE8 0031AD28 48 04 43 ED */ bl _savegpr_27 /* 8031DDEC 0031AD2C 7C 7C 1B 78 */ mr r28, r3 /* 8031DDF0 0031AD30 8B C3 00 58 */ lbz r30, 0x58(r3) /* 8031DDF4 0031AD34 3B A0 00 00 */ li r29, 0 @@ -7034,7 +7034,7 @@ lbl_8031DEB0: /* 8031DEB0 0031ADF0 7C 1D F0 40 */ cmplw r29, r30 /* 8031DEB4 0031ADF4 41 80 FF 54 */ blt lbl_8031DE08 /* 8031DEB8 0031ADF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DEBC 0031ADFC 48 04 43 65 */ bl func_80362220 +/* 8031DEBC 0031ADFC 48 04 43 65 */ bl _restgpr_27 /* 8031DEC0 0031AE00 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031DEC4 0031AE04 7C 08 03 A6 */ mtlr r0 /* 8031DEC8 0031AE08 38 21 00 20 */ addi r1, r1, 0x20 @@ -7203,7 +7203,7 @@ lbl_8031E100: /* 8031E130 0031B070 7C 08 02 A6 */ mflr r0 /* 8031E134 0031B074 90 01 00 24 */ stw r0, 0x24(r1) /* 8031E138 0031B078 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031E13C 0031B07C 48 04 40 9D */ bl func_803621D8 +/* 8031E13C 0031B07C 48 04 40 9D */ bl _savegpr_28 /* 8031E140 0031B080 7C 7F 1B 78 */ mr r31, r3 /* 8031E144 0031B084 8B C3 00 04 */ lbz r30, 4(r3) /* 8031E148 0031B088 3B 80 00 00 */ li r28, 0 @@ -7325,7 +7325,7 @@ lbl_8031E1AC: /* 8031E308 0031B248 89 5F 00 11 */ lbz r10, 0x11(r31) /* 8031E30C 0031B24C 4B FF 0B FD */ bl J3DGDSetIndTexOrder /* 8031E310 0031B250 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031E314 0031B254 48 04 3F 11 */ bl func_80362224 +/* 8031E314 0031B254 48 04 3F 11 */ bl _restgpr_28 /* 8031E318 0031B258 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031E31C 0031B25C 7C 08 03 A6 */ mtlr r0 /* 8031E320 0031B260 38 21 00 20 */ addi r1, r1, 0x20 @@ -9034,7 +9034,7 @@ lbl_8031FCF0: /* 8031FD0C 0031CC4C 7C 08 02 A6 */ mflr r0 /* 8031FD10 0031CC50 90 01 00 24 */ stw r0, 0x24(r1) /* 8031FD14 0031CC54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FD18 0031CC58 48 04 24 C1 */ bl func_803621D8 +/* 8031FD18 0031CC58 48 04 24 C1 */ bl _savegpr_28 /* 8031FD1C 0031CC5C 7C 7C 1B 78 */ mr r28, r3 /* 8031FD20 0031CC60 7C 9D 23 78 */ mr r29, r4 /* 8031FD24 0031CC64 7F A3 EB 78 */ mr r3, r29 @@ -9082,7 +9082,7 @@ lbl_8031FD98: /* 8031FDC4 0031CD04 3B FF 00 02 */ addi r31, r31, 2 /* 8031FDC8 0031CD08 41 80 FF D0 */ blt lbl_8031FD98 /* 8031FDCC 0031CD0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FDD0 0031CD10 48 04 24 55 */ bl func_80362224 +/* 8031FDD0 0031CD10 48 04 24 55 */ bl _restgpr_28 /* 8031FDD4 0031CD14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031FDD8 0031CD18 7C 08 03 A6 */ mtlr r0 /* 8031FDDC 0031CD1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -9091,7 +9091,7 @@ lbl_8031FD98: /* 8031FDE8 0031CD28 7C 08 02 A6 */ mflr r0 /* 8031FDEC 0031CD2C 90 01 00 24 */ stw r0, 0x24(r1) /* 8031FDF0 0031CD30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FDF4 0031CD34 48 04 23 E5 */ bl func_803621D8 +/* 8031FDF4 0031CD34 48 04 23 E5 */ bl _savegpr_28 /* 8031FDF8 0031CD38 7C 7E 1B 78 */ mr r30, r3 /* 8031FDFC 0031CD3C 7C 9F 23 78 */ mr r31, r4 /* 8031FE00 0031CD40 7F E3 FB 78 */ mr r3, r31 @@ -9170,7 +9170,7 @@ lbl_8031FF0C: /* 8031FF14 0031CE54 3B BD 00 04 */ addi r29, r29, 4 /* 8031FF18 0031CE58 41 80 FF 98 */ blt lbl_8031FEB0 /* 8031FF1C 0031CE5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FF20 0031CE60 48 04 23 05 */ bl func_80362224 +/* 8031FF20 0031CE60 48 04 23 05 */ bl _restgpr_28 /* 8031FF24 0031CE64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031FF28 0031CE68 7C 08 03 A6 */ mtlr r0 /* 8031FF2C 0031CE6C 38 21 00 20 */ addi r1, r1, 0x20 @@ -9179,7 +9179,7 @@ lbl_8031FF0C: /* 8031FF38 0031CE78 7C 08 02 A6 */ mflr r0 /* 8031FF3C 0031CE7C 90 01 00 24 */ stw r0, 0x24(r1) /* 8031FF40 0031CE80 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031FF44 0031CE84 48 04 22 95 */ bl func_803621D8 +/* 8031FF44 0031CE84 48 04 22 95 */ bl _savegpr_28 /* 8031FF48 0031CE88 7C 7E 1B 78 */ mr r30, r3 /* 8031FF4C 0031CE8C 7C 9F 23 78 */ mr r31, r4 /* 8031FF50 0031CE90 7F E3 FB 78 */ mr r3, r31 @@ -9258,7 +9258,7 @@ lbl_8032005C: /* 80320064 0031CFA4 3B BD 00 04 */ addi r29, r29, 4 /* 80320068 0031CFA8 41 80 FF 98 */ blt lbl_80320000 /* 8032006C 0031CFAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320070 0031CFB0 48 04 21 B5 */ bl func_80362224 +/* 80320070 0031CFB0 48 04 21 B5 */ bl _restgpr_28 /* 80320074 0031CFB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80320078 0031CFB8 7C 08 03 A6 */ mtlr r0 /* 8032007C 0031CFBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -9267,7 +9267,7 @@ lbl_8032005C: /* 80320088 0031CFC8 7C 08 02 A6 */ mflr r0 /* 8032008C 0031CFCC 90 01 00 24 */ stw r0, 0x24(r1) /* 80320090 0031CFD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320094 0031CFD4 48 04 21 41 */ bl func_803621D4 +/* 80320094 0031CFD4 48 04 21 41 */ bl _savegpr_27 /* 80320098 0031CFD8 7C 7B 1B 78 */ mr r27, r3 /* 8032009C 0031CFDC 7C 9C 23 78 */ mr r28, r4 /* 803200A0 0031CFE0 7F 83 E3 78 */ mr r3, r28 @@ -9333,7 +9333,7 @@ lbl_80320178: /* 80320180 0031D0C0 3B FF 00 04 */ addi r31, r31, 4 /* 80320184 0031D0C4 41 80 FF 78 */ blt lbl_803200FC /* 80320188 0031D0C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032018C 0031D0CC 48 04 20 95 */ bl func_80362220 +/* 8032018C 0031D0CC 48 04 20 95 */ bl _restgpr_27 /* 80320190 0031D0D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80320194 0031D0D4 7C 08 03 A6 */ mtlr r0 /* 80320198 0031D0D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -9342,7 +9342,7 @@ lbl_80320178: /* 803201A4 0031D0E4 7C 08 02 A6 */ mflr r0 /* 803201A8 0031D0E8 90 01 00 24 */ stw r0, 0x24(r1) /* 803201AC 0031D0EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803201B0 0031D0F0 48 04 20 25 */ bl func_803621D4 +/* 803201B0 0031D0F0 48 04 20 25 */ bl _savegpr_27 /* 803201B4 0031D0F4 7C 7B 1B 78 */ mr r27, r3 /* 803201B8 0031D0F8 7C 9C 23 78 */ mr r28, r4 /* 803201BC 0031D0FC 7F 83 E3 78 */ mr r3, r28 @@ -9416,7 +9416,7 @@ lbl_80320294: /* 803202BC 0031D1FC 38 7B 00 5C */ addi r3, r27, 0x5c /* 803202C0 0031D200 48 00 55 BD */ bl J3DNBTScaleInfo_NS___as /* 803202C4 0031D204 39 61 00 20 */ addi r11, r1, 0x20 -/* 803202C8 0031D208 48 04 1F 59 */ bl func_80362220 +/* 803202C8 0031D208 48 04 1F 59 */ bl _restgpr_27 /* 803202CC 0031D20C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803202D0 0031D210 7C 08 03 A6 */ mtlr r0 /* 803202D4 0031D214 38 21 00 20 */ addi r1, r1, 0x20 @@ -9425,7 +9425,7 @@ lbl_80320294: /* 803202E0 0031D220 7C 08 02 A6 */ mflr r0 /* 803202E4 0031D224 90 01 00 24 */ stw r0, 0x24(r1) /* 803202E8 0031D228 39 61 00 20 */ addi r11, r1, 0x20 -/* 803202EC 0031D22C 48 04 1E E9 */ bl func_803621D4 +/* 803202EC 0031D22C 48 04 1E E9 */ bl _savegpr_27 /* 803202F0 0031D230 7C 7B 1B 78 */ mr r27, r3 /* 803202F4 0031D234 7C 9C 23 78 */ mr r28, r4 /* 803202F8 0031D238 7F 83 E3 78 */ mr r3, r28 @@ -9499,7 +9499,7 @@ lbl_803203D0: /* 803203F8 0031D338 38 7B 00 5C */ addi r3, r27, 0x5c /* 803203FC 0031D33C 48 00 54 81 */ bl J3DNBTScaleInfo_NS___as /* 80320400 0031D340 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320404 0031D344 48 04 1E 1D */ bl func_80362220 +/* 80320404 0031D344 48 04 1E 1D */ bl _restgpr_27 /* 80320408 0031D348 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032040C 0031D34C 7C 08 03 A6 */ mtlr r0 /* 80320410 0031D350 38 21 00 20 */ addi r1, r1, 0x20 @@ -9508,7 +9508,7 @@ lbl_803203D0: /* 8032041C 0031D35C 7C 08 02 A6 */ mflr r0 /* 80320420 0031D360 90 01 00 24 */ stw r0, 0x24(r1) /* 80320424 0031D364 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320428 0031D368 48 04 1D AD */ bl func_803621D4 +/* 80320428 0031D368 48 04 1D AD */ bl _savegpr_27 /* 8032042C 0031D36C 7C 7E 1B 78 */ mr r30, r3 /* 80320430 0031D370 7C 9F 23 78 */ mr r31, r4 /* 80320434 0031D374 7F E3 FB 78 */ mr r3, r31 @@ -9614,7 +9614,7 @@ lbl_80320538: /* 803205B4 0031D4F4 3B 9C 00 08 */ addi r28, r28, 8 /* 803205B8 0031D4F8 41 80 FF 80 */ blt lbl_80320538 /* 803205BC 0031D4FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803205C0 0031D500 48 04 1C 61 */ bl func_80362220 +/* 803205C0 0031D500 48 04 1C 61 */ bl _restgpr_27 /* 803205C4 0031D504 80 01 00 24 */ lwz r0, 0x24(r1) /* 803205C8 0031D508 7C 08 03 A6 */ mtlr r0 /* 803205CC 0031D50C 38 21 00 20 */ addi r1, r1, 0x20 @@ -9677,7 +9677,7 @@ lbl_80320538: /* 803206B0 0031D5F0 7C 08 02 A6 */ mflr r0 /* 803206B4 0031D5F4 90 01 00 24 */ stw r0, 0x24(r1) /* 803206B8 0031D5F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 803206BC 0031D5FC 48 04 1B 1D */ bl func_803621D8 +/* 803206BC 0031D5FC 48 04 1B 1D */ bl _savegpr_28 /* 803206C0 0031D600 7C 7E 1B 78 */ mr r30, r3 /* 803206C4 0031D604 7C 9F 23 78 */ mr r31, r4 /* 803206C8 0031D608 7F E3 FB 78 */ mr r3, r31 @@ -9855,7 +9855,7 @@ lbl_80320944: /* 8032096C 0031D8AC 28 1C 00 04 */ cmplwi r28, 4 /* 80320970 0031D8B0 41 80 FF D4 */ blt lbl_80320944 /* 80320974 0031D8B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320978 0031D8B8 48 04 18 AD */ bl func_80362224 +/* 80320978 0031D8B8 48 04 18 AD */ bl _restgpr_28 /* 8032097C 0031D8BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80320980 0031D8C0 7C 08 03 A6 */ mtlr r0 /* 80320984 0031D8C4 38 21 00 20 */ addi r1, r1, 0x20 @@ -9864,7 +9864,7 @@ lbl_80320944: /* 80320990 0031D8D0 7C 08 02 A6 */ mflr r0 /* 80320994 0031D8D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80320998 0031D8D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032099C 0031D8DC 48 04 18 3D */ bl func_803621D8 +/* 8032099C 0031D8DC 48 04 18 3D */ bl _savegpr_28 /* 803209A0 0031D8E0 7C 7E 1B 78 */ mr r30, r3 /* 803209A4 0031D8E4 7C 9F 23 78 */ mr r31, r4 /* 803209A8 0031D8E8 7F E3 FB 78 */ mr r3, r31 @@ -10152,7 +10152,7 @@ lbl_80320DDC: /* 80320E04 0031DD44 28 1C 00 04 */ cmplwi r28, 4 /* 80320E08 0031DD48 41 80 FF D4 */ blt lbl_80320DDC /* 80320E0C 0031DD4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320E10 0031DD50 48 04 14 15 */ bl func_80362224 +/* 80320E10 0031DD50 48 04 14 15 */ bl _restgpr_28 /* 80320E14 0031DD54 80 01 00 24 */ lwz r0, 0x24(r1) /* 80320E18 0031DD58 7C 08 03 A6 */ mtlr r0 /* 80320E1C 0031DD5C 38 21 00 20 */ addi r1, r1, 0x20 @@ -10161,7 +10161,7 @@ lbl_80320DDC: /* 80320E28 0031DD68 7C 08 02 A6 */ mflr r0 /* 80320E2C 0031DD6C 90 01 00 24 */ stw r0, 0x24(r1) /* 80320E30 0031DD70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80320E34 0031DD74 48 04 13 A1 */ bl func_803621D4 +/* 80320E34 0031DD74 48 04 13 A1 */ bl _savegpr_27 /* 80320E38 0031DD78 7C 7E 1B 78 */ mr r30, r3 /* 80320E3C 0031DD7C 7C 9F 23 78 */ mr r31, r4 /* 80320E40 0031DD80 7F E3 FB 78 */ mr r3, r31 @@ -10323,7 +10323,7 @@ lbl_80321068: /* 80321090 0031DFD0 28 1B 00 04 */ cmplwi r27, 4 /* 80321094 0031DFD4 41 80 FF D4 */ blt lbl_80321068 /* 80321098 0031DFD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032109C 0031DFDC 48 04 11 85 */ bl func_80362220 +/* 8032109C 0031DFDC 48 04 11 85 */ bl _restgpr_27 /* 803210A0 0031DFE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 803210A4 0031DFE4 7C 08 03 A6 */ mtlr r0 /* 803210A8 0031DFE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -10332,7 +10332,7 @@ lbl_80321068: /* 803210B4 0031DFF4 7C 08 02 A6 */ mflr r0 /* 803210B8 0031DFF8 90 01 00 24 */ stw r0, 0x24(r1) /* 803210BC 0031DFFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803210C0 0031E000 48 04 11 19 */ bl func_803621D8 +/* 803210C0 0031E000 48 04 11 19 */ bl _savegpr_28 /* 803210C4 0031E004 7C 7C 1B 78 */ mr r28, r3 /* 803210C8 0031E008 7C 9D 23 78 */ mr r29, r4 /* 803210CC 0031E00C 7F A3 EB 78 */ mr r3, r29 @@ -10391,7 +10391,7 @@ lbl_80321168: /* 80321194 0031E0D4 3B FF 00 04 */ addi r31, r31, 4 /* 80321198 0031E0D8 41 80 FF D0 */ blt lbl_80321168 /* 8032119C 0031E0DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803211A0 0031E0E0 48 04 10 85 */ bl func_80362224 +/* 803211A0 0031E0E0 48 04 10 85 */ bl _restgpr_28 /* 803211A4 0031E0E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 803211A8 0031E0E8 7C 08 03 A6 */ mtlr r0 /* 803211AC 0031E0EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -10831,7 +10831,7 @@ lbl_803217F0: /* 80321820 0031E760 7C 08 02 A6 */ mflr r0 /* 80321824 0031E764 90 01 00 24 */ stw r0, 0x24(r1) /* 80321828 0031E768 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032182C 0031E76C 48 04 09 AD */ bl func_803621D8 +/* 8032182C 0031E76C 48 04 09 AD */ bl _savegpr_28 /* 80321830 0031E770 7C 7E 1B 78 */ mr r30, r3 /* 80321834 0031E774 3B E0 00 00 */ li r31, 0 /* 80321838 0031E778 3B A0 00 00 */ li r29, 0 @@ -10896,7 +10896,7 @@ lbl_8032190C: /* 80321918 0031E858 3B 9C 00 04 */ addi r28, r28, 4 /* 8032191C 0031E85C 41 80 FF 24 */ blt lbl_80321840 /* 80321920 0031E860 39 61 00 20 */ addi r11, r1, 0x20 -/* 80321924 0031E864 48 04 09 01 */ bl func_80362224 +/* 80321924 0031E864 48 04 09 01 */ bl _restgpr_28 /* 80321928 0031E868 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032192C 0031E86C 7C 08 03 A6 */ mtlr r0 /* 80321930 0031E870 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DMaterial.s b/asm/J3DGraphBase/J3DMaterial.s index 716b420f07..2c9e56aafc 100644 --- a/asm/J3DGraphBase/J3DMaterial.s +++ b/asm/J3DGraphBase/J3DMaterial.s @@ -1196,7 +1196,7 @@ lbl_8031672C: /* 803167DC 0031371C 7C 08 02 A6 */ mflr r0 /* 803167E0 00313720 90 01 00 24 */ stw r0, 0x24(r1) /* 803167E4 00313724 39 61 00 20 */ addi r11, r1, 0x20 -/* 803167E8 00313728 48 04 B9 ED */ bl func_803621D4 +/* 803167E8 00313728 48 04 B9 ED */ bl _savegpr_27 /* 803167EC 0031372C 7C 7D 1B 78 */ mr r29, r3 /* 803167F0 00313730 7C 9E 23 78 */ mr r30, r4 /* 803167F4 00313734 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -1318,7 +1318,7 @@ lbl_8031698C: /* 803169C0 00313900 4B FF C0 8D */ bl J3DMatPacket_NS_endDiff lbl_803169C4: /* 803169C4 00313904 39 61 00 20 */ addi r11, r1, 0x20 -/* 803169C8 00313908 48 04 B8 59 */ bl func_80362220 +/* 803169C8 00313908 48 04 B8 59 */ bl _restgpr_27 /* 803169CC 0031390C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803169D0 00313910 7C 08 03 A6 */ mtlr r0 /* 803169D4 00313914 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DPacket.s b/asm/J3DGraphBase/J3DPacket.s index 91ae0865c9..5fb3206238 100644 --- a/asm/J3DGraphBase/J3DPacket.s +++ b/asm/J3DGraphBase/J3DPacket.s @@ -566,7 +566,7 @@ J3DShapePacket_NS_calcDifferedBufferSize: /* 80312BD8 0030FB18 7C 08 02 A6 */ mflr r0 /* 80312BDC 0030FB1C 90 01 00 24 */ stw r0, 0x24(r1) /* 80312BE0 0030FB20 39 61 00 20 */ addi r11, r1, 0x20 -/* 80312BE4 0030FB24 48 04 F5 F5 */ bl func_803621D8 +/* 80312BE4 0030FB24 48 04 F5 F5 */ bl _savegpr_28 /* 80312BE8 0030FB28 7C 7D 1B 78 */ mr r29, r3 /* 80312BEC 0030FB2C 7C 9E 23 78 */ mr r30, r4 /* 80312BF0 0030FB30 3B E0 00 00 */ li r31, 0 @@ -693,7 +693,7 @@ lbl_80312D9C: /* 80312D9C 0030FCDC 38 1F 00 1F */ addi r0, r31, 0x1f /* 80312DA0 0030FCE0 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a /* 80312DA4 0030FCE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80312DA8 0030FCE8 48 04 F4 7D */ bl func_80362224 +/* 80312DA8 0030FCE8 48 04 F4 7D */ bl _restgpr_28 /* 80312DAC 0030FCEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80312DB0 0030FCF0 7C 08 03 A6 */ mtlr r0 /* 80312DB4 0030FCF4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DShape.s b/asm/J3DGraphBase/J3DShape.s index 0a79fbb86b..4d25ad5b87 100644 --- a/asm/J3DGraphBase/J3DShape.s +++ b/asm/J3DGraphBase/J3DShape.s @@ -40,7 +40,7 @@ J3DShape_NS_addTexMtxIndexInDL: /* 80314BBC 00311AFC 7C 08 02 A6 */ mflr r0 /* 80314BC0 00311B00 90 01 00 34 */ stw r0, 0x34(r1) /* 80314BC4 00311B04 39 61 00 30 */ addi r11, r1, 0x30 -/* 80314BC8 00311B08 48 04 D6 0D */ bl func_803621D4 +/* 80314BC8 00311B08 48 04 D6 0D */ bl _savegpr_27 /* 80314BCC 00311B0C 7C 7F 1B 78 */ mr r31, r3 /* 80314BD0 00311B10 3C 60 80 3A */ lis r3, lbl_803A1E98@ha /* 80314BD4 00311B14 38 C3 1E 98 */ addi r6, r3, lbl_803A1E98@l @@ -103,7 +103,7 @@ lbl_80314C94: /* 80314CA0 00311BE0 41 80 FF D4 */ blt lbl_80314C74 lbl_80314CA4: /* 80314CA4 00311BE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80314CA8 00311BE8 48 04 D5 79 */ bl func_80362220 +/* 80314CA8 00311BE8 48 04 D5 79 */ bl _restgpr_27 /* 80314CAC 00311BEC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80314CB0 00311BF0 7C 08 03 A6 */ mtlr r0 /* 80314CB4 00311BF4 38 21 00 30 */ addi r1, r1, 0x30 @@ -184,7 +184,7 @@ J3DShape_NS_calcNBTScale: /* 80314DAC 00311CEC 7C 08 02 A6 */ mflr r0 /* 80314DB0 00311CF0 90 01 00 24 */ stw r0, 0x24(r1) /* 80314DB4 00311CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80314DB8 00311CF8 48 04 D4 1D */ bl func_803621D4 +/* 80314DB8 00311CF8 48 04 D4 1D */ bl _savegpr_27 /* 80314DBC 00311CFC 7C 7B 1B 78 */ mr r27, r3 /* 80314DC0 00311D00 7C 9C 23 78 */ mr r28, r4 /* 80314DC4 00311D04 7C BD 2B 78 */ mr r29, r5 @@ -209,7 +209,7 @@ lbl_80314E00: /* 80314E08 00311D48 7C 03 00 40 */ cmplw r3, r0 /* 80314E0C 00311D4C 41 80 FF C8 */ blt lbl_80314DD4 /* 80314E10 00311D50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80314E14 00311D54 48 04 D4 0D */ bl func_80362220 +/* 80314E14 00311D54 48 04 D4 0D */ bl _restgpr_27 /* 80314E18 00311D58 80 01 00 24 */ lwz r0, 0x24(r1) /* 80314E1C 00311D5C 7C 08 03 A6 */ mtlr r0 /* 80314E20 00311D60 38 21 00 20 */ addi r1, r1, 0x20 @@ -221,7 +221,7 @@ J3DShape_NS_countBumpMtxNum: /* 80314E2C 00311D6C 7C 08 02 A6 */ mflr r0 /* 80314E30 00311D70 90 01 00 24 */ stw r0, 0x24(r1) /* 80314E34 00311D74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80314E38 00311D78 48 04 D3 A1 */ bl func_803621D8 +/* 80314E38 00311D78 48 04 D3 A1 */ bl _savegpr_28 /* 80314E3C 00311D7C 3B A0 00 00 */ li r29, 0 /* 80314E40 00311D80 3B 80 00 00 */ li r28, 0 /* 80314E44 00311D84 83 C3 00 38 */ lwz r30, 0x38(r3) @@ -242,7 +242,7 @@ lbl_80314E70: /* 80314E78 00311DB8 41 80 FF D8 */ blt lbl_80314E50 /* 80314E7C 00311DBC 7F A3 EB 78 */ mr r3, r29 /* 80314E80 00311DC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80314E84 00311DC4 48 04 D3 A1 */ bl func_80362224 +/* 80314E84 00311DC4 48 04 D3 A1 */ bl _restgpr_28 /* 80314E88 00311DC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80314E8C 00311DCC 7C 08 03 A6 */ mtlr r0 /* 80314E90 00311DD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -334,7 +334,7 @@ J3DShape_NS_makeVtxArrayCmd: /* 80314F9C 00311EDC 7C 08 02 A6 */ mflr r0 /* 80314FA0 00311EE0 90 01 00 64 */ stw r0, 0x64(r1) /* 80314FA4 00311EE4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80314FA8 00311EE8 48 04 D2 2D */ bl func_803621D4 +/* 80314FA8 00311EE8 48 04 D2 2D */ bl _savegpr_27 /* 80314FAC 00311EEC 80 83 00 4C */ lwz r4, 0x4c(r3) /* 80314FB0 00311EF0 80 84 00 14 */ lwz r4, 0x14(r4) /* 80314FB4 00311EF4 38 A0 00 00 */ li r5, 0 @@ -525,7 +525,7 @@ lbl_80315230: /* 80315240 00312180 3B BD 00 04 */ addi r29, r29, 4 /* 80315244 00312184 41 80 FF C0 */ blt lbl_80315204 /* 80315248 00312188 39 61 00 60 */ addi r11, r1, 0x60 -/* 8031524C 0031218C 48 04 CF D5 */ bl func_80362220 +/* 8031524C 0031218C 48 04 CF D5 */ bl _restgpr_27 /* 80315250 00312190 80 01 00 64 */ lwz r0, 0x64(r1) /* 80315254 00312194 7C 08 03 A6 */ mtlr r0 /* 80315258 00312198 38 21 00 60 */ addi r1, r1, 0x60 @@ -668,7 +668,7 @@ J3DShape_NS_setArrayAndBindPipeline: /* 80315450 00312390 7C 08 02 A6 */ mflr r0 /* 80315454 00312394 90 01 00 24 */ stw r0, 0x24(r1) /* 80315458 00312398 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031545C 0031239C 48 04 CD 79 */ bl func_803621D4 +/* 8031545C 0031239C 48 04 CD 79 */ bl _savegpr_27 /* 80315460 003123A0 7C 7F 1B 78 */ mr r31, r3 /* 80315464 003123A4 80 0D 90 50 */ lwz r0, lbl_804515D0-_SDA_BASE_(r13) /* 80315468 003123A8 80 63 00 2C */ lwz r3, 0x2c(r3) @@ -772,7 +772,7 @@ lbl_803155BC: /* 803155C4 00312504 41 80 FF E0 */ blt lbl_803155A4 lbl_803155C8: /* 803155C8 00312508 39 61 00 20 */ addi r11, r1, 0x20 -/* 803155CC 0031250C 48 04 CC 55 */ bl func_80362220 +/* 803155CC 0031250C 48 04 CC 55 */ bl _restgpr_27 /* 803155D0 00312510 80 01 00 24 */ lwz r0, 0x24(r1) /* 803155D4 00312514 7C 08 03 A6 */ mtlr r0 /* 803155D8 00312518 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index f37f7ce818..e535f11e3a 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -559,7 +559,7 @@ lbl_80313884: /* 803138CC 0031080C 7C 08 02 A6 */ mflr r0 /* 803138D0 00310810 90 01 00 54 */ stw r0, 0x54(r1) /* 803138D4 00310814 39 61 00 50 */ addi r11, r1, 0x50 -/* 803138D8 00310818 48 04 E9 01 */ bl func_803621D8 +/* 803138D8 00310818 48 04 E9 01 */ bl _savegpr_28 /* 803138DC 0031081C 7C 7C 1B 78 */ mr r28, r3 /* 803138E0 00310820 7C 9D 23 78 */ mr r29, r4 /* 803138E4 00310824 7C BE 2B 78 */ mr r30, r5 @@ -592,7 +592,7 @@ lbl_80313924: /* 8031394C 0031088C 7D 89 03 A6 */ mtctr r12 /* 80313950 00310890 4E 80 04 21 */ bctrl /* 80313954 00310894 39 61 00 50 */ addi r11, r1, 0x50 -/* 80313958 00310898 48 04 E8 CD */ bl func_80362224 +/* 80313958 00310898 48 04 E8 CD */ bl _restgpr_28 /* 8031395C 0031089C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80313960 003108A0 7C 08 03 A6 */ mtlr r0 /* 80313964 003108A4 38 21 00 50 */ addi r1, r1, 0x50 @@ -924,7 +924,7 @@ lbl_80313E38: /* 80313E50 00310D90 7C 08 02 A6 */ mflr r0 /* 80313E54 00310D94 90 01 00 34 */ stw r0, 0x34(r1) /* 80313E58 00310D98 39 61 00 30 */ addi r11, r1, 0x30 -/* 80313E5C 00310D9C 48 04 E3 79 */ bl func_803621D4 +/* 80313E5C 00310D9C 48 04 E3 79 */ bl _savegpr_27 /* 80313E60 00310DA0 7C 7B 1B 78 */ mr r27, r3 /* 80313E64 00310DA4 80 0D 90 28 */ lwz r0, lbl_804515A8-_SDA_BASE_(r13) /* 80313E68 00310DA8 1C 80 00 0C */ mulli r4, r0, 0xc @@ -958,7 +958,7 @@ lbl_80313ECC: /* 80313ECC 00310E0C 7C 1C E8 00 */ cmpw r28, r29 /* 80313ED0 00310E10 41 80 FF D4 */ blt lbl_80313EA4 /* 80313ED4 00310E14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80313ED8 00310E18 48 04 E3 49 */ bl func_80362220 +/* 80313ED8 00310E18 48 04 E3 49 */ bl _restgpr_27 /* 80313EDC 00310E1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80313EE0 00310E20 7C 08 03 A6 */ mtlr r0 /* 80313EE4 00310E24 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DSys.s b/asm/J3DGraphBase/J3DSys.s index 49baf857e3..617024dcd8 100644 --- a/asm/J3DGraphBase/J3DSys.s +++ b/asm/J3DGraphBase/J3DSys.s @@ -212,7 +212,7 @@ J3DSys_NS_drawInit: /* 803100C0 0030D000 7C 08 02 A6 */ mflr r0 /* 803100C4 0030D004 90 01 00 54 */ stw r0, 0x54(r1) /* 803100C8 0030D008 39 61 00 50 */ addi r11, r1, 0x50 -/* 803100CC 0030D00C 48 05 21 0D */ bl func_803621D8 +/* 803100CC 0030D00C 48 05 21 0D */ bl _savegpr_28 /* 803100D0 0030D010 7C 7F 1B 78 */ mr r31, r3 /* 803100D4 0030D014 48 04 BA 99 */ bl GXInvalidateVtxCache /* 803100D8 0030D018 38 60 00 00 */ li r3, 0 @@ -637,7 +637,7 @@ lbl_803106DC: /* 8031071C 0030D65C 38 80 00 00 */ li r4, 0 /* 80310720 0030D660 4B FF F7 ED */ bl J3DSys_NS_setTexCacheRegion /* 80310724 0030D664 39 61 00 50 */ addi r11, r1, 0x50 -/* 80310728 0030D668 48 05 1A FD */ bl func_80362224 +/* 80310728 0030D668 48 05 1A FD */ bl _restgpr_28 /* 8031072C 0030D66C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80310730 0030D670 7C 08 03 A6 */ mtlr r0 /* 80310734 0030D674 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/J3DGraphBase/J3DTevs.s b/asm/J3DGraphBase/J3DTevs.s index 285c5ab698..7c444da6d5 100644 --- a/asm/J3DGraphBase/J3DTevs.s +++ b/asm/J3DGraphBase/J3DTevs.s @@ -723,7 +723,7 @@ loadTexNo: /* 80323F98 00320ED8 7C 08 02 A6 */ mflr r0 /* 80323F9C 00320EDC 90 01 00 34 */ stw r0, 0x34(r1) /* 80323FA0 00320EE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80323FA4 00320EE4 48 03 E2 35 */ bl func_803621D8 +/* 80323FA4 00320EE4 48 03 E2 35 */ bl _savegpr_28 /* 80323FA8 00320EE8 7C 7E 1B 78 */ mr r30, r3 /* 80323FAC 00320EEC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80323FB0 00320EF0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -824,7 +824,7 @@ lbl_803240F8: /* 80324120 00321060 4B FE A6 C1 */ bl J3DGDSetTexTlut lbl_80324124: /* 80324124 00321064 39 61 00 30 */ addi r11, r1, 0x30 -/* 80324128 00321068 48 03 E0 FD */ bl func_80362224 +/* 80324128 00321068 48 03 E0 FD */ bl _restgpr_28 /* 8032412C 0032106C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80324130 00321070 7C 08 03 A6 */ mtlr r0 /* 80324134 00321074 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DTexture.s b/asm/J3DGraphBase/J3DTexture.s index af8722b073..6738d4c5f2 100644 --- a/asm/J3DGraphBase/J3DTexture.s +++ b/asm/J3DGraphBase/J3DTexture.s @@ -135,7 +135,7 @@ J3DTexture_NS_addResTIMG: /* 80312220 0030F160 7C 08 02 A6 */ mflr r0 /* 80312224 0030F164 90 01 00 24 */ stw r0, 0x24(r1) /* 80312228 0030F168 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031222C 0030F16C 48 04 FF AD */ bl func_803621D8 +/* 8031222C 0030F16C 48 04 FF AD */ bl _savegpr_28 /* 80312230 0030F170 7C 7C 1B 78 */ mr r28, r3 /* 80312234 0030F174 7C BD 2B 78 */ mr r29, r5 /* 80312238 0030F178 54 80 04 3F */ clrlwi. r0, r4, 0x10 @@ -286,7 +286,7 @@ lbl_80312460: /* 8031246C 0030F3AC 41 80 FF 00 */ blt lbl_8031236C lbl_80312470: /* 80312470 0030F3B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80312474 0030F3B4 48 04 FD B1 */ bl func_80362224 +/* 80312474 0030F3B4 48 04 FD B1 */ bl _restgpr_28 /* 80312478 0030F3B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031247C 0030F3BC 7C 08 03 A6 */ mtlr r0 /* 80312480 0030F3C0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DVertex.s b/asm/J3DGraphBase/J3DVertex.s index 6886079b28..3ca1172d38 100644 --- a/asm/J3DGraphBase/J3DVertex.s +++ b/asm/J3DGraphBase/J3DVertex.s @@ -129,7 +129,7 @@ J3DVertexBuffer_NS_copyLocalVtxPosArray: /* 80311094 0030DFD4 7C 08 02 A6 */ mflr r0 /* 80311098 0030DFD8 90 01 00 24 */ stw r0, 0x24(r1) /* 8031109C 0030DFDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803110A0 0030DFE0 48 05 11 39 */ bl func_803621D8 +/* 803110A0 0030DFE0 48 05 11 39 */ bl _savegpr_28 /* 803110A4 0030DFE4 7C 7F 1B 78 */ mr r31, r3 /* 803110A8 0030DFE8 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 803110AC 0030DFEC 41 82 00 78 */ beq lbl_80311124 @@ -198,7 +198,7 @@ lbl_80311194: /* 80311194 0030E0D4 38 60 00 00 */ li r3, 0 lbl_80311198: /* 80311198 0030E0D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031119C 0030E0DC 48 05 10 89 */ bl func_80362224 +/* 8031119C 0030E0DC 48 05 10 89 */ bl _restgpr_28 /* 803111A0 0030E0E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 803111A4 0030E0E4 7C 08 03 A6 */ mtlr r0 /* 803111A8 0030E0E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -210,7 +210,7 @@ J3DVertexBuffer_NS_copyLocalVtxNrmArray: /* 803111B4 0030E0F4 7C 08 02 A6 */ mflr r0 /* 803111B8 0030E0F8 90 01 00 24 */ stw r0, 0x24(r1) /* 803111BC 0030E0FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803111C0 0030E100 48 05 10 19 */ bl func_803621D8 +/* 803111C0 0030E100 48 05 10 19 */ bl _savegpr_28 /* 803111C4 0030E104 7C 7F 1B 78 */ mr r31, r3 /* 803111C8 0030E108 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 803111CC 0030E10C 41 82 00 78 */ beq lbl_80311244 @@ -279,7 +279,7 @@ lbl_803112B4: /* 803112B4 0030E1F4 38 60 00 00 */ li r3, 0 lbl_803112B8: /* 803112B8 0030E1F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 803112BC 0030E1FC 48 05 0F 69 */ bl func_80362224 +/* 803112BC 0030E1FC 48 05 0F 69 */ bl _restgpr_28 /* 803112C0 0030E200 80 01 00 24 */ lwz r0, 0x24(r1) /* 803112C4 0030E204 7C 08 03 A6 */ mtlr r0 /* 803112C8 0030E208 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphLoader/J3DAnmLoader.s b/asm/J3DGraphLoader/J3DAnmLoader.s index 93ed642351..ef7dce9f2c 100644 --- a/asm/J3DGraphLoader/J3DAnmLoader.s +++ b/asm/J3DGraphLoader/J3DAnmLoader.s @@ -731,7 +731,7 @@ J3DAnmFullLoader_v15_NS_load: /* 8033855C 0033549C 7C 08 02 A6 */ mflr r0 /* 80338560 003354A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80338564 003354A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80338568 003354A8 48 02 9C 6D */ bl func_803621D4 +/* 80338568 003354A8 48 02 9C 6D */ bl _savegpr_27 /* 8033856C 003354AC 7C 7D 1B 78 */ mr r29, r3 /* 80338570 003354B0 3B E4 00 20 */ addi r31, r4, 0x20 /* 80338574 003354B4 3B C0 00 00 */ li r30, 0 @@ -816,7 +816,7 @@ lbl_8033867C: /* 80338680 003355C0 41 80 FF 08 */ blt lbl_80338588 /* 80338684 003355C4 80 7D 00 04 */ lwz r3, 4(r29) /* 80338688 003355C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8033868C 003355CC 48 02 9B 95 */ bl func_80362220 +/* 8033868C 003355CC 48 02 9B 95 */ bl _restgpr_27 /* 80338690 003355D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80338694 003355D4 7C 08 03 A6 */ mtlr r0 /* 80338698 003355D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1308,7 +1308,7 @@ J3DAnmKeyLoader_v15_NS_load: /* 80338D48 00335C88 7C 08 02 A6 */ mflr r0 /* 80338D4C 00335C8C 90 01 00 24 */ stw r0, 0x24(r1) /* 80338D50 00335C90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80338D54 00335C94 48 02 94 81 */ bl func_803621D4 +/* 80338D54 00335C94 48 02 94 81 */ bl _savegpr_27 /* 80338D58 00335C98 7C 7D 1B 78 */ mr r29, r3 /* 80338D5C 00335C9C 3B E4 00 20 */ addi r31, r4, 0x20 /* 80338D60 00335CA0 3B C0 00 00 */ li r30, 0 @@ -1393,7 +1393,7 @@ lbl_80338E68: /* 80338E6C 00335DAC 41 80 FF 08 */ blt lbl_80338D74 /* 80338E70 00335DB0 80 7D 00 04 */ lwz r3, 4(r29) /* 80338E74 00335DB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80338E78 00335DB8 48 02 93 A9 */ bl func_80362220 +/* 80338E78 00335DB8 48 02 93 A9 */ bl _restgpr_27 /* 80338E7C 00335DBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80338E80 00335DC0 7C 08 03 A6 */ mtlr r0 /* 80338E84 00335DC4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphLoader/J3DMaterialFactory.s b/asm/J3DGraphLoader/J3DMaterialFactory.s index c2b7314894..3cdf703148 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory.s @@ -1675,7 +1675,7 @@ J3DMaterialFactory_NS_createLockedMaterial: /* 803317D8 0032E718 7C 08 02 A6 */ mflr r0 /* 803317DC 0032E71C 90 01 00 24 */ stw r0, 0x24(r1) /* 803317E0 0032E720 39 61 00 20 */ addi r11, r1, 0x20 -/* 803317E4 0032E724 48 03 09 F5 */ bl func_803621D8 +/* 803317E4 0032E724 48 03 09 F5 */ bl _savegpr_28 /* 803317E8 0032E728 7C 7C 1B 78 */ mr r28, r3 /* 803317EC 0032E72C 7C 9D 23 79 */ or. r29, r4, r4 /* 803317F0 0032E730 7C BE 2B 78 */ mr r30, r5 @@ -1845,7 +1845,7 @@ lbl_80331A40: lbl_80331A60: /* 80331A60 0032E9A0 7F A3 EB 78 */ mr r3, r29 /* 80331A64 0032E9A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80331A68 0032E9A8 48 03 07 BD */ bl func_80362224 +/* 80331A68 0032E9A8 48 03 07 BD */ bl _restgpr_28 /* 80331A6C 0032E9AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80331A70 0032E9B0 7C 08 03 A6 */ mtlr r0 /* 80331A74 0032E9B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1983,7 +1983,7 @@ J3DMaterialFactory_NS_calcSizePatchedMaterial: /* 80331C34 0032EB74 7C 08 02 A6 */ mflr r0 /* 80331C38 0032EB78 90 01 00 24 */ stw r0, 0x24(r1) /* 80331C3C 0032EB7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80331C40 0032EB80 48 03 05 99 */ bl func_803621D8 +/* 80331C40 0032EB80 48 03 05 99 */ bl _savegpr_28 /* 80331C44 0032EB84 7C 7C 1B 78 */ mr r28, r3 /* 80331C48 0032EB88 7C BD 2B 78 */ mr r29, r5 /* 80331C4C 0032EB8C 3B C0 00 00 */ li r30, 0 @@ -2029,7 +2029,7 @@ lbl_80331CDC: /* 80331CE0 0032EC20 42 00 FF E8 */ bdnz lbl_80331CC8 /* 80331CE4 0032EC24 7F C3 F3 78 */ mr r3, r30 /* 80331CE8 0032EC28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80331CEC 0032EC2C 48 03 05 39 */ bl func_80362224 +/* 80331CEC 0032EC2C 48 03 05 39 */ bl _restgpr_28 /* 80331CF0 0032EC30 80 01 00 24 */ lwz r0, 0x24(r1) /* 80331CF4 0032EC34 7C 08 03 A6 */ mtlr r0 /* 80331CF8 0032EC38 38 21 00 20 */ addi r1, r1, 0x20 @@ -2571,7 +2571,7 @@ J3DMaterialFactory_NS_newIndTexMtx: /* 80332410 0032F350 7C 08 02 A6 */ mflr r0 /* 80332414 0032F354 90 01 00 44 */ stw r0, 0x44(r1) /* 80332418 0032F358 39 61 00 40 */ addi r11, r1, 0x40 -/* 8033241C 0032F35C 48 02 FD BD */ bl func_803621D8 +/* 8033241C 0032F35C 48 02 FD BD */ bl _savegpr_28 /* 80332420 0032F360 7C 7C 1B 78 */ mr r28, r3 /* 80332424 0032F364 7C 9D 23 78 */ mr r29, r4 /* 80332428 0032F368 7C BE 2B 78 */ mr r30, r5 @@ -2607,7 +2607,7 @@ lbl_80332480: /* 80332498 0032F3D8 90 05 00 04 */ stw r0, 4(r5) lbl_8033249C: /* 8033249C 0032F3DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 803324A0 0032F3E0 48 02 FD 85 */ bl func_80362224 +/* 803324A0 0032F3E0 48 02 FD 85 */ bl _restgpr_28 /* 803324A4 0032F3E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 803324A8 0032F3E8 7C 08 03 A6 */ mtlr r0 /* 803324AC 0032F3EC 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphLoader/J3DModelLoader.s b/asm/J3DGraphLoader/J3DModelLoader.s index cc3098a041..10eb2a96b3 100644 --- a/asm/J3DGraphLoader/J3DModelLoader.s +++ b/asm/J3DGraphLoader/J3DModelLoader.s @@ -308,7 +308,7 @@ lbl_80334AA0: /* 80334AC0 00331A00 7C 08 02 A6 */ mflr r0 /* 80334AC4 00331A04 90 01 00 24 */ stw r0, 0x24(r1) /* 80334AC8 00331A08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80334ACC 00331A0C 48 02 D7 09 */ bl func_803621D4 +/* 80334ACC 00331A0C 48 02 D7 09 */ bl _savegpr_27 /* 80334AD0 00331A10 7C 7F 1B 78 */ mr r31, r3 /* 80334AD4 00331A14 7C 9E 23 78 */ mr r30, r4 /* 80334AD8 00331A18 38 60 00 20 */ li r3, 0x20 @@ -399,7 +399,7 @@ lbl_80334BFC: lbl_80334C04: /* 80334C04 00331B44 80 7F 00 08 */ lwz r3, 8(r31) /* 80334C08 00331B48 39 61 00 20 */ addi r11, r1, 0x20 -/* 80334C0C 00331B4C 48 02 D6 15 */ bl func_80362220 +/* 80334C0C 00331B4C 48 02 D6 15 */ bl _restgpr_27 /* 80334C10 00331B50 80 01 00 24 */ lwz r0, 0x24(r1) /* 80334C14 00331B54 7C 08 03 A6 */ mtlr r0 /* 80334C18 00331B58 38 21 00 20 */ addi r1, r1, 0x20 @@ -602,7 +602,7 @@ lbl_80334E50: /* 80334EE4 00331E24 7C 08 02 A6 */ mflr r0 /* 80334EE8 00331E28 90 01 00 24 */ stw r0, 0x24(r1) /* 80334EEC 00331E2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80334EF0 00331E30 48 02 D2 E5 */ bl func_803621D4 +/* 80334EF0 00331E30 48 02 D2 E5 */ bl _savegpr_27 /* 80334EF4 00331E34 7C 7D 1B 78 */ mr r29, r3 /* 80334EF8 00331E38 3B C0 00 00 */ li r30, 0 /* 80334EFC 00331E3C 48 00 01 20 */ b lbl_8033501C @@ -692,7 +692,7 @@ lbl_8033501C: /* 80335028 00331F68 7C 00 18 40 */ cmplw r0, r3 /* 8033502C 00331F6C 41 80 FE D4 */ blt lbl_80334F00 /* 80335030 00331F70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335034 00331F74 48 02 D1 ED */ bl func_80362220 +/* 80335034 00331F74 48 02 D1 ED */ bl _restgpr_27 /* 80335038 00331F78 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033503C 00331F7C 7C 08 03 A6 */ mtlr r0 /* 80335040 00331F80 38 21 00 20 */ addi r1, r1, 0x20 @@ -816,7 +816,7 @@ J3DModelLoader_NS_readVertex: /* 803351D4 00332114 7C 08 02 A6 */ mflr r0 /* 803351D8 00332118 90 01 00 24 */ stw r0, 0x24(r1) /* 803351DC 0033211C 39 61 00 20 */ addi r11, r1, 0x20 -/* 803351E0 00332120 48 02 CF F9 */ bl func_803621D8 +/* 803351E0 00332120 48 02 CF F9 */ bl _savegpr_28 /* 803351E4 00332124 7C 9E 23 78 */ mr r30, r4 /* 803351E8 00332128 80 63 00 04 */ lwz r3, 4(r3) /* 803351EC 0033212C 3B E3 00 88 */ addi r31, r3, 0x88 @@ -959,7 +959,7 @@ lbl_803353C0: /* 803353D4 00332314 90 1F 00 0C */ stw r0, 0xc(r31) lbl_803353D8: /* 803353D8 00332318 39 61 00 20 */ addi r11, r1, 0x20 -/* 803353DC 0033231C 48 02 CE 49 */ bl func_80362224 +/* 803353DC 0033231C 48 02 CE 49 */ bl _restgpr_28 /* 803353E0 00332320 80 01 00 24 */ lwz r0, 0x24(r1) /* 803353E4 00332324 7C 08 03 A6 */ mtlr r0 /* 803353E8 00332328 38 21 00 20 */ addi r1, r1, 0x20 @@ -1122,7 +1122,7 @@ lbl_803355E8: /* 80335618 00332558 7C 08 02 A6 */ mflr r0 /* 8033561C 0033255C 90 01 00 B4 */ stw r0, 0xb4(r1) /* 80335620 00332560 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80335624 00332564 48 02 CB B1 */ bl func_803621D4 +/* 80335624 00332564 48 02 CB B1 */ bl _savegpr_27 /* 80335628 00332568 7C 7D 1B 78 */ mr r29, r3 /* 8033562C 0033256C 7C 9B 23 78 */ mr r27, r4 /* 80335630 00332570 7C BE 2B 78 */ mr r30, r5 @@ -1292,7 +1292,7 @@ lbl_80335864: /* 80335874 003327B4 41 80 FF C8 */ blt lbl_8033583C lbl_80335878: /* 80335878 003327B8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8033587C 003327BC 48 02 C9 A5 */ bl func_80362220 +/* 8033587C 003327BC 48 02 C9 A5 */ bl _restgpr_27 /* 80335880 003327C0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80335884 003327C4 7C 08 03 A6 */ mtlr r0 /* 80335888 003327C8 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -1301,7 +1301,7 @@ lbl_80335878: /* 80335894 003327D4 7C 08 02 A6 */ mflr r0 /* 80335898 003327D8 90 01 00 94 */ stw r0, 0x94(r1) /* 8033589C 003327DC 39 61 00 90 */ addi r11, r1, 0x90 -/* 803358A0 003327E0 48 02 C9 35 */ bl func_803621D4 +/* 803358A0 003327E0 48 02 C9 35 */ bl _savegpr_27 /* 803358A4 003327E4 7C 7D 1B 78 */ mr r29, r3 /* 803358A8 003327E8 7C 9B 23 78 */ mr r27, r4 /* 803358AC 003327EC 7C BE 2B 78 */ mr r30, r5 @@ -1465,7 +1465,7 @@ lbl_80335AC8: /* 80335AD8 00332A18 41 80 FF DC */ blt lbl_80335AB4 lbl_80335ADC: /* 80335ADC 00332A1C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80335AE0 00332A20 48 02 C7 41 */ bl func_80362220 +/* 80335AE0 00332A20 48 02 C7 41 */ bl _restgpr_27 /* 80335AE4 00332A24 80 01 00 94 */ lwz r0, 0x94(r1) /* 80335AE8 00332A28 7C 08 03 A6 */ mtlr r0 /* 80335AEC 00332A2C 38 21 00 90 */ addi r1, r1, 0x90 @@ -1477,7 +1477,7 @@ J3DModelLoader_NS_readShape: /* 80335AF8 00332A38 7C 08 02 A6 */ mflr r0 /* 80335AFC 00332A3C 90 01 00 44 */ stw r0, 0x44(r1) /* 80335B00 00332A40 39 61 00 40 */ addi r11, r1, 0x40 -/* 80335B04 00332A44 48 02 C6 D1 */ bl func_803621D4 +/* 80335B04 00332A44 48 02 C6 D1 */ bl _savegpr_27 /* 80335B08 00332A48 7C 7B 1B 78 */ mr r27, r3 /* 80335B0C 00332A4C 7C 9C 23 78 */ mr r28, r4 /* 80335B10 00332A50 7C BD 2B 78 */ mr r29, r5 @@ -1547,7 +1547,7 @@ lbl_80335BF4: /* 80335BF8 00332B38 28 00 00 00 */ cmplwi r0, 0 /* 80335BFC 00332B3C 40 82 FF A4 */ bne lbl_80335BA0 /* 80335C00 00332B40 39 61 00 40 */ addi r11, r1, 0x40 -/* 80335C04 00332B44 48 02 C6 1D */ bl func_80362220 +/* 80335C04 00332B44 48 02 C6 1D */ bl _restgpr_27 /* 80335C08 00332B48 80 01 00 44 */ lwz r0, 0x44(r1) /* 80335C0C 00332B4C 7C 08 03 A6 */ mtlr r0 /* 80335C10 00332B50 38 21 00 40 */ addi r1, r1, 0x40 @@ -1559,7 +1559,7 @@ J3DModelLoader_NS_readTexture: /* 80335C1C 00332B5C 7C 08 02 A6 */ mflr r0 /* 80335C20 00332B60 90 01 00 24 */ stw r0, 0x24(r1) /* 80335C24 00332B64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335C28 00332B68 48 02 C5 AD */ bl func_803621D4 +/* 80335C28 00332B68 48 02 C5 AD */ bl _savegpr_27 /* 80335C2C 00332B6C 7C 7B 1B 78 */ mr r27, r3 /* 80335C30 00332B70 7C 9C 23 78 */ mr r28, r4 /* 80335C34 00332B74 A3 A4 00 08 */ lhz r29, 8(r4) @@ -1605,7 +1605,7 @@ lbl_80335CC4: /* 80335CC4 00332C04 80 9B 00 08 */ lwz r4, 8(r27) /* 80335CC8 00332C08 90 64 00 14 */ stw r3, 0x14(r4) /* 80335CCC 00332C0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335CD0 00332C10 48 02 C5 51 */ bl func_80362220 +/* 80335CD0 00332C10 48 02 C5 51 */ bl _restgpr_27 /* 80335CD4 00332C14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80335CD8 00332C18 7C 08 03 A6 */ mtlr r0 /* 80335CDC 00332C1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1614,7 +1614,7 @@ lbl_80335CC4: /* 80335CE8 00332C28 7C 08 02 A6 */ mflr r0 /* 80335CEC 00332C2C 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80335CF0 00332C30 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80335CF4 00332C34 48 02 C4 E5 */ bl func_803621D8 +/* 80335CF4 00332C34 48 02 C4 E5 */ bl _savegpr_28 /* 80335CF8 00332C38 7C 7E 1B 78 */ mr r30, r3 /* 80335CFC 00332C3C 7C 9C 23 78 */ mr r28, r4 /* 80335D00 00332C40 7C BF 2B 78 */ mr r31, r5 @@ -1691,7 +1691,7 @@ lbl_80335DF4: /* 80335E00 00332D40 7C 03 00 40 */ cmplw r3, r0 /* 80335E04 00332D44 41 80 FF CC */ blt lbl_80335DD0 /* 80335E08 00332D48 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80335E0C 00332D4C 48 02 C4 19 */ bl func_80362224 +/* 80335E0C 00332D4C 48 02 C4 19 */ bl _restgpr_28 /* 80335E10 00332D50 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80335E14 00332D54 7C 08 03 A6 */ mtlr r0 /* 80335E18 00332D58 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -1700,7 +1700,7 @@ lbl_80335DF4: /* 80335E24 00332D64 7C 08 02 A6 */ mflr r0 /* 80335E28 00332D68 90 01 00 94 */ stw r0, 0x94(r1) /* 80335E2C 00332D6C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80335E30 00332D70 48 02 C3 A9 */ bl func_803621D8 +/* 80335E30 00332D70 48 02 C3 A9 */ bl _savegpr_28 /* 80335E34 00332D74 7C 7E 1B 78 */ mr r30, r3 /* 80335E38 00332D78 7C 9C 23 78 */ mr r28, r4 /* 80335E3C 00332D7C 7C BF 2B 78 */ mr r31, r5 @@ -1777,7 +1777,7 @@ lbl_80335F30: /* 80335F3C 00332E7C 7C 03 00 40 */ cmplw r3, r0 /* 80335F40 00332E80 41 80 FF C8 */ blt lbl_80335F08 /* 80335F44 00332E84 39 61 00 90 */ addi r11, r1, 0x90 -/* 80335F48 00332E88 48 02 C2 DD */ bl func_80362224 +/* 80335F48 00332E88 48 02 C2 DD */ bl _restgpr_28 /* 80335F4C 00332E8C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80335F50 00332E90 7C 08 03 A6 */ mtlr r0 /* 80335F54 00332E94 38 21 00 90 */ addi r1, r1, 0x90 @@ -1789,7 +1789,7 @@ J3DModelLoader_NS_readTextureTable: /* 80335F60 00332EA0 7C 08 02 A6 */ mflr r0 /* 80335F64 00332EA4 90 01 00 24 */ stw r0, 0x24(r1) /* 80335F68 00332EA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335F6C 00332EAC 48 02 C2 69 */ bl func_803621D4 +/* 80335F6C 00332EAC 48 02 C2 69 */ bl _savegpr_27 /* 80335F70 00332EB0 7C 7B 1B 78 */ mr r27, r3 /* 80335F74 00332EB4 7C 9C 23 78 */ mr r28, r4 /* 80335F78 00332EB8 A3 A4 00 08 */ lhz r29, 8(r4) @@ -1835,7 +1835,7 @@ lbl_80336008: /* 80336008 00332F48 80 9B 00 08 */ lwz r4, 8(r27) /* 8033600C 00332F4C 90 64 00 14 */ stw r3, 0x14(r4) /* 80336010 00332F50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80336014 00332F54 48 02 C2 0D */ bl func_80362220 +/* 80336014 00332F54 48 02 C2 0D */ bl _restgpr_27 /* 80336018 00332F58 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033601C 00332F5C 7C 08 03 A6 */ mtlr r0 /* 80336020 00332F60 38 21 00 20 */ addi r1, r1, 0x20 @@ -1847,7 +1847,7 @@ J3DModelLoader_NS_readPatchedMaterial: /* 8033602C 00332F6C 7C 08 02 A6 */ mflr r0 /* 80336030 00332F70 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80336034 00332F74 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336038 00332F78 48 02 C1 A1 */ bl func_803621D8 +/* 80336038 00332F78 48 02 C1 A1 */ bl _savegpr_28 /* 8033603C 00332F7C 7C 7D 1B 78 */ mr r29, r3 /* 80336040 00332F80 7C 9C 23 78 */ mr r28, r4 /* 80336044 00332F84 7C BE 2B 78 */ mr r30, r5 @@ -1923,7 +1923,7 @@ lbl_8033613C: /* 80336148 00333088 7C 04 00 40 */ cmplw r4, r0 /* 8033614C 0033308C 41 80 FF 9C */ blt lbl_803360E8 /* 80336150 00333090 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336154 00333094 48 02 C0 D1 */ bl func_80362224 +/* 80336154 00333094 48 02 C0 D1 */ bl _restgpr_28 /* 80336158 00333098 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8033615C 0033309C 7C 08 03 A6 */ mtlr r0 /* 80336160 003330A0 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -1935,7 +1935,7 @@ J3DModelLoader_NS_readMaterialDL: /* 8033616C 003330AC 7C 08 02 A6 */ mflr r0 /* 80336170 003330B0 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80336174 003330B4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336178 003330B8 48 02 C0 61 */ bl func_803621D8 +/* 80336178 003330B8 48 02 C0 61 */ bl _savegpr_28 /* 8033617C 003330BC 7C 7E 1B 78 */ mr r30, r3 /* 80336180 003330C0 7C 9C 23 78 */ mr r28, r4 /* 80336184 003330C4 7C BF 2B 78 */ mr r31, r5 @@ -2046,7 +2046,7 @@ lbl_803362F0: /* 80336300 00333240 41 80 FF C0 */ blt lbl_803362C0 lbl_80336304: /* 80336304 00333244 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336308 00333248 48 02 BF 1D */ bl func_80362224 +/* 80336308 00333248 48 02 BF 1D */ bl _restgpr_28 /* 8033630C 0033324C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80336310 00333250 7C 08 03 A6 */ mtlr r0 /* 80336314 00333254 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s index 8ebaab1b6c..40fca20374 100644 --- a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s +++ b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s @@ -458,7 +458,7 @@ J3DModelLoader_NS_calcSizeDraw: /* 80336DB8 00333CF8 7C 08 02 A6 */ mflr r0 /* 80336DBC 00333CFC 90 01 00 B4 */ stw r0, 0xb4(r1) /* 80336DC0 00333D00 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80336DC4 00333D04 48 02 B4 11 */ bl func_803621D4 +/* 80336DC4 00333D04 48 02 B4 11 */ bl _savegpr_27 /* 80336DC8 00333D08 7C 9C 23 78 */ mr r28, r4 /* 80336DCC 00333D0C 7C BB 2B 78 */ mr r27, r5 /* 80336DD0 00333D10 3B E0 00 00 */ li r31, 0 @@ -515,7 +515,7 @@ lbl_80336E7C: /* 80336E80 00333DC0 41 80 FF DC */ blt lbl_80336E5C /* 80336E84 00333DC4 7F E3 FB 78 */ mr r3, r31 /* 80336E88 00333DC8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80336E8C 00333DCC 48 02 B3 95 */ bl func_80362220 +/* 80336E8C 00333DCC 48 02 B3 95 */ bl _restgpr_27 /* 80336E90 00333DD0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80336E94 00333DD4 7C 08 03 A6 */ mtlr r0 /* 80336E98 00333DD8 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -527,7 +527,7 @@ J3DModelLoader_NS_calcSizeShape: /* 80336EA4 00333DE4 7C 08 02 A6 */ mflr r0 /* 80336EA8 00333DE8 90 01 00 44 */ stw r0, 0x44(r1) /* 80336EAC 00333DEC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80336EB0 00333DF0 48 02 B3 29 */ bl func_803621D8 +/* 80336EB0 00333DF0 48 02 B3 29 */ bl _savegpr_28 /* 80336EB4 00333DF4 7C 7C 1B 78 */ mr r28, r3 /* 80336EB8 00333DF8 7C 9E 23 78 */ mr r30, r4 /* 80336EBC 00333DFC 7C BD 2B 78 */ mr r29, r5 @@ -563,7 +563,7 @@ lbl_80336F1C: /* 80336F24 00333E64 40 82 FF D8 */ bne lbl_80336EFC /* 80336F28 00333E68 7F E3 FB 78 */ mr r3, r31 /* 80336F2C 00333E6C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80336F30 00333E70 48 02 B2 F5 */ bl func_80362224 +/* 80336F30 00333E70 48 02 B2 F5 */ bl _restgpr_28 /* 80336F34 00333E74 80 01 00 44 */ lwz r0, 0x44(r1) /* 80336F38 00333E78 7C 08 03 A6 */ mtlr r0 /* 80336F3C 00333E7C 38 21 00 40 */ addi r1, r1, 0x40 @@ -583,7 +583,7 @@ lbl_80336F58: /* 80336F64 00333EA4 7C 08 02 A6 */ mflr r0 /* 80336F68 00333EA8 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80336F6C 00333EAC 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336F70 00333EB0 48 02 B2 69 */ bl func_803621D8 +/* 80336F70 00333EB0 48 02 B2 69 */ bl _savegpr_28 /* 80336F74 00333EB4 7C 9D 23 78 */ mr r29, r4 /* 80336F78 00333EB8 7C BC 2B 78 */ mr r28, r5 /* 80336F7C 00333EBC 3B E0 00 00 */ li r31, 0 @@ -613,7 +613,7 @@ lbl_80336FC8: /* 80336FD0 00333F10 41 80 FF DC */ blt lbl_80336FAC /* 80336FD4 00333F14 7F E3 FB 78 */ mr r3, r31 /* 80336FD8 00333F18 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80336FDC 00333F1C 48 02 B2 49 */ bl func_80362224 +/* 80336FDC 00333F1C 48 02 B2 49 */ bl _restgpr_28 /* 80336FE0 00333F20 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80336FE4 00333F24 7C 08 03 A6 */ mtlr r0 /* 80336FE8 00333F28 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -636,7 +636,7 @@ J3DModelLoader_NS_calcSizePatchedMaterial: /* 80337014 00333F54 7C 08 02 A6 */ mflr r0 /* 80337018 00333F58 90 01 00 A4 */ stw r0, 0xa4(r1) /* 8033701C 00333F5C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80337020 00333F60 48 02 B1 B9 */ bl func_803621D8 +/* 80337020 00333F60 48 02 B1 B9 */ bl _savegpr_28 /* 80337024 00333F64 7C 9D 23 78 */ mr r29, r4 /* 80337028 00333F68 7C BC 2B 78 */ mr r28, r5 /* 8033702C 00333F6C 3B E0 00 00 */ li r31, 0 @@ -666,7 +666,7 @@ lbl_80337078: /* 80337080 00333FC0 41 80 FF DC */ blt lbl_8033705C /* 80337084 00333FC4 7F E3 FB 78 */ mr r3, r31 /* 80337088 00333FC8 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8033708C 00333FCC 48 02 B1 99 */ bl func_80362224 +/* 8033708C 00333FCC 48 02 B1 99 */ bl _restgpr_28 /* 80337090 00333FD0 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80337094 00333FD4 7C 08 03 A6 */ mtlr r0 /* 80337098 00333FD8 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -678,7 +678,7 @@ J3DModelLoader_NS_calcSizeMaterialDL: /* 803370A4 00333FE4 7C 08 02 A6 */ mflr r0 /* 803370A8 00333FE8 90 01 00 B4 */ stw r0, 0xb4(r1) /* 803370AC 00333FEC 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 803370B0 00333FF0 48 02 B1 25 */ bl func_803621D4 +/* 803370B0 00333FF0 48 02 B1 25 */ bl _savegpr_27 /* 803370B4 00333FF4 7C 7B 1B 78 */ mr r27, r3 /* 803370B8 00333FF8 7C 9C 23 78 */ mr r28, r4 /* 803370BC 00333FFC 7C BF 2B 78 */ mr r31, r5 @@ -730,7 +730,7 @@ lbl_80337150: lbl_8033715C: /* 8033715C 0033409C 7F C3 F3 78 */ mr r3, r30 /* 80337160 003340A0 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80337164 003340A4 48 02 B0 BD */ bl func_80362220 +/* 80337164 003340A4 48 02 B0 BD */ bl _restgpr_27 /* 80337168 003340A8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8033716C 003340AC 7C 08 03 A6 */ mtlr r0 /* 80337170 003340B0 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/JAudio2/JAISe.s b/asm/JAudio2/JAISe.s index 871c92155a..083a79d032 100644 --- a/asm/JAudio2/JAISe.s +++ b/asm/JAudio2/JAISe.s @@ -9,7 +9,7 @@ JAISe: /* 8029F040 0029BF80 7C 08 02 A6 */ mflr r0 /* 8029F044 0029BF84 90 01 00 24 */ stw r0, 0x24(r1) /* 8029F048 0029BF88 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029F04C 0029BF8C 48 0C 31 8D */ bl func_803621D8 +/* 8029F04C 0029BF8C 48 0C 31 8D */ bl _savegpr_28 /* 8029F050 0029BF90 7C 7C 1B 78 */ mr r28, r3 /* 8029F054 0029BF94 7C 9D 23 78 */ mr r29, r4 /* 8029F058 0029BF98 7C BE 2B 78 */ mr r30, r5 @@ -47,7 +47,7 @@ JAISe: /* 8029F0D8 0029C018 93 FC 00 AC */ stw r31, 0xac(r28) /* 8029F0DC 0029C01C 7F 83 E3 78 */ mr r3, r28 /* 8029F0E0 0029C020 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029F0E4 0029C024 48 0C 31 41 */ bl func_80362224 +/* 8029F0E4 0029C024 48 0C 31 41 */ bl _restgpr_28 /* 8029F0E8 0029C028 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029F0EC 0029C02C 7C 08 03 A6 */ mtlr r0 /* 8029F0F0 0029C030 38 21 00 20 */ addi r1, r1, 0x20 @@ -209,7 +209,7 @@ JAISe_NS_JAISeCategoryMgr_mixOut_: /* 8029F308 0029C248 7C 08 02 A6 */ mflr r0 /* 8029F30C 0029C24C 90 01 00 24 */ stw r0, 0x24(r1) /* 8029F310 0029C250 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029F314 0029C254 48 0C 2E C5 */ bl func_803621D8 +/* 8029F314 0029C254 48 0C 2E C5 */ bl _savegpr_28 /* 8029F318 0029C258 7C 7E 1B 78 */ mr r30, r3 /* 8029F31C 0029C25C 7C 9C 23 78 */ mr r28, r4 /* 8029F320 0029C260 7C BD 2B 78 */ mr r29, r5 @@ -329,7 +329,7 @@ lbl_8029F48C: /* 8029F4B0 0029C3F0 98 1E 00 2F */ stb r0, 0x2f(r30) lbl_8029F4B4: /* 8029F4B4 0029C3F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029F4B8 0029C3F8 48 0C 2D 6D */ bl func_80362224 +/* 8029F4B8 0029C3F8 48 0C 2D 6D */ bl _restgpr_28 /* 8029F4BC 0029C3FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029F4C0 0029C400 7C 08 03 A6 */ mtlr r0 /* 8029F4C4 0029C404 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index 63246396cb..f183725619 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -203,7 +203,7 @@ JAISeCategoryMgr_NS_JAISeMgr_freeDeadSe_: /* 8029FB34 0029CA74 7C 08 02 A6 */ mflr r0 /* 8029FB38 0029CA78 90 01 00 24 */ stw r0, 0x24(r1) /* 8029FB3C 0029CA7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029FB40 0029CA80 48 0C 26 99 */ bl func_803621D8 +/* 8029FB40 0029CA80 48 0C 26 99 */ bl _savegpr_28 /* 8029FB44 0029CA84 7C 7C 1B 78 */ mr r28, r3 /* 8029FB48 0029CA88 83 C3 00 58 */ lwz r30, 0x58(r3) /* 8029FB4C 0029CA8C 3C 60 80 3D */ lis r3, lbl_803C9858@ha @@ -267,7 +267,7 @@ lbl_8029FC14: /* 8029FC14 0029CB54 28 1E 00 00 */ cmplwi r30, 0 /* 8029FC18 0029CB58 40 82 FF 44 */ bne lbl_8029FB5C /* 8029FC1C 0029CB5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029FC20 0029CB60 48 0C 26 05 */ bl func_80362224 +/* 8029FC20 0029CB60 48 0C 26 05 */ bl _restgpr_28 /* 8029FC24 0029CB64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029FC28 0029CB68 7C 08 03 A6 */ mtlr r0 /* 8029FC2C 0029CB6C 38 21 00 20 */ addi r1, r1, 0x20 @@ -674,7 +674,7 @@ lbl_802A0094: /* 802A016C 0029D0AC 7C 08 02 A6 */ mflr r0 /* 802A0170 0029D0B0 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0174 0029D0B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0178 0029D0B8 48 0C 20 61 */ bl func_803621D8 +/* 802A0178 0029D0B8 48 0C 20 61 */ bl _savegpr_28 /* 802A017C 0029D0BC 7C 7C 1B 78 */ mr r28, r3 /* 802A0180 0029D0C0 7C 9D 23 78 */ mr r29, r4 /* 802A0184 0029D0C4 3B C0 00 00 */ li r30, 0 @@ -696,7 +696,7 @@ lbl_802A01AC: /* 802A01BC 0029D0FC 38 60 00 00 */ li r3, 0 lbl_802A01C0: /* 802A01C0 0029D100 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A01C4 0029D104 48 0C 20 61 */ bl func_80362224 +/* 802A01C4 0029D104 48 0C 20 61 */ bl _restgpr_28 /* 802A01C8 0029D108 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A01CC 0029D10C 7C 08 03 A6 */ mtlr r0 /* 802A01D0 0029D110 38 21 00 20 */ addi r1, r1, 0x20 @@ -705,7 +705,7 @@ lbl_802A01C0: /* 802A01DC 0029D11C 7C 08 02 A6 */ mflr r0 /* 802A01E0 0029D120 90 01 00 24 */ stw r0, 0x24(r1) /* 802A01E4 0029D124 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A01E8 0029D128 48 0C 1F ED */ bl func_803621D4 +/* 802A01E8 0029D128 48 0C 1F ED */ bl _savegpr_27 /* 802A01EC 0029D12C 7C 7B 1B 78 */ mr r27, r3 /* 802A01F0 0029D130 7C 9C 23 78 */ mr r28, r4 /* 802A01F4 0029D134 3B C0 00 00 */ li r30, 0 @@ -737,7 +737,7 @@ lbl_802A0234: /* 802A024C 0029D18C 7C 60 19 10 */ subfe r3, r0, r3 lbl_802A0250: /* 802A0250 0029D190 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0254 0029D194 48 0C 1F CD */ bl func_80362220 +/* 802A0254 0029D194 48 0C 1F CD */ bl _restgpr_27 /* 802A0258 0029D198 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A025C 0029D19C 7C 08 03 A6 */ mtlr r0 /* 802A0260 0029D1A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -792,7 +792,7 @@ JAISeMgr_NS_stopSoundID: /* 802A02F8 0029D238 7C 08 02 A6 */ mflr r0 /* 802A02FC 0029D23C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0300 0029D240 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0304 0029D244 48 0C 1E D5 */ bl func_803621D8 +/* 802A0304 0029D244 48 0C 1E D5 */ bl _savegpr_28 /* 802A0308 0029D248 7C 7C 1B 78 */ mr r28, r3 /* 802A030C 0029D24C 7C 9D 23 78 */ mr r29, r4 /* 802A0310 0029D250 3B C0 00 00 */ li r30, 0 @@ -809,7 +809,7 @@ lbl_802A0318: /* 802A0338 0029D278 3B FF 00 6C */ addi r31, r31, 0x6c /* 802A033C 0029D27C 41 80 FF DC */ blt lbl_802A0318 /* 802A0340 0029D280 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0344 0029D284 48 0C 1E E1 */ bl func_80362224 +/* 802A0344 0029D284 48 0C 1E E1 */ bl _restgpr_28 /* 802A0348 0029D288 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A034C 0029D28C 7C 08 03 A6 */ mtlr r0 /* 802A0350 0029D290 38 21 00 20 */ addi r1, r1, 0x20 @@ -910,7 +910,7 @@ JAISeMgr_NS_newSe_: /* 802A0488 0029D3C8 7C 08 02 A6 */ mflr r0 /* 802A048C 0029D3CC 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0490 0029D3D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0494 0029D3D4 48 0C 1D 45 */ bl func_803621D8 +/* 802A0494 0029D3D4 48 0C 1D 45 */ bl _savegpr_28 /* 802A0498 0029D3D8 7C 7D 1B 78 */ mr r29, r3 /* 802A049C 0029D3DC 7C BE 2B 78 */ mr r30, r5 /* 802A04A0 0029D3E0 2C 04 00 00 */ cmpwi r4, 0 @@ -969,7 +969,7 @@ lbl_802A054C: /* 802A0558 0029D498 7F 83 E3 78 */ mr r3, r28 lbl_802A055C: /* 802A055C 0029D49C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0560 0029D4A0 48 0C 1C C5 */ bl func_80362224 +/* 802A0560 0029D4A0 48 0C 1C C5 */ bl _restgpr_28 /* 802A0564 0029D4A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A0568 0029D4A8 7C 08 03 A6 */ mtlr r0 /* 802A056C 0029D4AC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAISeq.s b/asm/JAudio2/JAISeq.s index 9145a4de19..e03fb66655 100644 --- a/asm/JAudio2/JAISeq.s +++ b/asm/JAudio2/JAISeq.s @@ -21,7 +21,7 @@ JAISeq: /* 802A0A90 0029D9D0 7C 08 02 A6 */ mflr r0 /* 802A0A94 0029D9D4 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0A98 0029D9D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0A9C 0029D9DC 48 0C 17 3D */ bl func_803621D8 +/* 802A0A9C 0029D9DC 48 0C 17 3D */ bl _savegpr_28 /* 802A0AA0 0029D9E0 7C 7D 1B 78 */ mr r29, r3 /* 802A0AA4 0029D9E4 7C 9E 23 78 */ mr r30, r4 /* 802A0AA8 0029D9E8 7C BF 2B 78 */ mr r31, r5 @@ -67,7 +67,7 @@ lbl_802A0B38: /* 802A0B44 0029DA84 42 00 FF F4 */ bdnz lbl_802A0B38 /* 802A0B48 0029DA88 7F A3 EB 78 */ mr r3, r29 /* 802A0B4C 0029DA8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0B50 0029DA90 48 0C 16 D5 */ bl func_80362224 +/* 802A0B50 0029DA90 48 0C 16 D5 */ bl _restgpr_28 /* 802A0B54 0029DA94 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A0B58 0029DA98 7C 08 03 A6 */ mtlr r0 /* 802A0B5C 0029DA9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -79,7 +79,7 @@ JAISeq_NS_JAISeqMgr_startID_: /* 802A0B68 0029DAA8 7C 08 02 A6 */ mflr r0 /* 802A0B6C 0029DAAC 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0B70 0029DAB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0B74 0029DAB4 48 0C 16 65 */ bl func_803621D8 +/* 802A0B74 0029DAB4 48 0C 16 65 */ bl _savegpr_28 /* 802A0B78 0029DAB8 7C 7C 1B 78 */ mr r28, r3 /* 802A0B7C 0029DABC 7C 9D 23 78 */ mr r29, r4 /* 802A0B80 0029DAC0 7C BE 2B 78 */ mr r30, r5 @@ -112,7 +112,7 @@ lbl_802A0BE4: /* 802A0BE8 0029DB28 90 1C 03 A8 */ stw r0, 0x3a8(r28) lbl_802A0BEC: /* 802A0BEC 0029DB2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0BF0 0029DB30 48 0C 16 35 */ bl func_80362224 +/* 802A0BF0 0029DB30 48 0C 16 35 */ bl _restgpr_28 /* 802A0BF4 0029DB34 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A0BF8 0029DB38 7C 08 03 A6 */ mtlr r0 /* 802A0BFC 0029DB3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -528,7 +528,7 @@ JAISeq_NS_die_: /* 802A1184 0029E0C4 7C 08 02 A6 */ mflr r0 /* 802A1188 0029E0C8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A118C 0029E0CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1190 0029E0D0 48 0C 10 45 */ bl func_803621D4 +/* 802A1190 0029E0D0 48 0C 10 45 */ bl _savegpr_27 /* 802A1194 0029E0D4 7C 7D 1B 78 */ mr r29, r3 /* 802A1198 0029E0D8 3B C0 00 00 */ li r30, 0 /* 802A119C 0029E0DC 3B 80 00 00 */ li r28, 0 @@ -583,7 +583,7 @@ lbl_802A1240: /* 802A1248 0029E188 7F A3 EB 78 */ mr r3, r29 /* 802A124C 0029E18C 48 00 13 A5 */ bl JAISound_NS_die_JAISound_ /* 802A1250 0029E190 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1254 0029E194 48 0C 0F CD */ bl func_80362220 +/* 802A1254 0029E194 48 0C 0F CD */ bl _restgpr_27 /* 802A1258 0029E198 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A125C 0029E19C 7C 08 03 A6 */ mtlr r0 /* 802A1260 0029E1A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -656,7 +656,7 @@ JAISeq_NS_mixOut_: /* 802A134C 0029E28C 7C 08 02 A6 */ mflr r0 /* 802A1350 0029E290 90 01 00 34 */ stw r0, 0x34(r1) /* 802A1354 0029E294 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A1358 0029E298 48 0C 0E 81 */ bl func_803621D8 +/* 802A1358 0029E298 48 0C 0E 81 */ bl _savegpr_28 /* 802A135C 0029E29C 7C 7F 1B 78 */ mr r31, r3 /* 802A1360 0029E2A0 7C 9D 23 78 */ mr r29, r4 /* 802A1364 0029E2A4 7C BC 2B 78 */ mr r28, r5 @@ -767,7 +767,7 @@ lbl_802A14D4: /* 802A14E0 0029E420 41 80 FF C8 */ blt lbl_802A14A8 lbl_802A14E4: /* 802A14E4 0029E424 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A14E8 0029E428 48 0C 0D 3D */ bl func_80362224 +/* 802A14E8 0029E428 48 0C 0D 3D */ bl _restgpr_28 /* 802A14EC 0029E42C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A14F0 0029E430 7C 08 03 A6 */ mtlr r0 /* 802A14F4 0029E434 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JAIStream.s b/asm/JAudio2/JAIStream.s index ef71a81ee3..cba4de101c 100644 --- a/asm/JAudio2/JAIStream.s +++ b/asm/JAudio2/JAIStream.s @@ -313,7 +313,7 @@ JAIStream_NS_JAIStreamMgr_mixOut_: /* 802A34E8 002A0428 7C 08 02 A6 */ mflr r0 /* 802A34EC 002A042C 90 01 00 44 */ stw r0, 0x44(r1) /* 802A34F0 002A0430 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A34F4 002A0434 48 0B EC E1 */ bl func_803621D4 +/* 802A34F4 002A0434 48 0B EC E1 */ bl _savegpr_27 /* 802A34F8 002A0438 7C 7E 1B 78 */ mr r30, r3 /* 802A34FC 002A043C 7C BF 2B 78 */ mr r31, r5 /* 802A3500 002A0440 C0 02 BD F0 */ lfs f0, lbl_804557F0-_SDA2_BASE_(r2) @@ -462,7 +462,7 @@ lbl_802A36E8: /* 802A3704 002A0644 9B BE 02 C4 */ stb r29, 0x2c4(r30) lbl_802A3708: /* 802A3708 002A0648 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A370C 002A064C 48 0B EB 15 */ bl func_80362220 +/* 802A370C 002A064C 48 0B EB 15 */ bl _restgpr_27 /* 802A3710 002A0650 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A3714 002A0654 7C 08 03 A6 */ mtlr r0 /* 802A3718 002A0658 38 21 00 40 */ addi r1, r1, 0x40 @@ -474,7 +474,7 @@ JAIStream_NS_die_JAIStream_: /* 802A3724 002A0664 7C 08 02 A6 */ mflr r0 /* 802A3728 002A0668 90 01 00 24 */ stw r0, 0x24(r1) /* 802A372C 002A066C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A3730 002A0670 48 0B EA A5 */ bl func_803621D4 +/* 802A3730 002A0670 48 0B EA A5 */ bl _savegpr_27 /* 802A3734 002A0674 7C 7D 1B 78 */ mr r29, r3 /* 802A3738 002A0678 4B FF EE B9 */ bl JAISound_NS_die_JAISound_ /* 802A373C 002A067C 3B C0 00 00 */ li r30, 0 @@ -526,7 +526,7 @@ lbl_802A37AC: /* 802A37E0 002A0720 90 1D 02 BC */ stw r0, 0x2bc(r29) lbl_802A37E4: /* 802A37E4 002A0724 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A37E8 002A0728 48 0B EA 39 */ bl func_80362220 +/* 802A37E8 002A0728 48 0B EA 39 */ bl _restgpr_27 /* 802A37EC 002A072C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A37F0 002A0730 7C 08 03 A6 */ mtlr r0 /* 802A37F4 002A0734 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASAiCtrl.s b/asm/JAudio2/JASAiCtrl.s index 8b1d880fd8..bfecd9a7c7 100644 --- a/asm/JAudio2/JASAiCtrl.s +++ b/asm/JAudio2/JASAiCtrl.s @@ -482,7 +482,7 @@ JASDriver_NS_getFrameSamples: /* 8029CA14 00299954 7C 08 02 A6 */ mflr r0 /* 8029CA18 00299958 90 01 00 24 */ stw r0, 0x24(r1) /* 8029CA1C 0029995C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CA20 00299960 48 0C 57 B9 */ bl func_803621D8 +/* 8029CA20 00299960 48 0C 57 B9 */ bl _savegpr_28 /* 8029CA24 00299964 7C 7E 1B 78 */ mr r30, r3 /* 8029CA28 00299968 7C 9C 23 78 */ mr r28, r4 /* 8029CA2C 0029996C 7C BD 2B 78 */ mr r29, r5 @@ -520,7 +520,7 @@ lbl_8029CAA0: /* 8029CAA4 002999E4 40 82 FF C8 */ bne lbl_8029CA6C lbl_8029CAA8: /* 8029CAA8 002999E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CAAC 002999EC 48 0C 57 79 */ bl func_80362224 +/* 8029CAAC 002999EC 48 0C 57 79 */ bl _restgpr_28 /* 8029CAB0 002999F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029CAB4 002999F4 7C 08 03 A6 */ mtlr r0 /* 8029CAB8 002999F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -529,7 +529,7 @@ lbl_8029CAA8: /* 8029CAC4 00299A04 7C 08 02 A6 */ mflr r0 /* 8029CAC8 00299A08 90 01 00 24 */ stw r0, 0x24(r1) /* 8029CACC 00299A0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CAD0 00299A10 48 0C 57 09 */ bl func_803621D8 +/* 8029CAD0 00299A10 48 0C 57 09 */ bl _savegpr_28 /* 8029CAD4 00299A14 7C 7E 1B 78 */ mr r30, r3 /* 8029CAD8 00299A18 7C 9C 23 78 */ mr r28, r4 /* 8029CADC 00299A1C 7C BD 2B 78 */ mr r29, r5 @@ -567,7 +567,7 @@ lbl_8029CB50: /* 8029CB54 00299A94 40 82 FF C8 */ bne lbl_8029CB1C lbl_8029CB58: /* 8029CB58 00299A98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CB5C 00299A9C 48 0C 56 C9 */ bl func_80362224 +/* 8029CB5C 00299A9C 48 0C 56 C9 */ bl _restgpr_28 /* 8029CB60 00299AA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029CB64 00299AA4 7C 08 03 A6 */ mtlr r0 /* 8029CB68 00299AA8 38 21 00 20 */ addi r1, r1, 0x20 @@ -576,7 +576,7 @@ lbl_8029CB58: /* 8029CB74 00299AB4 7C 08 02 A6 */ mflr r0 /* 8029CB78 00299AB8 90 01 00 24 */ stw r0, 0x24(r1) /* 8029CB7C 00299ABC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CB80 00299AC0 48 0C 56 55 */ bl func_803621D4 +/* 8029CB80 00299AC0 48 0C 56 55 */ bl _savegpr_27 /* 8029CB84 00299AC4 7C 7D 1B 78 */ mr r29, r3 /* 8029CB88 00299AC8 7C 9B 23 78 */ mr r27, r4 /* 8029CB8C 00299ACC 7C BC 2B 78 */ mr r28, r5 @@ -626,7 +626,7 @@ lbl_8029CC28: /* 8029CC34 00299B74 4B FF 42 F1 */ bl JASProbe_NS_stop_X1_ lbl_8029CC38: /* 8029CC38 00299B78 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CC3C 00299B7C 48 0C 55 E5 */ bl func_80362220 +/* 8029CC3C 00299B7C 48 0C 55 E5 */ bl _restgpr_27 /* 8029CC40 00299B80 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029CC44 00299B84 7C 08 03 A6 */ mtlr r0 /* 8029CC48 00299B88 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index b3adc05dd6..45202be144 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -1566,7 +1566,7 @@ JASAramStream_NS_channelStop: /* 80297874 002947B4 7C 08 02 A6 */ mflr r0 /* 80297878 002947B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8029787C 002947BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80297880 002947C0 48 0C A9 59 */ bl func_803621D8 +/* 80297880 002947C0 48 0C A9 59 */ bl _savegpr_28 /* 80297884 002947C4 7C 7C 1B 78 */ mr r28, r3 /* 80297888 002947C8 7C 9D 23 78 */ mr r29, r4 /* 8029788C 002947CC 3B C0 00 00 */ li r30, 0 @@ -1587,7 +1587,7 @@ lbl_802978B8: /* 802978BC 002947FC 7C 1E 00 00 */ cmpw r30, r0 /* 802978C0 00294800 41 80 FF D8 */ blt lbl_80297898 /* 802978C4 00294804 39 61 00 20 */ addi r11, r1, 0x20 -/* 802978C8 00294808 48 0C A9 5D */ bl func_80362224 +/* 802978C8 00294808 48 0C A9 5D */ bl _restgpr_28 /* 802978CC 0029480C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802978D0 00294810 7C 08 03 A6 */ mtlr r0 /* 802978D4 00294814 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASBNKParser.s b/asm/JAudio2/JASBNKParser.s index 2ded6e919f..60de498dac 100644 --- a/asm/JAudio2/JASBNKParser.s +++ b/asm/JAudio2/JASBNKParser.s @@ -20,7 +20,7 @@ JASBNKParser_NS_createBasicBank: /* 8029955C 0029649C 7C 08 02 A6 */ mflr r0 /* 80299560 002964A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80299564 002964A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80299568 002964A8 48 0C 8C 71 */ bl func_803621D8 +/* 80299568 002964A8 48 0C 8C 71 */ bl _savegpr_28 /* 8029956C 002964AC 7C 7C 1B 78 */ mr r28, r3 /* 80299570 002964B0 7C 9D 23 79 */ or. r29, r4, r4 /* 80299574 002964B4 40 82 00 08 */ bne lbl_8029957C @@ -57,7 +57,7 @@ lbl_802995CC: /* 802995E0 00296520 90 0D 8D 08 */ stw r0, lbl_80451288-_SDA_BASE_(r13) /* 802995E4 00296524 7F C3 F3 78 */ mr r3, r30 /* 802995E8 00296528 39 61 00 20 */ addi r11, r1, 0x20 -/* 802995EC 0029652C 48 0C 8C 39 */ bl func_80362224 +/* 802995EC 0029652C 48 0C 8C 39 */ bl _restgpr_28 /* 802995F0 00296530 80 01 00 24 */ lwz r0, 0x24(r1) /* 802995F4 00296534 7C 08 03 A6 */ mtlr r0 /* 802995F8 00296538 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASCallback.s b/asm/JAudio2/JASCallback.s index 49a1436a27..26e2acfa55 100644 --- a/asm/JAudio2/JASCallback.s +++ b/asm/JAudio2/JASCallback.s @@ -49,7 +49,7 @@ JASCallbackMgr_NS_reject: /* 80290034 0028CF74 7C 08 02 A6 */ mflr r0 /* 80290038 0028CF78 90 01 00 24 */ stw r0, 0x24(r1) /* 8029003C 0028CF7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290040 0028CF80 48 0D 21 99 */ bl func_803621D8 +/* 80290040 0028CF80 48 0D 21 99 */ bl _savegpr_28 /* 80290044 0028CF84 7C 7C 1B 78 */ mr r28, r3 /* 80290048 0028CF88 7C 9D 23 78 */ mr r29, r4 /* 8029004C 0028CF8C 7C BE 2B 78 */ mr r30, r5 @@ -79,7 +79,7 @@ lbl_80290098: /* 802900A4 0028CFE4 48 0A D6 79 */ bl OSRestoreInterrupts /* 802900A8 0028CFE8 7F E3 FB 78 */ mr r3, r31 /* 802900AC 0028CFEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802900B0 0028CFF0 48 0D 21 75 */ bl func_80362224 +/* 802900B0 0028CFF0 48 0D 21 75 */ bl _restgpr_28 /* 802900B4 0028CFF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802900B8 0028CFF8 7C 08 03 A6 */ mtlr r0 /* 802900BC 0028CFFC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASChannel.s b/asm/JAudio2/JASChannel.s index 888ec39419..61aaf4f8ea 100644 --- a/asm/JAudio2/JASChannel.s +++ b/asm/JAudio2/JASChannel.s @@ -407,7 +407,7 @@ JASChannel_NS_updateEffectorParam: /* 8029AD5C 00297C9C DB 81 00 50 */ stfd f28, 0x50(r1) /* 8029AD60 00297CA0 F3 81 00 58 */ psq_st f28, 88(r1), 0, qr0 /* 8029AD64 00297CA4 39 61 00 50 */ addi r11, r1, 0x50 -/* 8029AD68 00297CA8 48 0C 74 71 */ bl func_803621D8 +/* 8029AD68 00297CA8 48 0C 74 71 */ bl _savegpr_28 /* 8029AD6C 00297CAC 7C 7C 1B 78 */ mr r28, r3 /* 8029AD70 00297CB0 7C 9D 23 78 */ mr r29, r4 /* 8029AD74 00297CB4 7C BE 2B 78 */ mr r30, r5 @@ -550,7 +550,7 @@ lbl_8029AF40: /* 8029AF58 00297E98 E3 81 00 58 */ psq_l f28, 88(r1), 0, qr0 /* 8029AF5C 00297E9C CB 81 00 50 */ lfd f28, 0x50(r1) /* 8029AF60 00297EA0 39 61 00 50 */ addi r11, r1, 0x50 -/* 8029AF64 00297EA4 48 0C 72 C1 */ bl func_80362224 +/* 8029AF64 00297EA4 48 0C 72 C1 */ bl _restgpr_28 /* 8029AF68 00297EA8 80 01 00 94 */ lwz r0, 0x94(r1) /* 8029AF6C 00297EAC 7C 08 03 A6 */ mtlr r0 /* 8029AF70 00297EB0 38 21 00 90 */ addi r1, r1, 0x90 @@ -605,7 +605,7 @@ JASChannel_NS_initialUpdateDSPChannel: /* 8029B008 00297F48 7C 08 02 A6 */ mflr r0 /* 8029B00C 00297F4C 90 01 00 64 */ stw r0, 0x64(r1) /* 8029B010 00297F50 39 61 00 60 */ addi r11, r1, 0x60 -/* 8029B014 00297F54 48 0C 71 C5 */ bl func_803621D8 +/* 8029B014 00297F54 48 0C 71 C5 */ bl _savegpr_28 /* 8029B018 00297F58 7C 7E 1B 78 */ mr r30, r3 /* 8029B01C 00297F5C 7C 9F 23 78 */ mr r31, r4 /* 8029B020 00297F60 A0 03 00 8C */ lhz r0, 0x8c(r3) @@ -816,7 +816,7 @@ lbl_8029B2E0: /* 8029B308 00298248 38 60 00 00 */ li r3, 0 lbl_8029B30C: /* 8029B30C 0029824C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8029B310 00298250 48 0C 6F 15 */ bl func_80362224 +/* 8029B310 00298250 48 0C 6F 15 */ bl _restgpr_28 /* 8029B314 00298254 80 01 00 64 */ lwz r0, 0x64(r1) /* 8029B318 00298258 7C 08 03 A6 */ mtlr r0 /* 8029B31C 0029825C 38 21 00 60 */ addi r1, r1, 0x60 @@ -830,7 +830,7 @@ JASChannel_NS_updateDSPChannel: /* 8029B330 00298270 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8029B334 00298274 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8029B338 00298278 39 61 00 60 */ addi r11, r1, 0x60 -/* 8029B33C 0029827C 48 0C 6E 99 */ bl func_803621D4 +/* 8029B33C 0029827C 48 0C 6E 99 */ bl _savegpr_27 /* 8029B340 00298280 7C 7E 1B 78 */ mr r30, r3 /* 8029B344 00298284 7C 9F 23 78 */ mr r31, r4 /* 8029B348 00298288 81 83 00 0C */ lwz r12, 0xc(r3) @@ -1057,7 +1057,7 @@ lbl_8029B680: /* 8029B680 002985C0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8029B684 002985C4 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8029B688 002985C8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8029B68C 002985CC 48 0C 6B 95 */ bl func_80362220 +/* 8029B68C 002985CC 48 0C 6B 95 */ bl _restgpr_27 /* 8029B690 002985D0 80 01 00 74 */ lwz r0, 0x74(r1) /* 8029B694 002985D4 7C 08 03 A6 */ mtlr r0 /* 8029B698 002985D8 38 21 00 70 */ addi r1, r1, 0x70 @@ -1174,7 +1174,7 @@ JASChannel_NS_updateMixer: /* 8029B82C 0029876C DA C1 00 30 */ stfd f22, 0x30(r1) /* 8029B830 00298770 F2 C1 00 38 */ psq_st f22, 56(r1), 0, qr0 /* 8029B834 00298774 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029B838 00298778 48 0C 69 A1 */ bl func_803621D8 +/* 8029B838 00298778 48 0C 69 A1 */ bl _savegpr_28 /* 8029B83C 0029877C 7C 7D 1B 78 */ mr r29, r3 /* 8029B840 00298780 FE E0 08 90 */ fmr f23, f1 /* 8029B844 00298784 FF 00 10 90 */ fmr f24, f2 @@ -1434,7 +1434,7 @@ lbl_8029BB84: /* 8029BBDC 00298B1C E2 C1 00 38 */ psq_l f22, 56(r1), 0, qr0 /* 8029BBE0 00298B20 CA C1 00 30 */ lfd f22, 0x30(r1) /* 8029BBE4 00298B24 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029BBE8 00298B28 48 0C 66 3D */ bl func_80362224 +/* 8029BBE8 00298B28 48 0C 66 3D */ bl _restgpr_28 /* 8029BBEC 00298B2C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8029BBF0 00298B30 7C 08 03 A6 */ mtlr r0 /* 8029BBF4 00298B34 38 21 00 D0 */ addi r1, r1, 0xd0 diff --git a/asm/JAudio2/JASDSPChannel.s b/asm/JAudio2/JASDSPChannel.s index 3c62d8d0c4..b52c0a6ea0 100644 --- a/asm/JAudio2/JASDSPChannel.s +++ b/asm/JAudio2/JASDSPChannel.s @@ -115,7 +115,7 @@ JASDSPChannel_NS_alloc: /* 8029D450 0029A390 7C 08 02 A6 */ mflr r0 /* 8029D454 0029A394 90 01 00 24 */ stw r0, 0x24(r1) /* 8029D458 0029A398 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029D45C 0029A39C 48 0C 4D 7D */ bl func_803621D8 +/* 8029D45C 0029A39C 48 0C 4D 7D */ bl _savegpr_28 /* 8029D460 0029A3A0 7C 7C 1B 78 */ mr r28, r3 /* 8029D464 0029A3A4 7C 9D 23 78 */ mr r29, r4 /* 8029D468 0029A3A8 7C BE 2B 78 */ mr r30, r5 @@ -136,7 +136,7 @@ lbl_8029D484: /* 8029D4A0 0029A3E0 7F E3 FB 78 */ mr r3, r31 lbl_8029D4A4: /* 8029D4A4 0029A3E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029D4A8 0029A3E8 48 0C 4D 7D */ bl func_80362224 +/* 8029D4A8 0029A3E8 48 0C 4D 7D */ bl _restgpr_28 /* 8029D4AC 0029A3EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029D4B0 0029A3F0 7C 08 03 A6 */ mtlr r0 /* 8029D4B4 0029A3F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -148,7 +148,7 @@ JASDSPChannel_NS_allocForce: /* 8029D4C0 0029A400 7C 08 02 A6 */ mflr r0 /* 8029D4C4 0029A404 90 01 00 24 */ stw r0, 0x24(r1) /* 8029D4C8 0029A408 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029D4CC 0029A40C 48 0C 4D 0D */ bl func_803621D8 +/* 8029D4CC 0029A40C 48 0C 4D 0D */ bl _savegpr_28 /* 8029D4D0 0029A410 7C 7C 1B 78 */ mr r28, r3 /* 8029D4D4 0029A414 7C 9D 23 78 */ mr r29, r4 /* 8029D4D8 0029A418 7C BE 2B 78 */ mr r30, r5 @@ -171,7 +171,7 @@ lbl_8029D4F4: /* 8029D518 0029A458 7F E3 FB 78 */ mr r3, r31 lbl_8029D51C: /* 8029D51C 0029A45C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029D520 0029A460 48 0C 4D 05 */ bl func_80362224 +/* 8029D520 0029A460 48 0C 4D 05 */ bl _restgpr_28 /* 8029D524 0029A464 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029D528 0029A468 7C 08 03 A6 */ mtlr r0 /* 8029D52C 0029A46C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASDSPInterface.s b/asm/JAudio2/JASDSPInterface.s index c47aace09f..551b66d7ad 100644 --- a/asm/JAudio2/JASDSPInterface.s +++ b/asm/JAudio2/JASDSPInterface.s @@ -183,7 +183,7 @@ JASDsp_NS_setFXLine: /* 8029DB7C 0029AABC 7C 08 02 A6 */ mflr r0 /* 8029DB80 0029AAC0 90 01 00 24 */ stw r0, 0x24(r1) /* 8029DB84 0029AAC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029DB88 0029AAC8 48 0C 46 51 */ bl func_803621D8 +/* 8029DB88 0029AAC8 48 0C 46 51 */ bl _savegpr_28 /* 8029DB8C 0029AACC 7C 9D 23 78 */ mr r29, r4 /* 8029DB90 0029AAD0 7C BE 2B 78 */ mr r30, r5 /* 8029DB94 0029AAD4 80 8D 8D 6C */ lwz r4, lbl_804512EC-_SDA_BASE_(r13) @@ -255,7 +255,7 @@ lbl_8029DC74: /* 8029DC84 0029ABC4 48 09 FA 99 */ bl OSRestoreInterrupts /* 8029DC88 0029ABC8 38 60 00 01 */ li r3, 1 /* 8029DC8C 0029ABCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029DC90 0029ABD0 48 0C 45 95 */ bl func_80362224 +/* 8029DC90 0029ABD0 48 0C 45 95 */ bl _restgpr_28 /* 8029DC94 0029ABD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029DC98 0029ABD8 7C 08 03 A6 */ mtlr r0 /* 8029DC9C 0029ABDC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASDriverIF.s b/asm/JAudio2/JASDriverIF.s index 67e00d955a..346077ca0a 100644 --- a/asm/JAudio2/JASDriverIF.s +++ b/asm/JAudio2/JASDriverIF.s @@ -65,7 +65,7 @@ JASDriver_NS_rejectCallback: /* 8029E1C8 0029B108 7C 08 02 A6 */ mflr r0 /* 8029E1CC 0029B10C 90 01 00 24 */ stw r0, 0x24(r1) /* 8029E1D0 0029B110 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029E1D4 0029B114 48 0C 40 05 */ bl func_803621D8 +/* 8029E1D4 0029B114 48 0C 40 05 */ bl _savegpr_28 /* 8029E1D8 0029B118 7C 7C 1B 78 */ mr r28, r3 /* 8029E1DC 0029B11C 7C 9D 23 78 */ mr r29, r4 /* 8029E1E0 0029B120 3C 60 80 43 */ lis r3, lbl_80431C78@ha @@ -87,7 +87,7 @@ JASDriver_NS_rejectCallback: /* 8029E220 0029B160 7F FF 1A 14 */ add r31, r31, r3 /* 8029E224 0029B164 7F E3 FB 78 */ mr r3, r31 /* 8029E228 0029B168 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029E22C 0029B16C 48 0C 3F F9 */ bl func_80362224 +/* 8029E22C 0029B16C 48 0C 3F F9 */ bl _restgpr_28 /* 8029E230 0029B170 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029E234 0029B174 7C 08 03 A6 */ mtlr r0 /* 8029E238 0029B178 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASHeapCtrl.s b/asm/JAudio2/JASHeapCtrl.s index 9e657323d2..9d28c0406b 100644 --- a/asm/JAudio2/JASHeapCtrl.s +++ b/asm/JAudio2/JASHeapCtrl.s @@ -70,7 +70,7 @@ JASHeap_NS_alloc: /* 80290220 0028D160 7C 08 02 A6 */ mflr r0 /* 80290224 0028D164 90 01 00 34 */ stw r0, 0x34(r1) /* 80290228 0028D168 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029022C 0028D16C 48 0D 1F A9 */ bl func_803621D4 +/* 8029022C 0028D16C 48 0D 1F A9 */ bl _savegpr_27 /* 80290230 0028D170 7C 7C 1B 78 */ mr r28, r3 /* 80290234 0028D174 7C 9D 23 78 */ mr r29, r4 /* 80290238 0028D178 7C BE 2B 78 */ mr r30, r5 @@ -190,7 +190,7 @@ lbl_802903B8: /* 802903D8 0028D318 38 60 00 01 */ li r3, 1 lbl_802903DC: /* 802903DC 0028D31C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802903E0 0028D320 48 0D 1E 41 */ bl func_80362220 +/* 802903E0 0028D320 48 0D 1E 41 */ bl _restgpr_27 /* 802903E4 0028D324 80 01 00 34 */ lwz r0, 0x34(r1) /* 802903E8 0028D328 7C 08 03 A6 */ mtlr r0 /* 802903EC 0028D32C 38 21 00 30 */ addi r1, r1, 0x30 @@ -202,7 +202,7 @@ JASHeap_NS_allocTail: /* 802903F8 0028D338 7C 08 02 A6 */ mflr r0 /* 802903FC 0028D33C 90 01 00 34 */ stw r0, 0x34(r1) /* 80290400 0028D340 39 61 00 30 */ addi r11, r1, 0x30 -/* 80290404 0028D344 48 0D 1D D1 */ bl func_803621D4 +/* 80290404 0028D344 48 0D 1D D1 */ bl _savegpr_27 /* 80290408 0028D348 7C 7B 1B 78 */ mr r27, r3 /* 8029040C 0028D34C 7C 9C 23 78 */ mr r28, r4 /* 80290410 0028D350 7C BD 2B 78 */ mr r29, r5 @@ -257,7 +257,7 @@ lbl_80290494: /* 802904C8 0028D408 38 60 00 01 */ li r3, 1 lbl_802904CC: /* 802904CC 0028D40C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802904D0 0028D410 48 0D 1D 51 */ bl func_80362220 +/* 802904D0 0028D410 48 0D 1D 51 */ bl _restgpr_27 /* 802904D4 0028D414 80 01 00 34 */ lwz r0, 0x34(r1) /* 802904D8 0028D418 7C 08 03 A6 */ mtlr r0 /* 802904DC 0028D41C 38 21 00 30 */ addi r1, r1, 0x30 @@ -568,7 +568,7 @@ JASGenericMemPool_NS_newMemPool: /* 802908CC 0028D80C 7C 08 02 A6 */ mflr r0 /* 802908D0 0028D810 90 01 00 24 */ stw r0, 0x24(r1) /* 802908D4 0028D814 39 61 00 20 */ addi r11, r1, 0x20 -/* 802908D8 0028D818 48 0D 19 01 */ bl func_803621D8 +/* 802908D8 0028D818 48 0D 19 01 */ bl _savegpr_28 /* 802908DC 0028D81C 7C 7C 1B 78 */ mr r28, r3 /* 802908E0 0028D820 7C BD 2B 78 */ mr r29, r5 /* 802908E4 0028D824 3B C0 00 00 */ li r30, 0 @@ -593,7 +593,7 @@ lbl_80290910: /* 80290928 0028D868 7C 00 EA 14 */ add r0, r0, r29 /* 8029092C 0028D86C 90 1C 00 08 */ stw r0, 8(r28) /* 80290930 0028D870 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290934 0028D874 48 0D 18 F1 */ bl func_80362224 +/* 80290934 0028D874 48 0D 18 F1 */ bl _restgpr_28 /* 80290938 0028D878 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029093C 0028D87C 7C 08 03 A6 */ mtlr r0 /* 80290940 0028D880 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASResArcLoader.s b/asm/JAudio2/JASResArcLoader.s index d0a664dd1f..3b7ae6af4c 100644 --- a/asm/JAudio2/JASResArcLoader.s +++ b/asm/JAudio2/JASResArcLoader.s @@ -27,7 +27,7 @@ JASResArcLoader_NS_getResMaxSize: /* 80290C08 0028DB48 7C 08 02 A6 */ mflr r0 /* 80290C0C 0028DB4C 90 01 00 24 */ stw r0, 0x24(r1) /* 80290C10 0028DB50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290C14 0028DB54 48 0D 15 C5 */ bl func_803621D8 +/* 80290C14 0028DB54 48 0D 15 C5 */ bl _savegpr_28 /* 80290C18 0028DB58 7C 7C 1B 78 */ mr r28, r3 /* 80290C1C 0028DB5C 80 63 00 44 */ lwz r3, 0x44(r3) /* 80290C20 0028DB60 83 E3 00 08 */ lwz r31, 8(r3) @@ -51,7 +51,7 @@ lbl_80290C58: /* 80290C5C 0028DB9C 41 80 FF D4 */ blt lbl_80290C30 /* 80290C60 0028DBA0 7F C3 F3 78 */ mr r3, r30 /* 80290C64 0028DBA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290C68 0028DBA8 48 0D 15 BD */ bl func_80362224 +/* 80290C68 0028DBA8 48 0D 15 BD */ bl _restgpr_28 /* 80290C6C 0028DBAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80290C70 0028DBB0 7C 08 03 A6 */ mtlr r0 /* 80290C74 0028DBB4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASSeqParser.s b/asm/JAudio2/JASSeqParser.s index b1a28ac663..94117a283f 100644 --- a/asm/JAudio2/JASSeqParser.s +++ b/asm/JAudio2/JASSeqParser.s @@ -1117,7 +1117,7 @@ lbl_80294D5C: /* 80294DAC 00291CEC 7C 08 02 A6 */ mflr r0 /* 80294DB0 00291CF0 90 01 00 24 */ stw r0, 0x24(r1) /* 80294DB4 00291CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294DB8 00291CF8 48 0C D4 21 */ bl func_803621D8 +/* 80294DB8 00291CF8 48 0C D4 21 */ bl _savegpr_28 /* 80294DBC 00291CFC 7C 7C 1B 78 */ mr r28, r3 /* 80294DC0 00291D00 7C 9D 23 78 */ mr r29, r4 /* 80294DC4 00291D04 83 E5 00 04 */ lwz r31, 4(r5) @@ -1202,7 +1202,7 @@ lbl_80294EE0: /* 80294EF4 00291E34 38 60 00 00 */ li r3, 0 lbl_80294EF8: /* 80294EF8 00291E38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294EFC 00291E3C 48 0C D3 29 */ bl func_80362224 +/* 80294EFC 00291E3C 48 0C D3 29 */ bl _restgpr_28 /* 80294F00 00291E40 80 01 00 24 */ lwz r0, 0x24(r1) /* 80294F04 00291E44 7C 08 03 A6 */ mtlr r0 /* 80294F08 00291E48 38 21 00 20 */ addi r1, r1, 0x20 @@ -1318,7 +1318,7 @@ lbl_80295078: /* 8029508C 00291FCC 7C 08 02 A6 */ mflr r0 /* 80295090 00291FD0 90 01 00 24 */ stw r0, 0x24(r1) /* 80295094 00291FD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80295098 00291FD8 48 0C D1 41 */ bl func_803621D8 +/* 80295098 00291FD8 48 0C D1 41 */ bl _savegpr_28 /* 8029509C 00291FDC 7C 7C 1B 78 */ mr r28, r3 /* 802950A0 00291FE0 7C 9F 23 78 */ mr r31, r4 /* 802950A4 00291FE4 3C 60 80 3A */ lis r3, lbl_8039B018@ha @@ -1430,7 +1430,7 @@ lbl_80295078: /* 8029524C 0029218C 4B FF BD 19 */ bl JASReport /* 80295250 00292190 38 60 00 00 */ li r3, 0 /* 80295254 00292194 39 61 00 20 */ addi r11, r1, 0x20 -/* 80295258 00292198 48 0C CF CD */ bl func_80362224 +/* 80295258 00292198 48 0C CF CD */ bl _restgpr_28 /* 8029525C 0029219C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80295260 002921A0 7C 08 03 A6 */ mtlr r0 /* 80295264 002921A4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1698,7 +1698,7 @@ JASSeqParser_NS_parseNoteOn: /* 80295604 00292544 7C 08 02 A6 */ mflr r0 /* 80295608 00292548 90 01 00 24 */ stw r0, 0x24(r1) /* 8029560C 0029254C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80295610 00292550 48 0C CB C5 */ bl func_803621D4 +/* 80295610 00292550 48 0C CB C5 */ bl _savegpr_27 /* 80295614 00292554 7C 7B 1B 78 */ mr r27, r3 /* 80295618 00292558 7C 9C 23 78 */ mr r28, r4 /* 8029561C 0029255C 7C BD 2B 78 */ mr r29, r5 @@ -1735,7 +1735,7 @@ lbl_8029567C: lbl_80295694: /* 80295694 002925D4 38 60 00 00 */ li r3, 0 /* 80295698 002925D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029569C 002925DC 48 0C CB 85 */ bl func_80362220 +/* 8029569C 002925DC 48 0C CB 85 */ bl _restgpr_27 /* 802956A0 002925E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802956A4 002925E4 7C 08 03 A6 */ mtlr r0 /* 802956A8 002925E8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASTaskThread.s b/asm/JAudio2/JASTaskThread.s index 03a142a466..541decbe22 100644 --- a/asm/JAudio2/JASTaskThread.s +++ b/asm/JAudio2/JASTaskThread.s @@ -33,7 +33,7 @@ JASTaskThread: /* 8028F728 0028C668 7C 08 02 A6 */ mflr r0 /* 8028F72C 0028C66C 90 01 00 34 */ stw r0, 0x34(r1) /* 8028F730 0028C670 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028F734 0028C674 48 0D 2A A1 */ bl func_803621D4 +/* 8028F734 0028C674 48 0D 2A A1 */ bl _savegpr_27 /* 8028F738 0028C678 7C 7E 1B 79 */ or. r30, r3, r3 /* 8028F73C 0028C67C 7C 9F 23 78 */ mr r31, r4 /* 8028F740 0028C680 41 82 00 F4 */ beq lbl_8028F834 @@ -108,7 +108,7 @@ lbl_8028F818: lbl_8028F834: /* 8028F834 0028C774 7F C3 F3 78 */ mr r3, r30 /* 8028F838 0028C778 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028F83C 0028C77C 48 0D 29 E5 */ bl func_80362220 +/* 8028F83C 0028C77C 48 0D 29 E5 */ bl _restgpr_27 /* 8028F840 0028C780 80 01 00 34 */ lwz r0, 0x34(r1) /* 8028F844 0028C784 7C 08 03 A6 */ mtlr r0 /* 8028F848 0028C788 38 21 00 30 */ addi r1, r1, 0x30 @@ -237,7 +237,7 @@ JASTaskThread_NS_allocCallStack_X1_: /* 8028F9F0 0028C930 7C 08 02 A6 */ mflr r0 /* 8028F9F4 0028C934 90 01 00 24 */ stw r0, 0x24(r1) /* 8028F9F8 0028C938 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028F9FC 0028C93C 48 0D 27 DD */ bl func_803621D8 +/* 8028F9FC 0028C93C 48 0D 27 DD */ bl _savegpr_28 /* 8028FA00 0028C940 7C 9E 23 78 */ mr r30, r4 /* 8028FA04 0028C944 7C BF 2B 78 */ mr r31, r5 /* 8028FA08 0028C948 48 00 10 C1 */ bl JASKernel_NS_getCommandHeap @@ -330,7 +330,7 @@ lbl_8028FB30: /* 8028FB40 0028CA80 7F A3 EB 78 */ mr r3, r29 lbl_8028FB44: /* 8028FB44 0028CA84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FB48 0028CA88 48 0D 26 DD */ bl func_80362224 +/* 8028FB48 0028CA88 48 0D 26 DD */ bl _restgpr_28 /* 8028FB4C 0028CA8C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028FB50 0028CA90 7C 08 03 A6 */ mtlr r0 /* 8028FB54 0028CA94 38 21 00 20 */ addi r1, r1, 0x20 @@ -342,7 +342,7 @@ JASTaskThread_NS_sendCmdMsg: /* 8028FB60 0028CAA0 7C 08 02 A6 */ mflr r0 /* 8028FB64 0028CAA4 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FB68 0028CAA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FB6C 0028CAAC 48 0D 26 6D */ bl func_803621D8 +/* 8028FB6C 0028CAAC 48 0D 26 6D */ bl _savegpr_28 /* 8028FB70 0028CAB0 7C 7D 1B 78 */ mr r29, r3 /* 8028FB74 0028CAB4 4B FF FC DD */ bl JASTaskThread_NS_allocCallStack /* 8028FB78 0028CAB8 7C 7C 1B 79 */ or. r28, r3, r3 @@ -403,7 +403,7 @@ lbl_8028FC38: /* 8028FC38 0028CB78 7F A3 EB 78 */ mr r3, r29 lbl_8028FC3C: /* 8028FC3C 0028CB7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FC40 0028CB80 48 0D 25 E5 */ bl func_80362224 +/* 8028FC40 0028CB80 48 0D 25 E5 */ bl _restgpr_28 /* 8028FC44 0028CB84 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028FC48 0028CB88 7C 08 03 A6 */ mtlr r0 /* 8028FC4C 0028CB8C 38 21 00 20 */ addi r1, r1, 0x20 @@ -415,7 +415,7 @@ JASTaskThread_NS_sendCmdMsg_X1_: /* 8028FC58 0028CB98 7C 08 02 A6 */ mflr r0 /* 8028FC5C 0028CB9C 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FC60 0028CBA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FC64 0028CBA4 48 0D 25 75 */ bl func_803621D8 +/* 8028FC64 0028CBA4 48 0D 25 75 */ bl _savegpr_28 /* 8028FC68 0028CBA8 7C 7D 1B 78 */ mr r29, r3 /* 8028FC6C 0028CBAC 4B FF FD 81 */ bl JASTaskThread_NS_allocCallStack_X1_ /* 8028FC70 0028CBB0 7C 7C 1B 79 */ or. r28, r3, r3 @@ -476,7 +476,7 @@ lbl_8028FD30: /* 8028FD30 0028CC70 7F A3 EB 78 */ mr r3, r29 lbl_8028FD34: /* 8028FD34 0028CC74 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FD38 0028CC78 48 0D 24 ED */ bl func_80362224 +/* 8028FD38 0028CC78 48 0D 24 ED */ bl _restgpr_28 /* 8028FD3C 0028CC7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028FD40 0028CC80 7C 08 03 A6 */ mtlr r0 /* 8028FD44 0028CC84 38 21 00 20 */ addi r1, r1, 0x20 @@ -485,7 +485,7 @@ lbl_8028FD34: /* 8028FD50 0028CC90 7C 08 02 A6 */ mflr r0 /* 8028FD54 0028CC94 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FD58 0028CC98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FD5C 0028CC9C 48 0D 24 7D */ bl func_803621D8 +/* 8028FD5C 0028CC9C 48 0D 24 7D */ bl _savegpr_28 /* 8028FD60 0028CCA0 7C 7F 1B 78 */ mr r31, r3 /* 8028FD64 0028CCA4 38 60 00 04 */ li r3, 4 /* 8028FD68 0028CCA8 64 63 00 04 */ oris r3, r3, 4 diff --git a/asm/JAudio2/JASTrack.s b/asm/JAudio2/JASTrack.s index 9c67386ad4..b8b33692f5 100644 --- a/asm/JAudio2/JASTrack.s +++ b/asm/JAudio2/JASTrack.s @@ -278,7 +278,7 @@ JASTrack_NS_init: /* 802915D8 0028E518 7C 08 02 A6 */ mflr r0 /* 802915DC 0028E51C 90 01 00 34 */ stw r0, 0x34(r1) /* 802915E0 0028E520 39 61 00 30 */ addi r11, r1, 0x30 -/* 802915E4 0028E524 48 0D 0B F1 */ bl func_803621D4 +/* 802915E4 0028E524 48 0D 0B F1 */ bl _savegpr_27 /* 802915E8 0028E528 7C 7C 1B 78 */ mr r28, r3 /* 802915EC 0028E52C 3C 80 80 3A */ lis r4, lbl_8039AFD0@ha /* 802915F0 0028E530 3B 64 AF D0 */ addi r27, r4, lbl_8039AFD0@l @@ -480,7 +480,7 @@ lbl_80291868: /* 802918DC 0028E81C 98 1C 02 16 */ stb r0, 0x216(r28) /* 802918E0 0028E820 98 9C 02 15 */ stb r4, 0x215(r28) /* 802918E4 0028E824 39 61 00 30 */ addi r11, r1, 0x30 -/* 802918E8 0028E828 48 0D 09 39 */ bl func_80362220 +/* 802918E8 0028E828 48 0D 09 39 */ bl _restgpr_27 /* 802918EC 0028E82C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802918F0 0028E830 7C 08 03 A6 */ mtlr r0 /* 802918F4 0028E834 38 21 00 30 */ addi r1, r1, 0x30 @@ -738,7 +738,7 @@ JASTrack_NS_openChild: /* 80291C34 0028EB74 7C 08 02 A6 */ mflr r0 /* 80291C38 0028EB78 90 01 00 34 */ stw r0, 0x34(r1) /* 80291C3C 0028EB7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80291C40 0028EB80 48 0D 05 95 */ bl func_803621D4 +/* 80291C40 0028EB80 48 0D 05 95 */ bl _savegpr_27 /* 80291C44 0028EB84 7C 7E 1B 78 */ mr r30, r3 /* 80291C48 0028EB88 7C 9F 23 78 */ mr r31, r4 /* 80291C4C 0028EB8C 54 80 10 3A */ slwi r0, r4, 2 @@ -835,7 +835,7 @@ lbl_80291D78: /* 80291D90 0028ECD0 7F 83 E3 78 */ mr r3, r28 lbl_80291D94: /* 80291D94 0028ECD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80291D98 0028ECD8 48 0D 04 89 */ bl func_80362220 +/* 80291D98 0028ECD8 48 0D 04 89 */ bl _restgpr_27 /* 80291D9C 0028ECDC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80291DA0 0028ECE0 7C 08 03 A6 */ mtlr r0 /* 80291DA4 0028ECE4 38 21 00 30 */ addi r1, r1, 0x30 @@ -872,7 +872,7 @@ JASTrack_NS_channelStart: /* 80291DFC 0028ED3C 7C 08 02 A6 */ mflr r0 /* 80291E00 0028ED40 90 01 00 24 */ stw r0, 0x24(r1) /* 80291E04 0028ED44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80291E08 0028ED48 48 0D 03 CD */ bl func_803621D4 +/* 80291E08 0028ED48 48 0D 03 CD */ bl _savegpr_27 /* 80291E0C 0028ED4C 7C 7F 1B 78 */ mr r31, r3 /* 80291E10 0028ED50 7C 9B 23 78 */ mr r27, r4 /* 80291E14 0028ED54 7C BE 2B 78 */ mr r30, r5 @@ -950,7 +950,7 @@ lbl_80291F1C: /* 80291F1C 0028EE5C 7F A3 EB 78 */ mr r3, r29 lbl_80291F20: /* 80291F20 0028EE60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80291F24 0028EE64 48 0D 02 FD */ bl func_80362220 +/* 80291F24 0028EE64 48 0D 02 FD */ bl _restgpr_27 /* 80291F28 0028EE68 80 01 00 24 */ lwz r0, 0x24(r1) /* 80291F2C 0028EE6C 7C 08 03 A6 */ mtlr r0 /* 80291F30 0028EE70 38 21 00 20 */ addi r1, r1, 0x20 @@ -1199,7 +1199,7 @@ JASTrack_NS_overwriteOsc: /* 80292270 0028F1B0 7C 08 02 A6 */ mflr r0 /* 80292274 0028F1B4 90 01 00 24 */ stw r0, 0x24(r1) /* 80292278 0028F1B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029227C 0028F1BC 48 0C FF 5D */ bl func_803621D8 +/* 8029227C 0028F1BC 48 0C FF 5D */ bl _savegpr_28 /* 80292280 0028F1C0 7C 7C 1B 78 */ mr r28, r3 /* 80292284 0028F1C4 7C 9D 23 78 */ mr r29, r4 /* 80292288 0028F1C8 3B C0 00 00 */ li r30, 0 @@ -1219,7 +1219,7 @@ lbl_802922B0: /* 802922B8 0028F1F8 3B FF 00 18 */ addi r31, r31, 0x18 /* 802922BC 0028F1FC 41 80 FF D4 */ blt lbl_80292290 /* 802922C0 0028F200 39 61 00 20 */ addi r11, r1, 0x20 -/* 802922C4 0028F204 48 0C FF 61 */ bl func_80362224 +/* 802922C4 0028F204 48 0C FF 61 */ bl _restgpr_28 /* 802922C8 0028F208 80 01 00 24 */ lwz r0, 0x24(r1) /* 802922CC 0028F20C 7C 08 03 A6 */ mtlr r0 /* 802922D0 0028F210 38 21 00 20 */ addi r1, r1, 0x20 @@ -1423,7 +1423,7 @@ JASTrack_NS_updateSeq: /* 8029258C 0028F4CC DB E1 00 20 */ stfd f31, 0x20(r1) /* 80292590 0028F4D0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80292594 0028F4D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80292598 0028F4D8 48 0C FC 41 */ bl func_803621D8 +/* 80292598 0028F4D8 48 0C FC 41 */ bl _savegpr_28 /* 8029259C 0028F4DC 7C 7C 1B 78 */ mr r28, r3 /* 802925A0 0028F4E0 7C 9D 23 78 */ mr r29, r4 /* 802925A4 0028F4E4 FF E0 08 90 */ fmr f31, f1 @@ -1465,7 +1465,7 @@ lbl_80292614: /* 80292624 0028F564 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80292628 0028F568 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8029262C 0028F56C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80292630 0028F570 48 0C FB F5 */ bl func_80362224 +/* 80292630 0028F570 48 0C FB F5 */ bl _restgpr_28 /* 80292634 0028F574 80 01 00 34 */ lwz r0, 0x34(r1) /* 80292638 0028F578 7C 08 03 A6 */ mtlr r0 /* 8029263C 0028F57C 38 21 00 30 */ addi r1, r1, 0x30 @@ -1535,7 +1535,7 @@ JASTrack_NS_noteOffAll: /* 8029270C 0028F64C 7C 08 02 A6 */ mflr r0 /* 80292710 0028F650 90 01 00 24 */ stw r0, 0x24(r1) /* 80292714 0028F654 39 61 00 20 */ addi r11, r1, 0x20 -/* 80292718 0028F658 48 0C FA C1 */ bl func_803621D8 +/* 80292718 0028F658 48 0C FA C1 */ bl _savegpr_28 /* 8029271C 0028F65C 7C 7C 1B 78 */ mr r28, r3 /* 80292720 0028F660 7C 9D 23 78 */ mr r29, r4 /* 80292724 0028F664 3B E0 00 00 */ li r31, 0 @@ -1568,7 +1568,7 @@ lbl_80292778: /* 80292780 0028F6C0 3B FF 00 04 */ addi r31, r31, 4 /* 80292784 0028F6C4 41 80 FF D0 */ blt lbl_80292754 /* 80292788 0028F6C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029278C 0028F6CC 48 0C FA 99 */ bl func_80362224 +/* 8029278C 0028F6CC 48 0C FA 99 */ bl _restgpr_28 /* 80292790 0028F6D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80292794 0028F6D4 7C 08 03 A6 */ mtlr r0 /* 80292798 0028F6D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1744,7 +1744,7 @@ JASTrack_NS_setChannelPauseFlag: /* 802929A4 0028F8E4 7C 08 02 A6 */ mflr r0 /* 802929A8 0028F8E8 90 01 00 24 */ stw r0, 0x24(r1) /* 802929AC 0028F8EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802929B0 0028F8F0 48 0C F8 29 */ bl func_803621D8 +/* 802929B0 0028F8F0 48 0C F8 29 */ bl _savegpr_28 /* 802929B4 0028F8F4 7C 7C 1B 78 */ mr r28, r3 /* 802929B8 0028F8F8 7C 9D 23 78 */ mr r29, r4 /* 802929BC 0028F8FC 3B C0 00 00 */ li r30, 0 @@ -1779,7 +1779,7 @@ lbl_80292A14: /* 80292A1C 0028F95C 3B FF 00 04 */ addi r31, r31, 4 /* 80292A20 0028F960 41 80 FF DC */ blt lbl_802929FC /* 80292A24 0028F964 39 61 00 20 */ addi r11, r1, 0x20 -/* 80292A28 0028F968 48 0C F7 FD */ bl func_80362224 +/* 80292A28 0028F968 48 0C F7 FD */ bl _restgpr_28 /* 80292A2C 0028F96C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80292A30 0028F970 7C 08 03 A6 */ mtlr r0 /* 80292A34 0028F974 38 21 00 20 */ addi r1, r1, 0x20 @@ -2051,7 +2051,7 @@ JASTrack_NS_tickProc: /* 80292DA4 0028FCE4 7C 08 02 A6 */ mflr r0 /* 80292DA8 0028FCE8 90 01 00 24 */ stw r0, 0x24(r1) /* 80292DAC 0028FCEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80292DB0 0028FCF0 48 0C F4 25 */ bl func_803621D4 +/* 80292DB0 0028FCF0 48 0C F4 25 */ bl _savegpr_27 /* 80292DB4 0028FCF4 7C 7B 1B 78 */ mr r27, r3 /* 80292DB8 0028FCF8 88 03 02 16 */ lbz r0, 0x216(r3) /* 80292DBC 0028FCFC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f @@ -2110,7 +2110,7 @@ lbl_80292E70: /* 80292E80 0028FDC0 38 60 00 00 */ li r3, 0 lbl_80292E84: /* 80292E84 0028FDC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80292E88 0028FDC8 48 0C F3 99 */ bl func_80362220 +/* 80292E88 0028FDC8 48 0C F3 99 */ bl _restgpr_27 /* 80292E8C 0028FDCC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80292E90 0028FDD0 7C 08 03 A6 */ mtlr r0 /* 80292E94 0028FDD4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2351,7 +2351,7 @@ JASTrack_NS_TChannelMgr_NS_releaseAll: /* 802931B4 002900F4 7C 08 02 A6 */ mflr r0 /* 802931B8 002900F8 90 01 00 24 */ stw r0, 0x24(r1) /* 802931BC 002900FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802931C0 00290100 48 0C F0 15 */ bl func_803621D4 +/* 802931C0 00290100 48 0C F0 15 */ bl _savegpr_27 /* 802931C4 00290104 7C 7B 1B 78 */ mr r27, r3 /* 802931C8 00290108 3B A0 00 00 */ li r29, 0 /* 802931CC 0029010C 3B E0 00 00 */ li r31, 0 @@ -2372,7 +2372,7 @@ lbl_802931F8: /* 80293200 00290140 3B FF 00 04 */ addi r31, r31, 4 /* 80293204 00290144 41 80 FF D0 */ blt lbl_802931D4 /* 80293208 00290148 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029320C 0029014C 48 0C F0 15 */ bl func_80362220 +/* 8029320C 0029014C 48 0C F0 15 */ bl _restgpr_27 /* 80293210 00290150 80 01 00 24 */ lwz r0, 0x24(r1) /* 80293214 00290154 7C 08 03 A6 */ mtlr r0 /* 80293218 00290158 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASWaveArcLoader.s b/asm/JAudio2/JASWaveArcLoader.s index 4e9ac899ca..57b4a4f033 100644 --- a/asm/JAudio2/JASWaveArcLoader.s +++ b/asm/JAudio2/JASWaveArcLoader.s @@ -28,7 +28,7 @@ JASWaveArcLoader_NS_setCurrentDir: /* 8029A0DC 0029701C 7C 64 1B 78 */ mr r4, r3 /* 8029A0E0 00297020 3C 60 80 3C */ lis r3, lbl_803C77E0@ha /* 8029A0E4 00297024 38 63 77 E0 */ addi r3, r3, lbl_803C77E0@l -/* 8029A0E8 00297028 48 0C EA 45 */ bl func_80368B2C +/* 8029A0E8 00297028 48 0C EA 45 */ bl strcpy /* 8029A0EC 0029702C 3C 60 80 3C */ lis r3, lbl_803C77E0@ha /* 8029A0F0 00297030 38 63 77 E0 */ addi r3, r3, lbl_803C77E0@l /* 8029A0F4 00297034 48 0C EA F1 */ bl func_80368BE4 @@ -488,7 +488,7 @@ JASWaveArc_NS_setFileName: /* 8029A710 00297650 7C 08 02 A6 */ mflr r0 /* 8029A714 00297654 90 01 00 24 */ stw r0, 0x24(r1) /* 8029A718 00297658 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029A71C 0029765C 48 0C 7A B9 */ bl func_803621D4 +/* 8029A71C 0029765C 48 0C 7A B9 */ bl _savegpr_27 /* 8029A720 00297660 7C 7B 1B 78 */ mr r27, r3 /* 8029A724 00297664 7C 9C 23 78 */ mr r28, r4 /* 8029A728 00297668 4B FF FA 09 */ bl JASWaveArcLoader_NS_getCurrentDir @@ -505,7 +505,7 @@ JASWaveArc_NS_setFileName: /* 8029A754 00297694 48 03 45 BD */ bl __nwa_X2_ /* 8029A758 00297698 7C 7D 1B 78 */ mr r29, r3 /* 8029A75C 0029769C 7F C4 F3 78 */ mr r4, r30 -/* 8029A760 002976A0 48 0C E3 CD */ bl func_80368B2C +/* 8029A760 002976A0 48 0C E3 CD */ bl strcpy /* 8029A764 002976A4 7F A3 EB 78 */ mr r3, r29 /* 8029A768 002976A8 7F 84 E3 78 */ mr r4, r28 /* 8029A76C 002976AC 48 0C E3 51 */ bl func_80368ABC @@ -523,7 +523,7 @@ JASWaveArc_NS_setFileName: /* 8029A79C 002976DC 4B FF FF 11 */ bl JASWaveArc_NS_setEntryNum lbl_8029A7A0: /* 8029A7A0 002976E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029A7A4 002976E4 48 0C 7A 7D */ bl func_80362220 +/* 8029A7A4 002976E4 48 0C 7A 7D */ bl _restgpr_27 /* 8029A7A8 002976E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029A7AC 002976EC 7C 08 03 A6 */ mtlr r0 /* 8029A7B0 002976F0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUSectionHeap.s b/asm/JAudio2/JAUSectionHeap.s index 047c3c0d73..da2dcdd7fd 100644 --- a/asm/JAudio2/JAUSectionHeap.s +++ b/asm/JAudio2/JAUSectionHeap.s @@ -44,7 +44,7 @@ JAUSection_NS_TSectionData_NS_resetRegisteredBankTables: /* 802A4F6C 002A1EAC 7C 08 02 A6 */ mflr r0 /* 802A4F70 002A1EB0 90 01 00 24 */ stw r0, 0x24(r1) /* 802A4F74 002A1EB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4F78 002A1EB8 48 0B D2 61 */ bl func_803621D8 +/* 802A4F78 002A1EB8 48 0B D2 61 */ bl _savegpr_28 /* 802A4F7C 002A1EBC 7C 7C 1B 78 */ mr r28, r3 /* 802A4F80 002A1EC0 3B A0 00 00 */ li r29, 0 /* 802A4F84 002A1EC4 3C 60 80 3D */ lis r3, lbl_803D29B0@ha @@ -68,7 +68,7 @@ lbl_802A4FB4: /* 802A4FC4 002A1F04 28 1D 00 FF */ cmplwi r29, 0xff /* 802A4FC8 002A1F08 41 80 FF D0 */ blt lbl_802A4F98 /* 802A4FCC 002A1F0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4FD0 002A1F10 48 0B D2 55 */ bl func_80362224 +/* 802A4FD0 002A1F10 48 0B D2 55 */ bl _restgpr_28 /* 802A4FD4 002A1F14 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A4FD8 002A1F18 7C 08 03 A6 */ mtlr r0 /* 802A4FDC 002A1F1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -80,7 +80,7 @@ JAUSection_NS_TSectionData_NS_resetRegisteredWaveBankTables: /* 802A4FE8 002A1F28 7C 08 02 A6 */ mflr r0 /* 802A4FEC 002A1F2C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A4FF0 002A1F30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4FF4 002A1F34 48 0B D1 E5 */ bl func_803621D8 +/* 802A4FF4 002A1F34 48 0B D1 E5 */ bl _savegpr_28 /* 802A4FF8 002A1F38 7C 7C 1B 78 */ mr r28, r3 /* 802A4FFC 002A1F3C 3B A0 00 00 */ li r29, 0 /* 802A5000 002A1F40 3C 60 80 3D */ lis r3, lbl_803D29B0@ha @@ -104,7 +104,7 @@ lbl_802A5030: /* 802A5040 002A1F80 28 1D 00 FF */ cmplwi r29, 0xff /* 802A5044 002A1F84 41 80 FF D0 */ blt lbl_802A5014 /* 802A5048 002A1F88 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A504C 002A1F8C 48 0B D1 D9 */ bl func_80362224 +/* 802A504C 002A1F8C 48 0B D1 D9 */ bl _restgpr_28 /* 802A5050 002A1F90 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5054 002A1F94 7C 08 03 A6 */ mtlr r0 /* 802A5058 002A1F98 38 21 00 20 */ addi r1, r1, 0x20 @@ -116,7 +116,7 @@ JAUSection: /* 802A5064 002A1FA4 7C 08 02 A6 */ mflr r0 /* 802A5068 002A1FA8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A506C 002A1FAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5070 002A1FB0 48 0B D1 69 */ bl func_803621D8 +/* 802A5070 002A1FB0 48 0B D1 69 */ bl _savegpr_28 /* 802A5074 002A1FB4 7C 7C 1B 78 */ mr r28, r3 /* 802A5078 002A1FB8 7C 9D 23 78 */ mr r29, r4 /* 802A507C 002A1FBC 7C BE 2B 78 */ mr r30, r5 @@ -146,7 +146,7 @@ JAUSection: lbl_802A50DC: /* 802A50DC 002A201C 7F 83 E3 78 */ mr r3, r28 /* 802A50E0 002A2020 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A50E4 002A2024 48 0B D1 41 */ bl func_80362224 +/* 802A50E4 002A2024 48 0B D1 41 */ bl _restgpr_28 /* 802A50E8 002A2028 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A50EC 002A202C 7C 08 03 A6 */ mtlr r0 /* 802A50F0 002A2030 38 21 00 20 */ addi r1, r1, 0x20 @@ -223,7 +223,7 @@ JAUSection_NS_newSoundTable: /* 802A51E8 002A2128 7C 08 02 A6 */ mflr r0 /* 802A51EC 002A212C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A51F0 002A2130 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A51F4 002A2134 48 0B CF E5 */ bl func_803621D8 +/* 802A51F4 002A2134 48 0B CF E5 */ bl _savegpr_28 /* 802A51F8 002A2138 7C 7C 1B 78 */ mr r28, r3 /* 802A51FC 002A213C 7C 9E 23 78 */ mr r30, r4 /* 802A5200 002A2140 7C BF 2B 78 */ mr r31, r5 @@ -264,7 +264,7 @@ lbl_802A5260: /* 802A5280 002A21C0 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A5284 002A21C4 80 63 05 2C */ lwz r3, 0x52c(r3) /* 802A5288 002A21C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A528C 002A21CC 48 0B CF 99 */ bl func_80362224 +/* 802A528C 002A21CC 48 0B CF 99 */ bl _restgpr_28 /* 802A5290 002A21D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5294 002A21D4 7C 08 03 A6 */ mtlr r0 /* 802A5298 002A21D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -276,7 +276,7 @@ JAUSection_NS_newSoundNameTable: /* 802A52A4 002A21E4 7C 08 02 A6 */ mflr r0 /* 802A52A8 002A21E8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A52AC 002A21EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A52B0 002A21F0 48 0B CF 29 */ bl func_803621D8 +/* 802A52B0 002A21F0 48 0B CF 29 */ bl _savegpr_28 /* 802A52B4 002A21F4 7C 7C 1B 78 */ mr r28, r3 /* 802A52B8 002A21F8 7C 9E 23 78 */ mr r30, r4 /* 802A52BC 002A21FC 7C BF 2B 78 */ mr r31, r5 @@ -317,7 +317,7 @@ lbl_802A531C: /* 802A533C 002A227C 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A5340 002A2280 80 63 05 30 */ lwz r3, 0x530(r3) /* 802A5344 002A2284 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5348 002A2288 48 0B CE DD */ bl func_80362224 +/* 802A5348 002A2288 48 0B CE DD */ bl _restgpr_28 /* 802A534C 002A228C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5350 002A2290 7C 08 03 A6 */ mtlr r0 /* 802A5354 002A2294 38 21 00 20 */ addi r1, r1, 0x20 @@ -329,7 +329,7 @@ JAUSection_NS_newStreamFileTable: /* 802A5360 002A22A0 7C 08 02 A6 */ mflr r0 /* 802A5364 002A22A4 90 01 00 34 */ stw r0, 0x34(r1) /* 802A5368 002A22A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A536C 002A22AC 48 0B CE 69 */ bl func_803621D4 +/* 802A536C 002A22AC 48 0B CE 69 */ bl _savegpr_27 /* 802A5370 002A22B0 7C 7D 1B 78 */ mr r29, r3 /* 802A5374 002A22B4 7C 9E 23 78 */ mr r30, r4 /* 802A5378 002A22B8 7C BC 2B 78 */ mr r28, r5 @@ -433,7 +433,7 @@ lbl_802A54D0: /* 802A54E0 002A2420 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A54E4 002A2424 80 63 05 28 */ lwz r3, 0x528(r3) /* 802A54E8 002A2428 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A54EC 002A242C 48 0B CD 35 */ bl func_80362220 +/* 802A54EC 002A242C 48 0B CD 35 */ bl _restgpr_27 /* 802A54F0 002A2430 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A54F4 002A2434 7C 08 03 A6 */ mtlr r0 /* 802A54F8 002A2438 38 21 00 30 */ addi r1, r1, 0x30 @@ -688,7 +688,7 @@ JAUSection_NS_newWaveBank: /* 802A5858 002A2798 7C 08 02 A6 */ mflr r0 /* 802A585C 002A279C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A5860 002A27A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5864 002A27A4 48 0B C9 75 */ bl func_803621D8 +/* 802A5864 002A27A4 48 0B C9 75 */ bl _savegpr_28 /* 802A5868 002A27A8 7C 7F 1B 78 */ mr r31, r3 /* 802A586C 002A27AC 7C 9C 23 78 */ mr r28, r4 /* 802A5870 002A27B0 7C BD 2B 78 */ mr r29, r5 @@ -743,7 +743,7 @@ lbl_802A5924: /* 802A592C 002A286C 38 60 00 00 */ li r3, 0 lbl_802A5930: /* 802A5930 002A2870 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5934 002A2874 48 0B C8 F1 */ bl func_80362224 +/* 802A5934 002A2874 48 0B C8 F1 */ bl _restgpr_28 /* 802A5938 002A2878 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A593C 002A287C 7C 08 03 A6 */ mtlr r0 /* 802A5940 002A2880 38 21 00 20 */ addi r1, r1, 0x20 @@ -755,7 +755,7 @@ JAUSection_NS_loadWaveArc: /* 802A594C 002A288C 7C 08 02 A6 */ mflr r0 /* 802A5950 002A2890 90 01 00 24 */ stw r0, 0x24(r1) /* 802A5954 002A2894 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5958 002A2898 48 0B C8 81 */ bl func_803621D8 +/* 802A5958 002A2898 48 0B C8 81 */ bl _savegpr_28 /* 802A595C 002A289C 7C 7E 1B 78 */ mr r30, r3 /* 802A5960 002A28A0 7C 9D 23 78 */ mr r29, r4 /* 802A5964 002A28A4 7C BC 2B 78 */ mr r28, r5 @@ -820,7 +820,7 @@ lbl_802A5A34: /* 802A5A34 002A2974 38 60 00 00 */ li r3, 0 lbl_802A5A38: /* 802A5A38 002A2978 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5A3C 002A297C 48 0B C7 E9 */ bl func_80362224 +/* 802A5A3C 002A297C 48 0B C7 E9 */ bl _restgpr_28 /* 802A5A40 002A2980 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5A44 002A2984 7C 08 03 A6 */ mtlr r0 /* 802A5A48 002A2988 38 21 00 20 */ addi r1, r1, 0x20 @@ -832,7 +832,7 @@ JAUSection_NS_newBank: /* 802A5A54 002A2994 7C 08 02 A6 */ mflr r0 /* 802A5A58 002A2998 90 01 00 34 */ stw r0, 0x34(r1) /* 802A5A5C 002A299C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A5A60 002A29A0 48 0B C7 75 */ bl func_803621D4 +/* 802A5A60 002A29A0 48 0B C7 75 */ bl _savegpr_27 /* 802A5A64 002A29A4 7C 7E 1B 78 */ mr r30, r3 /* 802A5A68 002A29A8 7C 9F 23 78 */ mr r31, r4 /* 802A5A6C 002A29AC 80 83 00 30 */ lwz r4, 0x30(r3) @@ -907,7 +907,7 @@ lbl_802A5B60: /* 802A5B68 002A2AA8 38 60 00 00 */ li r3, 0 lbl_802A5B6C: /* 802A5B6C 002A2AAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A5B70 002A2AB0 48 0B C6 B1 */ bl func_80362220 +/* 802A5B70 002A2AB0 48 0B C6 B1 */ bl _restgpr_27 /* 802A5B74 002A2AB4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A5B78 002A2AB8 7C 08 03 A6 */ mtlr r0 /* 802A5B7C 002A2ABC 38 21 00 30 */ addi r1, r1, 0x30 @@ -919,7 +919,7 @@ JAUSection_NS_newVoiceBank: /* 802A5B88 002A2AC8 7C 08 02 A6 */ mflr r0 /* 802A5B8C 002A2ACC 90 01 00 24 */ stw r0, 0x24(r1) /* 802A5B90 002A2AD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5B94 002A2AD4 48 0B C6 45 */ bl func_803621D8 +/* 802A5B94 002A2AD4 48 0B C6 45 */ bl _savegpr_28 /* 802A5B98 002A2AD8 7C 7D 1B 78 */ mr r29, r3 /* 802A5B9C 002A2ADC 7C 9E 23 78 */ mr r30, r4 /* 802A5BA0 002A2AE0 80 83 00 30 */ lwz r4, 0x30(r3) @@ -992,7 +992,7 @@ lbl_802A5C88: /* 802A5C90 002A2BD0 38 60 00 00 */ li r3, 0 lbl_802A5C94: /* 802A5C94 002A2BD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5C98 002A2BD8 48 0B C5 8D */ bl func_80362224 +/* 802A5C98 002A2BD8 48 0B C5 8D */ bl _restgpr_28 /* 802A5C9C 002A2BDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5CA0 002A2BE0 7C 08 03 A6 */ mtlr r0 /* 802A5CA4 002A2BE4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1004,7 +1004,7 @@ JAUSection_NS_beginNewBankTable: /* 802A5CB0 002A2BF0 7C 08 02 A6 */ mflr r0 /* 802A5CB4 002A2BF4 90 01 00 34 */ stw r0, 0x34(r1) /* 802A5CB8 002A2BF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A5CBC 002A2BFC 48 0B C5 19 */ bl func_803621D4 +/* 802A5CBC 002A2BFC 48 0B C5 19 */ bl _savegpr_27 /* 802A5CC0 002A2C00 7C 7B 1B 78 */ mr r27, r3 /* 802A5CC4 002A2C04 7C 9C 23 78 */ mr r28, r4 /* 802A5CC8 002A2C08 7C BD 2B 78 */ mr r29, r5 @@ -1058,7 +1058,7 @@ lbl_802A5D70: /* 802A5D7C 002A2CBC 7C 00 F1 10 */ subfe r0, r0, r30 /* 802A5D80 002A2CC0 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 802A5D84 002A2CC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A5D88 002A2CC8 48 0B C4 99 */ bl func_80362220 +/* 802A5D88 002A2CC8 48 0B C4 99 */ bl _restgpr_27 /* 802A5D8C 002A2CCC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A5D90 002A2CD0 7C 08 03 A6 */ mtlr r0 /* 802A5D94 002A2CD4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1186,7 +1186,7 @@ JAUNewSectionHeap: /* 802A5F28 002A2E68 7C 08 02 A6 */ mflr r0 /* 802A5F2C 002A2E6C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A5F30 002A2E70 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5F34 002A2E74 48 0B C2 A5 */ bl func_803621D8 +/* 802A5F34 002A2E74 48 0B C2 A5 */ bl _savegpr_28 /* 802A5F38 002A2E78 7C 7C 1B 78 */ mr r28, r3 /* 802A5F3C 002A2E7C 7C 9D 23 78 */ mr r29, r4 /* 802A5F40 002A2E80 48 02 84 F9 */ bl JKRHeap_NS_becomeCurrentHeap @@ -1208,7 +1208,7 @@ lbl_802A5F78: /* 802A5F7C 002A2EBC 48 02 84 BD */ bl JKRHeap_NS_becomeCurrentHeap /* 802A5F80 002A2EC0 7F E3 FB 78 */ mr r3, r31 /* 802A5F84 002A2EC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5F88 002A2EC8 48 0B C2 9D */ bl func_80362224 +/* 802A5F88 002A2EC8 48 0B C2 9D */ bl _restgpr_28 /* 802A5F8C 002A2ECC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5F90 002A2ED0 7C 08 03 A6 */ mtlr r0 /* 802A5F94 002A2ED4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1302,7 +1302,7 @@ JAUSectionHeap_NS_newDynamicSeqBlock: /* 802A60B0 002A2FF0 7C 08 02 A6 */ mflr r0 /* 802A60B4 002A2FF4 90 01 00 24 */ stw r0, 0x24(r1) /* 802A60B8 002A2FF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A60BC 002A2FFC 48 0B C1 1D */ bl func_803621D8 +/* 802A60BC 002A2FFC 48 0B C1 1D */ bl _savegpr_28 /* 802A60C0 002A3000 7C 7C 1B 78 */ mr r28, r3 /* 802A60C4 002A3004 7C 9D 23 78 */ mr r29, r4 /* 802A60C8 002A3008 80 63 00 30 */ lwz r3, 0x30(r3) @@ -1373,7 +1373,7 @@ lbl_802A61A4: /* 802A61B4 002A30F4 38 60 00 00 */ li r3, 0 lbl_802A61B8: /* 802A61B8 002A30F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A61BC 002A30FC 48 0B C0 69 */ bl func_80362224 +/* 802A61BC 002A30FC 48 0B C0 69 */ bl _restgpr_28 /* 802A61C0 002A3100 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A61C4 002A3104 7C 08 03 A6 */ mtlr r0 /* 802A61C8 002A3108 38 21 00 20 */ addi r1, r1, 0x20 @@ -1384,7 +1384,7 @@ JAUSectionHeap_NS_getSeqData: /* 802A61D4 002A3114 7C 08 02 A6 */ mflr r0 /* 802A61D8 002A3118 90 01 00 24 */ stw r0, 0x24(r1) /* 802A61DC 002A311C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A61E0 002A3120 48 0B BF F9 */ bl func_803621D8 +/* 802A61E0 002A3120 48 0B BF F9 */ bl _savegpr_28 /* 802A61E4 002A3124 7C 7C 1B 78 */ mr r28, r3 /* 802A61E8 002A3128 7C 9D 23 78 */ mr r29, r4 /* 802A61EC 002A312C 7C BE 2B 78 */ mr r30, r5 @@ -1419,7 +1419,7 @@ lbl_802A6230: /* 802A6254 002A3194 48 00 08 55 */ bl JAUDynamicSeqDataBlocks_NS_getSeqData lbl_802A6258: /* 802A6258 002A3198 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A625C 002A319C 48 0B BF C9 */ bl func_80362224 +/* 802A625C 002A319C 48 0B BF C9 */ bl _restgpr_28 /* 802A6260 002A31A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A6264 002A31A4 7C 08 03 A6 */ mtlr r0 /* 802A6268 002A31A8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUSeqDataBlockMgr.s b/asm/JAudio2/JAUSeqDataBlockMgr.s index fd99330cbf..2928a9f219 100644 --- a/asm/JAudio2/JAUSeqDataBlockMgr.s +++ b/asm/JAudio2/JAUSeqDataBlockMgr.s @@ -153,7 +153,7 @@ JAUDynamicSeqDataBlocks_NS_getSeqData: /* 802A6AAC 002A39EC 7C 08 02 A6 */ mflr r0 /* 802A6AB0 002A39F0 90 01 00 34 */ stw r0, 0x34(r1) /* 802A6AB4 002A39F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A6AB8 002A39F8 48 0B B7 1D */ bl func_803621D4 +/* 802A6AB8 002A39F8 48 0B B7 1D */ bl _savegpr_27 /* 802A6ABC 002A39FC 7C 7B 1B 78 */ mr r27, r3 /* 802A6AC0 002A3A00 7C 9C 23 78 */ mr r28, r4 /* 802A6AC4 002A3A04 7C BD 2B 78 */ mr r29, r5 @@ -205,7 +205,7 @@ lbl_802A6B4C: /* 802A6B70 002A3AB0 7C 60 19 10 */ subfe r3, r0, r3 lbl_802A6B74: /* 802A6B74 002A3AB4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A6B78 002A3AB8 48 0B B6 A9 */ bl func_80362220 +/* 802A6B78 002A3AB8 48 0B B6 A9 */ bl _restgpr_27 /* 802A6B7C 002A3ABC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A6B80 002A3AC0 7C 08 03 A6 */ mtlr r0 /* 802A6B84 002A3AC4 38 21 00 30 */ addi r1, r1, 0x30 @@ -346,7 +346,7 @@ JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock: /* 802A6D4C 002A3C8C 7C 08 02 A6 */ mflr r0 /* 802A6D50 002A3C90 90 01 00 24 */ stw r0, 0x24(r1) /* 802A6D54 002A3C94 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6D58 002A3C98 48 0B B4 7D */ bl func_803621D4 +/* 802A6D58 002A3C98 48 0B B4 7D */ bl _savegpr_27 /* 802A6D5C 002A3C9C 7C 7B 1B 78 */ mr r27, r3 /* 802A6D60 002A3CA0 7C 9C 23 78 */ mr r28, r4 /* 802A6D64 002A3CA4 48 00 01 79 */ bl JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_ @@ -388,7 +388,7 @@ lbl_802A6DDC: /* 802A6DE0 002A3D20 40 82 FF 94 */ bne lbl_802A6D74 /* 802A6DE4 002A3D24 7F C3 F3 78 */ mr r3, r30 /* 802A6DE8 002A3D28 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6DEC 002A3D2C 48 0B B4 35 */ bl func_80362220 +/* 802A6DEC 002A3D2C 48 0B B4 35 */ bl _restgpr_27 /* 802A6DF0 002A3D30 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A6DF4 002A3D34 7C 08 03 A6 */ mtlr r0 /* 802A6DF8 002A3D38 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUSoundAnimator.s b/asm/JAudio2/JAUSoundAnimator.s index f4b1ebc487..53746c47bb 100644 --- a/asm/JAudio2/JAUSoundAnimator.s +++ b/asm/JAudio2/JAUSoundAnimator.s @@ -11,7 +11,7 @@ JAUSoundAnimation_NS_getStartSoundIndex: /* 802A6F7C 002A3EBC DB E1 00 20 */ stfd f31, 0x20(r1) /* 802A6F80 002A3EC0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 802A6F84 002A3EC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6F88 002A3EC8 48 0B B2 51 */ bl func_803621D8 +/* 802A6F88 002A3EC8 48 0B B2 51 */ bl _savegpr_28 /* 802A6F8C 002A3ECC 7C 7C 1B 78 */ mr r28, r3 /* 802A6F90 002A3ED0 FF E0 08 90 */ fmr f31, f1 /* 802A6F94 002A3ED4 3B A0 00 00 */ li r29, 0 @@ -60,7 +60,7 @@ lbl_802A7020: /* 802A7024 002A3F64 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 802A7028 002A3F68 CB E1 00 20 */ lfd f31, 0x20(r1) /* 802A702C 002A3F6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7030 002A3F70 48 0B B1 F5 */ bl func_80362224 +/* 802A7030 002A3F70 48 0B B1 F5 */ bl _restgpr_28 /* 802A7034 002A3F74 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A7038 002A3F78 7C 08 03 A6 */ mtlr r0 /* 802A703C 002A3F7C 38 21 00 30 */ addi r1, r1, 0x30 @@ -74,7 +74,7 @@ JAUSoundAnimation_NS_getEndSoundIndex: /* 802A7050 002A3F90 DB E1 00 20 */ stfd f31, 0x20(r1) /* 802A7054 002A3F94 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 802A7058 002A3F98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A705C 002A3F9C 48 0B B1 7D */ bl func_803621D8 +/* 802A705C 002A3F9C 48 0B B1 7D */ bl _savegpr_28 /* 802A7060 002A3FA0 7C 7C 1B 78 */ mr r28, r3 /* 802A7064 002A3FA4 FF E0 08 90 */ fmr f31, f1 /* 802A7068 002A3FA8 3B A0 00 00 */ li r29, 0 @@ -122,7 +122,7 @@ lbl_802A70F0: /* 802A70F4 002A4034 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 802A70F8 002A4038 CB E1 00 20 */ lfd f31, 0x20(r1) /* 802A70FC 002A403C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7100 002A4040 48 0B B1 25 */ bl func_80362224 +/* 802A7100 002A4040 48 0B B1 25 */ bl _restgpr_28 /* 802A7104 002A4044 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A7108 002A4048 7C 08 03 A6 */ mtlr r0 /* 802A710C 002A404C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JFramework/JFWDisplay.s b/asm/JFramework/JFWDisplay.s index 199d2d33e0..6c8efb674d 100644 --- a/asm/JFramework/JFWDisplay.s +++ b/asm/JFramework/JFWDisplay.s @@ -187,7 +187,7 @@ JFWDisplay_NS_prepareCopyDisp: /* 802722C0 0026F200 90 01 00 34 */ stw r0, 0x34(r1) /* 802722C4 0026F204 DB E1 00 28 */ stfd f31, 0x28(r1) /* 802722C8 0026F208 39 61 00 28 */ addi r11, r1, 0x28 -/* 802722CC 0026F20C 48 0E FF 0D */ bl func_803621D8 +/* 802722CC 0026F20C 48 0E FF 0D */ bl _savegpr_28 /* 802722D0 0026F210 7C 7C 1B 78 */ mr r28, r3 /* 802722D4 0026F214 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) /* 802722D8 0026F218 80 63 00 04 */ lwz r3, 4(r3) @@ -239,7 +239,7 @@ JFWDisplay_NS_prepareCopyDisp: lbl_80272390: /* 80272390 0026F2D0 CB E1 00 28 */ lfd f31, 0x28(r1) /* 80272394 0026F2D4 39 61 00 28 */ addi r11, r1, 0x28 -/* 80272398 0026F2D8 48 0E FE 8D */ bl func_80362224 +/* 80272398 0026F2D8 48 0E FE 8D */ bl _restgpr_28 /* 8027239C 0026F2DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802723A0 0026F2E0 7C 08 03 A6 */ mtlr r0 /* 802723A4 0026F2E4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1002,7 +1002,7 @@ JFWDisplay_NS_threadSleep: /* 80272E14 0026FD54 7C 08 02 A6 */ mflr r0 /* 80272E18 0026FD58 90 01 00 64 */ stw r0, 0x64(r1) /* 80272E1C 0026FD5C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80272E20 0026FD60 48 0E F3 B9 */ bl func_803621D8 +/* 80272E20 0026FD60 48 0E F3 B9 */ bl _savegpr_28 /* 80272E24 0026FD64 7C BD 2B 78 */ mr r29, r5 /* 80272E28 0026FD68 7C DC 33 78 */ mr r28, r6 /* 80272E2C 0026FD6C 3B E1 00 34 */ addi r31, r1, 0x34 @@ -1038,7 +1038,7 @@ JFWDisplay_NS_threadSleep: /* 80272E9C 0026FDDC 48 06 8F 79 */ bl JSUPtrLink_NS_dtor lbl_80272EA0: /* 80272EA0 0026FDE0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80272EA4 0026FDE4 48 0E F3 81 */ bl func_80362224 +/* 80272EA4 0026FDE4 48 0E F3 81 */ bl _restgpr_28 /* 80272EA8 0026FDE8 80 01 00 64 */ lwz r0, 0x64(r1) /* 80272EAC 0026FDEC 7C 08 03 A6 */ mtlr r0 /* 80272EB0 0026FDF0 38 21 00 60 */ addi r1, r1, 0x60 @@ -1481,7 +1481,7 @@ diagnoseGpHang: /* 80273500 00270440 7C 08 02 A6 */ mflr r0 /* 80273504 00270444 90 01 00 44 */ stw r0, 0x44(r1) /* 80273508 00270448 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027350C 0027044C 48 0E EC CD */ bl func_803621D8 +/* 8027350C 0027044C 48 0E EC CD */ bl _savegpr_28 /* 80273510 00270450 38 61 00 24 */ addi r3, r1, 0x24 /* 80273514 00270454 38 81 00 28 */ addi r4, r1, 0x28 /* 80273518 00270458 38 A1 00 1C */ addi r5, r1, 0x1c @@ -1597,7 +1597,7 @@ lbl_802736B0: /* 802736C0 00270600 4B D9 33 FD */ bl OSReport lbl_802736C4: /* 802736C4 00270604 39 61 00 40 */ addi r11, r1, 0x40 -/* 802736C8 00270608 48 0E EB 5D */ bl func_80362224 +/* 802736C8 00270608 48 0E EB 5D */ bl _restgpr_28 /* 802736CC 0027060C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802736D0 00270610 7C 08 03 A6 */ mtlr r0 /* 802736D4 00270614 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JGadget/linklist.s b/asm/JGadget/linklist.s index 1288ccf63b..5152d3a6e1 100644 --- a/asm/JGadget/linklist.s +++ b/asm/JGadget/linklist.s @@ -49,7 +49,7 @@ JGadget_NS_TNodeLinkList_NS_erase_X1_: /* 802DCAA4 002D99E4 7C 08 02 A6 */ mflr r0 /* 802DCAA8 002D99E8 90 01 00 34 */ stw r0, 0x34(r1) /* 802DCAAC 002D99EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DCAB0 002D99F0 48 08 57 25 */ bl func_803621D4 +/* 802DCAB0 002D99F0 48 08 57 25 */ bl _savegpr_27 /* 802DCAB4 002D99F4 7C 7B 1B 78 */ mr r27, r3 /* 802DCAB8 002D99F8 7C 9C 23 78 */ mr r28, r4 /* 802DCABC 002D99FC 7C DD 33 78 */ mr r29, r6 @@ -68,7 +68,7 @@ lbl_802DCAE0: /* 802DCAE8 002D9A28 80 1D 00 00 */ lwz r0, 0(r29) /* 802DCAEC 002D9A2C 90 1B 00 00 */ stw r0, 0(r27) /* 802DCAF0 002D9A30 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DCAF4 002D9A34 48 08 57 2D */ bl func_80362220 +/* 802DCAF4 002D9A34 48 08 57 2D */ bl _restgpr_27 /* 802DCAF8 002D9A38 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DCAFC 002D9A3C 7C 08 03 A6 */ mtlr r0 /* 802DCB00 002D9A40 38 21 00 30 */ addi r1, r1, 0x30 @@ -151,7 +151,7 @@ JGadget_NS_TNodeLinkList_NS_Remove: /* 802DCBFC 002D9B3C 7C 08 02 A6 */ mflr r0 /* 802DCC00 002D9B40 90 01 00 54 */ stw r0, 0x54(r1) /* 802DCC04 002D9B44 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DCC08 002D9B48 48 08 55 D1 */ bl func_803621D8 +/* 802DCC08 002D9B48 48 08 55 D1 */ bl _savegpr_28 /* 802DCC0C 002D9B4C 7C 7C 1B 78 */ mr r28, r3 /* 802DCC10 002D9B50 90 81 00 2C */ stw r4, 0x2c(r1) /* 802DCC14 002D9B54 38 00 00 00 */ li r0, 0 @@ -197,7 +197,7 @@ lbl_802DCC8C: /* 802DCCA8 002D9BE8 38 80 FF FF */ li r4, -1 /* 802DCCAC 002D9BEC 4B FF FD 71 */ bl JGadget_NS_TNodeLinkList_NS_dtor /* 802DCCB0 002D9BF0 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DCCB4 002D9BF4 48 08 55 71 */ bl func_80362224 +/* 802DCCB4 002D9BF4 48 08 55 71 */ bl _restgpr_28 /* 802DCCB8 002D9BF8 80 01 00 54 */ lwz r0, 0x54(r1) /* 802DCCBC 002D9BFC 7C 08 03 A6 */ mtlr r0 /* 802DCCC0 002D9C00 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/JGadget/std-vector.s b/asm/JGadget/std-vector.s index 0d820cc8bd..f707b4b32b 100644 --- a/asm/JGadget/std-vector.s +++ b/asm/JGadget/std-vector.s @@ -155,7 +155,7 @@ JGadget_NS_TVector_X1_: /* 802DCE90 002D9DD0 7C 08 02 A6 */ mflr r0 /* 802DCE94 002D9DD4 90 01 00 34 */ stw r0, 0x34(r1) /* 802DCE98 002D9DD8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DCE9C 002D9DDC 48 08 53 39 */ bl func_803621D4 +/* 802DCE9C 002D9DDC 48 08 53 39 */ bl _savegpr_27 /* 802DCEA0 002D9DE0 7C 7B 1B 78 */ mr r27, r3 /* 802DCEA4 002D9DE4 7C BC 2B 79 */ or. r28, r5, r5 /* 802DCEA8 002D9DE8 7C 9E 23 78 */ mr r30, r4 @@ -341,7 +341,7 @@ lbl_802DD0D4: /* 802DD114 002DA054 7F A3 EB 78 */ mr r3, r29 lbl_802DD118: /* 802DD118 002DA058 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DD11C 002DA05C 48 08 51 05 */ bl func_80362220 +/* 802DD11C 002DA05C 48 08 51 05 */ bl _restgpr_27 /* 802DD120 002DA060 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DD124 002DA064 7C 08 03 A6 */ mtlr r0 /* 802DD128 002DA068 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JKernel/JKRAram.s b/asm/JKernel/JKRAram.s index 3ad978b8ad..7f1cf579f0 100644 --- a/asm/JKernel/JKRAram.s +++ b/asm/JKernel/JKRAram.s @@ -9,7 +9,7 @@ JKRAram_NS_create: /* 802D1FA8 002CEEE8 7C 08 02 A6 */ mflr r0 /* 802D1FAC 002CEEEC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D1FB0 002CEEF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1FB4 002CEEF4 48 09 02 21 */ bl func_803621D4 +/* 802D1FB4 002CEEF4 48 09 02 21 */ bl _savegpr_27 /* 802D1FB8 002CEEF8 7C 7B 1B 78 */ mr r27, r3 /* 802D1FBC 002CEEFC 7C 9C 23 78 */ mr r28, r4 /* 802D1FC0 002CEF00 7C BD 2B 78 */ mr r29, r5 @@ -41,7 +41,7 @@ lbl_802D2008: /* 802D2020 002CEF60 48 06 F7 95 */ bl OSResumeThread /* 802D2024 002CEF64 80 6D 8E 48 */ lwz r3, lbl_804513C8-_SDA_BASE_(r13) /* 802D2028 002CEF68 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D202C 002CEF6C 48 09 01 F5 */ bl func_80362220 +/* 802D202C 002CEF6C 48 09 01 F5 */ bl _restgpr_27 /* 802D2030 002CEF70 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D2034 002CEF74 7C 08 03 A6 */ mtlr r0 /* 802D2038 002CEF78 38 21 00 20 */ addi r1, r1, 0x20 @@ -53,7 +53,7 @@ JKRAram: /* 802D2044 002CEF84 7C 08 02 A6 */ mflr r0 /* 802D2048 002CEF88 90 01 00 24 */ stw r0, 0x24(r1) /* 802D204C 002CEF8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2050 002CEF90 48 09 01 89 */ bl func_803621D8 +/* 802D2050 002CEF90 48 09 01 89 */ bl _savegpr_28 /* 802D2054 002CEF94 7C 7C 1B 78 */ mr r28, r3 /* 802D2058 002CEF98 7C 9D 23 78 */ mr r29, r4 /* 802D205C 002CEF9C 7C BE 2B 78 */ mr r30, r5 @@ -116,7 +116,7 @@ lbl_802D212C: /* 802D212C 002CF06C 90 1C 00 94 */ stw r0, 0x94(r28) /* 802D2130 002CF070 7F 83 E3 78 */ mr r3, r28 /* 802D2134 002CF074 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2138 002CF078 48 09 00 ED */ bl func_80362224 +/* 802D2138 002CF078 48 09 00 ED */ bl _restgpr_28 /* 802D213C 002CF07C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D2140 002CF080 7C 08 03 A6 */ mtlr r0 /* 802D2144 002CF084 38 21 00 20 */ addi r1, r1, 0x20 @@ -972,7 +972,7 @@ nextSrcData: /* 802D2CE8 002CFC28 7C 08 02 A6 */ mflr r0 /* 802D2CEC 002CFC2C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D2CF0 002CFC30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2CF4 002CFC34 48 08 F4 E5 */ bl func_803621D8 +/* 802D2CF4 002CFC34 48 08 F4 E5 */ bl _savegpr_28 /* 802D2CF8 002CFC38 7C 64 1B 78 */ mr r4, r3 /* 802D2CFC 002CFC3C 80 0D 8E 50 */ lwz r0, lbl_804513D0-_SDA_BASE_(r13) /* 802D2D00 002CFC40 7F A4 00 50 */ subf r29, r4, r0 @@ -1017,7 +1017,7 @@ lbl_802D2D48: lbl_802D2D90: /* 802D2D90 002CFCD0 7F C3 F3 78 */ mr r3, r30 /* 802D2D94 002CFCD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2D98 002CFCD8 48 08 F4 8D */ bl func_80362224 +/* 802D2D98 002CFCD8 48 08 F4 8D */ bl _restgpr_28 /* 802D2D9C 002CFCDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D2DA0 002CFCE0 7C 08 03 A6 */ mtlr r0 /* 802D2DA4 002CFCE4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRAramArchive.s b/asm/JKernel/JKRAramArchive.s index f9919ed160..4d2075d24a 100644 --- a/asm/JKernel/JKRAramArchive.s +++ b/asm/JKernel/JKRAramArchive.s @@ -53,7 +53,7 @@ lbl_802D7150: /* 802D716C 002D40AC 7C 08 02 A6 */ mflr r0 /* 802D7170 002D40B0 90 01 00 24 */ stw r0, 0x24(r1) /* 802D7174 002D40B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7178 002D40B8 48 08 B0 61 */ bl func_803621D8 +/* 802D7178 002D40B8 48 08 B0 61 */ bl _savegpr_28 /* 802D717C 002D40BC 7C 7E 1B 79 */ or. r30, r3, r3 /* 802D7180 002D40C0 7C 9F 23 78 */ mr r31, r4 /* 802D7184 002D40C4 41 82 01 08 */ beq lbl_802D728C @@ -133,7 +133,7 @@ lbl_802D7270: lbl_802D728C: /* 802D728C 002D41CC 7F C3 F3 78 */ mr r3, r30 /* 802D7290 002D41D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7294 002D41D4 48 08 AF 91 */ bl func_80362224 +/* 802D7294 002D41D4 48 08 AF 91 */ bl _restgpr_28 /* 802D7298 002D41D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D729C 002D41DC 7C 08 03 A6 */ mtlr r0 /* 802D72A0 002D41E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -145,7 +145,7 @@ JKRAramArchive_NS_open: /* 802D72AC 002D41EC 7C 08 02 A6 */ mflr r0 /* 802D72B0 002D41F0 90 01 00 34 */ stw r0, 0x34(r1) /* 802D72B4 002D41F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D72B8 002D41F8 48 08 AF 1D */ bl func_803621D4 +/* 802D72B8 002D41F8 48 08 AF 1D */ bl _savegpr_27 /* 802D72BC 002D41FC 7C 7F 1B 78 */ mr r31, r3 /* 802D72C0 002D4200 7C 9C 23 78 */ mr r28, r4 /* 802D72C4 002D4204 38 00 00 00 */ li r0, 0 @@ -361,7 +361,7 @@ lbl_802D75C4: /* 802D75C4 002D4504 38 60 00 01 */ li r3, 1 lbl_802D75C8: /* 802D75C8 002D4508 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D75CC 002D450C 48 08 AC 55 */ bl func_80362220 +/* 802D75CC 002D450C 48 08 AC 55 */ bl _restgpr_27 /* 802D75D0 002D4510 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D75D4 002D4514 7C 08 03 A6 */ mtlr r0 /* 802D75D8 002D4518 38 21 00 30 */ addi r1, r1, 0x30 @@ -370,7 +370,7 @@ lbl_802D75C8: /* 802D75E4 002D4524 7C 08 02 A6 */ mflr r0 /* 802D75E8 002D4528 90 01 00 24 */ stw r0, 0x24(r1) /* 802D75EC 002D452C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D75F0 002D4530 48 08 AB E9 */ bl func_803621D8 +/* 802D75F0 002D4530 48 08 AB E9 */ bl _savegpr_28 /* 802D75F4 002D4534 7C 7C 1B 78 */ mr r28, r3 /* 802D75F8 002D4538 7C 9D 23 78 */ mr r29, r4 /* 802D75FC 002D453C 7C BE 2B 79 */ or. r30, r5, r5 @@ -439,7 +439,7 @@ lbl_802D76D8: /* 802D76D8 002D4618 80 7D 00 10 */ lwz r3, 0x10(r29) lbl_802D76DC: /* 802D76DC 002D461C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D76E0 002D4620 48 08 AB 45 */ bl func_80362224 +/* 802D76E0 002D4620 48 08 AB 45 */ bl _restgpr_28 /* 802D76E4 002D4624 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D76E8 002D4628 7C 08 03 A6 */ mtlr r0 /* 802D76EC 002D462C 38 21 00 20 */ addi r1, r1, 0x20 @@ -448,7 +448,7 @@ lbl_802D76DC: /* 802D76F8 002D4638 7C 08 02 A6 */ mflr r0 /* 802D76FC 002D463C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D7700 002D4640 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7704 002D4644 48 08 AA D1 */ bl func_803621D4 +/* 802D7704 002D4644 48 08 AA D1 */ bl _savegpr_27 /* 802D7708 002D4648 7C 9B 23 78 */ mr r27, r4 /* 802D770C 002D464C 7C BC 2B 78 */ mr r28, r5 /* 802D7710 002D4650 7C DD 33 78 */ mr r29, r6 @@ -513,7 +513,7 @@ lbl_802D77D0: lbl_802D77DC: /* 802D77DC 002D471C 7F 63 DB 78 */ mr r3, r27 /* 802D77E0 002D4720 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D77E4 002D4724 48 08 AA 3D */ bl func_80362220 +/* 802D77E4 002D4724 48 08 AA 3D */ bl _restgpr_27 /* 802D77E8 002D4728 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D77EC 002D472C 7C 08 03 A6 */ mtlr r0 /* 802D77F0 002D4730 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRAramBlock.s b/asm/JKernel/JKRAramBlock.s index 4568597f54..a791ea1803 100644 --- a/asm/JKernel/JKRAramBlock.s +++ b/asm/JKernel/JKRAramBlock.s @@ -135,7 +135,7 @@ JKRAramBlock_NS_allocTail: /* 802D34D4 002D0414 7C 08 02 A6 */ mflr r0 /* 802D34D8 002D0418 90 01 00 24 */ stw r0, 0x24(r1) /* 802D34DC 002D041C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D34E0 002D0420 48 08 EC F5 */ bl func_803621D4 +/* 802D34E0 002D0420 48 08 EC F5 */ bl _savegpr_27 /* 802D34E4 002D0424 7C 7B 1B 78 */ mr r27, r3 /* 802D34E8 002D0428 7C 9C 23 78 */ mr r28, r4 /* 802D34EC 002D042C 7C BD 2B 78 */ mr r29, r5 @@ -168,7 +168,7 @@ lbl_802D353C: /* 802D3554 002D0494 48 00 8B 41 */ bl JSUPtrList_NS_insert /* 802D3558 002D0498 7F E3 FB 78 */ mr r3, r31 /* 802D355C 002D049C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D3560 002D04A0 48 08 EC C1 */ bl func_80362220 +/* 802D3560 002D04A0 48 08 EC C1 */ bl _restgpr_27 /* 802D3564 002D04A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D3568 002D04A8 7C 08 03 A6 */ mtlr r0 /* 802D356C 002D04AC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRAramPiece.s b/asm/JKernel/JKRAramPiece.s index bab415b4c2..9f81694b9a 100644 --- a/asm/JKernel/JKRAramPiece.s +++ b/asm/JKernel/JKRAramPiece.s @@ -205,7 +205,7 @@ JKRAramPiece_NS_orderSync: /* 802D383C 002D077C 7C 08 02 A6 */ mflr r0 /* 802D3840 002D0780 90 01 00 24 */ stw r0, 0x24(r1) /* 802D3844 002D0784 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D3848 002D0788 48 08 E9 8D */ bl func_803621D4 +/* 802D3848 002D0788 48 08 E9 8D */ bl _savegpr_27 /* 802D384C 002D078C 7C 7B 1B 78 */ mr r27, r3 /* 802D3850 002D0790 7C 9C 23 78 */ mr r28, r4 /* 802D3854 002D0794 7C BD 2B 78 */ mr r29, r5 @@ -233,7 +233,7 @@ JKRAramPiece_NS_orderSync: /* 802D38AC 002D07EC 48 06 B8 71 */ bl OSUnlockMutex /* 802D38B0 002D07F0 7F C3 F3 78 */ mr r3, r30 /* 802D38B4 002D07F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D38B8 002D07F8 48 08 E9 69 */ bl func_80362220 +/* 802D38B8 002D07F8 48 08 E9 69 */ bl _restgpr_27 /* 802D38BC 002D07FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D38C0 002D0800 7C 08 03 A6 */ mtlr r0 /* 802D38C4 002D0804 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRArchivePri.s b/asm/JKernel/JKRArchivePri.s index d0bfcc3e98..62aea70821 100644 --- a/asm/JKernel/JKRArchivePri.s +++ b/asm/JKernel/JKRArchivePri.s @@ -127,7 +127,7 @@ JKRArchive_NS_findDirectory: /* 802D6420 002D3360 7C 08 02 A6 */ mflr r0 /* 802D6424 002D3364 90 01 01 34 */ stw r0, 0x134(r1) /* 802D6428 002D3368 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D642C 002D336C 48 08 BD A9 */ bl func_803621D4 +/* 802D642C 002D336C 48 08 BD A9 */ bl _savegpr_27 /* 802D6430 002D3370 7C 7B 1B 78 */ mr r27, r3 /* 802D6434 002D3374 7C BD 2B 78 */ mr r29, r5 /* 802D6438 002D3378 28 04 00 00 */ cmplwi r4, 0 @@ -178,7 +178,7 @@ lbl_802D64D8: /* 802D64D8 002D3418 38 60 00 00 */ li r3, 0 lbl_802D64DC: /* 802D64DC 002D341C 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D64E0 002D3420 48 08 BD 41 */ bl func_80362220 +/* 802D64E0 002D3420 48 08 BD 41 */ bl _restgpr_27 /* 802D64E4 002D3424 80 01 01 34 */ lwz r0, 0x134(r1) /* 802D64E8 002D3428 7C 08 03 A6 */ mtlr r0 /* 802D64EC 002D342C 38 21 01 30 */ addi r1, r1, 0x130 @@ -190,7 +190,7 @@ JKRArchive_NS_findTypeResource: /* 802D64F8 002D3438 7C 08 02 A6 */ mflr r0 /* 802D64FC 002D343C 90 01 01 24 */ stw r0, 0x124(r1) /* 802D6500 002D3440 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D6504 002D3444 48 08 BC D5 */ bl func_803621D8 +/* 802D6504 002D3444 48 08 BC D5 */ bl _savegpr_28 /* 802D6508 002D3448 7C 7C 1B 78 */ mr r28, r3 /* 802D650C 002D344C 7C 9D 23 79 */ or. r29, r4, r4 /* 802D6510 002D3450 41 82 00 78 */ beq lbl_802D6588 @@ -230,7 +230,7 @@ lbl_802D6588: /* 802D6588 002D34C8 38 60 00 00 */ li r3, 0 lbl_802D658C: /* 802D658C 002D34CC 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D6590 002D34D0 48 08 BC 95 */ bl func_80362224 +/* 802D6590 002D34D0 48 08 BC 95 */ bl _restgpr_28 /* 802D6594 002D34D4 80 01 01 24 */ lwz r0, 0x124(r1) /* 802D6598 002D34D8 7C 08 03 A6 */ mtlr r0 /* 802D659C 002D34DC 38 21 01 20 */ addi r1, r1, 0x120 @@ -242,7 +242,7 @@ JKRArchive_NS_findFsResource: /* 802D65A8 002D34E8 7C 08 02 A6 */ mflr r0 /* 802D65AC 002D34EC 90 01 01 34 */ stw r0, 0x134(r1) /* 802D65B0 002D34F0 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D65B4 002D34F4 48 08 BC 21 */ bl func_803621D4 +/* 802D65B4 002D34F4 48 08 BC 21 */ bl _savegpr_27 /* 802D65B8 002D34F8 7C 7B 1B 78 */ mr r27, r3 /* 802D65BC 002D34FC 7C BD 2B 78 */ mr r29, r5 /* 802D65C0 002D3500 28 04 00 00 */ cmplwi r4, 0 @@ -296,7 +296,7 @@ lbl_802D6668: /* 802D6668 002D35A8 38 60 00 00 */ li r3, 0 lbl_802D666C: /* 802D666C 002D35AC 39 61 01 30 */ addi r11, r1, 0x130 -/* 802D6670 002D35B0 48 08 BB B1 */ bl func_80362220 +/* 802D6670 002D35B0 48 08 BB B1 */ bl _restgpr_27 /* 802D6674 002D35B4 80 01 01 34 */ lwz r0, 0x134(r1) /* 802D6678 002D35B8 7C 08 03 A6 */ mtlr r0 /* 802D667C 002D35BC 38 21 01 30 */ addi r1, r1, 0x130 @@ -322,7 +322,7 @@ JKRArchive_NS_findNameResource: /* 802D66B0 002D35F0 7C 08 02 A6 */ mflr r0 /* 802D66B4 002D35F4 90 01 01 24 */ stw r0, 0x124(r1) /* 802D66B8 002D35F8 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D66BC 002D35FC 48 08 BB 1D */ bl func_803621D8 +/* 802D66BC 002D35FC 48 08 BB 1D */ bl _savegpr_28 /* 802D66C0 002D3600 7C 7C 1B 78 */ mr r28, r3 /* 802D66C4 002D3604 83 C3 00 4C */ lwz r30, 0x4c(r3) /* 802D66C8 002D3608 38 61 00 08 */ addi r3, r1, 8 @@ -351,7 +351,7 @@ lbl_802D670C: /* 802D6718 002D3658 38 60 00 00 */ li r3, 0 lbl_802D671C: /* 802D671C 002D365C 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D6720 002D3660 48 08 BB 05 */ bl func_80362224 +/* 802D6720 002D3660 48 08 BB 05 */ bl _restgpr_28 /* 802D6724 002D3664 80 01 01 24 */ lwz r0, 0x124(r1) /* 802D6728 002D3668 7C 08 03 A6 */ mtlr r0 /* 802D672C 002D366C 38 21 01 20 */ addi r1, r1, 0x120 @@ -466,7 +466,7 @@ JKRArchive_NS_CArcName_NS_store_X1_: /* 802D6888 002D37C8 7C 08 02 A6 */ mflr r0 /* 802D688C 002D37CC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D6890 002D37D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6894 002D37D4 48 08 B9 45 */ bl func_803621D8 +/* 802D6894 002D37D4 48 08 B9 45 */ bl _savegpr_28 /* 802D6898 002D37D8 7C 7C 1B 78 */ mr r28, r3 /* 802D689C 002D37DC 7C 9D 23 78 */ mr r29, r4 /* 802D68A0 002D37E0 38 00 00 00 */ li r0, 0 @@ -509,7 +509,7 @@ lbl_802D6920: /* 802D6920 002D3860 38 7D 00 01 */ addi r3, r29, 1 lbl_802D6924: /* 802D6924 002D3864 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6928 002D3868 48 08 B8 FD */ bl func_80362224 +/* 802D6928 002D3868 48 08 B8 FD */ bl _restgpr_28 /* 802D692C 002D386C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6930 002D3870 7C 08 03 A6 */ mtlr r0 /* 802D6934 002D3874 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRArchivePub.s b/asm/JKernel/JKRArchivePub.s index 805d6f19a2..4e0c4576a4 100644 --- a/asm/JKernel/JKRArchivePub.s +++ b/asm/JKernel/JKRArchivePub.s @@ -112,7 +112,7 @@ JKRArchive_NS_mount_X2_: /* 802D58CC 002D280C 7C 08 02 A6 */ mflr r0 /* 802D58D0 002D2810 90 01 00 24 */ stw r0, 0x24(r1) /* 802D58D4 002D2814 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D58D8 002D2818 48 08 C8 FD */ bl func_803621D4 +/* 802D58D8 002D2818 48 08 C8 FD */ bl _savegpr_27 /* 802D58DC 002D281C 7C 7B 1B 78 */ mr r27, r3 /* 802D58E0 002D2820 7C 9C 23 78 */ mr r28, r4 /* 802D58E4 002D2824 7C BD 2B 78 */ mr r29, r5 @@ -210,7 +210,7 @@ lbl_802D5A1C: /* 802D5A1C 002D295C 7F E3 FB 78 */ mr r3, r31 lbl_802D5A20: /* 802D5A20 002D2960 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5A24 002D2964 48 08 C7 FD */ bl func_80362220 +/* 802D5A24 002D2964 48 08 C7 FD */ bl _restgpr_27 /* 802D5A28 002D2968 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5A2C 002D296C 7C 08 03 A6 */ mtlr r0 /* 802D5A30 002D2970 38 21 00 20 */ addi r1, r1, 0x20 @@ -626,7 +626,7 @@ lbl_802D5F9C: /* 802D5FB8 002D2EF8 7C 08 02 A6 */ mflr r0 /* 802D5FBC 002D2EFC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5FC0 002D2F00 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5FC4 002D2F04 48 08 C2 15 */ bl func_803621D8 +/* 802D5FC4 002D2F04 48 08 C2 15 */ bl _savegpr_28 /* 802D5FC8 002D2F08 7C 7C 1B 78 */ mr r28, r3 /* 802D5FCC 002D2F0C 80 03 00 44 */ lwz r0, 0x44(r3) /* 802D5FD0 002D2F10 28 00 00 00 */ cmplwi r0, 0 @@ -655,7 +655,7 @@ lbl_802D6014: /* 802D6020 002D2F60 41 80 FF D4 */ blt lbl_802D5FF4 lbl_802D6024: /* 802D6024 002D2F64 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6028 002D2F68 48 08 C1 FD */ bl func_80362224 +/* 802D6028 002D2F68 48 08 C1 FD */ bl _restgpr_28 /* 802D602C 002D2F6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6030 002D2F70 7C 08 03 A6 */ mtlr r0 /* 802D6034 002D2F74 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRCompArchive.s b/asm/JKernel/JKRCompArchive.s index f1765164d5..2f5fcb7bcb 100644 --- a/asm/JKernel/JKRCompArchive.s +++ b/asm/JKernel/JKRCompArchive.s @@ -53,7 +53,7 @@ lbl_802D8864: /* 802D8880 002D57C0 7C 08 02 A6 */ mflr r0 /* 802D8884 002D57C4 90 01 00 24 */ stw r0, 0x24(r1) /* 802D8888 002D57C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D888C 002D57CC 48 08 99 4D */ bl func_803621D8 +/* 802D888C 002D57CC 48 08 99 4D */ bl _savegpr_28 /* 802D8890 002D57D0 7C 7E 1B 79 */ or. r30, r3, r3 /* 802D8894 002D57D4 7C 9F 23 78 */ mr r31, r4 /* 802D8898 002D57D8 41 82 01 08 */ beq lbl_802D89A0 @@ -132,7 +132,7 @@ lbl_802D896C: lbl_802D89A0: /* 802D89A0 002D58E0 7F C3 F3 78 */ mr r3, r30 /* 802D89A4 002D58E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D89A8 002D58E8 48 08 98 7D */ bl func_80362224 +/* 802D89A8 002D58E8 48 08 98 7D */ bl _restgpr_28 /* 802D89AC 002D58EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D89B0 002D58F0 7C 08 03 A6 */ mtlr r0 /* 802D89B4 002D58F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -523,7 +523,7 @@ lbl_802D8F28: /* 802D8F44 002D5E84 7C 08 02 A6 */ mflr r0 /* 802D8F48 002D5E88 90 01 00 34 */ stw r0, 0x34(r1) /* 802D8F4C 002D5E8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D8F50 002D5E90 48 08 92 89 */ bl func_803621D8 +/* 802D8F50 002D5E90 48 08 92 89 */ bl _savegpr_28 /* 802D8F54 002D5E94 7C 7C 1B 78 */ mr r28, r3 /* 802D8F58 002D5E98 7C 9D 23 78 */ mr r29, r4 /* 802D8F5C 002D5E9C 7C BE 2B 78 */ mr r30, r5 @@ -619,7 +619,7 @@ lbl_802D9098: lbl_802D90A4: /* 802D90A4 002D5FE4 80 7D 00 10 */ lwz r3, 0x10(r29) /* 802D90A8 002D5FE8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D90AC 002D5FEC 48 08 91 79 */ bl func_80362224 +/* 802D90AC 002D5FEC 48 08 91 79 */ bl _restgpr_28 /* 802D90B0 002D5FF0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D90B4 002D5FF4 7C 08 03 A6 */ mtlr r0 /* 802D90B8 002D5FF8 38 21 00 30 */ addi r1, r1, 0x30 @@ -743,7 +743,7 @@ lbl_802D9244: /* 802D9264 002D61A4 7C 08 02 A6 */ mflr r0 /* 802D9268 002D61A8 90 01 00 24 */ stw r0, 0x24(r1) /* 802D926C 002D61AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9270 002D61B0 48 08 8F 69 */ bl func_803621D8 +/* 802D9270 002D61B0 48 08 8F 69 */ bl _savegpr_28 /* 802D9274 002D61B4 7C 7C 1B 78 */ mr r28, r3 /* 802D9278 002D61B8 80 03 00 44 */ lwz r0, 0x44(r3) /* 802D927C 002D61BC 28 00 00 00 */ cmplwi r0, 0 @@ -776,7 +776,7 @@ lbl_802D92CC: /* 802D92D8 002D6218 41 80 FF C8 */ blt lbl_802D92A0 lbl_802D92DC: /* 802D92DC 002D621C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D92E0 002D6220 48 08 8F 45 */ bl func_80362224 +/* 802D92E0 002D6220 48 08 8F 45 */ bl _restgpr_28 /* 802D92E4 002D6224 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D92E8 002D6228 7C 08 03 A6 */ mtlr r0 /* 802D92EC 002D622C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRDecomp.s b/asm/JKernel/JKRDecomp.s index 4e539cef90..bbbb158262 100644 --- a/asm/JKernel/JKRDecomp.s +++ b/asm/JKernel/JKRDecomp.s @@ -140,7 +140,7 @@ JKRDecomp_NS_prepareCommand: /* 802DB85C 002D879C 7C 08 02 A6 */ mflr r0 /* 802DB860 002D87A0 90 01 00 24 */ stw r0, 0x24(r1) /* 802DB864 002D87A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB868 002D87A8 48 08 69 6D */ bl func_803621D4 +/* 802DB868 002D87A8 48 08 69 6D */ bl _savegpr_27 /* 802DB86C 002D87AC 7C 7B 1B 78 */ mr r27, r3 /* 802DB870 002D87B0 7C 9C 23 78 */ mr r28, r4 /* 802DB874 002D87B4 7C BD 2B 78 */ mr r29, r5 @@ -162,7 +162,7 @@ lbl_802DB8A0: /* 802DB8B0 002D87F0 93 E4 00 14 */ stw r31, 0x14(r4) /* 802DB8B4 002D87F4 7C 83 23 78 */ mr r3, r4 /* 802DB8B8 002D87F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB8BC 002D87FC 48 08 69 65 */ bl func_80362220 +/* 802DB8BC 002D87FC 48 08 69 65 */ bl _restgpr_27 /* 802DB8C0 002D8800 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DB8C4 002D8804 7C 08 03 A6 */ mtlr r0 /* 802DB8C8 002D8808 38 21 00 20 */ addi r1, r1, 0x20 @@ -255,7 +255,7 @@ JKRDecomp_NS_decode: /* 802DB9E0 002D8920 7C 08 02 A6 */ mflr r0 /* 802DB9E4 002D8924 90 01 00 24 */ stw r0, 0x24(r1) /* 802DB9E8 002D8928 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB9EC 002D892C 48 08 67 ED */ bl func_803621D8 +/* 802DB9EC 002D892C 48 08 67 ED */ bl _savegpr_28 /* 802DB9F0 002D8930 7C 7C 1B 78 */ mr r28, r3 /* 802DB9F4 002D8934 7C 9D 23 78 */ mr r29, r4 /* 802DB9F8 002D8938 7C BE 2B 78 */ mr r30, r5 @@ -279,7 +279,7 @@ lbl_802DBA24: /* 802DBA3C 002D897C 48 00 01 D9 */ bl JKRDecomp_NS_decodeSZS lbl_802DBA40: /* 802DBA40 002D8980 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBA44 002D8984 48 08 67 E1 */ bl func_80362224 +/* 802DBA44 002D8984 48 08 67 E1 */ bl _restgpr_28 /* 802DBA48 002D8988 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DBA4C 002D898C 7C 08 03 A6 */ mtlr r0 /* 802DBA50 002D8990 38 21 00 20 */ addi r1, r1, 0x20 @@ -291,7 +291,7 @@ JKRDecomp_NS_decodeSZP: /* 802DBA5C 002D899C 7C 08 02 A6 */ mflr r0 /* 802DBA60 002D89A0 90 01 00 24 */ stw r0, 0x24(r1) /* 802DBA64 002D89A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBA68 002D89A8 48 08 67 6D */ bl func_803621D4 +/* 802DBA68 002D89A8 48 08 67 6D */ bl _savegpr_27 /* 802DBA6C 002D89AC 89 23 00 07 */ lbz r9, 7(r3) /* 802DBA70 002D89B0 89 03 00 06 */ lbz r8, 6(r3) /* 802DBA74 002D89B4 88 E3 00 04 */ lbz r7, 4(r3) @@ -406,7 +406,7 @@ lbl_802DBBEC: /* 802DBBF8 002D8B38 41 80 FE F8 */ blt lbl_802DBAF0 lbl_802DBBFC: /* 802DBBFC 002D8B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBC00 002D8B40 48 08 66 21 */ bl func_80362220 +/* 802DBC00 002D8B40 48 08 66 21 */ bl _restgpr_27 /* 802DBC04 002D8B44 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DBC08 002D8B48 7C 08 03 A6 */ mtlr r0 /* 802DBC0C 002D8B4C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRDvdArchive.s b/asm/JKernel/JKRDvdArchive.s index 6b6412609b..ed3651a4fb 100644 --- a/asm/JKernel/JKRDvdArchive.s +++ b/asm/JKernel/JKRDvdArchive.s @@ -53,7 +53,7 @@ lbl_802D7C80: /* 802D7C9C 002D4BDC 7C 08 02 A6 */ mflr r0 /* 802D7CA0 002D4BE0 90 01 00 24 */ stw r0, 0x24(r1) /* 802D7CA4 002D4BE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7CA8 002D4BE8 48 08 A5 31 */ bl func_803621D8 +/* 802D7CA8 002D4BE8 48 08 A5 31 */ bl _savegpr_28 /* 802D7CAC 002D4BEC 7C 7F 1B 79 */ or. r31, r3, r3 /* 802D7CB0 002D4BF0 7C 9C 23 78 */ mr r28, r4 /* 802D7CB4 002D4BF4 41 82 00 E4 */ beq lbl_802D7D98 @@ -123,7 +123,7 @@ lbl_802D7D7C: lbl_802D7D98: /* 802D7D98 002D4CD8 7F E3 FB 78 */ mr r3, r31 /* 802D7D9C 002D4CDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7DA0 002D4CE0 48 08 A4 85 */ bl func_80362224 +/* 802D7DA0 002D4CE0 48 08 A4 85 */ bl _restgpr_28 /* 802D7DA4 002D4CE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D7DA8 002D4CE8 7C 08 03 A6 */ mtlr r0 /* 802D7DAC 002D4CEC 38 21 00 20 */ addi r1, r1, 0x20 @@ -135,7 +135,7 @@ JKRDvdArchive_NS_open: /* 802D7DB8 002D4CF8 7C 08 02 A6 */ mflr r0 /* 802D7DBC 002D4CFC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D7DC0 002D4D00 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7DC4 002D4D04 48 08 A4 15 */ bl func_803621D8 +/* 802D7DC4 002D4D04 48 08 A4 15 */ bl _savegpr_28 /* 802D7DC8 002D4D08 7C 7D 1B 78 */ mr r29, r3 /* 802D7DCC 002D4D0C 7C 9C 23 78 */ mr r28, r4 /* 802D7DD0 002D4D10 38 00 00 00 */ li r0, 0 @@ -308,7 +308,7 @@ lbl_802D8034: /* 802D8034 002D4F74 38 60 00 01 */ li r3, 1 lbl_802D8038: /* 802D8038 002D4F78 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D803C 002D4F7C 48 08 A1 E9 */ bl func_80362224 +/* 802D803C 002D4F7C 48 08 A1 E9 */ bl _restgpr_28 /* 802D8040 002D4F80 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D8044 002D4F84 7C 08 03 A6 */ mtlr r0 /* 802D8048 002D4F88 38 21 00 20 */ addi r1, r1, 0x20 @@ -317,7 +317,7 @@ lbl_802D8038: /* 802D8054 002D4F94 7C 08 02 A6 */ mflr r0 /* 802D8058 002D4F98 90 01 00 24 */ stw r0, 0x24(r1) /* 802D805C 002D4F9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8060 002D4FA0 48 08 A1 79 */ bl func_803621D8 +/* 802D8060 002D4FA0 48 08 A1 79 */ bl _savegpr_28 /* 802D8064 002D4FA4 7C 7C 1B 78 */ mr r28, r3 /* 802D8068 002D4FA8 7C 9D 23 78 */ mr r29, r4 /* 802D806C 002D4FAC 7C BE 2B 79 */ or. r30, r5, r5 @@ -387,7 +387,7 @@ lbl_802D814C: /* 802D814C 002D508C 80 7D 00 10 */ lwz r3, 0x10(r29) lbl_802D8150: /* 802D8150 002D5090 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8154 002D5094 48 08 A0 D1 */ bl func_80362224 +/* 802D8154 002D5094 48 08 A0 D1 */ bl _restgpr_28 /* 802D8158 002D5098 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D815C 002D509C 7C 08 03 A6 */ mtlr r0 /* 802D8160 002D50A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -396,7 +396,7 @@ lbl_802D8150: /* 802D816C 002D50AC 7C 08 02 A6 */ mflr r0 /* 802D8170 002D50B0 90 01 00 24 */ stw r0, 0x24(r1) /* 802D8174 002D50B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8178 002D50B8 48 08 A0 5D */ bl func_803621D4 +/* 802D8178 002D50B8 48 08 A0 5D */ bl _savegpr_27 /* 802D817C 002D50BC 7C 69 1B 78 */ mr r9, r3 /* 802D8180 002D50C0 7C 9B 23 78 */ mr r27, r4 /* 802D8184 002D50C4 7C BC 2B 78 */ mr r28, r5 @@ -460,7 +460,7 @@ lbl_802D8244: lbl_802D8250: /* 802D8250 002D5190 7F 63 DB 78 */ mr r3, r27 /* 802D8254 002D5194 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8258 002D5198 48 08 9F C9 */ bl func_80362220 +/* 802D8258 002D5198 48 08 9F C9 */ bl _restgpr_27 /* 802D825C 002D519C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D8260 002D51A0 7C 08 03 A6 */ mtlr r0 /* 802D8264 002D51A4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRDvdFile.s b/asm/JKernel/JKRDvdFile.s index 004b904c56..c3f4ed1bd1 100644 --- a/asm/JKernel/JKRDvdFile.s +++ b/asm/JKernel/JKRDvdFile.s @@ -306,7 +306,7 @@ lbl_802D99A0: /* 802D99B8 002D68F8 7C 08 02 A6 */ mflr r0 /* 802D99BC 002D68FC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D99C0 002D6900 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D99C4 002D6904 48 08 88 11 */ bl func_803621D4 +/* 802D99C4 002D6904 48 08 88 11 */ bl _savegpr_27 /* 802D99C8 002D6908 7C 7B 1B 78 */ mr r27, r3 /* 802D99CC 002D690C 7C 9C 23 78 */ mr r28, r4 /* 802D99D0 002D6910 7C BD 2B 78 */ mr r29, r5 @@ -347,7 +347,7 @@ lbl_802D9A3C: /* 802D9A4C 002D698C 7F E3 FB 78 */ mr r3, r31 lbl_802D9A50: /* 802D9A50 002D6990 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9A54 002D6994 48 08 87 CD */ bl func_80362220 +/* 802D9A54 002D6994 48 08 87 CD */ bl _restgpr_27 /* 802D9A58 002D6998 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D9A5C 002D699C 7C 08 03 A6 */ mtlr r0 /* 802D9A60 002D69A0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRDvdRipper.s b/asm/JKernel/JKRDvdRipper.s index d88c4a779d..00febb3a1a 100644 --- a/asm/JKernel/JKRDvdRipper.s +++ b/asm/JKernel/JKRDvdRipper.s @@ -834,7 +834,7 @@ nextSrcData_X1_: /* 802DA6DC 002D761C 7C 08 02 A6 */ mflr r0 /* 802DA6E0 002D7620 90 01 00 24 */ stw r0, 0x24(r1) /* 802DA6E4 002D7624 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DA6E8 002D7628 48 08 7A F1 */ bl func_803621D8 +/* 802DA6E8 002D7628 48 08 7A F1 */ bl _savegpr_28 /* 802DA6EC 002D762C 7C 64 1B 78 */ mr r4, r3 /* 802DA6F0 002D7630 80 0D 8E AC */ lwz r0, lbl_8045142C-_SDA_BASE_(r13) /* 802DA6F4 002D7634 7F A4 00 50 */ subf r29, r4, r0 @@ -899,7 +899,7 @@ lbl_802DA7B8: /* 802DA7B8 002D76F8 7F 83 E3 78 */ mr r3, r28 lbl_802DA7BC: /* 802DA7BC 002D76FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DA7C0 002D7700 48 08 7A 65 */ bl func_80362224 +/* 802DA7C0 002D7700 48 08 7A 65 */ bl _restgpr_28 /* 802DA7C4 002D7704 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DA7C8 002D7708 7C 08 03 A6 */ mtlr r0 /* 802DA7CC 002D770C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRExpHeap.s b/asm/JKernel/JKRExpHeap.s index 304b1af54c..7705abdacd 100644 --- a/asm/JKernel/JKRExpHeap.s +++ b/asm/JKernel/JKRExpHeap.s @@ -44,7 +44,7 @@ JKRExpHeap_NS_create: /* 802CEE30 002CBD70 7C 08 02 A6 */ mflr r0 /* 802CEE34 002CBD74 90 01 00 24 */ stw r0, 0x24(r1) /* 802CEE38 002CBD78 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEE3C 002CBD7C 48 09 33 9D */ bl func_803621D8 +/* 802CEE3C 002CBD7C 48 09 33 9D */ bl _savegpr_28 /* 802CEE40 002CBD80 7C 9C 23 79 */ or. r28, r4, r4 /* 802CEE44 002CBD84 7C BD 2B 78 */ mr r29, r5 /* 802CEE48 002CBD88 40 82 00 08 */ bne lbl_802CEE50 @@ -95,7 +95,7 @@ lbl_802CEEDC: /* 802CEEE4 002CBE24 7C A3 2B 78 */ mr r3, r5 lbl_802CEEE8: /* 802CEEE8 002CBE28 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEEEC 002CBE2C 48 09 33 39 */ bl func_80362224 +/* 802CEEEC 002CBE2C 48 09 33 39 */ bl _restgpr_28 /* 802CEEF0 002CBE30 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CEEF4 002CBE34 7C 08 03 A6 */ mtlr r0 /* 802CEEF8 002CBE38 38 21 00 20 */ addi r1, r1, 0x20 @@ -256,7 +256,7 @@ lbl_802CF10C: /* 802CF12C 002CC06C 7C 08 02 A6 */ mflr r0 /* 802CF130 002CC070 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF134 002CC074 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF138 002CC078 48 09 30 A1 */ bl func_803621D8 +/* 802CF138 002CC078 48 09 30 A1 */ bl _savegpr_28 /* 802CF13C 002CC07C 7C 7C 1B 78 */ mr r28, r3 /* 802CF140 002CC080 7C 9D 23 78 */ mr r29, r4 /* 802CF144 002CC084 7C BE 2B 78 */ mr r30, r5 @@ -320,7 +320,7 @@ lbl_802CF210: /* 802CF214 002CC154 48 06 FF 09 */ bl OSUnlockMutex /* 802CF218 002CC158 7F E3 FB 78 */ mr r3, r31 /* 802CF21C 002CC15C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF220 002CC160 48 09 30 05 */ bl func_80362224 +/* 802CF220 002CC160 48 09 30 05 */ bl _restgpr_28 /* 802CF224 002CC164 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF228 002CC168 7C 08 03 A6 */ mtlr r0 /* 802CF22C 002CC16C 38 21 00 20 */ addi r1, r1, 0x20 @@ -569,7 +569,7 @@ JKRExpHeap_NS_allocFromTail: /* 802CF578 002CC4B8 7C 08 02 A6 */ mflr r0 /* 802CF57C 002CC4BC 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF580 002CC4C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF584 002CC4C4 48 09 2C 51 */ bl func_803621D4 +/* 802CF584 002CC4C4 48 09 2C 51 */ bl _savegpr_27 /* 802CF588 002CC4C8 7C 7B 1B 78 */ mr r27, r3 /* 802CF58C 002CC4CC 3B E0 00 00 */ li r31, 0 /* 802CF590 002CC4D0 3B C0 00 00 */ li r30, 0 @@ -656,7 +656,7 @@ lbl_802CF6B8: /* 802CF6B8 002CC5F8 38 60 00 00 */ li r3, 0 lbl_802CF6BC: /* 802CF6BC 002CC5FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF6C0 002CC600 48 09 2B 61 */ bl func_80362220 +/* 802CF6C0 002CC600 48 09 2B 61 */ bl _restgpr_27 /* 802CF6C4 002CC604 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF6C8 002CC608 7C 08 03 A6 */ mtlr r0 /* 802CF6CC 002CC60C 38 21 00 20 */ addi r1, r1, 0x20 @@ -850,7 +850,7 @@ lbl_802CF8FC: /* 802CF97C 002CC8BC 7C 08 02 A6 */ mflr r0 /* 802CF980 002CC8C0 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF984 002CC8C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF988 002CC8C8 48 09 28 51 */ bl func_803621D8 +/* 802CF988 002CC8C8 48 09 28 51 */ bl _savegpr_28 /* 802CF98C 002CC8CC 7C 7D 1B 78 */ mr r29, r3 /* 802CF990 002CC8D0 7C 9C 23 78 */ mr r28, r4 /* 802CF994 002CC8D4 7C BE 2B 78 */ mr r30, r5 @@ -960,7 +960,7 @@ lbl_802CFB00: /* 802CFB08 002CCA48 80 7F 00 04 */ lwz r3, 4(r31) lbl_802CFB0C: /* 802CFB0C 002CCA4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CFB10 002CCA50 48 09 27 15 */ bl func_80362224 +/* 802CFB10 002CCA50 48 09 27 15 */ bl _restgpr_28 /* 802CFB14 002CCA54 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CFB18 002CCA58 7C 08 03 A6 */ mtlr r0 /* 802CFB1C 002CCA5C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1387,7 +1387,7 @@ JKRExpHeap_NS_joinTwoBlocks: /* 802D00B8 002CCFF8 7C 08 02 A6 */ mflr r0 /* 802D00BC 002CCFFC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D00C0 002CD000 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D00C4 002CD004 48 09 21 11 */ bl func_803621D4 +/* 802D00C4 002CD004 48 09 21 11 */ bl _savegpr_27 /* 802D00C8 002CD008 7C 7E 1B 78 */ mr r30, r3 /* 802D00CC 002CD00C 7C 9F 23 78 */ mr r31, r4 /* 802D00D0 002CD010 80 04 00 04 */ lwz r0, 4(r4) @@ -1435,7 +1435,7 @@ lbl_802D013C: /* 802D0174 002CD0B4 4B FF FC F5 */ bl JKRExpHeap_NS_setFreeBlock lbl_802D0178: /* 802D0178 002CD0B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D017C 002CD0BC 48 09 20 A5 */ bl func_80362220 +/* 802D017C 002CD0BC 48 09 20 A5 */ bl _restgpr_27 /* 802D0180 002CD0C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D0184 002CD0C4 7C 08 03 A6 */ mtlr r0 /* 802D0188 002CD0C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1444,7 +1444,7 @@ lbl_802D0178: /* 802D0194 002CD0D4 7C 08 02 A6 */ mflr r0 /* 802D0198 002CD0D8 90 01 00 24 */ stw r0, 0x24(r1) /* 802D019C 002CD0DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D01A0 002CD0E0 48 09 20 39 */ bl func_803621D8 +/* 802D01A0 002CD0E0 48 09 20 39 */ bl _savegpr_28 /* 802D01A4 002CD0E4 7C 7C 1B 78 */ mr r28, r3 /* 802D01A8 002CD0E8 38 7C 00 18 */ addi r3, r28, 0x18 /* 802D01AC 002CD0EC 48 06 EE 95 */ bl OSLockMutex @@ -1587,7 +1587,7 @@ lbl_802D0394: /* 802D0398 002CD2D8 48 06 ED 85 */ bl OSUnlockMutex /* 802D039C 002CD2DC 7F C3 F3 78 */ mr r3, r30 /* 802D03A0 002CD2E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D03A4 002CD2E4 48 09 1E 81 */ bl func_80362224 +/* 802D03A4 002CD2E4 48 09 1E 81 */ bl _restgpr_28 /* 802D03A8 002CD2E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D03AC 002CD2EC 7C 08 03 A6 */ mtlr r0 /* 802D03B0 002CD2F0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRFile.s b/asm/JKernel/JKRFile.s index dccee56b38..2111624b1a 100644 --- a/asm/JKernel/JKRFile.s +++ b/asm/JKernel/JKRFile.s @@ -9,7 +9,7 @@ JKRFile_NS_read: /* 802D951C 002D645C 7C 08 02 A6 */ mflr r0 /* 802D9520 002D6460 90 01 00 24 */ stw r0, 0x24(r1) /* 802D9524 002D6464 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9528 002D6468 48 08 8C B1 */ bl func_803621D8 +/* 802D9528 002D6468 48 08 8C B1 */ bl _savegpr_28 /* 802D952C 002D646C 7C 7C 1B 78 */ mr r28, r3 /* 802D9530 002D6470 7C 9D 23 78 */ mr r29, r4 /* 802D9534 002D6474 7C BE 2B 78 */ mr r30, r5 @@ -29,7 +29,7 @@ lbl_802D953C: /* 802D9568 002D64A8 4B FF FF D4 */ b lbl_802D953C lbl_802D956C: /* 802D956C 002D64AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9570 002D64B0 48 08 8C B5 */ bl func_80362224 +/* 802D9570 002D64B0 48 08 8C B5 */ bl _restgpr_28 /* 802D9574 002D64B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D9578 002D64B8 7C 08 03 A6 */ mtlr r0 /* 802D957C 002D64BC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRFileCache.s b/asm/JKernel/JKRFileCache.s index fc4d8fc12a..37c0e08570 100644 --- a/asm/JKernel/JKRFileCache.s +++ b/asm/JKernel/JKRFileCache.s @@ -9,7 +9,7 @@ JKRFileCache_NS_mount: /* 802D49B8 002D18F8 7C 08 02 A6 */ mflr r0 /* 802D49BC 002D18FC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D49C0 002D1900 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D49C4 002D1904 48 08 D8 11 */ bl func_803621D4 +/* 802D49C4 002D1904 48 08 D8 11 */ bl _savegpr_27 /* 802D49C8 002D1908 7C 7E 1B 79 */ or. r30, r3, r3 /* 802D49CC 002D190C 7C 9B 23 78 */ mr r27, r4 /* 802D49D0 002D1910 7C BF 2B 78 */ mr r31, r5 @@ -72,7 +72,7 @@ lbl_802D4A98: /* 802D4A98 002D19D8 7C 03 03 78 */ mr r3, r0 lbl_802D4A9C: /* 802D4A9C 002D19DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4AA0 002D19E0 48 08 D7 81 */ bl func_80362220 +/* 802D4AA0 002D19E0 48 08 D7 81 */ bl _restgpr_27 /* 802D4AA4 002D19E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D4AA8 002D19E8 7C 08 03 A6 */ mtlr r0 /* 802D4AAC 002D19EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -84,7 +84,7 @@ JKRFileCache: /* 802D4AB8 002D19F8 7C 08 02 A6 */ mflr r0 /* 802D4ABC 002D19FC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D4AC0 002D1A00 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4AC4 002D1A04 48 08 D7 15 */ bl func_803621D8 +/* 802D4AC4 002D1A04 48 08 D7 15 */ bl _savegpr_28 /* 802D4AC8 002D1A08 7C 7F 1B 78 */ mr r31, r3 /* 802D4ACC 002D1A0C 7C 9C 23 78 */ mr r28, r4 /* 802D4AD0 002D1A10 7C BD 2B 78 */ mr r29, r5 @@ -117,10 +117,10 @@ JKRFileCache: /* 802D4B3C 002D1A7C 90 7F 00 4C */ stw r3, 0x4c(r31) /* 802D4B40 002D1A80 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802D4B44 002D1A84 7F 84 E3 78 */ mr r4, r28 -/* 802D4B48 002D1A88 48 09 3F E5 */ bl func_80368B2C +/* 802D4B48 002D1A88 48 09 3F E5 */ bl strcpy /* 802D4B4C 002D1A8C 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 802D4B50 002D1A90 7F 84 E3 78 */ mr r4, r28 -/* 802D4B54 002D1A94 48 09 3F D9 */ bl func_80368B2C +/* 802D4B54 002D1A94 48 09 3F D9 */ bl strcpy /* 802D4B58 002D1A98 88 1C 00 01 */ lbz r0, 1(r28) /* 802D4B5C 002D1A9C 7C 00 07 75 */ extsb. r0, r0 /* 802D4B60 002D1AA0 41 82 00 88 */ beq lbl_802D4BE8 @@ -151,7 +151,7 @@ lbl_802D4BA8: /* 802D4BC0 002D1B00 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D4BC4 002D1B04 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D4BC8 002D1B08 7F C4 F3 78 */ mr r4, r30 -/* 802D4BCC 002D1B0C 48 09 3F 61 */ bl func_80368B2C +/* 802D4BCC 002D1B0C 48 09 3F 61 */ bl strcpy /* 802D4BD0 002D1B10 7F E3 FB 78 */ mr r3, r31 /* 802D4BD4 002D1B14 80 9F 00 50 */ lwz r4, 0x50(r31) /* 802D4BD8 002D1B18 48 00 0A 4D */ bl JKRFileCache_NS_convStrLower @@ -175,7 +175,7 @@ lbl_802D4C00: /* 802D4C18 002D1B58 90 7F 00 50 */ stw r3, 0x50(r31) /* 802D4C1C 002D1B5C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802D4C20 002D1B60 7F C4 F3 78 */ mr r4, r30 -/* 802D4C24 002D1B64 48 09 3F 09 */ bl func_80368B2C +/* 802D4C24 002D1B64 48 09 3F 09 */ bl strcpy /* 802D4C28 002D1B68 7F E3 FB 78 */ mr r3, r31 /* 802D4C2C 002D1B6C 80 9F 00 50 */ lwz r4, 0x50(r31) /* 802D4C30 002D1B70 48 00 09 F5 */ bl JKRFileCache_NS_convStrLower @@ -190,7 +190,7 @@ lbl_802D4C3C: /* 802D4C50 002D1B90 98 1F 00 30 */ stb r0, 0x30(r31) /* 802D4C54 002D1B94 7F E3 FB 78 */ mr r3, r31 /* 802D4C58 002D1B98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4C5C 002D1B9C 48 08 D5 C9 */ bl func_80362224 +/* 802D4C5C 002D1B9C 48 08 D5 C9 */ bl _restgpr_28 /* 802D4C60 002D1BA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D4C64 002D1BA4 7C 08 03 A6 */ mtlr r0 /* 802D4C68 002D1BA8 38 21 00 20 */ addi r1, r1, 0x20 @@ -296,7 +296,7 @@ lbl_802D4DBC: /* 802D4DDC 002D1D1C 7C 08 02 A6 */ mflr r0 /* 802D4DE0 002D1D20 90 01 01 14 */ stw r0, 0x114(r1) /* 802D4DE4 002D1D24 39 61 01 10 */ addi r11, r1, 0x110 -/* 802D4DE8 002D1D28 48 08 D3 F1 */ bl func_803621D8 +/* 802D4DE8 002D1D28 48 08 D3 F1 */ bl _savegpr_28 /* 802D4DEC 002D1D2C 7C 7C 1B 78 */ mr r28, r3 /* 802D4DF0 002D1D30 3B E0 00 00 */ li r31, 0 /* 802D4DF4 002D1D34 48 00 07 29 */ bl JKRFileCache_NS_getDvdPathName @@ -355,7 +355,7 @@ lbl_802D4EA8: /* 802D4EBC 002D1DFC 48 00 48 8D */ bl JKRDvdFile_NS_dtor /* 802D4EC0 002D1E00 7F E3 FB 78 */ mr r3, r31 /* 802D4EC4 002D1E04 39 61 01 10 */ addi r11, r1, 0x110 -/* 802D4EC8 002D1E08 48 08 D3 5D */ bl func_80362224 +/* 802D4EC8 002D1E08 48 08 D3 5D */ bl _restgpr_28 /* 802D4ECC 002D1E0C 80 01 01 14 */ lwz r0, 0x114(r1) /* 802D4ED0 002D1E10 7C 08 03 A6 */ mtlr r0 /* 802D4ED4 002D1E14 38 21 01 10 */ addi r1, r1, 0x110 @@ -373,7 +373,7 @@ lbl_802D4EA8: /* 802D4F04 002D1E44 7F FF 1A 14 */ add r31, r31, r3 /* 802D4F08 002D1E48 38 61 00 08 */ addi r3, r1, 8 /* 802D4F0C 002D1E4C 80 9D 00 48 */ lwz r4, 0x48(r29) -/* 802D4F10 002D1E50 48 09 3C 1D */ bl func_80368B2C +/* 802D4F10 002D1E50 48 09 3C 1D */ bl strcpy /* 802D4F14 002D1E54 7F A3 EB 78 */ mr r3, r29 /* 802D4F18 002D1E58 38 81 00 08 */ addi r4, r1, 8 /* 802D4F1C 002D1E5C 7F C5 F3 78 */ mr r5, r30 @@ -400,7 +400,7 @@ lbl_802D4F4C: /* 802D4F68 002D1EA8 7C 08 02 A6 */ mflr r0 /* 802D4F6C 002D1EAC 90 01 01 24 */ stw r0, 0x124(r1) /* 802D4F70 002D1EB0 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D4F74 002D1EB4 48 08 D2 61 */ bl func_803621D4 +/* 802D4F74 002D1EB4 48 08 D2 61 */ bl _savegpr_27 /* 802D4F78 002D1EB8 7C 7B 1B 78 */ mr r27, r3 /* 802D4F7C 002D1EBC 7C 9C 23 78 */ mr r28, r4 /* 802D4F80 002D1EC0 7C BD 2B 78 */ mr r29, r5 @@ -449,7 +449,7 @@ lbl_802D5008: /* 802D501C 002D1F5C 48 00 47 2D */ bl JKRDvdFile_NS_dtor /* 802D5020 002D1F60 7F C3 F3 78 */ mr r3, r30 /* 802D5024 002D1F64 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D5028 002D1F68 48 08 D1 F9 */ bl func_80362220 +/* 802D5028 002D1F68 48 08 D1 F9 */ bl _restgpr_27 /* 802D502C 002D1F6C 80 01 01 24 */ lwz r0, 0x124(r1) /* 802D5030 002D1F70 7C 08 03 A6 */ mtlr r0 /* 802D5034 002D1F74 38 21 01 20 */ addi r1, r1, 0x120 @@ -458,7 +458,7 @@ lbl_802D5008: /* 802D5040 002D1F80 7C 08 02 A6 */ mflr r0 /* 802D5044 002D1F84 90 01 01 24 */ stw r0, 0x124(r1) /* 802D5048 002D1F88 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D504C 002D1F8C 48 08 D1 89 */ bl func_803621D4 +/* 802D504C 002D1F8C 48 08 D1 89 */ bl _savegpr_27 /* 802D5050 002D1F90 7C 7B 1B 78 */ mr r27, r3 /* 802D5054 002D1F94 7C 9C 23 78 */ mr r28, r4 /* 802D5058 002D1F98 7C BD 2B 78 */ mr r29, r5 @@ -469,7 +469,7 @@ lbl_802D5008: /* 802D506C 002D1FAC 7F FF 1A 14 */ add r31, r31, r3 /* 802D5070 002D1FB0 38 61 00 08 */ addi r3, r1, 8 /* 802D5074 002D1FB4 80 9B 00 48 */ lwz r4, 0x48(r27) -/* 802D5078 002D1FB8 48 09 3A B5 */ bl func_80368B2C +/* 802D5078 002D1FB8 48 09 3A B5 */ bl strcpy /* 802D507C 002D1FBC 7F 63 DB 78 */ mr r3, r27 /* 802D5080 002D1FC0 38 81 00 08 */ addi r4, r1, 8 /* 802D5084 002D1FC4 7F C5 F3 78 */ mr r5, r30 @@ -489,7 +489,7 @@ lbl_802D50B8: /* 802D50B8 002D1FF8 38 60 00 00 */ li r3, 0 lbl_802D50BC: /* 802D50BC 002D1FFC 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D50C0 002D2000 48 08 D1 61 */ bl func_80362220 +/* 802D50C0 002D2000 48 08 D1 61 */ bl _restgpr_27 /* 802D50C4 002D2004 80 01 01 24 */ lwz r0, 0x124(r1) /* 802D50C8 002D2008 7C 08 03 A6 */ mtlr r0 /* 802D50CC 002D200C 38 21 01 20 */ addi r1, r1, 0x120 @@ -762,7 +762,7 @@ lbl_802D5460: /* 802D5470 002D23B0 98 1E 00 00 */ stb r0, 0(r30) /* 802D5474 002D23B4 7F E3 FB 78 */ mr r3, r31 /* 802D5478 002D23B8 80 81 00 10 */ lwz r4, 0x10(r1) -/* 802D547C 002D23BC 48 09 36 B1 */ bl func_80368B2C +/* 802D547C 002D23BC 48 09 36 B1 */ bl strcpy /* 802D5480 002D23C0 7F 43 D3 78 */ mr r3, r26 /* 802D5484 002D23C4 7F 64 DB 78 */ mr r4, r27 /* 802D5488 002D23C8 7F 85 E3 78 */ mr r5, r28 @@ -832,7 +832,7 @@ JKRFileCache_NS_getDvdPathName: /* 802D556C 002D24AC 7C 60 1B 78 */ mr r0, r3 /* 802D5570 002D24B0 7C 1F 03 78 */ mr r31, r0 /* 802D5574 002D24B4 80 9D 00 48 */ lwz r4, 0x48(r29) -/* 802D5578 002D24B8 48 09 35 B5 */ bl func_80368B2C +/* 802D5578 002D24B8 48 09 35 B5 */ bl strcpy /* 802D557C 002D24BC 88 1E 00 01 */ lbz r0, 1(r30) /* 802D5580 002D24C0 7C 00 07 75 */ extsb. r0, r0 /* 802D5584 002D24C4 41 82 00 78 */ beq lbl_802D55FC @@ -863,7 +863,7 @@ lbl_802D55B8: /* 802D55E0 002D2520 7C 60 1B 78 */ mr r0, r3 /* 802D55E4 002D2524 7C 1F 03 78 */ mr r31, r0 /* 802D55E8 002D2528 80 9D 00 4C */ lwz r4, 0x4c(r29) -/* 802D55EC 002D252C 48 09 35 41 */ bl func_80368B2C +/* 802D55EC 002D252C 48 09 35 41 */ bl strcpy /* 802D55F0 002D2530 7F E3 FB 78 */ mr r3, r31 /* 802D55F4 002D2534 7F C4 F3 78 */ mr r4, r30 /* 802D55F8 002D2538 48 09 34 C5 */ bl func_80368ABC @@ -908,7 +908,7 @@ JKRFileCache_NS_CCacheBlock: /* 802D5670 002D25B0 7C 08 02 A6 */ mflr r0 /* 802D5674 002D25B4 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5678 002D25B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D567C 002D25BC 48 08 CB 5D */ bl func_803621D8 +/* 802D567C 002D25BC 48 08 CB 5D */ bl _savegpr_28 /* 802D5680 002D25C0 7C 7C 1B 78 */ mr r28, r3 /* 802D5684 002D25C4 7C 9D 23 78 */ mr r29, r4 /* 802D5688 002D25C8 7C BE 2B 78 */ mr r30, r5 @@ -922,7 +922,7 @@ JKRFileCache_NS_CCacheBlock: /* 802D56A8 002D25E8 93 FC 00 1C */ stw r31, 0x1c(r28) /* 802D56AC 002D25EC 7F 83 E3 78 */ mr r3, r28 /* 802D56B0 002D25F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D56B4 002D25F4 48 08 CB 71 */ bl func_80362224 +/* 802D56B4 002D25F4 48 08 CB 71 */ bl _restgpr_28 /* 802D56B8 002D25F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D56BC 002D25FC 7C 08 03 A6 */ mtlr r0 /* 802D56C0 002D2600 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRFileLoader.s b/asm/JKernel/JKRFileLoader.s index 66bf70cf32..ae64b0eb41 100644 --- a/asm/JKernel/JKRFileLoader.s +++ b/asm/JKernel/JKRFileLoader.s @@ -312,7 +312,7 @@ JKRFileLoader_NS_fetchVolumeName: /* 802D44F8 002D1438 40 82 00 18 */ bne lbl_802D4510 /* 802D44FC 002D143C 7F A3 EB 78 */ mr r3, r29 /* 802D4500 002D1440 38 8D 83 40 */ addi r4, r13, lbl_804508C0-_SDA_BASE_ -/* 802D4504 002D1444 48 09 46 29 */ bl func_80368B2C +/* 802D4504 002D1444 48 09 46 29 */ bl strcpy /* 802D4508 002D1448 38 6D 83 40 */ addi r3, r13, lbl_804508C0-_SDA_BASE_ /* 802D450C 002D144C 48 00 00 7C */ b lbl_802D4588 lbl_802D4510: diff --git a/asm/JKernel/JKRHeap.s b/asm/JKernel/JKRHeap.s index 7eb2c95fcb..8c09aa20e2 100644 --- a/asm/JKernel/JKRHeap.s +++ b/asm/JKernel/JKRHeap.s @@ -178,7 +178,7 @@ JKRHeap_NS_initArena: /* 802CE37C 002CB2BC 7C 08 02 A6 */ mflr r0 /* 802CE380 002CB2C0 90 01 00 24 */ stw r0, 0x24(r1) /* 802CE384 002CB2C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE388 002CB2C8 48 09 3E 4D */ bl func_803621D4 +/* 802CE388 002CB2C8 48 09 3E 4D */ bl _savegpr_27 /* 802CE38C 002CB2CC 7C 7B 1B 78 */ mr r27, r3 /* 802CE390 002CB2D0 7C 9C 23 78 */ mr r28, r4 /* 802CE394 002CB2D4 7C BF 2B 78 */ mr r31, r5 @@ -215,7 +215,7 @@ lbl_802CE3B8: /* 802CE40C 002CB34C 38 60 00 01 */ li r3, 1 lbl_802CE410: /* 802CE410 002CB350 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE414 002CB354 48 09 3E 0D */ bl func_80362220 +/* 802CE414 002CB354 48 09 3E 0D */ bl _restgpr_27 /* 802CE418 002CB358 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE41C 002CB35C 7C 08 03 A6 */ mtlr r0 /* 802CE420 002CB360 38 21 00 20 */ addi r1, r1, 0x20 @@ -686,7 +686,7 @@ JKRHeap_NS_dispose_subroutine: /* 802CE9E8 002CB928 7C 08 02 A6 */ mflr r0 /* 802CE9EC 002CB92C 90 01 00 24 */ stw r0, 0x24(r1) /* 802CE9F0 002CB930 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE9F4 002CB934 48 09 37 E5 */ bl func_803621D8 +/* 802CE9F4 002CB934 48 09 37 E5 */ bl _savegpr_28 /* 802CE9F8 002CB938 7C 7C 1B 78 */ mr r28, r3 /* 802CE9FC 002CB93C 7C 9D 23 78 */ mr r29, r4 /* 802CEA00 002CB940 7C BE 2B 78 */ mr r30, r5 @@ -718,7 +718,7 @@ lbl_802CEA58: /* 802CEA58 002CB998 28 04 00 00 */ cmplwi r4, 0 /* 802CEA5C 002CB99C 40 82 FF B4 */ bne lbl_802CEA10 /* 802CEA60 002CB9A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEA64 002CB9A4 48 09 37 C1 */ bl func_80362224 +/* 802CEA64 002CB9A4 48 09 37 C1 */ bl _restgpr_28 /* 802CEA68 002CB9A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CEA6C 002CB9AC 7C 08 03 A6 */ mtlr r0 /* 802CEA70 002CB9B0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRMemArchive.s b/asm/JKernel/JKRMemArchive.s index 3731234e84..3f30e1647a 100644 --- a/asm/JKernel/JKRMemArchive.s +++ b/asm/JKernel/JKRMemArchive.s @@ -59,7 +59,7 @@ JKRMemArchive_X1_: /* 802D6A70 002D39B0 7C 08 02 A6 */ mflr r0 /* 802D6A74 002D39B4 90 01 00 24 */ stw r0, 0x24(r1) /* 802D6A78 002D39B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6A7C 002D39BC 48 08 B7 5D */ bl func_803621D8 +/* 802D6A7C 002D39BC 48 08 B7 5D */ bl _savegpr_28 /* 802D6A80 002D39C0 7C 7C 1B 78 */ mr r28, r3 /* 802D6A84 002D39C4 7C 9D 23 78 */ mr r29, r4 /* 802D6A88 002D39C8 7C BE 2B 78 */ mr r30, r5 @@ -98,7 +98,7 @@ lbl_802D6AD0: /* 802D6B08 002D3A48 7F 83 E3 78 */ mr r3, r28 lbl_802D6B0C: /* 802D6B0C 002D3A4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6B10 002D3A50 48 08 B7 15 */ bl func_80362224 +/* 802D6B10 002D3A50 48 08 B7 15 */ bl _restgpr_28 /* 802D6B14 002D3A54 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6B18 002D3A58 7C 08 03 A6 */ mtlr r0 /* 802D6B1C 002D3A5C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRSolidHeap.s b/asm/JKernel/JKRSolidHeap.s index 479523244c..06d872506d 100644 --- a/asm/JKernel/JKRSolidHeap.s +++ b/asm/JKernel/JKRSolidHeap.s @@ -239,7 +239,7 @@ JKRSolidHeap_NS_allocFromHead: /* 802D0D5C 002CDC9C 7C 08 02 A6 */ mflr r0 /* 802D0D60 002CDCA0 90 01 00 24 */ stw r0, 0x24(r1) /* 802D0D64 002CDCA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0D68 002CDCA8 48 09 14 71 */ bl func_803621D8 +/* 802D0D68 002CDCA8 48 09 14 71 */ bl _savegpr_28 /* 802D0D6C 002CDCAC 7C 7F 1B 78 */ mr r31, r3 /* 802D0D70 002CDCB0 7C BD 2B 78 */ mr r29, r5 /* 802D0D74 002CDCB4 38 04 00 03 */ addi r0, r4, 3 @@ -282,7 +282,7 @@ lbl_802D0DC8: lbl_802D0E04: /* 802D0E04 002CDD44 7F C3 F3 78 */ mr r3, r30 /* 802D0E08 002CDD48 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0E0C 002CDD4C 48 09 14 19 */ bl func_80362224 +/* 802D0E0C 002CDD4C 48 09 14 19 */ bl _restgpr_28 /* 802D0E10 002CDD50 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D0E14 002CDD54 7C 08 03 A6 */ mtlr r0 /* 802D0E18 002CDD58 38 21 00 20 */ addi r1, r1, 0x20 @@ -294,7 +294,7 @@ JKRSolidHeap_NS_allocFromTail: /* 802D0E24 002CDD64 7C 08 02 A6 */ mflr r0 /* 802D0E28 002CDD68 90 01 00 24 */ stw r0, 0x24(r1) /* 802D0E2C 002CDD6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0E30 002CDD70 48 09 13 A9 */ bl func_803621D8 +/* 802D0E30 002CDD70 48 09 13 A9 */ bl _savegpr_28 /* 802D0E34 002CDD74 7C 7F 1B 78 */ mr r31, r3 /* 802D0E38 002CDD78 7C BD 2B 78 */ mr r29, r5 /* 802D0E3C 002CDD7C 38 04 00 03 */ addi r0, r4, 3 @@ -336,7 +336,7 @@ lbl_802D0E88: lbl_802D0EC8: /* 802D0EC8 002CDE08 7F C3 F3 78 */ mr r3, r30 /* 802D0ECC 002CDE0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0ED0 002CDE10 48 09 13 55 */ bl func_80362224 +/* 802D0ED0 002CDE10 48 09 13 55 */ bl _restgpr_28 /* 802D0ED4 002CDE14 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D0ED8 002CDE18 7C 08 03 A6 */ mtlr r0 /* 802D0EDC 002CDE1C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRThread.s b/asm/JKernel/JKRThread.s index e238ccefb3..40b3c51700 100644 --- a/asm/JKernel/JKRThread.s +++ b/asm/JKernel/JKRThread.s @@ -9,7 +9,7 @@ JKRThread: /* 802D156C 002CE4AC 7C 08 02 A6 */ mflr r0 /* 802D1570 002CE4B0 90 01 00 24 */ stw r0, 0x24(r1) /* 802D1574 002CE4B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1578 002CE4B8 48 09 0C 61 */ bl func_803621D8 +/* 802D1578 002CE4B8 48 09 0C 61 */ bl _savegpr_28 /* 802D157C 002CE4BC 7C 7C 1B 78 */ mr r28, r3 /* 802D1580 002CE4C0 7C 9D 23 78 */ mr r29, r4 /* 802D1584 002CE4C4 7C BE 2B 78 */ mr r30, r5 @@ -43,7 +43,7 @@ lbl_802D15D4: /* 802D15F0 002CE530 48 00 02 41 */ bl JKRThread_NS_setCommon_mesgQueue /* 802D15F4 002CE534 7F 83 E3 78 */ mr r3, r28 /* 802D15F8 002CE538 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D15FC 002CE53C 48 09 0C 29 */ bl func_80362224 +/* 802D15FC 002CE53C 48 09 0C 29 */ bl _restgpr_28 /* 802D1600 002CE540 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D1604 002CE544 7C 08 03 A6 */ mtlr r0 /* 802D1608 002CE548 38 21 00 20 */ addi r1, r1, 0x20 @@ -55,7 +55,7 @@ JKRThread_X1_: /* 802D1614 002CE554 7C 08 02 A6 */ mflr r0 /* 802D1618 002CE558 90 01 00 24 */ stw r0, 0x24(r1) /* 802D161C 002CE55C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1620 002CE560 48 09 0B B5 */ bl func_803621D4 +/* 802D1620 002CE560 48 09 0B B5 */ bl _savegpr_27 /* 802D1624 002CE564 7C 7B 1B 78 */ mr r27, r3 /* 802D1628 002CE568 7C 9C 23 78 */ mr r28, r4 /* 802D162C 002CE56C 7C BD 2B 78 */ mr r29, r5 @@ -89,7 +89,7 @@ lbl_802D1678: /* 802D1698 002CE5D8 48 00 01 99 */ bl JKRThread_NS_setCommon_mesgQueue /* 802D169C 002CE5DC 7F 63 DB 78 */ mr r3, r27 /* 802D16A0 002CE5E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D16A4 002CE5E4 48 09 0B 7D */ bl func_80362220 +/* 802D16A4 002CE5E4 48 09 0B 7D */ bl _restgpr_27 /* 802D16A8 002CE5E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D16AC 002CE5EC 7C 08 03 A6 */ mtlr r0 /* 802D16B0 002CE5F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -409,7 +409,7 @@ JKRThreadSwitch_NS_callback: /* 802D1AE8 002CEA28 7C 08 02 A6 */ mflr r0 /* 802D1AEC 002CEA2C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D1AF0 002CEA30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1AF4 002CEA34 48 09 06 E1 */ bl func_803621D4 +/* 802D1AF4 002CEA34 48 09 06 E1 */ bl _savegpr_27 /* 802D1AF8 002CEA38 7C 7B 1B 78 */ mr r27, r3 /* 802D1AFC 002CEA3C 7C 9C 23 78 */ mr r28, r4 /* 802D1B00 002CEA40 81 8D 8E 40 */ lwz r12, lbl_804513C0-_SDA_BASE_(r13) @@ -513,7 +513,7 @@ lbl_802D1C40: /* 802D1C58 002CEB98 4E 80 04 21 */ bctrl lbl_802D1C5C: /* 802D1C5C 002CEB9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1C60 002CEBA0 48 09 05 C1 */ bl func_80362220 +/* 802D1C60 002CEBA0 48 09 05 C1 */ bl _restgpr_27 /* 802D1C64 002CEBA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D1C68 002CEBA8 7C 08 03 A6 */ mtlr r0 /* 802D1C6C 002CEBAC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JMath/JMATrigonometric.s b/asm/JMath/JMATrigonometric.s index 887e55c935..2d4042ab10 100644 --- a/asm/JMath/JMATrigonometric.s +++ b/asm/JMath/JMATrigonometric.s @@ -15,7 +15,7 @@ /* 80339B10 00336A50 DB 81 00 30 */ stfd f28, 0x30(r1) /* 80339B14 00336A54 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80339B18 00336A58 39 61 00 30 */ addi r11, r1, 0x30 -/* 80339B1C 00336A5C 48 02 86 B9 */ bl func_803621D4 +/* 80339B1C 00336A5C 48 02 86 B9 */ bl _savegpr_27 /* 80339B20 00336A60 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80339B24 00336A64 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l .global std_NS_pair @@ -116,7 +116,7 @@ lbl_80339C30: /* 80339C90 00336BD0 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 80339C94 00336BD4 CB 81 00 30 */ lfd f28, 0x30(r1) /* 80339C98 00336BD8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80339C9C 00336BDC 48 02 85 85 */ bl func_80362220 +/* 80339C9C 00336BDC 48 02 85 85 */ bl _restgpr_27 /* 80339CA0 00336BE0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80339CA4 00336BE4 7C 08 03 A6 */ mtlr r0 /* 80339CA8 00336BE8 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/JMessage/control.s b/asm/JMessage/control.s index 522412f726..5c232751fc 100644 --- a/asm/JMessage/control.s +++ b/asm/JMessage/control.s @@ -121,7 +121,7 @@ JMessage_NS_TControl_NS_render: /* 802A76C0 002A4600 7C 08 02 A6 */ mflr r0 /* 802A76C4 002A4604 90 01 00 24 */ stw r0, 0x24(r1) /* 802A76C8 002A4608 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A76CC 002A460C 48 0B AB 0D */ bl func_803621D8 +/* 802A76CC 002A460C 48 0B AB 0D */ bl _savegpr_28 /* 802A76D0 002A4610 7C 7F 1B 78 */ mr r31, r3 /* 802A76D4 002A4614 38 60 00 00 */ li r3, 0 /* 802A76D8 002A4618 83 9F 00 20 */ lwz r28, 0x20(r31) @@ -193,7 +193,7 @@ lbl_802A77C4: /* 802A77CC 002A470C 48 00 13 55 */ bl JMessage_NS_TRenderingProcessor_NS_process lbl_802A77D0: /* 802A77D0 002A4710 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A77D4 002A4714 48 0B AA 51 */ bl func_80362224 +/* 802A77D4 002A4714 48 0B AA 51 */ bl _restgpr_28 /* 802A77D8 002A4718 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A77DC 002A471C 7C 08 03 A6 */ mtlr r0 /* 802A77E0 002A4720 38 21 00 20 */ addi r1, r1, 0x20 @@ -205,7 +205,7 @@ JMessage_NS_TControl_NS_setMessageCode: /* 802A77EC 002A472C 7C 08 02 A6 */ mflr r0 /* 802A77F0 002A4730 90 01 00 24 */ stw r0, 0x24(r1) /* 802A77F4 002A4734 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A77F8 002A4738 48 0B A9 E1 */ bl func_803621D8 +/* 802A77F8 002A4738 48 0B A9 E1 */ bl _savegpr_28 /* 802A77FC 002A473C 7C 7C 1B 78 */ mr r28, r3 /* 802A7800 002A4740 7C 80 23 78 */ mr r0, r4 /* 802A7804 002A4744 7C A6 2B 78 */ mr r6, r5 @@ -271,7 +271,7 @@ lbl_802A78D8: /* 802A78D8 002A4818 38 60 00 01 */ li r3, 1 lbl_802A78DC: /* 802A78DC 002A481C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A78E0 002A4820 48 0B A9 45 */ bl func_80362224 +/* 802A78E0 002A4820 48 0B A9 45 */ bl _restgpr_28 /* 802A78E4 002A4824 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A78E8 002A4828 7C 08 03 A6 */ mtlr r0 /* 802A78EC 002A482C 38 21 00 20 */ addi r1, r1, 0x20 @@ -283,7 +283,7 @@ JMessage_NS_TControl_NS_setMessageID: /* 802A78F8 002A4838 7C 08 02 A6 */ mflr r0 /* 802A78FC 002A483C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A7900 002A4840 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7904 002A4844 48 0B A8 D5 */ bl func_803621D8 +/* 802A7904 002A4844 48 0B A8 D5 */ bl _savegpr_28 /* 802A7908 002A4848 7C 7C 1B 78 */ mr r28, r3 /* 802A790C 002A484C 83 C3 00 04 */ lwz r30, 4(r3) /* 802A7910 002A4850 28 1E 00 00 */ cmplwi r30, 0 @@ -358,7 +358,7 @@ lbl_802A7A04: /* 802A7A04 002A4944 38 60 00 01 */ li r3, 1 lbl_802A7A08: /* 802A7A08 002A4948 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7A0C 002A494C 48 0B A8 19 */ bl func_80362224 +/* 802A7A0C 002A494C 48 0B A8 19 */ bl _restgpr_28 /* 802A7A10 002A4950 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A7A14 002A4954 7C 08 03 A6 */ mtlr r0 /* 802A7A18 002A4958 38 21 00 20 */ addi r1, r1, 0x20 @@ -370,7 +370,7 @@ JMessage_NS_TControl_NS_setMessageCode_inSequence_: /* 802A7A24 002A4964 7C 08 02 A6 */ mflr r0 /* 802A7A28 002A4968 90 01 00 24 */ stw r0, 0x24(r1) /* 802A7A2C 002A496C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7A30 002A4970 48 0B A7 A9 */ bl func_803621D8 +/* 802A7A30 002A4970 48 0B A7 A9 */ bl _savegpr_28 /* 802A7A34 002A4974 7C 7F 1B 78 */ mr r31, r3 /* 802A7A38 002A4978 7C 9C 23 78 */ mr r28, r4 /* 802A7A3C 002A497C 7C BD 2B 78 */ mr r29, r5 @@ -420,7 +420,7 @@ lbl_802A7AA4: /* 802A7ADC 002A4A1C 38 60 00 01 */ li r3, 1 lbl_802A7AE0: /* 802A7AE0 002A4A20 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7AE4 002A4A24 48 0B A7 41 */ bl func_80362224 +/* 802A7AE4 002A4A24 48 0B A7 41 */ bl _restgpr_28 /* 802A7AE8 002A4A28 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A7AEC 002A4A2C 7C 08 03 A6 */ mtlr r0 /* 802A7AF0 002A4A30 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JMessage/processor.s b/asm/JMessage/processor.s index c7760e2c01..4da20177db 100644 --- a/asm/JMessage/processor.s +++ b/asm/JMessage/processor.s @@ -375,7 +375,7 @@ JMessage_NS_TProcessor_NS_on_tag_: /* 802A7FE8 002A4F28 7C 08 02 A6 */ mflr r0 /* 802A7FEC 002A4F2C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A7FF0 002A4F30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A7FF4 002A4F34 48 0B A1 E5 */ bl func_803621D8 +/* 802A7FF4 002A4F34 48 0B A1 E5 */ bl _savegpr_28 /* 802A7FF8 002A4F38 7C 7C 1B 78 */ mr r28, r3 /* 802A7FFC 002A4F3C 83 C3 00 0C */ lwz r30, 0xc(r3) /* 802A8000 002A4F40 8B FE 00 00 */ lbz r31, 0(r30) @@ -407,7 +407,7 @@ JMessage_NS_TProcessor_NS_on_tag_: /* 802A8068 002A4FA8 4E 80 04 21 */ bctrl lbl_802A806C: /* 802A806C 002A4FAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A8070 002A4FB0 48 0B A1 B5 */ bl func_80362224 +/* 802A8070 002A4FB0 48 0B A1 B5 */ bl _restgpr_28 /* 802A8074 002A4FB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A8078 002A4FB8 7C 08 03 A6 */ mtlr r0 /* 802A807C 002A4FBC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JMessage/resource.s b/asm/JMessage/resource.s index caa3a48c30..4482f08806 100644 --- a/asm/JMessage/resource.s +++ b/asm/JMessage/resource.s @@ -378,7 +378,7 @@ lbl_802A919C: /* 802A91BC 002A60FC 7C 08 02 A6 */ mflr r0 /* 802A91C0 002A6100 90 01 00 34 */ stw r0, 0x34(r1) /* 802A91C4 002A6104 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A91C8 002A6108 48 0B 90 11 */ bl func_803621D8 +/* 802A91C8 002A6108 48 0B 90 11 */ bl _savegpr_28 /* 802A91CC 002A610C 7C 7F 1B 78 */ mr r31, r3 /* 802A91D0 002A6110 7C DC 33 78 */ mr r28, r6 /* 802A91D4 002A6114 83 C4 00 00 */ lwz r30, 0(r4) @@ -457,7 +457,7 @@ lbl_802A92A8: /* 802A92D8 002A6218 38 60 00 01 */ li r3, 1 lbl_802A92DC: /* 802A92DC 002A621C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A92E0 002A6220 48 0B 8F 45 */ bl func_80362224 +/* 802A92E0 002A6220 48 0B 8F 45 */ bl _restgpr_28 /* 802A92E4 002A6224 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A92E8 002A6228 7C 08 03 A6 */ mtlr r0 /* 802A92EC 002A622C 38 21 00 30 */ addi r1, r1, 0x30 @@ -466,7 +466,7 @@ lbl_802A92DC: /* 802A92F8 002A6238 7C 08 02 A6 */ mflr r0 /* 802A92FC 002A623C 90 01 00 34 */ stw r0, 0x34(r1) /* 802A9300 002A6240 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A9304 002A6244 48 0B 8E D5 */ bl func_803621D8 +/* 802A9304 002A6244 48 0B 8E D5 */ bl _savegpr_28 /* 802A9308 002A6248 7C 7E 1B 78 */ mr r30, r3 /* 802A930C 002A624C 80 E4 00 00 */ lwz r7, 0(r4) /* 802A9310 002A6250 80 07 00 04 */ lwz r0, 4(r7) @@ -572,7 +572,7 @@ lbl_802A9474: /* 802A9474 002A63B4 38 60 00 01 */ li r3, 1 lbl_802A9478: /* 802A9478 002A63B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A947C 002A63BC 48 0B 8D A9 */ bl func_80362224 +/* 802A947C 002A63BC 48 0B 8D A9 */ bl _restgpr_28 /* 802A9480 002A63C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A9484 002A63C4 7C 08 03 A6 */ mtlr r0 /* 802A9488 002A63C8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index a0fb7197b0..f80e0692f3 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -3926,7 +3926,7 @@ makeColorTable: /* 8027A458 00277398 7C 08 02 A6 */ mflr r0 /* 8027A45C 0027739C 90 01 00 44 */ stw r0, 0x44(r1) /* 8027A460 002773A0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027A464 002773A4 48 0E 7D 75 */ bl func_803621D8 +/* 8027A464 002773A4 48 0E 7D 75 */ bl _savegpr_28 /* 8027A468 002773A8 7C 7D 1B 78 */ mr r29, r3 /* 8027A46C 002773AC 7C 9E 23 78 */ mr r30, r4 /* 8027A470 002773B0 7C BC 2B 78 */ mr r28, r5 @@ -4084,7 +4084,7 @@ lbl_8027A6B4: /* 8027A6BC 002775FC 41 80 FE 4C */ blt lbl_8027A508 /* 8027A6C0 00277600 90 7D 00 00 */ stw r3, 0(r29) /* 8027A6C4 00277604 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027A6C8 00277608 48 0E 7B 5D */ bl func_80362224 +/* 8027A6C8 00277608 48 0E 7B 5D */ bl _restgpr_28 /* 8027A6CC 0027760C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8027A6D0 00277610 7C 08 03 A6 */ mtlr r0 /* 8027A6D4 00277614 38 21 00 40 */ addi r1, r1, 0x40 @@ -4175,7 +4175,7 @@ JPABaseShape_NS_setGX: /* 8027A7EC 0027772C 7C 08 02 A6 */ mflr r0 /* 8027A7F0 00277730 90 01 00 24 */ stw r0, 0x24(r1) /* 8027A7F4 00277734 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027A7F8 00277738 48 0E 79 E1 */ bl func_803621D8 +/* 8027A7F8 00277738 48 0E 79 E1 */ bl _savegpr_28 /* 8027A7FC 0027773C 7C 7C 1B 78 */ mr r28, r3 /* 8027A800 00277740 3C 60 80 3C */ lis r3, lbl_803C42E0@ha /* 8027A804 00277744 3B E3 42 E0 */ addi r31, r3, lbl_803C42E0@l @@ -4242,7 +4242,7 @@ JPABaseShape_NS_setGX: /* 8027A8F8 00277838 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f /* 8027A8FC 0027783C 48 0E 53 D5 */ bl GXSetZCompLoc /* 8027A900 00277840 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027A904 00277844 48 0E 79 21 */ bl func_80362224 +/* 8027A904 00277844 48 0E 79 21 */ bl _restgpr_28 /* 8027A908 00277848 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027A90C 0027784C 7C 08 03 A6 */ mtlr r0 /* 8027A910 00277850 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JParticle/JPAEmitterManager.s b/asm/JParticle/JPAEmitterManager.s index a67b84d65e..dc58bae1fa 100644 --- a/asm/JParticle/JPAEmitterManager.s +++ b/asm/JParticle/JPAEmitterManager.s @@ -495,7 +495,7 @@ JPAEmitterManager_NS_clearResourceManager: /* 8027E358 0027B298 7C 08 02 A6 */ mflr r0 /* 8027E35C 0027B29C 90 01 00 24 */ stw r0, 0x24(r1) /* 8027E360 0027B2A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027E364 0027B2A4 48 0E 3E 71 */ bl func_803621D4 +/* 8027E364 0027B2A4 48 0E 3E 71 */ bl _savegpr_27 /* 8027E368 0027B2A8 7C 7B 1B 78 */ mr r27, r3 /* 8027E36C 0027B2AC 7C 9C 23 78 */ mr r28, r4 /* 8027E370 0027B2B0 3B A0 00 00 */ li r29, 0 @@ -531,7 +531,7 @@ lbl_8027E3BC: /* 8027E3D4 0027B314 57 80 15 BA */ rlwinm r0, r28, 2, 0x16, 0x1d /* 8027E3D8 0027B318 7C 83 01 2E */ stwx r4, r3, r0 /* 8027E3DC 0027B31C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027E3E0 0027B320 48 0E 3E 41 */ bl func_80362220 +/* 8027E3E0 0027B320 48 0E 3E 41 */ bl _restgpr_27 /* 8027E3E4 0027B324 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027E3E8 0027B328 7C 08 03 A6 */ mtlr r0 /* 8027E3EC 0027B32C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JParticle/JPAMath.s b/asm/JParticle/JPAMath.s index b347d789af..ba59a622e5 100644 --- a/asm/JParticle/JPAMath.s +++ b/asm/JParticle/JPAMath.s @@ -183,7 +183,7 @@ JPASetRMtxSTVecfromMtx: /* 8028080C 0027D74C 7C 08 02 A6 */ mflr r0 /* 80280810 0027D750 90 01 00 34 */ stw r0, 0x34(r1) /* 80280814 0027D754 39 61 00 30 */ addi r11, r1, 0x30 -/* 80280818 0027D758 48 0E 19 C1 */ bl func_803621D8 +/* 80280818 0027D758 48 0E 19 C1 */ bl _savegpr_28 /* 8028081C 0027D75C 7C 7C 1B 78 */ mr r28, r3 /* 80280820 0027D760 7C 9D 23 78 */ mr r29, r4 /* 80280824 0027D764 7C BE 2B 78 */ mr r30, r5 @@ -272,7 +272,7 @@ lbl_80280954: /* 80280964 0027D8A4 D0 3F 00 04 */ stfs f1, 4(r31) /* 80280968 0027D8A8 D0 5F 00 08 */ stfs f2, 8(r31) /* 8028096C 0027D8AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80280970 0027D8B0 48 0E 18 B5 */ bl func_80362224 +/* 80280970 0027D8B0 48 0E 18 B5 */ bl _restgpr_28 /* 80280974 0027D8B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80280978 0027D8B8 7C 08 03 A6 */ mtlr r0 /* 8028097C 0027D8BC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JParticle/JPAResource.s b/asm/JParticle/JPAResource.s index 66380ef9e0..daa431d779 100644 --- a/asm/JParticle/JPAResource.s +++ b/asm/JParticle/JPAResource.s @@ -1775,7 +1775,7 @@ JPAResource_NS_calc: /* 802755EC 0027252C 7C 08 02 A6 */ mflr r0 /* 802755F0 00272530 90 01 00 24 */ stw r0, 0x24(r1) /* 802755F4 00272534 39 61 00 20 */ addi r11, r1, 0x20 -/* 802755F8 00272538 48 0E CB DD */ bl func_803621D4 +/* 802755F8 00272538 48 0E CB DD */ bl _savegpr_27 /* 802755FC 0027253C 7C 7E 1B 78 */ mr r30, r3 /* 80275600 00272540 7C 9C 23 78 */ mr r28, r4 /* 80275604 00272544 7C BD 2B 78 */ mr r29, r5 @@ -2098,7 +2098,7 @@ lbl_80275A78: /* 80275A78 002729B8 38 60 00 00 */ li r3, 0 lbl_80275A7C: /* 80275A7C 002729BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80275A80 002729C0 48 0E C7 A1 */ bl func_80362220 +/* 80275A80 002729C0 48 0E C7 A1 */ bl _restgpr_27 /* 80275A84 002729C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80275A88 002729C8 7C 08 03 A6 */ mtlr r0 /* 80275A8C 002729CC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2110,7 +2110,7 @@ JPAResource_NS_draw: /* 80275A98 002729D8 7C 08 02 A6 */ mflr r0 /* 80275A9C 002729DC 90 01 00 24 */ stw r0, 0x24(r1) /* 80275AA0 002729E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80275AA4 002729E4 48 0E C7 35 */ bl func_803621D8 +/* 80275AA4 002729E4 48 0E C7 35 */ bl _savegpr_28 /* 80275AA8 002729E8 7C 7C 1B 78 */ mr r28, r3 /* 80275AAC 002729EC 7C 9D 23 78 */ mr r29, r4 /* 80275AB0 002729F0 7C BE 2B 78 */ mr r30, r5 @@ -2161,7 +2161,7 @@ lbl_80275B50: /* 80275B54 00272A94 7C 1F 00 00 */ cmpw r31, r0 /* 80275B58 00272A98 40 81 FF 84 */ ble lbl_80275ADC /* 80275B5C 00272A9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80275B60 00272AA0 48 0E C6 C5 */ bl func_80362224 +/* 80275B60 00272AA0 48 0E C6 C5 */ bl _restgpr_28 /* 80275B64 00272AA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80275B68 00272AA8 7C 08 03 A6 */ mtlr r0 /* 80275B6C 00272AAC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2173,7 +2173,7 @@ JPAResource_NS_drawP: /* 80275B78 00272AB8 7C 08 02 A6 */ mflr r0 /* 80275B7C 00272ABC 90 01 00 34 */ stw r0, 0x34(r1) /* 80275B80 00272AC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80275B84 00272AC4 48 0E C6 51 */ bl func_803621D4 +/* 80275B84 00272AC4 48 0E C6 51 */ bl _savegpr_27 /* 80275B88 00272AC8 7C 7E 1B 78 */ mr r30, r3 /* 80275B8C 00272ACC 7C 9F 23 78 */ mr r31, r4 /* 80275B90 00272AD0 80 64 00 00 */ lwz r3, 0(r4) @@ -2395,7 +2395,7 @@ lbl_80275E6C: /* 80275E94 00272DD4 4E 80 04 21 */ bctrl lbl_80275E98: /* 80275E98 00272DD8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80275E9C 00272DDC 48 0E C3 85 */ bl func_80362220 +/* 80275E9C 00272DDC 48 0E C3 85 */ bl _restgpr_27 /* 80275EA0 00272DE0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80275EA4 00272DE4 7C 08 03 A6 */ mtlr r0 /* 80275EA8 00272DE8 38 21 00 30 */ addi r1, r1, 0x30 @@ -2407,7 +2407,7 @@ JPAResource_NS_drawC: /* 80275EB4 00272DF4 7C 08 02 A6 */ mflr r0 /* 80275EB8 00272DF8 90 01 00 24 */ stw r0, 0x24(r1) /* 80275EBC 00272DFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80275EC0 00272E00 48 0E C3 15 */ bl func_803621D4 +/* 80275EC0 00272E00 48 0E C3 15 */ bl _savegpr_27 /* 80275EC4 00272E04 7C 7E 1B 78 */ mr r30, r3 /* 80275EC8 00272E08 7C 9F 23 78 */ mr r31, r4 /* 80275ECC 00272E0C 80 64 00 00 */ lwz r3, 0(r4) @@ -2610,7 +2610,7 @@ lbl_80276164: /* 8027618C 002730CC 4E 80 04 21 */ bctrl lbl_80276190: /* 80276190 002730D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80276194 002730D4 48 0E C0 8D */ bl func_80362220 +/* 80276194 002730D4 48 0E C0 8D */ bl _restgpr_27 /* 80276198 002730D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027619C 002730DC 7C 08 03 A6 */ mtlr r0 /* 802761A0 002730E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2891,7 +2891,7 @@ JPAResource_NS_calc_p: /* 80276590 002734D0 7C 08 02 A6 */ mflr r0 /* 80276594 002734D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80276598 002734D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027659C 002734DC 48 0E BC 39 */ bl func_803621D4 +/* 8027659C 002734DC 48 0E BC 39 */ bl _savegpr_27 /* 802765A0 002734E0 7C 7B 1B 78 */ mr r27, r3 /* 802765A4 002734E4 7C 9C 23 78 */ mr r28, r4 /* 802765A8 002734E8 7C BD 2B 78 */ mr r29, r5 @@ -2916,7 +2916,7 @@ lbl_802765E8: /* 802765EC 0027352C 40 80 FF DC */ bge lbl_802765C8 lbl_802765F0: /* 802765F0 00273530 39 61 00 20 */ addi r11, r1, 0x20 -/* 802765F4 00273534 48 0E BC 2D */ bl func_80362220 +/* 802765F4 00273534 48 0E BC 2D */ bl _restgpr_27 /* 802765F8 00273538 80 01 00 24 */ lwz r0, 0x24(r1) /* 802765FC 0027353C 7C 08 03 A6 */ mtlr r0 /* 80276600 00273540 38 21 00 20 */ addi r1, r1, 0x20 @@ -2928,7 +2928,7 @@ JPAResource_NS_calc_c: /* 8027660C 0027354C 7C 08 02 A6 */ mflr r0 /* 80276610 00273550 90 01 00 24 */ stw r0, 0x24(r1) /* 80276614 00273554 39 61 00 20 */ addi r11, r1, 0x20 -/* 80276618 00273558 48 0E BB BD */ bl func_803621D4 +/* 80276618 00273558 48 0E BB BD */ bl _savegpr_27 /* 8027661C 0027355C 7C 7B 1B 78 */ mr r27, r3 /* 80276620 00273560 7C 9C 23 78 */ mr r28, r4 /* 80276624 00273564 7C BD 2B 78 */ mr r29, r5 @@ -2953,7 +2953,7 @@ lbl_80276664: /* 80276668 002735A8 40 80 FF DC */ bge lbl_80276644 lbl_8027666C: /* 8027666C 002735AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80276670 002735B0 48 0E BB B1 */ bl func_80362220 +/* 80276670 002735B0 48 0E BB B1 */ bl _restgpr_27 /* 80276674 002735B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80276678 002735B8 7C 08 03 A6 */ mtlr r0 /* 8027667C 002735BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2965,7 +2965,7 @@ JPAResource_NS_calcField: /* 80276688 002735C8 7C 08 02 A6 */ mflr r0 /* 8027668C 002735CC 90 01 00 24 */ stw r0, 0x24(r1) /* 80276690 002735D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80276694 002735D4 48 0E BB 41 */ bl func_803621D4 +/* 80276694 002735D4 48 0E BB 41 */ bl _savegpr_27 /* 80276698 002735D8 7C 7B 1B 78 */ mr r27, r3 /* 8027669C 002735DC 7C 9C 23 78 */ mr r28, r4 /* 802766A0 002735E0 7C BD 2B 78 */ mr r29, r5 @@ -2989,7 +2989,7 @@ lbl_802766E0: /* 802766E0 00273620 2C 1E 00 00 */ cmpwi r30, 0 /* 802766E4 00273624 40 80 FF D0 */ bge lbl_802766B4 /* 802766E8 00273628 39 61 00 20 */ addi r11, r1, 0x20 -/* 802766EC 0027362C 48 0E BB 35 */ bl func_80362220 +/* 802766EC 0027362C 48 0E BB 35 */ bl _restgpr_27 /* 802766F0 00273630 80 01 00 24 */ lwz r0, 0x24(r1) /* 802766F4 00273634 7C 08 03 A6 */ mtlr r0 /* 802766F8 00273638 38 21 00 20 */ addi r1, r1, 0x20 @@ -3003,7 +3003,7 @@ JPAResource_NS_calcKey: /* 8027670C 0027364C DB E1 00 30 */ stfd f31, 0x30(r1) /* 80276710 00273650 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80276714 00273654 39 61 00 30 */ addi r11, r1, 0x30 -/* 80276718 00273658 48 0E BA BD */ bl func_803621D4 +/* 80276718 00273658 48 0E BA BD */ bl _savegpr_27 /* 8027671C 0027365C 7C 7C 1B 78 */ mr r28, r3 /* 80276720 00273660 7C 9D 23 78 */ mr r29, r4 /* 80276724 00273664 88 63 00 3F */ lbz r3, 0x3f(r3) @@ -3075,7 +3075,7 @@ lbl_80276818: /* 80276820 00273760 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80276824 00273764 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80276828 00273768 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027682C 0027376C 48 0E B9 F5 */ bl func_80362220 +/* 8027682C 0027376C 48 0E B9 F5 */ bl _restgpr_27 /* 80276830 00273770 80 01 00 44 */ lwz r0, 0x44(r1) /* 80276834 00273774 7C 08 03 A6 */ mtlr r0 /* 80276838 00273778 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JStudio/ctb.s b/asm/JStudio/ctb.s index d0c6eb23bf..34d8ccc524 100644 --- a/asm/JStudio/ctb.s +++ b/asm/JStudio/ctb.s @@ -501,7 +501,7 @@ std_NS_find_if: /* 802815B8 0027E4F8 7C 08 02 A6 */ mflr r0 /* 802815BC 0027E4FC 90 01 00 34 */ stw r0, 0x34(r1) /* 802815C0 0027E500 39 61 00 30 */ addi r11, r1, 0x30 -/* 802815C4 0027E504 48 0E 0C 15 */ bl func_803621D8 +/* 802815C4 0027E504 48 0E 0C 15 */ bl _savegpr_28 /* 802815C8 0027E508 7C 7C 1B 78 */ mr r28, r3 /* 802815CC 0027E50C 7C 9D 23 78 */ mr r29, r4 /* 802815D0 0027E510 7C BE 2B 78 */ mr r30, r5 @@ -532,7 +532,7 @@ lbl_80281628: /* 80281628 0027E568 80 1D 00 00 */ lwz r0, 0(r29) /* 8028162C 0027E56C 90 1C 00 00 */ stw r0, 0(r28) /* 80281630 0027E570 39 61 00 30 */ addi r11, r1, 0x30 -/* 80281634 0027E574 48 0E 0B F1 */ bl func_80362224 +/* 80281634 0027E574 48 0E 0B F1 */ bl _restgpr_28 /* 80281638 0027E578 80 01 00 34 */ lwz r0, 0x34(r1) /* 8028163C 0027E57C 7C 08 03 A6 */ mtlr r0 /* 80281640 0027E580 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/fvb.s b/asm/JStudio/fvb.s index 1cad946839..cdb7d156d1 100644 --- a/asm/JStudio/fvb.s +++ b/asm/JStudio/fvb.s @@ -1198,7 +1198,7 @@ std_NS_find_if_X1_: /* 8028501C 00281F5C 7C 08 02 A6 */ mflr r0 /* 80285020 00281F60 90 01 00 34 */ stw r0, 0x34(r1) /* 80285024 00281F64 39 61 00 30 */ addi r11, r1, 0x30 -/* 80285028 00281F68 48 0D D1 B1 */ bl func_803621D8 +/* 80285028 00281F68 48 0D D1 B1 */ bl _savegpr_28 /* 8028502C 00281F6C 7C 7C 1B 78 */ mr r28, r3 /* 80285030 00281F70 7C 9D 23 78 */ mr r29, r4 /* 80285034 00281F74 7C BE 2B 78 */ mr r30, r5 @@ -1229,7 +1229,7 @@ lbl_8028508C: /* 8028508C 00281FCC 80 1D 00 00 */ lwz r0, 0(r29) /* 80285090 00281FD0 90 1C 00 00 */ stw r0, 0(r28) /* 80285094 00281FD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80285098 00281FD8 48 0D D1 8D */ bl func_80362224 +/* 80285098 00281FD8 48 0D D1 8D */ bl _restgpr_28 /* 8028509C 00281FDC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802850A0 00281FE0 7C 08 03 A6 */ mtlr r0 /* 802850A4 00281FE4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/jstudio-control.s b/asm/JStudio/jstudio-control.s index f5f6c27b59..f9ded54332 100644 --- a/asm/JStudio/jstudio-control.s +++ b/asm/JStudio/jstudio-control.s @@ -574,7 +574,7 @@ JStudio_NS_TParse_NS_parseBlock_block_ctb_: /* 802858F4 00282834 7C 08 02 A6 */ mflr r0 /* 802858F8 00282838 90 01 00 34 */ stw r0, 0x34(r1) /* 802858FC 0028283C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80285900 00282840 48 0D C8 D9 */ bl func_803621D8 +/* 80285900 00282840 48 0D C8 D9 */ bl _savegpr_28 /* 80285904 00282844 7C BC 2B 78 */ mr r28, r5 /* 80285908 00282848 83 E3 00 04 */ lwz r31, 4(r3) /* 8028590C 0028284C 80 64 00 00 */ lwz r3, 0(r4) @@ -631,7 +631,7 @@ lbl_802859B4: /* 802859C0 00282900 38 60 00 01 */ li r3, 1 lbl_802859C4: /* 802859C4 00282904 39 61 00 30 */ addi r11, r1, 0x30 -/* 802859C8 00282908 48 0D C8 5D */ bl func_80362224 +/* 802859C8 00282908 48 0D C8 5D */ bl _restgpr_28 /* 802859CC 0028290C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802859D0 00282910 7C 08 03 A6 */ mtlr r0 /* 802859D4 00282914 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/jstudio-math.s b/asm/JStudio/jstudio-math.s index 4ede7e0c7e..8cf1c7211f 100644 --- a/asm/JStudio/jstudio-math.s +++ b/asm/JStudio/jstudio-math.s @@ -147,7 +147,7 @@ JStudio_NS_math_NS_getFromTransformation_SRxyzT: /* 80285BF0 00282B30 DB 81 00 40 */ stfd f28, 0x40(r1) /* 80285BF4 00282B34 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 80285BF8 00282B38 39 61 00 40 */ addi r11, r1, 0x40 -/* 80285BFC 00282B3C 48 0D C5 DD */ bl func_803621D8 +/* 80285BFC 00282B3C 48 0D C5 DD */ bl _savegpr_28 /* 80285C00 00282B40 7C 7C 1B 78 */ mr r28, r3 /* 80285C04 00282B44 7C 9D 23 78 */ mr r29, r4 /* 80285C08 00282B48 7C BE 2B 78 */ mr r30, r5 @@ -280,7 +280,7 @@ lbl_80285DAC: /* 80285DEC 00282D2C E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 80285DF0 00282D30 CB 81 00 40 */ lfd f28, 0x40(r1) /* 80285DF4 00282D34 39 61 00 40 */ addi r11, r1, 0x40 -/* 80285DF8 00282D38 48 0D C4 2D */ bl func_80362224 +/* 80285DF8 00282D38 48 0D C4 2D */ bl _restgpr_28 /* 80285DFC 00282D3C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80285E00 00282D40 7C 08 03 A6 */ mtlr r0 /* 80285E04 00282D44 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/JStudio/jstudio-object.s b/asm/JStudio/jstudio-object.s index 724fc6dc43..e3e14b2aa7 100644 --- a/asm/JStudio/jstudio-object.s +++ b/asm/JStudio/jstudio-object.s @@ -536,7 +536,7 @@ JStudio_NS_TAdaptor_NS_adaptor_updateVariableValue: /* 802864E0 00283420 90 01 00 34 */ stw r0, 0x34(r1) /* 802864E4 00283424 DB E1 00 28 */ stfd f31, 0x28(r1) /* 802864E8 00283428 39 61 00 28 */ addi r11, r1, 0x28 -/* 802864EC 0028342C 48 0D BC E9 */ bl func_803621D4 +/* 802864EC 0028342C 48 0D BC E9 */ bl _savegpr_27 /* 802864F0 00283430 7C 7B 1B 78 */ mr r27, r3 /* 802864F4 00283434 7C BC 2B 78 */ mr r28, r5 /* 802864F8 00283438 CB E4 00 58 */ lfd f31, 0x58(r4) @@ -567,7 +567,7 @@ lbl_80286548: /* 8028654C 0028348C 40 82 FF C8 */ bne lbl_80286514 /* 80286550 00283490 CB E1 00 28 */ lfd f31, 0x28(r1) /* 80286554 00283494 39 61 00 28 */ addi r11, r1, 0x28 -/* 80286558 00283498 48 0D BC C9 */ bl func_80362220 +/* 80286558 00283498 48 0D BC C9 */ bl _restgpr_27 /* 8028655C 0028349C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80286560 002834A0 7C 08 03 A6 */ mtlr r0 /* 80286564 002834A4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/stb.s b/asm/JStudio/stb.s index 8ffac3a208..161811b98e 100644 --- a/asm/JStudio/stb.s +++ b/asm/JStudio/stb.s @@ -1086,7 +1086,7 @@ std_NS_find_if_X2_: /* 8028992C 0028686C 7C 08 02 A6 */ mflr r0 /* 80289930 00286870 90 01 00 34 */ stw r0, 0x34(r1) /* 80289934 00286874 39 61 00 30 */ addi r11, r1, 0x30 -/* 80289938 00286878 48 0D 88 A1 */ bl func_803621D8 +/* 80289938 00286878 48 0D 88 A1 */ bl _savegpr_28 /* 8028993C 0028687C 7C 7C 1B 78 */ mr r28, r3 /* 80289940 00286880 7C 9D 23 78 */ mr r29, r4 /* 80289944 00286884 7C BE 2B 78 */ mr r30, r5 @@ -1117,7 +1117,7 @@ lbl_8028999C: /* 8028999C 002868DC 80 1D 00 00 */ lwz r0, 0(r29) /* 802899A0 002868E0 90 1C 00 00 */ stw r0, 0(r28) /* 802899A4 002868E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802899A8 002868E8 48 0D 88 7D */ bl func_80362224 +/* 802899A8 002868E8 48 0D 88 7D */ bl _restgpr_28 /* 802899AC 002868EC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802899B0 002868F0 7C 08 03 A6 */ mtlr r0 /* 802899B4 002868F4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio_JParticle/object-particle.s b/asm/JStudio_JParticle/object-particle.s index 6c6be6d1e8..01d2e30ae4 100644 --- a/asm/JStudio_JParticle/object-particle.s +++ b/asm/JStudio_JParticle/object-particle.s @@ -530,7 +530,7 @@ lbl_8028EC44: /* 8028ECCC 0028BC0C DB E1 00 D0 */ stfd f31, 0xd0(r1) /* 8028ECD0 0028BC10 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, qr0 /* 8028ECD4 0028BC14 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8028ECD8 0028BC18 48 0D 35 01 */ bl func_803621D8 +/* 8028ECD8 0028BC18 48 0D 35 01 */ bl _savegpr_28 /* 8028ECDC 0028BC1C 7C 7E 1B 78 */ mr r30, r3 /* 8028ECE0 0028BC20 7C 9F 23 78 */ mr r31, r4 /* 8028ECE4 0028BC24 38 80 00 00 */ li r4, 0 @@ -767,7 +767,7 @@ lbl_8028F040: /* 8028F040 0028BF80 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, qr0 /* 8028F044 0028BF84 CB E1 00 D0 */ lfd f31, 0xd0(r1) /* 8028F048 0028BF88 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8028F04C 0028BF8C 48 0D 31 D9 */ bl func_80362224 +/* 8028F04C 0028BF8C 48 0D 31 D9 */ bl _restgpr_28 /* 8028F050 0028BF90 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8028F054 0028BF94 7C 08 03 A6 */ mtlr r0 /* 8028F058 0028BF98 38 21 00 E0 */ addi r1, r1, 0xe0 diff --git a/asm/JStudio_JStage/control.s b/asm/JStudio_JStage/control.s index cd8462532f..179cef8a3f 100644 --- a/asm/JStudio_JStage/control.s +++ b/asm/JStudio_JStage/control.s @@ -32,7 +32,7 @@ lbl_80289B44: /* 80289B64 00286AA4 7C 08 02 A6 */ mflr r0 /* 80289B68 00286AA8 90 01 00 24 */ stw r0, 0x24(r1) /* 80289B6C 00286AAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289B70 00286AB0 48 0D 86 69 */ bl func_803621D8 +/* 80289B70 00286AB0 48 0D 86 69 */ bl _savegpr_28 /* 80289B74 00286AB4 7C 7D 1B 78 */ mr r29, r3 /* 80289B78 00286AB8 7C 9E 23 78 */ mr r30, r4 /* 80289B7C 00286ABC 7C BF 2B 78 */ mr r31, r5 @@ -143,7 +143,7 @@ lbl_80289CC8: /* 80289CC8 00286C08 38 60 00 00 */ li r3, 0 lbl_80289CCC: /* 80289CCC 00286C0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289CD0 00286C10 48 0D 85 55 */ bl func_80362224 +/* 80289CD0 00286C10 48 0D 85 55 */ bl _restgpr_28 /* 80289CD4 00286C14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80289CD8 00286C18 7C 08 03 A6 */ mtlr r0 /* 80289CDC 00286C1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -154,7 +154,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG_: /* 80289CE8 00286C28 7C 08 02 A6 */ mflr r0 /* 80289CEC 00286C2C 90 01 00 24 */ stw r0, 0x24(r1) /* 80289CF0 00286C30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289CF4 00286C34 48 0D 84 E5 */ bl func_803621D8 +/* 80289CF4 00286C34 48 0D 84 E5 */ bl _savegpr_28 /* 80289CF8 00286C38 7C 7C 1B 78 */ mr r28, r3 /* 80289CFC 00286C3C 7C BD 2B 78 */ mr r29, r5 /* 80289D00 00286C40 7C 9E 23 78 */ mr r30, r4 @@ -219,7 +219,7 @@ lbl_80289DCC: /* 80289DCC 00286D0C 7F C3 F3 78 */ mr r3, r30 lbl_80289DD0: /* 80289DD0 00286D10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289DD4 00286D14 48 0D 84 51 */ bl func_80362224 +/* 80289DD4 00286D14 48 0D 84 51 */ bl _restgpr_28 /* 80289DD8 00286D18 80 01 00 24 */ lwz r0, 0x24(r1) /* 80289DDC 00286D1C 7C 08 03 A6 */ mtlr r0 /* 80289DE0 00286D20 38 21 00 20 */ addi r1, r1, 0x20 @@ -230,7 +230,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X1_: /* 80289DEC 00286D2C 7C 08 02 A6 */ mflr r0 /* 80289DF0 00286D30 90 01 00 24 */ stw r0, 0x24(r1) /* 80289DF4 00286D34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289DF8 00286D38 48 0D 83 E1 */ bl func_803621D8 +/* 80289DF8 00286D38 48 0D 83 E1 */ bl _savegpr_28 /* 80289DFC 00286D3C 7C 7C 1B 78 */ mr r28, r3 /* 80289E00 00286D40 7C BD 2B 78 */ mr r29, r5 /* 80289E04 00286D44 7C 9E 23 78 */ mr r30, r4 @@ -295,7 +295,7 @@ lbl_80289ED0: /* 80289ED0 00286E10 7F C3 F3 78 */ mr r3, r30 lbl_80289ED4: /* 80289ED4 00286E14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289ED8 00286E18 48 0D 83 4D */ bl func_80362224 +/* 80289ED8 00286E18 48 0D 83 4D */ bl _restgpr_28 /* 80289EDC 00286E1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80289EE0 00286E20 7C 08 03 A6 */ mtlr r0 /* 80289EE4 00286E24 38 21 00 20 */ addi r1, r1, 0x20 @@ -306,7 +306,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X2_: /* 80289EF0 00286E30 7C 08 02 A6 */ mflr r0 /* 80289EF4 00286E34 90 01 00 24 */ stw r0, 0x24(r1) /* 80289EF8 00286E38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289EFC 00286E3C 48 0D 82 DD */ bl func_803621D8 +/* 80289EFC 00286E3C 48 0D 82 DD */ bl _savegpr_28 /* 80289F00 00286E40 7C 7C 1B 78 */ mr r28, r3 /* 80289F04 00286E44 7C BD 2B 78 */ mr r29, r5 /* 80289F08 00286E48 7C 9E 23 78 */ mr r30, r4 @@ -371,7 +371,7 @@ lbl_80289FD4: /* 80289FD4 00286F14 7F C3 F3 78 */ mr r3, r30 lbl_80289FD8: /* 80289FD8 00286F18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289FDC 00286F1C 48 0D 82 49 */ bl func_80362224 +/* 80289FDC 00286F1C 48 0D 82 49 */ bl _restgpr_28 /* 80289FE0 00286F20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80289FE4 00286F24 7C 08 03 A6 */ mtlr r0 /* 80289FE8 00286F28 38 21 00 20 */ addi r1, r1, 0x20 @@ -382,7 +382,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X3_: /* 80289FF4 00286F34 7C 08 02 A6 */ mflr r0 /* 80289FF8 00286F38 90 01 00 24 */ stw r0, 0x24(r1) /* 80289FFC 00286F3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A000 00286F40 48 0D 81 D9 */ bl func_803621D8 +/* 8028A000 00286F40 48 0D 81 D9 */ bl _savegpr_28 /* 8028A004 00286F44 7C 7C 1B 78 */ mr r28, r3 /* 8028A008 00286F48 7C BD 2B 78 */ mr r29, r5 /* 8028A00C 00286F4C 7C 9E 23 78 */ mr r30, r4 @@ -447,7 +447,7 @@ lbl_8028A0D8: /* 8028A0D8 00287018 7F C3 F3 78 */ mr r3, r30 lbl_8028A0DC: /* 8028A0DC 0028701C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A0E0 00287020 48 0D 81 45 */ bl func_80362224 +/* 8028A0E0 00287020 48 0D 81 45 */ bl _restgpr_28 /* 8028A0E4 00287024 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028A0E8 00287028 7C 08 03 A6 */ mtlr r0 /* 8028A0EC 0028702C 38 21 00 20 */ addi r1, r1, 0x20 @@ -458,7 +458,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X4_: /* 8028A0F8 00287038 7C 08 02 A6 */ mflr r0 /* 8028A0FC 0028703C 90 01 00 24 */ stw r0, 0x24(r1) /* 8028A100 00287040 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A104 00287044 48 0D 80 D5 */ bl func_803621D8 +/* 8028A104 00287044 48 0D 80 D5 */ bl _savegpr_28 /* 8028A108 00287048 7C 7C 1B 78 */ mr r28, r3 /* 8028A10C 0028704C 7C BD 2B 78 */ mr r29, r5 /* 8028A110 00287050 7C 9E 23 78 */ mr r30, r4 @@ -523,7 +523,7 @@ lbl_8028A1DC: /* 8028A1DC 0028711C 7F C3 F3 78 */ mr r3, r30 lbl_8028A1E0: /* 8028A1E0 00287120 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A1E4 00287124 48 0D 80 41 */ bl func_80362224 +/* 8028A1E4 00287124 48 0D 80 41 */ bl _restgpr_28 /* 8028A1E8 00287128 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028A1EC 0028712C 7C 08 03 A6 */ mtlr r0 /* 8028A1F0 00287130 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio_JStage/object-actor.s b/asm/JStudio_JStage/object-actor.s index 98567c69c4..6d15676424 100644 --- a/asm/JStudio_JStage/object-actor.s +++ b/asm/JStudio_JStage/object-actor.s @@ -133,7 +133,7 @@ lbl_8028A7A4: /* 8028A7B8 002876F8 7C 08 02 A6 */ mflr r0 /* 8028A7BC 002876FC 90 01 00 24 */ stw r0, 0x24(r1) /* 8028A7C0 00287700 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A7C4 00287704 48 0D 7A 11 */ bl func_803621D4 +/* 8028A7C4 00287704 48 0D 7A 11 */ bl _savegpr_27 /* 8028A7C8 00287708 7C 7E 1B 78 */ mr r30, r3 /* 8028A7CC 0028770C 83 83 01 2C */ lwz r28, 0x12c(r3) /* 8028A7D0 00287710 7F 83 E3 78 */ mr r3, r28 @@ -205,7 +205,7 @@ lbl_8028A8B4: /* 8028A8B8 002877F8 2C 00 FF FF */ cmpwi r0, -1 /* 8028A8BC 002877FC 40 82 FF C8 */ bne lbl_8028A884 /* 8028A8C0 00287800 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A8C4 00287804 48 0D 79 5D */ bl func_80362220 +/* 8028A8C4 00287804 48 0D 79 5D */ bl _restgpr_27 /* 8028A8C8 00287808 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028A8CC 0028780C 7C 08 03 A6 */ mtlr r0 /* 8028A8D0 00287810 38 21 00 20 */ addi r1, r1, 0x20 @@ -744,7 +744,7 @@ lbl_8028B04C: /* 8028B078 00287FB8 DB C1 00 20 */ stfd f30, 0x20(r1) /* 8028B07C 00287FBC F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8028B080 00287FC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B084 00287FC4 48 0D 71 55 */ bl func_803621D8 +/* 8028B084 00287FC4 48 0D 71 55 */ bl _savegpr_28 /* 8028B088 00287FC8 7C 7C 1B 78 */ mr r28, r3 /* 8028B08C 00287FCC FF C0 08 90 */ fmr f30, f1 /* 8028B090 00287FD0 83 E4 01 2C */ lwz r31, 0x12c(r4) @@ -787,7 +787,7 @@ lbl_8028B0FC: /* 8028B118 00288058 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8028B11C 0028805C CB C1 00 20 */ lfd f30, 0x20(r1) /* 8028B120 00288060 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B124 00288064 48 0D 71 01 */ bl func_80362224 +/* 8028B124 00288064 48 0D 71 01 */ bl _restgpr_28 /* 8028B128 00288068 80 01 00 44 */ lwz r0, 0x44(r1) /* 8028B12C 0028806C 7C 08 03 A6 */ mtlr r0 /* 8028B130 00288070 38 21 00 40 */ addi r1, r1, 0x40 @@ -823,7 +823,7 @@ lbl_8028B17C: /* 8028B19C 002880DC 7C 08 02 A6 */ mflr r0 /* 8028B1A0 002880E0 90 01 01 04 */ stw r0, 0x104(r1) /* 8028B1A4 002880E4 39 61 01 00 */ addi r11, r1, 0x100 -/* 8028B1A8 002880E8 48 0D 70 2D */ bl func_803621D4 +/* 8028B1A8 002880E8 48 0D 70 2D */ bl _savegpr_27 /* 8028B1AC 002880EC 3C 60 80 3C */ lis r3, lbl_803C5730@ha /* 8028B1B0 002880F0 3B C3 57 30 */ addi r30, r3, lbl_803C5730@l /* 8028B1B4 002880F4 3C 60 80 43 */ lis r3, lbl_80431188@ha @@ -1068,7 +1068,7 @@ lbl_8028B17C: /* 8028B548 00288488 38 80 00 00 */ li r4, 0 /* 8028B54C 0028848C 4B FF A8 C1 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor /* 8028B550 00288490 39 61 01 00 */ addi r11, r1, 0x100 -/* 8028B554 00288494 48 0D 6C CD */ bl func_80362220 +/* 8028B554 00288494 48 0D 6C CD */ bl _restgpr_27 /* 8028B558 00288498 80 01 01 04 */ lwz r0, 0x104(r1) /* 8028B55C 0028849C 7C 08 03 A6 */ mtlr r0 /* 8028B560 002884A0 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/asm/JStudio_JStage/object-camera.s b/asm/JStudio_JStage/object-camera.s index 2c1fcf70f2..febf39b483 100644 --- a/asm/JStudio_JStage/object-camera.s +++ b/asm/JStudio_JStage/object-camera.s @@ -111,7 +111,7 @@ lbl_8028BA0C: /* 8028BA20 00288960 7C 08 02 A6 */ mflr r0 /* 8028BA24 00288964 90 01 00 24 */ stw r0, 0x24(r1) /* 8028BA28 00288968 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028BA2C 0028896C 48 0D 67 A9 */ bl func_803621D4 +/* 8028BA2C 0028896C 48 0D 67 A9 */ bl _savegpr_27 /* 8028BA30 00288970 7C 7B 1B 78 */ mr r27, r3 /* 8028BA34 00288974 83 C3 01 04 */ lwz r30, 0x104(r3) /* 8028BA38 00288978 7F C3 F3 78 */ mr r3, r30 @@ -161,7 +161,7 @@ lbl_8028BAD4: /* 8028BAD8 00288A18 2C 00 FF FF */ cmpwi r0, -1 /* 8028BADC 00288A1C 40 82 FF C8 */ bne lbl_8028BAA4 /* 8028BAE0 00288A20 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028BAE4 00288A24 48 0D 67 3D */ bl func_80362220 +/* 8028BAE4 00288A24 48 0D 67 3D */ bl _restgpr_27 /* 8028BAE8 00288A28 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028BAEC 00288A2C 7C 08 03 A6 */ mtlr r0 /* 8028BAF0 00288A30 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio_JStage/object-fog.s b/asm/JStudio_JStage/object-fog.s index 8381121310..0be192bf62 100644 --- a/asm/JStudio_JStage/object-fog.s +++ b/asm/JStudio_JStage/object-fog.s @@ -102,7 +102,7 @@ lbl_8028C6BC: /* 8028C6D0 00289610 7C 08 02 A6 */ mflr r0 /* 8028C6D4 00289614 90 01 00 34 */ stw r0, 0x34(r1) /* 8028C6D8 00289618 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028C6DC 0028961C 48 0D 5A F9 */ bl func_803621D4 +/* 8028C6DC 0028961C 48 0D 5A F9 */ bl _savegpr_27 /* 8028C6E0 00289620 7C 7B 1B 78 */ mr r27, r3 /* 8028C6E4 00289624 83 C3 00 8C */ lwz r30, 0x8c(r3) /* 8028C6E8 00289628 7F C3 F3 78 */ mr r3, r30 @@ -155,7 +155,7 @@ lbl_8028C790: /* 8028C794 002896D4 2C 00 FF FF */ cmpwi r0, -1 /* 8028C798 002896D8 40 82 FF C8 */ bne lbl_8028C760 /* 8028C79C 002896DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028C7A0 002896E0 48 0D 5A 81 */ bl func_80362220 +/* 8028C7A0 002896E0 48 0D 5A 81 */ bl _restgpr_27 /* 8028C7A4 002896E4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8028C7A8 002896E8 7C 08 03 A6 */ mtlr r0 /* 8028C7AC 002896EC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JSupport/JSUFileStream.s b/asm/JSupport/JSUFileStream.s index 79ff4106d6..5bea7728ac 100644 --- a/asm/JSupport/JSUFileStream.s +++ b/asm/JSupport/JSUFileStream.s @@ -26,7 +26,7 @@ JSUFileInputStream: /* 802DC680 002D95C0 7C 08 02 A6 */ mflr r0 /* 802DC684 002D95C4 90 01 00 24 */ stw r0, 0x24(r1) /* 802DC688 002D95C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC68C 002D95CC 48 08 5B 4D */ bl func_803621D8 +/* 802DC68C 002D95CC 48 08 5B 4D */ bl _savegpr_28 /* 802DC690 002D95D0 7C 7C 1B 78 */ mr r28, r3 /* 802DC694 002D95D4 7C 9D 23 78 */ mr r29, r4 /* 802DC698 002D95D8 7C BE 2B 78 */ mr r30, r5 @@ -73,7 +73,7 @@ lbl_802DC730: /* 802DC730 002D9670 7F E3 FB 78 */ mr r3, r31 lbl_802DC734: /* 802DC734 002D9674 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC738 002D9678 48 08 5A ED */ bl func_80362224 +/* 802DC738 002D9678 48 08 5A ED */ bl _restgpr_28 /* 802DC73C 002D967C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DC740 002D9680 7C 08 03 A6 */ mtlr r0 /* 802DC744 002D9684 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JSupport/JSUInputStream.s b/asm/JSupport/JSUInputStream.s index 6b9746080e..49e0fffb38 100644 --- a/asm/JSupport/JSUInputStream.s +++ b/asm/JSupport/JSUInputStream.s @@ -162,7 +162,7 @@ JSURandomInputStream_NS_peek: /* 802DC45C 002D939C 7C 08 02 A6 */ mflr r0 /* 802DC460 002D93A0 90 01 00 24 */ stw r0, 0x24(r1) /* 802DC464 002D93A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC468 002D93A8 48 08 5D 71 */ bl func_803621D8 +/* 802DC468 002D93A8 48 08 5D 71 */ bl _savegpr_28 /* 802DC46C 002D93AC 7C 7C 1B 78 */ mr r28, r3 /* 802DC470 002D93B0 7C 9D 23 78 */ mr r29, r4 /* 802DC474 002D93B4 7C BE 2B 78 */ mr r30, r5 @@ -187,7 +187,7 @@ JSURandomInputStream_NS_peek: lbl_802DC4C0: /* 802DC4C0 002D9400 7F C3 F3 78 */ mr r3, r30 /* 802DC4C4 002D9404 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC4C8 002D9408 48 08 5D 5D */ bl func_80362224 +/* 802DC4C8 002D9408 48 08 5D 5D */ bl _restgpr_28 /* 802DC4CC 002D940C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DC4D0 002D9410 7C 08 03 A6 */ mtlr r0 /* 802DC4D4 002D9414 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTCacheFont.s b/asm/JUtility/JUTCacheFont.s index 2e7b757b1c..e285da83dd 100644 --- a/asm/JUtility/JUTCacheFont.s +++ b/asm/JUtility/JUTCacheFont.s @@ -9,7 +9,7 @@ JUTCacheFont: /* 802DD18C 002DA0CC 7C 08 02 A6 */ mflr r0 /* 802DD190 002DA0D0 90 01 00 24 */ stw r0, 0x24(r1) /* 802DD194 002DA0D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DD198 002DA0D8 48 08 50 41 */ bl func_803621D8 +/* 802DD198 002DA0D8 48 08 50 41 */ bl _savegpr_28 /* 802DD19C 002DA0DC 7C 7C 1B 78 */ mr r28, r3 /* 802DD1A0 002DA0E0 7C 9D 23 78 */ mr r29, r4 /* 802DD1A4 002DA0E4 7C BE 2B 78 */ mr r30, r5 @@ -32,7 +32,7 @@ JUTCacheFont: /* 802DD1E8 002DA128 48 00 03 05 */ bl JUTCacheFont_NS_initiate /* 802DD1EC 002DA12C 7F 83 E3 78 */ mr r3, r28 /* 802DD1F0 002DA130 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DD1F4 002DA134 48 08 50 31 */ bl func_80362224 +/* 802DD1F4 002DA134 48 08 50 31 */ bl _restgpr_28 /* 802DD1F8 002DA138 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DD1FC 002DA13C 7C 08 03 A6 */ mtlr r0 /* 802DD200 002DA140 38 21 00 20 */ addi r1, r1, 0x20 @@ -288,7 +288,7 @@ JUTCacheFont_NS_internal_initiate: /* 802DD550 002DA490 7C 08 02 A6 */ mflr r0 /* 802DD554 002DA494 90 01 00 34 */ stw r0, 0x34(r1) /* 802DD558 002DA498 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DD55C 002DA49C 48 08 4C 79 */ bl func_803621D4 +/* 802DD55C 002DA49C 48 08 4C 79 */ bl _savegpr_27 /* 802DD560 002DA4A0 7C 7B 1B 78 */ mr r27, r3 /* 802DD564 002DA4A4 7C 9C 23 78 */ mr r28, r4 /* 802DD568 002DA4A8 7C BD 2B 78 */ mr r29, r5 @@ -348,7 +348,7 @@ lbl_802DD620: /* 802DD634 002DA574 38 60 00 01 */ li r3, 1 lbl_802DD638: /* 802DD638 002DA578 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DD63C 002DA57C 48 08 4B E5 */ bl func_80362220 +/* 802DD63C 002DA57C 48 08 4B E5 */ bl _restgpr_27 /* 802DD640 002DA580 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DD644 002DA584 7C 08 03 A6 */ mtlr r0 /* 802DD648 002DA588 38 21 00 30 */ addi r1, r1, 0x30 @@ -360,7 +360,7 @@ JUTCacheFont_NS_allocArea: /* 802DD654 002DA594 7C 08 02 A6 */ mflr r0 /* 802DD658 002DA598 90 01 00 24 */ stw r0, 0x24(r1) /* 802DD65C 002DA59C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DD660 002DA5A0 48 08 4B 79 */ bl func_803621D8 +/* 802DD660 002DA5A0 48 08 4B 79 */ bl _savegpr_28 /* 802DD664 002DA5A4 7C 7C 1B 78 */ mr r28, r3 /* 802DD668 002DA5A8 7C 9D 23 78 */ mr r29, r4 /* 802DD66C 002DA5AC 7C BE 2B 78 */ mr r30, r5 @@ -470,7 +470,7 @@ lbl_802DD7E0: /* 802DD7E8 002DA728 38 60 00 01 */ li r3, 1 lbl_802DD7EC: /* 802DD7EC 002DA72C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DD7F0 002DA730 48 08 4A 35 */ bl func_80362224 +/* 802DD7F0 002DA730 48 08 4A 35 */ bl _restgpr_28 /* 802DD7F4 002DA734 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DD7F8 002DA738 7C 08 03 A6 */ mtlr r0 /* 802DD7FC 002DA73C 38 21 00 20 */ addi r1, r1, 0x20 @@ -751,7 +751,7 @@ JUTCacheFont_NS_getGlyphFromAram: /* 802DDBC0 002DAB00 7C 08 02 A6 */ mflr r0 /* 802DDBC4 002DAB04 90 01 00 24 */ stw r0, 0x24(r1) /* 802DDBC8 002DAB08 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DDBCC 002DAB0C 48 08 46 09 */ bl func_803621D4 +/* 802DDBCC 002DAB0C 48 08 46 09 */ bl _savegpr_27 /* 802DDBD0 002DAB10 7C 7B 1B 78 */ mr r27, r3 /* 802DDBD4 002DAB14 7C 9C 23 78 */ mr r28, r4 /* 802DDBD8 002DAB18 7C BF 2B 78 */ mr r31, r5 @@ -817,7 +817,7 @@ lbl_802DDC40: /* 802DDCC4 002DAC04 39 00 00 00 */ li r8, 0 /* 802DDCC8 002DAC08 48 08 04 0D */ bl GXInitTexObjLOD /* 802DDCCC 002DAC0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DDCD0 002DAC10 48 08 45 51 */ bl func_80362220 +/* 802DDCD0 002DAC10 48 08 45 51 */ bl _restgpr_27 /* 802DDCD4 002DAC14 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DDCD8 002DAC18 7C 08 03 A6 */ mtlr r0 /* 802DDCDC 002DAC1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -875,7 +875,7 @@ JUTCacheFont_NS_loadCache_char_subroutine: /* 802DDD9C 002DACDC 7C 08 02 A6 */ mflr r0 /* 802DDDA0 002DACE0 90 01 00 34 */ stw r0, 0x34(r1) /* 802DDDA4 002DACE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DDDA8 002DACE8 48 08 44 2D */ bl func_803621D4 +/* 802DDDA8 002DACE8 48 08 44 2D */ bl _savegpr_27 /* 802DDDAC 002DACEC 7C 7D 1B 78 */ mr r29, r3 /* 802DDDB0 002DACF0 7C 9E 23 78 */ mr r30, r4 /* 802DDDB4 002DACF4 7C BF 2B 78 */ mr r31, r5 @@ -959,7 +959,7 @@ lbl_802DDEB8: /* 802DDEC4 002DAE04 B0 03 00 1E */ sth r0, 0x1e(r3) lbl_802DDEC8: /* 802DDEC8 002DAE08 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DDECC 002DAE0C 48 08 43 55 */ bl func_80362220 +/* 802DDECC 002DAE0C 48 08 43 55 */ bl _restgpr_27 /* 802DDED0 002DAE10 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DDED4 002DAE14 7C 08 03 A6 */ mtlr r0 /* 802DDED8 002DAE18 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JUtility/JUTConsole.s b/asm/JUtility/JUTConsole.s index 5e9eea8ea0..481889628f 100644 --- a/asm/JUtility/JUTConsole.s +++ b/asm/JUtility/JUTConsole.s @@ -9,7 +9,7 @@ JUTConsole_NS_create: /* 802E7358 002E4298 7C 08 02 A6 */ mflr r0 /* 802E735C 002E429C 90 01 00 24 */ stw r0, 0x24(r1) /* 802E7360 002E42A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E7364 002E42A4 48 07 AE 71 */ bl func_803621D4 +/* 802E7364 002E42A4 48 07 AE 71 */ bl _savegpr_27 /* 802E7368 002E42A8 7C 7B 1B 78 */ mr r27, r3 /* 802E736C 002E42AC 7C 9C 23 78 */ mr r28, r4 /* 802E7370 002E42B0 7C BD 2B 78 */ mr r29, r5 @@ -37,7 +37,7 @@ lbl_802E73AC: /* 802E73C4 002E4304 48 00 0E 7D */ bl JUTConsoleManager_NS_appendConsole /* 802E73C8 002E4308 7F E3 FB 78 */ mr r3, r31 /* 802E73CC 002E430C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E73D0 002E4310 48 07 AE 51 */ bl func_80362220 +/* 802E73D0 002E4310 48 07 AE 51 */ bl _restgpr_27 /* 802E73D4 002E4314 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E73D8 002E4318 7C 08 03 A6 */ mtlr r0 /* 802E73DC 002E431C 38 21 00 20 */ addi r1, r1, 0x20 @@ -49,7 +49,7 @@ JUTConsole_NS_create_X1_: /* 802E73E8 002E4328 7C 08 02 A6 */ mflr r0 /* 802E73EC 002E432C 90 01 00 24 */ stw r0, 0x24(r1) /* 802E73F0 002E4330 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E73F4 002E4334 48 07 AD E5 */ bl func_803621D8 +/* 802E73F4 002E4334 48 07 AD E5 */ bl _savegpr_28 /* 802E73F8 002E4338 7C 7C 1B 78 */ mr r28, r3 /* 802E73FC 002E433C 7C 9D 23 78 */ mr r29, r4 /* 802E7400 002E4340 83 CD 8F F0 */ lwz r30, lbl_80451570-_SDA_BASE_(r13) @@ -75,7 +75,7 @@ lbl_802E7434: /* 802E744C 002E438C 48 00 0D F5 */ bl JUTConsoleManager_NS_appendConsole /* 802E7450 002E4390 7F E3 FB 78 */ mr r3, r31 /* 802E7454 002E4394 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E7458 002E4398 48 07 AD CD */ bl func_80362224 +/* 802E7458 002E4398 48 07 AD CD */ bl _restgpr_28 /* 802E745C 002E439C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E7460 002E43A0 7C 08 03 A6 */ mtlr r0 /* 802E7464 002E43A4 38 21 00 20 */ addi r1, r1, 0x20 @@ -87,7 +87,7 @@ JUTConsole: /* 802E7470 002E43B0 7C 08 02 A6 */ mflr r0 /* 802E7474 002E43B4 90 01 00 24 */ stw r0, 0x24(r1) /* 802E7478 002E43B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E747C 002E43BC 48 07 AD 5D */ bl func_803621D8 +/* 802E747C 002E43BC 48 07 AD 5D */ bl _savegpr_28 /* 802E7480 002E43C0 7C 7C 1B 78 */ mr r28, r3 /* 802E7484 002E43C4 7C 9D 23 78 */ mr r29, r4 /* 802E7488 002E43C8 7C BE 2B 78 */ mr r30, r5 @@ -139,7 +139,7 @@ lbl_802E74F0: /* 802E753C 002E447C 90 1C 00 64 */ stw r0, 0x64(r28) /* 802E7540 002E4480 7F 83 E3 78 */ mr r3, r28 /* 802E7544 002E4484 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E7548 002E4488 48 07 AC DD */ bl func_80362224 +/* 802E7548 002E4488 48 07 AC DD */ bl _restgpr_28 /* 802E754C 002E448C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E7550 002E4490 7C 08 03 A6 */ mtlr r0 /* 802E7554 002E4494 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTDbPrint.s b/asm/JUtility/JUTDbPrint.s index fb73498249..09c48dd524 100644 --- a/asm/JUtility/JUTDbPrint.s +++ b/asm/JUtility/JUTDbPrint.s @@ -97,7 +97,7 @@ JUTDbPrint_NS_enter: /* 802E0270 002DD1B0 B3 DF 00 0A */ sth r30, 0xa(r31) /* 802E0274 002DD1B4 38 7F 00 0C */ addi r3, r31, 0xc /* 802E0278 002DD1B8 7F A4 EB 78 */ mr r4, r29 -/* 802E027C 002DD1BC 48 08 88 B1 */ bl func_80368B2C +/* 802E027C 002DD1BC 48 08 88 B1 */ bl strcpy /* 802E0280 002DD1C0 80 19 00 00 */ lwz r0, 0(r25) /* 802E0284 002DD1C4 90 1F 00 00 */ stw r0, 0(r31) /* 802E0288 002DD1C8 93 F9 00 00 */ stw r31, 0(r25) @@ -132,7 +132,7 @@ JUTDbPrint_NS_flush_X1_: /* 802E02E0 002DD220 7C 08 02 A6 */ mflr r0 /* 802E02E4 002DD224 90 01 01 14 */ stw r0, 0x114(r1) /* 802E02E8 002DD228 39 61 01 10 */ addi r11, r1, 0x110 -/* 802E02EC 002DD22C 48 08 1E ED */ bl func_803621D8 +/* 802E02EC 002DD22C 48 08 1E ED */ bl _savegpr_28 /* 802E02F0 002DD230 7C 7C 1B 78 */ mr r28, r3 /* 802E02F4 002DD234 7F 9F E3 78 */ mr r31, r28 /* 802E02F8 002DD238 83 C3 00 00 */ lwz r30, 0(r3) @@ -217,7 +217,7 @@ lbl_802E0408: /* 802E0424 002DD364 90 01 00 0C */ stw r0, 0xc(r1) lbl_802E0428: /* 802E0428 002DD368 39 61 01 10 */ addi r11, r1, 0x110 -/* 802E042C 002DD36C 48 08 1D F9 */ bl func_80362224 +/* 802E042C 002DD36C 48 08 1D F9 */ bl _restgpr_28 /* 802E0430 002DD370 80 01 01 14 */ lwz r0, 0x114(r1) /* 802E0434 002DD374 7C 08 03 A6 */ mtlr r0 /* 802E0438 002DD378 38 21 01 10 */ addi r1, r1, 0x110 @@ -231,7 +231,7 @@ JUTDbPrint_NS_drawString: /* 802E044C 002DD38C DB E1 00 40 */ stfd f31, 0x40(r1) /* 802E0450 002DD390 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 802E0454 002DD394 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E0458 002DD398 48 08 1D 7D */ bl func_803621D4 +/* 802E0458 002DD398 48 08 1D 7D */ bl _savegpr_27 /* 802E045C 002DD39C 7C 9B 23 78 */ mr r27, r4 /* 802E0460 002DD3A0 7C BC 2B 78 */ mr r28, r5 /* 802E0464 002DD3A4 7C DD 33 78 */ mr r29, r6 @@ -280,7 +280,7 @@ JUTDbPrint_NS_drawString: /* 802E0510 002DD450 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802E0514 002DD454 CB E1 00 40 */ lfd f31, 0x40(r1) /* 802E0518 002DD458 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E051C 002DD45C 48 08 1D 05 */ bl func_80362220 +/* 802E051C 002DD45C 48 08 1D 05 */ bl _restgpr_27 /* 802E0520 002DD460 80 01 00 54 */ lwz r0, 0x54(r1) /* 802E0524 002DD464 7C 08 03 A6 */ mtlr r0 /* 802E0528 002DD468 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/JUtility/JUTDirectFile.s b/asm/JUtility/JUTDirectFile.s index a8e414bfca..62f25df2ca 100644 --- a/asm/JUtility/JUTDirectFile.s +++ b/asm/JUtility/JUTDirectFile.s @@ -171,7 +171,7 @@ JUTDirectFile_NS_fgets: /* 802E895C 002E589C 7C 08 02 A6 */ mflr r0 /* 802E8960 002E58A0 90 01 00 24 */ stw r0, 0x24(r1) /* 802E8964 002E58A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E8968 002E58A8 48 07 98 6D */ bl func_803621D4 +/* 802E8968 002E58A8 48 07 98 6D */ bl _savegpr_27 /* 802E896C 002E58AC 7C 7C 1B 78 */ mr r28, r3 /* 802E8970 002E58B0 7C BD 2B 78 */ mr r29, r5 /* 802E8974 002E58B4 88 03 08 30 */ lbz r0, 0x830(r3) @@ -287,7 +287,7 @@ lbl_802E8AEC: /* 802E8AEC 002E5A2C 7F C3 F3 78 */ mr r3, r30 lbl_802E8AF0: /* 802E8AF0 002E5A30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E8AF4 002E5A34 48 07 97 2D */ bl func_80362220 +/* 802E8AF4 002E5A34 48 07 97 2D */ bl _restgpr_27 /* 802E8AF8 002E5A38 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E8AFC 002E5A3C 7C 08 03 A6 */ mtlr r0 /* 802E8B00 002E5A40 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTDirectPrint.s b/asm/JUtility/JUTDirectPrint.s index ce5ec2f4e1..ae4c69bbdd 100644 --- a/asm/JUtility/JUTDirectPrint.s +++ b/asm/JUtility/JUTDirectPrint.s @@ -103,7 +103,7 @@ JUTDirectPrint_NS_drawChar: /* 802E4320 002E1260 7C 08 02 A6 */ mflr r0 /* 802E4324 002E1264 90 01 00 24 */ stw r0, 0x24(r1) /* 802E4328 002E1268 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E432C 002E126C 48 07 DE A9 */ bl func_803621D4 +/* 802E432C 002E126C 48 07 DE A9 */ bl _savegpr_27 /* 802E4330 002E1270 3C E0 80 3D */ lis r7, lbl_803CC6B8@ha /* 802E4334 002E1274 38 E7 C6 B8 */ addi r7, r7, lbl_803CC6B8@l /* 802E4338 002E1278 2C 06 00 64 */ cmpwi r6, 0x64 @@ -267,7 +267,7 @@ lbl_802E4534: /* 802E454C 002E148C 2C 0B 00 07 */ cmpwi r11, 7 /* 802E4550 002E1490 41 80 FE 84 */ blt lbl_802E43D4 /* 802E4554 002E1494 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E4558 002E1498 48 07 DC C9 */ bl func_80362220 +/* 802E4558 002E1498 48 07 DC C9 */ bl _restgpr_27 /* 802E455C 002E149C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E4560 002E14A0 7C 08 03 A6 */ mtlr r0 /* 802E4564 002E14A4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index 508d5f1088..4c1792f53b 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -186,7 +186,7 @@ JUTException_NS_errorHandler: /* 802E1FD0 002DEF10 7C 08 02 A6 */ mflr r0 /* 802E1FD4 002DEF14 90 01 00 24 */ stw r0, 0x24(r1) /* 802E1FD8 002DEF18 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E1FDC 002DEF1C 48 08 01 FD */ bl func_803621D8 +/* 802E1FDC 002DEF1C 48 08 01 FD */ bl _savegpr_28 /* 802E1FE0 002DEF20 7C 7C 1B 78 */ mr r28, r3 /* 802E1FE4 002DEF24 7C 9D 23 78 */ mr r29, r4 /* 802E1FE8 002DEF28 7C BE 2B 78 */ mr r30, r5 @@ -239,7 +239,7 @@ lbl_802E2070: /* 802E20A0 002DEFE0 48 05 EC 65 */ bl OSEnableScheduler /* 802E20A4 002DEFE4 48 05 F1 AD */ bl OSYieldThread /* 802E20A8 002DEFE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E20AC 002DEFEC 48 08 01 79 */ bl func_80362224 +/* 802E20AC 002DEFEC 48 08 01 79 */ bl _restgpr_28 /* 802E20B0 002DEFF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E20B4 002DEFF4 7C 08 03 A6 */ mtlr r0 /* 802E20B8 002DEFF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -697,7 +697,7 @@ JUTException_NS_showStack: /* 802E26B4 002DF5F4 7C 08 02 A6 */ mflr r0 /* 802E26B8 002DF5F8 90 01 00 24 */ stw r0, 0x24(r1) /* 802E26BC 002DF5FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E26C0 002DF600 48 07 FB 19 */ bl func_803621D8 +/* 802E26C0 002DF600 48 07 FB 19 */ bl _savegpr_28 /* 802E26C4 002DF604 7C 7C 1B 78 */ mr r28, r3 /* 802E26C8 002DF608 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E26CC 002DF60C 28 03 00 00 */ cmplwi r3, 0 @@ -756,7 +756,7 @@ lbl_802E2778: /* 802E2794 002DF6D4 41 80 FF 7C */ blt lbl_802E2710 lbl_802E2798: /* 802E2798 002DF6D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E279C 002DF6DC 48 07 FA 89 */ bl func_80362224 +/* 802E279C 002DF6DC 48 07 FA 89 */ bl _restgpr_28 /* 802E27A0 002DF6E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E27A4 002DF6E4 7C 08 03 A6 */ mtlr r0 /* 802E27A8 002DF6E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -768,7 +768,7 @@ JUTException_NS_showMainInfo: /* 802E27B4 002DF6F4 7C 08 02 A6 */ mflr r0 /* 802E27B8 002DF6F8 90 01 00 24 */ stw r0, 0x24(r1) /* 802E27BC 002DF6FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E27C0 002DF700 48 07 FA 19 */ bl func_803621D8 +/* 802E27C0 002DF700 48 07 FA 19 */ bl _savegpr_28 /* 802E27C4 002DF704 7C 9F 23 78 */ mr r31, r4 /* 802E27C8 002DF708 7C BC 2B 78 */ mr r28, r5 /* 802E27CC 002DF70C 7C DD 33 78 */ mr r29, r6 @@ -956,7 +956,7 @@ lbl_802E2A2C: /* 802E2A68 002DF9A8 48 00 51 51 */ bl JUTConsole_NS_print_f lbl_802E2A6C: /* 802E2A6C 002DF9AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E2A70 002DF9B0 48 07 F7 B5 */ bl func_80362224 +/* 802E2A70 002DF9B0 48 07 F7 B5 */ bl _restgpr_28 /* 802E2A74 002DF9B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E2A78 002DF9B8 7C 08 03 A6 */ mtlr r0 /* 802E2A7C 002DF9BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -968,7 +968,7 @@ JUTException_NS_showGPR: /* 802E2A88 002DF9C8 7C 08 02 A6 */ mflr r0 /* 802E2A8C 002DF9CC 90 01 00 24 */ stw r0, 0x24(r1) /* 802E2A90 002DF9D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E2A94 002DF9D4 48 07 F7 45 */ bl func_803621D8 +/* 802E2A94 002DF9D4 48 07 F7 45 */ bl _savegpr_28 /* 802E2A98 002DF9D8 7C 9C 23 78 */ mr r28, r4 /* 802E2A9C 002DF9DC 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2AA0 002DF9E0 28 03 00 00 */ cmplwi r3, 0 @@ -1009,7 +1009,7 @@ lbl_802E2AC8: /* 802E2B28 002DFA68 48 00 50 91 */ bl JUTConsole_NS_print_f lbl_802E2B2C: /* 802E2B2C 002DFA6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E2B30 002DFA70 48 07 F6 F5 */ bl func_80362224 +/* 802E2B30 002DFA70 48 07 F6 F5 */ bl _restgpr_28 /* 802E2B34 002DFA74 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E2B38 002DFA78 7C 08 03 A6 */ mtlr r0 /* 802E2B3C 002DFA7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1021,7 +1021,7 @@ JUTException_NS_showMapInfo_subroutine: /* 802E2B48 002DFA88 7C 08 02 A6 */ mflr r0 /* 802E2B4C 002DFA8C 90 01 01 64 */ stw r0, 0x164(r1) /* 802E2B50 002DFA90 39 61 01 60 */ addi r11, r1, 0x160 -/* 802E2B54 002DFA94 48 07 F6 85 */ bl func_803621D8 +/* 802E2B54 002DFA94 48 07 F6 85 */ bl _savegpr_28 /* 802E2B58 002DFA98 7C 9C 23 78 */ mr r28, r4 /* 802E2B5C 002DFA9C 7C BD 2B 78 */ mr r29, r5 /* 802E2B60 002DFAA0 3C 00 80 00 */ lis r0, 0x8000 @@ -1107,7 +1107,7 @@ lbl_802E2C84: /* 802E2C84 002DFBC4 38 60 00 00 */ li r3, 0 lbl_802E2C88: /* 802E2C88 002DFBC8 39 61 01 60 */ addi r11, r1, 0x160 -/* 802E2C8C 002DFBCC 48 07 F5 99 */ bl func_80362224 +/* 802E2C8C 002DFBCC 48 07 F5 99 */ bl _restgpr_28 /* 802E2C90 002DFBD0 80 01 01 64 */ lwz r0, 0x164(r1) /* 802E2C94 002DFBD4 7C 08 03 A6 */ mtlr r0 /* 802E2C98 002DFBD8 38 21 01 60 */ addi r1, r1, 0x160 @@ -2085,7 +2085,7 @@ JUTException_NS_createFB: /* 802E3A0C 002E094C 7C 08 02 A6 */ mflr r0 /* 802E3A10 002E0950 90 01 00 24 */ stw r0, 0x24(r1) /* 802E3A14 002E0954 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E3A18 002E0958 48 07 E7 C1 */ bl func_803621D8 +/* 802E3A18 002E0958 48 07 E7 C1 */ bl _savegpr_28 /* 802E3A1C 002E095C 7C 7C 1B 78 */ mr r28, r3 /* 802E3A20 002E0960 3C 60 80 3D */ lis r3, lbl_803D2484@ha /* 802E3A24 002E0964 38 03 24 84 */ addi r0, r3, lbl_803D2484@l @@ -2136,7 +2136,7 @@ lbl_802E3AB8: /* 802E3ACC 002E0A0C 41 80 FF E4 */ blt lbl_802E3AB0 /* 802E3AD0 002E0A10 93 BC 00 7C */ stw r29, 0x7c(r28) /* 802E3AD4 002E0A14 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E3AD8 002E0A18 48 07 E7 4D */ bl func_80362224 +/* 802E3AD8 002E0A18 48 07 E7 4D */ bl _restgpr_28 /* 802E3ADC 002E0A1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E3AE0 002E0A20 7C 08 03 A6 */ mtlr r0 /* 802E3AE4 002E0A24 38 21 00 20 */ addi r1, r1, 0x20 @@ -2219,7 +2219,7 @@ JUTException_NS_queryMapAddress: /* 802E3BD8 002E0B18 41 82 00 60 */ beq lbl_802E3C38 /* 802E3BDC 002E0B1C 38 61 00 10 */ addi r3, r1, 0x10 /* 802E3BE0 002E0B20 7C 04 03 78 */ mr r4, r0 -/* 802E3BE4 002E0B24 48 08 4F 49 */ bl func_80368B2C +/* 802E3BE4 002E0B24 48 08 4F 49 */ bl strcpy /* 802E3BE8 002E0B28 38 61 00 10 */ addi r3, r1, 0x10 /* 802E3BEC 002E0B2C 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E3BF0 002E0B30 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l diff --git a/asm/JUtility/JUTFont.s b/asm/JUtility/JUTFont.s index 7a6328baf2..77188f1a56 100644 --- a/asm/JUtility/JUTFont.s +++ b/asm/JUtility/JUTFont.s @@ -107,7 +107,7 @@ JUTFont_NS_drawString_size_scale: /* 802DEE54 002DBD94 DB 61 00 20 */ stfd f27, 0x20(r1) /* 802DEE58 002DBD98 F3 61 00 28 */ psq_st f27, 40(r1), 0, qr0 /* 802DEE5C 002DBD9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEE60 002DBDA0 48 08 33 75 */ bl func_803621D4 +/* 802DEE60 002DBDA0 48 08 33 75 */ bl _savegpr_27 /* 802DEE64 002DBDA4 7C 7B 1B 78 */ mr r27, r3 /* 802DEE68 002DBDA8 FF 60 08 90 */ fmr f27, f1 /* 802DEE6C 002DBDAC FF 80 10 90 */ fmr f28, f2 @@ -163,7 +163,7 @@ lbl_802DEEFC: /* 802DEF28 002DBE68 E3 61 00 28 */ psq_l f27, 40(r1), 0, qr0 /* 802DEF2C 002DBE6C CB 61 00 20 */ lfd f27, 0x20(r1) /* 802DEF30 002DBE70 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEF34 002DBE74 48 08 32 ED */ bl func_80362220 +/* 802DEF34 002DBE74 48 08 32 ED */ bl _restgpr_27 /* 802DEF38 002DBE78 80 01 00 74 */ lwz r0, 0x74(r1) /* 802DEF3C 002DBE7C 7C 08 03 A6 */ mtlr r0 /* 802DEF40 002DBE80 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/JUtility/JUTGamePad.s b/asm/JUtility/JUTGamePad.s index ca9715caf8..b75b446f54 100644 --- a/asm/JUtility/JUTGamePad.s +++ b/asm/JUtility/JUTGamePad.s @@ -439,7 +439,7 @@ JUTGamePad_NS_update: /* 802E0CDC 002DDC1C 7C 08 02 A6 */ mflr r0 /* 802E0CE0 002DDC20 90 01 00 24 */ stw r0, 0x24(r1) /* 802E0CE4 002DDC24 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E0CE8 002DDC28 48 08 14 F1 */ bl func_803621D8 +/* 802E0CE8 002DDC28 48 08 14 F1 */ bl _savegpr_28 /* 802E0CEC 002DDC2C 7C 7E 1B 78 */ mr r30, r3 /* 802E0CF0 002DDC30 3C 60 80 43 */ lis r3, lbl_804343D8@ha /* 802E0CF4 002DDC34 38 63 43 D8 */ addi r3, r3, lbl_804343D8@l @@ -620,7 +620,7 @@ lbl_802E0F68: /* 802E0F88 002DDEC8 48 00 07 99 */ bl JUTGamePad_NS_CRumble_NS_update lbl_802E0F8C: /* 802E0F8C 002DDECC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E0F90 002DDED0 48 08 12 95 */ bl func_80362224 +/* 802E0F90 002DDED0 48 08 12 95 */ bl _restgpr_28 /* 802E0F94 002DDED4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E0F98 002DDED8 7C 08 03 A6 */ mtlr r0 /* 802E0F9C 002DDEDC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1397,7 +1397,7 @@ JUTGamePad_NS_CRumble_NS_setEnabled: /* 802E19DC 002DE91C 7C 08 02 A6 */ mflr r0 /* 802E19E0 002DE920 90 01 00 24 */ stw r0, 0x24(r1) /* 802E19E4 002DE924 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E19E8 002DE928 48 08 07 ED */ bl func_803621D4 +/* 802E19E8 002DE928 48 08 07 ED */ bl _savegpr_27 /* 802E19EC 002DE92C 7C 7B 1B 78 */ mr r27, r3 /* 802E19F0 002DE930 3B 80 00 00 */ li r28, 0 /* 802E19F4 002DE934 3B C0 00 00 */ li r30, 0 @@ -1432,7 +1432,7 @@ lbl_802E1A48: /* 802E1A5C 002DE99C 57 60 00 06 */ rlwinm r0, r27, 0, 0, 3 /* 802E1A60 002DE9A0 90 0D 8F 68 */ stw r0, lbl_804514E8-_SDA_BASE_(r13) /* 802E1A64 002DE9A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E1A68 002DE9A8 48 08 07 B9 */ bl func_80362220 +/* 802E1A68 002DE9A8 48 08 07 B9 */ bl _restgpr_27 /* 802E1A6C 002DE9AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E1A70 002DE9B0 7C 08 03 A6 */ mtlr r0 /* 802E1A74 002DE9B4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTProcBar.s b/asm/JUtility/JUTProcBar.s index f278fe831a..43b702e675 100644 --- a/asm/JUtility/JUTProcBar.s +++ b/asm/JUtility/JUTProcBar.s @@ -202,7 +202,7 @@ JUTProcBar_NS_bar_subroutine: /* 802E5B34 002E2A74 7C 08 02 A6 */ mflr r0 /* 802E5B38 002E2A78 90 01 00 54 */ stw r0, 0x54(r1) /* 802E5B3C 002E2A7C 39 61 00 50 */ addi r11, r1, 0x50 -/* 802E5B40 002E2A80 48 07 C6 95 */ bl func_803621D4 +/* 802E5B40 002E2A80 48 07 C6 95 */ bl _savegpr_27 /* 802E5B44 002E2A84 7C 9D 23 78 */ mr r29, r4 /* 802E5B48 002E2A88 7C BE 2B 78 */ mr r30, r5 /* 802E5B4C 002E2A8C 7C DF 33 78 */ mr r31, r6 @@ -296,7 +296,7 @@ lbl_802E5C4C: /* 802E5CA8 002E2BE8 48 00 3E 1D */ bl J2DFillBox lbl_802E5CAC: /* 802E5CAC 002E2BEC 39 61 00 50 */ addi r11, r1, 0x50 -/* 802E5CB0 002E2BF0 48 07 C5 71 */ bl func_80362220 +/* 802E5CB0 002E2BF0 48 07 C5 71 */ bl _restgpr_27 /* 802E5CB4 002E2BF4 80 01 00 54 */ lwz r0, 0x54(r1) /* 802E5CB8 002E2BF8 7C 08 03 A6 */ mtlr r0 /* 802E5CBC 002E2BFC 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/JUtility/JUTResFont.s b/asm/JUtility/JUTResFont.s index bffb4fa160..1600b1c5f7 100644 --- a/asm/JUtility/JUTResFont.s +++ b/asm/JUtility/JUTResFont.s @@ -233,7 +233,7 @@ JUTResFont_NS_countBlock: /* 802DF24C 002DC18C 7C 08 02 A6 */ mflr r0 /* 802DF250 002DC190 90 01 00 24 */ stw r0, 0x24(r1) /* 802DF254 002DC194 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DF258 002DC198 48 08 2F 81 */ bl func_803621D8 +/* 802DF258 002DC198 48 08 2F 81 */ bl _savegpr_28 /* 802DF25C 002DC19C 7C 7C 1B 78 */ mr r28, r3 /* 802DF260 002DC1A0 38 00 00 00 */ li r0, 0 /* 802DF264 002DC1A4 B0 03 00 60 */ sth r0, 0x60(r3) @@ -295,7 +295,7 @@ lbl_802DF31C: /* 802DF324 002DC264 7C 1D 00 40 */ cmplw r29, r0 /* 802DF328 002DC268 41 80 FF 60 */ blt lbl_802DF288 /* 802DF32C 002DC26C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DF330 002DC270 48 08 2E F5 */ bl func_80362224 +/* 802DF330 002DC270 48 08 2E F5 */ bl _restgpr_28 /* 802DF334 002DC274 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DF338 002DC278 7C 08 03 A6 */ mtlr r0 /* 802DF33C 002DC27C 38 21 00 20 */ addi r1, r1, 0x20 @@ -616,7 +616,7 @@ lbl_802DF7AC: /* 802DF7F8 002DC738 DB 41 00 50 */ stfd f26, 0x50(r1) /* 802DF7FC 002DC73C F3 41 00 58 */ psq_st f26, 88(r1), 0, qr0 /* 802DF800 002DC740 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DF804 002DC744 48 08 29 D1 */ bl func_803621D4 +/* 802DF804 002DC744 48 08 29 D1 */ bl _savegpr_27 /* 802DF808 002DC748 7C 7E 1B 78 */ mr r30, r3 /* 802DF80C 002DC74C FF 40 08 90 */ fmr f26, f1 /* 802DF810 002DC750 FF 60 10 90 */ fmr f27, f2 @@ -865,7 +865,7 @@ lbl_802DF9AC: /* 802DFBC8 002DCB08 E3 41 00 58 */ psq_l f26, 88(r1), 0, qr0 /* 802DFBCC 002DCB0C CB 41 00 50 */ lfd f26, 0x50(r1) /* 802DFBD0 002DCB10 39 61 00 50 */ addi r11, r1, 0x50 -/* 802DFBD4 002DCB14 48 08 26 4D */ bl func_80362220 +/* 802DFBD4 002DCB14 48 08 26 4D */ bl _restgpr_27 /* 802DFBD8 002DCB18 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802DFBDC 002DCB1C 7C 08 03 A6 */ mtlr r0 /* 802DFBE0 002DCB20 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -1122,7 +1122,7 @@ lbl_802DFF44: /* 802DFF64 002DCEA4 7C 08 02 A6 */ mflr r0 /* 802DFF68 002DCEA8 90 01 00 24 */ stw r0, 0x24(r1) /* 802DFF6C 002DCEAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFF70 002DCEB0 48 08 22 69 */ bl func_803621D8 +/* 802DFF70 002DCEB0 48 08 22 69 */ bl _savegpr_28 /* 802DFF74 002DCEB4 7C 7C 1B 78 */ mr r28, r3 /* 802DFF78 002DCEB8 7C BD 2B 78 */ mr r29, r5 /* 802DFF7C 002DCEBC 3B E0 00 00 */ li r31, 0 @@ -1208,7 +1208,7 @@ lbl_802E00A0: /* 802E00A8 002DCFE8 48 07 E3 6D */ bl GXLoadTexObj lbl_802E00AC: /* 802E00AC 002DCFEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E00B0 002DCFF0 48 08 21 75 */ bl func_80362224 +/* 802E00B0 002DCFF0 48 08 21 75 */ bl _restgpr_28 /* 802E00B4 002DCFF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E00B8 002DCFF8 7C 08 03 A6 */ mtlr r0 /* 802E00BC 002DCFFC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTResource.s b/asm/JUtility/JUTResource.s index 9104b85a1c..644d62d9b6 100644 --- a/asm/JUtility/JUTResource.s +++ b/asm/JUtility/JUTResource.s @@ -9,7 +9,7 @@ JUTResReference_NS_getResource: /* 802DE07C 002DAFBC 7C 08 02 A6 */ mflr r0 /* 802DE080 002DAFC0 90 01 00 24 */ stw r0, 0x24(r1) /* 802DE084 002DAFC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE088 002DAFC8 48 08 41 51 */ bl func_803621D8 +/* 802DE088 002DAFC8 48 08 41 51 */ bl _savegpr_28 /* 802DE08C 002DAFCC 7C 7C 1B 78 */ mr r28, r3 /* 802DE090 002DAFD0 7C 9D 23 78 */ mr r29, r4 /* 802DE094 002DAFD4 7C BE 2B 78 */ mr r30, r5 @@ -44,7 +44,7 @@ lbl_802DE0F8: /* 802DE100 002DB040 7F E5 FB 78 */ mr r5, r31 /* 802DE104 002DB044 48 00 00 B9 */ bl JUTResReference_NS_getResource_X2_ /* 802DE108 002DB048 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE10C 002DB04C 48 08 41 19 */ bl func_80362224 +/* 802DE10C 002DB04C 48 08 41 19 */ bl _restgpr_28 /* 802DE110 002DB050 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DE114 002DB054 7C 08 03 A6 */ mtlr r0 /* 802DE118 002DB058 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTXfb.s b/asm/JUtility/JUTXfb.s index aabd35bb15..623895b35f 100644 --- a/asm/JUtility/JUTXfb.s +++ b/asm/JUtility/JUTXfb.s @@ -34,7 +34,7 @@ JUTXfb: /* 802E5264 002E21A4 7C 08 02 A6 */ mflr r0 /* 802E5268 002E21A8 90 01 00 24 */ stw r0, 0x24(r1) /* 802E526C 002E21AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5270 002E21B0 48 07 CF 65 */ bl func_803621D4 +/* 802E5270 002E21B0 48 07 CF 65 */ bl _savegpr_27 /* 802E5274 002E21B4 7C 7B 1B 78 */ mr r27, r3 /* 802E5278 002E21B8 7C 9E 23 78 */ mr r30, r4 /* 802E527C 002E21BC 7C BC 2B 78 */ mr r28, r5 @@ -69,7 +69,7 @@ lbl_802E52B0: lbl_802E52EC: /* 802E52EC 002E222C 7F 63 DB 78 */ mr r3, r27 /* 802E52F0 002E2230 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E52F4 002E2234 48 07 CF 2D */ bl func_80362220 +/* 802E52F4 002E2234 48 07 CF 2D */ bl _restgpr_27 /* 802E52F8 002E2238 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E52FC 002E223C 7C 08 03 A6 */ mtlr r0 /* 802E5300 002E2240 38 21 00 20 */ addi r1, r1, 0x20 @@ -181,7 +181,7 @@ JUTXfb_NS_initiate: /* 802E5458 002E2398 7C 08 02 A6 */ mflr r0 /* 802E545C 002E239C 90 01 00 24 */ stw r0, 0x24(r1) /* 802E5460 002E23A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5464 002E23A4 48 07 CD 75 */ bl func_803621D8 +/* 802E5464 002E23A4 48 07 CD 75 */ bl _savegpr_28 /* 802E5468 002E23A8 7C 7C 1B 78 */ mr r28, r3 /* 802E546C 002E23AC 7C DD 33 79 */ or. r29, r6, r6 /* 802E5470 002E23B0 7C FE 3B 78 */ mr r30, r7 @@ -232,7 +232,7 @@ lbl_802E550C: /* 802E5514 002E2454 98 1C 00 0E */ stb r0, 0xe(r28) lbl_802E5518: /* 802E5518 002E2458 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E551C 002E245C 48 07 CD 09 */ bl func_80362224 +/* 802E551C 002E245C 48 07 CD 09 */ bl _restgpr_28 /* 802E5520 002E2460 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E5524 002E2464 7C 08 03 A6 */ mtlr r0 /* 802E5528 002E2468 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/SComponent/c/c_m3d.s b/asm/SComponent/c/c_m3d.s index f22f9bb4ae..6ffa017f6e 100644 --- a/asm/SComponent/c/c_m3d.s +++ b/asm/SComponent/c/c_m3d.s @@ -134,7 +134,7 @@ cM3d_Len3dSqPntAndSegLine: /* 8026871C 0026565C DB E1 00 40 */ stfd f31, 0x40(r1) /* 80268720 00265660 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80268724 00265664 39 61 00 40 */ addi r11, r1, 0x40 -/* 80268728 00265668 48 0F 9A AD */ bl func_803621D4 +/* 80268728 00265668 48 0F 9A AD */ bl _savegpr_27 /* 8026872C 0026566C 7C 7B 1B 78 */ mr r27, r3 /* 80268730 00265670 7C 9C 23 78 */ mr r28, r4 /* 80268734 00265674 7C BD 2B 78 */ mr r29, r5 @@ -193,7 +193,7 @@ lbl_802687F4: /* 802687F4 00265734 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802687F8 00265738 CB E1 00 40 */ lfd f31, 0x40(r1) /* 802687FC 0026573C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80268800 00265740 48 0F 9A 21 */ bl func_80362220 +/* 80268800 00265740 48 0F 9A 21 */ bl _restgpr_27 /* 80268804 00265744 80 01 00 54 */ lwz r0, 0x54(r1) /* 80268808 00265748 7C 08 03 A6 */ mtlr r0 /* 8026880C 0026574C 38 21 00 50 */ addi r1, r1, 0x50 @@ -279,7 +279,7 @@ cM3d_CalcPla: /* 80268920 00265860 7C 08 02 A6 */ mflr r0 /* 80268924 00265864 90 01 00 34 */ stw r0, 0x34(r1) /* 80268928 00265868 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026892C 0026586C 48 0F 98 AD */ bl func_803621D8 +/* 8026892C 0026586C 48 0F 98 AD */ bl _savegpr_28 /* 80268930 00265870 7C 7C 1B 78 */ mr r28, r3 /* 80268934 00265874 7C BD 2B 78 */ mr r29, r5 /* 80268938 00265878 7C DE 33 78 */ mr r30, r6 @@ -323,7 +323,7 @@ lbl_802689BC: /* 802689CC 0026590C D0 1E 00 00 */ stfs f0, 0(r30) lbl_802689D0: /* 802689D0 00265910 39 61 00 30 */ addi r11, r1, 0x30 -/* 802689D4 00265914 48 0F 98 51 */ bl func_80362224 +/* 802689D4 00265914 48 0F 98 51 */ bl _restgpr_28 /* 802689D8 00265918 80 01 00 34 */ lwz r0, 0x34(r1) /* 802689DC 0026591C 7C 08 03 A6 */ mtlr r0 /* 802689E0 00265920 38 21 00 30 */ addi r1, r1, 0x30 @@ -543,7 +543,7 @@ cM3d_Check_LinLin: /* 80268CA0 00265BE0 DB 01 00 40 */ stfd f24, 0x40(r1) /* 80268CA4 00265BE4 F3 01 00 48 */ psq_st f24, 72(r1), 0, qr0 /* 80268CA8 00265BE8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80268CAC 00265BEC 48 0F 95 2D */ bl func_803621D8 +/* 80268CAC 00265BEC 48 0F 95 2D */ bl _savegpr_28 /* 80268CB0 00265BF0 7C 7C 1B 78 */ mr r28, r3 /* 80268CB4 00265BF4 7C 9D 23 78 */ mr r29, r4 /* 80268CB8 00265BF8 7C BE 2B 78 */ mr r30, r5 @@ -686,7 +686,7 @@ lbl_80268E7C: /* 80268EB4 00265DF4 E3 01 00 48 */ psq_l f24, 72(r1), 0, qr0 /* 80268EB8 00265DF8 CB 01 00 40 */ lfd f24, 0x40(r1) /* 80268EBC 00265DFC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80268EC0 00265E00 48 0F 93 65 */ bl func_80362224 +/* 80268EC0 00265E00 48 0F 93 65 */ bl _restgpr_28 /* 80268EC4 00265E04 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80268EC8 00265E08 7C 08 03 A6 */ mtlr r0 /* 80268ECC 00265E0C 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -729,7 +729,7 @@ cM3d_Cross_LinPla: /* 80268F40 00265E80 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80268F44 00265E84 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80268F48 00265E88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80268F4C 00265E8C 48 0F 92 89 */ bl func_803621D4 +/* 80268F4C 00265E8C 48 0F 92 89 */ bl _savegpr_27 /* 80268F50 00265E90 7C 7B 1B 78 */ mr r27, r3 /* 80268F54 00265E94 7C 9C 23 78 */ mr r28, r4 /* 80268F58 00265E98 7C BD 2B 78 */ mr r29, r5 @@ -793,7 +793,7 @@ lbl_80269030: /* 80269030 00265F70 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80269034 00265F74 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80269038 00265F78 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026903C 00265F7C 48 0F 91 E5 */ bl func_80362220 +/* 8026903C 00265F7C 48 0F 91 E5 */ bl _restgpr_27 /* 80269040 00265F80 80 01 00 34 */ lwz r0, 0x34(r1) /* 80269044 00265F84 7C 08 03 A6 */ mtlr r0 /* 80269048 00265F88 38 21 00 30 */ addi r1, r1, 0x30 @@ -835,7 +835,7 @@ cM3d_Cross_MinMaxBoxLine: /* 802690CC 0026600C DA 21 01 10 */ stfd f17, 0x110(r1) /* 802690D0 00266010 F2 21 01 18 */ psq_st f17, 280(r1), 0, qr0 /* 802690D4 00266014 39 61 01 10 */ addi r11, r1, 0x110 -/* 802690D8 00266018 48 0F 91 01 */ bl func_803621D8 +/* 802690D8 00266018 48 0F 91 01 */ bl _savegpr_28 /* 802690DC 0026601C 7C 7C 1B 78 */ mr r28, r3 /* 802690E0 00266020 7C 9D 23 78 */ mr r29, r4 /* 802690E4 00266024 3B E0 00 00 */ li r31, 0 @@ -1630,7 +1630,7 @@ lbl_80269B9C: /* 80269C0C 00266B4C E2 21 01 18 */ psq_l f17, 280(r1), 0, qr0 /* 80269C10 00266B50 CA 21 01 10 */ lfd f17, 0x110(r1) /* 80269C14 00266B54 39 61 01 10 */ addi r11, r1, 0x110 -/* 80269C18 00266B58 48 0F 86 0D */ bl func_80362224 +/* 80269C18 00266B58 48 0F 86 0D */ bl _restgpr_28 /* 80269C1C 00266B5C 80 01 02 04 */ lwz r0, 0x204(r1) /* 80269C20 00266B60 7C 08 03 A6 */ mtlr r0 /* 80269C24 00266B64 38 21 02 00 */ addi r1, r1, 0x200 @@ -2350,7 +2350,7 @@ cM3d_CrossY_Tri_X1_: /* 8026A618 00267558 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8026A61C 0026755C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8026A620 00267560 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026A624 00267564 48 0F 7B B5 */ bl func_803621D8 +/* 8026A624 00267564 48 0F 7B B5 */ bl _savegpr_28 /* 8026A628 00267568 7C 7C 1B 78 */ mr r28, r3 /* 8026A62C 0026756C 7C 9D 23 78 */ mr r29, r4 /* 8026A630 00267570 7C BE 2B 78 */ mr r30, r5 @@ -2451,7 +2451,7 @@ lbl_8026A798: /* 8026A798 002676D8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8026A79C 002676DC CB E1 00 20 */ lfd f31, 0x20(r1) /* 8026A7A0 002676E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026A7A4 002676E4 48 0F 7A 81 */ bl func_80362224 +/* 8026A7A4 002676E4 48 0F 7A 81 */ bl _restgpr_28 /* 8026A7A8 002676E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026A7AC 002676EC 7C 08 03 A6 */ mtlr r0 /* 8026A7B0 002676F0 38 21 00 30 */ addi r1, r1, 0x30 @@ -2463,7 +2463,7 @@ cM3d_CrossY_Tri_Front: /* 8026A7BC 002676FC 7C 08 02 A6 */ mflr r0 /* 8026A7C0 00267700 90 01 00 24 */ stw r0, 0x24(r1) /* 8026A7C4 00267704 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026A7C8 00267708 48 0F 7A 11 */ bl func_803621D8 +/* 8026A7C8 00267708 48 0F 7A 11 */ bl _savegpr_28 /* 8026A7CC 0026770C 7C 7C 1B 78 */ mr r28, r3 /* 8026A7D0 00267710 7C 9D 23 78 */ mr r29, r4 /* 8026A7D4 00267714 7C BE 2B 78 */ mr r30, r5 @@ -2523,7 +2523,7 @@ lbl_8026A8A4: /* 8026A8A4 002677E4 38 60 00 00 */ li r3, 0 lbl_8026A8A8: /* 8026A8A8 002677E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026A8AC 002677EC 48 0F 79 79 */ bl func_80362224 +/* 8026A8AC 002677EC 48 0F 79 79 */ bl _restgpr_28 /* 8026A8B0 002677F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8026A8B4 002677F4 7C 08 03 A6 */ mtlr r0 /* 8026A8B8 002677F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -2688,7 +2688,7 @@ cM3d_CrossY_Tri_X4_: /* 8026AAF4 00267A34 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8026AAF8 00267A38 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8026AAFC 00267A3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026AB00 00267A40 48 0F 76 D9 */ bl func_803621D8 +/* 8026AB00 00267A40 48 0F 76 D9 */ bl _savegpr_28 /* 8026AB04 00267A44 7C 7C 1B 78 */ mr r28, r3 /* 8026AB08 00267A48 7C 9D 23 78 */ mr r29, r4 /* 8026AB0C 00267A4C 7C BE 2B 78 */ mr r30, r5 @@ -2742,7 +2742,7 @@ lbl_8026ABB8: /* 8026ABB8 00267AF8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8026ABBC 00267AFC CB E1 00 30 */ lfd f31, 0x30(r1) /* 8026ABC0 00267B00 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026ABC4 00267B04 48 0F 76 61 */ bl func_80362224 +/* 8026ABC4 00267B04 48 0F 76 61 */ bl _restgpr_28 /* 8026ABC8 00267B08 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026ABCC 00267B0C 7C 08 03 A6 */ mtlr r0 /* 8026ABD0 00267B10 38 21 00 40 */ addi r1, r1, 0x40 @@ -3398,7 +3398,7 @@ cM3d_Cross_LinSph_CrossPos: /* 8026B504 00268444 DB A1 00 60 */ stfd f29, 0x60(r1) /* 8026B508 00268448 F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 8026B50C 0026844C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8026B510 00268450 48 0F 6C C9 */ bl func_803621D8 +/* 8026B510 00268450 48 0F 6C C9 */ bl _savegpr_28 /* 8026B514 00268454 7C 7F 1B 78 */ mr r31, r3 /* 8026B518 00268458 7C 9C 23 78 */ mr r28, r4 /* 8026B51C 0026845C 7C BD 2B 78 */ mr r29, r5 @@ -3648,7 +3648,7 @@ lbl_8026B874: /* 8026B884 002687C4 E3 A1 00 68 */ psq_l f29, 104(r1), 0, qr0 /* 8026B888 002687C8 CB A1 00 60 */ lfd f29, 0x60(r1) /* 8026B88C 002687CC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8026B890 002687D0 48 0F 69 95 */ bl func_80362224 +/* 8026B890 002687D0 48 0F 69 95 */ bl _restgpr_28 /* 8026B894 002687D4 80 01 00 94 */ lwz r0, 0x94(r1) /* 8026B898 002687D8 7C 08 03 A6 */ mtlr r0 /* 8026B89C 002687DC 38 21 00 90 */ addi r1, r1, 0x90 @@ -3782,7 +3782,7 @@ cM3d_Cross_CylSph_X1_: /* 8026BA54 00268994 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8026BA58 00268998 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8026BA5C 0026899C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BA60 002689A0 48 0F 67 79 */ bl func_803621D8 +/* 8026BA60 002689A0 48 0F 67 79 */ bl _savegpr_28 /* 8026BA64 002689A4 7C 7E 1B 78 */ mr r30, r3 /* 8026BA68 002689A8 7C 9F 23 78 */ mr r31, r4 /* 8026BA6C 002689AC 7C BC 2B 78 */ mr r28, r5 @@ -3927,7 +3927,7 @@ lbl_8026BC5C: /* 8026BC5C 00268B9C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8026BC60 00268BA0 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8026BC64 00268BA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BC68 00268BA8 48 0F 65 BD */ bl func_80362224 +/* 8026BC68 00268BA8 48 0F 65 BD */ bl _restgpr_28 /* 8026BC6C 00268BAC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026BC70 00268BB0 7C 08 03 A6 */ mtlr r0 /* 8026BC74 00268BB4 38 21 00 40 */ addi r1, r1, 0x40 @@ -3976,7 +3976,7 @@ cM3d_Cross_SphSph_X1_: /* 8026BD00 00268C40 7C 08 02 A6 */ mflr r0 /* 8026BD04 00268C44 90 01 00 34 */ stw r0, 0x34(r1) /* 8026BD08 00268C48 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BD0C 00268C4C 48 0F 64 CD */ bl func_803621D8 +/* 8026BD0C 00268C4C 48 0F 64 CD */ bl _savegpr_28 /* 8026BD10 00268C50 7C 7C 1B 78 */ mr r28, r3 /* 8026BD14 00268C54 7C 9D 23 78 */ mr r29, r4 /* 8026BD18 00268C58 7C BE 2B 78 */ mr r30, r5 @@ -4004,7 +4004,7 @@ lbl_8026BD64: /* 8026BD6C 00268CAC 38 60 00 00 */ li r3, 0 lbl_8026BD70: /* 8026BD70 00268CB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BD74 00268CB4 48 0F 64 B1 */ bl func_80362224 +/* 8026BD74 00268CB4 48 0F 64 B1 */ bl _restgpr_28 /* 8026BD78 00268CB8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026BD7C 00268CBC 7C 08 03 A6 */ mtlr r0 /* 8026BD80 00268CC0 38 21 00 30 */ addi r1, r1, 0x30 @@ -5605,7 +5605,7 @@ cM3d_Cross_CpsCyl: /* 8026D3D8 0026A318 7C 08 02 A6 */ mflr r0 /* 8026D3DC 0026A31C 90 01 00 A4 */ stw r0, 0xa4(r1) /* 8026D3E0 0026A320 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8026D3E4 0026A324 48 0F 4D F5 */ bl func_803621D8 +/* 8026D3E4 0026A324 48 0F 4D F5 */ bl _savegpr_28 /* 8026D3E8 0026A328 7C 7C 1B 78 */ mr r28, r3 /* 8026D3EC 0026A32C 7C 9D 23 78 */ mr r29, r4 /* 8026D3F0 0026A330 7C BE 2B 78 */ mr r30, r5 @@ -6077,7 +6077,7 @@ lbl_8026DAB8: /* 8026DAC4 0026AA04 38 60 00 00 */ li r3, 0 lbl_8026DAC8: /* 8026DAC8 0026AA08 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8026DACC 0026AA0C 48 0F 47 59 */ bl func_80362224 +/* 8026DACC 0026AA0C 48 0F 47 59 */ bl _restgpr_28 /* 8026DAD0 0026AA10 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8026DAD4 0026AA14 7C 08 03 A6 */ mtlr r0 /* 8026DAD8 0026AA18 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -6091,7 +6091,7 @@ cM3d_Cross_CpsSph_CrossPos: /* 8026DAEC 0026AA2C DB E1 00 40 */ stfd f31, 0x40(r1) /* 8026DAF0 0026AA30 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8026DAF4 0026AA34 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026DAF8 0026AA38 48 0F 46 E1 */ bl func_803621D8 +/* 8026DAF8 0026AA38 48 0F 46 E1 */ bl _savegpr_28 /* 8026DAFC 0026AA3C 7C 7C 1B 78 */ mr r28, r3 /* 8026DB00 0026AA40 7C 9D 23 78 */ mr r29, r4 /* 8026DB04 0026AA44 7C BE 2B 78 */ mr r30, r5 @@ -6172,7 +6172,7 @@ lbl_8026DC1C: /* 8026DC1C 0026AB5C E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8026DC20 0026AB60 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8026DC24 0026AB64 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026DC28 0026AB68 48 0F 45 FD */ bl func_80362224 +/* 8026DC28 0026AB68 48 0F 45 FD */ bl _restgpr_28 /* 8026DC2C 0026AB6C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8026DC30 0026AB70 7C 08 03 A6 */ mtlr r0 /* 8026DC34 0026AB74 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/SComponent/c/cc/c_cc_d.s b/asm/SComponent/c/cc/c_cc_d.s index 5bf59d794d..13818b4c07 100644 --- a/asm/SComponent/c/cc/c_cc_d.s +++ b/asm/SComponent/c/cc/c_cc_d.s @@ -394,7 +394,7 @@ cCcD_Stts_NS_Init: /* 802638A8 002607E8 7C 08 02 A6 */ mflr r0 /* 802638AC 002607EC 90 01 00 24 */ stw r0, 0x24(r1) /* 802638B0 002607F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802638B4 002607F4 48 0F E9 21 */ bl func_803621D4 +/* 802638B4 002607F4 48 0F E9 21 */ bl _savegpr_27 /* 802638B8 002607F8 7C 7B 1B 78 */ mr r27, r3 /* 802638BC 002607FC 7C 9C 23 78 */ mr r28, r4 /* 802638C0 00260800 7C BD 2B 78 */ mr r29, r5 @@ -409,7 +409,7 @@ cCcD_Stts_NS_Init: /* 802638E4 00260824 93 DB 00 0C */ stw r30, 0xc(r27) /* 802638E8 00260828 93 FB 00 10 */ stw r31, 0x10(r27) /* 802638EC 0026082C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802638F0 00260830 48 0F E9 31 */ bl func_80362220 +/* 802638F0 00260830 48 0F E9 31 */ bl _restgpr_27 /* 802638F4 00260834 80 01 00 24 */ lwz r0, 0x24(r1) /* 802638F8 00260838 7C 08 03 A6 */ mtlr r0 /* 802638FC 0026083C 38 21 00 20 */ addi r1, r1, 0x20 @@ -926,7 +926,7 @@ cCcD_CpsAttr_NS_CalcAabBox: /* 80264020 00260F60 DB E1 00 40 */ stfd f31, 0x40(r1) /* 80264024 00260F64 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80264028 00260F68 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026402C 00260F6C 48 0F E1 AD */ bl func_803621D8 +/* 8026402C 00260F6C 48 0F E1 AD */ bl _savegpr_28 /* 80264030 00260F70 7C 7C 1B 78 */ mr r28, r3 /* 80264034 00260F74 7C 9D 23 78 */ mr r29, r4 /* 80264038 00260F78 7C BE 2B 78 */ mr r30, r5 @@ -1011,7 +1011,7 @@ lbl_8026415C: /* 8026415C 0026109C E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80264160 002610A0 CB E1 00 40 */ lfd f31, 0x40(r1) /* 80264164 002610A4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80264168 002610A8 48 0F E0 BD */ bl func_80362224 +/* 80264168 002610A8 48 0F E0 BD */ bl _restgpr_28 /* 8026416C 002610AC 80 01 00 54 */ lwz r0, 0x54(r1) /* 80264170 002610B0 7C 08 03 A6 */ mtlr r0 /* 80264174 002610B4 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/SComponent/c/cc/c_cc_s.s b/asm/SComponent/c/cc/c_cc_s.s index aa4d061222..2b64d8a2b1 100644 --- a/asm/SComponent/c/cc/c_cc_s.s +++ b/asm/SComponent/c/cc/c_cc_s.s @@ -294,7 +294,7 @@ cCcS_NS_ChkNoHitAtTg: /* 80264E30 00261D70 7C 08 02 A6 */ mflr r0 /* 80264E34 00261D74 90 01 00 24 */ stw r0, 0x24(r1) /* 80264E38 00261D78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80264E3C 00261D7C 48 0F D3 99 */ bl func_803621D4 +/* 80264E3C 00261D7C 48 0F D3 99 */ bl _savegpr_27 /* 80264E40 00261D80 7C 7B 1B 78 */ mr r27, r3 /* 80264E44 00261D84 7C 9C 23 78 */ mr r28, r4 /* 80264E48 00261D88 7C BF 2B 78 */ mr r31, r5 @@ -358,7 +358,7 @@ lbl_80264EA4: /* 80264F24 00261E64 4E 80 04 21 */ bctrl lbl_80264F28: /* 80264F28 00261E68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80264F2C 00261E6C 48 0F D2 F5 */ bl func_80362220 +/* 80264F2C 00261E6C 48 0F D2 F5 */ bl _restgpr_27 /* 80264F30 00261E70 80 01 00 24 */ lwz r0, 0x24(r1) /* 80264F34 00261E74 7C 08 03 A6 */ mtlr r0 /* 80264F38 00261E78 38 21 00 20 */ addi r1, r1, 0x20 @@ -519,7 +519,7 @@ cCcS_NS_ChkNoHitCo: /* 80265160 002620A0 7C 08 02 A6 */ mflr r0 /* 80265164 002620A4 90 01 00 24 */ stw r0, 0x24(r1) /* 80265168 002620A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026516C 002620AC 48 0F D0 6D */ bl func_803621D8 +/* 8026516C 002620AC 48 0F D0 6D */ bl _savegpr_28 /* 80265170 002620B0 7C 7C 1B 78 */ mr r28, r3 /* 80265174 002620B4 7C 9D 23 78 */ mr r29, r4 /* 80265178 002620B8 7C BE 2B 78 */ mr r30, r5 @@ -567,7 +567,7 @@ lbl_80265214: /* 80265214 00262154 38 60 00 00 */ li r3, 0 lbl_80265218: /* 80265218 00262158 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026521C 0026215C 48 0F D0 09 */ bl func_80362224 +/* 8026521C 0026215C 48 0F D0 09 */ bl _restgpr_28 /* 80265220 00262160 80 01 00 24 */ lwz r0, 0x24(r1) /* 80265224 00262164 7C 08 03 A6 */ mtlr r0 /* 80265228 00262168 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/SComponent/c/m3d/g/c_m3d_g_pla.s b/asm/SComponent/c/m3d/g/c_m3d_g_pla.s index c102fef126..1d2d5a4b1e 100644 --- a/asm/SComponent/c/m3d/g/c_m3d_g_pla.s +++ b/asm/SComponent/c/m3d/g/c_m3d_g_pla.s @@ -25,7 +25,7 @@ cM3dGPla_NS_crossInfLin: /* 8026F414 0026C354 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8026F418 0026C358 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8026F41C 0026C35C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026F420 0026C360 48 0F 2D B9 */ bl func_803621D8 +/* 8026F420 0026C360 48 0F 2D B9 */ bl _savegpr_28 /* 8026F424 0026C364 7C 7C 1B 78 */ mr r28, r3 /* 8026F428 0026C368 7C 9D 23 78 */ mr r29, r4 /* 8026F42C 0026C36C 7C BE 2B 78 */ mr r30, r5 @@ -63,7 +63,7 @@ lbl_8026F4A4: /* 8026F4A4 0026C3E4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8026F4A8 0026C3E8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8026F4AC 0026C3EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026F4B0 0026C3F0 48 0F 2D 75 */ bl func_80362224 +/* 8026F4B0 0026C3F0 48 0F 2D 75 */ bl _restgpr_28 /* 8026F4B4 0026C3F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026F4B8 0026C3F8 7C 08 03 A6 */ mtlr r0 /* 8026F4BC 0026C3FC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/SComponent/c/node/c_node_iter.s b/asm/SComponent/c/node/c_node_iter.s index 8bad11b7d1..4ea882e380 100644 --- a/asm/SComponent/c/node/c_node_iter.s +++ b/asm/SComponent/c/node/c_node_iter.s @@ -9,7 +9,7 @@ cNdIt_Method: /* 80266328 00263268 7C 08 02 A6 */ mflr r0 /* 8026632C 0026326C 90 01 00 24 */ stw r0, 0x24(r1) /* 80266330 00263270 39 61 00 20 */ addi r11, r1, 0x20 -/* 80266334 00263274 48 0F BE A5 */ bl func_803621D8 +/* 80266334 00263274 48 0F BE A5 */ bl _savegpr_28 /* 80266338 00263278 7C 9C 23 78 */ mr r28, r4 /* 8026633C 0026327C 7C BD 2B 78 */ mr r29, r5 /* 80266340 00263280 3B E0 00 01 */ li r31, 1 @@ -41,7 +41,7 @@ lbl_80266390: /* 80266394 002632D4 40 82 FF C8 */ bne lbl_8026635C /* 80266398 002632D8 7F E3 FB 78 */ mr r3, r31 /* 8026639C 002632DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802663A0 002632E0 48 0F BE 85 */ bl func_80362224 +/* 802663A0 002632E0 48 0F BE 85 */ bl _restgpr_28 /* 802663A4 002632E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802663A8 002632E8 7C 08 03 A6 */ mtlr r0 /* 802663AC 002632EC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/SComponent/c/tree/c_tree_iter.s b/asm/SComponent/c/tree/c_tree_iter.s index da3b263193..86ae9d1ac2 100644 --- a/asm/SComponent/c/tree/c_tree_iter.s +++ b/asm/SComponent/c/tree/c_tree_iter.s @@ -9,7 +9,7 @@ cTrIt_Method: /* 80266544 00263484 7C 08 02 A6 */ mflr r0 /* 80266548 00263488 90 01 00 24 */ stw r0, 0x24(r1) /* 8026654C 0026348C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80266550 00263490 48 0F BC 85 */ bl func_803621D4 +/* 80266550 00263490 48 0F BC 85 */ bl _savegpr_27 /* 80266554 00263494 7C 9B 23 78 */ mr r27, r4 /* 80266558 00263498 7C BC 2B 78 */ mr r28, r5 /* 8026655C 0026349C 83 E3 00 00 */ lwz r31, 0(r3) @@ -31,7 +31,7 @@ lbl_8026658C: /* 80266594 002634D4 41 81 FF D8 */ bgt lbl_8026656C /* 80266598 002634D8 7F A3 EB 78 */ mr r3, r29 /* 8026659C 002634DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802665A0 002634E0 48 0F BC 81 */ bl func_80362220 +/* 802665A0 002634E0 48 0F BC 81 */ bl _restgpr_27 /* 802665A4 002634E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802665A8 002634E8 7C 08 03 A6 */ mtlr r0 /* 802665AC 002634EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -43,7 +43,7 @@ cTrIt_Judge: /* 802665B8 002634F8 7C 08 02 A6 */ mflr r0 /* 802665BC 002634FC 90 01 00 24 */ stw r0, 0x24(r1) /* 802665C0 00263500 39 61 00 20 */ addi r11, r1, 0x20 -/* 802665C4 00263504 48 0F BC 15 */ bl func_803621D8 +/* 802665C4 00263504 48 0F BC 15 */ bl _savegpr_28 /* 802665C8 00263508 7C 9C 23 78 */ mr r28, r4 /* 802665CC 0026350C 7C BD 2B 78 */ mr r29, r5 /* 802665D0 00263510 83 E3 00 00 */ lwz r31, 0(r3) @@ -65,7 +65,7 @@ lbl_802665FC: /* 80266608 00263548 38 60 00 00 */ li r3, 0 lbl_8026660C: /* 8026660C 0026354C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80266610 00263550 48 0F BC 15 */ bl func_80362224 +/* 80266610 00263550 48 0F BC 15 */ bl _restgpr_28 /* 80266614 00263554 80 01 00 24 */ lwz r0, 0x24(r1) /* 80266618 00263558 7C 08 03 A6 */ mtlr r0 /* 8026661C 0026355C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2Audience.s b/asm/Z2AudioLib/Z2Audience.s index 4c49fdeb3d..1ad8fa8c42 100644 --- a/asm/Z2AudioLib/Z2Audience.s +++ b/asm/Z2AudioLib/Z2Audience.s @@ -62,7 +62,7 @@ Z2Audible: /* 802BBD98 002B8CD8 7C 08 02 A6 */ mflr r0 /* 802BBD9C 002B8CDC 90 01 00 24 */ stw r0, 0x24(r1) /* 802BBDA0 002B8CE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BBDA4 002B8CE4 48 0A 64 35 */ bl func_803621D8 +/* 802BBDA4 002B8CE4 48 0A 64 35 */ bl _savegpr_28 /* 802BBDA8 002B8CE8 7C 7C 1B 78 */ mr r28, r3 /* 802BBDAC 002B8CEC 7C 9D 23 78 */ mr r29, r4 /* 802BBDB0 002B8CF0 7C BE 2B 78 */ mr r30, r5 @@ -112,7 +112,7 @@ lbl_802BBE50: /* 802BBE54 002B8D94 D0 1C 00 64 */ stfs f0, 0x64(r28) /* 802BBE58 002B8D98 7F 83 E3 78 */ mr r3, r28 /* 802BBE5C 002B8D9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BBE60 002B8DA0 48 0A 63 C5 */ bl func_80362224 +/* 802BBE60 002B8DA0 48 0A 63 C5 */ bl _restgpr_28 /* 802BBE64 002B8DA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BBE68 002B8DA8 7C 08 03 A6 */ mtlr r0 /* 802BBE6C 002B8DAC 38 21 00 20 */ addi r1, r1, 0x20 @@ -854,7 +854,7 @@ Z2AudioCamera_NS_setCameraState_X1_: /* 802BC8D8 002B9818 DB 61 00 90 */ stfd f27, 0x90(r1) /* 802BC8DC 002B981C F3 61 00 98 */ psq_st f27, 152(r1), 0, qr0 /* 802BC8E0 002B9820 39 61 00 90 */ addi r11, r1, 0x90 -/* 802BC8E4 002B9824 48 0A 58 F1 */ bl func_803621D4 +/* 802BC8E4 002B9824 48 0A 58 F1 */ bl _savegpr_27 /* 802BC8E8 002B9828 7C 7B 1B 78 */ mr r27, r3 /* 802BC8EC 002B982C 7C 9C 23 78 */ mr r28, r4 /* 802BC8F0 002B9830 7C BD 2B 78 */ mr r29, r5 @@ -1053,7 +1053,7 @@ lbl_802BCB98: /* 802BCBCC 002B9B0C E3 61 00 98 */ psq_l f27, 152(r1), 0, qr0 /* 802BCBD0 002B9B10 CB 61 00 90 */ lfd f27, 0x90(r1) /* 802BCBD4 002B9B14 39 61 00 90 */ addi r11, r1, 0x90 -/* 802BCBD8 002B9B18 48 0A 56 49 */ bl func_80362220 +/* 802BCBD8 002B9B18 48 0A 56 49 */ bl _restgpr_27 /* 802BCBDC 002B9B1C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 802BCBE0 002B9B20 7C 08 03 A6 */ mtlr r0 /* 802BCBE4 002B9B24 38 21 00 E0 */ addi r1, r1, 0xe0 @@ -1223,7 +1223,7 @@ Z2SpotMic_NS_setMicState: /* 802BCE18 002B9D58 7C 08 02 A6 */ mflr r0 /* 802BCE1C 002B9D5C 90 01 00 34 */ stw r0, 0x34(r1) /* 802BCE20 002B9D60 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BCE24 002B9D64 48 0A 53 B5 */ bl func_803621D8 +/* 802BCE24 002B9D64 48 0A 53 B5 */ bl _savegpr_28 /* 802BCE28 002B9D68 7C 7C 1B 78 */ mr r28, r3 /* 802BCE2C 002B9D6C 7C 9D 23 78 */ mr r29, r4 /* 802BCE30 002B9D70 7C BE 2B 78 */ mr r30, r5 @@ -1304,7 +1304,7 @@ lbl_802BCF38: /* 802BCF40 002B9E80 4B FF FE A9 */ bl Z2SpotMic_NS_calcVolumeFactor lbl_802BCF44: /* 802BCF44 002B9E84 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BCF48 002B9E88 48 0A 52 DD */ bl func_80362224 +/* 802BCF48 002B9E88 48 0A 52 DD */ bl _restgpr_28 /* 802BCF4C 002B9E8C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802BCF50 002B9E90 7C 08 03 A6 */ mtlr r0 /* 802BCF54 002B9E94 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2AudioMgr.s b/asm/Z2AudioLib/Z2AudioMgr.s index d91ee6eddf..aed923eee2 100644 --- a/asm/Z2AudioLib/Z2AudioMgr.s +++ b/asm/Z2AudioLib/Z2AudioMgr.s @@ -578,7 +578,7 @@ Z2AudioMgr_NS_hasReset: /* 802CDA70 002CA9B0 7C 08 02 A6 */ mflr r0 /* 802CDA74 002CA9B4 90 01 00 24 */ stw r0, 0x24(r1) /* 802CDA78 002CA9B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CDA7C 002CA9BC 48 09 47 5D */ bl func_803621D8 +/* 802CDA7C 002CA9BC 48 09 47 5D */ bl _savegpr_28 /* 802CDA80 002CA9C0 7C 7C 1B 78 */ mr r28, r3 /* 802CDA84 002CA9C4 3B C0 00 00 */ li r30, 0 /* 802CDA88 002CA9C8 7F DF F3 78 */ mr r31, r30 @@ -617,7 +617,7 @@ lbl_802CDAF4: lbl_802CDB00: /* 802CDB00 002CAA40 7F C3 F3 78 */ mr r3, r30 /* 802CDB04 002CAA44 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CDB08 002CAA48 48 09 47 1D */ bl func_80362224 +/* 802CDB08 002CAA48 48 09 47 1D */ bl _restgpr_28 /* 802CDB0C 002CAA4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CDB10 002CAA50 7C 08 03 A6 */ mtlr r0 /* 802CDB14 002CAA54 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s index 3193250b1a..2dde586f51 100644 --- a/asm/Z2AudioLib/Z2Creature.s +++ b/asm/Z2AudioLib/Z2Creature.s @@ -112,7 +112,7 @@ Z2Creature_NS_init: /* 802C0534 002BD474 7C 08 02 A6 */ mflr r0 /* 802C0538 002BD478 90 01 00 24 */ stw r0, 0x24(r1) /* 802C053C 002BD47C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0540 002BD480 48 0A 1C 99 */ bl func_803621D8 +/* 802C0540 002BD480 48 0A 1C 99 */ bl _savegpr_28 /* 802C0544 002BD484 7C 7C 1B 78 */ mr r28, r3 /* 802C0548 002BD488 7C 9D 23 79 */ or. r29, r4, r4 /* 802C054C 002BD48C 7C BE 2B 78 */ mr r30, r5 @@ -137,7 +137,7 @@ lbl_802C0574: /* 802C0594 002BD4D4 4E 80 04 21 */ bctrl lbl_802C0598: /* 802C0598 002BD4D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C059C 002BD4DC 48 0A 1C 89 */ bl func_80362224 +/* 802C059C 002BD4DC 48 0A 1C 89 */ bl _restgpr_28 /* 802C05A0 002BD4E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C05A4 002BD4E4 7C 08 03 A6 */ mtlr r0 /* 802C05A8 002BD4E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -940,7 +940,7 @@ lbl_802C10F8: /* 802C1120 002BE060 DB C1 00 30 */ stfd f30, 0x30(r1) /* 802C1124 002BE064 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802C1128 002BE068 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C112C 002BE06C 48 0A 10 AD */ bl func_803621D8 +/* 802C112C 002BE06C 48 0A 10 AD */ bl _savegpr_28 /* 802C1130 002BE070 7C 7D 1B 78 */ mr r29, r3 /* 802C1134 002BE074 7C 9E 23 78 */ mr r30, r4 /* 802C1138 002BE078 7C BC 2B 78 */ mr r28, r5 @@ -1087,7 +1087,7 @@ lbl_802C1344: /* 802C134C 002BE28C E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 802C1350 002BE290 CB C1 00 30 */ lfd f30, 0x30(r1) /* 802C1354 002BE294 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C1358 002BE298 48 0A 0E CD */ bl func_80362224 +/* 802C1358 002BE298 48 0A 0E CD */ bl _restgpr_28 /* 802C135C 002BE29C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C1360 002BE2A0 7C 08 03 A6 */ mtlr r0 /* 802C1364 002BE2A4 38 21 00 50 */ addi r1, r1, 0x50 @@ -1100,7 +1100,7 @@ lbl_802C1344: /* 802C1380 002BE2C0 DB C1 00 40 */ stfd f30, 0x40(r1) /* 802C1384 002BE2C4 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 802C1388 002BE2C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C138C 002BE2CC 48 0A 0E 4D */ bl func_803621D8 +/* 802C138C 002BE2CC 48 0A 0E 4D */ bl _savegpr_28 /* 802C1390 002BE2D0 7C 7C 1B 78 */ mr r28, r3 /* 802C1394 002BE2D4 7C 9D 23 78 */ mr r29, r4 /* 802C1398 002BE2D8 7C BE 2B 78 */ mr r30, r5 @@ -1295,7 +1295,7 @@ lbl_802C1664: /* 802C166C 002BE5AC E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 802C1670 002BE5B0 CB C1 00 40 */ lfd f30, 0x40(r1) /* 802C1674 002BE5B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1678 002BE5B8 48 0A 0B AD */ bl func_80362224 +/* 802C1678 002BE5B8 48 0A 0B AD */ bl _restgpr_28 /* 802C167C 002BE5BC 80 01 00 64 */ lwz r0, 0x64(r1) /* 802C1680 002BE5C0 7C 08 03 A6 */ mtlr r0 /* 802C1684 002BE5C4 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s index 13c934108b..6ce740a4d9 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr.s @@ -1707,7 +1707,7 @@ Z2EnvSeMgr_NS_startStaticEnvSe: /* 802C70F4 002C4034 DB 61 00 C0 */ stfd f27, 0xc0(r1) /* 802C70F8 002C4038 F3 61 00 C8 */ psq_st f27, 200(r1), 0, qr0 /* 802C70FC 002C403C 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 802C7100 002C4040 48 09 B0 D9 */ bl func_803621D8 +/* 802C7100 002C4040 48 09 B0 D9 */ bl _savegpr_28 /* 802C7104 002C4044 7C 7F 1B 78 */ mr r31, r3 /* 802C7108 002C4048 38 00 00 64 */ li r0, 0x64 /* 802C710C 002C404C 98 03 01 B8 */ stb r0, 0x1b8(r3) @@ -2170,7 +2170,7 @@ lbl_802C77CC: /* 802C77EC 002C472C E3 61 00 C8 */ psq_l f27, 200(r1), 0, qr0 /* 802C77F0 002C4730 CB 61 00 C0 */ lfd f27, 0xc0(r1) /* 802C77F4 002C4734 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 802C77F8 002C4738 48 09 AA 2D */ bl func_80362224 +/* 802C77F8 002C4738 48 09 AA 2D */ bl _restgpr_28 /* 802C77FC 002C473C 80 01 01 14 */ lwz r0, 0x114(r1) /* 802C7800 002C4740 7C 08 03 A6 */ mtlr r0 /* 802C7804 002C4744 38 21 01 10 */ addi r1, r1, 0x110 @@ -4205,7 +4205,7 @@ Z2EnvSeMgr_NS_initLv3WaterSe: /* 802C9510 002C6450 7C 08 02 A6 */ mflr r0 /* 802C9514 002C6454 90 01 00 34 */ stw r0, 0x34(r1) /* 802C9518 002C6458 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C951C 002C645C 48 09 8C B9 */ bl func_803621D4 +/* 802C951C 002C645C 48 09 8C B9 */ bl _savegpr_27 /* 802C9520 002C6460 7C 7B 1B 78 */ mr r27, r3 /* 802C9524 002C6464 7C 9C 23 78 */ mr r28, r4 /* 802C9528 002C6468 7C BD 2B 78 */ mr r29, r5 @@ -4924,7 +4924,7 @@ lbl_802C9F20: /* 802C9F3C 002C6E7C 4B FF E7 F5 */ bl Z2EnvSeMgr_NS_initFallSe lbl_802C9F40: /* 802C9F40 002C6E80 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C9F44 002C6E84 48 09 82 DD */ bl func_80362220 +/* 802C9F44 002C6E84 48 09 82 DD */ bl _restgpr_27 /* 802C9F48 002C6E88 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C9F4C 002C6E8C 7C 08 03 A6 */ mtlr r0 /* 802C9F50 002C6E90 38 21 00 30 */ addi r1, r1, 0x30 @@ -4936,7 +4936,7 @@ Z2EnvSeMgr_NS_registLv3WaterSePos: /* 802C9F5C 002C6E9C 7C 08 02 A6 */ mflr r0 /* 802C9F60 002C6EA0 90 01 00 24 */ stw r0, 0x24(r1) /* 802C9F64 002C6EA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C9F68 002C6EA8 48 09 82 71 */ bl func_803621D8 +/* 802C9F68 002C6EA8 48 09 82 71 */ bl _savegpr_28 /* 802C9F6C 002C6EAC 7C 7D 1B 78 */ mr r29, r3 /* 802C9F70 002C6EB0 7C 9E 23 78 */ mr r30, r4 /* 802C9F74 002C6EB4 7C BF 2B 78 */ mr r31, r5 @@ -5486,7 +5486,7 @@ lbl_802CA764: /* 802CA778 002C76B8 4B FE 43 F9 */ bl Z2MultiSeMgr_NS_registMultiSePos lbl_802CA77C: /* 802CA77C 002C76BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CA780 002C76C0 48 09 7A A5 */ bl func_80362224 +/* 802CA780 002C76C0 48 09 7A A5 */ bl _restgpr_28 /* 802CA784 002C76C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CA788 002C76C8 7C 08 03 A6 */ mtlr r0 /* 802CA78C 002C76CC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2FxLineMgr.s b/asm/Z2AudioLib/Z2FxLineMgr.s index a69a00b919..d0968b3a8c 100644 --- a/asm/Z2AudioLib/Z2FxLineMgr.s +++ b/asm/Z2AudioLib/Z2FxLineMgr.s @@ -316,7 +316,7 @@ Z2FxLineMgr_NS_setLine: /* 802BAC78 002B7BB8 7C 08 02 A6 */ mflr r0 /* 802BAC7C 002B7BBC 90 01 00 44 */ stw r0, 0x44(r1) /* 802BAC80 002B7BC0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BAC84 002B7BC4 48 0A 75 55 */ bl func_803621D8 +/* 802BAC84 002B7BC4 48 0A 75 55 */ bl _savegpr_28 /* 802BAC88 002B7BC8 7C 9C 23 78 */ mr r28, r4 /* 802BAC8C 002B7BCC 7C DD 33 78 */ mr r29, r6 /* 802BAC90 002B7BD0 38 00 00 00 */ li r0, 0 @@ -420,7 +420,7 @@ lbl_802BADAC: /* 802BAE00 002B7D40 4B FE 2D 79 */ bl JASDsp_NS_setFXLine lbl_802BAE04: /* 802BAE04 002B7D44 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BAE08 002B7D48 48 0A 74 1D */ bl func_80362224 +/* 802BAE08 002B7D48 48 0A 74 1D */ bl _restgpr_28 /* 802BAE0C 002B7D4C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BAE10 002B7D50 7C 08 03 A6 */ mtlr r0 /* 802BAE14 002B7D54 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/Z2AudioLib/Z2LinkMgr.s b/asm/Z2AudioLib/Z2LinkMgr.s index 9493d00293..6d50f0e13b 100644 --- a/asm/Z2AudioLib/Z2LinkMgr.s +++ b/asm/Z2AudioLib/Z2LinkMgr.s @@ -892,7 +892,7 @@ Z2CreatureLink_NS_startLinkSoundLevel: /* 802C3E7C 002C0DBC DB C1 00 30 */ stfd f30, 0x30(r1) /* 802C3E80 002C0DC0 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802C3E84 002C0DC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C3E88 002C0DC8 48 09 E3 51 */ bl func_803621D8 +/* 802C3E88 002C0DC8 48 09 E3 51 */ bl _savegpr_28 /* 802C3E8C 002C0DCC 7C 7D 1B 78 */ mr r29, r3 /* 802C3E90 002C0DD0 7C 9C 23 78 */ mr r28, r4 /* 802C3E94 002C0DD4 80 84 00 00 */ lwz r4, 0(r4) @@ -1201,7 +1201,7 @@ lbl_802C42F8: /* 802C4300 002C1240 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 802C4304 002C1244 CB C1 00 30 */ lfd f30, 0x30(r1) /* 802C4308 002C1248 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C430C 002C124C 48 09 DF 19 */ bl func_80362224 +/* 802C430C 002C124C 48 09 DF 19 */ bl _restgpr_28 /* 802C4310 002C1250 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C4314 002C1254 7C 08 03 A6 */ mtlr r0 /* 802C4318 002C1258 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/Z2AudioLib/Z2SeMgr.s b/asm/Z2AudioLib/Z2SeMgr.s index fb1eb81a32..cf9da172f3 100644 --- a/asm/Z2AudioLib/Z2SeMgr.s +++ b/asm/Z2AudioLib/Z2SeMgr.s @@ -91,7 +91,7 @@ Z2SeMgr_NS_initSe: /* 802AB754 002A8694 7C 08 02 A6 */ mflr r0 /* 802AB758 002A8698 90 01 00 24 */ stw r0, 0x24(r1) /* 802AB75C 002A869C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AB760 002A86A0 48 0B 6A 75 */ bl func_803621D4 +/* 802AB760 002A86A0 48 0B 6A 75 */ bl _savegpr_27 /* 802AB764 002A86A4 7C 7B 1B 78 */ mr r27, r3 /* 802AB768 002A86A8 3B 80 00 00 */ li r28, 0 /* 802AB76C 002A86AC 3B E0 FF FF */ li r31, -1 @@ -133,7 +133,7 @@ lbl_802AB7D8: /* 802AB7EC 002A872C 7F 63 DB 78 */ mr r3, r27 /* 802AB7F0 002A8730 48 00 00 1D */ bl Z2SeMgr_NS_resetModY /* 802AB7F4 002A8734 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AB7F8 002A8738 48 0B 6A 29 */ bl func_80362220 +/* 802AB7F8 002A8738 48 0B 6A 29 */ bl _restgpr_27 /* 802AB7FC 002A873C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AB800 002A8740 7C 08 03 A6 */ mtlr r0 /* 802AB804 002A8744 38 21 00 20 */ addi r1, r1, 0x20 @@ -2430,7 +2430,7 @@ Z2SeMgr_NS_seStop: /* 802AD8B4 002AA7F4 7C 08 02 A6 */ mflr r0 /* 802AD8B8 002AA7F8 90 01 00 34 */ stw r0, 0x34(r1) /* 802AD8BC 002AA7FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AD8C0 002AA800 48 0B 49 15 */ bl func_803621D4 +/* 802AD8C0 002AA800 48 0B 49 15 */ bl _savegpr_27 /* 802AD8C4 002AA804 7C 7B 1B 78 */ mr r27, r3 /* 802AD8C8 002AA808 7C 9C 23 78 */ mr r28, r4 /* 802AD8CC 002AA80C 7C BD 2B 78 */ mr r29, r5 @@ -2464,7 +2464,7 @@ lbl_802AD928: /* 802AD930 002AA870 41 80 FF B8 */ blt lbl_802AD8E8 lbl_802AD934: /* 802AD934 002AA874 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AD938 002AA878 48 0B 48 E9 */ bl func_80362220 +/* 802AD938 002AA878 48 0B 48 E9 */ bl _restgpr_27 /* 802AD93C 002AA87C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AD940 002AA880 7C 08 03 A6 */ mtlr r0 /* 802AD944 002AA884 38 21 00 30 */ addi r1, r1, 0x30 @@ -3062,7 +3062,7 @@ Z2SeMgr_NS_processSeFramework: /* 802AE1A0 002AB0E0 DB A1 00 30 */ stfd f29, 0x30(r1) /* 802AE1A4 002AB0E4 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 802AE1A8 002AB0E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AE1AC 002AB0EC 48 0B 40 29 */ bl func_803621D4 +/* 802AE1AC 002AB0EC 48 0B 40 29 */ bl _savegpr_27 /* 802AE1B0 002AB0F0 7C 7F 1B 78 */ mr r31, r3 /* 802AE1B4 002AB0F4 80 8D 86 00 */ lwz r4, lbl_80450B80-_SDA_BASE_(r13) /* 802AE1B8 002AB0F8 88 04 00 1D */ lbz r0, 0x1d(r4) @@ -3312,7 +3312,7 @@ lbl_802AE4F4: /* 802AE504 002AB444 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 802AE508 002AB448 CB A1 00 30 */ lfd f29, 0x30(r1) /* 802AE50C 002AB44C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AE510 002AB450 48 0B 3D 11 */ bl func_80362220 +/* 802AE510 002AB450 48 0B 3D 11 */ bl _restgpr_27 /* 802AE514 002AB454 80 01 00 64 */ lwz r0, 0x64(r1) /* 802AE518 002AB458 7C 08 03 A6 */ mtlr r0 /* 802AE51C 002AB45C 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/Z2AudioLib/Z2SeqMgr.s b/asm/Z2AudioLib/Z2SeqMgr.s index 19323be938..8a4c1ceb7d 100644 --- a/asm/Z2AudioLib/Z2SeqMgr.s +++ b/asm/Z2AudioLib/Z2SeqMgr.s @@ -104,7 +104,7 @@ Z2SeqMgr_NS_bgmStart: /* 802AF014 002ABF54 7C 08 02 A6 */ mflr r0 /* 802AF018 002ABF58 90 01 00 34 */ stw r0, 0x34(r1) /* 802AF01C 002ABF5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AF020 002ABF60 48 0B 31 B9 */ bl func_803621D8 +/* 802AF020 002ABF60 48 0B 31 B9 */ bl _savegpr_28 /* 802AF024 002ABF64 7C 7C 1B 78 */ mr r28, r3 /* 802AF028 002ABF68 7C 9D 23 78 */ mr r29, r4 /* 802AF02C 002ABF6C 7C BE 2B 78 */ mr r30, r5 @@ -375,7 +375,7 @@ lbl_802AF3D4: /* 802AF3EC 002AC32C D0 1C 00 AC */ stfs f0, 0xac(r28) lbl_802AF3F0: /* 802AF3F0 002AC330 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AF3F4 002AC334 48 0B 2E 31 */ bl func_80362224 +/* 802AF3F4 002AC334 48 0B 2E 31 */ bl _restgpr_28 /* 802AF3F8 002AC338 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AF3FC 002AC33C 7C 08 03 A6 */ mtlr r0 /* 802AF400 002AC340 38 21 00 30 */ addi r1, r1, 0x30 @@ -431,7 +431,7 @@ Z2SeqMgr_NS_subBgmStart: /* 802AF4A0 002AC3E0 7C 08 02 A6 */ mflr r0 /* 802AF4A4 002AC3E4 90 01 00 34 */ stw r0, 0x34(r1) /* 802AF4A8 002AC3E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AF4AC 002AC3EC 48 0B 2D 2D */ bl func_803621D8 +/* 802AF4AC 002AC3EC 48 0B 2D 2D */ bl _savegpr_28 /* 802AF4B0 002AC3F0 7C 7D 1B 78 */ mr r29, r3 /* 802AF4B4 002AC3F4 7C 9E 23 78 */ mr r30, r4 /* 802AF4B8 002AC3F8 3C 1E 00 01 */ addis r0, r30, 1 @@ -699,7 +699,7 @@ lbl_802AF864: /* 802AF868 002AC7A8 B0 1D 00 B8 */ sth r0, 0xb8(r29) lbl_802AF86C: /* 802AF86C 002AC7AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AF870 002AC7B0 48 0B 29 B5 */ bl func_80362224 +/* 802AF870 002AC7B0 48 0B 29 B5 */ bl _restgpr_28 /* 802AF874 002AC7B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AF878 002AC7B8 7C 08 03 A6 */ mtlr r0 /* 802AF87C 002AC7BC 38 21 00 30 */ addi r1, r1, 0x30 @@ -3272,7 +3272,7 @@ Z2SeqMgr_NS_changeSubBgmStatus: /* 802B1DF8 002AED38 7C 08 02 A6 */ mflr r0 /* 802B1DFC 002AED3C 90 01 00 24 */ stw r0, 0x24(r1) /* 802B1E00 002AED40 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B1E04 002AED44 48 0B 03 D5 */ bl func_803621D8 +/* 802B1E04 002AED44 48 0B 03 D5 */ bl _savegpr_28 /* 802B1E08 002AED48 7C 7C 1B 78 */ mr r28, r3 /* 802B1E0C 002AED4C 7C 9D 23 78 */ mr r29, r4 /* 802B1E10 002AED50 80 63 00 04 */ lwz r3, 4(r3) @@ -4038,7 +4038,7 @@ lbl_802B2980: /* 802B2980 002AF8C0 9B BC 00 BD */ stb r29, 0xbd(r28) lbl_802B2984: /* 802B2984 002AF8C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B2988 002AF8C8 48 0A F8 9D */ bl func_80362224 +/* 802B2988 002AF8C8 48 0A F8 9D */ bl _restgpr_28 /* 802B298C 002AF8CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B2990 002AF8D0 7C 08 03 A6 */ mtlr r0 /* 802B2994 002AF8D4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SoundHandles.s b/asm/Z2AudioLib/Z2SoundHandles.s index 9299323a82..6268a5e149 100644 --- a/asm/Z2AudioLib/Z2SoundHandles.s +++ b/asm/Z2AudioLib/Z2SoundHandles.s @@ -384,7 +384,7 @@ Z2SoundHandles_NS_setPos: /* 802AB53C 002A847C 7C 08 02 A6 */ mflr r0 /* 802AB540 002A8480 90 01 00 24 */ stw r0, 0x24(r1) /* 802AB544 002A8484 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AB548 002A8488 48 0B 6C 91 */ bl func_803621D8 +/* 802AB548 002A8488 48 0B 6C 91 */ bl _savegpr_28 /* 802AB54C 002A848C 7C 7C 1B 78 */ mr r28, r3 /* 802AB550 002A8490 7C 9D 23 78 */ mr r29, r4 /* 802AB554 002A8494 83 C3 00 00 */ lwz r30, 0(r3) @@ -454,7 +454,7 @@ lbl_802AB62C: /* 802AB62C 002A856C 28 1E 00 00 */ cmplwi r30, 0 /* 802AB630 002A8570 40 82 FF 2C */ bne lbl_802AB55C /* 802AB634 002A8574 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AB638 002A8578 48 0B 6B ED */ bl func_80362224 +/* 802AB638 002A8578 48 0B 6B ED */ bl _restgpr_28 /* 802AB63C 002A857C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AB640 002A8580 7C 08 03 A6 */ mtlr r0 /* 802AB644 002A8584 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SoundInfo.s b/asm/Z2AudioLib/Z2SoundInfo.s index 101ccaf290..c471df397c 100644 --- a/asm/Z2AudioLib/Z2SoundInfo.s +++ b/asm/Z2AudioLib/Z2SoundInfo.s @@ -105,7 +105,7 @@ Z2SoundInfo_NS_getAudibleSwFull: /* 802BB15C 002B809C 7C 08 02 A6 */ mflr r0 /* 802BB160 002B80A0 90 01 00 54 */ stw r0, 0x54(r1) /* 802BB164 002B80A4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BB168 002B80A8 48 0A 70 71 */ bl func_803621D8 +/* 802BB168 002B80A8 48 0A 70 71 */ bl _savegpr_28 /* 802BB16C 002B80AC 7C 7E 1B 78 */ mr r30, r3 /* 802BB170 002B80B0 7C 9F 23 78 */ mr r31, r4 /* 802BB174 002B80B4 80 04 00 00 */ lwz r0, 0(r4) @@ -300,7 +300,7 @@ lbl_802BB3C0: lbl_802BB42C: /* 802BB42C 002B836C 80 61 00 38 */ lwz r3, 0x38(r1) /* 802BB430 002B8370 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BB434 002B8374 48 0A 6D F1 */ bl func_80362224 +/* 802BB434 002B8374 48 0A 6D F1 */ bl _restgpr_28 /* 802BB438 002B8378 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BB43C 002B837C 7C 08 03 A6 */ mtlr r0 /* 802BB440 002B8380 38 21 00 50 */ addi r1, r1, 0x50 @@ -311,7 +311,7 @@ Z2SoundInfo_NS_getAudibleSw: /* 802BB44C 002B838C 7C 08 02 A6 */ mflr r0 /* 802BB450 002B8390 90 01 00 54 */ stw r0, 0x54(r1) /* 802BB454 002B8394 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BB458 002B8398 48 0A 6D 81 */ bl func_803621D8 +/* 802BB458 002B8398 48 0A 6D 81 */ bl _savegpr_28 /* 802BB45C 002B839C 7C 7E 1B 78 */ mr r30, r3 /* 802BB460 002B83A0 7C 9F 23 78 */ mr r31, r4 /* 802BB464 002B83A4 80 04 00 00 */ lwz r0, 0(r4) @@ -483,7 +483,7 @@ lbl_802BB6B0: lbl_802BB6C0: /* 802BB6C0 002B8600 A0 61 00 38 */ lhz r3, 0x38(r1) /* 802BB6C4 002B8604 39 61 00 50 */ addi r11, r1, 0x50 -/* 802BB6C8 002B8608 48 0A 6B 5D */ bl func_80362224 +/* 802BB6C8 002B8608 48 0A 6B 5D */ bl _restgpr_28 /* 802BB6CC 002B860C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BB6D0 002B8610 7C 08 03 A6 */ mtlr r0 /* 802BB6D4 002B8614 38 21 00 50 */ addi r1, r1, 0x50 @@ -494,7 +494,7 @@ lbl_802BB6C0: /* 802BB6E8 002B8628 DB E1 00 40 */ stfd f31, 0x40(r1) /* 802BB6EC 002B862C F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 802BB6F0 002B8630 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BB6F4 002B8634 48 0A 6A E1 */ bl func_803621D4 +/* 802BB6F4 002B8634 48 0A 6A E1 */ bl _savegpr_27 /* 802BB6F8 002B8638 7C 7B 1B 78 */ mr r27, r3 /* 802BB6FC 002B863C 7C 9C 23 78 */ mr r28, r4 /* 802BB700 002B8640 7C BD 2B 79 */ or. r29, r5, r5 @@ -609,7 +609,7 @@ lbl_802BB894: /* 802BB894 002B87D4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802BB898 002B87D8 CB E1 00 40 */ lfd f31, 0x40(r1) /* 802BB89C 002B87DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BB8A0 002B87E0 48 0A 69 81 */ bl func_80362220 +/* 802BB8A0 002B87E0 48 0A 69 81 */ bl _restgpr_27 /* 802BB8A4 002B87E4 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BB8A8 002B87E8 7C 08 03 A6 */ mtlr r0 /* 802BB8AC 002B87EC 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/Z2AudioLib/Z2SoundMgr.s b/asm/Z2AudioLib/Z2SoundMgr.s index 621604d3ab..054b6141f4 100644 --- a/asm/Z2AudioLib/Z2SoundMgr.s +++ b/asm/Z2AudioLib/Z2SoundMgr.s @@ -9,7 +9,7 @@ seqCallback: /* 802A9BCC 002A6B0C 7C 08 02 A6 */ mflr r0 /* 802A9BD0 002A6B10 90 01 00 44 */ stw r0, 0x44(r1) /* 802A9BD4 002A6B14 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A9BD8 002A6B18 48 0B 86 01 */ bl func_803621D8 +/* 802A9BD8 002A6B18 48 0B 86 01 */ bl _savegpr_28 /* 802A9BDC 002A6B1C 7C 9F 23 78 */ mr r31, r4 /* 802A9BE0 002A6B20 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 802A9BE4 002A6B24 38 03 F0 00 */ addi r0, r3, -4096 @@ -192,7 +192,7 @@ lbl_802A9E5C: lbl_802A9E64: /* 802A9E64 002A6DA4 38 60 00 00 */ li r3, 0 /* 802A9E68 002A6DA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A9E6C 002A6DAC 48 0B 83 B9 */ bl func_80362224 +/* 802A9E6C 002A6DAC 48 0B 83 B9 */ bl _restgpr_28 /* 802A9E70 002A6DB0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A9E74 002A6DB4 7C 08 03 A6 */ mtlr r0 /* 802A9E78 002A6DB8 38 21 00 40 */ addi r1, r1, 0x40 @@ -230,7 +230,7 @@ Z2SoundMgr: /* 802A9EEC 002A6E2C 7C 08 02 A6 */ mflr r0 /* 802A9EF0 002A6E30 90 01 00 74 */ stw r0, 0x74(r1) /* 802A9EF4 002A6E34 39 61 00 70 */ addi r11, r1, 0x70 -/* 802A9EF8 002A6E38 48 0B 82 DD */ bl func_803621D4 +/* 802A9EF8 002A6E38 48 0B 82 DD */ bl _savegpr_27 /* 802A9EFC 002A6E3C 7C 7C 1B 78 */ mr r28, r3 /* 802A9F00 002A6E40 7C 9D 23 78 */ mr r29, r4 /* 802A9F04 002A6E44 7C BE 2B 78 */ mr r30, r5 @@ -417,7 +417,7 @@ lbl_802AA17C: /* 802AA194 002A70D4 38 60 00 00 */ li r3, 0 lbl_802AA198: /* 802AA198 002A70D8 39 61 00 70 */ addi r11, r1, 0x70 -/* 802AA19C 002A70DC 48 0B 80 85 */ bl func_80362220 +/* 802AA19C 002A70DC 48 0B 80 85 */ bl _restgpr_27 /* 802AA1A0 002A70E0 80 01 00 74 */ lwz r0, 0x74(r1) /* 802AA1A4 002A70E4 7C 08 03 A6 */ mtlr r0 /* 802AA1A8 002A70E8 38 21 00 70 */ addi r1, r1, 0x70 @@ -610,7 +610,7 @@ Z2SoundMgr_NS_resetFilterAll: /* 802AA434 002A7374 7C 08 02 A6 */ mflr r0 /* 802AA438 002A7378 90 01 00 24 */ stw r0, 0x24(r1) /* 802AA43C 002A737C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AA440 002A7380 48 0B 7D 95 */ bl func_803621D4 +/* 802AA440 002A7380 48 0B 7D 95 */ bl _savegpr_27 /* 802AA444 002A7384 7C 7F 1B 78 */ mr r31, r3 /* 802AA448 002A7388 3B A0 00 01 */ li r29, 1 /* 802AA44C 002A738C 88 0D 8D C2 */ lbz r0, lbl_80451342-_SDA_BASE_(r13) @@ -674,7 +674,7 @@ lbl_802AA508: /* 802AA508 002A7448 2C 1D 00 09 */ cmpwi r29, 9 /* 802AA50C 002A744C 41 80 FF 58 */ blt lbl_802AA464 /* 802AA510 002A7450 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AA514 002A7454 48 0B 7D 0D */ bl func_80362220 +/* 802AA514 002A7454 48 0B 7D 0D */ bl _restgpr_27 /* 802AA518 002A7458 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AA51C 002A745C 7C 08 03 A6 */ mtlr r0 /* 802AA520 002A7460 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SoundObjMgr.s b/asm/Z2AudioLib/Z2SoundObjMgr.s index e7d171ee7f..ca1e0540ed 100644 --- a/asm/Z2AudioLib/Z2SoundObjMgr.s +++ b/asm/Z2AudioLib/Z2SoundObjMgr.s @@ -532,7 +532,7 @@ Z2SoundObjMgr_NS_getEnemyID: /* 802C0078 002BCFB8 7C 08 02 A6 */ mflr r0 /* 802C007C 002BCFBC 90 01 00 24 */ stw r0, 0x24(r1) /* 802C0080 002BCFC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0084 002BCFC4 48 0A 21 51 */ bl func_803621D4 +/* 802C0084 002BCFC4 48 0A 21 51 */ bl _savegpr_27 /* 802C0088 002BCFC8 7C 7B 1B 78 */ mr r27, r3 /* 802C008C 002BCFCC 7C 9C 23 79 */ or. r28, r4, r4 /* 802C0090 002BCFD0 7C BD 2B 78 */ mr r29, r5 @@ -563,7 +563,7 @@ lbl_802C00E4: /* 802C00E4 002BD024 38 60 00 00 */ li r3, 0 lbl_802C00E8: /* 802C00E8 002BD028 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C00EC 002BD02C 48 0A 21 35 */ bl func_80362220 +/* 802C00EC 002BD02C 48 0A 21 35 */ bl _restgpr_27 /* 802C00F0 002BD030 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C00F4 002BD034 7C 08 03 A6 */ mtlr r0 /* 802C00F8 002BD038 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SoundObject.s b/asm/Z2AudioLib/Z2SoundObject.s index 298d3c3b14..6f5af8d859 100644 --- a/asm/Z2AudioLib/Z2SoundObject.s +++ b/asm/Z2AudioLib/Z2SoundObject.s @@ -181,7 +181,7 @@ Z2SoundObjBase_NS_startSound: /* 802BE150 002BB090 DB E1 00 40 */ stfd f31, 0x40(r1) /* 802BE154 002BB094 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 802BE158 002BB098 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BE15C 002BB09C 48 0A 40 7D */ bl func_803621D8 +/* 802BE15C 002BB09C 48 0A 40 7D */ bl _savegpr_28 /* 802BE160 002BB0A0 7C 7D 1B 78 */ mr r29, r3 /* 802BE164 002BB0A4 7C 9E 23 78 */ mr r30, r4 /* 802BE168 002BB0A8 7C BF 2B 78 */ mr r31, r5 @@ -280,7 +280,7 @@ lbl_802BE2B4: /* 802BE2B4 002BB1F4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802BE2B8 002BB1F8 CB E1 00 40 */ lfd f31, 0x40(r1) /* 802BE2BC 002BB1FC 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BE2C0 002BB200 48 0A 3F 65 */ bl func_80362224 +/* 802BE2C0 002BB200 48 0A 3F 65 */ bl _restgpr_28 /* 802BE2C4 002BB204 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BE2C8 002BB208 7C 08 03 A6 */ mtlr r0 /* 802BE2CC 002BB20C 38 21 00 50 */ addi r1, r1, 0x50 @@ -294,7 +294,7 @@ Z2SoundObjBase_NS_startLevelSound: /* 802BE2E0 002BB220 DB E1 00 30 */ stfd f31, 0x30(r1) /* 802BE2E4 002BB224 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802BE2E8 002BB228 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BE2EC 002BB22C 48 0A 3E ED */ bl func_803621D8 +/* 802BE2EC 002BB22C 48 0A 3E ED */ bl _savegpr_28 /* 802BE2F0 002BB230 7C 7E 1B 78 */ mr r30, r3 /* 802BE2F4 002BB234 7C 9C 23 78 */ mr r28, r4 /* 802BE2F8 002BB238 7C BF 2B 78 */ mr r31, r5 @@ -408,7 +408,7 @@ lbl_802BE484: /* 802BE484 002BB3C4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802BE488 002BB3C8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802BE48C 002BB3CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BE490 002BB3D0 48 0A 3D 95 */ bl func_80362224 +/* 802BE490 002BB3D0 48 0A 3D 95 */ bl _restgpr_28 /* 802BE494 002BB3D4 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BE498 002BB3D8 7C 08 03 A6 */ mtlr r0 /* 802BE49C 002BB3DC 38 21 00 40 */ addi r1, r1, 0x40 @@ -420,7 +420,7 @@ Z2SoundObjBase_NS_startCollisionSE: /* 802BE4A8 002BB3E8 7C 08 02 A6 */ mflr r0 /* 802BE4AC 002BB3EC 90 01 00 24 */ stw r0, 0x24(r1) /* 802BE4B0 002BB3F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE4B4 002BB3F4 48 0A 3D 25 */ bl func_803621D8 +/* 802BE4B4 002BB3F4 48 0A 3D 25 */ bl _savegpr_28 /* 802BE4B8 002BB3F8 7C 7C 1B 78 */ mr r28, r3 /* 802BE4BC 002BB3FC 7C 9D 23 78 */ mr r29, r4 /* 802BE4C0 002BB400 7C BE 2B 78 */ mr r30, r5 @@ -480,7 +480,7 @@ lbl_802BE520: /* 802BE584 002BB4C4 98 05 00 11 */ stb r0, 0x11(r5) lbl_802BE588: /* 802BE588 002BB4C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE58C 002BB4CC 48 0A 3C 99 */ bl func_80362224 +/* 802BE58C 002BB4CC 48 0A 3C 99 */ bl _restgpr_28 /* 802BE590 002BB4D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BE594 002BB4D4 7C 08 03 A6 */ mtlr r0 /* 802BE598 002BB4D8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SpeechMgr2.s b/asm/Z2AudioLib/Z2SpeechMgr2.s index ec6c22a42d..3f575a411c 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2.s @@ -988,7 +988,7 @@ Z2SpeechMgr2_NS_playOneShotVoice: /* 802CCA24 002C9964 DB E1 00 A0 */ stfd f31, 0xa0(r1) /* 802CCA28 002C9968 F3 E1 00 A8 */ psq_st f31, 168(r1), 0, qr0 /* 802CCA2C 002C996C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 802CCA30 002C9970 48 09 57 A9 */ bl func_803621D8 +/* 802CCA30 002C9970 48 09 57 A9 */ bl _savegpr_28 /* 802CCA34 002C9974 7C 7C 1B 78 */ mr r28, r3 /* 802CCA38 002C9978 7C 9D 23 78 */ mr r29, r4 /* 802CCA3C 002C997C 7C BE 2B 78 */ mr r30, r5 @@ -1370,7 +1370,7 @@ lbl_802CCF68: /* 802CCF68 002C9EA8 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 802CCF6C 002C9EAC CB E1 00 A0 */ lfd f31, 0xa0(r1) /* 802CCF70 002C9EB0 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 802CCF74 002C9EB4 48 09 52 B1 */ bl func_80362224 +/* 802CCF74 002C9EB4 48 09 52 B1 */ bl _restgpr_28 /* 802CCF78 002C9EB8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802CCF7C 002C9EBC 7C 08 03 A6 */ mtlr r0 /* 802CCF80 002C9EC0 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr.s b/asm/Z2AudioLib/Z2WolfHowlMgr.s index dea2d14d3d..5e10f76c7a 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr.s @@ -655,7 +655,7 @@ Z2WolfHowlMgr_NS_checkLine: /* 802CB390 002C82D0 7C 08 02 A6 */ mflr r0 /* 802CB394 002C82D4 90 01 00 34 */ stw r0, 0x34(r1) /* 802CB398 002C82D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB39C 002C82DC 48 09 6E 3D */ bl func_803621D8 +/* 802CB39C 002C82DC 48 09 6E 3D */ bl _savegpr_28 /* 802CB3A0 002C82E0 7C 7F 1B 78 */ mr r31, r3 /* 802CB3A4 002C82E4 88 63 00 8E */ lbz r3, 0x8e(r3) /* 802CB3A8 002C82E8 7C 60 07 74 */ extsb r0, r3 @@ -843,7 +843,7 @@ lbl_802CB634: /* 802CB634 002C8574 38 60 FF FF */ li r3, -1 lbl_802CB638: /* 802CB638 002C8578 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB63C 002C857C 48 09 6B E9 */ bl func_80362224 +/* 802CB63C 002C857C 48 09 6B E9 */ bl _restgpr_28 /* 802CB640 002C8580 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CB644 002C8584 7C 08 03 A6 */ mtlr r0 /* 802CB648 002C8588 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/clib.s b/asm/clib.s index 41c23bc9ca..87e0236607 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -565,12 +565,12 @@ func_803621CC: func_803621D0: /* 803621D0 0035F110 93 4B FF E8 */ stw r26, -0x18(r11) -.global func_803621D4 -func_803621D4: +.global _savegpr_27 +_savegpr_27: /* 803621D4 0035F114 93 6B FF EC */ stw r27, -0x14(r11) -.global func_803621D8 -func_803621D8: +.global _savegpr_28 +_savegpr_28: /* 803621D8 0035F118 93 8B FF F0 */ stw r28, -0x10(r11) .global _savegpr_29 @@ -632,12 +632,12 @@ func_80362218: func_8036221C: /* 8036221C 0035F15C 83 4B FF E8 */ lwz r26, -0x18(r11) -.global func_80362220 -func_80362220: +.global _restgpr_27 +_restgpr_27: /* 80362220 0035F160 83 6B FF EC */ lwz r27, -0x14(r11) -.global func_80362224 -func_80362224: +.global _restgpr_28 +_restgpr_28: /* 80362224 0035F164 83 8B FF F0 */ lwz r28, -0x10(r11) .global _restgpr_29 @@ -6621,14 +6621,14 @@ lbl_8036726C: /* 80367298 003641D8 7F 83 E3 78 */ mr r3, r28 /* 8036729C 003641DC 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 803672A0 003641E0 38 84 00 01 */ addi r4, r4, 1 -/* 803672A4 003641E4 48 00 18 89 */ bl func_80368B2C +/* 803672A4 003641E4 48 00 18 89 */ bl strcpy /* 803672A8 003641E8 48 00 00 64 */ b lbl_8036730C lbl_803672AC: /* 803672AC 003641EC 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 803672B0 003641F0 7F 83 E3 78 */ mr r3, r28 /* 803672B4 003641F4 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 803672B8 003641F8 38 84 00 06 */ addi r4, r4, 6 -/* 803672BC 003641FC 48 00 18 71 */ bl func_80368B2C +/* 803672BC 003641FC 48 00 18 71 */ bl strcpy /* 803672C0 00364200 48 00 00 4C */ b lbl_8036730C lbl_803672C4: /* 803672C4 00364204 3C 60 80 3D */ lis r3, lbl_803D2C18@ha @@ -6642,14 +6642,14 @@ lbl_803672C4: /* 803672E4 00364224 7F 83 E3 78 */ mr r3, r28 /* 803672E8 00364228 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 803672EC 0036422C 38 84 00 0B */ addi r4, r4, 0xb -/* 803672F0 00364230 48 00 18 3D */ bl func_80368B2C +/* 803672F0 00364230 48 00 18 3D */ bl strcpy /* 803672F4 00364234 48 00 00 18 */ b lbl_8036730C lbl_803672F8: /* 803672F8 00364238 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 803672FC 0036423C 7F 83 E3 78 */ mr r3, r28 /* 80367300 00364240 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367304 00364244 38 84 00 0F */ addi r4, r4, 0xf -/* 80367308 00364248 48 00 18 25 */ bl func_80368B2C +/* 80367308 00364248 48 00 18 25 */ bl strcpy lbl_8036730C: /* 8036730C 0036424C 7F 83 E3 78 */ mr r3, r28 /* 80367310 00364250 48 00 05 84 */ b lbl_80367894 @@ -6668,14 +6668,14 @@ lbl_80367314: /* 80367340 00364280 7F 83 E3 78 */ mr r3, r28 /* 80367344 00364284 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367348 00364288 38 84 00 13 */ addi r4, r4, 0x13 -/* 8036734C 0036428C 48 00 17 E1 */ bl func_80368B2C +/* 8036734C 0036428C 48 00 17 E1 */ bl strcpy /* 80367350 00364290 48 00 00 64 */ b lbl_803673B4 lbl_80367354: /* 80367354 00364294 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 80367358 00364298 7F 83 E3 78 */ mr r3, r28 /* 8036735C 0036429C 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367360 003642A0 38 84 00 18 */ addi r4, r4, 0x18 -/* 80367364 003642A4 48 00 17 C9 */ bl func_80368B2C +/* 80367364 003642A4 48 00 17 C9 */ bl strcpy /* 80367368 003642A8 48 00 00 4C */ b lbl_803673B4 lbl_8036736C: /* 8036736C 003642AC 3C 60 80 3D */ lis r3, lbl_803D2C18@ha @@ -6689,14 +6689,14 @@ lbl_8036736C: /* 8036738C 003642CC 7F 83 E3 78 */ mr r3, r28 /* 80367390 003642D0 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367394 003642D4 38 84 00 1D */ addi r4, r4, 0x1d -/* 80367398 003642D8 48 00 17 95 */ bl func_80368B2C +/* 80367398 003642D8 48 00 17 95 */ bl strcpy /* 8036739C 003642DC 48 00 00 18 */ b lbl_803673B4 lbl_803673A0: /* 803673A0 003642E0 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 803673A4 003642E4 7F 83 E3 78 */ mr r3, r28 /* 803673A8 003642E8 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 803673AC 003642EC 38 84 00 21 */ addi r4, r4, 0x21 -/* 803673B0 003642F0 48 00 17 7D */ bl func_80368B2C +/* 803673B0 003642F0 48 00 17 7D */ bl strcpy lbl_803673B4: /* 803673B4 003642F4 7F 83 E3 78 */ mr r3, r28 /* 803673B8 003642F8 48 00 04 DC */ b lbl_80367894 @@ -7204,14 +7204,14 @@ lbl_80367A1C: /* 80367A64 003649A4 7F C3 F3 78 */ mr r3, r30 /* 80367A68 003649A8 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367A6C 003649AC 38 84 00 01 */ addi r4, r4, 1 -/* 80367A70 003649B0 48 00 10 BD */ bl func_80368B2C +/* 80367A70 003649B0 48 00 10 BD */ bl strcpy /* 80367A74 003649B4 48 00 00 58 */ b lbl_80367ACC lbl_80367A78: /* 80367A78 003649B8 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 80367A7C 003649BC 7F C3 F3 78 */ mr r3, r30 /* 80367A80 003649C0 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367A84 003649C4 38 84 00 06 */ addi r4, r4, 6 -/* 80367A88 003649C8 48 00 10 A5 */ bl func_80368B2C +/* 80367A88 003649C8 48 00 10 A5 */ bl strcpy /* 80367A8C 003649CC 48 00 00 40 */ b lbl_80367ACC lbl_80367A90: /* 80367A90 003649D0 88 1F 00 05 */ lbz r0, 5(r31) @@ -7222,14 +7222,14 @@ lbl_80367A90: /* 80367AA4 003649E4 7F C3 F3 78 */ mr r3, r30 /* 80367AA8 003649E8 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367AAC 003649EC 38 84 00 0B */ addi r4, r4, 0xb -/* 80367AB0 003649F0 48 00 10 7D */ bl func_80368B2C +/* 80367AB0 003649F0 48 00 10 7D */ bl strcpy /* 80367AB4 003649F4 48 00 00 18 */ b lbl_80367ACC lbl_80367AB8: /* 80367AB8 003649F8 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 80367ABC 003649FC 7F C3 F3 78 */ mr r3, r30 /* 80367AC0 00364A00 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367AC4 00364A04 38 84 00 0F */ addi r4, r4, 0xf -/* 80367AC8 00364A08 48 00 10 65 */ bl func_80368B2C +/* 80367AC8 00364A08 48 00 10 65 */ bl strcpy lbl_80367ACC: /* 80367ACC 00364A0C 7F C3 F3 78 */ mr r3, r30 /* 80367AD0 00364A10 48 00 02 34 */ b lbl_80367D04 @@ -7247,14 +7247,14 @@ lbl_80367AD4: /* 80367AFC 00364A3C 7F C3 F3 78 */ mr r3, r30 /* 80367B00 00364A40 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367B04 00364A44 38 84 00 13 */ addi r4, r4, 0x13 -/* 80367B08 00364A48 48 00 10 25 */ bl func_80368B2C +/* 80367B08 00364A48 48 00 10 25 */ bl strcpy /* 80367B0C 00364A4C 48 00 00 58 */ b lbl_80367B64 lbl_80367B10: /* 80367B10 00364A50 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 80367B14 00364A54 7F C3 F3 78 */ mr r3, r30 /* 80367B18 00364A58 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367B1C 00364A5C 38 84 00 18 */ addi r4, r4, 0x18 -/* 80367B20 00364A60 48 00 10 0D */ bl func_80368B2C +/* 80367B20 00364A60 48 00 10 0D */ bl strcpy /* 80367B24 00364A64 48 00 00 40 */ b lbl_80367B64 lbl_80367B28: /* 80367B28 00364A68 88 1F 00 05 */ lbz r0, 5(r31) @@ -7265,14 +7265,14 @@ lbl_80367B28: /* 80367B3C 00364A7C 7F C3 F3 78 */ mr r3, r30 /* 80367B40 00364A80 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367B44 00364A84 38 84 00 1D */ addi r4, r4, 0x1d -/* 80367B48 00364A88 48 00 0F E5 */ bl func_80368B2C +/* 80367B48 00364A88 48 00 0F E5 */ bl strcpy /* 80367B4C 00364A8C 48 00 00 18 */ b lbl_80367B64 lbl_80367B50: /* 80367B50 00364A90 3C 80 80 3A */ lis r4, lbl_803A2318@ha /* 80367B54 00364A94 7F C3 F3 78 */ mr r3, r30 /* 80367B58 00364A98 38 84 23 18 */ addi r4, r4, lbl_803A2318@l /* 80367B5C 00364A9C 38 84 00 21 */ addi r4, r4, 0x21 -/* 80367B60 00364AA0 48 00 0F CD */ bl func_80368B2C +/* 80367B60 00364AA0 48 00 0F CD */ bl strcpy lbl_80367B64: /* 80367B64 00364AA4 7F C3 F3 78 */ mr r3, r30 /* 80367B68 00364AA8 48 00 01 9C */ b lbl_80367D04 @@ -8453,8 +8453,8 @@ lbl_80368B20: /* 80368B24 00365A64 40 82 FF D4 */ bne lbl_80368AF8 /* 80368B28 00365A68 4E 80 00 20 */ blr -.global func_80368B2C -func_80368B2C: +.global strcpy +strcpy: /* 80368B2C 00365A6C 54 60 07 BE */ clrlwi r0, r3, 0x1e /* 80368B30 00365A70 54 85 07 BE */ clrlwi r5, r4, 0x1e /* 80368B34 00365A74 7C 00 28 40 */ cmplw r0, r5 diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index fa5d275e02..42355541e2 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -52,7 +52,7 @@ daAlink_matAnm_c_NS_init: /* 8009D910 0009A850 7C 08 02 A6 */ mflr r0 /* 8009D914 0009A854 90 01 00 24 */ stw r0, 0x24(r1) /* 8009D918 0009A858 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009D91C 0009A85C 48 2C 48 BD */ bl func_803621D8 +/* 8009D91C 0009A85C 48 2C 48 BD */ bl _savegpr_28 /* 8009D920 0009A860 7C 7E 1B 78 */ mr r30, r3 /* 8009D924 0009A864 7C 9F 23 78 */ mr r31, r4 /* 8009D928 0009A868 48 28 EA 9D */ bl J3DMaterialAnm_NS_calc @@ -134,7 +134,7 @@ lbl_8009DA38: /* 8009DA44 0009A984 41 80 FF 08 */ blt lbl_8009D94C lbl_8009DA48: /* 8009DA48 0009A988 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009DA4C 0009A98C 48 2C 47 D9 */ bl func_80362224 +/* 8009DA4C 0009A98C 48 2C 47 D9 */ bl _restgpr_28 /* 8009DA50 0009A990 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009DA54 0009A994 7C 08 03 A6 */ mtlr r0 /* 8009DA58 0009A998 38 21 00 20 */ addi r1, r1, 0x20 @@ -378,7 +378,7 @@ daAlink_c_NS_jointControll: /* 8009DD94 0009ACD4 7C 08 02 A6 */ mflr r0 /* 8009DD98 0009ACD8 90 01 00 B4 */ stw r0, 0xb4(r1) /* 8009DD9C 0009ACDC 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8009DDA0 0009ACE0 48 2C 44 35 */ bl func_803621D4 +/* 8009DDA0 0009ACE0 48 2C 44 35 */ bl _savegpr_27 /* 8009DDA4 0009ACE4 7C 7B 1B 78 */ mr r27, r3 /* 8009DDA8 0009ACE8 7C 9F 23 78 */ mr r31, r4 /* 8009DDAC 0009ACEC 38 61 00 10 */ addi r3, r1, 0x10 @@ -1075,7 +1075,7 @@ lbl_8009E70C: lbl_8009E79C: /* 8009E79C 0009B6DC 38 60 00 01 */ li r3, 1 /* 8009E7A0 0009B6E0 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8009E7A4 0009B6E4 48 2C 3A 7D */ bl func_80362220 +/* 8009E7A4 0009B6E4 48 2C 3A 7D */ bl _restgpr_27 /* 8009E7A8 0009B6E8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8009E7AC 0009B6EC 7C 08 03 A6 */ mtlr r0 /* 8009E7B0 0009B6F0 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -3400,7 +3400,7 @@ daAlink_c_NS_checkActorPosAngle: /* 800A086C 0009D7AC 7C 08 02 A6 */ mflr r0 /* 800A0870 0009D7B0 90 01 00 24 */ stw r0, 0x24(r1) /* 800A0874 0009D7B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A0878 0009D7B8 48 2C 19 61 */ bl func_803621D8 +/* 800A0878 0009D7B8 48 2C 19 61 */ bl _savegpr_28 /* 800A087C 0009D7BC 7C 7C 1B 78 */ mr r28, r3 /* 800A0880 0009D7C0 7C 9D 23 79 */ or. r29, r4, r4 /* 800A0884 0009D7C4 7C BE 2B 78 */ mr r30, r5 @@ -3449,7 +3449,7 @@ lbl_800A0920: /* 800A0920 0009D860 38 60 00 00 */ li r3, 0 lbl_800A0924: /* 800A0924 0009D864 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A0928 0009D868 48 2C 18 FD */ bl func_80362224 +/* 800A0928 0009D868 48 2C 18 FD */ bl _restgpr_28 /* 800A092C 0009D86C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A0930 0009D870 7C 08 03 A6 */ mtlr r0 /* 800A0934 0009D874 38 21 00 20 */ addi r1, r1, 0x20 @@ -4138,7 +4138,7 @@ lbl_800A12B0: /* 800A12DC 0009E21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800A12E0 0009E220 38 63 00 28 */ addi r3, r3, 0x28 /* 800A12E4 0009E224 38 80 00 03 */ li r4, 3 -/* 800A12E8 0009E228 4B F9 19 05 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 800A12E8 0009E228 4B F9 19 05 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 800A12EC 0009E22C 2C 03 00 00 */ cmpwi r3, 0 /* 800A12F0 0009E230 40 82 00 08 */ bne lbl_800A12F8 /* 800A12F4 0009E234 3B 40 00 00 */ li r26, 0 @@ -4723,7 +4723,7 @@ daAlink_c_NS_setEyeMove: /* 800A1B00 0009EA40 DB C1 00 30 */ stfd f30, 0x30(r1) /* 800A1B04 0009EA44 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 800A1B08 0009EA48 39 61 00 30 */ addi r11, r1, 0x30 -/* 800A1B0C 0009EA4C 48 2C 06 C9 */ bl func_803621D4 +/* 800A1B0C 0009EA4C 48 2C 06 C9 */ bl _savegpr_27 /* 800A1B10 0009EA50 7C 7F 1B 78 */ mr r31, r3 /* 800A1B14 0009EA54 7C 9B 23 78 */ mr r27, r4 /* 800A1B18 0009EA58 7C BC 2B 78 */ mr r28, r5 @@ -5039,7 +5039,7 @@ lbl_800A1F68: /* 800A1F70 0009EEB0 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 800A1F74 0009EEB4 CB C1 00 30 */ lfd f30, 0x30(r1) /* 800A1F78 0009EEB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800A1F7C 0009EEBC 48 2C 02 A5 */ bl func_80362220 +/* 800A1F7C 0009EEBC 48 2C 02 A5 */ bl _restgpr_27 /* 800A1F80 0009EEC0 80 01 00 54 */ lwz r0, 0x54(r1) /* 800A1F84 0009EEC4 7C 08 03 A6 */ mtlr r0 /* 800A1F88 0009EEC8 38 21 00 50 */ addi r1, r1, 0x50 @@ -7151,7 +7151,7 @@ daAlink_c_NS_initModel: /* 800A3D80 000A0CC0 7C 08 02 A6 */ mflr r0 /* 800A3D84 000A0CC4 90 01 00 24 */ stw r0, 0x24(r1) /* 800A3D88 000A0CC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A3D8C 000A0CCC 48 2B E4 4D */ bl func_803621D8 +/* 800A3D8C 000A0CCC 48 2B E4 4D */ bl _savegpr_28 /* 800A3D90 000A0CD0 7C 9C 23 78 */ mr r28, r4 /* 800A3D94 000A0CD4 7C BD 2B 78 */ mr r29, r5 /* 800A3D98 000A0CD8 7C DE 33 78 */ mr r30, r6 @@ -7190,7 +7190,7 @@ lbl_800A3DEC: lbl_800A3E14: /* 800A3E14 000A0D54 7F C3 F3 78 */ mr r3, r30 /* 800A3E18 000A0D58 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A3E1C 000A0D5C 48 2B E4 09 */ bl func_80362224 +/* 800A3E1C 000A0D5C 48 2B E4 09 */ bl _restgpr_28 /* 800A3E20 000A0D60 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A3E24 000A0D64 7C 08 03 A6 */ mtlr r0 /* 800A3E28 000A0D68 38 21 00 20 */ addi r1, r1, 0x20 @@ -7362,7 +7362,7 @@ daAlink_c_NS_createHeap: /* 800A406C 000A0FAC 7C 08 02 A6 */ mflr r0 /* 800A4070 000A0FB0 90 01 00 24 */ stw r0, 0x24(r1) /* 800A4074 000A0FB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A4078 000A0FB8 48 2B E1 5D */ bl func_803621D4 +/* 800A4078 000A0FB8 48 2B E1 5D */ bl _savegpr_27 /* 800A407C 000A0FBC 7C 7F 1B 78 */ mr r31, r3 /* 800A4080 000A0FC0 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 800A4084 000A0FC4 38 63 20 94 */ addi r3, r3, lbl_80392094@l @@ -7912,7 +7912,7 @@ lbl_800A4804: /* 800A4804 000A1744 38 60 00 01 */ li r3, 1 lbl_800A4808: /* 800A4808 000A1748 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A480C 000A174C 48 2B DA 15 */ bl func_80362220 +/* 800A480C 000A174C 48 2B DA 15 */ bl _restgpr_27 /* 800A4810 000A1750 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A4814 000A1754 7C 08 03 A6 */ mtlr r0 /* 800A4818 000A1758 38 21 00 20 */ addi r1, r1, 0x20 @@ -7997,7 +7997,7 @@ daAlink_c_NS_setSelectEquipItem: /* 800A4914 000A1854 7C 08 02 A6 */ mflr r0 /* 800A4918 000A1858 90 01 00 24 */ stw r0, 0x24(r1) /* 800A491C 000A185C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A4920 000A1860 48 2B D8 B9 */ bl func_803621D8 +/* 800A4920 000A1860 48 2B D8 B9 */ bl _savegpr_28 /* 800A4924 000A1864 7C 7C 1B 78 */ mr r28, r3 /* 800A4928 000A1868 7C 9D 23 78 */ mr r29, r4 /* 800A492C 000A186C 80 03 05 74 */ lwz r0, 0x574(r3) @@ -8182,7 +8182,7 @@ lbl_800A4BA0: /* 800A4BAC 000A1AEC 48 00 46 9D */ bl daAlink_c_NS_simpleAnmPlay lbl_800A4BB0: /* 800A4BB0 000A1AF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A4BB4 000A1AF4 48 2B D6 71 */ bl func_80362224 +/* 800A4BB4 000A1AF4 48 2B D6 71 */ bl _restgpr_28 /* 800A4BB8 000A1AF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A4BBC 000A1AFC 7C 08 03 A6 */ mtlr r0 /* 800A4BC0 000A1B00 38 21 00 20 */ addi r1, r1, 0x20 @@ -8283,7 +8283,7 @@ daAlink_c_NS_playerInit: /* 800A4D10 000A1C50 38 63 00 9C */ addi r3, r3, 0x9c /* 800A4D14 000A1C54 38 80 00 12 */ li r4, 0x12 /* 800A4D18 000A1C58 38 A0 00 2D */ li r5, 0x2d -/* 800A4D1C 000A1C5C 4B F8 E2 9D */ bl dSv_player_item_c_NS_setItem +/* 800A4D1C 000A1C5C 4B F8 E2 9D */ bl setItem__17dSv_player_item_cFiUc lbl_800A4D20: /* 800A4D20 000A1C60 3B 37 08 50 */ addi r25, r23, 0x850 /* 800A4D24 000A1C64 3B 17 0C 04 */ addi r24, r23, 0xc04 @@ -13312,7 +13312,7 @@ daAlink_c_NS_setItemMatrix: /* 800A9454 000A6394 7C 08 02 A6 */ mflr r0 /* 800A9458 000A6398 90 01 00 24 */ stw r0, 0x24(r1) /* 800A945C 000A639C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A9460 000A63A0 48 2B 8D 79 */ bl func_803621D8 +/* 800A9460 000A63A0 48 2B 8D 79 */ bl _savegpr_28 /* 800A9464 000A63A4 7C 7F 1B 78 */ mr r31, r3 /* 800A9468 000A63A8 7C 9E 23 78 */ mr r30, r4 /* 800A946C 000A63AC 80 63 06 50 */ lwz r3, 0x650(r3) @@ -14054,7 +14054,7 @@ lbl_800A9F14: /* 800A9F30 000A6E70 48 04 33 E1 */ bl daAlink_c_NS_setHorseStirrup lbl_800A9F34: /* 800A9F34 000A6E74 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A9F38 000A6E78 48 2B 82 ED */ bl func_80362224 +/* 800A9F38 000A6E78 48 2B 82 ED */ bl _restgpr_28 /* 800A9F3C 000A6E7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A9F40 000A6E80 7C 08 03 A6 */ mtlr r0 /* 800A9F44 000A6E84 38 21 00 20 */ addi r1, r1, 0x20 @@ -14799,7 +14799,7 @@ daAlink_c_NS_resetAtCollision: /* 800AA9E0 000A7920 7C 08 02 A6 */ mflr r0 /* 800AA9E4 000A7924 90 01 00 24 */ stw r0, 0x24(r1) /* 800AA9E8 000A7928 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AA9EC 000A792C 48 2B 77 ED */ bl func_803621D8 +/* 800AA9EC 000A792C 48 2B 77 ED */ bl _savegpr_28 /* 800AA9F0 000A7930 7C 7C 1B 78 */ mr r28, r3 /* 800AA9F4 000A7934 80 03 05 70 */ lwz r0, 0x570(r3) /* 800AA9F8 000A7938 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 @@ -14849,7 +14849,7 @@ lbl_800AAA74: /* 800AAAA0 000A79E0 4B FD 98 79 */ bl dCcD_GObjInf_NS_ResetAtHit lbl_800AAAA4: /* 800AAAA4 000A79E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AAAA8 000A79E8 48 2B 77 7D */ bl func_80362224 +/* 800AAAA8 000A79E8 48 2B 77 7D */ bl _restgpr_28 /* 800AAAAC 000A79EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800AAAB0 000A79F0 7C 08 03 A6 */ mtlr r0 /* 800AAAB4 000A79F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -15803,7 +15803,7 @@ daAlink_c_NS_setWolfCollisionPos: /* 800AB884 000A87C4 DB E1 00 70 */ stfd f31, 0x70(r1) /* 800AB888 000A87C8 F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 800AB88C 000A87CC 39 61 00 70 */ addi r11, r1, 0x70 -/* 800AB890 000A87D0 48 2B 69 45 */ bl func_803621D4 +/* 800AB890 000A87D0 48 2B 69 45 */ bl _savegpr_27 /* 800AB894 000A87D4 7C 7F 1B 78 */ mr r31, r3 /* 800AB898 000A87D8 80 63 06 50 */ lwz r3, 0x650(r3) /* 800AB89C 000A87DC 80 63 00 84 */ lwz r3, 0x84(r3) @@ -15953,7 +15953,7 @@ lbl_800ABA78: /* 800ABAC0 000A8A00 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 800ABAC4 000A8A04 CB E1 00 70 */ lfd f31, 0x70(r1) /* 800ABAC8 000A8A08 39 61 00 70 */ addi r11, r1, 0x70 -/* 800ABACC 000A8A0C 48 2B 67 55 */ bl func_80362220 +/* 800ABACC 000A8A0C 48 2B 67 55 */ bl _restgpr_27 /* 800ABAD0 000A8A10 80 01 00 84 */ lwz r0, 0x84(r1) /* 800ABAD4 000A8A14 7C 08 03 A6 */ mtlr r0 /* 800ABAD8 000A8A18 38 21 00 80 */ addi r1, r1, 0x80 @@ -16591,7 +16591,7 @@ daAlink_c_NS_setFrameCtrl: /* 800AC3A8 000A92E8 DB C1 00 20 */ stfd f30, 0x20(r1) /* 800AC3AC 000A92EC F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 800AC3B0 000A92F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AC3B4 000A92F4 48 2B 5E 25 */ bl func_803621D8 +/* 800AC3B4 000A92F4 48 2B 5E 25 */ bl _savegpr_28 /* 800AC3B8 000A92F8 7C 9C 23 78 */ mr r28, r4 /* 800AC3BC 000A92FC 7C BD 2B 78 */ mr r29, r5 /* 800AC3C0 000A9300 7C DE 33 78 */ mr r30, r6 @@ -16627,7 +16627,7 @@ lbl_800AC40C: /* 800AC430 000A9370 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 800AC434 000A9374 CB C1 00 20 */ lfd f30, 0x20(r1) /* 800AC438 000A9378 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AC43C 000A937C 48 2B 5D E9 */ bl func_80362224 +/* 800AC43C 000A937C 48 2B 5D E9 */ bl _restgpr_28 /* 800AC440 000A9380 80 01 00 44 */ lwz r0, 0x44(r1) /* 800AC444 000A9384 7C 08 03 A6 */ mtlr r0 /* 800AC448 000A9388 38 21 00 40 */ addi r1, r1, 0x40 @@ -17282,7 +17282,7 @@ daAlink_c_NS_commonSingleAnime: /* 800ACD5C 000A9C9C DB A1 00 30 */ stfd f29, 0x30(r1) /* 800ACD60 000A9CA0 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 800ACD64 000A9CA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800ACD68 000A9CA8 48 2B 54 6D */ bl func_803621D4 +/* 800ACD68 000A9CA8 48 2B 54 6D */ bl _savegpr_27 /* 800ACD6C 000A9CAC 7C 7B 1B 78 */ mr r27, r3 /* 800ACD70 000A9CB0 7C 9C 23 78 */ mr r28, r4 /* 800ACD74 000A9CB4 7C BD 2B 78 */ mr r29, r5 @@ -17423,7 +17423,7 @@ lbl_800ACF34: /* 800ACF60 000A9EA0 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 800ACF64 000A9EA4 CB A1 00 30 */ lfd f29, 0x30(r1) /* 800ACF68 000A9EA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800ACF6C 000A9EAC 48 2B 52 B5 */ bl func_80362220 +/* 800ACF6C 000A9EAC 48 2B 52 B5 */ bl _restgpr_27 /* 800ACF70 000A9EB0 80 01 00 64 */ lwz r0, 0x64(r1) /* 800ACF74 000A9EB4 7C 08 03 A6 */ mtlr r0 /* 800ACF78 000A9EB8 38 21 00 60 */ addi r1, r1, 0x60 @@ -19388,7 +19388,7 @@ daAlink_c_NS_setBlendAtnMoveAnime: /* 800AEAA4 000AB9E4 DB 41 00 30 */ stfd f26, 0x30(r1) /* 800AEAA8 000AB9E8 F3 41 00 38 */ psq_st f26, 56(r1), 0, qr0 /* 800AEAAC 000AB9EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AEAB0 000AB9F0 48 2B 37 29 */ bl func_803621D8 +/* 800AEAB0 000AB9F0 48 2B 37 29 */ bl _savegpr_28 /* 800AEAB4 000AB9F4 7C 7D 1B 78 */ mr r29, r3 /* 800AEAB8 000AB9F8 FF E0 08 90 */ fmr f31, f1 /* 800AEABC 000AB9FC 3C 60 80 39 */ lis r3, lbl_8038D658@ha @@ -19849,7 +19849,7 @@ lbl_800AF0D4: /* 800AF0FC 000AC03C E3 41 00 38 */ psq_l f26, 56(r1), 0, qr0 /* 800AF100 000AC040 CB 41 00 30 */ lfd f26, 0x30(r1) /* 800AF104 000AC044 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AF108 000AC048 48 2B 31 1D */ bl func_80362224 +/* 800AF108 000AC048 48 2B 31 1D */ bl _restgpr_28 /* 800AF10C 000AC04C 80 01 00 94 */ lwz r0, 0x94(r1) /* 800AF110 000AC050 7C 08 03 A6 */ mtlr r0 /* 800AF114 000AC054 38 21 00 90 */ addi r1, r1, 0x90 @@ -19877,7 +19877,7 @@ daAlink_c_NS_setBlendAtnBackMoveAnime: /* 800AF160 000AC0A0 DB 01 00 30 */ stfd f24, 0x30(r1) /* 800AF164 000AC0A4 F3 01 00 38 */ psq_st f24, 56(r1), 0, qr0 /* 800AF168 000AC0A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AF16C 000AC0AC 48 2B 30 6D */ bl func_803621D8 +/* 800AF16C 000AC0AC 48 2B 30 6D */ bl _savegpr_28 /* 800AF170 000AC0B0 7C 7F 1B 78 */ mr r31, r3 /* 800AF174 000AC0B4 FF E0 08 90 */ fmr f31, f1 /* 800AF178 000AC0B8 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -20095,7 +20095,7 @@ lbl_800AF458: /* 800AF490 000AC3D0 E3 01 00 38 */ psq_l f24, 56(r1), 0, qr0 /* 800AF494 000AC3D4 CB 01 00 30 */ lfd f24, 0x30(r1) /* 800AF498 000AC3D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AF49C 000AC3DC 48 2B 2D 89 */ bl func_80362224 +/* 800AF49C 000AC3DC 48 2B 2D 89 */ bl _restgpr_28 /* 800AF4A0 000AC3E0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800AF4A4 000AC3E4 7C 08 03 A6 */ mtlr r0 /* 800AF4A8 000AC3E8 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -21078,7 +21078,7 @@ daAlink_c_NS_getWallEdgePos: /* 800B0200 000AD140 7C 08 02 A6 */ mflr r0 /* 800B0204 000AD144 90 01 00 54 */ stw r0, 0x54(r1) /* 800B0208 000AD148 39 61 00 50 */ addi r11, r1, 0x50 -/* 800B020C 000AD14C 48 2B 1F CD */ bl func_803621D8 +/* 800B020C 000AD14C 48 2B 1F CD */ bl _savegpr_28 /* 800B0210 000AD150 7C 9C 23 78 */ mr r28, r4 /* 800B0214 000AD154 7C BD 2B 78 */ mr r29, r5 /* 800B0218 000AD158 7C DE 33 78 */ mr r30, r6 @@ -21117,7 +21117,7 @@ daAlink_c_NS_getWallEdgePos: /* 800B029C 000AD1DC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B02A0 000AD1E0 90 01 00 30 */ stw r0, 0x30(r1) /* 800B02A4 000AD1E4 39 61 00 50 */ addi r11, r1, 0x50 -/* 800B02A8 000AD1E8 48 2B 1F 7D */ bl func_80362224 +/* 800B02A8 000AD1E8 48 2B 1F 7D */ bl _restgpr_28 /* 800B02AC 000AD1EC 80 01 00 54 */ lwz r0, 0x54(r1) /* 800B02B0 000AD1F0 7C 08 03 A6 */ mtlr r0 /* 800B02B4 000AD1F4 38 21 00 50 */ addi r1, r1, 0x50 @@ -23190,7 +23190,7 @@ daAlink_c_NS_getSlidePolygon: /* 800B1FDC 000AEF1C 7C 08 02 A6 */ mflr r0 /* 800B1FE0 000AEF20 90 01 00 24 */ stw r0, 0x24(r1) /* 800B1FE4 000AEF24 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B1FE8 000AEF28 48 2B 01 F1 */ bl func_803621D8 +/* 800B1FE8 000AEF28 48 2B 01 F1 */ bl _savegpr_28 /* 800B1FEC 000AEF2C 7C 7D 1B 78 */ mr r29, r3 /* 800B1FF0 000AEF30 7C 9E 23 78 */ mr r30, r4 /* 800B1FF4 000AEF34 80 03 05 70 */ lwz r0, 0x570(r3) @@ -23324,7 +23324,7 @@ lbl_800B21D0: /* 800B21D0 000AF110 38 60 00 00 */ li r3, 0 lbl_800B21D4: /* 800B21D4 000AF114 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B21D8 000AF118 48 2B 00 4D */ bl func_80362224 +/* 800B21D8 000AF118 48 2B 00 4D */ bl _restgpr_28 /* 800B21DC 000AF11C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B21E0 000AF120 7C 08 03 A6 */ mtlr r0 /* 800B21E4 000AF124 38 21 00 20 */ addi r1, r1, 0x20 @@ -23349,7 +23349,7 @@ lbl_800B2214: /* 800B2220 000AF160 7C 08 02 A6 */ mflr r0 /* 800B2224 000AF164 90 01 00 24 */ stw r0, 0x24(r1) /* 800B2228 000AF168 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B222C 000AF16C 48 2A FF AD */ bl func_803621D8 +/* 800B222C 000AF16C 48 2A FF AD */ bl _savegpr_28 /* 800B2230 000AF170 7C 7F 1B 78 */ mr r31, r3 /* 800B2234 000AF174 7C 9C 23 78 */ mr r28, r4 /* 800B2238 000AF178 7C BD 2B 78 */ mr r29, r5 @@ -23468,7 +23468,7 @@ lbl_800B23DC: /* 800B23E0 000AF320 48 1B 15 7D */ bl cCcD_Stts_NS_ClrCcMove lbl_800B23E4: /* 800B23E4 000AF324 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B23E8 000AF328 48 2A FE 3D */ bl func_80362224 +/* 800B23E8 000AF328 48 2A FE 3D */ bl _restgpr_28 /* 800B23EC 000AF32C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B23F0 000AF330 7C 08 03 A6 */ mtlr r0 /* 800B23F4 000AF334 38 21 00 20 */ addi r1, r1, 0x20 @@ -25528,7 +25528,7 @@ daAlink_c_NS_setSpeedAndAngleNormal: /* 800B3FF0 000B0F30 DB A1 00 40 */ stfd f29, 0x40(r1) /* 800B3FF4 000B0F34 F3 A1 00 48 */ psq_st f29, 72(r1), 0, qr0 /* 800B3FF8 000B0F38 39 61 00 40 */ addi r11, r1, 0x40 -/* 800B3FFC 000B0F3C 48 2A E1 DD */ bl func_803621D8 +/* 800B3FFC 000B0F3C 48 2A E1 DD */ bl _savegpr_28 /* 800B4000 000B0F40 7C 7E 1B 78 */ mr r30, r3 /* 800B4004 000B0F44 80 03 19 9C */ lwz r0, 0x199c(r3) /* 800B4008 000B0F48 54 03 06 F7 */ rlwinm. r3, r0, 0, 0x1b, 0x1b @@ -25823,7 +25823,7 @@ lbl_800B441C: /* 800B442C 000B136C E3 A1 00 48 */ psq_l f29, 72(r1), 0, qr0 /* 800B4430 000B1370 CB A1 00 40 */ lfd f29, 0x40(r1) /* 800B4434 000B1374 39 61 00 40 */ addi r11, r1, 0x40 -/* 800B4438 000B1378 48 2A DD ED */ bl func_80362224 +/* 800B4438 000B1378 48 2A DD ED */ bl _restgpr_28 /* 800B443C 000B137C 80 01 00 74 */ lwz r0, 0x74(r1) /* 800B4440 000B1380 7C 08 03 A6 */ mtlr r0 /* 800B4444 000B1384 38 21 00 70 */ addi r1, r1, 0x70 @@ -27613,7 +27613,7 @@ daAlink_c_NS_checkLandAction: /* 800B5CD8 000B2C18 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800B5CDC 000B2C1C F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 800B5CE0 000B2C20 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B5CE4 000B2C24 48 2A C4 F1 */ bl func_803621D4 +/* 800B5CE4 000B2C24 48 2A C4 F1 */ bl _savegpr_27 /* 800B5CE8 000B2C28 7C 7E 1B 78 */ mr r30, r3 /* 800B5CEC 000B2C2C 7C 9F 23 78 */ mr r31, r4 /* 800B5CF0 000B2C30 C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) @@ -27784,7 +27784,7 @@ lbl_800B5F48: /* 800B5F4C 000B2E8C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 800B5F50 000B2E90 CB E1 00 30 */ lfd f31, 0x30(r1) /* 800B5F54 000B2E94 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B5F58 000B2E98 48 2A C2 C9 */ bl func_80362220 +/* 800B5F58 000B2E98 48 2A C2 C9 */ bl _restgpr_27 /* 800B5F5C 000B2E9C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800B5F60 000B2EA0 7C 08 03 A6 */ mtlr r0 /* 800B5F64 000B2EA4 38 21 00 40 */ addi r1, r1, 0x40 @@ -28177,7 +28177,7 @@ lbl_800B64D0: /* 800B64E0 000B3420 40 82 00 18 */ bne lbl_800B64F8 /* 800B64E4 000B3424 38 63 00 9C */ addi r3, r3, 0x9c /* 800B64E8 000B3428 38 80 00 6C */ li r4, 0x6c -/* 800B64EC 000B342C 4B F7 D1 F5 */ bl dSv_player_item_c_NS_checkBottle +/* 800B64EC 000B342C 4B F7 D1 F5 */ bl checkBottle__17dSv_player_item_cFUc /* 800B64F0 000B3430 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B64F4 000B3434 41 82 02 CC */ beq lbl_800B67C0 lbl_800B64F8: @@ -29858,7 +29858,7 @@ daAlink_c_NS_orderTalk: /* 800B7BFC 000B4B3C 7C 08 02 A6 */ mflr r0 /* 800B7C00 000B4B40 90 01 00 24 */ stw r0, 0x24(r1) /* 800B7C04 000B4B44 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B7C08 000B4B48 48 2A A5 D1 */ bl func_803621D8 +/* 800B7C08 000B4B48 48 2A A5 D1 */ bl _savegpr_28 /* 800B7C0C 000B4B4C 7C 7C 1B 78 */ mr r28, r3 /* 800B7C10 000B4B50 7C 9D 23 78 */ mr r29, r4 /* 800B7C14 000B4B54 4B FF CD 3D */ bl daAlink_c_NS_notTalk @@ -29942,7 +29942,7 @@ lbl_800B7D30: /* 800B7D30 000B4C70 38 60 00 00 */ li r3, 0 lbl_800B7D34: /* 800B7D34 000B4C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B7D38 000B4C78 48 2A A4 ED */ bl func_80362224 +/* 800B7D38 000B4C78 48 2A A4 ED */ bl _restgpr_28 /* 800B7D3C 000B4C7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B7D40 000B4C80 7C 08 03 A6 */ mtlr r0 /* 800B7D44 000B4C84 38 21 00 20 */ addi r1, r1, 0x20 @@ -32004,7 +32004,7 @@ daAlink_c_NS_checkItemChangeFromButton: /* 800B9950 000B6890 7C 08 02 A6 */ mflr r0 /* 800B9954 000B6894 90 01 00 24 */ stw r0, 0x24(r1) /* 800B9958 000B6898 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B995C 000B689C 48 2A 88 79 */ bl func_803621D4 +/* 800B995C 000B689C 48 2A 88 79 */ bl _savegpr_27 /* 800B9960 000B68A0 7C 7E 1B 78 */ mr r30, r3 /* 800B9964 000B68A4 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800B9968 000B68A8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -32262,7 +32262,7 @@ lbl_800B9D10: /* 800B9D10 000B6C50 38 60 00 00 */ li r3, 0 lbl_800B9D14: /* 800B9D14 000B6C54 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B9D18 000B6C58 48 2A 85 09 */ bl func_80362220 +/* 800B9D18 000B6C58 48 2A 85 09 */ bl _restgpr_27 /* 800B9D1C 000B6C5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B9D20 000B6C60 7C 08 03 A6 */ mtlr r0 /* 800B9D24 000B6C64 38 21 00 20 */ addi r1, r1, 0x20 @@ -32546,7 +32546,7 @@ daAlink_c_NS_checkNextAction: /* 800BA0DC 000B701C DB E1 00 20 */ stfd f31, 0x20(r1) /* 800BA0E0 000B7020 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800BA0E4 000B7024 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BA0E8 000B7028 48 2A 80 ED */ bl func_803621D4 +/* 800BA0E8 000B7028 48 2A 80 ED */ bl _savegpr_27 /* 800BA0EC 000B702C 7C 7C 1B 78 */ mr r28, r3 /* 800BA0F0 000B7030 7C 9D 23 78 */ mr r29, r4 /* 800BA0F4 000B7034 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -32949,7 +32949,7 @@ lbl_800BA680: /* 800BA680 000B75C0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800BA684 000B75C4 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800BA688 000B75C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BA68C 000B75CC 48 2A 7B 95 */ bl func_80362220 +/* 800BA68C 000B75CC 48 2A 7B 95 */ bl _restgpr_27 /* 800BA690 000B75D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 800BA694 000B75D4 7C 08 03 A6 */ mtlr r0 /* 800BA698 000B75D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -32961,7 +32961,7 @@ daAlink_c_NS_commonChangeItem: /* 800BA6A4 000B75E4 7C 08 02 A6 */ mflr r0 /* 800BA6A8 000B75E8 90 01 00 24 */ stw r0, 0x24(r1) /* 800BA6AC 000B75EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BA6B0 000B75F0 48 2A 7B 29 */ bl func_803621D8 +/* 800BA6B0 000B75F0 48 2A 7B 29 */ bl _savegpr_28 /* 800BA6B4 000B75F4 7C 7E 1B 78 */ mr r30, r3 /* 800BA6B8 000B75F8 A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800BA6BC 000B75FC 28 00 00 48 */ cmplwi r0, 0x48 @@ -33130,7 +33130,7 @@ lbl_800BA8F4: /* 800BA8F8 000B7838 48 00 54 7D */ bl daAlink_c_NS_makeItemType lbl_800BA8FC: /* 800BA8FC 000B783C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BA900 000B7840 48 2A 79 25 */ bl func_80362224 +/* 800BA900 000B7840 48 2A 79 25 */ bl _restgpr_28 /* 800BA904 000B7844 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BA908 000B7848 7C 08 03 A6 */ mtlr r0 /* 800BA90C 000B784C 38 21 00 20 */ addi r1, r1, 0x20 @@ -33874,7 +33874,7 @@ daAlink_c_NS_setMagicArmorBrk: /* 800BB328 000B8268 7C 08 02 A6 */ mflr r0 /* 800BB32C 000B826C 90 01 00 24 */ stw r0, 0x24(r1) /* 800BB330 000B8270 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB334 000B8274 48 2A 6E A1 */ bl func_803621D4 +/* 800BB334 000B8274 48 2A 6E A1 */ bl _savegpr_27 /* 800BB338 000B8278 7C 7B 1B 78 */ mr r27, r3 /* 800BB33C 000B827C 7C 9C 23 78 */ mr r28, r4 /* 800BB340 000B8280 80 63 06 50 */ lwz r3, 0x650(r3) @@ -33922,7 +33922,7 @@ daAlink_c_NS_setMagicArmorBrk: /* 800BB3E8 000B8328 D0 03 00 08 */ stfs f0, 8(r3) /* 800BB3EC 000B832C 9B 9B 2F D7 */ stb r28, 0x2fd7(r27) /* 800BB3F0 000B8330 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB3F4 000B8334 48 2A 6E 2D */ bl func_80362220 +/* 800BB3F4 000B8334 48 2A 6E 2D */ bl _restgpr_27 /* 800BB3F8 000B8338 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BB3FC 000B833C 7C 08 03 A6 */ mtlr r0 /* 800BB400 000B8340 38 21 00 20 */ addi r1, r1, 0x20 @@ -34201,7 +34201,7 @@ daAlink_c_NS_transAnimeProc: /* 800BB7B4 000B86F4 DB C1 00 90 */ stfd f30, 0x90(r1) /* 800BB7B8 000B86F8 F3 C1 00 98 */ psq_st f30, 152(r1), 0, qr0 /* 800BB7BC 000B86FC 39 61 00 90 */ addi r11, r1, 0x90 -/* 800BB7C0 000B8700 48 2A 6A 15 */ bl func_803621D4 +/* 800BB7C0 000B8700 48 2A 6A 15 */ bl _savegpr_27 /* 800BB7C4 000B8704 7C 7D 1B 78 */ mr r29, r3 /* 800BB7C8 000B8708 7C 9E 23 78 */ mr r30, r4 /* 800BB7CC 000B870C FF C0 08 90 */ fmr f30, f1 @@ -34570,7 +34570,7 @@ lbl_800BBD00: /* 800BBD20 000B8C60 E3 C1 00 98 */ psq_l f30, 152(r1), 0, qr0 /* 800BBD24 000B8C64 CB C1 00 90 */ lfd f30, 0x90(r1) /* 800BBD28 000B8C68 39 61 00 90 */ addi r11, r1, 0x90 -/* 800BBD2C 000B8C6C 48 2A 64 F5 */ bl func_80362220 +/* 800BBD2C 000B8C6C 48 2A 64 F5 */ bl _restgpr_27 /* 800BBD30 000B8C70 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800BBD34 000B8C74 7C 08 03 A6 */ mtlr r0 /* 800BBD38 000B8C78 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -36967,7 +36967,7 @@ daAlink_c_NS_startRestartRoom: /* 800BDF64 000BAEA4 7C 08 02 A6 */ mflr r0 /* 800BDF68 000BAEA8 90 01 00 34 */ stw r0, 0x34(r1) /* 800BDF6C 000BAEAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800BDF70 000BAEB0 48 2A 42 69 */ bl func_803621D8 +/* 800BDF70 000BAEB0 48 2A 42 69 */ bl _savegpr_28 /* 800BDF74 000BAEB4 7C 7C 1B 78 */ mr r28, r3 /* 800BDF78 000BAEB8 90 81 00 08 */ stw r4, 8(r1) /* 800BDF7C 000BAEBC 7C BD 2B 78 */ mr r29, r5 @@ -37174,7 +37174,7 @@ lbl_800BE250: /* 800BE250 000BB190 38 60 00 00 */ li r3, 0 lbl_800BE254: /* 800BE254 000BB194 39 61 00 30 */ addi r11, r1, 0x30 -/* 800BE258 000BB198 48 2A 3F CD */ bl func_80362224 +/* 800BE258 000BB198 48 2A 3F CD */ bl _restgpr_28 /* 800BE25C 000BB19C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800BE260 000BB1A0 7C 08 03 A6 */ mtlr r0 /* 800BE264 000BB1A4 38 21 00 30 */ addi r1, r1, 0x30 @@ -37801,7 +37801,7 @@ daAlink_c_NS_checkSceneChange: /* 800BEB0C 000BBA4C DB C1 00 30 */ stfd f30, 0x30(r1) /* 800BEB10 000BBA50 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 800BEB14 000BBA54 39 61 00 30 */ addi r11, r1, 0x30 -/* 800BEB18 000BBA58 48 2A 36 BD */ bl func_803621D4 +/* 800BEB18 000BBA58 48 2A 36 BD */ bl _savegpr_27 /* 800BEB1C 000BBA5C 7C 7C 1B 78 */ mr r28, r3 /* 800BEB20 000BBA60 38 60 00 00 */ li r3, 0 /* 800BEB24 000BBA64 A0 BC 2F E8 */ lhz r5, 0x2fe8(r28) @@ -38183,7 +38183,7 @@ lbl_800BF05C: /* 800BF064 000BBFA4 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 800BF068 000BBFA8 CB C1 00 30 */ lfd f30, 0x30(r1) /* 800BF06C 000BBFAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800BF070 000BBFB0 48 2A 31 B1 */ bl func_80362220 +/* 800BF070 000BBFB0 48 2A 31 B1 */ bl _restgpr_27 /* 800BF074 000BBFB4 80 01 00 54 */ lwz r0, 0x54(r1) /* 800BF078 000BBFB8 7C 08 03 A6 */ mtlr r0 /* 800BF07C 000BBFBC 38 21 00 50 */ addi r1, r1, 0x50 @@ -38516,7 +38516,7 @@ daAlink_c_NS_checkSightLine: /* 800BF50C 000BC44C DB E1 00 60 */ stfd f31, 0x60(r1) /* 800BF510 000BC450 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 800BF514 000BC454 39 61 00 60 */ addi r11, r1, 0x60 -/* 800BF518 000BC458 48 2A 2C C1 */ bl func_803621D8 +/* 800BF518 000BC458 48 2A 2C C1 */ bl _savegpr_28 /* 800BF51C 000BC45C 7C 7D 1B 78 */ mr r29, r3 /* 800BF520 000BC460 FF E0 08 90 */ fmr f31, f1 /* 800BF524 000BC464 7C 9E 23 78 */ mr r30, r4 @@ -38684,7 +38684,7 @@ lbl_800BF77C: /* 800BF77C 000BC6BC E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 800BF780 000BC6C0 CB E1 00 60 */ lfd f31, 0x60(r1) /* 800BF784 000BC6C4 39 61 00 60 */ addi r11, r1, 0x60 -/* 800BF788 000BC6C8 48 2A 2A 9D */ bl func_80362224 +/* 800BF788 000BC6C8 48 2A 2A 9D */ bl _restgpr_28 /* 800BF78C 000BC6CC 80 01 00 74 */ lwz r0, 0x74(r1) /* 800BF790 000BC6D0 7C 08 03 A6 */ mtlr r0 /* 800BF794 000BC6D4 38 21 00 70 */ addi r1, r1, 0x70 @@ -39179,7 +39179,7 @@ daAlink_c_NS_loadAramBmd: /* 800BFE4C 000BCD8C 7C 08 02 A6 */ mflr r0 /* 800BFE50 000BCD90 90 01 00 24 */ stw r0, 0x24(r1) /* 800BFE54 000BCD94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFE58 000BCD98 48 2A 23 81 */ bl func_803621D8 +/* 800BFE58 000BCD98 48 2A 23 81 */ bl _savegpr_28 /* 800BFE5C 000BCD9C 7C 9C 23 78 */ mr r28, r4 /* 800BFE60 000BCDA0 7C BD 2B 78 */ mr r29, r5 /* 800BFE64 000BCDA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -39220,7 +39220,7 @@ lbl_800BFEE4: /* 800BFEE4 000BCE24 7F C4 F3 78 */ mr r4, r30 /* 800BFEE8 000BCE28 4B F7 AF 2D */ bl dRes_info_c_NS_loaderBasicBmd /* 800BFEEC 000BCE2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFEF0 000BCE30 48 2A 23 35 */ bl func_80362224 +/* 800BFEF0 000BCE30 48 2A 23 35 */ bl _restgpr_28 /* 800BFEF4 000BCE34 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BFEF8 000BCE38 7C 08 03 A6 */ mtlr r0 /* 800BFEFC 000BCE3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -39408,7 +39408,7 @@ daAlink_c_NS_checkSetItemTrigger: /* 800C0168 000BD0A8 7C 08 02 A6 */ mflr r0 /* 800C016C 000BD0AC 90 01 00 24 */ stw r0, 0x24(r1) /* 800C0170 000BD0B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C0174 000BD0B4 48 2A 20 61 */ bl func_803621D4 +/* 800C0174 000BD0B4 48 2A 20 61 */ bl _savegpr_27 /* 800C0178 000BD0B8 7C 7B 1B 78 */ mr r27, r3 /* 800C017C 000BD0BC 7C 9C 23 78 */ mr r28, r4 /* 800C0180 000BD0C0 3B A0 00 00 */ li r29, 0 @@ -39445,7 +39445,7 @@ lbl_800C01E0: /* 800C01EC 000BD12C 38 60 00 00 */ li r3, 0 lbl_800C01F0: /* 800C01F0 000BD130 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C01F4 000BD134 48 2A 20 2D */ bl func_80362220 +/* 800C01F4 000BD134 48 2A 20 2D */ bl _restgpr_27 /* 800C01F8 000BD138 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C01FC 000BD13C 7C 08 03 A6 */ mtlr r0 /* 800C0200 000BD140 38 21 00 20 */ addi r1, r1, 0x20 @@ -39457,7 +39457,7 @@ daAlink_c_NS_checkItemSetButton: /* 800C020C 000BD14C 7C 08 02 A6 */ mflr r0 /* 800C0210 000BD150 90 01 00 24 */ stw r0, 0x24(r1) /* 800C0214 000BD154 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C0218 000BD158 48 2A 1F C1 */ bl func_803621D8 +/* 800C0218 000BD158 48 2A 1F C1 */ bl _savegpr_28 /* 800C021C 000BD15C 7C 7C 1B 78 */ mr r28, r3 /* 800C0220 000BD160 7C 9D 23 78 */ mr r29, r4 /* 800C0224 000BD164 3B C0 00 00 */ li r30, 0 @@ -39483,7 +39483,7 @@ lbl_800C025C: /* 800C0268 000BD1A8 38 60 00 02 */ li r3, 2 lbl_800C026C: /* 800C026C 000BD1AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C0270 000BD1B0 48 2A 1F B5 */ bl func_80362224 +/* 800C0270 000BD1B0 48 2A 1F B5 */ bl _restgpr_28 /* 800C0274 000BD1B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C0278 000BD1B8 7C 08 03 A6 */ mtlr r0 /* 800C027C 000BD1BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -39874,7 +39874,7 @@ daAlink_c_NS_changeItemTriggerKeepProc: /* 800C0780 000BD6C0 7C 08 02 A6 */ mflr r0 /* 800C0784 000BD6C4 90 01 00 24 */ stw r0, 0x24(r1) /* 800C0788 000BD6C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C078C 000BD6CC 48 2A 1A 4D */ bl func_803621D8 +/* 800C078C 000BD6CC 48 2A 1A 4D */ bl _savegpr_28 /* 800C0790 000BD6D0 7C 7C 1B 78 */ mr r28, r3 /* 800C0794 000BD6D4 7C 9D 23 78 */ mr r29, r4 /* 800C0798 000BD6D8 7C BE 2B 78 */ mr r30, r5 @@ -40089,7 +40089,7 @@ lbl_800C0A60: lbl_800C0A80: /* 800C0A80 000BD9C0 38 60 00 01 */ li r3, 1 /* 800C0A84 000BD9C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C0A88 000BD9C8 48 2A 17 9D */ bl func_80362224 +/* 800C0A88 000BD9C8 48 2A 17 9D */ bl _restgpr_28 /* 800C0A8C 000BD9CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C0A90 000BD9D0 7C 08 03 A6 */ mtlr r0 /* 800C0A94 000BD9D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -40103,7 +40103,7 @@ daAlink_c_NS_checkNewItemChange: /* 800C0AA8 000BD9E8 DB E1 00 60 */ stfd f31, 0x60(r1) /* 800C0AAC 000BD9EC F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 800C0AB0 000BD9F0 39 61 00 60 */ addi r11, r1, 0x60 -/* 800C0AB4 000BD9F4 48 2A 17 25 */ bl func_803621D8 +/* 800C0AB4 000BD9F4 48 2A 17 25 */ bl _savegpr_28 /* 800C0AB8 000BD9F8 7C 7C 1B 78 */ mr r28, r3 /* 800C0ABC 000BD9FC 7C 9D 23 78 */ mr r29, r4 /* 800C0AC0 000BDA00 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -40676,7 +40676,7 @@ lbl_800C12BC: /* 800C12BC 000BE1FC E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 800C12C0 000BE200 CB E1 00 60 */ lfd f31, 0x60(r1) /* 800C12C4 000BE204 39 61 00 60 */ addi r11, r1, 0x60 -/* 800C12C8 000BE208 48 2A 0F 5D */ bl func_80362224 +/* 800C12C8 000BE208 48 2A 0F 5D */ bl _restgpr_28 /* 800C12CC 000BE20C 80 01 00 74 */ lwz r0, 0x74(r1) /* 800C12D0 000BE210 7C 08 03 A6 */ mtlr r0 /* 800C12D4 000BE214 38 21 00 70 */ addi r1, r1, 0x70 @@ -41470,7 +41470,7 @@ daAlink_c_NS_changeWarpMaterial: /* 800C1E10 000BED50 7C 08 02 A6 */ mflr r0 /* 800C1E14 000BED54 90 01 00 24 */ stw r0, 0x24(r1) /* 800C1E18 000BED58 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C1E1C 000BED5C 48 2A 03 BD */ bl func_803621D8 +/* 800C1E1C 000BED5C 48 2A 03 BD */ bl _savegpr_28 /* 800C1E20 000BED60 7C 7D 1B 78 */ mr r29, r3 /* 800C1E24 000BED64 7C 9E 23 78 */ mr r30, r4 /* 800C1E28 000BED68 80 62 98 D8 */ lwz r3, lbl_804532D8-_SDA2_BASE_(r2) @@ -41554,7 +41554,7 @@ lbl_800C1F44: /* 800C1F50 000BEE90 41 80 FF CC */ blt lbl_800C1F1C lbl_800C1F54: /* 800C1F54 000BEE94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C1F58 000BEE98 48 2A 02 CD */ bl func_80362224 +/* 800C1F58 000BEE98 48 2A 02 CD */ bl _restgpr_28 /* 800C1F5C 000BEE9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C1F60 000BEEA0 7C 08 03 A6 */ mtlr r0 /* 800C1F64 000BEEA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -44543,7 +44543,7 @@ daAlink_c_NS_procFrontRollInit: /* 800C4950 000C1890 7C 08 02 A6 */ mflr r0 /* 800C4954 000C1894 90 01 00 24 */ stw r0, 0x24(r1) /* 800C4958 000C1898 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C495C 000C189C 48 29 D8 7D */ bl func_803621D8 +/* 800C495C 000C189C 48 29 D8 7D */ bl _savegpr_28 /* 800C4960 000C18A0 7C 7E 1B 78 */ mr r30, r3 /* 800C4964 000C18A4 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800C4968 000C18A8 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -44669,7 +44669,7 @@ lbl_800C4B24: /* 800C4B24 000C1A64 38 60 00 01 */ li r3, 1 lbl_800C4B28: /* 800C4B28 000C1A68 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C4B2C 000C1A6C 48 29 D6 F9 */ bl func_80362224 +/* 800C4B2C 000C1A6C 48 29 D6 F9 */ bl _restgpr_28 /* 800C4B30 000C1A70 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C4B34 000C1A74 7C 08 03 A6 */ mtlr r0 /* 800C4B38 000C1A78 38 21 00 20 */ addi r1, r1, 0x20 @@ -45541,7 +45541,7 @@ daAlink_c_NS_procBackJumpInit: /* 800C57A8 000C26E8 7C 08 02 A6 */ mflr r0 /* 800C57AC 000C26EC 90 01 00 24 */ stw r0, 0x24(r1) /* 800C57B0 000C26F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C57B4 000C26F4 48 29 CA 21 */ bl func_803621D4 +/* 800C57B4 000C26F4 48 29 CA 21 */ bl _savegpr_27 /* 800C57B8 000C26F8 7C 7E 1B 78 */ mr r30, r3 /* 800C57BC 000C26FC 7C 9B 23 78 */ mr r27, r4 /* 800C57C0 000C2700 81 83 06 28 */ lwz r12, 0x628(r3) @@ -45650,7 +45650,7 @@ lbl_800C591C: lbl_800C5948: /* 800C5948 000C2888 38 60 00 01 */ li r3, 1 /* 800C594C 000C288C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5950 000C2890 48 29 C8 D1 */ bl func_80362220 +/* 800C5950 000C2890 48 29 C8 D1 */ bl _restgpr_27 /* 800C5954 000C2894 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C5958 000C2898 7C 08 03 A6 */ mtlr r0 /* 800C595C 000C289C 38 21 00 20 */ addi r1, r1, 0x20 @@ -46011,7 +46011,7 @@ daAlink_c_NS_procAutoJumpInit: /* 800C5E6C 000C2DAC 7C 08 02 A6 */ mflr r0 /* 800C5E70 000C2DB0 90 01 00 24 */ stw r0, 0x24(r1) /* 800C5E74 000C2DB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5E78 000C2DB8 48 29 C3 5D */ bl func_803621D4 +/* 800C5E78 000C2DB8 48 29 C3 5D */ bl _savegpr_27 /* 800C5E7C 000C2DBC 7C 7B 1B 78 */ mr r27, r3 /* 800C5E80 000C2DC0 7C 9C 23 78 */ mr r28, r4 /* 800C5E84 000C2DC4 80 03 31 A0 */ lwz r0, 0x31a0(r3) @@ -46250,7 +46250,7 @@ lbl_800C6174: /* 800C61D0 000C3110 38 60 00 01 */ li r3, 1 lbl_800C61D4: /* 800C61D4 000C3114 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C61D8 000C3118 48 29 C0 49 */ bl func_80362220 +/* 800C61D8 000C3118 48 29 C0 49 */ bl _restgpr_27 /* 800C61DC 000C311C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C61E0 000C3120 7C 08 03 A6 */ mtlr r0 /* 800C61E4 000C3124 38 21 00 20 */ addi r1, r1, 0x20 @@ -46259,7 +46259,7 @@ lbl_800C61D4: /* 800C61F0 000C3130 7C 08 02 A6 */ mflr r0 /* 800C61F4 000C3134 90 01 00 24 */ stw r0, 0x24(r1) /* 800C61F8 000C3138 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C61FC 000C313C 48 29 BF D9 */ bl func_803621D4 +/* 800C61FC 000C313C 48 29 BF D9 */ bl _savegpr_27 /* 800C6200 000C3140 7C 7E 1B 78 */ mr r30, r3 /* 800C6204 000C3144 A8 63 04 DE */ lha r3, 0x4de(r3) /* 800C6208 000C3148 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) @@ -46594,7 +46594,7 @@ lbl_800C66B8: /* 800C66C0 000C3600 38 60 00 01 */ li r3, 1 lbl_800C66C4: /* 800C66C4 000C3604 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C66C8 000C3608 48 29 BB 59 */ bl func_80362220 +/* 800C66C8 000C3608 48 29 BB 59 */ bl _restgpr_27 /* 800C66CC 000C360C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C66D0 000C3610 7C 08 03 A6 */ mtlr r0 /* 800C66D4 000C3614 38 21 00 20 */ addi r1, r1, 0x20 @@ -46843,7 +46843,7 @@ daAlink_c_NS_procFallInit: /* 800C6A54 000C3994 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800C6A58 000C3998 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 800C6A5C 000C399C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800C6A60 000C39A0 48 29 B7 75 */ bl func_803621D4 +/* 800C6A60 000C39A0 48 29 B7 75 */ bl _savegpr_27 /* 800C6A64 000C39A4 7C 7C 1B 78 */ mr r28, r3 /* 800C6A68 000C39A8 7C 9D 23 78 */ mr r29, r4 /* 800C6A6C 000C39AC FF E0 08 90 */ fmr f31, f1 @@ -47028,7 +47028,7 @@ lbl_800C6D00: /* 800C6D00 000C3C40 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 800C6D04 000C3C44 CB E1 00 30 */ lfd f31, 0x30(r1) /* 800C6D08 000C3C48 39 61 00 30 */ addi r11, r1, 0x30 -/* 800C6D0C 000C3C4C 48 29 B5 15 */ bl func_80362220 +/* 800C6D0C 000C3C4C 48 29 B5 15 */ bl _restgpr_27 /* 800C6D10 000C3C50 80 01 00 44 */ lwz r0, 0x44(r1) /* 800C6D14 000C3C54 7C 08 03 A6 */ mtlr r0 /* 800C6D18 000C3C58 38 21 00 40 */ addi r1, r1, 0x40 @@ -47794,7 +47794,7 @@ daAlink_c_NS_procCoMetamorphoseInit: /* 800C7800 000C4740 DB E1 00 50 */ stfd f31, 0x50(r1) /* 800C7804 000C4744 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 800C7808 000C4748 39 61 00 50 */ addi r11, r1, 0x50 -/* 800C780C 000C474C 48 29 A9 C9 */ bl func_803621D4 +/* 800C780C 000C474C 48 29 A9 C9 */ bl _savegpr_27 /* 800C7810 000C4750 7C 7E 1B 78 */ mr r30, r3 /* 800C7814 000C4754 3B A0 00 00 */ li r29, 0 /* 800C7818 000C4758 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -47921,7 +47921,7 @@ lbl_800C7954: /* 800C79D8 000C4918 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800C79DC 000C491C 38 63 00 28 */ addi r3, r3, 0x28 /* 800C79E0 000C4920 38 80 00 03 */ li r4, 3 -/* 800C79E4 000C4924 4B F6 B2 09 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 800C79E4 000C4924 4B F6 B2 09 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 800C79E8 000C4928 2C 03 00 00 */ cmpwi r3, 0 /* 800C79EC 000C492C 40 82 00 08 */ bne lbl_800C79F4 /* 800C79F0 000C4930 3B A0 00 00 */ li r29, 0 @@ -48089,7 +48089,7 @@ lbl_800C7C44: /* 800C7C44 000C4B84 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 800C7C48 000C4B88 CB E1 00 50 */ lfd f31, 0x50(r1) /* 800C7C4C 000C4B8C 39 61 00 50 */ addi r11, r1, 0x50 -/* 800C7C50 000C4B90 48 29 A5 D1 */ bl func_80362220 +/* 800C7C50 000C4B90 48 29 A5 D1 */ bl _restgpr_27 /* 800C7C54 000C4B94 80 01 00 64 */ lwz r0, 0x64(r1) /* 800C7C58 000C4B98 7C 08 03 A6 */ mtlr r0 /* 800C7C5C 000C4B9C 38 21 00 60 */ addi r1, r1, 0x60 @@ -48100,7 +48100,7 @@ lbl_800C7C44: /* 800C7C70 000C4BB0 DB E1 00 40 */ stfd f31, 0x40(r1) /* 800C7C74 000C4BB4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 800C7C78 000C4BB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 800C7C7C 000C4BBC 48 29 A5 5D */ bl func_803621D8 +/* 800C7C7C 000C4BBC 48 29 A5 5D */ bl _savegpr_28 /* 800C7C80 000C4BC0 7C 7D 1B 78 */ mr r29, r3 /* 800C7C84 000C4BC4 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800C7C88 000C4BC8 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -48544,7 +48544,7 @@ lbl_800C82C8: /* 800C82C8 000C5208 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 800C82CC 000C520C CB E1 00 40 */ lfd f31, 0x40(r1) /* 800C82D0 000C5210 39 61 00 40 */ addi r11, r1, 0x40 -/* 800C82D4 000C5214 48 29 9F 51 */ bl func_80362224 +/* 800C82D4 000C5214 48 29 9F 51 */ bl _restgpr_28 /* 800C82D8 000C5218 80 01 00 54 */ lwz r0, 0x54(r1) /* 800C82DC 000C521C 7C 08 03 A6 */ mtlr r0 /* 800C82E0 000C5220 38 21 00 50 */ addi r1, r1, 0x50 @@ -48847,7 +48847,7 @@ daAlink_c_NS_execute: /* 800C870C 000C564C DB E1 00 A0 */ stfd f31, 0xa0(r1) /* 800C8710 000C5650 F3 E1 00 A8 */ psq_st f31, 168(r1), 0, qr0 /* 800C8714 000C5654 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800C8718 000C5658 48 29 9A BD */ bl func_803621D4 +/* 800C8718 000C5658 48 29 9A BD */ bl _savegpr_27 /* 800C871C 000C565C 7C 7F 1B 78 */ mr r31, r3 /* 800C8720 000C5660 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800C8724 000C5664 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l @@ -51661,7 +51661,7 @@ lbl_800CAF84: /* 800CAF88 000C7EC8 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 800CAF8C 000C7ECC CB E1 00 A0 */ lfd f31, 0xa0(r1) /* 800CAF90 000C7ED0 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 800CAF94 000C7ED4 48 29 72 8D */ bl func_80362220 +/* 800CAF94 000C7ED4 48 29 72 8D */ bl _restgpr_27 /* 800CAF98 000C7ED8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800CAF9C 000C7EDC 7C 08 03 A6 */ mtlr r0 /* 800CAFA0 000C7EE0 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -52567,7 +52567,7 @@ daAlink_c_NS_shadowDraw: /* 800CBC1C 000C8B5C 7C 08 02 A6 */ mflr r0 /* 800CBC20 000C8B60 90 01 00 44 */ stw r0, 0x44(r1) /* 800CBC24 000C8B64 39 61 00 40 */ addi r11, r1, 0x40 -/* 800CBC28 000C8B68 48 29 65 AD */ bl func_803621D4 +/* 800CBC28 000C8B68 48 29 65 AD */ bl _savegpr_27 /* 800CBC2C 000C8B6C 7C 7D 1B 78 */ mr r29, r3 /* 800CBC30 000C8B70 83 ED 8A 98 */ lwz r31, lbl_80451018-_SDA_BASE_(r13) /* 800CBC34 000C8B74 28 1F 00 00 */ cmplwi r31, 0 @@ -53001,7 +53001,7 @@ lbl_800CC1E4: /* 800CC240 000C9180 4B F8 9C DD */ bl dDlst_shadowControl_c_NS_addReal lbl_800CC244: /* 800CC244 000C9184 39 61 00 40 */ addi r11, r1, 0x40 -/* 800CC248 000C9188 48 29 5F D9 */ bl func_80362220 +/* 800CC248 000C9188 48 29 5F D9 */ bl _restgpr_27 /* 800CC24C 000C918C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800CC250 000C9190 7C 08 03 A6 */ mtlr r0 /* 800CC254 000C9194 38 21 00 40 */ addi r1, r1, 0x40 @@ -59280,7 +59280,7 @@ daAlink_c_NS_changeCutReverseProc: /* 800D19D4 000CE914 DB E1 00 80 */ stfd f31, 0x80(r1) /* 800D19D8 000CE918 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 800D19DC 000CE91C 39 61 00 80 */ addi r11, r1, 0x80 -/* 800D19E0 000CE920 48 29 07 F9 */ bl func_803621D8 +/* 800D19E0 000CE920 48 29 07 F9 */ bl _savegpr_28 /* 800D19E4 000CE924 7C 7E 1B 78 */ mr r30, r3 /* 800D19E8 000CE928 7C 9F 23 78 */ mr r31, r4 /* 800D19EC 000CE92C 38 9E 12 2C */ addi r4, r30, 0x122c @@ -59574,7 +59574,7 @@ lbl_800D1DFC: /* 800D1DFC 000CED3C E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 800D1E00 000CED40 CB E1 00 80 */ lfd f31, 0x80(r1) /* 800D1E04 000CED44 39 61 00 80 */ addi r11, r1, 0x80 -/* 800D1E08 000CED48 48 29 04 1D */ bl func_80362224 +/* 800D1E08 000CED48 48 29 04 1D */ bl _restgpr_28 /* 800D1E0C 000CED4C 80 01 00 94 */ lwz r0, 0x94(r1) /* 800D1E10 000CED50 7C 08 03 A6 */ mtlr r0 /* 800D1E14 000CED54 38 21 00 90 */ addi r1, r1, 0x90 @@ -60007,7 +60007,7 @@ daAlink_c_NS_checkCutAction: /* 800D23C4 000CF304 7C 08 02 A6 */ mflr r0 /* 800D23C8 000CF308 90 01 00 24 */ stw r0, 0x24(r1) /* 800D23CC 000CF30C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D23D0 000CF310 48 28 FE 05 */ bl func_803621D4 +/* 800D23D0 000CF310 48 28 FE 05 */ bl _savegpr_27 /* 800D23D4 000CF314 7C 7D 1B 78 */ mr r29, r3 /* 800D23D8 000CF318 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800D23DC 000CF31C 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l @@ -60196,7 +60196,7 @@ lbl_800D2668: /* 800D2668 000CF5A8 38 60 00 01 */ li r3, 1 lbl_800D266C: /* 800D266C 000CF5AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2670 000CF5B0 48 28 FB B1 */ bl func_80362220 +/* 800D2670 000CF5B0 48 28 FB B1 */ bl _restgpr_27 /* 800D2674 000CF5B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D2678 000CF5B8 7C 08 03 A6 */ mtlr r0 /* 800D267C 000CF5BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -60525,7 +60525,7 @@ daAlink_c_NS_checkCutLargeTurnState: /* 800D2AC0 000CFA00 7C 08 02 A6 */ mflr r0 /* 800D2AC4 000CFA04 90 01 00 24 */ stw r0, 0x24(r1) /* 800D2AC8 000CFA08 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2ACC 000CFA0C 48 28 F7 0D */ bl func_803621D8 +/* 800D2ACC 000CFA0C 48 28 F7 0D */ bl _savegpr_28 /* 800D2AD0 000CFA10 7C 7C 1B 78 */ mr r28, r3 /* 800D2AD4 000CFA14 3B C0 00 01 */ li r30, 1 /* 800D2AD8 000CFA18 3B A0 00 00 */ li r29, 0 @@ -60571,7 +60571,7 @@ lbl_800D2B60: lbl_800D2B6C: /* 800D2B6C 000CFAAC 57 C3 06 3E */ clrlwi r3, r30, 0x18 /* 800D2B70 000CFAB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2B74 000CFAB4 48 28 F6 B1 */ bl func_80362224 +/* 800D2B74 000CFAB4 48 28 F6 B1 */ bl _restgpr_28 /* 800D2B78 000CFAB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D2B7C 000CFABC 7C 08 03 A6 */ mtlr r0 /* 800D2B80 000CFAC0 38 21 00 20 */ addi r1, r1, 0x20 @@ -60861,7 +60861,7 @@ daAlink_c_NS_procCutNormalInit: /* 800D2F5C 000CFE9C 7C 08 02 A6 */ mflr r0 /* 800D2F60 000CFEA0 90 01 00 24 */ stw r0, 0x24(r1) /* 800D2F64 000CFEA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D2F68 000CFEA8 48 28 F2 6D */ bl func_803621D4 +/* 800D2F68 000CFEA8 48 28 F2 6D */ bl _savegpr_27 /* 800D2F6C 000CFEAC 7C 7D 1B 78 */ mr r29, r3 /* 800D2F70 000CFEB0 7C 9B 23 78 */ mr r27, r4 /* 800D2F74 000CFEB4 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -61019,7 +61019,7 @@ lbl_800D318C: /* 800D3198 000D00D8 4B FF FA 65 */ bl daAlink_c_NS_initCutAtnActorSearch /* 800D319C 000D00DC 38 60 00 01 */ li r3, 1 /* 800D31A0 000D00E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D31A4 000D00E4 48 28 F0 7D */ bl func_80362220 +/* 800D31A4 000D00E4 48 28 F0 7D */ bl _restgpr_27 /* 800D31A8 000D00E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D31AC 000D00EC 7C 08 03 A6 */ mtlr r0 /* 800D31B0 000D00F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -62589,7 +62589,7 @@ daAlink_c_NS_procCutTurnInit: /* 800D47E8 000D1728 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800D47EC 000D172C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800D47F0 000D1730 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D47F4 000D1734 48 28 D9 E1 */ bl func_803621D4 +/* 800D47F4 000D1734 48 28 D9 E1 */ bl _savegpr_27 /* 800D47F8 000D1738 7C 7C 1B 78 */ mr r28, r3 /* 800D47FC 000D173C 7C 9B 23 78 */ mr r27, r4 /* 800D4800 000D1740 7C BD 2B 78 */ mr r29, r5 @@ -62759,7 +62759,7 @@ lbl_800D49DC: /* 800D4A54 000D1994 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800D4A58 000D1998 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800D4A5C 000D199C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D4A60 000D19A0 48 28 D7 C1 */ bl func_80362220 +/* 800D4A60 000D19A0 48 28 D7 C1 */ bl _restgpr_27 /* 800D4A64 000D19A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 800D4A68 000D19A8 7C 08 03 A6 */ mtlr r0 /* 800D4A6C 000D19AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -65989,7 +65989,7 @@ daAlink_c_NS_checkPolyDamage: /* 800D7824 000D4764 7C 08 02 A6 */ mflr r0 /* 800D7828 000D4768 90 01 00 34 */ stw r0, 0x34(r1) /* 800D782C 000D476C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D7830 000D4770 48 28 A9 A9 */ bl func_803621D8 +/* 800D7830 000D4770 48 28 A9 A9 */ bl _savegpr_28 /* 800D7834 000D4774 7C 7F 1B 78 */ mr r31, r3 /* 800D7838 000D4778 4B F5 81 CD */ bl dComIfGs_PolyDamageOff_Check /* 800D783C 000D477C 7C 60 07 75 */ extsb. r0, r3 @@ -66152,7 +66152,7 @@ lbl_800D7A7C: /* 800D7A7C 000D49BC 88 7F 2F CA */ lbz r3, 0x2fca(r31) lbl_800D7A80: /* 800D7A80 000D49C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D7A84 000D49C4 48 28 A7 A1 */ bl func_80362224 +/* 800D7A84 000D49C4 48 28 A7 A1 */ bl _restgpr_28 /* 800D7A88 000D49C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800D7A8C 000D49CC 7C 08 03 A6 */ mtlr r0 /* 800D7A90 000D49D0 38 21 00 30 */ addi r1, r1, 0x30 @@ -70001,7 +70001,7 @@ daAlink_c_NS_procCoElecDamageInit: /* 800DB144 000D8084 7C 08 02 A6 */ mflr r0 /* 800DB148 000D8088 90 01 00 24 */ stw r0, 0x24(r1) /* 800DB14C 000D808C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DB150 000D8090 48 28 70 85 */ bl func_803621D4 +/* 800DB150 000D8090 48 28 70 85 */ bl _savegpr_27 /* 800DB154 000D8094 7C 7B 1B 78 */ mr r27, r3 /* 800DB158 000D8098 7C 9F 23 78 */ mr r31, r4 /* 800DB15C 000D809C 7C BC 2B 78 */ mr r28, r5 @@ -70189,7 +70189,7 @@ lbl_800DB3E8: /* 800DB3FC 000D833C 38 60 00 01 */ li r3, 1 lbl_800DB400: /* 800DB400 000D8340 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DB404 000D8344 48 28 6E 1D */ bl func_80362220 +/* 800DB404 000D8344 48 28 6E 1D */ bl _restgpr_27 /* 800DB408 000D8348 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DB40C 000D834C 7C 08 03 A6 */ mtlr r0 /* 800DB410 000D8350 38 21 00 20 */ addi r1, r1, 0x20 @@ -71218,7 +71218,7 @@ daAlink_c_NS_procCoSwimFreezeReturnInit: /* 800DC284 000D91C4 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800DC288 000D91C8 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800DC28C 000D91CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC290 000D91D0 48 28 5F 49 */ bl func_803621D8 +/* 800DC290 000D91D0 48 28 5F 49 */ bl _savegpr_28 /* 800DC294 000D91D4 7C 7F 1B 78 */ mr r31, r3 /* 800DC298 000D91D8 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800DC29C 000D91DC 3B C3 D6 58 */ addi r30, r3, lbl_8038D658@l @@ -71342,7 +71342,7 @@ lbl_800DC454: /* 800DC454 000D9394 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800DC458 000D9398 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800DC45C 000D939C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC460 000D93A0 48 28 5D C5 */ bl func_80362224 +/* 800DC460 000D93A0 48 28 5D C5 */ bl _restgpr_28 /* 800DC464 000D93A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DC468 000D93A8 7C 08 03 A6 */ mtlr r0 /* 800DC46C 000D93AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -71992,7 +71992,7 @@ lbl_800DCD3C: /* 800DCD78 000D9CB8 7C 08 02 A6 */ mflr r0 /* 800DCD7C 000D9CBC 90 01 00 34 */ stw r0, 0x34(r1) /* 800DCD80 000D9CC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DCD84 000D9CC4 48 28 54 55 */ bl func_803621D8 +/* 800DCD84 000D9CC4 48 28 54 55 */ bl _savegpr_28 /* 800DCD88 000D9CC8 7C 7C 1B 78 */ mr r28, r3 /* 800DCD8C 000D9CCC 7C 9D 23 78 */ mr r29, r4 /* 800DCD90 000D9CD0 7C BE 2B 78 */ mr r30, r5 @@ -72014,7 +72014,7 @@ lbl_800DCD3C: /* 800DCDD0 000D9D10 7F A5 EB 78 */ mr r5, r29 /* 800DCDD4 000D9D14 48 26 9F 99 */ bl PSMTXMultVec /* 800DCDD8 000D9D18 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DCDDC 000D9D1C 48 28 54 49 */ bl func_80362224 +/* 800DCDDC 000D9D1C 48 28 54 49 */ bl _restgpr_28 /* 800DCDE0 000D9D20 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DCDE4 000D9D24 7C 08 03 A6 */ mtlr r0 /* 800DCDE8 000D9D28 38 21 00 30 */ addi r1, r1, 0x30 @@ -72058,7 +72058,7 @@ lbl_800DCE50: /* 800DCE70 000D9DB0 7C 08 02 A6 */ mflr r0 /* 800DCE74 000D9DB4 90 01 00 24 */ stw r0, 0x24(r1) /* 800DCE78 000D9DB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DCE7C 000D9DBC 48 28 53 5D */ bl func_803621D8 +/* 800DCE7C 000D9DBC 48 28 53 5D */ bl _savegpr_28 /* 800DCE80 000D9DC0 7C 7C 1B 78 */ mr r28, r3 /* 800DCE84 000D9DC4 3B E0 00 01 */ li r31, 1 /* 800DCE88 000D9DC8 7F FE FB 78 */ mr r30, r31 @@ -72090,7 +72090,7 @@ lbl_800DCECC: lbl_800DCEE8: /* 800DCEE8 000D9E28 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 800DCEEC 000D9E2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DCEF0 000D9E30 48 28 53 35 */ bl func_80362224 +/* 800DCEF0 000D9E30 48 28 53 35 */ bl _restgpr_28 /* 800DCEF4 000D9E34 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DCEF8 000D9E38 7C 08 03 A6 */ mtlr r0 /* 800DCEFC 000D9E3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -72258,7 +72258,7 @@ daAlink_c_NS_setGuardSe: /* 800DD118 000DA058 7C 08 02 A6 */ mflr r0 /* 800DD11C 000DA05C 90 01 00 24 */ stw r0, 0x24(r1) /* 800DD120 000DA060 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DD124 000DA064 48 28 50 B5 */ bl func_803621D8 +/* 800DD124 000DA064 48 28 50 B5 */ bl _savegpr_28 /* 800DD128 000DA068 7C 7C 1B 78 */ mr r28, r3 /* 800DD12C 000DA06C 7C 9D 23 78 */ mr r29, r4 /* 800DD130 000DA070 4B FF F8 FD */ bl daAlink_c_NS_checkWoodShieldEquipNotIronBall @@ -72301,7 +72301,7 @@ lbl_800DD1A4: /* 800DD1B4 000DA0F4 7D 89 03 A6 */ mtctr r12 /* 800DD1B8 000DA0F8 4E 80 04 21 */ bctrl /* 800DD1BC 000DA0FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DD1C0 000DA100 48 28 50 65 */ bl func_80362224 +/* 800DD1C0 000DA100 48 28 50 65 */ bl _restgpr_28 /* 800DD1C4 000DA104 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DD1C8 000DA108 7C 08 03 A6 */ mtlr r0 /* 800DD1CC 000DA10C 38 21 00 20 */ addi r1, r1, 0x20 @@ -72313,7 +72313,7 @@ daAlink_c_NS_setSmallGuard: /* 800DD1D8 000DA118 7C 08 02 A6 */ mflr r0 /* 800DD1DC 000DA11C 90 01 00 34 */ stw r0, 0x34(r1) /* 800DD1E0 000DA120 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DD1E4 000DA124 48 28 4F F5 */ bl func_803621D8 +/* 800DD1E4 000DA124 48 28 4F F5 */ bl _savegpr_28 /* 800DD1E8 000DA128 7C 7D 1B 78 */ mr r29, r3 /* 800DD1EC 000DA12C 7C 9C 23 78 */ mr r28, r4 /* 800DD1F0 000DA130 38 80 00 16 */ li r4, 0x16 @@ -72454,7 +72454,7 @@ lbl_800DD3C4: lbl_800DD3C8: /* 800DD3C8 000DA308 B3 9D 05 9C */ sth r28, 0x59c(r29) /* 800DD3CC 000DA30C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DD3D0 000DA310 48 28 4E 55 */ bl func_80362224 +/* 800DD3D0 000DA310 48 28 4E 55 */ bl _restgpr_28 /* 800DD3D4 000DA314 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DD3D8 000DA318 7C 08 03 A6 */ mtlr r0 /* 800DD3DC 000DA31C 38 21 00 30 */ addi r1, r1, 0x30 @@ -73320,7 +73320,7 @@ daAlink_c_NS_procTurnMoveInit: /* 800DE00C 000DAF4C 7C 08 02 A6 */ mflr r0 /* 800DE010 000DAF50 90 01 00 54 */ stw r0, 0x54(r1) /* 800DE014 000DAF54 39 61 00 50 */ addi r11, r1, 0x50 -/* 800DE018 000DAF58 48 28 41 C1 */ bl func_803621D8 +/* 800DE018 000DAF58 48 28 41 C1 */ bl _savegpr_28 /* 800DE01C 000DAF5C 7C 7C 1B 78 */ mr r28, r3 /* 800DE020 000DAF60 7C 9D 23 78 */ mr r29, r4 /* 800DE024 000DAF64 4B FF ED CD */ bl daAlink_c_NS_checkUpperGuardAnime @@ -73555,7 +73555,7 @@ lbl_800DE328: lbl_800DE364: /* 800DE364 000DB2A4 38 60 00 01 */ li r3, 1 /* 800DE368 000DB2A8 39 61 00 50 */ addi r11, r1, 0x50 -/* 800DE36C 000DB2AC 48 28 3E B9 */ bl func_80362224 +/* 800DE36C 000DB2AC 48 28 3E B9 */ bl _restgpr_28 /* 800DE370 000DB2B0 80 01 00 54 */ lwz r0, 0x54(r1) /* 800DE374 000DB2B4 7C 08 03 A6 */ mtlr r0 /* 800DE378 000DB2B8 38 21 00 50 */ addi r1, r1, 0x50 @@ -73916,7 +73916,7 @@ daAlink_c_NS_checkBowCameraArrowPosP: /* 800DE888 000DB7C8 7C 08 02 A6 */ mflr r0 /* 800DE88C 000DB7CC 90 01 00 24 */ stw r0, 0x24(r1) /* 800DE890 000DB7D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE894 000DB7D4 48 28 39 45 */ bl func_803621D8 +/* 800DE894 000DB7D4 48 28 39 45 */ bl _savegpr_28 /* 800DE898 000DB7D8 7C 7D 1B 78 */ mr r29, r3 /* 800DE89C 000DB7DC 7C 9E 23 78 */ mr r30, r4 /* 800DE8A0 000DB7E0 7C BF 2B 78 */ mr r31, r5 @@ -73980,7 +73980,7 @@ lbl_800DE920: /* 800DE974 000DB8B4 38 7D 37 E0 */ addi r3, r29, 0x37e0 lbl_800DE978: /* 800DE978 000DB8B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE97C 000DB8BC 48 28 38 A9 */ bl func_80362224 +/* 800DE97C 000DB8BC 48 28 38 A9 */ bl _restgpr_28 /* 800DE980 000DB8C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DE984 000DB8C4 7C 08 03 A6 */ mtlr r0 /* 800DE988 000DB8C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -74285,7 +74285,7 @@ daAlink_c_NS_cancelBowMoveRideNotAtn: /* 800DED8C 000DBCCC 7C 08 02 A6 */ mflr r0 /* 800DED90 000DBCD0 90 01 00 24 */ stw r0, 0x24(r1) /* 800DED94 000DBCD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DED98 000DBCD8 48 28 34 3D */ bl func_803621D4 +/* 800DED98 000DBCD8 48 28 34 3D */ bl _savegpr_27 /* 800DED9C 000DBCDC 7C 7B 1B 78 */ mr r27, r3 /* 800DEDA0 000DBCE0 3B C0 00 00 */ li r30, 0 /* 800DEDA4 000DBCE4 7F DD F3 78 */ mr r29, r30 @@ -74316,7 +74316,7 @@ lbl_800DEDE8: lbl_800DEE00: /* 800DEE00 000DBD40 57 C3 06 3E */ clrlwi r3, r30, 0x18 /* 800DEE04 000DBD44 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEE08 000DBD48 48 28 34 19 */ bl func_80362220 +/* 800DEE08 000DBD48 48 28 34 19 */ bl _restgpr_27 /* 800DEE0C 000DBD4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DEE10 000DBD50 7C 08 03 A6 */ mtlr r0 /* 800DEE14 000DBD54 38 21 00 20 */ addi r1, r1, 0x20 @@ -75033,7 +75033,7 @@ daAlink_c_NS_checkNextActionBow: /* 800DF818 000DC758 7C 08 02 A6 */ mflr r0 /* 800DF81C 000DC75C 90 01 00 24 */ stw r0, 0x24(r1) /* 800DF820 000DC760 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DF824 000DC764 48 28 29 B5 */ bl func_803621D8 +/* 800DF824 000DC764 48 28 29 B5 */ bl _savegpr_28 /* 800DF828 000DC768 7C 7E 1B 78 */ mr r30, r3 /* 800DF82C 000DC76C A8 03 30 8E */ lha r0, 0x308e(r3) /* 800DF830 000DC770 2C 00 00 00 */ cmpwi r0, 0 @@ -75224,7 +75224,7 @@ lbl_800DFA70: lbl_800DFACC: /* 800DFACC 000DCA0C 7F 83 E3 78 */ mr r3, r28 /* 800DFAD0 000DCA10 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DFAD4 000DCA14 48 28 27 51 */ bl func_80362224 +/* 800DFAD4 000DCA14 48 28 27 51 */ bl _restgpr_28 /* 800DFAD8 000DCA18 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DFADC 000DCA1C 7C 08 03 A6 */ mtlr r0 /* 800DFAE0 000DCA20 38 21 00 20 */ addi r1, r1, 0x20 @@ -77098,7 +77098,7 @@ lbl_800E1444: /* 800E1460 000DE3A0 7C 08 02 A6 */ mflr r0 /* 800E1464 000DE3A4 90 01 00 24 */ stw r0, 0x24(r1) /* 800E1468 000DE3A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E146C 000DE3AC 48 28 0D 6D */ bl func_803621D8 +/* 800E146C 000DE3AC 48 28 0D 6D */ bl _savegpr_28 /* 800E1470 000DE3B0 7C 7C 1B 78 */ mr r28, r3 /* 800E1474 000DE3B4 3B E0 00 01 */ li r31, 1 /* 800E1478 000DE3B8 7F FE FB 78 */ mr r30, r31 @@ -77146,7 +77146,7 @@ lbl_800E14FC: lbl_800E1514: /* 800E1514 000DE454 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 800E1518 000DE458 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E151C 000DE45C 48 28 0D 09 */ bl func_80362224 +/* 800E151C 000DE45C 48 28 0D 09 */ bl _restgpr_28 /* 800E1520 000DE460 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E1524 000DE464 7C 08 03 A6 */ mtlr r0 /* 800E1528 000DE468 38 21 00 20 */ addi r1, r1, 0x20 @@ -78518,7 +78518,7 @@ daAlink_c_NS_setMagneBootsMtx: /* 800E2814 000DF754 DB E1 00 80 */ stfd f31, 0x80(r1) /* 800E2818 000DF758 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 800E281C 000DF75C 39 61 00 80 */ addi r11, r1, 0x80 -/* 800E2820 000DF760 48 27 F9 B9 */ bl func_803621D8 +/* 800E2820 000DF760 48 27 F9 B9 */ bl _savegpr_28 /* 800E2824 000DF764 7C 7D 1B 78 */ mr r29, r3 /* 800E2828 000DF768 7C 9E 23 78 */ mr r30, r4 /* 800E282C 000DF76C 7C BF 2B 78 */ mr r31, r5 @@ -78907,7 +78907,7 @@ lbl_800E2D4C: /* 800E2DA4 000DFCE4 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 800E2DA8 000DFCE8 CB E1 00 80 */ lfd f31, 0x80(r1) /* 800E2DAC 000DFCEC 39 61 00 80 */ addi r11, r1, 0x80 -/* 800E2DB0 000DFCF0 48 27 F4 75 */ bl func_80362224 +/* 800E2DB0 000DFCF0 48 27 F4 75 */ bl _restgpr_28 /* 800E2DB4 000DFCF4 80 01 00 94 */ lwz r0, 0x94(r1) /* 800E2DB8 000DFCF8 7C 08 03 A6 */ mtlr r0 /* 800E2DBC 000DFCFC 38 21 00 90 */ addi r1, r1, 0x90 @@ -81915,7 +81915,7 @@ daAlink_c_NS_putObjLineCheck: /* 800E583C 000E277C DB E1 00 50 */ stfd f31, 0x50(r1) /* 800E5840 000E2780 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 800E5844 000E2784 39 61 00 50 */ addi r11, r1, 0x50 -/* 800E5848 000E2788 48 27 C9 91 */ bl func_803621D8 +/* 800E5848 000E2788 48 27 C9 91 */ bl _savegpr_28 /* 800E584C 000E278C 7C 7E 1B 78 */ mr r30, r3 /* 800E5850 000E2790 7C 9C 23 78 */ mr r28, r4 /* 800E5854 000E2794 7C BD 2B 78 */ mr r29, r5 @@ -82133,7 +82133,7 @@ lbl_800E5B4C: /* 800E5B4C 000E2A8C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 800E5B50 000E2A90 CB E1 00 50 */ lfd f31, 0x50(r1) /* 800E5B54 000E2A94 39 61 00 50 */ addi r11, r1, 0x50 -/* 800E5B58 000E2A98 48 27 C6 CD */ bl func_80362224 +/* 800E5B58 000E2A98 48 27 C6 CD */ bl _restgpr_28 /* 800E5B5C 000E2A9C 80 01 00 64 */ lwz r0, 0x64(r1) /* 800E5B60 000E2AA0 7C 08 03 A6 */ mtlr r0 /* 800E5B64 000E2AA4 38 21 00 60 */ addi r1, r1, 0x60 @@ -83217,7 +83217,7 @@ daAlink_c_NS_procGrabWaitInit: /* 800E6AA8 000E39E8 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800E6AAC 000E39EC F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800E6AB0 000E39F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E6AB4 000E39F4 48 27 B7 25 */ bl func_803621D8 +/* 800E6AB4 000E39F4 48 27 B7 25 */ bl _savegpr_28 /* 800E6AB8 000E39F8 7C 7F 1B 78 */ mr r31, r3 /* 800E6ABC 000E39FC 80 03 05 90 */ lwz r0, 0x590(r3) /* 800E6AC0 000E3A00 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -83321,7 +83321,7 @@ lbl_800E6C14: /* 800E6C14 000E3B54 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800E6C18 000E3B58 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800E6C1C 000E3B5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E6C20 000E3B60 48 27 B6 05 */ bl func_80362224 +/* 800E6C20 000E3B60 48 27 B6 05 */ bl _restgpr_28 /* 800E6C24 000E3B64 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E6C28 000E3B68 7C 08 03 A6 */ mtlr r0 /* 800E6C2C 000E3B6C 38 21 00 30 */ addi r1, r1, 0x30 @@ -85840,7 +85840,7 @@ lbl_800E8F24: /* 800E8F48 000E5E88 7C 08 02 A6 */ mflr r0 /* 800E8F4C 000E5E8C 90 01 00 24 */ stw r0, 0x24(r1) /* 800E8F50 000E5E90 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E8F54 000E5E94 48 27 92 85 */ bl func_803621D8 +/* 800E8F54 000E5E94 48 27 92 85 */ bl _savegpr_28 /* 800E8F58 000E5E98 7C 7E 1B 78 */ mr r30, r3 /* 800E8F5C 000E5E9C 38 80 00 15 */ li r4, 0x15 /* 800E8F60 000E5EA0 38 A0 00 02 */ li r5, 2 @@ -86002,7 +86002,7 @@ lbl_800E9194: /* 800E9194 000E60D4 38 60 00 01 */ li r3, 1 lbl_800E9198: /* 800E9198 000E60D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E919C 000E60DC 48 27 90 89 */ bl func_80362224 +/* 800E919C 000E60DC 48 27 90 89 */ bl _restgpr_28 /* 800E91A0 000E60E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E91A4 000E60E4 7C 08 03 A6 */ mtlr r0 /* 800E91A8 000E60E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -86728,7 +86728,7 @@ lbl_800E9BB0: /* 800E9BE4 000E6B24 DB C1 00 20 */ stfd f30, 0x20(r1) /* 800E9BE8 000E6B28 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 800E9BEC 000E6B2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E9BF0 000E6B30 48 27 85 E5 */ bl func_803621D4 +/* 800E9BF0 000E6B30 48 27 85 E5 */ bl _savegpr_27 /* 800E9BF4 000E6B34 7C 7C 1B 78 */ mr r28, r3 /* 800E9BF8 000E6B38 3B BC 1F D0 */ addi r29, r28, 0x1fd0 /* 800E9BFC 000E6B3C 83 E3 28 10 */ lwz r31, 0x2810(r3) @@ -87200,7 +87200,7 @@ lbl_800EA280: /* 800EA288 000E71C8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 800EA28C 000E71CC CB C1 00 20 */ lfd f30, 0x20(r1) /* 800EA290 000E71D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EA294 000E71D4 48 27 7F 8D */ bl func_80362220 +/* 800EA294 000E71D4 48 27 7F 8D */ bl _restgpr_27 /* 800EA298 000E71D8 80 01 00 44 */ lwz r0, 0x44(r1) /* 800EA29C 000E71DC 7C 08 03 A6 */ mtlr r0 /* 800EA2A0 000E71E0 38 21 00 40 */ addi r1, r1, 0x40 @@ -88591,7 +88591,7 @@ daAlink_c_NS_procSumouActionInit: /* 800EB630 000E8570 DB E1 00 40 */ stfd f31, 0x40(r1) /* 800EB634 000E8574 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 800EB638 000E8578 39 61 00 40 */ addi r11, r1, 0x40 -/* 800EB63C 000E857C 48 27 6B 99 */ bl func_803621D4 +/* 800EB63C 000E857C 48 27 6B 99 */ bl _savegpr_27 /* 800EB640 000E8580 7C 7B 1B 78 */ mr r27, r3 /* 800EB644 000E8584 7C 9C 23 78 */ mr r28, r4 /* 800EB648 000E8588 7C BD 2B 78 */ mr r29, r5 @@ -89064,7 +89064,7 @@ lbl_800EBCBC: /* 800EBCC0 000E8C00 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 800EBCC4 000E8C04 CB E1 00 40 */ lfd f31, 0x40(r1) /* 800EBCC8 000E8C08 39 61 00 40 */ addi r11, r1, 0x40 -/* 800EBCCC 000E8C0C 48 27 65 55 */ bl func_80362220 +/* 800EBCCC 000E8C0C 48 27 65 55 */ bl _restgpr_27 /* 800EBCD0 000E8C10 80 01 00 54 */ lwz r0, 0x54(r1) /* 800EBCD4 000E8C14 7C 08 03 A6 */ mtlr r0 /* 800EBCD8 000E8C18 38 21 00 50 */ addi r1, r1, 0x50 @@ -90530,7 +90530,7 @@ lbl_800ED0B8: /* 800ED0D8 000EA018 7C 08 02 A6 */ mflr r0 /* 800ED0DC 000EA01C 90 01 00 24 */ stw r0, 0x24(r1) /* 800ED0E0 000EA020 39 61 00 20 */ addi r11, r1, 0x20 -/* 800ED0E4 000EA024 48 27 50 F5 */ bl func_803621D8 +/* 800ED0E4 000EA024 48 27 50 F5 */ bl _savegpr_28 /* 800ED0E8 000EA028 7C 7C 1B 78 */ mr r28, r3 /* 800ED0EC 000EA02C 7C 9D 23 78 */ mr r29, r4 /* 800ED0F0 000EA030 7C BE 2B 78 */ mr r30, r5 @@ -90595,7 +90595,7 @@ lbl_800ED198: /* 800ED1D4 000EA114 48 25 9B 99 */ bl PSMTXMultVec lbl_800ED1D8: /* 800ED1D8 000EA118 39 61 00 20 */ addi r11, r1, 0x20 -/* 800ED1DC 000EA11C 48 27 50 49 */ bl func_80362224 +/* 800ED1DC 000EA11C 48 27 50 49 */ bl _restgpr_28 /* 800ED1E0 000EA120 80 01 00 24 */ lwz r0, 0x24(r1) /* 800ED1E4 000EA124 7C 08 03 A6 */ mtlr r0 /* 800ED1E8 000EA128 38 21 00 20 */ addi r1, r1, 0x20 @@ -91278,7 +91278,7 @@ daAlink_c_NS_getBaseHorseAnime: /* 800EDB4C 000EAA8C 7C 08 02 A6 */ mflr r0 /* 800EDB50 000EAA90 90 01 00 24 */ stw r0, 0x24(r1) /* 800EDB54 000EAA94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EDB58 000EAA98 48 27 46 81 */ bl func_803621D8 +/* 800EDB58 000EAA98 48 27 46 81 */ bl _savegpr_28 /* 800EDB5C 000EAA9C 7C 7C 1B 78 */ mr r28, r3 /* 800EDB60 000EAAA0 7C 9D 23 78 */ mr r29, r4 /* 800EDB64 000EAAA4 3C 80 80 40 */ lis r4, lbl_804061C0@ha @@ -91429,7 +91429,7 @@ lbl_800EDD40: /* 800EDD50 000EAC90 41 80 FE AC */ blt lbl_800EDBFC lbl_800EDD54: /* 800EDD54 000EAC94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EDD58 000EAC98 48 27 44 CD */ bl func_80362224 +/* 800EDD58 000EAC98 48 27 44 CD */ bl _restgpr_28 /* 800EDD5C 000EAC9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EDD60 000EACA0 7C 08 03 A6 */ mtlr r0 /* 800EDD64 000EACA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -91557,7 +91557,7 @@ daAlink_c_NS_setSyncHorse: /* 800EDF00 000EAE40 DB C1 00 30 */ stfd f30, 0x30(r1) /* 800EDF04 000EAE44 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 800EDF08 000EAE48 39 61 00 30 */ addi r11, r1, 0x30 -/* 800EDF0C 000EAE4C 48 27 42 CD */ bl func_803621D8 +/* 800EDF0C 000EAE4C 48 27 42 CD */ bl _savegpr_28 /* 800EDF10 000EAE50 7C 7D 1B 78 */ mr r29, r3 /* 800EDF14 000EAE54 7C 9E 23 78 */ mr r30, r4 /* 800EDF18 000EAE58 3C 80 80 40 */ lis r4, lbl_804061C0@ha @@ -92055,7 +92055,7 @@ lbl_800EE624: /* 800EE62C 000EB56C E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 800EE630 000EB570 CB C1 00 30 */ lfd f30, 0x30(r1) /* 800EE634 000EB574 39 61 00 30 */ addi r11, r1, 0x30 -/* 800EE638 000EB578 48 27 3B ED */ bl func_80362224 +/* 800EE638 000EB578 48 27 3B ED */ bl _restgpr_28 /* 800EE63C 000EB57C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800EE640 000EB580 7C 08 03 A6 */ mtlr r0 /* 800EE644 000EB584 38 21 00 50 */ addi r1, r1, 0x50 @@ -92067,7 +92067,7 @@ daAlink_c_NS_setSyncBoar: /* 800EE650 000EB590 7C 08 02 A6 */ mflr r0 /* 800EE654 000EB594 90 01 00 24 */ stw r0, 0x24(r1) /* 800EE658 000EB598 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EE65C 000EB59C 48 27 3B 7D */ bl func_803621D8 +/* 800EE65C 000EB59C 48 27 3B 7D */ bl _savegpr_28 /* 800EE660 000EB5A0 7C 7E 1B 78 */ mr r30, r3 /* 800EE664 000EB5A4 7C 9C 23 78 */ mr r28, r4 /* 800EE668 000EB5A8 83 E3 28 18 */ lwz r31, 0x2818(r3) @@ -92257,7 +92257,7 @@ lbl_800EE8FC: /* 800EE8FC 000EB83C 38 60 00 01 */ li r3, 1 lbl_800EE900: /* 800EE900 000EB840 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EE904 000EB844 48 27 39 21 */ bl func_80362224 +/* 800EE904 000EB844 48 27 39 21 */ bl _restgpr_28 /* 800EE908 000EB848 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EE90C 000EB84C 7C 08 03 A6 */ mtlr r0 /* 800EE910 000EB850 38 21 00 20 */ addi r1, r1, 0x20 @@ -92400,7 +92400,7 @@ daAlink_c_NS_setBaseHorseAnimeFrame: /* 800EEAF4 000EBA34 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800EEAF8 000EBA38 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800EEAFC 000EBA3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EEB00 000EBA40 48 27 36 D9 */ bl func_803621D8 +/* 800EEB00 000EBA40 48 27 36 D9 */ bl _savegpr_28 /* 800EEB04 000EBA44 7C 7D 1B 78 */ mr r29, r3 /* 800EEB08 000EBA48 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 800EEB0C 000EBA4C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l @@ -92507,7 +92507,7 @@ lbl_800EEC60: /* 800EEC78 000EBBB8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800EEC7C 000EBBBC CB E1 00 20 */ lfd f31, 0x20(r1) /* 800EEC80 000EBBC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EEC84 000EBBC4 48 27 35 A1 */ bl func_80362224 +/* 800EEC84 000EBBC4 48 27 35 A1 */ bl _restgpr_28 /* 800EEC88 000EBBC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800EEC8C 000EBBCC 7C 08 03 A6 */ mtlr r0 /* 800EEC90 000EBBD0 38 21 00 30 */ addi r1, r1, 0x30 @@ -93178,7 +93178,7 @@ daAlink_c_NS_checkHorseGetOff: /* 800EF59C 000EC4DC 7C 08 02 A6 */ mflr r0 /* 800EF5A0 000EC4E0 90 01 00 24 */ stw r0, 0x24(r1) /* 800EF5A4 000EC4E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF5A8 000EC4E8 48 27 2C 31 */ bl func_803621D8 +/* 800EF5A8 000EC4E8 48 27 2C 31 */ bl _savegpr_28 /* 800EF5AC 000EC4EC 7C 7C 1B 78 */ mr r28, r3 /* 800EF5B0 000EC4F0 3B E0 00 01 */ li r31, 1 /* 800EF5B4 000EC4F4 3B A0 00 00 */ li r29, 0 @@ -93244,7 +93244,7 @@ lbl_800EF688: lbl_800EF694: /* 800EF694 000EC5D4 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 800EF698 000EC5D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF69C 000EC5DC 48 27 2B 89 */ bl func_80362224 +/* 800EF69C 000EC5DC 48 27 2B 89 */ bl _restgpr_28 /* 800EF6A0 000EC5E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EF6A4 000EC5E4 7C 08 03 A6 */ mtlr r0 /* 800EF6A8 000EC5E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -93256,7 +93256,7 @@ daAlink_c_NS_checkHorseGetOffAndSetDoStatus: /* 800EF6B4 000EC5F4 7C 08 02 A6 */ mflr r0 /* 800EF6B8 000EC5F8 90 01 00 24 */ stw r0, 0x24(r1) /* 800EF6BC 000EC5FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF6C0 000EC600 48 27 2B 19 */ bl func_803621D8 +/* 800EF6C0 000EC600 48 27 2B 19 */ bl _savegpr_28 /* 800EF6C4 000EC604 7C 7E 1B 78 */ mr r30, r3 /* 800EF6C8 000EC608 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 800EF6CC 000EC60C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l @@ -93373,7 +93373,7 @@ lbl_800EF85C: lbl_800EF868: /* 800EF868 000EC7A8 7F E3 FB 78 */ mr r3, r31 /* 800EF86C 000EC7AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF870 000EC7B0 48 27 29 B5 */ bl func_80362224 +/* 800EF870 000EC7B0 48 27 29 B5 */ bl _restgpr_28 /* 800EF874 000EC7B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EF878 000EC7B8 7C 08 03 A6 */ mtlr r0 /* 800EF87C 000EC7BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -93743,7 +93743,7 @@ lbl_800EFD14: /* 800EFDC8 000ECD08 7C 08 02 A6 */ mflr r0 /* 800EFDCC 000ECD0C 90 01 00 34 */ stw r0, 0x34(r1) /* 800EFDD0 000ECD10 39 61 00 30 */ addi r11, r1, 0x30 -/* 800EFDD4 000ECD14 48 27 24 05 */ bl func_803621D8 +/* 800EFDD4 000ECD14 48 27 24 05 */ bl _savegpr_28 /* 800EFDD8 000ECD18 7C 7C 1B 78 */ mr r28, r3 /* 800EFDDC 000ECD1C 3B FC 1F D0 */ addi r31, r28, 0x1fd0 /* 800EFDE0 000ECD20 83 A3 28 18 */ lwz r29, 0x2818(r3) @@ -94127,7 +94127,7 @@ lbl_800F0370: /* 800F0370 000ED2B0 38 60 00 01 */ li r3, 1 lbl_800F0374: /* 800F0374 000ED2B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F0378 000ED2B8 48 27 1E AD */ bl func_80362224 +/* 800F0378 000ED2B8 48 27 1E AD */ bl _restgpr_28 /* 800F037C 000ED2BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F0380 000ED2C0 7C 08 03 A6 */ mtlr r0 /* 800F0384 000ED2C4 38 21 00 30 */ addi r1, r1, 0x30 @@ -95219,7 +95219,7 @@ lbl_800F12CC: /* 800F12FC 000EE23C 7C 08 02 A6 */ mflr r0 /* 800F1300 000EE240 90 01 00 24 */ stw r0, 0x24(r1) /* 800F1304 000EE244 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F1308 000EE248 48 27 0E D1 */ bl func_803621D8 +/* 800F1308 000EE248 48 27 0E D1 */ bl _savegpr_28 /* 800F130C 000EE24C 7C 7C 1B 78 */ mr r28, r3 /* 800F1310 000EE250 80 03 05 80 */ lwz r0, 0x580(r3) /* 800F1314 000EE254 64 00 04 00 */ oris r0, r0, 0x400 @@ -95272,7 +95272,7 @@ lbl_800F13BC: /* 800F13BC 000EE2FC 38 60 00 01 */ li r3, 1 lbl_800F13C0: /* 800F13C0 000EE300 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F13C4 000EE304 48 27 0E 61 */ bl func_80362224 +/* 800F13C4 000EE304 48 27 0E 61 */ bl _restgpr_28 /* 800F13C8 000EE308 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F13CC 000EE30C 7C 08 03 A6 */ mtlr r0 /* 800F13D0 000EE310 38 21 00 20 */ addi r1, r1, 0x20 @@ -95284,7 +95284,7 @@ daAlink_c_NS_procHorseCutInit: /* 800F13DC 000EE31C 7C 08 02 A6 */ mflr r0 /* 800F13E0 000EE320 90 01 00 24 */ stw r0, 0x24(r1) /* 800F13E4 000EE324 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F13E8 000EE328 48 27 0D F1 */ bl func_803621D8 +/* 800F13E8 000EE328 48 27 0D F1 */ bl _savegpr_28 /* 800F13EC 000EE32C 7C 7E 1B 78 */ mr r30, r3 /* 800F13F0 000EE330 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800F13F4 000EE334 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -95465,7 +95465,7 @@ lbl_800F1628: /* 800F1668 000EE5A8 90 1E 05 74 */ stw r0, 0x574(r30) /* 800F166C 000EE5AC 38 60 00 01 */ li r3, 1 /* 800F1670 000EE5B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F1674 000EE5B4 48 27 0B B1 */ bl func_80362224 +/* 800F1674 000EE5B4 48 27 0B B1 */ bl _restgpr_28 /* 800F1678 000EE5B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F167C 000EE5BC 7C 08 03 A6 */ mtlr r0 /* 800F1680 000EE5C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -98316,7 +98316,7 @@ lbl_800F3E9C: /* 800F3EBC 000F0DFC 7C 08 02 A6 */ mflr r0 /* 800F3EC0 000F0E00 90 01 00 24 */ stw r0, 0x24(r1) /* 800F3EC4 000F0E04 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3EC8 000F0E08 48 26 E3 11 */ bl func_803621D8 +/* 800F3EC8 000F0E08 48 26 E3 11 */ bl _savegpr_28 /* 800F3ECC 000F0E0C 7C 7C 1B 78 */ mr r28, r3 /* 800F3ED0 000F0E10 7C 9D 23 78 */ mr r29, r4 /* 800F3ED4 000F0E14 3B C0 00 00 */ li r30, 0 @@ -98341,7 +98341,7 @@ lbl_800F3F10: lbl_800F3F1C: /* 800F3F1C 000F0E5C 57 C3 06 3E */ clrlwi r3, r30, 0x18 /* 800F3F20 000F0E60 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3F24 000F0E64 48 26 E3 01 */ bl func_80362224 +/* 800F3F24 000F0E64 48 26 E3 01 */ bl _restgpr_28 /* 800F3F28 000F0E68 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F3F2C 000F0E6C 7C 08 03 A6 */ mtlr r0 /* 800F3F30 000F0E70 38 21 00 20 */ addi r1, r1, 0x20 @@ -99671,7 +99671,7 @@ daAlink_c_NS_procCanoeWaitInit: /* 800F51F0 000F2130 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800F51F4 000F2134 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 800F51F8 000F2138 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F51FC 000F213C 48 26 CF D9 */ bl func_803621D4 +/* 800F51FC 000F213C 48 26 CF D9 */ bl _savegpr_27 /* 800F5200 000F2140 7C 7C 1B 78 */ mr r28, r3 /* 800F5204 000F2144 7C 9D 23 78 */ mr r29, r4 /* 800F5208 000F2148 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) @@ -99817,7 +99817,7 @@ lbl_800F540C: /* 800F540C 000F234C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 800F5410 000F2350 CB E1 00 30 */ lfd f31, 0x30(r1) /* 800F5414 000F2354 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F5418 000F2358 48 26 CE 09 */ bl func_80362220 +/* 800F5418 000F2358 48 26 CE 09 */ bl _restgpr_27 /* 800F541C 000F235C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800F5420 000F2360 7C 08 03 A6 */ mtlr r0 /* 800F5424 000F2364 38 21 00 40 */ addi r1, r1, 0x40 @@ -100040,7 +100040,7 @@ daAlink_c_NS_procCanoeRowInit: /* 800F5728 000F2668 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800F572C 000F266C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800F5730 000F2670 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F5734 000F2674 48 26 CA A1 */ bl func_803621D4 +/* 800F5734 000F2674 48 26 CA A1 */ bl _savegpr_27 /* 800F5738 000F2678 7C 7C 1B 78 */ mr r28, r3 /* 800F573C 000F267C 7C 9D 23 79 */ or. r29, r4, r4 /* 800F5740 000F2680 83 C3 28 18 */ lwz r30, 0x2818(r3) @@ -100249,7 +100249,7 @@ lbl_800F59FC: /* 800F59FC 000F293C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800F5A00 000F2940 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800F5A04 000F2944 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F5A08 000F2948 48 26 C8 19 */ bl func_80362220 +/* 800F5A08 000F2948 48 26 C8 19 */ bl _restgpr_27 /* 800F5A0C 000F294C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F5A10 000F2950 7C 08 03 A6 */ mtlr r0 /* 800F5A14 000F2954 38 21 00 30 */ addi r1, r1, 0x30 @@ -101541,7 +101541,7 @@ daAlink_c_NS_procCanoeSubjectivityInit: /* 800F6C34 000F3B74 7C 08 02 A6 */ mflr r0 /* 800F6C38 000F3B78 90 01 00 24 */ stw r0, 0x24(r1) /* 800F6C3C 000F3B7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F6C40 000F3B80 48 26 B5 99 */ bl func_803621D8 +/* 800F6C40 000F3B80 48 26 B5 99 */ bl _savegpr_28 /* 800F6C44 000F3B84 7C 7C 1B 78 */ mr r28, r3 /* 800F6C48 000F3B88 80 03 05 80 */ lwz r0, 0x580(r3) /* 800F6C4C 000F3B8C 64 00 04 00 */ oris r0, r0, 0x400 @@ -101594,7 +101594,7 @@ lbl_800F6CF4: /* 800F6CF4 000F3C34 38 60 00 01 */ li r3, 1 lbl_800F6CF8: /* 800F6CF8 000F3C38 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F6CFC 000F3C3C 48 26 B5 29 */ bl func_80362224 +/* 800F6CFC 000F3C3C 48 26 B5 29 */ bl _restgpr_28 /* 800F6D00 000F3C40 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F6D04 000F3C44 7C 08 03 A6 */ mtlr r0 /* 800F6D08 000F3C48 38 21 00 20 */ addi r1, r1, 0x20 @@ -102629,7 +102629,7 @@ lbl_800F7B48: /* 800F7B50 000F4A90 38 63 00 9C */ addi r3, r3, 0x9c /* 800F7B54 000F4A94 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 800F7B58 000F4A98 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800F7B5C 000F4A9C 4B F3 BB 61 */ bl dSv_player_item_c_NS_setEquipBottleItemEmpty +/* 800F7B5C 000F4A9C 4B F3 BB 61 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc /* 800F7B60 000F4AA0 48 00 00 10 */ b lbl_800F7B70 lbl_800F7B64: /* 800F7B64 000F4AA4 A8 7E 30 0E */ lha r3, 0x300e(r30) @@ -102645,7 +102645,7 @@ lbl_800F7B70: /* 800F7B88 000F4AC8 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 800F7B8C 000F4ACC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 800F7B90 000F4AD0 54 A5 06 3E */ clrlwi r5, r5, 0x18 -/* 800F7B94 000F4AD4 4B F3 BA 05 */ bl dSv_player_item_c_NS_setEquipBottleItemIn +/* 800F7B94 000F4AD4 4B F3 BA 05 */ bl setEquipBottleItemIn__17dSv_player_item_cFUcUc /* 800F7B98 000F4AD8 A8 1E 30 1A */ lha r0, 0x301a(r30) /* 800F7B9C 000F4ADC 2C 00 00 76 */ cmpwi r0, 0x76 /* 800F7BA0 000F4AE0 40 82 00 10 */ bne lbl_800F7BB0 @@ -103373,7 +103373,7 @@ daAlink_c_NS_crawlBgCheck: /* 800F85C8 000F5508 90 01 00 54 */ stw r0, 0x54(r1) /* 800F85CC 000F550C DB E1 00 48 */ stfd f31, 0x48(r1) /* 800F85D0 000F5510 39 61 00 48 */ addi r11, r1, 0x48 -/* 800F85D4 000F5514 48 26 9C 05 */ bl func_803621D8 +/* 800F85D4 000F5514 48 26 9C 05 */ bl _savegpr_28 /* 800F85D8 000F5518 7C 7C 1B 78 */ mr r28, r3 /* 800F85DC 000F551C 7C 9F 23 78 */ mr r31, r4 /* 800F85E0 000F5520 7C BD 2B 78 */ mr r29, r5 @@ -103447,7 +103447,7 @@ lbl_800F86CC: lbl_800F86E4: /* 800F86E4 000F5624 CB E1 00 48 */ lfd f31, 0x48(r1) /* 800F86E8 000F5628 39 61 00 48 */ addi r11, r1, 0x48 -/* 800F86EC 000F562C 48 26 9B 39 */ bl func_80362224 +/* 800F86EC 000F562C 48 26 9B 39 */ bl _restgpr_28 /* 800F86F0 000F5630 80 01 00 54 */ lwz r0, 0x54(r1) /* 800F86F4 000F5634 7C 08 03 A6 */ mtlr r0 /* 800F86F8 000F5638 38 21 00 50 */ addi r1, r1, 0x50 @@ -103735,7 +103735,7 @@ daAlink_c_NS_checkCrawlInHoll: /* 800F8B04 000F5A44 7C 08 02 A6 */ mflr r0 /* 800F8B08 000F5A48 90 01 00 D4 */ stw r0, 0xd4(r1) /* 800F8B0C 000F5A4C 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 800F8B10 000F5A50 48 26 96 C9 */ bl func_803621D8 +/* 800F8B10 000F5A50 48 26 96 C9 */ bl _savegpr_28 /* 800F8B14 000F5A54 7C 7C 1B 78 */ mr r28, r3 /* 800F8B18 000F5A58 7C 9D 23 78 */ mr r29, r4 /* 800F8B1C 000F5A5C 7C BE 2B 78 */ mr r30, r5 @@ -103860,7 +103860,7 @@ lbl_800F8CE8: /* 800F8CE8 000F5C28 38 60 00 00 */ li r3, 0 lbl_800F8CEC: /* 800F8CEC 000F5C2C 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 800F8CF0 000F5C30 48 26 95 35 */ bl func_80362224 +/* 800F8CF0 000F5C30 48 26 95 35 */ bl _restgpr_28 /* 800F8CF4 000F5C34 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800F8CF8 000F5C38 7C 08 03 A6 */ mtlr r0 /* 800F8CFC 000F5C3C 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -104773,7 +104773,7 @@ daAlink_c_NS_procCrawlAutoMoveInit: /* 800F9A00 000F6940 7C 08 02 A6 */ mflr r0 /* 800F9A04 000F6944 90 01 00 24 */ stw r0, 0x24(r1) /* 800F9A08 000F6948 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F9A0C 000F694C 48 26 87 C9 */ bl func_803621D4 +/* 800F9A0C 000F694C 48 26 87 C9 */ bl _savegpr_27 /* 800F9A10 000F6950 7C 7B 1B 78 */ mr r27, r3 /* 800F9A14 000F6954 7C 9C 23 78 */ mr r28, r4 /* 800F9A18 000F6958 7C BD 2B 78 */ mr r29, r5 @@ -104813,7 +104813,7 @@ daAlink_c_NS_procCrawlAutoMoveInit: lbl_800F9AA0: /* 800F9AA0 000F69E0 38 60 00 01 */ li r3, 1 /* 800F9AA4 000F69E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F9AA8 000F69E8 48 26 87 79 */ bl func_80362220 +/* 800F9AA8 000F69E8 48 26 87 79 */ bl _restgpr_27 /* 800F9AAC 000F69EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F9AB0 000F69F0 7C 08 03 A6 */ mtlr r0 /* 800F9AB4 000F69F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -104822,7 +104822,7 @@ lbl_800F9AA0: /* 800F9AC0 000F6A00 7C 08 02 A6 */ mflr r0 /* 800F9AC4 000F6A04 90 01 00 34 */ stw r0, 0x34(r1) /* 800F9AC8 000F6A08 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F9ACC 000F6A0C 48 26 87 0D */ bl func_803621D8 +/* 800F9ACC 000F6A0C 48 26 87 0D */ bl _savegpr_28 /* 800F9AD0 000F6A10 7C 7F 1B 78 */ mr r31, r3 /* 800F9AD4 000F6A14 38 00 00 0C */ li r0, 0xc /* 800F9AD8 000F6A18 98 03 2F 99 */ stb r0, 0x2f99(r3) @@ -105006,7 +105006,7 @@ lbl_800F9D58: /* 800F9D5C 000F6C9C B0 1F 31 0C */ sth r0, 0x310c(r31) /* 800F9D60 000F6CA0 38 60 00 01 */ li r3, 1 /* 800F9D64 000F6CA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F9D68 000F6CA8 48 26 84 BD */ bl func_80362224 +/* 800F9D68 000F6CA8 48 26 84 BD */ bl _restgpr_28 /* 800F9D6C 000F6CAC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F9D70 000F6CB0 7C 08 03 A6 */ mtlr r0 /* 800F9D74 000F6CB4 38 21 00 30 */ addi r1, r1, 0x30 @@ -105020,7 +105020,7 @@ daAlink_c_NS_procCrawlEndInit: /* 800F9D88 000F6CC8 DB E1 00 50 */ stfd f31, 0x50(r1) /* 800F9D8C 000F6CCC F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 800F9D90 000F6CD0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800F9D94 000F6CD4 48 26 84 41 */ bl func_803621D4 +/* 800F9D94 000F6CD4 48 26 84 41 */ bl _savegpr_27 /* 800F9D98 000F6CD8 7C 7F 1B 78 */ mr r31, r3 /* 800F9D9C 000F6CDC 7C 9B 23 78 */ mr r27, r4 /* 800F9DA0 000F6CE0 7C BC 2B 78 */ mr r28, r5 @@ -105125,7 +105125,7 @@ lbl_800F9EBC: /* 800F9F10 000F6E50 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 800F9F14 000F6E54 CB E1 00 50 */ lfd f31, 0x50(r1) /* 800F9F18 000F6E58 39 61 00 50 */ addi r11, r1, 0x50 -/* 800F9F1C 000F6E5C 48 26 83 05 */ bl func_80362220 +/* 800F9F1C 000F6E5C 48 26 83 05 */ bl _restgpr_27 /* 800F9F20 000F6E60 80 01 00 64 */ lwz r0, 0x64(r1) /* 800F9F24 000F6E64 7C 08 03 A6 */ mtlr r0 /* 800F9F28 000F6E68 38 21 00 60 */ addi r1, r1, 0x60 @@ -105417,7 +105417,7 @@ daAlink_c_NS_changeHangMoveProc: /* 800FA33C 000F727C 7C 08 02 A6 */ mflr r0 /* 800FA340 000F7280 90 01 00 64 */ stw r0, 0x64(r1) /* 800FA344 000F7284 39 61 00 60 */ addi r11, r1, 0x60 -/* 800FA348 000F7288 48 26 7E 91 */ bl func_803621D8 +/* 800FA348 000F7288 48 26 7E 91 */ bl _savegpr_28 /* 800FA34C 000F728C 7C 7E 1B 78 */ mr r30, r3 /* 800FA350 000F7290 7C 9C 23 78 */ mr r28, r4 /* 800FA354 000F7294 80 03 19 9C */ lwz r0, 0x199c(r3) @@ -105584,7 +105584,7 @@ lbl_800FA58C: /* 800FA5AC 000F74EC 90 01 00 48 */ stw r0, 0x48(r1) lbl_800FA5B0: /* 800FA5B0 000F74F0 39 61 00 60 */ addi r11, r1, 0x60 -/* 800FA5B4 000F74F4 48 26 7C 71 */ bl func_80362224 +/* 800FA5B4 000F74F4 48 26 7C 71 */ bl _restgpr_28 /* 800FA5B8 000F74F8 80 01 00 64 */ lwz r0, 0x64(r1) /* 800FA5BC 000F74FC 7C 08 03 A6 */ mtlr r0 /* 800FA5C0 000F7500 38 21 00 60 */ addi r1, r1, 0x60 @@ -105783,7 +105783,7 @@ daAlink_c_NS_checkHangStartSideWall: /* 800FA878 000F77B8 DB A1 00 50 */ stfd f29, 0x50(r1) /* 800FA87C 000F77BC F3 A1 00 58 */ psq_st f29, 88(r1), 0, qr0 /* 800FA880 000F77C0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800FA884 000F77C4 48 26 79 55 */ bl func_803621D8 +/* 800FA884 000F77C4 48 26 79 55 */ bl _savegpr_28 /* 800FA888 000F77C8 7C 7F 1B 78 */ mr r31, r3 /* 800FA88C 000F77CC 7C 83 07 34 */ extsh r3, r4 /* 800FA890 000F77D0 38 03 C0 00 */ addi r0, r3, -16384 @@ -105910,7 +105910,7 @@ lbl_800FAA40: /* 800FAA5C 000F799C E3 A1 00 58 */ psq_l f29, 88(r1), 0, qr0 /* 800FAA60 000F79A0 CB A1 00 50 */ lfd f29, 0x50(r1) /* 800FAA64 000F79A4 39 61 00 50 */ addi r11, r1, 0x50 -/* 800FAA68 000F79A8 48 26 77 BD */ bl func_80362224 +/* 800FAA68 000F79A8 48 26 77 BD */ bl _restgpr_28 /* 800FAA6C 000F79AC 80 01 00 84 */ lwz r0, 0x84(r1) /* 800FAA70 000F79B0 7C 08 03 A6 */ mtlr r0 /* 800FAA74 000F79B4 38 21 00 80 */ addi r1, r1, 0x80 @@ -108005,7 +108005,7 @@ lbl_800FC7E0: /* 800FC87C 000F97BC DB E1 00 50 */ stfd f31, 0x50(r1) /* 800FC880 000F97C0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 800FC884 000F97C4 39 61 00 50 */ addi r11, r1, 0x50 -/* 800FC888 000F97C8 48 26 59 51 */ bl func_803621D8 +/* 800FC888 000F97C8 48 26 59 51 */ bl _savegpr_28 /* 800FC88C 000F97CC 7C 7D 1B 78 */ mr r29, r3 /* 800FC890 000F97D0 83 E3 28 10 */ lwz r31, 0x2810(r3) /* 800FC894 000F97D4 80 03 32 CC */ lwz r0, 0x32cc(r3) @@ -108487,7 +108487,7 @@ lbl_800FCF38: /* 800FCF38 000F9E78 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 800FCF3C 000F9E7C CB E1 00 50 */ lfd f31, 0x50(r1) /* 800FCF40 000F9E80 39 61 00 50 */ addi r11, r1, 0x50 -/* 800FCF44 000F9E84 48 26 52 E1 */ bl func_80362224 +/* 800FCF44 000F9E84 48 26 52 E1 */ bl _restgpr_28 /* 800FCF48 000F9E88 80 01 00 64 */ lwz r0, 0x64(r1) /* 800FCF4C 000F9E8C 7C 08 03 A6 */ mtlr r0 /* 800FCF50 000F9E90 38 21 00 60 */ addi r1, r1, 0x60 @@ -108740,7 +108740,7 @@ daAlink_c_NS_changeLadderMoveProc: /* 800FD2B0 000FA1F0 7C 08 02 A6 */ mflr r0 /* 800FD2B4 000FA1F4 90 01 00 34 */ stw r0, 0x34(r1) /* 800FD2B8 000FA1F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FD2BC 000FA1FC 48 26 4F 1D */ bl func_803621D8 +/* 800FD2BC 000FA1FC 48 26 4F 1D */ bl _savegpr_28 /* 800FD2C0 000FA200 7C 7C 1B 78 */ mr r28, r3 /* 800FD2C4 000FA204 7C 9D 23 78 */ mr r29, r4 /* 800FD2C8 000FA208 38 7C 04 D0 */ addi r3, r28, 0x4d0 @@ -108867,7 +108867,7 @@ lbl_800FD48C: /* 800FD48C 000FA3CC 38 60 00 00 */ li r3, 0 lbl_800FD490: /* 800FD490 000FA3D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FD494 000FA3D4 48 26 4D 91 */ bl func_80362224 +/* 800FD494 000FA3D4 48 26 4D 91 */ bl _restgpr_28 /* 800FD498 000FA3D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800FD49C 000FA3DC 7C 08 03 A6 */ mtlr r0 /* 800FD4A0 000FA3E0 38 21 00 30 */ addi r1, r1, 0x30 @@ -109501,7 +109501,7 @@ daAlink_c_NS_procLadderMoveInit: /* 800FDD9C 000FACDC DB E1 00 20 */ stfd f31, 0x20(r1) /* 800FDDA0 000FACE0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800FDDA4 000FACE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FDDA8 000FACE8 48 26 44 2D */ bl func_803621D4 +/* 800FDDA8 000FACE8 48 26 44 2D */ bl _savegpr_27 /* 800FDDAC 000FACEC 7C 7B 1B 78 */ mr r27, r3 /* 800FDDB0 000FACF0 7C 9C 23 78 */ mr r28, r4 /* 800FDDB4 000FACF4 7C BD 2B 78 */ mr r29, r5 @@ -109613,7 +109613,7 @@ lbl_800FDEE0: /* 800FDF30 000FAE70 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800FDF34 000FAE74 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800FDF38 000FAE78 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FDF3C 000FAE7C 48 26 42 E5 */ bl func_80362220 +/* 800FDF3C 000FAE7C 48 26 42 E5 */ bl _restgpr_27 /* 800FDF40 000FAE80 80 01 00 34 */ lwz r0, 0x34(r1) /* 800FDF44 000FAE84 7C 08 03 A6 */ mtlr r0 /* 800FDF48 000FAE88 38 21 00 30 */ addi r1, r1, 0x30 @@ -109978,7 +109978,7 @@ daAlink_c_NS_changeClimbMoveProc: /* 800FE43C 000FB37C 7C 08 02 A6 */ mflr r0 /* 800FE440 000FB380 90 01 00 34 */ stw r0, 0x34(r1) /* 800FE444 000FB384 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FE448 000FB388 48 26 3D 91 */ bl func_803621D8 +/* 800FE448 000FB388 48 26 3D 91 */ bl _savegpr_28 /* 800FE44C 000FB38C 7C 7C 1B 78 */ mr r28, r3 /* 800FE450 000FB390 7C 9D 23 78 */ mr r29, r4 /* 800FE454 000FB394 AB C3 30 8C */ lha r30, 0x308c(r3) @@ -110064,7 +110064,7 @@ lbl_800FE578: lbl_800FE584: /* 800FE584 000FB4C4 B3 DC 30 8C */ sth r30, 0x308c(r28) /* 800FE588 000FB4C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FE58C 000FB4CC 48 26 3C 99 */ bl func_80362224 +/* 800FE58C 000FB4CC 48 26 3C 99 */ bl _restgpr_28 /* 800FE590 000FB4D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 800FE594 000FB4D4 7C 08 03 A6 */ mtlr r0 /* 800FE598 000FB4D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -110623,7 +110623,7 @@ daAlink_c_NS_checkClimbGround: /* 800FED7C 000FBCBC DB 61 00 20 */ stfd f27, 0x20(r1) /* 800FED80 000FBCC0 F3 61 00 28 */ psq_st f27, 40(r1), 0, qr0 /* 800FED84 000FBCC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FED88 000FBCC8 48 26 34 51 */ bl func_803621D8 +/* 800FED88 000FBCC8 48 26 34 51 */ bl _savegpr_28 /* 800FED8C 000FBCCC 7C 7C 1B 78 */ mr r28, r3 /* 800FED90 000FBCD0 7C 9D 23 78 */ mr r29, r4 /* 800FED94 000FBCD4 FF E0 08 90 */ fmr f31, f1 @@ -110699,7 +110699,7 @@ lbl_800FEE80: /* 800FEEA0 000FBDE0 E3 61 00 28 */ psq_l f27, 40(r1), 0, qr0 /* 800FEEA4 000FBDE4 CB 61 00 20 */ lfd f27, 0x20(r1) /* 800FEEA8 000FBDE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FEEAC 000FBDEC 48 26 33 79 */ bl func_80362224 +/* 800FEEAC 000FBDEC 48 26 33 79 */ bl _restgpr_28 /* 800FEEB0 000FBDF0 80 01 00 74 */ lwz r0, 0x74(r1) /* 800FEEB4 000FBDF4 7C 08 03 A6 */ mtlr r0 /* 800FEEB8 000FBDF8 38 21 00 70 */ addi r1, r1, 0x70 @@ -112610,7 +112610,7 @@ daAlink_c_NS_procRoofHangStartInit: /* 80100A14 000FD954 7C 08 02 A6 */ mflr r0 /* 80100A18 000FD958 90 01 00 24 */ stw r0, 0x24(r1) /* 80100A1C 000FD95C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80100A20 000FD960 48 26 17 B9 */ bl func_803621D8 +/* 80100A20 000FD960 48 26 17 B9 */ bl _savegpr_28 /* 80100A24 000FD964 7C 7C 1B 78 */ mr r28, r3 /* 80100A28 000FD968 7C 9D 23 78 */ mr r29, r4 /* 80100A2C 000FD96C 7C BE 2B 78 */ mr r30, r5 @@ -112654,7 +112654,7 @@ daAlink_c_NS_procRoofHangStartInit: /* 80100AC4 000FDA04 B3 FC 30 08 */ sth r31, 0x3008(r28) /* 80100AC8 000FDA08 38 60 00 01 */ li r3, 1 /* 80100ACC 000FDA0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80100AD0 000FDA10 48 26 17 55 */ bl func_80362224 +/* 80100AD0 000FDA10 48 26 17 55 */ bl _restgpr_28 /* 80100AD4 000FDA14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80100AD8 000FDA18 7C 08 03 A6 */ mtlr r0 /* 80100ADC 000FDA1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -112948,7 +112948,7 @@ lbl_80100E90: /* 80100EF8 000FDE38 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80100EFC 000FDE3C F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 80100F00 000FDE40 39 61 00 50 */ addi r11, r1, 0x50 -/* 80100F04 000FDE44 48 26 12 D5 */ bl func_803621D8 +/* 80100F04 000FDE44 48 26 12 D5 */ bl _savegpr_28 /* 80100F08 000FDE48 7C 7E 1B 78 */ mr r30, r3 /* 80100F0C 000FDE4C 4B FF F8 65 */ bl daAlink_c_NS_commonRoofHangProc /* 80100F10 000FDE50 2C 03 00 00 */ cmpwi r3, 0 @@ -113155,7 +113155,7 @@ lbl_801011FC: /* 801011FC 000FE13C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 80101200 000FE140 CB E1 00 50 */ lfd f31, 0x50(r1) /* 80101204 000FE144 39 61 00 50 */ addi r11, r1, 0x50 -/* 80101208 000FE148 48 26 10 1D */ bl func_80362224 +/* 80101208 000FE148 48 26 10 1D */ bl _restgpr_28 /* 8010120C 000FE14C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80101210 000FE150 7C 08 03 A6 */ mtlr r0 /* 80101214 000FE154 38 21 00 60 */ addi r1, r1, 0x60 @@ -113994,7 +113994,7 @@ daAlink_c_NS_swimBgCheck: /* 80101D8C 000FECCC DB A1 00 A0 */ stfd f29, 0xa0(r1) /* 80101D90 000FECD0 F3 A1 00 A8 */ psq_st f29, 168(r1), 0, qr0 /* 80101D94 000FECD4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80101D98 000FECD8 48 26 04 3D */ bl func_803621D4 +/* 80101D98 000FECD8 48 26 04 3D */ bl _savegpr_27 /* 80101D9C 000FECDC 7C 7C 1B 78 */ mr r28, r3 /* 80101DA0 000FECE0 FF A0 08 90 */ fmr f29, f1 /* 80101DA4 000FECE4 80 03 05 74 */ lwz r0, 0x574(r3) @@ -114431,7 +114431,7 @@ lbl_801023B4: /* 801023C4 000FF304 E3 A1 00 A8 */ psq_l f29, 168(r1), 0, qr0 /* 801023C8 000FF308 CB A1 00 A0 */ lfd f29, 0xa0(r1) /* 801023CC 000FF30C 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 801023D0 000FF310 48 25 FE 51 */ bl func_80362220 +/* 801023D0 000FF310 48 25 FE 51 */ bl _restgpr_27 /* 801023D4 000FF314 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801023D8 000FF318 7C 08 03 A6 */ mtlr r0 /* 801023DC 000FF31C 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -116923,7 +116923,7 @@ daAlink_c_NS_procSwimMoveInit: /* 80104674 001015B4 7C 08 02 A6 */ mflr r0 /* 80104678 001015B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8010467C 001015BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80104680 001015C0 48 25 DB 59 */ bl func_803621D8 +/* 80104680 001015C0 48 25 DB 59 */ bl _savegpr_28 /* 80104684 001015C4 7C 7F 1B 78 */ mr r31, r3 /* 80104688 001015C8 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 8010468C 001015CC 54 1E 03 5A */ rlwinm r30, r0, 0, 0xd, 0xd @@ -117002,7 +117002,7 @@ lbl_80104778: /* 80104798 001016D8 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 8010479C 001016DC 38 60 00 01 */ li r3, 1 /* 801047A0 001016E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801047A4 001016E4 48 25 DA 81 */ bl func_80362224 +/* 801047A4 001016E4 48 25 DA 81 */ bl _restgpr_28 /* 801047A8 001016E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801047AC 001016EC 7C 08 03 A6 */ mtlr r0 /* 801047B0 001016F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -117714,7 +117714,7 @@ daAlink_c_NS_procSwimDamageInit: /* 801051A8 001020E8 DB E1 00 60 */ stfd f31, 0x60(r1) /* 801051AC 001020EC F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 801051B0 001020F0 39 61 00 60 */ addi r11, r1, 0x60 -/* 801051B4 001020F4 48 25 D0 21 */ bl func_803621D4 +/* 801051B4 001020F4 48 25 D0 21 */ bl _savegpr_27 /* 801051B8 001020F8 7C 7D 1B 78 */ mr r29, r3 /* 801051BC 001020FC 7C 9B 23 78 */ mr r27, r4 /* 801051C0 00102100 3C 80 00 02 */ lis r4, 0x00020014@ha @@ -118088,7 +118088,7 @@ lbl_80105708: /* 80105708 00102648 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8010570C 0010264C CB E1 00 60 */ lfd f31, 0x60(r1) /* 80105710 00102650 39 61 00 60 */ addi r11, r1, 0x60 -/* 80105714 00102654 48 25 CB 0D */ bl func_80362220 +/* 80105714 00102654 48 25 CB 0D */ bl _restgpr_27 /* 80105718 00102658 80 01 00 74 */ lwz r0, 0x74(r1) /* 8010571C 0010265C 7C 08 03 A6 */ mtlr r0 /* 80105720 00102660 38 21 00 70 */ addi r1, r1, 0x70 @@ -121231,7 +121231,7 @@ daAlink_c_NS_hookshotAtHitCallBack: /* 801083CC 0010530C 7C 08 02 A6 */ mflr r0 /* 801083D0 00105310 90 01 00 24 */ stw r0, 0x24(r1) /* 801083D4 00105314 39 61 00 20 */ addi r11, r1, 0x20 -/* 801083D8 00105318 48 25 9E 01 */ bl func_803621D8 +/* 801083D8 00105318 48 25 9E 01 */ bl _savegpr_28 /* 801083DC 0010531C 7C 7E 1B 78 */ mr r30, r3 /* 801083E0 00105320 7C 9D 23 78 */ mr r29, r4 /* 801083E4 00105324 7C BF 2B 79 */ or. r31, r5, r5 @@ -121352,7 +121352,7 @@ lbl_8010857C: /* 80108580 001054C0 D0 1E 34 94 */ stfs f0, 0x3494(r30) lbl_80108584: /* 80108584 001054C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80108588 001054C8 48 25 9C 9D */ bl func_80362224 +/* 80108588 001054C8 48 25 9C 9D */ bl _restgpr_28 /* 8010858C 001054CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80108590 001054D0 7C 08 03 A6 */ mtlr r0 /* 80108594 001054D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -126082,7 +126082,7 @@ daAlink_c_NS_procHookshotRoofWaitInit: /* 8010C834 00109774 7C 08 02 A6 */ mflr r0 /* 8010C838 00109778 90 01 00 44 */ stw r0, 0x44(r1) /* 8010C83C 0010977C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8010C840 00109780 48 25 59 99 */ bl func_803621D8 +/* 8010C840 00109780 48 25 59 99 */ bl _savegpr_28 /* 8010C844 00109784 7C 7C 1B 78 */ mr r28, r3 /* 8010C848 00109788 7C 9D 23 78 */ mr r29, r4 /* 8010C84C 0010978C 7C BE 2B 78 */ mr r30, r5 @@ -126191,7 +126191,7 @@ lbl_8010C9B0: /* 8010C9D4 00109914 98 1C 08 28 */ stb r0, 0x828(r28) /* 8010C9D8 00109918 38 60 00 01 */ li r3, 1 /* 8010C9DC 0010991C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8010C9E0 00109920 48 25 58 45 */ bl func_80362224 +/* 8010C9E0 00109920 48 25 58 45 */ bl _restgpr_28 /* 8010C9E4 00109924 80 01 00 44 */ lwz r0, 0x44(r1) /* 8010C9E8 00109928 7C 08 03 A6 */ mtlr r0 /* 8010C9EC 0010992C 38 21 00 40 */ addi r1, r1, 0x40 @@ -126438,7 +126438,7 @@ lbl_8010CCBC: /* 8010CD64 00109CA4 7C 08 02 A6 */ mflr r0 /* 8010CD68 00109CA8 90 01 00 24 */ stw r0, 0x24(r1) /* 8010CD6C 00109CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010CD70 00109CB0 48 25 54 69 */ bl func_803621D8 +/* 8010CD70 00109CB0 48 25 54 69 */ bl _savegpr_28 /* 8010CD74 00109CB4 7C 7F 1B 78 */ mr r31, r3 /* 8010CD78 00109CB8 4B FF BC A1 */ bl daAlink_c_NS_checkHookshotWait /* 8010CD7C 00109CBC 2C 03 00 00 */ cmpwi r3, 0 @@ -126574,7 +126574,7 @@ lbl_8010CF50: /* 8010CF50 00109E90 38 60 00 01 */ li r3, 1 lbl_8010CF54: /* 8010CF54 00109E94 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010CF58 00109E98 48 25 52 CD */ bl func_80362224 +/* 8010CF58 00109E98 48 25 52 CD */ bl _restgpr_28 /* 8010CF5C 00109E9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010CF60 00109EA0 7C 08 03 A6 */ mtlr r0 /* 8010CF64 00109EA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -126727,7 +126727,7 @@ daAlink_c_NS_procHookshotWallWaitInit: /* 8010D178 0010A0B8 7C 08 02 A6 */ mflr r0 /* 8010D17C 0010A0BC 90 01 00 44 */ stw r0, 0x44(r1) /* 8010D180 0010A0C0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8010D184 0010A0C4 48 25 50 55 */ bl func_803621D8 +/* 8010D184 0010A0C4 48 25 50 55 */ bl _savegpr_28 /* 8010D188 0010A0C8 7C 7D 1B 78 */ mr r29, r3 /* 8010D18C 0010A0CC 7C 9E 23 78 */ mr r30, r4 /* 8010D190 0010A0D0 7C BC 2B 78 */ mr r28, r5 @@ -126857,7 +126857,7 @@ lbl_8010D36C: /* 8010D36C 0010A2AC B3 FD 30 12 */ sth r31, 0x3012(r29) /* 8010D370 0010A2B0 38 60 00 01 */ li r3, 1 /* 8010D374 0010A2B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8010D378 0010A2B8 48 25 4E AD */ bl func_80362224 +/* 8010D378 0010A2B8 48 25 4E AD */ bl _restgpr_28 /* 8010D37C 0010A2BC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8010D380 0010A2C0 7C 08 03 A6 */ mtlr r0 /* 8010D384 0010A2C4 38 21 00 40 */ addi r1, r1, 0x40 @@ -127692,7 +127692,7 @@ lbl_8010DF38: /* 8010DF50 0010AE90 7C 08 02 A6 */ mflr r0 /* 8010DF54 0010AE94 90 01 00 34 */ stw r0, 0x34(r1) /* 8010DF58 0010AE98 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010DF5C 0010AE9C 48 25 42 7D */ bl func_803621D8 +/* 8010DF5C 0010AE9C 48 25 42 7D */ bl _savegpr_28 /* 8010DF60 0010AEA0 7C 7E 1B 78 */ mr r30, r3 /* 8010DF64 0010AEA4 83 E3 28 18 */ lwz r31, 0x2818(r3) /* 8010DF68 0010AEA8 28 1F 00 00 */ cmplwi r31, 0 @@ -128044,7 +128044,7 @@ lbl_8010E460: /* 8010E470 0010B3B0 38 60 00 01 */ li r3, 1 lbl_8010E474: /* 8010E474 0010B3B4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010E478 0010B3B8 48 25 3D AD */ bl func_80362224 +/* 8010E478 0010B3B8 48 25 3D AD */ bl _restgpr_28 /* 8010E47C 0010B3BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8010E480 0010B3C0 7C 08 03 A6 */ mtlr r0 /* 8010E484 0010B3C4 38 21 00 30 */ addi r1, r1, 0x30 @@ -128151,7 +128151,7 @@ daAlink_c_NS_setBottleModel: /* 8010E5DC 0010B51C 7C 08 02 A6 */ mflr r0 /* 8010E5E0 0010B520 90 01 00 24 */ stw r0, 0x24(r1) /* 8010E5E4 0010B524 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010E5E8 0010B528 48 25 3B ED */ bl func_803621D4 +/* 8010E5E8 0010B528 48 25 3B ED */ bl _savegpr_27 /* 8010E5EC 0010B52C 7C 7C 1B 78 */ mr r28, r3 /* 8010E5F0 0010B530 7C 9D 23 78 */ mr r29, r4 /* 8010E5F4 0010B534 4B F9 56 99 */ bl daAlink_c_NS_setItemHeap @@ -128490,7 +128490,7 @@ lbl_8010EA88: /* 8010EAA8 0010B9E8 90 03 00 0C */ stw r0, 0xc(r3) lbl_8010EAAC: /* 8010EAAC 0010B9EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010EAB0 0010B9F0 48 25 37 71 */ bl func_80362220 +/* 8010EAB0 0010B9F0 48 25 37 71 */ bl _restgpr_27 /* 8010EAB4 0010B9F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010EAB8 0010B9F8 7C 08 03 A6 */ mtlr r0 /* 8010EABC 0010B9FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -128502,7 +128502,7 @@ daAlink_c_NS_commonBottleDrink: /* 8010EAC8 0010BA08 7C 08 02 A6 */ mflr r0 /* 8010EACC 0010BA0C 90 01 00 34 */ stw r0, 0x34(r1) /* 8010EAD0 0010BA10 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010EAD4 0010BA14 48 25 37 05 */ bl func_803621D8 +/* 8010EAD4 0010BA14 48 25 37 05 */ bl _savegpr_28 /* 8010EAD8 0010BA18 7C 7D 1B 78 */ mr r29, r3 /* 8010EADC 0010BA1C 7C 9E 23 78 */ mr r30, r4 /* 8010EAE0 0010BA20 80 63 07 18 */ lwz r3, 0x718(r3) @@ -128771,7 +128771,7 @@ lbl_8010EE88: /* 8010EEA8 0010BDE8 38 63 00 9C */ addi r3, r3, 0x9c /* 8010EEAC 0010BDEC 88 9D 2F 9C */ lbz r4, 0x2f9c(r29) /* 8010EEB0 0010BDF0 38 A0 00 65 */ li r5, 0x65 -/* 8010EEB4 0010BDF4 4B F2 46 E5 */ bl dSv_player_item_c_NS_setEquipBottleItemIn +/* 8010EEB4 0010BDF4 4B F2 46 E5 */ bl setEquipBottleItemIn__17dSv_player_item_cFUcUc /* 8010EEB8 0010BDF8 48 00 05 88 */ b lbl_8010F440 lbl_8010EEBC: /* 8010EEBC 0010BDFC A8 1D 30 0C */ lha r0, 0x300c(r29) @@ -128934,7 +128934,7 @@ lbl_8010F0D4: /* 8010F0F0 0010C030 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8010F0F4 0010C034 38 63 00 9C */ addi r3, r3, 0x9c /* 8010F0F8 0010C038 88 9D 2F 9C */ lbz r4, 0x2f9c(r29) -/* 8010F0FC 0010C03C 4B F2 45 C1 */ bl dSv_player_item_c_NS_setEquipBottleItemEmpty +/* 8010F0FC 0010C03C 4B F2 45 C1 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc lbl_8010F100: /* 8010F100 0010C040 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 8010F104 0010C044 28 00 00 77 */ cmplwi r0, 0x77 @@ -129165,7 +129165,7 @@ lbl_8010F440: /* 8010F440 0010C380 38 60 00 00 */ li r3, 0 lbl_8010F444: /* 8010F444 0010C384 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010F448 0010C388 48 25 2D DD */ bl func_80362224 +/* 8010F448 0010C388 48 25 2D DD */ bl _restgpr_28 /* 8010F44C 0010C38C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8010F450 0010C390 7C 08 03 A6 */ mtlr r0 /* 8010F454 0010C394 38 21 00 30 */ addi r1, r1, 0x30 @@ -129639,7 +129639,7 @@ lbl_8010FADC: /* 8010FB10 0010CA50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8010FB14 0010CA54 38 63 00 9C */ addi r3, r3, 0x9c /* 8010FB18 0010CA58 88 9E 2F 9C */ lbz r4, 0x2f9c(r30) -/* 8010FB1C 0010CA5C 4B F2 3B A1 */ bl dSv_player_item_c_NS_setEquipBottleItemEmpty +/* 8010FB1C 0010CA5C 4B F2 3B A1 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc /* 8010FB20 0010CA60 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 8010FB24 0010CA64 28 00 00 67 */ cmplwi r0, 0x67 /* 8010FB28 0010CA68 40 82 00 60 */ bne lbl_8010FB88 @@ -130022,7 +130022,7 @@ lbl_8011008C: /* 80110094 0010CFD4 38 63 00 9C */ addi r3, r3, 0x9c /* 80110098 0010CFD8 88 9E 2F 9C */ lbz r4, 0x2f9c(r30) /* 8011009C 0010CFDC 57 A5 06 3E */ clrlwi r5, r29, 0x18 -/* 801100A0 0010CFE0 4B F2 34 F9 */ bl dSv_player_item_c_NS_setEquipBottleItemIn +/* 801100A0 0010CFE0 4B F2 34 F9 */ bl setEquipBottleItemIn__17dSv_player_item_cFUcUc /* 801100A4 0010CFE4 57 A3 04 3E */ clrlwi r3, r29, 0x10 /* 801100A8 0010CFE8 28 03 00 76 */ cmplwi r3, 0x76 /* 801100AC 0010CFEC 40 82 00 18 */ bne lbl_801100C4 @@ -130469,7 +130469,7 @@ lbl_801106D0: /* 801106EC 0010D62C 7C 08 02 A6 */ mflr r0 /* 801106F0 0010D630 90 01 00 24 */ stw r0, 0x24(r1) /* 801106F4 0010D634 39 61 00 20 */ addi r11, r1, 0x20 -/* 801106F8 0010D638 48 25 1A E1 */ bl func_803621D8 +/* 801106F8 0010D638 48 25 1A E1 */ bl _savegpr_28 /* 801106FC 0010D63C 7C 7C 1B 78 */ mr r28, r3 /* 80110700 0010D640 7C 9D 23 78 */ mr r29, r4 /* 80110704 0010D644 7C BE 2B 78 */ mr r30, r5 @@ -130504,7 +130504,7 @@ lbl_80110760: /* 80110770 0010D6B0 90 1C 05 8C */ stw r0, 0x58c(r28) lbl_80110774: /* 80110774 0010D6B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80110778 0010D6B8 48 25 1A AD */ bl func_80362224 +/* 80110778 0010D6B8 48 25 1A AD */ bl _restgpr_28 /* 8011077C 0010D6BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80110780 0010D6C0 7C 08 03 A6 */ mtlr r0 /* 80110784 0010D6C4 38 21 00 20 */ addi r1, r1, 0x20 @@ -130624,7 +130624,7 @@ daAlink_c_NS_kandelaarModelCallBack: /* 801108F8 0010D838 DB E1 00 80 */ stfd f31, 0x80(r1) /* 801108FC 0010D83C F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 80110900 0010D840 39 61 00 80 */ addi r11, r1, 0x80 -/* 80110904 0010D844 48 25 18 D1 */ bl func_803621D4 +/* 80110904 0010D844 48 25 18 D1 */ bl _savegpr_27 /* 80110908 0010D848 7C 7F 1B 78 */ mr r31, r3 /* 8011090C 0010D84C 3C 60 80 43 */ lis r3, lbl_80434BE4@ha /* 80110910 0010D850 3B C3 4B E4 */ addi r30, r3, lbl_80434BE4@l @@ -130814,7 +130814,7 @@ lbl_80110BC8: /* 80110BCC 0010DB0C E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 80110BD0 0010DB10 CB E1 00 80 */ lfd f31, 0x80(r1) /* 80110BD4 0010DB14 39 61 00 80 */ addi r11, r1, 0x80 -/* 80110BD8 0010DB18 48 25 16 49 */ bl func_80362220 +/* 80110BD8 0010DB18 48 25 16 49 */ bl _restgpr_27 /* 80110BDC 0010DB1C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80110BE0 0010DB20 7C 08 03 A6 */ mtlr r0 /* 80110BE4 0010DB24 38 21 00 90 */ addi r1, r1, 0x90 @@ -131167,7 +131167,7 @@ daAlink_c_NS_commonKandelaarPour: /* 801110BC 0010DFFC 7C 08 02 A6 */ mflr r0 /* 801110C0 0010E000 90 01 00 24 */ stw r0, 0x24(r1) /* 801110C4 0010E004 39 61 00 20 */ addi r11, r1, 0x20 -/* 801110C8 0010E008 48 25 11 11 */ bl func_803621D8 +/* 801110C8 0010E008 48 25 11 11 */ bl _savegpr_28 /* 801110CC 0010E00C 7C 7E 1B 78 */ mr r30, r3 /* 801110D0 0010E010 7C 9F 23 78 */ mr r31, r4 /* 801110D4 0010E014 80 63 07 18 */ lwz r3, 0x718(r3) @@ -131293,7 +131293,7 @@ lbl_80111280: /* 80111290 0010E1D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80111294 0010E1D4 38 63 00 9C */ addi r3, r3, 0x9c /* 80111298 0010E1D8 88 9E 2F 9C */ lbz r4, 0x2f9c(r30) -/* 8011129C 0010E1DC 4B F2 24 21 */ bl dSv_player_item_c_NS_setEquipBottleItemEmpty +/* 8011129C 0010E1DC 4B F2 24 21 */ bl setEquipBottleItemEmpty__17dSv_player_item_cFUc /* 801112A0 0010E1E0 48 00 00 50 */ b lbl_801112F0 lbl_801112A4: /* 801112A4 0010E1E4 7F A3 EB 78 */ mr r3, r29 @@ -131320,7 +131320,7 @@ lbl_801112F0: /* 801112F0 0010E230 38 60 00 00 */ li r3, 0 lbl_801112F4: /* 801112F4 0010E234 39 61 00 20 */ addi r11, r1, 0x20 -/* 801112F8 0010E238 48 25 0F 2D */ bl func_80362224 +/* 801112F8 0010E238 48 25 0F 2D */ bl _restgpr_28 /* 801112FC 0010E23C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80111300 0010E240 7C 08 03 A6 */ mtlr r0 /* 80111304 0010E244 38 21 00 20 */ addi r1, r1, 0x20 @@ -136480,7 +136480,7 @@ daAlink_c_NS_createNpcTks: /* 80115D0C 00112C4C 7C 08 02 A6 */ mflr r0 /* 80115D10 00112C50 90 01 00 44 */ stw r0, 0x44(r1) /* 80115D14 00112C54 39 61 00 40 */ addi r11, r1, 0x40 -/* 80115D18 00112C58 48 24 C4 BD */ bl func_803621D4 +/* 80115D18 00112C58 48 24 C4 BD */ bl _savegpr_27 /* 80115D1C 00112C5C 7C 7C 1B 78 */ mr r28, r3 /* 80115D20 00112C60 7C 9D 23 78 */ mr r29, r4 /* 80115D24 00112C64 7C BE 2B 78 */ mr r30, r5 @@ -136587,7 +136587,7 @@ lbl_80115EA4: /* 80115EA4 00112DE4 38 60 00 00 */ li r3, 0 lbl_80115EA8: /* 80115EA8 00112DE8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80115EAC 00112DEC 48 24 C3 75 */ bl func_80362220 +/* 80115EAC 00112DEC 48 24 C3 75 */ bl _restgpr_27 /* 80115EB0 00112DF0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80115EB4 00112DF4 7C 08 03 A6 */ mtlr r0 /* 80115EB8 00112DF8 38 21 00 40 */ addi r1, r1, 0x40 @@ -136599,7 +136599,7 @@ daAlink_c_NS_checkDemoAction: /* 80115EC4 00112E04 7C 08 02 A6 */ mflr r0 /* 80115EC8 00112E08 90 01 00 24 */ stw r0, 0x24(r1) /* 80115ECC 00112E0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80115ED0 00112E10 48 24 C3 09 */ bl func_803621D8 +/* 80115ED0 00112E10 48 24 C3 09 */ bl _savegpr_28 /* 80115ED4 00112E14 7C 7D 1B 78 */ mr r29, r3 /* 80115ED8 00112E18 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80115EDC 00112E1C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -137705,7 +137705,7 @@ lbl_80116E44: /* 80116E44 00113D84 38 60 00 00 */ li r3, 0 lbl_80116E48: /* 80116E48 00113D88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80116E4C 00113D8C 48 24 B3 D9 */ bl func_80362224 +/* 80116E4C 00113D8C 48 24 B3 D9 */ bl _restgpr_28 /* 80116E50 00113D90 80 01 00 24 */ lwz r0, 0x24(r1) /* 80116E54 00113D94 7C 08 03 A6 */ mtlr r0 /* 80116E58 00113D98 38 21 00 20 */ addi r1, r1, 0x20 @@ -138240,7 +138240,7 @@ lbl_80117584: /* 801175A8 001144E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801175AC 001144EC 38 63 00 28 */ addi r3, r3, 0x28 /* 801175B0 001144F0 38 80 00 03 */ li r4, 3 -/* 801175B4 001144F4 4B F1 B6 39 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 801175B4 001144F4 4B F1 B6 39 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 801175B8 001144F8 2C 03 00 00 */ cmpwi r3, 0 /* 801175BC 001144FC 40 82 00 08 */ bne lbl_801175C4 /* 801175C0 00114500 3A E0 00 00 */ li r23, 0 @@ -138763,7 +138763,7 @@ daAlink_c_NS_endDemoMode: /* 80117CFC 00114C3C 7C 08 02 A6 */ mflr r0 /* 80117D00 00114C40 90 01 00 24 */ stw r0, 0x24(r1) /* 80117D04 00114C44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80117D08 00114C48 48 24 A4 CD */ bl func_803621D4 +/* 80117D08 00114C48 48 24 A4 CD */ bl _savegpr_27 /* 80117D0C 00114C4C 7C 7C 1B 78 */ mr r28, r3 /* 80117D10 00114C50 48 00 04 61 */ bl daAlink_c_NS_checkFlyAtnWait /* 80117D14 00114C54 7C 7E 1B 78 */ mr r30, r3 @@ -139034,7 +139034,7 @@ lbl_801180AC: /* 801180D0 00115010 4B FD D1 15 */ bl daAlink_c_NS_procCanoeWaitInit lbl_801180D4: /* 801180D4 00115014 39 61 00 20 */ addi r11, r1, 0x20 -/* 801180D8 00115018 48 24 A1 49 */ bl func_80362220 +/* 801180D8 00115018 48 24 A1 49 */ bl _restgpr_27 /* 801180DC 0011501C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801180E0 00115020 7C 08 03 A6 */ mtlr r0 /* 801180E4 00115024 38 21 00 20 */ addi r1, r1, 0x20 @@ -139836,7 +139836,7 @@ daAlink_c_NS_checkRestartDead: /* 80118BA0 00115AE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80118BA4 00115AE4 38 63 00 9C */ addi r3, r3, 0x9c /* 80118BA8 00115AE8 38 80 00 6C */ li r4, 0x6c -/* 80118BAC 00115AEC 4B F1 AB 35 */ bl dSv_player_item_c_NS_checkBottle +/* 80118BAC 00115AEC 4B F1 AB 35 */ bl checkBottle__17dSv_player_item_cFUc /* 80118BB0 00115AF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80118BB4 00115AF4 40 82 00 24 */ bne lbl_80118BD8 /* 80118BB8 00115AF8 80 1E 05 78 */ lwz r0, 0x578(r30) @@ -139911,7 +139911,7 @@ daAlink_c_NS_checkDeadHP: /* 80118C9C 00115BDC 7C 08 02 A6 */ mflr r0 /* 80118CA0 00115BE0 90 01 00 24 */ stw r0, 0x24(r1) /* 80118CA4 00115BE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80118CA8 00115BE8 48 24 95 31 */ bl func_803621D8 +/* 80118CA8 00115BE8 48 24 95 31 */ bl _savegpr_28 /* 80118CAC 00115BEC 7C 7C 1B 78 */ mr r28, r3 /* 80118CB0 00115BF0 3B E0 00 01 */ li r31, 1 /* 80118CB4 00115BF4 7F FE FB 78 */ mr r30, r31 @@ -139933,7 +139933,7 @@ lbl_80118CE4: /* 80118CF0 00115C30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80118CF4 00115C34 38 63 00 9C */ addi r3, r3, 0x9c /* 80118CF8 00115C38 38 80 00 6C */ li r4, 0x6c -/* 80118CFC 00115C3C 4B F1 A9 E5 */ bl dSv_player_item_c_NS_checkBottle +/* 80118CFC 00115C3C 4B F1 A9 E5 */ bl checkBottle__17dSv_player_item_cFUc /* 80118D00 00115C40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80118D04 00115C44 40 82 00 08 */ bne lbl_80118D0C /* 80118D08 00115C48 3B A0 00 01 */ li r29, 1 @@ -139964,7 +139964,7 @@ lbl_80118D54: lbl_80118D60: /* 80118D60 00115CA0 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 80118D64 00115CA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80118D68 00115CA8 48 24 94 BD */ bl func_80362224 +/* 80118D68 00115CA8 48 24 94 BD */ bl _restgpr_28 /* 80118D6C 00115CAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80118D70 00115CB0 7C 08 03 A6 */ mtlr r0 /* 80118D74 00115CB4 38 21 00 20 */ addi r1, r1, 0x20 @@ -140125,7 +140125,7 @@ lbl_80118F84: /* 80118FA4 00115EE4 3B C3 00 9C */ addi r30, r3, 0x9c /* 80118FA8 00115EE8 7F C3 F3 78 */ mr r3, r30 /* 80118FAC 00115EEC 38 80 00 6C */ li r4, 0x6c -/* 80118FB0 00115EF0 4B F1 A7 31 */ bl dSv_player_item_c_NS_checkBottle +/* 80118FB0 00115EF0 4B F1 A7 31 */ bl checkBottle__17dSv_player_item_cFUc /* 80118FB4 00115EF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80118FB8 00115EF8 41 82 00 24 */ beq lbl_80118FDC /* 80118FBC 00115EFC 7F E3 FB 78 */ mr r3, r31 @@ -140135,7 +140135,7 @@ lbl_80118F84: /* 80118FCC 00115F0C 7F C3 F3 78 */ mr r3, r30 /* 80118FD0 00115F10 38 80 00 6C */ li r4, 0x6c /* 80118FD4 00115F14 38 A0 00 60 */ li r5, 0x60 -/* 80118FD8 00115F18 4B F1 A3 99 */ bl dSv_player_item_c_NS_setBottleItemIn +/* 80118FD8 00115F18 4B F1 A3 99 */ bl setBottleItemIn__17dSv_player_item_cFUcUc lbl_80118FDC: /* 80118FDC 00115F1C 38 60 00 00 */ li r3, 0 lbl_80118FE0: @@ -140641,7 +140641,7 @@ lbl_801196C4: /* 801196E4 00116624 DB E1 00 40 */ stfd f31, 0x40(r1) /* 801196E8 00116628 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 801196EC 0011662C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801196F0 00116630 48 24 8A E9 */ bl func_803621D8 +/* 801196F0 00116630 48 24 8A E9 */ bl _savegpr_28 /* 801196F4 00116634 7C 7C 1B 78 */ mr r28, r3 /* 801196F8 00116638 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 801196FC 0011663C 88 9C 04 98 */ lbz r4, 0x498(r28) @@ -141101,7 +141101,7 @@ lbl_80119D74: /* 80119D78 00116CB8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80119D7C 00116CBC CB E1 00 40 */ lfd f31, 0x40(r1) /* 80119D80 00116CC0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80119D84 00116CC4 48 24 84 A1 */ bl func_80362224 +/* 80119D84 00116CC4 48 24 84 A1 */ bl _restgpr_28 /* 80119D88 00116CC8 80 01 00 54 */ lwz r0, 0x54(r1) /* 80119D8C 00116CCC 7C 08 03 A6 */ mtlr r0 /* 80119D90 00116CD0 38 21 00 50 */ addi r1, r1, 0x50 @@ -141819,7 +141819,7 @@ daAlink_c_NS_procCoGetItemInit: /* 8011A79C 001176DC 7C 08 02 A6 */ mflr r0 /* 8011A7A0 001176E0 90 01 00 24 */ stw r0, 0x24(r1) /* 8011A7A4 001176E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011A7A8 001176E8 48 24 7A 31 */ bl func_803621D8 +/* 8011A7A8 001176E8 48 24 7A 31 */ bl _savegpr_28 /* 8011A7AC 001176EC 7C 7D 1B 78 */ mr r29, r3 /* 8011A7B0 001176F0 3B E0 00 00 */ li r31, 0 /* 8011A7B4 001176F4 3B C0 00 00 */ li r30, 0 @@ -142134,7 +142134,7 @@ lbl_8011AC0C: /* 8011AC0C 00117B4C 38 60 00 01 */ li r3, 1 lbl_8011AC10: /* 8011AC10 00117B50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011AC14 00117B54 48 24 76 11 */ bl func_80362224 +/* 8011AC14 00117B54 48 24 76 11 */ bl _restgpr_28 /* 8011AC18 00117B58 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011AC1C 00117B5C 7C 08 03 A6 */ mtlr r0 /* 8011AC20 00117B60 38 21 00 20 */ addi r1, r1, 0x20 @@ -142143,7 +142143,7 @@ lbl_8011AC10: /* 8011AC2C 00117B6C 7C 08 02 A6 */ mflr r0 /* 8011AC30 00117B70 90 01 00 44 */ stw r0, 0x44(r1) /* 8011AC34 00117B74 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011AC38 00117B78 48 24 75 9D */ bl func_803621D4 +/* 8011AC38 00117B78 48 24 75 9D */ bl _savegpr_27 /* 8011AC3C 00117B7C 7C 7C 1B 78 */ mr r28, r3 /* 8011AC40 00117B80 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 8011AC44 00117B84 3B E3 D6 58 */ addi r31, r3, lbl_8038D658@l @@ -142676,7 +142676,7 @@ lbl_8011B3D4: /* 8011B3D4 00118314 38 60 00 01 */ li r3, 1 lbl_8011B3D8: /* 8011B3D8 00118318 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011B3DC 0011831C 48 24 6E 45 */ bl func_80362220 +/* 8011B3DC 0011831C 48 24 6E 45 */ bl _restgpr_27 /* 8011B3E0 00118320 80 01 00 44 */ lwz r0, 0x44(r1) /* 8011B3E4 00118324 7C 08 03 A6 */ mtlr r0 /* 8011B3E8 00118328 38 21 00 40 */ addi r1, r1, 0x40 @@ -143654,7 +143654,7 @@ lbl_8011C19C: /* 8011C1B8 001190F8 7C 08 02 A6 */ mflr r0 /* 8011C1BC 001190FC 90 01 00 24 */ stw r0, 0x24(r1) /* 8011C1C0 00119100 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011C1C4 00119104 48 24 60 15 */ bl func_803621D8 +/* 8011C1C4 00119104 48 24 60 15 */ bl _savegpr_28 /* 8011C1C8 00119108 7C 7D 1B 78 */ mr r29, r3 /* 8011C1CC 0011910C 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 8011C1D0 00119110 A8 03 30 08 */ lha r0, 0x3008(r3) @@ -143962,7 +143962,7 @@ lbl_8011C610: /* 8011C610 00119550 38 60 00 01 */ li r3, 1 lbl_8011C614: /* 8011C614 00119554 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011C618 00119558 48 24 5C 0D */ bl func_80362224 +/* 8011C618 00119558 48 24 5C 0D */ bl _restgpr_28 /* 8011C61C 0011955C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011C620 00119560 7C 08 03 A6 */ mtlr r0 /* 8011C624 00119564 38 21 00 20 */ addi r1, r1, 0x20 @@ -147429,7 +147429,7 @@ daAlink_c_NS_dungeonReturnWarp: /* 8011F818 0011C758 4B F0 FA 95 */ bl dComIfGs_getWarpStageName /* 8011F81C 0011C75C 7C 64 1B 78 */ mr r4, r3 /* 8011F820 0011C760 38 61 00 10 */ addi r3, r1, 0x10 -/* 8011F824 0011C764 48 24 93 09 */ bl func_80368B2C +/* 8011F824 0011C764 48 24 93 09 */ bl strcpy /* 8011F828 0011C768 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8011F82C 0011C76C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8011F830 0011C770 3B E3 0D B4 */ addi r31, r3, 0xdb4 @@ -147793,7 +147793,7 @@ daAlink_c_NS_procCoWarpInit: /* 8011FD50 0011CC90 7C 08 02 A6 */ mflr r0 /* 8011FD54 0011CC94 90 01 00 44 */ stw r0, 0x44(r1) /* 8011FD58 0011CC98 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011FD5C 0011CC9C 48 24 24 79 */ bl func_803621D4 +/* 8011FD5C 0011CC9C 48 24 24 79 */ bl _savegpr_27 /* 8011FD60 0011CCA0 7C 7C 1B 78 */ mr r28, r3 /* 8011FD64 0011CCA4 7C 9D 23 78 */ mr r29, r4 /* 8011FD68 0011CCA8 7C BE 2B 78 */ mr r30, r5 @@ -147932,7 +147932,7 @@ lbl_8011FF30: /* 8011FF54 0011CE94 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8011FF58 0011CE98 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8011FF5C 0011CE9C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 8011FF60 0011CEA0 48 24 8B CD */ bl func_80368B2C +/* 8011FF60 0011CEA0 48 24 8B CD */ bl strcpy /* 8011FF64 0011CEA4 38 C0 00 00 */ li r6, 0 /* 8011FF68 0011CEA8 38 A0 00 00 */ li r5, 0 /* 8011FF6C 0011CEAC 38 61 00 08 */ addi r3, r1, 8 @@ -147977,7 +147977,7 @@ lbl_8011FFF0: /* 8011FFF8 0011CF38 38 63 00 9C */ addi r3, r3, 0x9c /* 8011FFFC 0011CF3C 38 80 00 12 */ li r4, 0x12 /* 80120000 0011CF40 38 A0 00 FF */ li r5, 0xff -/* 80120004 0011CF44 4B F1 2F B5 */ bl dSv_player_item_c_NS_setItem +/* 80120004 0011CF44 4B F1 2F B5 */ bl setItem__17dSv_player_item_cFiUc /* 80120008 0011CF48 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8012000C 0011CF4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80120010 0011CF50 38 00 FF FF */ li r0, -1 @@ -148055,7 +148055,7 @@ lbl_801200FC: /* 80120108 0011D048 38 60 00 01 */ li r3, 1 lbl_8012010C: /* 8012010C 0011D04C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80120110 0011D050 48 24 21 11 */ bl func_80362220 +/* 80120110 0011D050 48 24 21 11 */ bl _restgpr_27 /* 80120114 0011D054 80 01 00 44 */ lwz r0, 0x44(r1) /* 80120118 0011D058 7C 08 03 A6 */ mtlr r0 /* 8012011C 0011D05C 38 21 00 40 */ addi r1, r1, 0x40 @@ -148064,7 +148064,7 @@ lbl_8012010C: /* 80120128 0011D068 7C 08 02 A6 */ mflr r0 /* 8012012C 0011D06C 90 01 00 44 */ stw r0, 0x44(r1) /* 80120130 0011D070 39 61 00 40 */ addi r11, r1, 0x40 -/* 80120134 0011D074 48 24 20 A1 */ bl func_803621D4 +/* 80120134 0011D074 48 24 20 A1 */ bl _savegpr_27 /* 80120138 0011D078 7C 7E 1B 78 */ mr r30, r3 /* 8012013C 0011D07C 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80120140 0011D080 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -148272,7 +148272,7 @@ lbl_80120424: /* 80120424 0011D364 38 60 00 01 */ li r3, 1 lbl_80120428: /* 80120428 0011D368 39 61 00 40 */ addi r11, r1, 0x40 -/* 8012042C 0011D36C 48 24 1D F5 */ bl func_80362220 +/* 8012042C 0011D36C 48 24 1D F5 */ bl _restgpr_27 /* 80120430 0011D370 80 01 00 44 */ lwz r0, 0x44(r1) /* 80120434 0011D374 7C 08 03 A6 */ mtlr r0 /* 80120438 0011D378 38 21 00 40 */ addi r1, r1, 0x40 @@ -149353,7 +149353,7 @@ daAlink_c_NS_setEffect: /* 80121394 0011E2D4 DB E1 00 F0 */ stfd f31, 0xf0(r1) /* 80121398 0011E2D8 F3 E1 00 F8 */ psq_st f31, 248(r1), 0, qr0 /* 8012139C 0011E2DC 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 801213A0 0011E2E0 48 24 0E 35 */ bl func_803621D4 +/* 801213A0 0011E2E0 48 24 0E 35 */ bl _savegpr_27 /* 801213A4 0011E2E4 7C 7B 1B 78 */ mr r27, r3 /* 801213A8 0011E2E8 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 801213AC 0011E2EC 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -150342,7 +150342,7 @@ lbl_801221C8: /* 801221D0 0011F110 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, qr0 /* 801221D4 0011F114 CB E1 00 F0 */ lfd f31, 0xf0(r1) /* 801221D8 0011F118 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 801221DC 0011F11C 48 24 00 45 */ bl func_80362220 +/* 801221DC 0011F11C 48 24 00 45 */ bl _restgpr_27 /* 801221E0 0011F120 80 01 01 04 */ lwz r0, 0x104(r1) /* 801221E4 0011F124 7C 08 03 A6 */ mtlr r0 /* 801221E8 0011F128 38 21 01 00 */ addi r1, r1, 0x100 @@ -150847,7 +150847,7 @@ daAlink_c_NS_setSwordChargeEffect: /* 80122908 0011F848 DB C1 00 80 */ stfd f30, 0x80(r1) /* 8012290C 0011F84C F3 C1 00 88 */ psq_st f30, 136(r1), 0, qr0 /* 80122910 0011F850 39 61 00 80 */ addi r11, r1, 0x80 -/* 80122914 0011F854 48 23 F8 C1 */ bl func_803621D4 +/* 80122914 0011F854 48 23 F8 C1 */ bl _savegpr_27 /* 80122918 0011F858 7C 7F 1B 78 */ mr r31, r3 /* 8012291C 0011F85C 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80122920 0011F860 3B 63 D6 58 */ addi r27, r3, lbl_8038D658@l @@ -151023,7 +151023,7 @@ lbl_80122B94: /* 80122B9C 0011FADC E3 C1 00 88 */ psq_l f30, 136(r1), 0, qr0 /* 80122BA0 0011FAE0 CB C1 00 80 */ lfd f30, 0x80(r1) /* 80122BA4 0011FAE4 39 61 00 80 */ addi r11, r1, 0x80 -/* 80122BA8 0011FAE8 48 23 F6 79 */ bl func_80362220 +/* 80122BA8 0011FAE8 48 23 F6 79 */ bl _restgpr_27 /* 80122BAC 0011FAEC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80122BB0 0011FAF0 7C 08 03 A6 */ mtlr r0 /* 80122BB4 0011FAF4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -151035,7 +151035,7 @@ daAlink_c_NS_setElecDamageEffect: /* 80122BC0 0011FB00 7C 08 02 A6 */ mflr r0 /* 80122BC4 0011FB04 90 01 00 94 */ stw r0, 0x94(r1) /* 80122BC8 0011FB08 39 61 00 90 */ addi r11, r1, 0x90 -/* 80122BCC 0011FB0C 48 23 F6 09 */ bl func_803621D4 +/* 80122BCC 0011FB0C 48 23 F6 09 */ bl _savegpr_27 /* 80122BD0 0011FB10 7C 7E 1B 78 */ mr r30, r3 /* 80122BD4 0011FB14 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80122BD8 0011FB18 3B 83 D6 58 */ addi r28, r3, lbl_8038D658@l @@ -151257,7 +151257,7 @@ lbl_80122EF0: /* 80122EFC 0011FE3C B0 1D 00 54 */ sth r0, 0x54(r29) lbl_80122F00: /* 80122F00 0011FE40 39 61 00 90 */ addi r11, r1, 0x90 -/* 80122F04 0011FE44 48 23 F3 1D */ bl func_80362220 +/* 80122F04 0011FE44 48 23 F3 1D */ bl _restgpr_27 /* 80122F08 0011FE48 80 01 00 94 */ lwz r0, 0x94(r1) /* 80122F0C 0011FE4C 7C 08 03 A6 */ mtlr r0 /* 80122F10 0011FE50 38 21 00 90 */ addi r1, r1, 0x90 @@ -151269,7 +151269,7 @@ daAlink_c_NS_clearCutTurnEffectID: /* 80122F1C 0011FE5C 7C 08 02 A6 */ mflr r0 /* 80122F20 0011FE60 90 01 00 24 */ stw r0, 0x24(r1) /* 80122F24 0011FE64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80122F28 0011FE68 48 23 F2 AD */ bl func_803621D4 +/* 80122F28 0011FE68 48 23 F2 AD */ bl _savegpr_27 /* 80122F2C 0011FE6C 7C 7B 1B 78 */ mr r27, r3 /* 80122F30 0011FE70 3B 80 00 00 */ li r28, 0 /* 80122F34 0011FE74 3B E0 00 00 */ li r31, 0 @@ -151285,7 +151285,7 @@ lbl_80122F3C: /* 80122F58 0011FE98 3B FF 00 04 */ addi r31, r31, 4 /* 80122F5C 0011FE9C 41 80 FF E0 */ blt lbl_80122F3C /* 80122F60 0011FEA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80122F64 0011FEA4 48 23 F2 BD */ bl func_80362220 +/* 80122F64 0011FEA4 48 23 F2 BD */ bl _restgpr_27 /* 80122F68 0011FEA8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80122F6C 0011FEAC 7C 08 03 A6 */ mtlr r0 /* 80122F70 0011FEB0 38 21 00 20 */ addi r1, r1, 0x20 @@ -151624,7 +151624,7 @@ daAlink_c_NS_setCutLargeJumpLandEffect: /* 80123438 00120378 7C 08 02 A6 */ mflr r0 /* 8012343C 0012037C 90 01 00 74 */ stw r0, 0x74(r1) /* 80123440 00120380 39 61 00 70 */ addi r11, r1, 0x70 -/* 80123444 00120384 48 23 ED 91 */ bl func_803621D4 +/* 80123444 00120384 48 23 ED 91 */ bl _savegpr_27 /* 80123448 00120388 7C 7F 1B 78 */ mr r31, r3 /* 8012344C 0012038C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80123450 00120390 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l @@ -151789,7 +151789,7 @@ lbl_80123644: /* 8012369C 001205DC 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 801236A0 001205E0 90 01 00 54 */ stw r0, 0x54(r1) /* 801236A4 001205E4 39 61 00 70 */ addi r11, r1, 0x70 -/* 801236A8 001205E8 48 23 EB 79 */ bl func_80362220 +/* 801236A8 001205E8 48 23 EB 79 */ bl _restgpr_27 /* 801236AC 001205EC 80 01 00 74 */ lwz r0, 0x74(r1) /* 801236B0 001205F0 7C 08 03 A6 */ mtlr r0 /* 801236B4 001205F4 38 21 00 70 */ addi r1, r1, 0x70 @@ -151801,7 +151801,7 @@ daAlink_c_NS_setBootsLightEffect: /* 801236C0 00120600 7C 08 02 A6 */ mflr r0 /* 801236C4 00120604 90 01 00 24 */ stw r0, 0x24(r1) /* 801236C8 00120608 39 61 00 20 */ addi r11, r1, 0x20 -/* 801236CC 0012060C 48 23 EB 0D */ bl func_803621D8 +/* 801236CC 0012060C 48 23 EB 0D */ bl _savegpr_28 /* 801236D0 00120610 7C 7F 1B 78 */ mr r31, r3 /* 801236D4 00120614 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 801236D8 00120618 38 63 20 94 */ addi r3, r3, lbl_80392094@l @@ -151854,7 +151854,7 @@ lbl_80123760: /* 8012378C 001206CC 4E 80 04 21 */ bctrl lbl_80123790: /* 80123790 001206D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80123794 001206D4 48 23 EA 91 */ bl func_80362224 +/* 80123794 001206D4 48 23 EA 91 */ bl _restgpr_28 /* 80123798 001206D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012379C 001206DC 7C 08 03 A6 */ mtlr r0 /* 801237A0 001206E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -151866,7 +151866,7 @@ daAlink_c_NS_setLightningSwordEffect: /* 801237AC 001206EC 7C 08 02 A6 */ mflr r0 /* 801237B0 001206F0 90 01 00 24 */ stw r0, 0x24(r1) /* 801237B4 001206F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801237B8 001206F8 48 23 EA 1D */ bl func_803621D4 +/* 801237B8 001206F8 48 23 EA 1D */ bl _savegpr_27 /* 801237BC 001206FC 7C 7F 1B 78 */ mr r31, r3 /* 801237C0 00120700 80 03 05 90 */ lwz r0, 0x590(r3) /* 801237C4 00120704 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -151950,7 +151950,7 @@ lbl_801238C4: /* 801238E0 00120820 41 80 FF E4 */ blt lbl_801238C4 lbl_801238E4: /* 801238E4 00120824 39 61 00 20 */ addi r11, r1, 0x20 -/* 801238E8 00120828 48 23 E9 39 */ bl func_80362220 +/* 801238E8 00120828 48 23 E9 39 */ bl _restgpr_27 /* 801238EC 0012082C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801238F0 00120830 7C 08 03 A6 */ mtlr r0 /* 801238F4 00120834 38 21 00 20 */ addi r1, r1, 0x20 @@ -152016,7 +152016,7 @@ daAlink_c_NS_setWolfDigEffect: /* 801239C4 00120904 DB C1 00 30 */ stfd f30, 0x30(r1) /* 801239C8 00120908 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 801239CC 0012090C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801239D0 00120910 48 23 E8 09 */ bl func_803621D8 +/* 801239D0 00120910 48 23 E8 09 */ bl _savegpr_28 /* 801239D4 00120914 7C 7F 1B 78 */ mr r31, r3 /* 801239D8 00120918 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801239DC 0012091C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -152157,7 +152157,7 @@ lbl_80123BC8: /* 80123BD0 00120B10 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 80123BD4 00120B14 CB C1 00 30 */ lfd f30, 0x30(r1) /* 80123BD8 00120B18 39 61 00 30 */ addi r11, r1, 0x30 -/* 80123BDC 00120B1C 48 23 E6 49 */ bl func_80362224 +/* 80123BDC 00120B1C 48 23 E6 49 */ bl _restgpr_28 /* 80123BE0 00120B20 80 01 00 54 */ lwz r0, 0x54(r1) /* 80123BE4 00120B24 7C 08 03 A6 */ mtlr r0 /* 80123BE8 00120B28 38 21 00 50 */ addi r1, r1, 0x50 @@ -152169,7 +152169,7 @@ daAlink_c_NS_setWolfSwimEndEffect: /* 80123BF4 00120B34 7C 08 02 A6 */ mflr r0 /* 80123BF8 00120B38 90 01 00 24 */ stw r0, 0x24(r1) /* 80123BFC 00120B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80123C00 00120B40 48 23 E5 D5 */ bl func_803621D4 +/* 80123C00 00120B40 48 23 E5 D5 */ bl _savegpr_27 /* 80123C04 00120B44 7C 7B 1B 78 */ mr r27, r3 /* 80123C08 00120B48 7C 9C 23 78 */ mr r28, r4 /* 80123C0C 00120B4C 7C BD 2B 78 */ mr r29, r5 @@ -152202,7 +152202,7 @@ lbl_80123C28: /* 80123C70 00120BB0 90 7D 00 00 */ stw r3, 0(r29) lbl_80123C74: /* 80123C74 00120BB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80123C78 00120BB8 48 23 E5 A9 */ bl func_80362220 +/* 80123C78 00120BB8 48 23 E5 A9 */ bl _restgpr_27 /* 80123C7C 00120BBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80123C80 00120BC0 7C 08 03 A6 */ mtlr r0 /* 80123C84 00120BC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -152377,7 +152377,7 @@ daAlink_c_NS_setWolfBarrierHitEffect: /* 80123ED4 00120E14 7C 08 02 A6 */ mflr r0 /* 80123ED8 00120E18 90 01 00 74 */ stw r0, 0x74(r1) /* 80123EDC 00120E1C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80123EE0 00120E20 48 23 E2 F5 */ bl func_803621D4 +/* 80123EE0 00120E20 48 23 E2 F5 */ bl _savegpr_27 /* 80123EE4 00120E24 7C 7E 1B 78 */ mr r30, r3 /* 80123EE8 00120E28 7C 9F 23 78 */ mr r31, r4 /* 80123EEC 00120E2C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -152539,7 +152539,7 @@ lbl_8012408C: /* 80124124 00121064 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80124128 00121068 90 01 00 4C */ stw r0, 0x4c(r1) /* 8012412C 0012106C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80124130 00121070 48 23 E0 F1 */ bl func_80362220 +/* 80124130 00121070 48 23 E0 F1 */ bl _restgpr_27 /* 80124134 00121074 80 01 00 74 */ lwz r0, 0x74(r1) /* 80124138 00121078 7C 08 03 A6 */ mtlr r0 /* 8012413C 0012107C 38 21 00 70 */ addi r1, r1, 0x70 @@ -152882,7 +152882,7 @@ daAlink_c_NS_setSwordCutSplash: /* 801245F0 00121530 7C 08 02 A6 */ mflr r0 /* 801245F4 00121534 90 01 00 44 */ stw r0, 0x44(r1) /* 801245F8 00121538 39 61 00 40 */ addi r11, r1, 0x40 -/* 801245FC 0012153C 48 23 DB D9 */ bl func_803621D4 +/* 801245FC 0012153C 48 23 DB D9 */ bl _savegpr_27 /* 80124600 00121540 7C 7B 1B 78 */ mr r27, r3 /* 80124604 00121544 88 03 05 68 */ lbz r0, 0x568(r3) /* 80124608 00121548 28 00 00 00 */ cmplwi r0, 0 @@ -152960,7 +152960,7 @@ lbl_8012470C: /* 8012471C 0012165C 41 80 FF 60 */ blt lbl_8012467C lbl_80124720: /* 80124720 00121660 39 61 00 40 */ addi r11, r1, 0x40 -/* 80124724 00121664 48 23 DA FD */ bl func_80362220 +/* 80124724 00121664 48 23 DA FD */ bl _restgpr_27 /* 80124728 00121668 80 01 00 44 */ lwz r0, 0x44(r1) /* 8012472C 0012166C 7C 08 03 A6 */ mtlr r0 /* 80124730 00121670 38 21 00 40 */ addi r1, r1, 0x40 @@ -153175,7 +153175,7 @@ lbl_80124A18: /* 80124A38 00121978 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80124A3C 0012197C F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80124A40 00121980 39 61 00 30 */ addi r11, r1, 0x30 -/* 80124A44 00121984 48 23 D7 95 */ bl func_803621D8 +/* 80124A44 00121984 48 23 D7 95 */ bl _savegpr_28 /* 80124A48 00121988 7C 7C 1B 78 */ mr r28, r3 /* 80124A4C 0012198C 7C BD 2B 78 */ mr r29, r5 /* 80124A50 00121990 C0 25 00 00 */ lfs f1, 0(r5) @@ -153248,7 +153248,7 @@ lbl_80124B48: /* 80124B48 00121A88 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80124B4C 00121A8C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80124B50 00121A90 39 61 00 30 */ addi r11, r1, 0x30 -/* 80124B54 00121A94 48 23 D6 D1 */ bl func_80362224 +/* 80124B54 00121A94 48 23 D6 D1 */ bl _restgpr_28 /* 80124B58 00121A98 80 01 00 44 */ lwz r0, 0x44(r1) /* 80124B5C 00121A9C 7C 08 03 A6 */ mtlr r0 /* 80124B60 00121AA0 38 21 00 40 */ addi r1, r1, 0x40 @@ -153550,7 +153550,7 @@ daAlink_c_NS_initFirePointDamageEffect: /* 80124FA8 00121EE8 7C 08 02 A6 */ mflr r0 /* 80124FAC 00121EEC 90 01 00 44 */ stw r0, 0x44(r1) /* 80124FB0 00121EF0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80124FB4 00121EF4 48 23 D2 21 */ bl func_803621D4 +/* 80124FB4 00121EF4 48 23 D2 21 */ bl _savegpr_27 /* 80124FB8 00121EF8 7C 7E 1B 78 */ mr r30, r3 /* 80124FBC 00121EFC 7C 9B 23 78 */ mr r27, r4 /* 80124FC0 00121F00 3B FE 32 D8 */ addi r31, r30, 0x32d8 @@ -153642,7 +153642,7 @@ lbl_80125070: /* 8012510C 0012204C 48 22 1C 61 */ bl PSMTXMultVec lbl_80125110: /* 80125110 00122050 39 61 00 40 */ addi r11, r1, 0x40 -/* 80125114 00122054 48 23 D1 0D */ bl func_80362220 +/* 80125114 00122054 48 23 D1 0D */ bl _restgpr_27 /* 80125118 00122058 80 01 00 44 */ lwz r0, 0x44(r1) /* 8012511C 0012205C 7C 08 03 A6 */ mtlr r0 /* 80125120 00122060 38 21 00 40 */ addi r1, r1, 0x40 @@ -153800,7 +153800,7 @@ daAlink_c_NS_setFreezeEffect: /* 8012533C 0012227C 7C 08 02 A6 */ mflr r0 /* 80125340 00122280 90 01 00 54 */ stw r0, 0x54(r1) /* 80125344 00122284 39 61 00 50 */ addi r11, r1, 0x50 -/* 80125348 00122288 48 23 CE 91 */ bl func_803621D8 +/* 80125348 00122288 48 23 CE 91 */ bl _savegpr_28 /* 8012534C 0012228C 7C 7F 1B 78 */ mr r31, r3 /* 80125350 00122290 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80125354 00122294 3B A3 D6 58 */ addi r29, r3, lbl_8038D658@l @@ -153923,7 +153923,7 @@ lbl_8012549C: /* 80125508 00122448 90 1F 05 7C */ stw r0, 0x57c(r31) lbl_8012550C: /* 8012550C 0012244C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80125510 00122450 48 23 CD 15 */ bl func_80362224 +/* 80125510 00122450 48 23 CD 15 */ bl _restgpr_28 /* 80125514 00122454 80 01 00 54 */ lwz r0, 0x54(r1) /* 80125518 00122458 7C 08 03 A6 */ mtlr r0 /* 8012551C 0012245C 38 21 00 50 */ addi r1, r1, 0x50 @@ -153935,7 +153935,7 @@ daAlink_c_NS_setWoodShieldBurnEffect: /* 80125528 00122468 7C 08 02 A6 */ mflr r0 /* 8012552C 0012246C 90 01 00 24 */ stw r0, 0x24(r1) /* 80125530 00122470 39 61 00 20 */ addi r11, r1, 0x20 -/* 80125534 00122474 48 23 CC A1 */ bl func_803621D4 +/* 80125534 00122474 48 23 CC A1 */ bl _savegpr_27 /* 80125538 00122478 7C 7B 1B 78 */ mr r27, r3 /* 8012553C 0012247C 88 03 2F CB */ lbz r0, 0x2fcb(r3) /* 80125540 00122480 28 00 00 00 */ cmplwi r0, 0 @@ -153967,7 +153967,7 @@ lbl_80125590: /* 801255A0 001224E0 41 80 FF B8 */ blt lbl_80125558 lbl_801255A4: /* 801255A4 001224E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801255A8 001224E8 48 23 CC 79 */ bl func_80362220 +/* 801255A8 001224E8 48 23 CC 79 */ bl _restgpr_27 /* 801255AC 001224EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801255B0 001224F0 7C 08 03 A6 */ mtlr r0 /* 801255B4 001224F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -154011,7 +154011,7 @@ daAlink_c_NS_setWoodShieldBurnOutEffect: /* 8012562C 0012256C 7C 08 02 A6 */ mflr r0 /* 80125630 00122570 90 01 00 34 */ stw r0, 0x34(r1) /* 80125634 00122574 39 61 00 30 */ addi r11, r1, 0x30 -/* 80125638 00122578 48 23 CB A1 */ bl func_803621D8 +/* 80125638 00122578 48 23 CB A1 */ bl _savegpr_28 /* 8012563C 0012257C 7C 7C 1B 78 */ mr r28, r3 /* 80125640 00122580 3B A0 00 00 */ li r29, 0 /* 80125644 00122584 3B E0 00 00 */ li r31, 0 @@ -154053,7 +154053,7 @@ lbl_801256B4: /* 801256CC 0012260C 7F 83 E3 78 */ mr r3, r28 /* 801256D0 00122610 4B FF FE ED */ bl daAlink_c_NS_clearWoodShieldBurnEffect /* 801256D4 00122614 39 61 00 30 */ addi r11, r1, 0x30 -/* 801256D8 00122618 48 23 CB 4D */ bl func_80362224 +/* 801256D8 00122618 48 23 CB 4D */ bl _restgpr_28 /* 801256DC 0012261C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801256E0 00122620 7C 08 03 A6 */ mtlr r0 /* 801256E4 00122624 38 21 00 30 */ addi r1, r1, 0x30 @@ -154109,7 +154109,7 @@ setBezierPos: /* 80125794 001226D4 DB A1 00 70 */ stfd f29, 0x70(r1) /* 80125798 001226D8 F3 A1 00 78 */ psq_st f29, 120(r1), 0, qr0 /* 8012579C 001226DC 39 61 00 70 */ addi r11, r1, 0x70 -/* 801257A0 001226E0 48 23 CA 39 */ bl func_803621D8 +/* 801257A0 001226E0 48 23 CA 39 */ bl _savegpr_28 /* 801257A4 001226E4 7C 60 1B 78 */ mr r0, r3 /* 801257A8 001226E8 7C 9C 23 78 */ mr r28, r4 /* 801257AC 001226EC 7C BD 2B 78 */ mr r29, r5 @@ -154167,7 +154167,7 @@ setBezierPos: /* 8012587C 001227BC E3 A1 00 78 */ psq_l f29, 120(r1), 0, qr0 /* 80125880 001227C0 CB A1 00 70 */ lfd f29, 0x70(r1) /* 80125884 001227C4 39 61 00 70 */ addi r11, r1, 0x70 -/* 80125888 001227C8 48 23 C9 9D */ bl func_80362224 +/* 80125888 001227C8 48 23 C9 9D */ bl _restgpr_28 /* 8012588C 001227CC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80125890 001227D0 7C 08 03 A6 */ mtlr r0 /* 80125894 001227D4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -154341,7 +154341,7 @@ daAlink_blur_c_NS_traceBlur: /* 80125B10 00122A50 7C 08 02 A6 */ mflr r0 /* 80125B14 00122A54 90 01 00 34 */ stw r0, 0x34(r1) /* 80125B18 00122A58 39 61 00 30 */ addi r11, r1, 0x30 -/* 80125B1C 00122A5C 48 23 C6 B9 */ bl func_803621D4 +/* 80125B1C 00122A5C 48 23 C6 B9 */ bl _savegpr_27 /* 80125B20 00122A60 7C 7B 1B 78 */ mr r27, r3 /* 80125B24 00122A64 7C BD 2B 78 */ mr r29, r5 /* 80125B28 00122A68 7C DC 33 78 */ mr r28, r6 @@ -154392,7 +154392,7 @@ lbl_80125BD0: /* 80125BD4 00122B14 7C 1C 00 00 */ cmpw r28, r0 /* 80125BD8 00122B18 41 80 FF 9C */ blt lbl_80125B74 /* 80125BDC 00122B1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80125BE0 00122B20 48 23 C6 41 */ bl func_80362220 +/* 80125BE0 00122B20 48 23 C6 41 */ bl _restgpr_27 /* 80125BE4 00122B24 80 01 00 34 */ lwz r0, 0x34(r1) /* 80125BE8 00122B28 7C 08 03 A6 */ mtlr r0 /* 80125BEC 00122B2C 38 21 00 30 */ addi r1, r1, 0x30 @@ -154401,7 +154401,7 @@ lbl_80125BD0: /* 80125BF8 00122B38 7C 08 02 A6 */ mflr r0 /* 80125BFC 00122B3C 90 01 00 24 */ stw r0, 0x24(r1) /* 80125C00 00122B40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80125C04 00122B44 48 23 C5 D5 */ bl func_803621D8 +/* 80125C04 00122B44 48 23 C5 D5 */ bl _savegpr_28 /* 80125C08 00122B48 7C 7F 1B 78 */ mr r31, r3 /* 80125C0C 00122B4C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80125C10 00122B50 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -154594,7 +154594,7 @@ lbl_80125EF4: /* 80125EF4 00122E34 38 00 00 00 */ li r0, 0 /* 80125EF8 00122E38 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) /* 80125EFC 00122E3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80125F00 00122E40 48 23 C3 25 */ bl func_80362224 +/* 80125F00 00122E40 48 23 C3 25 */ bl _restgpr_28 /* 80125F04 00122E44 80 01 00 24 */ lwz r0, 0x24(r1) /* 80125F08 00122E48 7C 08 03 A6 */ mtlr r0 /* 80125F0C 00122E4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -156699,7 +156699,7 @@ daAlink_c_NS_setWolfTailAngle: /* 80127E0C 00124D4C 7C 08 02 A6 */ mflr r0 /* 80127E10 00124D50 90 01 00 34 */ stw r0, 0x34(r1) /* 80127E14 00124D54 39 61 00 30 */ addi r11, r1, 0x30 -/* 80127E18 00124D58 48 23 A3 BD */ bl func_803621D4 +/* 80127E18 00124D58 48 23 A3 BD */ bl _savegpr_27 /* 80127E1C 00124D5C 7C 7C 1B 78 */ mr r28, r3 /* 80127E20 00124D60 3B FC 30 94 */ addi r31, r28, 0x3094 /* 80127E24 00124D64 3B DC 30 9A */ addi r30, r28, 0x309a @@ -156765,7 +156765,7 @@ lbl_80127EF4: /* 80127F00 00124E40 3B DE 00 02 */ addi r30, r30, 2 /* 80127F04 00124E44 41 80 FF 38 */ blt lbl_80127E3C /* 80127F08 00124E48 39 61 00 30 */ addi r11, r1, 0x30 -/* 80127F0C 00124E4C 48 23 A3 15 */ bl func_80362220 +/* 80127F0C 00124E4C 48 23 A3 15 */ bl _restgpr_27 /* 80127F10 00124E50 80 01 00 34 */ lwz r0, 0x34(r1) /* 80127F14 00124E54 7C 08 03 A6 */ mtlr r0 /* 80127F18 00124E58 38 21 00 30 */ addi r1, r1, 0x30 @@ -157159,7 +157159,7 @@ daAlink_c_NS_setSpeedAndAngleWolfAtn: /* 8012848C 001253CC DB C1 00 20 */ stfd f30, 0x20(r1) /* 80128490 001253D0 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 80128494 001253D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80128498 001253D8 48 23 9D 41 */ bl func_803621D8 +/* 80128498 001253D8 48 23 9D 41 */ bl _savegpr_28 /* 8012849C 001253DC 7C 7E 1B 78 */ mr r30, r3 /* 801284A0 001253E0 88 03 2F 98 */ lbz r0, 0x2f98(r3) /* 801284A4 001253E4 28 00 00 01 */ cmplwi r0, 1 @@ -157367,7 +157367,7 @@ lbl_80128760: /* 80128778 001256B8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8012877C 001256BC CB C1 00 20 */ lfd f30, 0x20(r1) /* 80128780 001256C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80128784 001256C4 48 23 9A A1 */ bl func_80362224 +/* 80128784 001256C4 48 23 9A A1 */ bl _restgpr_28 /* 80128788 001256C8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8012878C 001256CC 7C 08 03 A6 */ mtlr r0 /* 80128790 001256D0 38 21 00 40 */ addi r1, r1, 0x40 @@ -158488,7 +158488,7 @@ daAlink_c_NS_setSingleAnimeWolf: /* 80129720 00126660 DB A1 00 20 */ stfd f29, 0x20(r1) /* 80129724 00126664 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 80129728 00126668 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012972C 0012666C 48 23 8A AD */ bl func_803621D8 +/* 8012972C 0012666C 48 23 8A AD */ bl _savegpr_28 /* 80129730 00126670 7C 7F 1B 78 */ mr r31, r3 /* 80129734 00126674 7C 80 23 78 */ mr r0, r4 /* 80129738 00126678 FF A0 08 90 */ fmr f29, f1 @@ -158558,7 +158558,7 @@ lbl_801297F0: /* 80129828 00126768 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 8012982C 0012676C CB A1 00 20 */ lfd f29, 0x20(r1) /* 80129830 00126770 39 61 00 20 */ addi r11, r1, 0x20 -/* 80129834 00126774 48 23 89 F1 */ bl func_80362224 +/* 80129834 00126774 48 23 89 F1 */ bl _restgpr_28 /* 80129838 00126778 80 01 00 54 */ lwz r0, 0x54(r1) /* 8012983C 0012677C 7C 08 03 A6 */ mtlr r0 /* 80129840 00126780 38 21 00 50 */ addi r1, r1, 0x50 @@ -162183,7 +162183,7 @@ daAlink_c_NS_setWolfAnmVoice: /* 8012CB18 00129A58 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8012CB1C 00129A5C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8012CB20 00129A60 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012CB24 00129A64 48 23 56 B5 */ bl func_803621D8 +/* 8012CB24 00129A64 48 23 56 B5 */ bl _savegpr_28 /* 8012CB28 00129A68 7C 7C 1B 78 */ mr r28, r3 /* 8012CB2C 00129A6C 83 C3 21 60 */ lwz r30, 0x2160(r3) /* 8012CB30 00129A70 88 03 2F D8 */ lbz r0, 0x2fd8(r3) @@ -162230,7 +162230,7 @@ lbl_8012CBC4: /* 8012CBC4 00129B04 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8012CBC8 00129B08 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8012CBCC 00129B0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012CBD0 00129B10 48 23 56 55 */ bl func_80362224 +/* 8012CBD0 00129B10 48 23 56 55 */ bl _restgpr_28 /* 8012CBD4 00129B14 80 01 00 34 */ lwz r0, 0x34(r1) /* 8012CBD8 00129B18 7C 08 03 A6 */ mtlr r0 /* 8012CBDC 00129B1C 38 21 00 30 */ addi r1, r1, 0x30 @@ -166256,7 +166256,7 @@ daAlink_searchWolfHowl: /* 80130584 0012D4C4 7C 08 02 A6 */ mflr r0 /* 80130588 0012D4C8 90 01 00 34 */ stw r0, 0x34(r1) /* 8013058C 0012D4CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80130590 0012D4D0 48 23 1C 49 */ bl func_803621D8 +/* 80130590 0012D4D0 48 23 1C 49 */ bl _savegpr_28 /* 80130594 0012D4D4 7C 7C 1B 78 */ mr r28, r3 /* 80130598 0012D4D8 7C 9D 23 78 */ mr r29, r4 /* 8013059C 0012D4DC AB E3 00 08 */ lha r31, 8(r3) @@ -166304,7 +166304,7 @@ lbl_80130634: lbl_80130638: /* 80130638 0012D578 38 60 00 00 */ li r3, 0 /* 8013063C 0012D57C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80130640 0012D580 48 23 1B E5 */ bl func_80362224 +/* 80130640 0012D580 48 23 1B E5 */ bl _restgpr_28 /* 80130644 0012D584 80 01 00 34 */ lwz r0, 0x34(r1) /* 80130648 0012D588 7C 08 03 A6 */ mtlr r0 /* 8013064C 0012D58C 38 21 00 30 */ addi r1, r1, 0x30 @@ -167318,7 +167318,7 @@ daAlink_c_NS_checkWolfRopeHit: /* 80131454 0012E394 7C 08 02 A6 */ mflr r0 /* 80131458 0012E398 90 01 00 74 */ stw r0, 0x74(r1) /* 8013145C 0012E39C 39 61 00 70 */ addi r11, r1, 0x70 -/* 80131460 0012E3A0 48 23 0D 75 */ bl func_803621D4 +/* 80131460 0012E3A0 48 23 0D 75 */ bl _savegpr_27 /* 80131464 0012E3A4 7C 7B 1B 78 */ mr r27, r3 /* 80131468 0012E3A8 7C 9C 23 78 */ mr r28, r4 /* 8013146C 0012E3AC 7C BE 2B 78 */ mr r30, r5 @@ -167431,7 +167431,7 @@ lbl_8013160C: /* 8013160C 0012E54C 38 60 00 00 */ li r3, 0 lbl_80131610: /* 80131610 0012E550 39 61 00 70 */ addi r11, r1, 0x70 -/* 80131614 0012E554 48 23 0C 0D */ bl func_80362220 +/* 80131614 0012E554 48 23 0C 0D */ bl _restgpr_27 /* 80131618 0012E558 80 01 00 74 */ lwz r0, 0x74(r1) /* 8013161C 0012E55C 7C 08 03 A6 */ mtlr r0 /* 80131620 0012E560 38 21 00 70 */ addi r1, r1, 0x70 @@ -167899,7 +167899,7 @@ daAlink_c_NS_procWolfRopeMoveInit: /* 80131C78 0012EBB8 7C 08 02 A6 */ mflr r0 /* 80131C7C 0012EBBC 90 01 00 24 */ stw r0, 0x24(r1) /* 80131C80 0012EBC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80131C84 0012EBC4 48 23 05 55 */ bl func_803621D8 +/* 80131C84 0012EBC4 48 23 05 55 */ bl _savegpr_28 /* 80131C88 0012EBC8 7C 7C 1B 78 */ mr r28, r3 /* 80131C8C 0012EBCC 7C 9D 23 78 */ mr r29, r4 /* 80131C90 0012EBD0 7C BE 2B 78 */ mr r30, r5 @@ -167970,7 +167970,7 @@ lbl_80131D74: /* 80131D80 0012ECC0 4B F8 1A C5 */ bl daAlink_c_NS_initServiceWaitTime /* 80131D84 0012ECC4 38 60 00 01 */ li r3, 1 /* 80131D88 0012ECC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80131D8C 0012ECCC 48 23 04 99 */ bl func_80362224 +/* 80131D8C 0012ECCC 48 23 04 99 */ bl _restgpr_28 /* 80131D90 0012ECD0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80131D94 0012ECD4 7C 08 03 A6 */ mtlr r0 /* 80131D98 0012ECD8 38 21 00 20 */ addi r1, r1, 0x20 @@ -174668,7 +174668,7 @@ daAlink_c_NS_procWolfLieAutoMoveInit: /* 80137C94 00134BD4 7C 08 02 A6 */ mflr r0 /* 80137C98 00134BD8 90 01 00 24 */ stw r0, 0x24(r1) /* 80137C9C 00134BDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80137CA0 00134BE0 48 22 A5 35 */ bl func_803621D4 +/* 80137CA0 00134BE0 48 22 A5 35 */ bl _savegpr_27 /* 80137CA4 00134BE4 7C 7B 1B 78 */ mr r27, r3 /* 80137CA8 00134BE8 7C 9C 23 78 */ mr r28, r4 /* 80137CAC 00134BEC 7C BD 2B 78 */ mr r29, r5 @@ -174707,7 +174707,7 @@ lbl_80137D28: /* 80137D2C 00134C6C B0 1B 30 12 */ sth r0, 0x3012(r27) /* 80137D30 00134C70 38 60 00 01 */ li r3, 1 /* 80137D34 00134C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80137D38 00134C78 48 22 A4 E9 */ bl func_80362220 +/* 80137D38 00134C78 48 22 A4 E9 */ bl _restgpr_27 /* 80137D3C 00134C7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80137D40 00134C80 7C 08 03 A6 */ mtlr r0 /* 80137D44 00134C84 38 21 00 20 */ addi r1, r1, 0x20 @@ -174716,7 +174716,7 @@ lbl_80137D28: /* 80137D50 00134C90 7C 08 02 A6 */ mflr r0 /* 80137D54 00134C94 90 01 00 34 */ stw r0, 0x34(r1) /* 80137D58 00134C98 39 61 00 30 */ addi r11, r1, 0x30 -/* 80137D5C 00134C9C 48 22 A4 7D */ bl func_803621D8 +/* 80137D5C 00134C9C 48 22 A4 7D */ bl _savegpr_28 /* 80137D60 00134CA0 7C 7F 1B 78 */ mr r31, r3 /* 80137D64 00134CA4 38 00 00 0D */ li r0, 0xd /* 80137D68 00134CA8 98 03 2F 99 */ stb r0, 0x2f99(r3) @@ -174897,7 +174897,7 @@ lbl_80137FDC: /* 80137FE0 00134F20 B0 1F 31 0C */ sth r0, 0x310c(r31) /* 80137FE4 00134F24 38 60 00 01 */ li r3, 1 /* 80137FE8 00134F28 39 61 00 30 */ addi r11, r1, 0x30 -/* 80137FEC 00134F2C 48 22 A2 39 */ bl func_80362224 +/* 80137FEC 00134F2C 48 22 A2 39 */ bl _restgpr_28 /* 80137FF0 00134F30 80 01 00 34 */ lwz r0, 0x34(r1) /* 80137FF4 00134F34 7C 08 03 A6 */ mtlr r0 /* 80137FF8 00134F38 38 21 00 30 */ addi r1, r1, 0x30 @@ -176059,7 +176059,7 @@ daAlink_c_NS_checkWolfLockData: /* 8013904C 00135F8C 7C 08 02 A6 */ mflr r0 /* 80139050 00135F90 90 01 00 24 */ stw r0, 0x24(r1) /* 80139054 00135F94 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139058 00135F98 48 22 91 81 */ bl func_803621D8 +/* 80139058 00135F98 48 22 91 81 */ bl _savegpr_28 /* 8013905C 00135F9C 7C 7C 1B 78 */ mr r28, r3 /* 80139060 00135FA0 3B C0 00 00 */ li r30, 0 /* 80139064 00135FA4 3B E0 00 00 */ li r31, 0 @@ -176109,7 +176109,7 @@ lbl_801390F8: /* 801390FC 0013603C 7C 1E 00 00 */ cmpw r30, r0 /* 80139100 00136040 41 80 FF 8C */ blt lbl_8013908C /* 80139104 00136044 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139108 00136048 48 22 91 1D */ bl func_80362224 +/* 80139108 00136048 48 22 91 1D */ bl _restgpr_28 /* 8013910C 0013604C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80139110 00136050 7C 08 03 A6 */ mtlr r0 /* 80139114 00136054 38 21 00 20 */ addi r1, r1, 0x20 @@ -176622,7 +176622,7 @@ lbl_801397F0: /* 80139800 00136740 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80139804 00136744 38 63 00 28 */ addi r3, r3, 0x28 /* 80139808 00136748 38 80 00 03 */ li r4, 3 -/* 8013980C 0013674C 4B EF 93 E1 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8013980C 0013674C 4B EF 93 E1 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 80139810 00136750 2C 03 00 00 */ cmpwi r3, 0 /* 80139814 00136754 41 82 00 24 */ beq lbl_80139838 /* 80139818 00136758 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -176649,7 +176649,7 @@ lbl_80139844: /* 80139864 001367A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80139868 001367A8 38 63 00 28 */ addi r3, r3, 0x28 /* 8013986C 001367AC 38 80 00 03 */ li r4, 3 -/* 80139870 001367B0 4B EF 93 7D */ bl dSv_player_status_b_c_NS_isTransformLV +/* 80139870 001367B0 4B EF 93 7D */ bl isTransformLV__21dSv_player_status_b_cCFi /* 80139874 001367B4 2C 03 00 00 */ cmpwi r3, 0 /* 80139878 001367B8 40 82 00 08 */ bne lbl_80139880 /* 8013987C 001367BC 3B A0 00 00 */ li r29, 0 @@ -176797,7 +176797,7 @@ lbl_801399FC: /* 80139A7C 001369BC DB E1 00 20 */ stfd f31, 0x20(r1) /* 80139A80 001369C0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80139A84 001369C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139A88 001369C8 48 22 87 51 */ bl func_803621D8 +/* 80139A88 001369C8 48 22 87 51 */ bl _savegpr_28 /* 80139A8C 001369CC 7C 7E 1B 78 */ mr r30, r3 /* 80139A90 001369D0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80139A94 001369D4 4B FE FF ED */ bl daAlink_c_NS_checkWolfGroundSpecialMode @@ -177031,7 +177031,7 @@ lbl_80139DC0: /* 80139DC0 00136D00 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80139DC4 00136D04 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80139DC8 00136D08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139DCC 00136D0C 48 22 84 59 */ bl func_80362224 +/* 80139DCC 00136D0C 48 22 84 59 */ bl _restgpr_28 /* 80139DD0 00136D10 80 01 00 34 */ lwz r0, 0x34(r1) /* 80139DD4 00136D14 7C 08 03 A6 */ mtlr r0 /* 80139DD8 00136D18 38 21 00 30 */ addi r1, r1, 0x30 @@ -177819,7 +177819,7 @@ daAlink_c_NS_procWolfJumpAttackSlideLandInit: /* 8013A900 00137840 7C 08 02 A6 */ mflr r0 /* 8013A904 00137844 90 01 00 24 */ stw r0, 0x24(r1) /* 8013A908 00137848 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013A90C 0013784C 48 22 78 CD */ bl func_803621D8 +/* 8013A90C 0013784C 48 22 78 CD */ bl _savegpr_28 /* 8013A910 00137850 7C 7D 1B 78 */ mr r29, r3 /* 8013A914 00137854 7C 9C 23 78 */ mr r28, r4 /* 8013A918 00137858 7C BE 2B 78 */ mr r30, r5 @@ -177932,7 +177932,7 @@ lbl_8013AA8C: /* 8013AAA4 001379E4 98 9D 2F 98 */ stb r4, 0x2f98(r29) /* 8013AAA8 001379E8 38 60 00 01 */ li r3, 1 /* 8013AAAC 001379EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013AAB0 001379F0 48 22 77 75 */ bl func_80362224 +/* 8013AAB0 001379F0 48 22 77 75 */ bl _restgpr_28 /* 8013AAB4 001379F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013AAB8 001379F8 7C 08 03 A6 */ mtlr r0 /* 8013AABC 001379FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -178164,7 +178164,7 @@ daAlink_c_NS_procWolfWaitAttackInit: /* 8013ADF4 00137D34 7C 08 02 A6 */ mflr r0 /* 8013ADF8 00137D38 90 01 00 24 */ stw r0, 0x24(r1) /* 8013ADFC 00137D3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013AE00 00137D40 48 22 73 D9 */ bl func_803621D8 +/* 8013AE00 00137D40 48 22 73 D9 */ bl _savegpr_28 /* 8013AE04 00137D44 7C 7F 1B 78 */ mr r31, r3 /* 8013AE08 00137D48 7C 9D 23 78 */ mr r29, r4 /* 8013AE0C 00137D4C 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -178278,7 +178278,7 @@ lbl_8013AF28: lbl_8013AFA4: /* 8013AFA4 00137EE4 38 60 00 01 */ li r3, 1 /* 8013AFA8 00137EE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013AFAC 00137EEC 48 22 72 79 */ bl func_80362224 +/* 8013AFAC 00137EEC 48 22 72 79 */ bl _restgpr_28 /* 8013AFB0 00137EF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013AFB4 00137EF4 7C 08 03 A6 */ mtlr r0 /* 8013AFB8 00137EF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -179684,7 +179684,7 @@ lbl_8013C2B0: /* 8013C3E8 00139328 7C 08 02 A6 */ mflr r0 /* 8013C3EC 0013932C 90 01 00 24 */ stw r0, 0x24(r1) /* 8013C3F0 00139330 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013C3F4 00139334 48 22 5D E5 */ bl func_803621D8 +/* 8013C3F4 00139334 48 22 5D E5 */ bl _savegpr_28 /* 8013C3F8 00139338 7C 7F 1B 78 */ mr r31, r3 /* 8013C3FC 0013933C 3B A0 00 00 */ li r29, 0 /* 8013C400 00139340 3B 80 00 00 */ li r28, 0 @@ -179838,7 +179838,7 @@ lbl_8013C614: /* 8013C614 00139554 38 60 00 01 */ li r3, 1 lbl_8013C618: /* 8013C618 00139558 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013C61C 0013955C 48 22 5C 09 */ bl func_80362224 +/* 8013C61C 0013955C 48 22 5C 09 */ bl _restgpr_28 /* 8013C620 00139560 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013C624 00139564 7C 08 03 A6 */ mtlr r0 /* 8013C628 00139568 38 21 00 20 */ addi r1, r1, 0x20 @@ -183095,7 +183095,7 @@ daAlink_c_NS_procWolfDigThroughInit: /* 8013F4AC 0013C3EC 7C 08 02 A6 */ mflr r0 /* 8013F4B0 0013C3F0 90 01 00 44 */ stw r0, 0x44(r1) /* 8013F4B4 0013C3F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8013F4B8 0013C3F8 48 22 2D 21 */ bl func_803621D8 +/* 8013F4B8 0013C3F8 48 22 2D 21 */ bl _savegpr_28 /* 8013F4BC 0013C3FC 7C 7D 1B 78 */ mr r29, r3 /* 8013F4C0 0013C400 7C 9E 23 79 */ or. r30, r4, r4 /* 8013F4C4 0013C404 41 82 00 10 */ beq lbl_8013F4D4 @@ -183299,7 +183299,7 @@ lbl_8013F6C0: /* 8013F7A8 0013C6E8 38 60 00 01 */ li r3, 1 lbl_8013F7AC: /* 8013F7AC 0013C6EC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8013F7B0 0013C6F0 48 22 2A 75 */ bl func_80362224 +/* 8013F7B0 0013C6F0 48 22 2A 75 */ bl _restgpr_28 /* 8013F7B4 0013C6F4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8013F7B8 0013C6F8 7C 08 03 A6 */ mtlr r0 /* 8013F7BC 0013C6FC 38 21 00 40 */ addi r1, r1, 0x40 @@ -185879,7 +185879,7 @@ daMidna_c_NS_checkMidnaTired: /* 80141A34 0013E974 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80141A38 0013E978 38 63 00 28 */ addi r3, r3, 0x28 /* 80141A3C 0013E97C 38 80 00 03 */ li r4, 3 -/* 80141A40 0013E980 4B EF 11 AD */ bl dSv_player_status_b_c_NS_isTransformLV +/* 80141A40 0013E980 4B EF 11 AD */ bl isTransformLV__21dSv_player_status_b_cCFi /* 80141A44 0013E984 2C 03 00 00 */ cmpwi r3, 0 /* 80141A48 0013E988 41 82 00 24 */ beq lbl_80141A6C /* 80141A4C 0013E98C 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 8cb011b8b2..1a5ae15fcd 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -67,7 +67,7 @@ lbl_80145754: /* 8014578C 001426CC 7C 08 02 A6 */ mflr r0 /* 80145790 001426D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80145794 001426D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80145798 001426D8 48 21 CA 41 */ bl func_803621D8 +/* 80145798 001426D8 48 21 CA 41 */ bl _savegpr_28 /* 8014579C 001426DC 7C 7C 1B 78 */ mr r28, r3 /* 801457A0 001426E0 7C 9D 23 78 */ mr r29, r4 /* 801457A4 001426E4 48 1E 6C 21 */ bl J3DMaterialAnm_NS_calc @@ -130,7 +130,7 @@ lbl_80145870: /* 80145878 001427B8 3B FF 00 08 */ addi r31, r31, 8 /* 8014587C 001427BC 41 80 FF 34 */ blt lbl_801457B0 /* 80145880 001427C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80145884 001427C4 48 21 C9 A1 */ bl func_80362224 +/* 80145884 001427C4 48 21 C9 A1 */ bl _restgpr_28 /* 80145888 001427C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014588C 001427CC 7C 08 03 A6 */ mtlr r0 /* 80145890 001427D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -545,7 +545,7 @@ lbl_80145E28: /* 80145E3C 00142D7C 7C 08 02 A6 */ mflr r0 /* 80145E40 00142D80 90 01 00 54 */ stw r0, 0x54(r1) /* 80145E44 00142D84 39 61 00 50 */ addi r11, r1, 0x50 -/* 80145E48 00142D88 48 21 C3 8D */ bl func_803621D4 +/* 80145E48 00142D88 48 21 C3 8D */ bl _savegpr_27 /* 80145E4C 00142D8C 7C 7B 1B 78 */ mr r27, r3 /* 80145E50 00142D90 7C 9C 23 78 */ mr r28, r4 /* 80145E54 00142D94 7C BF 2B 78 */ mr r31, r5 @@ -635,7 +635,7 @@ lbl_80145F54: /* 80145F98 00142ED8 38 60 00 00 */ li r3, 0 lbl_80145F9C: /* 80145F9C 00142EDC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80145FA0 00142EE0 48 21 C2 81 */ bl func_80362220 +/* 80145FA0 00142EE0 48 21 C2 81 */ bl _restgpr_27 /* 80145FA4 00142EE4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80145FA8 00142EE8 7C 08 03 A6 */ mtlr r0 /* 80145FAC 00142EEC 38 21 00 50 */ addi r1, r1, 0x50 @@ -770,7 +770,7 @@ daNpcT_Path_c_NS_chkPassed1: /* 8014618C 001430CC 7C 08 02 A6 */ mflr r0 /* 80146190 001430D0 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80146194 001430D4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80146198 001430D8 48 21 C0 41 */ bl func_803621D8 +/* 80146198 001430D8 48 21 C0 41 */ bl _savegpr_28 /* 8014619C 001430DC 7C 7D 1B 78 */ mr r29, r3 /* 801461A0 001430E0 7C 9E 23 78 */ mr r30, r4 /* 801461A4 001430E4 7C BC 2B 78 */ mr r28, r5 @@ -979,7 +979,7 @@ lbl_801464BC: /* 801464BC 001433FC 38 60 00 00 */ li r3, 0 lbl_801464C0: /* 801464C0 00143400 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 801464C4 00143404 48 21 BD 61 */ bl func_80362224 +/* 801464C4 00143404 48 21 BD 61 */ bl _restgpr_28 /* 801464C8 00143408 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801464CC 0014340C 7C 08 03 A6 */ mtlr r0 /* 801464D0 00143410 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -2555,7 +2555,7 @@ lbl_80147BC0: /* 80147C54 00144B94 DB A1 00 20 */ stfd f29, 0x20(r1) /* 80147C58 00144B98 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 80147C5C 00144B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80147C60 00144BA0 48 21 A5 79 */ bl func_803621D8 +/* 80147C60 00144BA0 48 21 A5 79 */ bl _savegpr_28 /* 80147C64 00144BA4 7C 7C 1B 78 */ mr r28, r3 /* 80147C68 00144BA8 FF A0 08 90 */ fmr f29, f1 /* 80147C6C 00144BAC FF C0 18 90 */ fmr f30, f3 @@ -2648,7 +2648,7 @@ lbl_80147D8C: /* 80147DAC 00144CEC E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 80147DB0 00144CF0 CB A1 00 20 */ lfd f29, 0x20(r1) /* 80147DB4 00144CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80147DB8 00144CF8 48 21 A4 6D */ bl func_80362224 +/* 80147DB8 00144CF8 48 21 A4 6D */ bl _restgpr_28 /* 80147DBC 00144CFC 80 01 00 54 */ lwz r0, 0x54(r1) /* 80147DC0 00144D00 7C 08 03 A6 */ mtlr r0 /* 80147DC4 00144D04 38 21 00 50 */ addi r1, r1, 0x50 @@ -3139,7 +3139,7 @@ lbl_80148494: /* 801484B0 001453F0 7C 08 02 A6 */ mflr r0 /* 801484B4 001453F4 90 01 00 24 */ stw r0, 0x24(r1) /* 801484B8 001453F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801484BC 001453FC 48 21 9D 19 */ bl func_803621D4 +/* 801484BC 001453FC 48 21 9D 19 */ bl _savegpr_27 /* 801484C0 00145400 7C 7B 1B 78 */ mr r27, r3 /* 801484C4 00145404 7C BC 2B 78 */ mr r28, r5 /* 801484C8 00145408 3B A0 00 00 */ li r29, 0 @@ -3165,7 +3165,7 @@ lbl_801484FC: /* 80148510 00145450 40 82 FF C8 */ bne lbl_801484D8 lbl_80148514: /* 80148514 00145454 39 61 00 20 */ addi r11, r1, 0x20 -/* 80148518 00145458 48 21 9D 09 */ bl func_80362220 +/* 80148518 00145458 48 21 9D 09 */ bl _restgpr_27 /* 8014851C 0014545C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80148520 00145460 7C 08 03 A6 */ mtlr r0 /* 80148524 00145464 38 21 00 20 */ addi r1, r1, 0x20 @@ -4202,7 +4202,7 @@ daNpcT_c_NS_ctrlMsgAnm: /* 801493BC 001462FC 7C 08 02 A6 */ mflr r0 /* 801493C0 00146300 90 01 00 24 */ stw r0, 0x24(r1) /* 801493C4 00146304 39 61 00 20 */ addi r11, r1, 0x20 -/* 801493C8 00146308 48 21 8E 0D */ bl func_803621D4 +/* 801493C8 00146308 48 21 8E 0D */ bl _savegpr_27 /* 801493CC 0014630C 7C 7E 1B 78 */ mr r30, r3 /* 801493D0 00146310 7C 9B 23 78 */ mr r27, r4 /* 801493D4 00146314 7C BC 2B 78 */ mr r28, r5 @@ -4293,7 +4293,7 @@ lbl_801494F0: lbl_80149500: /* 80149500 00146440 80 7E 0D B4 */ lwz r3, 0xdb4(r30) /* 80149504 00146444 39 61 00 20 */ addi r11, r1, 0x20 -/* 80149508 00146448 48 21 8D 19 */ bl func_80362220 +/* 80149508 00146448 48 21 8D 19 */ bl _restgpr_27 /* 8014950C 0014644C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80149510 00146450 7C 08 03 A6 */ mtlr r0 /* 80149514 00146454 38 21 00 20 */ addi r1, r1, 0x20 @@ -4302,7 +4302,7 @@ lbl_80149500: /* 80149520 00146460 7C 08 02 A6 */ mflr r0 /* 80149524 00146464 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80149528 00146468 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8014952C 0014646C 48 21 8C A9 */ bl func_803621D4 +/* 8014952C 0014646C 48 21 8C A9 */ bl _savegpr_27 /* 80149530 00146470 7C 7C 1B 78 */ mr r28, r3 /* 80149534 00146474 7C BD 2B 78 */ mr r29, r5 /* 80149538 00146478 A0 84 00 14 */ lhz r4, 0x14(r4) @@ -4584,7 +4584,7 @@ lbl_80149934: lbl_80149960: /* 80149960 001468A0 38 60 00 01 */ li r3, 1 /* 80149964 001468A4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80149968 001468A8 48 21 88 B9 */ bl func_80362220 +/* 80149968 001468A8 48 21 88 B9 */ bl _restgpr_27 /* 8014996C 001468AC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80149970 001468B0 7C 08 03 A6 */ mtlr r0 /* 80149974 001468B4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -4593,7 +4593,7 @@ lbl_80149960: /* 80149980 001468C0 7C 08 02 A6 */ mflr r0 /* 80149984 001468C4 90 01 00 24 */ stw r0, 0x24(r1) /* 80149988 001468C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014998C 001468CC 48 21 88 4D */ bl func_803621D8 +/* 8014998C 001468CC 48 21 88 4D */ bl _savegpr_28 /* 80149990 001468D0 7C 7E 1B 78 */ mr r30, r3 /* 80149994 001468D4 3B E0 00 00 */ li r31, 0 /* 80149998 001468D8 3C 80 80 40 */ lis r4, lbl_804061C0@ha @@ -4737,7 +4737,7 @@ lbl_80149B88: lbl_80149B98: /* 80149B98 00146AD8 7F E3 FB 78 */ mr r3, r31 /* 80149B9C 00146ADC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80149BA0 00146AE0 48 21 86 85 */ bl func_80362224 +/* 80149BA0 00146AE0 48 21 86 85 */ bl _restgpr_28 /* 80149BA4 00146AE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80149BA8 00146AE8 7C 08 03 A6 */ mtlr r0 /* 80149BAC 00146AEC 38 21 00 20 */ addi r1, r1, 0x20 @@ -5275,7 +5275,7 @@ daNpcT_c_NS_setFaceMotionAnm: /* 8014A38C 001472CC 7C 08 02 A6 */ mflr r0 /* 8014A390 001472D0 90 01 00 94 */ stw r0, 0x94(r1) /* 8014A394 001472D4 39 61 00 90 */ addi r11, r1, 0x90 -/* 8014A398 001472D8 48 21 7E 3D */ bl func_803621D4 +/* 8014A398 001472D8 48 21 7E 3D */ bl _savegpr_27 /* 8014A39C 001472DC 7C 7B 1B 78 */ mr r27, r3 /* 8014A3A0 001472E0 7C 9C 23 78 */ mr r28, r4 /* 8014A3A4 001472E4 7C BD 2B 78 */ mr r29, r5 @@ -5446,7 +5446,7 @@ lbl_8014A5EC: /* 8014A60C 0014754C 4E 80 04 21 */ bctrl lbl_8014A610: /* 8014A610 00147550 39 61 00 90 */ addi r11, r1, 0x90 -/* 8014A614 00147554 48 21 7C 0D */ bl func_80362220 +/* 8014A614 00147554 48 21 7C 0D */ bl _restgpr_27 /* 8014A618 00147558 80 01 00 94 */ lwz r0, 0x94(r1) /* 8014A61C 0014755C 7C 08 03 A6 */ mtlr r0 /* 8014A620 00147560 38 21 00 90 */ addi r1, r1, 0x90 @@ -5769,7 +5769,7 @@ lbl_8014AAB8: /* 8014AAD4 00147A14 7C 08 02 A6 */ mflr r0 /* 8014AAD8 00147A18 90 01 00 24 */ stw r0, 0x24(r1) /* 8014AADC 00147A1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014AAE0 00147A20 48 21 76 F9 */ bl func_803621D8 +/* 8014AAE0 00147A20 48 21 76 F9 */ bl _savegpr_28 /* 8014AAE4 00147A24 7C 7C 1B 78 */ mr r28, r3 /* 8014AAE8 00147A28 7C DD 33 78 */ mr r29, r6 /* 8014AAEC 00147A2C 38 00 00 08 */ li r0, 8 @@ -5829,7 +5829,7 @@ lbl_8014ABA4: /* 8014ABB0 00147AF0 D0 1C 05 00 */ stfs f0, 0x500(r28) /* 8014ABB4 00147AF4 D0 1C 05 2C */ stfs f0, 0x52c(r28) /* 8014ABB8 00147AF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014ABBC 00147AFC 48 21 76 69 */ bl func_80362224 +/* 8014ABBC 00147AFC 48 21 76 69 */ bl _restgpr_28 /* 8014ABC0 00147B00 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014ABC4 00147B04 7C 08 03 A6 */ mtlr r0 /* 8014ABC8 00147B08 38 21 00 20 */ addi r1, r1, 0x20 @@ -6010,7 +6010,7 @@ daNpcT_c_NS_chkFindActor: /* 8014AE40 00147D80 DB 81 00 50 */ stfd f28, 0x50(r1) /* 8014AE44 00147D84 F3 81 00 58 */ psq_st f28, 88(r1), 0, qr0 /* 8014AE48 00147D88 39 61 00 50 */ addi r11, r1, 0x50 -/* 8014AE4C 00147D8C 48 21 73 89 */ bl func_803621D4 +/* 8014AE4C 00147D8C 48 21 73 89 */ bl _savegpr_27 /* 8014AE50 00147D90 7C 7B 1B 78 */ mr r27, r3 /* 8014AE54 00147D94 7C 9C 23 78 */ mr r28, r4 /* 8014AE58 00147D98 7C BD 2B 78 */ mr r29, r5 @@ -6130,7 +6130,7 @@ lbl_8014AFD8: /* 8014AFF0 00147F30 E3 81 00 58 */ psq_l f28, 88(r1), 0, qr0 /* 8014AFF4 00147F34 CB 81 00 50 */ lfd f28, 0x50(r1) /* 8014AFF8 00147F38 39 61 00 50 */ addi r11, r1, 0x50 -/* 8014AFFC 00147F3C 48 21 72 25 */ bl func_80362220 +/* 8014AFFC 00147F3C 48 21 72 25 */ bl _restgpr_27 /* 8014B000 00147F40 80 01 00 94 */ lwz r0, 0x94(r1) /* 8014B004 00147F44 7C 08 03 A6 */ mtlr r0 /* 8014B008 00147F48 38 21 00 90 */ addi r1, r1, 0x90 @@ -6564,7 +6564,7 @@ lbl_8014B62C: /* 8014B64C 0014858C 7C 08 02 A6 */ mflr r0 /* 8014B650 00148590 90 01 00 34 */ stw r0, 0x34(r1) /* 8014B654 00148594 39 61 00 30 */ addi r11, r1, 0x30 -/* 8014B658 00148598 48 21 6B 81 */ bl func_803621D8 +/* 8014B658 00148598 48 21 6B 81 */ bl _savegpr_28 /* 8014B65C 0014859C 7C 7D 1B 78 */ mr r29, r3 /* 8014B660 001485A0 7C BE 2B 78 */ mr r30, r5 /* 8014B664 001485A4 7C DF 33 78 */ mr r31, r6 @@ -6674,7 +6674,7 @@ lbl_8014B7D4: /* 8014B7E8 00148728 7C 00 18 50 */ subf r0, r0, r3 /* 8014B7EC 0014872C 54 03 0F FE */ srwi r3, r0, 0x1f /* 8014B7F0 00148730 39 61 00 30 */ addi r11, r1, 0x30 -/* 8014B7F4 00148734 48 21 6A 31 */ bl func_80362224 +/* 8014B7F4 00148734 48 21 6A 31 */ bl _restgpr_28 /* 8014B7F8 00148738 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014B7FC 0014873C 7C 08 03 A6 */ mtlr r0 /* 8014B800 00148740 38 21 00 30 */ addi r1, r1, 0x30 @@ -6899,7 +6899,7 @@ lbl_8014BAE8: /* 8014BB14 00148A54 DB C1 00 20 */ stfd f30, 0x20(r1) /* 8014BB18 00148A58 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8014BB1C 00148A5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014BB20 00148A60 48 21 66 B9 */ bl func_803621D8 +/* 8014BB20 00148A60 48 21 66 B9 */ bl _savegpr_28 /* 8014BB24 00148A64 7C 7C 1B 78 */ mr r28, r3 /* 8014BB28 00148A68 7C 9D 23 78 */ mr r29, r4 /* 8014BB2C 00148A6C 7C DE 33 78 */ mr r30, r6 @@ -6950,7 +6950,7 @@ lbl_8014BBC8: /* 8014BBD0 00148B10 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8014BBD4 00148B14 CB C1 00 20 */ lfd f30, 0x20(r1) /* 8014BBD8 00148B18 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014BBDC 00148B1C 48 21 66 49 */ bl func_80362224 +/* 8014BBDC 00148B1C 48 21 66 49 */ bl _restgpr_28 /* 8014BBE0 00148B20 80 01 00 44 */ lwz r0, 0x44(r1) /* 8014BBE4 00148B24 7C 08 03 A6 */ mtlr r0 /* 8014BBE8 00148B28 38 21 00 40 */ addi r1, r1, 0x40 @@ -7119,7 +7119,7 @@ lbl_8014BE10: /* 8014BE38 00148D78 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8014BE3C 00148D7C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8014BE40 00148D80 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014BE44 00148D84 48 21 63 91 */ bl func_803621D4 +/* 8014BE44 00148D84 48 21 63 91 */ bl _savegpr_27 /* 8014BE48 00148D88 7C 7B 1B 78 */ mr r27, r3 /* 8014BE4C 00148D8C 3B A0 00 00 */ li r29, 0 /* 8014BE50 00148D90 C3 E2 9A 7C */ lfs f31, lbl_8045347C-_SDA2_BASE_(r2) @@ -7159,7 +7159,7 @@ lbl_8014BEB4: /* 8014BEC4 00148E04 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8014BEC8 00148E08 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8014BECC 00148E0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014BED0 00148E10 48 21 63 51 */ bl func_80362220 +/* 8014BED0 00148E10 48 21 63 51 */ bl _restgpr_27 /* 8014BED4 00148E14 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014BED8 00148E18 7C 08 03 A6 */ mtlr r0 /* 8014BEDC 00148E1C 38 21 00 30 */ addi r1, r1, 0x30 @@ -7498,7 +7498,7 @@ daNpcT_chkPointInArea: /* 8014C3A8 001492E8 DB 81 00 40 */ stfd f28, 0x40(r1) /* 8014C3AC 001492EC F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 8014C3B0 001492F0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014C3B4 001492F4 48 21 5E 25 */ bl func_803621D8 +/* 8014C3B4 001492F4 48 21 5E 25 */ bl _savegpr_28 /* 8014C3B8 001492F8 7C 7C 1B 78 */ mr r28, r3 /* 8014C3BC 001492FC 7C 9D 23 78 */ mr r29, r4 /* 8014C3C0 00149300 7C BE 2B 78 */ mr r30, r5 @@ -7580,7 +7580,7 @@ lbl_8014C4C8: /* 8014C4E0 00149420 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 8014C4E4 00149424 CB 81 00 40 */ lfd f28, 0x40(r1) /* 8014C4E8 00149428 39 61 00 40 */ addi r11, r1, 0x40 -/* 8014C4EC 0014942C 48 21 5D 39 */ bl func_80362224 +/* 8014C4EC 0014942C 48 21 5D 39 */ bl _restgpr_28 /* 8014C4F0 00149430 80 01 00 84 */ lwz r0, 0x84(r1) /* 8014C4F4 00149434 7C 08 03 A6 */ mtlr r0 /* 8014C4F8 00149438 38 21 00 80 */ addi r1, r1, 0x80 @@ -7649,7 +7649,7 @@ lbl_8014C5C4: /* 8014C5E4 00149524 7C 08 02 A6 */ mflr r0 /* 8014C5E8 00149528 90 01 00 24 */ stw r0, 0x24(r1) /* 8014C5EC 0014952C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014C5F0 00149530 48 21 5B E9 */ bl func_803621D8 +/* 8014C5F0 00149530 48 21 5B E9 */ bl _savegpr_28 /* 8014C5F4 00149534 7C 7C 1B 78 */ mr r28, r3 /* 8014C5F8 00149538 3B C0 00 00 */ li r30, 0 /* 8014C5FC 0014953C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -7719,7 +7719,7 @@ lbl_8014C6D8: lbl_8014C6E4: /* 8014C6E4 00149624 7F C3 F3 78 */ mr r3, r30 /* 8014C6E8 00149628 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014C6EC 0014962C 48 21 5B 39 */ bl func_80362224 +/* 8014C6EC 0014962C 48 21 5B 39 */ bl _restgpr_28 /* 8014C6F0 00149630 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014C6F4 00149634 7C 08 03 A6 */ mtlr r0 /* 8014C6F8 00149638 38 21 00 20 */ addi r1, r1, 0x20 @@ -8959,7 +8959,7 @@ lbl_8014D874: /* 8014D888 0014A7C8 7C 08 02 A6 */ mflr r0 /* 8014D88C 0014A7CC 90 01 00 24 */ stw r0, 0x24(r1) /* 8014D890 0014A7D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014D894 0014A7D4 48 21 49 45 */ bl func_803621D8 +/* 8014D894 0014A7D4 48 21 49 45 */ bl _savegpr_28 /* 8014D898 0014A7D8 7C 7C 1B 78 */ mr r28, r3 /* 8014D89C 0014A7DC 7C 9D 23 78 */ mr r29, r4 /* 8014D8A0 0014A7E0 48 1D EB 25 */ bl J3DMaterialAnm_NS_calc @@ -9023,7 +9023,7 @@ lbl_8014D970: /* 8014D978 0014A8B8 3B FF 00 08 */ addi r31, r31, 8 /* 8014D97C 0014A8BC 41 80 FF 30 */ blt lbl_8014D8AC /* 8014D980 0014A8C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014D984 0014A8C4 48 21 48 A1 */ bl func_80362224 +/* 8014D984 0014A8C4 48 21 48 A1 */ bl _restgpr_28 /* 8014D988 0014A8C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014D98C 0014A8CC 7C 08 03 A6 */ mtlr r0 /* 8014D990 0014A8D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -10340,7 +10340,7 @@ lbl_8014EBD0: /* 8014EC5C 0014BB9C DB E1 00 20 */ stfd f31, 0x20(r1) /* 8014EC60 0014BBA0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8014EC64 0014BBA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014EC68 0014BBA8 48 21 35 71 */ bl func_803621D8 +/* 8014EC68 0014BBA8 48 21 35 71 */ bl _savegpr_28 /* 8014EC6C 0014BBAC 7C 7D 1B 78 */ mr r29, r3 /* 8014EC70 0014BBB0 FF E0 08 90 */ fmr f31, f1 /* 8014EC74 0014BBB4 80 63 07 54 */ lwz r3, 0x754(r3) @@ -10462,7 +10462,7 @@ lbl_8014EE1C: /* 8014EE1C 0014BD5C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8014EE20 0014BD60 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8014EE24 0014BD64 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014EE28 0014BD68 48 21 33 FD */ bl func_80362224 +/* 8014EE28 0014BD68 48 21 33 FD */ bl _restgpr_28 /* 8014EE2C 0014BD6C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014EE30 0014BD70 7C 08 03 A6 */ mtlr r0 /* 8014EE34 0014BD74 38 21 00 30 */ addi r1, r1, 0x30 @@ -10845,7 +10845,7 @@ lbl_8014F360: /* 8014F394 0014C2D4 7C 08 02 A6 */ mflr r0 /* 8014F398 0014C2D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8014F39C 0014C2DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014F3A0 0014C2E0 48 21 2E 39 */ bl func_803621D8 +/* 8014F3A0 0014C2E0 48 21 2E 39 */ bl _savegpr_28 /* 8014F3A4 0014C2E4 7C 7F 1B 78 */ mr r31, r3 /* 8014F3A8 0014C2E8 7C 9C 23 78 */ mr r28, r4 /* 8014F3AC 0014C2EC 80 63 07 54 */ lwz r3, 0x754(r3) @@ -10912,7 +10912,7 @@ lbl_8014F480: /* 8014F484 0014C3C4 4B EC 1D 69 */ bl mDoExt_McaMorfSO_NS_modelCalc lbl_8014F488: /* 8014F488 0014C3C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014F48C 0014C3CC 48 21 2D 99 */ bl func_80362224 +/* 8014F48C 0014C3CC 48 21 2D 99 */ bl _restgpr_28 /* 8014F490 0014C3D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014F494 0014C3D4 7C 08 03 A6 */ mtlr r0 /* 8014F498 0014C3D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -11023,7 +11023,7 @@ lbl_8014F5F8: /* 8014F610 0014C550 7C 08 02 A6 */ mflr r0 /* 8014F614 0014C554 90 01 00 24 */ stw r0, 0x24(r1) /* 8014F618 0014C558 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014F61C 0014C55C 48 21 2B B9 */ bl func_803621D4 +/* 8014F61C 0014C55C 48 21 2B B9 */ bl _savegpr_27 /* 8014F620 0014C560 7C 7B 1B 78 */ mr r27, r3 /* 8014F624 0014C564 7C 9C 23 78 */ mr r28, r4 /* 8014F628 0014C568 7C BD 2B 78 */ mr r29, r5 @@ -11079,7 +11079,7 @@ lbl_8014F6C4: /* 8014F6E0 0014C620 38 63 00 05 */ addi r3, r3, 5 lbl_8014F6E4: /* 8014F6E4 0014C624 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014F6E8 0014C628 48 21 2B 39 */ bl func_80362220 +/* 8014F6E8 0014C628 48 21 2B 39 */ bl _restgpr_27 /* 8014F6EC 0014C62C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014F6F0 0014C630 7C 08 03 A6 */ mtlr r0 /* 8014F6F4 0014C634 38 21 00 20 */ addi r1, r1, 0x20 @@ -12265,7 +12265,7 @@ lbl_80150728: /* 80150760 0014D6A0 7C 08 02 A6 */ mflr r0 /* 80150764 0014D6A4 90 01 00 24 */ stw r0, 0x24(r1) /* 80150768 0014D6A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015076C 0014D6AC 48 21 1A 6D */ bl func_803621D8 +/* 8015076C 0014D6AC 48 21 1A 6D */ bl _savegpr_28 /* 80150770 0014D6B0 7C 7C 1B 78 */ mr r28, r3 /* 80150774 0014D6B4 7C 9D 23 78 */ mr r29, r4 /* 80150778 0014D6B8 48 1D BC 4D */ bl J3DMaterialAnm_NS_calc @@ -12329,7 +12329,7 @@ lbl_80150848: /* 80150850 0014D790 3B FF 00 08 */ addi r31, r31, 8 /* 80150854 0014D794 41 80 FF 30 */ blt lbl_80150784 /* 80150858 0014D798 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015085C 0014D79C 48 21 19 C9 */ bl func_80362224 +/* 8015085C 0014D79C 48 21 19 C9 */ bl _restgpr_28 /* 80150860 0014D7A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80150864 0014D7A4 7C 08 03 A6 */ mtlr r0 /* 80150868 0014D7A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -12710,7 +12710,7 @@ daNpcF_Path_c_NS_setNextIdx: /* 80150DE4 0014DD24 7C 08 02 A6 */ mflr r0 /* 80150DE8 0014DD28 90 01 00 34 */ stw r0, 0x34(r1) /* 80150DEC 0014DD2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80150DF0 0014DD30 48 21 13 E9 */ bl func_803621D8 +/* 80150DF0 0014DD30 48 21 13 E9 */ bl _savegpr_28 /* 80150DF4 0014DD34 7C 7C 1B 78 */ mr r28, r3 /* 80150DF8 0014DD38 7C 9D 23 78 */ mr r29, r4 /* 80150DFC 0014DD3C 7C BE 2B 78 */ mr r30, r5 @@ -12757,7 +12757,7 @@ lbl_80150E90: lbl_80150E98: /* 80150E98 0014DDD8 7F E3 FB 78 */ mr r3, r31 /* 80150E9C 0014DDDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80150EA0 0014DDE0 48 21 13 85 */ bl func_80362224 +/* 80150EA0 0014DDE0 48 21 13 85 */ bl _restgpr_28 /* 80150EA4 0014DDE4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80150EA8 0014DDE8 7C 08 03 A6 */ mtlr r0 /* 80150EAC 0014DDEC 38 21 00 30 */ addi r1, r1, 0x30 @@ -13974,7 +13974,7 @@ lbl_80151FF8: /* 80152018 0014EF58 7C 08 02 A6 */ mflr r0 /* 8015201C 0014EF5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80152020 0014EF60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80152024 0014EF64 48 21 01 B5 */ bl func_803621D8 +/* 80152024 0014EF64 48 21 01 B5 */ bl _savegpr_28 /* 80152028 0014EF68 7C 7F 1B 78 */ mr r31, r3 /* 8015202C 0014EF6C 81 83 0B 44 */ lwz r12, 0xb44(r3) /* 80152030 0014EF70 81 8C 00 0C */ lwz r12, 0xc(r12) @@ -14137,7 +14137,7 @@ lbl_80152268: lbl_80152290: /* 80152290 0014F1D0 38 60 00 01 */ li r3, 1 /* 80152294 0014F1D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80152298 0014F1D8 48 20 FF 8D */ bl func_80362224 +/* 80152298 0014F1D8 48 20 FF 8D */ bl _restgpr_28 /* 8015229C 0014F1DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801522A0 0014F1E0 7C 08 03 A6 */ mtlr r0 /* 801522A4 0014F1E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -15441,7 +15441,7 @@ lbl_80153560: /* 8015357C 001504BC 7C 08 02 A6 */ mflr r0 /* 80153580 001504C0 90 01 00 24 */ stw r0, 0x24(r1) /* 80153584 001504C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153588 001504C8 48 20 EC 4D */ bl func_803621D4 +/* 80153588 001504C8 48 20 EC 4D */ bl _savegpr_27 /* 8015358C 001504CC 7C 7B 1B 78 */ mr r27, r3 /* 80153590 001504D0 7C 9C 23 78 */ mr r28, r4 /* 80153594 001504D4 7C BD 2B 78 */ mr r29, r5 @@ -15492,7 +15492,7 @@ lbl_80153628: /* 8015363C 0015057C 38 60 00 00 */ li r3, 0 lbl_80153640: /* 80153640 00150580 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153644 00150584 48 20 EB DD */ bl func_80362220 +/* 80153644 00150584 48 20 EB DD */ bl _restgpr_27 /* 80153648 00150588 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015364C 0015058C 7C 08 03 A6 */ mtlr r0 /* 80153650 00150590 38 21 00 20 */ addi r1, r1, 0x20 @@ -15551,7 +15551,7 @@ lbl_801536C0: /* 8015371C 0015065C 7C 08 02 A6 */ mflr r0 /* 80153720 00150660 90 01 00 24 */ stw r0, 0x24(r1) /* 80153724 00150664 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153728 00150668 48 20 EA AD */ bl func_803621D4 +/* 80153728 00150668 48 20 EA AD */ bl _savegpr_27 /* 8015372C 0015066C 7C 7E 1B 78 */ mr r30, r3 /* 80153730 00150670 7C 9B 23 78 */ mr r27, r4 /* 80153734 00150674 7C BC 2B 78 */ mr r28, r5 @@ -15642,7 +15642,7 @@ lbl_80153850: lbl_80153860: /* 80153860 001507A0 80 7E 09 50 */ lwz r3, 0x950(r30) /* 80153864 001507A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153868 001507A8 48 20 E9 B9 */ bl func_80362220 +/* 80153868 001507A8 48 20 E9 B9 */ bl _restgpr_27 /* 8015386C 001507AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80153870 001507B0 7C 08 03 A6 */ mtlr r0 /* 80153874 001507B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -15709,7 +15709,7 @@ lbl_8015393C: /* 80153958 00150898 7C 08 02 A6 */ mflr r0 /* 8015395C 0015089C 90 01 00 24 */ stw r0, 0x24(r1) /* 80153960 001508A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153964 001508A4 48 20 E8 71 */ bl func_803621D4 +/* 80153964 001508A4 48 20 E8 71 */ bl _savegpr_27 /* 80153968 001508A8 7C 7B 1B 78 */ mr r27, r3 /* 8015396C 001508AC 7C BC 2B 78 */ mr r28, r5 /* 80153970 001508B0 7C DD 33 78 */ mr r29, r6 @@ -15740,7 +15740,7 @@ lbl_80153998: /* 801539D0 00150910 7F C6 F3 78 */ mr r6, r30 /* 801539D4 00150914 4B EC 7C 11 */ bl fopAcM_orderChangeEventId /* 801539D8 00150918 39 61 00 20 */ addi r11, r1, 0x20 -/* 801539DC 0015091C 48 20 E8 45 */ bl func_80362220 +/* 801539DC 0015091C 48 20 E8 45 */ bl _restgpr_27 /* 801539E0 00150920 80 01 00 24 */ lwz r0, 0x24(r1) /* 801539E4 00150924 7C 08 03 A6 */ mtlr r0 /* 801539E8 00150928 38 21 00 20 */ addi r1, r1, 0x20 @@ -15796,7 +15796,7 @@ daNpcF_c_NS_chkActorInArea: /* 80153A9C 001509DC DB 81 00 40 */ stfd f28, 0x40(r1) /* 80153AA0 001509E0 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 80153AA4 001509E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80153AA8 001509E8 48 20 E7 31 */ bl func_803621D8 +/* 80153AA8 001509E8 48 20 E7 31 */ bl _savegpr_28 /* 80153AAC 001509EC 7C 9C 23 78 */ mr r28, r4 /* 80153AB0 001509F0 7C BD 2B 78 */ mr r29, r5 /* 80153AB4 001509F4 7C DE 33 78 */ mr r30, r6 @@ -15869,7 +15869,7 @@ lbl_80153BA0: /* 80153BBC 00150AFC E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 80153BC0 00150B00 CB 81 00 40 */ lfd f28, 0x40(r1) /* 80153BC4 00150B04 39 61 00 40 */ addi r11, r1, 0x40 -/* 80153BC8 00150B08 48 20 E6 5D */ bl func_80362224 +/* 80153BC8 00150B08 48 20 E6 5D */ bl _restgpr_28 /* 80153BCC 00150B0C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80153BD0 00150B10 7C 08 03 A6 */ mtlr r0 /* 80153BD4 00150B14 38 21 00 80 */ addi r1, r1, 0x80 @@ -15882,7 +15882,7 @@ lbl_80153BA0: /* 80153BF0 00150B30 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80153BF4 00150B34 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80153BF8 00150B38 39 61 00 50 */ addi r11, r1, 0x50 -/* 80153BFC 00150B3C 48 20 E5 D9 */ bl func_803621D4 +/* 80153BFC 00150B3C 48 20 E5 D9 */ bl _savegpr_27 /* 80153C00 00150B40 7C 7B 1B 78 */ mr r27, r3 /* 80153C04 00150B44 7C 9C 23 78 */ mr r28, r4 /* 80153C08 00150B48 7C BD 2B 78 */ mr r29, r5 @@ -15950,7 +15950,7 @@ lbl_80153CF0: /* 80153CFC 00150C3C E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 80153D00 00150C40 CB C1 00 50 */ lfd f30, 0x50(r1) /* 80153D04 00150C44 39 61 00 50 */ addi r11, r1, 0x50 -/* 80153D08 00150C48 48 20 E5 19 */ bl func_80362220 +/* 80153D08 00150C48 48 20 E5 19 */ bl _restgpr_27 /* 80153D0C 00150C4C 80 01 00 74 */ lwz r0, 0x74(r1) /* 80153D10 00150C50 7C 08 03 A6 */ mtlr r0 /* 80153D14 00150C54 38 21 00 70 */ addi r1, r1, 0x70 @@ -15985,7 +15985,7 @@ lbl_80153CF0: /* 80153D88 00150CC8 7C 08 02 A6 */ mflr r0 /* 80153D8C 00150CCC 90 01 00 34 */ stw r0, 0x34(r1) /* 80153D90 00150CD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80153D94 00150CD4 48 20 E4 41 */ bl func_803621D4 +/* 80153D94 00150CD4 48 20 E4 41 */ bl _savegpr_27 /* 80153D98 00150CD8 7C 7B 1B 78 */ mr r27, r3 /* 80153D9C 00150CDC 7C 9C 23 78 */ mr r28, r4 /* 80153DA0 00150CE0 7C BD 2B 78 */ mr r29, r5 @@ -16077,7 +16077,7 @@ lbl_80153EB0: lbl_80153ED8: /* 80153ED8 00150E18 7F C3 F3 78 */ mr r3, r30 /* 80153EDC 00150E1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80153EE0 00150E20 48 20 E3 41 */ bl func_80362220 +/* 80153EE0 00150E20 48 20 E3 41 */ bl _restgpr_27 /* 80153EE4 00150E24 80 01 00 34 */ lwz r0, 0x34(r1) /* 80153EE8 00150E28 7C 08 03 A6 */ mtlr r0 /* 80153EEC 00150E2C 38 21 00 30 */ addi r1, r1, 0x30 @@ -16848,7 +16848,7 @@ lbl_801549B4: /* 80154A04 00151944 DB 81 00 50 */ stfd f28, 0x50(r1) /* 80154A08 00151948 F3 81 00 58 */ psq_st f28, 88(r1), 0, qr0 /* 80154A0C 0015194C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80154A10 00151950 48 20 D7 C5 */ bl func_803621D4 +/* 80154A10 00151950 48 20 D7 C5 */ bl _savegpr_27 /* 80154A14 00151954 7C 7B 1B 78 */ mr r27, r3 /* 80154A18 00151958 7C 9C 23 78 */ mr r28, r4 /* 80154A1C 0015195C 7C BD 2B 78 */ mr r29, r5 @@ -16969,7 +16969,7 @@ lbl_80154BA0: /* 80154BB8 00151AF8 E3 81 00 58 */ psq_l f28, 88(r1), 0, qr0 /* 80154BBC 00151AFC CB 81 00 50 */ lfd f28, 0x50(r1) /* 80154BC0 00151B00 39 61 00 50 */ addi r11, r1, 0x50 -/* 80154BC4 00151B04 48 20 D6 5D */ bl func_80362220 +/* 80154BC4 00151B04 48 20 D6 5D */ bl _restgpr_27 /* 80154BC8 00151B08 80 01 00 94 */ lwz r0, 0x94(r1) /* 80154BCC 00151B0C 7C 08 03 A6 */ mtlr r0 /* 80154BD0 00151B10 38 21 00 90 */ addi r1, r1, 0x90 @@ -17846,7 +17846,7 @@ lbl_80155838: /* 80155858 00152798 7C 08 02 A6 */ mflr r0 /* 8015585C 0015279C 90 01 00 24 */ stw r0, 0x24(r1) /* 80155860 001527A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80155864 001527A4 48 20 C9 75 */ bl func_803621D8 +/* 80155864 001527A4 48 20 C9 75 */ bl _savegpr_28 /* 80155868 001527A8 7C 7C 1B 78 */ mr r28, r3 /* 8015586C 001527AC 3B C0 00 00 */ li r30, 0 /* 80155870 001527B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17913,7 +17913,7 @@ lbl_80155940: lbl_8015594C: /* 8015594C 0015288C 7F C3 F3 78 */ mr r3, r30 /* 80155950 00152890 39 61 00 20 */ addi r11, r1, 0x20 -/* 80155954 00152894 48 20 C8 D1 */ bl func_80362224 +/* 80155954 00152894 48 20 C8 D1 */ bl _restgpr_28 /* 80155958 00152898 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015595C 0015289C 7C 08 03 A6 */ mtlr r0 /* 80155960 001528A0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/a/d_a_obj.s b/asm/d/a/d_a_obj.s index 838ec56e00..f9ba53aa6b 100644 --- a/asm/d/a/d_a_obj.s +++ b/asm/d/a/d_a_obj.s @@ -407,7 +407,7 @@ daObj_NS_posMoveF_grade: /* 80037634 00034574 DB C1 00 30 */ stfd f30, 0x30(r1) /* 80037638 00034578 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 8003763C 0003457C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037640 00034580 48 32 AB 99 */ bl func_803621D8 +/* 80037640 00034580 48 32 AB 99 */ bl _savegpr_28 /* 80037644 00034584 7C 7C 1B 78 */ mr r28, r3 /* 80037648 00034588 7C 9D 23 78 */ mr r29, r4 /* 8003764C 0003458C 7C DE 33 78 */ mr r30, r6 @@ -487,7 +487,7 @@ lbl_80037748: /* 80037768 000346A8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 8003776C 000346AC CB C1 00 30 */ lfd f30, 0x30(r1) /* 80037770 000346B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037774 000346B4 48 32 AA B1 */ bl func_80362224 +/* 80037774 000346B4 48 32 AA B1 */ bl _restgpr_28 /* 80037778 000346B8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003777C 000346BC 7C 08 03 A6 */ mtlr r0 /* 80037780 000346C0 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/a/d_a_player.s b/asm/d/a/d_a_player.s index 8acf0d4341..dd72ead33e 100644 --- a/asm/d/a/d_a_player.s +++ b/asm/d/a/d_a_player.s @@ -125,7 +125,7 @@ daPy_boomerangMove_c_NS_posMove: /* 8015E658 0015B598 7C 08 02 A6 */ mflr r0 /* 8015E65C 0015B59C 90 01 00 34 */ stw r0, 0x34(r1) /* 8015E660 0015B5A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015E664 0015B5A4 48 20 3B 71 */ bl func_803621D4 +/* 8015E664 0015B5A4 48 20 3B 71 */ bl _savegpr_27 /* 8015E668 0015B5A8 7C 7E 1B 78 */ mr r30, r3 /* 8015E66C 0015B5AC 7C 9F 23 78 */ mr r31, r4 /* 8015E670 0015B5B0 7C BB 2B 78 */ mr r27, r5 @@ -265,7 +265,7 @@ lbl_8015E860: /* 8015E860 0015B7A0 38 60 00 00 */ li r3, 0 lbl_8015E864: /* 8015E864 0015B7A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015E868 0015B7A8 48 20 39 B9 */ bl func_80362220 +/* 8015E868 0015B7A8 48 20 39 B9 */ bl _restgpr_27 /* 8015E86C 0015B7AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8015E870 0015B7B0 7C 08 03 A6 */ mtlr r0 /* 8015E874 0015B7B4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/a/no/chg/d_a_no_chg_room.s b/asm/d/a/no/chg/d_a_no_chg_room.s index efffffcb0e..7dec7e270c 100644 --- a/asm/d/a/no/chg/d_a_no_chg_room.s +++ b/asm/d/a/no/chg/d_a_no_chg_room.s @@ -9,7 +9,7 @@ isLoadRoom: /* 801451F0 00142130 7C 08 02 A6 */ mflr r0 /* 801451F4 00142134 90 01 00 24 */ stw r0, 0x24(r1) /* 801451F8 00142138 39 61 00 20 */ addi r11, r1, 0x20 -/* 801451FC 0014213C 48 21 CF DD */ bl func_803621D8 +/* 801451FC 0014213C 48 21 CF DD */ bl _savegpr_28 /* 80145200 00142140 7C 7C 1B 78 */ mr r28, r3 /* 80145204 00142144 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80145208 00142148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -67,7 +67,7 @@ lbl_801452C0: /* 801452C0 00142200 38 60 00 01 */ li r3, 1 lbl_801452C4: /* 801452C4 00142204 39 61 00 20 */ addi r11, r1, 0x20 -/* 801452C8 00142208 48 21 CF 5D */ bl func_80362224 +/* 801452C8 00142208 48 21 CF 5D */ bl _restgpr_28 /* 801452CC 0014220C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801452D0 00142210 7C 08 03 A6 */ mtlr r0 /* 801452D4 00142214 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/a/npc/d_a_npc_cd.s b/asm/d/a/npc/d_a_npc_cd.s index e33f48967b..1dcfadcfb7 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -766,7 +766,7 @@ lbl_80156AFC: /* 80156B50 00153A90 7C 08 02 A6 */ mflr r0 /* 80156B54 00153A94 90 01 00 24 */ stw r0, 0x24(r1) /* 80156B58 00153A98 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156B5C 00153A9C 48 20 B6 7D */ bl func_803621D8 +/* 80156B5C 00153A9C 48 20 B6 7D */ bl _savegpr_28 /* 80156B60 00153AA0 7C 7C 1B 78 */ mr r28, r3 /* 80156B64 00153AA4 7C 9D 23 78 */ mr r29, r4 /* 80156B68 00153AA8 88 03 09 E8 */ lbz r0, 0x9e8(r3) @@ -828,7 +828,7 @@ lbl_80156C24: /* 80156C34 00153B74 2C 03 00 04 */ cmpwi r3, 4 lbl_80156C38: /* 80156C38 00153B78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156C3C 00153B7C 48 20 B5 E9 */ bl func_80362224 +/* 80156C3C 00153B7C 48 20 B5 E9 */ bl _restgpr_28 /* 80156C40 00153B80 80 01 00 24 */ lwz r0, 0x24(r1) /* 80156C44 00153B84 7C 08 03 A6 */ mtlr r0 /* 80156C48 00153B88 38 21 00 20 */ addi r1, r1, 0x20 @@ -837,7 +837,7 @@ lbl_80156C38: /* 80156C54 00153B94 7C 08 02 A6 */ mflr r0 /* 80156C58 00153B98 90 01 00 24 */ stw r0, 0x24(r1) /* 80156C5C 00153B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156C60 00153BA0 48 20 B5 79 */ bl func_803621D8 +/* 80156C60 00153BA0 48 20 B5 79 */ bl _savegpr_28 /* 80156C64 00153BA4 7C 7C 1B 78 */ mr r28, r3 /* 80156C68 00153BA8 7C 9D 23 78 */ mr r29, r4 /* 80156C6C 00153BAC 88 03 09 E8 */ lbz r0, 0x9e8(r3) @@ -881,7 +881,7 @@ lbl_80156CD4: /* 80156CFC 00153C3C 4B ED 63 0D */ bl dComIfG_resDelete /* 80156D00 00153C40 38 60 00 01 */ li r3, 1 /* 80156D04 00153C44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156D08 00153C48 48 20 B5 1D */ bl func_80362224 +/* 80156D08 00153C48 48 20 B5 1D */ bl _restgpr_28 /* 80156D0C 00153C4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80156D10 00153C50 7C 08 03 A6 */ mtlr r0 /* 80156D14 00153C54 38 21 00 20 */ addi r1, r1, 0x20 @@ -1122,7 +1122,7 @@ daNpcCd_c_NS_jntNodeCB: /* 80157088 00153FC8 7C 08 02 A6 */ mflr r0 /* 8015708C 00153FCC 90 01 00 54 */ stw r0, 0x54(r1) /* 80157090 00153FD0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80157094 00153FD4 48 20 B1 45 */ bl func_803621D8 +/* 80157094 00153FD4 48 20 B1 45 */ bl _savegpr_28 /* 80157098 00153FD8 7C 7C 1B 78 */ mr r28, r3 /* 8015709C 00153FDC 7C BD 2B 78 */ mr r29, r5 /* 801570A0 00153FE0 A3 E4 00 14 */ lhz r31, 0x14(r4) @@ -1311,7 +1311,7 @@ lbl_8015731C: /* 8015734C 0015428C 48 1E F1 65 */ bl PSMTXCopy /* 80157350 00154290 38 60 00 01 */ li r3, 1 /* 80157354 00154294 39 61 00 50 */ addi r11, r1, 0x50 -/* 80157358 00154298 48 20 AE CD */ bl func_80362224 +/* 80157358 00154298 48 20 AE CD */ bl _restgpr_28 /* 8015735C 0015429C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80157360 001542A0 7C 08 03 A6 */ mtlr r0 /* 80157364 001542A4 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index 199c1e289e..6b84bb66ce 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -29,7 +29,7 @@ lbl_80157CEC: /* 80157D04 00154C44 7C 08 02 A6 */ mflr r0 /* 80157D08 00154C48 90 01 00 44 */ stw r0, 0x44(r1) /* 80157D0C 00154C4C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80157D10 00154C50 48 20 A4 C5 */ bl func_803621D4 +/* 80157D10 00154C50 48 20 A4 C5 */ bl _savegpr_27 /* 80157D14 00154C54 7C 7C 1B 78 */ mr r28, r3 /* 80157D18 00154C58 7C 9D 23 78 */ mr r29, r4 /* 80157D1C 00154C5C 48 00 1B CD */ bl daNpcCd2_c_NS_getNpcMdlDataP @@ -171,7 +171,7 @@ lbl_80157EF0: /* 80157F0C 00154E4C 38 60 00 01 */ li r3, 1 lbl_80157F10: /* 80157F10 00154E50 39 61 00 40 */ addi r11, r1, 0x40 -/* 80157F14 00154E54 48 20 A3 0D */ bl func_80362220 +/* 80157F14 00154E54 48 20 A3 0D */ bl _restgpr_27 /* 80157F18 00154E58 80 01 00 44 */ lwz r0, 0x44(r1) /* 80157F1C 00154E5C 7C 08 03 A6 */ mtlr r0 /* 80157F20 00154E60 38 21 00 40 */ addi r1, r1, 0x40 @@ -1036,7 +1036,7 @@ lbl_80158B68: /* 80158BBC 00155AFC 7C 08 02 A6 */ mflr r0 /* 80158BC0 00155B00 90 01 00 24 */ stw r0, 0x24(r1) /* 80158BC4 00155B04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158BC8 00155B08 48 20 96 11 */ bl func_803621D8 +/* 80158BC8 00155B08 48 20 96 11 */ bl _savegpr_28 /* 80158BCC 00155B0C 7C 7C 1B 78 */ mr r28, r3 /* 80158BD0 00155B10 7C 9D 23 78 */ mr r29, r4 /* 80158BD4 00155B14 88 03 0A C6 */ lbz r0, 0xac6(r3) @@ -1098,7 +1098,7 @@ lbl_80158C90: /* 80158CA0 00155BE0 2C 03 00 04 */ cmpwi r3, 4 lbl_80158CA4: /* 80158CA4 00155BE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158CA8 00155BE8 48 20 95 7D */ bl func_80362224 +/* 80158CA8 00155BE8 48 20 95 7D */ bl _restgpr_28 /* 80158CAC 00155BEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80158CB0 00155BF0 7C 08 03 A6 */ mtlr r0 /* 80158CB4 00155BF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1107,7 +1107,7 @@ lbl_80158CA4: /* 80158CC0 00155C00 7C 08 02 A6 */ mflr r0 /* 80158CC4 00155C04 90 01 00 24 */ stw r0, 0x24(r1) /* 80158CC8 00155C08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158CCC 00155C0C 48 20 95 0D */ bl func_803621D8 +/* 80158CCC 00155C0C 48 20 95 0D */ bl _savegpr_28 /* 80158CD0 00155C10 7C 7C 1B 78 */ mr r28, r3 /* 80158CD4 00155C14 7C 9D 23 78 */ mr r29, r4 /* 80158CD8 00155C18 88 03 0A C6 */ lbz r0, 0xac6(r3) @@ -1151,7 +1151,7 @@ lbl_80158D40: /* 80158D68 00155CA8 4B ED 42 A1 */ bl dComIfG_resDelete /* 80158D6C 00155CAC 38 60 00 01 */ li r3, 1 /* 80158D70 00155CB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158D74 00155CB4 48 20 94 B1 */ bl func_80362224 +/* 80158D74 00155CB4 48 20 94 B1 */ bl _restgpr_28 /* 80158D78 00155CB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80158D7C 00155CBC 7C 08 03 A6 */ mtlr r0 /* 80158D80 00155CC0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2038,7 +2038,7 @@ lbl_80159A28: /* 80159A44 00156984 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80159A48 00156988 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80159A4C 0015698C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80159A50 00156990 48 20 87 89 */ bl func_803621D8 +/* 80159A50 00156990 48 20 87 89 */ bl _savegpr_28 /* 80159A54 00156994 7C 7F 1B 78 */ mr r31, r3 /* 80159A58 00156998 7C DC 33 78 */ mr r28, r6 /* 80159A5C 0015699C 7C FD 3B 78 */ mr r29, r7 @@ -2161,7 +2161,7 @@ lbl_80159BF4: /* 80159BF4 00156B34 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80159BF8 00156B38 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80159BFC 00156B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80159C00 00156B40 48 20 86 25 */ bl func_80362224 +/* 80159C00 00156B40 48 20 86 25 */ bl _restgpr_28 /* 80159C04 00156B44 80 01 00 34 */ lwz r0, 0x34(r1) /* 80159C08 00156B48 7C 08 03 A6 */ mtlr r0 /* 80159C0C 00156B4C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2741,7 +2741,7 @@ PathTrace_c_NS_checkObstacleSub: /* 8015A3F0 00157330 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8015A3F4 00157334 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8015A3F8 00157338 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015A3FC 0015733C 48 20 7D D9 */ bl func_803621D4 +/* 8015A3FC 0015733C 48 20 7D D9 */ bl _savegpr_27 /* 8015A400 00157340 7C 7B 1B 78 */ mr r27, r3 /* 8015A404 00157344 7C 9C 23 78 */ mr r28, r4 /* 8015A408 00157348 80 03 00 00 */ lwz r0, 0(r3) @@ -2793,7 +2793,7 @@ lbl_8015A4B8: /* 8015A4B8 001573F8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8015A4BC 001573FC CB E1 00 30 */ lfd f31, 0x30(r1) /* 8015A4C0 00157400 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015A4C4 00157404 48 20 7D 5D */ bl func_80362220 +/* 8015A4C4 00157404 48 20 7D 5D */ bl _restgpr_27 /* 8015A4C8 00157408 80 01 00 44 */ lwz r0, 0x44(r1) /* 8015A4CC 0015740C 7C 08 03 A6 */ mtlr r0 /* 8015A4D0 00157410 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index 9359940aea..a83b24ed3c 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -728,7 +728,7 @@ daItem_c_NS__daItem_create: /* 8015B7D8 00158718 7C 08 02 A6 */ mflr r0 /* 8015B7DC 0015871C 90 01 00 24 */ stw r0, 0x24(r1) /* 8015B7E0 00158720 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015B7E4 00158724 48 20 69 F5 */ bl func_803621D8 +/* 8015B7E4 00158724 48 20 69 F5 */ bl _savegpr_28 /* 8015B7E8 00158728 7C 7F 1B 78 */ mr r31, r3 /* 8015B7EC 0015872C 80 03 04 A0 */ lwz r0, 0x4a0(r3) /* 8015B7F0 00158730 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -883,7 +883,7 @@ lbl_8015BA20: /* 8015BA20 00158960 7F A3 EB 78 */ mr r3, r29 lbl_8015BA24: /* 8015BA24 00158964 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015BA28 00158968 48 20 67 FD */ bl func_80362224 +/* 8015BA28 00158968 48 20 67 FD */ bl _restgpr_28 /* 8015BA2C 0015896C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015BA30 00158970 7C 08 03 A6 */ mtlr r0 /* 8015BA34 00158974 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index 484de7e9a5..ef037eb90e 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -35,7 +35,7 @@ cBgS_NS_Regist: /* 80074148 00071088 7C 08 02 A6 */ mflr r0 /* 8007414C 0007108C 90 01 00 24 */ stw r0, 0x24(r1) /* 80074150 00071090 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074154 00071094 48 2E E0 81 */ bl func_803621D4 +/* 80074154 00071094 48 2E E0 81 */ bl _savegpr_27 /* 80074158 00071098 7C 7B 1B 78 */ mr r27, r3 /* 8007415C 0007109C 7C 9C 23 79 */ or. r28, r4, r4 /* 80074160 000710A0 7C BD 2B 78 */ mr r29, r5 @@ -101,7 +101,7 @@ lbl_80074224: /* 80074234 00071174 38 60 00 01 */ li r3, 1 lbl_80074238: /* 80074238 00071178 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007423C 0007117C 48 2E DF E5 */ bl func_80362220 +/* 8007423C 0007117C 48 2E DF E5 */ bl _restgpr_27 /* 80074240 00071180 80 01 00 24 */ lwz r0, 0x24(r1) /* 80074244 00071184 7C 08 03 A6 */ mtlr r0 /* 80074248 00071188 38 21 00 20 */ addi r1, r1, 0x20 @@ -1555,7 +1555,7 @@ dBgS_NS_SplGrpChk: /* 80075568 000724A8 7C 08 02 A6 */ mflr r0 /* 8007556C 000724AC 90 01 00 24 */ stw r0, 0x24(r1) /* 80075570 000724B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075574 000724B4 48 2E CC 61 */ bl func_803621D4 +/* 80075574 000724B4 48 2E CC 61 */ bl _savegpr_27 /* 80075578 000724B8 7C 7C 1B 78 */ mr r28, r3 /* 8007557C 000724BC 7C 9B 23 78 */ mr r27, r4 /* 80075580 000724C0 3B E0 00 00 */ li r31, 0 @@ -1622,7 +1622,7 @@ lbl_8007565C: /* 80075668 000725A8 41 80 FF 2C */ blt lbl_80075594 /* 8007566C 000725AC 7F E3 FB 78 */ mr r3, r31 /* 80075670 000725B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075674 000725B4 48 2E CB AD */ bl func_80362220 +/* 80075674 000725B4 48 2E CB AD */ bl _restgpr_27 /* 80075678 000725B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007567C 000725BC 7C 08 03 A6 */ mtlr r0 /* 80075680 000725C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1634,7 +1634,7 @@ dBgS_NS_SphChk: /* 8007568C 000725CC 7C 08 02 A6 */ mflr r0 /* 80075690 000725D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80075694 000725D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075698 000725D8 48 2E CB 3D */ bl func_803621D4 +/* 80075698 000725D8 48 2E CB 3D */ bl _savegpr_27 /* 8007569C 000725DC 7C 7D 1B 78 */ mr r29, r3 /* 800756A0 000725E0 7C 9B 23 78 */ mr r27, r4 /* 800756A4 000725E4 7C BC 2B 78 */ mr r28, r5 @@ -1688,7 +1688,7 @@ lbl_80075748: /* 80075758 00072698 7F E3 FB 78 */ mr r3, r31 lbl_8007575C: /* 8007575C 0007269C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075760 000726A0 48 2E CA C1 */ bl func_80362220 +/* 80075760 000726A0 48 2E CA C1 */ bl _restgpr_27 /* 80075764 000726A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80075768 000726A8 7C 08 03 A6 */ mtlr r0 /* 8007576C 000726AC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1985,7 +1985,7 @@ dBgS_NS_RideCallBack: /* 80075B88 00072AC8 7C 08 02 A6 */ mflr r0 /* 80075B8C 00072ACC 90 01 00 24 */ stw r0, 0x24(r1) /* 80075B90 00072AD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075B94 00072AD4 48 2E C6 45 */ bl func_803621D8 +/* 80075B94 00072AD4 48 2E C6 45 */ bl _savegpr_28 /* 80075B98 00072AD8 7C 7C 1B 78 */ mr r28, r3 /* 80075B9C 00072ADC 7C BD 2B 78 */ mr r29, r5 /* 80075BA0 00072AE0 A0 04 00 02 */ lhz r0, 2(r4) @@ -2005,7 +2005,7 @@ dBgS_NS_RideCallBack: /* 80075BD8 00072B18 4E 80 04 21 */ bctrl lbl_80075BDC: /* 80075BDC 00072B1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075BE0 00072B20 48 2E C6 45 */ bl func_80362224 +/* 80075BE0 00072B20 48 2E C6 45 */ bl _restgpr_28 /* 80075BE4 00072B24 80 01 00 24 */ lwz r0, 0x24(r1) /* 80075BE8 00072B28 7C 08 03 A6 */ mtlr r0 /* 80075BEC 00072B2C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2014,7 +2014,7 @@ lbl_80075BDC: /* 80075BF8 00072B38 7C 08 02 A6 */ mflr r0 /* 80075BFC 00072B3C 90 01 00 24 */ stw r0, 0x24(r1) /* 80075C00 00072B40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075C04 00072B44 48 2E C5 D1 */ bl func_803621D4 +/* 80075C04 00072B44 48 2E C5 D1 */ bl _savegpr_27 /* 80075C08 00072B48 7C 7B 1B 78 */ mr r27, r3 /* 80075C0C 00072B4C 7C BC 2B 78 */ mr r28, r5 /* 80075C10 00072B50 7C DD 33 78 */ mr r29, r6 @@ -2036,7 +2036,7 @@ lbl_80075BDC: /* 80075C50 00072B90 4E 80 04 21 */ bctrl lbl_80075C54: /* 80075C54 00072B94 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075C58 00072B98 48 2E C5 C9 */ bl func_80362220 +/* 80075C58 00072B98 48 2E C5 C9 */ bl _restgpr_27 /* 80075C5C 00072B9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80075C60 00072BA0 7C 08 03 A6 */ mtlr r0 /* 80075C64 00072BA4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index a3770bf89d..c883b62d7a 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -280,7 +280,7 @@ lbl_80079550: /* 80079568 000764A8 7C 08 02 A6 */ mflr r0 /* 8007956C 000764AC 90 01 00 24 */ stw r0, 0x24(r1) /* 80079570 000764B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079574 000764B4 48 2E 8C 61 */ bl func_803621D4 +/* 80079574 000764B4 48 2E 8C 61 */ bl _savegpr_27 /* 80079578 000764B8 7C 7F 1B 78 */ mr r31, r3 /* 8007957C 000764BC 80 63 00 A0 */ lwz r3, 0xa0(r3) /* 80079580 000764C0 83 83 00 0C */ lwz r28, 0xc(r3) @@ -342,7 +342,7 @@ lbl_80079640: /* 8007964C 0007658C 41 80 FF AC */ blt lbl_800795F8 lbl_80079650: /* 80079650 00076590 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079654 00076594 48 2E 8B CD */ bl func_80362220 +/* 80079654 00076594 48 2E 8B CD */ bl _restgpr_27 /* 80079658 00076598 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007965C 0007659C 7C 08 03 A6 */ mtlr r0 /* 80079660 000765A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -819,7 +819,7 @@ cBgW_NS_MakeNodeTreeGrpRp: /* 80079CC8 00076C08 7C 08 02 A6 */ mflr r0 /* 80079CCC 00076C0C 90 01 00 24 */ stw r0, 0x24(r1) /* 80079CD0 00076C10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079CD4 00076C14 48 2E 85 05 */ bl func_803621D8 +/* 80079CD4 00076C14 48 2E 85 05 */ bl _savegpr_28 /* 80079CD8 00076C18 7C 7D 1B 78 */ mr r29, r3 /* 80079CDC 00076C1C 7C 9E 23 78 */ mr r30, r4 /* 80079CE0 00076C20 80 83 00 A0 */ lwz r4, 0xa0(r3) @@ -888,7 +888,7 @@ lbl_80079D74: /* 80079DD4 00076D14 4B FF FF A0 */ b lbl_80079D74 lbl_80079DD8: /* 80079DD8 00076D18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079DDC 00076D1C 48 2E 84 49 */ bl func_80362224 +/* 80079DDC 00076D1C 48 2E 84 49 */ bl _restgpr_28 /* 80079DE0 00076D20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80079DE4 00076D24 7C 08 03 A6 */ mtlr r0 /* 80079DE8 00076D28 38 21 00 20 */ addi r1, r1, 0x20 @@ -995,7 +995,7 @@ cBgW_NS_Set: /* 80079F3C 00076E7C 7C 08 02 A6 */ mflr r0 /* 80079F40 00076E80 90 01 00 24 */ stw r0, 0x24(r1) /* 80079F44 00076E84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079F48 00076E88 48 2E 82 91 */ bl func_803621D8 +/* 80079F48 00076E88 48 2E 82 91 */ bl _savegpr_28 /* 80079F4C 00076E8C 7C 7F 1B 78 */ mr r31, r3 /* 80079F50 00076E90 7C 9C 23 78 */ mr r28, r4 /* 80079F54 00076E94 7C BD 2B 78 */ mr r29, r5 @@ -1155,7 +1155,7 @@ lbl_8007A144: /* 8007A168 000770A8 38 60 00 00 */ li r3, 0 lbl_8007A16C: /* 8007A16C 000770AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A170 000770B0 48 2E 80 B5 */ bl func_80362224 +/* 8007A170 000770B0 48 2E 80 B5 */ bl _restgpr_28 /* 8007A174 000770B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007A178 000770B8 7C 08 03 A6 */ mtlr r0 /* 8007A17C 000770BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1426,7 +1426,7 @@ cBgW_NS_LineCheckGrpRp: /* 8007A530 00077470 7C 08 02 A6 */ mflr r0 /* 8007A534 00077474 90 01 00 24 */ stw r0, 0x24(r1) /* 8007A538 00077478 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A53C 0007747C 48 2E 7C 99 */ bl func_803621D4 +/* 8007A53C 0007747C 48 2E 7C 99 */ bl _savegpr_27 /* 8007A540 00077480 7C 7C 1B 78 */ mr r28, r3 /* 8007A544 00077484 7C 9D 23 78 */ mr r29, r4 /* 8007A548 00077488 7C BB 2B 78 */ mr r27, r5 @@ -1499,7 +1499,7 @@ lbl_8007A63C: /* 8007A63C 0007757C 7F E3 FB 78 */ mr r3, r31 lbl_8007A640: /* 8007A640 00077580 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A644 00077584 48 2E 7B DD */ bl func_80362220 +/* 8007A644 00077584 48 2E 7B DD */ bl _restgpr_27 /* 8007A648 00077588 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007A64C 0007758C 7C 08 03 A6 */ mtlr r0 /* 8007A650 00077590 38 21 00 20 */ addi r1, r1, 0x20 @@ -1587,7 +1587,7 @@ cBgW_NS_RwgGroundCheckGnd: /* 8007A778 000776B8 7C 08 02 A6 */ mflr r0 /* 8007A77C 000776BC 90 01 00 24 */ stw r0, 0x24(r1) /* 8007A780 000776C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A784 000776C4 48 2E 7A 51 */ bl func_803621D4 +/* 8007A784 000776C4 48 2E 7A 51 */ bl _savegpr_27 /* 8007A788 000776C8 7C 7B 1B 78 */ mr r27, r3 /* 8007A78C 000776CC 7C BC 2B 78 */ mr r28, r5 /* 8007A790 000776D0 3B A0 00 00 */ li r29, 0 @@ -1625,7 +1625,7 @@ lbl_8007A7F8: lbl_8007A808: /* 8007A808 00077748 7F A3 EB 78 */ mr r3, r29 /* 8007A80C 0007774C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A810 00077750 48 2E 7A 11 */ bl func_80362220 +/* 8007A810 00077750 48 2E 7A 11 */ bl _restgpr_27 /* 8007A814 00077754 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007A818 00077758 7C 08 03 A6 */ mtlr r0 /* 8007A81C 0007775C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1639,7 +1639,7 @@ cBgW_NS_RwgGroundCheckWall: /* 8007A830 00077770 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8007A834 00077774 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8007A838 00077778 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A83C 0007777C 48 2E 79 99 */ bl func_803621D4 +/* 8007A83C 0007777C 48 2E 79 99 */ bl _savegpr_27 /* 8007A840 00077780 7C 7B 1B 78 */ mr r27, r3 /* 8007A844 00077784 7C BC 2B 78 */ mr r28, r5 /* 8007A848 00077788 3B A0 00 00 */ li r29, 0 @@ -1683,7 +1683,7 @@ lbl_8007A8D0: /* 8007A8D4 00077814 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8007A8D8 00077818 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8007A8DC 0007781C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A8E0 00077820 48 2E 79 41 */ bl func_80362220 +/* 8007A8E0 00077820 48 2E 79 41 */ bl _restgpr_27 /* 8007A8E4 00077824 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007A8E8 00077828 7C 08 03 A6 */ mtlr r0 /* 8007A8EC 0007782C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2049,7 +2049,7 @@ cBgW_NS_RwgShdwDraw: /* 8007ADF4 00077D34 7C 08 02 A6 */ mflr r0 /* 8007ADF8 00077D38 90 01 00 24 */ stw r0, 0x24(r1) /* 8007ADFC 00077D3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007AE00 00077D40 48 2E 73 D5 */ bl func_803621D4 +/* 8007AE00 00077D40 48 2E 73 D5 */ bl _savegpr_27 /* 8007AE04 00077D44 7C 7B 1B 78 */ mr r27, r3 /* 8007AE08 00077D48 7C 9C 23 78 */ mr r28, r4 /* 8007AE0C 00077D4C 7C BD 2B 78 */ mr r29, r5 @@ -2088,7 +2088,7 @@ lbl_8007AE78: /* 8007AE88 00077DC8 4B FF FF 88 */ b lbl_8007AE10 lbl_8007AE8C: /* 8007AE8C 00077DCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007AE90 00077DD0 48 2E 73 91 */ bl func_80362220 +/* 8007AE90 00077DD0 48 2E 73 91 */ bl _restgpr_27 /* 8007AE94 00077DD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007AE98 00077DD8 7C 08 03 A6 */ mtlr r0 /* 8007AE9C 00077DDC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2100,7 +2100,7 @@ cBgW_NS_ShdwDrawRp: /* 8007AEA8 00077DE8 7C 08 02 A6 */ mflr r0 /* 8007AEAC 00077DEC 90 01 00 24 */ stw r0, 0x24(r1) /* 8007AEB0 00077DF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007AEB4 00077DF4 48 2E 73 21 */ bl func_803621D4 +/* 8007AEB4 00077DF4 48 2E 73 21 */ bl _savegpr_27 /* 8007AEB8 00077DF8 7C 7E 1B 78 */ mr r30, r3 /* 8007AEBC 00077DFC 7C 9F 23 78 */ mr r31, r4 /* 8007AEC0 00077E00 7C BB 2B 78 */ mr r27, r5 @@ -2168,7 +2168,7 @@ lbl_8007AF98: /* 8007AFA4 00077EE4 41 80 FF D8 */ blt lbl_8007AF7C lbl_8007AFA8: /* 8007AFA8 00077EE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007AFAC 00077EEC 48 2E 72 75 */ bl func_80362220 +/* 8007AFAC 00077EEC 48 2E 72 75 */ bl _restgpr_27 /* 8007AFB0 00077EF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007AFB4 00077EF4 7C 08 03 A6 */ mtlr r0 /* 8007AFB8 00077EF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3520,7 +3520,7 @@ dBgW_NS_WallCorrectGrpRp: /* 8007C364 000792A4 7C 08 02 A6 */ mflr r0 /* 8007C368 000792A8 90 01 00 24 */ stw r0, 0x24(r1) /* 8007C36C 000792AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007C370 000792B0 48 2E 5E 65 */ bl func_803621D4 +/* 8007C370 000792B0 48 2E 5E 65 */ bl _savegpr_27 /* 8007C374 000792B4 7C 7C 1B 78 */ mr r28, r3 /* 8007C378 000792B8 7C 9D 23 78 */ mr r29, r4 /* 8007C37C 000792BC 7C BB 2B 78 */ mr r27, r5 @@ -3591,7 +3591,7 @@ lbl_8007C468: /* 8007C468 000793A8 7F E3 FB 78 */ mr r3, r31 lbl_8007C46C: /* 8007C46C 000793AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007C470 000793B0 48 2E 5D B1 */ bl func_80362220 +/* 8007C470 000793B0 48 2E 5D B1 */ bl _restgpr_27 /* 8007C474 000793B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C478 000793B8 7C 08 03 A6 */ mtlr r0 /* 8007C47C 000793BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3779,7 +3779,7 @@ dBgW_NS_WallCorrectRpSort: /* 8007C718 00079658 7C 08 02 A6 */ mflr r0 /* 8007C71C 0007965C 90 01 00 24 */ stw r0, 0x24(r1) /* 8007C720 00079660 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007C724 00079664 48 2E 5A B1 */ bl func_803621D4 +/* 8007C724 00079664 48 2E 5A B1 */ bl _savegpr_27 /* 8007C728 00079668 7C 7E 1B 78 */ mr r30, r3 /* 8007C72C 0007966C 7C 9F 23 78 */ mr r31, r4 /* 8007C730 00079670 7C BB 2B 78 */ mr r27, r5 @@ -3836,7 +3836,7 @@ lbl_8007C7E0: /* 8007C7EC 0007972C 41 80 FF D8 */ blt lbl_8007C7C4 lbl_8007C7F0: /* 8007C7F0 00079730 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007C7F4 00079734 48 2E 5A 2D */ bl func_80362220 +/* 8007C7F4 00079734 48 2E 5A 2D */ bl _restgpr_27 /* 8007C7F8 00079738 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C7FC 0007973C 7C 08 03 A6 */ mtlr r0 /* 8007C800 00079740 38 21 00 20 */ addi r1, r1, 0x20 @@ -3848,7 +3848,7 @@ dBgW_NS_WallCorrectGrpRpSort: /* 8007C80C 0007974C 7C 08 02 A6 */ mflr r0 /* 8007C810 00079750 90 01 00 24 */ stw r0, 0x24(r1) /* 8007C814 00079754 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007C818 00079758 48 2E 59 C1 */ bl func_803621D8 +/* 8007C818 00079758 48 2E 59 C1 */ bl _savegpr_28 /* 8007C81C 0007975C 7C 7D 1B 78 */ mr r29, r3 /* 8007C820 00079760 7C 9E 23 78 */ mr r30, r4 /* 8007C824 00079764 7C BC 2B 78 */ mr r28, r5 @@ -3911,7 +3911,7 @@ lbl_8007C8F4: /* 8007C8F4 00079834 38 60 00 00 */ li r3, 0 lbl_8007C8F8: /* 8007C8F8 00079838 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007C8FC 0007983C 48 2E 59 29 */ bl func_80362224 +/* 8007C8FC 0007983C 48 2E 59 29 */ bl _restgpr_28 /* 8007C900 00079840 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C904 00079844 7C 08 03 A6 */ mtlr r0 /* 8007C908 00079848 38 21 00 20 */ addi r1, r1, 0x20 @@ -4613,7 +4613,7 @@ dBgW_NS_RoofChkGrpRp: /* 8007D334 0007A274 7C 08 02 A6 */ mflr r0 /* 8007D338 0007A278 90 01 00 24 */ stw r0, 0x24(r1) /* 8007D33C 0007A27C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D340 0007A280 48 2E 4E 95 */ bl func_803621D4 +/* 8007D340 0007A280 48 2E 4E 95 */ bl _savegpr_27 /* 8007D344 0007A284 7C 7D 1B 78 */ mr r29, r3 /* 8007D348 0007A288 7C 9E 23 78 */ mr r30, r4 /* 8007D34C 0007A28C 7C BB 2B 78 */ mr r27, r5 @@ -4692,7 +4692,7 @@ lbl_8007D454: /* 8007D454 0007A394 7F 83 E3 78 */ mr r3, r28 lbl_8007D458: /* 8007D458 0007A398 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D45C 0007A39C 48 2E 4D C5 */ bl func_80362220 +/* 8007D45C 0007A39C 48 2E 4D C5 */ bl _restgpr_27 /* 8007D460 0007A3A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007D464 0007A3A4 7C 08 03 A6 */ mtlr r0 /* 8007D468 0007A3A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -4880,7 +4880,7 @@ dBgW_NS_SplGrpChkGrpRp: /* 8007D6F4 0007A634 7C 08 02 A6 */ mflr r0 /* 8007D6F8 0007A638 90 01 00 24 */ stw r0, 0x24(r1) /* 8007D6FC 0007A63C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D700 0007A640 48 2E 4A D5 */ bl func_803621D4 +/* 8007D700 0007A640 48 2E 4A D5 */ bl _savegpr_27 /* 8007D704 0007A644 7C 7D 1B 78 */ mr r29, r3 /* 8007D708 0007A648 7C 9E 23 78 */ mr r30, r4 /* 8007D70C 0007A64C 7C BB 2B 78 */ mr r27, r5 @@ -4959,7 +4959,7 @@ lbl_8007D814: /* 8007D814 0007A754 7F 83 E3 78 */ mr r3, r28 lbl_8007D818: /* 8007D818 0007A758 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D81C 0007A75C 48 2E 4A 05 */ bl func_80362220 +/* 8007D81C 0007A75C 48 2E 4A 05 */ bl _restgpr_27 /* 8007D820 0007A760 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007D824 0007A764 7C 08 03 A6 */ mtlr r0 /* 8007D828 0007A768 38 21 00 20 */ addi r1, r1, 0x20 @@ -4981,7 +4981,7 @@ dBgW_NS_RwgCaptPoly: /* 8007D85C 0007A79C 7C 08 02 A6 */ mflr r0 /* 8007D860 0007A7A0 90 01 00 24 */ stw r0, 0x24(r1) /* 8007D864 0007A7A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D868 0007A7A8 48 2E 49 71 */ bl func_803621D8 +/* 8007D868 0007A7A8 48 2E 49 71 */ bl _savegpr_28 /* 8007D86C 0007A7AC 7C 7C 1B 78 */ mr r28, r3 /* 8007D870 0007A7B0 7C 89 23 78 */ mr r9, r4 /* 8007D874 0007A7B4 7C BD 2B 78 */ mr r29, r5 @@ -5010,7 +5010,7 @@ lbl_8007D878: /* 8007D8CC 0007A80C 4B FF FF AC */ b lbl_8007D878 lbl_8007D8D0: /* 8007D8D0 0007A810 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D8D4 0007A814 48 2E 49 51 */ bl func_80362224 +/* 8007D8D4 0007A814 48 2E 49 51 */ bl _restgpr_28 /* 8007D8D8 0007A818 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007D8DC 0007A81C 7C 08 03 A6 */ mtlr r0 /* 8007D8E0 0007A820 38 21 00 20 */ addi r1, r1, 0x20 @@ -5022,7 +5022,7 @@ dBgW_NS_CaptPolyRp: /* 8007D8EC 0007A82C 7C 08 02 A6 */ mflr r0 /* 8007D8F0 0007A830 90 01 00 24 */ stw r0, 0x24(r1) /* 8007D8F4 0007A834 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D8F8 0007A838 48 2E 48 DD */ bl func_803621D4 +/* 8007D8F8 0007A838 48 2E 48 DD */ bl _savegpr_27 /* 8007D8FC 0007A83C 7C 7E 1B 78 */ mr r30, r3 /* 8007D900 0007A840 7C 9F 23 78 */ mr r31, r4 /* 8007D904 0007A844 7C BB 2B 78 */ mr r27, r5 @@ -5090,7 +5090,7 @@ lbl_8007D9DC: /* 8007D9E8 0007A928 41 80 FF D8 */ blt lbl_8007D9C0 lbl_8007D9EC: /* 8007D9EC 0007A92C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007D9F0 0007A930 48 2E 48 31 */ bl func_80362220 +/* 8007D9F0 0007A930 48 2E 48 31 */ bl _restgpr_27 /* 8007D9F4 0007A934 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007D9F8 0007A938 7C 08 03 A6 */ mtlr r0 /* 8007D9FC 0007A93C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5102,7 +5102,7 @@ dBgW_NS_CaptPolyGrpRp: /* 8007DA08 0007A948 7C 08 02 A6 */ mflr r0 /* 8007DA0C 0007A94C 90 01 00 24 */ stw r0, 0x24(r1) /* 8007DA10 0007A950 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007DA14 0007A954 48 2E 47 C5 */ bl func_803621D8 +/* 8007DA14 0007A954 48 2E 47 C5 */ bl _savegpr_28 /* 8007DA18 0007A958 7C 7D 1B 78 */ mr r29, r3 /* 8007DA1C 0007A95C 7C 9E 23 78 */ mr r30, r4 /* 8007DA20 0007A960 7C BC 2B 78 */ mr r28, r5 @@ -5157,7 +5157,7 @@ lbl_8007DAA8: /* 8007DADC 0007AA1C 4B FF FF CC */ b lbl_8007DAA8 lbl_8007DAE0: /* 8007DAE0 0007AA20 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007DAE4 0007AA24 48 2E 47 41 */ bl func_80362224 +/* 8007DAE4 0007AA24 48 2E 47 41 */ bl _restgpr_28 /* 8007DAE8 0007AA28 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007DAEC 0007AA2C 7C 08 03 A6 */ mtlr r0 /* 8007DAF0 0007AA30 38 21 00 20 */ addi r1, r1, 0x20 @@ -5528,7 +5528,7 @@ lbl_8007DFF0: /* 8007E030 0007AF70 7C 08 02 A6 */ mflr r0 /* 8007E034 0007AF74 90 01 00 34 */ stw r0, 0x34(r1) /* 8007E038 0007AF78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007E03C 0007AF7C 48 2E 41 9D */ bl func_803621D8 +/* 8007E03C 0007AF7C 48 2E 41 9D */ bl _savegpr_28 /* 8007E040 0007AF80 7C 7D 1B 78 */ mr r29, r3 /* 8007E044 0007AF84 7C 9E 23 78 */ mr r30, r4 /* 8007E048 0007AF88 28 05 00 00 */ cmplwi r5, 0 @@ -5741,7 +5741,7 @@ lbl_8007E344: /* 8007E344 0007B284 38 60 00 00 */ li r3, 0 lbl_8007E348: /* 8007E348 0007B288 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007E34C 0007B28C 48 2E 3E D9 */ bl func_80362224 +/* 8007E34C 0007B28C 48 2E 3E D9 */ bl _restgpr_28 /* 8007E350 0007B290 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007E354 0007B294 7C 08 03 A6 */ mtlr r0 /* 8007E358 0007B298 38 21 00 30 */ addi r1, r1, 0x30 @@ -5846,7 +5846,7 @@ lbl_8007E494: /* 8007E4C4 0007B404 7C 08 02 A6 */ mflr r0 /* 8007E4C8 0007B408 90 01 00 24 */ stw r0, 0x24(r1) /* 8007E4CC 0007B40C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007E4D0 0007B410 48 2E 3D 09 */ bl func_803621D8 +/* 8007E4D0 0007B410 48 2E 3D 09 */ bl _savegpr_28 /* 8007E4D4 0007B414 7C 7C 1B 78 */ mr r28, r3 /* 8007E4D8 0007B418 7C 9D 23 78 */ mr r29, r4 /* 8007E4DC 0007B41C 7C BE 2B 78 */ mr r30, r5 @@ -5875,7 +5875,7 @@ lbl_8007E52C: /* 8007E52C 0007B46C 7F E3 FB 78 */ mr r3, r31 lbl_8007E530: /* 8007E530 0007B470 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007E534 0007B474 48 2E 3C F1 */ bl func_80362224 +/* 8007E534 0007B474 48 2E 3C F1 */ bl _restgpr_28 /* 8007E538 0007B478 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007E53C 0007B47C 7C 08 03 A6 */ mtlr r0 /* 8007E540 0007B480 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s b/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s index fc4f226088..e0410d413f 100644 --- a/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s +++ b/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s @@ -120,7 +120,7 @@ lbl_800787A8: /* 800787C0 00075700 7C 08 02 A6 */ mflr r0 /* 800787C4 00075704 90 01 00 24 */ stw r0, 0x24(r1) /* 800787C8 00075708 39 61 00 20 */ addi r11, r1, 0x20 -/* 800787CC 0007570C 48 2E 9A 09 */ bl func_803621D4 +/* 800787CC 0007570C 48 2E 9A 09 */ bl _savegpr_27 /* 800787D0 00075710 7C 7F 1B 78 */ mr r31, r3 /* 800787D4 00075714 7C 9B 23 78 */ mr r27, r4 /* 800787D8 00075718 7C BC 2B 78 */ mr r28, r5 @@ -190,7 +190,7 @@ lbl_800788A4: /* 800788C0 00075800 38 63 00 05 */ addi r3, r3, 5 lbl_800788C4: /* 800788C4 00075804 39 61 00 20 */ addi r11, r1, 0x20 -/* 800788C8 00075808 48 2E 99 59 */ bl func_80362220 +/* 800788C8 00075808 48 2E 99 59 */ bl _restgpr_27 /* 800788CC 0007580C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800788D0 00075810 7C 08 03 A6 */ mtlr r0 /* 800788D4 00075814 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/bg/w/d_bg_w_sv.s b/asm/d/bg/w/d_bg_w_sv.s index 8d43b891a5..b2b7a57262 100644 --- a/asm/d/bg/w/d_bg_w_sv.s +++ b/asm/d/bg/w/d_bg_w_sv.s @@ -192,7 +192,7 @@ lbl_8008323C: /* 80083248 00080188 7C 08 02 A6 */ mflr r0 /* 8008324C 0008018C 90 01 00 24 */ stw r0, 0x24(r1) /* 80083250 00080190 39 61 00 20 */ addi r11, r1, 0x20 -/* 80083254 00080194 48 2D EF 81 */ bl func_803621D4 +/* 80083254 00080194 48 2D EF 81 */ bl _savegpr_27 /* 80083258 00080198 7C 7B 1B 78 */ mr r27, r3 /* 8008325C 0008019C 7C FC 3B 78 */ mr r28, r7 /* 80083260 000801A0 88 03 00 C4 */ lbz r0, 0xc4(r3) @@ -231,7 +231,7 @@ lbl_8008323C: /* 800832E4 00080224 4B FF FD A9 */ bl dBgWSv_NS_CrrPosWork lbl_800832E8: /* 800832E8 00080228 39 61 00 20 */ addi r11, r1, 0x20 -/* 800832EC 0008022C 48 2D EF 35 */ bl func_80362220 +/* 800832EC 0008022C 48 2D EF 35 */ bl _restgpr_27 /* 800832F0 00080230 80 01 00 24 */ lwz r0, 0x24(r1) /* 800832F4 00080234 7C 08 03 A6 */ mtlr r0 /* 800832F8 00080238 38 21 00 20 */ addi r1, r1, 0x20 @@ -385,7 +385,7 @@ lbl_80083514: /* 80083520 00080460 7C 08 02 A6 */ mflr r0 /* 80083524 00080464 90 01 00 24 */ stw r0, 0x24(r1) /* 80083528 00080468 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008352C 0008046C 48 2D EC A9 */ bl func_803621D4 +/* 8008352C 0008046C 48 2D EC A9 */ bl _savegpr_27 /* 80083530 00080470 7C 7B 1B 78 */ mr r27, r3 /* 80083534 00080474 7C FC 3B 78 */ mr r28, r7 /* 80083538 00080478 88 03 00 C4 */ lbz r0, 0xc4(r3) @@ -424,7 +424,7 @@ lbl_80083514: /* 800835BC 000804FC 4B FF FD 45 */ bl dBgWSv_NS_TransPosWork lbl_800835C0: /* 800835C0 00080500 39 61 00 20 */ addi r11, r1, 0x20 -/* 800835C4 00080504 48 2D EC 5D */ bl func_80362220 +/* 800835C4 00080504 48 2D EC 5D */ bl _restgpr_27 /* 800835C8 00080508 80 01 00 24 */ lwz r0, 0x24(r1) /* 800835CC 0008050C 7C 08 03 A6 */ mtlr r0 /* 800835D0 00080510 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/com/d_com_static.s b/asm/d/com/d_com_static.s index 3bd269a54c..3b29f476f0 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -387,7 +387,7 @@ daSus_c_NS_check: /* 80031438 0002E378 7C 08 02 A6 */ mflr r0 /* 8003143C 0002E37C 90 01 00 24 */ stw r0, 0x24(r1) /* 80031440 0002E380 39 61 00 20 */ addi r11, r1, 0x20 -/* 80031444 0002E384 48 33 0D 95 */ bl func_803621D8 +/* 80031444 0002E384 48 33 0D 95 */ bl _savegpr_28 /* 80031448 0002E388 7C 9C 23 78 */ mr r28, r4 /* 8003144C 0002E38C 3C 80 80 42 */ lis r4, lbl_80423FFC@ha /* 80031450 0002E390 38 04 3F FC */ addi r0, r4, lbl_80423FFC@l @@ -422,7 +422,7 @@ lbl_800314AC: /* 800314B8 0002E3F8 38 60 00 00 */ li r3, 0 lbl_800314BC: /* 800314BC 0002E3FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800314C0 0002E400 48 33 0D 65 */ bl func_80362224 +/* 800314C0 0002E400 48 33 0D 65 */ bl _restgpr_28 /* 800314C4 0002E404 80 01 00 24 */ lwz r0, 0x24(r1) /* 800314C8 0002E408 7C 08 03 A6 */ mtlr r0 /* 800314CC 0002E40C 38 21 00 20 */ addi r1, r1, 0x20 @@ -434,7 +434,7 @@ daSus_c_NS_check_X1_: /* 800314D8 0002E418 7C 08 02 A6 */ mflr r0 /* 800314DC 0002E41C 90 01 00 24 */ stw r0, 0x24(r1) /* 800314E0 0002E420 39 61 00 20 */ addi r11, r1, 0x20 -/* 800314E4 0002E424 48 33 0C F5 */ bl func_803621D8 +/* 800314E4 0002E424 48 33 0C F5 */ bl _savegpr_28 /* 800314E8 0002E428 7C 7F 1B 78 */ mr r31, r3 /* 800314EC 0002E42C 88 03 04 96 */ lbz r0, 0x496(r3) /* 800314F0 0002E430 28 00 00 01 */ cmplwi r0, 1 @@ -482,7 +482,7 @@ lbl_80031580: /* 80031588 0002E4C8 90 1F 04 9C */ stw r0, 0x49c(r31) lbl_8003158C: /* 8003158C 0002E4CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80031590 0002E4D0 48 33 0C 95 */ bl func_80362224 +/* 80031590 0002E4D0 48 33 0C 95 */ bl _restgpr_28 /* 80031594 0002E4D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80031598 0002E4D8 7C 08 03 A6 */ mtlr r0 /* 8003159C 0002E4DC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index 16161df822..c74fd83a39 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -833,7 +833,7 @@ lbl_8002BD74: /* 8002BD78 00028CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BD7C 00028CBC 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BD80 00028CC0 38 80 00 00 */ li r4, 0 -/* 8002BD84 00028CC4 48 00 6E 2D */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002BD84 00028CC4 48 00 6E 2D */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002BD88 00028CC8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BD8C 00028CCC 41 82 00 18 */ beq lbl_8002BDA4 /* 8002BD90 00028CD0 38 00 00 02 */ li r0, 2 @@ -881,7 +881,7 @@ lbl_8002BE18: /* 8002BE24 00028D64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BE28 00028D68 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BE2C 00028D6C 38 80 00 00 */ li r4, 0 -/* 8002BE30 00028D70 48 00 6D 81 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002BE30 00028D70 48 00 6D 81 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002BE34 00028D74 2C 03 00 00 */ cmpwi r3, 0 /* 8002BE38 00028D78 41 82 00 10 */ beq lbl_8002BE48 /* 8002BE3C 00028D7C 38 00 00 02 */ li r0, 2 @@ -937,7 +937,7 @@ lbl_8002BEC8: /* 8002BEF0 00028E30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BEF4 00028E34 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BEF8 00028E38 38 80 00 00 */ li r4, 0 -/* 8002BEFC 00028E3C 48 00 6C B5 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002BEFC 00028E3C 48 00 6C B5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002BF00 00028E40 2C 03 00 00 */ cmpwi r3, 0 /* 8002BF04 00028E44 41 82 08 28 */ beq lbl_8002C72C /* 8002BF08 00028E48 38 00 00 02 */ li r0, 2 @@ -962,7 +962,7 @@ lbl_8002BF48: /* 8002BF4C 00028E8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BF50 00028E90 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BF54 00028E94 38 80 00 00 */ li r4, 0 -/* 8002BF58 00028E98 48 00 6C 59 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002BF58 00028E98 48 00 6C 59 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002BF5C 00028E9C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BF60 00028EA0 41 82 00 10 */ beq lbl_8002BF70 /* 8002BF64 00028EA4 38 00 00 02 */ li r0, 2 @@ -997,7 +997,7 @@ lbl_8002BFC8: /* 8002BFCC 00028F0C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BFD0 00028F10 38 63 00 28 */ addi r3, r3, 0x28 /* 8002BFD4 00028F14 38 80 00 00 */ li r4, 0 -/* 8002BFD8 00028F18 48 00 6B D9 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002BFD8 00028F18 48 00 6B D9 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002BFDC 00028F1C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BFE0 00028F20 41 82 07 4C */ beq lbl_8002C72C /* 8002BFE4 00028F24 38 00 00 02 */ li r0, 2 @@ -1017,7 +1017,7 @@ lbl_8002BFF0: /* 8002C018 00028F58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C01C 00028F5C 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C020 00028F60 38 80 00 00 */ li r4, 0 -/* 8002C024 00028F64 48 00 6B 8D */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002C024 00028F64 48 00 6B 8D */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002C028 00028F68 2C 03 00 00 */ cmpwi r3, 0 /* 8002C02C 00028F6C 41 82 00 10 */ beq lbl_8002C03C /* 8002C030 00028F70 38 00 00 02 */ li r0, 2 @@ -1064,7 +1064,7 @@ lbl_8002C0BC: /* 8002C0C0 00029000 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C0C4 00029004 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C0C8 00029008 38 80 00 00 */ li r4, 0 -/* 8002C0CC 0002900C 48 00 6A E5 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002C0CC 0002900C 48 00 6A E5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002C0D0 00029010 2C 03 00 00 */ cmpwi r3, 0 /* 8002C0D4 00029014 41 82 00 10 */ beq lbl_8002C0E4 /* 8002C0D8 00029018 38 00 00 02 */ li r0, 2 @@ -1095,7 +1095,7 @@ lbl_8002C114: /* 8002C134 00029074 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C138 00029078 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C13C 0002907C 38 80 00 00 */ li r4, 0 -/* 8002C140 00029080 48 00 6A 71 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002C140 00029080 48 00 6A 71 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002C144 00029084 2C 03 00 00 */ cmpwi r3, 0 /* 8002C148 00029088 41 82 00 18 */ beq lbl_8002C160 /* 8002C14C 0002908C 38 00 00 02 */ li r0, 2 @@ -1442,7 +1442,7 @@ lbl_8002C610: /* 8002C630 00029570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C634 00029574 38 63 00 28 */ addi r3, r3, 0x28 /* 8002C638 00029578 38 80 00 03 */ li r4, 3 -/* 8002C63C 0002957C 48 00 65 B1 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8002C63C 0002957C 48 00 65 B1 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 8002C640 00029580 2C 03 00 00 */ cmpwi r3, 0 /* 8002C644 00029584 41 82 00 E8 */ beq lbl_8002C72C /* 8002C648 00029588 38 00 00 0D */ li r0, 0xd @@ -2240,7 +2240,7 @@ dComIfGd_setSimpleShadow: /* 8002D0D0 0002A010 DB A1 00 30 */ stfd f29, 0x30(r1) /* 8002D0D4 0002A014 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 8002D0D8 0002A018 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002D0DC 0002A01C 48 33 50 FD */ bl func_803621D8 +/* 8002D0DC 0002A01C 48 33 50 FD */ bl _savegpr_28 /* 8002D0E0 0002A020 7C 7C 1B 78 */ mr r28, r3 /* 8002D0E4 0002A024 FF A0 08 90 */ fmr f29, f1 /* 8002D0E8 0002A028 FF C0 10 90 */ fmr f30, f2 @@ -2289,7 +2289,7 @@ lbl_8002D17C: /* 8002D18C 0002A0CC E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 8002D190 0002A0D0 CB A1 00 30 */ lfd f29, 0x30(r1) /* 8002D194 0002A0D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002D198 0002A0D8 48 33 50 8D */ bl func_80362224 +/* 8002D198 0002A0D8 48 33 50 8D */ bl _restgpr_28 /* 8002D19C 0002A0DC 80 01 00 64 */ lwz r0, 0x64(r1) /* 8002D1A0 0002A0E0 7C 08 03 A6 */ mtlr r0 /* 8002D1A4 0002A0E4 38 21 00 60 */ addi r1, r1, 0x60 @@ -2298,7 +2298,7 @@ lbl_8002D17C: /* 8002D1B0 0002A0F0 7C 08 02 A6 */ mflr r0 /* 8002D1B4 0002A0F4 90 01 00 24 */ stw r0, 0x24(r1) /* 8002D1B8 0002A0F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002D1BC 0002A0FC 48 33 50 1D */ bl func_803621D8 +/* 8002D1BC 0002A0FC 48 33 50 1D */ bl _savegpr_28 /* 8002D1C0 0002A100 7C 7C 1B 78 */ mr r28, r3 /* 8002D1C4 0002A104 7C 9D 23 78 */ mr r29, r4 /* 8002D1C8 0002A108 7C BE 2B 78 */ mr r30, r5 @@ -2338,7 +2338,7 @@ lbl_8002D240: /* 8002D240 0002A180 38 60 00 00 */ li r3, 0 lbl_8002D244: /* 8002D244 0002A184 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002D248 0002A188 48 33 4F DD */ bl func_80362224 +/* 8002D248 0002A188 48 33 4F DD */ bl _restgpr_28 /* 8002D24C 0002A18C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002D250 0002A190 7C 08 03 A6 */ mtlr r0 /* 8002D254 0002A194 38 21 00 20 */ addi r1, r1, 0x20 @@ -2448,7 +2448,7 @@ lbl_8002D350: /* 8002D3BC 0002A2FC 38 A1 00 18 */ addi r5, r1, 0x18 /* 8002D3C0 0002A300 7E C6 B3 78 */ mr r6, r22 /* 8002D3C4 0002A304 7E A7 AB 78 */ mr r7, r21 -/* 8002D3C8 0002A308 48 00 5A 19 */ bl dSv_player_field_last_stay_info_c_NS_set +/* 8002D3C8 0002A308 48 00 5A 19 */ bl set__33dSv_player_field_last_stay_info_cFPCcRC4cXyzsScUc lbl_8002D3CC: /* 8002D3CC 0002A30C 7E E3 BB 78 */ mr r3, r23 /* 8002D3D0 0002A310 3C 80 80 38 */ lis r4, lbl_80378F38@ha @@ -3272,7 +3272,7 @@ lbl_8002DE80: /* 8002DEB8 0002ADF8 38 63 00 9C */ addi r3, r3, 0x9c /* 8002DEBC 0002ADFC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8002DEC0 0002AE00 38 A0 00 00 */ li r5, 0 -/* 8002DEC4 0002AE04 48 00 51 6D */ bl dSv_player_item_c_NS_getItem +/* 8002DEC4 0002AE04 48 00 51 6D */ bl getItem__17dSv_player_item_cCFib /* 8002DEC8 0002AE08 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8002DECC 0002AE0C 38 04 61 C0 */ addi r0, r4, lbl_804061C0@l /* 8002DED0 0002AE10 7C 80 FA 14 */ add r4, r0, r31 @@ -3325,7 +3325,7 @@ lbl_8002DF50: /* 8002DF74 0002AEB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DF78 0002AEB8 38 63 00 9C */ addi r3, r3, 0x9c /* 8002DF7C 0002AEBC 38 A0 00 00 */ li r5, 0 -/* 8002DF80 0002AEC0 48 00 50 B1 */ bl dSv_player_item_c_NS_getItem +/* 8002DF80 0002AEC0 48 00 50 B1 */ bl getItem__17dSv_player_item_cCFib /* 8002DF84 0002AEC4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002DF88 0002AEC8 28 00 00 43 */ cmplwi r0, 0x43 /* 8002DF8C 0002AECC 40 82 00 10 */ bne lbl_8002DF9C @@ -3586,7 +3586,7 @@ dComIfGp_destroySubExpHeap2D: /* 8002E2E0 0002B220 7C 08 02 A6 */ mflr r0 /* 8002E2E4 0002B224 90 01 00 24 */ stw r0, 0x24(r1) /* 8002E2E8 0002B228 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E2EC 0002B22C 48 33 3E E9 */ bl func_803621D4 +/* 8002E2EC 0002B22C 48 33 3E E9 */ bl _savegpr_27 /* 8002E2F0 0002B230 3B 60 00 00 */ li r27, 0 /* 8002E2F4 0002B234 3B E0 00 00 */ li r31, 0 /* 8002E2F8 0002B238 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -3606,7 +3606,7 @@ lbl_8002E320: /* 8002E328 0002B268 3B FF 00 04 */ addi r31, r31, 4 /* 8002E32C 0002B26C 41 80 FF D8 */ blt lbl_8002E304 /* 8002E330 0002B270 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E334 0002B274 48 33 3E ED */ bl func_80362220 +/* 8002E334 0002B274 48 33 3E ED */ bl _restgpr_27 /* 8002E338 0002B278 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002E33C 0002B27C 7C 08 03 A6 */ mtlr r0 /* 8002E340 0002B280 38 21 00 20 */ addi r1, r1, 0x20 @@ -3737,7 +3737,7 @@ dComIfGs_checkGetItem: /* 8002E4D0 0002B410 7C 08 02 A6 */ mflr r0 /* 8002E4D4 0002B414 90 01 00 24 */ stw r0, 0x24(r1) /* 8002E4D8 0002B418 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E4DC 0002B41C 48 33 3C F9 */ bl func_803621D4 +/* 8002E4DC 0002B41C 48 33 3C F9 */ bl _savegpr_27 /* 8002E4E0 0002B420 7C 7E 1B 78 */ mr r30, r3 /* 8002E4E4 0002B424 3B E0 00 00 */ li r31, 0 /* 8002E4E8 0002B428 3B 60 00 00 */ li r27, 0 @@ -3749,7 +3749,7 @@ lbl_8002E4FC: /* 8002E4FC 0002B43C 7F 83 E3 78 */ mr r3, r28 /* 8002E500 0002B440 7F 64 DB 78 */ mr r4, r27 /* 8002E504 0002B444 38 A0 00 01 */ li r5, 1 -/* 8002E508 0002B448 48 00 4B 29 */ bl dSv_player_item_c_NS_getItem +/* 8002E508 0002B448 48 00 4B 29 */ bl getItem__17dSv_player_item_cCFib /* 8002E50C 0002B44C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002E510 0002B450 7C 1D 00 40 */ cmplw r29, r0 /* 8002E514 0002B454 40 82 00 10 */ bne lbl_8002E524 @@ -3792,7 +3792,7 @@ lbl_8002E578: lbl_8002E59C: /* 8002E59C 0002B4DC 7F E3 FB 78 */ mr r3, r31 /* 8002E5A0 0002B4E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E5A4 0002B4E4 48 33 3C 7D */ bl func_80362220 +/* 8002E5A4 0002B4E4 48 33 3C 7D */ bl _restgpr_27 /* 8002E5A8 0002B4E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002E5AC 0002B4EC 7C 08 03 A6 */ mtlr r0 /* 8002E5B0 0002B4F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3909,7 +3909,7 @@ dComIfGp_setSelectItemNum: /* 8002E718 0002B658 7C 08 02 A6 */ mflr r0 /* 8002E71C 0002B65C 90 01 00 24 */ stw r0, 0x24(r1) /* 8002E720 0002B660 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E724 0002B664 48 33 3A B5 */ bl func_803621D8 +/* 8002E724 0002B664 48 33 3A B5 */ bl _savegpr_28 /* 8002E728 0002B668 7C 7C 1B 78 */ mr r28, r3 /* 8002E72C 0002B66C 7C 9F 23 78 */ mr r31, r4 /* 8002E730 0002B670 4B FF F7 ED */ bl dComIfGp_getSelectItem @@ -3980,7 +3980,7 @@ lbl_8002E80C: /* 8002E820 0002B760 48 00 57 6D */ bl dSv_player_item_record_c_NS_setBottleNum lbl_8002E824: /* 8002E824 0002B764 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002E828 0002B768 48 33 39 FD */ bl func_80362224 +/* 8002E828 0002B768 48 33 39 FD */ bl _restgpr_28 /* 8002E82C 0002B76C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002E830 0002B770 7C 08 03 A6 */ mtlr r0 /* 8002E834 0002B774 38 21 00 20 */ addi r1, r1, 0x20 @@ -4200,7 +4200,7 @@ lbl_8002EAD8: /* 8002EB3C 0002BA7C 38 C0 00 00 */ li r6, 0 /* 8002EB40 0002BA80 38 E0 00 00 */ li r7, 0 /* 8002EB44 0002BA84 39 00 00 04 */ li r8, 4 -/* 8002EB48 0002BA88 48 00 42 99 */ bl dSv_player_field_last_stay_info_c_NS_set +/* 8002EB48 0002BA88 48 00 42 99 */ bl set__33dSv_player_field_last_stay_info_cFPCcRC4cXyzsScUc /* 8002EB4C 0002BA8C 48 00 00 A4 */ b lbl_8002EBF0 lbl_8002EB50: /* 8002EB50 0002BA90 3B 60 00 00 */ li r27, 0 @@ -4655,7 +4655,7 @@ dComIfG_play_c_NS_setWarpItemData: /* 8002F14C 0002C08C 7D 1E 43 78 */ mr r30, r8 /* 8002F150 0002C090 7D 3F 4B 78 */ mr r31, r9 /* 8002F154 0002C094 38 7A 4F 94 */ addi r3, r26, 0x4f94 -/* 8002F158 0002C098 48 33 99 D5 */ bl func_80368B2C +/* 8002F158 0002C098 48 33 99 D5 */ bl strcpy /* 8002F15C 0002C09C C0 1B 00 00 */ lfs f0, 0(r27) /* 8002F160 0002C0A0 D0 1A 4F 9C */ stfs f0, 0x4f9c(r26) /* 8002F164 0002C0A4 C0 1B 00 04 */ lfs f0, 4(r27) @@ -4740,7 +4740,7 @@ dComIfGs_setLastWarpMarkItemData: /* 8002F288 0002C1C8 7D 66 5B 78 */ mr r6, r11 /* 8002F28C 0002C1CC 7D 47 53 78 */ mr r7, r10 /* 8002F290 0002C1D0 7C 08 03 78 */ mr r8, r0 -/* 8002F294 0002C1D4 48 00 3C 99 */ bl dSv_player_last_mark_info_c_NS_setWarpItemData +/* 8002F294 0002C1D4 48 00 3C 99 */ bl setWarpItemData__27dSv_player_last_mark_info_cFPCcRC4cXyzsScUcUc /* 8002F298 0002C1D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002F29C 0002C1DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002F2A0 0002C1E0 7C 08 03 A6 */ mtlr r0 @@ -4799,7 +4799,7 @@ dComIfGs_setWarpMarkFlag: /* 8002F32C 0002C26C 7C 08 02 A6 */ mflr r0 /* 8002F330 0002C270 90 01 00 24 */ stw r0, 0x24(r1) /* 8002F334 0002C274 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F338 0002C278 48 33 2E 9D */ bl func_803621D4 +/* 8002F338 0002C278 48 33 2E 9D */ bl _savegpr_27 /* 8002F33C 0002C27C 7C 7B 1B 79 */ or. r27, r3, r3 /* 8002F340 0002C280 7C 9C 23 78 */ mr r28, r4 /* 8002F344 0002C284 41 82 00 54 */ beq lbl_8002F398 @@ -4829,7 +4829,7 @@ lbl_8002F388: lbl_8002F398: /* 8002F398 0002C2D8 7F 63 DB 78 */ mr r3, r27 /* 8002F39C 0002C2DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F3A0 0002C2E0 48 33 2E 81 */ bl func_80362220 +/* 8002F3A0 0002C2E0 48 33 2E 81 */ bl _restgpr_27 /* 8002F3A4 0002C2E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002F3A8 0002C2E8 7C 08 03 A6 */ mtlr r0 /* 8002F3AC 0002C2EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -5181,12 +5181,12 @@ lbl_8002F854: /* 8002F85C 0002C79C 3B C3 00 28 */ addi r30, r3, 0x28 /* 8002F860 0002C7A0 7F C3 F3 78 */ mr r3, r30 /* 8002F864 0002C7A4 38 80 00 00 */ li r4, 0 -/* 8002F868 0002C7A8 48 00 33 85 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8002F868 0002C7A8 48 00 33 85 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 8002F86C 0002C7AC 2C 03 00 00 */ cmpwi r3, 0 /* 8002F870 0002C7B0 41 82 00 20 */ beq lbl_8002F890 /* 8002F874 0002C7B4 7F C3 F3 78 */ mr r3, r30 /* 8002F878 0002C7B8 38 80 00 00 */ li r4, 0 -/* 8002F87C 0002C7BC 48 00 33 35 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002F87C 0002C7BC 48 00 33 35 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002F880 0002C7C0 2C 03 00 00 */ cmpwi r3, 0 /* 8002F884 0002C7C4 40 82 00 0C */ bne lbl_8002F890 /* 8002F888 0002C7C8 3B E0 00 01 */ li r31, 1 @@ -5194,12 +5194,12 @@ lbl_8002F854: lbl_8002F890: /* 8002F890 0002C7D0 7F C3 F3 78 */ mr r3, r30 /* 8002F894 0002C7D4 38 80 00 01 */ li r4, 1 -/* 8002F898 0002C7D8 48 00 33 55 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8002F898 0002C7D8 48 00 33 55 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 8002F89C 0002C7DC 2C 03 00 00 */ cmpwi r3, 0 /* 8002F8A0 0002C7E0 41 82 00 20 */ beq lbl_8002F8C0 /* 8002F8A4 0002C7E4 7F C3 F3 78 */ mr r3, r30 /* 8002F8A8 0002C7E8 38 80 00 01 */ li r4, 1 -/* 8002F8AC 0002C7EC 48 00 33 05 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002F8AC 0002C7EC 48 00 33 05 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002F8B0 0002C7F0 2C 03 00 00 */ cmpwi r3, 0 /* 8002F8B4 0002C7F4 40 82 00 0C */ bne lbl_8002F8C0 /* 8002F8B8 0002C7F8 3B E0 00 01 */ li r31, 1 @@ -5207,12 +5207,12 @@ lbl_8002F890: lbl_8002F8C0: /* 8002F8C0 0002C800 7F C3 F3 78 */ mr r3, r30 /* 8002F8C4 0002C804 38 80 00 02 */ li r4, 2 -/* 8002F8C8 0002C808 48 00 33 25 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8002F8C8 0002C808 48 00 33 25 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 8002F8CC 0002C80C 2C 03 00 00 */ cmpwi r3, 0 /* 8002F8D0 0002C810 41 82 00 20 */ beq lbl_8002F8F0 /* 8002F8D4 0002C814 7F C3 F3 78 */ mr r3, r30 /* 8002F8D8 0002C818 38 80 00 02 */ li r4, 2 -/* 8002F8DC 0002C81C 48 00 32 D5 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002F8DC 0002C81C 48 00 32 D5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002F8E0 0002C820 2C 03 00 00 */ cmpwi r3, 0 /* 8002F8E4 0002C824 40 82 00 0C */ bne lbl_8002F8F0 /* 8002F8E8 0002C828 3B E0 00 01 */ li r31, 1 @@ -5220,12 +5220,12 @@ lbl_8002F8C0: lbl_8002F8F0: /* 8002F8F0 0002C830 7F C3 F3 78 */ mr r3, r30 /* 8002F8F4 0002C834 38 80 00 03 */ li r4, 3 -/* 8002F8F8 0002C838 48 00 32 F5 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8002F8F8 0002C838 48 00 32 F5 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 8002F8FC 0002C83C 2C 03 00 00 */ cmpwi r3, 0 /* 8002F900 0002C840 41 82 00 1C */ beq lbl_8002F91C /* 8002F904 0002C844 7F C3 F3 78 */ mr r3, r30 /* 8002F908 0002C848 38 80 00 03 */ li r4, 3 -/* 8002F90C 0002C84C 48 00 32 A5 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8002F90C 0002C84C 48 00 32 A5 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8002F910 0002C850 2C 03 00 00 */ cmpwi r3, 0 /* 8002F914 0002C854 40 82 00 08 */ bne lbl_8002F91C /* 8002F918 0002C858 3B E0 00 01 */ li r31, 1 @@ -5421,7 +5421,7 @@ dComIfGs_onVisitedRoom: /* 8002FB84 0002CAC4 7C 08 02 A6 */ mflr r0 /* 8002FB88 0002CAC8 90 01 00 24 */ stw r0, 0x24(r1) /* 8002FB8C 0002CACC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FB90 0002CAD0 48 33 26 49 */ bl func_803621D8 +/* 8002FB90 0002CAD0 48 33 26 49 */ bl _savegpr_28 /* 8002FB94 0002CAD4 7C 7C 1B 78 */ mr r28, r3 /* 8002FB98 0002CAD8 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 8002FB9C 0002CADC 38 63 60 94 */ addi r3, r3, lbl_803F6094@l @@ -5442,12 +5442,12 @@ dComIfGs_onVisitedRoom: /* 8002FBD8 0002CB18 3B E3 00 64 */ addi r31, r3, 0x64 /* 8002FBDC 0002CB1C 7F E3 FB 78 */ mr r3, r31 /* 8002FBE0 0002CB20 7F C4 F3 78 */ mr r4, r30 -/* 8002FBE4 0002CB24 48 00 32 95 */ bl dSv_player_field_last_stay_info_c_NS_isRegionBit +/* 8002FBE4 0002CB24 48 00 32 95 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi /* 8002FBE8 0002CB28 2C 03 00 00 */ cmpwi r3, 0 /* 8002FBEC 0002CB2C 40 82 00 10 */ bne lbl_8002FBFC /* 8002FBF0 0002CB30 7F E3 FB 78 */ mr r3, r31 /* 8002FBF4 0002CB34 7F C4 F3 78 */ mr r4, r30 -/* 8002FBF8 0002CB38 48 00 32 55 */ bl dSv_player_field_last_stay_info_c_NS_onRegionBit +/* 8002FBF8 0002CB38 48 00 32 55 */ bl onRegionBit__33dSv_player_field_last_stay_info_cFi lbl_8002FBFC: /* 8002FBFC 0002CB3C 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8002FC00 0002CB40 7C 00 07 74 */ extsb r0, r0 @@ -5461,7 +5461,7 @@ lbl_8002FBFC: /* 8002FC20 0002CB60 48 00 4E 85 */ bl dSv_memory2_c_NS_onVisitedRoom lbl_8002FC24: /* 8002FC24 0002CB64 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FC28 0002CB68 48 33 25 FD */ bl func_80362224 +/* 8002FC28 0002CB68 48 33 25 FD */ bl _restgpr_28 /* 8002FC2C 0002CB6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002FC30 0002CB70 7C 08 03 A6 */ mtlr r0 /* 8002FC34 0002CB74 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_attention.s b/asm/d/d_attention.s index 4001968a34..1ba2bd5fe8 100644 --- a/asm/d/d_attention.s +++ b/asm/d/d_attention.s @@ -600,7 +600,7 @@ dAttention_c_NS_getActionBtnB: /* 80070884 0006D7C4 7C 08 02 A6 */ mflr r0 /* 80070888 0006D7C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8007088C 0006D7CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80070890 0006D7D0 48 2F 19 49 */ bl func_803621D8 +/* 80070890 0006D7D0 48 2F 19 49 */ bl _savegpr_28 /* 80070894 0006D7D4 7C 7C 1B 78 */ mr r28, r3 /* 80070898 0006D7D8 38 80 00 00 */ li r4, 0 /* 8007089C 0006D7DC 4B FF FF A9 */ bl dAttention_c_NS_GetLockonList @@ -659,7 +659,7 @@ lbl_8007094C: /* 80070958 0006D898 38 60 00 00 */ li r3, 0 lbl_8007095C: /* 8007095C 0006D89C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80070960 0006D8A0 48 2F 18 C5 */ bl func_80362224 +/* 80070960 0006D8A0 48 2F 18 C5 */ bl _restgpr_28 /* 80070964 0006D8A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80070968 0006D8A8 7C 08 03 A6 */ mtlr r0 /* 8007096C 0006D8AC 38 21 00 20 */ addi r1, r1, 0x20 @@ -671,7 +671,7 @@ dAttention_c_NS_getActionBtnXY: /* 80070978 0006D8B8 7C 08 02 A6 */ mflr r0 /* 8007097C 0006D8BC 90 01 00 24 */ stw r0, 0x24(r1) /* 80070980 0006D8C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80070984 0006D8C4 48 2F 18 55 */ bl func_803621D8 +/* 80070984 0006D8C4 48 2F 18 55 */ bl _savegpr_28 /* 80070988 0006D8C8 7C 7C 1B 78 */ mr r28, r3 /* 8007098C 0006D8CC 38 80 00 00 */ li r4, 0 /* 80070990 0006D8D0 4B FF FE B5 */ bl dAttention_c_NS_GetLockonList @@ -732,7 +732,7 @@ lbl_80070A48: /* 80070A54 0006D994 38 60 00 00 */ li r3, 0 lbl_80070A58: /* 80070A58 0006D998 39 61 00 20 */ addi r11, r1, 0x20 -/* 80070A5C 0006D99C 48 2F 17 C9 */ bl func_80362224 +/* 80070A5C 0006D99C 48 2F 17 C9 */ bl _restgpr_28 /* 80070A60 0006D9A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80070A64 0006D9A4 7C 08 03 A6 */ mtlr r0 /* 80070A68 0006D9A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1324,7 +1324,7 @@ dAttention_c_NS_initList: /* 80071244 0006E184 7C 08 02 A6 */ mflr r0 /* 80071248 0006E188 90 01 00 24 */ stw r0, 0x24(r1) /* 8007124C 0006E18C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80071250 0006E190 48 2F 0F 85 */ bl func_803621D4 +/* 80071250 0006E190 48 2F 0F 85 */ bl _savegpr_27 /* 80071254 0006E194 7C 7F 1B 78 */ mr r31, r3 /* 80071258 0006E198 90 83 00 10 */ stw r4, 0x10(r3) /* 8007125C 0006E19C 80 03 03 34 */ lwz r0, 0x334(r3) @@ -1404,7 +1404,7 @@ lbl_80071340: /* 8007136C 0006E2AC 60 00 10 00 */ ori r0, r0, 0x1000 /* 80071370 0006E2B0 90 1F 03 34 */ stw r0, 0x334(r31) /* 80071374 0006E2B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80071378 0006E2B8 48 2F 0E A9 */ bl func_80362220 +/* 80071378 0006E2B8 48 2F 0E A9 */ bl _restgpr_27 /* 8007137C 0006E2BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80071380 0006E2C0 7C 08 03 A6 */ mtlr r0 /* 80071384 0006E2C4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1935,7 +1935,7 @@ dAttention_c_NS_chaseAttention: /* 80071AA4 0006E9E4 DB E1 00 60 */ stfd f31, 0x60(r1) /* 80071AA8 0006E9E8 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 80071AAC 0006E9EC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80071AB0 0006E9F0 48 2F 07 29 */ bl func_803621D8 +/* 80071AB0 0006E9F0 48 2F 07 29 */ bl _savegpr_28 /* 80071AB4 0006E9F4 7C 7D 1B 78 */ mr r29, r3 /* 80071AB8 0006E9F8 80 03 03 DC */ lwz r0, 0x3dc(r3) /* 80071ABC 0006E9FC 1F E0 00 14 */ mulli r31, r0, 0x14 @@ -2070,7 +2070,7 @@ lbl_80071CA0: /* 80071CA0 0006EBE0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 80071CA4 0006EBE4 CB E1 00 60 */ lfd f31, 0x60(r1) /* 80071CA8 0006EBE8 39 61 00 60 */ addi r11, r1, 0x60 -/* 80071CAC 0006EBEC 48 2F 05 79 */ bl func_80362224 +/* 80071CAC 0006EBEC 48 2F 05 79 */ bl _restgpr_28 /* 80071CB0 0006EBF0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80071CB4 0006EBF4 7C 08 03 A6 */ mtlr r0 /* 80071CB8 0006EBF8 38 21 00 70 */ addi r1, r1, 0x70 @@ -3466,7 +3466,7 @@ dAttDraw_c_NS_alphaAnm: /* 80073010 0006FF50 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80073014 0006FF54 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80073018 0006FF58 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007301C 0006FF5C 48 2E F1 BD */ bl func_803621D8 +/* 8007301C 0006FF5C 48 2E F1 BD */ bl _savegpr_28 /* 80073020 0006FF60 7C 7F 1B 78 */ mr r31, r3 /* 80073024 0006FF64 88 03 01 72 */ lbz r0, 0x172(r3) /* 80073028 0006FF68 C8 42 8C A8 */ lfd f2, lbl_804526A8-_SDA2_BASE_(r2) @@ -3638,7 +3638,7 @@ lbl_8007328C: /* 8007328C 000701CC E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80073290 000701D0 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80073294 000701D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80073298 000701D8 48 2E EF 8D */ bl func_80362224 +/* 80073298 000701D8 48 2E EF 8D */ bl _restgpr_28 /* 8007329C 000701DC 80 01 00 44 */ lwz r0, 0x44(r1) /* 800732A0 000701E0 7C 08 03 A6 */ mtlr r0 /* 800732A4 000701E4 38 21 00 40 */ addi r1, r1, 0x40 @@ -3655,7 +3655,7 @@ dAttDraw_c_NS_draw: /* 800732C4 00070204 DB C1 00 40 */ stfd f30, 0x40(r1) /* 800732C8 00070208 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 800732CC 0007020C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800732D0 00070210 48 2E EF 05 */ bl func_803621D4 +/* 800732D0 00070210 48 2E EF 05 */ bl _savegpr_27 /* 800732D4 00070214 7C 7D 1B 78 */ mr r29, r3 /* 800732D8 00070218 7C 9E 23 78 */ mr r30, r4 /* 800732DC 0007021C 7C BB 2B 78 */ mr r27, r5 @@ -3808,7 +3808,7 @@ lbl_800734D0: /* 8007351C 0007045C E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 80073520 00070460 CB C1 00 40 */ lfd f30, 0x40(r1) /* 80073524 00070464 39 61 00 40 */ addi r11, r1, 0x40 -/* 80073528 00070468 48 2E EC F9 */ bl func_80362220 +/* 80073528 00070468 48 2E EC F9 */ bl _restgpr_27 /* 8007352C 0007046C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80073530 00070470 7C 08 03 A6 */ mtlr r0 /* 80073534 00070474 38 21 00 60 */ addi r1, r1, 0x60 @@ -4435,7 +4435,7 @@ dAttLook_c_NS_proc: /* 80073D24 00070C64 DB A1 00 60 */ stfd f29, 0x60(r1) /* 80073D28 00070C68 F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 80073D2C 00070C6C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80073D30 00070C70 48 2E E4 A5 */ bl func_803621D4 +/* 80073D30 00070C70 48 2E E4 A5 */ bl _savegpr_27 /* 80073D34 00070C74 7C 7C 1B 78 */ mr r28, r3 /* 80073D38 00070C78 7C 9D 23 78 */ mr r29, r4 /* 80073D3C 00070C7C FF E0 08 90 */ fmr f31, f1 @@ -4617,7 +4617,7 @@ lbl_80073F94: /* 80073FA4 00070EE4 E3 A1 00 68 */ psq_l f29, 104(r1), 0, qr0 /* 80073FA8 00070EE8 CB A1 00 60 */ lfd f29, 0x60(r1) /* 80073FAC 00070EEC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80073FB0 00070EF0 48 2E E2 71 */ bl func_80362220 +/* 80073FB0 00070EF0 48 2E E2 71 */ bl _restgpr_27 /* 80073FB4 00070EF4 80 01 00 94 */ lwz r0, 0x94(r1) /* 80073FB8 00070EF8 7C 08 03 A6 */ mtlr r0 /* 80073FBC 00070EFC 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index b26e400da1..ca41935cd0 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -157,7 +157,7 @@ _unnamed_d_camera_cpp__NS_relationalPos2: /* 8015FC0C 0015CB4C DB C1 01 20 */ stfd f30, 0x120(r1) /* 8015FC10 0015CB50 F3 C1 01 28 */ psq_st f30, 296(r1), 0, qr0 /* 8015FC14 0015CB54 39 61 01 20 */ addi r11, r1, 0x120 -/* 8015FC18 0015CB58 48 20 25 BD */ bl func_803621D4 +/* 8015FC18 0015CB58 48 20 25 BD */ bl _savegpr_27 /* 8015FC1C 0015CB5C 7C 7F 1B 78 */ mr r31, r3 /* 8015FC20 0015CB60 7C 9B 23 79 */ or. r27, r4, r4 /* 8015FC24 0015CB64 7C BC 2B 78 */ mr r28, r5 @@ -324,7 +324,7 @@ lbl_8015FE90: /* 8015FE98 0015CDD8 E3 C1 01 28 */ psq_l f30, 296(r1), 0, qr0 /* 8015FE9C 0015CDDC CB C1 01 20 */ lfd f30, 0x120(r1) /* 8015FEA0 0015CDE0 39 61 01 20 */ addi r11, r1, 0x120 -/* 8015FEA4 0015CDE4 48 20 23 7D */ bl func_80362220 +/* 8015FEA4 0015CDE4 48 20 23 7D */ bl _restgpr_27 /* 8015FEA8 0015CDE8 80 01 01 44 */ lwz r0, 0x144(r1) /* 8015FEAC 0015CDEC 7C 08 03 A6 */ mtlr r0 /* 8015FEB0 0015CDF0 38 21 01 40 */ addi r1, r1, 0x140 @@ -2645,7 +2645,7 @@ dCamera_c_NS_checkForceLockTarget: /* 8016208C 0015EFCC 7C 08 02 A6 */ mflr r0 /* 80162090 0015EFD0 90 01 00 64 */ stw r0, 0x64(r1) /* 80162094 0015EFD4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80162098 0015EFD8 48 20 01 41 */ bl func_803621D8 +/* 80162098 0015EFD8 48 20 01 41 */ bl _savegpr_28 /* 8016209C 0015EFDC 7C 7E 1B 78 */ mr r30, r3 /* 801620A0 0015EFE0 3B E0 00 01 */ li r31, 1 /* 801620A4 0015EFE4 80 83 01 98 */ lwz r4, 0x198(r3) @@ -2788,7 +2788,7 @@ lbl_80162290: lbl_80162294: /* 80162294 0015F1D4 7F E3 FB 78 */ mr r3, r31 /* 80162298 0015F1D8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8016229C 0015F1DC 48 1F FF 89 */ bl func_80362224 +/* 8016229C 0015F1DC 48 1F FF 89 */ bl _restgpr_28 /* 801622A0 0015F1E0 80 01 00 64 */ lwz r0, 0x64(r1) /* 801622A4 0015F1E4 7C 08 03 A6 */ mtlr r0 /* 801622A8 0015F1E8 38 21 00 60 */ addi r1, r1, 0x60 @@ -3849,7 +3849,7 @@ dCamera_c_NS_setStageMapToolData: /* 80163180 001600C0 7C 08 02 A6 */ mflr r0 /* 80163184 001600C4 90 01 00 24 */ stw r0, 0x24(r1) /* 80163188 001600C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8016318C 001600CC 48 1F F0 49 */ bl func_803621D4 +/* 8016318C 001600CC 48 1F F0 49 */ bl _savegpr_27 /* 80163190 001600D0 7C 7E 1B 78 */ mr r30, r3 /* 80163194 001600D4 3B 80 00 FF */ li r28, 0xff /* 80163198 001600D8 38 60 00 FF */ li r3, 0xff @@ -3957,7 +3957,7 @@ lbl_801632C0: /* 80163324 00160264 B0 1E 08 12 */ sth r0, 0x812(r30) lbl_80163328: /* 80163328 00160268 39 61 00 20 */ addi r11, r1, 0x20 -/* 8016332C 0016026C 48 1F EE F5 */ bl func_80362220 +/* 8016332C 0016026C 48 1F EE F5 */ bl _restgpr_27 /* 80163330 00160270 80 01 00 24 */ lwz r0, 0x24(r1) /* 80163334 00160274 7C 08 03 A6 */ mtlr r0 /* 80163338 00160278 38 21 00 20 */ addi r1, r1, 0x20 @@ -5692,7 +5692,7 @@ dCamera_c_NS_GetCameraTypeFromCameraName: /* 80164B68 00161AA8 7C 08 02 A6 */ mflr r0 /* 80164B6C 00161AAC 90 01 00 24 */ stw r0, 0x24(r1) /* 80164B70 00161AB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80164B74 00161AB4 48 1F D6 65 */ bl func_803621D8 +/* 80164B74 00161AB4 48 1F D6 65 */ bl _savegpr_28 /* 80164B78 00161AB8 7C 7C 1B 78 */ mr r28, r3 /* 80164B7C 00161ABC 7C 9D 23 78 */ mr r29, r4 /* 80164B80 00161AC0 7F A3 EB 78 */ mr r3, r29 @@ -5732,7 +5732,7 @@ lbl_80164BF4: /* 80164BF4 00161B34 7F C3 F3 78 */ mr r3, r30 lbl_80164BF8: /* 80164BF8 00161B38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80164BFC 00161B3C 48 1F D6 29 */ bl func_80362224 +/* 80164BFC 00161B3C 48 1F D6 29 */ bl _restgpr_28 /* 80164C00 00161B40 80 01 00 24 */ lwz r0, 0x24(r1) /* 80164C04 00161B44 7C 08 03 A6 */ mtlr r0 /* 80164C08 00161B48 38 21 00 20 */ addi r1, r1, 0x20 @@ -5848,7 +5848,7 @@ dCamera_c_NS_relationalPos: /* 80164D70 00161CB0 7C 08 02 A6 */ mflr r0 /* 80164D74 00161CB4 90 01 00 44 */ stw r0, 0x44(r1) /* 80164D78 00161CB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80164D7C 00161CBC 48 1F D4 5D */ bl func_803621D8 +/* 80164D7C 00161CBC 48 1F D4 5D */ bl _savegpr_28 /* 80164D80 00161CC0 7C 7C 1B 78 */ mr r28, r3 /* 80164D84 00161CC4 7C 9D 23 78 */ mr r29, r4 /* 80164D88 00161CC8 7C BE 2B 79 */ or. r30, r5, r5 @@ -5886,7 +5886,7 @@ lbl_80164DB4: /* 80164E04 00161D44 48 10 1C E1 */ bl cXyz_NS___pl lbl_80164E08: /* 80164E08 00161D48 39 61 00 40 */ addi r11, r1, 0x40 -/* 80164E0C 00161D4C 48 1F D4 19 */ bl func_80362224 +/* 80164E0C 00161D4C 48 1F D4 19 */ bl _restgpr_28 /* 80164E10 00161D50 80 01 00 44 */ lwz r0, 0x44(r1) /* 80164E14 00161D54 7C 08 03 A6 */ mtlr r0 /* 80164E18 00161D58 38 21 00 40 */ addi r1, r1, 0x40 @@ -5902,7 +5902,7 @@ dCamera_c_NS_relationalPos_X1_: /* 80164E34 00161D74 DB C1 01 40 */ stfd f30, 0x140(r1) /* 80164E38 00161D78 F3 C1 01 48 */ psq_st f30, 328(r1), 0, qr0 /* 80164E3C 00161D7C 39 61 01 40 */ addi r11, r1, 0x140 -/* 80164E40 00161D80 48 1F D3 95 */ bl func_803621D4 +/* 80164E40 00161D80 48 1F D3 95 */ bl _savegpr_27 /* 80164E44 00161D84 7C 7F 1B 78 */ mr r31, r3 /* 80164E48 00161D88 7C 9B 23 78 */ mr r27, r4 /* 80164E4C 00161D8C 7C BC 2B 79 */ or. r28, r5, r5 @@ -6078,7 +6078,7 @@ lbl_801650DC: /* 801650E4 00162024 E3 C1 01 48 */ psq_l f30, 328(r1), 0, qr0 /* 801650E8 00162028 CB C1 01 40 */ lfd f30, 0x140(r1) /* 801650EC 0016202C 39 61 01 40 */ addi r11, r1, 0x140 -/* 801650F0 00162030 48 1F D1 31 */ bl func_80362220 +/* 801650F0 00162030 48 1F D1 31 */ bl _restgpr_27 /* 801650F4 00162034 80 01 01 64 */ lwz r0, 0x164(r1) /* 801650F8 00162038 7C 08 03 A6 */ mtlr r0 /* 801650FC 0016203C 38 21 01 60 */ addi r1, r1, 0x160 @@ -6629,7 +6629,7 @@ dCamera_c_NS_lineBGCheck: /* 801658C4 00162804 7C 08 02 A6 */ mflr r0 /* 801658C8 00162808 90 01 00 24 */ stw r0, 0x24(r1) /* 801658CC 0016280C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801658D0 00162810 48 1F C9 09 */ bl func_803621D8 +/* 801658D0 00162810 48 1F C9 09 */ bl _savegpr_28 /* 801658D4 00162814 7C 9C 23 78 */ mr r28, r4 /* 801658D8 00162818 7C BD 2B 78 */ mr r29, r5 /* 801658DC 0016281C 7C DF 33 78 */ mr r31, r6 @@ -6709,7 +6709,7 @@ lbl_801659D8: /* 801659D8 00162918 38 60 00 00 */ li r3, 0 lbl_801659DC: /* 801659DC 0016291C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801659E0 00162920 48 1F C8 45 */ bl func_80362224 +/* 801659E0 00162920 48 1F C8 45 */ bl _restgpr_28 /* 801659E4 00162924 80 01 00 24 */ lwz r0, 0x24(r1) /* 801659E8 00162928 7C 08 03 A6 */ mtlr r0 /* 801659EC 0016292C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6721,7 +6721,7 @@ dCamera_c_NS_lineBGCheck_X1_: /* 801659F8 00162938 7C 08 02 A6 */ mflr r0 /* 801659FC 0016293C 90 01 00 B4 */ stw r0, 0xb4(r1) /* 80165A00 00162940 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80165A04 00162944 48 1F C7 D1 */ bl func_803621D4 +/* 80165A04 00162944 48 1F C7 D1 */ bl _savegpr_27 /* 80165A08 00162948 7C 7B 1B 78 */ mr r27, r3 /* 80165A0C 0016294C 7C 9C 23 78 */ mr r28, r4 /* 80165A10 00162950 7C BD 2B 78 */ mr r29, r5 @@ -6777,7 +6777,7 @@ lbl_80165AB0: /* 80165AD4 00162A14 38 60 00 00 */ li r3, 0 lbl_80165AD8: /* 80165AD8 00162A18 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80165ADC 00162A1C 48 1F C7 45 */ bl func_80362220 +/* 80165ADC 00162A1C 48 1F C7 45 */ bl _restgpr_27 /* 80165AE0 00162A20 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80165AE4 00162A24 7C 08 03 A6 */ mtlr r0 /* 80165AE8 00162A28 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -6789,7 +6789,7 @@ dCamera_c_NS_lineBGCheck_X2_: /* 80165AF4 00162A34 7C 08 02 A6 */ mflr r0 /* 80165AF8 00162A38 90 01 00 94 */ stw r0, 0x94(r1) /* 80165AFC 00162A3C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80165B00 00162A40 48 1F C6 D9 */ bl func_803621D8 +/* 80165B00 00162A40 48 1F C6 D9 */ bl _savegpr_28 /* 80165B04 00162A44 7C 7C 1B 78 */ mr r28, r3 /* 80165B08 00162A48 7C 9D 23 78 */ mr r29, r4 /* 80165B0C 00162A4C 7C BE 2B 78 */ mr r30, r5 @@ -6808,7 +6808,7 @@ dCamera_c_NS_lineBGCheck_X2_: /* 80165B40 00162A80 4B F1 22 C1 */ bl dBgS_CamLinChk_NS_dtor /* 80165B44 00162A84 7F E3 FB 78 */ mr r3, r31 /* 80165B48 00162A88 39 61 00 90 */ addi r11, r1, 0x90 -/* 80165B4C 00162A8C 48 1F C6 D9 */ bl func_80362224 +/* 80165B4C 00162A8C 48 1F C6 D9 */ bl _restgpr_28 /* 80165B50 00162A90 80 01 00 94 */ lwz r0, 0x94(r1) /* 80165B54 00162A94 7C 08 03 A6 */ mtlr r0 /* 80165B58 00162A98 38 21 00 90 */ addi r1, r1, 0x90 @@ -6820,7 +6820,7 @@ dCamera_c_NS_lineCollisionCheckBush: /* 80165B64 00162AA4 7C 08 02 A6 */ mflr r0 /* 80165B68 00162AA8 90 01 00 44 */ stw r0, 0x44(r1) /* 80165B6C 00162AAC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80165B70 00162AB0 48 1F C6 69 */ bl func_803621D8 +/* 80165B70 00162AB0 48 1F C6 69 */ bl _savegpr_28 /* 80165B74 00162AB4 7C 9C 23 78 */ mr r28, r4 /* 80165B78 00162AB8 7C BD 2B 78 */ mr r29, r5 /* 80165B7C 00162ABC 3B C0 00 00 */ li r30, 0 @@ -6856,7 +6856,7 @@ lbl_80165BB8: /* 80165BE8 00162B28 48 10 93 BD */ bl cM3dGCps_NS_dtor /* 80165BEC 00162B2C 7F C3 F3 78 */ mr r3, r30 /* 80165BF0 00162B30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80165BF4 00162B34 48 1F C6 31 */ bl func_80362224 +/* 80165BF4 00162B34 48 1F C6 31 */ bl _restgpr_28 /* 80165BF8 00162B38 80 01 00 44 */ lwz r0, 0x44(r1) /* 80165BFC 00162B3C 7C 08 03 A6 */ mtlr r0 /* 80165C00 00162B40 38 21 00 40 */ addi r1, r1, 0x40 @@ -7188,7 +7188,7 @@ dCamera_c_NS_forwardCheckAngle: /* 801660A0 00162FE0 DB C1 01 F0 */ stfd f30, 0x1f0(r1) /* 801660A4 00162FE4 F3 C1 01 F8 */ psq_st f30, 504(r1), 0, qr0 /* 801660A8 00162FE8 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 801660AC 00162FEC 48 1F C1 2D */ bl func_803621D8 +/* 801660AC 00162FEC 48 1F C1 2D */ bl _savegpr_28 /* 801660B0 00162FF0 7C 7D 1B 78 */ mr r29, r3 /* 801660B4 00162FF4 7C 9E 23 78 */ mr r30, r4 /* 801660B8 00162FF8 38 61 01 64 */ addi r3, r1, 0x164 @@ -7647,7 +7647,7 @@ lbl_80166724: /* 80166744 00163684 E3 C1 01 F8 */ psq_l f30, 504(r1), 0, qr0 /* 80166748 00163688 CB C1 01 F0 */ lfd f30, 0x1f0(r1) /* 8016674C 0016368C 39 61 01 F0 */ addi r11, r1, 0x1f0 -/* 80166750 00163690 48 1F BA D5 */ bl func_80362224 +/* 80166750 00163690 48 1F BA D5 */ bl _restgpr_28 /* 80166754 00163694 80 01 02 14 */ lwz r0, 0x214(r1) /* 80166758 00163698 7C 08 03 A6 */ mtlr r0 /* 8016675C 0016369C 38 21 02 10 */ addi r1, r1, 0x210 @@ -9345,7 +9345,7 @@ dCamera_c_NS_checkGroundInfo: /* 80167FF8 00164F38 DB E1 01 50 */ stfd f31, 0x150(r1) /* 80167FFC 00164F3C F3 E1 01 58 */ psq_st f31, 344(r1), 0, qr0 /* 80168000 00164F40 39 61 01 50 */ addi r11, r1, 0x150 -/* 80168004 00164F44 48 1F A1 D1 */ bl func_803621D4 +/* 80168004 00164F44 48 1F A1 D1 */ bl _savegpr_27 /* 80168008 00164F48 7C 7C 1B 78 */ mr r28, r3 /* 8016800C 00164F4C 80 A3 01 80 */ lwz r5, 0x180(r3) /* 80168010 00164F50 7C BD 2B 78 */ mr r29, r5 @@ -9829,7 +9829,7 @@ lbl_8016870C: /* 80168724 00165664 E3 E1 01 58 */ psq_l f31, 344(r1), 0, qr0 /* 80168728 00165668 CB E1 01 50 */ lfd f31, 0x150(r1) /* 8016872C 0016566C 39 61 01 50 */ addi r11, r1, 0x150 -/* 80168730 00165670 48 1F 9A F1 */ bl func_80362220 +/* 80168730 00165670 48 1F 9A F1 */ bl _restgpr_27 /* 80168734 00165674 80 01 01 64 */ lwz r0, 0x164(r1) /* 80168738 00165678 7C 08 03 A6 */ mtlr r0 /* 8016873C 0016567C 38 21 01 60 */ addi r1, r1, 0x160 @@ -24460,7 +24460,7 @@ lbl_80175FE4: /* 801760F8 00173038 DA 01 01 90 */ stfd f16, 0x190(r1) /* 801760FC 0017303C F2 01 01 98 */ psq_st f16, 408(r1), 0, qr0 /* 80176100 00173040 39 61 01 90 */ addi r11, r1, 0x190 -/* 80176104 00173044 48 1E C0 D5 */ bl func_803621D8 +/* 80176104 00173044 48 1E C0 D5 */ bl _savegpr_28 /* 80176108 00173048 7C 7D 1B 78 */ mr r29, r3 /* 8017610C 0017304C 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 80176110 00173050 1F E4 00 78 */ mulli r31, r4, 0x78 @@ -24913,7 +24913,7 @@ lbl_80176528: /* 801767D8 00173718 E2 01 01 98 */ psq_l f16, 408(r1), 0, qr0 /* 801767DC 0017371C CA 01 01 90 */ lfd f16, 0x190(r1) /* 801767E0 00173720 39 61 01 90 */ addi r11, r1, 0x190 -/* 801767E4 00173724 48 1E BA 41 */ bl func_80362224 +/* 801767E4 00173724 48 1E BA 41 */ bl _restgpr_28 /* 801767E8 00173728 80 01 02 94 */ lwz r0, 0x294(r1) /* 801767EC 0017372C 7C 08 03 A6 */ mtlr r0 /* 801767F0 00173730 38 21 02 90 */ addi r1, r1, 0x290 @@ -37371,7 +37371,7 @@ lbl_80181F40: /* 80181F7C 0017EEBC DB E1 00 A0 */ stfd f31, 0xa0(r1) /* 80181F80 0017EEC0 F3 E1 00 A8 */ psq_st f31, 168(r1), 0, qr0 /* 80181F84 0017EEC4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80181F88 0017EEC8 48 1E 02 4D */ bl func_803621D4 +/* 80181F88 0017EEC8 48 1E 02 4D */ bl _savegpr_27 /* 80181F8C 0017EECC 7C 7D 1B 78 */ mr r29, r3 /* 80181F90 0017EED0 7F BB EB 78 */ mr r27, r29 /* 80181F94 0017EED4 3B DD 02 48 */ addi r30, r29, 0x248 @@ -37520,7 +37520,7 @@ lbl_8018217C: /* 801821C0 0017F100 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 801821C4 0017F104 CB E1 00 A0 */ lfd f31, 0xa0(r1) /* 801821C8 0017F108 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 801821CC 0017F10C 48 1E 00 55 */ bl func_80362220 +/* 801821CC 0017F10C 48 1E 00 55 */ bl _restgpr_27 /* 801821D0 0017F110 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801821D4 0017F114 7C 08 03 A6 */ mtlr r0 /* 801821D8 0017F118 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -37563,7 +37563,7 @@ lbl_8018217C: /* 8018226C 0017F1AC DB E1 00 80 */ stfd f31, 0x80(r1) /* 80182270 0017F1B0 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 80182274 0017F1B4 39 61 00 80 */ addi r11, r1, 0x80 -/* 80182278 0017F1B8 48 1D FF 61 */ bl func_803621D8 +/* 80182278 0017F1B8 48 1D FF 61 */ bl _savegpr_28 /* 8018227C 0017F1BC 7C 7F 1B 78 */ mr r31, r3 /* 80182280 0017F1C0 3B DF 02 48 */ addi r30, r31, 0x248 /* 80182284 0017F1C4 4B E9 C0 85 */ bl fopCamM_GetParam @@ -37682,7 +37682,7 @@ lbl_80182434: /* 80182434 0017F374 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 80182438 0017F378 CB E1 00 80 */ lfd f31, 0x80(r1) /* 8018243C 0017F37C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80182440 0017F380 48 1D FD E5 */ bl func_80362224 +/* 80182440 0017F380 48 1D FD E5 */ bl _restgpr_28 /* 80182444 0017F384 80 01 00 94 */ lwz r0, 0x94(r1) /* 80182448 0017F388 7C 08 03 A6 */ mtlr r0 /* 8018244C 0017F38C 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index 4f978f668e..ebf7455fac 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -71,7 +71,7 @@ lbl_80037EB8: /* 80037ED8 00034E18 7C 08 02 A6 */ mflr r0 /* 80037EDC 00034E1C 90 01 00 24 */ stw r0, 0x24(r1) /* 80037EE0 00034E20 39 61 00 20 */ addi r11, r1, 0x20 -/* 80037EE4 00034E24 48 32 A2 F5 */ bl func_803621D8 +/* 80037EE4 00034E24 48 32 A2 F5 */ bl _savegpr_28 /* 80037EE8 00034E28 7C 9F 23 78 */ mr r31, r4 /* 80037EEC 00034E2C 7C BC 2B 78 */ mr r28, r5 /* 80037EF0 00034E30 80 65 00 00 */ lwz r3, 0(r5) @@ -156,7 +156,7 @@ lbl_80038004: /* 80038004 00034F44 38 60 00 00 */ li r3, 0 lbl_80038008: /* 80038008 00034F48 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003800C 00034F4C 48 32 A2 19 */ bl func_80362224 +/* 8003800C 00034F4C 48 32 A2 19 */ bl _restgpr_28 /* 80038010 00034F50 80 01 00 24 */ lwz r0, 0x24(r1) /* 80038014 00034F54 7C 08 03 A6 */ mtlr r0 /* 80038018 00034F58 38 21 00 20 */ addi r1, r1, 0x20 @@ -401,7 +401,7 @@ dDemo_actor_c_NS_getDemoIDData: /* 8003833C 0003527C 7C 08 02 A6 */ mflr r0 /* 80038340 00035280 90 01 00 64 */ stw r0, 0x64(r1) /* 80038344 00035284 39 61 00 60 */ addi r11, r1, 0x60 -/* 80038348 00035288 48 32 9E 8D */ bl func_803621D4 +/* 80038348 00035288 48 32 9E 8D */ bl _savegpr_27 /* 8003834C 0003528C 7C 9B 23 78 */ mr r27, r4 /* 80038350 00035290 7C BC 2B 78 */ mr r28, r5 /* 80038354 00035294 7C DD 33 78 */ mr r29, r6 @@ -484,7 +484,7 @@ lbl_80038468: /* 80038474 000353B4 38 60 00 01 */ li r3, 1 lbl_80038478: /* 80038478 000353B8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8003847C 000353BC 48 32 9D A5 */ bl func_80362220 +/* 8003847C 000353BC 48 32 9D A5 */ bl _restgpr_27 /* 80038480 000353C0 80 01 00 64 */ lwz r0, 0x64(r1) /* 80038484 000353C4 7C 08 03 A6 */ mtlr r0 /* 80038488 000353C8 38 21 00 60 */ addi r1, r1, 0x60 @@ -1671,7 +1671,7 @@ lbl_8003950C: /* 8003952C 0003646C 7C 08 02 A6 */ mflr r0 /* 80039530 00036470 90 01 00 24 */ stw r0, 0x24(r1) /* 80039534 00036474 39 61 00 20 */ addi r11, r1, 0x20 -/* 80039538 00036478 48 32 8C 9D */ bl func_803621D4 +/* 80039538 00036478 48 32 8C 9D */ bl _savegpr_27 /* 8003953C 0003647C 7C 7B 1B 78 */ mr r27, r3 /* 80039540 00036480 7C 9C 23 78 */ mr r28, r4 /* 80039544 00036484 7C BD 2B 78 */ mr r29, r5 @@ -1757,7 +1757,7 @@ lbl_80039654: /* 8003965C 0003659C 54 03 D9 7E */ srwi r3, r0, 5 lbl_80039660: /* 80039660 000365A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80039664 000365A4 48 32 8B BD */ bl func_80362220 +/* 80039664 000365A4 48 32 8B BD */ bl _restgpr_27 /* 80039668 000365A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003966C 000365AC 7C 08 03 A6 */ mtlr r0 /* 80039670 000365B0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index 6d87ab2566..ec7526ae35 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -323,7 +323,7 @@ lbl_80051B38: /* 80051F9C 0004EEDC 7C 08 02 A6 */ mflr r0 /* 80051FA0 0004EEE0 90 01 00 94 */ stw r0, 0x94(r1) /* 80051FA4 0004EEE4 39 61 00 90 */ addi r11, r1, 0x90 -/* 80051FA8 0004EEE8 48 31 02 2D */ bl func_803621D4 +/* 80051FA8 0004EEE8 48 31 02 2D */ bl _savegpr_27 /* 80051FAC 0004EEEC 7C 7B 1B 78 */ mr r27, r3 /* 80051FB0 0004EEF0 A0 A3 00 0E */ lhz r5, 0xe(r3) /* 80051FB4 0004EEF4 C8 22 86 18 */ lfd f1, lbl_80452018-_SDA2_BASE_(r2) @@ -553,7 +553,7 @@ lbl_80051B38: /* 80052334 0004F274 7D 89 03 A6 */ mtctr r12 /* 80052338 0004F278 4E 80 04 21 */ bctrl /* 8005233C 0004F27C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80052340 0004F280 48 30 FE E1 */ bl func_80362220 +/* 80052340 0004F280 48 30 FE E1 */ bl _restgpr_27 /* 80052344 0004F284 80 01 00 94 */ lwz r0, 0x94(r1) /* 80052348 0004F288 7C 08 03 A6 */ mtlr r0 /* 8005234C 0004F28C 38 21 00 90 */ addi r1, r1, 0x90 @@ -1102,7 +1102,7 @@ dDlst_2DT2_c_NS_init: /* 80052B58 0004FA98 39 61 00 50 */ addi r11, r1, 0x50 /* 80052B5C 0004FA9C 48 30 F5 DD */ bl func_80362138 /* 80052B60 0004FAA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80052B64 0004FAA4 48 30 F6 75 */ bl func_803621D8 +/* 80052B64 0004FAA4 48 30 F6 75 */ bl _savegpr_28 /* 80052B68 0004FAA8 7C 7C 1B 78 */ mr r28, r3 /* 80052B6C 0004FAAC FF 40 08 90 */ fmr f26, f1 /* 80052B70 0004FAB0 FF 60 10 90 */ fmr f27, f2 @@ -1160,7 +1160,7 @@ lbl_80052C34: /* 80052C38 0004FB78 39 61 00 50 */ addi r11, r1, 0x50 /* 80052C3C 0004FB7C 48 30 F5 49 */ bl func_80362184 /* 80052C40 0004FB80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80052C44 0004FB84 48 30 F5 E1 */ bl func_80362224 +/* 80052C44 0004FB84 48 30 F5 E1 */ bl _restgpr_28 /* 80052C48 0004FB88 80 01 00 54 */ lwz r0, 0x54(r1) /* 80052C4C 0004FB8C 7C 08 03 A6 */ mtlr r0 /* 80052C50 0004FB90 38 21 00 50 */ addi r1, r1, 0x50 @@ -3057,7 +3057,7 @@ realPolygonCheck: /* 80054868 000517A8 DB C1 00 80 */ stfd f30, 0x80(r1) /* 8005486C 000517AC F3 C1 00 88 */ psq_st f30, 136(r1), 0, qr0 /* 80054870 000517B0 39 61 00 80 */ addi r11, r1, 0x80 -/* 80054874 000517B4 48 30 D9 61 */ bl func_803621D4 +/* 80054874 000517B4 48 30 D9 61 */ bl _savegpr_27 /* 80054878 000517B8 7C 7B 1B 78 */ mr r27, r3 /* 8005487C 000517BC FF E0 08 90 */ fmr f31, f1 /* 80054880 000517C0 FF C0 10 90 */ fmr f30, f2 @@ -3188,7 +3188,7 @@ lbl_80054A44: /* 80054A4C 0005198C E3 C1 00 88 */ psq_l f30, 136(r1), 0, qr0 /* 80054A50 00051990 CB C1 00 80 */ lfd f30, 0x80(r1) /* 80054A54 00051994 39 61 00 80 */ addi r11, r1, 0x80 -/* 80054A58 00051998 48 30 D7 C9 */ bl func_80362220 +/* 80054A58 00051998 48 30 D7 C9 */ bl _restgpr_27 /* 80054A5C 0005199C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80054A60 000519A0 7C 08 03 A6 */ mtlr r0 /* 80054A64 000519A4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -3306,7 +3306,7 @@ dDlst_shadowReal_c_NS_setShadowRealMtx: /* 80054BEC 00051B2C DB A1 00 80 */ stfd f29, 0x80(r1) /* 80054BF0 00051B30 F3 A1 00 88 */ psq_st f29, 136(r1), 0, qr0 /* 80054BF4 00051B34 39 61 00 80 */ addi r11, r1, 0x80 -/* 80054BF8 00051B38 48 30 D5 DD */ bl func_803621D4 +/* 80054BF8 00051B38 48 30 D5 DD */ bl _savegpr_27 /* 80054BFC 00051B3C 7C 7E 1B 78 */ mr r30, r3 /* 80054C00 00051B40 7C 9C 23 78 */ mr r28, r4 /* 80054C04 00051B44 7C BF 2B 78 */ mr r31, r5 @@ -3592,7 +3592,7 @@ lbl_80054FF8: /* 80055008 00051F48 E3 A1 00 88 */ psq_l f29, 136(r1), 0, qr0 /* 8005500C 00051F4C CB A1 00 80 */ lfd f29, 0x80(r1) /* 80055010 00051F50 39 61 00 80 */ addi r11, r1, 0x80 -/* 80055014 00051F54 48 30 D2 0D */ bl func_80362220 +/* 80055014 00051F54 48 30 D2 0D */ bl _restgpr_27 /* 80055018 00051F58 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8005501C 00051F5C 7C 08 03 A6 */ mtlr r0 /* 80055020 00051F60 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -3872,7 +3872,7 @@ dDlst_shadowSimple_c_NS_set: /* 80055410 00052350 DB 81 00 30 */ stfd f28, 0x30(r1) /* 80055414 00052354 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80055418 00052358 39 61 00 30 */ addi r11, r1, 0x30 -/* 8005541C 0005235C 48 30 CD B9 */ bl func_803621D4 +/* 8005541C 0005235C 48 30 CD B9 */ bl _savegpr_27 /* 80055420 00052360 7C 7B 1B 78 */ mr r27, r3 /* 80055424 00052364 7C 9C 23 78 */ mr r28, r4 /* 80055428 00052368 FF A0 08 90 */ fmr f29, f1 @@ -4029,7 +4029,7 @@ lbl_800555C0: /* 80055664 000525A4 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 80055668 000525A8 CB 81 00 30 */ lfd f28, 0x30(r1) /* 8005566C 000525AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80055670 000525B0 48 30 CB B1 */ bl func_80362220 +/* 80055670 000525B0 48 30 CB B1 */ bl _restgpr_27 /* 80055674 000525B4 80 01 00 74 */ lwz r0, 0x74(r1) /* 80055678 000525B8 7C 08 03 A6 */ mtlr r0 /* 8005567C 000525BC 38 21 00 70 */ addi r1, r1, 0x70 @@ -4286,7 +4286,7 @@ dDlst_shadowControl_c_NS_draw: /* 80055A18 00052958 7C 08 02 A6 */ mflr r0 /* 80055A1C 0005295C 90 01 00 34 */ stw r0, 0x34(r1) /* 80055A20 00052960 39 61 00 30 */ addi r11, r1, 0x30 -/* 80055A24 00052964 48 30 C7 B1 */ bl func_803621D4 +/* 80055A24 00052964 48 30 C7 B1 */ bl _savegpr_27 /* 80055A28 00052968 7C 7E 1B 78 */ mr r30, r3 /* 80055A2C 0005296C 7C 9B 23 78 */ mr r27, r4 /* 80055A30 00052970 3C 60 80 3B */ lis r3, lbl_803A87A0@ha @@ -4435,7 +4435,7 @@ lbl_80055C40: /* 80055C54 00052B94 38 60 00 00 */ li r3, 0 /* 80055C58 00052B98 48 30 A0 19 */ bl GXSetAlphaUpdate /* 80055C5C 00052B9C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80055C60 00052BA0 48 30 C5 C1 */ bl func_80362220 +/* 80055C60 00052BA0 48 30 C5 C1 */ bl _restgpr_27 /* 80055C64 00052BA4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80055C68 00052BA8 7C 08 03 A6 */ mtlr r0 /* 80055C6C 00052BAC 38 21 00 30 */ addi r1, r1, 0x30 @@ -4990,7 +4990,7 @@ dDlst_list_c_NS_init: /* 80056394 000532D4 7C 08 02 A6 */ mflr r0 /* 80056398 000532D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8005639C 000532DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800563A0 000532E0 48 30 BE 39 */ bl func_803621D8 +/* 800563A0 000532E0 48 30 BE 39 */ bl _savegpr_28 /* 800563A4 000532E4 7C 7F 1B 78 */ mr r31, r3 /* 800563A8 000532E8 7F FE FB 78 */ mr r30, r31 /* 800563AC 000532EC 3C 60 80 38 */ lis r3, lbl_8037A178@ha @@ -5047,7 +5047,7 @@ lbl_8005641C: /* 8005646C 000533AC 38 7F 02 5C */ addi r3, r31, 0x25c /* 80056470 000533B0 4B FF F2 15 */ bl dDlst_shadowControl_c_NS_init /* 80056474 000533B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056478 000533B8 48 30 BD AD */ bl func_80362224 +/* 80056478 000533B8 48 30 BD AD */ bl _restgpr_28 /* 8005647C 000533BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80056480 000533C0 7C 08 03 A6 */ mtlr r0 /* 80056484 000533C4 38 21 00 20 */ addi r1, r1, 0x20 @@ -5059,7 +5059,7 @@ dDlst_list_c_NS_dtor: /* 80056490 000533D0 7C 08 02 A6 */ mflr r0 /* 80056494 000533D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80056498 000533D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005649C 000533DC 48 30 BD 3D */ bl func_803621D8 +/* 8005649C 000533DC 48 30 BD 3D */ bl _savegpr_28 /* 800564A0 000533E0 7C 7C 1B 79 */ or. r28, r3, r3 /* 800564A4 000533E4 7C 9D 23 78 */ mr r29, r4 /* 800564A8 000533E8 41 82 00 74 */ beq lbl_8005651C @@ -5100,7 +5100,7 @@ lbl_8005650C: lbl_8005651C: /* 8005651C 0005345C 7F 83 E3 78 */ mr r3, r28 /* 80056520 00053460 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056524 00053464 48 30 BD 01 */ bl func_80362224 +/* 80056524 00053464 48 30 BD 01 */ bl _restgpr_28 /* 80056528 00053468 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005652C 0005346C 7C 08 03 A6 */ mtlr r0 /* 80056530 00053470 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_envse.s b/asm/d/d_envse.s index 3700799430..80e7358fdd 100644 --- a/asm/d/d_envse.s +++ b/asm/d/d_envse.s @@ -482,7 +482,7 @@ dEnvSe_c_NS_execute: /* 80183484 001803C4 7C 08 02 A6 */ mflr r0 /* 80183488 001803C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8018348C 001803CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80183490 001803D0 48 1D ED 49 */ bl func_803621D8 +/* 80183490 001803D0 48 1D ED 49 */ bl _savegpr_28 /* 80183494 001803D4 7C 7C 1B 78 */ mr r28, r3 /* 80183498 001803D8 8B CD 87 E4 */ lbz r30, lbl_80450D64-_SDA_BASE_(r13) /* 8018349C 001803DC 7F DE 07 74 */ extsb r30, r30 @@ -548,7 +548,7 @@ lbl_801834E4: /* 80183584 001804C4 4B FF FA 55 */ bl dEnvSe_c_NS_execute_common lbl_80183588: /* 80183588 001804C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018358C 001804CC 48 1D EC 99 */ bl func_80362224 +/* 8018358C 001804CC 48 1D EC 99 */ bl _restgpr_28 /* 80183590 001804D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80183594 001804D4 7C 08 03 A6 */ mtlr r0 /* 80183598 001804D8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index f6ce4a13ee..70db0ac16f 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -264,7 +264,7 @@ dEvt_control_c_NS_setParam: /* 80041808 0003E748 7C 08 02 A6 */ mflr r0 /* 8004180C 0003E74C 90 01 00 24 */ stw r0, 0x24(r1) /* 80041810 0003E750 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041814 0003E754 48 32 09 C5 */ bl func_803621D8 +/* 80041814 0003E754 48 32 09 C5 */ bl _savegpr_28 /* 80041818 0003E758 7C 7E 1B 78 */ mr r30, r3 /* 8004181C 0003E75C 7C 9F 23 78 */ mr r31, r4 /* 80041820 0003E760 80 84 00 08 */ lwz r4, 8(r4) @@ -336,7 +336,7 @@ lbl_8004190C: /* 80041914 0003E854 38 00 00 00 */ li r0, 0 /* 80041918 0003E858 B0 1E 00 D8 */ sth r0, 0xd8(r30) /* 8004191C 0003E85C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041920 0003E860 48 32 09 05 */ bl func_80362224 +/* 80041920 0003E860 48 32 09 05 */ bl _restgpr_28 /* 80041924 0003E864 80 01 00 24 */ lwz r0, 0x24(r1) /* 80041928 0003E868 7C 08 03 A6 */ mtlr r0 /* 8004192C 0003E86C 38 21 00 20 */ addi r1, r1, 0x20 @@ -510,7 +510,7 @@ dEvt_control_c_NS_talkXyCheck: /* 80041B5C 0003EA9C 7C 08 02 A6 */ mflr r0 /* 80041B60 0003EAA0 90 01 00 24 */ stw r0, 0x24(r1) /* 80041B64 0003EAA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041B68 0003EAA8 48 32 06 6D */ bl func_803621D4 +/* 80041B68 0003EAA8 48 32 06 6D */ bl _savegpr_27 /* 80041B6C 0003EAAC 7C 7B 1B 78 */ mr r27, r3 /* 80041B70 0003EAB0 7C 9C 23 78 */ mr r28, r4 /* 80041B74 0003EAB4 3C 60 80 38 */ lis r3, lbl_80379D80@ha @@ -588,7 +588,7 @@ lbl_80041C74: /* 80041C74 0003EBB4 38 60 00 00 */ li r3, 0 lbl_80041C78: /* 80041C78 0003EBB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041C7C 0003EBBC 48 32 05 A5 */ bl func_80362220 +/* 80041C7C 0003EBBC 48 32 05 A5 */ bl _restgpr_27 /* 80041C80 0003EBC0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80041C84 0003EBC4 7C 08 03 A6 */ mtlr r0 /* 80041C88 0003EBC8 38 21 00 20 */ addi r1, r1, 0x20 @@ -698,7 +698,7 @@ dEvt_control_c_NS_demoCheck: /* 80041DE0 0003ED20 7C 08 02 A6 */ mflr r0 /* 80041DE4 0003ED24 90 01 00 24 */ stw r0, 0x24(r1) /* 80041DE8 0003ED28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041DEC 0003ED2C 48 32 03 E9 */ bl func_803621D4 +/* 80041DEC 0003ED2C 48 32 03 E9 */ bl _savegpr_27 /* 80041DF0 0003ED30 7C 7B 1B 78 */ mr r27, r3 /* 80041DF4 0003ED34 7C 9C 23 78 */ mr r28, r4 /* 80041DF8 0003ED38 83 E4 00 08 */ lwz r31, 8(r4) @@ -777,7 +777,7 @@ lbl_80041EDC: /* 80041EFC 0003EE3C 38 60 00 01 */ li r3, 1 lbl_80041F00: /* 80041F00 0003EE40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041F04 0003EE44 48 32 03 1D */ bl func_80362220 +/* 80041F04 0003EE44 48 32 03 1D */ bl _restgpr_27 /* 80041F08 0003EE48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80041F0C 0003EE4C 7C 08 03 A6 */ mtlr r0 /* 80041F10 0003EE50 38 21 00 20 */ addi r1, r1, 0x20 @@ -1329,7 +1329,7 @@ lbl_80042680: lbl_80042698: /* 80042698 0003F5D8 38 61 00 08 */ addi r3, r1, 8 /* 8004269C 0003F5DC 38 84 00 0D */ addi r4, r4, 0xd -/* 800426A0 0003F5E0 48 32 64 8D */ bl func_80368B2C +/* 800426A0 0003F5E0 48 32 64 8D */ bl strcpy /* 800426A4 0003F5E4 38 61 00 08 */ addi r3, r1, 8 /* 800426A8 0003F5E8 3C 80 80 38 */ lis r4, lbl_80379D80@ha /* 800426AC 0003F5EC 38 84 9D 80 */ addi r4, r4, lbl_80379D80@l @@ -1426,7 +1426,7 @@ lbl_800427DC: lbl_800427F4: /* 800427F4 0003F734 38 61 00 08 */ addi r3, r1, 8 /* 800427F8 0003F738 38 84 00 0D */ addi r4, r4, 0xd -/* 800427FC 0003F73C 48 32 63 31 */ bl func_80368B2C +/* 800427FC 0003F73C 48 32 63 31 */ bl strcpy /* 80042800 0003F740 38 61 00 08 */ addi r3, r1, 8 /* 80042804 0003F744 3C 80 80 38 */ lis r4, lbl_80379D80@ha /* 80042808 0003F748 38 84 9D 80 */ addi r4, r4, lbl_80379D80@l @@ -1544,7 +1544,7 @@ dEvt_control_c_NS_setSkipZev: /* 80042980 0003F8C0 4B FF FF 95 */ bl dEvt_control_c_NS_setSkipProc /* 80042984 0003F8C4 38 7E 01 14 */ addi r3, r30, 0x114 /* 80042988 0003F8C8 7F E4 FB 78 */ mr r4, r31 -/* 8004298C 0003F8CC 48 32 61 A1 */ bl func_80368B2C +/* 8004298C 0003F8CC 48 32 61 A1 */ bl strcpy /* 80042990 0003F8D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80042994 0003F8D4 83 C1 00 08 */ lwz r30, 8(r1) /* 80042998 0003F8D8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1713,7 +1713,7 @@ dEvt_control_c_NS_Step: /* 80042BC0 0003FB00 7C 08 02 A6 */ mflr r0 /* 80042BC4 0003FB04 90 01 00 24 */ stw r0, 0x24(r1) /* 80042BC8 0003FB08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042BCC 0003FB0C 48 31 F6 0D */ bl func_803621D8 +/* 80042BCC 0003FB0C 48 31 F6 0D */ bl _savegpr_28 /* 80042BD0 0003FB10 7C 7D 1B 78 */ mr r29, r3 /* 80042BD4 0003FB14 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 80042BD8 0003FB18 3B E4 61 C0 */ addi r31, r4, lbl_804061C0@l @@ -1981,7 +1981,7 @@ lbl_80042F84: /* 80042F8C 0003FECC 38 60 00 00 */ li r3, 0 lbl_80042F90: /* 80042F90 0003FED0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042F94 0003FED4 48 31 F2 91 */ bl func_80362224 +/* 80042F94 0003FED4 48 31 F2 91 */ bl _restgpr_28 /* 80042F98 0003FED8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80042F9C 0003FEDC 7C 08 03 A6 */ mtlr r0 /* 80042FA0 0003FEE0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index 63086ecf9c..3bba5de77f 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -224,7 +224,7 @@ dGameover_c_NS__create: /* 8019B048 00197F88 7C 08 02 A6 */ mflr r0 /* 8019B04C 00197F8C 90 01 00 24 */ stw r0, 0x24(r1) /* 8019B050 00197F90 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019B054 00197F94 48 1C 71 85 */ bl func_803621D8 +/* 8019B054 00197F94 48 1C 71 85 */ bl _savegpr_28 /* 8019B058 00197F98 7C 7D 1B 78 */ mr r29, r3 /* 8019B05C 00197F9C 38 7D 01 08 */ addi r3, r29, 0x108 /* 8019B060 00197FA0 3C 80 80 39 */ lis r4, lbl_80394C28@ha @@ -329,7 +329,7 @@ lbl_8019B198: /* 8019B1D4 00198114 38 63 00 9C */ addi r3, r3, 0x9c /* 8019B1D8 00198118 38 80 00 12 */ li r4, 0x12 /* 8019B1DC 0019811C 38 A0 00 FF */ li r5, 0xff -/* 8019B1E0 00198120 4B E9 7D D9 */ bl dSv_player_item_c_NS_setItem +/* 8019B1E0 00198120 4B E9 7D D9 */ bl setItem__17dSv_player_item_cFiUc /* 8019B1E4 00198124 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8019B1E8 00198128 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8019B1EC 0019812C 38 00 FF FF */ li r0, -1 @@ -403,7 +403,7 @@ lbl_8019B2B8: /* 8019B2D8 00198218 38 60 00 04 */ li r3, 4 lbl_8019B2DC: /* 8019B2DC 0019821C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019B2E0 00198220 48 1C 6F 45 */ bl func_80362224 +/* 8019B2E0 00198220 48 1C 6F 45 */ bl _restgpr_28 /* 8019B2E4 00198224 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019B2E8 00198228 7C 08 03 A6 */ mtlr r0 /* 8019B2EC 0019822C 38 21 00 20 */ addi r1, r1, 0x20 @@ -690,14 +690,14 @@ lbl_8019B6E4: /* 8019B70C 0019864C 7F C3 F3 78 */ mr r3, r30 /* 8019B710 00198650 38 80 00 01 */ li r4, 1 /* 8019B714 00198654 38 A0 00 01 */ li r5, 1 -/* 8019B718 00198658 4B E9 79 19 */ bl dSv_player_item_c_NS_getItem +/* 8019B718 00198658 4B E9 79 19 */ bl getItem__17dSv_player_item_cCFib /* 8019B71C 0019865C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8019B720 00198660 28 00 00 FF */ cmplwi r0, 0xff /* 8019B724 00198664 40 82 00 2C */ bne lbl_8019B750 /* 8019B728 00198668 7F C3 F3 78 */ mr r3, r30 /* 8019B72C 0019866C 38 80 00 01 */ li r4, 1 /* 8019B730 00198670 38 A0 00 48 */ li r5, 0x48 -/* 8019B734 00198674 4B E9 78 85 */ bl dSv_player_item_c_NS_setItem +/* 8019B734 00198674 4B E9 78 85 */ bl setItem__17dSv_player_item_cFiUc /* 8019B738 00198678 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8019B73C 0019867C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8019B740 00198680 A0 03 00 B6 */ lhz r0, 0xb6(r3) diff --git a/asm/d/d_item.s b/asm/d/d_item.s index 2a3d3ac3c5..2b2bb050fc 100644 --- a/asm/d/d_item.s +++ b/asm/d/d_item.s @@ -348,7 +348,7 @@ lbl_80097F18: /* 800983CC 0009530C 38 63 00 9C */ addi r3, r3, 0x9c /* 800983D0 00095310 38 80 00 12 */ li r4, 0x12 /* 800983D4 00095314 38 A0 00 25 */ li r5, 0x25 -/* 800983D8 00095318 4B F9 AB E1 */ bl dSv_player_item_c_NS_setItem +/* 800983D8 00095318 4B F9 AB E1 */ bl setItem__17dSv_player_item_cFiUc /* 800983DC 0009531C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800983E0 00095320 7C 08 03 A6 */ mtlr r0 /* 800983E4 00095324 38 21 00 10 */ addi r1, r1, 0x10 @@ -373,7 +373,7 @@ lbl_80097F18: /* 80098430 00095370 38 63 00 9C */ addi r3, r3, 0x9c /* 80098434 00095374 38 80 00 12 */ li r4, 0x12 /* 80098438 00095378 38 A0 00 27 */ li r5, 0x27 -/* 8009843C 0009537C 4B F9 AB 7D */ bl dSv_player_item_c_NS_setItem +/* 8009843C 0009537C 4B F9 AB 7D */ bl setItem__17dSv_player_item_cFiUc /* 80098440 00095380 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098444 00095384 7C 08 03 A6 */ mtlr r0 /* 80098448 00095388 38 21 00 10 */ addi r1, r1, 0x10 @@ -433,7 +433,7 @@ lbl_80097F18: /* 80098520 00095460 38 63 00 9C */ addi r3, r3, 0x9c /* 80098524 00095464 38 80 00 12 */ li r4, 0x12 /* 80098528 00095468 38 A0 00 2D */ li r5, 0x2d -/* 8009852C 0009546C 4B F9 AA 8D */ bl dSv_player_item_c_NS_setItem +/* 8009852C 0009546C 4B F9 AA 8D */ bl setItem__17dSv_player_item_cFiUc /* 80098530 00095470 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098534 00095474 7C 08 03 A6 */ mtlr r0 /* 80098538 00095478 38 21 00 10 */ addi r1, r1, 0x10 @@ -481,7 +481,7 @@ lbl_80097F18: /* 800985E0 00095520 38 63 00 9C */ addi r3, r3, 0x9c /* 800985E4 00095524 38 80 00 12 */ li r4, 0x12 /* 800985E8 00095528 38 A0 00 25 */ li r5, 0x25 -/* 800985EC 0009552C 4B F9 A9 CD */ bl dSv_player_item_c_NS_setItem +/* 800985EC 0009552C 4B F9 A9 CD */ bl setItem__17dSv_player_item_cFiUc /* 800985F0 00095530 80 01 00 14 */ lwz r0, 0x14(r1) /* 800985F4 00095534 7C 08 03 A6 */ mtlr r0 /* 800985F8 00095538 38 21 00 10 */ addi r1, r1, 0x10 @@ -518,7 +518,7 @@ lbl_80098668: /* 80098670 000955B0 38 63 00 9C */ addi r3, r3, 0x9c /* 80098674 000955B4 38 80 00 14 */ li r4, 0x14 /* 80098678 000955B8 38 A0 00 3D */ li r5, 0x3d -/* 8009867C 000955BC 4B F9 A9 3D */ bl dSv_player_item_c_NS_setItem +/* 8009867C 000955BC 4B F9 A9 3D */ bl setItem__17dSv_player_item_cFiUc lbl_80098680: /* 80098680 000955C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098684 000955C4 7C 08 03 A6 */ mtlr r0 @@ -532,7 +532,7 @@ lbl_80098680: /* 800986A4 000955E4 38 63 00 9C */ addi r3, r3, 0x9c /* 800986A8 000955E8 38 80 00 05 */ li r4, 5 /* 800986AC 000955EC 38 A0 00 3E */ li r5, 0x3e -/* 800986B0 000955F0 4B F9 A9 09 */ bl dSv_player_item_c_NS_setItem +/* 800986B0 000955F0 4B F9 A9 09 */ bl setItem__17dSv_player_item_cFiUc /* 800986B4 000955F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800986B8 000955F8 7C 08 03 A6 */ mtlr r0 /* 800986BC 000955FC 38 21 00 10 */ addi r1, r1, 0x10 @@ -566,7 +566,7 @@ lbl_80098680: /* 8009872C 0009566C 38 63 00 9C */ addi r3, r3, 0x9c /* 80098730 00095670 38 80 00 00 */ li r4, 0 /* 80098734 00095674 38 A0 00 40 */ li r5, 0x40 -/* 80098738 00095678 4B F9 A8 81 */ bl dSv_player_item_c_NS_setItem +/* 80098738 00095678 4B F9 A8 81 */ bl setItem__17dSv_player_item_cFiUc /* 8009873C 0009567C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098740 00095680 7C 08 03 A6 */ mtlr r0 /* 80098744 00095684 38 21 00 10 */ addi r1, r1, 0x10 @@ -579,7 +579,7 @@ lbl_80098680: /* 80098760 000956A0 38 63 00 9C */ addi r3, r3, 0x9c /* 80098764 000956A4 38 80 00 02 */ li r4, 2 /* 80098768 000956A8 38 A0 00 41 */ li r5, 0x41 -/* 8009876C 000956AC 4B F9 A8 4D */ bl dSv_player_item_c_NS_setItem +/* 8009876C 000956AC 4B F9 A8 4D */ bl setItem__17dSv_player_item_cFiUc /* 80098770 000956B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098774 000956B4 7C 08 03 A6 */ mtlr r0 /* 80098778 000956B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -592,7 +592,7 @@ lbl_80098680: /* 80098794 000956D4 38 63 00 9C */ addi r3, r3, 0x9c /* 80098798 000956D8 38 80 00 06 */ li r4, 6 /* 8009879C 000956DC 38 A0 00 42 */ li r5, 0x42 -/* 800987A0 000956E0 4B F9 A8 19 */ bl dSv_player_item_c_NS_setItem +/* 800987A0 000956E0 4B F9 A8 19 */ bl setItem__17dSv_player_item_cFiUc /* 800987A4 000956E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800987A8 000956E8 7C 08 03 A6 */ mtlr r0 /* 800987AC 000956EC 38 21 00 10 */ addi r1, r1, 0x10 @@ -605,7 +605,7 @@ lbl_80098680: /* 800987C8 00095708 38 63 00 9C */ addi r3, r3, 0x9c /* 800987CC 0009570C 38 80 00 04 */ li r4, 4 /* 800987D0 00095710 38 A0 00 43 */ li r5, 0x43 -/* 800987D4 00095714 4B F9 A7 E5 */ bl dSv_player_item_c_NS_setItem +/* 800987D4 00095714 4B F9 A7 E5 */ bl setItem__17dSv_player_item_cFiUc /* 800987D8 00095718 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 800987DC 0009571C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800987E0 00095720 38 00 00 1E */ li r0, 0x1e @@ -623,7 +623,7 @@ lbl_80098680: /* 80098810 00095750 38 63 00 9C */ addi r3, r3, 0x9c /* 80098814 00095754 38 80 00 09 */ li r4, 9 /* 80098818 00095758 38 A0 00 44 */ li r5, 0x44 -/* 8009881C 0009575C 4B F9 A7 9D */ bl dSv_player_item_c_NS_setItem +/* 8009881C 0009575C 4B F9 A7 9D */ bl setItem__17dSv_player_item_cFiUc /* 80098820 00095760 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098824 00095764 7C 08 03 A6 */ mtlr r0 /* 80098828 00095768 38 21 00 10 */ addi r1, r1, 0x10 @@ -636,7 +636,7 @@ lbl_80098680: /* 80098844 00095784 38 63 00 9C */ addi r3, r3, 0x9c /* 80098848 00095788 38 80 00 03 */ li r4, 3 /* 8009884C 0009578C 38 A0 00 45 */ li r5, 0x45 -/* 80098850 00095790 4B F9 A7 69 */ bl dSv_player_item_c_NS_setItem +/* 80098850 00095790 4B F9 A7 69 */ bl setItem__17dSv_player_item_cFiUc /* 80098854 00095794 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098858 00095798 7C 08 03 A6 */ mtlr r0 /* 8009885C 0009579C 38 21 00 10 */ addi r1, r1, 0x10 @@ -649,7 +649,7 @@ lbl_80098680: /* 80098878 000957B8 38 63 00 9C */ addi r3, r3, 0x9c /* 8009887C 000957BC 38 80 00 08 */ li r4, 8 /* 80098880 000957C0 38 A0 00 46 */ li r5, 0x46 -/* 80098884 000957C4 4B F9 A7 35 */ bl dSv_player_item_c_NS_setItem +/* 80098884 000957C4 4B F9 A7 35 */ bl setItem__17dSv_player_item_cFiUc /* 80098888 000957C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009888C 000957CC 7C 08 03 A6 */ mtlr r0 /* 80098890 000957D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -664,11 +664,11 @@ lbl_80098680: /* 800988B4 000957F4 7F E3 FB 78 */ mr r3, r31 /* 800988B8 000957F8 38 80 00 09 */ li r4, 9 /* 800988BC 000957FC 38 A0 00 FF */ li r5, 0xff -/* 800988C0 00095800 4B F9 A6 F9 */ bl dSv_player_item_c_NS_setItem +/* 800988C0 00095800 4B F9 A6 F9 */ bl setItem__17dSv_player_item_cFiUc /* 800988C4 00095804 7F E3 FB 78 */ mr r3, r31 /* 800988C8 00095808 38 80 00 0A */ li r4, 0xa /* 800988CC 0009580C 38 A0 00 47 */ li r5, 0x47 -/* 800988D0 00095810 4B F9 A6 E9 */ bl dSv_player_item_c_NS_setItem +/* 800988D0 00095810 4B F9 A6 E9 */ bl setItem__17dSv_player_item_cFiUc /* 800988D4 00095814 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800988D8 00095818 80 01 00 14 */ lwz r0, 0x14(r1) /* 800988DC 0009581C 7C 08 03 A6 */ mtlr r0 @@ -685,7 +685,7 @@ lbl_80098680: /* 80098908 00095848 38 63 00 9C */ addi r3, r3, 0x9c /* 8009890C 0009584C 38 80 00 01 */ li r4, 1 /* 80098910 00095850 38 A0 00 48 */ li r5, 0x48 -/* 80098914 00095854 4B F9 A6 A5 */ bl dSv_player_item_c_NS_setItem +/* 80098914 00095854 4B F9 A6 A5 */ bl setItem__17dSv_player_item_cFiUc /* 80098918 00095858 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009891C 0009585C 7C 08 03 A6 */ mtlr r0 /* 80098920 00095860 38 21 00 10 */ addi r1, r1, 0x10 @@ -714,7 +714,7 @@ lbl_80098680: /* 8009897C 000958BC 38 63 00 9C */ addi r3, r3, 0x9c /* 80098980 000958C0 38 80 00 14 */ li r4, 0x14 /* 80098984 000958C4 38 A0 00 4A */ li r5, 0x4a -/* 80098988 000958C8 4B F9 A6 31 */ bl dSv_player_item_c_NS_setItem +/* 80098988 000958C8 4B F9 A6 31 */ bl setItem__17dSv_player_item_cFiUc /* 8009898C 000958CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098990 000958D0 7C 08 03 A6 */ mtlr r0 /* 80098994 000958D4 38 21 00 10 */ addi r1, r1, 0x10 @@ -730,7 +730,7 @@ lbl_80098680: /* 800989BC 000958FC 38 64 00 9C */ addi r3, r4, 0x9c /* 800989C0 00095900 38 80 00 17 */ li r4, 0x17 /* 800989C4 00095904 38 A0 00 4B */ li r5, 0x4b -/* 800989C8 00095908 4B F9 A5 F1 */ bl dSv_player_item_c_NS_setItem +/* 800989C8 00095908 4B F9 A5 F1 */ bl setItem__17dSv_player_item_cFiUc /* 800989CC 0009590C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800989D0 00095910 7C 08 03 A6 */ mtlr r0 /* 800989D4 00095914 38 21 00 10 */ addi r1, r1, 0x10 @@ -743,7 +743,7 @@ lbl_80098680: /* 800989F0 00095930 38 63 00 9C */ addi r3, r3, 0x9c /* 800989F4 00095934 38 80 00 08 */ li r4, 8 /* 800989F8 00095938 38 A0 00 46 */ li r5, 0x46 -/* 800989FC 0009593C 4B F9 A5 BD */ bl dSv_player_item_c_NS_setItem +/* 800989FC 0009593C 4B F9 A5 BD */ bl setItem__17dSv_player_item_cFiUc /* 80098A00 00095940 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098A04 00095944 7C 08 03 A6 */ mtlr r0 /* 80098A08 00095948 38 21 00 10 */ addi r1, r1, 0x10 @@ -783,7 +783,7 @@ lbl_80098680: /* 80098A90 000959D0 38 63 00 9C */ addi r3, r3, 0x9c /* 80098A94 000959D4 38 80 00 04 */ li r4, 4 /* 80098A98 000959D8 38 A0 00 53 */ li r5, 0x53 -/* 80098A9C 000959DC 4B F9 A5 1D */ bl dSv_player_item_c_NS_setItem +/* 80098A9C 000959DC 4B F9 A5 1D */ bl setItem__17dSv_player_item_cFiUc /* 80098AA0 000959E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098AA4 000959E4 7C 08 03 A6 */ mtlr r0 /* 80098AA8 000959E8 38 21 00 10 */ addi r1, r1, 0x10 @@ -820,7 +820,7 @@ lbl_80098680: /* 80098B24 00095A64 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80098B28 00095A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098B2C 00095A6C 38 63 00 9C */ addi r3, r3, 0x9c -/* 80098B30 00095A70 4B F9 A9 65 */ bl dSv_player_item_c_NS_setEmptyBottle +/* 80098B30 00095A70 4B F9 A9 65 */ bl setEmptyBottle__17dSv_player_item_cFv /* 80098B34 00095A74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098B38 00095A78 7C 08 03 A6 */ mtlr r0 /* 80098B3C 00095A7C 38 21 00 10 */ addi r1, r1, 0x10 @@ -832,7 +832,7 @@ lbl_80098680: /* 80098B54 00095A94 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098B58 00095A98 38 63 00 9C */ addi r3, r3, 0x9c /* 80098B5C 00095A9C 38 80 00 61 */ li r4, 0x61 -/* 80098B60 00095AA0 4B F9 A8 F1 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098B60 00095AA0 4B F9 A8 F1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098B64 00095AA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098B68 00095AA8 7C 08 03 A6 */ mtlr r0 /* 80098B6C 00095AAC 38 21 00 10 */ addi r1, r1, 0x10 @@ -844,7 +844,7 @@ lbl_80098680: /* 80098B84 00095AC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098B88 00095AC8 38 63 00 9C */ addi r3, r3, 0x9c /* 80098B8C 00095ACC 38 80 00 62 */ li r4, 0x62 -/* 80098B90 00095AD0 4B F9 A8 C1 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098B90 00095AD0 4B F9 A8 C1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098B94 00095AD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098B98 00095AD8 7C 08 03 A6 */ mtlr r0 /* 80098B9C 00095ADC 38 21 00 10 */ addi r1, r1, 0x10 @@ -856,7 +856,7 @@ lbl_80098680: /* 80098BB4 00095AF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098BB8 00095AF8 38 63 00 9C */ addi r3, r3, 0x9c /* 80098BBC 00095AFC 38 80 00 63 */ li r4, 0x63 -/* 80098BC0 00095B00 4B F9 A8 91 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098BC0 00095B00 4B F9 A8 91 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098BC4 00095B04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098BC8 00095B08 7C 08 03 A6 */ mtlr r0 /* 80098BCC 00095B0C 38 21 00 10 */ addi r1, r1, 0x10 @@ -868,7 +868,7 @@ lbl_80098680: /* 80098BE4 00095B24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098BE8 00095B28 38 63 00 9C */ addi r3, r3, 0x9c /* 80098BEC 00095B2C 38 80 00 64 */ li r4, 0x64 -/* 80098BF0 00095B30 4B F9 A8 61 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098BF0 00095B30 4B F9 A8 61 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098BF4 00095B34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098BF8 00095B38 7C 08 03 A6 */ mtlr r0 /* 80098BFC 00095B3C 38 21 00 10 */ addi r1, r1, 0x10 @@ -880,7 +880,7 @@ lbl_80098680: /* 80098C14 00095B54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098C18 00095B58 38 63 00 9C */ addi r3, r3, 0x9c /* 80098C1C 00095B5C 38 80 00 65 */ li r4, 0x65 -/* 80098C20 00095B60 4B F9 A8 F5 */ bl dSv_player_item_c_NS_setEmptyBottle_X1_ +/* 80098C20 00095B60 4B F9 A8 F5 */ bl setEmptyBottle__17dSv_player_item_cFUc /* 80098C24 00095B64 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098C28 00095B68 7C 08 03 A6 */ mtlr r0 /* 80098C2C 00095B6C 38 21 00 10 */ addi r1, r1, 0x10 @@ -892,7 +892,7 @@ lbl_80098680: /* 80098C44 00095B84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098C48 00095B88 38 63 00 9C */ addi r3, r3, 0x9c /* 80098C4C 00095B8C 38 80 00 66 */ li r4, 0x66 -/* 80098C50 00095B90 4B F9 A8 01 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098C50 00095B90 4B F9 A8 01 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098C54 00095B94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098C58 00095B98 7C 08 03 A6 */ mtlr r0 /* 80098C5C 00095B9C 38 21 00 10 */ addi r1, r1, 0x10 @@ -904,7 +904,7 @@ lbl_80098680: /* 80098C74 00095BB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098C78 00095BB8 38 63 00 9C */ addi r3, r3, 0x9c /* 80098C7C 00095BBC 38 80 00 67 */ li r4, 0x67 -/* 80098C80 00095BC0 4B F9 A7 D1 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098C80 00095BC0 4B F9 A7 D1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098C84 00095BC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098C88 00095BC8 7C 08 03 A6 */ mtlr r0 /* 80098C8C 00095BCC 38 21 00 10 */ addi r1, r1, 0x10 @@ -916,7 +916,7 @@ lbl_80098680: /* 80098CA4 00095BE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098CA8 00095BE8 38 63 00 9C */ addi r3, r3, 0x9c /* 80098CAC 00095BEC 38 80 00 66 */ li r4, 0x66 -/* 80098CB0 00095BF0 4B F9 A7 A1 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098CB0 00095BF0 4B F9 A7 A1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098CB4 00095BF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098CB8 00095BF8 7C 08 03 A6 */ mtlr r0 /* 80098CBC 00095BFC 38 21 00 10 */ addi r1, r1, 0x10 @@ -928,7 +928,7 @@ lbl_80098680: /* 80098CD4 00095C14 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098CD8 00095C18 38 63 00 9C */ addi r3, r3, 0x9c /* 80098CDC 00095C1C 38 80 00 61 */ li r4, 0x61 -/* 80098CE0 00095C20 4B F9 A7 71 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098CE0 00095C20 4B F9 A7 71 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098CE4 00095C24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098CE8 00095C28 7C 08 03 A6 */ mtlr r0 /* 80098CEC 00095C2C 38 21 00 10 */ addi r1, r1, 0x10 @@ -940,7 +940,7 @@ lbl_80098680: /* 80098D04 00095C44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098D08 00095C48 38 63 00 9C */ addi r3, r3, 0x9c /* 80098D0C 00095C4C 38 80 00 6A */ li r4, 0x6a -/* 80098D10 00095C50 4B F9 A7 41 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098D10 00095C50 4B F9 A7 41 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098D14 00095C54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098D18 00095C58 7C 08 03 A6 */ mtlr r0 /* 80098D1C 00095C5C 38 21 00 10 */ addi r1, r1, 0x10 @@ -952,7 +952,7 @@ lbl_80098680: /* 80098D34 00095C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098D38 00095C78 38 63 00 9C */ addi r3, r3, 0x9c /* 80098D3C 00095C7C 38 80 00 6B */ li r4, 0x6b -/* 80098D40 00095C80 4B F9 A7 11 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098D40 00095C80 4B F9 A7 11 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098D44 00095C84 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098D48 00095C88 7C 08 03 A6 */ mtlr r0 /* 80098D4C 00095C8C 38 21 00 10 */ addi r1, r1, 0x10 @@ -964,7 +964,7 @@ lbl_80098680: /* 80098D64 00095CA4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098D68 00095CA8 38 63 00 9C */ addi r3, r3, 0x9c /* 80098D6C 00095CAC 38 80 00 6C */ li r4, 0x6c -/* 80098D70 00095CB0 4B F9 A6 E1 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098D70 00095CB0 4B F9 A6 E1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098D74 00095CB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098D78 00095CB8 7C 08 03 A6 */ mtlr r0 /* 80098D7C 00095CBC 38 21 00 10 */ addi r1, r1, 0x10 @@ -976,7 +976,7 @@ lbl_80098680: /* 80098D94 00095CD4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098D98 00095CD8 38 63 00 9C */ addi r3, r3, 0x9c /* 80098D9C 00095CDC 38 80 00 6B */ li r4, 0x6b -/* 80098DA0 00095CE0 4B F9 A6 B1 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098DA0 00095CE0 4B F9 A6 B1 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098DA4 00095CE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098DA8 00095CE8 7C 08 03 A6 */ mtlr r0 /* 80098DAC 00095CEC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1039,7 +1039,7 @@ lbl_80098680: /* 80098E90 00095DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098E94 00095DD4 38 63 00 9C */ addi r3, r3, 0x9c /* 80098E98 00095DD8 38 80 00 73 */ li r4, 0x73 -/* 80098E9C 00095DDC 4B F9 A5 B5 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098E9C 00095DDC 4B F9 A5 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098EA0 00095DE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098EA4 00095DE4 7C 08 03 A6 */ mtlr r0 /* 80098EA8 00095DE8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1052,7 +1052,7 @@ lbl_80098680: /* 80098EC4 00095E04 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098EC8 00095E08 38 63 00 9C */ addi r3, r3, 0x9c /* 80098ECC 00095E0C 38 80 00 73 */ li r4, 0x73 -/* 80098ED0 00095E10 4B F9 A6 45 */ bl dSv_player_item_c_NS_setEmptyBottle_X1_ +/* 80098ED0 00095E10 4B F9 A6 45 */ bl setEmptyBottle__17dSv_player_item_cFUc /* 80098ED4 00095E14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098ED8 00095E18 7C 08 03 A6 */ mtlr r0 /* 80098EDC 00095E1C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1074,7 +1074,7 @@ lbl_80098F0C: /* 80098F0C 00095E4C 7F E3 FB 78 */ mr r3, r31 /* 80098F10 00095E50 38 9D 00 0B */ addi r4, r29, 0xb /* 80098F14 00095E54 38 A0 00 01 */ li r5, 1 -/* 80098F18 00095E58 4B F9 A1 19 */ bl dSv_player_item_c_NS_getItem +/* 80098F18 00095E58 4B F9 A1 19 */ bl getItem__17dSv_player_item_cCFib /* 80098F1C 00095E5C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80098F20 00095E60 28 00 00 60 */ cmplwi r0, 0x60 /* 80098F24 00095E64 40 82 00 0C */ bne lbl_80098F30 @@ -1095,7 +1095,7 @@ lbl_80098F3C: /* 80098F58 00095E98 4B F9 B0 35 */ bl dSv_player_item_record_c_NS_setBottleNum /* 80098F5C 00095E9C 7F E3 FB 78 */ mr r3, r31 /* 80098F60 00095EA0 38 80 00 76 */ li r4, 0x76 -/* 80098F64 00095EA4 4B F9 A4 ED */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098F64 00095EA4 4B F9 A4 ED */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc lbl_80098F68: /* 80098F68 00095EA8 39 61 00 20 */ addi r11, r1, 0x20 /* 80098F6C 00095EAC 48 2C 92 BD */ bl _restgpr_29 @@ -1110,7 +1110,7 @@ lbl_80098F68: /* 80098F90 00095ED0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098F94 00095ED4 38 63 00 9C */ addi r3, r3, 0x9c /* 80098F98 00095ED8 38 80 00 77 */ li r4, 0x77 -/* 80098F9C 00095EDC 4B F9 A4 B5 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098F9C 00095EDC 4B F9 A4 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098FA0 00095EE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098FA4 00095EE4 7C 08 03 A6 */ mtlr r0 /* 80098FA8 00095EE8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1122,7 +1122,7 @@ lbl_80098F68: /* 80098FC0 00095F00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098FC4 00095F04 38 63 00 9C */ addi r3, r3, 0x9c /* 80098FC8 00095F08 38 80 00 78 */ li r4, 0x78 -/* 80098FCC 00095F0C 4B F9 A4 85 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098FCC 00095F0C 4B F9 A4 85 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80098FD0 00095F10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80098FD4 00095F14 7C 08 03 A6 */ mtlr r0 /* 80098FD8 00095F18 38 21 00 10 */ addi r1, r1, 0x10 @@ -1134,7 +1134,7 @@ lbl_80098F68: /* 80098FF0 00095F30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80098FF4 00095F34 38 63 00 9C */ addi r3, r3, 0x9c /* 80098FF8 00095F38 38 80 00 79 */ li r4, 0x79 -/* 80098FFC 00095F3C 4B F9 A4 55 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80098FFC 00095F3C 4B F9 A4 55 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80099000 00095F40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099004 00095F44 7C 08 03 A6 */ mtlr r0 /* 80099008 00095F48 38 21 00 10 */ addi r1, r1, 0x10 @@ -1146,7 +1146,7 @@ lbl_80098F68: /* 80099020 00095F60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099024 00095F64 38 63 00 9C */ addi r3, r3, 0x9c /* 80099028 00095F68 38 80 00 7A */ li r4, 0x7a -/* 8009902C 00095F6C 4B F9 A4 25 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8009902C 00095F6C 4B F9 A4 25 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80099030 00095F70 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099034 00095F74 7C 08 03 A6 */ mtlr r0 /* 80099038 00095F78 38 21 00 10 */ addi r1, r1, 0x10 @@ -1158,7 +1158,7 @@ lbl_80098F68: /* 80099050 00095F90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099054 00095F94 38 63 00 9C */ addi r3, r3, 0x9c /* 80099058 00095F98 38 80 00 7B */ li r4, 0x7b -/* 8009905C 00095F9C 4B F9 A3 F5 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8009905C 00095F9C 4B F9 A3 F5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80099060 00095FA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099064 00095FA4 7C 08 03 A6 */ mtlr r0 /* 80099068 00095FA8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1170,7 +1170,7 @@ lbl_80098F68: /* 80099080 00095FC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099084 00095FC4 38 63 00 9C */ addi r3, r3, 0x9c /* 80099088 00095FC8 38 80 00 7C */ li r4, 0x7c -/* 8009908C 00095FCC 4B F9 A3 C5 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8009908C 00095FCC 4B F9 A3 C5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80099090 00095FD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099094 00095FD4 7C 08 03 A6 */ mtlr r0 /* 80099098 00095FD8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1182,7 +1182,7 @@ lbl_80098F68: /* 800990B0 00095FF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800990B4 00095FF4 38 63 00 9C */ addi r3, r3, 0x9c /* 800990B8 00095FF8 38 80 00 7D */ li r4, 0x7d -/* 800990BC 00095FFC 4B F9 A3 95 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 800990BC 00095FFC 4B F9 A3 95 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 800990C0 00096000 80 01 00 14 */ lwz r0, 0x14(r1) /* 800990C4 00096004 7C 08 03 A6 */ mtlr r0 /* 800990C8 00096008 38 21 00 10 */ addi r1, r1, 0x10 @@ -1194,7 +1194,7 @@ lbl_80098F68: /* 800990E0 00096020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800990E4 00096024 38 63 00 9C */ addi r3, r3, 0x9c /* 800990E8 00096028 38 80 00 7E */ li r4, 0x7e -/* 800990EC 0009602C 4B F9 A3 65 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 800990EC 0009602C 4B F9 A3 65 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 800990F0 00096030 80 01 00 14 */ lwz r0, 0x14(r1) /* 800990F4 00096034 7C 08 03 A6 */ mtlr r0 /* 800990F8 00096038 38 21 00 10 */ addi r1, r1, 0x10 @@ -1206,7 +1206,7 @@ lbl_80098F68: /* 80099110 00096050 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099114 00096054 38 63 00 9C */ addi r3, r3, 0x9c /* 80099118 00096058 38 80 00 7F */ li r4, 0x7f -/* 8009911C 0009605C 4B F9 A3 35 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8009911C 0009605C 4B F9 A3 35 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80099120 00096060 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099124 00096064 7C 08 03 A6 */ mtlr r0 /* 80099128 00096068 38 21 00 10 */ addi r1, r1, 0x10 @@ -1219,7 +1219,7 @@ lbl_80098F68: /* 80099144 00096084 38 63 00 9C */ addi r3, r3, 0x9c /* 80099148 00096088 38 80 00 15 */ li r4, 0x15 /* 8009914C 0009608C 38 A0 00 80 */ li r5, 0x80 -/* 80099150 00096090 4B F9 9E 69 */ bl dSv_player_item_c_NS_setItem +/* 80099150 00096090 4B F9 9E 69 */ bl setItem__17dSv_player_item_cFiUc /* 80099154 00096094 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099158 00096098 7C 08 03 A6 */ mtlr r0 /* 8009915C 0009609C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1232,7 +1232,7 @@ lbl_80098F68: /* 80099178 000960B8 38 63 00 9C */ addi r3, r3, 0x9c /* 8009917C 000960BC 38 80 00 15 */ li r4, 0x15 /* 80099180 000960C0 38 A0 00 81 */ li r5, 0x81 -/* 80099184 000960C4 4B F9 9E 35 */ bl dSv_player_item_c_NS_setItem +/* 80099184 000960C4 4B F9 9E 35 */ bl setItem__17dSv_player_item_cFiUc /* 80099188 000960C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009918C 000960CC 7C 08 03 A6 */ mtlr r0 /* 80099190 000960D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1252,7 +1252,7 @@ lbl_80098F68: /* 800991C8 00096108 38 63 00 9C */ addi r3, r3, 0x9c /* 800991CC 0009610C 38 80 00 15 */ li r4, 0x15 /* 800991D0 00096110 38 A0 00 82 */ li r5, 0x82 -/* 800991D4 00096114 4B F9 9D E5 */ bl dSv_player_item_c_NS_setItem +/* 800991D4 00096114 4B F9 9D E5 */ bl setItem__17dSv_player_item_cFiUc /* 800991D8 00096118 80 01 00 14 */ lwz r0, 0x14(r1) /* 800991DC 0009611C 7C 08 03 A6 */ mtlr r0 /* 800991E0 00096120 38 21 00 10 */ addi r1, r1, 0x10 @@ -1265,7 +1265,7 @@ lbl_80098F68: /* 800991FC 0009613C 38 63 00 9C */ addi r3, r3, 0x9c /* 80099200 00096140 38 80 00 15 */ li r4, 0x15 /* 80099204 00096144 38 A0 00 83 */ li r5, 0x83 -/* 80099208 00096148 4B F9 9D B1 */ bl dSv_player_item_c_NS_setItem +/* 80099208 00096148 4B F9 9D B1 */ bl setItem__17dSv_player_item_cFiUc /* 8009920C 0009614C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099210 00096150 7C 08 03 A6 */ mtlr r0 /* 80099214 00096154 38 21 00 10 */ addi r1, r1, 0x10 @@ -1278,7 +1278,7 @@ lbl_80098F68: /* 80099230 00096170 38 63 00 9C */ addi r3, r3, 0x9c /* 80099234 00096174 38 80 00 15 */ li r4, 0x15 /* 80099238 00096178 38 A0 00 84 */ li r5, 0x84 -/* 8009923C 0009617C 4B F9 9D 7D */ bl dSv_player_item_c_NS_setItem +/* 8009923C 0009617C 4B F9 9D 7D */ bl setItem__17dSv_player_item_cFiUc /* 80099240 00096180 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099244 00096184 7C 08 03 A6 */ mtlr r0 /* 80099248 00096188 38 21 00 10 */ addi r1, r1, 0x10 @@ -1291,7 +1291,7 @@ lbl_80098F68: /* 80099264 000961A4 38 63 00 9C */ addi r3, r3, 0x9c /* 80099268 000961A8 38 80 00 13 */ li r4, 0x13 /* 8009926C 000961AC 38 A0 00 90 */ li r5, 0x90 -/* 80099270 000961B0 4B F9 9D 49 */ bl dSv_player_item_c_NS_setItem +/* 80099270 000961B0 4B F9 9D 49 */ bl setItem__17dSv_player_item_cFiUc /* 80099274 000961B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099278 000961B8 7C 08 03 A6 */ mtlr r0 /* 8009927C 000961BC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1304,7 +1304,7 @@ lbl_80098F68: /* 80099298 000961D8 38 63 00 9C */ addi r3, r3, 0x9c /* 8009929C 000961DC 38 80 00 13 */ li r4, 0x13 /* 800992A0 000961E0 38 A0 00 91 */ li r5, 0x91 -/* 800992A4 000961E4 4B F9 9D 15 */ bl dSv_player_item_c_NS_setItem +/* 800992A4 000961E4 4B F9 9D 15 */ bl setItem__17dSv_player_item_cFiUc /* 800992A8 000961E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800992AC 000961EC 7C 08 03 A6 */ mtlr r0 /* 800992B0 000961F0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1316,7 +1316,7 @@ lbl_80098F68: /* 800992C8 00096208 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800992CC 0009620C 38 63 00 9C */ addi r3, r3, 0x9c /* 800992D0 00096210 38 80 00 7B */ li r4, 0x7b -/* 800992D4 00096214 4B F9 A1 7D */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 800992D4 00096214 4B F9 A1 7D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 800992D8 00096218 80 01 00 14 */ lwz r0, 0x14(r1) /* 800992DC 0009621C 7C 08 03 A6 */ mtlr r0 /* 800992E0 00096220 38 21 00 10 */ addi r1, r1, 0x10 @@ -1328,7 +1328,7 @@ lbl_80098F68: /* 800992F8 00096238 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800992FC 0009623C 38 63 00 9C */ addi r3, r3, 0x9c /* 80099300 00096240 38 80 00 66 */ li r4, 0x66 -/* 80099304 00096244 4B F9 A2 11 */ bl dSv_player_item_c_NS_setEmptyBottle_X1_ +/* 80099304 00096244 4B F9 A2 11 */ bl setEmptyBottle__17dSv_player_item_cFUc /* 80099308 00096248 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009930C 0009624C 7C 08 03 A6 */ mtlr r0 /* 80099310 00096250 38 21 00 10 */ addi r1, r1, 0x10 @@ -1348,7 +1348,7 @@ lbl_80098F68: /* 80099348 00096288 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009934C 0009628C 38 63 00 9C */ addi r3, r3, 0x9c /* 80099350 00096290 38 80 00 9F */ li r4, 0x9f -/* 80099354 00096294 4B F9 A0 FD */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 80099354 00096294 4B F9 A0 FD */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 80099358 00096298 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009935C 0009629C 7C 08 03 A6 */ mtlr r0 /* 80099360 000962A0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1433,7 +1433,7 @@ lbl_80098F68: /* 8009949C 000963DC 38 63 00 9C */ addi r3, r3, 0x9c /* 800994A0 000963E0 38 80 00 16 */ li r4, 0x16 /* 800994A4 000963E4 38 A0 00 E9 */ li r5, 0xe9 -/* 800994A8 000963E8 4B F9 9B 11 */ bl dSv_player_item_c_NS_setItem +/* 800994A8 000963E8 4B F9 9B 11 */ bl setItem__17dSv_player_item_cFiUc /* 800994AC 000963EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800994B0 000963F0 7C 08 03 A6 */ mtlr r0 /* 800994B4 000963F4 38 21 00 10 */ addi r1, r1, 0x10 @@ -1446,7 +1446,7 @@ lbl_80098F68: /* 800994D0 00096410 38 63 00 9C */ addi r3, r3, 0x9c /* 800994D4 00096414 38 80 00 16 */ li r4, 0x16 /* 800994D8 00096418 38 A0 00 EA */ li r5, 0xea -/* 800994DC 0009641C 4B F9 9A DD */ bl dSv_player_item_c_NS_setItem +/* 800994DC 0009641C 4B F9 9A DD */ bl setItem__17dSv_player_item_cFiUc /* 800994E0 00096420 80 01 00 14 */ lwz r0, 0x14(r1) /* 800994E4 00096424 7C 08 03 A6 */ mtlr r0 /* 800994E8 00096428 38 21 00 10 */ addi r1, r1, 0x10 @@ -1459,7 +1459,7 @@ lbl_80098F68: /* 80099504 00096444 38 63 00 9C */ addi r3, r3, 0x9c /* 80099508 00096448 38 80 00 16 */ li r4, 0x16 /* 8009950C 0009644C 38 A0 00 EB */ li r5, 0xeb -/* 80099510 00096450 4B F9 9A A9 */ bl dSv_player_item_c_NS_setItem +/* 80099510 00096450 4B F9 9A A9 */ bl setItem__17dSv_player_item_cFiUc /* 80099514 00096454 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099518 00096458 7C 08 03 A6 */ mtlr r0 /* 8009951C 0009645C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1472,7 +1472,7 @@ lbl_80098F68: /* 80099538 00096478 38 63 00 9C */ addi r3, r3, 0x9c /* 8009953C 0009647C 38 80 00 12 */ li r4, 0x12 /* 80099540 00096480 38 A0 00 EC */ li r5, 0xec -/* 80099544 00096484 4B F9 9A 75 */ bl dSv_player_item_c_NS_setItem +/* 80099544 00096484 4B F9 9A 75 */ bl setItem__17dSv_player_item_cFiUc /* 80099548 00096488 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009954C 0009648C 7C 08 03 A6 */ mtlr r0 /* 80099550 00096490 38 21 00 10 */ addi r1, r1, 0x10 @@ -1811,7 +1811,7 @@ lbl_80098F68: /* 80099A84 000969C4 38 63 00 9C */ addi r3, r3, 0x9c /* 80099A88 000969C8 38 80 00 12 */ li r4, 0x12 /* 80099A8C 000969CC 38 A0 00 01 */ li r5, 1 -/* 80099A90 000969D0 4B F9 95 A1 */ bl dSv_player_item_c_NS_getItem +/* 80099A90 000969D0 4B F9 95 A1 */ bl getItem__17dSv_player_item_cCFib /* 80099A94 000969D4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099A98 000969D8 20 00 00 25 */ subfic r0, r0, 0x25 /* 80099A9C 000969DC 7C 00 00 34 */ cntlzw r0, r0 @@ -1840,7 +1840,7 @@ lbl_80098F68: /* 80099AF8 00096A38 38 63 00 9C */ addi r3, r3, 0x9c /* 80099AFC 00096A3C 38 80 00 12 */ li r4, 0x12 /* 80099B00 00096A40 38 A0 00 01 */ li r5, 1 -/* 80099B04 00096A44 4B F9 95 2D */ bl dSv_player_item_c_NS_getItem +/* 80099B04 00096A44 4B F9 95 2D */ bl getItem__17dSv_player_item_cCFib /* 80099B08 00096A48 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099B0C 00096A4C 20 00 00 27 */ subfic r0, r0, 0x27 /* 80099B10 00096A50 7C 00 00 34 */ cntlzw r0, r0 @@ -1919,7 +1919,7 @@ lbl_80098F68: /* 80099C34 00096B74 38 63 00 9C */ addi r3, r3, 0x9c /* 80099C38 00096B78 38 80 00 12 */ li r4, 0x12 /* 80099C3C 00096B7C 38 A0 00 01 */ li r5, 1 -/* 80099C40 00096B80 4B F9 93 F1 */ bl dSv_player_item_c_NS_getItem +/* 80099C40 00096B80 4B F9 93 F1 */ bl getItem__17dSv_player_item_cCFib /* 80099C44 00096B84 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099C48 00096B88 20 00 00 2D */ subfic r0, r0, 0x2d /* 80099C4C 00096B8C 7C 00 00 34 */ cntlzw r0, r0 @@ -1987,7 +1987,7 @@ lbl_80098F68: /* 80099D44 00096C84 38 63 00 9C */ addi r3, r3, 0x9c /* 80099D48 00096C88 38 80 00 12 */ li r4, 0x12 /* 80099D4C 00096C8C 38 A0 00 01 */ li r5, 1 -/* 80099D50 00096C90 4B F9 92 E1 */ bl dSv_player_item_c_NS_getItem +/* 80099D50 00096C90 4B F9 92 E1 */ bl getItem__17dSv_player_item_cCFib /* 80099D54 00096C94 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099D58 00096C98 20 00 00 25 */ subfic r0, r0, 0x25 /* 80099D5C 00096C9C 7C 00 00 34 */ cntlzw r0, r0 @@ -2010,7 +2010,7 @@ lbl_80098F68: /* 80099DA0 00096CE0 38 63 00 9C */ addi r3, r3, 0x9c /* 80099DA4 00096CE4 38 80 00 14 */ li r4, 0x14 /* 80099DA8 00096CE8 38 A0 00 01 */ li r5, 1 -/* 80099DAC 00096CEC 4B F9 92 85 */ bl dSv_player_item_c_NS_getItem +/* 80099DAC 00096CEC 4B F9 92 85 */ bl getItem__17dSv_player_item_cCFib /* 80099DB0 00096CF0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099DB4 00096CF4 20 00 00 3D */ subfic r0, r0, 0x3d /* 80099DB8 00096CF8 7C 00 00 34 */ cntlzw r0, r0 @@ -2051,7 +2051,7 @@ lbl_80098F68: /* 80099E44 00096D84 38 63 00 9C */ addi r3, r3, 0x9c /* 80099E48 00096D88 38 80 00 00 */ li r4, 0 /* 80099E4C 00096D8C 38 A0 00 01 */ li r5, 1 -/* 80099E50 00096D90 4B F9 91 E1 */ bl dSv_player_item_c_NS_getItem +/* 80099E50 00096D90 4B F9 91 E1 */ bl getItem__17dSv_player_item_cCFib /* 80099E54 00096D94 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099E58 00096D98 20 00 00 40 */ subfic r0, r0, 0x40 /* 80099E5C 00096D9C 7C 00 00 34 */ cntlzw r0, r0 @@ -2068,7 +2068,7 @@ lbl_80098F68: /* 80099E88 00096DC8 38 63 00 9C */ addi r3, r3, 0x9c /* 80099E8C 00096DCC 38 80 00 02 */ li r4, 2 /* 80099E90 00096DD0 38 A0 00 01 */ li r5, 1 -/* 80099E94 00096DD4 4B F9 91 9D */ bl dSv_player_item_c_NS_getItem +/* 80099E94 00096DD4 4B F9 91 9D */ bl getItem__17dSv_player_item_cCFib /* 80099E98 00096DD8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099E9C 00096DDC 20 00 00 41 */ subfic r0, r0, 0x41 /* 80099EA0 00096DE0 7C 00 00 34 */ cntlzw r0, r0 @@ -2085,7 +2085,7 @@ lbl_80098F68: /* 80099ECC 00096E0C 38 63 00 9C */ addi r3, r3, 0x9c /* 80099ED0 00096E10 38 80 00 06 */ li r4, 6 /* 80099ED4 00096E14 38 A0 00 01 */ li r5, 1 -/* 80099ED8 00096E18 4B F9 91 59 */ bl dSv_player_item_c_NS_getItem +/* 80099ED8 00096E18 4B F9 91 59 */ bl getItem__17dSv_player_item_cCFib /* 80099EDC 00096E1C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099EE0 00096E20 20 00 00 42 */ subfic r0, r0, 0x42 /* 80099EE4 00096E24 7C 00 00 34 */ cntlzw r0, r0 @@ -2102,7 +2102,7 @@ lbl_80098F68: /* 80099F10 00096E50 38 63 00 9C */ addi r3, r3, 0x9c /* 80099F14 00096E54 38 80 00 04 */ li r4, 4 /* 80099F18 00096E58 38 A0 00 00 */ li r5, 0 -/* 80099F1C 00096E5C 4B F9 91 15 */ bl dSv_player_item_c_NS_getItem +/* 80099F1C 00096E5C 4B F9 91 15 */ bl getItem__17dSv_player_item_cCFib /* 80099F20 00096E60 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099F24 00096E64 20 00 00 43 */ subfic r0, r0, 0x43 /* 80099F28 00096E68 7C 00 00 34 */ cntlzw r0, r0 @@ -2119,7 +2119,7 @@ lbl_80098F68: /* 80099F54 00096E94 38 63 00 9C */ addi r3, r3, 0x9c /* 80099F58 00096E98 38 80 00 09 */ li r4, 9 /* 80099F5C 00096E9C 38 A0 00 01 */ li r5, 1 -/* 80099F60 00096EA0 4B F9 90 D1 */ bl dSv_player_item_c_NS_getItem +/* 80099F60 00096EA0 4B F9 90 D1 */ bl getItem__17dSv_player_item_cCFib /* 80099F64 00096EA4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099F68 00096EA8 20 00 00 44 */ subfic r0, r0, 0x44 /* 80099F6C 00096EAC 7C 00 00 34 */ cntlzw r0, r0 @@ -2136,7 +2136,7 @@ lbl_80098F68: /* 80099F98 00096ED8 38 63 00 9C */ addi r3, r3, 0x9c /* 80099F9C 00096EDC 38 80 00 03 */ li r4, 3 /* 80099FA0 00096EE0 38 A0 00 01 */ li r5, 1 -/* 80099FA4 00096EE4 4B F9 90 8D */ bl dSv_player_item_c_NS_getItem +/* 80099FA4 00096EE4 4B F9 90 8D */ bl getItem__17dSv_player_item_cCFib /* 80099FA8 00096EE8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099FAC 00096EEC 20 00 00 45 */ subfic r0, r0, 0x45 /* 80099FB0 00096EF0 7C 00 00 34 */ cntlzw r0, r0 @@ -2153,7 +2153,7 @@ lbl_80098F68: /* 80099FDC 00096F1C 38 63 00 9C */ addi r3, r3, 0x9c /* 80099FE0 00096F20 38 80 00 08 */ li r4, 8 /* 80099FE4 00096F24 38 A0 00 01 */ li r5, 1 -/* 80099FE8 00096F28 4B F9 90 49 */ bl dSv_player_item_c_NS_getItem +/* 80099FE8 00096F28 4B F9 90 49 */ bl getItem__17dSv_player_item_cCFib /* 80099FEC 00096F2C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80099FF0 00096F30 20 00 00 46 */ subfic r0, r0, 0x46 /* 80099FF4 00096F34 7C 00 00 34 */ cntlzw r0, r0 @@ -2170,7 +2170,7 @@ lbl_80098F68: /* 8009A020 00096F60 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A024 00096F64 38 80 00 0A */ li r4, 0xa /* 8009A028 00096F68 38 A0 00 01 */ li r5, 1 -/* 8009A02C 00096F6C 4B F9 90 05 */ bl dSv_player_item_c_NS_getItem +/* 8009A02C 00096F6C 4B F9 90 05 */ bl getItem__17dSv_player_item_cCFib /* 8009A030 00096F70 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A034 00096F74 20 00 00 47 */ subfic r0, r0, 0x47 /* 8009A038 00096F78 7C 00 00 34 */ cntlzw r0, r0 @@ -2187,7 +2187,7 @@ lbl_80098F68: /* 8009A064 00096FA4 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A068 00096FA8 38 80 00 01 */ li r4, 1 /* 8009A06C 00096FAC 38 A0 00 01 */ li r5, 1 -/* 8009A070 00096FB0 4B F9 8F C1 */ bl dSv_player_item_c_NS_getItem +/* 8009A070 00096FB0 4B F9 8F C1 */ bl getItem__17dSv_player_item_cCFib /* 8009A074 00096FB4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A078 00096FB8 20 00 00 48 */ subfic r0, r0, 0x48 /* 8009A07C 00096FBC 7C 00 00 34 */ cntlzw r0, r0 @@ -2228,14 +2228,14 @@ item_getcheck_func_FISHING_ROD_1: /* 8009A0FC 0009703C 7F 43 D3 78 */ mr r3, r26 /* 8009A100 00097040 38 80 00 14 */ li r4, 0x14 /* 8009A104 00097044 38 A0 00 01 */ li r5, 1 -/* 8009A108 00097048 4B F9 8F 29 */ bl dSv_player_item_c_NS_getItem +/* 8009A108 00097048 4B F9 8F 29 */ bl getItem__17dSv_player_item_cCFib /* 8009A10C 0009704C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A110 00097050 28 00 00 4A */ cmplwi r0, 0x4a /* 8009A114 00097054 41 82 00 24 */ beq lbl_8009A138 /* 8009A118 00097058 7F 43 D3 78 */ mr r3, r26 /* 8009A11C 0009705C 38 80 00 14 */ li r4, 0x14 /* 8009A120 00097060 38 A0 00 01 */ li r5, 1 -/* 8009A124 00097064 4B F9 8F 0D */ bl dSv_player_item_c_NS_getItem +/* 8009A124 00097064 4B F9 8F 0D */ bl getItem__17dSv_player_item_cCFib /* 8009A128 00097068 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A12C 0009706C 28 00 00 5B */ cmplwi r0, 0x5b /* 8009A130 00097070 41 82 00 08 */ beq lbl_8009A138 @@ -2246,7 +2246,7 @@ lbl_8009A138: /* 8009A140 00097080 7F 43 D3 78 */ mr r3, r26 /* 8009A144 00097084 38 80 00 14 */ li r4, 0x14 /* 8009A148 00097088 38 A0 00 01 */ li r5, 1 -/* 8009A14C 0009708C 4B F9 8E E5 */ bl dSv_player_item_c_NS_getItem +/* 8009A14C 0009708C 4B F9 8E E5 */ bl getItem__17dSv_player_item_cCFib /* 8009A150 00097090 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A154 00097094 28 00 00 5D */ cmplwi r0, 0x5d /* 8009A158 00097098 41 82 00 08 */ beq lbl_8009A160 @@ -2257,7 +2257,7 @@ lbl_8009A160: /* 8009A168 000970A8 7F 43 D3 78 */ mr r3, r26 /* 8009A16C 000970AC 38 80 00 14 */ li r4, 0x14 /* 8009A170 000970B0 38 A0 00 01 */ li r5, 1 -/* 8009A174 000970B4 4B F9 8E BD */ bl dSv_player_item_c_NS_getItem +/* 8009A174 000970B4 4B F9 8E BD */ bl getItem__17dSv_player_item_cCFib /* 8009A178 000970B8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A17C 000970BC 28 00 00 5C */ cmplwi r0, 0x5c /* 8009A180 000970C0 41 82 00 08 */ beq lbl_8009A188 @@ -2268,7 +2268,7 @@ lbl_8009A188: /* 8009A190 000970D0 7F 43 D3 78 */ mr r3, r26 /* 8009A194 000970D4 38 80 00 14 */ li r4, 0x14 /* 8009A198 000970D8 38 A0 00 01 */ li r5, 1 -/* 8009A19C 000970DC 4B F9 8E 95 */ bl dSv_player_item_c_NS_getItem +/* 8009A19C 000970DC 4B F9 8E 95 */ bl getItem__17dSv_player_item_cCFib /* 8009A1A0 000970E0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A1A4 000970E4 28 00 00 5E */ cmplwi r0, 0x5e /* 8009A1A8 000970E8 41 82 00 08 */ beq lbl_8009A1B0 @@ -2279,7 +2279,7 @@ lbl_8009A1B0: /* 8009A1B8 000970F8 7F 43 D3 78 */ mr r3, r26 /* 8009A1BC 000970FC 38 80 00 14 */ li r4, 0x14 /* 8009A1C0 00097100 38 A0 00 01 */ li r5, 1 -/* 8009A1C4 00097104 4B F9 8E 6D */ bl dSv_player_item_c_NS_getItem +/* 8009A1C4 00097104 4B F9 8E 6D */ bl getItem__17dSv_player_item_cCFib /* 8009A1C8 00097108 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A1CC 0009710C 28 00 00 5F */ cmplwi r0, 0x5f /* 8009A1D0 00097110 41 82 00 08 */ beq lbl_8009A1D8 @@ -2302,7 +2302,7 @@ lbl_8009A1D8: /* 8009A210 00097150 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A214 00097154 38 80 00 17 */ li r4, 0x17 /* 8009A218 00097158 38 A0 00 01 */ li r5, 1 -/* 8009A21C 0009715C 4B F9 8E 15 */ bl dSv_player_item_c_NS_getItem +/* 8009A21C 0009715C 4B F9 8E 15 */ bl getItem__17dSv_player_item_cCFib /* 8009A220 00097160 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A224 00097164 20 00 00 4B */ subfic r0, r0, 0x4b /* 8009A228 00097168 7C 00 00 34 */ cntlzw r0, r0 @@ -2371,7 +2371,7 @@ lbl_8009A1D8: /* 8009A324 00097264 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A328 00097268 38 80 00 04 */ li r4, 4 /* 8009A32C 0009726C 38 A0 00 00 */ li r5, 0 -/* 8009A330 00097270 4B F9 8D 01 */ bl dSv_player_item_c_NS_getItem +/* 8009A330 00097270 4B F9 8D 01 */ bl getItem__17dSv_player_item_cCFib /* 8009A334 00097274 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A338 00097278 28 00 00 43 */ cmplwi r0, 0x43 /* 8009A33C 0009727C 40 82 00 1C */ bne lbl_8009A358 @@ -2400,7 +2400,7 @@ lbl_8009A358: /* 8009A394 000972D4 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A398 000972D8 38 80 00 04 */ li r4, 4 /* 8009A39C 000972DC 38 A0 00 00 */ li r5, 0 -/* 8009A3A0 000972E0 4B F9 8C 91 */ bl dSv_player_item_c_NS_getItem +/* 8009A3A0 000972E0 4B F9 8C 91 */ bl getItem__17dSv_player_item_cCFib /* 8009A3A4 000972E4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A3A8 000972E8 28 00 00 43 */ cmplwi r0, 0x43 /* 8009A3AC 000972EC 40 82 00 1C */ bne lbl_8009A3C8 @@ -2429,7 +2429,7 @@ lbl_8009A3C8: /* 8009A404 00097344 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A408 00097348 38 80 00 04 */ li r4, 4 /* 8009A40C 0009734C 38 A0 00 00 */ li r5, 0 -/* 8009A410 00097350 4B F9 8C 21 */ bl dSv_player_item_c_NS_getItem +/* 8009A410 00097350 4B F9 8C 21 */ bl getItem__17dSv_player_item_cCFib /* 8009A414 00097354 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009A418 00097358 28 00 00 43 */ cmplwi r0, 0x43 /* 8009A41C 0009735C 40 82 00 1C */ bne lbl_8009A438 @@ -2501,7 +2501,7 @@ lbl_8009A438: /* 8009A520 00097460 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A524 00097464 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A528 00097468 38 80 00 60 */ li r4, 0x60 -/* 8009A52C 0009746C 4B F9 91 B5 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A52C 0009746C 4B F9 91 B5 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A530 00097470 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A534 00097474 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A538 00097478 7C 08 03 A6 */ mtlr r0 @@ -2514,7 +2514,7 @@ lbl_8009A438: /* 8009A554 00097494 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A558 00097498 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A55C 0009749C 38 80 00 61 */ li r4, 0x61 -/* 8009A560 000974A0 4B F9 91 81 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A560 000974A0 4B F9 91 81 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A564 000974A4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A568 000974A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A56C 000974AC 7C 08 03 A6 */ mtlr r0 @@ -2527,7 +2527,7 @@ lbl_8009A438: /* 8009A588 000974C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A58C 000974CC 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A590 000974D0 38 80 00 62 */ li r4, 0x62 -/* 8009A594 000974D4 4B F9 91 4D */ bl dSv_player_item_c_NS_checkBottle +/* 8009A594 000974D4 4B F9 91 4D */ bl checkBottle__17dSv_player_item_cFUc /* 8009A598 000974D8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A59C 000974DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A5A0 000974E0 7C 08 03 A6 */ mtlr r0 @@ -2540,7 +2540,7 @@ lbl_8009A438: /* 8009A5BC 000974FC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A5C0 00097500 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A5C4 00097504 38 80 00 63 */ li r4, 0x63 -/* 8009A5C8 00097508 4B F9 91 19 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A5C8 00097508 4B F9 91 19 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A5CC 0009750C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A5D0 00097510 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A5D4 00097514 7C 08 03 A6 */ mtlr r0 @@ -2553,7 +2553,7 @@ lbl_8009A438: /* 8009A5F0 00097530 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A5F4 00097534 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A5F8 00097538 38 80 00 64 */ li r4, 0x64 -/* 8009A5FC 0009753C 4B F9 90 E5 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A5FC 0009753C 4B F9 90 E5 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A600 00097540 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A604 00097544 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A608 00097548 7C 08 03 A6 */ mtlr r0 @@ -2566,7 +2566,7 @@ lbl_8009A438: /* 8009A624 00097564 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A628 00097568 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A62C 0009756C 38 80 00 65 */ li r4, 0x65 -/* 8009A630 00097570 4B F9 90 B1 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A630 00097570 4B F9 90 B1 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A634 00097574 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A638 00097578 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A63C 0009757C 7C 08 03 A6 */ mtlr r0 @@ -2579,7 +2579,7 @@ lbl_8009A438: /* 8009A658 00097598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A65C 0009759C 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A660 000975A0 38 80 00 66 */ li r4, 0x66 -/* 8009A664 000975A4 4B F9 90 7D */ bl dSv_player_item_c_NS_checkBottle +/* 8009A664 000975A4 4B F9 90 7D */ bl checkBottle__17dSv_player_item_cFUc /* 8009A668 000975A8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A66C 000975AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A670 000975B0 7C 08 03 A6 */ mtlr r0 @@ -2592,7 +2592,7 @@ lbl_8009A438: /* 8009A68C 000975CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A690 000975D0 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A694 000975D4 38 80 00 67 */ li r4, 0x67 -/* 8009A698 000975D8 4B F9 90 49 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A698 000975D8 4B F9 90 49 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A69C 000975DC 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A6A0 000975E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A6A4 000975E4 7C 08 03 A6 */ mtlr r0 @@ -2605,7 +2605,7 @@ lbl_8009A438: /* 8009A6C0 00097600 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A6C4 00097604 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A6C8 00097608 38 80 00 68 */ li r4, 0x68 -/* 8009A6CC 0009760C 4B F9 90 15 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A6CC 0009760C 4B F9 90 15 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A6D0 00097610 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A6D4 00097614 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A6D8 00097618 7C 08 03 A6 */ mtlr r0 @@ -2618,7 +2618,7 @@ lbl_8009A438: /* 8009A6F4 00097634 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A6F8 00097638 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A6FC 0009763C 38 80 00 69 */ li r4, 0x69 -/* 8009A700 00097640 4B F9 8F E1 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A700 00097640 4B F9 8F E1 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A704 00097644 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A708 00097648 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A70C 0009764C 7C 08 03 A6 */ mtlr r0 @@ -2631,7 +2631,7 @@ lbl_8009A438: /* 8009A728 00097668 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A72C 0009766C 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A730 00097670 38 80 00 6A */ li r4, 0x6a -/* 8009A734 00097674 4B F9 8F AD */ bl dSv_player_item_c_NS_checkBottle +/* 8009A734 00097674 4B F9 8F AD */ bl checkBottle__17dSv_player_item_cFUc /* 8009A738 00097678 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A73C 0009767C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A740 00097680 7C 08 03 A6 */ mtlr r0 @@ -2644,7 +2644,7 @@ lbl_8009A438: /* 8009A75C 0009769C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A760 000976A0 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A764 000976A4 38 80 00 6B */ li r4, 0x6b -/* 8009A768 000976A8 4B F9 8F 79 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A768 000976A8 4B F9 8F 79 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A76C 000976AC 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A770 000976B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A774 000976B4 7C 08 03 A6 */ mtlr r0 @@ -2657,7 +2657,7 @@ lbl_8009A438: /* 8009A790 000976D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A794 000976D4 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A798 000976D8 38 80 00 6C */ li r4, 0x6c -/* 8009A79C 000976DC 4B F9 8F 45 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A79C 000976DC 4B F9 8F 45 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A7A0 000976E0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A7A4 000976E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A7A8 000976E8 7C 08 03 A6 */ mtlr r0 @@ -2670,7 +2670,7 @@ lbl_8009A438: /* 8009A7C4 00097704 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A7C8 00097708 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A7CC 0009770C 38 80 00 6B */ li r4, 0x6b -/* 8009A7D0 00097710 4B F9 8F 11 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A7D0 00097710 4B F9 8F 11 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A7D4 00097714 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A7D8 00097718 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A7DC 0009771C 7C 08 03 A6 */ mtlr r0 @@ -2683,7 +2683,7 @@ lbl_8009A438: /* 8009A7F8 00097738 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A7FC 0009773C 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A800 00097740 38 80 00 6E */ li r4, 0x6e -/* 8009A804 00097744 4B F9 8E DD */ bl dSv_player_item_c_NS_checkBottle +/* 8009A804 00097744 4B F9 8E DD */ bl checkBottle__17dSv_player_item_cFUc /* 8009A808 00097748 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A80C 0009774C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A810 00097750 7C 08 03 A6 */ mtlr r0 @@ -2696,7 +2696,7 @@ lbl_8009A438: /* 8009A82C 0009776C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A830 00097770 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A834 00097774 38 80 00 6F */ li r4, 0x6f -/* 8009A838 00097778 4B F9 8E A9 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A838 00097778 4B F9 8E A9 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A83C 0009777C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A840 00097780 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A844 00097784 7C 08 03 A6 */ mtlr r0 @@ -2745,7 +2745,7 @@ lbl_8009A438: /* 8009A8F0 00097830 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A8F4 00097834 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A8F8 00097838 38 80 00 73 */ li r4, 0x73 -/* 8009A8FC 0009783C 4B F9 8D E5 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A8FC 0009783C 4B F9 8D E5 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A900 00097840 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A904 00097844 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A908 00097848 7C 08 03 A6 */ mtlr r0 @@ -2758,7 +2758,7 @@ lbl_8009A438: /* 8009A924 00097864 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A928 00097868 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A92C 0009786C 38 80 00 74 */ li r4, 0x74 -/* 8009A930 00097870 4B F9 8D B1 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A930 00097870 4B F9 8D B1 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A934 00097874 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A938 00097878 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A93C 0009787C 7C 08 03 A6 */ mtlr r0 @@ -2785,7 +2785,7 @@ lbl_8009A438: /* 8009A990 000978D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A994 000978D4 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A998 000978D8 38 80 00 77 */ li r4, 0x77 -/* 8009A99C 000978DC 4B F9 8D 45 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A99C 000978DC 4B F9 8D 45 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A9A0 000978E0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A9A4 000978E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A9A8 000978E8 7C 08 03 A6 */ mtlr r0 @@ -2798,7 +2798,7 @@ lbl_8009A438: /* 8009A9C4 00097904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A9C8 00097908 38 63 00 9C */ addi r3, r3, 0x9c /* 8009A9CC 0009790C 38 80 00 78 */ li r4, 0x78 -/* 8009A9D0 00097910 4B F9 8D 11 */ bl dSv_player_item_c_NS_checkBottle +/* 8009A9D0 00097910 4B F9 8D 11 */ bl checkBottle__17dSv_player_item_cFUc /* 8009A9D4 00097914 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009A9D8 00097918 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A9DC 0009791C 7C 08 03 A6 */ mtlr r0 @@ -2811,7 +2811,7 @@ lbl_8009A438: /* 8009A9F8 00097938 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A9FC 0009793C 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AA00 00097940 38 80 00 79 */ li r4, 0x79 -/* 8009AA04 00097944 4B F9 8C DD */ bl dSv_player_item_c_NS_checkBottle +/* 8009AA04 00097944 4B F9 8C DD */ bl checkBottle__17dSv_player_item_cFUc /* 8009AA08 00097948 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009AA0C 0009794C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AA10 00097950 7C 08 03 A6 */ mtlr r0 @@ -2824,7 +2824,7 @@ lbl_8009A438: /* 8009AA2C 0009796C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AA30 00097970 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AA34 00097974 38 80 00 7A */ li r4, 0x7a -/* 8009AA38 00097978 4B F9 8C A9 */ bl dSv_player_item_c_NS_checkBottle +/* 8009AA38 00097978 4B F9 8C A9 */ bl checkBottle__17dSv_player_item_cFUc /* 8009AA3C 0009797C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009AA40 00097980 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AA44 00097984 7C 08 03 A6 */ mtlr r0 @@ -2837,7 +2837,7 @@ lbl_8009A438: /* 8009AA60 000979A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AA64 000979A4 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AA68 000979A8 38 80 00 7B */ li r4, 0x7b -/* 8009AA6C 000979AC 4B F9 8C 75 */ bl dSv_player_item_c_NS_checkBottle +/* 8009AA6C 000979AC 4B F9 8C 75 */ bl checkBottle__17dSv_player_item_cFUc /* 8009AA70 000979B0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009AA74 000979B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AA78 000979B8 7C 08 03 A6 */ mtlr r0 @@ -2850,7 +2850,7 @@ lbl_8009A438: /* 8009AA94 000979D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AA98 000979D8 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AA9C 000979DC 38 80 00 7C */ li r4, 0x7c -/* 8009AAA0 000979E0 4B F9 8C 41 */ bl dSv_player_item_c_NS_checkBottle +/* 8009AAA0 000979E0 4B F9 8C 41 */ bl checkBottle__17dSv_player_item_cFUc /* 8009AAA4 000979E4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009AAA8 000979E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AAAC 000979EC 7C 08 03 A6 */ mtlr r0 @@ -2900,7 +2900,7 @@ lbl_8009A438: /* 8009AB5C 00097A9C 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AB60 00097AA0 38 80 00 15 */ li r4, 0x15 /* 8009AB64 00097AA4 38 A0 00 01 */ li r5, 1 -/* 8009AB68 00097AA8 4B F9 84 C9 */ bl dSv_player_item_c_NS_getItem +/* 8009AB68 00097AA8 4B F9 84 C9 */ bl getItem__17dSv_player_item_cCFib /* 8009AB6C 00097AAC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009AB70 00097AB0 20 00 00 80 */ subfic r0, r0, 0x80 /* 8009AB74 00097AB4 7C 00 00 34 */ cntlzw r0, r0 @@ -2917,7 +2917,7 @@ lbl_8009A438: /* 8009ABA0 00097AE0 38 63 00 9C */ addi r3, r3, 0x9c /* 8009ABA4 00097AE4 38 80 00 15 */ li r4, 0x15 /* 8009ABA8 00097AE8 38 A0 00 01 */ li r5, 1 -/* 8009ABAC 00097AEC 4B F9 84 85 */ bl dSv_player_item_c_NS_getItem +/* 8009ABAC 00097AEC 4B F9 84 85 */ bl getItem__17dSv_player_item_cCFib /* 8009ABB0 00097AF0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009ABB4 00097AF4 20 00 00 81 */ subfic r0, r0, 0x81 /* 8009ABB8 00097AF8 7C 00 00 34 */ cntlzw r0, r0 @@ -2934,7 +2934,7 @@ lbl_8009A438: /* 8009ABE4 00097B24 38 63 00 9C */ addi r3, r3, 0x9c /* 8009ABE8 00097B28 38 80 00 15 */ li r4, 0x15 /* 8009ABEC 00097B2C 38 A0 00 01 */ li r5, 1 -/* 8009ABF0 00097B30 4B F9 84 41 */ bl dSv_player_item_c_NS_getItem +/* 8009ABF0 00097B30 4B F9 84 41 */ bl getItem__17dSv_player_item_cCFib /* 8009ABF4 00097B34 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009ABF8 00097B38 20 00 00 82 */ subfic r0, r0, 0x82 /* 8009ABFC 00097B3C 7C 00 00 34 */ cntlzw r0, r0 @@ -2951,7 +2951,7 @@ lbl_8009A438: /* 8009AC28 00097B68 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AC2C 00097B6C 38 80 00 15 */ li r4, 0x15 /* 8009AC30 00097B70 38 A0 00 01 */ li r5, 1 -/* 8009AC34 00097B74 4B F9 83 FD */ bl dSv_player_item_c_NS_getItem +/* 8009AC34 00097B74 4B F9 83 FD */ bl getItem__17dSv_player_item_cCFib /* 8009AC38 00097B78 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009AC3C 00097B7C 20 00 00 83 */ subfic r0, r0, 0x83 /* 8009AC40 00097B80 7C 00 00 34 */ cntlzw r0, r0 @@ -2968,7 +2968,7 @@ lbl_8009A438: /* 8009AC6C 00097BAC 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AC70 00097BB0 38 80 00 16 */ li r4, 0x16 /* 8009AC74 00097BB4 38 A0 00 01 */ li r5, 1 -/* 8009AC78 00097BB8 4B F9 83 B9 */ bl dSv_player_item_c_NS_getItem +/* 8009AC78 00097BB8 4B F9 83 B9 */ bl getItem__17dSv_player_item_cCFib /* 8009AC7C 00097BBC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009AC80 00097BC0 20 00 00 84 */ subfic r0, r0, 0x84 /* 8009AC84 00097BC4 7C 00 00 34 */ cntlzw r0, r0 @@ -2985,7 +2985,7 @@ lbl_8009A438: /* 8009ACB0 00097BF0 38 63 00 9C */ addi r3, r3, 0x9c /* 8009ACB4 00097BF4 38 80 00 13 */ li r4, 0x13 /* 8009ACB8 00097BF8 38 A0 00 01 */ li r5, 1 -/* 8009ACBC 00097BFC 4B F9 83 75 */ bl dSv_player_item_c_NS_getItem +/* 8009ACBC 00097BFC 4B F9 83 75 */ bl getItem__17dSv_player_item_cCFib /* 8009ACC0 00097C00 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009ACC4 00097C04 20 00 00 90 */ subfic r0, r0, 0x90 /* 8009ACC8 00097C08 7C 00 00 34 */ cntlzw r0, r0 @@ -3002,7 +3002,7 @@ lbl_8009A438: /* 8009ACF4 00097C34 38 63 00 9C */ addi r3, r3, 0x9c /* 8009ACF8 00097C38 38 80 00 13 */ li r4, 0x13 /* 8009ACFC 00097C3C 38 A0 00 01 */ li r5, 1 -/* 8009AD00 00097C40 4B F9 83 31 */ bl dSv_player_item_c_NS_getItem +/* 8009AD00 00097C40 4B F9 83 31 */ bl getItem__17dSv_player_item_cCFib /* 8009AD04 00097C44 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009AD08 00097C48 20 00 00 91 */ subfic r0, r0, 0x91 /* 8009AD0C 00097C4C 7C 00 00 34 */ cntlzw r0, r0 @@ -3018,7 +3018,7 @@ lbl_8009A438: /* 8009AD34 00097C74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AD38 00097C78 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AD3C 00097C7C 38 80 00 9C */ li r4, 0x9c -/* 8009AD40 00097C80 4B F9 89 A1 */ bl dSv_player_item_c_NS_checkBottle +/* 8009AD40 00097C80 4B F9 89 A1 */ bl checkBottle__17dSv_player_item_cFUc /* 8009AD44 00097C84 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009AD48 00097C88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AD4C 00097C8C 7C 08 03 A6 */ mtlr r0 @@ -3035,7 +3035,7 @@ lbl_8009A438: /* 8009AD78 00097CB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AD7C 00097CBC 38 63 00 9C */ addi r3, r3, 0x9c /* 8009AD80 00097CC0 38 80 00 9F */ li r4, 0x9f -/* 8009AD84 00097CC4 4B F9 89 5D */ bl dSv_player_item_c_NS_checkBottle +/* 8009AD84 00097CC4 4B F9 89 5D */ bl checkBottle__17dSv_player_item_cFUc /* 8009AD88 00097CC8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8009AD8C 00097CCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AD90 00097CD0 7C 08 03 A6 */ mtlr r0 @@ -3434,7 +3434,7 @@ lbl_8009A438: /* 8009B3B4 000982F4 38 63 00 9C */ addi r3, r3, 0x9c /* 8009B3B8 000982F8 38 80 00 16 */ li r4, 0x16 /* 8009B3BC 000982FC 38 A0 00 01 */ li r5, 1 -/* 8009B3C0 00098300 4B F9 7C 71 */ bl dSv_player_item_c_NS_getItem +/* 8009B3C0 00098300 4B F9 7C 71 */ bl getItem__17dSv_player_item_cCFib /* 8009B3C4 00098304 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009B3C8 00098308 20 00 00 E9 */ subfic r0, r0, 0xe9 /* 8009B3CC 0009830C 7C 00 00 34 */ cntlzw r0, r0 @@ -3451,7 +3451,7 @@ lbl_8009A438: /* 8009B3F8 00098338 38 63 00 9C */ addi r3, r3, 0x9c /* 8009B3FC 0009833C 38 80 00 16 */ li r4, 0x16 /* 8009B400 00098340 38 A0 00 01 */ li r5, 1 -/* 8009B404 00098344 4B F9 7C 2D */ bl dSv_player_item_c_NS_getItem +/* 8009B404 00098344 4B F9 7C 2D */ bl getItem__17dSv_player_item_cCFib /* 8009B408 00098348 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009B40C 0009834C 20 00 00 EA */ subfic r0, r0, 0xea /* 8009B410 00098350 7C 00 00 34 */ cntlzw r0, r0 @@ -3468,7 +3468,7 @@ lbl_8009A438: /* 8009B43C 0009837C 38 63 00 9C */ addi r3, r3, 0x9c /* 8009B440 00098380 38 80 00 16 */ li r4, 0x16 /* 8009B444 00098384 38 A0 00 01 */ li r5, 1 -/* 8009B448 00098388 4B F9 7B E9 */ bl dSv_player_item_c_NS_getItem +/* 8009B448 00098388 4B F9 7B E9 */ bl getItem__17dSv_player_item_cCFib /* 8009B44C 0009838C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009B450 00098390 20 00 00 EB */ subfic r0, r0, 0xeb /* 8009B454 00098394 7C 00 00 34 */ cntlzw r0, r0 @@ -3485,7 +3485,7 @@ lbl_8009A438: /* 8009B480 000983C0 38 63 00 9C */ addi r3, r3, 0x9c /* 8009B484 000983C4 38 80 00 12 */ li r4, 0x12 /* 8009B488 000983C8 38 A0 00 01 */ li r5, 1 -/* 8009B48C 000983CC 4B F9 7B A5 */ bl dSv_player_item_c_NS_getItem +/* 8009B48C 000983CC 4B F9 7B A5 */ bl getItem__17dSv_player_item_cCFib /* 8009B490 000983D0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009B494 000983D4 20 00 00 EC */ subfic r0, r0, 0xec /* 8009B498 000983D8 7C 00 00 34 */ cntlzw r0, r0 @@ -3728,7 +3728,7 @@ check_itemno: /* 8009B7D8 00098718 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8009B7DC 0009871C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B7E0 00098720 38 80 00 00 */ li r4, 0 -/* 8009B7E4 00098724 4B F9 73 15 */ bl dSv_player_status_a_c_NS_isMagicFlag +/* 8009B7E4 00098724 4B F9 73 15 */ bl isMagicFlag__21dSv_player_status_a_cCFUc /* 8009B7E8 00098728 2C 03 00 00 */ cmpwi r3, 0 /* 8009B7EC 0009872C 40 82 00 1C */ bne lbl_8009B808 /* 8009B7F0 00098730 2C 1F 00 08 */ cmpwi r31, 8 @@ -3849,7 +3849,7 @@ lbl_8009B978: /* 8009B97C 000988BC 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8009B980 000988C0 38 84 00 0F */ addi r4, r4, 0xf /* 8009B984 000988C4 38 A0 00 00 */ li r5, 0 -/* 8009B988 000988C8 4B F9 76 A9 */ bl dSv_player_item_c_NS_getItem +/* 8009B988 000988C8 4B F9 76 A9 */ bl getItem__17dSv_player_item_cCFib /* 8009B98C 000988CC 57 35 06 3E */ clrlwi r21, r25, 0x18 /* 8009B990 000988D0 7C 7B A9 AE */ stbx r3, r27, r21 /* 8009B994 000988D4 7C 7B A8 AE */ lbzx r3, r27, r21 diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index 87a298f996..8218c9e762 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -1340,7 +1340,7 @@ kankyo_color_ratio_set: /* 8019D6A8 0019A5E8 DB A1 00 30 */ stfd f29, 0x30(r1) /* 8019D6AC 0019A5EC F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 8019D6B0 0019A5F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019D6B4 0019A5F4 48 1C 4B 25 */ bl func_803621D8 +/* 8019D6B4 0019A5F4 48 1C 4B 25 */ bl _savegpr_28 /* 8019D6B8 0019A5F8 FF A0 08 90 */ fmr f29, f1 /* 8019D6BC 0019A5FC 7C BC 2B 78 */ mr r28, r5 /* 8019D6C0 0019A600 7C DD 33 78 */ mr r29, r6 @@ -1392,7 +1392,7 @@ lbl_8019D760: /* 8019D770 0019A6B0 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 8019D774 0019A6B4 CB A1 00 30 */ lfd f29, 0x30(r1) /* 8019D778 0019A6B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019D77C 0019A6BC 48 1C 4A A9 */ bl func_80362224 +/* 8019D77C 0019A6BC 48 1C 4A A9 */ bl _restgpr_28 /* 8019D780 0019A6C0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8019D784 0019A6C4 7C 08 03 A6 */ mtlr r0 /* 8019D788 0019A6C8 38 21 00 60 */ addi r1, r1, 0x60 @@ -2778,7 +2778,7 @@ undwater_init: /* 8019EAA4 0019B9E4 7C 08 02 A6 */ mflr r0 /* 8019EAA8 0019B9E8 90 01 00 24 */ stw r0, 0x24(r1) /* 8019EAAC 0019B9EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019EAB0 0019B9F0 48 1C 37 25 */ bl func_803621D4 +/* 8019EAB0 0019B9F0 48 1C 37 25 */ bl _savegpr_27 /* 8019EAB4 0019B9F4 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 8019EAB8 0019B9F8 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 8019EABC 0019B9FC 38 63 01 73 */ addi r3, r3, 0x173 @@ -2848,7 +2848,7 @@ lbl_8019EBAC: /* 8019EBB4 0019BAF4 4B E7 04 D9 */ bl mDoExt_adjustSolidHeap lbl_8019EBB8: /* 8019EBB8 0019BAF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019EBBC 0019BAFC 48 1C 36 65 */ bl func_80362220 +/* 8019EBBC 0019BAFC 48 1C 36 65 */ bl _restgpr_27 /* 8019EBC0 0019BB00 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019EBC4 0019BB04 7C 08 03 A6 */ mtlr r0 /* 8019EBC8 0019BB08 38 21 00 20 */ addi r1, r1, 0x20 @@ -6523,7 +6523,7 @@ cLib_addCalcU8: /* 801A2094 0019EFD4 7C 08 02 A6 */ mflr r0 /* 801A2098 0019EFD8 90 01 00 24 */ stw r0, 0x24(r1) /* 801A209C 0019EFDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A20A0 0019EFE0 48 1C 01 35 */ bl func_803621D4 +/* 801A20A0 0019EFE0 48 1C 01 35 */ bl _savegpr_27 /* 801A20A4 0019EFE4 7C 7B 1B 78 */ mr r27, r3 /* 801A20A8 0019EFE8 7C BC 2B 78 */ mr r28, r5 /* 801A20AC 0019EFEC 7C DD 33 78 */ mr r29, r6 @@ -6556,7 +6556,7 @@ lbl_801A2108: lbl_801A210C: /* 801A210C 0019F04C 9B DB 00 00 */ stb r30, 0(r27) /* 801A2110 0019F050 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A2114 0019F054 48 1C 01 0D */ bl func_80362220 +/* 801A2114 0019F054 48 1C 01 0D */ bl _restgpr_27 /* 801A2118 0019F058 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A211C 0019F05C 7C 08 03 A6 */ mtlr r0 /* 801A2120 0019F060 38 21 00 20 */ addi r1, r1, 0x20 @@ -9640,7 +9640,7 @@ dScnKy_env_light_c_NS_setLightTevColorType_MAJI: /* 801A4DA4 001A1CE4 7C 08 02 A6 */ mflr r0 /* 801A4DA8 001A1CE8 90 01 00 24 */ stw r0, 0x24(r1) /* 801A4DAC 001A1CEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A4DB0 001A1CF0 48 1B D4 29 */ bl func_803621D8 +/* 801A4DB0 001A1CF0 48 1B D4 29 */ bl _savegpr_28 /* 801A4DB4 001A1CF4 7C 7E 1B 78 */ mr r30, r3 /* 801A4DB8 001A1CF8 7C 9C 23 78 */ mr r28, r4 /* 801A4DBC 001A1CFC 7C BD 2B 78 */ mr r29, r5 @@ -9699,7 +9699,7 @@ lbl_801A4E70: /* 801A4E74 001A1DB4 40 80 FF E0 */ bge lbl_801A4E54 lbl_801A4E78: /* 801A4E78 001A1DB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A4E7C 001A1DBC 48 1B D3 A9 */ bl func_80362224 +/* 801A4E7C 001A1DBC 48 1B D3 A9 */ bl _restgpr_28 /* 801A4E80 001A1DC0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A4E84 001A1DC4 7C 08 03 A6 */ mtlr r0 /* 801A4E88 001A1DC8 38 21 00 20 */ addi r1, r1, 0x20 @@ -10315,7 +10315,7 @@ dKy_undwater_filter_draw: /* 801A5730 001A2670 7C 08 02 A6 */ mflr r0 /* 801A5734 001A2674 90 01 00 34 */ stw r0, 0x34(r1) /* 801A5738 001A2678 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A573C 001A267C 48 1B CA 9D */ bl func_803621D8 +/* 801A573C 001A267C 48 1B CA 9D */ bl _savegpr_28 /* 801A5740 001A2680 3C 60 80 43 */ lis r3, lbl_8042CA48@ha /* 801A5744 001A2684 3B E3 CA 48 */ addi r31, r3, lbl_8042CA48@l /* 801A5748 001A2688 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -10603,7 +10603,7 @@ lbl_801A5A34: /* 801A5B50 001A2A90 90 1D 00 4C */ stw r0, 0x4c(r29) lbl_801A5B54: /* 801A5B54 001A2A94 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A5B58 001A2A98 48 1B C6 CD */ bl func_80362224 +/* 801A5B58 001A2A98 48 1B C6 CD */ bl _restgpr_28 /* 801A5B5C 001A2A9C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A5B60 001A2AA0 7C 08 03 A6 */ mtlr r0 /* 801A5B64 001A2AA4 38 21 00 30 */ addi r1, r1, 0x30 @@ -16361,7 +16361,7 @@ dKy_twilight_camelight_set: /* 801AAD54 001A7C94 7C 08 02 A6 */ mflr r0 /* 801AAD58 001A7C98 90 01 00 24 */ stw r0, 0x24(r1) /* 801AAD5C 001A7C9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AAD60 001A7CA0 48 1B 74 75 */ bl func_803621D4 +/* 801AAD60 001A7CA0 48 1B 74 75 */ bl _savegpr_27 /* 801AAD64 001A7CA4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AAD68 001A7CA8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 801AAD6C 001A7CAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -16545,7 +16545,7 @@ lbl_801AAFF8: /* 801AB000 001A7F40 42 00 FE 08 */ bdnz lbl_801AAE08 lbl_801AB004: /* 801AB004 001A7F44 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB008 001A7F48 48 1B 72 19 */ bl func_80362220 +/* 801AB008 001A7F48 48 1B 72 19 */ bl _restgpr_27 /* 801AB00C 001A7F4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AB010 001A7F50 7C 08 03 A6 */ mtlr r0 /* 801AB014 001A7F54 38 21 00 20 */ addi r1, r1, 0x20 @@ -16735,7 +16735,7 @@ dKy_pol_efftype_get: /* 801AB294 001A81D4 7C 08 02 A6 */ mflr r0 /* 801AB298 001A81D8 90 01 00 24 */ stw r0, 0x24(r1) /* 801AB29C 001A81DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB2A0 001A81E0 48 1B 6F 35 */ bl func_803621D4 +/* 801AB2A0 001A81E0 48 1B 6F 35 */ bl _savegpr_27 /* 801AB2A4 001A81E4 7C 7B 1B 79 */ or. r27, r3, r3 /* 801AB2A8 001A81E8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB2AC 001A81EC 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -16802,7 +16802,7 @@ lbl_801AB38C: /* 801AB38C 001A82CC 38 60 00 FF */ li r3, 0xff lbl_801AB390: /* 801AB390 001A82D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB394 001A82D4 48 1B 6E 8D */ bl func_80362220 +/* 801AB394 001A82D4 48 1B 6E 8D */ bl _restgpr_27 /* 801AB398 001A82D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AB39C 001A82DC 7C 08 03 A6 */ mtlr r0 /* 801AB3A0 001A82E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -16814,7 +16814,7 @@ dKy_pol_efftype2_get: /* 801AB3AC 001A82EC 7C 08 02 A6 */ mflr r0 /* 801AB3B0 001A82F0 90 01 00 24 */ stw r0, 0x24(r1) /* 801AB3B4 001A82F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB3B8 001A82F8 48 1B 6E 1D */ bl func_803621D4 +/* 801AB3B8 001A82F8 48 1B 6E 1D */ bl _savegpr_27 /* 801AB3BC 001A82FC 7C 7B 1B 79 */ or. r27, r3, r3 /* 801AB3C0 001A8300 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB3C4 001A8304 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -16881,7 +16881,7 @@ lbl_801AB4A4: /* 801AB4A4 001A83E4 38 60 00 FF */ li r3, 0xff lbl_801AB4A8: /* 801AB4A8 001A83E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB4AC 001A83EC 48 1B 6D 75 */ bl func_80362220 +/* 801AB4AC 001A83EC 48 1B 6D 75 */ bl _restgpr_27 /* 801AB4B0 001A83F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AB4B4 001A83F4 7C 08 03 A6 */ mtlr r0 /* 801AB4B8 001A83F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -16893,7 +16893,7 @@ dKy_pol_sound_get: /* 801AB4C4 001A8404 7C 08 02 A6 */ mflr r0 /* 801AB4C8 001A8408 90 01 00 24 */ stw r0, 0x24(r1) /* 801AB4CC 001A840C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB4D0 001A8410 48 1B 6D 09 */ bl func_803621D8 +/* 801AB4D0 001A8410 48 1B 6D 09 */ bl _savegpr_28 /* 801AB4D4 001A8414 7C 7C 1B 79 */ or. r28, r3, r3 /* 801AB4D8 001A8418 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB4DC 001A841C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -16945,7 +16945,7 @@ lbl_801AB574: /* 801AB580 001A84C0 38 60 00 00 */ li r3, 0 lbl_801AB584: /* 801AB584 001A84C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB588 001A84C8 48 1B 6C 9D */ bl func_80362224 +/* 801AB588 001A84C8 48 1B 6C 9D */ bl _restgpr_28 /* 801AB58C 001A84CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AB590 001A84D0 7C 08 03 A6 */ mtlr r0 /* 801AB594 001A84D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -16957,7 +16957,7 @@ dKy_pol_argument_get: /* 801AB5A0 001A84E0 7C 08 02 A6 */ mflr r0 /* 801AB5A4 001A84E4 90 01 00 24 */ stw r0, 0x24(r1) /* 801AB5A8 001A84E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB5AC 001A84EC 48 1B 6C 2D */ bl func_803621D8 +/* 801AB5AC 001A84EC 48 1B 6C 2D */ bl _savegpr_28 /* 801AB5B0 001A84F0 7C 7C 1B 79 */ or. r28, r3, r3 /* 801AB5B4 001A84F4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AB5B8 001A84F8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -17004,7 +17004,7 @@ lbl_801AB64C: /* 801AB64C 001A858C 38 60 00 00 */ li r3, 0 lbl_801AB650: /* 801AB650 001A8590 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB654 001A8594 48 1B 6B D1 */ bl func_80362224 +/* 801AB654 001A8594 48 1B 6B D1 */ bl _restgpr_28 /* 801AB658 001A8598 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AB65C 001A859C 7C 08 03 A6 */ mtlr r0 /* 801AB660 001A85A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -17422,7 +17422,7 @@ dKy_pol_eff_alpha_get: /* 801ABC14 001A8B54 7C 08 02 A6 */ mflr r0 /* 801ABC18 001A8B58 90 01 00 24 */ stw r0, 0x24(r1) /* 801ABC1C 001A8B5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801ABC20 001A8B60 48 1B 65 B5 */ bl func_803621D4 +/* 801ABC20 001A8B60 48 1B 65 B5 */ bl _savegpr_27 /* 801ABC24 001A8B64 7C 7B 1B 79 */ or. r27, r3, r3 /* 801ABC28 001A8B68 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801ABC2C 001A8B6C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -17500,7 +17500,7 @@ lbl_801ABD24: /* 801ABD30 001A8C70 88 63 00 06 */ lbz r3, 6(r3) lbl_801ABD34: /* 801ABD34 001A8C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 801ABD38 001A8C78 48 1B 64 E9 */ bl func_80362220 +/* 801ABD38 001A8C78 48 1B 64 E9 */ bl _restgpr_27 /* 801ABD3C 001A8C7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801ABD40 001A8C80 7C 08 03 A6 */ mtlr r0 /* 801ABD44 001A8C84 38 21 00 20 */ addi r1, r1, 0x20 @@ -17512,7 +17512,7 @@ dKy_pol_eff_ratio_get: /* 801ABD50 001A8C90 7C 08 02 A6 */ mflr r0 /* 801ABD54 001A8C94 90 01 00 34 */ stw r0, 0x34(r1) /* 801ABD58 001A8C98 39 61 00 30 */ addi r11, r1, 0x30 -/* 801ABD5C 001A8C9C 48 1B 64 79 */ bl func_803621D4 +/* 801ABD5C 001A8C9C 48 1B 64 79 */ bl _savegpr_27 /* 801ABD60 001A8CA0 7C 7F 1B 79 */ or. r31, r3, r3 /* 801ABD64 001A8CA4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801ABD68 001A8CA8 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l @@ -17598,7 +17598,7 @@ lbl_801ABE60: /* 801ABE8C 001A8DCC EC 20 00 72 */ fmuls f1, f0, f1 lbl_801ABE90: /* 801ABE90 001A8DD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801ABE94 001A8DD4 48 1B 63 8D */ bl func_80362220 +/* 801ABE94 001A8DD4 48 1B 63 8D */ bl _restgpr_27 /* 801ABE98 001A8DD8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801ABE9C 001A8DDC 7C 08 03 A6 */ mtlr r0 /* 801ABEA0 001A8DE0 38 21 00 30 */ addi r1, r1, 0x30 @@ -17610,7 +17610,7 @@ dKy_pol_eff2_alpha_get: /* 801ABEAC 001A8DEC 7C 08 02 A6 */ mflr r0 /* 801ABEB0 001A8DF0 90 01 00 24 */ stw r0, 0x24(r1) /* 801ABEB4 001A8DF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801ABEB8 001A8DF8 48 1B 63 1D */ bl func_803621D4 +/* 801ABEB8 001A8DF8 48 1B 63 1D */ bl _savegpr_27 /* 801ABEBC 001A8DFC 7C 7B 1B 79 */ or. r27, r3, r3 /* 801ABEC0 001A8E00 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801ABEC4 001A8E04 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -17688,7 +17688,7 @@ lbl_801ABFBC: /* 801ABFC8 001A8F08 88 63 00 06 */ lbz r3, 6(r3) lbl_801ABFCC: /* 801ABFCC 001A8F0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801ABFD0 001A8F10 48 1B 62 51 */ bl func_80362220 +/* 801ABFD0 001A8F10 48 1B 62 51 */ bl _restgpr_27 /* 801ABFD4 001A8F14 80 01 00 24 */ lwz r0, 0x24(r1) /* 801ABFD8 001A8F18 7C 08 03 A6 */ mtlr r0 /* 801ABFDC 001A8F1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -17700,7 +17700,7 @@ dKy_pol_eff2_ratio_get: /* 801ABFE8 001A8F28 7C 08 02 A6 */ mflr r0 /* 801ABFEC 001A8F2C 90 01 00 34 */ stw r0, 0x34(r1) /* 801ABFF0 001A8F30 39 61 00 30 */ addi r11, r1, 0x30 -/* 801ABFF4 001A8F34 48 1B 61 E1 */ bl func_803621D4 +/* 801ABFF4 001A8F34 48 1B 61 E1 */ bl _savegpr_27 /* 801ABFF8 001A8F38 7C 7F 1B 79 */ or. r31, r3, r3 /* 801ABFFC 001A8F3C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AC000 001A8F40 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l @@ -17786,7 +17786,7 @@ lbl_801AC0F8: /* 801AC124 001A9064 EC 20 00 72 */ fmuls f1, f0, f1 lbl_801AC128: /* 801AC128 001A9068 39 61 00 30 */ addi r11, r1, 0x30 -/* 801AC12C 001A906C 48 1B 60 F5 */ bl func_80362220 +/* 801AC12C 001A906C 48 1B 60 F5 */ bl _restgpr_27 /* 801AC130 001A9070 80 01 00 34 */ lwz r0, 0x34(r1) /* 801AC134 001A9074 7C 08 03 A6 */ mtlr r0 /* 801AC138 001A9078 38 21 00 30 */ addi r1, r1, 0x30 @@ -18254,7 +18254,7 @@ lbl_801AC788: /* 801AC78C 001A96CC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AC790 001A96D0 38 63 00 28 */ addi r3, r3, 0x28 /* 801AC794 001A96D4 88 81 00 08 */ lbz r4, 8(r1) -/* 801AC798 001A96D8 4B E8 64 19 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 801AC798 001A96D8 4B E8 64 19 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 801AC79C 001A96DC 2C 03 00 00 */ cmpwi r3, 0 /* 801AC7A0 001A96E0 40 82 00 24 */ bne lbl_801AC7C4 /* 801AC7A4 001A96E4 3B 80 00 01 */ li r28, 1 @@ -18282,7 +18282,7 @@ dKy_darkworld_spot_check: /* 801AC7E4 001A9724 7C 08 02 A6 */ mflr r0 /* 801AC7E8 001A9728 90 01 00 24 */ stw r0, 0x24(r1) /* 801AC7EC 001A972C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AC7F0 001A9730 48 1B 59 E5 */ bl func_803621D4 +/* 801AC7F0 001A9730 48 1B 59 E5 */ bl _savegpr_27 /* 801AC7F4 001A9734 7C 7B 1B 78 */ mr r27, r3 /* 801AC7F8 001A9738 7C 9C 23 78 */ mr r28, r4 /* 801AC7FC 001A973C 4B EA A2 75 */ bl dKyd_darkworld_tbl_getp @@ -18312,7 +18312,7 @@ lbl_801AC844: lbl_801AC854: /* 801AC854 001A9794 7F C3 F3 78 */ mr r3, r30 /* 801AC858 001A9798 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AC85C 001A979C 48 1B 59 C5 */ bl func_80362220 +/* 801AC85C 001A979C 48 1B 59 C5 */ bl _restgpr_27 /* 801AC860 001A97A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AC864 001A97A4 7C 08 03 A6 */ mtlr r0 /* 801AC868 001A97A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -18324,7 +18324,7 @@ dKy_darkworld_Area_set: /* 801AC874 001A97B4 7C 08 02 A6 */ mflr r0 /* 801AC878 001A97B8 90 01 00 34 */ stw r0, 0x34(r1) /* 801AC87C 001A97BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801AC880 001A97C0 48 1B 59 55 */ bl func_803621D4 +/* 801AC880 001A97C0 48 1B 59 55 */ bl _savegpr_27 /* 801AC884 001A97C4 7C 7B 1B 78 */ mr r27, r3 /* 801AC888 001A97C8 7C 9C 23 78 */ mr r28, r4 /* 801AC88C 001A97CC 4B EA A1 E5 */ bl dKyd_darkworld_tbl_getp @@ -18361,7 +18361,7 @@ lbl_801AC8F0: /* 801AC8FC 001A983C 41 80 FF A0 */ blt lbl_801AC89C lbl_801AC900: /* 801AC900 001A9840 39 61 00 30 */ addi r11, r1, 0x30 -/* 801AC904 001A9844 48 1B 59 1D */ bl func_80362220 +/* 801AC904 001A9844 48 1B 59 1D */ bl _restgpr_27 /* 801AC908 001A9848 80 01 00 34 */ lwz r0, 0x34(r1) /* 801AC90C 001A984C 7C 08 03 A6 */ mtlr r0 /* 801AC910 001A9850 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 4d702dd6d7..ac21043cd1 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -1310,7 +1310,7 @@ dMap_c_NS_setMapPaletteColorAlphaPer: /* 800297B0 000266F0 90 01 00 24 */ stw r0, 0x24(r1) /* 800297B4 000266F4 DB E1 00 18 */ stfd f31, 0x18(r1) /* 800297B8 000266F8 39 61 00 18 */ addi r11, r1, 0x18 -/* 800297BC 000266FC 48 33 8A 1D */ bl func_803621D8 +/* 800297BC 000266FC 48 33 8A 1D */ bl _savegpr_28 /* 800297C0 00026700 7C 7C 1B 78 */ mr r28, r3 /* 800297C4 00026704 FF E0 08 90 */ fmr f31, f1 /* 800297C8 00026708 7C 64 28 50 */ subf r3, r4, r5 @@ -1330,7 +1330,7 @@ lbl_800297F4: /* 800297F8 00026738 41 80 FF E4 */ blt lbl_800297DC /* 800297FC 0002673C CB E1 00 18 */ lfd f31, 0x18(r1) /* 80029800 00026740 39 61 00 18 */ addi r11, r1, 0x18 -/* 80029804 00026744 48 33 8A 21 */ bl func_80362224 +/* 80029804 00026744 48 33 8A 21 */ bl _restgpr_28 /* 80029808 00026748 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002980C 0002674C 7C 08 03 A6 */ mtlr r0 /* 80029810 00026750 38 21 00 20 */ addi r1, r1, 0x20 @@ -1369,7 +1369,7 @@ dMap_c: /* 80029878 000267B8 7C 08 02 A6 */ mflr r0 /* 8002987C 000267BC 90 01 00 24 */ stw r0, 0x24(r1) /* 80029880 000267C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80029884 000267C4 48 33 89 51 */ bl func_803621D4 +/* 80029884 000267C4 48 33 89 51 */ bl _savegpr_27 /* 80029888 000267C8 7C 7F 1B 78 */ mr r31, r3 /* 8002988C 000267CC 7C 9B 23 78 */ mr r27, r4 /* 80029890 000267D0 7C BC 2B 78 */ mr r28, r5 @@ -1467,7 +1467,7 @@ lbl_80029990: /* 800299FC 0002693C 48 01 33 3D */ bl dRenderingMap_c_NS_makeResTIMG /* 80029A00 00026940 7F E3 FB 78 */ mr r3, r31 /* 80029A04 00026944 39 61 00 20 */ addi r11, r1, 0x20 -/* 80029A08 00026948 48 33 88 19 */ bl func_80362220 +/* 80029A08 00026948 48 33 88 19 */ bl _restgpr_27 /* 80029A0C 0002694C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80029A10 00026950 7C 08 03 A6 */ mtlr r0 /* 80029A14 00026954 38 21 00 20 */ addi r1, r1, 0x20 @@ -1521,7 +1521,7 @@ dMap_c_NS_getMapMinMaxXZ: /* 80029AB0 000269F0 DB 81 00 30 */ stfd f28, 0x30(r1) /* 80029AB4 000269F4 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80029AB8 000269F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029ABC 000269FC 48 33 87 19 */ bl func_803621D4 +/* 80029ABC 000269FC 48 33 87 19 */ bl _savegpr_27 /* 80029AC0 00026A00 7C 7B 1B 78 */ mr r27, r3 /* 80029AC4 00026A04 7C BC 2B 78 */ mr r28, r5 /* 80029AC8 00026A08 7C DD 33 78 */ mr r29, r6 @@ -1611,7 +1611,7 @@ lbl_80029BD8: /* 80029BF0 00026B30 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 80029BF4 00026B34 CB 81 00 30 */ lfd f28, 0x30(r1) /* 80029BF8 00026B38 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029BFC 00026B3C 48 33 86 25 */ bl func_80362220 +/* 80029BFC 00026B3C 48 33 86 25 */ bl _restgpr_27 /* 80029C00 00026B40 80 01 00 74 */ lwz r0, 0x74(r1) /* 80029C04 00026B44 7C 08 03 A6 */ mtlr r0 /* 80029C08 00026B48 38 21 00 70 */ addi r1, r1, 0x70 @@ -1627,7 +1627,7 @@ dMap_c_NS_getPack: /* 80029C24 00026B64 DB C1 00 30 */ stfd f30, 0x30(r1) /* 80029C28 00026B68 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 80029C2C 00026B6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029C30 00026B70 48 33 85 A9 */ bl func_803621D8 +/* 80029C30 00026B70 48 33 85 A9 */ bl _savegpr_28 /* 80029C34 00026B74 7C 7C 1B 78 */ mr r28, r3 /* 80029C38 00026B78 7C 9D 23 78 */ mr r29, r4 /* 80029C3C 00026B7C 7C BE 2B 78 */ mr r30, r5 @@ -1708,7 +1708,7 @@ lbl_80029D50: /* 80029D58 00026C98 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 80029D5C 00026C9C CB C1 00 30 */ lfd f30, 0x30(r1) /* 80029D60 00026CA0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80029D64 00026CA4 48 33 84 C1 */ bl func_80362224 +/* 80029D64 00026CA4 48 33 84 C1 */ bl _restgpr_28 /* 80029D68 00026CA8 80 01 00 54 */ lwz r0, 0x54(r1) /* 80029D6C 00026CAC 7C 08 03 A6 */ mtlr r0 /* 80029D70 00026CB0 38 21 00 50 */ addi r1, r1, 0x50 @@ -2083,7 +2083,7 @@ lbl_8002A284: /* 8002A298 000271D8 7C 08 02 A6 */ mflr r0 /* 8002A29C 000271DC 90 01 00 24 */ stw r0, 0x24(r1) /* 8002A2A0 000271E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002A2A4 000271E4 48 33 7F 35 */ bl func_803621D8 +/* 8002A2A4 000271E4 48 33 7F 35 */ bl _savegpr_28 /* 8002A2A8 000271E8 7C 7C 1B 78 */ mr r28, r3 /* 8002A2AC 000271EC 7C 9D 23 78 */ mr r29, r4 /* 8002A2B0 000271F0 7C BF 2B 78 */ mr r31, r5 @@ -2117,7 +2117,7 @@ lbl_8002A30C: lbl_8002A310: /* 8002A310 00027250 7F C3 F3 78 */ mr r3, r30 /* 8002A314 00027254 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002A318 00027258 48 33 7F 0D */ bl func_80362224 +/* 8002A318 00027258 48 33 7F 0D */ bl _restgpr_28 /* 8002A31C 0002725C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002A320 00027260 7C 08 03 A6 */ mtlr r0 /* 8002A324 00027264 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 2f5c1656ac..32527d04e1 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -80,7 +80,7 @@ lbl_8021EB20: /* 8021EB24 0021BA64 38 19 00 0F */ addi r0, r25, 0xf /* 8021EB28 0021BA68 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021EB2C 0021BA6C 38 A0 00 01 */ li r5, 1 -/* 8021EB30 0021BA70 4B E1 45 01 */ bl dSv_player_item_c_NS_getItem +/* 8021EB30 0021BA70 4B E1 45 01 */ bl getItem__17dSv_player_item_cCFib /* 8021EB34 0021BA74 7C 64 1B 78 */ mr r4, r3 /* 8021EB38 0021BA78 7F A3 EB 78 */ mr r3, r29 /* 8021EB3C 0021BA7C 4B E1 55 BD */ bl dSv_player_item_max_c_NS_getBombNum @@ -1888,7 +1888,7 @@ dMeter2_c_NS_moveOxygen: /* 80220520 0021D460 7C 08 02 A6 */ mflr r0 /* 80220524 0021D464 90 01 00 44 */ stw r0, 0x44(r1) /* 80220528 0021D468 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022052C 0021D46C 48 14 1C A9 */ bl func_803621D4 +/* 8022052C 0021D46C 48 14 1C A9 */ bl _savegpr_27 /* 80220530 0021D470 7C 7E 1B 78 */ mr r30, r3 /* 80220534 0021D474 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80220538 0021D478 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -2120,7 +2120,7 @@ lbl_80220858: /* 80220868 0021D7A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8022086C 0021D7AC 90 03 5D E4 */ stw r0, 0x5de4(r3) /* 80220870 0021D7B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80220874 0021D7B4 48 14 19 AD */ bl func_80362220 +/* 80220874 0021D7B4 48 14 19 AD */ bl _restgpr_27 /* 80220878 0021D7B8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8022087C 0021D7BC 7C 08 03 A6 */ mtlr r0 /* 80220880 0021D7C0 38 21 00 40 */ addi r1, r1, 0x40 @@ -2140,7 +2140,7 @@ dMeter2_c_NS_moveLightDrop: /* 802208AC 0021D7EC DB 81 00 30 */ stfd f28, 0x30(r1) /* 802208B0 0021D7F0 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 802208B4 0021D7F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802208B8 0021D7F8 48 14 19 1D */ bl func_803621D4 +/* 802208B8 0021D7F8 48 14 19 1D */ bl _savegpr_27 /* 802208BC 0021D7FC 7C 7B 1B 78 */ mr r27, r3 /* 802208C0 0021D800 3B A0 00 00 */ li r29, 0 /* 802208C4 0021D804 3B 80 00 00 */ li r28, 0 @@ -2370,7 +2370,7 @@ lbl_80220BF0: /* 80220C10 0021DB50 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 80220C14 0021DB54 CB 81 00 30 */ lfd f28, 0x30(r1) /* 80220C18 0021DB58 39 61 00 30 */ addi r11, r1, 0x30 -/* 80220C1C 0021DB5C 48 14 16 05 */ bl func_80362220 +/* 80220C1C 0021DB5C 48 14 16 05 */ bl _restgpr_27 /* 80220C20 0021DB60 80 01 00 74 */ lwz r0, 0x74(r1) /* 80220C24 0021DB64 7C 08 03 A6 */ mtlr r0 /* 80220C28 0021DB68 38 21 00 70 */ addi r1, r1, 0x70 @@ -5918,12 +5918,12 @@ lbl_80223E3C: /* 80223E44 00220D84 54 13 06 3E */ clrlwi r19, r0, 0x18 /* 80223E48 00220D88 7E 64 9B 78 */ mr r4, r19 /* 80223E4C 00220D8C 38 A0 00 01 */ li r5, 1 -/* 80223E50 00220D90 4B E0 F1 E1 */ bl dSv_player_item_c_NS_getItem +/* 80223E50 00220D90 4B E0 F1 E1 */ bl getItem__17dSv_player_item_cCFib /* 80223E54 00220D94 7C 7F 1B 78 */ mr r31, r3 /* 80223E58 00220D98 7F 63 DB 78 */ mr r3, r27 /* 80223E5C 00220D9C 7E 64 9B 78 */ mr r4, r19 /* 80223E60 00220DA0 38 A0 00 00 */ li r5, 0 -/* 80223E64 00220DA4 4B E0 F1 CD */ bl dSv_player_item_c_NS_getItem +/* 80223E64 00220DA4 4B E0 F1 CD */ bl getItem__17dSv_player_item_cCFib /* 80223E68 00220DA8 7C 7C 1B 78 */ mr r28, r3 /* 80223E6C 00220DAC 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 80223E70 00220DB0 28 00 00 FF */ cmplwi r0, 0xff @@ -6059,7 +6059,7 @@ lbl_80224050: /* 80224050 00220F90 7F 63 DB 78 */ mr r3, r27 /* 80224054 00220F94 38 97 00 0F */ addi r4, r23, 0xf /* 80224058 00220F98 38 A0 00 50 */ li r5, 0x50 -/* 8022405C 00220F9C 4B E0 EF 5D */ bl dSv_player_item_c_NS_setItem +/* 8022405C 00220F9C 4B E0 EF 5D */ bl setItem__17dSv_player_item_cFiUc /* 80224060 00220FA0 3A 97 00 0F */ addi r20, r23, 0xf /* 80224064 00220FA4 9A 9D 5E 7D */ stb r20, 0x5e7d(r29) /* 80224068 00220FA8 38 00 00 50 */ li r0, 0x50 @@ -6218,7 +6218,7 @@ lbl_80224284: /* 80224288 002211C8 38 1F 00 0B */ addi r0, r31, 0xb /* 8022428C 002211CC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80224290 002211D0 38 A0 00 01 */ li r5, 1 -/* 80224294 002211D4 4B E0 ED 9D */ bl dSv_player_item_c_NS_getItem +/* 80224294 002211D4 4B E0 ED 9D */ bl getItem__17dSv_player_item_cCFib /* 80224298 002211D8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022429C 002211DC 28 00 00 76 */ cmplwi r0, 0x76 /* 802242A0 002211E0 40 82 00 90 */ bne lbl_80224330 @@ -6276,7 +6276,7 @@ dMeter2_c_NS_moveArrowNum: /* 80224358 00221298 7C 08 02 A6 */ mflr r0 /* 8022435C 0022129C 90 01 00 34 */ stw r0, 0x34(r1) /* 80224360 002212A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80224364 002212A4 48 13 DE 71 */ bl func_803621D4 +/* 80224364 002212A4 48 13 DE 71 */ bl _savegpr_27 /* 80224368 002212A8 7C 7E 1B 78 */ mr r30, r3 /* 8022436C 002212AC 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 80224370 002212B0 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l @@ -6489,7 +6489,7 @@ lbl_80224658: /* 80224664 002215A4 41 80 FF 30 */ blt lbl_80224594 lbl_80224668: /* 80224668 002215A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022466C 002215AC 48 13 DB B5 */ bl func_80362220 +/* 8022466C 002215AC 48 13 DB B5 */ bl _restgpr_27 /* 80224670 002215B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80224674 002215B4 7C 08 03 A6 */ mtlr r0 /* 80224678 002215B8 38 21 00 30 */ addi r1, r1, 0x30 @@ -6762,7 +6762,7 @@ dMeter2_c_NS_alphaAnimeKantera: /* 80224A30 00221970 38 63 00 9C */ addi r3, r3, 0x9c /* 80224A34 00221974 38 80 00 01 */ li r4, 1 /* 80224A38 00221978 38 A0 00 01 */ li r5, 1 -/* 80224A3C 0022197C 4B E0 E5 F5 */ bl dSv_player_item_c_NS_getItem +/* 80224A3C 0022197C 4B E0 E5 F5 */ bl getItem__17dSv_player_item_cCFib /* 80224A40 00221980 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80224A44 00221984 28 00 00 48 */ cmplwi r0, 0x48 /* 80224A48 00221988 40 82 01 2C */ bne lbl_80224B74 @@ -7250,7 +7250,7 @@ dMeter2_c_NS_alphaAnimeButton: /* 802250F8 00222038 7C 08 02 A6 */ mflr r0 /* 802250FC 0022203C 90 01 00 24 */ stw r0, 0x24(r1) /* 80225100 00222040 39 61 00 20 */ addi r11, r1, 0x20 -/* 80225104 00222044 48 13 D0 D1 */ bl func_803621D4 +/* 80225104 00222044 48 13 D0 D1 */ bl _savegpr_27 /* 80225108 00222048 7C 7E 1B 78 */ mr r30, r3 /* 8022510C 0022204C 3B E0 00 00 */ li r31, 0 /* 80225110 00222050 80 83 01 24 */ lwz r4, 0x124(r3) @@ -7510,7 +7510,7 @@ lbl_8022548C: /* 802254A0 002223E0 38 80 00 00 */ li r4, 0 /* 802254A4 002223E4 4B FF 32 E5 */ bl dMeter2Draw_c_NS_setAlphaButtonChange /* 802254A8 002223E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802254AC 002223EC 48 13 CD 75 */ bl func_80362220 +/* 802254AC 002223EC 48 13 CD 75 */ bl _restgpr_27 /* 802254B0 002223F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802254B4 002223F4 7C 08 03 A6 */ mtlr r0 /* 802254B8 002223F8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_model.s b/asm/d/d_model.s index a8359974a9..46d9dcdc28 100644 --- a/asm/d/d_model.s +++ b/asm/d/d_model.s @@ -7,7 +7,7 @@ /* 8009C500 00099440 7C 08 02 A6 */ mflr r0 /* 8009C504 00099444 90 01 00 64 */ stw r0, 0x64(r1) /* 8009C508 00099448 39 61 00 60 */ addi r11, r1, 0x60 -/* 8009C50C 0009944C 48 2C 5C CD */ bl func_803621D8 +/* 8009C50C 0009944C 48 2C 5C CD */ bl _savegpr_28 /* 8009C510 00099450 7C 7F 1B 78 */ mr r31, r3 /* 8009C514 00099454 80 83 00 10 */ lwz r4, 0x10(r3) /* 8009C518 00099458 80 04 00 A0 */ lwz r0, 0xa0(r4) @@ -85,7 +85,7 @@ lbl_8009C628: /* 8009C630 00099570 38 00 00 00 */ li r0, 0 /* 8009C634 00099574 98 1F 00 1A */ stb r0, 0x1a(r31) /* 8009C638 00099578 39 61 00 60 */ addi r11, r1, 0x60 -/* 8009C63C 0009957C 48 2C 5B E9 */ bl func_80362224 +/* 8009C63C 0009957C 48 2C 5B E9 */ bl _restgpr_28 /* 8009C640 00099580 80 01 00 64 */ lwz r0, 0x64(r1) /* 8009C644 00099584 7C 08 03 A6 */ mtlr r0 /* 8009C648 00099588 38 21 00 60 */ addi r1, r1, 0x60 @@ -160,7 +160,7 @@ dMdl_mng_c_NS_entry: /* 8009C728 00099668 7C 08 02 A6 */ mflr r0 /* 8009C72C 0009966C 90 01 00 24 */ stw r0, 0x24(r1) /* 8009C730 00099670 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C734 00099674 48 2C 5A A1 */ bl func_803621D4 +/* 8009C734 00099674 48 2C 5A A1 */ bl _savegpr_27 /* 8009C738 00099678 7C 7B 1B 78 */ mr r27, r3 /* 8009C73C 0009967C 7C 9C 23 78 */ mr r28, r4 /* 8009C740 00099680 7C BD 2B 78 */ mr r29, r5 @@ -188,7 +188,7 @@ lbl_8009C790: /* 8009C790 000996D0 7F E3 FB 78 */ mr r3, r31 lbl_8009C794: /* 8009C794 000996D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C798 000996D8 48 2C 5A 89 */ bl func_80362220 +/* 8009C798 000996D8 48 2C 5A 89 */ bl _restgpr_27 /* 8009C79C 000996DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009C7A0 000996E0 7C 08 03 A6 */ mtlr r0 /* 8009C7A4 000996E4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_name.s b/asm/d/d_name.s index 485a029831..c1cbdaf230 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -46,7 +46,7 @@ dName_c: /* 8024E46C 0024B3AC 7C 08 02 A6 */ mflr r0 /* 8024E470 0024B3B0 90 01 00 24 */ stw r0, 0x24(r1) /* 8024E474 0024B3B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024E478 0024B3B8 48 11 3D 61 */ bl func_803621D8 +/* 8024E478 0024B3B8 48 11 3D 61 */ bl _savegpr_28 /* 8024E47C 0024B3BC 7C 7E 1B 79 */ or. r30, r3, r3 /* 8024E480 0024B3C0 7C 9F 23 78 */ mr r31, r4 /* 8024E484 0024B3C4 41 82 01 8C */ beq lbl_8024E610 @@ -162,7 +162,7 @@ lbl_8024E600: lbl_8024E610: /* 8024E610 0024B550 7F C3 F3 78 */ mr r3, r30 /* 8024E614 0024B554 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024E618 0024B558 48 11 3C 0D */ bl func_80362224 +/* 8024E618 0024B558 48 11 3C 0D */ bl _restgpr_28 /* 8024E61C 0024B55C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024E620 0024B560 7C 08 03 A6 */ mtlr r0 /* 8024E624 0024B564 38 21 00 20 */ addi r1, r1, 0x20 @@ -1458,7 +1458,7 @@ dName_c_NS_setNameText: /* 8024F890 0024C7D0 7C 08 02 A6 */ mflr r0 /* 8024F894 0024C7D4 90 01 00 24 */ stw r0, 0x24(r1) /* 8024F898 0024C7D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024F89C 0024C7DC 48 11 29 39 */ bl func_803621D4 +/* 8024F89C 0024C7DC 48 11 29 39 */ bl _savegpr_27 /* 8024F8A0 0024C7E0 7C 7B 1B 78 */ mr r27, r3 /* 8024F8A4 0024C7E4 3B 80 00 00 */ li r28, 0 /* 8024F8A8 0024C7E8 3B E0 00 00 */ li r31, 0 @@ -1485,7 +1485,7 @@ lbl_8024F8E8: /* 8024F8F4 0024C834 3B DE 00 08 */ addi r30, r30, 8 /* 8024F8F8 0024C838 41 80 FF C0 */ blt lbl_8024F8B8 /* 8024F8FC 0024C83C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024F900 0024C840 48 11 29 21 */ bl func_80362220 +/* 8024F900 0024C840 48 11 29 21 */ bl _restgpr_27 /* 8024F904 0024C844 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024F908 0024C848 7C 08 03 A6 */ mtlr r0 /* 8024F90C 0024C84C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2091,7 +2091,7 @@ dName_c_NS_mojiListChange: /* 802501B4 0024D0F4 7C 08 02 A6 */ mflr r0 /* 802501B8 0024D0F8 90 01 00 74 */ stw r0, 0x74(r1) /* 802501BC 0024D0FC 39 61 00 70 */ addi r11, r1, 0x70 -/* 802501C0 0024D100 48 11 20 15 */ bl func_803621D4 +/* 802501C0 0024D100 48 11 20 15 */ bl _savegpr_27 /* 802501C4 0024D104 7C 7B 1B 78 */ mr r27, r3 /* 802501C8 0024D108 3C 60 80 3C */ lis r3, lbl_803C1F50@ha /* 802501CC 0024D10C 38 63 1F 50 */ addi r3, r3, lbl_803C1F50@l @@ -2122,7 +2122,7 @@ lbl_8025020C: lbl_8025021C: /* 8025021C 0024D15C 38 61 00 08 */ addi r3, r1, 8 /* 80250220 0024D160 38 9E 02 A4 */ addi r4, r30, 0x2a4 -/* 80250224 0024D164 48 11 89 09 */ bl func_80368B2C +/* 80250224 0024D164 48 11 89 09 */ bl strcpy /* 80250228 0024D168 38 61 00 08 */ addi r3, r1, 8 /* 8025022C 0024D16C 7C 9D F8 2E */ lwzx r4, r29, r31 /* 80250230 0024D170 48 11 88 8D */ bl func_80368ABC @@ -2135,13 +2135,13 @@ lbl_8025021C: /* 8025024C 0024D18C 38 1F 01 78 */ addi r0, r31, 0x178 /* 80250250 0024D190 7C 7B 00 2E */ lwzx r3, r27, r0 /* 80250254 0024D194 38 81 00 08 */ addi r4, r1, 8 -/* 80250258 0024D198 48 11 88 D5 */ bl func_80368B2C +/* 80250258 0024D198 48 11 88 D5 */ bl strcpy /* 8025025C 0024D19C 3B 9C 00 01 */ addi r28, r28, 1 /* 80250260 0024D1A0 2C 1C 00 41 */ cmpwi r28, 0x41 /* 80250264 0024D1A4 3B FF 00 04 */ addi r31, r31, 4 /* 80250268 0024D1A8 41 80 FF B4 */ blt lbl_8025021C /* 8025026C 0024D1AC 39 61 00 70 */ addi r11, r1, 0x70 -/* 80250270 0024D1B0 48 11 1F B1 */ bl func_80362220 +/* 80250270 0024D1B0 48 11 1F B1 */ bl _restgpr_27 /* 80250274 0024D1B4 80 01 00 74 */ lwz r0, 0x74(r1) /* 80250278 0024D1B8 7C 08 03 A6 */ mtlr r0 /* 8025027C 0024D1BC 38 21 00 70 */ addi r1, r1, 0x70 @@ -2353,7 +2353,7 @@ dName_c_NS__draw: /* 80250564 0024D4A4 7C 08 02 A6 */ mflr r0 /* 80250568 0024D4A8 90 01 00 24 */ stw r0, 0x24(r1) /* 8025056C 0024D4AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80250570 0024D4B0 48 11 1C 69 */ bl func_803621D8 +/* 80250570 0024D4B0 48 11 1C 69 */ bl _savegpr_28 /* 80250574 0024D4B4 7C 7C 1B 78 */ mr r28, r3 /* 80250578 0024D4B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8025057C 0024D4BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2371,7 +2371,7 @@ dName_c_NS__draw: /* 802505AC 0024D4EC 80 DC 00 20 */ lwz r6, 0x20(r28) /* 802505B0 0024D4F0 4B E0 61 E5 */ bl dDlst_list_c_NS_set /* 802505B4 0024D4F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802505B8 0024D4F8 48 11 1C 6D */ bl func_80362224 +/* 802505B8 0024D4F8 48 11 1C 6D */ bl _restgpr_28 /* 802505BC 0024D4FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802505C0 0024D500 7C 08 03 A6 */ mtlr r0 /* 802505C4 0024D504 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index f3fb1f6ee8..13b5329469 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -181,7 +181,7 @@ lbl_80049698: /* 800496B8 000465F8 7C 08 02 A6 */ mflr r0 /* 800496BC 000465FC 90 01 00 24 */ stw r0, 0x24(r1) /* 800496C0 00046600 39 61 00 20 */ addi r11, r1, 0x20 -/* 800496C4 00046604 48 31 8B 15 */ bl func_803621D8 +/* 800496C4 00046604 48 31 8B 15 */ bl _savegpr_28 /* 800496C8 00046608 7C 7C 1B 78 */ mr r28, r3 /* 800496CC 0004660C 7C 9D 23 78 */ mr r29, r4 /* 800496D0 00046610 7C BE 2B 78 */ mr r30, r5 @@ -213,7 +213,7 @@ lbl_80049724: /* 80049730 00046670 98 1C 00 10 */ stb r0, 0x10(r28) lbl_80049734: /* 80049734 00046674 39 61 00 20 */ addi r11, r1, 0x20 -/* 80049738 00046678 48 31 8A ED */ bl func_80362224 +/* 80049738 00046678 48 31 8A ED */ bl _restgpr_28 /* 8004973C 0004667C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80049740 00046680 7C 08 03 A6 */ mtlr r0 /* 80049744 00046684 38 21 00 20 */ addi r1, r1, 0x20 @@ -366,7 +366,7 @@ initiateLighting8: /* 80049938 00046878 7C 08 02 A6 */ mflr r0 /* 8004993C 0004687C 90 01 00 74 */ stw r0, 0x74(r1) /* 80049940 00046880 39 61 00 70 */ addi r11, r1, 0x70 -/* 80049944 00046884 48 31 88 95 */ bl func_803621D8 +/* 80049944 00046884 48 31 88 95 */ bl _savegpr_28 /* 80049948 00046888 7C 7F 1B 78 */ mr r31, r3 /* 8004994C 0004688C 7C 9C 23 78 */ mr r28, r4 /* 80049950 00046890 38 60 00 00 */ li r3, 0 @@ -488,7 +488,7 @@ lbl_80049AF0: /* 80049B10 00046A50 38 81 00 08 */ addi r4, r1, 8 /* 80049B14 00046A54 48 31 3F 35 */ bl GXSetChanMatColor /* 80049B18 00046A58 39 61 00 70 */ addi r11, r1, 0x70 -/* 80049B1C 00046A5C 48 31 87 09 */ bl func_80362224 +/* 80049B1C 00046A5C 48 31 87 09 */ bl _restgpr_28 /* 80049B20 00046A60 80 01 00 74 */ lwz r0, 0x74(r1) /* 80049B24 00046A64 7C 08 03 A6 */ mtlr r0 /* 80049B28 00046A68 38 21 00 70 */ addi r1, r1, 0x70 @@ -1436,7 +1436,7 @@ dPa_modelEcallBack_NS_model_c_NS_draw: /* 8004A8E0 00047820 7C 08 02 A6 */ mflr r0 /* 8004A8E4 00047824 90 01 00 54 */ stw r0, 0x54(r1) /* 8004A8E8 00047828 39 61 00 50 */ addi r11, r1, 0x50 -/* 8004A8EC 0004782C 48 31 78 E9 */ bl func_803621D4 +/* 8004A8EC 0004782C 48 31 78 E9 */ bl _savegpr_27 /* 8004A8F0 00047830 7C 7B 1B 78 */ mr r27, r3 /* 8004A8F4 00047834 7C 9C 23 78 */ mr r28, r4 /* 8004A8F8 00047838 80 63 00 00 */ lwz r3, 0(r3) @@ -1520,7 +1520,7 @@ lbl_8004AA14: /* 8004AA14 00047954 28 1D 00 00 */ cmplwi r29, 0 /* 8004AA18 00047958 40 82 FF 00 */ bne lbl_8004A918 /* 8004AA1C 0004795C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8004AA20 00047960 48 31 78 01 */ bl func_80362220 +/* 8004AA20 00047960 48 31 78 01 */ bl _restgpr_27 /* 8004AA24 00047964 80 01 00 54 */ lwz r0, 0x54(r1) /* 8004AA28 00047968 7C 08 03 A6 */ mtlr r0 /* 8004AA2C 0004796C 38 21 00 50 */ addi r1, r1, 0x50 @@ -2545,7 +2545,7 @@ dPa_control_c_NS_level_c_NS_cleanup: /* 8004B80C 0004874C 7C 08 02 A6 */ mflr r0 /* 8004B810 00048750 90 01 00 24 */ stw r0, 0x24(r1) /* 8004B814 00048754 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B818 00048758 48 31 69 C1 */ bl func_803621D8 +/* 8004B818 00048758 48 31 69 C1 */ bl _savegpr_28 /* 8004B81C 0004875C 7C 7C 1B 78 */ mr r28, r3 /* 8004B820 00048760 3B DC 00 08 */ addi r30, r28, 8 /* 8004B824 00048764 3B A0 00 00 */ li r29, 0 @@ -2565,7 +2565,7 @@ lbl_8004B84C: /* 8004B854 00048794 3B DE 00 18 */ addi r30, r30, 0x18 /* 8004B858 00048798 41 80 FF D4 */ blt lbl_8004B82C /* 8004B85C 0004879C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B860 000487A0 48 31 69 C5 */ bl func_80362224 +/* 8004B860 000487A0 48 31 69 C5 */ bl _restgpr_28 /* 8004B864 000487A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004B868 000487A8 7C 08 03 A6 */ mtlr r0 /* 8004B86C 000487AC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2817,7 +2817,7 @@ dPa_control_c_NS_createCommon: /* 8004BB7C 00048ABC 7C 08 02 A6 */ mflr r0 /* 8004BB80 00048AC0 90 01 00 34 */ stw r0, 0x34(r1) /* 8004BB84 00048AC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004BB88 00048AC8 48 31 66 4D */ bl func_803621D4 +/* 8004BB88 00048AC8 48 31 66 4D */ bl _savegpr_27 /* 8004BB8C 00048ACC 7C 7F 1B 78 */ mr r31, r3 /* 8004BB90 00048AD0 7C 9B 23 78 */ mr r27, r4 /* 8004BB94 00048AD4 38 60 00 00 */ li r3, 0 @@ -2902,7 +2902,7 @@ lbl_8004BCA0: /* 8004BCBC 00048BFC 80 7F 00 00 */ lwz r3, 0(r31) /* 8004BCC0 00048C00 4B FC 33 CD */ bl mDoExt_adjustSolidHeap /* 8004BCC4 00048C04 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004BCC8 00048C08 48 31 65 59 */ bl func_80362220 +/* 8004BCC8 00048C08 48 31 65 59 */ bl _restgpr_27 /* 8004BCCC 00048C0C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004BCD0 00048C10 7C 08 03 A6 */ mtlr r0 /* 8004BCD4 00048C14 38 21 00 30 */ addi r1, r1, 0x30 @@ -2914,7 +2914,7 @@ dPa_control_c_NS_createRoomScene: /* 8004BCE0 00048C20 7C 08 02 A6 */ mflr r0 /* 8004BCE4 00048C24 90 01 00 34 */ stw r0, 0x34(r1) /* 8004BCE8 00048C28 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004BCEC 00048C2C 48 31 64 E9 */ bl func_803621D4 +/* 8004BCEC 00048C2C 48 31 64 E9 */ bl _savegpr_27 /* 8004BCF0 00048C30 7C 7B 1B 78 */ mr r27, r3 /* 8004BCF4 00048C34 38 60 00 00 */ li r3, 0 /* 8004BCF8 00048C38 38 80 00 00 */ li r4, 0 @@ -2981,7 +2981,7 @@ lbl_8004BDC8: /* 8004BDDC 00048D1C 80 7B 00 0C */ lwz r3, 0xc(r27) /* 8004BDE0 00048D20 4B FC 32 AD */ bl mDoExt_adjustSolidHeap /* 8004BDE4 00048D24 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004BDE8 00048D28 48 31 64 39 */ bl func_80362220 +/* 8004BDE8 00048D28 48 31 64 39 */ bl _restgpr_27 /* 8004BDEC 00048D2C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004BDF0 00048D30 7C 08 03 A6 */ mtlr r0 /* 8004BDF4 00048D34 38 21 00 30 */ addi r1, r1, 0x30 @@ -3045,7 +3045,7 @@ dPa_control_c_NS_createScene: /* 8004BEB4 00048DF4 7C 08 02 A6 */ mflr r0 /* 8004BEB8 00048DF8 90 01 00 24 */ stw r0, 0x24(r1) /* 8004BEBC 00048DFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004BEC0 00048E00 48 31 63 19 */ bl func_803621D8 +/* 8004BEC0 00048E00 48 31 63 19 */ bl _savegpr_28 /* 8004BEC4 00048E04 7C 7C 1B 78 */ mr r28, r3 /* 8004BEC8 00048E08 7C 9D 23 78 */ mr r29, r4 /* 8004BECC 00048E0C 3B C0 00 00 */ li r30, 0 @@ -3075,7 +3075,7 @@ lbl_8004BF1C: /* 8004BF1C 00048E5C 38 60 00 80 */ li r3, 0x80 /* 8004BF20 00048E60 4B FF EB FD */ bl dPa_modelEcallBack_NS_create /* 8004BF24 00048E64 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004BF28 00048E68 48 31 62 FD */ bl func_80362224 +/* 8004BF28 00048E68 48 31 62 FD */ bl _restgpr_28 /* 8004BF2C 00048E6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004BF30 00048E70 7C 08 03 A6 */ mtlr r0 /* 8004BF34 00048E74 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index 52c11aebf0..acaa0c0c90 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -78,7 +78,7 @@ dRes_info_c_NS_set: /* 8003A34C 0003728C 7C 08 02 A6 */ mflr r0 /* 8003A350 00037290 90 01 00 44 */ stw r0, 0x44(r1) /* 8003A354 00037294 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003A358 00037298 48 32 7E 81 */ bl func_803621D8 +/* 8003A358 00037298 48 32 7E 81 */ bl _savegpr_28 /* 8003A35C 0003729C 7C 7C 1B 78 */ mr r28, r3 /* 8003A360 000372A0 7C 9D 23 78 */ mr r29, r4 /* 8003A364 000372A4 7C A8 2B 78 */ mr r8, r5 @@ -113,7 +113,7 @@ lbl_8003A3C4: /* 8003A3D4 00037314 38 60 00 01 */ li r3, 1 lbl_8003A3D8: /* 8003A3D8 00037318 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003A3DC 0003731C 48 32 7E 49 */ bl func_80362224 +/* 8003A3DC 0003731C 48 32 7E 49 */ bl _restgpr_28 /* 8003A3E0 00037320 80 01 00 44 */ lwz r0, 0x44(r1) /* 8003A3E4 00037324 7C 08 03 A6 */ mtlr r0 /* 8003A3E8 00037328 38 21 00 40 */ addi r1, r1, 0x40 @@ -125,7 +125,7 @@ setAlpha: /* 8003A3F4 00037334 7C 08 02 A6 */ mflr r0 /* 8003A3F8 00037338 90 01 00 24 */ stw r0, 0x24(r1) /* 8003A3FC 0003733C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003A400 00037340 48 32 7D D9 */ bl func_803621D8 +/* 8003A400 00037340 48 32 7D D9 */ bl _savegpr_28 /* 8003A404 00037344 7C 7C 1B 78 */ mr r28, r3 /* 8003A408 00037348 3B A0 00 00 */ li r29, 0 /* 8003A40C 0003734C 48 00 00 5C */ b lbl_8003A468 @@ -159,7 +159,7 @@ lbl_8003A468: /* 8003A470 000373B0 7C 03 00 40 */ cmplw r3, r0 /* 8003A474 000373B4 41 80 FF 9C */ blt lbl_8003A410 /* 8003A478 000373B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003A47C 000373BC 48 32 7D A9 */ bl func_80362224 +/* 8003A47C 000373BC 48 32 7D A9 */ bl _restgpr_28 /* 8003A480 000373C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003A484 000373C4 7C 08 03 A6 */ mtlr r0 /* 8003A488 000373C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -171,7 +171,7 @@ setIndirectTex: /* 8003A494 000373D4 7C 08 02 A6 */ mflr r0 /* 8003A498 000373D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8003A49C 000373DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003A4A0 000373E0 48 32 7D 35 */ bl func_803621D4 +/* 8003A4A0 000373E0 48 32 7D 35 */ bl _savegpr_27 /* 8003A4A4 000373E4 83 C3 00 6C */ lwz r30, 0x6c(r3) /* 8003A4A8 000373E8 28 1E 00 00 */ cmplwi r30, 0 /* 8003A4AC 000373EC 41 82 03 58 */ beq lbl_8003A804 @@ -395,7 +395,7 @@ lbl_8003A7F4: /* 8003A800 00037740 41 80 FC CC */ blt lbl_8003A4CC lbl_8003A804: /* 8003A804 00037744 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003A808 00037748 48 32 7A 19 */ bl func_80362220 +/* 8003A808 00037748 48 32 7A 19 */ bl _restgpr_27 /* 8003A80C 0003774C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003A810 00037750 7C 08 03 A6 */ mtlr r0 /* 8003A814 00037754 38 21 00 20 */ addi r1, r1, 0x20 @@ -616,7 +616,7 @@ dRes_info_c_NS_onWarpMaterial: /* 8003AB34 00037A74 7C 08 02 A6 */ mflr r0 /* 8003AB38 00037A78 90 01 00 24 */ stw r0, 0x24(r1) /* 8003AB3C 00037A7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003AB40 00037A80 48 32 76 95 */ bl func_803621D4 +/* 8003AB40 00037A80 48 32 76 95 */ bl _savegpr_27 /* 8003AB44 00037A84 7C 7B 1B 78 */ mr r27, r3 /* 8003AB48 00037A88 3B 80 00 00 */ li r28, 0 /* 8003AB4C 00037A8C 48 00 00 A8 */ b lbl_8003ABF4 @@ -669,7 +669,7 @@ lbl_8003ABF4: /* 8003AC00 00037B40 41 80 FF 50 */ blt lbl_8003AB50 lbl_8003AC04: /* 8003AC04 00037B44 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003AC08 00037B48 48 32 76 19 */ bl func_80362220 +/* 8003AC08 00037B48 48 32 76 19 */ bl _restgpr_27 /* 8003AC0C 00037B4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003AC10 00037B50 7C 08 03 A6 */ mtlr r0 /* 8003AC14 00037B54 38 21 00 20 */ addi r1, r1, 0x20 @@ -681,7 +681,7 @@ dRes_info_c_NS_offWarpMaterial: /* 8003AC20 00037B60 7C 08 02 A6 */ mflr r0 /* 8003AC24 00037B64 90 01 00 24 */ stw r0, 0x24(r1) /* 8003AC28 00037B68 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003AC2C 00037B6C 48 32 75 A9 */ bl func_803621D4 +/* 8003AC2C 00037B6C 48 32 75 A9 */ bl _savegpr_27 /* 8003AC30 00037B70 7C 7B 1B 78 */ mr r27, r3 /* 8003AC34 00037B74 3B 80 00 00 */ li r28, 0 /* 8003AC38 00037B78 48 00 00 A8 */ b lbl_8003ACE0 @@ -734,7 +734,7 @@ lbl_8003ACE0: /* 8003ACEC 00037C2C 41 80 FF 50 */ blt lbl_8003AC3C lbl_8003ACF0: /* 8003ACF0 00037C30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003ACF4 00037C34 48 32 75 2D */ bl func_80362220 +/* 8003ACF4 00037C34 48 32 75 2D */ bl _restgpr_27 /* 8003ACF8 00037C38 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003ACFC 00037C3C 7C 08 03 A6 */ mtlr r0 /* 8003AD00 00037C40 38 21 00 20 */ addi r1, r1, 0x20 @@ -2127,7 +2127,7 @@ dRes_control_c_NS_dtor: /* 8003BFB4 00038EF4 7C 08 02 A6 */ mflr r0 /* 8003BFB8 00038EF8 90 01 00 24 */ stw r0, 0x24(r1) /* 8003BFBC 00038EFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003BFC0 00038F00 48 32 62 19 */ bl func_803621D8 +/* 8003BFC0 00038F00 48 32 62 19 */ bl _savegpr_28 /* 8003BFC4 00038F04 7C 7C 1B 79 */ or. r28, r3, r3 /* 8003BFC8 00038F08 7C 9D 23 78 */ mr r29, r4 /* 8003BFCC 00038F0C 41 82 00 90 */ beq lbl_8003C05C @@ -2171,7 +2171,7 @@ lbl_8003BFFC: lbl_8003C05C: /* 8003C05C 00038F9C 7F 83 E3 78 */ mr r3, r28 /* 8003C060 00038FA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C064 00038FA4 48 32 61 C1 */ bl func_80362224 +/* 8003C064 00038FA4 48 32 61 C1 */ bl _restgpr_28 /* 8003C068 00038FA8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003C06C 00038FAC 7C 08 03 A6 */ mtlr r0 /* 8003C070 00038FB0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2291,7 +2291,7 @@ dRes_control_c_NS_getResInfo: /* 8003C1E8 00039128 7C 08 02 A6 */ mflr r0 /* 8003C1EC 0003912C 90 01 00 24 */ stw r0, 0x24(r1) /* 8003C1F0 00039130 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C1F4 00039134 48 32 5F E5 */ bl func_803621D8 +/* 8003C1F4 00039134 48 32 5F E5 */ bl _savegpr_28 /* 8003C1F8 00039138 7C 7C 1B 78 */ mr r28, r3 /* 8003C1FC 0003913C 7C 9D 23 78 */ mr r29, r4 /* 8003C200 00039140 7C BE 2B 78 */ mr r30, r5 @@ -2317,7 +2317,7 @@ lbl_8003C23C: /* 8003C244 00039184 38 60 00 00 */ li r3, 0 lbl_8003C248: /* 8003C248 00039188 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C24C 0003918C 48 32 5F D9 */ bl func_80362224 +/* 8003C24C 0003918C 48 32 5F D9 */ bl _restgpr_28 /* 8003C250 00039190 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003C254 00039194 7C 08 03 A6 */ mtlr r0 /* 8003C258 00039198 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_save.s b/asm/d/d_save.s index f9ca940d6e..51d76c20c6 100644 --- a/asm/d/d_save.s +++ b/asm/d/d_save.s @@ -2,1071 +2,13 @@ .section .text, "ax" # 80032918 -.global dSv_player_status_a_c_NS_isMagicFlag -dSv_player_status_a_c_NS_isMagicFlag: -/* 80032AF8 0002FA38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032AFC 0002FA3C 7C 08 02 A6 */ mflr r0 -/* 80032B00 0002FA40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032B04 0002FA44 54 84 06 3F */ clrlwi. r4, r4, 0x18 -/* 80032B08 0002FA48 40 82 00 1C */ bne lbl_80032B24 -/* 80032B0C 0002FA4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80032B14 0002FA54 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80032B18 0002FA58 38 80 23 04 */ li r4, 0x2304 -/* 80032B1C 0002FA5C 48 00 1E A1 */ bl dSv_event_c_NS_isEventBit -/* 80032B20 0002FA60 48 00 00 20 */ b lbl_80032B40 -lbl_80032B24: -/* 80032B24 0002FA64 88 63 00 1C */ lbz r3, 0x1c(r3) -/* 80032B28 0002FA68 38 00 00 01 */ li r0, 1 -/* 80032B2C 0002FA6C 7C 00 20 30 */ slw r0, r0, r4 -/* 80032B30 0002FA70 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032B34 0002FA74 7C 63 00 38 */ and r3, r3, r0 -/* 80032B38 0002FA78 30 03 FF FF */ addic r0, r3, -1 -/* 80032B3C 0002FA7C 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80032B40: -/* 80032B40 0002FA80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032B44 0002FA84 7C 08 03 A6 */ mtlr r0 -/* 80032B48 0002FA88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032B4C 0002FA8C 4E 80 00 20 */ blr - -.global dSv_player_status_b_c_NS_init -dSv_player_status_b_c_NS_init: -/* 80032B50 0002FA90 38 80 00 00 */ li r4, 0 -/* 80032B54 0002FA94 90 83 00 04 */ stw r4, 4(r3) -/* 80032B58 0002FA98 90 83 00 00 */ stw r4, 0(r3) -/* 80032B5C 0002FA9C 98 83 00 08 */ stb r4, 8(r3) -/* 80032B60 0002FAA0 98 83 00 09 */ stb r4, 9(r3) -/* 80032B64 0002FAA4 98 83 00 0A */ stb r4, 0xa(r3) -/* 80032B68 0002FAA8 C0 02 83 58 */ lfs f0, lbl_80451D58-_SDA2_BASE_(r2) -/* 80032B6C 0002FAAC D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80032B70 0002FAB0 B0 83 00 10 */ sth r4, 0x10(r3) -/* 80032B74 0002FAB4 38 A0 00 00 */ li r5, 0 -/* 80032B78 0002FAB8 38 00 00 03 */ li r0, 3 -/* 80032B7C 0002FABC 7C 09 03 A6 */ mtctr r0 -lbl_80032B80: -/* 80032B80 0002FAC0 38 05 00 12 */ addi r0, r5, 0x12 -/* 80032B84 0002FAC4 7C 83 01 AE */ stbx r4, r3, r0 -/* 80032B88 0002FAC8 38 A5 00 01 */ addi r5, r5, 1 -/* 80032B8C 0002FACC 42 00 FF F4 */ bdnz lbl_80032B80 -/* 80032B90 0002FAD0 4E 80 00 20 */ blr - -.global dSv_player_status_b_c_NS_onDarkClearLV -dSv_player_status_b_c_NS_onDarkClearLV: -/* 80032B94 0002FAD4 88 A3 00 09 */ lbz r5, 9(r3) -/* 80032B98 0002FAD8 38 00 00 01 */ li r0, 1 -/* 80032B9C 0002FADC 7C 00 20 30 */ slw r0, r0, r4 -/* 80032BA0 0002FAE0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032BA4 0002FAE4 7C A0 03 78 */ or r0, r5, r0 -/* 80032BA8 0002FAE8 98 03 00 09 */ stb r0, 9(r3) -/* 80032BAC 0002FAEC 4E 80 00 20 */ blr - -.global dSv_player_status_b_c_NS_isDarkClearLV -dSv_player_status_b_c_NS_isDarkClearLV: -/* 80032BB0 0002FAF0 88 63 00 09 */ lbz r3, 9(r3) -/* 80032BB4 0002FAF4 38 00 00 01 */ li r0, 1 -/* 80032BB8 0002FAF8 7C 00 20 30 */ slw r0, r0, r4 -/* 80032BBC 0002FAFC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032BC0 0002FB00 7C 63 00 38 */ and r3, r3, r0 -/* 80032BC4 0002FB04 30 03 FF FF */ addic r0, r3, -1 -/* 80032BC8 0002FB08 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032BCC 0002FB0C 4E 80 00 20 */ blr - -.global dSv_player_status_b_c_NS_onTransformLV -dSv_player_status_b_c_NS_onTransformLV: -/* 80032BD0 0002FB10 88 A3 00 08 */ lbz r5, 8(r3) -/* 80032BD4 0002FB14 38 00 00 01 */ li r0, 1 -/* 80032BD8 0002FB18 7C 00 20 30 */ slw r0, r0, r4 -/* 80032BDC 0002FB1C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032BE0 0002FB20 7C A0 03 78 */ or r0, r5, r0 -/* 80032BE4 0002FB24 98 03 00 08 */ stb r0, 8(r3) -/* 80032BE8 0002FB28 4E 80 00 20 */ blr - -.global dSv_player_status_b_c_NS_isTransformLV -dSv_player_status_b_c_NS_isTransformLV: -/* 80032BEC 0002FB2C 88 63 00 08 */ lbz r3, 8(r3) -/* 80032BF0 0002FB30 38 00 00 01 */ li r0, 1 -/* 80032BF4 0002FB34 7C 00 20 30 */ slw r0, r0, r4 -/* 80032BF8 0002FB38 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032BFC 0002FB3C 7C 63 00 38 */ and r3, r3, r0 -/* 80032C00 0002FB40 30 03 FF FF */ addic r0, r3, -1 -/* 80032C04 0002FB44 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032C08 0002FB48 4E 80 00 20 */ blr - -.global dSv_horse_place_c_NS_init -dSv_horse_place_c_NS_init: -/* 80032C0C 0002FB4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032C10 0002FB50 7C 08 02 A6 */ mflr r0 -/* 80032C14 0002FB54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032C18 0002FB58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032C1C 0002FB5C 7C 7F 1B 78 */ mr r31, r3 -/* 80032C20 0002FB60 38 7F 00 0E */ addi r3, r31, 0xe -/* 80032C24 0002FB64 3C 80 80 38 */ lis r4, lbl_80379234@ha -/* 80032C28 0002FB68 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80032C2C 0002FB6C 48 33 5F 01 */ bl func_80368B2C -/* 80032C30 0002FB70 C0 02 83 5C */ lfs f0, lbl_80451D5C-_SDA2_BASE_(r2) -/* 80032C34 0002FB74 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80032C38 0002FB78 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80032C3C 0002FB7C D0 1F 00 08 */ stfs f0, 8(r31) -/* 80032C40 0002FB80 38 00 00 00 */ li r0, 0 -/* 80032C44 0002FB84 B0 1F 00 0C */ sth r0, 0xc(r31) -/* 80032C48 0002FB88 98 1F 00 16 */ stb r0, 0x16(r31) -/* 80032C4C 0002FB8C 98 1F 00 17 */ stb r0, 0x17(r31) -/* 80032C50 0002FB90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032C54 0002FB94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032C58 0002FB98 7C 08 03 A6 */ mtlr r0 -/* 80032C5C 0002FB9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032C60 0002FBA0 4E 80 00 20 */ blr -/* 80032C64 0002FBA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032C68 0002FBA8 7C 08 02 A6 */ mflr r0 -/* 80032C6C 0002FBAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032C70 0002FBB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032C74 0002FBB4 48 32 F5 65 */ bl func_803621D8 -/* 80032C78 0002FBB8 7C 7C 1B 78 */ mr r28, r3 -/* 80032C7C 0002FBBC 7C BD 2B 78 */ mr r29, r5 -/* 80032C80 0002FBC0 7C DE 33 78 */ mr r30, r6 -/* 80032C84 0002FBC4 7C FF 3B 78 */ mr r31, r7 -/* 80032C88 0002FBC8 38 7C 00 0E */ addi r3, r28, 0xe -/* 80032C8C 0002FBCC 48 33 5E A1 */ bl func_80368B2C -/* 80032C90 0002FBD0 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80032C94 0002FBD4 D0 1C 00 00 */ stfs f0, 0(r28) -/* 80032C98 0002FBD8 C0 1D 00 04 */ lfs f0, 4(r29) -/* 80032C9C 0002FBDC D0 1C 00 04 */ stfs f0, 4(r28) -/* 80032CA0 0002FBE0 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80032CA4 0002FBE4 D0 1C 00 08 */ stfs f0, 8(r28) -/* 80032CA8 0002FBE8 B3 DC 00 0C */ sth r30, 0xc(r28) -/* 80032CAC 0002FBEC 9B FC 00 17 */ stb r31, 0x17(r28) -/* 80032CB0 0002FBF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032CB4 0002FBF4 48 32 F5 71 */ bl func_80362224 -/* 80032CB8 0002FBF8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032CBC 0002FBFC 7C 08 03 A6 */ mtlr r0 -/* 80032CC0 0002FC00 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032CC4 0002FC04 4E 80 00 20 */ blr - -.global dSv_player_return_place_c_NS_init -dSv_player_return_place_c_NS_init: -/* 80032CC8 0002FC08 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032CCC 0002FC0C 7C 08 02 A6 */ mflr r0 -/* 80032CD0 0002FC10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032CD4 0002FC14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032CD8 0002FC18 7C 7F 1B 78 */ mr r31, r3 -/* 80032CDC 0002FC1C 3C 80 80 38 */ lis r4, lbl_80379234@ha -/* 80032CE0 0002FC20 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80032CE4 0002FC24 38 84 00 01 */ addi r4, r4, 1 -/* 80032CE8 0002FC28 48 33 5E 45 */ bl func_80368B2C -/* 80032CEC 0002FC2C 38 00 00 01 */ li r0, 1 -/* 80032CF0 0002FC30 98 1F 00 09 */ stb r0, 9(r31) -/* 80032CF4 0002FC34 38 60 00 00 */ li r3, 0 -/* 80032CF8 0002FC38 98 7F 00 08 */ stb r3, 8(r31) -/* 80032CFC 0002FC3C 38 00 00 15 */ li r0, 0x15 -/* 80032D00 0002FC40 98 1F 00 0A */ stb r0, 0xa(r31) -/* 80032D04 0002FC44 98 7F 00 0B */ stb r3, 0xb(r31) -/* 80032D08 0002FC48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032D0C 0002FC4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032D10 0002FC50 7C 08 03 A6 */ mtlr r0 -/* 80032D14 0002FC54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032D18 0002FC58 4E 80 00 20 */ blr -/* 80032D1C 0002FC5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032D20 0002FC60 7C 08 02 A6 */ mflr r0 -/* 80032D24 0002FC64 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032D28 0002FC68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032D2C 0002FC6C 48 32 F4 B1 */ bl _savegpr_29 -/* 80032D30 0002FC70 7C 7D 1B 78 */ mr r29, r3 -/* 80032D34 0002FC74 7C BE 2B 78 */ mr r30, r5 -/* 80032D38 0002FC78 7C DF 33 78 */ mr r31, r6 -/* 80032D3C 0002FC7C 48 33 5D F1 */ bl func_80368B2C -/* 80032D40 0002FC80 9B DD 00 09 */ stb r30, 9(r29) -/* 80032D44 0002FC84 9B FD 00 08 */ stb r31, 8(r29) -/* 80032D48 0002FC88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032D4C 0002FC8C 48 32 F4 DD */ bl _restgpr_29 -/* 80032D50 0002FC90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032D54 0002FC94 7C 08 03 A6 */ mtlr r0 -/* 80032D58 0002FC98 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032D5C 0002FC9C 4E 80 00 20 */ blr - -.global dSv_player_field_last_stay_info_c_NS_init -dSv_player_field_last_stay_info_c_NS_init: -/* 80032D60 0002FCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032D64 0002FCA4 7C 08 02 A6 */ mflr r0 -/* 80032D68 0002FCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032D6C 0002FCAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032D70 0002FCB0 7C 7F 1B 78 */ mr r31, r3 -/* 80032D74 0002FCB4 38 7F 00 0E */ addi r3, r31, 0xe -/* 80032D78 0002FCB8 3C 80 80 38 */ lis r4, lbl_80379234@ha -/* 80032D7C 0002FCBC 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80032D80 0002FCC0 48 33 5D AD */ bl func_80368B2C -/* 80032D84 0002FCC4 C0 02 83 5C */ lfs f0, lbl_80451D5C-_SDA2_BASE_(r2) -/* 80032D88 0002FCC8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80032D8C 0002FCCC D0 1F 00 04 */ stfs f0, 4(r31) -/* 80032D90 0002FCD0 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80032D94 0002FCD4 38 60 00 00 */ li r3, 0 -/* 80032D98 0002FCD8 B0 7F 00 0C */ sth r3, 0xc(r31) -/* 80032D9C 0002FCDC 98 7F 00 16 */ stb r3, 0x16(r31) -/* 80032DA0 0002FCE0 38 00 00 01 */ li r0, 1 -/* 80032DA4 0002FCE4 98 1F 00 17 */ stb r0, 0x17(r31) -/* 80032DA8 0002FCE8 98 7F 00 18 */ stb r3, 0x18(r31) -/* 80032DAC 0002FCEC 98 7F 00 19 */ stb r3, 0x19(r31) -/* 80032DB0 0002FCF0 38 80 00 00 */ li r4, 0 -/* 80032DB4 0002FCF4 38 00 00 02 */ li r0, 2 -/* 80032DB8 0002FCF8 7C 09 03 A6 */ mtctr r0 -lbl_80032DBC: -/* 80032DBC 0002FCFC 38 04 00 1A */ addi r0, r4, 0x1a -/* 80032DC0 0002FD00 7C 7F 01 AE */ stbx r3, r31, r0 -/* 80032DC4 0002FD04 38 84 00 01 */ addi r4, r4, 1 -/* 80032DC8 0002FD08 42 00 FF F4 */ bdnz lbl_80032DBC -/* 80032DCC 0002FD0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032DD0 0002FD10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032DD4 0002FD14 7C 08 03 A6 */ mtlr r0 -/* 80032DD8 0002FD18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032DDC 0002FD1C 4E 80 00 20 */ blr - -.global dSv_player_field_last_stay_info_c_NS_set -dSv_player_field_last_stay_info_c_NS_set: -/* 80032DE0 0002FD20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032DE4 0002FD24 7C 08 02 A6 */ mflr r0 -/* 80032DE8 0002FD28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032DEC 0002FD2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032DF0 0002FD30 48 32 F3 E5 */ bl func_803621D4 -/* 80032DF4 0002FD34 7C 7B 1B 78 */ mr r27, r3 -/* 80032DF8 0002FD38 7C BC 2B 78 */ mr r28, r5 -/* 80032DFC 0002FD3C 7C DD 33 78 */ mr r29, r6 -/* 80032E00 0002FD40 7C FE 3B 78 */ mr r30, r7 -/* 80032E04 0002FD44 7D 1F 43 78 */ mr r31, r8 -/* 80032E08 0002FD48 38 7B 00 0E */ addi r3, r27, 0xe -/* 80032E0C 0002FD4C 48 33 5D 21 */ bl func_80368B2C -/* 80032E10 0002FD50 C0 1C 00 00 */ lfs f0, 0(r28) -/* 80032E14 0002FD54 D0 1B 00 00 */ stfs f0, 0(r27) -/* 80032E18 0002FD58 C0 1C 00 04 */ lfs f0, 4(r28) -/* 80032E1C 0002FD5C D0 1B 00 04 */ stfs f0, 4(r27) -/* 80032E20 0002FD60 C0 1C 00 08 */ lfs f0, 8(r28) -/* 80032E24 0002FD64 D0 1B 00 08 */ stfs f0, 8(r27) -/* 80032E28 0002FD68 B3 BB 00 0C */ sth r29, 0xc(r27) -/* 80032E2C 0002FD6C 9B DB 00 16 */ stb r30, 0x16(r27) -/* 80032E30 0002FD70 9B FB 00 17 */ stb r31, 0x17(r27) -/* 80032E34 0002FD74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032E38 0002FD78 48 32 F3 E9 */ bl func_80362220 -/* 80032E3C 0002FD7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032E40 0002FD80 7C 08 03 A6 */ mtlr r0 -/* 80032E44 0002FD84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032E48 0002FD88 4E 80 00 20 */ blr - -.global dSv_player_field_last_stay_info_c_NS_onRegionBit -dSv_player_field_last_stay_info_c_NS_onRegionBit: -/* 80032E4C 0002FD8C 2C 04 00 00 */ cmpwi r4, 0 -/* 80032E50 0002FD90 4D 80 00 20 */ bltlr -/* 80032E54 0002FD94 2C 04 00 08 */ cmpwi r4, 8 -/* 80032E58 0002FD98 4C 80 00 20 */ bgelr -/* 80032E5C 0002FD9C 88 A3 00 19 */ lbz r5, 0x19(r3) -/* 80032E60 0002FDA0 38 00 00 01 */ li r0, 1 -/* 80032E64 0002FDA4 7C 00 20 30 */ slw r0, r0, r4 -/* 80032E68 0002FDA8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032E6C 0002FDAC 7C A0 03 78 */ or r0, r5, r0 -/* 80032E70 0002FDB0 98 03 00 19 */ stb r0, 0x19(r3) -/* 80032E74 0002FDB4 4E 80 00 20 */ blr - -.global dSv_player_field_last_stay_info_c_NS_isRegionBit -dSv_player_field_last_stay_info_c_NS_isRegionBit: -/* 80032E78 0002FDB8 2C 04 00 00 */ cmpwi r4, 0 -/* 80032E7C 0002FDBC 41 80 00 2C */ blt lbl_80032EA8 -/* 80032E80 0002FDC0 2C 04 00 08 */ cmpwi r4, 8 -/* 80032E84 0002FDC4 40 80 00 24 */ bge lbl_80032EA8 -/* 80032E88 0002FDC8 88 63 00 19 */ lbz r3, 0x19(r3) -/* 80032E8C 0002FDCC 38 00 00 01 */ li r0, 1 -/* 80032E90 0002FDD0 7C 00 20 30 */ slw r0, r0, r4 -/* 80032E94 0002FDD4 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80032E98 0002FDD8 7C 63 00 38 */ and r3, r3, r0 -/* 80032E9C 0002FDDC 30 03 FF FF */ addic r0, r3, -1 -/* 80032EA0 0002FDE0 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032EA4 0002FDE4 4E 80 00 20 */ blr -lbl_80032EA8: -/* 80032EA8 0002FDE8 38 60 00 00 */ li r3, 0 -/* 80032EAC 0002FDEC 4E 80 00 20 */ blr - -.global dSv_player_last_mark_info_c_NS_init -dSv_player_last_mark_info_c_NS_init: -/* 80032EB0 0002FDF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032EB4 0002FDF4 7C 08 02 A6 */ mflr r0 -/* 80032EB8 0002FDF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032EBC 0002FDFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032EC0 0002FE00 7C 7F 1B 78 */ mr r31, r3 -/* 80032EC4 0002FE04 38 7F 00 0E */ addi r3, r31, 0xe -/* 80032EC8 0002FE08 3C 80 80 38 */ lis r4, lbl_80379234@ha -/* 80032ECC 0002FE0C 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80032ED0 0002FE10 48 33 5C 5D */ bl func_80368B2C -/* 80032ED4 0002FE14 C0 02 83 5C */ lfs f0, lbl_80451D5C-_SDA2_BASE_(r2) -/* 80032ED8 0002FE18 D0 1F 00 00 */ stfs f0, 0(r31) -/* 80032EDC 0002FE1C D0 1F 00 04 */ stfs f0, 4(r31) -/* 80032EE0 0002FE20 D0 1F 00 08 */ stfs f0, 8(r31) -/* 80032EE4 0002FE24 38 60 00 00 */ li r3, 0 -/* 80032EE8 0002FE28 B0 7F 00 0C */ sth r3, 0xc(r31) -/* 80032EEC 0002FE2C 98 7F 00 17 */ stb r3, 0x17(r31) -/* 80032EF0 0002FE30 98 7F 00 16 */ stb r3, 0x16(r31) -/* 80032EF4 0002FE34 38 00 FF FF */ li r0, -1 -/* 80032EF8 0002FE38 98 1F 00 18 */ stb r0, 0x18(r31) -/* 80032EFC 0002FE3C 38 80 00 00 */ li r4, 0 -/* 80032F00 0002FE40 38 00 00 03 */ li r0, 3 -/* 80032F04 0002FE44 7C 09 03 A6 */ mtctr r0 -lbl_80032F08: -/* 80032F08 0002FE48 38 04 00 19 */ addi r0, r4, 0x19 -/* 80032F0C 0002FE4C 7C 7F 01 AE */ stbx r3, r31, r0 -/* 80032F10 0002FE50 38 84 00 01 */ addi r4, r4, 1 -/* 80032F14 0002FE54 42 00 FF F4 */ bdnz lbl_80032F08 -/* 80032F18 0002FE58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032F1C 0002FE5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032F20 0002FE60 7C 08 03 A6 */ mtlr r0 -/* 80032F24 0002FE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032F28 0002FE68 4E 80 00 20 */ blr - -.global dSv_player_last_mark_info_c_NS_setWarpItemData -dSv_player_last_mark_info_c_NS_setWarpItemData: -/* 80032F2C 0002FE6C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032F30 0002FE70 7C 08 02 A6 */ mflr r0 -/* 80032F34 0002FE74 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032F38 0002FE78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032F3C 0002FE7C 48 32 F2 9D */ bl func_803621D8 -/* 80032F40 0002FE80 7C 7C 1B 78 */ mr r28, r3 -/* 80032F44 0002FE84 7C BD 2B 78 */ mr r29, r5 -/* 80032F48 0002FE88 7C DE 33 78 */ mr r30, r6 -/* 80032F4C 0002FE8C 7C FF 3B 78 */ mr r31, r7 -/* 80032F50 0002FE90 38 7C 00 0E */ addi r3, r28, 0xe -/* 80032F54 0002FE94 48 33 5B D9 */ bl func_80368B2C -/* 80032F58 0002FE98 C0 1D 00 00 */ lfs f0, 0(r29) -/* 80032F5C 0002FE9C D0 1C 00 00 */ stfs f0, 0(r28) -/* 80032F60 0002FEA0 C0 1D 00 04 */ lfs f0, 4(r29) -/* 80032F64 0002FEA4 D0 1C 00 04 */ stfs f0, 4(r28) -/* 80032F68 0002FEA8 C0 1D 00 08 */ lfs f0, 8(r29) -/* 80032F6C 0002FEAC D0 1C 00 08 */ stfs f0, 8(r28) -/* 80032F70 0002FEB0 B3 DC 00 0C */ sth r30, 0xc(r28) -/* 80032F74 0002FEB4 9B FC 00 17 */ stb r31, 0x17(r28) -/* 80032F78 0002FEB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032F7C 0002FEBC 48 32 F2 A9 */ bl func_80362224 -/* 80032F80 0002FEC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032F84 0002FEC4 7C 08 03 A6 */ mtlr r0 -/* 80032F88 0002FEC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032F8C 0002FECC 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_init -dSv_player_item_c_NS_init: -/* 80032F90 0002FED0 38 C0 00 00 */ li r6, 0 -/* 80032F94 0002FED4 38 80 00 FF */ li r4, 0xff -/* 80032F98 0002FED8 38 00 00 18 */ li r0, 0x18 -/* 80032F9C 0002FEDC 7C 09 03 A6 */ mtctr r0 -lbl_80032FA0: -/* 80032FA0 0002FEE0 7C A3 32 14 */ add r5, r3, r6 -/* 80032FA4 0002FEE4 98 85 00 00 */ stb r4, 0(r5) -/* 80032FA8 0002FEE8 98 85 00 18 */ stb r4, 0x18(r5) -/* 80032FAC 0002FEEC 38 C6 00 01 */ addi r6, r6, 1 -/* 80032FB0 0002FEF0 42 00 FF F0 */ bdnz lbl_80032FA0 -/* 80032FB4 0002FEF4 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setItem -dSv_player_item_c_NS_setItem: -/* 80032FB8 0002FEF8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80032FBC 0002FEFC 7C 08 02 A6 */ mflr r0 -/* 80032FC0 0002FF00 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032FC4 0002FF04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032FC8 0002FF08 48 32 F2 15 */ bl _savegpr_29 -/* 80032FCC 0002FF0C 7C 9D 23 78 */ mr r29, r4 -/* 80032FD0 0002FF10 2C 1D 00 18 */ cmpwi r29, 0x18 -/* 80032FD4 0002FF14 40 80 00 0C */ bge lbl_80032FE0 -/* 80032FD8 0002FF18 7C A3 E9 AE */ stbx r5, r3, r29 -/* 80032FDC 0002FF1C 48 00 03 1D */ bl dSv_player_item_c_NS_setLineUpItem -lbl_80032FE0: -/* 80032FE0 0002FF20 3B C0 00 00 */ li r30, 0 -/* 80032FE4 0002FF24 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80032FE8 0002FF28 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l -lbl_80032FEC: -/* 80032FEC 0002FF2C 7F E3 FB 78 */ mr r3, r31 -/* 80032FF0 0002FF30 7F C4 F3 78 */ mr r4, r30 -/* 80032FF4 0002FF34 4B FF FA 69 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80032FF8 0002FF38 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80032FFC 0002FF3C 7C 1D 00 00 */ cmpw r29, r0 -/* 80033000 0002FF40 40 82 00 0C */ bne lbl_8003300C -/* 80033004 0002FF44 7F C3 F3 78 */ mr r3, r30 -/* 80033008 0002FF48 4B FF AD ED */ bl dComIfGp_setSelectItem -lbl_8003300C: -/* 8003300C 0002FF4C 3B DE 00 01 */ addi r30, r30, 1 -/* 80033010 0002FF50 2C 1E 00 03 */ cmpwi r30, 3 -/* 80033014 0002FF54 41 80 FF D8 */ blt lbl_80032FEC -/* 80033018 0002FF58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003301C 0002FF5C 48 32 F2 0D */ bl _restgpr_29 -/* 80033020 0002FF60 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033024 0002FF64 7C 08 03 A6 */ mtlr r0 -/* 80033028 0002FF68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003302C 0002FF6C 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_getItem -dSv_player_item_c_NS_getItem: -/* 80033030 0002FF70 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033034 0002FF74 7C 08 02 A6 */ mflr r0 -/* 80033038 0002FF78 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003303C 0002FF7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033040 0002FF80 48 32 F1 91 */ bl func_803621D0 -/* 80033044 0002FF84 7C 7A 1B 78 */ mr r26, r3 -/* 80033048 0002FF88 7C 9B 23 78 */ mr r27, r4 -/* 8003304C 0002FF8C 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 80033050 0002FF90 40 80 02 8C */ bge lbl_800332DC -/* 80033054 0002FF94 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80033058 0002FF98 41 82 02 7C */ beq lbl_800332D4 -/* 8003305C 0002FF9C 3B C0 00 00 */ li r30, 0 -/* 80033060 0002FFA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033064 0002FFA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l -lbl_80033068: -/* 80033068 0002FFA8 7F E3 FB 78 */ mr r3, r31 -/* 8003306C 0002FFAC 7F C4 F3 78 */ mr r4, r30 -/* 80033070 0002FFB0 4B FF F9 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80033074 0002FFB4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033078 0002FFB8 7C 1B 00 00 */ cmpw r27, r0 -/* 8003307C 0002FFBC 41 82 00 18 */ beq lbl_80033094 -/* 80033080 0002FFC0 7F C3 F3 78 */ mr r3, r30 -/* 80033084 0002FFC4 4B FF AD 45 */ bl dComIfGs_getMixItemIndex -/* 80033088 0002FFC8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8003308C 0002FFCC 7C 1B 00 00 */ cmpw r27, r0 -/* 80033090 0002FFD0 40 82 02 38 */ bne lbl_800332C8 -lbl_80033094: -/* 80033094 0002FFD4 7F C3 F3 78 */ mr r3, r30 -/* 80033098 0002FFD8 4B FF AD 31 */ bl dComIfGs_getMixItemIndex -/* 8003309C 0002FFDC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330A0 0002FFE0 28 00 00 FF */ cmplwi r0, 0xff -/* 800330A4 0002FFE4 41 82 02 24 */ beq lbl_800332C8 -/* 800330A8 0002FFE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800330AC 0002FFEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800330B0 0002FFF0 7F C4 F3 78 */ mr r4, r30 -/* 800330B4 0002FFF4 4B FF F9 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800330B8 0002FFF8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330BC 0002FFFC 7F BA 00 AE */ lbzx r29, r26, r0 -/* 800330C0 00030000 7F C3 F3 78 */ mr r3, r30 -/* 800330C4 00030004 4B FF AD 05 */ bl dComIfGs_getMixItemIndex -/* 800330C8 00030008 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330CC 0003000C 7C 7A 00 AE */ lbzx r3, r26, r0 -/* 800330D0 00030010 7C 7C 1B 78 */ mr r28, r3 -/* 800330D4 00030014 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800330D8 00030018 28 00 00 43 */ cmplwi r0, 0x43 -/* 800330DC 0003001C 40 82 00 10 */ bne lbl_800330EC -/* 800330E0 00030020 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800330E4 00030024 28 00 00 70 */ cmplwi r0, 0x70 -/* 800330E8 00030028 41 82 00 1C */ beq lbl_80033104 -lbl_800330EC: -/* 800330EC 0003002C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800330F0 00030030 28 00 00 43 */ cmplwi r0, 0x43 -/* 800330F4 00030034 40 82 00 18 */ bne lbl_8003310C -/* 800330F8 00030038 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800330FC 0003003C 28 00 00 70 */ cmplwi r0, 0x70 -/* 80033100 00030040 40 82 00 0C */ bne lbl_8003310C -lbl_80033104: -/* 80033104 00030044 38 60 00 59 */ li r3, 0x59 -/* 80033108 00030048 48 00 01 D8 */ b lbl_800332E0 -lbl_8003310C: -/* 8003310C 0003004C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033110 00030050 28 00 00 43 */ cmplwi r0, 0x43 -/* 80033114 00030054 40 82 00 10 */ bne lbl_80033124 -/* 80033118 00030058 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8003311C 0003005C 28 00 00 71 */ cmplwi r0, 0x71 -/* 80033120 00030060 41 82 00 1C */ beq lbl_8003313C -lbl_80033124: -/* 80033124 00030064 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033128 00030068 28 00 00 43 */ cmplwi r0, 0x43 -/* 8003312C 0003006C 40 82 00 18 */ bne lbl_80033144 -/* 80033130 00030070 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033134 00030074 28 00 00 71 */ cmplwi r0, 0x71 -/* 80033138 00030078 40 82 00 0C */ bne lbl_80033144 -lbl_8003313C: -/* 8003313C 0003007C 38 60 00 59 */ li r3, 0x59 -/* 80033140 00030080 48 00 01 A0 */ b lbl_800332E0 -lbl_80033144: -/* 80033144 00030084 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033148 00030088 28 00 00 43 */ cmplwi r0, 0x43 -/* 8003314C 0003008C 40 82 00 10 */ bne lbl_8003315C -/* 80033150 00030090 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033154 00030094 28 00 00 72 */ cmplwi r0, 0x72 -/* 80033158 00030098 41 82 00 1C */ beq lbl_80033174 -lbl_8003315C: -/* 8003315C 0003009C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033160 000300A0 28 00 00 43 */ cmplwi r0, 0x43 -/* 80033164 000300A4 40 82 00 18 */ bne lbl_8003317C -/* 80033168 000300A8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8003316C 000300AC 28 00 00 72 */ cmplwi r0, 0x72 -/* 80033170 000300B0 40 82 00 0C */ bne lbl_8003317C -lbl_80033174: -/* 80033174 000300B4 38 60 00 59 */ li r3, 0x59 -/* 80033178 000300B8 48 00 01 68 */ b lbl_800332E0 -lbl_8003317C: -/* 8003317C 000300BC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033180 000300C0 28 00 00 43 */ cmplwi r0, 0x43 -/* 80033184 000300C4 40 82 00 10 */ bne lbl_80033194 -/* 80033188 000300C8 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 8003318C 000300CC 28 00 00 3E */ cmplwi r0, 0x3e -/* 80033190 000300D0 41 82 00 1C */ beq lbl_800331AC -lbl_80033194: -/* 80033194 000300D4 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033198 000300D8 28 00 00 43 */ cmplwi r0, 0x43 -/* 8003319C 000300DC 40 82 00 18 */ bne lbl_800331B4 -/* 800331A0 000300E0 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331A4 000300E4 28 00 00 3E */ cmplwi r0, 0x3e -/* 800331A8 000300E8 40 82 00 0C */ bne lbl_800331B4 -lbl_800331AC: -/* 800331AC 000300EC 38 60 00 5A */ li r3, 0x5a -/* 800331B0 000300F0 48 00 01 30 */ b lbl_800332E0 -lbl_800331B4: -/* 800331B4 000300F4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331B8 000300F8 28 00 00 4A */ cmplwi r0, 0x4a -/* 800331BC 000300FC 40 82 00 10 */ bne lbl_800331CC -/* 800331C0 00030100 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800331C4 00030104 28 00 00 76 */ cmplwi r0, 0x76 -/* 800331C8 00030108 41 82 00 1C */ beq lbl_800331E4 -lbl_800331CC: -/* 800331CC 0003010C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800331D0 00030110 28 00 00 4A */ cmplwi r0, 0x4a -/* 800331D4 00030114 40 82 00 18 */ bne lbl_800331EC -/* 800331D8 00030118 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331DC 0003011C 28 00 00 76 */ cmplwi r0, 0x76 -/* 800331E0 00030120 40 82 00 0C */ bne lbl_800331EC -lbl_800331E4: -/* 800331E4 00030124 38 60 00 5B */ li r3, 0x5b -/* 800331E8 00030128 48 00 00 F8 */ b lbl_800332E0 -lbl_800331EC: -/* 800331EC 0003012C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800331F0 00030130 28 00 00 4A */ cmplwi r0, 0x4a -/* 800331F4 00030134 40 82 00 10 */ bne lbl_80033204 -/* 800331F8 00030138 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 800331FC 0003013C 28 00 00 3D */ cmplwi r0, 0x3d -/* 80033200 00030140 41 82 00 1C */ beq lbl_8003321C -lbl_80033204: -/* 80033204 00030144 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033208 00030148 28 00 00 4A */ cmplwi r0, 0x4a -/* 8003320C 0003014C 40 82 00 18 */ bne lbl_80033224 -/* 80033210 00030150 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033214 00030154 28 00 00 3D */ cmplwi r0, 0x3d -/* 80033218 00030158 40 82 00 0C */ bne lbl_80033224 -lbl_8003321C: -/* 8003321C 0003015C 38 60 00 5C */ li r3, 0x5c -/* 80033220 00030160 48 00 00 C0 */ b lbl_800332E0 -lbl_80033224: -/* 80033224 00030164 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033228 00030168 28 00 00 4A */ cmplwi r0, 0x4a -/* 8003322C 0003016C 40 82 00 10 */ bne lbl_8003323C -/* 80033230 00030170 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033234 00030174 28 00 00 74 */ cmplwi r0, 0x74 -/* 80033238 00030178 41 82 00 1C */ beq lbl_80033254 -lbl_8003323C: -/* 8003323C 0003017C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 80033240 00030180 28 00 00 4A */ cmplwi r0, 0x4a -/* 80033244 00030184 40 82 00 18 */ bne lbl_8003325C -/* 80033248 00030188 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 8003324C 0003018C 28 00 00 74 */ cmplwi r0, 0x74 -/* 80033250 00030190 40 82 00 0C */ bne lbl_8003325C -lbl_80033254: -/* 80033254 00030194 38 60 00 5D */ li r3, 0x5d -/* 80033258 00030198 48 00 00 88 */ b lbl_800332E0 -lbl_8003325C: -/* 8003325C 0003019C 2C 1E 00 03 */ cmpwi r30, 3 -/* 80033260 000301A0 40 82 00 4C */ bne lbl_800332AC -/* 80033264 000301A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033268 000301A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8003326C 000301AC 7F C4 F3 78 */ mr r4, r30 -/* 80033270 000301B0 4B FF F7 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80033274 000301B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80033278 000301B8 40 82 00 34 */ bne lbl_800332AC -/* 8003327C 000301BC 7F C3 F3 78 */ mr r3, r30 -/* 80033280 000301C0 4B FF AB 49 */ bl dComIfGs_getMixItemIndex -/* 80033284 000301C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80033288 000301C8 40 82 00 24 */ bne lbl_800332AC -/* 8003328C 000301CC 7F C3 F3 78 */ mr r3, r30 -/* 80033290 000301D0 38 80 00 FF */ li r4, 0xff -/* 80033294 000301D4 4B FF AA 31 */ bl dComIfGs_setSelectItemIndex -/* 80033298 000301D8 7F C3 F3 78 */ mr r3, r30 -/* 8003329C 000301DC 38 80 00 FF */ li r4, 0xff -/* 800332A0 000301E0 4B FF AA 69 */ bl dComIfGs_setMixItemIndex -/* 800332A4 000301E4 38 60 00 FF */ li r3, 0xff -/* 800332A8 000301E8 48 00 00 38 */ b lbl_800332E0 -lbl_800332AC: -/* 800332AC 000301EC 3C 60 80 38 */ lis r3, lbl_80379234@ha -/* 800332B0 000301F0 38 63 92 34 */ addi r3, r3, lbl_80379234@l -/* 800332B4 000301F4 38 63 00 09 */ addi r3, r3, 9 -/* 800332B8 000301F8 57 A4 06 3E */ clrlwi r4, r29, 0x18 -/* 800332BC 000301FC 57 85 06 3E */ clrlwi r5, r28, 0x18 -/* 800332C0 00030200 4C C6 31 82 */ crclr 6 -/* 800332C4 00030204 4B FD 39 49 */ bl OSReport_Error -lbl_800332C8: -/* 800332C8 00030208 3B DE 00 01 */ addi r30, r30, 1 -/* 800332CC 0003020C 2C 1E 00 02 */ cmpwi r30, 2 -/* 800332D0 00030210 41 80 FD 98 */ blt lbl_80033068 -lbl_800332D4: -/* 800332D4 00030214 7C 7A D8 AE */ lbzx r3, r26, r27 -/* 800332D8 00030218 48 00 00 08 */ b lbl_800332E0 -lbl_800332DC: -/* 800332DC 0003021C 38 60 00 FF */ li r3, 0xff -lbl_800332E0: -/* 800332E0 00030220 39 61 00 20 */ addi r11, r1, 0x20 -/* 800332E4 00030224 48 32 EF 39 */ bl func_8036221C -/* 800332E8 00030228 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800332EC 0003022C 7C 08 03 A6 */ mtlr r0 -/* 800332F0 00030230 38 21 00 20 */ addi r1, r1, 0x20 -/* 800332F4 00030234 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setLineUpItem -dSv_player_item_c_NS_setLineUpItem: -/* 800332F8 00030238 38 A0 00 00 */ li r5, 0 -/* 800332FC 0003023C 38 C0 00 00 */ li r6, 0 -/* 80033300 00030240 38 80 00 FF */ li r4, 0xff -/* 80033304 00030244 38 00 00 18 */ li r0, 0x18 -/* 80033308 00030248 7C 09 03 A6 */ mtctr r0 -lbl_8003330C: -/* 8003330C 0003024C 38 06 00 18 */ addi r0, r6, 0x18 -/* 80033310 00030250 7C 83 01 AE */ stbx r4, r3, r0 -/* 80033314 00030254 38 C6 00 01 */ addi r6, r6, 1 -/* 80033318 00030258 42 00 FF F4 */ bdnz lbl_8003330C -/* 8003331C 0003025C 3C 80 80 3A */ lis r4, lbl_803A7270@ha -/* 80033320 00030260 38 84 72 70 */ addi r4, r4, lbl_803A7270@l -/* 80033324 00030264 38 00 00 17 */ li r0, 0x17 -/* 80033328 00030268 7C 09 03 A6 */ mtctr r0 -lbl_8003332C: -/* 8003332C 0003026C 88 C4 00 00 */ lbz r6, 0(r4) -/* 80033330 00030270 7C 03 30 AE */ lbzx r0, r3, r6 -/* 80033334 00030274 28 00 00 FF */ cmplwi r0, 0xff -/* 80033338 00030278 41 82 00 10 */ beq lbl_80033348 -/* 8003333C 0003027C 38 05 00 18 */ addi r0, r5, 0x18 -/* 80033340 00030280 7C C3 01 AE */ stbx r6, r3, r0 -/* 80033344 00030284 38 A5 00 01 */ addi r5, r5, 1 -lbl_80033348: -/* 80033348 00030288 38 84 00 01 */ addi r4, r4, 1 -/* 8003334C 0003028C 42 00 FF E0 */ bdnz lbl_8003332C -/* 80033350 00030290 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_getLineUpItem -dSv_player_item_c_NS_getLineUpItem: -/* 80033354 00030294 2C 04 00 18 */ cmpwi r4, 0x18 -/* 80033358 00030298 40 80 00 10 */ bge lbl_80033368 -/* 8003335C 0003029C 7C 63 22 14 */ add r3, r3, r4 -/* 80033360 000302A0 88 63 00 18 */ lbz r3, 0x18(r3) -/* 80033364 000302A4 4E 80 00 20 */ blr -lbl_80033368: -/* 80033368 000302A8 38 60 00 FF */ li r3, 0xff -/* 8003336C 000302AC 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setBottleItemIn -dSv_player_item_c_NS_setBottleItemIn: -/* 80033370 000302B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033374 000302B4 7C 08 02 A6 */ mflr r0 -/* 80033378 000302B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003337C 000302BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033380 000302C0 48 32 EE 59 */ bl func_803621D8 -/* 80033384 000302C4 7C 7C 1B 78 */ mr r28, r3 -/* 80033388 000302C8 7C BD 2B 78 */ mr r29, r5 -/* 8003338C 000302CC 7C 83 23 78 */ mr r3, r4 -/* 80033390 000302D0 4B FF F5 89 */ bl dSv_item_rename__FUc -/* 80033394 000302D4 7C 7E 1B 78 */ mr r30, r3 -/* 80033398 000302D8 7F A3 EB 78 */ mr r3, r29 -/* 8003339C 000302DC 4B FF F5 7D */ bl dSv_item_rename__FUc -/* 800333A0 000302E0 7C 7D 1B 78 */ mr r29, r3 -/* 800333A4 000302E4 3B E0 00 00 */ li r31, 0 -/* 800333A8 000302E8 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800333AC 000302EC 38 00 00 04 */ li r0, 4 -/* 800333B0 000302F0 7C 09 03 A6 */ mtctr r0 -lbl_800333B4: -/* 800333B4 000302F4 38 9F 00 0B */ addi r4, r31, 0xb -/* 800333B8 000302F8 7C 1C 20 AE */ lbzx r0, r28, r4 -/* 800333BC 000302FC 7C 03 00 40 */ cmplw r3, r0 -/* 800333C0 00030300 40 82 00 70 */ bne lbl_80033430 -/* 800333C4 00030304 7F 83 E3 78 */ mr r3, r28 -/* 800333C8 00030308 7F A5 EB 78 */ mr r5, r29 -/* 800333CC 0003030C 4B FF FB ED */ bl dSv_player_item_c_NS_setItem -/* 800333D0 00030310 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 800333D4 00030314 28 00 00 6B */ cmplwi r0, 0x6b -/* 800333D8 00030318 40 82 00 18 */ bne lbl_800333F0 -/* 800333DC 0003031C 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 800333E0 00030320 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 800333E4 00030324 38 1F 00 0B */ addi r0, r31, 0xb -/* 800333E8 00030328 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800333EC 0003032C 48 1E A8 D9 */ bl dMeter2Info_c_NS_setHotSpringTimer -lbl_800333F0: -/* 800333F0 00030330 3B A0 00 00 */ li r29, 0 -/* 800333F4 00030334 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800333F8 00030338 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l -/* 800333FC 0003033C 3B FF 00 0B */ addi r31, r31, 0xb -lbl_80033400: -/* 80033400 00030340 7F C3 F3 78 */ mr r3, r30 -/* 80033404 00030344 7F A4 EB 78 */ mr r4, r29 -/* 80033408 00030348 4B FF F6 55 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8003340C 0003034C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033410 00030350 7C 1F 00 00 */ cmpw r31, r0 -/* 80033414 00030354 40 82 00 0C */ bne lbl_80033420 -/* 80033418 00030358 7F A3 EB 78 */ mr r3, r29 -/* 8003341C 0003035C 4B FF A9 D9 */ bl dComIfGp_setSelectItem -lbl_80033420: -/* 80033420 00030360 3B BD 00 01 */ addi r29, r29, 1 -/* 80033424 00030364 2C 1D 00 03 */ cmpwi r29, 3 -/* 80033428 00030368 41 80 FF D8 */ blt lbl_80033400 -/* 8003342C 0003036C 48 00 00 0C */ b lbl_80033438 -lbl_80033430: -/* 80033430 00030370 3B FF 00 01 */ addi r31, r31, 1 -/* 80033434 00030374 42 00 FF 80 */ bdnz lbl_800333B4 -lbl_80033438: -/* 80033438 00030378 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003343C 0003037C 48 32 ED E9 */ bl func_80362224 -/* 80033440 00030380 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033444 00030384 7C 08 03 A6 */ mtlr r0 -/* 80033448 00030388 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003344C 0003038C 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setEmptyBottleItemIn -dSv_player_item_c_NS_setEmptyBottleItemIn: -/* 80033450 00030390 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80033454 00030394 7C 08 02 A6 */ mflr r0 -/* 80033458 00030398 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003345C 0003039C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80033460 000303A0 7C 7F 1B 78 */ mr r31, r3 -/* 80033464 000303A4 7C 85 23 78 */ mr r5, r4 -/* 80033468 000303A8 7C A3 2B 78 */ mr r3, r5 -/* 8003346C 000303AC 4B FF F4 AD */ bl dSv_item_rename__FUc -/* 80033470 000303B0 7C 65 1B 78 */ mr r5, r3 -/* 80033474 000303B4 7F E3 FB 78 */ mr r3, r31 -/* 80033478 000303B8 38 80 00 60 */ li r4, 0x60 -/* 8003347C 000303BC 4B FF FE F5 */ bl dSv_player_item_c_NS_setBottleItemIn -/* 80033480 000303C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80033484 000303C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80033488 000303C8 7C 08 03 A6 */ mtlr r0 -/* 8003348C 000303CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033490 000303D0 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setEmptyBottle -dSv_player_item_c_NS_setEmptyBottle: -/* 80033494 000303D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033498 000303D8 7C 08 02 A6 */ mflr r0 -/* 8003349C 000303DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800334A0 000303E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800334A4 000303E4 48 32 ED 39 */ bl _savegpr_29 -/* 800334A8 000303E8 3B A0 00 00 */ li r29, 0 -/* 800334AC 000303EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800334B0 000303F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800334B4 000303F4 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_800334B8: -/* 800334B8 000303F8 7F E3 FB 78 */ mr r3, r31 -/* 800334BC 000303FC 38 1D 00 0B */ addi r0, r29, 0xb -/* 800334C0 00030400 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 800334C4 00030404 7F C4 F3 78 */ mr r4, r30 -/* 800334C8 00030408 38 A0 00 01 */ li r5, 1 -/* 800334CC 0003040C 4B FF FB 65 */ bl dSv_player_item_c_NS_getItem -/* 800334D0 00030410 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800334D4 00030414 28 00 00 FF */ cmplwi r0, 0xff -/* 800334D8 00030418 40 82 00 18 */ bne lbl_800334F0 -/* 800334DC 0003041C 7F E3 FB 78 */ mr r3, r31 -/* 800334E0 00030420 7F C4 F3 78 */ mr r4, r30 -/* 800334E4 00030424 38 A0 00 60 */ li r5, 0x60 -/* 800334E8 00030428 4B FF FA D1 */ bl dSv_player_item_c_NS_setItem -/* 800334EC 0003042C 48 00 00 10 */ b lbl_800334FC -lbl_800334F0: -/* 800334F0 00030430 3B BD 00 01 */ addi r29, r29, 1 -/* 800334F4 00030434 2C 1D 00 04 */ cmpwi r29, 4 -/* 800334F8 00030438 41 80 FF C0 */ blt lbl_800334B8 -lbl_800334FC: -/* 800334FC 0003043C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033500 00030440 48 32 ED 29 */ bl _restgpr_29 -/* 80033504 00030444 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033508 00030448 7C 08 03 A6 */ mtlr r0 -/* 8003350C 0003044C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033510 00030450 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setEmptyBottle_X1_ -dSv_player_item_c_NS_setEmptyBottle_X1_: -/* 80033514 00030454 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033518 00030458 7C 08 02 A6 */ mflr r0 -/* 8003351C 0003045C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033520 00030460 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033524 00030464 48 32 EC B5 */ bl func_803621D8 -/* 80033528 00030468 7C 9C 23 78 */ mr r28, r4 -/* 8003352C 0003046C 3B A0 00 00 */ li r29, 0 -/* 80033530 00030470 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033534 00030474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80033538 00030478 3B E3 00 9C */ addi r31, r3, 0x9c -lbl_8003353C: -/* 8003353C 0003047C 7F E3 FB 78 */ mr r3, r31 -/* 80033540 00030480 38 1D 00 0B */ addi r0, r29, 0xb -/* 80033544 00030484 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 80033548 00030488 7F C4 F3 78 */ mr r4, r30 -/* 8003354C 0003048C 38 A0 00 01 */ li r5, 1 -/* 80033550 00030490 4B FF FA E1 */ bl dSv_player_item_c_NS_getItem -/* 80033554 00030494 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80033558 00030498 28 00 00 FF */ cmplwi r0, 0xff -/* 8003355C 0003049C 40 82 00 18 */ bne lbl_80033574 -/* 80033560 000304A0 7F E3 FB 78 */ mr r3, r31 -/* 80033564 000304A4 7F C4 F3 78 */ mr r4, r30 -/* 80033568 000304A8 7F 85 E3 78 */ mr r5, r28 -/* 8003356C 000304AC 4B FF FA 4D */ bl dSv_player_item_c_NS_setItem -/* 80033570 000304B0 48 00 00 10 */ b lbl_80033580 -lbl_80033574: -/* 80033574 000304B4 3B BD 00 01 */ addi r29, r29, 1 -/* 80033578 000304B8 2C 1D 00 04 */ cmpwi r29, 4 -/* 8003357C 000304BC 41 80 FF C0 */ blt lbl_8003353C -lbl_80033580: -/* 80033580 000304C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033584 000304C4 48 32 EC A1 */ bl func_80362224 -/* 80033588 000304C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003358C 000304CC 7C 08 03 A6 */ mtlr r0 -/* 80033590 000304D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033594 000304D4 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setEquipBottleItemIn -dSv_player_item_c_NS_setEquipBottleItemIn: -/* 80033598 000304D8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003359C 000304DC 7C 08 02 A6 */ mflr r0 -/* 800335A0 000304E0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800335A4 000304E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800335A8 000304E8 48 32 EC 35 */ bl _savegpr_29 -/* 800335AC 000304EC 7C 7D 1B 78 */ mr r29, r3 -/* 800335B0 000304F0 7C 9F 23 78 */ mr r31, r4 -/* 800335B4 000304F4 7C BE 2B 78 */ mr r30, r5 -/* 800335B8 000304F8 7F C3 F3 78 */ mr r3, r30 -/* 800335BC 000304FC 4B FF F3 5D */ bl dSv_item_rename__FUc -/* 800335C0 00030500 7C 7E 1B 78 */ mr r30, r3 -/* 800335C4 00030504 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800335C8 00030508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800335CC 0003050C 57 FF 06 3E */ clrlwi r31, r31, 0x18 -/* 800335D0 00030510 7F E4 FB 78 */ mr r4, r31 -/* 800335D4 00030514 4B FF F4 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800335D8 00030518 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800335DC 0003051C 28 00 00 0B */ cmplwi r0, 0xb -/* 800335E0 00030520 41 80 00 C4 */ blt lbl_800336A4 -/* 800335E4 00030524 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800335E8 00030528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800335EC 0003052C 7F E4 FB 78 */ mr r4, r31 -/* 800335F0 00030530 4B FF F4 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800335F4 00030534 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800335F8 00030538 28 00 00 0E */ cmplwi r0, 0xe -/* 800335FC 0003053C 41 81 00 A8 */ bgt lbl_800336A4 -/* 80033600 00030540 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80033604 00030544 28 00 00 6B */ cmplwi r0, 0x6b -/* 80033608 00030548 40 82 00 24 */ bne lbl_8003362C -/* 8003360C 0003054C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033610 00030550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80033614 00030554 7F E4 FB 78 */ mr r4, r31 -/* 80033618 00030558 4B FF F4 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8003361C 0003055C 7C 64 1B 78 */ mr r4, r3 -/* 80033620 00030560 3C 60 80 43 */ lis r3, lbl_80430188@ha -/* 80033624 00030564 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80033628 00030568 48 1E A6 9D */ bl dMeter2Info_c_NS_setHotSpringTimer -lbl_8003362C: -/* 8003362C 0003056C 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033630 00030570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80033634 00030574 7F E4 FB 78 */ mr r4, r31 -/* 80033638 00030578 4B FF F4 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8003363C 0003057C 7C 60 1B 78 */ mr r0, r3 -/* 80033640 00030580 7F A3 EB 78 */ mr r3, r29 -/* 80033644 00030584 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033648 00030588 7F C5 F3 78 */ mr r5, r30 -/* 8003364C 0003058C 4B FF F9 6D */ bl dSv_player_item_c_NS_setItem -/* 80033650 00030590 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033654 00030594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80033658 00030598 7F E4 FB 78 */ mr r4, r31 -/* 8003365C 0003059C 4B FF F4 01 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 80033660 000305A0 7C 60 1B 78 */ mr r0, r3 -/* 80033664 000305A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033668 000305A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8003366C 000305AC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80033670 000305B0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033674 000305B4 7F C5 F3 78 */ mr r5, r30 -/* 80033678 000305B8 4B FF F9 41 */ bl dSv_player_item_c_NS_setItem -/* 8003367C 000305BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033680 000305C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80033684 000305C4 7F E4 FB 78 */ mr r4, r31 -/* 80033688 000305C8 4B FF F3 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 8003368C 000305CC 3C 80 80 40 */ lis r4, lbl_804061C0@ha -/* 80033690 000305D0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l -/* 80033694 000305D4 98 64 5E 7D */ stb r3, 0x5e7d(r4) -/* 80033698 000305D8 9B C4 5E 7E */ stb r30, 0x5e7e(r4) -/* 8003369C 000305DC 7F E3 FB 78 */ mr r3, r31 -/* 800336A0 000305E0 4B FF A7 55 */ bl dComIfGp_setSelectItem -lbl_800336A4: -/* 800336A4 000305E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800336A8 000305E8 48 32 EB 81 */ bl _restgpr_29 -/* 800336AC 000305EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800336B0 000305F0 7C 08 03 A6 */ mtlr r0 -/* 800336B4 000305F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800336B8 000305F8 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setEquipBottleItemEmpty -dSv_player_item_c_NS_setEquipBottleItemEmpty: -/* 800336BC 000305FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800336C0 00030600 7C 08 02 A6 */ mflr r0 -/* 800336C4 00030604 90 01 00 14 */ stw r0, 0x14(r1) -/* 800336C8 00030608 38 A0 00 60 */ li r5, 0x60 -/* 800336CC 0003060C 4B FF FE CD */ bl dSv_player_item_c_NS_setEquipBottleItemIn -/* 800336D0 00030610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800336D4 00030614 7C 08 03 A6 */ mtlr r0 -/* 800336D8 00030618 38 21 00 10 */ addi r1, r1, 0x10 -/* 800336DC 0003061C 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_checkBottle -dSv_player_item_c_NS_checkBottle: -/* 800336E0 00030620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800336E4 00030624 7C 08 02 A6 */ mflr r0 -/* 800336E8 00030628 90 01 00 14 */ stw r0, 0x14(r1) -/* 800336EC 0003062C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800336F0 00030630 93 C1 00 08 */ stw r30, 8(r1) -/* 800336F4 00030634 7C 7E 1B 78 */ mr r30, r3 -/* 800336F8 00030638 3B E0 00 00 */ li r31, 0 -/* 800336FC 0003063C 7C 83 23 78 */ mr r3, r4 -/* 80033700 00030640 4B FF F2 19 */ bl dSv_item_rename__FUc -/* 80033704 00030644 38 A0 00 00 */ li r5, 0 -/* 80033708 00030648 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8003370C 0003064C 38 00 00 04 */ li r0, 4 -/* 80033710 00030650 7C 09 03 A6 */ mtctr r0 -lbl_80033714: -/* 80033714 00030654 38 05 00 0B */ addi r0, r5, 0xb -/* 80033718 00030658 7C 1E 00 AE */ lbzx r0, r30, r0 -/* 8003371C 0003065C 7C 04 00 40 */ cmplw r4, r0 -/* 80033720 00030660 40 82 00 10 */ bne lbl_80033730 -/* 80033724 00030664 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80033728 00030668 38 03 00 01 */ addi r0, r3, 1 -/* 8003372C 0003066C 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_80033730: -/* 80033730 00030670 38 A5 00 01 */ addi r5, r5, 1 -/* 80033734 00030674 42 00 FF E0 */ bdnz lbl_80033714 -/* 80033738 00030678 7F E3 FB 78 */ mr r3, r31 -/* 8003373C 0003067C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80033740 00030680 83 C1 00 08 */ lwz r30, 8(r1) -/* 80033744 00030684 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80033748 00030688 7C 08 03 A6 */ mtlr r0 -/* 8003374C 0003068C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033750 00030690 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_checkInsectBottle -dSv_player_item_c_NS_checkInsectBottle: -/* 80033754 00030694 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80033758 00030698 7C 08 02 A6 */ mflr r0 -/* 8003375C 0003069C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033760 000306A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033764 000306A4 48 32 EA 71 */ bl func_803621D4 -/* 80033768 000306A8 3B 60 00 00 */ li r27, 0 -/* 8003376C 000306AC 3B E0 00 00 */ li r31, 0 -/* 80033770 000306B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80033778 000306B8 3B A3 00 CC */ addi r29, r3, 0xcc -/* 8003377C 000306BC 3B 83 07 F0 */ addi r28, r3, 0x7f0 -/* 80033780 000306C0 3C 60 80 3A */ lis r3, lbl_803A7288@ha -/* 80033784 000306C4 3B C3 72 88 */ addi r30, r3, lbl_803A7288@l -lbl_80033788: -/* 80033788 000306C8 7F A3 EB 78 */ mr r3, r29 -/* 8003378C 000306CC 38 1B 00 C0 */ addi r0, r27, 0xc0 -/* 80033790 000306D0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033794 000306D4 48 00 07 35 */ bl dSv_player_get_item_c_NS_isFirstBit -/* 80033798 000306D8 2C 03 00 00 */ cmpwi r3, 0 -/* 8003379C 000306DC 41 82 00 24 */ beq lbl_800337C0 -/* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28 -/* 800337A4 000306E4 7C 9E FA 14 */ add r4, r30, r31 -/* 800337A8 000306E8 A0 84 03 22 */ lhz r4, 0x322(r4) -/* 800337AC 000306EC 48 00 12 11 */ bl dSv_event_c_NS_isEventBit -/* 800337B0 000306F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800337B4 000306F4 40 82 00 0C */ bne lbl_800337C0 -/* 800337B8 000306F8 38 60 00 01 */ li r3, 1 -/* 800337BC 000306FC 48 00 00 18 */ b lbl_800337D4 -lbl_800337C0: -/* 800337C0 00030700 3B 7B 00 01 */ addi r27, r27, 1 -/* 800337C4 00030704 2C 1B 00 18 */ cmpwi r27, 0x18 -/* 800337C8 00030708 3B FF 00 02 */ addi r31, r31, 2 -/* 800337CC 0003070C 41 80 FF BC */ blt lbl_80033788 -/* 800337D0 00030710 38 60 00 00 */ li r3, 0 -lbl_800337D4: -/* 800337D4 00030714 39 61 00 20 */ addi r11, r1, 0x20 -/* 800337D8 00030718 48 32 EA 49 */ bl func_80362220 -/* 800337DC 0003071C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800337E0 00030720 7C 08 03 A6 */ mtlr r0 -/* 800337E4 00030724 38 21 00 20 */ addi r1, r1, 0x20 -/* 800337E8 00030728 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_checkEmptyBottle -dSv_player_item_c_NS_checkEmptyBottle: -/* 800337EC 0003072C 38 80 00 00 */ li r4, 0 -/* 800337F0 00030730 38 A0 00 00 */ li r5, 0 -/* 800337F4 00030734 38 00 00 04 */ li r0, 4 -/* 800337F8 00030738 7C 09 03 A6 */ mtctr r0 -lbl_800337FC: -/* 800337FC 0003073C 38 05 00 0B */ addi r0, r5, 0xb -/* 80033800 00030740 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80033804 00030744 28 00 00 60 */ cmplwi r0, 0x60 -/* 80033808 00030748 40 82 00 10 */ bne lbl_80033818 -/* 8003380C 0003074C 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80033810 00030750 38 04 00 01 */ addi r0, r4, 1 -/* 80033814 00030754 54 04 06 3E */ clrlwi r4, r0, 0x18 -lbl_80033818: -/* 80033818 00030758 38 A5 00 01 */ addi r5, r5, 1 -/* 8003381C 0003075C 42 00 FF E0 */ bdnz lbl_800337FC -/* 80033820 00030760 7C 83 23 78 */ mr r3, r4 -/* 80033824 00030764 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setBombBagItemIn -dSv_player_item_c_NS_setBombBagItemIn: -/* 80033828 00030768 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003382C 0003076C 7C 08 02 A6 */ mflr r0 -/* 80033830 00030770 90 01 00 24 */ stw r0, 0x24(r1) -/* 80033834 00030774 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033838 00030778 48 32 E9 A5 */ bl _savegpr_29 -/* 8003383C 0003077C 7C BE 2B 78 */ mr r30, r5 -/* 80033840 00030780 7C DD 33 78 */ mr r29, r6 -/* 80033844 00030784 3B E0 00 00 */ li r31, 0 -/* 80033848 00030788 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 8003384C 0003078C 38 00 00 03 */ li r0, 3 -/* 80033850 00030790 7C 09 03 A6 */ mtctr r0 -lbl_80033854: -/* 80033854 00030794 38 9F 00 0F */ addi r4, r31, 0xf -/* 80033858 00030798 7C 03 20 AE */ lbzx r0, r3, r4 -/* 8003385C 0003079C 7C 05 00 40 */ cmplw r5, r0 -/* 80033860 000307A0 40 82 00 90 */ bne lbl_800338F0 -/* 80033864 000307A4 7F C5 F3 78 */ mr r5, r30 -/* 80033868 000307A8 4B FF F7 51 */ bl dSv_player_item_c_NS_setItem -/* 8003386C 000307AC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 80033870 000307B0 28 00 00 01 */ cmplwi r0, 1 -/* 80033874 000307B4 40 82 00 3C */ bne lbl_800338B0 -/* 80033878 000307B8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 8003387C 000307BC 28 00 00 50 */ cmplwi r0, 0x50 -/* 80033880 000307C0 41 82 00 30 */ beq lbl_800338B0 -/* 80033884 000307C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8003388C 000307CC 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 80033890 000307D0 7F C4 F3 78 */ mr r4, r30 -/* 80033894 000307D4 48 00 08 65 */ bl dSv_player_item_max_c_NS_getBombNum -/* 80033898 000307D8 7C 65 1B 78 */ mr r5, r3 -/* 8003389C 000307DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 800338A4 000307E4 38 63 00 EC */ addi r3, r3, 0xec -/* 800338A8 000307E8 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 800338AC 000307EC 48 00 06 C1 */ bl dSv_player_item_record_c_NS_setBombNum -lbl_800338B0: -/* 800338B0 000307F0 3B A0 00 00 */ li r29, 0 -/* 800338B4 000307F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha -/* 800338B8 000307F8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l -/* 800338BC 000307FC 3B FF 00 0F */ addi r31, r31, 0xf -lbl_800338C0: -/* 800338C0 00030800 7F C3 F3 78 */ mr r3, r30 -/* 800338C4 00030804 7F A4 EB 78 */ mr r4, r29 -/* 800338C8 00030808 4B FF F1 95 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi -/* 800338CC 0003080C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 800338D0 00030810 7C 1F 00 00 */ cmpw r31, r0 -/* 800338D4 00030814 40 82 00 0C */ bne lbl_800338E0 -/* 800338D8 00030818 7F A3 EB 78 */ mr r3, r29 -/* 800338DC 0003081C 4B FF A5 19 */ bl dComIfGp_setSelectItem -lbl_800338E0: -/* 800338E0 00030820 3B BD 00 01 */ addi r29, r29, 1 -/* 800338E4 00030824 2C 1D 00 03 */ cmpwi r29, 3 -/* 800338E8 00030828 41 80 FF D8 */ blt lbl_800338C0 -/* 800338EC 0003082C 48 00 00 0C */ b lbl_800338F8 -lbl_800338F0: -/* 800338F0 00030830 3B FF 00 01 */ addi r31, r31, 1 -/* 800338F4 00030834 42 00 FF 60 */ bdnz lbl_80033854 -lbl_800338F8: -/* 800338F8 00030838 39 61 00 20 */ addi r11, r1, 0x20 -/* 800338FC 0003083C 48 32 E9 2D */ bl _restgpr_29 -/* 80033900 00030840 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80033904 00030844 7C 08 03 A6 */ mtlr r0 -/* 80033908 00030848 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003390C 0003084C 4E 80 00 20 */ blr - -.global dSv_player_item_c_NS_setBombBagItemIn_X1_ -dSv_player_item_c_NS_setBombBagItemIn_X1_: +.global setBombBagItemIn__17dSv_player_item_cFUcUcb_X1_ +setBombBagItemIn__17dSv_player_item_cFUcUcb_X1_: /* 80033910 00030850 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80033914 00030854 7C 08 02 A6 */ mflr r0 /* 80033918 00030858 90 01 00 24 */ stw r0, 0x24(r1) /* 8003391C 0003085C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033920 00030860 48 32 E8 B5 */ bl func_803621D4 +/* 80033920 00030860 48 32 E8 B5 */ bl _savegpr_27 /* 80033924 00030864 7C BB 2B 78 */ mr r27, r5 /* 80033928 00030868 7C DC 33 78 */ mr r28, r6 /* 8003392C 0003086C 7C FD 3B 78 */ mr r29, r7 @@ -1080,7 +22,7 @@ lbl_80033940: /* 80033948 00030888 7C 05 00 40 */ cmplw r5, r0 /* 8003394C 0003088C 40 82 00 B4 */ bne lbl_80033A00 /* 80033950 00030890 7F 65 DB 78 */ mr r5, r27 -/* 80033954 00030894 4B FF F6 65 */ bl dSv_player_item_c_NS_setItem +/* 80033954 00030894 4B FF F6 65 */ bl setItem__17dSv_player_item_cFiUc /* 80033958 00030898 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8003395C 0003089C 28 00 00 01 */ cmplwi r0, 1 /* 80033960 000308A0 40 82 00 60 */ bne lbl_800339C0 @@ -1132,7 +74,7 @@ lbl_80033A00: /* 80033A04 00030944 42 00 FF 3C */ bdnz lbl_80033940 lbl_80033A08: /* 80033A08 00030948 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033A0C 0003094C 48 32 E8 15 */ bl func_80362220 +/* 80033A0C 0003094C 48 32 E8 15 */ bl _restgpr_27 /* 80033A10 00030950 80 01 00 24 */ lwz r0, 0x24(r1) /* 80033A14 00030954 7C 08 03 A6 */ mtlr r0 /* 80033A18 00030958 38 21 00 20 */ addi r1, r1, 0x20 @@ -1147,7 +89,7 @@ dSv_player_item_c_NS_setEmptyBombBagItemIn: /* 80033A30 00030970 7C A6 2B 78 */ mr r6, r5 /* 80033A34 00030974 38 80 00 50 */ li r4, 0x50 /* 80033A38 00030978 7C 05 03 78 */ mr r5, r0 -/* 80033A3C 0003097C 4B FF FD ED */ bl dSv_player_item_c_NS_setBombBagItemIn +/* 80033A3C 0003097C 4B FF FD ED */ bl setBombBagItemIn__17dSv_player_item_cFUcUcb /* 80033A40 00030980 80 01 00 14 */ lwz r0, 0x14(r1) /* 80033A44 00030984 7C 08 03 A6 */ mtlr r0 /* 80033A48 00030988 38 21 00 10 */ addi r1, r1, 0x10 @@ -1164,7 +106,7 @@ dSv_player_item_c_NS_setEmptyBombBagItemIn_X1_: /* 80033A68 000309A8 38 80 00 50 */ li r4, 0x50 /* 80033A6C 000309AC 7D 05 43 78 */ mr r5, r8 /* 80033A70 000309B0 7C 06 03 78 */ mr r6, r0 -/* 80033A74 000309B4 4B FF FE 9D */ bl dSv_player_item_c_NS_setBombBagItemIn_X1_ +/* 80033A74 000309B4 4B FF FE 9D */ bl setBombBagItemIn__17dSv_player_item_cFUcUcb_X1_ /* 80033A78 000309B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80033A7C 000309BC 7C 08 03 A6 */ mtlr r0 /* 80033A80 000309C0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1187,14 +129,14 @@ lbl_80033AAC: /* 80033AB4 000309F4 54 1E 06 3E */ clrlwi r30, r0, 0x18 /* 80033AB8 000309F8 7F C4 F3 78 */ mr r4, r30 /* 80033ABC 000309FC 38 A0 00 01 */ li r5, 1 -/* 80033AC0 00030A00 4B FF F5 71 */ bl dSv_player_item_c_NS_getItem +/* 80033AC0 00030A00 4B FF F5 71 */ bl getItem__17dSv_player_item_cCFib /* 80033AC4 00030A04 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80033AC8 00030A08 28 00 00 FF */ cmplwi r0, 0xff /* 80033ACC 00030A0C 40 82 00 18 */ bne lbl_80033AE4 /* 80033AD0 00030A10 7F E3 FB 78 */ mr r3, r31 /* 80033AD4 00030A14 7F C4 F3 78 */ mr r4, r30 /* 80033AD8 00030A18 38 A0 00 50 */ li r5, 0x50 -/* 80033ADC 00030A1C 4B FF F4 DD */ bl dSv_player_item_c_NS_setItem +/* 80033ADC 00030A1C 4B FF F4 DD */ bl setItem__17dSv_player_item_cFiUc /* 80033AE0 00030A20 48 00 00 10 */ b lbl_80033AF0 lbl_80033AE4: /* 80033AE4 00030A24 3B BD 00 01 */ addi r29, r29, 1 @@ -1214,7 +156,7 @@ dSv_player_item_c_NS_setEmptyBombBag_X1_: /* 80033B0C 00030A4C 7C 08 02 A6 */ mflr r0 /* 80033B10 00030A50 90 01 00 24 */ stw r0, 0x24(r1) /* 80033B14 00030A54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033B18 00030A58 48 32 E6 BD */ bl func_803621D4 +/* 80033B18 00030A58 48 32 E6 BD */ bl _savegpr_27 /* 80033B1C 00030A5C 7C 9B 23 78 */ mr r27, r4 /* 80033B20 00030A60 7C BE 2B 78 */ mr r30, r5 /* 80033B24 00030A64 3B E0 00 00 */ li r31, 0 @@ -1227,14 +169,14 @@ lbl_80033B34: /* 80033B3C 00030A7C 54 1C 06 3E */ clrlwi r28, r0, 0x18 /* 80033B40 00030A80 7F 84 E3 78 */ mr r4, r28 /* 80033B44 00030A84 38 A0 00 01 */ li r5, 1 -/* 80033B48 00030A88 4B FF F4 E9 */ bl dSv_player_item_c_NS_getItem +/* 80033B48 00030A88 4B FF F4 E9 */ bl getItem__17dSv_player_item_cCFib /* 80033B4C 00030A8C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80033B50 00030A90 28 00 00 FF */ cmplwi r0, 0xff /* 80033B54 00030A94 40 82 00 74 */ bne lbl_80033BC8 /* 80033B58 00030A98 7F A3 EB 78 */ mr r3, r29 /* 80033B5C 00030A9C 7F 84 E3 78 */ mr r4, r28 /* 80033B60 00030AA0 7F 65 DB 78 */ mr r5, r27 -/* 80033B64 00030AA4 4B FF F4 55 */ bl dSv_player_item_c_NS_setItem +/* 80033B64 00030AA4 4B FF F4 55 */ bl setItem__17dSv_player_item_cFiUc /* 80033B68 00030AA8 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80033B6C 00030AAC 28 00 00 50 */ cmplwi r0, 0x50 /* 80033B70 00030AB0 41 82 00 64 */ beq lbl_80033BD4 @@ -1266,7 +208,7 @@ lbl_80033BC8: /* 80033BD0 00030B10 41 80 FF 64 */ blt lbl_80033B34 lbl_80033BD4: /* 80033BD4 00030B14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033BD8 00030B18 48 32 E6 49 */ bl func_80362220 +/* 80033BD8 00030B18 48 32 E6 49 */ bl _restgpr_27 /* 80033BDC 00030B1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80033BE0 00030B20 7C 08 03 A6 */ mtlr r0 /* 80033BE4 00030B24 38 21 00 20 */ addi r1, r1, 0x20 @@ -1306,7 +248,7 @@ dSv_player_item_c_NS_setWarashibeItem: /* 80033C4C 00030B8C 38 63 00 9C */ addi r3, r3, 0x9c /* 80033C50 00030B90 38 80 00 15 */ li r4, 0x15 /* 80033C54 00030B94 7F A5 EB 78 */ mr r5, r29 -/* 80033C58 00030B98 4B FF F3 61 */ bl dSv_player_item_c_NS_setItem +/* 80033C58 00030B98 4B FF F3 61 */ bl setItem__17dSv_player_item_cFiUc /* 80033C5C 00030B9C 38 00 00 15 */ li r0, 0x15 /* 80033C60 00030BA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80033C64 00030BA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -1585,7 +527,7 @@ dSv_player_item_record_c_NS_addBottleNum: /* 80033FD0 00030F10 38 04 00 0B */ addi r0, r4, 0xb /* 80033FD4 00030F14 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80033FD8 00030F18 38 A0 00 01 */ li r5, 1 -/* 80033FDC 00030F1C 4B FF F0 55 */ bl dSv_player_item_c_NS_getItem +/* 80033FDC 00030F1C 4B FF F0 55 */ bl getItem__17dSv_player_item_cCFib /* 80033FE0 00030F20 2C 1E 00 00 */ cmpwi r30, 0 /* 80033FE4 00030F24 40 80 00 10 */ bge lbl_80033FF4 /* 80033FE8 00030F28 38 00 00 00 */ li r0, 0 @@ -2147,17 +1089,17 @@ dSv_player_c_NS_init: /* 800346B4 000315F4 7C 7F 1B 78 */ mr r31, r3 /* 800346B8 000315F8 4B FF E2 A1 */ bl init__21dSv_player_status_a_cFv /* 800346BC 000315FC 38 7F 00 28 */ addi r3, r31, 0x28 -/* 800346C0 00031600 4B FF E4 91 */ bl dSv_player_status_b_c_NS_init +/* 800346C0 00031600 4B FF E4 91 */ bl init__21dSv_player_status_b_cFv /* 800346C4 00031604 38 7F 00 40 */ addi r3, r31, 0x40 -/* 800346C8 00031608 4B FF E5 45 */ bl dSv_horse_place_c_NS_init +/* 800346C8 00031608 4B FF E5 45 */ bl init__17dSv_horse_place_cFv /* 800346CC 0003160C 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800346D0 00031610 4B FF E5 F9 */ bl dSv_player_return_place_c_NS_init +/* 800346D0 00031610 4B FF E5 F9 */ bl init__25dSv_player_return_place_cFv /* 800346D4 00031614 38 7F 00 64 */ addi r3, r31, 0x64 -/* 800346D8 00031618 4B FF E6 89 */ bl dSv_player_field_last_stay_info_c_NS_init +/* 800346D8 00031618 4B FF E6 89 */ bl init__33dSv_player_field_last_stay_info_cFv /* 800346DC 0003161C 38 7F 00 80 */ addi r3, r31, 0x80 -/* 800346E0 00031620 4B FF E7 D1 */ bl dSv_player_last_mark_info_c_NS_init +/* 800346E0 00031620 4B FF E7 D1 */ bl init__27dSv_player_last_mark_info_cFv /* 800346E4 00031624 38 7F 00 9C */ addi r3, r31, 0x9c -/* 800346E8 00031628 4B FF E8 A9 */ bl dSv_player_item_c_NS_init +/* 800346E8 00031628 4B FF E8 A9 */ bl init__17dSv_player_item_cFv /* 800346EC 0003162C 38 7F 00 CC */ addi r3, r31, 0xcc /* 800346F0 00031630 4B FF F7 51 */ bl dSv_player_get_item_c_NS_init /* 800346F4 00031634 38 7F 00 EC */ addi r3, r31, 0xec @@ -3539,14 +2481,14 @@ lbl_80035834: /* 8003585C 0003279C 7F 23 CB 78 */ mr r3, r25 /* 80035860 000327A0 38 80 00 01 */ li r4, 1 /* 80035864 000327A4 38 A0 00 01 */ li r5, 1 -/* 80035868 000327A8 4B FF D7 C9 */ bl dSv_player_item_c_NS_getItem +/* 80035868 000327A8 4B FF D7 C9 */ bl getItem__17dSv_player_item_cCFib /* 8003586C 000327AC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80035870 000327B0 28 00 00 FF */ cmplwi r0, 0xff /* 80035874 000327B4 40 82 00 34 */ bne lbl_800358A8 /* 80035878 000327B8 7F 23 CB 78 */ mr r3, r25 /* 8003587C 000327BC 38 80 00 01 */ li r4, 1 /* 80035880 000327C0 38 A0 00 48 */ li r5, 0x48 -/* 80035884 000327C4 4B FF D7 35 */ bl dSv_player_item_c_NS_setItem +/* 80035884 000327C4 4B FF D7 35 */ bl setItem__17dSv_player_item_cFiUc /* 80035888 000327C8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8003588C 000327CC 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l /* 80035890 000327D0 A3 E4 00 08 */ lhz r31, 8(r4) @@ -3629,7 +2571,7 @@ lbl_800359A0: /* 800359B4 000328F4 38 63 00 9C */ addi r3, r3, 0x9c /* 800359B8 000328F8 38 80 00 01 */ li r4, 1 /* 800359BC 000328FC 38 A0 00 FF */ li r5, 0xff -/* 800359C0 00032900 4B FF D5 F9 */ bl dSv_player_item_c_NS_setItem +/* 800359C0 00032900 4B FF D5 F9 */ bl setItem__17dSv_player_item_cFiUc /* 800359C4 00032904 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 800359C8 00032908 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800359CC 0003290C B3 E3 00 08 */ sth r31, 8(r3) @@ -3711,40 +2653,40 @@ lbl_80035AC4: /* 80035ADC 00032A1C 7F C3 F3 78 */ mr r3, r30 /* 80035AE0 00032A20 38 80 00 09 */ li r4, 9 /* 80035AE4 00032A24 38 A0 00 01 */ li r5, 1 -/* 80035AE8 00032A28 4B FF D5 49 */ bl dSv_player_item_c_NS_getItem +/* 80035AE8 00032A28 4B FF D5 49 */ bl getItem__17dSv_player_item_cCFib /* 80035AEC 00032A2C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80035AF0 00032A30 28 00 00 47 */ cmplwi r0, 0x47 /* 80035AF4 00032A34 40 82 00 24 */ bne lbl_80035B18 /* 80035AF8 00032A38 7F C3 F3 78 */ mr r3, r30 /* 80035AFC 00032A3C 38 80 00 0A */ li r4, 0xa /* 80035B00 00032A40 38 A0 00 47 */ li r5, 0x47 -/* 80035B04 00032A44 4B FF D4 B5 */ bl dSv_player_item_c_NS_setItem +/* 80035B04 00032A44 4B FF D4 B5 */ bl setItem__17dSv_player_item_cFiUc /* 80035B08 00032A48 7F C3 F3 78 */ mr r3, r30 /* 80035B0C 00032A4C 38 80 00 09 */ li r4, 9 /* 80035B10 00032A50 38 A0 00 FF */ li r5, 0xff -/* 80035B14 00032A54 4B FF D4 A5 */ bl dSv_player_item_c_NS_setItem +/* 80035B14 00032A54 4B FF D4 A5 */ bl setItem__17dSv_player_item_cFiUc lbl_80035B18: /* 80035B18 00032A58 7F C3 F3 78 */ mr r3, r30 /* 80035B1C 00032A5C 38 80 00 09 */ li r4, 9 /* 80035B20 00032A60 38 A0 00 01 */ li r5, 1 -/* 80035B24 00032A64 4B FF D5 0D */ bl dSv_player_item_c_NS_getItem +/* 80035B24 00032A64 4B FF D5 0D */ bl getItem__17dSv_player_item_cCFib /* 80035B28 00032A68 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80035B2C 00032A6C 28 00 00 44 */ cmplwi r0, 0x44 /* 80035B30 00032A70 40 82 00 30 */ bne lbl_80035B60 /* 80035B34 00032A74 7F C3 F3 78 */ mr r3, r30 /* 80035B38 00032A78 38 80 00 0A */ li r4, 0xa /* 80035B3C 00032A7C 38 A0 00 01 */ li r5, 1 -/* 80035B40 00032A80 4B FF D4 F1 */ bl dSv_player_item_c_NS_getItem +/* 80035B40 00032A80 4B FF D4 F1 */ bl getItem__17dSv_player_item_cCFib /* 80035B44 00032A84 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80035B48 00032A88 28 00 00 47 */ cmplwi r0, 0x47 /* 80035B4C 00032A8C 40 82 00 14 */ bne lbl_80035B60 /* 80035B50 00032A90 7F C3 F3 78 */ mr r3, r30 /* 80035B54 00032A94 38 80 00 09 */ li r4, 9 /* 80035B58 00032A98 38 A0 00 FF */ li r5, 0xff -/* 80035B5C 00032A9C 4B FF D4 5D */ bl dSv_player_item_c_NS_setItem +/* 80035B5C 00032A9C 4B FF D4 5D */ bl setItem__17dSv_player_item_cFiUc lbl_80035B60: /* 80035B60 00032AA0 7F C3 F3 78 */ mr r3, r30 -/* 80035B64 00032AA4 4B FF D7 95 */ bl dSv_player_item_c_NS_setLineUpItem +/* 80035B64 00032AA4 4B FF D7 95 */ bl setLineUpItem__17dSv_player_item_cFv /* 80035B68 00032AA8 38 7F 01 E0 */ addi r3, r31, 0x1e0 /* 80035B6C 00032AAC 4B FF EB 29 */ bl dSv_player_config_c_NS_getVibration /* 80035B70 00032AB0 7C 64 1B 78 */ mr r4, r3 @@ -3803,11 +2745,11 @@ dSv_info_c_NS_initdata_to_card: /* 80035C28 00032B68 38 61 01 BC */ addi r3, r1, 0x1bc /* 80035C2C 00032B6C 3C 80 80 38 */ lis r4, lbl_80379234@ha /* 80035C30 00032B70 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80035C34 00032B74 48 33 2E F9 */ bl func_80368B2C +/* 80035C34 00032B74 48 33 2E F9 */ bl strcpy /* 80035C38 00032B78 38 61 01 CD */ addi r3, r1, 0x1cd /* 80035C3C 00032B7C 3C 80 80 38 */ lis r4, lbl_80379234@ha /* 80035C40 00032B80 38 84 92 34 */ addi r4, r4, lbl_80379234@l -/* 80035C44 00032B84 48 33 2E E9 */ bl func_80368B2C +/* 80035C44 00032B84 48 33 2E E9 */ bl strcpy /* 80035C48 00032B88 7F E3 FB 78 */ mr r3, r31 /* 80035C4C 00032B8C 38 81 00 08 */ addi r4, r1, 8 /* 80035C50 00032B90 38 A0 09 58 */ li r5, 0x958 diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index 656820fe0b..52152cbe63 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -272,17 +272,17 @@ dStage_startStage_c_NS_set: /* 800241A0 000210E0 7C 08 02 A6 */ mflr r0 /* 800241A4 000210E4 90 01 00 24 */ stw r0, 0x24(r1) /* 800241A8 000210E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800241AC 000210EC 48 33 E0 2D */ bl func_803621D8 +/* 800241AC 000210EC 48 33 E0 2D */ bl _savegpr_28 /* 800241B0 000210F0 7C 7C 1B 78 */ mr r28, r3 /* 800241B4 000210F4 7C BD 2B 78 */ mr r29, r5 /* 800241B8 000210F8 7C DE 33 78 */ mr r30, r6 /* 800241BC 000210FC 7C FF 3B 78 */ mr r31, r7 -/* 800241C0 00021100 48 34 49 6D */ bl func_80368B2C +/* 800241C0 00021100 48 34 49 6D */ bl strcpy /* 800241C4 00021104 9B BC 00 0A */ stb r29, 0xa(r28) /* 800241C8 00021108 B3 DC 00 08 */ sth r30, 8(r28) /* 800241CC 0002110C 9B FC 00 0B */ stb r31, 0xb(r28) /* 800241D0 00021110 39 61 00 20 */ addi r11, r1, 0x20 -/* 800241D4 00021114 48 33 E0 51 */ bl func_80362224 +/* 800241D4 00021114 48 33 E0 51 */ bl _restgpr_28 /* 800241D8 00021118 80 01 00 24 */ lwz r0, 0x24(r1) /* 800241DC 0002111C 7C 08 03 A6 */ mtlr r0 /* 800241E0 00021120 38 21 00 20 */ addi r1, r1, 0x20 @@ -294,7 +294,7 @@ dStage_roomControl_c_NS_init: /* 800241EC 0002112C 7C 08 02 A6 */ mflr r0 /* 800241F0 00021130 90 01 00 24 */ stw r0, 0x24(r1) /* 800241F4 00021134 39 61 00 20 */ addi r11, r1, 0x20 -/* 800241F8 00021138 48 33 DF E1 */ bl func_803621D8 +/* 800241F8 00021138 48 33 DF E1 */ bl _savegpr_28 /* 800241FC 0002113C 38 80 FF FF */ li r4, -1 /* 80024200 00021140 98 8D 87 E4 */ stb r4, lbl_80450D64-_SDA_BASE_(r13) /* 80024204 00021144 98 8D 87 E5 */ stb r4, lbl_80450D65-_SDA_BASE_(r13) @@ -374,7 +374,7 @@ lbl_800242C0: /* 8002431C 0002125C 90 0D 87 F0 */ stw r0, lbl_80450D70-_SDA_BASE_(r13) lbl_80024320: /* 80024320 00021260 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024324 00021264 48 33 DF 01 */ bl func_80362224 +/* 80024324 00021264 48 33 DF 01 */ bl _restgpr_28 /* 80024328 00021268 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002432C 0002126C 7C 08 03 A6 */ mtlr r0 /* 80024330 00021270 38 21 00 20 */ addi r1, r1, 0x20 @@ -683,7 +683,7 @@ dStage_roomControl_c_NS_zoneCountCheck: /* 80024720 00021660 7C 08 02 A6 */ mflr r0 /* 80024724 00021664 90 01 00 24 */ stw r0, 0x24(r1) /* 80024728 00021668 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002472C 0002166C 48 33 DA AD */ bl func_803621D8 +/* 8002472C 0002166C 48 33 DA AD */ bl _savegpr_28 /* 80024730 00021670 7C 9C 23 78 */ mr r28, r4 /* 80024734 00021674 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 80024738 00021678 38 03 60 94 */ addi r0, r3, lbl_803F6094@l @@ -748,7 +748,7 @@ lbl_8002480C: /* 8002481C 0002175C 7F 83 E3 78 */ mr r3, r28 /* 80024820 00021760 4B FF FB C9 */ bl dStage_roomControl_c_NS_setStayNo /* 80024824 00021764 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024828 00021768 48 33 D9 FD */ bl func_80362224 +/* 80024828 00021768 48 33 D9 FD */ bl _restgpr_28 /* 8002482C 0002176C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80024830 00021770 7C 08 03 A6 */ mtlr r0 /* 80024834 00021774 38 21 00 20 */ addi r1, r1, 0x20 @@ -791,7 +791,7 @@ dStage_roomControl_c_NS_destroyMemoryBlock: /* 800248AC 000217EC 7C 08 02 A6 */ mflr r0 /* 800248B0 000217F0 90 01 00 24 */ stw r0, 0x24(r1) /* 800248B4 000217F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800248B8 000217F8 48 33 D9 21 */ bl func_803621D8 +/* 800248B8 000217F8 48 33 D9 21 */ bl _savegpr_28 /* 800248BC 000217FC 3B 80 00 00 */ li r28, 0 /* 800248C0 00021800 3B E0 00 00 */ li r31, 0 /* 800248C4 00021804 3C 60 80 3A */ lis r3, lbl_803A6920@ha @@ -809,7 +809,7 @@ lbl_800248E4: /* 800248EC 0002182C 3B FF 00 04 */ addi r31, r31, 4 /* 800248F0 00021830 41 80 FF E0 */ blt lbl_800248D0 /* 800248F4 00021834 39 61 00 20 */ addi r11, r1, 0x20 -/* 800248F8 00021838 48 33 D9 2D */ bl func_80362224 +/* 800248F8 00021838 48 33 D9 2D */ bl _restgpr_28 /* 800248FC 0002183C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80024900 00021840 7C 08 03 A6 */ mtlr r0 /* 80024904 00021844 38 21 00 20 */ addi r1, r1, 0x20 @@ -845,7 +845,7 @@ dStage_roomControl_c_NS_resetArchiveBank: /* 80024958 00021898 7C 08 02 A6 */ mflr r0 /* 8002495C 0002189C 90 01 00 24 */ stw r0, 0x24(r1) /* 80024960 000218A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024964 000218A4 48 33 D8 75 */ bl func_803621D8 +/* 80024964 000218A4 48 33 D8 75 */ bl _savegpr_28 /* 80024968 000218A8 7C 7D 1B 78 */ mr r29, r3 /* 8002496C 000218AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80024970 000218B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -898,7 +898,7 @@ lbl_80024A10: /* 80024A18 00021958 38 60 00 01 */ li r3, 1 lbl_80024A1C: /* 80024A1C 0002195C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024A20 00021960 48 33 D8 05 */ bl func_80362224 +/* 80024A20 00021960 48 33 D8 05 */ bl _restgpr_28 /* 80024A24 00021964 80 01 00 24 */ lwz r0, 0x24(r1) /* 80024A28 00021968 7C 08 03 A6 */ mtlr r0 /* 80024A2C 0002196C 38 21 00 20 */ addi r1, r1, 0x20 @@ -950,7 +950,7 @@ dStage_roomControl_c_NS_roomDzs_c_NS_remove: /* 80024AC0 00021A00 7C 08 02 A6 */ mflr r0 /* 80024AC4 00021A04 90 01 00 24 */ stw r0, 0x24(r1) /* 80024AC8 00021A08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024ACC 00021A0C 48 33 D7 0D */ bl func_803621D8 +/* 80024ACC 00021A0C 48 33 D7 0D */ bl _savegpr_28 /* 80024AD0 00021A10 7C 7C 1B 78 */ mr r28, r3 /* 80024AD4 00021A14 88 03 00 00 */ lbz r0, 0(r3) /* 80024AD8 00021A18 28 00 00 00 */ cmplwi r0, 0 @@ -979,7 +979,7 @@ lbl_80024B0C: /* 80024B28 00021A68 98 1C 00 00 */ stb r0, 0(r28) lbl_80024B2C: /* 80024B2C 00021A6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024B30 00021A70 48 33 D6 F5 */ bl func_80362224 +/* 80024B30 00021A70 48 33 D6 F5 */ bl _restgpr_28 /* 80024B34 00021A74 80 01 00 24 */ lwz r0, 0x24(r1) /* 80024B38 00021A78 7C 08 03 A6 */ mtlr r0 /* 80024B3C 00021A7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -991,7 +991,7 @@ dStage_roomControl_c_NS_roomDzs_c_NS_add: /* 80024B48 00021A88 7C 08 02 A6 */ mflr r0 /* 80024B4C 00021A8C 90 01 00 34 */ stw r0, 0x34(r1) /* 80024B50 00021A90 39 61 00 30 */ addi r11, r1, 0x30 -/* 80024B54 00021A94 48 33 D6 85 */ bl func_803621D8 +/* 80024B54 00021A94 48 33 D6 85 */ bl _savegpr_28 /* 80024B58 00021A98 7C A6 2B 78 */ mr r6, r5 /* 80024B5C 00021A9C 88 03 00 00 */ lbz r0, 0(r3) /* 80024B60 00021AA0 28 00 00 00 */ cmplwi r0, 0 @@ -1039,7 +1039,7 @@ lbl_80024C00: /* 80024C00 00021B40 7C 7D F0 2E */ lwzx r3, r29, r30 lbl_80024C04: /* 80024C04 00021B44 39 61 00 30 */ addi r11, r1, 0x30 -/* 80024C08 00021B48 48 33 D6 1D */ bl func_80362224 +/* 80024C08 00021B48 48 33 D6 1D */ bl _restgpr_28 /* 80024C0C 00021B4C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80024C10 00021B50 7C 08 03 A6 */ mtlr r0 /* 80024C14 00021B54 38 21 00 30 */ addi r1, r1, 0x30 @@ -1340,7 +1340,7 @@ lbl_80024FE8: /* 80025018 00021F58 7C 08 02 A6 */ mflr r0 /* 8002501C 00021F5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80025020 00021F60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025024 00021F64 48 33 D1 B5 */ bl func_803621D8 +/* 80025024 00021F64 48 33 D1 B5 */ bl _savegpr_28 /* 80025028 00021F68 7C 7D 1B 78 */ mr r29, r3 /* 8002502C 00021F6C 7C BC 2B 78 */ mr r28, r5 /* 80025030 00021F70 38 84 00 04 */ addi r4, r4, 4 @@ -1514,7 +1514,7 @@ lbl_8002529C: /* 8002529C 000221DC 38 60 00 01 */ li r3, 1 lbl_800252A0: /* 800252A0 000221E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800252A4 000221E4 48 33 CF 81 */ bl func_80362224 +/* 800252A4 000221E4 48 33 CF 81 */ bl _restgpr_28 /* 800252A8 000221E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800252AC 000221EC 7C 08 03 A6 */ mtlr r0 /* 800252B0 000221F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1910,7 +1910,7 @@ lbl_800257BC: /* 80025870 000227B0 7C 08 02 A6 */ mflr r0 /* 80025874 000227B4 90 01 00 24 */ stw r0, 0x24(r1) /* 80025878 000227B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002587C 000227BC 48 33 C9 59 */ bl func_803621D4 +/* 8002587C 000227BC 48 33 C9 59 */ bl _savegpr_27 /* 80025880 000227C0 7C 7B 1B 78 */ mr r27, r3 /* 80025884 000227C4 7C 9C 23 78 */ mr r28, r4 /* 80025888 000227C8 83 C4 00 08 */ lwz r30, 8(r4) @@ -1963,7 +1963,7 @@ lbl_80025930: /* 80025938 00022878 41 80 FF 64 */ blt lbl_8002589C /* 8002593C 0002287C 38 60 00 01 */ li r3, 1 /* 80025940 00022880 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025944 00022884 48 33 C8 DD */ bl func_80362220 +/* 80025944 00022884 48 33 C8 DD */ bl _restgpr_27 /* 80025948 00022888 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002594C 0002288C 7C 08 03 A6 */ mtlr r0 /* 80025950 00022890 38 21 00 20 */ addi r1, r1, 0x20 @@ -1972,7 +1972,7 @@ lbl_80025930: /* 8002595C 0002289C 7C 08 02 A6 */ mflr r0 /* 80025960 000228A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80025964 000228A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025968 000228A8 48 33 C8 71 */ bl func_803621D8 +/* 80025968 000228A8 48 33 C8 71 */ bl _savegpr_28 /* 8002596C 000228AC 7C 7C 1B 78 */ mr r28, r3 /* 80025970 000228B0 7C 9D 23 78 */ mr r29, r4 /* 80025974 000228B4 83 E4 00 08 */ lwz r31, 8(r4) @@ -2022,7 +2022,7 @@ lbl_80025A10: /* 80025A18 00022958 41 80 FF 68 */ blt lbl_80025980 /* 80025A1C 0002295C 38 60 00 01 */ li r3, 1 /* 80025A20 00022960 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025A24 00022964 48 33 C8 01 */ bl func_80362224 +/* 80025A24 00022964 48 33 C8 01 */ bl _restgpr_28 /* 80025A28 00022968 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025A2C 0002296C 7C 08 03 A6 */ mtlr r0 /* 80025A30 00022970 38 21 00 20 */ addi r1, r1, 0x20 @@ -2034,7 +2034,7 @@ dStage_actorInit: /* 80025A3C 0002297C 7C 08 02 A6 */ mflr r0 /* 80025A40 00022980 90 01 00 24 */ stw r0, 0x24(r1) /* 80025A44 00022984 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025A48 00022988 48 33 C7 8D */ bl func_803621D4 +/* 80025A48 00022988 48 33 C7 8D */ bl _savegpr_27 /* 80025A4C 0002298C 7C 7B 1B 78 */ mr r27, r3 /* 80025A50 00022990 7C 9C 23 78 */ mr r28, r4 /* 80025A54 00022994 83 C4 00 08 */ lwz r30, 8(r4) @@ -2087,7 +2087,7 @@ lbl_80025AFC: /* 80025B04 00022A44 41 80 FF 64 */ blt lbl_80025A68 /* 80025B08 00022A48 38 60 00 01 */ li r3, 1 /* 80025B0C 00022A4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025B10 00022A50 48 33 C7 11 */ bl func_80362220 +/* 80025B10 00022A50 48 33 C7 11 */ bl _restgpr_27 /* 80025B14 00022A54 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025B18 00022A58 7C 08 03 A6 */ mtlr r0 /* 80025B1C 00022A5C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2096,7 +2096,7 @@ lbl_80025AFC: /* 80025B28 00022A68 7C 08 02 A6 */ mflr r0 /* 80025B2C 00022A6C 90 01 00 24 */ stw r0, 0x24(r1) /* 80025B30 00022A70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025B34 00022A74 48 33 C6 A1 */ bl func_803621D4 +/* 80025B34 00022A74 48 33 C6 A1 */ bl _savegpr_27 /* 80025B38 00022A78 7C 7B 1B 78 */ mr r27, r3 /* 80025B3C 00022A7C 7C 9C 23 78 */ mr r28, r4 /* 80025B40 00022A80 83 C4 00 08 */ lwz r30, 8(r4) @@ -2144,7 +2144,7 @@ lbl_80025BD4: /* 80025BDC 00022B1C 41 80 FF 78 */ blt lbl_80025B54 /* 80025BE0 00022B20 38 60 00 01 */ li r3, 1 /* 80025BE4 00022B24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025BE8 00022B28 48 33 C6 39 */ bl func_80362220 +/* 80025BE8 00022B28 48 33 C6 39 */ bl _restgpr_27 /* 80025BEC 00022B2C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025BF0 00022B30 7C 08 03 A6 */ mtlr r0 /* 80025BF4 00022B34 38 21 00 20 */ addi r1, r1, 0x20 @@ -2156,7 +2156,7 @@ dStage_tgscInfoInit: /* 80025C00 00022B40 7C 08 02 A6 */ mflr r0 /* 80025C04 00022B44 90 01 00 24 */ stw r0, 0x24(r1) /* 80025C08 00022B48 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025C0C 00022B4C 48 33 C5 CD */ bl func_803621D8 +/* 80025C0C 00022B4C 48 33 C5 CD */ bl _savegpr_28 /* 80025C10 00022B50 7C 7C 1B 78 */ mr r28, r3 /* 80025C14 00022B54 7C 9D 23 78 */ mr r29, r4 /* 80025C18 00022B58 83 E4 00 08 */ lwz r31, 8(r4) @@ -2206,7 +2206,7 @@ lbl_80025CB4: /* 80025CBC 00022BFC 41 80 FF 68 */ blt lbl_80025C24 /* 80025CC0 00022C00 38 60 00 01 */ li r3, 1 /* 80025CC4 00022C04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025CC8 00022C08 48 33 C5 5D */ bl func_80362224 +/* 80025CC8 00022C08 48 33 C5 5D */ bl _restgpr_28 /* 80025CCC 00022C0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025CD0 00022C10 7C 08 03 A6 */ mtlr r0 /* 80025CD4 00022C14 38 21 00 20 */ addi r1, r1, 0x20 @@ -2218,7 +2218,7 @@ dStage_doorInfoInit: /* 80025CE0 00022C20 7C 08 02 A6 */ mflr r0 /* 80025CE4 00022C24 90 01 00 24 */ stw r0, 0x24(r1) /* 80025CE8 00022C28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025CEC 00022C2C 48 33 C4 ED */ bl func_803621D8 +/* 80025CEC 00022C2C 48 33 C4 ED */ bl _savegpr_28 /* 80025CF0 00022C30 7C 7C 1B 78 */ mr r28, r3 /* 80025CF4 00022C34 7C 9D 23 78 */ mr r29, r4 /* 80025CF8 00022C38 83 E4 00 08 */ lwz r31, 8(r4) @@ -2263,7 +2263,7 @@ lbl_80025D80: /* 80025D88 00022CC8 41 80 FF 7C */ blt lbl_80025D04 /* 80025D8C 00022CCC 38 60 00 01 */ li r3, 1 /* 80025D90 00022CD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025D94 00022CD4 48 33 C4 91 */ bl func_80362224 +/* 80025D94 00022CD4 48 33 C4 91 */ bl _restgpr_28 /* 80025D98 00022CD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025D9C 00022CDC 7C 08 03 A6 */ mtlr r0 /* 80025DA0 00022CE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2343,7 +2343,7 @@ lbl_80025E58: /* 80025EA8 00022DE8 7C 08 02 A6 */ mflr r0 /* 80025EAC 00022DEC 90 01 00 24 */ stw r0, 0x24(r1) /* 80025EB0 00022DF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025EB4 00022DF4 48 33 C3 21 */ bl func_803621D4 +/* 80025EB4 00022DF4 48 33 C3 21 */ bl _savegpr_27 /* 80025EB8 00022DF8 7C 7B 1B 78 */ mr r27, r3 /* 80025EBC 00022DFC 3B C4 00 04 */ addi r30, r4, 4 /* 80025EC0 00022E00 83 A4 00 08 */ lwz r29, 8(r4) @@ -2377,7 +2377,7 @@ lbl_80025F1C: /* 80025F24 00022E64 41 80 FF C0 */ blt lbl_80025EE4 /* 80025F28 00022E68 38 60 00 01 */ li r3, 1 /* 80025F2C 00022E6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025F30 00022E70 48 33 C2 F1 */ bl func_80362220 +/* 80025F30 00022E70 48 33 C2 F1 */ bl _restgpr_27 /* 80025F34 00022E74 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025F38 00022E78 7C 08 03 A6 */ mtlr r0 /* 80025F3C 00022E7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2399,7 +2399,7 @@ lbl_80025F1C: /* 80025F7C 00022EBC 7C 08 02 A6 */ mflr r0 /* 80025F80 00022EC0 90 01 00 24 */ stw r0, 0x24(r1) /* 80025F84 00022EC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025F88 00022EC8 48 33 C2 4D */ bl func_803621D4 +/* 80025F88 00022EC8 48 33 C2 4D */ bl _savegpr_27 /* 80025F8C 00022ECC 7C 7B 1B 78 */ mr r27, r3 /* 80025F90 00022ED0 3B C4 00 04 */ addi r30, r4, 4 /* 80025F94 00022ED4 83 A4 00 08 */ lwz r29, 8(r4) @@ -2433,7 +2433,7 @@ lbl_80025FF0: /* 80025FF8 00022F38 41 80 FF C0 */ blt lbl_80025FB8 /* 80025FFC 00022F3C 38 60 00 01 */ li r3, 1 /* 80026000 00022F40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026004 00022F44 48 33 C2 1D */ bl func_80362220 +/* 80026004 00022F44 48 33 C2 1D */ bl _restgpr_27 /* 80026008 00022F48 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002600C 00022F4C 7C 08 03 A6 */ mtlr r0 /* 80026010 00022F50 38 21 00 20 */ addi r1, r1, 0x20 @@ -2901,7 +2901,7 @@ lbl_800265C4: /* 800266A8 000235E8 7C 08 02 A6 */ mflr r0 /* 800266AC 000235EC 90 01 00 24 */ stw r0, 0x24(r1) /* 800266B0 000235F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800266B4 000235F4 48 33 BB 25 */ bl func_803621D8 +/* 800266B4 000235F4 48 33 BB 25 */ bl _savegpr_28 /* 800266B8 000235F8 7C 7C 1B 78 */ mr r28, r3 /* 800266BC 000235FC 7C 9D 23 78 */ mr r29, r4 /* 800266C0 00023600 7C BE 2B 78 */ mr r30, r5 @@ -2918,7 +2918,7 @@ lbl_800265C4: /* 800266EC 0002362C 4B FF F3 4D */ bl dStage_actorInit /* 800266F0 00023630 38 60 00 01 */ li r3, 1 /* 800266F4 00023634 39 61 00 20 */ addi r11, r1, 0x20 -/* 800266F8 00023638 48 33 BB 2D */ bl func_80362224 +/* 800266F8 00023638 48 33 BB 2D */ bl _restgpr_28 /* 800266FC 0002363C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80026700 00023640 7C 08 03 A6 */ mtlr r0 /* 80026704 00023644 38 21 00 20 */ addi r1, r1, 0x20 @@ -2949,7 +2949,7 @@ lbl_800265C4: /* 80026768 000236A8 7C 08 02 A6 */ mflr r0 /* 8002676C 000236AC 90 01 00 24 */ stw r0, 0x24(r1) /* 80026770 000236B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026774 000236B4 48 33 BA 61 */ bl func_803621D4 +/* 80026774 000236B4 48 33 BA 61 */ bl _savegpr_27 /* 80026778 000236B8 7C 7B 1B 78 */ mr r27, r3 /* 8002677C 000236BC 7C 9C 23 78 */ mr r28, r4 /* 80026780 000236C0 7C BD 2B 78 */ mr r29, r5 @@ -2970,7 +2970,7 @@ lbl_800265C4: /* 800267BC 000236FC 4B FF D7 C9 */ bl dStage_KeepDoorInfoProc /* 800267C0 00023700 38 60 00 01 */ li r3, 1 /* 800267C4 00023704 39 61 00 20 */ addi r11, r1, 0x20 -/* 800267C8 00023708 48 33 BA 59 */ bl func_80362220 +/* 800267C8 00023708 48 33 BA 59 */ bl _restgpr_27 /* 800267CC 0002370C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800267D0 00023710 7C 08 03 A6 */ mtlr r0 /* 800267D4 00023714 38 21 00 20 */ addi r1, r1, 0x20 @@ -2979,7 +2979,7 @@ lbl_800265C4: /* 800267E0 00023720 7C 08 02 A6 */ mflr r0 /* 800267E4 00023724 90 01 00 24 */ stw r0, 0x24(r1) /* 800267E8 00023728 39 61 00 20 */ addi r11, r1, 0x20 -/* 800267EC 0002372C 48 33 B9 ED */ bl func_803621D8 +/* 800267EC 0002372C 48 33 B9 ED */ bl _savegpr_28 /* 800267F0 00023730 7C 7C 1B 78 */ mr r28, r3 /* 800267F4 00023734 7C 9D 23 78 */ mr r29, r4 /* 800267F8 00023738 7C BE 2B 78 */ mr r30, r5 @@ -2996,7 +2996,7 @@ lbl_800265C4: /* 80026824 00023764 4B FF F4 B9 */ bl dStage_doorInfoInit /* 80026828 00023768 38 60 00 01 */ li r3, 1 /* 8002682C 0002376C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026830 00023770 48 33 B9 F5 */ bl func_80362224 +/* 80026830 00023770 48 33 B9 F5 */ bl _restgpr_28 /* 80026834 00023774 80 01 00 24 */ lwz r0, 0x24(r1) /* 80026838 00023778 7C 08 03 A6 */ mtlr r0 /* 8002683C 0002377C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3111,7 +3111,7 @@ layerTableLoader: /* 800269B8 000238F8 7C 08 02 A6 */ mflr r0 /* 800269BC 000238FC 90 01 00 24 */ stw r0, 0x24(r1) /* 800269C0 00023900 39 61 00 20 */ addi r11, r1, 0x20 -/* 800269C4 00023904 48 33 B8 15 */ bl func_803621D8 +/* 800269C4 00023904 48 33 B8 15 */ bl _savegpr_28 /* 800269C8 00023908 7C 7E 1B 78 */ mr r30, r3 /* 800269CC 0002390C 7C 9F 23 78 */ mr r31, r4 /* 800269D0 00023910 2C 05 FF FF */ cmpwi r5, -1 @@ -3183,7 +3183,7 @@ lbl_80026AA4: /* 80026ACC 00023A0C 4B FF F5 E9 */ bl dStage_dt_c_decode lbl_80026AD0: /* 80026AD0 00023A10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026AD4 00023A14 48 33 B7 51 */ bl func_80362224 +/* 80026AD4 00023A14 48 33 B7 51 */ bl _restgpr_28 /* 80026AD8 00023A18 80 01 00 24 */ lwz r0, 0x24(r1) /* 80026ADC 00023A1C 7C 08 03 A6 */ mtlr r0 /* 80026AE0 00023A20 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 40282109af..9cc3c40632 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -9,7 +9,7 @@ dTimer_c_NS__create: /* 8025CA10 00259950 7C 08 02 A6 */ mflr r0 /* 8025CA14 00259954 90 01 00 24 */ stw r0, 0x24(r1) /* 8025CA18 00259958 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025CA1C 0025995C 48 10 57 BD */ bl func_803621D8 +/* 8025CA1C 0025995C 48 10 57 BD */ bl _savegpr_28 /* 8025CA20 00259960 7C 7F 1B 78 */ mr r31, r3 /* 8025CA24 00259964 38 7F 01 08 */ addi r3, r31, 0x108 /* 8025CA28 00259968 3C 80 80 3A */ lis r4, lbl_8039A3D8@ha @@ -338,7 +338,7 @@ lbl_8025CE54: /* 8025CEE8 00259E28 38 60 00 04 */ li r3, 4 lbl_8025CEEC: /* 8025CEEC 00259E2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025CEF0 00259E30 48 10 53 35 */ bl func_80362224 +/* 8025CEF0 00259E30 48 10 53 35 */ bl _restgpr_28 /* 8025CEF4 00259E34 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025CEF8 00259E38 7C 08 03 A6 */ mtlr r0 /* 8025CEFC 00259E3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2539,7 +2539,7 @@ dDlst_TimerScrnDraw_c_NS_changeNumberTexture: /* 8025EE28 0025BD68 7C 08 02 A6 */ mflr r0 /* 8025EE2C 0025BD6C 90 01 00 24 */ stw r0, 0x24(r1) /* 8025EE30 0025BD70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025EE34 0025BD74 48 10 33 A5 */ bl func_803621D8 +/* 8025EE34 0025BD74 48 10 33 A5 */ bl _savegpr_28 /* 8025EE38 0025BD78 7C 7C 1B 78 */ mr r28, r3 /* 8025EE3C 0025BD7C 7C 9D 23 78 */ mr r29, r4 /* 8025EE40 0025BD80 7C BE 2B 79 */ or. r30, r5, r5 @@ -2574,7 +2574,7 @@ lbl_8025EE54: /* 8025EEAC 0025BDEC 7D 89 03 A6 */ mtctr r12 /* 8025EEB0 0025BDF0 4E 80 04 21 */ bctrl /* 8025EEB4 0025BDF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025EEB8 0025BDF8 48 10 33 6D */ bl func_80362224 +/* 8025EEB8 0025BDF8 48 10 33 6D */ bl _restgpr_28 /* 8025EEBC 0025BDFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025EEC0 0025BE00 7C 08 03 A6 */ mtlr r0 /* 8025EEC4 0025BE04 38 21 00 20 */ addi r1, r1, 0x20 @@ -3927,7 +3927,7 @@ dDlst_TimerScrnDraw_c_NS_createGetIn: /* 80260248 0025D188 4E 80 04 21 */ bctrl /* 8026024C 0025D18C 48 0A 04 0D */ bl J2DTextBox_NS_getStringPtr /* 80260250 0025D190 38 81 00 40 */ addi r4, r1, 0x40 -/* 80260254 0025D194 48 10 88 D9 */ bl func_80368B2C +/* 80260254 0025D194 48 10 88 D9 */ bl strcpy /* 80260258 0025D198 80 7E 00 08 */ lwz r3, 8(r30) /* 8026025C 0025D19C 3C 80 74 5F */ lis r4, 0x745F696E@ha /* 80260260 0025D1A0 38 C4 69 6E */ addi r6, r4, 0x745F696E@l @@ -3938,7 +3938,7 @@ dDlst_TimerScrnDraw_c_NS_createGetIn: /* 80260274 0025D1B4 4E 80 04 21 */ bctrl /* 80260278 0025D1B8 48 0A 03 E1 */ bl J2DTextBox_NS_getStringPtr /* 8026027C 0025D1BC 38 81 00 40 */ addi r4, r1, 0x40 -/* 80260280 0025D1C0 48 10 88 AD */ bl func_80368B2C +/* 80260280 0025D1C0 48 10 88 AD */ bl strcpy /* 80260284 0025D1C4 88 1E 03 DC */ lbz r0, 0x3dc(r30) /* 80260288 0025D1C8 28 00 00 32 */ cmplwi r0, 0x32 /* 8026028C 0025D1CC 40 80 02 BC */ bge lbl_80260548 @@ -4165,7 +4165,7 @@ dDlst_TimerScrnDraw_c_NS_createStart: /* 802605C0 0025D500 4E 80 04 21 */ bctrl /* 802605C4 0025D504 48 0A 00 95 */ bl J2DTextBox_NS_getStringPtr /* 802605C8 0025D508 38 81 00 08 */ addi r4, r1, 8 -/* 802605CC 0025D50C 48 10 85 61 */ bl func_80368B2C +/* 802605CC 0025D50C 48 10 85 61 */ bl strcpy /* 802605D0 0025D510 80 7F 00 08 */ lwz r3, 8(r31) /* 802605D4 0025D514 3C 80 74 5F */ lis r4, 0x745F696E@ha /* 802605D8 0025D518 38 C4 69 6E */ addi r6, r4, 0x745F696E@l @@ -4176,7 +4176,7 @@ dDlst_TimerScrnDraw_c_NS_createStart: /* 802605EC 0025D52C 4E 80 04 21 */ bctrl /* 802605F0 0025D530 48 0A 00 69 */ bl J2DTextBox_NS_getStringPtr /* 802605F4 0025D534 38 81 00 08 */ addi r4, r1, 8 -/* 802605F8 0025D538 48 10 85 35 */ bl func_80368B2C +/* 802605F8 0025D538 48 10 85 35 */ bl strcpy /* 802605FC 0025D53C 88 1F 03 DC */ lbz r0, 0x3dc(r31) /* 80260600 0025D540 28 00 00 00 */ cmplwi r0, 0 /* 80260604 0025D544 40 82 00 74 */ bne lbl_80260678 @@ -4831,7 +4831,7 @@ dTimer_createTimer: /* 80260F98 0025DED8 39 61 00 40 */ addi r11, r1, 0x40 /* 80260F9C 0025DEDC 48 10 11 A5 */ bl func_80362140 /* 80260FA0 0025DEE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80260FA4 0025DEE4 48 10 12 35 */ bl func_803621D8 +/* 80260FA4 0025DEE4 48 10 12 35 */ bl _savegpr_28 /* 80260FA8 0025DEE8 7C 7C 1B 78 */ mr r28, r3 /* 80260FAC 0025DEEC 7C 9D 23 78 */ mr r29, r4 /* 80260FB0 0025DEF0 7C BE 2B 78 */ mr r30, r5 @@ -4864,7 +4864,7 @@ lbl_80261014: /* 80261014 0025DF54 39 61 00 40 */ addi r11, r1, 0x40 /* 80261018 0025DF58 48 10 11 75 */ bl func_8036218C /* 8026101C 0025DF5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80261020 0025DF60 48 10 12 05 */ bl func_80362224 +/* 80261020 0025DF60 48 10 12 05 */ bl _restgpr_28 /* 80261024 0025DF64 80 01 00 44 */ lwz r0, 0x44(r1) /* 80261028 0025DF68 7C 08 03 A6 */ mtlr r0 /* 8026102C 0025DF6C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/d_tresure.s b/asm/d/d_tresure.s index 2495401f39..12c07e39ae 100644 --- a/asm/d/d_tresure.s +++ b/asm/d/d_tresure.s @@ -405,7 +405,7 @@ lbl_8009C150: /* 8009C16C 000990AC 7C 08 02 A6 */ mflr r0 /* 8009C170 000990B0 90 01 00 24 */ stw r0, 0x24(r1) /* 8009C174 000990B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C178 000990B8 48 2C 60 61 */ bl func_803621D8 +/* 8009C178 000990B8 48 2C 60 61 */ bl _savegpr_28 /* 8009C17C 000990BC 7C 7D 1B 78 */ mr r29, r3 /* 8009C180 000990C0 7C 9C 23 78 */ mr r28, r4 /* 8009C184 000990C4 7C BF 2B 78 */ mr r31, r5 @@ -433,7 +433,7 @@ lbl_8009C1D0: /* 8009C1D0 00099110 7C 1D F0 00 */ cmpw r29, r30 /* 8009C1D4 00099114 41 80 FF DC */ blt lbl_8009C1B0 /* 8009C1D8 00099118 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C1DC 0009911C 48 2C 60 49 */ bl func_80362224 +/* 8009C1DC 0009911C 48 2C 60 49 */ bl _restgpr_28 /* 8009C1E0 00099120 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009C1E4 00099124 7C 08 03 A6 */ mtlr r0 /* 8009C1E8 00099128 38 21 00 20 */ addi r1, r1, 0x20 @@ -442,7 +442,7 @@ lbl_8009C1D0: /* 8009C1F4 00099134 7C 08 02 A6 */ mflr r0 /* 8009C1F8 00099138 90 01 00 24 */ stw r0, 0x24(r1) /* 8009C1FC 0009913C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C200 00099140 48 2C 5F D9 */ bl func_803621D8 +/* 8009C200 00099140 48 2C 5F D9 */ bl _savegpr_28 /* 8009C204 00099144 7C 7D 1B 78 */ mr r29, r3 /* 8009C208 00099148 7C 9C 23 78 */ mr r28, r4 /* 8009C20C 0009914C 7C BF 2B 78 */ mr r31, r5 @@ -471,7 +471,7 @@ lbl_8009C25C: /* 8009C25C 0009919C 7C 1D F0 00 */ cmpw r29, r30 /* 8009C260 000991A0 41 80 FF DC */ blt lbl_8009C23C /* 8009C264 000991A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C268 000991A8 48 2C 5F BD */ bl func_80362224 +/* 8009C268 000991A8 48 2C 5F BD */ bl _restgpr_28 /* 8009C26C 000991AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009C270 000991B0 7C 08 03 A6 */ mtlr r0 /* 8009C274 000991B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -483,7 +483,7 @@ dTres_c_NS_getBossIconFloorNo: /* 8009C280 000991C0 7C 08 02 A6 */ mflr r0 /* 8009C284 000991C4 90 01 00 24 */ stw r0, 0x24(r1) /* 8009C288 000991C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C28C 000991CC 48 2C 5F 4D */ bl func_803621D8 +/* 8009C28C 000991CC 48 2C 5F 4D */ bl _savegpr_28 /* 8009C290 000991D0 7C 7C 1B 79 */ or. r28, r3, r3 /* 8009C294 000991D4 40 82 00 0C */ bne lbl_8009C2A0 /* 8009C298 000991D8 38 60 00 00 */ li r3, 0 @@ -535,7 +535,7 @@ lbl_8009C344: /* 8009C344 00099284 7F A3 EB 78 */ mr r3, r29 lbl_8009C348: /* 8009C348 00099288 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C34C 0009928C 48 2C 5E D9 */ bl func_80362224 +/* 8009C34C 0009928C 48 2C 5E D9 */ bl _restgpr_28 /* 8009C350 00099290 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009C354 00099294 7C 08 03 A6 */ mtlr r0 /* 8009C358 00099298 38 21 00 20 */ addi r1, r1, 0x20 @@ -584,7 +584,7 @@ lbl_8009C3C4: /* 8009C3D0 00099310 7C 08 02 A6 */ mflr r0 /* 8009C3D4 00099314 90 01 00 34 */ stw r0, 0x34(r1) /* 8009C3D8 00099318 39 61 00 30 */ addi r11, r1, 0x30 -/* 8009C3DC 0009931C 48 2C 5D F9 */ bl func_803621D4 +/* 8009C3DC 0009931C 48 2C 5D F9 */ bl _savegpr_27 /* 8009C3E0 00099320 7C 7B 1B 78 */ mr r27, r3 /* 8009C3E4 00099324 7C 9C 23 78 */ mr r28, r4 /* 8009C3E8 00099328 7C BD 2B 78 */ mr r29, r5 @@ -631,7 +631,7 @@ lbl_8009C47C: /* 8009C480 000993C0 42 00 FF A0 */ bdnz lbl_8009C420 lbl_8009C484: /* 8009C484 000993C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8009C488 000993C8 48 2C 5D 99 */ bl func_80362220 +/* 8009C488 000993C8 48 2C 5D 99 */ bl _restgpr_27 /* 8009C48C 000993CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8009C490 000993D0 7C 08 03 A6 */ mtlr r0 /* 8009C494 000993D4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/error/d_error_msg.s b/asm/d/error/d_error_msg.s index 34905dbc62..a2209b3a68 100644 --- a/asm/d/error/d_error_msg.s +++ b/asm/d/error/d_error_msg.s @@ -13,7 +13,7 @@ messageSet: /* 8009CB9C 00099ADC DB C1 05 30 */ stfd f30, 0x530(r1) /* 8009CBA0 00099AE0 F3 C1 05 38 */ psq_st f30, 1336(r1), 0, qr0 /* 8009CBA4 00099AE4 39 61 05 30 */ addi r11, r1, 0x530 -/* 8009CBA8 00099AE8 48 2C 56 2D */ bl func_803621D4 +/* 8009CBA8 00099AE8 48 2C 56 2D */ bl _savegpr_27 /* 8009CBAC 00099AEC 7C 9D 23 78 */ mr r29, r4 /* 8009CBB0 00099AF0 3C 80 80 38 */ lis r4, lbl_8037B180@ha /* 8009CBB4 00099AF4 38 84 B1 80 */ addi r4, r4, lbl_8037B180@l @@ -407,7 +407,7 @@ lbl_8009D100: /* 8009D174 0009A0B4 E3 C1 05 38 */ psq_l f30, 1336(r1), 0, qr0 /* 8009D178 0009A0B8 CB C1 05 30 */ lfd f30, 0x530(r1) /* 8009D17C 0009A0BC 39 61 05 30 */ addi r11, r1, 0x530 -/* 8009D180 0009A0C0 48 2C 50 A1 */ bl func_80362220 +/* 8009D180 0009A0C0 48 2C 50 A1 */ bl _restgpr_27 /* 8009D184 0009A0C4 80 01 05 54 */ lwz r0, 0x554(r1) /* 8009D188 0009A0C8 7C 08 03 A6 */ mtlr r0 /* 8009D18C 0009A0CC 38 21 05 50 */ addi r1, r1, 0x550 diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 57f0c96b91..49a436f9ee 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -49,7 +49,7 @@ dCamera_c_NS_StartEventCamera: /* 80088A80 000859C0 7C 08 02 A6 */ mflr r0 /* 80088A84 000859C4 90 01 00 94 */ stw r0, 0x94(r1) /* 80088A88 000859C8 39 61 00 90 */ addi r11, r1, 0x90 -/* 80088A8C 000859CC 48 2D 97 4D */ bl func_803621D8 +/* 80088A8C 000859CC 48 2D 97 4D */ bl _savegpr_28 /* 80088A90 000859D0 7C 7F 1B 78 */ mr r31, r3 /* 80088A94 000859D4 40 86 00 24 */ bne cr1, lbl_80088AB8 /* 80088A98 000859D8 D8 21 00 28 */ stfd f1, 0x28(r1) @@ -94,7 +94,7 @@ lbl_80088B14: /* 80088B28 00085A68 41 82 00 3C */ beq lbl_80088B64 /* 80088B2C 00085A6C 7F BF F2 14 */ add r29, r31, r30 /* 80088B30 00085A70 38 7D 05 14 */ addi r3, r29, 0x514 -/* 80088B34 00085A74 48 2D FF F9 */ bl func_80368B2C +/* 80088B34 00085A74 48 2D FF F9 */ bl strcpy /* 80088B38 00085A78 38 61 00 68 */ addi r3, r1, 0x68 /* 80088B3C 00085A7C 38 80 00 01 */ li r4, 1 /* 80088B40 00085A80 48 2D 8F D5 */ bl func_80361B14 @@ -127,7 +127,7 @@ lbl_80088B88: /* 80088BA0 00085AE0 38 60 00 01 */ li r3, 1 lbl_80088BA4: /* 80088BA4 00085AE4 39 61 00 90 */ addi r11, r1, 0x90 -/* 80088BA8 00085AE8 48 2D 96 7D */ bl func_80362224 +/* 80088BA8 00085AE8 48 2D 96 7D */ bl _restgpr_28 /* 80088BAC 00085AEC 80 01 00 94 */ lwz r0, 0x94(r1) /* 80088BB0 00085AF0 7C 08 03 A6 */ mtlr r0 /* 80088BB4 00085AF4 38 21 00 90 */ addi r1, r1, 0x90 @@ -172,7 +172,7 @@ dCamera_c_NS_searchEventArgData: /* 80088C28 00085B68 7C 08 02 A6 */ mflr r0 /* 80088C2C 00085B6C 90 01 00 24 */ stw r0, 0x24(r1) /* 80088C30 00085B70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088C34 00085B74 48 2D 95 A1 */ bl func_803621D4 +/* 80088C34 00085B74 48 2D 95 A1 */ bl _savegpr_27 /* 80088C38 00085B78 7C 7B 1B 78 */ mr r27, r3 /* 80088C3C 00085B7C 7C 9C 23 78 */ mr r28, r4 /* 80088C40 00085B80 3B A0 00 00 */ li r29, 0 @@ -202,7 +202,7 @@ lbl_80088C88: /* 80088C94 00085BD4 7F C3 F3 78 */ mr r3, r30 lbl_80088C98: /* 80088C98 00085BD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088C9C 00085BDC 48 2D 95 85 */ bl func_80362220 +/* 80088C9C 00085BDC 48 2D 95 85 */ bl _restgpr_27 /* 80088CA0 00085BE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80088CA4 00085BE4 7C 08 03 A6 */ mtlr r0 /* 80088CA8 00085BE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -214,7 +214,7 @@ dCamera_c_NS_getEvIntData: /* 80088CB4 00085BF4 7C 08 02 A6 */ mflr r0 /* 80088CB8 00085BF8 90 01 00 24 */ stw r0, 0x24(r1) /* 80088CBC 00085BFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088CC0 00085C00 48 2D 95 19 */ bl func_803621D8 +/* 80088CC0 00085C00 48 2D 95 19 */ bl _savegpr_28 /* 80088CC4 00085C04 7C 7C 1B 78 */ mr r28, r3 /* 80088CC8 00085C08 7C 9D 23 78 */ mr r29, r4 /* 80088CCC 00085C0C 7C BE 2B 78 */ mr r30, r5 @@ -267,7 +267,7 @@ lbl_80088D74: /* 80088D74 00085CB4 38 60 00 01 */ li r3, 1 lbl_80088D78: /* 80088D78 00085CB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088D7C 00085CBC 48 2D 94 A9 */ bl func_80362224 +/* 80088D7C 00085CBC 48 2D 94 A9 */ bl _restgpr_28 /* 80088D80 00085CC0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80088D84 00085CC4 7C 08 03 A6 */ mtlr r0 /* 80088D88 00085CC8 38 21 00 20 */ addi r1, r1, 0x20 @@ -279,7 +279,7 @@ dCamera_c_NS_getEvFloatData: /* 80088D94 00085CD4 7C 08 02 A6 */ mflr r0 /* 80088D98 00085CD8 90 01 00 24 */ stw r0, 0x24(r1) /* 80088D9C 00085CDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088DA0 00085CE0 48 2D 94 39 */ bl func_803621D8 +/* 80088DA0 00085CE0 48 2D 94 39 */ bl _savegpr_28 /* 80088DA4 00085CE4 7C 7C 1B 78 */ mr r28, r3 /* 80088DA8 00085CE8 7C 9D 23 78 */ mr r29, r4 /* 80088DAC 00085CEC 7C BE 2B 78 */ mr r30, r5 @@ -325,7 +325,7 @@ lbl_80088E3C: /* 80088E3C 00085D7C 38 60 00 01 */ li r3, 1 lbl_80088E40: /* 80088E40 00085D80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088E44 00085D84 48 2D 93 E1 */ bl func_80362224 +/* 80088E44 00085D84 48 2D 93 E1 */ bl _restgpr_28 /* 80088E48 00085D88 80 01 00 24 */ lwz r0, 0x24(r1) /* 80088E4C 00085D8C 7C 08 03 A6 */ mtlr r0 /* 80088E50 00085D90 38 21 00 20 */ addi r1, r1, 0x20 @@ -337,7 +337,7 @@ dCamera_c_NS_getEvFloatListData: /* 80088E5C 00085D9C 7C 08 02 A6 */ mflr r0 /* 80088E60 00085DA0 90 01 00 24 */ stw r0, 0x24(r1) /* 80088E64 00085DA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088E68 00085DA8 48 2D 93 6D */ bl func_803621D4 +/* 80088E68 00085DA8 48 2D 93 6D */ bl _savegpr_27 /* 80088E6C 00085DAC 7C 7B 1B 78 */ mr r27, r3 /* 80088E70 00085DB0 7C 9C 23 78 */ mr r28, r4 /* 80088E74 00085DB4 7C BD 2B 78 */ mr r29, r5 @@ -382,7 +382,7 @@ lbl_80088F00: /* 80088F00 00085E40 7F C3 F3 78 */ mr r3, r30 lbl_80088F04: /* 80088F04 00085E44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088F08 00085E48 48 2D 93 19 */ bl func_80362220 +/* 80088F08 00085E48 48 2D 93 19 */ bl _restgpr_27 /* 80088F0C 00085E4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80088F10 00085E50 7C 08 03 A6 */ mtlr r0 /* 80088F14 00085E54 38 21 00 20 */ addi r1, r1, 0x20 @@ -394,7 +394,7 @@ dCamera_c_NS_getEvXyzListData: /* 80088F20 00085E60 7C 08 02 A6 */ mflr r0 /* 80088F24 00085E64 90 01 00 24 */ stw r0, 0x24(r1) /* 80088F28 00085E68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088F2C 00085E6C 48 2D 92 A9 */ bl func_803621D4 +/* 80088F2C 00085E6C 48 2D 92 A9 */ bl _savegpr_27 /* 80088F30 00085E70 7C 7B 1B 78 */ mr r27, r3 /* 80088F34 00085E74 7C 9C 23 78 */ mr r28, r4 /* 80088F38 00085E78 7C BD 2B 78 */ mr r29, r5 @@ -439,7 +439,7 @@ lbl_80088FC4: /* 80088FC4 00085F04 7F E3 FB 78 */ mr r3, r31 lbl_80088FC8: /* 80088FC8 00085F08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088FCC 00085F0C 48 2D 92 55 */ bl func_80362220 +/* 80088FCC 00085F0C 48 2D 92 55 */ bl _restgpr_27 /* 80088FD0 00085F10 80 01 00 24 */ lwz r0, 0x24(r1) /* 80088FD4 00085F14 7C 08 03 A6 */ mtlr r0 /* 80088FD8 00085F18 38 21 00 20 */ addi r1, r1, 0x20 @@ -501,7 +501,7 @@ dCamera_c_NS_getEvIntData_X1_: /* 80089090 00085FD0 7C 08 02 A6 */ mflr r0 /* 80089094 00085FD4 90 01 00 24 */ stw r0, 0x24(r1) /* 80089098 00085FD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008909C 00085FDC 48 2D 91 39 */ bl func_803621D4 +/* 8008909C 00085FDC 48 2D 91 39 */ bl _savegpr_27 /* 800890A0 00085FE0 7C 7B 1B 78 */ mr r27, r3 /* 800890A4 00085FE4 7C 9C 23 78 */ mr r28, r4 /* 800890A8 00085FE8 7C BD 2B 78 */ mr r29, r5 @@ -547,7 +547,7 @@ lbl_80089138: /* 80089138 00086078 38 60 00 01 */ li r3, 1 lbl_8008913C: /* 8008913C 0008607C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80089140 00086080 48 2D 90 E1 */ bl func_80362220 +/* 80089140 00086080 48 2D 90 E1 */ bl _restgpr_27 /* 80089144 00086084 80 01 00 24 */ lwz r0, 0x24(r1) /* 80089148 00086088 7C 08 03 A6 */ mtlr r0 /* 8008914C 0008608C 38 21 00 20 */ addi r1, r1, 0x20 @@ -561,7 +561,7 @@ dCamera_c_NS_getEvFloatData_X1_: /* 80089160 000860A0 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80089164 000860A4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80089168 000860A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008916C 000860AC 48 2D 90 6D */ bl func_803621D8 +/* 8008916C 000860AC 48 2D 90 6D */ bl _savegpr_28 /* 80089170 000860B0 7C 7C 1B 78 */ mr r28, r3 /* 80089174 000860B4 7C 9D 23 78 */ mr r29, r4 /* 80089178 000860B8 7C BE 2B 78 */ mr r30, r5 @@ -609,7 +609,7 @@ lbl_8008920C: /* 8008920C 0008614C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80089210 00086150 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80089214 00086154 39 61 00 20 */ addi r11, r1, 0x20 -/* 80089218 00086158 48 2D 90 0D */ bl func_80362224 +/* 80089218 00086158 48 2D 90 0D */ bl _restgpr_28 /* 8008921C 0008615C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80089220 00086160 7C 08 03 A6 */ mtlr r0 /* 80089224 00086164 38 21 00 30 */ addi r1, r1, 0x30 @@ -621,7 +621,7 @@ dCamera_c_NS_getEvXyzData: /* 80089230 00086170 7C 08 02 A6 */ mflr r0 /* 80089234 00086174 90 01 00 24 */ stw r0, 0x24(r1) /* 80089238 00086178 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008923C 0008617C 48 2D 8F 99 */ bl func_803621D4 +/* 8008923C 0008617C 48 2D 8F 99 */ bl _savegpr_27 /* 80089240 00086180 7C 7B 1B 78 */ mr r27, r3 /* 80089244 00086184 7C 9C 23 78 */ mr r28, r4 /* 80089248 00086188 7C BD 2B 78 */ mr r29, r5 @@ -685,7 +685,7 @@ lbl_80089320: /* 80089320 00086260 38 60 00 01 */ li r3, 1 lbl_80089324: /* 80089324 00086264 39 61 00 20 */ addi r11, r1, 0x20 -/* 80089328 00086268 48 2D 8E F9 */ bl func_80362220 +/* 80089328 00086268 48 2D 8E F9 */ bl _restgpr_27 /* 8008932C 0008626C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80089330 00086270 7C 08 03 A6 */ mtlr r0 /* 80089334 00086274 38 21 00 20 */ addi r1, r1, 0x20 @@ -697,7 +697,7 @@ dCamera_c_NS_getEvStringData: /* 80089340 00086280 7C 08 02 A6 */ mflr r0 /* 80089344 00086284 90 01 00 24 */ stw r0, 0x24(r1) /* 80089348 00086288 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008934C 0008628C 48 2D 8E 89 */ bl func_803621D4 +/* 8008934C 0008628C 48 2D 8E 89 */ bl _savegpr_27 /* 80089350 00086290 7C 7B 1B 78 */ mr r27, r3 /* 80089354 00086294 7C 9C 23 78 */ mr r28, r4 /* 80089358 00086298 7C BD 2B 78 */ mr r29, r5 @@ -712,14 +712,14 @@ dCamera_c_NS_getEvStringData: /* 8008937C 000862BC 40 82 00 14 */ bne lbl_80089390 /* 80089380 000862C0 7F 83 E3 78 */ mr r3, r28 /* 80089384 000862C4 7F C4 F3 78 */ mr r4, r30 -/* 80089388 000862C8 48 2D F7 A5 */ bl func_80368B2C +/* 80089388 000862C8 48 2D F7 A5 */ bl strcpy /* 8008938C 000862CC 48 00 00 74 */ b lbl_80089400 lbl_80089390: /* 80089390 000862D0 7F 83 E3 78 */ mr r3, r28 /* 80089394 000862D4 1C 00 00 18 */ mulli r0, r0, 0x18 /* 80089398 000862D8 7C 9B 02 14 */ add r4, r27, r0 /* 8008939C 000862DC 80 84 05 28 */ lwz r4, 0x528(r4) -/* 800893A0 000862E0 48 2D F7 8D */ bl func_80368B2C +/* 800893A0 000862E0 48 2D F7 8D */ bl strcpy /* 800893A4 000862E4 48 00 00 5C */ b lbl_80089400 lbl_800893A8: /* 800893A8 000862E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -737,19 +737,19 @@ lbl_800893A8: /* 800893D8 00086318 4B FB ED 15 */ bl dEvent_manager_c_NS_getMySubstanceP /* 800893DC 0008631C 7C 64 1B 78 */ mr r4, r3 /* 800893E0 00086320 7F 83 E3 78 */ mr r3, r28 -/* 800893E4 00086324 48 2D F7 49 */ bl func_80368B2C +/* 800893E4 00086324 48 2D F7 49 */ bl strcpy /* 800893E8 00086328 48 00 00 18 */ b lbl_80089400 lbl_800893EC: /* 800893EC 0008632C 7F 83 E3 78 */ mr r3, r28 /* 800893F0 00086330 7F C4 F3 78 */ mr r4, r30 -/* 800893F4 00086334 48 2D F7 39 */ bl func_80368B2C +/* 800893F4 00086334 48 2D F7 39 */ bl strcpy /* 800893F8 00086338 38 60 00 00 */ li r3, 0 /* 800893FC 0008633C 48 00 00 08 */ b lbl_80089404 lbl_80089400: /* 80089400 00086340 38 60 00 01 */ li r3, 1 lbl_80089404: /* 80089404 00086344 39 61 00 20 */ addi r11, r1, 0x20 -/* 80089408 00086348 48 2D 8E 19 */ bl func_80362220 +/* 80089408 00086348 48 2D 8E 19 */ bl _restgpr_27 /* 8008940C 0008634C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80089410 00086350 7C 08 03 A6 */ mtlr r0 /* 80089414 00086354 38 21 00 20 */ addi r1, r1, 0x20 @@ -761,7 +761,7 @@ dCamera_c_NS_getEvStringPntData_X1_: /* 80089420 00086360 7C 08 02 A6 */ mflr r0 /* 80089424 00086364 90 01 00 24 */ stw r0, 0x24(r1) /* 80089428 00086368 39 61 00 20 */ addi r11, r1, 0x20 -/* 8008942C 0008636C 48 2D 8D AD */ bl func_803621D8 +/* 8008942C 0008636C 48 2D 8D AD */ bl _savegpr_28 /* 80089430 00086370 7C 7C 1B 78 */ mr r28, r3 /* 80089434 00086374 7C 9D 23 78 */ mr r29, r4 /* 80089438 00086378 7C BE 2B 78 */ mr r30, r5 @@ -798,7 +798,7 @@ lbl_800894A8: /* 800894A8 000863E8 7F C3 F3 78 */ mr r3, r30 lbl_800894AC: /* 800894AC 000863EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800894B0 000863F0 48 2D 8D 75 */ bl func_80362224 +/* 800894B0 000863F0 48 2D 8D 75 */ bl _restgpr_28 /* 800894B4 000863F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800894B8 000863F8 7C 08 03 A6 */ mtlr r0 /* 800894BC 000863FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3704,7 +3704,7 @@ dCamera_c_NS_transEvCamera: /* 8008BEAC 00088DEC DB C1 09 40 */ stfd f30, 0x940(r1) /* 8008BEB0 00088DF0 F3 C1 09 48 */ psq_st f30, -1720(r1), 0, qr0 /* 8008BEB4 00088DF4 39 61 09 40 */ addi r11, r1, 0x940 -/* 8008BEB8 00088DF8 48 2D 63 1D */ bl func_803621D4 +/* 8008BEB8 00088DF8 48 2D 63 1D */ bl _savegpr_27 /* 8008BEBC 00088DFC 7C 7E 1B 78 */ mr r30, r3 /* 8008BEC0 00088E00 7C 9B 23 78 */ mr r27, r4 /* 8008BEC4 00088E04 3C 60 80 38 */ lis r3, lbl_8037A7F0@ha @@ -6400,7 +6400,7 @@ lbl_8008E728: /* 8008E730 0008B670 E3 C1 09 48 */ psq_l f30, -1720(r1), 0, qr0 /* 8008E734 0008B674 CB C1 09 40 */ lfd f30, 0x940(r1) /* 8008E738 0008B678 39 61 09 40 */ addi r11, r1, 0x940 -/* 8008E73C 0008B67C 48 2D 3A E5 */ bl func_80362220 +/* 8008E73C 0008B67C 48 2D 3A E5 */ bl _restgpr_27 /* 8008E740 0008B680 80 01 09 64 */ lwz r0, 0x964(r1) /* 8008E744 0008B684 7C 08 03 A6 */ mtlr r0 /* 8008E748 0008B688 38 21 09 60 */ addi r1, r1, 0x960 @@ -9484,7 +9484,7 @@ lbl_80091414: /* 8009146C 0008E3AC 7C 08 02 A6 */ mflr r0 /* 80091470 0008E3B0 90 01 06 34 */ stw r0, 0x634(r1) /* 80091474 0008E3B4 39 61 06 30 */ addi r11, r1, 0x630 -/* 80091478 0008E3B8 48 2D 0D 61 */ bl func_803621D8 +/* 80091478 0008E3B8 48 2D 0D 61 */ bl _savegpr_28 /* 8009147C 0008E3BC 7C 7E 1B 78 */ mr r30, r3 /* 80091480 0008E3C0 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091484 0008E3C4 D0 01 03 C4 */ stfs f0, 0x3c4(r1) @@ -10468,7 +10468,7 @@ lbl_80092328: /* 8009234C 0008F28C 90 1E 03 EC */ stw r0, 0x3ec(r30) /* 80092350 0008F290 38 60 00 01 */ li r3, 1 /* 80092354 0008F294 39 61 06 30 */ addi r11, r1, 0x630 -/* 80092358 0008F298 48 2C FE CD */ bl func_80362224 +/* 80092358 0008F298 48 2C FE CD */ bl _restgpr_28 /* 8009235C 0008F29C 80 01 06 34 */ lwz r0, 0x634(r1) /* 80092360 0008F2A0 7C 08 03 A6 */ mtlr r0 /* 80092364 0008F2A4 38 21 06 30 */ addi r1, r1, 0x630 @@ -13438,7 +13438,7 @@ lbl_80094FF0: /* 80095014 00091F54 7C 08 02 A6 */ mflr r0 /* 80095018 00091F58 90 01 00 84 */ stw r0, 0x84(r1) /* 8009501C 00091F5C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80095020 00091F60 48 2C D1 B9 */ bl func_803621D8 +/* 80095020 00091F60 48 2C D1 B9 */ bl _savegpr_28 /* 80095024 00091F64 7C 7D 1B 78 */ mr r29, r3 /* 80095028 00091F68 80 03 01 74 */ lwz r0, 0x174(r3) /* 8009502C 00091F6C 28 00 00 00 */ cmplwi r0, 0 @@ -13719,7 +13719,7 @@ lbl_80095430: /* 80095430 00092370 38 60 00 01 */ li r3, 1 lbl_80095434: /* 80095434 00092374 39 61 00 80 */ addi r11, r1, 0x80 -/* 80095438 00092378 48 2C CD ED */ bl func_80362224 +/* 80095438 00092378 48 2C CD ED */ bl _restgpr_28 /* 8009543C 0009237C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80095440 00092380 7C 08 03 A6 */ mtlr r0 /* 80095444 00092384 38 21 00 80 */ addi r1, r1, 0x80 @@ -14514,7 +14514,7 @@ lbl_80095FB4: /* 80095FDC 00092F1C DB E1 01 70 */ stfd f31, 0x170(r1) /* 80095FE0 00092F20 F3 E1 01 78 */ psq_st f31, 376(r1), 0, qr0 /* 80095FE4 00092F24 39 61 01 70 */ addi r11, r1, 0x170 -/* 80095FE8 00092F28 48 2C C1 F1 */ bl func_803621D8 +/* 80095FE8 00092F28 48 2C C1 F1 */ bl _savegpr_28 /* 80095FEC 00092F2C 7C 7F 1B 78 */ mr r31, r3 /* 80095FF0 00092F30 80 03 01 74 */ lwz r0, 0x174(r3) /* 80095FF4 00092F34 28 00 00 00 */ cmplwi r0, 0 @@ -14891,7 +14891,7 @@ lbl_80096588: /* 8009658C 000934CC E3 E1 01 78 */ psq_l f31, 376(r1), 0, qr0 /* 80096590 000934D0 CB E1 01 70 */ lfd f31, 0x170(r1) /* 80096594 000934D4 39 61 01 70 */ addi r11, r1, 0x170 -/* 80096598 000934D8 48 2C BC 8D */ bl func_80362224 +/* 80096598 000934D8 48 2C BC 8D */ bl _restgpr_28 /* 8009659C 000934DC 80 01 01 84 */ lwz r0, 0x184(r1) /* 800965A0 000934E0 7C 08 03 A6 */ mtlr r0 /* 800965A4 000934E4 38 21 01 80 */ addi r1, r1, 0x180 @@ -15572,7 +15572,7 @@ lbl_80096FA4: /* 80096FB8 00093EF8 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80096FBC 00093EFC 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 80096FC0 00093F00 38 84 02 4A */ addi r4, r4, 0x24a -/* 80096FC4 00093F04 48 2D 1B 69 */ bl func_80368B2C +/* 80096FC4 00093F04 48 2D 1B 69 */ bl strcpy /* 80096FC8 00093F08 7F C3 F3 78 */ mr r3, r30 /* 80096FCC 00093F0C 38 9F 00 08 */ addi r4, r31, 8 /* 80096FD0 00093F10 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha @@ -15601,7 +15601,7 @@ lbl_8009701C: /* 80097028 00093F68 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8009702C 00093F6C 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 80097030 00093F70 38 84 02 4A */ addi r4, r4, 0x24a -/* 80097034 00093F74 48 2D 1A F9 */ bl func_80368B2C +/* 80097034 00093F74 48 2D 1A F9 */ bl strcpy /* 80097038 00093F78 7F C3 F3 78 */ mr r3, r30 /* 8009703C 00093F7C 38 9F 00 40 */ addi r4, r31, 0x40 /* 80097040 00093F80 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index 113bc8cd95..dee9431f8e 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -543,7 +543,7 @@ dEvDtEvent_c_NS_finishCheck: /* 80043E7C 00040DBC 7C 08 02 A6 */ mflr r0 /* 80043E80 00040DC0 90 01 00 24 */ stw r0, 0x24(r1) /* 80043E84 00040DC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043E88 00040DC8 48 31 E3 51 */ bl func_803621D8 +/* 80043E88 00040DC8 48 31 E3 51 */ bl _savegpr_28 /* 80043E8C 00040DCC 7C 7C 1B 78 */ mr r28, r3 /* 80043E90 00040DD0 3B A0 00 00 */ li r29, 0 /* 80043E94 00040DD4 3B E0 00 00 */ li r31, 0 @@ -571,7 +571,7 @@ lbl_80043ED0: /* 80043EE0 00040E20 38 60 00 01 */ li r3, 1 lbl_80043EE4: /* 80043EE4 00040E24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043EE8 00040E28 48 31 E3 3D */ bl func_80362224 +/* 80043EE8 00040E28 48 31 E3 3D */ bl _restgpr_28 /* 80043EEC 00040E2C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80043EF0 00040E30 7C 08 03 A6 */ mtlr r0 /* 80043EF4 00040E34 38 21 00 20 */ addi r1, r1, 0x20 @@ -583,7 +583,7 @@ dEvDtEvent_c_NS_forceFinish: /* 80043F00 00040E40 7C 08 02 A6 */ mflr r0 /* 80043F04 00040E44 90 01 00 24 */ stw r0, 0x24(r1) /* 80043F08 00040E48 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043F0C 00040E4C 48 31 E2 CD */ bl func_803621D8 +/* 80043F0C 00040E4C 48 31 E2 CD */ bl _savegpr_28 /* 80043F10 00040E50 7C 7C 1B 78 */ mr r28, r3 /* 80043F14 00040E54 3B A0 00 00 */ li r29, 0 /* 80043F18 00040E58 3B E0 00 00 */ li r31, 0 @@ -606,7 +606,7 @@ lbl_80043F3C: /* 80043F54 00040E94 38 60 00 01 */ li r3, 1 lbl_80043F58: /* 80043F58 00040E98 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043F5C 00040E9C 48 31 E2 C9 */ bl func_80362224 +/* 80043F5C 00040E9C 48 31 E2 C9 */ bl _restgpr_28 /* 80043F60 00040EA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80043F64 00040EA4 7C 08 03 A6 */ mtlr r0 /* 80043F68 00040EA8 38 21 00 20 */ addi r1, r1, 0x20 @@ -618,7 +618,7 @@ dEvDtEvent_c_NS_specialStaffProc: /* 80043F74 00040EB4 7C 08 02 A6 */ mflr r0 /* 80043F78 00040EB8 90 01 00 24 */ stw r0, 0x24(r1) /* 80043F7C 00040EBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043F80 00040EC0 48 31 E2 59 */ bl func_803621D8 +/* 80043F80 00040EC0 48 31 E2 59 */ bl _savegpr_28 /* 80043F84 00040EC4 7C 7C 1B 78 */ mr r28, r3 /* 80043F88 00040EC8 7C 9D 23 78 */ mr r29, r4 /* 80043F8C 00040ECC 3B C0 00 00 */ li r30, 0 @@ -637,7 +637,7 @@ lbl_80043FB4: /* 80043FB8 00040EF8 7C 1E 00 00 */ cmpw r30, r0 /* 80043FBC 00040EFC 41 80 FF DC */ blt lbl_80043F98 /* 80043FC0 00040F00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043FC4 00040F04 48 31 E2 61 */ bl func_80362224 +/* 80043FC4 00040F04 48 31 E2 61 */ bl _restgpr_28 /* 80043FC8 00040F08 80 01 00 24 */ lwz r0, 0x24(r1) /* 80043FCC 00040F0C 7C 08 03 A6 */ mtlr r0 /* 80043FD0 00040F10 38 21 00 20 */ addi r1, r1, 0x20 @@ -1402,7 +1402,7 @@ dEvDtStaff_c_NS_specialProcSound: /* 80044A5C 0004199C 7C 08 02 A6 */ mflr r0 /* 80044A60 000419A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80044A64 000419A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80044A68 000419A8 48 31 D7 71 */ bl func_803621D8 +/* 80044A68 000419A8 48 31 D7 71 */ bl _savegpr_28 /* 80044A6C 000419AC 7C 7C 1B 78 */ mr r28, r3 /* 80044A70 000419B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80044A74 000419B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -1557,7 +1557,7 @@ lbl_80044C94: /* 80044C9C 00041BDC 48 00 34 E1 */ bl dEvent_manager_c_NS_cutEnd lbl_80044CA0: /* 80044CA0 00041BE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80044CA4 00041BE4 48 31 D5 81 */ bl func_80362224 +/* 80044CA4 00041BE4 48 31 D5 81 */ bl _restgpr_28 /* 80044CA8 00041BE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80044CAC 00041BEC 7C 08 03 A6 */ mtlr r0 /* 80044CB0 00041BF0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1569,7 +1569,7 @@ dEvDtStaff_c_NS_specialProcCreate: /* 80044CBC 00041BFC 7C 08 02 A6 */ mflr r0 /* 80044CC0 00041C00 90 01 00 44 */ stw r0, 0x44(r1) /* 80044CC4 00041C04 39 61 00 40 */ addi r11, r1, 0x40 -/* 80044CC8 00041C08 48 31 D5 11 */ bl func_803621D8 +/* 80044CC8 00041C08 48 31 D5 11 */ bl _savegpr_28 /* 80044CCC 00041C0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80044CD0 00041C10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80044CD4 00041C14 3B C3 4F F8 */ addi r30, r3, 0x4ff8 @@ -1709,7 +1709,7 @@ lbl_80044EA8: /* 80044EC8 00041E08 4B FD 4E D1 */ bl fopAcM_create_X1_ lbl_80044ECC: /* 80044ECC 00041E0C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80044ED0 00041E10 48 31 D3 55 */ bl func_80362224 +/* 80044ED0 00041E10 48 31 D3 55 */ bl _restgpr_28 /* 80044ED4 00041E14 80 01 00 44 */ lwz r0, 0x44(r1) /* 80044ED8 00041E18 7C 08 03 A6 */ mtlr r0 /* 80044EDC 00041E1C 38 21 00 40 */ addi r1, r1, 0x40 @@ -2564,7 +2564,7 @@ dEvDtStaff_c_NS_specialProcTimekeeper: /* 80045B00 00042A40 7C 08 02 A6 */ mflr r0 /* 80045B04 00042A44 90 01 00 24 */ stw r0, 0x24(r1) /* 80045B08 00042A48 39 61 00 20 */ addi r11, r1, 0x20 -/* 80045B0C 00042A4C 48 31 C6 CD */ bl func_803621D8 +/* 80045B0C 00042A4C 48 31 C6 CD */ bl _savegpr_28 /* 80045B10 00042A50 7C 7E 1B 78 */ mr r30, r3 /* 80045B14 00042A54 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80045B18 00042A58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2639,7 +2639,7 @@ lbl_80045C10: /* 80045C18 00042B58 48 00 25 65 */ bl dEvent_manager_c_NS_cutEnd lbl_80045C1C: /* 80045C1C 00042B5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80045C20 00042B60 48 31 C6 05 */ bl func_80362224 +/* 80045C20 00042B60 48 31 C6 05 */ bl _restgpr_28 /* 80045C24 00042B64 80 01 00 24 */ lwz r0, 0x24(r1) /* 80045C28 00042B68 7C 08 03 A6 */ mtlr r0 /* 80045C2C 00042B6C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2973,7 +2973,7 @@ dEvDtCut_c_NS_startCheck: /* 800460AC 00042FEC 7C 08 02 A6 */ mflr r0 /* 800460B0 00042FF0 90 01 00 24 */ stw r0, 0x24(r1) /* 800460B4 00042FF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800460B8 00042FF8 48 31 C1 21 */ bl func_803621D8 +/* 800460B8 00042FF8 48 31 C1 21 */ bl _savegpr_28 /* 800460BC 00042FFC 7C 7C 1B 78 */ mr r28, r3 /* 800460C0 00043000 3B A0 00 00 */ li r29, 0 /* 800460C4 00043004 3B E0 00 00 */ li r31, 0 @@ -3004,7 +3004,7 @@ lbl_8004610C: /* 8004611C 0004305C 38 60 00 01 */ li r3, 1 lbl_80046120: /* 80046120 00043060 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046124 00043064 48 31 C1 01 */ bl func_80362224 +/* 80046124 00043064 48 31 C1 01 */ bl _restgpr_28 /* 80046128 00043068 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004612C 0004306C 7C 08 03 A6 */ mtlr r0 /* 80046130 00043070 38 21 00 20 */ addi r1, r1, 0x20 @@ -3116,7 +3116,7 @@ dEvDtBase_c_NS_advanceCut: /* 80046290 000431D0 7C 08 02 A6 */ mflr r0 /* 80046294 000431D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80046298 000431D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004629C 000431DC 48 31 BF 3D */ bl func_803621D8 +/* 8004629C 000431DC 48 31 BF 3D */ bl _savegpr_28 /* 800462A0 000431E0 7C 7C 1B 78 */ mr r28, r3 /* 800462A4 000431E4 7C 9D 23 78 */ mr r29, r4 /* 800462A8 000431E8 3B C0 00 00 */ li r30, 0 @@ -3137,7 +3137,7 @@ lbl_800462D8: /* 800462DC 0004321C 7C 1E 00 00 */ cmpw r30, r0 /* 800462E0 00043220 41 80 FF D4 */ blt lbl_800462B4 /* 800462E4 00043224 39 61 00 20 */ addi r11, r1, 0x20 -/* 800462E8 00043228 48 31 BF 3D */ bl func_80362224 +/* 800462E8 00043228 48 31 BF 3D */ bl _restgpr_28 /* 800462EC 0004322C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800462F0 00043230 7C 08 03 A6 */ mtlr r0 /* 800462F4 00043234 38 21 00 20 */ addi r1, r1, 0x20 @@ -3149,7 +3149,7 @@ dEvDtBase_c_NS_advanceCutLocal: /* 80046300 00043240 7C 08 02 A6 */ mflr r0 /* 80046304 00043244 90 01 00 24 */ stw r0, 0x24(r1) /* 80046308 00043248 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004630C 0004324C 48 31 BE CD */ bl func_803621D8 +/* 8004630C 0004324C 48 31 BE CD */ bl _savegpr_28 /* 80046310 00043250 7C 7C 1B 78 */ mr r28, r3 /* 80046314 00043254 7C 9D 23 78 */ mr r29, r4 /* 80046318 00043258 80 63 00 0C */ lwz r3, 0xc(r3) @@ -3201,7 +3201,7 @@ lbl_800463B8: /* 800463C0 00043300 38 60 00 00 */ li r3, 0 lbl_800463C4: /* 800463C4 00043304 39 61 00 20 */ addi r11, r1, 0x20 -/* 800463C8 00043308 48 31 BE 5D */ bl func_80362224 +/* 800463C8 00043308 48 31 BE 5D */ bl _restgpr_28 /* 800463CC 0004330C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800463D0 00043310 7C 08 03 A6 */ mtlr r0 /* 800463D4 00043314 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index 20801a235d..eff1b42fbb 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -407,7 +407,7 @@ lbl_80046930: /* 80046934 00043874 4B FE 8B 89 */ bl dComIfG_getRoomArcName /* 80046938 00043878 7C 64 1B 78 */ mr r4, r3 /* 8004693C 0004387C 38 61 00 08 */ addi r3, r1, 8 -/* 80046940 00043880 48 32 21 ED */ bl func_80368B2C +/* 80046940 00043880 48 32 21 ED */ bl strcpy /* 80046944 00043884 38 61 00 08 */ addi r3, r1, 8 /* 80046948 00043888 3C 80 80 38 */ lis r4, lbl_80379F50@ha /* 8004694C 0004388C 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l @@ -462,7 +462,7 @@ dEvent_manager_c_NS_roomFinish: /* 800469F0 00043930 7C 08 02 A6 */ mflr r0 /* 800469F4 00043934 90 01 00 24 */ stw r0, 0x24(r1) /* 800469F8 00043938 39 61 00 20 */ addi r11, r1, 0x20 -/* 800469FC 0004393C 48 31 B7 DD */ bl func_803621D8 +/* 800469FC 0004393C 48 31 B7 DD */ bl _savegpr_28 /* 80046A00 00043940 7C 7C 1B 78 */ mr r28, r3 /* 80046A04 00043944 7C 9D 23 78 */ mr r29, r4 /* 80046A08 00043948 3B C0 00 04 */ li r30, 4 @@ -482,7 +482,7 @@ lbl_80046A30: /* 80046A38 00043978 3B FF 00 24 */ addi r31, r31, 0x24 /* 80046A3C 0004397C 40 81 FF D4 */ ble lbl_80046A10 /* 80046A40 00043980 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046A44 00043984 48 31 B7 E1 */ bl func_80362224 +/* 80046A44 00043984 48 31 B7 E1 */ bl _restgpr_28 /* 80046A48 00043988 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046A4C 0004398C 7C 08 03 A6 */ mtlr r0 /* 80046A50 00043990 38 21 00 20 */ addi r1, r1, 0x20 @@ -667,7 +667,7 @@ dEvent_manager_c_NS_startProc: /* 80046CBC 00043BFC 7C 08 02 A6 */ mflr r0 /* 80046CC0 00043C00 90 01 00 24 */ stw r0, 0x24(r1) /* 80046CC4 00043C04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046CC8 00043C08 48 31 B5 0D */ bl func_803621D4 +/* 80046CC8 00043C08 48 31 B5 0D */ bl _savegpr_27 /* 80046CCC 00043C0C 7C 7D 1B 78 */ mr r29, r3 /* 80046CD0 00043C10 7C 9E 23 78 */ mr r30, r4 /* 80046CD4 00043C14 3B E0 00 00 */ li r31, 0 @@ -721,7 +721,7 @@ lbl_80046D6C: /* 80046D80 00043CC0 38 7D 01 BC */ addi r3, r29, 0x1bc /* 80046D84 00043CC4 4B FF D0 D5 */ bl dEvDtFlag_c_NS_init /* 80046D88 00043CC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046D8C 00043CCC 48 31 B4 95 */ bl func_80362220 +/* 80046D8C 00043CCC 48 31 B4 95 */ bl _restgpr_27 /* 80046D90 00043CD0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046D94 00043CD4 7C 08 03 A6 */ mtlr r0 /* 80046D98 00043CD8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1791,7 +1791,7 @@ lbl_80047BD4: /* 80047BFC 00044B3C 41 82 01 24 */ beq lbl_80047D20 /* 80047C00 00044B40 38 61 00 08 */ addi r3, r1, 8 /* 80047C04 00044B44 7F 84 E3 78 */ mr r4, r28 -/* 80047C08 00044B48 48 32 0F 25 */ bl func_80368B2C +/* 80047C08 00044B48 48 32 0F 25 */ bl strcpy /* 80047C0C 00044B4C 3B 00 00 00 */ li r24, 0 /* 80047C10 00044B50 57 20 06 3F */ clrlwi. r0, r25, 0x18 /* 80047C14 00044B54 40 82 00 28 */ bne lbl_80047C3C @@ -2251,7 +2251,7 @@ dEvent_manager_c_NS_getEventPrio: /* 800481F8 00045138 7C 08 02 A6 */ mflr r0 /* 800481FC 0004513C 90 01 00 44 */ stw r0, 0x44(r1) /* 80048200 00045140 39 61 00 40 */ addi r11, r1, 0x40 -/* 80048204 00045144 48 31 9F D5 */ bl func_803621D8 +/* 80048204 00045144 48 31 9F D5 */ bl _savegpr_28 /* 80048208 00045148 7C 7C 1B 78 */ mr r28, r3 /* 8004820C 0004514C 7C 9D 23 78 */ mr r29, r4 /* 80048210 00045150 7C BE 2B 78 */ mr r30, r5 @@ -2300,7 +2300,7 @@ lbl_800482B0: /* 800482B0 000451F0 80 7F 00 28 */ lwz r3, 0x28(r31) lbl_800482B4: /* 800482B4 000451F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 800482B8 000451F8 48 31 9F 6D */ bl func_80362224 +/* 800482B8 000451F8 48 31 9F 6D */ bl _restgpr_28 /* 800482BC 000451FC 80 01 00 44 */ lwz r0, 0x44(r1) /* 800482C0 00045200 7C 08 03 A6 */ mtlr r0 /* 800482C4 00045204 38 21 00 40 */ addi r1, r1, 0x40 @@ -2330,7 +2330,7 @@ dEvent_manager_c_NS_issueStaff: lbl_80048310: /* 80048310 00045250 38 61 00 08 */ addi r3, r1, 8 /* 80048314 00045254 7F E4 FB 78 */ mr r4, r31 -/* 80048318 00045258 48 32 08 15 */ bl func_80368B2C +/* 80048318 00045258 48 32 08 15 */ bl strcpy /* 8004831C 0004525C 38 61 00 08 */ addi r3, r1, 8 /* 80048320 00045260 38 80 FF FF */ li r4, -1 /* 80048324 00045264 4B FD 54 7D */ bl fopAcM_searchFromName4Event @@ -2368,7 +2368,7 @@ dEvent_manager_c_NS_cancelStaff: lbl_8004838C: /* 8004838C 000452CC 38 61 00 08 */ addi r3, r1, 8 /* 80048390 000452D0 7F E4 FB 78 */ mr r4, r31 -/* 80048394 000452D4 48 32 07 99 */ bl func_80368B2C +/* 80048394 000452D4 48 32 07 99 */ bl strcpy /* 80048398 000452D8 38 61 00 08 */ addi r3, r1, 8 /* 8004839C 000452DC 38 80 FF FF */ li r4, -1 /* 800483A0 000452E0 4B FD 54 01 */ bl fopAcM_searchFromName4Event @@ -2649,7 +2649,7 @@ dEv_talkman_get_action: /* 8004874C 0004568C 7C 08 02 A6 */ mflr r0 /* 80048750 00045690 90 01 00 24 */ stw r0, 0x24(r1) /* 80048754 00045694 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048758 00045698 48 31 9A 81 */ bl func_803621D8 +/* 80048758 00045698 48 31 9A 81 */ bl _savegpr_28 /* 8004875C 0004569C 7C 7C 1B 78 */ mr r28, r3 /* 80048760 000456A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80048764 000456A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2685,7 +2685,7 @@ lbl_800487D4: /* 800487D4 00045714 7F A3 EB 78 */ mr r3, r29 lbl_800487D8: /* 800487D8 00045718 39 61 00 20 */ addi r11, r1, 0x20 -/* 800487DC 0004571C 48 31 9A 49 */ bl func_80362224 +/* 800487DC 0004571C 48 31 9A 49 */ bl _restgpr_28 /* 800487E0 00045720 80 01 00 24 */ lwz r0, 0x24(r1) /* 800487E4 00045724 7C 08 03 A6 */ mtlr r0 /* 800487E8 00045728 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/eye/d_eye_hl.s b/asm/d/eye/d_eye_hl.s index 726cbb71fe..d69a9bc500 100644 --- a/asm/d/eye/d_eye_hl.s +++ b/asm/d/eye/d_eye_hl.s @@ -9,7 +9,7 @@ dEyeHL_c_NS_entry: /* 8009C968 000998A8 7C 08 02 A6 */ mflr r0 /* 8009C96C 000998AC 90 01 00 24 */ stw r0, 0x24(r1) /* 8009C970 000998B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009C974 000998B4 48 2C 58 61 */ bl func_803621D4 +/* 8009C974 000998B4 48 2C 58 61 */ bl _savegpr_27 /* 8009C978 000998B8 7C 7B 1B 78 */ mr r27, r3 /* 8009C97C 000998BC 7C BC 2B 78 */ mr r28, r5 /* 8009C980 000998C0 83 E4 00 6C */ lwz r31, 0x6c(r4) @@ -54,7 +54,7 @@ lbl_8009CA00: /* 8009CA0C 0009994C 4B F6 A2 01 */ bl OSReport_Error lbl_8009CA10: /* 8009CA10 00099950 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009CA14 00099954 48 2C 58 0D */ bl func_80362220 +/* 8009CA14 00099954 48 2C 58 0D */ bl _restgpr_27 /* 8009CA18 00099958 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009CA1C 0009995C 7C 08 03 A6 */ mtlr r0 /* 8009CA20 00099960 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index 36724b20fe..98c7ff0997 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -103,7 +103,7 @@ lbl_8018373C: /* 80183760 001806A0 7C 08 02 A6 */ mflr r0 /* 80183764 001806A4 90 01 00 24 */ stw r0, 0x24(r1) /* 80183768 001806A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018376C 001806AC 48 1D EA 69 */ bl func_803621D4 +/* 8018376C 001806AC 48 1D EA 69 */ bl _savegpr_27 /* 80183770 001806B0 7C 7F 1B 79 */ or. r31, r3, r3 /* 80183774 001806B4 7C 9E 23 78 */ mr r30, r4 /* 80183778 001806B8 41 82 0A 58 */ beq lbl_801841D0 @@ -848,7 +848,7 @@ lbl_801841C0: lbl_801841D0: /* 801841D0 00181110 7F E3 FB 78 */ mr r3, r31 /* 801841D4 00181114 39 61 00 20 */ addi r11, r1, 0x20 -/* 801841D8 00181118 48 1D E0 49 */ bl func_80362220 +/* 801841D8 00181118 48 1D E0 49 */ bl _restgpr_27 /* 801841DC 0018111C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801841E0 00181120 7C 08 03 A6 */ mtlr r0 /* 801841E4 00181124 38 21 00 20 */ addi r1, r1, 0x20 @@ -1993,7 +1993,7 @@ lbl_80185218: /* 80185234 00182174 7C 08 02 A6 */ mflr r0 /* 80185238 00182178 90 01 00 34 */ stw r0, 0x34(r1) /* 8018523C 0018217C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80185240 00182180 48 1D CF 95 */ bl func_803621D4 +/* 80185240 00182180 48 1D CF 95 */ bl _savegpr_27 /* 80185244 00182184 7C 7B 1B 78 */ mr r27, r3 /* 80185248 00182188 48 00 80 15 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 8018524C 0018218C 7C 7F 1B 78 */ mr r31, r3 @@ -2089,7 +2089,7 @@ lbl_801853A4: /* 801853A8 001822E8 98 1B 02 6F */ stb r0, 0x26f(r27) lbl_801853AC: /* 801853AC 001822EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801853B0 001822F0 48 1D CE 71 */ bl func_80362220 +/* 801853B0 001822F0 48 1D CE 71 */ bl _restgpr_27 /* 801853B4 001822F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 801853B8 001822F8 7C 08 03 A6 */ mtlr r0 /* 801853BC 001822FC 38 21 00 30 */ addi r1, r1, 0x30 @@ -2396,11 +2396,11 @@ lbl_80185740: /* 80185850 00182790 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l /* 80185854 00182794 38 7E 01 B4 */ addi r3, r30, 0x1b4 /* 80185858 00182798 38 81 00 10 */ addi r4, r1, 0x10 -/* 8018585C 0018279C 48 1E 32 D1 */ bl func_80368B2C +/* 8018585C 0018279C 48 1E 32 D1 */ bl strcpy /* 80185860 001827A0 38 9E 01 B4 */ addi r4, r30, 0x1b4 /* 80185864 001827A4 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80185868 001827A8 38 63 03 1C */ addi r3, r3, 0x31c -/* 8018586C 001827AC 48 1E 32 C1 */ bl func_80368B2C +/* 8018586C 001827AC 48 1E 32 C1 */ bl strcpy /* 80185870 001827B0 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80185874 001827B4 48 0C 8F 31 */ bl dName_c_NS_initial /* 80185878 001827B8 7F E3 FB 78 */ mr r3, r31 @@ -3256,7 +3256,7 @@ lbl_801864C4: /* 801864E0 00183420 7C 08 02 A6 */ mflr r0 /* 801864E4 00183424 90 01 00 34 */ stw r0, 0x34(r1) /* 801864E8 00183428 39 61 00 30 */ addi r11, r1, 0x30 -/* 801864EC 0018342C 48 1D BC E9 */ bl func_803621D4 +/* 801864EC 0018342C 48 1D BC E9 */ bl _savegpr_27 /* 801864F0 00183430 7C 7F 1B 78 */ mr r31, r3 /* 801864F4 00183434 48 00 6D 69 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 801864F8 00183438 7C 7B 1B 78 */ mr r27, r3 @@ -3335,7 +3335,7 @@ lbl_801864C4: /* 8018661C 0018355C 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80186620: /* 80186620 00183560 39 61 00 30 */ addi r11, r1, 0x30 -/* 80186624 00183564 48 1D BB FD */ bl func_80362220 +/* 80186624 00183564 48 1D BB FD */ bl _restgpr_27 /* 80186628 00183568 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018662C 0018356C 7C 08 03 A6 */ mtlr r0 /* 80186630 00183570 38 21 00 30 */ addi r1, r1, 0x30 @@ -3344,7 +3344,7 @@ lbl_80186620: /* 8018663C 0018357C 7C 08 02 A6 */ mflr r0 /* 80186640 00183580 90 01 00 24 */ stw r0, 0x24(r1) /* 80186644 00183584 39 61 00 20 */ addi r11, r1, 0x20 -/* 80186648 00183588 48 1D BB 91 */ bl func_803621D8 +/* 80186648 00183588 48 1D BB 91 */ bl _savegpr_28 /* 8018664C 0018358C 7C 7C 1B 78 */ mr r28, r3 /* 80186650 00183590 48 00 6C 0D */ bl dFile_select_c_NS_headerTxtChangeAnm /* 80186654 00183594 7C 7D 1B 78 */ mr r29, r3 @@ -3372,7 +3372,7 @@ lbl_80186620: /* 801866AC 001835EC 98 1C 02 6F */ stb r0, 0x26f(r28) lbl_801866B0: /* 801866B0 001835F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801866B4 001835F4 48 1D BB 71 */ bl func_80362224 +/* 801866B4 001835F4 48 1D BB 71 */ bl _restgpr_28 /* 801866B8 001835F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801866BC 001835FC 7C 08 03 A6 */ mtlr r0 /* 801866C0 00183600 38 21 00 20 */ addi r1, r1, 0x20 @@ -3381,7 +3381,7 @@ lbl_801866B0: /* 801866CC 0018360C 7C 08 02 A6 */ mflr r0 /* 801866D0 00183610 90 01 00 24 */ stw r0, 0x24(r1) /* 801866D4 00183614 39 61 00 20 */ addi r11, r1, 0x20 -/* 801866D8 00183618 48 1D BB 01 */ bl func_803621D8 +/* 801866D8 00183618 48 1D BB 01 */ bl _savegpr_28 /* 801866DC 0018361C 7C 7C 1B 78 */ mr r28, r3 /* 801866E0 00183620 48 00 6B 7D */ bl dFile_select_c_NS_headerTxtChangeAnm /* 801866E4 00183624 7C 7D 1B 78 */ mr r29, r3 @@ -3416,7 +3416,7 @@ lbl_801866B0: /* 80186758 00183698 98 1C 02 6F */ stb r0, 0x26f(r28) lbl_8018675C: /* 8018675C 0018369C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80186760 001836A0 48 1D BA C5 */ bl func_80362224 +/* 80186760 001836A0 48 1D BA C5 */ bl _restgpr_28 /* 80186764 001836A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80186768 001836A8 7C 08 03 A6 */ mtlr r0 /* 8018676C 001836AC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3686,7 +3686,7 @@ dFile_select_c_NS_menuMoveAnmInitSet: /* 80186B4C 00183A8C 7C 08 02 A6 */ mflr r0 /* 80186B50 00183A90 90 01 00 44 */ stw r0, 0x44(r1) /* 80186B54 00183A94 39 61 00 40 */ addi r11, r1, 0x40 -/* 80186B58 00183A98 48 1D B6 7D */ bl func_803621D4 +/* 80186B58 00183A98 48 1D B6 7D */ bl _savegpr_27 /* 80186B5C 00183A9C 7C 7D 1B 78 */ mr r29, r3 /* 80186B60 00183AA0 7C 9E 23 78 */ mr r30, r4 /* 80186B64 00183AA4 7C BF 2B 78 */ mr r31, r5 @@ -3760,7 +3760,7 @@ lbl_80186C1C: /* 80186C64 00183BA4 80 7D 01 18 */ lwz r3, 0x118(r29) /* 80186C68 00183BA8 48 17 13 65 */ bl J2DPane_NS_animationTransform /* 80186C6C 00183BAC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80186C70 00183BB0 48 1D B5 B1 */ bl func_80362220 +/* 80186C70 00183BB0 48 1D B5 B1 */ bl _restgpr_27 /* 80186C74 00183BB4 80 01 00 44 */ lwz r0, 0x44(r1) /* 80186C78 00183BB8 7C 08 03 A6 */ mtlr r0 /* 80186C7C 00183BBC 38 21 00 40 */ addi r1, r1, 0x40 @@ -4151,7 +4151,7 @@ lbl_80187204: /* 80187220 00184160 7C 08 02 A6 */ mflr r0 /* 80187224 00184164 90 01 00 24 */ stw r0, 0x24(r1) /* 80187228 00184168 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018722C 0018416C 48 1D AF A9 */ bl func_803621D4 +/* 8018722C 0018416C 48 1D AF A9 */ bl _savegpr_27 /* 80187230 00184170 7C 7B 1B 78 */ mr r27, r3 /* 80187234 00184174 48 00 60 29 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 80187238 00184178 7C 7C 1B 78 */ mr r28, r3 @@ -4185,7 +4185,7 @@ lbl_80187204: /* 801872A8 001841E8 98 1B 02 6F */ stb r0, 0x26f(r27) lbl_801872AC: /* 801872AC 001841EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801872B0 001841F0 48 1D AF 71 */ bl func_80362220 +/* 801872B0 001841F0 48 1D AF 71 */ bl _restgpr_27 /* 801872B4 001841F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801872B8 001841F8 7C 08 03 A6 */ mtlr r0 /* 801872BC 001841FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -4323,7 +4323,7 @@ lbl_801874B0: /* 801874B4 001843F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801874B8 001843F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801874BC 001843FC 38 63 01 B4 */ addi r3, r3, 0x1b4 -/* 801874C0 00184400 48 1E 16 6D */ bl func_80368B2C +/* 801874C0 00184400 48 1E 16 6D */ bl strcpy /* 801874C4 00184404 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801874C8 00184408 80 63 00 20 */ lwz r3, 0x20(r3) /* 801874CC 0018440C C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) @@ -4342,7 +4342,7 @@ lbl_801874E4: /* 801874FC 0018443C 7C 08 02 A6 */ mflr r0 /* 80187500 00184440 90 01 00 24 */ stw r0, 0x24(r1) /* 80187504 00184444 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187508 00184448 48 1D AC D1 */ bl func_803621D8 +/* 80187508 00184448 48 1D AC D1 */ bl _savegpr_28 /* 8018750C 0018444C 7C 7C 1B 78 */ mr r28, r3 /* 80187510 00184450 48 00 5D 4D */ bl dFile_select_c_NS_headerTxtChangeAnm /* 80187514 00184454 7C 7D 1B 78 */ mr r29, r3 @@ -4375,7 +4375,7 @@ lbl_801874E4: /* 80187580 001844C0 98 1C 02 6F */ stb r0, 0x26f(r28) lbl_80187584: /* 80187584 001844C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187588 001844C8 48 1D AC 9D */ bl func_80362224 +/* 80187588 001844C8 48 1D AC 9D */ bl _restgpr_28 /* 8018758C 001844CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80187590 001844D0 7C 08 03 A6 */ mtlr r0 /* 80187594 001844D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -4428,11 +4428,11 @@ lbl_80187584: /* 80187650 00184590 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l /* 80187654 00184594 38 7F 01 C5 */ addi r3, r31, 0x1c5 /* 80187658 00184598 38 81 00 08 */ addi r4, r1, 8 -/* 8018765C 0018459C 48 1E 14 D1 */ bl func_80368B2C +/* 8018765C 0018459C 48 1E 14 D1 */ bl strcpy /* 80187660 001845A0 38 9F 01 C5 */ addi r4, r31, 0x1c5 /* 80187664 001845A4 80 7E 00 68 */ lwz r3, 0x68(r30) /* 80187668 001845A8 38 63 03 1C */ addi r3, r3, 0x31c -/* 8018766C 001845AC 48 1E 14 C1 */ bl func_80368B2C +/* 8018766C 001845AC 48 1E 14 C1 */ bl strcpy /* 80187670 001845B0 80 7E 00 68 */ lwz r3, 0x68(r30) /* 80187674 001845B4 48 0C 71 31 */ bl dName_c_NS_initial /* 80187678 001845B8 38 00 00 0F */ li r0, 0xf @@ -4538,7 +4538,7 @@ lbl_801877EC: /* 801877F0 00184730 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801877F4 00184734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801877F8 00184738 38 63 01 C5 */ addi r3, r3, 0x1c5 -/* 801877FC 0018473C 48 1E 13 31 */ bl func_80368B2C +/* 801877FC 0018473C 48 1E 13 31 */ bl strcpy /* 80187800 00184740 38 00 00 01 */ li r0, 1 /* 80187804 00184744 98 1F 02 70 */ stb r0, 0x270(r31) /* 80187808 00184748 38 00 00 2E */ li r0, 0x2e @@ -4591,7 +4591,7 @@ lbl_80187810: /* 801878C0 00184800 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801878C4 00184804 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801878C8 00184808 38 63 03 1C */ addi r3, r3, 0x31c -/* 801878CC 0018480C 48 1E 12 61 */ bl func_80368B2C +/* 801878CC 0018480C 48 1E 12 61 */ bl strcpy /* 801878D0 00184810 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801878D4 00184814 48 0C 6E D1 */ bl dName_c_NS_initial /* 801878D8 00184818 7F E3 FB 78 */ mr r3, r31 @@ -4656,7 +4656,7 @@ lbl_801879A4: /* 801879BC 001848FC 7C 08 02 A6 */ mflr r0 /* 801879C0 00184900 90 01 00 44 */ stw r0, 0x44(r1) /* 801879C4 00184904 39 61 00 40 */ addi r11, r1, 0x40 -/* 801879C8 00184908 48 1D A8 0D */ bl func_803621D4 +/* 801879C8 00184908 48 1D A8 0D */ bl _savegpr_27 /* 801879CC 0018490C 7C 7F 1B 78 */ mr r31, r3 /* 801879D0 00184910 48 00 58 8D */ bl dFile_select_c_NS_headerTxtChangeAnm /* 801879D4 00184914 7C 7B 1B 78 */ mr r27, r3 @@ -4721,7 +4721,7 @@ lbl_801879A4: /* 80187AC0 00184A00 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80187AC4: /* 80187AC4 00184A04 39 61 00 40 */ addi r11, r1, 0x40 -/* 80187AC8 00184A08 48 1D A7 59 */ bl func_80362220 +/* 80187AC8 00184A08 48 1D A7 59 */ bl _restgpr_27 /* 80187ACC 00184A0C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80187AD0 00184A10 7C 08 03 A6 */ mtlr r0 /* 80187AD4 00184A14 38 21 00 40 */ addi r1, r1, 0x40 @@ -4757,7 +4757,7 @@ lbl_80187B2C: /* 80187B48 00184A88 7C 08 02 A6 */ mflr r0 /* 80187B4C 00184A8C 90 01 00 24 */ stw r0, 0x24(r1) /* 80187B50 00184A90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187B54 00184A94 48 1D A6 85 */ bl func_803621D8 +/* 80187B54 00184A94 48 1D A6 85 */ bl _savegpr_28 /* 80187B58 00184A98 7C 7C 1B 78 */ mr r28, r3 /* 80187B5C 00184A9C 48 00 57 01 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 80187B60 00184AA0 7C 7D 1B 78 */ mr r29, r3 @@ -4790,7 +4790,7 @@ lbl_80187B2C: /* 80187BCC 00184B0C 98 1C 02 6F */ stb r0, 0x26f(r28) lbl_80187BD0: /* 80187BD0 00184B10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187BD4 00184B14 48 1D A6 51 */ bl func_80362224 +/* 80187BD4 00184B14 48 1D A6 51 */ bl _restgpr_28 /* 80187BD8 00184B18 80 01 00 24 */ lwz r0, 0x24(r1) /* 80187BDC 00184B1C 7C 08 03 A6 */ mtlr r0 /* 80187BE0 00184B20 38 21 00 20 */ addi r1, r1, 0x20 @@ -5727,7 +5727,7 @@ lbl_8018898C: /* 80188998 001858D8 7C 08 02 A6 */ mflr r0 /* 8018899C 001858DC 90 01 00 34 */ stw r0, 0x34(r1) /* 801889A0 001858E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801889A4 001858E4 48 1D 98 31 */ bl func_803621D4 +/* 801889A4 001858E4 48 1D 98 31 */ bl _savegpr_27 /* 801889A8 001858E8 7C 7D 1B 78 */ mr r29, r3 /* 801889AC 001858EC 48 00 48 B1 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 801889B0 001858F0 7C 7B 1B 78 */ mr r27, r3 @@ -5834,7 +5834,7 @@ lbl_80188AB8: /* 80188B38 00185A78 98 1D 02 6F */ stb r0, 0x26f(r29) lbl_80188B3C: /* 80188B3C 00185A7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80188B40 00185A80 48 1D 96 E1 */ bl func_80362220 +/* 80188B40 00185A80 48 1D 96 E1 */ bl _restgpr_27 /* 80188B44 00185A84 80 01 00 34 */ lwz r0, 0x34(r1) /* 80188B48 00185A88 7C 08 03 A6 */ mtlr r0 /* 80188B4C 00185A8C 38 21 00 30 */ addi r1, r1, 0x30 @@ -6849,7 +6849,7 @@ lbl_801899F8: /* 80189A28 00186968 7C 08 02 A6 */ mflr r0 /* 80189A2C 0018696C 90 01 00 34 */ stw r0, 0x34(r1) /* 80189A30 00186970 39 61 00 30 */ addi r11, r1, 0x30 -/* 80189A34 00186974 48 1D 87 A5 */ bl func_803621D8 +/* 80189A34 00186974 48 1D 87 A5 */ bl _savegpr_28 /* 80189A38 00186978 7C 7F 1B 78 */ mr r31, r3 /* 80189A3C 0018697C 48 00 38 21 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 80189A40 00186980 7C 7D 1B 78 */ mr r29, r3 @@ -6948,7 +6948,7 @@ lbl_80189B7C: /* 80189B8C 00186ACC 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80189B90: /* 80189B90 00186AD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80189B94 00186AD4 48 1D 86 91 */ bl func_80362224 +/* 80189B94 00186AD4 48 1D 86 91 */ bl _restgpr_28 /* 80189B98 00186AD8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80189B9C 00186ADC 7C 08 03 A6 */ mtlr r0 /* 80189BA0 00186AE0 38 21 00 30 */ addi r1, r1, 0x30 @@ -7709,7 +7709,7 @@ lbl_8018A6E4: /* 8018A6FC 0018763C 7C 08 02 A6 */ mflr r0 /* 8018A700 00187640 90 01 00 24 */ stw r0, 0x24(r1) /* 8018A704 00187644 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A708 00187648 48 1D 7A D1 */ bl func_803621D8 +/* 8018A708 00187648 48 1D 7A D1 */ bl _savegpr_28 /* 8018A70C 0018764C 7C 7F 1B 78 */ mr r31, r3 /* 8018A710 00187650 88 03 02 6D */ lbz r0, 0x26d(r3) /* 8018A714 00187654 54 00 10 3A */ slwi r0, r0, 2 @@ -7796,7 +7796,7 @@ lbl_8018A7CC: /* 8018A84C 0018778C 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_8018A850: /* 8018A850 00187790 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A854 00187794 48 1D 79 D1 */ bl func_80362224 +/* 8018A854 00187794 48 1D 79 D1 */ bl _restgpr_28 /* 8018A858 00187798 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018A85C 0018779C 7C 08 03 A6 */ mtlr r0 /* 8018A860 001877A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -7871,7 +7871,7 @@ lbl_8018A948: /* 8018A964 001878A4 7C 08 02 A6 */ mflr r0 /* 8018A968 001878A8 90 01 00 24 */ stw r0, 0x24(r1) /* 8018A96C 001878AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A970 001878B0 48 1D 78 65 */ bl func_803621D4 +/* 8018A970 001878B0 48 1D 78 65 */ bl _savegpr_27 /* 8018A974 001878B4 7C 7E 1B 78 */ mr r30, r3 /* 8018A978 001878B8 48 00 28 E5 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 8018A97C 001878BC 54 7F 06 3E */ clrlwi r31, r3, 0x18 @@ -7954,7 +7954,7 @@ lbl_8018AA28: /* 8018AAA8 001879E8 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_8018AAAC: /* 8018AAAC 001879EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018AAB0 001879F0 48 1D 77 71 */ bl func_80362220 +/* 8018AAB0 001879F0 48 1D 77 71 */ bl _restgpr_27 /* 8018AAB4 001879F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018AAB8 001879F8 7C 08 03 A6 */ mtlr r0 /* 8018AABC 001879FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -10314,7 +10314,7 @@ dFile_select_c_NS_setWakuAnm: /* 8018CE3C 00189D7C 7C 08 02 A6 */ mflr r0 /* 8018CE40 00189D80 90 01 00 24 */ stw r0, 0x24(r1) /* 8018CE44 00189D84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018CE48 00189D88 48 1D 53 91 */ bl func_803621D8 +/* 8018CE48 00189D88 48 1D 53 91 */ bl _savegpr_28 /* 8018CE4C 00189D8C 7C 7C 1B 78 */ mr r28, r3 /* 8018CE50 00189D90 C0 02 9F B0 */ lfs f0, lbl_804539B0-_SDA2_BASE_(r2) /* 8018CE54 00189D94 80 63 00 98 */ lwz r3, 0x98(r3) @@ -10376,7 +10376,7 @@ lbl_8018CE64: /* 8018CF30 00189E70 3B FF 00 04 */ addi r31, r31, 4 /* 8018CF34 00189E74 41 80 FF 30 */ blt lbl_8018CE64 /* 8018CF38 00189E78 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018CF3C 00189E7C 48 1D 52 E9 */ bl func_80362224 +/* 8018CF3C 00189E7C 48 1D 52 E9 */ bl _restgpr_28 /* 8018CF40 00189E80 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018CF44 00189E84 7C 08 03 A6 */ mtlr r0 /* 8018CF48 00189E88 38 21 00 20 */ addi r1, r1, 0x20 @@ -10452,7 +10452,7 @@ dFile_select_c_NS_setSaveData: /* 8018D048 00189F88 7C 08 02 A6 */ mflr r0 /* 8018D04C 00189F8C 90 01 00 24 */ stw r0, 0x24(r1) /* 8018D050 00189F90 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D054 00189F94 48 1D 51 85 */ bl func_803621D8 +/* 8018D054 00189F94 48 1D 51 85 */ bl _savegpr_28 /* 8018D058 00189F98 7C 7C 1B 78 */ mr r28, r3 /* 8018D05C 00189F9C 3B DC 03 B8 */ addi r30, r28, 0x3b8 /* 8018D060 00189FA0 3B A0 00 00 */ li r29, 0 @@ -10486,7 +10486,7 @@ lbl_8018D0B8: /* 8018D0C4 0018A004 3B FF 00 04 */ addi r31, r31, 4 /* 8018D0C8 0018A008 41 80 FF A0 */ blt lbl_8018D068 /* 8018D0CC 0018A00C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D0D0 0018A010 48 1D 51 55 */ bl func_80362224 +/* 8018D0D0 0018A010 48 1D 51 55 */ bl _restgpr_28 /* 8018D0D4 0018A014 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018D0D8 0018A018 7C 08 03 A6 */ mtlr r0 /* 8018D0DC 0018A01C 38 21 00 20 */ addi r1, r1, 0x20 @@ -10518,7 +10518,7 @@ lbl_8018D11C: /* 8018D134 0018A074 3C 80 80 39 */ lis r4, lbl_80394388@ha /* 8018D138 0018A078 38 84 43 88 */ addi r4, r4, lbl_80394388@l /* 8018D13C 0018A07C 38 84 00 6B */ addi r4, r4, 0x6b -/* 8018D140 0018A080 48 1D B9 ED */ bl func_80368B2C +/* 8018D140 0018A080 48 1D B9 ED */ bl strcpy /* 8018D144 0018A084 48 00 00 C4 */ b lbl_8018D208 lbl_8018D148: /* 8018D148 0018A088 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d @@ -10602,7 +10602,7 @@ dFile_select_c_NS_headerTxtChangeAnm: /* 8018D260 0018A1A0 7C 08 02 A6 */ mflr r0 /* 8018D264 0018A1A4 90 01 00 24 */ stw r0, 0x24(r1) /* 8018D268 0018A1A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D26C 0018A1AC 48 1D 4F 6D */ bl func_803621D8 +/* 8018D26C 0018A1AC 48 1D 4F 6D */ bl _savegpr_28 /* 8018D270 0018A1B0 7C 7F 1B 78 */ mr r31, r3 /* 8018D274 0018A1B4 88 03 02 1D */ lbz r0, 0x21d(r3) /* 8018D278 0018A1B8 28 00 00 00 */ cmplwi r0, 0 @@ -10654,7 +10654,7 @@ lbl_8018D328: /* 8018D328 0018A268 7F 83 E3 78 */ mr r3, r28 lbl_8018D32C: /* 8018D32C 0018A26C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D330 0018A270 48 1D 4E F5 */ bl func_80362224 +/* 8018D330 0018A270 48 1D 4E F5 */ bl _restgpr_28 /* 8018D334 0018A274 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018D338 0018A278 7C 08 03 A6 */ mtlr r0 /* 8018D33C 0018A27C 38 21 00 20 */ addi r1, r1, 0x20 @@ -12416,7 +12416,7 @@ lbl_8018ECA8: /* 8018ECC0 0018BC00 7C 08 02 A6 */ mflr r0 /* 8018ECC4 0018BC04 90 01 00 24 */ stw r0, 0x24(r1) /* 8018ECC8 0018BC08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018ECCC 0018BC0C 48 1D 35 0D */ bl func_803621D8 +/* 8018ECCC 0018BC0C 48 1D 35 0D */ bl _savegpr_28 /* 8018ECD0 0018BC10 7C 7C 1B 78 */ mr r28, r3 /* 8018ECD4 0018BC14 48 00 10 5D */ bl dFile_select_c_NS_errorTxtChangeAnm /* 8018ECD8 0018BC18 7C 7F 1B 78 */ mr r31, r3 @@ -12460,7 +12460,7 @@ lbl_8018ED60: /* 8018ED64 0018BCA4 98 1C 02 71 */ stb r0, 0x271(r28) lbl_8018ED68: /* 8018ED68 0018BCA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018ED6C 0018BCAC 48 1D 34 B9 */ bl func_80362224 +/* 8018ED6C 0018BCAC 48 1D 34 B9 */ bl _restgpr_28 /* 8018ED70 0018BCB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018ED74 0018BCB4 7C 08 03 A6 */ mtlr r0 /* 8018ED78 0018BCB8 38 21 00 20 */ addi r1, r1, 0x20 @@ -12516,7 +12516,7 @@ lbl_8018EDF0: /* 8018EE3C 0018BD7C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l /* 8018EE40 0018BD80 38 7E 01 B4 */ addi r3, r30, 0x1b4 /* 8018EE44 0018BD84 38 81 00 08 */ addi r4, r1, 8 -/* 8018EE48 0018BD88 48 1D 9C E5 */ bl func_80368B2C +/* 8018EE48 0018BD88 48 1D 9C E5 */ bl strcpy /* 8018EE4C 0018BD8C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8018EE50 0018BD90 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8018EE54 0018BD94 38 80 03 83 */ li r4, 0x383 @@ -12525,11 +12525,11 @@ lbl_8018EDF0: /* 8018EE60 0018BDA0 48 08 D3 F1 */ bl dMeter2Info_c_NS_getString /* 8018EE64 0018BDA4 38 7E 01 C5 */ addi r3, r30, 0x1c5 /* 8018EE68 0018BDA8 38 81 00 08 */ addi r4, r1, 8 -/* 8018EE6C 0018BDAC 48 1D 9C C1 */ bl func_80368B2C +/* 8018EE6C 0018BDAC 48 1D 9C C1 */ bl strcpy /* 8018EE70 0018BDB0 38 9E 01 B4 */ addi r4, r30, 0x1b4 /* 8018EE74 0018BDB4 80 7F 00 68 */ lwz r3, 0x68(r31) /* 8018EE78 0018BDB8 38 63 03 1C */ addi r3, r3, 0x31c -/* 8018EE7C 0018BDBC 48 1D 9C B1 */ bl func_80368B2C +/* 8018EE7C 0018BDBC 48 1D 9C B1 */ bl strcpy /* 8018EE80 0018BDC0 80 7F 00 68 */ lwz r3, 0x68(r31) /* 8018EE84 0018BDC4 48 0B F9 21 */ bl dName_c_NS_initial /* 8018EE88 0018BDC8 7F E3 FB 78 */ mr r3, r31 @@ -13508,7 +13508,7 @@ dFile_select_c_NS_errorTxtSet: /* 8018FC98 0018CBD8 3C 80 80 39 */ lis r4, lbl_80394388@ha /* 8018FC9C 0018CBDC 38 84 43 88 */ addi r4, r4, lbl_80394388@l /* 8018FCA0 0018CBE0 38 84 00 6B */ addi r4, r4, 0x6b -/* 8018FCA4 0018CBE4 48 1D 8E 89 */ bl func_80368B2C +/* 8018FCA4 0018CBE4 48 1D 8E 89 */ bl strcpy /* 8018FCA8 0018CBE8 48 00 00 40 */ b lbl_8018FCE8 lbl_8018FCAC: /* 8018FCAC 0018CBEC 88 1F 01 48 */ lbz r0, 0x148(r31) @@ -13552,7 +13552,7 @@ dFile_select_c_NS_errorTxtChangeAnm: /* 8018FD34 0018CC74 7C 08 02 A6 */ mflr r0 /* 8018FD38 0018CC78 90 01 00 24 */ stw r0, 0x24(r1) /* 8018FD3C 0018CC7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018FD40 0018CC80 48 1D 24 99 */ bl func_803621D8 +/* 8018FD40 0018CC80 48 1D 24 99 */ bl _savegpr_28 /* 8018FD44 0018CC84 7C 7F 1B 78 */ mr r31, r3 /* 8018FD48 0018CC88 88 03 01 49 */ lbz r0, 0x149(r3) /* 8018FD4C 0018CC8C 28 00 00 00 */ cmplwi r0, 0 @@ -13604,7 +13604,7 @@ lbl_8018FDFC: /* 8018FDFC 0018CD3C 7F 83 E3 78 */ mr r3, r28 lbl_8018FE00: /* 8018FE00 0018CD40 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018FE04 0018CD44 48 1D 24 21 */ bl func_80362224 +/* 8018FE04 0018CD44 48 1D 24 21 */ bl _restgpr_28 /* 8018FE08 0018CD48 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018FE0C 0018CD4C 7C 08 03 A6 */ mtlr r0 /* 8018FE10 0018CD50 38 21 00 20 */ addi r1, r1, 0x20 @@ -13680,7 +13680,7 @@ dFile_select_c_NS_fileRecScaleAnm2: /* 8018FEF8 0018CE38 7C 08 02 A6 */ mflr r0 /* 8018FEFC 0018CE3C 90 01 00 34 */ stw r0, 0x34(r1) /* 8018FF00 0018CE40 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018FF04 0018CE44 48 1D 22 D1 */ bl func_803621D4 +/* 8018FF04 0018CE44 48 1D 22 D1 */ bl _savegpr_27 /* 8018FF08 0018CE48 7C 7B 1B 78 */ mr r27, r3 /* 8018FF0C 0018CE4C 3B 80 00 00 */ li r28, 0 /* 8018FF10 0018CE50 3B C0 00 00 */ li r30, 0 @@ -13716,7 +13716,7 @@ lbl_8018FF80: /* 8018FF80 0018CEC0 38 60 00 00 */ li r3, 0 lbl_8018FF84: /* 8018FF84 0018CEC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018FF88 0018CEC8 48 1D 22 99 */ bl func_80362220 +/* 8018FF88 0018CEC8 48 1D 22 99 */ bl _restgpr_27 /* 8018FF8C 0018CECC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018FF90 0018CED0 7C 08 03 A6 */ mtlr r0 /* 8018FF94 0018CED4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/file/sel/d_file_sel_info.s b/asm/d/file/sel/d_file_sel_info.s index f7eda0b128..c525ac6c34 100644 --- a/asm/d/file/sel/d_file_sel_info.s +++ b/asm/d/file/sel/d_file_sel_info.s @@ -380,17 +380,17 @@ dFile_info_c_NS_setSaveData: /* 801929C4 0018F904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801929C8 0018F908 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801929CC 0018F90C 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 801929D0 0018F910 48 1D 61 5D */ bl func_80368B2C +/* 801929D0 0018F910 48 1D 61 5D */ bl strcpy /* 801929D4 0018F914 80 7F 00 30 */ lwz r3, 0x30(r31) /* 801929D8 0018F918 3C 80 80 39 */ lis r4, lbl_803948B8@ha /* 801929DC 0018F91C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l /* 801929E0 0018F920 38 84 00 20 */ addi r4, r4, 0x20 -/* 801929E4 0018F924 48 1D 61 49 */ bl func_80368B2C +/* 801929E4 0018F924 48 1D 61 49 */ bl strcpy /* 801929E8 0018F928 80 7F 00 34 */ lwz r3, 0x34(r31) /* 801929EC 0018F92C 3C 80 80 39 */ lis r4, lbl_803948B8@ha /* 801929F0 0018F930 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l /* 801929F4 0018F934 38 84 00 20 */ addi r4, r4, 0x20 -/* 801929F8 0018F938 48 1D 61 35 */ bl func_80368B2C +/* 801929F8 0018F938 48 1D 61 35 */ bl strcpy /* 801929FC 0018F93C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80192A00 0018F940 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80192A04 0018F944 38 80 00 4D */ li r4, 0x4d @@ -412,7 +412,7 @@ lbl_80192A3C: /* 80192A3C 0018F97C 48 00 00 65 */ bl dFile_info_c_NS_setHeartCnt /* 80192A40 0018F980 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80192A44 0018F984 7F C4 F3 78 */ mr r4, r30 -/* 80192A48 0018F988 48 1D 60 E5 */ bl func_80368B2C +/* 80192A48 0018F988 48 1D 60 E5 */ bl strcpy /* 80192A4C 0018F98C 7F E3 FB 78 */ mr r3, r31 /* 80192A50 0018F990 7F A4 EB 78 */ mr r4, r29 /* 80192A54 0018F994 48 00 01 B5 */ bl dFile_info_c_NS_setSaveDate @@ -571,7 +571,7 @@ dFile_info_c_NS_setPlayTime: /* 80192C74 0018FBB4 7C 08 02 A6 */ mflr r0 /* 80192C78 0018FBB8 90 01 00 24 */ stw r0, 0x24(r1) /* 80192C7C 0018FBBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192C80 0018FBC0 48 1C F5 59 */ bl func_803621D8 +/* 80192C80 0018FBC0 48 1C F5 59 */ bl _savegpr_28 /* 80192C84 0018FBC4 7C 7C 1B 78 */ mr r28, r3 /* 80192C88 0018FBC8 80 64 01 A8 */ lwz r3, 0x1a8(r4) /* 80192C8C 0018FBCC 80 84 01 AC */ lwz r4, 0x1ac(r4) @@ -622,7 +622,7 @@ lbl_80192CF0: /* 80192D3C 0018FC7C 48 1D 37 A1 */ bl func_803664DC lbl_80192D40: /* 80192D40 0018FC80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192D44 0018FC84 48 1C F4 E1 */ bl func_80362224 +/* 80192D44 0018FC84 48 1C F4 E1 */ bl _restgpr_28 /* 80192D48 0018FC88 80 01 00 24 */ lwz r0, 0x24(r1) /* 80192D4C 0018FC8C 7C 08 03 A6 */ mtlr r0 /* 80192D50 0018FC90 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/jnt/d_jnt_col.s b/asm/d/jnt/d_jnt_col.s index 32bc35e7a2..93193c41a2 100644 --- a/asm/d/jnt/d_jnt_col.s +++ b/asm/d/jnt/d_jnt_col.s @@ -1002,7 +1002,7 @@ lbl_80036AD4: /* 80036AF0 00033A30 7C 08 02 A6 */ mflr r0 /* 80036AF4 00033A34 90 01 00 54 */ stw r0, 0x54(r1) /* 80036AF8 00033A38 39 61 00 50 */ addi r11, r1, 0x50 -/* 80036AFC 00033A3C 48 32 B6 DD */ bl func_803621D8 +/* 80036AFC 00033A3C 48 32 B6 DD */ bl _savegpr_28 /* 80036B00 00033A40 7C 7C 1B 78 */ mr r28, r3 /* 80036B04 00033A44 7C 9F 23 78 */ mr r31, r4 /* 80036B08 00033A48 7C DD 33 78 */ mr r29, r6 @@ -1084,7 +1084,7 @@ lbl_80036BC0: /* 80036C28 00033B68 90 01 00 38 */ stw r0, 0x38(r1) lbl_80036C2C: /* 80036C2C 00033B6C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80036C30 00033B70 48 32 B5 F5 */ bl func_80362224 +/* 80036C30 00033B70 48 32 B5 F5 */ bl _restgpr_28 /* 80036C34 00033B74 80 01 00 54 */ lwz r0, 0x54(r1) /* 80036C38 00033B78 7C 08 03 A6 */ mtlr r0 /* 80036C3C 00033B7C 38 21 00 50 */ addi r1, r1, 0x50 @@ -1098,7 +1098,7 @@ dJntCol_c_NS_getHitmarkPosAndAngle: /* 80036C50 00033B90 DB E1 00 C0 */ stfd f31, 0xc0(r1) /* 80036C54 00033B94 F3 E1 00 C8 */ psq_st f31, 200(r1), 0, qr0 /* 80036C58 00033B98 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80036C5C 00033B9C 48 32 B5 79 */ bl func_803621D4 +/* 80036C5C 00033B9C 48 32 B5 79 */ bl _savegpr_27 /* 80036C60 00033BA0 7C 7B 1B 78 */ mr r27, r3 /* 80036C64 00033BA4 7C 9F 23 78 */ mr r31, r4 /* 80036C68 00033BA8 7C DC 33 78 */ mr r28, r6 @@ -1320,7 +1320,7 @@ lbl_80036F88: /* 80036F88 00033EC8 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0 /* 80036F8C 00033ECC CB E1 00 C0 */ lfd f31, 0xc0(r1) /* 80036F90 00033ED0 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80036F94 00033ED4 48 32 B2 8D */ bl func_80362220 +/* 80036F94 00033ED4 48 32 B2 8D */ bl _restgpr_27 /* 80036F98 00033ED8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80036F9C 00033EDC 7C 08 03 A6 */ mtlr r0 /* 80036FA0 00033EE0 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -1329,7 +1329,7 @@ lbl_80036F88: /* 80036FAC 00033EEC 7C 08 02 A6 */ mflr r0 /* 80036FB0 00033EF0 90 01 00 34 */ stw r0, 0x34(r1) /* 80036FB4 00033EF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80036FB8 00033EF8 48 32 B2 1D */ bl func_803621D4 +/* 80036FB8 00033EF8 48 32 B2 1D */ bl _savegpr_27 /* 80036FBC 00033EFC 7C 7B 1B 78 */ mr r27, r3 /* 80036FC0 00033F00 7C 9C 23 78 */ mr r28, r4 /* 80036FC4 00033F04 7C FD 3B 78 */ mr r29, r7 @@ -1356,7 +1356,7 @@ lbl_80036F88: /* 80037018 00033F58 7F A5 EB 78 */ mr r5, r29 /* 8003701C 00033F5C 48 30 FD 51 */ bl PSMTXMultVec /* 80037020 00033F60 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037024 00033F64 48 32 B1 FD */ bl func_80362220 +/* 80037024 00033F64 48 32 B1 FD */ bl _restgpr_27 /* 80037028 00033F68 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003702C 00033F6C 7C 08 03 A6 */ mtlr r0 /* 80037030 00033F70 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/k/d_k_wpillar.s b/asm/d/k/d_k_wpillar.s index f2bd2f5b3d..0e540053eb 100644 --- a/asm/d/k/d_k_wpillar.s +++ b/asm/d/k/d_k_wpillar.s @@ -9,7 +9,7 @@ dkWpillar_c_NS_create: /* 80261B58 0025EA98 7C 08 02 A6 */ mflr r0 /* 80261B5C 0025EA9C 90 01 00 34 */ stw r0, 0x34(r1) /* 80261B60 0025EAA0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80261B64 0025EAA4 48 10 06 75 */ bl func_803621D8 +/* 80261B64 0025EAA4 48 10 06 75 */ bl _savegpr_28 /* 80261B68 0025EAA8 7C 7F 1B 78 */ mr r31, r3 /* 80261B6C 0025EAAC 28 03 00 00 */ cmplwi r3, 0 /* 80261B70 0025EAB0 41 82 00 A4 */ beq lbl_80261C14 @@ -249,7 +249,7 @@ lbl_80261EA0: /* 80261EE8 0025EE28 38 60 00 04 */ li r3, 4 lbl_80261EEC: /* 80261EEC 0025EE2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80261EF0 0025EE30 48 10 03 35 */ bl func_80362224 +/* 80261EF0 0025EE30 48 10 03 35 */ bl _restgpr_28 /* 80261EF4 0025EE34 80 01 00 34 */ lwz r0, 0x34(r1) /* 80261EF8 0025EE38 7C 08 03 A6 */ mtlr r0 /* 80261EFC 0025EE3C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index a848ff263c..392ca888b5 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -285,7 +285,7 @@ dKyr_lenzflare_move: /* 8005BA4C 0005898C 7C 08 02 A6 */ mflr r0 /* 8005BA50 00058990 90 01 00 84 */ stw r0, 0x84(r1) /* 8005BA54 00058994 39 61 00 80 */ addi r11, r1, 0x80 -/* 8005BA58 00058998 48 30 67 81 */ bl func_803621D8 +/* 8005BA58 00058998 48 30 67 81 */ bl _savegpr_28 /* 8005BA5C 0005899C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005BA60 000589A0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005BA64 000589A4 83 E3 0E 74 */ lwz r31, 0xe74(r3) @@ -590,7 +590,7 @@ lbl_8005BEB0: /* 8005BEBC 00058DFC 41 80 FC BC */ blt lbl_8005BB78 lbl_8005BEC0: /* 8005BEC0 00058E00 39 61 00 80 */ addi r11, r1, 0x80 -/* 8005BEC4 00058E04 48 30 63 61 */ bl func_80362224 +/* 8005BEC4 00058E04 48 30 63 61 */ bl _restgpr_28 /* 8005BEC8 00058E08 80 01 00 84 */ lwz r0, 0x84(r1) /* 8005BECC 00058E0C 7C 08 03 A6 */ mtlr r0 /* 8005BED0 00058E10 38 21 00 80 */ addi r1, r1, 0x80 @@ -1742,7 +1742,7 @@ forward_overhead_bg_chk: /* 8005CF84 00059EC4 DB E1 00 E0 */ stfd f31, 0xe0(r1) /* 8005CF88 00059EC8 F3 E1 00 E8 */ psq_st f31, 232(r1), 0, qr0 /* 8005CF8C 00059ECC 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8005CF90 00059ED0 48 30 52 49 */ bl func_803621D8 +/* 8005CF90 00059ED0 48 30 52 49 */ bl _savegpr_28 /* 8005CF94 00059ED4 7C 7D 1B 78 */ mr r29, r3 /* 8005CF98 00059ED8 FF E0 08 90 */ fmr f31, f1 /* 8005CF9C 00059EDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1867,7 +1867,7 @@ lbl_8005D16C: /* 8005D16C 0005A0AC E3 E1 00 E8 */ psq_l f31, 232(r1), 0, qr0 /* 8005D170 0005A0B0 CB E1 00 E0 */ lfd f31, 0xe0(r1) /* 8005D174 0005A0B4 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8005D178 0005A0B8 48 30 50 AD */ bl func_80362224 +/* 8005D178 0005A0B8 48 30 50 AD */ bl _restgpr_28 /* 8005D17C 0005A0BC 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8005D180 0005A0C0 7C 08 03 A6 */ mtlr r0 /* 8005D184 0005A0C4 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -11754,7 +11754,7 @@ dKyr_drawSibuki: /* 80066074 00062FB4 DB 61 00 E0 */ stfd f27, 0xe0(r1) /* 80066078 00062FB8 F3 61 00 E8 */ psq_st f27, 232(r1), 0, qr0 /* 8006607C 00062FBC 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80066080 00062FC0 48 2F C1 55 */ bl func_803621D4 +/* 80066080 00062FC0 48 2F C1 55 */ bl _savegpr_27 /* 80066084 00062FC4 7C 7B 1B 78 */ mr r27, r3 /* 80066088 00062FC8 7C 9C 23 78 */ mr r28, r4 /* 8006608C 00062FCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -12064,7 +12064,7 @@ lbl_800664FC: /* 8006651C 0006345C E3 61 00 E8 */ psq_l f27, 232(r1), 0, qr0 /* 80066520 00063460 CB 61 00 E0 */ lfd f27, 0xe0(r1) /* 80066524 00063464 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80066528 00063468 48 2F BC F9 */ bl func_80362220 +/* 80066528 00063468 48 2F BC F9 */ bl _restgpr_27 /* 8006652C 0006346C 80 01 01 34 */ lwz r0, 0x134(r1) /* 80066530 00063470 7C 08 03 A6 */ mtlr r0 /* 80066534 00063474 38 21 01 30 */ addi r1, r1, 0x130 @@ -17202,7 +17202,7 @@ dKyr_thunder_move: /* 8006B1B4 000680F4 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8006B1B8 000680F8 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8006B1BC 000680FC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8006B1C0 00068100 48 2F 70 15 */ bl func_803621D4 +/* 8006B1C0 00068100 48 2F 70 15 */ bl _savegpr_27 /* 8006B1C4 00068104 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006B1C8 00068108 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 8006B1CC 0006810C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -17671,7 +17671,7 @@ lbl_8006B8BC: /* 8006B8BC 000687FC E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8006B8C0 00068800 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8006B8C4 00068804 39 61 00 60 */ addi r11, r1, 0x60 -/* 8006B8C8 00068808 48 2F 69 59 */ bl func_80362220 +/* 8006B8C8 00068808 48 2F 69 59 */ bl _restgpr_27 /* 8006B8CC 0006880C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8006B8D0 00068810 7C 08 03 A6 */ mtlr r0 /* 8006B8D4 00068814 38 21 00 70 */ addi r1, r1, 0x70 @@ -17711,7 +17711,7 @@ dKyr_odour_move: /* 8006B928 00068868 7C 08 02 A6 */ mflr r0 /* 8006B92C 0006886C 90 01 00 94 */ stw r0, 0x94(r1) /* 8006B930 00068870 39 61 00 90 */ addi r11, r1, 0x90 -/* 8006B934 00068874 48 2F 68 A5 */ bl func_803621D8 +/* 8006B934 00068874 48 2F 68 A5 */ bl _savegpr_28 /* 8006B938 00068878 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006B93C 0006887C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006B940 00068880 83 E3 0F 28 */ lwz r31, 0xf28(r3) @@ -18037,7 +18037,7 @@ lbl_8006BDE4: /* 8006BDF0 00068D30 41 80 FB E8 */ blt lbl_8006B9D8 lbl_8006BDF4: /* 8006BDF4 00068D34 39 61 00 90 */ addi r11, r1, 0x90 -/* 8006BDF8 00068D38 48 2F 64 2D */ bl func_80362224 +/* 8006BDF8 00068D38 48 2F 64 2D */ bl _restgpr_28 /* 8006BDFC 00068D3C 80 01 00 94 */ lwz r0, 0x94(r1) /* 8006BE00 00068D40 7C 08 03 A6 */ mtlr r0 /* 8006BE04 00068D44 38 21 00 90 */ addi r1, r1, 0x90 @@ -20633,7 +20633,7 @@ dKyr_near_bosslight_check: /* 8006E454 0006B394 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8006E458 0006B398 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8006E45C 0006B39C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8006E460 0006B3A0 48 2F 3D 75 */ bl func_803621D4 +/* 8006E460 0006B3A0 48 2F 3D 75 */ bl _savegpr_27 /* 8006E464 0006B3A4 7C 7D 1B 78 */ mr r29, r3 /* 8006E468 0006B3A8 C3 E2 8B F8 */ lfs f31, lbl_804525F8-_SDA2_BASE_(r2) /* 8006E46C 0006B3AC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -20796,7 +20796,7 @@ lbl_8006E67C: /* 8006E690 0006B5D0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8006E694 0006B5D4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8006E698 0006B5D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8006E69C 0006B5DC 48 2F 3B 85 */ bl func_80362220 +/* 8006E69C 0006B5DC 48 2F 3B 85 */ bl _restgpr_27 /* 8006E6A0 0006B5E0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8006E6A4 0006B5E4 7C 08 03 A6 */ mtlr r0 /* 8006E6A8 0006B5E8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/kankyo/d_kankyo_wether.s b/asm/d/kankyo/d_kankyo_wether.s index 238555da33..935b485da1 100644 --- a/asm/d/kankyo/d_kankyo_wether.s +++ b/asm/d/kankyo/d_kankyo_wether.s @@ -1797,7 +1797,7 @@ wether_move_sun: /* 8005831C 0005525C 7C 08 02 A6 */ mflr r0 /* 80058320 00055260 90 01 00 24 */ stw r0, 0x24(r1) /* 80058324 00055264 39 61 00 20 */ addi r11, r1, 0x20 -/* 80058328 00055268 48 30 9E B1 */ bl func_803621D8 +/* 80058328 00055268 48 30 9E B1 */ bl _savegpr_28 /* 8005832C 0005526C 3B 80 00 00 */ li r28, 0 /* 80058330 00055270 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80058334 00055274 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l @@ -2154,7 +2154,7 @@ lbl_80058874: /* 80058878 000557B8 48 00 31 D1 */ bl dKyr_lenzflare_move lbl_8005887C: /* 8005887C 000557BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80058880 000557C0 48 30 99 A5 */ bl func_80362224 +/* 80058880 000557C0 48 30 99 A5 */ bl _restgpr_28 /* 80058884 000557C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80058888 000557C8 7C 08 03 A6 */ mtlr r0 /* 8005888C 000557CC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3211,7 +3211,7 @@ wether_move_vrkumo: /* 80059754 00056694 DB 61 00 50 */ stfd f27, 0x50(r1) /* 80059758 00056698 F3 61 00 58 */ psq_st f27, 88(r1), 0, qr0 /* 8005975C 0005669C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80059760 000566A0 48 30 8A 79 */ bl func_803621D8 +/* 80059760 000566A0 48 30 8A 79 */ bl _savegpr_28 /* 80059764 000566A4 3B E0 00 00 */ li r31, 0 /* 80059768 000566A8 88 0D 89 60 */ lbz r0, lbl_80450EE0-_SDA_BASE_(r13) /* 8005976C 000566AC 7C 00 07 75 */ extsb. r0, r0 @@ -3682,7 +3682,7 @@ lbl_80059DF8: /* 80059E18 00056D58 E3 61 00 58 */ psq_l f27, 88(r1), 0, qr0 /* 80059E1C 00056D5C CB 61 00 50 */ lfd f27, 0x50(r1) /* 80059E20 00056D60 39 61 00 50 */ addi r11, r1, 0x50 -/* 80059E24 00056D64 48 30 84 01 */ bl func_80362224 +/* 80059E24 00056D64 48 30 84 01 */ bl _restgpr_28 /* 80059E28 00056D68 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80059E2C 00056D6C 7C 08 03 A6 */ mtlr r0 /* 80059E30 00056D70 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/asm/d/ky/d_ky_thunder.s b/asm/d/ky/d_ky_thunder.s index 59d1fe10c8..22fcd01a36 100644 --- a/asm/d/ky/d_ky_thunder.s +++ b/asm/d/ky/d_ky_thunder.s @@ -361,7 +361,7 @@ dThunder_c_NS_create: /* 801AE484 001AB3C4 DB 61 00 50 */ stfd f27, 0x50(r1) /* 801AE488 001AB3C8 F3 61 00 58 */ psq_st f27, 88(r1), 0, qr0 /* 801AE48C 001AB3CC 39 61 00 50 */ addi r11, r1, 0x50 -/* 801AE490 001AB3D0 48 1B 3D 45 */ bl func_803621D4 +/* 801AE490 001AB3D0 48 1B 3D 45 */ bl _savegpr_27 /* 801AE494 001AB3D4 7C 7D 1B 78 */ mr r29, r3 /* 801AE498 001AB3D8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AE49C 001AB3DC 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -671,7 +671,7 @@ lbl_801AE8F8: /* 801AE918 001AB858 E3 61 00 58 */ psq_l f27, 88(r1), 0, qr0 /* 801AE91C 001AB85C CB 61 00 50 */ lfd f27, 0x50(r1) /* 801AE920 001AB860 39 61 00 50 */ addi r11, r1, 0x50 -/* 801AE924 001AB864 48 1B 38 FD */ bl func_80362220 +/* 801AE924 001AB864 48 1B 38 FD */ bl _restgpr_27 /* 801AE928 001AB868 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801AE92C 001AB86C 7C 08 03 A6 */ mtlr r0 /* 801AE930 001AB870 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/asm/d/map/d_map_path.s b/asm/d/map/d_map_path.s index 827f79c280..03562aee53 100644 --- a/asm/d/map/d_map_path.s +++ b/asm/d/map/d_map_path.s @@ -51,7 +51,7 @@ dMpath_n_NS_dTexObjAggregate_c_NS_remove: /* 8003C8F8 00039838 7C 08 02 A6 */ mflr r0 /* 8003C8FC 0003983C 90 01 00 24 */ stw r0, 0x24(r1) /* 8003C900 00039840 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C904 00039844 48 32 58 D5 */ bl func_803621D8 +/* 8003C904 00039844 48 32 58 D5 */ bl _savegpr_28 /* 8003C908 00039848 7C 7C 1B 78 */ mr r28, r3 /* 8003C90C 0003984C 3B A0 00 00 */ li r29, 0 /* 8003C910 00039850 3B E0 00 00 */ li r31, 0 @@ -65,7 +65,7 @@ lbl_8003C918: /* 8003C92C 0003986C 3B FF 00 04 */ addi r31, r31, 4 /* 8003C930 00039870 41 80 FF E8 */ blt lbl_8003C918 /* 8003C934 00039874 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C938 00039878 48 32 58 ED */ bl func_80362224 +/* 8003C938 00039878 48 32 58 ED */ bl _restgpr_28 /* 8003C93C 0003987C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003C940 00039880 7C 08 03 A6 */ mtlr r0 /* 8003C944 00039884 38 21 00 20 */ addi r1, r1, 0x20 @@ -196,7 +196,7 @@ dDrawPath_c_NS_rendering_X2_: /* 8003CB04 00039A44 7C 08 02 A6 */ mflr r0 /* 8003CB08 00039A48 90 01 00 24 */ stw r0, 0x24(r1) /* 8003CB0C 00039A4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CB10 00039A50 48 32 56 C5 */ bl func_803621D4 +/* 8003CB10 00039A50 48 32 56 C5 */ bl _savegpr_27 /* 8003CB14 00039A54 7C 7B 1B 78 */ mr r27, r3 /* 8003CB18 00039A58 7C 9C 23 78 */ mr r28, r4 /* 8003CB1C 00039A5C 81 83 00 00 */ lwz r12, 0(r3) @@ -239,7 +239,7 @@ lbl_8003CB9C: /* 8003CBA0 00039AE0 41 80 FF DC */ blt lbl_8003CB7C lbl_8003CBA4: /* 8003CBA4 00039AE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CBA8 00039AE8 48 32 56 79 */ bl func_80362220 +/* 8003CBA8 00039AE8 48 32 56 79 */ bl _restgpr_27 /* 8003CBAC 00039AEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003CBB0 00039AF0 7C 08 03 A6 */ mtlr r0 /* 8003CBB4 00039AF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -251,7 +251,7 @@ dDrawPath_c_NS_rendering_X3_: /* 8003CBC0 00039B00 7C 08 02 A6 */ mflr r0 /* 8003CBC4 00039B04 90 01 00 24 */ stw r0, 0x24(r1) /* 8003CBC8 00039B08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CBCC 00039B0C 48 32 56 0D */ bl func_803621D8 +/* 8003CBCC 00039B0C 48 32 56 0D */ bl _savegpr_28 /* 8003CBD0 00039B10 7C 7C 1B 78 */ mr r28, r3 /* 8003CBD4 00039B14 80 04 00 04 */ lwz r0, 4(r4) /* 8003CBD8 00039B18 28 00 00 00 */ cmplwi r0, 0 @@ -271,7 +271,7 @@ lbl_8003CC04: /* 8003CC08 00039B48 41 80 FF E8 */ blt lbl_8003CBF0 lbl_8003CC0C: /* 8003CC0C 00039B4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CC10 00039B50 48 32 56 15 */ bl func_80362224 +/* 8003CC10 00039B50 48 32 56 15 */ bl _restgpr_28 /* 8003CC14 00039B54 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003CC18 00039B58 7C 08 03 A6 */ mtlr r0 /* 8003CC1C 00039B5C 38 21 00 20 */ addi r1, r1, 0x20 @@ -283,7 +283,7 @@ dDrawPath_c_NS_rendering_X4_: /* 8003CC28 00039B68 7C 08 02 A6 */ mflr r0 /* 8003CC2C 00039B6C 90 01 00 24 */ stw r0, 0x24(r1) /* 8003CC30 00039B70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CC34 00039B74 48 32 55 A5 */ bl func_803621D8 +/* 8003CC34 00039B74 48 32 55 A5 */ bl _savegpr_28 /* 8003CC38 00039B78 7C 7C 1B 78 */ mr r28, r3 /* 8003CC3C 00039B7C 7C 9D 23 79 */ or. r29, r4, r4 /* 8003CC40 00039B80 41 82 00 6C */ beq lbl_8003CCAC @@ -318,7 +318,7 @@ lbl_8003CCA0: /* 8003CCA8 00039BE8 41 80 FF C0 */ blt lbl_8003CC68 lbl_8003CCAC: /* 8003CCAC 00039BEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CCB0 00039BF0 48 32 55 75 */ bl func_80362224 +/* 8003CCB0 00039BF0 48 32 55 75 */ bl _restgpr_28 /* 8003CCB4 00039BF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003CCB8 00039BF8 7C 08 03 A6 */ mtlr r0 /* 8003CCBC 00039BFC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index ced20fac8e..0517667d98 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -221,7 +221,7 @@ dMapInfo_n_NS_getConstRestartIconPointer: /* 8003EF74 0003BEB4 7C 08 02 A6 */ mflr r0 /* 8003EF78 0003BEB8 90 01 00 24 */ stw r0, 0x24(r1) /* 8003EF7C 0003BEBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003EF80 0003BEC0 48 32 32 59 */ bl func_803621D8 +/* 8003EF80 0003BEC0 48 32 32 59 */ bl _savegpr_28 /* 8003EF84 0003BEC4 3C 60 80 42 */ lis r3, lbl_80425438@ha /* 8003EF88 0003BEC8 38 63 54 38 */ addi r3, r3, lbl_80425438@l /* 8003EF8C 0003BECC 8B C3 00 5C */ lbz r30, 0x5c(r3) @@ -263,7 +263,7 @@ lbl_8003F000: lbl_8003F010: /* 8003F010 0003BF50 7F A3 EB 78 */ mr r3, r29 /* 8003F014 0003BF54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003F018 0003BF58 48 32 32 0D */ bl func_80362224 +/* 8003F018 0003BF58 48 32 32 0D */ bl _restgpr_28 /* 8003F01C 0003BF5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003F020 0003BF60 7C 08 03 A6 */ mtlr r0 /* 8003F024 0003BF64 38 21 00 20 */ addi r1, r1, 0x20 @@ -1015,7 +1015,7 @@ dMpath_c_NS_setPointer_X1_: /* 8003FA44 0003C984 7C 08 02 A6 */ mflr r0 /* 8003FA48 0003C988 90 01 00 34 */ stw r0, 0x34(r1) /* 8003FA4C 0003C98C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003FA50 0003C990 48 32 27 89 */ bl func_803621D8 +/* 8003FA50 0003C990 48 32 27 89 */ bl _savegpr_28 /* 8003FA54 0003C994 7C 7C 1B 78 */ mr r28, r3 /* 8003FA58 0003C998 7C BD 2B 78 */ mr r29, r5 /* 8003FA5C 0003C99C 83 C4 00 04 */ lwz r30, 4(r4) @@ -1087,7 +1087,7 @@ lbl_8003FB04: /* 8003FB54 0003CA94 7F C4 01 2E */ stwx r30, r4, r0 lbl_8003FB58: /* 8003FB58 0003CA98 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003FB5C 0003CA9C 48 32 26 C9 */ bl func_80362224 +/* 8003FB5C 0003CA9C 48 32 26 C9 */ bl _restgpr_28 /* 8003FB60 0003CAA0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003FB64 0003CAA4 7C 08 03 A6 */ mtlr r0 /* 8003FB68 0003CAA8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1322,7 +1322,7 @@ renderingDAmap_c_NS_isDrawRoom: /* 8003FE74 0003CDB4 7C 08 02 A6 */ mflr r0 /* 8003FE78 0003CDB8 90 01 00 24 */ stw r0, 0x24(r1) /* 8003FE7C 0003CDBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003FE80 0003CDC0 48 32 23 59 */ bl func_803621D8 +/* 8003FE80 0003CDC0 48 32 23 59 */ bl _savegpr_28 /* 8003FE84 0003CDC4 7C 7C 1B 78 */ mr r28, r3 /* 8003FE88 0003CDC8 7C 9D 23 78 */ mr r29, r4 /* 8003FE8C 0003CDCC 7C BF 2B 78 */ mr r31, r5 @@ -1359,7 +1359,7 @@ lbl_8003FEF4: lbl_8003FEF8: /* 8003FEF8 0003CE38 7F C3 F3 78 */ mr r3, r30 /* 8003FEFC 0003CE3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003FF00 0003CE40 48 32 23 25 */ bl func_80362224 +/* 8003FF00 0003CE40 48 32 23 25 */ bl _restgpr_28 /* 8003FF04 0003CE44 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003FF08 0003CE48 7C 08 03 A6 */ mtlr r0 /* 8003FF0C 0003CE4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2741,7 +2741,7 @@ renderingPlusDoorAndCursor_c_NS_drawCursor: /* 800412D4 0003E214 DB C1 00 60 */ stfd f30, 0x60(r1) /* 800412D8 0003E218 F3 C1 00 68 */ psq_st f30, 104(r1), 0, qr0 /* 800412DC 0003E21C 39 61 00 60 */ addi r11, r1, 0x60 -/* 800412E0 0003E220 48 32 0E F5 */ bl func_803621D4 +/* 800412E0 0003E220 48 32 0E F5 */ bl _savegpr_27 /* 800412E4 0003E224 7C BC 2B 78 */ mr r28, r5 /* 800412E8 0003E228 7C DB 33 78 */ mr r27, r6 /* 800412EC 0003E22C C0 02 84 B8 */ lfs f0, lbl_80451EB8-_SDA2_BASE_(r2) @@ -2833,7 +2833,7 @@ lbl_80041414: /* 8004143C 0003E37C E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 /* 80041440 0003E380 CB C1 00 60 */ lfd f30, 0x60(r1) /* 80041444 0003E384 39 61 00 60 */ addi r11, r1, 0x60 -/* 80041448 0003E388 48 32 0D D9 */ bl func_80362220 +/* 80041448 0003E388 48 32 0D D9 */ bl _restgpr_27 /* 8004144C 0003E38C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80041450 0003E390 7C 08 03 A6 */ mtlr r0 /* 80041454 0003E394 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index 9567b5bd77..1729f78644 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -9,7 +9,7 @@ fmpTresTypeGroupDataList_c_NS_addTypeGroupData: /* 8003D794 0003A6D4 7C 08 02 A6 */ mflr r0 /* 8003D798 0003A6D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8003D79C 0003A6DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D7A0 0003A6E0 48 32 4A 39 */ bl func_803621D8 +/* 8003D7A0 0003A6E0 48 32 4A 39 */ bl _savegpr_28 /* 8003D7A4 0003A6E4 7C 7C 1B 78 */ mr r28, r3 /* 8003D7A8 0003A6E8 7C 9D 23 78 */ mr r29, r4 /* 8003D7AC 0003A6EC 7C BE 2B 78 */ mr r30, r5 @@ -37,7 +37,7 @@ lbl_8003D7E0: lbl_8003D7FC: /* 8003D7FC 0003A73C 90 7C 00 04 */ stw r3, 4(r28) /* 8003D800 0003A740 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D804 0003A744 48 32 4A 21 */ bl func_80362224 +/* 8003D804 0003A744 48 32 4A 21 */ bl _restgpr_28 /* 8003D808 0003A748 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003D80C 0003A74C 7C 08 03 A6 */ mtlr r0 /* 8003D810 0003A750 38 21 00 20 */ addi r1, r1, 0x20 @@ -72,7 +72,7 @@ dMenu_Fmap_room_data_c_NS_buildTresTypeGroup: /* 8003D86C 0003A7AC 7C 08 02 A6 */ mflr r0 /* 8003D870 0003A7B0 90 01 00 24 */ stw r0, 0x24(r1) /* 8003D874 0003A7B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D878 0003A7B8 48 32 49 5D */ bl func_803621D4 +/* 8003D878 0003A7B8 48 32 49 5D */ bl _savegpr_27 /* 8003D87C 0003A7BC 7C 7B 1B 78 */ mr r27, r3 /* 8003D880 0003A7C0 7C DC 33 78 */ mr r28, r6 /* 8003D884 0003A7C4 80 63 00 00 */ lwz r3, 0(r3) @@ -121,7 +121,7 @@ lbl_8003D90C: /* 8003D910 0003A850 41 80 FF D0 */ blt lbl_8003D8E0 lbl_8003D914: /* 8003D914 0003A854 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D918 0003A858 48 32 49 09 */ bl func_80362220 +/* 8003D918 0003A858 48 32 49 09 */ bl _restgpr_27 /* 8003D91C 0003A85C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003D920 0003A860 7C 08 03 A6 */ mtlr r0 /* 8003D924 0003A864 38 21 00 20 */ addi r1, r1, 0x20 @@ -198,7 +198,7 @@ dMenu_Fmap_stage_data_c_NS_buildFmapStageData: /* 8003DA0C 0003A94C DB 41 00 20 */ stfd f26, 0x20(r1) /* 8003DA10 0003A950 F3 41 00 28 */ psq_st f26, 40(r1), 0, qr0 /* 8003DA14 0003A954 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003DA18 0003A958 48 32 47 C1 */ bl func_803621D8 +/* 8003DA18 0003A958 48 32 47 C1 */ bl _savegpr_28 /* 8003DA1C 0003A95C 7C 7C 1B 78 */ mr r28, r3 /* 8003DA20 0003A960 7C 9D 23 78 */ mr r29, r4 /* 8003DA24 0003A964 FF 40 08 90 */ fmr f26, f1 @@ -277,7 +277,7 @@ lbl_8003DAFC: /* 8003DB28 0003AA68 E3 41 00 28 */ psq_l f26, 40(r1), 0, qr0 /* 8003DB2C 0003AA6C CB 41 00 20 */ lfd f26, 0x20(r1) /* 8003DB30 0003AA70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003DB34 0003AA74 48 32 46 F1 */ bl func_80362224 +/* 8003DB34 0003AA74 48 32 46 F1 */ bl _restgpr_28 /* 8003DB38 0003AA78 80 01 00 84 */ lwz r0, 0x84(r1) /* 8003DB3C 0003AA7C 7C 08 03 A6 */ mtlr r0 /* 8003DB40 0003AA80 38 21 00 80 */ addi r1, r1, 0x80 @@ -1046,7 +1046,7 @@ dMenuFmapIconDisp_c_NS_getPosition: /* 8003E58C 0003B4CC DB C1 00 20 */ stfd f30, 0x20(r1) /* 8003E590 0003B4D0 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8003E594 0003B4D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E598 0003B4D8 48 32 3C 41 */ bl func_803621D8 +/* 8003E598 0003B4D8 48 32 3C 41 */ bl _savegpr_28 /* 8003E59C 0003B4DC 7C 7C 1B 78 */ mr r28, r3 /* 8003E5A0 0003B4E0 7C DD 33 79 */ or. r29, r6, r6 /* 8003E5A4 0003B4E4 7C FE 3B 78 */ mr r30, r7 @@ -1135,7 +1135,7 @@ lbl_8003E6BC: /* 8003E6C8 0003B608 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8003E6CC 0003B60C CB C1 00 20 */ lfd f30, 0x20(r1) /* 8003E6D0 0003B610 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E6D4 0003B614 48 32 3B 51 */ bl func_80362224 +/* 8003E6D4 0003B614 48 32 3B 51 */ bl _restgpr_28 /* 8003E6D8 0003B618 80 01 00 44 */ lwz r0, 0x44(r1) /* 8003E6DC 0003B61C 7C 08 03 A6 */ mtlr r0 /* 8003E6E0 0003B620 38 21 00 40 */ addi r1, r1, 0x40 @@ -1147,7 +1147,7 @@ dMenuFmapIconDisp_c_NS_isDrawDisp: /* 8003E6EC 0003B62C 7C 08 02 A6 */ mflr r0 /* 8003E6F0 0003B630 90 01 00 24 */ stw r0, 0x24(r1) /* 8003E6F4 0003B634 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E6F8 0003B638 48 32 3A DD */ bl func_803621D4 +/* 8003E6F8 0003B638 48 32 3A DD */ bl _savegpr_27 /* 8003E6FC 0003B63C 7C 7B 1B 78 */ mr r27, r3 /* 8003E700 0003B640 80 63 00 14 */ lwz r3, 0x14(r3) /* 8003E704 0003B644 80 63 00 08 */ lwz r3, 8(r3) @@ -1428,7 +1428,7 @@ lbl_8003EAF4: /* 8003EAF4 0003BA34 7F 83 E3 78 */ mr r3, r28 lbl_8003EAF8: /* 8003EAF8 0003BA38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003EAFC 0003BA3C 48 32 37 25 */ bl func_80362220 +/* 8003EAFC 0003BA3C 48 32 37 25 */ bl _restgpr_27 /* 8003EB00 0003BA40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003EB04 0003BA44 7C 08 03 A6 */ mtlr r0 /* 8003EB08 0003BA48 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_calibration.s b/asm/d/menu/d_menu_calibration.s index 612799d4fa..f274cdcd85 100644 --- a/asm/d/menu/d_menu_calibration.s +++ b/asm/d/menu/d_menu_calibration.s @@ -669,7 +669,7 @@ dMenu_Calibration_c_NS_setAButtonString: /* 801AF73C 001AC67C 7C 08 02 A6 */ mflr r0 /* 801AF740 001AC680 90 01 00 24 */ stw r0, 0x24(r1) /* 801AF744 001AC684 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF748 001AC688 48 1B 2A 8D */ bl func_803621D4 +/* 801AF748 001AC688 48 1B 2A 8D */ bl _savegpr_27 /* 801AF74C 001AC68C 7C 7B 1B 78 */ mr r27, r3 /* 801AF750 001AC690 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801AF754 001AC694 40 82 00 3C */ bne lbl_801AF790 @@ -682,7 +682,7 @@ lbl_801AF768: /* 801AF76C 001AC6AC 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801AF770 001AC6B0 48 15 0E E9 */ bl J2DTextBox_NS_getStringPtr /* 801AF774 001AC6B4 7F C4 F3 78 */ mr r4, r30 -/* 801AF778 001AC6B8 48 1B 93 B5 */ bl func_80368B2C +/* 801AF778 001AC6B8 48 1B 93 B5 */ bl strcpy /* 801AF77C 001AC6BC 3B BD 00 01 */ addi r29, r29, 1 /* 801AF780 001AC6C0 2C 1D 00 05 */ cmpwi r29, 5 /* 801AF784 001AC6C4 3B FF 00 04 */ addi r31, r31, 4 @@ -708,7 +708,7 @@ lbl_801AF7A0: /* 801AF7CC 001AC70C 41 80 FF D4 */ blt lbl_801AF7A0 lbl_801AF7D0: /* 801AF7D0 001AC710 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF7D4 001AC714 48 1B 2A 4D */ bl func_80362220 +/* 801AF7D4 001AC714 48 1B 2A 4D */ bl _restgpr_27 /* 801AF7D8 001AC718 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AF7DC 001AC71C 7C 08 03 A6 */ mtlr r0 /* 801AF7E0 001AC720 38 21 00 20 */ addi r1, r1, 0x20 @@ -720,7 +720,7 @@ dMenu_Calibration_c_NS_setBButtonString: /* 801AF7EC 001AC72C 7C 08 02 A6 */ mflr r0 /* 801AF7F0 001AC730 90 01 00 24 */ stw r0, 0x24(r1) /* 801AF7F4 001AC734 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF7F8 001AC738 48 1B 29 DD */ bl func_803621D4 +/* 801AF7F8 001AC738 48 1B 29 DD */ bl _savegpr_27 /* 801AF7FC 001AC73C 7C 7B 1B 78 */ mr r27, r3 /* 801AF800 001AC740 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801AF804 001AC744 40 82 00 3C */ bne lbl_801AF840 @@ -733,7 +733,7 @@ lbl_801AF818: /* 801AF81C 001AC75C 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801AF820 001AC760 48 15 0E 39 */ bl J2DTextBox_NS_getStringPtr /* 801AF824 001AC764 7F C4 F3 78 */ mr r4, r30 -/* 801AF828 001AC768 48 1B 93 05 */ bl func_80368B2C +/* 801AF828 001AC768 48 1B 93 05 */ bl strcpy /* 801AF82C 001AC76C 3B BD 00 01 */ addi r29, r29, 1 /* 801AF830 001AC770 2C 1D 00 05 */ cmpwi r29, 5 /* 801AF834 001AC774 3B FF 00 04 */ addi r31, r31, 4 @@ -759,7 +759,7 @@ lbl_801AF850: /* 801AF87C 001AC7BC 41 80 FF D4 */ blt lbl_801AF850 lbl_801AF880: /* 801AF880 001AC7C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF884 001AC7C4 48 1B 29 9D */ bl func_80362220 +/* 801AF884 001AC7C4 48 1B 29 9D */ bl _restgpr_27 /* 801AF888 001AC7C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AF88C 001AC7CC 7C 08 03 A6 */ mtlr r0 /* 801AF890 001AC7D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -771,7 +771,7 @@ dMenu_Calibration_c_NS_setStepString: /* 801AF89C 001AC7DC 7C 08 02 A6 */ mflr r0 /* 801AF8A0 001AC7E0 90 01 00 24 */ stw r0, 0x24(r1) /* 801AF8A4 001AC7E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF8A8 001AC7E8 48 1B 29 2D */ bl func_803621D4 +/* 801AF8A8 001AC7E8 48 1B 29 2D */ bl _savegpr_27 /* 801AF8AC 001AC7EC 7C 7B 1B 78 */ mr r27, r3 /* 801AF8B0 001AC7F0 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801AF8B4 001AC7F4 40 82 00 3C */ bne lbl_801AF8F0 @@ -784,7 +784,7 @@ lbl_801AF8C8: /* 801AF8CC 001AC80C 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801AF8D0 001AC810 48 15 0D 89 */ bl J2DTextBox_NS_getStringPtr /* 801AF8D4 001AC814 7F C4 F3 78 */ mr r4, r30 -/* 801AF8D8 001AC818 48 1B 92 55 */ bl func_80368B2C +/* 801AF8D8 001AC818 48 1B 92 55 */ bl strcpy /* 801AF8DC 001AC81C 3B BD 00 01 */ addi r29, r29, 1 /* 801AF8E0 001AC820 2C 1D 00 03 */ cmpwi r29, 3 /* 801AF8E4 001AC824 3B FF 00 04 */ addi r31, r31, 4 @@ -810,7 +810,7 @@ lbl_801AF900: /* 801AF92C 001AC86C 41 80 FF D4 */ blt lbl_801AF900 lbl_801AF930: /* 801AF930 001AC870 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF934 001AC874 48 1B 28 ED */ bl func_80362220 +/* 801AF934 001AC874 48 1B 28 ED */ bl _restgpr_27 /* 801AF938 001AC878 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AF93C 001AC87C 7C 08 03 A6 */ mtlr r0 /* 801AF940 001AC880 38 21 00 20 */ addi r1, r1, 0x20 @@ -822,7 +822,7 @@ dMenu_Calibration_c_NS_setExplainString: /* 801AF94C 001AC88C 7C 08 02 A6 */ mflr r0 /* 801AF950 001AC890 90 01 00 24 */ stw r0, 0x24(r1) /* 801AF954 001AC894 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF958 001AC898 48 1B 28 81 */ bl func_803621D8 +/* 801AF958 001AC898 48 1B 28 81 */ bl _savegpr_28 /* 801AF95C 001AC89C 7C 7C 1B 78 */ mr r28, r3 /* 801AF960 001AC8A0 54 9E 04 3F */ clrlwi. r30, r4, 0x10 /* 801AF964 001AC8A4 40 82 00 3C */ bne lbl_801AF9A0 @@ -835,7 +835,7 @@ lbl_801AF978: /* 801AF97C 001AC8BC 7C 7C 00 2E */ lwzx r3, r28, r0 /* 801AF980 001AC8C0 48 15 0C D9 */ bl J2DTextBox_NS_getStringPtr /* 801AF984 001AC8C4 7F C4 F3 78 */ mr r4, r30 -/* 801AF988 001AC8C8 48 1B 91 A5 */ bl func_80368B2C +/* 801AF988 001AC8C8 48 1B 91 A5 */ bl strcpy /* 801AF98C 001AC8CC 3B BD 00 01 */ addi r29, r29, 1 /* 801AF990 001AC8D0 2C 1D 00 03 */ cmpwi r29, 3 /* 801AF994 001AC8D4 3B FF 00 04 */ addi r31, r31, 4 @@ -863,7 +863,7 @@ lbl_801AF9A8: /* 801AF9E4 001AC924 41 80 FF C4 */ blt lbl_801AF9A8 lbl_801AF9E8: /* 801AF9E8 001AC928 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AF9EC 001AC92C 48 1B 28 39 */ bl func_80362224 +/* 801AF9EC 001AC92C 48 1B 28 39 */ bl _restgpr_28 /* 801AF9F0 001AC930 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AF9F4 001AC934 7C 08 03 A6 */ mtlr r0 /* 801AF9F8 001AC938 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index 21f4147665..83c4ffc1aa 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -2944,7 +2944,7 @@ dMenu_Collect2D_c_NS_cursorPosSet: /* 801B27F0 001AF730 7C 08 02 A6 */ mflr r0 /* 801B27F4 001AF734 90 01 00 34 */ stw r0, 0x34(r1) /* 801B27F8 001AF738 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B27FC 001AF73C 48 1A F9 DD */ bl func_803621D8 +/* 801B27FC 001AF73C 48 1A F9 DD */ bl _savegpr_28 /* 801B2800 001AF740 7C 7F 1B 78 */ mr r31, r3 /* 801B2804 001AF744 3B A0 00 00 */ li r29, 0 /* 801B2808 001AF748 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -3108,7 +3108,7 @@ lbl_801B2A40: /* 801B2A58 001AF998 4B FE 27 59 */ bl dSelect_cursor_c_NS_setParam lbl_801B2A5C: /* 801B2A5C 001AF99C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B2A60 001AF9A0 48 1A F7 C5 */ bl func_80362224 +/* 801B2A60 001AF9A0 48 1A F7 C5 */ bl _restgpr_28 /* 801B2A64 001AF9A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B2A68 001AF9A8 7C 08 03 A6 */ mtlr r0 /* 801B2A6C 001AF9AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -3846,7 +3846,7 @@ dMenu_Collect2D_c_NS_setSmellType: /* 801B3528 001B0468 7C 08 02 A6 */ mflr r0 /* 801B352C 001B046C 90 01 00 24 */ stw r0, 0x24(r1) /* 801B3530 001B0470 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B3534 001B0474 48 1A EC A5 */ bl func_803621D8 +/* 801B3534 001B0474 48 1A EC A5 */ bl _savegpr_28 /* 801B3538 001B0478 7C 7C 1B 78 */ mr r28, r3 /* 801B353C 001B047C 3B C0 FF FF */ li r30, -1 /* 801B3540 001B0480 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -3918,7 +3918,7 @@ lbl_801B3618: /* 801B3620 001B0560 3B FF 00 08 */ addi r31, r31, 8 /* 801B3624 001B0564 41 80 FF 88 */ blt lbl_801B35AC /* 801B3628 001B0568 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B362C 001B056C 48 1A EB F9 */ bl func_80362224 +/* 801B362C 001B056C 48 1A EB F9 */ bl _restgpr_28 /* 801B3630 001B0570 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B3634 001B0574 7C 08 03 A6 */ mtlr r0 /* 801B3638 001B0578 38 21 00 20 */ addi r1, r1, 0x20 @@ -3930,7 +3930,7 @@ dMenu_Collect2D_c_NS_setHeartPiece: /* 801B3644 001B0584 7C 08 02 A6 */ mflr r0 /* 801B3648 001B0588 90 01 00 24 */ stw r0, 0x24(r1) /* 801B364C 001B058C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B3650 001B0590 48 1A EB 89 */ bl func_803621D8 +/* 801B3650 001B0590 48 1A EB 89 */ bl _savegpr_28 /* 801B3654 001B0594 7C 7C 1B 78 */ mr r28, r3 /* 801B3658 001B0598 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801B365C 001B059C A0 83 61 C0 */ lhz r4, lbl_804061C0@l(r3) @@ -3975,7 +3975,7 @@ lbl_801B36E4: /* 801B36EC 001B062C 3B FF 00 08 */ addi r31, r31, 8 /* 801B36F0 001B0630 41 80 FF 88 */ blt lbl_801B3678 /* 801B36F4 001B0634 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B36F8 001B0638 48 1A EB 2D */ bl func_80362224 +/* 801B36F8 001B0638 48 1A EB 2D */ bl _restgpr_28 /* 801B36FC 001B063C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B3700 001B0640 7C 08 03 A6 */ mtlr r0 /* 801B3704 001B0644 38 21 00 20 */ addi r1, r1, 0x20 @@ -4175,7 +4175,7 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorSword: /* 801B39D4 001B0914 7C 08 02 A6 */ mflr r0 /* 801B39D8 001B0918 90 01 00 64 */ stw r0, 0x64(r1) /* 801B39DC 001B091C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B39E0 001B0920 48 1A E7 F5 */ bl func_803621D4 +/* 801B39E0 001B0920 48 1A E7 F5 */ bl _savegpr_27 /* 801B39E4 001B0924 7C 7D 1B 78 */ mr r29, r3 /* 801B39E8 001B0928 7C 9E 23 78 */ mr r30, r4 /* 801B39EC 001B092C 2C 1E FF FF */ cmpwi r30, -1 @@ -4381,7 +4381,7 @@ lbl_801B3CC8: /* 801B3CD8 001B0C18 41 80 FE E0 */ blt lbl_801B3BB8 lbl_801B3CDC: /* 801B3CDC 001B0C1C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B3CE0 001B0C20 48 1A E5 41 */ bl func_80362220 +/* 801B3CE0 001B0C20 48 1A E5 41 */ bl _restgpr_27 /* 801B3CE4 001B0C24 80 01 00 64 */ lwz r0, 0x64(r1) /* 801B3CE8 001B0C28 7C 08 03 A6 */ mtlr r0 /* 801B3CEC 001B0C2C 38 21 00 60 */ addi r1, r1, 0x60 @@ -4393,7 +4393,7 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorShield: /* 801B3CF8 001B0C38 7C 08 02 A6 */ mflr r0 /* 801B3CFC 001B0C3C 90 01 00 64 */ stw r0, 0x64(r1) /* 801B3D00 001B0C40 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B3D04 001B0C44 48 1A E4 D1 */ bl func_803621D4 +/* 801B3D04 001B0C44 48 1A E4 D1 */ bl _savegpr_27 /* 801B3D08 001B0C48 7C 7D 1B 78 */ mr r29, r3 /* 801B3D0C 001B0C4C 7C 9E 23 78 */ mr r30, r4 /* 801B3D10 001B0C50 2C 1E FF FF */ cmpwi r30, -1 @@ -4581,7 +4581,7 @@ lbl_801B3FB0: /* 801B3FC0 001B0F00 41 80 FE E0 */ blt lbl_801B3EA0 lbl_801B3FC4: /* 801B3FC4 001B0F04 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B3FC8 001B0F08 48 1A E2 59 */ bl func_80362220 +/* 801B3FC8 001B0F08 48 1A E2 59 */ bl _restgpr_27 /* 801B3FCC 001B0F0C 80 01 00 64 */ lwz r0, 0x64(r1) /* 801B3FD0 001B0F10 7C 08 03 A6 */ mtlr r0 /* 801B3FD4 001B0F14 38 21 00 60 */ addi r1, r1, 0x60 @@ -4593,7 +4593,7 @@ dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes: /* 801B3FE0 001B0F20 7C 08 02 A6 */ mflr r0 /* 801B3FE4 001B0F24 90 01 00 64 */ stw r0, 0x64(r1) /* 801B3FE8 001B0F28 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B3FEC 001B0F2C 48 1A E1 E9 */ bl func_803621D4 +/* 801B3FEC 001B0F2C 48 1A E1 E9 */ bl _savegpr_27 /* 801B3FF0 001B0F30 7C 7D 1B 78 */ mr r29, r3 /* 801B3FF4 001B0F34 7C 9E 23 78 */ mr r30, r4 /* 801B3FF8 001B0F38 2C 1E FF FF */ cmpwi r30, -1 @@ -4788,7 +4788,7 @@ lbl_801B42AC: /* 801B42BC 001B11FC 41 80 FE E0 */ blt lbl_801B419C lbl_801B42C0: /* 801B42C0 001B1200 39 61 00 60 */ addi r11, r1, 0x60 -/* 801B42C4 001B1204 48 1A DF 5D */ bl func_80362220 +/* 801B42C4 001B1204 48 1A DF 5D */ bl _restgpr_27 /* 801B42C8 001B1208 80 01 00 64 */ lwz r0, 0x64(r1) /* 801B42CC 001B120C 7C 08 03 A6 */ mtlr r0 /* 801B42D0 001B1210 38 21 00 60 */ addi r1, r1, 0x60 @@ -6648,7 +6648,7 @@ dMenu_Collect2D_c_NS__draw: /* 801B5DF0 001B2D30 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B5DF4 001B2D34 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B5DF8 001B2D38 38 84 00 55 */ addi r4, r4, 0x55 -/* 801B5DFC 001B2D3C 48 1B 2D 31 */ bl func_80368B2C +/* 801B5DFC 001B2D3C 48 1B 2D 31 */ bl strcpy /* 801B5E00 001B2D40 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B5E04 001B2D44 3C 80 65 78 */ lis r4, 0x65787430@ha /* 801B5E08 001B2D48 38 C4 74 30 */ addi r6, r4, 0x65787430@l @@ -6662,7 +6662,7 @@ dMenu_Collect2D_c_NS__draw: /* 801B5E28 001B2D68 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B5E2C 001B2D6C 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B5E30 001B2D70 38 84 00 55 */ addi r4, r4, 0x55 -/* 801B5E34 001B2D74 48 1B 2C F9 */ bl func_80368B2C +/* 801B5E34 001B2D74 48 1B 2C F9 */ bl strcpy /* 801B5E38 001B2D78 48 00 00 E4 */ b lbl_801B5F1C lbl_801B5E3C: /* 801B5E3C 001B2D7C 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -6804,7 +6804,7 @@ lbl_801B6000: /* 801B601C 001B2F5C 4E 80 04 21 */ bctrl /* 801B6020 001B2F60 48 14 A6 39 */ bl J2DTextBox_NS_getStringPtr /* 801B6024 001B2F64 38 9C 00 55 */ addi r4, r28, 0x55 -/* 801B6028 001B2F68 48 1B 2B 05 */ bl func_80368B2C +/* 801B6028 001B2F68 48 1B 2B 05 */ bl strcpy /* 801B602C 001B2F6C 3B 7B 00 01 */ addi r27, r27, 1 /* 801B6030 001B2F70 2C 1B 00 05 */ cmpwi r27, 5 /* 801B6034 001B2F74 3B DE 00 08 */ addi r30, r30, 8 @@ -6876,7 +6876,7 @@ lbl_801B6104: /* 801B6120 001B3060 4E 80 04 21 */ bctrl /* 801B6124 001B3064 48 14 A5 35 */ bl J2DTextBox_NS_getStringPtr /* 801B6128 001B3068 38 9C 00 55 */ addi r4, r28, 0x55 -/* 801B612C 001B306C 48 1B 2A 01 */ bl func_80368B2C +/* 801B612C 001B306C 48 1B 2A 01 */ bl strcpy /* 801B6130 001B3070 3B 7B 00 01 */ addi r27, r27, 1 /* 801B6134 001B3074 2C 1B 00 05 */ cmpwi r27, 5 /* 801B6138 001B3078 3B DE 00 08 */ addi r30, r30, 8 @@ -7042,7 +7042,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B6388 001B32C8 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B638C 001B32CC 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B6390 001B32D0 38 84 00 55 */ addi r4, r4, 0x55 -/* 801B6394 001B32D4 48 1B 27 99 */ bl func_80368B2C +/* 801B6394 001B32D4 48 1B 27 99 */ bl strcpy /* 801B6398 001B32D8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B639C 001B32DC 3C 80 5F 6E */ lis r4, 0x5F6E3035@ha /* 801B63A0 001B32E0 38 C4 30 35 */ addi r6, r4, 0x5F6E3035@l @@ -7056,7 +7056,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B63C0 001B3300 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B63C4 001B3304 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B63C8 001B3308 38 84 00 55 */ addi r4, r4, 0x55 -/* 801B63CC 001B330C 48 1B 27 61 */ bl func_80368B2C +/* 801B63CC 001B330C 48 1B 27 61 */ bl strcpy /* 801B63D0 001B3310 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B63D4 001B3314 3C 80 5F 6E */ lis r4, 0x5F6E3036@ha /* 801B63D8 001B3318 38 C4 30 36 */ addi r6, r4, 0x5F6E3036@l @@ -7070,7 +7070,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B63F8 001B3338 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B63FC 001B333C 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B6400 001B3340 38 84 00 55 */ addi r4, r4, 0x55 -/* 801B6404 001B3344 48 1B 27 29 */ bl func_80368B2C +/* 801B6404 001B3344 48 1B 27 29 */ bl strcpy /* 801B6408 001B3348 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B640C 001B334C 3C 80 5F 6E */ lis r4, 0x5F6E3037@ha /* 801B6410 001B3350 38 C4 30 37 */ addi r6, r4, 0x5F6E3037@l @@ -7084,7 +7084,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B6430 001B3370 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B6434 001B3374 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B6438 001B3378 38 84 00 55 */ addi r4, r4, 0x55 -/* 801B643C 001B337C 48 1B 26 F1 */ bl func_80368B2C +/* 801B643C 001B337C 48 1B 26 F1 */ bl strcpy /* 801B6440 001B3380 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B6444 001B3384 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B6448 001B3388 7C 08 03 A6 */ mtlr r0 @@ -7097,7 +7097,7 @@ dMenu_Collect3D_c: /* 801B6458 001B3398 7C 08 02 A6 */ mflr r0 /* 801B645C 001B339C 90 01 00 24 */ stw r0, 0x24(r1) /* 801B6460 001B33A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B6464 001B33A4 48 1A BD 71 */ bl func_803621D4 +/* 801B6464 001B33A4 48 1A BD 71 */ bl _savegpr_27 /* 801B6468 001B33A8 7C 7F 1B 78 */ mr r31, r3 /* 801B646C 001B33AC 7C 9B 23 78 */ mr r27, r4 /* 801B6470 001B33B0 7C BC 2B 78 */ mr r28, r5 @@ -7149,7 +7149,7 @@ lbl_801B6500: /* 801B6518 001B3458 D0 1F 03 CC */ stfs f0, 0x3cc(r31) /* 801B651C 001B345C 7F E3 FB 78 */ mr r3, r31 /* 801B6520 001B3460 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B6524 001B3464 48 1A BC FD */ bl func_80362220 +/* 801B6524 001B3464 48 1A BC FD */ bl _restgpr_27 /* 801B6528 001B3468 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B652C 001B346C 7C 08 03 A6 */ mtlr r0 /* 801B6530 001B3470 38 21 00 20 */ addi r1, r1, 0x20 @@ -8550,7 +8550,7 @@ dMenu_Collect_c: /* 801B78C4 001B4804 7C 08 02 A6 */ mflr r0 /* 801B78C8 001B4808 90 01 00 24 */ stw r0, 0x24(r1) /* 801B78CC 001B480C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B78D0 001B4810 48 1A A9 09 */ bl func_803621D8 +/* 801B78D0 001B4810 48 1A A9 09 */ bl _savegpr_28 /* 801B78D4 001B4814 7C 7C 1B 78 */ mr r28, r3 /* 801B78D8 001B4818 7C 9D 23 78 */ mr r29, r4 /* 801B78DC 001B481C 7C BE 2B 78 */ mr r30, r5 @@ -8582,7 +8582,7 @@ lbl_801B793C: /* 801B793C 001B487C 90 1C 00 08 */ stw r0, 8(r28) /* 801B7940 001B4880 7F 83 E3 78 */ mr r3, r28 /* 801B7944 001B4884 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B7948 001B4888 48 1A A8 DD */ bl func_80362224 +/* 801B7948 001B4888 48 1A A8 DD */ bl _restgpr_28 /* 801B794C 001B488C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B7950 001B4890 7C 08 03 A6 */ mtlr r0 /* 801B7954 001B4894 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index e9ea1344ea..172355d0ff 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -79,12 +79,12 @@ lbl_801B8018: /* 801B8034 001B4F74 38 61 00 10 */ addi r3, r1, 0x10 /* 801B8038 001B4F78 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B803C 001B4F7C 38 84 57 60 */ addi r4, r4, lbl_80395760@l -/* 801B8040 001B4F80 48 1B 0A ED */ bl func_80368B2C +/* 801B8040 001B4F80 48 1B 0A ED */ bl strcpy /* 801B8044 001B4F84 38 61 00 08 */ addi r3, r1, 8 /* 801B8048 001B4F88 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 801B804C 001B4F8C 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 801B8050 001B4F90 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 801B8054 001B4F94 48 1B 0A D9 */ bl func_80368B2C +/* 801B8054 001B4F94 48 1B 0A D9 */ bl strcpy /* 801B8058 001B4F98 88 01 00 0C */ lbz r0, 0xc(r1) /* 801B805C 001B4F9C 98 01 00 22 */ stb r0, 0x22(r1) /* 801B8060 001B4FA0 88 01 00 0D */ lbz r0, 0xd(r1) @@ -1004,7 +1004,7 @@ dMenu_DmapBg_c_NS_setAButtonString: /* 801B8DE8 001B5D28 7C 08 02 A6 */ mflr r0 /* 801B8DEC 001B5D2C 90 01 00 24 */ stw r0, 0x24(r1) /* 801B8DF0 001B5D30 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B8DF4 001B5D34 48 1A 93 E5 */ bl func_803621D8 +/* 801B8DF4 001B5D34 48 1A 93 E5 */ bl _savegpr_28 /* 801B8DF8 001B5D38 7C 7C 1B 78 */ mr r28, r3 /* 801B8DFC 001B5D3C 7C 9D 23 78 */ mr r29, r4 /* 801B8E00 001B5D40 3B C0 00 00 */ li r30, 0 @@ -1026,7 +1026,7 @@ lbl_801B8E08: /* 801B8E3C 001B5D7C 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B8E40 001B5D80 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B8E44 001B5D84 38 84 00 6F */ addi r4, r4, 0x6f -/* 801B8E48 001B5D88 48 1A FC E5 */ bl func_80368B2C +/* 801B8E48 001B5D88 48 1A FC E5 */ bl strcpy /* 801B8E4C 001B5D8C 48 00 00 48 */ b lbl_801B8E94 lbl_801B8E50: /* 801B8E50 001B5D90 80 7C 0C B4 */ lwz r3, 0xcb4(r28) @@ -1052,7 +1052,7 @@ lbl_801B8E94: /* 801B8E9C 001B5DDC 3B FF 00 08 */ addi r31, r31, 8 /* 801B8EA0 001B5DE0 41 80 FF 68 */ blt lbl_801B8E08 /* 801B8EA4 001B5DE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B8EA8 001B5DE8 48 1A 93 7D */ bl func_80362224 +/* 801B8EA8 001B5DE8 48 1A 93 7D */ bl _restgpr_28 /* 801B8EAC 001B5DEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B8EB0 001B5DF0 7C 08 03 A6 */ mtlr r0 /* 801B8EB4 001B5DF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1064,7 +1064,7 @@ dMenu_DmapBg_c_NS_setBButtonString: /* 801B8EC0 001B5E00 7C 08 02 A6 */ mflr r0 /* 801B8EC4 001B5E04 90 01 00 24 */ stw r0, 0x24(r1) /* 801B8EC8 001B5E08 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B8ECC 001B5E0C 48 1A 93 0D */ bl func_803621D8 +/* 801B8ECC 001B5E0C 48 1A 93 0D */ bl _savegpr_28 /* 801B8ED0 001B5E10 7C 7C 1B 78 */ mr r28, r3 /* 801B8ED4 001B5E14 7C 9D 23 78 */ mr r29, r4 /* 801B8ED8 001B5E18 3B C0 00 00 */ li r30, 0 @@ -1086,7 +1086,7 @@ lbl_801B8EE0: /* 801B8F14 001B5E54 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B8F18 001B5E58 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B8F1C 001B5E5C 38 84 00 6F */ addi r4, r4, 0x6f -/* 801B8F20 001B5E60 48 1A FC 0D */ bl func_80368B2C +/* 801B8F20 001B5E60 48 1A FC 0D */ bl strcpy /* 801B8F24 001B5E64 48 00 00 48 */ b lbl_801B8F6C lbl_801B8F28: /* 801B8F28 001B5E68 80 7C 0C B4 */ lwz r3, 0xcb4(r28) @@ -1112,7 +1112,7 @@ lbl_801B8F6C: /* 801B8F74 001B5EB4 3B FF 00 08 */ addi r31, r31, 8 /* 801B8F78 001B5EB8 41 80 FF 68 */ blt lbl_801B8EE0 /* 801B8F7C 001B5EBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B8F80 001B5EC0 48 1A 92 A5 */ bl func_80362224 +/* 801B8F80 001B5EC0 48 1A 92 A5 */ bl _restgpr_28 /* 801B8F84 001B5EC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B8F88 001B5EC8 7C 08 03 A6 */ mtlr r0 /* 801B8F8C 001B5ECC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1155,7 +1155,7 @@ lbl_801B8FEC: /* 801B9008 001B5F48 4E 80 04 21 */ bctrl /* 801B900C 001B5F4C 48 14 76 4D */ bl J2DTextBox_NS_getStringPtr /* 801B9010 001B5F50 38 9C 00 6F */ addi r4, r28, 0x6f -/* 801B9014 001B5F54 48 1A FB 19 */ bl func_80368B2C +/* 801B9014 001B5F54 48 1A FB 19 */ bl strcpy /* 801B9018 001B5F58 3B 7B 00 01 */ addi r27, r27, 1 /* 801B901C 001B5F5C 2C 1B 00 02 */ cmpwi r27, 2 /* 801B9020 001B5F60 3B DE 00 08 */ addi r30, r30, 8 @@ -2717,7 +2717,7 @@ dMenu_DmapBg_c_NS_setGoldAnimation: /* 801BA704 001B7644 7C 08 02 A6 */ mflr r0 /* 801BA708 001B7648 90 01 00 24 */ stw r0, 0x24(r1) /* 801BA70C 001B764C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BA710 001B7650 48 1A 7A C9 */ bl func_803621D8 +/* 801BA710 001B7650 48 1A 7A C9 */ bl _savegpr_28 /* 801BA714 001B7654 7C 7C 1B 78 */ mr r28, r3 /* 801BA718 001B7658 7C 9D 23 78 */ mr r29, r4 /* 801BA71C 001B765C 80 63 0C A8 */ lwz r3, 0xca8(r3) @@ -2770,7 +2770,7 @@ lbl_801BA7A8: /* 801BA7D4 001B7714 4E 80 04 21 */ bctrl lbl_801BA7D8: /* 801BA7D8 001B7718 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BA7DC 001B771C 48 1A 7A 49 */ bl func_80362224 +/* 801BA7DC 001B771C 48 1A 7A 49 */ bl _restgpr_28 /* 801BA7E0 001B7720 80 01 00 24 */ lwz r0, 0x24(r1) /* 801BA7E4 001B7724 7C 08 03 A6 */ mtlr r0 /* 801BA7E8 001B7728 38 21 00 20 */ addi r1, r1, 0x20 @@ -5765,7 +5765,7 @@ dMenu_Dmap_c_NS_drawFloorScreenBack: /* 801BD3CC 001BA30C DB C1 00 20 */ stfd f30, 0x20(r1) /* 801BD3D0 001BA310 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801BD3D4 001BA314 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BD3D8 001BA318 48 1A 4D FD */ bl func_803621D4 +/* 801BD3D8 001BA318 48 1A 4D FD */ bl _savegpr_27 /* 801BD3DC 001BA31C 7C 7D 1B 78 */ mr r29, r3 /* 801BD3E0 001BA320 7C 9E 23 78 */ mr r30, r4 /* 801BD3E4 001BA324 FF C0 08 90 */ fmr f30, f1 @@ -5851,7 +5851,7 @@ lbl_801BD4E8: /* 801BD504 001BA444 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801BD508 001BA448 CB C1 00 20 */ lfd f30, 0x20(r1) /* 801BD50C 001BA44C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BD510 001BA450 48 1A 4D 11 */ bl func_80362220 +/* 801BD510 001BA450 48 1A 4D 11 */ bl _restgpr_27 /* 801BD514 001BA454 80 01 00 44 */ lwz r0, 0x44(r1) /* 801BD518 001BA458 7C 08 03 A6 */ mtlr r0 /* 801BD51C 001BA45C 38 21 00 40 */ addi r1, r1, 0x40 @@ -5867,7 +5867,7 @@ dMenu_Dmap_c_NS_drawFloorScreenTop: /* 801BD538 001BA478 DB C1 00 20 */ stfd f30, 0x20(r1) /* 801BD53C 001BA47C F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801BD540 001BA480 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BD544 001BA484 48 1A 4C 91 */ bl func_803621D4 +/* 801BD544 001BA484 48 1A 4C 91 */ bl _savegpr_27 /* 801BD548 001BA488 7C 7D 1B 78 */ mr r29, r3 /* 801BD54C 001BA48C 7C 9E 23 78 */ mr r30, r4 /* 801BD550 001BA490 FF C0 08 90 */ fmr f30, f1 @@ -5953,7 +5953,7 @@ lbl_801BD654: /* 801BD670 001BA5B0 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801BD674 001BA5B4 CB C1 00 20 */ lfd f30, 0x20(r1) /* 801BD678 001BA5B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BD67C 001BA5BC 48 1A 4B A5 */ bl func_80362220 +/* 801BD67C 001BA5BC 48 1A 4B A5 */ bl _restgpr_27 /* 801BD680 001BA5C0 80 01 00 44 */ lwz r0, 0x44(r1) /* 801BD684 001BA5C4 7C 08 03 A6 */ mtlr r0 /* 801BD688 001BA5C8 38 21 00 40 */ addi r1, r1, 0x40 @@ -6052,7 +6052,7 @@ dMenu_Dmap_c_NS__create: /* 801BD7C4 001BA704 7C 08 02 A6 */ mflr r0 /* 801BD7C8 001BA708 90 01 00 54 */ stw r0, 0x54(r1) /* 801BD7CC 001BA70C 39 61 00 50 */ addi r11, r1, 0x50 -/* 801BD7D0 001BA710 48 1A 4A 09 */ bl func_803621D8 +/* 801BD7D0 001BA710 48 1A 4A 09 */ bl _savegpr_28 /* 801BD7D4 001BA714 7C 7F 1B 78 */ mr r31, r3 /* 801BD7D8 001BA718 80 63 00 E8 */ lwz r3, 0xe8(r3) /* 801BD7DC 001BA71C 48 11 0F A9 */ bl JKRHeap_NS_getTotalFreeSize @@ -6413,7 +6413,7 @@ lbl_801BDCB8: /* 801BDD20 001BAC60 48 1A 43 65 */ bl func_80362084 /* 801BDD24 001BAC64 60 00 00 00 */ nop /* 801BDD28 001BAC68 39 61 00 50 */ addi r11, r1, 0x50 -/* 801BDD2C 001BAC6C 48 1A 44 F9 */ bl func_80362224 +/* 801BDD2C 001BAC6C 48 1A 44 F9 */ bl _restgpr_28 /* 801BDD30 001BAC70 80 01 00 54 */ lwz r0, 0x54(r1) /* 801BDD34 001BAC74 7C 08 03 A6 */ mtlr r0 /* 801BDD38 001BAC78 38 21 00 50 */ addi r1, r1, 0x50 @@ -6838,7 +6838,7 @@ dMenu_Dmap_c_NS_isOpen: /* 801BE32C 001BB26C 7C 08 02 A6 */ mflr r0 /* 801BE330 001BB270 90 01 00 64 */ stw r0, 0x64(r1) /* 801BE334 001BB274 39 61 00 60 */ addi r11, r1, 0x60 -/* 801BE338 001BB278 48 1A 3E 9D */ bl func_803621D4 +/* 801BE338 001BB278 48 1A 3E 9D */ bl _savegpr_27 /* 801BE33C 001BB27C 7C 7B 1B 78 */ mr r27, r3 /* 801BE340 001BB280 3B A0 00 00 */ li r29, 0 /* 801BE344 001BB284 3B 80 00 00 */ li r28, 0 @@ -7052,7 +7052,7 @@ lbl_801BE638: /* 801BE654 001BB594 7F A3 EB 78 */ mr r3, r29 lbl_801BE658: /* 801BE658 001BB598 39 61 00 60 */ addi r11, r1, 0x60 -/* 801BE65C 001BB59C 48 1A 3B C5 */ bl func_80362220 +/* 801BE65C 001BB59C 48 1A 3B C5 */ bl _restgpr_27 /* 801BE660 001BB5A0 80 01 00 64 */ lwz r0, 0x64(r1) /* 801BE664 001BB5A4 7C 08 03 A6 */ mtlr r0 /* 801BE668 001BB5A8 38 21 00 60 */ addi r1, r1, 0x60 @@ -8615,7 +8615,7 @@ lbl_801BFC9C: /* 801BFD68 001BCCA8 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801BFD6C 001BCCAC F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801BFD70 001BCCB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801BFD74 001BCCB4 48 1A 24 65 */ bl func_803621D8 +/* 801BFD74 001BCCB4 48 1A 24 65 */ bl _savegpr_28 /* 801BFD78 001BCCB8 7C 7F 1B 78 */ mr r31, r3 /* 801BFD7C 001BCCBC 4B FF D4 59 */ bl dMenu_Dmap_c_NS_getCurFloorPos /* 801BFD80 001BCCC0 7C 60 07 74 */ extsb r0, r3 @@ -8743,7 +8743,7 @@ lbl_801BFF5C: /* 801BFF64 001BCEA4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801BFF68 001BCEA8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801BFF6C 001BCEAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801BFF70 001BCEB0 48 1A 22 B5 */ bl func_80362224 +/* 801BFF70 001BCEB0 48 1A 22 B5 */ bl _restgpr_28 /* 801BFF74 001BCEB4 80 01 00 44 */ lwz r0, 0x44(r1) /* 801BFF78 001BCEB8 7C 08 03 A6 */ mtlr r0 /* 801BFF7C 001BCEBC 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index e199f013d6..60c285fc0a 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -357,7 +357,7 @@ dMenu_Fishing_c_NS_init: /* 801C5230 001C2170 7C 08 02 A6 */ mflr r0 /* 801C5234 001C2174 90 01 00 24 */ stw r0, 0x24(r1) /* 801C5238 001C2178 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C523C 001C217C 48 19 CF 9D */ bl func_803621D8 +/* 801C523C 001C217C 48 19 CF 9D */ bl _savegpr_28 /* 801C5240 001C2180 7C 7C 1B 78 */ mr r28, r3 /* 801C5244 001C2184 3B A0 00 00 */ li r29, 0 /* 801C5248 001C2188 3B E0 00 00 */ li r31, 0 @@ -397,7 +397,7 @@ lbl_801C529C: /* 801C52C4 001C2204 48 19 CD C1 */ bl func_80362084 /* 801C52C8 001C2208 60 00 00 00 */ nop /* 801C52CC 001C220C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C52D0 001C2210 48 19 CF 55 */ bl func_80362224 +/* 801C52D0 001C2210 48 19 CF 55 */ bl _restgpr_28 /* 801C52D4 001C2214 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C52D8 001C2218 7C 08 03 A6 */ mtlr r0 /* 801C52DC 001C221C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1203,7 +1203,7 @@ dMenu_Fishing_c_NS_setAButtonString: /* 801C5EBC 001C2DFC 7C 08 02 A6 */ mflr r0 /* 801C5EC0 001C2E00 90 01 00 24 */ stw r0, 0x24(r1) /* 801C5EC4 001C2E04 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C5EC8 001C2E08 48 19 C3 0D */ bl func_803621D4 +/* 801C5EC8 001C2E08 48 19 C3 0D */ bl _savegpr_27 /* 801C5ECC 001C2E0C 7C 7B 1B 78 */ mr r27, r3 /* 801C5ED0 001C2E10 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801C5ED4 001C2E14 40 82 00 3C */ bne lbl_801C5F10 @@ -1216,7 +1216,7 @@ lbl_801C5EE8: /* 801C5EEC 001C2E2C 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801C5EF0 001C2E30 48 13 A7 69 */ bl J2DTextBox_NS_getStringPtr /* 801C5EF4 001C2E34 38 9E 00 3E */ addi r4, r30, 0x3e -/* 801C5EF8 001C2E38 48 1A 2C 35 */ bl func_80368B2C +/* 801C5EF8 001C2E38 48 1A 2C 35 */ bl strcpy /* 801C5EFC 001C2E3C 3B BD 00 01 */ addi r29, r29, 1 /* 801C5F00 001C2E40 2C 1D 00 05 */ cmpwi r29, 5 /* 801C5F04 001C2E44 3B FF 00 04 */ addi r31, r31, 4 @@ -1242,7 +1242,7 @@ lbl_801C5F20: /* 801C5F4C 001C2E8C 41 80 FF D4 */ blt lbl_801C5F20 lbl_801C5F50: /* 801C5F50 001C2E90 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C5F54 001C2E94 48 19 C2 CD */ bl func_80362220 +/* 801C5F54 001C2E94 48 19 C2 CD */ bl _restgpr_27 /* 801C5F58 001C2E98 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C5F5C 001C2E9C 7C 08 03 A6 */ mtlr r0 /* 801C5F60 001C2EA0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1254,7 +1254,7 @@ dMenu_Fishing_c_NS_setBButtonString: /* 801C5F6C 001C2EAC 7C 08 02 A6 */ mflr r0 /* 801C5F70 001C2EB0 90 01 00 24 */ stw r0, 0x24(r1) /* 801C5F74 001C2EB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C5F78 001C2EB8 48 19 C2 5D */ bl func_803621D4 +/* 801C5F78 001C2EB8 48 19 C2 5D */ bl _savegpr_27 /* 801C5F7C 001C2EBC 7C 7B 1B 78 */ mr r27, r3 /* 801C5F80 001C2EC0 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801C5F84 001C2EC4 40 82 00 3C */ bne lbl_801C5FC0 @@ -1267,7 +1267,7 @@ lbl_801C5F98: /* 801C5F9C 001C2EDC 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801C5FA0 001C2EE0 48 13 A6 B9 */ bl J2DTextBox_NS_getStringPtr /* 801C5FA4 001C2EE4 38 9E 00 3E */ addi r4, r30, 0x3e -/* 801C5FA8 001C2EE8 48 1A 2B 85 */ bl func_80368B2C +/* 801C5FA8 001C2EE8 48 1A 2B 85 */ bl strcpy /* 801C5FAC 001C2EEC 3B BD 00 01 */ addi r29, r29, 1 /* 801C5FB0 001C2EF0 2C 1D 00 05 */ cmpwi r29, 5 /* 801C5FB4 001C2EF4 3B FF 00 04 */ addi r31, r31, 4 @@ -1293,7 +1293,7 @@ lbl_801C5FD0: /* 801C5FFC 001C2F3C 41 80 FF D4 */ blt lbl_801C5FD0 lbl_801C6000: /* 801C6000 001C2F40 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C6004 001C2F44 48 19 C2 1D */ bl func_80362220 +/* 801C6004 001C2F44 48 19 C2 1D */ bl _restgpr_27 /* 801C6008 001C2F48 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C600C 001C2F4C 7C 08 03 A6 */ mtlr r0 /* 801C6010 001C2F50 38 21 00 20 */ addi r1, r1, 0x20 @@ -1365,7 +1365,7 @@ dMenu_Fishing_c_NS_setFishParam: /* 801C60F4 001C3034 48 13 A5 65 */ bl J2DTextBox_NS_getStringPtr /* 801C60F8 001C3038 7C 64 1B 78 */ mr r4, r3 /* 801C60FC 001C303C 7F C3 F3 78 */ mr r3, r30 -/* 801C6100 001C3040 48 1A 2A 2D */ bl func_80368B2C +/* 801C6100 001C3040 48 1A 2A 2D */ bl strcpy /* 801C6104 001C3044 38 C0 00 00 */ li r6, 0 /* 801C6108 001C3048 38 81 00 08 */ addi r4, r1, 8 /* 801C610C 001C304C 7C 7E D2 14 */ add r3, r30, r26 @@ -1385,11 +1385,11 @@ lbl_801C6124: /* 801C613C 001C307C 80 7F 01 24 */ lwz r3, 0x124(r31) /* 801C6140 001C3080 48 13 A5 19 */ bl J2DTextBox_NS_getStringPtr /* 801C6144 001C3084 38 81 00 28 */ addi r4, r1, 0x28 -/* 801C6148 001C3088 48 1A 29 E5 */ bl func_80368B2C +/* 801C6148 001C3088 48 1A 29 E5 */ bl strcpy /* 801C614C 001C308C 80 7F 01 84 */ lwz r3, 0x184(r31) /* 801C6150 001C3090 48 13 A5 09 */ bl J2DTextBox_NS_getStringPtr /* 801C6154 001C3094 38 81 00 08 */ addi r4, r1, 8 -/* 801C6158 001C3098 48 1A 29 D5 */ bl func_80368B2C +/* 801C6158 001C3098 48 1A 29 D5 */ bl strcpy /* 801C615C 001C309C 93 19 5E 0C */ stw r24, 0x5e0c(r25) /* 801C6160 001C30A0 80 7D 01 F4 */ lwz r3, 0x1f4(r29) /* 801C6164 001C30A4 38 80 05 98 */ li r4, 0x598 @@ -1406,7 +1406,7 @@ lbl_801C6124: /* 801C6190 001C30D0 48 13 A4 C9 */ bl J2DTextBox_NS_getStringPtr /* 801C6194 001C30D4 7C 64 1B 78 */ mr r4, r3 /* 801C6198 001C30D8 38 61 00 28 */ addi r3, r1, 0x28 -/* 801C619C 001C30DC 48 1A 29 91 */ bl func_80368B2C +/* 801C619C 001C30DC 48 1A 29 91 */ bl strcpy /* 801C61A0 001C30E0 38 C0 00 00 */ li r6, 0 /* 801C61A4 001C30E4 38 81 00 08 */ addi r4, r1, 8 /* 801C61A8 001C30E8 7C 7E DA 14 */ add r3, r30, r27 @@ -1426,11 +1426,11 @@ lbl_801C61C0: /* 801C61D8 001C3118 80 7F 01 54 */ lwz r3, 0x154(r31) /* 801C61DC 001C311C 48 13 A4 7D */ bl J2DTextBox_NS_getStringPtr /* 801C61E0 001C3120 38 81 00 28 */ addi r4, r1, 0x28 -/* 801C61E4 001C3124 48 1A 29 49 */ bl func_80368B2C +/* 801C61E4 001C3124 48 1A 29 49 */ bl strcpy /* 801C61E8 001C3128 80 7F 01 B4 */ lwz r3, 0x1b4(r31) /* 801C61EC 001C312C 48 13 A4 6D */ bl J2DTextBox_NS_getStringPtr /* 801C61F0 001C3130 38 81 00 08 */ addi r4, r1, 8 -/* 801C61F4 001C3134 48 1A 29 39 */ bl func_80368B2C +/* 801C61F4 001C3134 48 1A 29 39 */ bl strcpy /* 801C61F8 001C3138 39 61 00 70 */ addi r11, r1, 0x70 /* 801C61FC 001C313C 48 19 C0 19 */ bl func_80362214 /* 801C6200 001C3140 80 01 00 74 */ lwz r0, 0x74(r1) diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index aaf9bf5f6c..6cbf1c1190 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -53,7 +53,7 @@ lbl_801C668C: /* 801C669C 001C35DC 40 82 00 18 */ bne lbl_801C66B4 /* 801C66A0 001C35E0 38 6D 8B 24 */ addi r3, r13, lbl_804510A4-_SDA_BASE_ /* 801C66A4 001C35E4 38 9B 00 08 */ addi r4, r27, 8 -/* 801C66A8 001C35E8 48 1A 24 85 */ bl func_80368B2C +/* 801C66A8 001C35E8 48 1A 24 85 */ bl strcpy /* 801C66AC 001C35EC 38 6D 8B 24 */ addi r3, r13, lbl_804510A4-_SDA_BASE_ /* 801C66B0 001C35F0 48 00 00 1C */ b lbl_801C66CC lbl_801C66B4: @@ -180,7 +180,7 @@ lbl_801C6820: /* 801C6874 001C37B4 38 7D 02 50 */ addi r3, r29, 0x250 /* 801C6878 001C37B8 3C 80 80 39 */ lis r4, lbl_803960E8@ha /* 801C687C 001C37BC 38 84 60 E8 */ addi r4, r4, lbl_803960E8@l -/* 801C6880 001C37C0 48 1A 22 AD */ bl func_80368B2C +/* 801C6880 001C37C0 48 1A 22 AD */ bl strcpy /* 801C6884 001C37C4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C6888 001C37C8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801C688C 001C37CC 80 83 00 08 */ lwz r4, 8(r3) @@ -345,7 +345,7 @@ lbl_801C6A70: /* 801C6ACC 001C3A0C 7C 08 02 A6 */ mflr r0 /* 801C6AD0 001C3A10 90 01 00 24 */ stw r0, 0x24(r1) /* 801C6AD4 001C3A14 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C6AD8 001C3A18 48 19 B6 FD */ bl func_803621D4 +/* 801C6AD8 001C3A18 48 19 B6 FD */ bl _savegpr_27 /* 801C6ADC 001C3A1C 7C 7E 1B 79 */ or. r30, r3, r3 /* 801C6AE0 001C3A20 7C 9F 23 78 */ mr r31, r4 /* 801C6AE4 001C3A24 41 82 02 64 */ beq lbl_801C6D48 @@ -522,7 +522,7 @@ lbl_801C6D2C: lbl_801C6D48: /* 801C6D48 001C3C88 7F C3 F3 78 */ mr r3, r30 /* 801C6D4C 001C3C8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C6D50 001C3C90 48 19 B4 D1 */ bl func_80362220 +/* 801C6D50 001C3C90 48 19 B4 D1 */ bl _restgpr_27 /* 801C6D54 001C3C94 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C6D58 001C3C98 7C 08 03 A6 */ mtlr r0 /* 801C6D5C 001C3C9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5263,7 +5263,7 @@ lbl_801CB340: /* 801CB348 001C8288 40 82 01 5C */ bne lbl_801CB4A4 /* 801CB34C 001C828C 38 61 00 08 */ addi r3, r1, 8 /* 801CB350 001C8290 7C 9D AA 14 */ add r4, r29, r21 -/* 801CB354 001C8294 48 19 D7 D9 */ bl func_80368B2C +/* 801CB354 001C8294 48 19 D7 D9 */ bl strcpy /* 801CB358 001C8298 38 C0 00 00 */ li r6, 0 /* 801CB35C 001C829C 38 A0 00 00 */ li r5, 0 /* 801CB360 001C82A0 38 81 00 50 */ addi r4, r1, 0x50 @@ -5425,7 +5425,7 @@ dMenu_Fmap_c_NS_checkStRoomData: /* 801CB574 001C84B4 7C 08 02 A6 */ mflr r0 /* 801CB578 001C84B8 90 01 00 24 */ stw r0, 0x24(r1) /* 801CB57C 001C84BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB580 001C84C0 48 19 6C 55 */ bl func_803621D4 +/* 801CB580 001C84C0 48 19 6C 55 */ bl _savegpr_27 /* 801CB584 001C84C4 7C 7F 1B 78 */ mr r31, r3 /* 801CB588 001C84C8 80 63 00 8C */ lwz r3, 0x8c(r3) /* 801CB58C 001C84CC 80 03 00 10 */ lwz r0, 0x10(r3) @@ -5484,7 +5484,7 @@ lbl_801CB630: /* 801CB648 001C8588 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l lbl_801CB64C: /* 801CB64C 001C858C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB650 001C8590 48 19 6B D1 */ bl func_80362220 +/* 801CB650 001C8590 48 19 6B D1 */ bl _restgpr_27 /* 801CB654 001C8594 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CB658 001C8598 7C 08 03 A6 */ mtlr r0 /* 801CB65C 001C859C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5577,7 +5577,7 @@ dMenu_Fmap_c_NS_readWorldData: /* 801CB774 001C86B4 7C 08 02 A6 */ mflr r0 /* 801CB778 001C86B8 90 01 00 24 */ stw r0, 0x24(r1) /* 801CB77C 001C86BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB780 001C86C0 48 19 6A 55 */ bl func_803621D4 +/* 801CB780 001C86C0 48 19 6A 55 */ bl _savegpr_27 /* 801CB784 001C86C4 7C 7D 1B 78 */ mr r29, r3 /* 801CB788 001C86C8 7C 9C 23 78 */ mr r28, r4 /* 801CB78C 001C86CC 48 00 0E 91 */ bl dMenu_Fmap_c_NS_removeAreaData @@ -5694,7 +5694,7 @@ lbl_801CB914: lbl_801CB91C: /* 801CB91C 001C885C 7F E3 FB 78 */ mr r3, r31 /* 801CB920 001C8860 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB924 001C8864 48 19 68 FD */ bl func_80362220 +/* 801CB924 001C8864 48 19 68 FD */ bl _restgpr_27 /* 801CB928 001C8868 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CB92C 001C886C 7C 08 03 A6 */ mtlr r0 /* 801CB930 001C8870 38 21 00 20 */ addi r1, r1, 0x20 @@ -5774,23 +5774,23 @@ lbl_801CBA2C: /* 801CBA34 001C8974 40 82 03 64 */ bne lbl_801CBD98 /* 801CBA38 001C8978 38 61 00 08 */ addi r3, r1, 8 /* 801CBA3C 001C897C 38 8F 02 58 */ addi r4, r15, 0x258 -/* 801CBA40 001C8980 48 19 D0 ED */ bl func_80368B2C +/* 801CBA40 001C8980 48 19 D0 ED */ bl strcpy /* 801CBA44 001C8984 7D E3 7B 78 */ mr r3, r15 /* 801CBA48 001C8988 48 00 10 7D */ bl dMenu_Fmap_c_NS_resetRoomDataBit /* 801CBA4C 001C898C 56 20 06 3F */ clrlwi. r0, r17, 0x18 /* 801CBA50 001C8990 41 82 00 14 */ beq lbl_801CBA64 /* 801CBA54 001C8994 38 6F 02 58 */ addi r3, r15, 0x258 /* 801CBA58 001C8998 7C 99 FA 14 */ add r4, r25, r31 -/* 801CBA5C 001C899C 48 19 D0 D1 */ bl func_80368B2C +/* 801CBA5C 001C899C 48 19 D0 D1 */ bl strcpy /* 801CBA60 001C89A0 48 00 00 10 */ b lbl_801CBA70 lbl_801CBA64: /* 801CBA64 001C89A4 38 6F 02 58 */ addi r3, r15, 0x258 /* 801CBA68 001C89A8 38 81 00 08 */ addi r4, r1, 8 -/* 801CBA6C 001C89AC 48 19 D0 C1 */ bl func_80368B2C +/* 801CBA6C 001C89AC 48 19 D0 C1 */ bl strcpy lbl_801CBA70: /* 801CBA70 001C89B0 38 61 00 08 */ addi r3, r1, 8 /* 801CBA74 001C89B4 7C 99 FA 14 */ add r4, r25, r31 -/* 801CBA78 001C89B8 48 19 D0 B5 */ bl func_80368B2C +/* 801CBA78 001C89B8 48 19 D0 B5 */ bl strcpy /* 801CBA7C 001C89BC 38 A0 00 00 */ li r5, 0 /* 801CBA80 001C89C0 38 80 00 00 */ li r4, 0 /* 801CBA84 001C89C4 38 61 00 18 */ addi r3, r1, 0x18 @@ -5983,7 +5983,7 @@ lbl_801CBCDC: /* 801CBD30 001C8C70 38 63 02 60 */ addi r3, r3, 0x260 /* 801CBD34 001C8C74 7C 6F 1A 14 */ add r3, r15, r3 /* 801CBD38 001C8C78 38 81 00 10 */ addi r4, r1, 0x10 -/* 801CBD3C 001C8C7C 48 19 CD F1 */ bl func_80368B2C +/* 801CBD3C 001C8C7C 48 19 CD F1 */ bl strcpy /* 801CBD40 001C8C80 88 6F 03 06 */ lbz r3, 0x306(r15) /* 801CBD44 001C8C84 38 03 00 01 */ addi r0, r3, 1 /* 801CBD48 001C8C88 98 0F 03 06 */ stb r0, 0x306(r15) @@ -6545,7 +6545,7 @@ dMenu_Fmap_c_NS_readRoomDzsData: /* 801CC520 001C9460 7C 08 02 A6 */ mflr r0 /* 801CC524 001C9464 90 01 00 24 */ stw r0, 0x24(r1) /* 801CC528 001C9468 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC52C 001C946C 48 19 5C A9 */ bl func_803621D4 +/* 801CC52C 001C946C 48 19 5C A9 */ bl _savegpr_27 /* 801CC530 001C9470 7C 7B 1B 78 */ mr r27, r3 /* 801CC534 001C9474 7C 9C 23 78 */ mr r28, r4 /* 801CC538 001C9478 7C DE 33 78 */ mr r30, r6 @@ -6604,7 +6604,7 @@ lbl_801CC5F4: /* 801CC600 001C9540 38 60 00 01 */ li r3, 1 lbl_801CC604: /* 801CC604 001C9544 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC608 001C9548 48 19 5C 19 */ bl func_80362220 +/* 801CC608 001C9548 48 19 5C 19 */ bl _restgpr_27 /* 801CC60C 001C954C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CC610 001C9550 7C 08 03 A6 */ mtlr r0 /* 801CC614 001C9554 38 21 00 20 */ addi r1, r1, 0x20 @@ -6712,7 +6712,7 @@ lbl_801CC764: /* 801CC764 001C96A4 38 7E 02 60 */ addi r3, r30, 0x260 /* 801CC768 001C96A8 7C 7F 1A 14 */ add r3, r31, r3 /* 801CC76C 001C96AC 7F A4 EB 78 */ mr r4, r29 -/* 801CC770 001C96B0 48 19 C3 BD */ bl func_80368B2C +/* 801CC770 001C96B0 48 19 C3 BD */ bl strcpy /* 801CC774 001C96B4 3B 5A 00 01 */ addi r26, r26, 1 /* 801CC778 001C96B8 2C 1A 00 14 */ cmpwi r26, 0x14 /* 801CC77C 001C96BC 3B DE 00 08 */ addi r30, r30, 8 @@ -6734,7 +6734,7 @@ dMenu_Fmap_c_NS_removeRoomData: /* 801CC7AC 001C96EC 7C 08 02 A6 */ mflr r0 /* 801CC7B0 001C96F0 90 01 00 24 */ stw r0, 0x24(r1) /* 801CC7B4 001C96F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC7B8 001C96F8 48 19 5A 21 */ bl func_803621D8 +/* 801CC7B8 001C96F8 48 19 5A 21 */ bl _savegpr_28 /* 801CC7BC 001C96FC 7C 7C 1B 78 */ mr r28, r3 /* 801CC7C0 001C9700 83 A4 00 0C */ lwz r29, 0xc(r4) /* 801CC7C4 001C9704 48 00 00 74 */ b lbl_801CC838 @@ -6778,7 +6778,7 @@ lbl_801CC838: /* 801CC83C 001C977C 40 82 FF 8C */ bne lbl_801CC7C8 /* 801CC840 001C9780 38 60 00 01 */ li r3, 1 /* 801CC844 001C9784 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CC848 001C9788 48 19 59 DD */ bl func_80362224 +/* 801CC848 001C9788 48 19 59 DD */ bl _restgpr_28 /* 801CC84C 001C978C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CC850 001C9790 7C 08 03 A6 */ mtlr r0 /* 801CC854 001C9794 38 21 00 20 */ addi r1, r1, 0x20 @@ -7021,7 +7021,7 @@ lbl_801CCB48: /* 801CCB88 001C9AC8 4B FF 9A A5 */ bl dMenuFmap_getStartStageName /* 801CCB8C 001C9ACC 7C 64 1B 78 */ mr r4, r3 /* 801CCB90 001C9AD0 38 61 00 08 */ addi r3, r1, 8 -/* 801CCB94 001C9AD4 48 19 BF 99 */ bl func_80368B2C +/* 801CCB94 001C9AD4 48 19 BF 99 */ bl strcpy /* 801CCB98 001C9AD8 48 00 00 2C */ b lbl_801CCBC4 lbl_801CCB9C: /* 801CCB9C 001C9ADC C0 03 00 64 */ lfs f0, 0x64(r3) @@ -7033,7 +7033,7 @@ lbl_801CCB9C: /* 801CCBB4 001C9AF4 AB 83 00 70 */ lha r28, 0x70(r3) /* 801CCBB8 001C9AF8 38 83 00 72 */ addi r4, r3, 0x72 /* 801CCBBC 001C9AFC 38 61 00 08 */ addi r3, r1, 8 -/* 801CCBC0 001C9B00 48 19 BF 6D */ bl func_80368B2C +/* 801CCBC0 001C9B00 48 19 BF 6D */ bl strcpy lbl_801CCBC4: /* 801CCBC4 001C9B04 38 C0 00 00 */ li r6, 0 /* 801CCBC8 001C9B08 88 1E 03 00 */ lbz r0, 0x300(r30) @@ -7280,7 +7280,7 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon: /* 801CCF14 001C9E54 4B FF 97 19 */ bl dMenuFmap_getStartStageName /* 801CCF18 001C9E58 7C 64 1B 78 */ mr r4, r3 /* 801CCF1C 001C9E5C 38 61 00 08 */ addi r3, r1, 8 -/* 801CCF20 001C9E60 48 19 BC 0D */ bl func_80368B2C +/* 801CCF20 001C9E60 48 19 BC 0D */ bl strcpy /* 801CCF24 001C9E64 48 00 00 2C */ b lbl_801CCF50 lbl_801CCF28: /* 801CCF28 001C9E68 C0 03 00 64 */ lfs f0, 0x64(r3) @@ -7292,7 +7292,7 @@ lbl_801CCF28: /* 801CCF40 001C9E80 AB E3 00 70 */ lha r31, 0x70(r3) /* 801CCF44 001C9E84 38 83 00 72 */ addi r4, r3, 0x72 /* 801CCF48 001C9E88 38 61 00 08 */ addi r3, r1, 8 -/* 801CCF4C 001C9E8C 48 19 BB E1 */ bl func_80368B2C +/* 801CCF4C 001C9E8C 48 19 BB E1 */ bl strcpy lbl_801CCF50: /* 801CCF50 001C9E90 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801CCF54 001C9E94 38 80 00 15 */ li r4, 0x15 @@ -7611,7 +7611,7 @@ dMenu_Fmap_c_NS_searchPortalStageID: /* 801CD384 001CA2C4 7C 08 02 A6 */ mflr r0 /* 801CD388 001CA2C8 90 01 00 24 */ stw r0, 0x24(r1) /* 801CD38C 001CA2CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CD390 001CA2D0 48 19 4E 49 */ bl func_803621D8 +/* 801CD390 001CA2D0 48 19 4E 49 */ bl _savegpr_28 /* 801CD394 001CA2D4 7C 7C 1B 78 */ mr r28, r3 /* 801CD398 001CA2D8 7C 9D 23 78 */ mr r29, r4 /* 801CD39C 001CA2DC 3B C0 00 00 */ li r30, 0 @@ -7633,7 +7633,7 @@ lbl_801CD3C4: /* 801CD3D4 001CA314 38 60 00 FF */ li r3, 0xff lbl_801CD3D8: /* 801CD3D8 001CA318 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CD3DC 001CA31C 48 19 4E 49 */ bl func_80362224 +/* 801CD3DC 001CA31C 48 19 4E 49 */ bl _restgpr_28 /* 801CD3E0 001CA320 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CD3E4 001CA324 7C 08 03 A6 */ mtlr r0 /* 801CD3E8 001CA328 38 21 00 20 */ addi r1, r1, 0x20 @@ -7716,7 +7716,7 @@ lbl_801CD4A0: /* 801CD4F4 001CA434 4B FF 91 39 */ bl dMenuFmap_getStartStageName /* 801CD4F8 001CA438 7C 64 1B 78 */ mr r4, r3 /* 801CD4FC 001CA43C 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD500 001CA440 48 19 B6 2D */ bl func_80368B2C +/* 801CD500 001CA440 48 19 B6 2D */ bl strcpy /* 801CD504 001CA444 48 00 00 28 */ b lbl_801CD52C lbl_801CD508: /* 801CD508 001CA448 C0 03 00 64 */ lfs f0, 0x64(r3) @@ -7727,7 +7727,7 @@ lbl_801CD508: /* 801CD51C 001CA45C D0 01 00 34 */ stfs f0, 0x34(r1) /* 801CD520 001CA460 38 83 00 72 */ addi r4, r3, 0x72 /* 801CD524 001CA464 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD528 001CA468 48 19 B6 05 */ bl func_80368B2C +/* 801CD528 001CA468 48 19 B6 05 */ bl strcpy lbl_801CD52C: /* 801CD52C 001CA46C C0 42 A7 28 */ lfs f2, lbl_80454128-_SDA2_BASE_(r2) /* 801CD530 001CA470 88 1E 03 00 */ lbz r0, 0x300(r30) @@ -7779,7 +7779,7 @@ dMenu_Fmap_c_NS_tableArrowPosInit: /* 801CD5D0 001CA510 7C 08 02 A6 */ mflr r0 /* 801CD5D4 001CA514 90 01 00 34 */ stw r0, 0x34(r1) /* 801CD5D8 001CA518 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CD5DC 001CA51C 48 19 4B FD */ bl func_803621D8 +/* 801CD5DC 001CA51C 48 19 4B FD */ bl _savegpr_28 /* 801CD5E0 001CA520 7C 7E 1B 78 */ mr r30, r3 /* 801CD5E4 001CA524 7C 9F 23 78 */ mr r31, r4 /* 801CD5E8 001CA528 3B 80 FF FF */ li r28, -1 @@ -7843,7 +7843,7 @@ lbl_801CD6AC: /* 801CD6B4 001CA5F4 3C 80 80 3C */ lis r4, lbl_803BD63C@ha /* 801CD6B8 001CA5F8 38 84 D6 3C */ addi r4, r4, lbl_803BD63C@l /* 801CD6BC 001CA5FC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 801CD6C0 001CA600 48 19 B4 6D */ bl func_80368B2C +/* 801CD6C0 001CA600 48 19 B4 6D */ bl strcpy /* 801CD6C4 001CA604 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801CD6C8 001CA608 41 82 00 70 */ beq lbl_801CD738 /* 801CD6CC 001CA60C 7F C3 F3 78 */ mr r3, r30 @@ -7884,7 +7884,7 @@ lbl_801CD738: /* 801CD754 001CA694 48 00 81 A5 */ bl dMenu_Fmap2DBack_c_NS_setArrowPos3D lbl_801CD758: /* 801CD758 001CA698 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CD75C 001CA69C 48 19 4A C9 */ bl func_80362224 +/* 801CD75C 001CA69C 48 19 4A C9 */ bl _restgpr_28 /* 801CD760 001CA6A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CD764 001CA6A4 7C 08 03 A6 */ mtlr r0 /* 801CD768 001CA6A8 38 21 00 30 */ addi r1, r1, 0x30 @@ -7952,7 +7952,7 @@ dMenu_Fmap_c_NS_howlArrowPosInit: /* 801CD844 001CA784 54 BF 15 BA */ rlwinm r31, r5, 2, 0x16, 0x1d /* 801CD848 001CA788 7C 80 FA 14 */ add r4, r0, r31 /* 801CD84C 001CA78C 80 84 FF F8 */ lwz r4, -8(r4) -/* 801CD850 001CA790 48 19 B2 DD */ bl func_80368B2C +/* 801CD850 001CA790 48 19 B2 DD */ bl strcpy /* 801CD854 001CA794 7F C3 F3 78 */ mr r3, r30 /* 801CD858 001CA798 38 80 00 06 */ li r4, 6 /* 801CD85C 001CA79C 3C A0 80 39 */ lis r5, lbl_803960D0@ha @@ -8059,7 +8059,7 @@ dMenu_Fmap_c_NS_getPlayerPos2D: /* 801CD9A8 001CA8E8 4B FF 8C 85 */ bl dMenuFmap_getStartStageName /* 801CD9AC 001CA8EC 7C 64 1B 78 */ mr r4, r3 /* 801CD9B0 001CA8F0 38 61 00 08 */ addi r3, r1, 8 -/* 801CD9B4 001CA8F4 48 19 B1 79 */ bl func_80368B2C +/* 801CD9B4 001CA8F4 48 19 B1 79 */ bl strcpy /* 801CD9B8 001CA8F8 48 00 00 28 */ b lbl_801CD9E0 lbl_801CD9BC: /* 801CD9BC 001CA8FC C0 03 00 64 */ lfs f0, 0x64(r3) @@ -8070,7 +8070,7 @@ lbl_801CD9BC: /* 801CD9D0 001CA910 D0 01 00 24 */ stfs f0, 0x24(r1) /* 801CD9D4 001CA914 38 83 00 72 */ addi r4, r3, 0x72 /* 801CD9D8 001CA918 38 61 00 08 */ addi r3, r1, 8 -/* 801CD9DC 001CA91C 48 19 B1 51 */ bl func_80368B2C +/* 801CD9DC 001CA91C 48 19 B1 51 */ bl strcpy lbl_801CD9E0: /* 801CD9E0 001CA920 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CD9E4 001CA924 C0 43 0F CC */ lfs f2, 0xfcc(r3) diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index 98d89d9b22..7f29a09163 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -9,7 +9,7 @@ dMenu_Fmap2DBack_c: /* 801CF570 001CC4B0 7C 08 02 A6 */ mflr r0 /* 801CF574 001CC4B4 90 01 00 44 */ stw r0, 0x44(r1) /* 801CF578 001CC4B8 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CF57C 001CC4BC 48 19 2C 59 */ bl func_803621D4 +/* 801CF57C 001CC4BC 48 19 2C 59 */ bl _savegpr_27 /* 801CF580 001CC4C0 7C 7F 1B 78 */ mr r31, r3 /* 801CF584 001CC4C4 3C 60 80 3A */ lis r3, lbl_803A6F88@ha /* 801CF588 001CC4C8 38 03 6F 88 */ addi r0, r3, lbl_803A6F88@l @@ -488,7 +488,7 @@ lbl_801CFC08: /* 801CFCBC 001CCBFC 90 1F 12 44 */ stw r0, 0x1244(r31) /* 801CFCC0 001CCC00 7F E3 FB 78 */ mr r3, r31 /* 801CFCC4 001CCC04 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CFCC8 001CCC08 48 19 25 59 */ bl func_80362220 +/* 801CFCC8 001CCC08 48 19 25 59 */ bl _restgpr_27 /* 801CFCCC 001CCC0C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801CFCD0 001CCC10 7C 08 03 A6 */ mtlr r0 /* 801CFCD4 001CCC14 38 21 00 40 */ addi r1, r1, 0x40 @@ -1895,7 +1895,7 @@ dMenu_Fmap2DBack_c_NS_zoomMapCalc: /* 801D1164 001CE0A4 DB A1 00 20 */ stfd f29, 0x20(r1) /* 801D1168 001CE0A8 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 801D116C 001CE0AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1170 001CE0B0 48 19 10 65 */ bl func_803621D4 +/* 801D1170 001CE0B0 48 19 10 65 */ bl _savegpr_27 /* 801D1174 001CE0B4 7C 7F 1B 78 */ mr r31, r3 /* 801D1178 001CE0B8 FF E0 08 90 */ fmr f31, f1 /* 801D117C 001CE0BC D3 E3 0F A0 */ stfs f31, 0xfa0(r3) @@ -2090,7 +2090,7 @@ lbl_801D13FC: /* 801D1458 001CE398 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 801D145C 001CE39C CB A1 00 20 */ lfd f29, 0x20(r1) /* 801D1460 001CE3A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1464 001CE3A4 48 19 0D BD */ bl func_80362220 +/* 801D1464 001CE3A4 48 19 0D BD */ bl _restgpr_27 /* 801D1468 001CE3A8 80 01 00 54 */ lwz r0, 0x54(r1) /* 801D146C 001CE3AC 7C 08 03 A6 */ mtlr r0 /* 801D1470 001CE3B0 38 21 00 50 */ addi r1, r1, 0x50 @@ -2106,7 +2106,7 @@ dMenu_Fmap2DBack_c_NS_zoomMapCalc2: /* 801D148C 001CE3CC DB C1 00 20 */ stfd f30, 0x20(r1) /* 801D1490 001CE3D0 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801D1494 001CE3D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1498 001CE3D8 48 19 0D 3D */ bl func_803621D4 +/* 801D1498 001CE3D8 48 19 0D 3D */ bl _savegpr_27 /* 801D149C 001CE3DC 7C 7F 1B 78 */ mr r31, r3 /* 801D14A0 001CE3E0 FF C0 08 90 */ fmr f30, f1 /* 801D14A4 001CE3E4 48 00 17 A9 */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate @@ -2354,7 +2354,7 @@ lbl_801D1830: /* 801D1838 001CE778 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801D183C 001CE77C CB C1 00 20 */ lfd f30, 0x20(r1) /* 801D1840 001CE780 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1844 001CE784 48 19 09 DD */ bl func_80362220 +/* 801D1844 001CE784 48 19 09 DD */ bl _restgpr_27 /* 801D1848 001CE788 80 01 00 44 */ lwz r0, 0x44(r1) /* 801D184C 001CE78C 7C 08 03 A6 */ mtlr r0 /* 801D1850 001CE790 38 21 00 40 */ addi r1, r1, 0x40 @@ -2368,7 +2368,7 @@ dMenu_Fmap2DBack_c_NS_zoomMapCalcHIO: /* 801D1864 001CE7A4 DB E1 00 20 */ stfd f31, 0x20(r1) /* 801D1868 001CE7A8 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 801D186C 001CE7AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1870 001CE7B0 48 19 09 65 */ bl func_803621D4 +/* 801D1870 001CE7B0 48 19 09 65 */ bl _savegpr_27 /* 801D1874 001CE7B4 7C 7F 1B 78 */ mr r31, r3 /* 801D1878 001CE7B8 48 00 13 D5 */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate /* 801D187C 001CE7BC C0 1F 0F 9C */ lfs f0, 0xf9c(r31) @@ -2509,7 +2509,7 @@ lbl_801D1A84: /* 801D1A84 001CE9C4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801D1A88 001CE9C8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 801D1A8C 001CE9CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1A90 001CE9D0 48 19 07 91 */ bl func_80362220 +/* 801D1A90 001CE9D0 48 19 07 91 */ bl _restgpr_27 /* 801D1A94 001CE9D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D1A98 001CE9D8 7C 08 03 A6 */ mtlr r0 /* 801D1A9C 001CE9DC 38 21 00 30 */ addi r1, r1, 0x30 @@ -2742,7 +2742,7 @@ dMenu_Fmap2DBack_c_NS_allmap_move2: /* 801D1DE0 001CED20 DB A1 00 30 */ stfd f29, 0x30(r1) /* 801D1DE4 001CED24 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 801D1DE8 001CED28 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D1DEC 001CED2C 48 19 03 ED */ bl func_803621D8 +/* 801D1DEC 001CED2C 48 19 03 ED */ bl _savegpr_28 /* 801D1DF0 001CED30 7C 7F 1B 78 */ mr r31, r3 /* 801D1DF4 001CED34 7C 9C 23 78 */ mr r28, r4 /* 801D1DF8 001CED38 48 00 09 99 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY @@ -2948,7 +2948,7 @@ lbl_801D20D0: /* 801D20E0 001CF020 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 801D20E4 001CF024 CB A1 00 30 */ lfd f29, 0x30(r1) /* 801D20E8 001CF028 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D20EC 001CF02C 48 19 01 39 */ bl func_80362224 +/* 801D20EC 001CF02C 48 19 01 39 */ bl _restgpr_28 /* 801D20F0 001CF030 80 01 00 64 */ lwz r0, 0x64(r1) /* 801D20F4 001CF034 7C 08 03 A6 */ mtlr r0 /* 801D20F8 001CF038 38 21 00 60 */ addi r1, r1, 0x60 @@ -2974,7 +2974,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos: /* 801D213C 001CF07C DB 21 00 40 */ stfd f25, 0x40(r1) /* 801D2140 001CF080 F3 21 00 48 */ psq_st f25, 72(r1), 0, qr0 /* 801D2144 001CF084 39 61 00 40 */ addi r11, r1, 0x40 -/* 801D2148 001CF088 48 19 00 8D */ bl func_803621D4 +/* 801D2148 001CF088 48 19 00 8D */ bl _savegpr_27 /* 801D214C 001CF08C 7C 7B 1B 78 */ mr r27, r3 /* 801D2150 001CF090 7C 9C 23 78 */ mr r28, r4 /* 801D2154 001CF094 FF 20 08 90 */ fmr f25, f1 @@ -3156,7 +3156,7 @@ lbl_801D23CC: /* 801D23FC 001CF33C E3 21 00 48 */ psq_l f25, 72(r1), 0, qr0 /* 801D2400 001CF340 CB 21 00 40 */ lfd f25, 0x40(r1) /* 801D2404 001CF344 39 61 00 40 */ addi r11, r1, 0x40 -/* 801D2408 001CF348 48 18 FE 19 */ bl func_80362220 +/* 801D2408 001CF348 48 18 FE 19 */ bl _restgpr_27 /* 801D240C 001CF34C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801D2410 001CF350 7C 08 03 A6 */ mtlr r0 /* 801D2414 001CF354 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -3191,7 +3191,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_: /* 801D2470 001CF3B0 DB A1 00 20 */ stfd f29, 0x20(r1) /* 801D2474 001CF3B4 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 801D2478 001CF3B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D247C 001CF3BC 48 18 FD 5D */ bl func_803621D8 +/* 801D247C 001CF3BC 48 18 FD 5D */ bl _savegpr_28 /* 801D2480 001CF3C0 7C 7C 1B 78 */ mr r28, r3 /* 801D2484 001CF3C4 7C 9D 23 78 */ mr r29, r4 /* 801D2488 001CF3C8 FF A0 08 90 */ fmr f29, f1 @@ -3221,7 +3221,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_: /* 801D24E8 001CF428 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 801D24EC 001CF42C CB A1 00 20 */ lfd f29, 0x20(r1) /* 801D24F0 001CF430 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D24F4 001CF434 48 18 FD 31 */ bl func_80362224 +/* 801D24F4 001CF434 48 18 FD 31 */ bl _restgpr_28 /* 801D24F8 001CF438 80 01 00 54 */ lwz r0, 0x54(r1) /* 801D24FC 001CF43C 7C 08 03 A6 */ mtlr r0 /* 801D2500 001CF440 38 21 00 50 */ addi r1, r1, 0x50 @@ -3275,7 +3275,7 @@ lbl_801D2590: /* 801D25A8 001CF4E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801D25AC 001CF4EC 38 63 00 64 */ addi r3, r3, 0x64 /* 801D25B0 001CF4F0 38 80 00 04 */ li r4, 4 -/* 801D25B4 001CF4F4 4B E6 08 C5 */ bl dSv_player_field_last_stay_info_c_NS_isRegionBit +/* 801D25B4 001CF4F4 4B E6 08 C5 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi /* 801D25B8 001CF4F8 2C 03 00 00 */ cmpwi r3, 0 /* 801D25BC 001CF4FC 41 82 00 0C */ beq lbl_801D25C8 /* 801D25C0 001CF500 38 60 00 01 */ li r3, 1 @@ -3301,7 +3301,7 @@ lbl_801D25E8: /* 801D2604 001CF544 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801D2608 001CF548 38 63 00 64 */ addi r3, r3, 0x64 /* 801D260C 001CF54C 38 9F 00 01 */ addi r4, r31, 1 -/* 801D2610 001CF550 4B E6 08 69 */ bl dSv_player_field_last_stay_info_c_NS_isRegionBit +/* 801D2610 001CF550 4B E6 08 69 */ bl isRegionBit__33dSv_player_field_last_stay_info_cCFi /* 801D2614 001CF554 2C 03 00 00 */ cmpwi r3, 0 /* 801D2618 001CF558 41 82 00 0C */ beq lbl_801D2624 /* 801D261C 001CF55C 38 60 00 01 */ li r3, 1 @@ -4654,7 +4654,7 @@ dMenu_Fmap2DBack_c_NS_scrollAreaDraw: /* 801D3918 001D0858 DB A1 00 50 */ stfd f29, 0x50(r1) /* 801D391C 001D085C F3 A1 00 58 */ psq_st f29, 88(r1), 0, qr0 /* 801D3920 001D0860 39 61 00 50 */ addi r11, r1, 0x50 -/* 801D3924 001D0864 48 18 E8 B5 */ bl func_803621D8 +/* 801D3924 001D0864 48 18 E8 B5 */ bl _savegpr_28 /* 801D3928 001D0868 7C 7E 1B 78 */ mr r30, r3 /* 801D392C 001D086C 3B E0 00 00 */ li r31, 0 /* 801D3930 001D0870 3B A0 00 00 */ li r29, 0 @@ -4771,7 +4771,7 @@ lbl_801D3AB8: /* 801D3AD8 001D0A18 E3 A1 00 58 */ psq_l f29, 88(r1), 0, qr0 /* 801D3ADC 001D0A1C CB A1 00 50 */ lfd f29, 0x50(r1) /* 801D3AE0 001D0A20 39 61 00 50 */ addi r11, r1, 0x50 -/* 801D3AE4 001D0A24 48 18 E7 41 */ bl func_80362224 +/* 801D3AE4 001D0A24 48 18 E7 41 */ bl _restgpr_28 /* 801D3AE8 001D0A28 80 01 00 84 */ lwz r0, 0x84(r1) /* 801D3AEC 001D0A2C 7C 08 03 A6 */ mtlr r0 /* 801D3AF0 001D0A30 38 21 00 80 */ addi r1, r1, 0x80 @@ -4837,7 +4837,7 @@ dMenu_Fmap2DBack_c_NS_stageOriginDraw: /* 801D3BC0 001D0B00 7C 08 02 A6 */ mflr r0 /* 801D3BC4 001D0B04 90 01 00 34 */ stw r0, 0x34(r1) /* 801D3BC8 001D0B08 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3BCC 001D0B0C 48 18 E6 0D */ bl func_803621D8 +/* 801D3BCC 001D0B0C 48 18 E6 0D */ bl _savegpr_28 /* 801D3BD0 001D0B10 7C 7C 1B 78 */ mr r28, r3 /* 801D3BD4 001D0B14 80 63 0D 88 */ lwz r3, 0xd88(r3) /* 801D3BD8 001D0B18 28 03 00 00 */ cmplwi r3, 0 @@ -4895,7 +4895,7 @@ lbl_801D3C94: /* 801D3C9C 001D0BDC 41 80 FF 54 */ blt lbl_801D3BF0 lbl_801D3CA0: /* 801D3CA0 001D0BE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3CA4 001D0BE4 48 18 E5 81 */ bl func_80362224 +/* 801D3CA4 001D0BE4 48 18 E5 81 */ bl _restgpr_28 /* 801D3CA8 001D0BE8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D3CAC 001D0BEC 7C 08 03 A6 */ mtlr r0 /* 801D3CB0 001D0BF0 38 21 00 30 */ addi r1, r1, 0x30 @@ -6097,7 +6097,7 @@ dMenu_Fmap2DBack_c_NS_stageMapMove: /* 801D4EB4 001D1DF4 DB 41 00 30 */ stfd f26, 0x30(r1) /* 801D4EB8 001D1DF8 F3 41 00 38 */ psq_st f26, 56(r1), 0, qr0 /* 801D4EBC 001D1DFC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D4EC0 001D1E00 48 18 D3 19 */ bl func_803621D8 +/* 801D4EC0 001D1E00 48 18 D3 19 */ bl _savegpr_28 /* 801D4EC4 001D1E04 7C 7E 1B 78 */ mr r30, r3 /* 801D4EC8 001D1E08 7C 9C 23 78 */ mr r28, r4 /* 801D4ECC 001D1E0C 7C DD 33 78 */ mr r29, r6 @@ -6398,7 +6398,7 @@ lbl_801D52EC: /* 801D5314 001D2254 E3 41 00 38 */ psq_l f26, 56(r1), 0, qr0 /* 801D5318 001D2258 CB 41 00 30 */ lfd f26, 0x30(r1) /* 801D531C 001D225C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D5320 001D2260 48 18 CF 05 */ bl func_80362224 +/* 801D5320 001D2260 48 18 CF 05 */ bl _restgpr_28 /* 801D5324 001D2264 80 01 00 94 */ lwz r0, 0x94(r1) /* 801D5328 001D2268 7C 08 03 A6 */ mtlr r0 /* 801D532C 001D226C 38 21 00 90 */ addi r1, r1, 0x90 @@ -6453,7 +6453,7 @@ dMenu_Fmap2DBack_c_NS_drawDebugStageArea: /* 801D53D4 001D2314 DA E1 00 70 */ stfd f23, 0x70(r1) /* 801D53D8 001D2318 F2 E1 00 78 */ psq_st f23, 120(r1), 0, qr0 /* 801D53DC 001D231C 39 61 00 70 */ addi r11, r1, 0x70 -/* 801D53E0 001D2320 48 18 CD F5 */ bl func_803621D4 +/* 801D53E0 001D2320 48 18 CD F5 */ bl _savegpr_27 /* 801D53E4 001D2324 7C 7B 1B 78 */ mr r27, r3 /* 801D53E8 001D2328 38 A0 00 FF */ li r5, 0xff /* 801D53EC 001D232C 98 A1 00 20 */ stb r5, 0x20(r1) @@ -6609,7 +6609,7 @@ lbl_801D55EC: /* 801D562C 001D256C E2 E1 00 78 */ psq_l f23, 120(r1), 0, qr0 /* 801D5630 001D2570 CA E1 00 70 */ lfd f23, 0x70(r1) /* 801D5634 001D2574 39 61 00 70 */ addi r11, r1, 0x70 -/* 801D5638 001D2578 48 18 CB E9 */ bl func_80362220 +/* 801D5638 001D2578 48 18 CB E9 */ bl _restgpr_27 /* 801D563C 001D257C 80 01 01 04 */ lwz r0, 0x104(r1) /* 801D5640 001D2580 7C 08 03 A6 */ mtlr r0 /* 801D5644 001D2584 38 21 01 00 */ addi r1, r1, 0x100 @@ -7753,7 +7753,7 @@ lbl_801D6628: /* 801D6704 001D3644 7C 08 02 A6 */ mflr r0 /* 801D6708 001D3648 90 01 00 24 */ stw r0, 0x24(r1) /* 801D670C 001D364C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6710 001D3650 48 18 BA C5 */ bl func_803621D4 +/* 801D6710 001D3650 48 18 BA C5 */ bl _savegpr_27 /* 801D6714 001D3654 7C 7F 1B 79 */ or. r31, r3, r3 /* 801D6718 001D3658 7C 9E 23 78 */ mr r30, r4 /* 801D671C 001D365C 41 82 03 0C */ beq lbl_801D6A28 @@ -7977,7 +7977,7 @@ lbl_801D6A10: lbl_801D6A28: /* 801D6A28 001D3968 7F E3 FB 78 */ mr r3, r31 /* 801D6A2C 001D396C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6A30 001D3970 48 18 B7 F1 */ bl func_80362220 +/* 801D6A30 001D3970 48 18 B7 F1 */ bl _restgpr_27 /* 801D6A34 001D3974 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D6A38 001D3978 7C 08 03 A6 */ mtlr r0 /* 801D6A3C 001D397C 38 21 00 20 */ addi r1, r1, 0x20 @@ -8343,7 +8343,7 @@ dMenu_Fmap2DTop_c_NS_setTitleNameString: /* 801D6F3C 001D3E7C 7C 08 02 A6 */ mflr r0 /* 801D6F40 001D3E80 90 01 00 24 */ stw r0, 0x24(r1) /* 801D6F44 001D3E84 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6F48 001D3E88 48 18 B2 91 */ bl func_803621D8 +/* 801D6F48 001D3E88 48 18 B2 91 */ bl _savegpr_28 /* 801D6F4C 001D3E8C 7C 7C 1B 78 */ mr r28, r3 /* 801D6F50 001D3E90 7C 9D 23 78 */ mr r29, r4 /* 801D6F54 001D3E94 3B C0 00 00 */ li r30, 0 @@ -8365,7 +8365,7 @@ lbl_801D6F5C: /* 801D6F90 001D3ED0 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D6F94 001D3ED4 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l /* 801D6F98 001D3ED8 38 84 00 BB */ addi r4, r4, 0xbb -/* 801D6F9C 001D3EDC 48 19 1B 91 */ bl func_80368B2C +/* 801D6F9C 001D3EDC 48 19 1B 91 */ bl strcpy /* 801D6FA0 001D3EE0 48 00 00 48 */ b lbl_801D6FE8 lbl_801D6FA4: /* 801D6FA4 001D3EE4 80 7C 00 08 */ lwz r3, 8(r28) @@ -8391,7 +8391,7 @@ lbl_801D6FE8: /* 801D6FF0 001D3F30 3B FF 00 08 */ addi r31, r31, 8 /* 801D6FF4 001D3F34 41 80 FF 68 */ blt lbl_801D6F5C /* 801D6FF8 001D3F38 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D6FFC 001D3F3C 48 18 B2 29 */ bl func_80362224 +/* 801D6FFC 001D3F3C 48 18 B2 29 */ bl _restgpr_28 /* 801D7000 001D3F40 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D7004 001D3F44 7C 08 03 A6 */ mtlr r0 /* 801D7008 001D3F48 38 21 00 20 */ addi r1, r1, 0x20 @@ -8403,7 +8403,7 @@ dMenu_Fmap2DTop_c_NS_setAreaNameString: /* 801D7014 001D3F54 7C 08 02 A6 */ mflr r0 /* 801D7018 001D3F58 90 01 00 24 */ stw r0, 0x24(r1) /* 801D701C 001D3F5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7020 001D3F60 48 18 B1 B9 */ bl func_803621D8 +/* 801D7020 001D3F60 48 18 B1 B9 */ bl _savegpr_28 /* 801D7024 001D3F64 7C 7C 1B 78 */ mr r28, r3 /* 801D7028 001D3F68 7C 9D 23 78 */ mr r29, r4 /* 801D702C 001D3F6C 3B C0 00 00 */ li r30, 0 @@ -8425,7 +8425,7 @@ lbl_801D7034: /* 801D7068 001D3FA8 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D706C 001D3FAC 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l /* 801D7070 001D3FB0 38 84 00 BB */ addi r4, r4, 0xbb -/* 801D7074 001D3FB4 48 19 1A B9 */ bl func_80368B2C +/* 801D7074 001D3FB4 48 19 1A B9 */ bl strcpy /* 801D7078 001D3FB8 48 00 00 48 */ b lbl_801D70C0 lbl_801D707C: /* 801D707C 001D3FBC 80 7C 00 08 */ lwz r3, 8(r28) @@ -8451,7 +8451,7 @@ lbl_801D70C0: /* 801D70C8 001D4008 3B FF 00 08 */ addi r31, r31, 8 /* 801D70CC 001D400C 41 80 FF 68 */ blt lbl_801D7034 /* 801D70D0 001D4010 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D70D4 001D4014 48 18 B1 51 */ bl func_80362224 +/* 801D70D4 001D4014 48 18 B1 51 */ bl _restgpr_28 /* 801D70D8 001D4018 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D70DC 001D401C 7C 08 03 A6 */ mtlr r0 /* 801D70E0 001D4020 38 21 00 20 */ addi r1, r1, 0x20 @@ -8681,7 +8681,7 @@ lbl_801D73D0: /* 801D73EC 001D432C 4E 80 04 21 */ bctrl /* 801D73F0 001D4330 48 12 92 69 */ bl J2DTextBox_NS_getStringPtr /* 801D73F4 001D4334 38 9C 00 BB */ addi r4, r28, 0xbb -/* 801D73F8 001D4338 48 19 17 35 */ bl func_80368B2C +/* 801D73F8 001D4338 48 19 17 35 */ bl strcpy /* 801D73FC 001D433C 3B 7B 00 01 */ addi r27, r27, 1 /* 801D7400 001D4340 2C 1B 00 05 */ cmpwi r27, 5 /* 801D7404 001D4344 3B DE 00 08 */ addi r30, r30, 8 @@ -8773,7 +8773,7 @@ lbl_801D7524: /* 801D7540 001D4480 4E 80 04 21 */ bctrl /* 801D7544 001D4484 48 12 91 15 */ bl J2DTextBox_NS_getStringPtr /* 801D7548 001D4488 38 9C 00 BB */ addi r4, r28, 0xbb -/* 801D754C 001D448C 48 19 15 E1 */ bl func_80368B2C +/* 801D754C 001D448C 48 19 15 E1 */ bl strcpy /* 801D7550 001D4490 3B 7B 00 01 */ addi r27, r27, 1 /* 801D7554 001D4494 2C 1B 00 05 */ cmpwi r27, 5 /* 801D7558 001D4498 3B DE 00 08 */ addi r30, r30, 8 @@ -8908,7 +8908,7 @@ dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio: /* 801D771C 001D465C 90 01 00 24 */ stw r0, 0x24(r1) /* 801D7720 001D4660 DB E1 00 18 */ stfd f31, 0x18(r1) /* 801D7724 001D4664 39 61 00 18 */ addi r11, r1, 0x18 -/* 801D7728 001D4668 48 18 AA B1 */ bl func_803621D8 +/* 801D7728 001D4668 48 18 AA B1 */ bl _savegpr_28 /* 801D772C 001D466C 7C 7C 1B 78 */ mr r28, r3 /* 801D7730 001D4670 FF E0 08 90 */ fmr f31, f1 /* 801D7734 001D4674 54 9E 06 3E */ clrlwi r30, r4, 0x18 @@ -8948,7 +8948,7 @@ lbl_801D7798: lbl_801D77A8: /* 801D77A8 001D46E8 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801D77AC 001D46EC 39 61 00 18 */ addi r11, r1, 0x18 -/* 801D77B0 001D46F0 48 18 AA 75 */ bl func_80362224 +/* 801D77B0 001D46F0 48 18 AA 75 */ bl _restgpr_28 /* 801D77B4 001D46F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D77B8 001D46F8 7C 08 03 A6 */ mtlr r0 /* 801D77BC 001D46FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -9130,7 +9130,7 @@ dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion: /* 801D7A0C 001D494C 7C 08 02 A6 */ mflr r0 /* 801D7A10 001D4950 90 01 00 24 */ stw r0, 0x24(r1) /* 801D7A14 001D4954 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7A18 001D4958 48 18 A7 BD */ bl func_803621D4 +/* 801D7A18 001D4958 48 18 A7 BD */ bl _savegpr_27 /* 801D7A1C 001D495C 3C A0 80 43 */ lis r5, lbl_8042FC60@ha /* 801D7A20 001D4960 38 A5 FC 60 */ addi r5, r5, lbl_8042FC60@l /* 801D7A24 001D4964 88 05 02 FC */ lbz r0, 0x2fc(r5) @@ -9170,7 +9170,7 @@ lbl_801D7A98: /* 801D7A98 001D49D8 38 60 00 00 */ li r3, 0 lbl_801D7A9C: /* 801D7A9C 001D49DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7AA0 001D49E0 48 18 A7 81 */ bl func_80362220 +/* 801D7AA0 001D49E0 48 18 A7 81 */ bl _restgpr_27 /* 801D7AA4 001D49E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D7AA8 001D49E8 7C 08 03 A6 */ mtlr r0 /* 801D7AAC 001D49EC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 091d62a8bb..18b2a70633 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -908,7 +908,7 @@ lbl_801D8DEC: /* 801D8E1C 001D5D5C DB A1 00 C0 */ stfd f29, 0xc0(r1) /* 801D8E20 001D5D60 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, qr0 /* 801D8E24 001D5D64 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 801D8E28 001D5D68 48 18 93 AD */ bl func_803621D4 +/* 801D8E28 001D5D68 48 18 93 AD */ bl _savegpr_27 /* 801D8E2C 001D5D6C 7C 7F 1B 78 */ mr r31, r3 /* 801D8E30 001D5D70 38 80 00 00 */ li r4, 0 /* 801D8E34 001D5D74 48 00 14 D1 */ bl dMenu_Insect_c_NS_setAButtonString @@ -1148,7 +1148,7 @@ lbl_801D91A8: /* 801D91C4 001D6104 E3 A1 00 C8 */ psq_l f29, 200(r1), 0, qr0 /* 801D91C8 001D6108 CB A1 00 C0 */ lfd f29, 0xc0(r1) /* 801D91CC 001D610C 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 801D91D0 001D6110 48 18 90 51 */ bl func_80362220 +/* 801D91D0 001D6110 48 18 90 51 */ bl _restgpr_27 /* 801D91D4 001D6114 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801D91D8 001D6118 7C 08 03 A6 */ mtlr r0 /* 801D91DC 001D611C 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -1454,7 +1454,7 @@ dMenu_Insect_c_NS_screenSetBase: /* 801D9648 001D6588 7C 08 02 A6 */ mflr r0 /* 801D964C 001D658C 90 01 00 24 */ stw r0, 0x24(r1) /* 801D9650 001D6590 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D9654 001D6594 48 18 8B 81 */ bl func_803621D4 +/* 801D9654 001D6594 48 18 8B 81 */ bl _savegpr_27 /* 801D9658 001D6598 7C 7D 1B 78 */ mr r29, r3 /* 801D965C 001D659C 38 60 01 18 */ li r3, 0x118 /* 801D9660 001D65A0 48 0F 55 ED */ bl __nw @@ -1626,7 +1626,7 @@ lbl_801D980C: /* 801D98D0 001D6810 7D 89 03 A6 */ mtctr r12 /* 801D98D4 001D6814 4E 80 04 21 */ bctrl /* 801D98D8 001D6818 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D98DC 001D681C 48 18 89 45 */ bl func_80362220 +/* 801D98DC 001D681C 48 18 89 45 */ bl _restgpr_27 /* 801D98E0 001D6820 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D98E4 001D6824 7C 08 03 A6 */ mtlr r0 /* 801D98E8 001D6828 38 21 00 20 */ addi r1, r1, 0x20 @@ -1932,7 +1932,7 @@ dMenu_Insect_c_NS_getGetInsectNum: /* 801D9D50 001D6C90 7C 08 02 A6 */ mflr r0 /* 801D9D54 001D6C94 90 01 00 24 */ stw r0, 0x24(r1) /* 801D9D58 001D6C98 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D9D5C 001D6C9C 48 18 84 7D */ bl func_803621D8 +/* 801D9D5C 001D6C9C 48 18 84 7D */ bl _savegpr_28 /* 801D9D60 001D6CA0 3B C0 00 00 */ li r30, 0 /* 801D9D64 001D6CA4 3C 60 80 3C */ lis r3, lbl_803BD87C@ha /* 801D9D68 001D6CA8 38 03 D8 7C */ addi r0, r3, lbl_803BD87C@l @@ -1957,7 +1957,7 @@ lbl_801D9DA4: /* 801D9DAC 001D6CEC 41 80 FF D4 */ blt lbl_801D9D80 /* 801D9DB0 001D6CF0 7F C3 F3 78 */ mr r3, r30 /* 801D9DB4 001D6CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D9DB8 001D6CF8 48 18 84 6D */ bl func_80362224 +/* 801D9DB8 001D6CF8 48 18 84 6D */ bl _restgpr_28 /* 801D9DBC 001D6CFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D9DC0 001D6D00 7C 08 03 A6 */ mtlr r0 /* 801D9DC4 001D6D04 38 21 00 20 */ addi r1, r1, 0x20 @@ -2105,7 +2105,7 @@ dMenu_Insect_c_NS_cursorMove: /* 801D9F90 001D6ED0 7C 08 02 A6 */ mflr r0 /* 801D9F94 001D6ED4 90 01 00 24 */ stw r0, 0x24(r1) /* 801D9F98 001D6ED8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D9F9C 001D6EDC 48 18 82 3D */ bl func_803621D8 +/* 801D9F9C 001D6EDC 48 18 82 3D */ bl _savegpr_28 /* 801D9FA0 001D6EE0 7C 7C 1B 78 */ mr r28, r3 /* 801D9FA4 001D6EE4 8B E3 00 F4 */ lbz r31, 0xf4(r3) /* 801D9FA8 001D6EE8 8B C3 00 F5 */ lbz r30, 0xf5(r3) @@ -2261,7 +2261,7 @@ lbl_801DA1A0: /* 801DA1D0 001D7110 48 0D 17 B5 */ bl Z2SeMgr_NS_seStart lbl_801DA1D4: /* 801DA1D4 001D7114 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA1D8 001D7118 48 18 80 4D */ bl func_80362224 +/* 801DA1D8 001D7118 48 18 80 4D */ bl _restgpr_28 /* 801DA1DC 001D711C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801DA1E0 001D7120 7C 08 03 A6 */ mtlr r0 /* 801DA1E4 001D7124 38 21 00 20 */ addi r1, r1, 0x20 @@ -2273,7 +2273,7 @@ dMenu_Insect_c_NS_setCursorPos: /* 801DA1F0 001D7130 7C 08 02 A6 */ mflr r0 /* 801DA1F4 001D7134 90 01 00 44 */ stw r0, 0x44(r1) /* 801DA1F8 001D7138 39 61 00 40 */ addi r11, r1, 0x40 -/* 801DA1FC 001D713C 48 18 7F D9 */ bl func_803621D4 +/* 801DA1FC 001D713C 48 18 7F D9 */ bl _savegpr_27 /* 801DA200 001D7140 7C 7E 1B 78 */ mr r30, r3 /* 801DA204 001D7144 88 63 00 F4 */ lbz r3, 0xf4(r3) /* 801DA208 001D7148 88 1E 00 F5 */ lbz r0, 0xf5(r30) @@ -2335,7 +2335,7 @@ lbl_801DA2D4: /* 801DA2DC 001D721C 3B BD 00 04 */ addi r29, r29, 4 /* 801DA2E0 001D7220 41 80 FF 98 */ blt lbl_801DA278 /* 801DA2E4 001D7224 39 61 00 40 */ addi r11, r1, 0x40 -/* 801DA2E8 001D7228 48 18 7F 39 */ bl func_80362220 +/* 801DA2E8 001D7228 48 18 7F 39 */ bl _restgpr_27 /* 801DA2EC 001D722C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DA2F0 001D7230 7C 08 03 A6 */ mtlr r0 /* 801DA2F4 001D7234 38 21 00 40 */ addi r1, r1, 0x40 @@ -2352,7 +2352,7 @@ dMenu_Insect_c_NS_setAButtonString: /* 801DA308 001D7248 7C 08 02 A6 */ mflr r0 /* 801DA30C 001D724C 90 01 00 24 */ stw r0, 0x24(r1) /* 801DA310 001D7250 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA314 001D7254 48 18 7E C1 */ bl func_803621D4 +/* 801DA314 001D7254 48 18 7E C1 */ bl _savegpr_27 /* 801DA318 001D7258 7C 7B 1B 78 */ mr r27, r3 /* 801DA31C 001D725C 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801DA320 001D7260 40 82 00 3C */ bne lbl_801DA35C @@ -2365,7 +2365,7 @@ lbl_801DA334: /* 801DA338 001D7278 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801DA33C 001D727C 48 12 63 1D */ bl J2DTextBox_NS_getStringPtr /* 801DA340 001D7280 38 9E 00 32 */ addi r4, r30, 0x32 -/* 801DA344 001D7284 48 18 E7 E9 */ bl func_80368B2C +/* 801DA344 001D7284 48 18 E7 E9 */ bl strcpy /* 801DA348 001D7288 3B BD 00 01 */ addi r29, r29, 1 /* 801DA34C 001D728C 2C 1D 00 05 */ cmpwi r29, 5 /* 801DA350 001D7290 3B FF 00 04 */ addi r31, r31, 4 @@ -2391,7 +2391,7 @@ lbl_801DA36C: /* 801DA398 001D72D8 41 80 FF D4 */ blt lbl_801DA36C lbl_801DA39C: /* 801DA39C 001D72DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA3A0 001D72E0 48 18 7E 81 */ bl func_80362220 +/* 801DA3A0 001D72E0 48 18 7E 81 */ bl _restgpr_27 /* 801DA3A4 001D72E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801DA3A8 001D72E8 7C 08 03 A6 */ mtlr r0 /* 801DA3AC 001D72EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2403,7 +2403,7 @@ dMenu_Insect_c_NS_setBButtonString: /* 801DA3B8 001D72F8 7C 08 02 A6 */ mflr r0 /* 801DA3BC 001D72FC 90 01 00 24 */ stw r0, 0x24(r1) /* 801DA3C0 001D7300 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA3C4 001D7304 48 18 7E 11 */ bl func_803621D4 +/* 801DA3C4 001D7304 48 18 7E 11 */ bl _savegpr_27 /* 801DA3C8 001D7308 7C 7B 1B 78 */ mr r27, r3 /* 801DA3CC 001D730C 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801DA3D0 001D7310 40 82 00 3C */ bne lbl_801DA40C @@ -2416,7 +2416,7 @@ lbl_801DA3E4: /* 801DA3E8 001D7328 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801DA3EC 001D732C 48 12 62 6D */ bl J2DTextBox_NS_getStringPtr /* 801DA3F0 001D7330 38 9E 00 32 */ addi r4, r30, 0x32 -/* 801DA3F4 001D7334 48 18 E7 39 */ bl func_80368B2C +/* 801DA3F4 001D7334 48 18 E7 39 */ bl strcpy /* 801DA3F8 001D7338 3B BD 00 01 */ addi r29, r29, 1 /* 801DA3FC 001D733C 2C 1D 00 05 */ cmpwi r29, 5 /* 801DA400 001D7340 3B FF 00 04 */ addi r31, r31, 4 @@ -2442,7 +2442,7 @@ lbl_801DA41C: /* 801DA448 001D7388 41 80 FF D4 */ blt lbl_801DA41C lbl_801DA44C: /* 801DA44C 001D738C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DA450 001D7390 48 18 7D D1 */ bl func_80362220 +/* 801DA450 001D7390 48 18 7D D1 */ bl _restgpr_27 /* 801DA454 001D7394 80 01 00 24 */ lwz r0, 0x24(r1) /* 801DA458 001D7398 7C 08 03 A6 */ mtlr r0 /* 801DA45C 001D739C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index 68db0285e7..6e2b7f58b8 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -9,7 +9,7 @@ dMenu_Letter_c: /* 801DCDC4 001D9D04 7C 08 02 A6 */ mflr r0 /* 801DCDC8 001D9D08 90 01 00 24 */ stw r0, 0x24(r1) /* 801DCDCC 001D9D0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DCDD0 001D9D10 48 18 54 09 */ bl func_803621D8 +/* 801DCDD0 001D9D10 48 18 54 09 */ bl _savegpr_28 /* 801DCDD4 001D9D14 7C 7F 1B 78 */ mr r31, r3 /* 801DCDD8 001D9D18 7C 9C 23 78 */ mr r28, r4 /* 801DCDDC 001D9D1C 7C BD 2B 78 */ mr r29, r5 @@ -103,7 +103,7 @@ lbl_801DCEF8: /* 801DCF14 001D9E54 41 80 FF D4 */ blt lbl_801DCEE8 /* 801DCF18 001D9E58 7F E3 FB 78 */ mr r3, r31 /* 801DCF1C 001D9E5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DCF20 001D9E60 48 18 53 05 */ bl func_80362224 +/* 801DCF20 001D9E60 48 18 53 05 */ bl _restgpr_28 /* 801DCF24 001D9E64 80 01 00 24 */ lwz r0, 0x24(r1) /* 801DCF28 001D9E68 7C 08 03 A6 */ mtlr r0 /* 801DCF2C 001D9E6C 38 21 00 20 */ addi r1, r1, 0x20 @@ -532,7 +532,7 @@ dMenu_Letter_c_NS__draw: /* 801DD520 001DA460 DB C1 01 30 */ stfd f30, 0x130(r1) /* 801DD524 001DA464 F3 C1 01 38 */ psq_st f30, 312(r1), 0, qr0 /* 801DD528 001DA468 39 61 01 30 */ addi r11, r1, 0x130 -/* 801DD52C 001DA46C 48 18 4C A9 */ bl func_803621D4 +/* 801DD52C 001DA46C 48 18 4C A9 */ bl _savegpr_27 /* 801DD530 001DA470 7C 7D 1B 78 */ mr r29, r3 /* 801DD534 001DA474 80 03 00 08 */ lwz r0, 8(r3) /* 801DD538 001DA478 28 00 00 00 */ cmplwi r0, 0 @@ -794,7 +794,7 @@ lbl_801DD90C: /* 801DD914 001DA854 E3 C1 01 38 */ psq_l f30, 312(r1), 0, qr0 /* 801DD918 001DA858 CB C1 01 30 */ lfd f30, 0x130(r1) /* 801DD91C 001DA85C 39 61 01 30 */ addi r11, r1, 0x130 -/* 801DD920 001DA860 48 18 49 01 */ bl func_80362220 +/* 801DD920 001DA860 48 18 49 01 */ bl _restgpr_27 /* 801DD924 001DA864 80 01 01 54 */ lwz r0, 0x154(r1) /* 801DD928 001DA868 7C 08 03 A6 */ mtlr r0 /* 801DD92C 001DA86C 38 21 01 50 */ addi r1, r1, 0x150 @@ -905,7 +905,7 @@ dMenu_Letter_c_NS__open: /* 801DDA80 001DA9C0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801DDA84 001DA9C4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801DDA88 001DA9C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DDA8C 001DA9CC 48 18 47 49 */ bl func_803621D4 +/* 801DDA8C 001DA9CC 48 18 47 49 */ bl _savegpr_27 /* 801DDA90 001DA9D0 7C 7F 1B 78 */ mr r31, r3 /* 801DDA94 001DA9D4 80 03 00 14 */ lwz r0, 0x14(r3) /* 801DDA98 001DA9D8 28 00 00 00 */ cmplwi r0, 0 @@ -1039,7 +1039,7 @@ lbl_801DDC78: /* 801DDC78 001DABB8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801DDC7C 001DABBC CB E1 00 30 */ lfd f31, 0x30(r1) /* 801DDC80 001DABC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DDC84 001DABC4 48 18 45 9D */ bl func_80362220 +/* 801DDC84 001DABC4 48 18 45 9D */ bl _restgpr_27 /* 801DDC88 001DABC8 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DDC8C 001DABCC 7C 08 03 A6 */ mtlr r0 /* 801DDC90 001DABD0 38 21 00 40 */ addi r1, r1, 0x40 @@ -1053,7 +1053,7 @@ dMenu_Letter_c_NS__close: /* 801DDCA4 001DABE4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801DDCA8 001DABE8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801DDCAC 001DABEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DDCB0 001DABF0 48 18 45 25 */ bl func_803621D4 +/* 801DDCB0 001DABF0 48 18 45 25 */ bl _savegpr_27 /* 801DDCB4 001DABF4 7C 7F 1B 78 */ mr r31, r3 /* 801DDCB8 001DABF8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DDCBC 001DABFC 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l @@ -1142,7 +1142,7 @@ lbl_801DDDF8: /* 801DDDF8 001DAD38 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801DDDFC 001DAD3C CB E1 00 30 */ lfd f31, 0x30(r1) /* 801DDE00 001DAD40 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DDE04 001DAD44 48 18 44 1D */ bl func_80362220 +/* 801DDE04 001DAD44 48 18 44 1D */ bl _restgpr_27 /* 801DDE08 001DAD48 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DDE0C 001DAD4C 7C 08 03 A6 */ mtlr r0 /* 801DDE10 001DAD50 38 21 00 40 */ addi r1, r1, 0x40 @@ -1576,7 +1576,7 @@ lbl_801DE47C: /* 801DE488 001DB3C8 7C 7C 00 2E */ lwzx r3, r28, r0 /* 801DE48C 001DB3CC 48 12 21 CD */ bl J2DTextBox_NS_getStringPtr /* 801DE490 001DB3D0 38 81 00 10 */ addi r4, r1, 0x10 -/* 801DE494 001DB3D4 48 18 A6 99 */ bl func_80368B2C +/* 801DE494 001DB3D4 48 18 A6 99 */ bl strcpy /* 801DE498 001DB3D8 3B 5A 00 01 */ addi r26, r26, 1 /* 801DE49C 001DB3DC 2C 1A 00 02 */ cmpwi r26, 2 /* 801DE4A0 001DB3E0 3B BD 00 04 */ addi r29, r29, 4 @@ -1638,7 +1638,7 @@ lbl_801DE514: /* 801DE570 001DB4B0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801DE574 001DB4B4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801DE578 001DB4B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DE57C 001DB4BC 48 18 3C 59 */ bl func_803621D4 +/* 801DE57C 001DB4BC 48 18 3C 59 */ bl _savegpr_27 /* 801DE580 001DB4C0 7C 7F 1B 78 */ mr r31, r3 /* 801DE584 001DB4C4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DE588 001DB4C8 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l @@ -1737,7 +1737,7 @@ lbl_801DE6EC: /* 801DE6EC 001DB62C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801DE6F0 001DB630 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801DE6F4 001DB634 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DE6F8 001DB638 48 18 3B 29 */ bl func_80362220 +/* 801DE6F8 001DB638 48 18 3B 29 */ bl _restgpr_27 /* 801DE6FC 001DB63C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DE700 001DB640 7C 08 03 A6 */ mtlr r0 /* 801DE704 001DB644 38 21 00 40 */ addi r1, r1, 0x40 @@ -1985,7 +1985,7 @@ lbl_801DEA34: /* 801DEAA0 001DB9E0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801DEAA4 001DB9E4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801DEAA8 001DB9E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DEAAC 001DB9EC 48 18 37 2D */ bl func_803621D8 +/* 801DEAAC 001DB9EC 48 18 37 2D */ bl _savegpr_28 /* 801DEAB0 001DB9F0 7C 7F 1B 78 */ mr r31, r3 /* 801DEAB4 001DB9F4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DEAB8 001DB9F8 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -2062,7 +2062,7 @@ lbl_801DEBB8: /* 801DEBB8 001DBAF8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801DEBBC 001DBAFC CB E1 00 30 */ lfd f31, 0x30(r1) /* 801DEBC0 001DBB00 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DEBC4 001DBB04 48 18 36 61 */ bl func_80362224 +/* 801DEBC4 001DBB04 48 18 36 61 */ bl _restgpr_28 /* 801DEBC8 001DBB08 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DEBCC 001DBB0C 7C 08 03 A6 */ mtlr r0 /* 801DEBD0 001DBB10 38 21 00 40 */ addi r1, r1, 0x40 @@ -2071,7 +2071,7 @@ lbl_801DEBB8: /* 801DEBDC 001DBB1C 7C 08 02 A6 */ mflr r0 /* 801DEBE0 001DBB20 90 01 00 34 */ stw r0, 0x34(r1) /* 801DEBE4 001DBB24 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DEBE8 001DBB28 48 18 35 F1 */ bl func_803621D8 +/* 801DEBE8 001DBB28 48 18 35 F1 */ bl _savegpr_28 /* 801DEBEC 001DBB2C 7C 7D 1B 78 */ mr r29, r3 /* 801DEBF0 001DBB30 3B E0 00 00 */ li r31, 0 /* 801DEBF4 001DBB34 B3 E3 03 6A */ sth r31, 0x36a(r3) @@ -2134,13 +2134,13 @@ lbl_801DECC0: /* 801DECCC 001DBC0C 7C 7D 00 2E */ lwzx r3, r29, r0 /* 801DECD0 001DBC10 48 12 19 89 */ bl J2DTextBox_NS_getStringPtr /* 801DECD4 001DBC14 38 81 00 10 */ addi r4, r1, 0x10 -/* 801DECD8 001DBC18 48 18 9E 55 */ bl func_80368B2C +/* 801DECD8 001DBC18 48 18 9E 55 */ bl strcpy /* 801DECDC 001DBC1C 3B 9C 00 01 */ addi r28, r28, 1 /* 801DECE0 001DBC20 2C 1C 00 02 */ cmpwi r28, 2 /* 801DECE4 001DBC24 3B DE 00 04 */ addi r30, r30, 4 /* 801DECE8 001DBC28 41 80 FF D8 */ blt lbl_801DECC0 /* 801DECEC 001DBC2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DECF0 001DBC30 48 18 35 35 */ bl func_80362224 +/* 801DECF0 001DBC30 48 18 35 35 */ bl _restgpr_28 /* 801DECF4 001DBC34 80 01 00 34 */ lwz r0, 0x34(r1) /* 801DECF8 001DBC38 7C 08 03 A6 */ mtlr r0 /* 801DECFC 001DBC3C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2151,7 +2151,7 @@ lbl_801DECC0: /* 801DED10 001DBC50 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801DED14 001DBC54 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801DED18 001DBC58 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DED1C 001DBC5C 48 18 34 BD */ bl func_803621D8 +/* 801DED1C 001DBC5C 48 18 34 BD */ bl _savegpr_28 /* 801DED20 001DBC60 7C 7F 1B 78 */ mr r31, r3 /* 801DED24 001DBC64 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DED28 001DBC68 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -2217,7 +2217,7 @@ lbl_801DEE00: /* 801DEE00 001DBD40 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801DEE04 001DBD44 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801DEE08 001DBD48 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DEE0C 001DBD4C 48 18 34 19 */ bl func_80362224 +/* 801DEE0C 001DBD4C 48 18 34 19 */ bl _restgpr_28 /* 801DEE10 001DBD50 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DEE14 001DBD54 7C 08 03 A6 */ mtlr r0 /* 801DEE18 001DBD58 38 21 00 40 */ addi r1, r1, 0x40 @@ -2247,7 +2247,7 @@ lbl_801DEE00: /* 801DEE78 001DBDB8 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801DEE7C 001DBDBC F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801DEE80 001DBDC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DEE84 001DBDC4 48 18 33 51 */ bl func_803621D4 +/* 801DEE84 001DBDC4 48 18 33 51 */ bl _savegpr_27 /* 801DEE88 001DBDC8 7C 7F 1B 78 */ mr r31, r3 /* 801DEE8C 001DBDCC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DEE90 001DBDD0 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l @@ -2345,7 +2345,7 @@ lbl_801DEFF0: /* 801DEFF0 001DBF30 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801DEFF4 001DBF34 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801DEFF8 001DBF38 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DEFFC 001DBF3C 48 18 32 25 */ bl func_80362220 +/* 801DEFFC 001DBF3C 48 18 32 25 */ bl _restgpr_27 /* 801DF000 001DBF40 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DF004 001DBF44 7C 08 03 A6 */ mtlr r0 /* 801DF008 001DBF48 38 21 00 40 */ addi r1, r1, 0x40 @@ -4835,7 +4835,7 @@ dMenu_Letter_c_NS_setAButtonString: /* 801E151C 001DE45C 7C 08 02 A6 */ mflr r0 /* 801E1520 001DE460 90 01 00 24 */ stw r0, 0x24(r1) /* 801E1524 001DE464 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E1528 001DE468 48 18 0C AD */ bl func_803621D4 +/* 801E1528 001DE468 48 18 0C AD */ bl _savegpr_27 /* 801E152C 001DE46C 7C 7B 1B 78 */ mr r27, r3 /* 801E1530 001DE470 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801E1534 001DE474 40 82 00 3C */ bne lbl_801E1570 @@ -4848,7 +4848,7 @@ lbl_801E1548: /* 801E154C 001DE48C 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801E1550 001DE490 48 11 F1 09 */ bl J2DTextBox_NS_getStringPtr /* 801E1554 001DE494 38 9E 00 3B */ addi r4, r30, 0x3b -/* 801E1558 001DE498 48 18 75 D5 */ bl func_80368B2C +/* 801E1558 001DE498 48 18 75 D5 */ bl strcpy /* 801E155C 001DE49C 3B BD 00 01 */ addi r29, r29, 1 /* 801E1560 001DE4A0 2C 1D 00 05 */ cmpwi r29, 5 /* 801E1564 001DE4A4 3B FF 00 04 */ addi r31, r31, 4 @@ -4874,7 +4874,7 @@ lbl_801E1580: /* 801E15AC 001DE4EC 41 80 FF D4 */ blt lbl_801E1580 lbl_801E15B0: /* 801E15B0 001DE4F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E15B4 001DE4F4 48 18 0C 6D */ bl func_80362220 +/* 801E15B4 001DE4F4 48 18 0C 6D */ bl _restgpr_27 /* 801E15B8 001DE4F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E15BC 001DE4FC 7C 08 03 A6 */ mtlr r0 /* 801E15C0 001DE500 38 21 00 20 */ addi r1, r1, 0x20 @@ -4886,7 +4886,7 @@ dMenu_Letter_c_NS_setBButtonString: /* 801E15CC 001DE50C 7C 08 02 A6 */ mflr r0 /* 801E15D0 001DE510 90 01 00 24 */ stw r0, 0x24(r1) /* 801E15D4 001DE514 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E15D8 001DE518 48 18 0B FD */ bl func_803621D4 +/* 801E15D8 001DE518 48 18 0B FD */ bl _savegpr_27 /* 801E15DC 001DE51C 7C 7B 1B 78 */ mr r27, r3 /* 801E15E0 001DE520 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801E15E4 001DE524 40 82 00 3C */ bne lbl_801E1620 @@ -4899,7 +4899,7 @@ lbl_801E15F8: /* 801E15FC 001DE53C 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801E1600 001DE540 48 11 F0 59 */ bl J2DTextBox_NS_getStringPtr /* 801E1604 001DE544 38 9E 00 3B */ addi r4, r30, 0x3b -/* 801E1608 001DE548 48 18 75 25 */ bl func_80368B2C +/* 801E1608 001DE548 48 18 75 25 */ bl strcpy /* 801E160C 001DE54C 3B BD 00 01 */ addi r29, r29, 1 /* 801E1610 001DE550 2C 1D 00 05 */ cmpwi r29, 5 /* 801E1614 001DE554 3B FF 00 04 */ addi r31, r31, 4 @@ -4925,7 +4925,7 @@ lbl_801E1630: /* 801E165C 001DE59C 41 80 FF D4 */ blt lbl_801E1630 lbl_801E1660: /* 801E1660 001DE5A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E1664 001DE5A4 48 18 0B BD */ bl func_80362220 +/* 801E1664 001DE5A4 48 18 0B BD */ bl _restgpr_27 /* 801E1668 001DE5A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E166C 001DE5AC 7C 08 03 A6 */ mtlr r0 /* 801E1670 001DE5B0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index df9c2f7076..acef74e2d4 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -1978,7 +1978,7 @@ dMenu_Option_c_NS__open: /* 801E3BA4 001E0AE4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801E3BA8 001E0AE8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801E3BAC 001E0AEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E3BB0 001E0AF0 48 17 E6 29 */ bl func_803621D8 +/* 801E3BB0 001E0AF0 48 17 E6 29 */ bl _savegpr_28 /* 801E3BB4 001E0AF4 7C 7F 1B 78 */ mr r31, r3 /* 801E3BB8 001E0AF8 80 03 00 40 */ lwz r0, 0x40(r3) /* 801E3BBC 001E0AFC 28 00 00 00 */ cmplwi r0, 0 @@ -2121,7 +2121,7 @@ lbl_801E3DC0: /* 801E3DC0 001E0D00 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801E3DC4 001E0D04 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801E3DC8 001E0D08 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E3DCC 001E0D0C 48 17 E4 59 */ bl func_80362224 +/* 801E3DCC 001E0D0C 48 17 E4 59 */ bl _restgpr_28 /* 801E3DD0 001E0D10 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E3DD4 001E0D14 7C 08 03 A6 */ mtlr r0 /* 801E3DD8 001E0D18 38 21 00 40 */ addi r1, r1, 0x40 @@ -2135,7 +2135,7 @@ dMenu_Option_c_NS__close: /* 801E3DEC 001E0D2C DB E1 00 30 */ stfd f31, 0x30(r1) /* 801E3DF0 001E0D30 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801E3DF4 001E0D34 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E3DF8 001E0D38 48 17 E3 E1 */ bl func_803621D8 +/* 801E3DF8 001E0D38 48 17 E3 E1 */ bl _savegpr_28 /* 801E3DFC 001E0D3C 7C 7F 1B 78 */ mr r31, r3 /* 801E3E00 001E0D40 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801E3E04 001E0D44 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l @@ -2227,7 +2227,7 @@ lbl_801E3F4C: /* 801E3F4C 001E0E8C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801E3F50 001E0E90 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801E3F54 001E0E94 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E3F58 001E0E98 48 17 E2 CD */ bl func_80362224 +/* 801E3F58 001E0E98 48 17 E2 CD */ bl _restgpr_28 /* 801E3F5C 001E0E9C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E3F60 001E0EA0 7C 08 03 A6 */ mtlr r0 /* 801E3F64 001E0EA4 38 21 00 40 */ addi r1, r1, 0x40 @@ -2411,7 +2411,7 @@ lbl_801E4188: /* 801E41FC 001E113C 7C 08 02 A6 */ mflr r0 /* 801E4200 001E1140 90 01 00 34 */ stw r0, 0x34(r1) /* 801E4204 001E1144 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E4208 001E1148 48 17 DF D1 */ bl func_803621D8 +/* 801E4208 001E1148 48 17 DF D1 */ bl _savegpr_28 /* 801E420C 001E114C 7C 7F 1B 78 */ mr r31, r3 /* 801E4210 001E1150 80 63 00 58 */ lwz r3, 0x58(r3) /* 801E4214 001E1154 4B E4 E3 11 */ bl STControl_NS_checkUpTrigger @@ -2576,7 +2576,7 @@ lbl_801E4468: /* 801E446C 001E13AC 48 00 39 89 */ bl dMenu_Option_c_NS_changeTVCheck lbl_801E4470: /* 801E4470 001E13B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E4474 001E13B4 48 17 DD B1 */ bl func_80362224 +/* 801E4474 001E13B4 48 17 DD B1 */ bl _restgpr_28 /* 801E4478 001E13B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E447C 001E13BC 7C 08 03 A6 */ mtlr r0 /* 801E4480 001E13C0 38 21 00 30 */ addi r1, r1, 0x30 @@ -3706,7 +3706,7 @@ dMenu_Option_c_NS_menuShow: /* 801E54FC 001E243C 7C 08 02 A6 */ mflr r0 /* 801E5500 001E2440 90 01 00 24 */ stw r0, 0x24(r1) /* 801E5504 001E2444 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E5508 001E2448 48 17 CC CD */ bl func_803621D4 +/* 801E5508 001E2448 48 17 CC CD */ bl _savegpr_27 /* 801E550C 001E244C 7C 7B 1B 78 */ mr r27, r3 /* 801E5510 001E2450 7C 9C 23 78 */ mr r28, r4 /* 801E5514 001E2454 54 9E 10 3A */ slwi r30, r4, 2 @@ -3750,7 +3750,7 @@ lbl_801E5590: /* 801E5598 001E24D8 3B FF 00 04 */ addi r31, r31, 4 /* 801E559C 001E24DC 41 80 FF E0 */ blt lbl_801E557C /* 801E55A0 001E24E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E55A4 001E24E4 48 17 CC 7D */ bl func_80362220 +/* 801E55A4 001E24E4 48 17 CC 7D */ bl _restgpr_27 /* 801E55A8 001E24E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E55AC 001E24EC 7C 08 03 A6 */ mtlr r0 /* 801E55B0 001E24F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3762,7 +3762,7 @@ dMenu_Option_c_NS_menuHide: /* 801E55BC 001E24FC 7C 08 02 A6 */ mflr r0 /* 801E55C0 001E2500 90 01 00 24 */ stw r0, 0x24(r1) /* 801E55C4 001E2504 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E55C8 001E2508 48 17 CC 0D */ bl func_803621D4 +/* 801E55C8 001E2508 48 17 CC 0D */ bl _savegpr_27 /* 801E55CC 001E250C 7C 7B 1B 78 */ mr r27, r3 /* 801E55D0 001E2510 7C 9C 23 78 */ mr r28, r4 /* 801E55D4 001E2514 54 9E 10 3A */ slwi r30, r4, 2 @@ -3806,7 +3806,7 @@ lbl_801E5650: /* 801E5658 001E2598 3B FF 00 04 */ addi r31, r31, 4 /* 801E565C 001E259C 41 80 FF E0 */ blt lbl_801E563C /* 801E5660 001E25A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E5664 001E25A4 48 17 CB BD */ bl func_80362220 +/* 801E5664 001E25A4 48 17 CB BD */ bl _restgpr_27 /* 801E5668 001E25A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E566C 001E25AC 7C 08 03 A6 */ mtlr r0 /* 801E5670 001E25B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -5529,7 +5529,7 @@ dMenu_Option_c_NS_setAttenString: /* 801E7008 001E3F48 7C 08 02 A6 */ mflr r0 /* 801E700C 001E3F4C 90 01 00 24 */ stw r0, 0x24(r1) /* 801E7010 001E3F50 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E7014 001E3F54 48 17 B1 C1 */ bl func_803621D4 +/* 801E7014 001E3F54 48 17 B1 C1 */ bl _savegpr_27 /* 801E7018 001E3F58 7C 7B 1B 78 */ mr r27, r3 /* 801E701C 001E3F5C 88 03 03 E4 */ lbz r0, 0x3e4(r3) /* 801E7020 001E3F60 28 00 00 00 */ cmplwi r0, 0 @@ -5582,7 +5582,7 @@ lbl_801E70C0: /* 801E70C8 001E4008 3B FF 00 04 */ addi r31, r31, 4 /* 801E70CC 001E400C 41 80 FF 80 */ blt lbl_801E704C /* 801E70D0 001E4010 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E70D4 001E4014 48 17 B1 4D */ bl func_80362220 +/* 801E70D4 001E4014 48 17 B1 4D */ bl _restgpr_27 /* 801E70D8 001E4018 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E70DC 001E401C 7C 08 03 A6 */ mtlr r0 /* 801E70E0 001E4020 38 21 00 20 */ addi r1, r1, 0x20 @@ -5594,7 +5594,7 @@ dMenu_Option_c_NS_setVibString: /* 801E70EC 001E402C 7C 08 02 A6 */ mflr r0 /* 801E70F0 001E4030 90 01 00 24 */ stw r0, 0x24(r1) /* 801E70F4 001E4034 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E70F8 001E4038 48 17 B0 DD */ bl func_803621D4 +/* 801E70F8 001E4038 48 17 B0 DD */ bl _savegpr_27 /* 801E70FC 001E403C 7C 7B 1B 78 */ mr r27, r3 /* 801E7100 001E4040 88 03 03 EA */ lbz r0, 0x3ea(r3) /* 801E7104 001E4044 28 00 00 00 */ cmplwi r0, 0 @@ -5647,7 +5647,7 @@ lbl_801E71A4: /* 801E71AC 001E40EC 3B FF 00 04 */ addi r31, r31, 4 /* 801E71B0 001E40F0 41 80 FF 80 */ blt lbl_801E7130 /* 801E71B4 001E40F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E71B8 001E40F8 48 17 B0 69 */ bl func_80362220 +/* 801E71B8 001E40F8 48 17 B0 69 */ bl _restgpr_27 /* 801E71BC 001E40FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E71C0 001E4100 7C 08 03 A6 */ mtlr r0 /* 801E71C4 001E4104 38 21 00 20 */ addi r1, r1, 0x20 @@ -6142,7 +6142,7 @@ dMenu_Option_c_NS_setHIO: /* 801E78BC 001E47FC 7C 08 02 A6 */ mflr r0 /* 801E78C0 001E4800 90 01 00 44 */ stw r0, 0x44(r1) /* 801E78C4 001E4804 39 61 00 40 */ addi r11, r1, 0x40 -/* 801E78C8 001E4808 48 17 A9 0D */ bl func_803621D4 +/* 801E78C8 001E4808 48 17 A9 0D */ bl _savegpr_27 /* 801E78CC 001E480C 7C 7E 1B 78 */ mr r30, r3 /* 801E78D0 001E4810 7C 9F 23 78 */ mr r31, r4 /* 801E78D4 001E4814 C0 03 03 78 */ lfs f0, 0x378(r3) @@ -6431,7 +6431,7 @@ lbl_801E7CB4: /* 801E7CFC 001E4C3C 4E 80 04 21 */ bctrl lbl_801E7D00: /* 801E7D00 001E4C40 39 61 00 40 */ addi r11, r1, 0x40 -/* 801E7D04 001E4C44 48 17 A5 1D */ bl func_80362220 +/* 801E7D04 001E4C44 48 17 A5 1D */ bl _restgpr_27 /* 801E7D08 001E4C48 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E7D0C 001E4C4C 7C 08 03 A6 */ mtlr r0 /* 801E7D10 001E4C50 38 21 00 40 */ addi r1, r1, 0x40 @@ -6581,7 +6581,7 @@ lbl_801E7EE4: /* 801E7F00 001E4E40 4E 80 04 21 */ bctrl /* 801E7F04 001E4E44 48 11 87 55 */ bl J2DTextBox_NS_getStringPtr /* 801E7F08 001E4E48 38 9C 00 1D */ addi r4, r28, 0x1d -/* 801E7F0C 001E4E4C 48 18 0C 21 */ bl func_80368B2C +/* 801E7F0C 001E4E4C 48 18 0C 21 */ bl strcpy /* 801E7F10 001E4E50 3B 7B 00 01 */ addi r27, r27, 1 /* 801E7F14 001E4E54 2C 1B 00 05 */ cmpwi r27, 5 /* 801E7F18 001E4E58 3B DE 00 08 */ addi r30, r30, 8 @@ -6653,7 +6653,7 @@ lbl_801E7FE8: /* 801E8004 001E4F44 4E 80 04 21 */ bctrl /* 801E8008 001E4F48 48 11 86 51 */ bl J2DTextBox_NS_getStringPtr /* 801E800C 001E4F4C 38 9C 00 1D */ addi r4, r28, 0x1d -/* 801E8010 001E4F50 48 18 0B 1D */ bl func_80368B2C +/* 801E8010 001E4F50 48 18 0B 1D */ bl strcpy /* 801E8014 001E4F54 3B 7B 00 01 */ addi r27, r27, 1 /* 801E8018 001E4F58 2C 1B 00 05 */ cmpwi r27, 5 /* 801E801C 001E4F5C 3B DE 00 08 */ addi r30, r30, 8 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index e24810236f..c1a321c1cf 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -279,7 +279,7 @@ lbl_801E94A4: lbl_801E950C: /* 801E950C 001E644C 7F A3 EB 78 */ mr r3, r29 /* 801E9510 001E6450 7E 64 9B 78 */ mr r4, r19 -/* 801E9514 001E6454 4B E4 9E 41 */ bl dSv_player_item_c_NS_getLineUpItem +/* 801E9514 001E6454 4B E4 9E 41 */ bl getLineUpItem__17dSv_player_item_cCFi /* 801E9518 001E6458 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801E951C 001E645C 28 00 00 FF */ cmplwi r0, 0xff /* 801E9520 001E6460 41 82 00 10 */ beq lbl_801E9530 @@ -303,7 +303,7 @@ lbl_801E9558: lbl_801E955C: /* 801E955C 001E649C 7F A3 EB 78 */ mr r3, r29 /* 801E9560 001E64A0 7E 64 9B 78 */ mr r4, r19 -/* 801E9564 001E64A4 4B E4 9D F1 */ bl dSv_player_item_c_NS_getLineUpItem +/* 801E9564 001E64A4 4B E4 9D F1 */ bl getLineUpItem__17dSv_player_item_cCFi /* 801E9568 001E64A8 38 13 06 90 */ addi r0, r19, 0x690 /* 801E956C 001E64AC 7C 7F 01 AE */ stbx r3, r31, r0 /* 801E9570 001E64B0 3A 73 00 01 */ addi r19, r19, 1 @@ -317,12 +317,12 @@ lbl_801E955C: lbl_801E9590: /* 801E9590 001E64D0 7F A3 EB 78 */ mr r3, r29 /* 801E9594 001E64D4 7E C4 B3 78 */ mr r4, r22 -/* 801E9598 001E64D8 4B E4 9D BD */ bl dSv_player_item_c_NS_getLineUpItem +/* 801E9598 001E64D8 4B E4 9D BD */ bl getLineUpItem__17dSv_player_item_cCFi /* 801E959C 001E64DC 38 16 06 90 */ addi r0, r22, 0x690 /* 801E95A0 001E64E0 7C 7F 01 AE */ stbx r3, r31, r0 /* 801E95A4 001E64E4 7F A3 EB 78 */ mr r3, r29 /* 801E95A8 001E64E8 7E C4 B3 78 */ mr r4, r22 -/* 801E95AC 001E64EC 4B E4 9D A9 */ bl dSv_player_item_c_NS_getLineUpItem +/* 801E95AC 001E64EC 4B E4 9D A9 */ bl getLineUpItem__17dSv_player_item_cCFi /* 801E95B0 001E64F0 7C 74 1B 78 */ mr r20, r3 /* 801E95B4 001E64F4 7E A3 AB 78 */ mr r3, r21 /* 801E95B8 001E64F8 38 80 00 00 */ li r4, 0 @@ -335,7 +335,7 @@ lbl_801E9590: lbl_801E95D4: /* 801E95D4 001E6514 7F A3 EB 78 */ mr r3, r29 /* 801E95D8 001E6518 7E C4 B3 78 */ mr r4, r22 -/* 801E95DC 001E651C 4B E4 9D 79 */ bl dSv_player_item_c_NS_getLineUpItem +/* 801E95DC 001E651C 4B E4 9D 79 */ bl getLineUpItem__17dSv_player_item_cCFi /* 801E95E0 001E6520 7C 74 1B 78 */ mr r20, r3 /* 801E95E4 001E6524 7E A3 AB 78 */ mr r3, r21 /* 801E95E8 001E6528 38 80 00 01 */ li r4, 1 @@ -623,7 +623,7 @@ lbl_801E99C8: /* 801E99F8 001E6938 38 19 06 90 */ addi r0, r25, 0x690 /* 801E99FC 001E693C 7C 9F 00 AE */ lbzx r4, r31, r0 /* 801E9A00 001E6940 38 A0 00 00 */ li r5, 0 -/* 801E9A04 001E6944 4B E4 96 2D */ bl dSv_player_item_c_NS_getItem +/* 801E9A04 001E6944 4B E4 96 2D */ bl getItem__17dSv_player_item_cCFib /* 801E9A08 001E6948 7C 75 1B 78 */ mr r21, r3 /* 801E9A0C 001E694C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801E9A10 001E6950 28 00 00 FF */ cmplwi r0, 0xff @@ -1451,7 +1451,7 @@ lbl_801EA65C: /* 801EA68C 001E75CC 7F A3 EB 78 */ mr r3, r29 /* 801EA690 001E75D0 88 9F 06 90 */ lbz r4, 0x690(r31) /* 801EA694 001E75D4 38 A0 00 00 */ li r5, 0 -/* 801EA698 001E75D8 4B E4 89 99 */ bl dSv_player_item_c_NS_getItem +/* 801EA698 001E75D8 4B E4 89 99 */ bl getItem__17dSv_player_item_cCFib /* 801EA69C 001E75DC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EA6A0 001E75E0 28 00 00 FF */ cmplwi r0, 0xff /* 801EA6A4 001E75E4 41 82 00 24 */ beq lbl_801EA6C8 @@ -2273,7 +2273,7 @@ lbl_801EB20C: /* 801EB240 001E8180 38 63 00 9C */ addi r3, r3, 0x9c /* 801EB244 001E8184 88 9E 06 90 */ lbz r4, 0x690(r30) /* 801EB248 001E8188 38 A0 00 00 */ li r5, 0 -/* 801EB24C 001E818C 4B E4 7D E5 */ bl dSv_player_item_c_NS_getItem +/* 801EB24C 001E818C 4B E4 7D E5 */ bl getItem__17dSv_player_item_cCFib /* 801EB250 001E8190 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EB254 001E8194 28 00 00 FF */ cmplwi r0, 0xff /* 801EB258 001E8198 41 82 00 24 */ beq lbl_801EB27C @@ -2512,7 +2512,7 @@ lbl_801EB564: /* 801EB5A4 001E84E4 7C 9E 02 14 */ add r4, r30, r0 /* 801EB5A8 001E84E8 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EB5AC 001E84EC 38 A0 00 00 */ li r5, 0 -/* 801EB5B0 001E84F0 4B E4 7A 81 */ bl dSv_player_item_c_NS_getItem +/* 801EB5B0 001E84F0 4B E4 7A 81 */ bl getItem__17dSv_player_item_cCFib /* 801EB5B4 001E84F4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EB5B8 001E84F8 28 00 00 FF */ cmplwi r0, 0xff /* 801EB5BC 001E84FC 41 82 00 30 */ beq lbl_801EB5EC @@ -2786,7 +2786,7 @@ dMenu_Ring_c_NS_setRotate: /* 801EB974 001E88B4 DB C1 00 20 */ stfd f30, 0x20(r1) /* 801EB978 001E88B8 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801EB97C 001E88BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EB980 001E88C0 48 17 68 55 */ bl func_803621D4 +/* 801EB980 001E88C0 48 17 68 55 */ bl _savegpr_27 /* 801EB984 001E88C4 7C 7B 1B 78 */ mr r27, r3 /* 801EB988 001E88C8 88 83 06 AE */ lbz r4, 0x6ae(r3) /* 801EB98C 001E88CC C0 22 A9 D4 */ lfs f1, lbl_804543D4-_SDA2_BASE_(r2) @@ -2829,7 +2829,7 @@ lbl_801EBA04: /* 801EBA18 001E8958 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801EBA1C 001E895C CB C1 00 20 */ lfd f30, 0x20(r1) /* 801EBA20 001E8960 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EBA24 001E8964 48 17 67 FD */ bl func_80362220 +/* 801EBA24 001E8964 48 17 67 FD */ bl _restgpr_27 /* 801EBA28 001E8968 80 01 00 44 */ lwz r0, 0x44(r1) /* 801EBA2C 001E896C 7C 08 03 A6 */ mtlr r0 /* 801EBA30 001E8970 38 21 00 40 */ addi r1, r1, 0x40 @@ -3471,7 +3471,7 @@ lbl_801EC300: /* 801EC304 001E9244 3B 5F 06 90 */ addi r26, r31, 0x690 /* 801EC308 001E9248 7C 9E D0 AE */ lbzx r4, r30, r26 /* 801EC30C 001E924C 38 A0 00 00 */ li r5, 0 -/* 801EC310 001E9250 4B E4 6D 21 */ bl dSv_player_item_c_NS_getItem +/* 801EC310 001E9250 4B E4 6D 21 */ bl getItem__17dSv_player_item_cCFib /* 801EC314 001E9254 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801EC318 001E9258 38 83 01 65 */ addi r4, r3, 0x165 /* 801EC31C 001E925C 88 BD 00 DC */ lbz r5, 0xdc(r29) @@ -3524,7 +3524,7 @@ dMenu_Ring_c_NS_setNameString: /* 801EC3B4 001E92F4 7C 08 02 A6 */ mflr r0 /* 801EC3B8 001E92F8 90 01 00 34 */ stw r0, 0x34(r1) /* 801EC3BC 001E92FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EC3C0 001E9300 48 17 5E 19 */ bl func_803621D8 +/* 801EC3C0 001E9300 48 17 5E 19 */ bl _savegpr_28 /* 801EC3C4 001E9304 7C 7C 1B 78 */ mr r28, r3 /* 801EC3C8 001E9308 7C 9D 23 78 */ mr r29, r4 /* 801EC3CC 001E930C 80 63 00 64 */ lwz r3, 0x64(r3) @@ -3581,7 +3581,7 @@ lbl_801EC480: /* 801EC494 001E93D4 3C 80 80 39 */ lis r4, lbl_803978C8@ha /* 801EC498 001E93D8 38 84 78 C8 */ addi r4, r4, lbl_803978C8@l /* 801EC49C 001E93DC 38 84 00 2D */ addi r4, r4, 0x2d -/* 801EC4A0 001E93E0 48 17 C6 8D */ bl func_80368B2C +/* 801EC4A0 001E93E0 48 17 C6 8D */ bl strcpy /* 801EC4A4 001E93E4 48 00 00 34 */ b lbl_801EC4D8 lbl_801EC4A8: /* 801EC4A8 001E93E8 80 7C 00 14 */ lwz r3, 0x14(r28) @@ -3604,7 +3604,7 @@ lbl_801EC4D8: /* 801EC4E8 001E9428 93 BC 06 30 */ stw r29, 0x630(r28) lbl_801EC4EC: /* 801EC4EC 001E942C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EC4F0 001E9430 48 17 5D 35 */ bl func_80362224 +/* 801EC4F0 001E9430 48 17 5D 35 */ bl _restgpr_28 /* 801EC4F4 001E9434 80 01 00 34 */ lwz r0, 0x34(r1) /* 801EC4F8 001E9438 7C 08 03 A6 */ mtlr r0 /* 801EC4FC 001E943C 38 21 00 30 */ addi r1, r1, 0x30 @@ -3625,7 +3625,7 @@ dMenu_Ring_c_NS_setActiveCursor: /* 801EC52C 001E946C 7C 9F 02 14 */ add r4, r31, r0 /* 801EC530 001E9470 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EC534 001E9474 38 A0 00 00 */ li r5, 0 -/* 801EC538 001E9478 4B E4 6A F9 */ bl dSv_player_item_c_NS_getItem +/* 801EC538 001E9478 4B E4 6A F9 */ bl getItem__17dSv_player_item_cCFib /* 801EC53C 001E947C 88 1F 06 B0 */ lbz r0, 0x6b0(r31) /* 801EC540 001E9480 28 00 00 00 */ cmplwi r0, 0 /* 801EC544 001E9484 40 82 01 F8 */ bne lbl_801EC73C @@ -3775,7 +3775,7 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC758 001E9698 7C 08 02 A6 */ mflr r0 /* 801EC75C 001E969C 90 01 00 44 */ stw r0, 0x44(r1) /* 801EC760 001E96A0 39 61 00 40 */ addi r11, r1, 0x40 -/* 801EC764 001E96A4 48 17 5A 71 */ bl func_803621D4 +/* 801EC764 001E96A4 48 17 5A 71 */ bl _savegpr_27 /* 801EC768 001E96A8 7C 7B 1B 78 */ mr r27, r3 /* 801EC76C 001E96AC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC770 001E96B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3784,7 +3784,7 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC77C 001E96BC 7C 9B 02 14 */ add r4, r27, r0 /* 801EC780 001E96C0 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EC784 001E96C4 38 A0 00 00 */ li r5, 0 -/* 801EC788 001E96C8 4B E4 68 A9 */ bl dSv_player_item_c_NS_getItem +/* 801EC788 001E96C8 4B E4 68 A9 */ bl getItem__17dSv_player_item_cCFib /* 801EC78C 001E96CC 7C 7F 1B 78 */ mr r31, r3 /* 801EC790 001E96D0 3B 80 00 00 */ li r28, 0 /* 801EC794 001E96D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4018,7 +4018,7 @@ lbl_801ECAEC: /* 801ECAF8 001E9A38 98 1B 06 AB */ stb r0, 0x6ab(r27) lbl_801ECAFC: /* 801ECAFC 001E9A3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801ECB00 001E9A40 48 17 57 21 */ bl func_80362220 +/* 801ECB00 001E9A40 48 17 57 21 */ bl _restgpr_27 /* 801ECB04 001E9A44 80 01 00 44 */ lwz r0, 0x44(r1) /* 801ECB08 001E9A48 7C 08 03 A6 */ mtlr r0 /* 801ECB0C 001E9A4C 38 21 00 40 */ addi r1, r1, 0x40 @@ -4232,7 +4232,7 @@ lbl_801ECDA0: /* 801ECE1C 001E9D5C 7E 63 9B 78 */ mr r3, r19 /* 801ECE20 001E9D60 7C 9B A0 AE */ lbzx r4, r27, r20 /* 801ECE24 001E9D64 38 A0 00 00 */ li r5, 0 -/* 801ECE28 001E9D68 4B E4 62 09 */ bl dSv_player_item_c_NS_getItem +/* 801ECE28 001E9D68 4B E4 62 09 */ bl getItem__17dSv_player_item_cCFib /* 801ECE2C 001E9D6C 7C 72 1B 78 */ mr r18, r3 /* 801ECE30 001E9D70 2C 1C 00 00 */ cmpwi r28, 0 /* 801ECE34 001E9D74 40 82 00 10 */ bne lbl_801ECE44 @@ -4455,7 +4455,7 @@ lbl_801ED0E8: /* 801ED164 001EA0A4 7F 83 E3 78 */ mr r3, r28 /* 801ED168 001EA0A8 7C 97 D8 AE */ lbzx r4, r23, r27 /* 801ED16C 001EA0AC 38 A0 00 00 */ li r5, 0 -/* 801ED170 001EA0B0 4B E4 5E C1 */ bl dSv_player_item_c_NS_getItem +/* 801ED170 001EA0B0 4B E4 5E C1 */ bl getItem__17dSv_player_item_cCFib /* 801ED174 001EA0B4 7C 74 1B 78 */ mr r20, r3 /* 801ED178 001EA0B8 2C 18 00 00 */ cmpwi r24, 0 /* 801ED17C 001EA0BC 40 82 00 10 */ bne lbl_801ED18C @@ -4583,7 +4583,7 @@ lbl_801ED30C: /* 801ED344 001EA284 7C 9F 02 14 */ add r4, r31, r0 /* 801ED348 001EA288 88 84 06 90 */ lbz r4, 0x690(r4) /* 801ED34C 001EA28C 38 A0 00 00 */ li r5, 0 -/* 801ED350 001EA290 4B E4 5C E1 */ bl dSv_player_item_c_NS_getItem +/* 801ED350 001EA290 4B E4 5C E1 */ bl getItem__17dSv_player_item_cCFib /* 801ED354 001EA294 7C 7E 1B 78 */ mr r30, r3 /* 801ED358 001EA298 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801ED35C 001EA29C 28 00 00 FF */ cmplwi r0, 0xff @@ -4843,7 +4843,7 @@ lbl_801ED6B4: /* 801ED710 001EA650 7C 9F 02 14 */ add r4, r31, r0 /* 801ED714 001EA654 88 84 06 90 */ lbz r4, 0x690(r4) /* 801ED718 001EA658 38 A0 00 00 */ li r5, 0 -/* 801ED71C 001EA65C 4B E4 59 15 */ bl dSv_player_item_c_NS_getItem +/* 801ED71C 001EA65C 4B E4 59 15 */ bl getItem__17dSv_player_item_cCFib /* 801ED720 001EA660 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801ED724 001EA664 28 00 00 FF */ cmplwi r0, 0xff /* 801ED728 001EA668 41 82 00 30 */ beq lbl_801ED758 @@ -4931,7 +4931,7 @@ lbl_801ED7FC: /* 801ED850 001EA790 7C 9F 02 14 */ add r4, r31, r0 /* 801ED854 001EA794 88 84 06 90 */ lbz r4, 0x690(r4) /* 801ED858 001EA798 38 A0 00 00 */ li r5, 0 -/* 801ED85C 001EA79C 4B E4 57 D5 */ bl dSv_player_item_c_NS_getItem +/* 801ED85C 001EA79C 4B E4 57 D5 */ bl getItem__17dSv_player_item_cCFib /* 801ED860 001EA7A0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801ED864 001EA7A4 28 00 00 FF */ cmplwi r0, 0xff /* 801ED868 001EA7A8 41 82 00 30 */ beq lbl_801ED898 @@ -5399,7 +5399,7 @@ dMenu_Ring_c_NS_setSelectItemForce: /* 801EDF30 001EAE70 7C 08 02 A6 */ mflr r0 /* 801EDF34 001EAE74 90 01 00 24 */ stw r0, 0x24(r1) /* 801EDF38 001EAE78 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EDF3C 001EAE7C 48 17 42 9D */ bl func_803621D8 +/* 801EDF3C 001EAE7C 48 17 42 9D */ bl _savegpr_28 /* 801EDF40 001EAE80 7C 7C 1B 78 */ mr r28, r3 /* 801EDF44 001EAE84 2C 04 00 02 */ cmpwi r4, 2 /* 801EDF48 001EAE88 40 82 00 34 */ bne lbl_801EDF7C @@ -5437,7 +5437,7 @@ lbl_801EDF94: /* 801EDFC0 001EAF00 B0 1E 06 74 */ sth r0, 0x674(r30) lbl_801EDFC4: /* 801EDFC4 001EAF04 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EDFC8 001EAF08 48 17 42 5D */ bl func_80362224 +/* 801EDFC8 001EAF08 48 17 42 5D */ bl _restgpr_28 /* 801EDFCC 001EAF0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801EDFD0 001EAF10 7C 08 03 A6 */ mtlr r0 /* 801EDFD4 001EAF14 38 21 00 20 */ addi r1, r1, 0x20 @@ -5449,7 +5449,7 @@ dMenu_Ring_c_NS_getCursorPos: /* 801EDFE0 001EAF20 7C 08 02 A6 */ mflr r0 /* 801EDFE4 001EAF24 90 01 00 24 */ stw r0, 0x24(r1) /* 801EDFE8 001EAF28 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EDFEC 001EAF2C 48 17 41 ED */ bl func_803621D8 +/* 801EDFEC 001EAF2C 48 17 41 ED */ bl _savegpr_28 /* 801EDFF0 001EAF30 7C 7C 1B 78 */ mr r28, r3 /* 801EDFF4 001EAF34 3B A0 00 00 */ li r29, 0 /* 801EDFF8 001EAF38 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -5460,7 +5460,7 @@ dMenu_Ring_c_NS_getCursorPos: lbl_801EE00C: /* 801EE00C 001EAF4C 7F C3 F3 78 */ mr r3, r30 /* 801EE010 001EAF50 7F A4 EB 78 */ mr r4, r29 -/* 801EE014 001EAF54 4B E4 53 41 */ bl dSv_player_item_c_NS_getLineUpItem +/* 801EE014 001EAF54 4B E4 53 41 */ bl getLineUpItem__17dSv_player_item_cCFi /* 801EE018 001EAF58 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EE01C 001EAF5C 7C 1F 00 40 */ cmplw r31, r0 /* 801EE020 001EAF60 40 82 00 0C */ bne lbl_801EE02C @@ -5475,7 +5475,7 @@ lbl_801EE030: /* 801EE03C 001EAF7C 38 60 00 FF */ li r3, 0xff lbl_801EE040: /* 801EE040 001EAF80 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EE044 001EAF84 48 17 41 E1 */ bl func_80362224 +/* 801EE044 001EAF84 48 17 41 E1 */ bl _restgpr_28 /* 801EE048 001EAF88 80 01 00 24 */ lwz r0, 0x24(r1) /* 801EE04C 001EAF8C 7C 08 03 A6 */ mtlr r0 /* 801EE050 001EAF90 38 21 00 20 */ addi r1, r1, 0x20 @@ -5493,7 +5493,7 @@ dMenu_Ring_c_NS_getItemNum: /* 801EE074 001EAFB4 54 9F 06 3E */ clrlwi r31, r4, 0x18 /* 801EE078 001EAFB8 7F E4 FB 78 */ mr r4, r31 /* 801EE07C 001EAFBC 38 A0 00 00 */ li r5, 0 -/* 801EE080 001EAFC0 4B E4 4F B1 */ bl dSv_player_item_c_NS_getItem +/* 801EE080 001EAFC0 4B E4 4F B1 */ bl getItem__17dSv_player_item_cCFib /* 801EE084 001EAFC4 38 80 00 00 */ li r4, 0 /* 801EE088 001EAFC8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EE08C 001EAFCC 2C 00 00 53 */ cmpwi r0, 0x53 @@ -5568,7 +5568,7 @@ dMenu_Ring_c_NS_getItemMaxNum: /* 801EE170 001EB0B0 38 63 00 9C */ addi r3, r3, 0x9c /* 801EE174 001EB0B4 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 801EE178 001EB0B8 38 A0 00 00 */ li r5, 0 -/* 801EE17C 001EB0BC 4B E4 4E B5 */ bl dSv_player_item_c_NS_getItem +/* 801EE17C 001EB0BC 4B E4 4E B5 */ bl getItem__17dSv_player_item_cCFib /* 801EE180 001EB0C0 7C 64 1B 78 */ mr r4, r3 /* 801EE184 001EB0C4 38 60 00 00 */ li r3, 0 /* 801EE188 001EB0C8 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -5627,7 +5627,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE22C 001EB16C 7C 08 02 A6 */ mflr r0 /* 801EE230 001EB170 90 01 00 24 */ stw r0, 0x24(r1) /* 801EE234 001EB174 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EE238 001EB178 48 17 3F A1 */ bl func_803621D8 +/* 801EE238 001EB178 48 17 3F A1 */ bl _savegpr_28 /* 801EE23C 001EB17C 7C 7D 1B 78 */ mr r29, r3 /* 801EE240 001EB180 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE244 001EB184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -5640,7 +5640,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE260 001EB1A0 7F 83 E3 78 */ mr r3, r28 /* 801EE264 001EB1A4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801EE268 001EB1A8 38 A0 00 00 */ li r5, 0 -/* 801EE26C 001EB1AC 4B E4 4D C5 */ bl dSv_player_item_c_NS_getItem +/* 801EE26C 001EB1AC 4B E4 4D C5 */ bl getItem__17dSv_player_item_cCFib /* 801EE270 001EB1B0 7C 7E 1B 78 */ mr r30, r3 /* 801EE274 001EB1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE278 001EB1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -5650,7 +5650,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE288 001EB1C8 7F 83 E3 78 */ mr r3, r28 /* 801EE28C 001EB1CC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801EE290 001EB1D0 38 A0 00 00 */ li r5, 0 -/* 801EE294 001EB1D4 4B E4 4D 9D */ bl dSv_player_item_c_NS_getItem +/* 801EE294 001EB1D4 4B E4 4D 9D */ bl getItem__17dSv_player_item_cCFib /* 801EE298 001EB1D8 7C 7F 1B 78 */ mr r31, r3 /* 801EE29C 001EB1DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE2A0 001EB1E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -5660,7 +5660,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE2B0 001EB1F0 7F 83 E3 78 */ mr r3, r28 /* 801EE2B4 001EB1F4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801EE2B8 001EB1F8 38 A0 00 00 */ li r5, 0 -/* 801EE2BC 001EB1FC 4B E4 4D 75 */ bl dSv_player_item_c_NS_getItem +/* 801EE2BC 001EB1FC 4B E4 4D 75 */ bl getItem__17dSv_player_item_cCFib /* 801EE2C0 001EB200 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE2C4 001EB204 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EE2C8 001EB208 38 80 00 03 */ li r4, 3 @@ -5669,13 +5669,13 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE2D4 001EB214 7F 83 E3 78 */ mr r3, r28 /* 801EE2D8 001EB218 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801EE2DC 001EB21C 38 A0 00 00 */ li r5, 0 -/* 801EE2E0 001EB220 4B E4 4D 51 */ bl dSv_player_item_c_NS_getItem +/* 801EE2E0 001EB220 4B E4 4D 51 */ bl getItem__17dSv_player_item_cCFib /* 801EE2E4 001EB224 7F 83 E3 78 */ mr r3, r28 /* 801EE2E8 001EB228 88 1D 06 A8 */ lbz r0, 0x6a8(r29) /* 801EE2EC 001EB22C 7C 9D 02 14 */ add r4, r29, r0 /* 801EE2F0 001EB230 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EE2F4 001EB234 38 A0 00 01 */ li r5, 1 -/* 801EE2F8 001EB238 4B E4 4D 39 */ bl dSv_player_item_c_NS_getItem +/* 801EE2F8 001EB238 4B E4 4D 39 */ bl getItem__17dSv_player_item_cCFib /* 801EE2FC 001EB23C 38 A0 00 FF */ li r5, 0xff /* 801EE300 001EB240 38 81 00 08 */ addi r4, r1, 8 /* 801EE304 001EB244 38 00 00 04 */ li r0, 4 @@ -5909,7 +5909,7 @@ lbl_801EE60C: lbl_801EE620: /* 801EE620 001EB560 38 60 00 00 */ li r3, 0 /* 801EE624 001EB564 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EE628 001EB568 48 17 3B FD */ bl func_80362224 +/* 801EE628 001EB568 48 17 3B FD */ bl _restgpr_28 /* 801EE62C 001EB56C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801EE630 001EB570 7C 08 03 A6 */ mtlr r0 /* 801EE634 001EB574 38 21 00 20 */ addi r1, r1, 0x20 @@ -6221,12 +6221,12 @@ dMenu_Ring_c_NS_getItem: /* 801EEAA4 001EB9E4 3B C3 00 9C */ addi r30, r3, 0x9c /* 801EEAA8 001EB9E8 7F C3 F3 78 */ mr r3, r30 /* 801EEAAC 001EB9EC 38 A0 00 00 */ li r5, 0 -/* 801EEAB0 001EB9F0 4B E4 45 81 */ bl dSv_player_item_c_NS_getItem +/* 801EEAB0 001EB9F0 4B E4 45 81 */ bl getItem__17dSv_player_item_cCFib /* 801EEAB4 001EB9F4 7C 7F 1B 78 */ mr r31, r3 /* 801EEAB8 001EB9F8 7F C3 F3 78 */ mr r3, r30 /* 801EEABC 001EB9FC 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 801EEAC0 001EBA00 38 A0 00 00 */ li r5, 0 -/* 801EEAC4 001EBA04 4B E4 45 6D */ bl dSv_player_item_c_NS_getItem +/* 801EEAC4 001EBA04 4B E4 45 6D */ bl getItem__17dSv_player_item_cCFib /* 801EEAC8 001EBA08 7F E3 FB 78 */ mr r3, r31 /* 801EEACC 001EBA0C 39 61 00 20 */ addi r11, r1, 0x20 /* 801EEAD0 001EBA10 48 17 37 59 */ bl _restgpr_29 @@ -6289,7 +6289,7 @@ dMenu_Ring_c_NS_isMixItemOn: /* 801EEB90 001EBAD0 7C 9E 02 14 */ add r4, r30, r0 /* 801EEB94 001EBAD4 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EEB98 001EBAD8 38 A0 00 00 */ li r5, 0 -/* 801EEB9C 001EBADC 4B E4 44 95 */ bl dSv_player_item_c_NS_getItem +/* 801EEB9C 001EBADC 4B E4 44 95 */ bl getItem__17dSv_player_item_cCFib /* 801EEBA0 001EBAE0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEBA4 001EBAE4 28 00 00 FF */ cmplwi r0, 0xff /* 801EEBA8 001EBAE8 41 82 00 D4 */ beq lbl_801EEC7C @@ -6298,7 +6298,7 @@ dMenu_Ring_c_NS_isMixItemOn: /* 801EEBB4 001EBAF4 7C 9E 02 14 */ add r4, r30, r0 /* 801EEBB8 001EBAF8 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EEBBC 001EBAFC 38 A0 00 00 */ li r5, 0 -/* 801EEBC0 001EBB00 4B E4 44 71 */ bl dSv_player_item_c_NS_getItem +/* 801EEBC0 001EBB00 4B E4 44 71 */ bl getItem__17dSv_player_item_cCFib /* 801EEBC4 001EBB04 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEBC8 001EBB08 2C 00 00 70 */ cmpwi r0, 0x70 /* 801EEBCC 001EBB0C 40 80 00 10 */ bge lbl_801EEBDC @@ -6379,7 +6379,7 @@ dMenu_Ring_c_NS_isMixItemOff: /* 801EECC8 001EBC08 7C 9F 02 14 */ add r4, r31, r0 /* 801EECCC 001EBC0C 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EECD0 001EBC10 38 A0 00 00 */ li r5, 0 -/* 801EECD4 001EBC14 4B E4 43 5D */ bl dSv_player_item_c_NS_getItem +/* 801EECD4 001EBC14 4B E4 43 5D */ bl getItem__17dSv_player_item_cCFib /* 801EECD8 001EBC18 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EECDC 001EBC1C 28 00 00 FF */ cmplwi r0, 0xff /* 801EECE0 001EBC20 41 82 00 8C */ beq lbl_801EED6C diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index b2e3addd53..2faebd9104 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -1424,7 +1424,7 @@ dMenu_save_c_NS__delete: /* 801F0B2C 001EDA6C 7C 08 02 A6 */ mflr r0 /* 801F0B30 001EDA70 90 01 00 24 */ stw r0, 0x24(r1) /* 801F0B34 001EDA74 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F0B38 001EDA78 48 17 16 A1 */ bl func_803621D8 +/* 801F0B38 001EDA78 48 17 16 A1 */ bl _savegpr_28 /* 801F0B3C 001EDA7C 7C 7F 1B 78 */ mr r31, r3 /* 801F0B40 001EDA80 80 63 00 0C */ lwz r3, 0xc(r3) /* 801F0B44 001EDA84 48 0D E1 F9 */ bl __dl @@ -1779,7 +1779,7 @@ lbl_801F0FF8: /* 801F102C 001EDF6C 4E 80 04 21 */ bctrl lbl_801F1030: /* 801F1030 001EDF70 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1034 001EDF74 48 17 11 F1 */ bl func_80362224 +/* 801F1034 001EDF74 48 17 11 F1 */ bl _restgpr_28 /* 801F1038 001EDF78 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F103C 001EDF7C 7C 08 03 A6 */ mtlr r0 /* 801F1040 001EDF80 38 21 00 20 */ addi r1, r1, 0x20 @@ -2055,7 +2055,7 @@ lbl_801F136C: /* 801F1408 001EE348 3C 80 80 39 */ lis r4, lbl_80397960@ha /* 801F140C 001EE34C 38 84 79 60 */ addi r4, r4, lbl_80397960@l /* 801F1410 001EE350 38 84 00 A5 */ addi r4, r4, 0xa5 -/* 801F1414 001EE354 48 17 77 19 */ bl func_80368B2C +/* 801F1414 001EE354 48 17 77 19 */ bl strcpy /* 801F1418 001EE358 88 1E 01 78 */ lbz r0, 0x178(r30) /* 801F141C 001EE35C 68 00 00 01 */ xori r0, r0, 1 /* 801F1420 001EE360 54 00 10 3A */ slwi r0, r0, 2 @@ -2064,7 +2064,7 @@ lbl_801F136C: /* 801F142C 001EE36C 3C 80 80 39 */ lis r4, lbl_80397960@ha /* 801F1430 001EE370 38 84 79 60 */ addi r4, r4, lbl_80397960@l /* 801F1434 001EE374 38 84 00 A5 */ addi r4, r4, 0xa5 -/* 801F1438 001EE378 48 17 76 F5 */ bl func_80368B2C +/* 801F1438 001EE378 48 17 76 F5 */ bl strcpy /* 801F143C 001EE37C 38 00 00 00 */ li r0, 0 /* 801F1440 001EE380 98 1E 00 64 */ stb r0, 0x64(r30) /* 801F1444 001EE384 38 00 00 01 */ li r0, 1 @@ -4035,14 +4035,14 @@ lbl_801F3118: /* 801F3140 001F0080 7F E3 FB 78 */ mr r3, r31 /* 801F3144 001F0084 38 80 00 01 */ li r4, 1 /* 801F3148 001F0088 38 A0 00 01 */ li r5, 1 -/* 801F314C 001F008C 4B E3 FE E5 */ bl dSv_player_item_c_NS_getItem +/* 801F314C 001F008C 4B E3 FE E5 */ bl getItem__17dSv_player_item_cCFib /* 801F3150 001F0090 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801F3154 001F0094 28 00 00 FF */ cmplwi r0, 0xff /* 801F3158 001F0098 40 82 00 2C */ bne lbl_801F3184 /* 801F315C 001F009C 7F E3 FB 78 */ mr r3, r31 /* 801F3160 001F00A0 38 80 00 01 */ li r4, 1 /* 801F3164 001F00A4 38 A0 00 48 */ li r5, 0x48 -/* 801F3168 001F00A8 4B E3 FE 51 */ bl dSv_player_item_c_NS_setItem +/* 801F3168 001F00A8 4B E3 FE 51 */ bl setItem__17dSv_player_item_cFiUc /* 801F316C 001F00AC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801F3170 001F00B0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801F3174 001F00B4 A0 03 00 B6 */ lhz r0, 0xb6(r3) @@ -4344,7 +4344,7 @@ lbl_801F3568: /* 801F358C 001F04CC 7C 08 02 A6 */ mflr r0 /* 801F3590 001F04D0 90 01 00 24 */ stw r0, 0x24(r1) /* 801F3594 001F04D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3598 001F04D8 48 16 EC 41 */ bl func_803621D8 +/* 801F3598 001F04D8 48 16 EC 41 */ bl _savegpr_28 /* 801F359C 001F04DC 7C 7F 1B 78 */ mr r31, r3 /* 801F35A0 001F04E0 48 00 13 89 */ bl dMenu_save_c_NS_headerTxtChangeAnm /* 801F35A4 001F04E4 7C 7E 1B 78 */ mr r30, r3 @@ -4417,7 +4417,7 @@ lbl_801F361C: /* 801F3698 001F05D8 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F369C: /* 801F369C 001F05DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F36A0 001F05E0 48 16 EB 85 */ bl func_80362224 +/* 801F36A0 001F05E0 48 16 EB 85 */ bl _restgpr_28 /* 801F36A4 001F05E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F36A8 001F05E8 7C 08 03 A6 */ mtlr r0 /* 801F36AC 001F05EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -4486,7 +4486,7 @@ lbl_801F3788: /* 801F37A4 001F06E4 7C 08 02 A6 */ mflr r0 /* 801F37A8 001F06E8 90 01 00 34 */ stw r0, 0x34(r1) /* 801F37AC 001F06EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F37B0 001F06F0 48 16 EA 25 */ bl func_803621D4 +/* 801F37B0 001F06F0 48 16 EA 25 */ bl _savegpr_27 /* 801F37B4 001F06F4 7C 7B 1B 78 */ mr r27, r3 /* 801F37B8 001F06F8 48 00 29 69 */ bl dMenu_save_c_NS_modoruTxtDispAnm /* 801F37BC 001F06FC 7C 7F 1B 78 */ mr r31, r3 @@ -4582,7 +4582,7 @@ lbl_801F3914: /* 801F3918 001F0858 98 1B 01 B2 */ stb r0, 0x1b2(r27) lbl_801F391C: /* 801F391C 001F085C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F3920 001F0860 48 16 E9 01 */ bl func_80362220 +/* 801F3920 001F0860 48 16 E9 01 */ bl _restgpr_27 /* 801F3924 001F0864 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F3928 001F0868 7C 08 03 A6 */ mtlr r0 /* 801F392C 001F086C 38 21 00 30 */ addi r1, r1, 0x30 @@ -4772,7 +4772,7 @@ lbl_801F3BC8: /* 801F3BE4 001F0B24 7C 08 02 A6 */ mflr r0 /* 801F3BE8 001F0B28 90 01 00 24 */ stw r0, 0x24(r1) /* 801F3BEC 001F0B2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3BF0 001F0B30 48 16 E5 E9 */ bl func_803621D8 +/* 801F3BF0 001F0B30 48 16 E5 E9 */ bl _savegpr_28 /* 801F3BF4 001F0B34 7C 7C 1B 78 */ mr r28, r3 /* 801F3BF8 001F0B38 48 00 0D 31 */ bl dMenu_save_c_NS_headerTxtChangeAnm /* 801F3BFC 001F0B3C 7C 7D 1B 78 */ mr r29, r3 @@ -4803,7 +4803,7 @@ lbl_801F3BC8: /* 801F3C60 001F0BA0 98 1C 01 B2 */ stb r0, 0x1b2(r28) lbl_801F3C64: /* 801F3C64 001F0BA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3C68 001F0BA8 48 16 E5 BD */ bl func_80362224 +/* 801F3C68 001F0BA8 48 16 E5 BD */ bl _restgpr_28 /* 801F3C6C 001F0BAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F3C70 001F0BB0 7C 08 03 A6 */ mtlr r0 /* 801F3C74 001F0BB4 38 21 00 20 */ addi r1, r1, 0x20 @@ -5249,7 +5249,7 @@ lbl_801F42E8: /* 801F4300 001F1240 7C 08 02 A6 */ mflr r0 /* 801F4304 001F1244 90 01 00 24 */ stw r0, 0x24(r1) /* 801F4308 001F1248 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F430C 001F124C 48 16 DE CD */ bl func_803621D8 +/* 801F430C 001F124C 48 16 DE CD */ bl _savegpr_28 /* 801F4310 001F1250 7C 7F 1B 78 */ mr r31, r3 /* 801F4314 001F1254 38 00 00 AD */ li r0, 0xad /* 801F4318 001F1258 90 01 00 08 */ stw r0, 8(r1) @@ -5304,7 +5304,7 @@ lbl_801F42E8: /* 801F43DC 001F131C 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F43E0: /* 801F43E0 001F1320 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F43E4 001F1324 48 16 DE 41 */ bl func_80362224 +/* 801F43E4 001F1324 48 16 DE 41 */ bl _restgpr_28 /* 801F43E8 001F1328 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F43EC 001F132C 7C 08 03 A6 */ mtlr r0 /* 801F43F0 001F1330 38 21 00 20 */ addi r1, r1, 0x20 @@ -5313,7 +5313,7 @@ lbl_801F43E0: /* 801F43FC 001F133C 7C 08 02 A6 */ mflr r0 /* 801F4400 001F1340 90 01 00 34 */ stw r0, 0x34(r1) /* 801F4404 001F1344 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F4408 001F1348 48 16 DD CD */ bl func_803621D4 +/* 801F4408 001F1348 48 16 DD CD */ bl _savegpr_27 /* 801F440C 001F134C 7C 7F 1B 78 */ mr r31, r3 /* 801F4410 001F1350 38 00 00 AD */ li r0, 0xad /* 801F4414 001F1354 90 01 00 08 */ stw r0, 8(r1) @@ -5375,7 +5375,7 @@ lbl_801F43E0: /* 801F44F4 001F1434 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F44F8: /* 801F44F8 001F1438 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F44FC 001F143C 48 16 DD 25 */ bl func_80362220 +/* 801F44FC 001F143C 48 16 DD 25 */ bl _restgpr_27 /* 801F4500 001F1440 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F4504 001F1444 7C 08 03 A6 */ mtlr r0 /* 801F4508 001F1448 38 21 00 30 */ addi r1, r1, 0x30 @@ -5620,7 +5620,7 @@ dMenu_save_c_NS_headerTxtSet: /* 801F4890 001F17D0 3C 80 80 39 */ lis r4, lbl_80397960@ha /* 801F4894 001F17D4 38 84 79 60 */ addi r4, r4, lbl_80397960@l /* 801F4898 001F17D8 38 84 00 A5 */ addi r4, r4, 0xa5 -/* 801F489C 001F17DC 48 17 42 91 */ bl func_80368B2C +/* 801F489C 001F17DC 48 17 42 91 */ bl strcpy /* 801F48A0 001F17E0 48 00 00 40 */ b lbl_801F48E0 lbl_801F48A4: /* 801F48A4 001F17E4 88 1F 01 78 */ lbz r0, 0x178(r31) @@ -5664,7 +5664,7 @@ dMenu_save_c_NS_headerTxtChangeAnm: /* 801F492C 001F186C 7C 08 02 A6 */ mflr r0 /* 801F4930 001F1870 90 01 00 24 */ stw r0, 0x24(r1) /* 801F4934 001F1874 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4938 001F1878 48 16 D8 A1 */ bl func_803621D8 +/* 801F4938 001F1878 48 16 D8 A1 */ bl _savegpr_28 /* 801F493C 001F187C 7C 7F 1B 78 */ mr r31, r3 /* 801F4940 001F1880 88 03 01 79 */ lbz r0, 0x179(r3) /* 801F4944 001F1884 28 00 00 00 */ cmplwi r0, 0 @@ -5716,7 +5716,7 @@ lbl_801F49F4: /* 801F49F4 001F1934 7F 83 E3 78 */ mr r3, r28 lbl_801F49F8: /* 801F49F8 001F1938 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F49FC 001F193C 48 16 D8 29 */ bl func_80362224 +/* 801F49FC 001F193C 48 16 D8 29 */ bl _restgpr_28 /* 801F4A00 001F1940 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F4A04 001F1944 7C 08 03 A6 */ mtlr r0 /* 801F4A08 001F1948 38 21 00 20 */ addi r1, r1, 0x20 @@ -6023,7 +6023,7 @@ dMenu_save_c_NS_errYesNoSelect: /* 801F4E4C 001F1D8C 7C 08 02 A6 */ mflr r0 /* 801F4E50 001F1D90 90 01 00 24 */ stw r0, 0x24(r1) /* 801F4E54 001F1D94 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4E58 001F1D98 48 16 D3 81 */ bl func_803621D8 +/* 801F4E58 001F1D98 48 16 D3 81 */ bl _savegpr_28 /* 801F4E5C 001F1D9C 7C 7F 1B 78 */ mr r31, r3 /* 801F4E60 001F1DA0 7C 9C 23 78 */ mr r28, r4 /* 801F4E64 001F1DA4 7C BD 2B 78 */ mr r29, r5 @@ -6112,7 +6112,7 @@ lbl_801F4F98: /* 801F4F98 001F1ED8 7F C3 F3 78 */ mr r3, r30 lbl_801F4F9C: /* 801F4F9C 001F1EDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4FA0 001F1EE0 48 16 D2 85 */ bl func_80362224 +/* 801F4FA0 001F1EE0 48 16 D2 85 */ bl _restgpr_28 /* 801F4FA4 001F1EE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F4FA8 001F1EE8 7C 08 03 A6 */ mtlr r0 /* 801F4FAC 001F1EEC 38 21 00 20 */ addi r1, r1, 0x20 @@ -6208,7 +6208,7 @@ dMenu_save_c_NS_errorTxtSet: /* 801F50F8 001F2038 3C 80 80 39 */ lis r4, lbl_80397960@ha /* 801F50FC 001F203C 38 84 79 60 */ addi r4, r4, lbl_80397960@l /* 801F5100 001F2040 38 84 00 A5 */ addi r4, r4, 0xa5 -/* 801F5104 001F2044 48 17 3A 29 */ bl func_80368B2C +/* 801F5104 001F2044 48 17 3A 29 */ bl strcpy /* 801F5108 001F2048 48 00 00 40 */ b lbl_801F5148 lbl_801F510C: /* 801F510C 001F204C 88 1F 00 D0 */ lbz r0, 0xd0(r31) @@ -6252,7 +6252,7 @@ dMenu_save_c_NS_errorTxtChangeAnm: /* 801F5194 001F20D4 7C 08 02 A6 */ mflr r0 /* 801F5198 001F20D8 90 01 00 24 */ stw r0, 0x24(r1) /* 801F519C 001F20DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F51A0 001F20E0 48 16 D0 39 */ bl func_803621D8 +/* 801F51A0 001F20E0 48 16 D0 39 */ bl _savegpr_28 /* 801F51A4 001F20E4 7C 7F 1B 78 */ mr r31, r3 /* 801F51A8 001F20E8 88 03 00 D1 */ lbz r0, 0xd1(r3) /* 801F51AC 001F20EC 28 00 00 00 */ cmplwi r0, 0 @@ -6304,7 +6304,7 @@ lbl_801F525C: /* 801F525C 001F219C 7F 83 E3 78 */ mr r3, r28 lbl_801F5260: /* 801F5260 001F21A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5264 001F21A4 48 16 CF C1 */ bl func_80362224 +/* 801F5264 001F21A4 48 16 CF C1 */ bl _restgpr_28 /* 801F5268 001F21A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F526C 001F21AC 7C 08 03 A6 */ mtlr r0 /* 801F5270 001F21B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -6907,7 +6907,7 @@ dMenu_save_c_NS_yesnoSelectMoveAnm: /* 801F5AE8 001F2A28 7C 08 02 A6 */ mflr r0 /* 801F5AEC 001F2A2C 90 01 00 24 */ stw r0, 0x24(r1) /* 801F5AF0 001F2A30 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5AF4 001F2A34 48 16 C6 E5 */ bl func_803621D8 +/* 801F5AF4 001F2A34 48 16 C6 E5 */ bl _savegpr_28 /* 801F5AF8 001F2A38 7C 7C 1B 78 */ mr r28, r3 /* 801F5AFC 001F2A3C 7C 9D 23 78 */ mr r29, r4 /* 801F5B00 001F2A40 3B E0 00 00 */ li r31, 0 @@ -7075,7 +7075,7 @@ lbl_801F5D64: lbl_801F5D68: /* 801F5D68 001F2CA8 7F E3 FB 78 */ mr r3, r31 /* 801F5D6C 001F2CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5D70 001F2CB0 48 16 C4 B5 */ bl func_80362224 +/* 801F5D70 001F2CB0 48 16 C4 B5 */ bl _restgpr_28 /* 801F5D74 001F2CB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F5D78 001F2CB8 7C 08 03 A6 */ mtlr r0 /* 801F5D7C 001F2CBC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index 9d8027b74a..c074e9a224 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -9,7 +9,7 @@ dMenu_Skill_c: /* 801F7228 001F4168 7C 08 02 A6 */ mflr r0 /* 801F722C 001F416C 90 01 00 24 */ stw r0, 0x24(r1) /* 801F7230 001F4170 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7234 001F4174 48 16 AF A5 */ bl func_803621D8 +/* 801F7234 001F4174 48 16 AF A5 */ bl _savegpr_28 /* 801F7238 001F4178 7C 7F 1B 78 */ mr r31, r3 /* 801F723C 001F417C 7C 9C 23 78 */ mr r28, r4 /* 801F7240 001F4180 7C BD 2B 78 */ mr r29, r5 @@ -81,7 +81,7 @@ dMenu_Skill_c: /* 801F7328 001F4268 D0 1F 01 F4 */ stfs f0, 0x1f4(r31) /* 801F732C 001F426C 7F E3 FB 78 */ mr r3, r31 /* 801F7330 001F4270 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7334 001F4274 48 16 AE F1 */ bl func_80362224 +/* 801F7334 001F4274 48 16 AE F1 */ bl _restgpr_28 /* 801F7338 001F4278 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F733C 001F427C 7C 08 03 A6 */ mtlr r0 /* 801F7340 001F4280 38 21 00 20 */ addi r1, r1, 0x20 @@ -1984,7 +1984,7 @@ dMenu_Skill_c_NS_changeActiveColor: /* 801F8F2C 001F5E6C 7C 08 02 A6 */ mflr r0 /* 801F8F30 001F5E70 90 01 00 64 */ stw r0, 0x64(r1) /* 801F8F34 001F5E74 39 61 00 60 */ addi r11, r1, 0x60 -/* 801F8F38 001F5E78 48 16 92 9D */ bl func_803621D4 +/* 801F8F38 001F5E78 48 16 92 9D */ bl _savegpr_27 /* 801F8F3C 001F5E7C 7C 7E 1B 78 */ mr r30, r3 /* 801F8F40 001F5E80 4B FF FF 5D */ bl dMenu_Skill_c_NS_setCursorPos /* 801F8F44 001F5E84 3B E0 00 00 */ li r31, 0 @@ -2113,7 +2113,7 @@ lbl_801F9118: /* 801F9124 001F6064 3B 9C 00 10 */ addi r28, r28, 0x10 /* 801F9128 001F6068 41 80 FE 28 */ blt lbl_801F8F50 /* 801F912C 001F606C 39 61 00 60 */ addi r11, r1, 0x60 -/* 801F9130 001F6070 48 16 90 F1 */ bl func_80362220 +/* 801F9130 001F6070 48 16 90 F1 */ bl _restgpr_27 /* 801F9134 001F6074 80 01 00 64 */ lwz r0, 0x64(r1) /* 801F9138 001F6078 7C 08 03 A6 */ mtlr r0 /* 801F913C 001F607C 38 21 00 60 */ addi r1, r1, 0x60 @@ -2201,7 +2201,7 @@ dMenu_Skill_c_NS_setAButtonString: /* 801F9264 001F61A4 7C 08 02 A6 */ mflr r0 /* 801F9268 001F61A8 90 01 00 24 */ stw r0, 0x24(r1) /* 801F926C 001F61AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F9270 001F61B0 48 16 8F 65 */ bl func_803621D4 +/* 801F9270 001F61B0 48 16 8F 65 */ bl _savegpr_27 /* 801F9274 001F61B4 7C 7B 1B 78 */ mr r27, r3 /* 801F9278 001F61B8 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801F927C 001F61BC 40 82 00 3C */ bne lbl_801F92B8 @@ -2214,7 +2214,7 @@ lbl_801F9290: /* 801F9294 001F61D4 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801F9298 001F61D8 48 10 73 C1 */ bl J2DTextBox_NS_getStringPtr /* 801F929C 001F61DC 38 9E 00 2F */ addi r4, r30, 0x2f -/* 801F92A0 001F61E0 48 16 F8 8D */ bl func_80368B2C +/* 801F92A0 001F61E0 48 16 F8 8D */ bl strcpy /* 801F92A4 001F61E4 3B BD 00 01 */ addi r29, r29, 1 /* 801F92A8 001F61E8 2C 1D 00 05 */ cmpwi r29, 5 /* 801F92AC 001F61EC 3B FF 00 04 */ addi r31, r31, 4 @@ -2240,7 +2240,7 @@ lbl_801F92C8: /* 801F92F4 001F6234 41 80 FF D4 */ blt lbl_801F92C8 lbl_801F92F8: /* 801F92F8 001F6238 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F92FC 001F623C 48 16 8F 25 */ bl func_80362220 +/* 801F92FC 001F623C 48 16 8F 25 */ bl _restgpr_27 /* 801F9300 001F6240 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F9304 001F6244 7C 08 03 A6 */ mtlr r0 /* 801F9308 001F6248 38 21 00 20 */ addi r1, r1, 0x20 @@ -2252,7 +2252,7 @@ dMenu_Skill_c_NS_setBButtonString: /* 801F9314 001F6254 7C 08 02 A6 */ mflr r0 /* 801F9318 001F6258 90 01 00 24 */ stw r0, 0x24(r1) /* 801F931C 001F625C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F9320 001F6260 48 16 8E B5 */ bl func_803621D4 +/* 801F9320 001F6260 48 16 8E B5 */ bl _savegpr_27 /* 801F9324 001F6264 7C 7B 1B 78 */ mr r27, r3 /* 801F9328 001F6268 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801F932C 001F626C 40 82 00 3C */ bne lbl_801F9368 @@ -2265,7 +2265,7 @@ lbl_801F9340: /* 801F9344 001F6284 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801F9348 001F6288 48 10 73 11 */ bl J2DTextBox_NS_getStringPtr /* 801F934C 001F628C 38 9E 00 2F */ addi r4, r30, 0x2f -/* 801F9350 001F6290 48 16 F7 DD */ bl func_80368B2C +/* 801F9350 001F6290 48 16 F7 DD */ bl strcpy /* 801F9354 001F6294 3B BD 00 01 */ addi r29, r29, 1 /* 801F9358 001F6298 2C 1D 00 05 */ cmpwi r29, 5 /* 801F935C 001F629C 3B FF 00 04 */ addi r31, r31, 4 @@ -2291,7 +2291,7 @@ lbl_801F9378: /* 801F93A4 001F62E4 41 80 FF D4 */ blt lbl_801F9378 lbl_801F93A8: /* 801F93A8 001F62E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F93AC 001F62EC 48 16 8E 75 */ bl func_80362220 +/* 801F93AC 001F62EC 48 16 8E 75 */ bl _restgpr_27 /* 801F93B0 001F62F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F93B4 001F62F4 7C 08 03 A6 */ mtlr r0 /* 801F93B8 001F62F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -2303,7 +2303,7 @@ dMenu_Skill_c_NS_setNameString: /* 801F93C4 001F6304 7C 08 02 A6 */ mflr r0 /* 801F93C8 001F6308 90 01 00 24 */ stw r0, 0x24(r1) /* 801F93CC 001F630C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F93D0 001F6310 48 16 8E 05 */ bl func_803621D4 +/* 801F93D0 001F6310 48 16 8E 05 */ bl _savegpr_27 /* 801F93D4 001F6314 7C 7B 1B 78 */ mr r27, r3 /* 801F93D8 001F6318 54 9D 04 3F */ clrlwi. r29, r4, 0x10 /* 801F93DC 001F631C 40 82 00 3C */ bne lbl_801F9418 @@ -2316,7 +2316,7 @@ lbl_801F93F0: /* 801F93F4 001F6334 7C 7B 00 2E */ lwzx r3, r27, r0 /* 801F93F8 001F6338 48 10 72 61 */ bl J2DTextBox_NS_getStringPtr /* 801F93FC 001F633C 38 9E 00 2F */ addi r4, r30, 0x2f -/* 801F9400 001F6340 48 16 F7 2D */ bl func_80368B2C +/* 801F9400 001F6340 48 16 F7 2D */ bl strcpy /* 801F9404 001F6344 3B BD 00 01 */ addi r29, r29, 1 /* 801F9408 001F6348 2C 1D 00 04 */ cmpwi r29, 4 /* 801F940C 001F634C 3B FF 00 04 */ addi r31, r31, 4 @@ -2342,7 +2342,7 @@ lbl_801F9428: /* 801F9454 001F6394 41 80 FF D4 */ blt lbl_801F9428 lbl_801F9458: /* 801F9458 001F6398 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F945C 001F639C 48 16 8D C5 */ bl func_80362220 +/* 801F945C 001F639C 48 16 8D C5 */ bl _restgpr_27 /* 801F9460 001F63A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F9464 001F63A4 7C 08 03 A6 */ mtlr r0 /* 801F9468 001F63A8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_window.s b/asm/d/menu/d_menu_window.s index 72f27d9fd4..c1c48e8456 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -3751,7 +3751,7 @@ dMw_c_NS__draw: /* 801FD454 001FA394 7C 08 02 A6 */ mflr r0 /* 801FD458 001FA398 90 01 00 24 */ stw r0, 0x24(r1) /* 801FD45C 001FA39C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD460 001FA3A0 48 16 4D 79 */ bl func_803621D8 +/* 801FD460 001FA3A0 48 16 4D 79 */ bl _savegpr_28 /* 801FD464 001FA3A4 7C 7F 1B 78 */ mr r31, r3 /* 801FD468 001FA3A8 80 C3 01 0C */ lwz r6, 0x10c(r3) /* 801FD46C 001FA3AC 28 06 00 00 */ cmplwi r6, 0 @@ -3893,7 +3893,7 @@ lbl_801FD610: lbl_801FD660: /* 801FD660 001FA5A0 38 60 00 01 */ li r3, 1 /* 801FD664 001FA5A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD668 001FA5A8 48 16 4B BD */ bl func_80362224 +/* 801FD668 001FA5A8 48 16 4B BD */ bl _restgpr_28 /* 801FD66C 001FA5AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801FD670 001FA5B0 7C 08 03 A6 */ mtlr r0 /* 801FD674 001FA5B4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index 1129f19826..9cd6793f95 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -339,7 +339,7 @@ dMenu_DmapMap_c_NS__delete: /* 801C0D08 001BDC48 7C 08 02 A6 */ mflr r0 /* 801C0D0C 001BDC4C 90 01 00 24 */ stw r0, 0x24(r1) /* 801C0D10 001BDC50 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C0D14 001BDC54 48 1A 14 C5 */ bl func_803621D8 +/* 801C0D14 001BDC54 48 1A 14 C5 */ bl _savegpr_28 /* 801C0D18 001BDC58 7C 7C 1B 78 */ mr r28, r3 /* 801C0D1C 001BDC5C 3B A0 00 00 */ li r29, 0 /* 801C0D20 001BDC60 3B E0 00 00 */ li r31, 0 @@ -360,7 +360,7 @@ lbl_801C0D48: /* 801C0D50 001BDC90 3B FF 00 04 */ addi r31, r31, 4 /* 801C0D54 001BDC94 41 80 FF D0 */ blt lbl_801C0D24 /* 801C0D58 001BDC98 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C0D5C 001BDC9C 48 1A 14 C9 */ bl func_80362224 +/* 801C0D5C 001BDC9C 48 1A 14 C9 */ bl _restgpr_28 /* 801C0D60 001BDCA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C0D64 001BDCA4 7C 08 03 A6 */ mtlr r0 /* 801C0D68 001BDCA8 38 21 00 20 */ addi r1, r1, 0x20 @@ -678,7 +678,7 @@ dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo: /* 801C1198 001BE0D8 7C 08 02 A6 */ mflr r0 /* 801C119C 001BE0DC 90 01 00 34 */ stw r0, 0x34(r1) /* 801C11A0 001BE0E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C11A4 001BE0E4 48 1A 10 35 */ bl func_803621D8 +/* 801C11A4 001BE0E4 48 1A 10 35 */ bl _savegpr_28 /* 801C11A8 001BE0E8 7C 7C 1B 78 */ mr r28, r3 /* 801C11AC 001BE0EC 7C 9D 23 78 */ mr r29, r4 /* 801C11B0 001BE0F0 7C BE 2B 78 */ mr r30, r5 @@ -703,7 +703,7 @@ dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo: /* 801C11FC 001BE13C B0 7F 00 00 */ sth r3, 0(r31) lbl_801C1200: /* 801C1200 001BE140 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C1204 001BE144 48 1A 10 21 */ bl func_80362224 +/* 801C1204 001BE144 48 1A 10 21 */ bl _restgpr_28 /* 801C1208 001BE148 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C120C 001BE14C 7C 08 03 A6 */ mtlr r0 /* 801C1210 001BE150 38 21 00 30 */ addi r1, r1, 0x30 @@ -715,7 +715,7 @@ dMenu_StageMapCtrl_c_NS_getRestartDrawInfo: /* 801C121C 001BE15C 7C 08 02 A6 */ mflr r0 /* 801C1220 001BE160 90 01 00 34 */ stw r0, 0x34(r1) /* 801C1224 001BE164 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C1228 001BE168 48 1A 0F B1 */ bl func_803621D8 +/* 801C1228 001BE168 48 1A 0F B1 */ bl _savegpr_28 /* 801C122C 001BE16C 7C 7C 1B 78 */ mr r28, r3 /* 801C1230 001BE170 7C 9D 23 78 */ mr r29, r4 /* 801C1234 001BE174 7C BE 2B 78 */ mr r30, r5 @@ -743,7 +743,7 @@ lbl_801C1284: /* 801C1288 001BE1C8 38 60 00 01 */ li r3, 1 /* 801C128C 001BE1CC 4B E7 E2 E5 */ bl dMapInfo_c_NS_calcNowStayFloorNo /* 801C1290 001BE1D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C1294 001BE1D4 48 1A 0F 91 */ bl func_80362224 +/* 801C1294 001BE1D4 48 1A 0F 91 */ bl _restgpr_28 /* 801C1298 001BE1D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C129C 001BE1DC 7C 08 03 A6 */ mtlr r0 /* 801C12A0 001BE1E0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/fmap/d_menu_fmap_map.s b/asm/d/menu/fmap/d_menu_fmap_map.s index 0ece135363..92ac20165f 100644 --- a/asm/d/menu/fmap/d_menu_fmap_map.s +++ b/asm/d/menu/fmap/d_menu_fmap_map.s @@ -780,7 +780,7 @@ dMenu_FmapMap_c_NS_setPointColor: /* 801CEB24 001CBA64 90 01 00 34 */ stw r0, 0x34(r1) /* 801CEB28 001CBA68 DB E1 00 28 */ stfd f31, 0x28(r1) /* 801CEB2C 001CBA6C 39 61 00 28 */ addi r11, r1, 0x28 -/* 801CEB30 001CBA70 48 19 36 A9 */ bl func_803621D8 +/* 801CEB30 001CBA70 48 19 36 A9 */ bl _savegpr_28 /* 801CEB34 001CBA74 7C 7F 1B 78 */ mr r31, r3 /* 801CEB38 001CBA78 FF E0 08 90 */ fmr f31, f1 /* 801CEB3C 001CBA7C 88 03 00 D8 */ lbz r0, 0xd8(r3) @@ -840,7 +840,7 @@ lbl_801CEBCC: lbl_801CEC08: /* 801CEC08 001CBB48 CB E1 00 28 */ lfd f31, 0x28(r1) /* 801CEC0C 001CBB4C 39 61 00 28 */ addi r11, r1, 0x28 -/* 801CEC10 001CBB50 48 19 36 15 */ bl func_80362224 +/* 801CEC10 001CBB50 48 19 36 15 */ bl _restgpr_28 /* 801CEC14 001CBB54 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CEC18 001CBB58 7C 08 03 A6 */ mtlr r0 /* 801CEC1C 001CBB5C 38 21 00 30 */ addi r1, r1, 0x30 @@ -1297,7 +1297,7 @@ lbl_801CF284: /* 801CF2A4 001CC1E4 7C 08 02 A6 */ mflr r0 /* 801CF2A8 001CC1E8 90 01 00 24 */ stw r0, 0x24(r1) /* 801CF2AC 001CC1EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF2B0 001CC1F0 48 19 2F 25 */ bl func_803621D4 +/* 801CF2B0 001CC1F0 48 19 2F 25 */ bl _savegpr_27 /* 801CF2B4 001CC1F4 7C 7B 1B 78 */ mr r27, r3 /* 801CF2B8 001CC1F8 7C 9E 23 78 */ mr r30, r4 /* 801CF2BC 001CC1FC 3C 80 80 39 */ lis r4, lbl_803961B0@ha @@ -1353,7 +1353,7 @@ lbl_801CF374: /* 801CF374 001CC2B4 57 C0 10 3A */ slwi r0, r30, 2 /* 801CF378 001CC2B8 7C 7F 02 14 */ add r3, r31, r0 /* 801CF37C 001CC2BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF380 001CC2C0 48 19 2E A1 */ bl func_80362220 +/* 801CF380 001CC2C0 48 19 2E A1 */ bl _restgpr_27 /* 801CF384 001CC2C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CF388 001CC2C8 7C 08 03 A6 */ mtlr r0 /* 801CF38C 001CC2CC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1365,7 +1365,7 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF398 001CC2D8 7C 08 02 A6 */ mflr r0 /* 801CF39C 001CC2DC 90 01 00 24 */ stw r0, 0x24(r1) /* 801CF3A0 001CC2E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF3A4 001CC2E4 48 19 2E 31 */ bl func_803621D4 +/* 801CF3A4 001CC2E4 48 19 2E 31 */ bl _savegpr_27 /* 801CF3A8 001CC2E8 7C 7B 1B 78 */ mr r27, r3 /* 801CF3AC 001CC2EC 7C 9C 23 78 */ mr r28, r4 /* 801CF3B0 001CC2F0 7C BD 2B 78 */ mr r29, r5 @@ -1403,7 +1403,7 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF430 001CC370 39 20 00 1B */ li r9, 0x1b /* 801CF434 001CC374 4B E6 D9 05 */ bl dRenderingMap_c_NS_makeResTIMG /* 801CF438 001CC378 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CF43C 001CC37C 48 19 2D E5 */ bl func_80362220 +/* 801CF43C 001CC37C 48 19 2D E5 */ bl _restgpr_27 /* 801CF440 001CC380 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CF444 001CC384 7C 08 03 A6 */ mtlr r0 /* 801CF448 001CC388 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 7af6d66e90..8c14de51d0 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -1172,7 +1172,7 @@ dMenu_ItemExplain_c_NS_open_init: /* 801DB824 001D8764 7C 08 02 A6 */ mflr r0 /* 801DB828 001D8768 90 01 00 34 */ stw r0, 0x34(r1) /* 801DB82C 001D876C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DB830 001D8770 48 18 69 A9 */ bl func_803621D8 +/* 801DB830 001D8770 48 18 69 A9 */ bl _savegpr_28 /* 801DB834 001D8774 7C 7F 1B 78 */ mr r31, r3 /* 801DB838 001D8778 80 03 00 C8 */ lwz r0, 0xc8(r3) /* 801DB83C 001D877C 90 03 00 C4 */ stw r0, 0xc4(r3) @@ -1341,7 +1341,7 @@ lbl_801DBA68: /* 801DBA94 001D89D4 39 00 00 00 */ li r8, 0 /* 801DBA98 001D89D8 48 0C FE ED */ bl Z2SeMgr_NS_seStart /* 801DBA9C 001D89DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DBAA0 001D89E0 48 18 67 85 */ bl func_80362224 +/* 801DBAA0 001D89E0 48 18 67 85 */ bl _restgpr_28 /* 801DBAA4 001D89E4 80 01 00 34 */ lwz r0, 0x34(r1) /* 801DBAA8 001D89E8 7C 08 03 A6 */ mtlr r0 /* 801DBAAC 001D89EC 38 21 00 30 */ addi r1, r1, 0x30 @@ -1938,7 +1938,7 @@ dMenu_ItemExplain_c_NS_openExplain: /* 801DC344 001D9284 7C 08 02 A6 */ mflr r0 /* 801DC348 001D9288 90 01 00 24 */ stw r0, 0x24(r1) /* 801DC34C 001D928C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DC350 001D9290 48 18 5E 85 */ bl func_803621D4 +/* 801DC350 001D9290 48 18 5E 85 */ bl _savegpr_27 /* 801DC354 001D9294 7C 7B 1B 78 */ mr r27, r3 /* 801DC358 001D9298 7C 9C 23 78 */ mr r28, r4 /* 801DC35C 001D929C 7C BD 2B 78 */ mr r29, r5 @@ -1949,7 +1949,7 @@ dMenu_ItemExplain_c_NS_openExplain: /* 801DC370 001D92B0 38 63 00 9C */ addi r3, r3, 0x9c /* 801DC374 001D92B4 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 801DC378 001D92B8 38 A0 00 00 */ li r5, 0 -/* 801DC37C 001D92BC 4B E5 6C B5 */ bl dSv_player_item_c_NS_getItem +/* 801DC37C 001D92BC 4B E5 6C B5 */ bl getItem__17dSv_player_item_cCFib /* 801DC380 001D92C0 7C 64 1B 78 */ mr r4, r3 /* 801DC384 001D92C4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801DC388 001D92C8 28 00 00 FF */ cmplwi r0, 0xff @@ -1965,7 +1965,7 @@ lbl_801DC398: /* 801DC3AC 001D92EC 48 00 00 1D */ bl dMenu_ItemExplain_c_NS_openExplainDmap lbl_801DC3B0: /* 801DC3B0 001D92F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DC3B4 001D92F4 48 18 5E 6D */ bl func_80362220 +/* 801DC3B4 001D92F4 48 18 5E 6D */ bl _restgpr_27 /* 801DC3B8 001D92F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801DC3BC 001D92FC 7C 08 03 A6 */ mtlr r0 /* 801DC3C0 001D9300 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index 321ae073e7..2025945e06 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -1101,7 +1101,7 @@ lbl_802022E8: /* 802022FC 001FF23C 48 0F E3 5D */ bl J2DTextBox_NS_getStringPtr /* 80202300 001FF240 7C 64 1B 78 */ mr r4, r3 /* 80202304 001FF244 38 61 00 E0 */ addi r3, r1, 0xe0 -/* 80202308 001FF248 48 16 68 25 */ bl func_80368B2C +/* 80202308 001FF248 48 16 68 25 */ bl strcpy /* 8020230C 001FF24C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80202310 001FF250 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80202314 001FF254 FC 40 08 90 */ fmr f2, f1 @@ -1131,7 +1131,7 @@ lbl_802022E8: /* 80202374 001FF2B4 80 63 00 04 */ lwz r3, 4(r3) /* 80202378 001FF2B8 48 0F E2 E1 */ bl J2DTextBox_NS_getStringPtr /* 8020237C 001FF2BC 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 80202380 001FF2C0 48 16 67 AD */ bl func_80368B2C +/* 80202380 001FF2C0 48 16 67 AD */ bl strcpy lbl_80202384: /* 80202384 001FF2C4 3B 60 00 00 */ li r27, 0 /* 80202388 001FF2C8 3B 40 00 00 */ li r26, 0 @@ -1623,7 +1623,7 @@ dMeterButton_c_NS__delete: /* 80202AA0 001FF9E0 7C 08 02 A6 */ mflr r0 /* 80202AA4 001FF9E4 90 01 00 24 */ stw r0, 0x24(r1) /* 80202AA8 001FF9E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80202AAC 001FF9EC 48 15 F7 29 */ bl func_803621D4 +/* 80202AAC 001FF9EC 48 15 F7 29 */ bl _savegpr_27 /* 80202AB0 001FF9F0 7C 7F 1B 78 */ mr r31, r3 /* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -2203,7 +2203,7 @@ lbl_80203284: /* 802032A4 002001E4 4E 80 04 21 */ bctrl /* 802032A8 002001E8 38 60 00 01 */ li r3, 1 /* 802032AC 002001EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802032B0 002001F0 48 15 EF 71 */ bl func_80362220 +/* 802032B0 002001F0 48 15 EF 71 */ bl _restgpr_27 /* 802032B4 002001F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802032B8 002001F8 7C 08 03 A6 */ mtlr r0 /* 802032BC 002001FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -4272,7 +4272,7 @@ lbl_80204F20: /* 80204F54 00201E94 38 63 00 9C */ addi r3, r3, 0x9c /* 80204F58 00201E98 38 80 00 14 */ li r4, 0x14 /* 80204F5C 00201E9C 38 A0 00 00 */ li r5, 0 -/* 80204F60 00201EA0 4B E2 E0 D1 */ bl dSv_player_item_c_NS_getItem +/* 80204F60 00201EA0 4B E2 E0 D1 */ bl getItem__17dSv_player_item_cCFib /* 80204F64 00201EA4 7C 79 1B 78 */ mr r25, r3 /* 80204F68 00201EA8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -4375,7 +4375,7 @@ lbl_802050E0: /* 802050E0 00202020 38 7C 01 14 */ addi r3, r28, 0x114 /* 802050E4 00202024 7C 7F 1A 14 */ add r3, r31, r3 /* 802050E8 00202028 38 99 00 21 */ addi r4, r25, 0x21 -/* 802050EC 0020202C 48 16 3A 41 */ bl func_80368B2C +/* 802050EC 0020202C 48 16 3A 41 */ bl strcpy /* 802050F0 00202030 7C 7F EA 14 */ add r3, r31, r29 /* 802050F4 00202034 D3 E3 02 E8 */ stfs f31, 0x2e8(r3) /* 802050F8 00202038 7C 9F C2 14 */ add r4, r31, r24 @@ -5158,7 +5158,7 @@ dMeterButton_c_NS_updateButton: /* 80205CBC 00202BFC DB A1 00 20 */ stfd f29, 0x20(r1) /* 80205CC0 00202C00 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 80205CC4 00202C04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80205CC8 00202C08 48 15 C5 0D */ bl func_803621D4 +/* 80205CC8 00202C08 48 15 C5 0D */ bl _savegpr_27 /* 80205CCC 00202C0C 7C 7D 1B 78 */ mr r29, r3 /* 80205CD0 00202C10 C3 E2 AD 48 */ lfs f31, lbl_80454748-_SDA2_BASE_(r2) /* 80205CD4 00202C14 FF C0 F8 90 */ fmr f30, f31 @@ -6033,7 +6033,7 @@ lbl_80206948: /* 80206958 00203898 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 8020695C 0020389C CB A1 00 20 */ lfd f29, 0x20(r1) /* 80206960 002038A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80206964 002038A4 48 15 B8 BD */ bl func_80362220 +/* 80206964 002038A4 48 15 B8 BD */ bl _restgpr_27 /* 80206968 002038A8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8020696C 002038AC 7C 08 03 A6 */ mtlr r0 /* 80206970 002038B0 38 21 00 50 */ addi r1, r1, 0x50 @@ -6047,7 +6047,7 @@ dMeterButton_c_NS_updateText: /* 80206984 002038C4 DB E1 06 50 */ stfd f31, 0x650(r1) /* 80206988 002038C8 F3 E1 06 58 */ psq_st f31, 1624(r1), 0, qr0 /* 8020698C 002038CC 39 61 06 50 */ addi r11, r1, 0x650 -/* 80206990 002038D0 48 15 B8 45 */ bl func_803621D4 +/* 80206990 002038D0 48 15 B8 45 */ bl _savegpr_27 /* 80206994 002038D4 7C 7E 1B 78 */ mr r30, r3 /* 80206998 002038D8 7C 9F 23 78 */ mr r31, r4 /* 8020699C 002038DC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -6129,12 +6129,12 @@ lbl_80206A74: /* 80206AC0 00203A00 80 63 00 04 */ lwz r3, 4(r3) /* 80206AC4 00203A04 48 0F 9B 95 */ bl J2DTextBox_NS_getStringPtr /* 80206AC8 00203A08 38 81 04 28 */ addi r4, r1, 0x428 -/* 80206ACC 00203A0C 48 16 20 61 */ bl func_80368B2C +/* 80206ACC 00203A0C 48 16 20 61 */ bl strcpy /* 80206AD0 00203A10 80 7E 00 E8 */ lwz r3, 0xe8(r30) /* 80206AD4 00203A14 80 63 00 04 */ lwz r3, 4(r3) /* 80206AD8 00203A18 48 0F 9B 81 */ bl J2DTextBox_NS_getStringPtr /* 80206ADC 00203A1C 38 81 00 28 */ addi r4, r1, 0x28 -/* 80206AE0 00203A20 48 16 20 4D */ bl func_80368B2C +/* 80206AE0 00203A20 48 16 20 4D */ bl strcpy /* 80206AE4 00203A24 3B 60 00 00 */ li r27, 0 /* 80206AE8 00203A28 3B A0 00 00 */ li r29, 0 lbl_80206AEC: @@ -6145,7 +6145,7 @@ lbl_80206AEC: /* 80206AFC 00203A3C 80 63 00 04 */ lwz r3, 4(r3) /* 80206B00 00203A40 48 0F 9B 59 */ bl J2DTextBox_NS_getStringPtr /* 80206B04 00203A44 38 81 02 28 */ addi r4, r1, 0x228 -/* 80206B08 00203A48 48 16 20 25 */ bl func_80368B2C +/* 80206B08 00203A48 48 16 20 25 */ bl strcpy lbl_80206B0C: /* 80206B0C 00203A4C 3B 7B 00 01 */ addi r27, r27, 1 /* 80206B10 00203A50 2C 1B 00 02 */ cmpwi r27, 2 @@ -6271,7 +6271,7 @@ lbl_80206CC0: /* 80206CC0 00203C00 E3 E1 06 58 */ psq_l f31, 1624(r1), 0, qr0 /* 80206CC4 00203C04 CB E1 06 50 */ lfd f31, 0x650(r1) /* 80206CC8 00203C08 39 61 06 50 */ addi r11, r1, 0x650 -/* 80206CCC 00203C0C 48 15 B5 55 */ bl func_80362220 +/* 80206CCC 00203C0C 48 15 B5 55 */ bl _restgpr_27 /* 80206CD0 00203C10 80 01 06 64 */ lwz r0, 0x664(r1) /* 80206CD4 00203C14 7C 08 03 A6 */ mtlr r0 /* 80206CD8 00203C18 38 21 06 60 */ addi r1, r1, 0x660 @@ -9669,7 +9669,7 @@ lbl_80209BDC: lbl_80209C1C: /* 80209C1C 00206B5C 7F C3 F3 78 */ mr r3, r30 /* 80209C20 00206B60 7F 44 D3 78 */ mr r4, r26 -/* 80209C24 00206B64 48 15 EF 09 */ bl func_80368B2C +/* 80209C24 00206B64 48 15 EF 09 */ bl strcpy /* 80209C28 00206B68 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80209C2C 00206B6C 40 82 00 58 */ bne lbl_80209C84 /* 80209C30 00206B70 57 A0 06 3F */ clrlwi. r0, r29, 0x18 @@ -9690,7 +9690,7 @@ lbl_80209C5C: /* 80209C60 00206BA0 7C 79 00 2E */ lwzx r3, r25, r0 /* 80209C64 00206BA4 48 0F 69 F5 */ bl J2DTextBox_NS_getStringPtr /* 80209C68 00206BA8 7F 44 D3 78 */ mr r4, r26 -/* 80209C6C 00206BAC 48 15 EE C1 */ bl func_80368B2C +/* 80209C6C 00206BAC 48 15 EE C1 */ bl strcpy /* 80209C70 00206BB0 3B 9C 00 01 */ addi r28, r28, 1 /* 80209C74 00206BB4 2C 1C 00 05 */ cmpwi r28, 5 /* 80209C78 00206BB8 3B 7B 00 04 */ addi r27, r27, 4 @@ -9715,7 +9715,7 @@ lbl_80209CB0: /* 80209CB4 00206BF4 7C 79 00 2E */ lwzx r3, r25, r0 /* 80209CB8 00206BF8 48 0F 69 A1 */ bl J2DTextBox_NS_getStringPtr /* 80209CBC 00206BFC 7F 44 D3 78 */ mr r4, r26 -/* 80209CC0 00206C00 48 15 EE 6D */ bl func_80368B2C +/* 80209CC0 00206C00 48 15 EE 6D */ bl strcpy /* 80209CC4 00206C04 3B 9C 00 01 */ addi r28, r28, 1 /* 80209CC8 00206C08 2C 1C 00 05 */ cmpwi r28, 5 /* 80209CCC 00206C0C 3B 7B 00 04 */ addi r27, r27, 4 @@ -10581,7 +10581,7 @@ dMeterButton_c_NS_hide_button: /* 8020A9B0 002078F0 3C 80 80 3A */ lis r4, lbl_803980E8@ha /* 8020A9B4 002078F4 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 8020A9B8 002078F8 38 84 00 21 */ addi r4, r4, 0x21 -/* 8020A9BC 002078FC 48 15 E1 71 */ bl func_80368B2C +/* 8020A9BC 002078FC 48 15 E1 71 */ bl strcpy /* 8020A9C0 00207900 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8020A9C4 00207904 A8 03 00 16 */ lha r0, 0x16(r3) /* 8020A9C8 00207908 80 7F 00 78 */ lwz r3, 0x78(r31) @@ -10610,7 +10610,7 @@ lbl_8020AA08: /* 8020AA20 00207960 3C 80 80 3A */ lis r4, lbl_803980E8@ha /* 8020AA24 00207964 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 8020AA28 00207968 38 84 00 21 */ addi r4, r4, 0x21 -/* 8020AA2C 0020796C 48 15 E1 01 */ bl func_80368B2C +/* 8020AA2C 0020796C 48 15 E1 01 */ bl strcpy /* 8020AA30 00207970 48 00 00 40 */ b lbl_8020AA70 lbl_8020AA34: /* 8020AA34 00207974 88 1F 04 BF */ lbz r0, 0x4bf(r31) @@ -10627,7 +10627,7 @@ lbl_8020AA34: /* 8020AA60 002079A0 3C 80 80 3A */ lis r4, lbl_803980E8@ha /* 8020AA64 002079A4 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l /* 8020AA68 002079A8 38 84 00 21 */ addi r4, r4, 0x21 -/* 8020AA6C 002079AC 48 15 E0 C1 */ bl func_80368B2C +/* 8020AA6C 002079AC 48 15 E0 C1 */ bl strcpy lbl_8020AA70: /* 8020AA70 002079B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020AA74 002079B4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/meter/d_meter_hakusha.s b/asm/d/meter/d_meter_hakusha.s index b2f55fc709..09692eb547 100644 --- a/asm/d/meter/d_meter_hakusha.s +++ b/asm/d/meter/d_meter_hakusha.s @@ -67,7 +67,7 @@ lbl_8020C3E4: /* 8020C404 00209344 7C 08 02 A6 */ mflr r0 /* 8020C408 00209348 90 01 00 24 */ stw r0, 0x24(r1) /* 8020C40C 0020934C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020C410 00209350 48 15 5D C5 */ bl func_803621D4 +/* 8020C410 00209350 48 15 5D C5 */ bl _savegpr_27 /* 8020C414 00209354 7C 7F 1B 78 */ mr r31, r3 /* 8020C418 00209358 3B 60 00 00 */ li r27, 0 /* 8020C41C 0020935C 3B C0 00 00 */ li r30, 0 @@ -327,7 +327,7 @@ lbl_8020C720: /* 8020C7E8 00209728 D0 1F 00 FC */ stfs f0, 0xfc(r31) /* 8020C7EC 0020972C 38 60 00 04 */ li r3, 4 /* 8020C7F0 00209730 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020C7F4 00209734 48 15 5A 2D */ bl func_80362220 +/* 8020C7F4 00209734 48 15 5A 2D */ bl _restgpr_27 /* 8020C7F8 00209738 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020C7FC 0020973C 7C 08 03 A6 */ mtlr r0 /* 8020C800 00209740 38 21 00 20 */ addi r1, r1, 0x20 @@ -517,7 +517,7 @@ lbl_8020CA94: /* 8020CAC0 00209A00 7C 08 02 A6 */ mflr r0 /* 8020CAC4 00209A04 90 01 00 24 */ stw r0, 0x24(r1) /* 8020CAC8 00209A08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020CACC 00209A0C 48 15 57 09 */ bl func_803621D4 +/* 8020CACC 00209A0C 48 15 57 09 */ bl _savegpr_27 /* 8020CAD0 00209A10 7C 7F 1B 78 */ mr r31, r3 /* 8020CAD4 00209A14 3B 60 00 00 */ li r27, 0 /* 8020CAD8 00209A18 3B C0 00 00 */ li r30, 0 @@ -619,7 +619,7 @@ lbl_8020CC34: /* 8020CC38 00209B78 90 1F 00 34 */ stw r0, 0x34(r31) /* 8020CC3C 00209B7C 38 60 00 01 */ li r3, 1 /* 8020CC40 00209B80 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020CC44 00209B84 48 15 55 DD */ bl func_80362220 +/* 8020CC44 00209B84 48 15 55 DD */ bl _restgpr_27 /* 8020CC48 00209B88 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020CC4C 00209B8C 7C 08 03 A6 */ mtlr r0 /* 8020CC50 00209B90 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index dfd5dbc25c..b8b5a3a028 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -412,7 +412,7 @@ dMeterMap_c_NS__create: /* 8020D9F0 0020A930 7C 08 02 A6 */ mflr r0 /* 8020D9F4 0020A934 90 01 00 34 */ stw r0, 0x34(r1) /* 8020D9F8 0020A938 39 61 00 30 */ addi r11, r1, 0x30 -/* 8020D9FC 0020A93C 48 15 47 D9 */ bl func_803621D4 +/* 8020D9FC 0020A93C 48 15 47 D9 */ bl _savegpr_27 /* 8020DA00 0020A940 7C 7F 1B 78 */ mr r31, r3 /* 8020DA04 0020A944 4B FF FB 25 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo /* 8020DA08 0020A948 4B FF FB 21 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo @@ -570,7 +570,7 @@ lbl_8020DC08: /* 8020DC30 0020AB70 4B E2 6D 8D */ bl dSv_event_c_NS_isEventBit /* 8020DC34 0020AB74 98 7F 00 2B */ stb r3, 0x2b(r31) /* 8020DC38 0020AB78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8020DC3C 0020AB7C 48 15 45 E5 */ bl func_80362220 +/* 8020DC3C 0020AB7C 48 15 45 E5 */ bl _restgpr_27 /* 8020DC40 0020AB80 80 01 00 34 */ lwz r0, 0x34(r1) /* 8020DC44 0020AB84 7C 08 03 A6 */ mtlr r0 /* 8020DC48 0020AB88 38 21 00 30 */ addi r1, r1, 0x30 @@ -626,7 +626,7 @@ dMeterMap_c_NS__move: /* 8020DCE8 0020AC28 7C 08 02 A6 */ mflr r0 /* 8020DCEC 0020AC2C 90 01 00 44 */ stw r0, 0x44(r1) /* 8020DCF0 0020AC30 39 61 00 40 */ addi r11, r1, 0x40 -/* 8020DCF4 0020AC34 48 15 44 E5 */ bl func_803621D8 +/* 8020DCF4 0020AC34 48 15 44 E5 */ bl _savegpr_28 /* 8020DCF8 0020AC38 7C 7E 1B 78 */ mr r30, r3 /* 8020DCFC 0020AC3C 7C 9F 23 78 */ mr r31, r4 /* 8020DD00 0020AC40 88 03 00 2B */ lbz r0, 0x2b(r3) @@ -765,7 +765,7 @@ lbl_8020DE6C: /* 8020DEFC 0020AE3C 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8020DF00 0020AE40 90 1E 00 30 */ stw r0, 0x30(r30) /* 8020DF04 0020AE44 39 61 00 40 */ addi r11, r1, 0x40 -/* 8020DF08 0020AE48 48 15 43 1D */ bl func_80362224 +/* 8020DF08 0020AE48 48 15 43 1D */ bl _restgpr_28 /* 8020DF0C 0020AE4C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8020DF10 0020AE50 7C 08 03 A6 */ mtlr r0 /* 8020DF14 0020AE54 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/meter/d_meter_string.s b/asm/d/meter/d_meter_string.s index 5360c9c7ae..f7b88a306f 100644 --- a/asm/d/meter/d_meter_string.s +++ b/asm/d/meter/d_meter_string.s @@ -585,7 +585,7 @@ dMeterString_c_NS_createString: /* 8020F5F4 0020C534 4E 80 04 21 */ bctrl /* 8020F5F8 0020C538 48 0F 10 61 */ bl J2DTextBox_NS_getStringPtr /* 8020F5FC 0020C53C 38 81 00 08 */ addi r4, r1, 8 -/* 8020F600 0020C540 48 15 95 2D */ bl func_80368B2C +/* 8020F600 0020C540 48 15 95 2D */ bl strcpy /* 8020F604 0020C544 80 7E 00 04 */ lwz r3, 4(r30) /* 8020F608 0020C548 3C 80 74 5F */ lis r4, 0x745F696E@ha /* 8020F60C 0020C54C 38 C4 69 6E */ addi r6, r4, 0x745F696E@l @@ -596,7 +596,7 @@ dMeterString_c_NS_createString: /* 8020F620 0020C560 4E 80 04 21 */ bctrl /* 8020F624 0020C564 48 0F 10 35 */ bl J2DTextBox_NS_getStringPtr /* 8020F628 0020C568 38 81 00 08 */ addi r4, r1, 8 -/* 8020F62C 0020C56C 48 15 95 01 */ bl func_80368B2C +/* 8020F62C 0020C56C 48 15 95 01 */ bl strcpy /* 8020F630 0020C570 C0 02 AE 78 */ lfs f0, lbl_80454878-_SDA2_BASE_(r2) /* 8020F634 0020C574 D0 1E 00 2C */ stfs f0, 0x2c(r30) /* 8020F638 0020C578 C0 02 AE 64 */ lfs f0, lbl_80454864-_SDA2_BASE_(r2) diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index d3fb217166..458a5ee807 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -5162,7 +5162,7 @@ dMeter2Draw_c_NS_drawPikariHakusha: /* 80214650 00211590 DB 81 00 30 */ stfd f28, 0x30(r1) /* 80214654 00211594 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80214658 00211598 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021465C 0021159C 48 14 DB 79 */ bl func_803621D4 +/* 8021465C 0021159C 48 14 DB 79 */ bl _savegpr_27 /* 80214660 002115A0 7C 7B 1B 78 */ mr r27, r3 /* 80214664 002115A4 FF 80 08 90 */ fmr f28, f1 /* 80214668 002115A8 FF A0 10 90 */ fmr f29, f2 @@ -5249,7 +5249,7 @@ dMeter2Draw_c_NS_drawPikariHakusha: /* 802147AC 002116EC E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 802147B0 002116F0 CB 81 00 30 */ lfd f28, 0x30(r1) /* 802147B4 002116F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802147B8 002116F8 48 14 DA 69 */ bl func_80362220 +/* 802147B8 002116F8 48 14 DA 69 */ bl _restgpr_27 /* 802147BC 002116FC 80 01 00 74 */ lwz r0, 0x74(r1) /* 802147C0 00211700 7C 08 03 A6 */ mtlr r0 /* 802147C4 00211704 38 21 00 70 */ addi r1, r1, 0x70 @@ -5755,7 +5755,7 @@ dMeter2Draw_c_NS_drawKanteraScreen: /* 80214EB8 00211DF8 7C 08 02 A6 */ mflr r0 /* 80214EBC 00211DFC 90 01 00 94 */ stw r0, 0x94(r1) /* 80214EC0 00211E00 39 61 00 90 */ addi r11, r1, 0x90 -/* 80214EC4 00211E04 48 14 D3 11 */ bl func_803621D4 +/* 80214EC4 00211E04 48 14 D3 11 */ bl _savegpr_27 /* 80214EC8 00211E08 7C 7C 1B 78 */ mr r28, r3 /* 80214ECC 00211E0C 7C 9B 23 78 */ mr r27, r4 /* 80214ED0 00211E10 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -5999,7 +5999,7 @@ lbl_802151B8: /* 80215270 002121B0 7F E4 FB 78 */ mr r4, r31 /* 80215274 002121B4 48 0E 3C 61 */ bl J2DScreen_NS_draw /* 80215278 002121B8 39 61 00 90 */ addi r11, r1, 0x90 -/* 8021527C 002121BC 48 14 CF A5 */ bl func_80362220 +/* 8021527C 002121BC 48 14 CF A5 */ bl _restgpr_27 /* 80215280 002121C0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80215284 002121C4 7C 08 03 A6 */ mtlr r0 /* 80215288 002121C8 38 21 00 90 */ addi r1, r1, 0x90 @@ -6074,7 +6074,7 @@ dMeter2Draw_c_NS_setAlphaMagicChange: /* 80215384 002122C4 7C 08 02 A6 */ mflr r0 /* 80215388 002122C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8021538C 002122CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80215390 002122D0 48 14 CE 45 */ bl func_803621D4 +/* 80215390 002122D0 48 14 CE 45 */ bl _savegpr_27 /* 80215394 002122D4 7C 7B 1B 78 */ mr r27, r3 /* 80215398 002122D8 7C 9C 23 78 */ mr r28, r4 /* 8021539C 002122DC 3B E0 00 00 */ li r31, 0 @@ -6149,7 +6149,7 @@ lbl_80215468: /* 8021548C 002123CC 48 04 03 45 */ bl CPaneMgrAlpha_NS_setAlphaRate lbl_80215490: /* 80215490 002123D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80215494 002123D4 48 14 CD 8D */ bl func_80362220 +/* 80215494 002123D4 48 14 CD 8D */ bl _restgpr_27 /* 80215498 002123D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021549C 002123DC 7C 08 03 A6 */ mtlr r0 /* 802154A0 002123E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -6233,7 +6233,7 @@ dMeter2Draw_c_NS_setAlphaKanteraChange: /* 802155BC 002124FC 7C 08 02 A6 */ mflr r0 /* 802155C0 00212500 90 01 00 24 */ stw r0, 0x24(r1) /* 802155C4 00212504 39 61 00 20 */ addi r11, r1, 0x20 -/* 802155C8 00212508 48 14 CC 0D */ bl func_803621D4 +/* 802155C8 00212508 48 14 CC 0D */ bl _savegpr_27 /* 802155CC 0021250C 7C 7B 1B 78 */ mr r27, r3 /* 802155D0 00212510 7C 9C 23 78 */ mr r28, r4 /* 802155D4 00212514 3B E0 00 00 */ li r31, 0 @@ -6308,7 +6308,7 @@ lbl_802156A0: /* 802156C4 00212604 48 04 01 0D */ bl CPaneMgrAlpha_NS_setAlphaRate lbl_802156C8: /* 802156C8 00212608 39 61 00 20 */ addi r11, r1, 0x20 -/* 802156CC 0021260C 48 14 CB 55 */ bl func_80362220 +/* 802156CC 0021260C 48 14 CB 55 */ bl _restgpr_27 /* 802156D0 00212610 80 01 00 24 */ lwz r0, 0x24(r1) /* 802156D4 00212614 7C 08 03 A6 */ mtlr r0 /* 802156D8 00212618 38 21 00 20 */ addi r1, r1, 0x20 @@ -6468,7 +6468,7 @@ dMeter2Draw_c_NS_setAlphaOxygenChange: /* 802158F4 00212834 7C 08 02 A6 */ mflr r0 /* 802158F8 00212838 90 01 00 24 */ stw r0, 0x24(r1) /* 802158FC 0021283C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80215900 00212840 48 14 C8 D5 */ bl func_803621D4 +/* 80215900 00212840 48 14 C8 D5 */ bl _savegpr_27 /* 80215904 00212844 7C 7B 1B 78 */ mr r27, r3 /* 80215908 00212848 7C 9C 23 78 */ mr r28, r4 /* 8021590C 0021284C 3B E0 00 00 */ li r31, 0 @@ -6543,7 +6543,7 @@ lbl_802159D8: /* 802159FC 0021293C 48 03 FD D5 */ bl CPaneMgrAlpha_NS_setAlphaRate lbl_80215A00: /* 80215A00 00212940 39 61 00 20 */ addi r11, r1, 0x20 -/* 80215A04 00212944 48 14 C8 1D */ bl func_80362220 +/* 80215A04 00212944 48 14 C8 1D */ bl _restgpr_27 /* 80215A08 00212948 80 01 00 24 */ lwz r0, 0x24(r1) /* 80215A0C 0021294C 7C 08 03 A6 */ mtlr r0 /* 80215A10 00212950 38 21 00 20 */ addi r1, r1, 0x20 @@ -7585,7 +7585,7 @@ dMeter2Draw_c_NS_setAlphaRupeeAnimeMin: /* 802168DC 0021381C DB E1 00 30 */ stfd f31, 0x30(r1) /* 802168E0 00213820 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802168E4 00213824 39 61 00 30 */ addi r11, r1, 0x30 -/* 802168E8 00213828 48 14 B8 ED */ bl func_803621D4 +/* 802168E8 00213828 48 14 B8 ED */ bl _savegpr_27 /* 802168EC 0021382C 7C 7B 1B 78 */ mr r27, r3 /* 802168F0 00213830 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802168F4 00213834 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -7624,7 +7624,7 @@ lbl_80216960: /* 80216970 002138B0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80216974 002138B4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80216978 002138B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021697C 002138BC 48 14 B8 A5 */ bl func_80362220 +/* 8021697C 002138BC 48 14 B8 A5 */ bl _restgpr_27 /* 80216980 002138C0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80216984 002138C4 7C 08 03 A6 */ mtlr r0 /* 80216988 002138C8 38 21 00 40 */ addi r1, r1, 0x40 @@ -7636,7 +7636,7 @@ dMeter2Draw_c_NS_setAlphaRupeeAnimeMax: /* 80216994 002138D4 7C 08 02 A6 */ mflr r0 /* 80216998 002138D8 90 01 00 34 */ stw r0, 0x34(r1) /* 8021699C 002138DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802169A0 002138E0 48 14 B8 35 */ bl func_803621D4 +/* 802169A0 002138E0 48 14 B8 35 */ bl _savegpr_27 /* 802169A4 002138E4 7C 7B 1B 78 */ mr r27, r3 /* 802169A8 002138E8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802169AC 002138EC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -7673,7 +7673,7 @@ lbl_80216A18: /* 80216A20 00213960 3B FF 00 04 */ addi r31, r31, 4 /* 80216A24 00213964 41 80 FF C0 */ blt lbl_802169E4 /* 80216A28 00213968 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216A2C 0021396C 48 14 B7 F5 */ bl func_80362220 +/* 80216A2C 0021396C 48 14 B7 F5 */ bl _restgpr_27 /* 80216A30 00213970 80 01 00 34 */ lwz r0, 0x34(r1) /* 80216A34 00213974 7C 08 03 A6 */ mtlr r0 /* 80216A38 00213978 38 21 00 30 */ addi r1, r1, 0x30 @@ -7685,7 +7685,7 @@ dMeter2Draw_c_NS_drawKey: /* 80216A44 00213984 7C 08 02 A6 */ mflr r0 /* 80216A48 00213988 90 01 00 24 */ stw r0, 0x24(r1) /* 80216A4C 0021398C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216A50 00213990 48 14 B7 85 */ bl func_803621D4 +/* 80216A50 00213990 48 14 B7 85 */ bl _savegpr_27 /* 80216A54 00213994 7C 7B 1B 78 */ mr r27, r3 /* 80216A58 00213998 7C 80 07 34 */ extsh r0, r4 /* 80216A5C 0021399C 2C 00 00 05 */ cmpwi r0, 5 @@ -7738,7 +7738,7 @@ lbl_80216ABC: /* 80216B08 00213A48 C0 44 03 64 */ lfs f2, 0x364(r4) /* 80216B0C 00213A4C 48 03 DA A5 */ bl CPaneMgr_NS_paneTrans /* 80216B10 00213A50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216B14 00213A54 48 14 B7 0D */ bl func_80362220 +/* 80216B14 00213A54 48 14 B7 0D */ bl _restgpr_27 /* 80216B18 00213A58 80 01 00 24 */ lwz r0, 0x24(r1) /* 80216B1C 00213A5C 7C 08 03 A6 */ mtlr r0 /* 80216B20 00213A60 38 21 00 20 */ addi r1, r1, 0x20 @@ -7750,7 +7750,7 @@ dMeter2Draw_c_NS_setAlphaKeyChange: /* 80216B2C 00213A6C 7C 08 02 A6 */ mflr r0 /* 80216B30 00213A70 90 01 00 24 */ stw r0, 0x24(r1) /* 80216B34 00213A74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216B38 00213A78 48 14 B6 9D */ bl func_803621D4 +/* 80216B38 00213A78 48 14 B6 9D */ bl _savegpr_27 /* 80216B3C 00213A7C 7C 7B 1B 78 */ mr r27, r3 /* 80216B40 00213A80 7C 9C 23 78 */ mr r28, r4 /* 80216B44 00213A84 3B E0 00 00 */ li r31, 0 @@ -7850,7 +7850,7 @@ lbl_80216C58: /* 80216C8C 00213BCC 41 80 FF CC */ blt lbl_80216C58 lbl_80216C90: /* 80216C90 00213BD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216C94 00213BD4 48 14 B5 8D */ bl func_80362220 +/* 80216C94 00213BD4 48 14 B5 8D */ bl _restgpr_27 /* 80216C98 00213BD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80216C9C 00213BDC 7C 08 03 A6 */ mtlr r0 /* 80216CA0 00213BE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -7949,7 +7949,7 @@ dMeter2Draw_c_NS_drawButtonA: /* 80216DE8 00213D28 DB 21 00 20 */ stfd f25, 0x20(r1) /* 80216DEC 00213D2C F3 21 00 28 */ psq_st f25, 40(r1), 0, qr0 /* 80216DF0 00213D30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80216DF4 00213D34 48 14 B3 E1 */ bl func_803621D4 +/* 80216DF4 00213D34 48 14 B3 E1 */ bl _savegpr_27 /* 80216DF8 00213D38 7C 7C 1B 78 */ mr r28, r3 /* 80216DFC 00213D3C 7C 9D 23 78 */ mr r29, r4 /* 80216E00 00213D40 FF 20 08 90 */ fmr f25, f1 @@ -8083,7 +8083,7 @@ lbl_80216FC0: /* 80216FC8 00213F08 80 63 00 04 */ lwz r3, 4(r3) /* 80216FCC 00213F0C 48 0E 96 8D */ bl J2DTextBox_NS_getStringPtr /* 80216FD0 00213F10 7F C4 F3 78 */ mr r4, r30 -/* 80216FD4 00213F14 48 15 1B 59 */ bl func_80368B2C +/* 80216FD4 00213F14 48 15 1B 59 */ bl strcpy /* 80216FD8 00213F18 3B FF 00 01 */ addi r31, r31, 1 /* 80216FDC 00213F1C 2C 1F 00 05 */ cmpwi r31, 5 /* 80216FE0 00213F20 3B BD 00 04 */ addi r29, r29, 4 @@ -8098,7 +8098,7 @@ lbl_80216FF4: /* 80216FFC 00213F3C 80 63 00 04 */ lwz r3, 4(r3) /* 80217000 00213F40 48 0E 96 59 */ bl J2DTextBox_NS_getStringPtr /* 80217004 00213F44 7F E4 FB 78 */ mr r4, r31 -/* 80217008 00213F48 48 15 1B 25 */ bl func_80368B2C +/* 80217008 00213F48 48 15 1B 25 */ bl strcpy /* 8021700C 00213F4C 3B DE 00 01 */ addi r30, r30, 1 /* 80217010 00213F50 2C 1E 00 05 */ cmpwi r30, 5 /* 80217014 00213F54 3B BD 00 04 */ addi r29, r29, 4 @@ -8149,7 +8149,7 @@ lbl_8021701C: /* 802170C4 00214004 E3 21 00 28 */ psq_l f25, 40(r1), 0, qr0 /* 802170C8 00214008 CB 21 00 20 */ lfd f25, 0x20(r1) /* 802170CC 0021400C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802170D0 00214010 48 14 B1 51 */ bl func_80362220 +/* 802170D0 00214010 48 14 B1 51 */ bl _restgpr_27 /* 802170D4 00214014 80 01 00 94 */ lwz r0, 0x94(r1) /* 802170D8 00214018 7C 08 03 A6 */ mtlr r0 /* 802170DC 0021401C 38 21 00 90 */ addi r1, r1, 0x90 @@ -8292,7 +8292,7 @@ lbl_802172BC: /* 802172C4 00214204 80 63 00 04 */ lwz r3, 4(r3) /* 802172C8 00214208 48 0E 93 91 */ bl J2DTextBox_NS_getStringPtr /* 802172CC 0021420C 7F C4 F3 78 */ mr r4, r30 -/* 802172D0 00214210 48 15 18 5D */ bl func_80368B2C +/* 802172D0 00214210 48 15 18 5D */ bl strcpy /* 802172D4 00214214 3B 39 00 01 */ addi r25, r25, 1 /* 802172D8 00214218 2C 19 00 05 */ cmpwi r25, 5 /* 802172DC 0021421C 3B BD 00 04 */ addi r29, r29, 4 @@ -8574,7 +8574,7 @@ dMeter2Draw_c_NS_drawButtonZ: /* 802176F0 00214630 7C 08 02 A6 */ mflr r0 /* 802176F4 00214634 90 01 00 24 */ stw r0, 0x24(r1) /* 802176F8 00214638 39 61 00 20 */ addi r11, r1, 0x20 -/* 802176FC 0021463C 48 14 AA DD */ bl func_803621D8 +/* 802176FC 0021463C 48 14 AA DD */ bl _savegpr_28 /* 80217700 00214640 7C 7F 1B 78 */ mr r31, r3 /* 80217704 00214644 7C 9C 23 78 */ mr r28, r4 /* 80217708 00214648 38 A0 00 01 */ li r5, 1 @@ -8627,7 +8627,7 @@ lbl_802177A4: /* 802177AC 002146EC 80 63 00 04 */ lwz r3, 4(r3) /* 802177B0 002146F0 48 0E 8E A9 */ bl J2DTextBox_NS_getStringPtr /* 802177B4 002146F4 7F A4 EB 78 */ mr r4, r29 -/* 802177B8 002146F8 48 15 13 75 */ bl func_80368B2C +/* 802177B8 002146F8 48 15 13 75 */ bl strcpy /* 802177BC 002146FC 3B 9C 00 01 */ addi r28, r28, 1 /* 802177C0 00214700 2C 1C 00 05 */ cmpwi r28, 5 /* 802177C4 00214704 3B DE 00 0C */ addi r30, r30, 0xc @@ -8705,7 +8705,7 @@ lbl_802177A4: /* 802178E4 00214824 C0 44 03 34 */ lfs f2, 0x334(r4) /* 802178E8 00214828 48 03 CC C9 */ bl CPaneMgr_NS_paneTrans /* 802178EC 0021482C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802178F0 00214830 48 14 A9 35 */ bl func_80362224 +/* 802178F0 00214830 48 14 A9 35 */ bl _restgpr_28 /* 802178F4 00214834 80 01 00 24 */ lwz r0, 0x24(r1) /* 802178F8 00214838 7C 08 03 A6 */ mtlr r0 /* 802178FC 0021483C 38 21 00 20 */ addi r1, r1, 0x20 @@ -8797,7 +8797,7 @@ dMeter2Draw_c_NS_drawButtonBin: /* 80217A14 00214954 7C 08 02 A6 */ mflr r0 /* 80217A18 00214958 90 01 00 24 */ stw r0, 0x24(r1) /* 80217A1C 0021495C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80217A20 00214960 48 14 A7 B5 */ bl func_803621D4 +/* 80217A20 00214960 48 14 A7 B5 */ bl _savegpr_27 /* 80217A24 00214964 7C 7B 1B 78 */ mr r27, r3 /* 80217A28 00214968 7C 9C 23 78 */ mr r28, r4 /* 80217A2C 0021496C 3B C0 00 00 */ li r30, 0 @@ -8810,7 +8810,7 @@ lbl_80217A40: /* 80217A44 00214984 38 1D 00 0B */ addi r0, r29, 0xb /* 80217A48 00214988 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80217A4C 0021498C 38 A0 00 01 */ li r5, 1 -/* 80217A50 00214990 4B E1 B5 E1 */ bl dSv_player_item_c_NS_getItem +/* 80217A50 00214990 4B E1 B5 E1 */ bl getItem__17dSv_player_item_cCFib /* 80217A54 00214994 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80217A58 00214998 28 00 00 FF */ cmplwi r0, 0xff /* 80217A5C 0021499C 41 82 00 08 */ beq lbl_80217A64 @@ -8832,7 +8832,7 @@ lbl_80217A64: /* 80217A98 002149D8 98 1B 07 63 */ stb r0, 0x763(r27) lbl_80217A9C: /* 80217A9C 002149DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80217AA0 002149E0 48 14 A7 81 */ bl func_80362220 +/* 80217AA0 002149E0 48 14 A7 81 */ bl _restgpr_27 /* 80217AA4 002149E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80217AA8 002149E8 7C 08 03 A6 */ mtlr r0 /* 80217AAC 002149EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -8961,7 +8961,7 @@ lbl_80217C5C: /* 80217C64 00214BA4 80 63 00 04 */ lwz r3, 4(r3) /* 80217C68 00214BA8 48 0E 89 F1 */ bl J2DTextBox_NS_getStringPtr /* 80217C6C 00214BAC 7F C4 F3 78 */ mr r4, r30 -/* 80217C70 00214BB0 48 15 0E BD */ bl func_80368B2C +/* 80217C70 00214BB0 48 15 0E BD */ bl strcpy /* 80217C74 00214BB4 3B 39 00 01 */ addi r25, r25, 1 /* 80217C78 00214BB8 2C 19 00 05 */ cmpwi r25, 5 /* 80217C7C 00214BBC 3B 9C 00 0C */ addi r28, r28, 0xc @@ -9504,7 +9504,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin: /* 80218454 00215394 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80218458 00215398 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8021845C 0021539C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218460 002153A0 48 14 9D 75 */ bl func_803621D4 +/* 80218460 002153A0 48 14 9D 75 */ bl _savegpr_27 /* 80218464 002153A4 7C 7B 1B 78 */ mr r27, r3 /* 80218468 002153A8 80 63 03 60 */ lwz r3, 0x360(r3) /* 8021846C 002153AC 48 03 D3 BD */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -9551,7 +9551,7 @@ lbl_802184F4: /* 80218504 00215444 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80218508 00215448 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8021850C 0021544C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218510 00215450 48 14 9D 11 */ bl func_80362220 +/* 80218510 00215450 48 14 9D 11 */ bl _restgpr_27 /* 80218514 00215454 80 01 00 34 */ lwz r0, 0x34(r1) /* 80218518 00215458 7C 08 03 A6 */ mtlr r0 /* 8021851C 0021545C 38 21 00 30 */ addi r1, r1, 0x30 @@ -9563,7 +9563,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax: /* 80218528 00215468 7C 08 02 A6 */ mflr r0 /* 8021852C 0021546C 90 01 00 24 */ stw r0, 0x24(r1) /* 80218530 00215470 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218534 00215474 48 14 9C A1 */ bl func_803621D4 +/* 80218534 00215474 48 14 9C A1 */ bl _savegpr_27 /* 80218538 00215478 7C 7B 1B 78 */ mr r27, r3 /* 8021853C 0021547C 80 63 03 60 */ lwz r3, 0x360(r3) /* 80218540 00215480 48 03 D2 E9 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -9606,7 +9606,7 @@ lbl_802185C0: /* 802185C8 00215508 3B FF 00 04 */ addi r31, r31, 4 /* 802185CC 0021550C 41 80 FF B8 */ blt lbl_80218584 /* 802185D0 00215510 39 61 00 20 */ addi r11, r1, 0x20 -/* 802185D4 00215514 48 14 9C 4D */ bl func_80362220 +/* 802185D4 00215514 48 14 9C 4D */ bl _restgpr_27 /* 802185D8 00215518 80 01 00 24 */ lwz r0, 0x24(r1) /* 802185DC 0021551C 7C 08 03 A6 */ mtlr r0 /* 802185E0 00215520 38 21 00 20 */ addi r1, r1, 0x20 @@ -9620,7 +9620,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin: /* 802185F4 00215534 DB E1 00 20 */ stfd f31, 0x20(r1) /* 802185F8 00215538 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 802185FC 0021553C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218600 00215540 48 14 9B D5 */ bl func_803621D4 +/* 80218600 00215540 48 14 9B D5 */ bl _savegpr_27 /* 80218604 00215544 7C 7B 1B 78 */ mr r27, r3 /* 80218608 00215548 80 63 03 64 */ lwz r3, 0x364(r3) /* 8021860C 0021554C 48 03 D2 1D */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -9667,7 +9667,7 @@ lbl_80218694: /* 802186A4 002155E4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 802186A8 002155E8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 802186AC 002155EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802186B0 002155F0 48 14 9B 71 */ bl func_80362220 +/* 802186B0 002155F0 48 14 9B 71 */ bl _restgpr_27 /* 802186B4 002155F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802186B8 002155F8 7C 08 03 A6 */ mtlr r0 /* 802186BC 002155FC 38 21 00 30 */ addi r1, r1, 0x30 @@ -9679,7 +9679,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax: /* 802186C8 00215608 7C 08 02 A6 */ mflr r0 /* 802186CC 0021560C 90 01 00 24 */ stw r0, 0x24(r1) /* 802186D0 00215610 39 61 00 20 */ addi r11, r1, 0x20 -/* 802186D4 00215614 48 14 9B 01 */ bl func_803621D4 +/* 802186D4 00215614 48 14 9B 01 */ bl _savegpr_27 /* 802186D8 00215618 7C 7B 1B 78 */ mr r27, r3 /* 802186DC 0021561C 80 63 03 64 */ lwz r3, 0x364(r3) /* 802186E0 00215620 48 03 D1 49 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -9722,7 +9722,7 @@ lbl_80218760: /* 80218768 002156A8 3B FF 00 04 */ addi r31, r31, 4 /* 8021876C 002156AC 41 80 FF B8 */ blt lbl_80218724 /* 80218770 002156B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80218774 002156B4 48 14 9A AD */ bl func_80362220 +/* 80218774 002156B4 48 14 9A AD */ bl _restgpr_27 /* 80218778 002156B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021877C 002156BC 7C 08 03 A6 */ mtlr r0 /* 80218780 002156C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -10445,7 +10445,7 @@ dMeter2Draw_c_NS_setAlphaButtonAAnimeMin: /* 80219180 002160C0 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80219184 002160C4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80219188 002160C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021918C 002160CC 48 14 90 49 */ bl func_803621D4 +/* 8021918C 002160CC 48 14 90 49 */ bl _savegpr_27 /* 80219190 002160D0 7C 7B 1B 78 */ mr r27, r3 /* 80219194 002160D4 80 63 03 00 */ lwz r3, 0x300(r3) /* 80219198 002160D8 48 03 C6 91 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -10494,7 +10494,7 @@ lbl_80219228: /* 80219238 00216178 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8021923C 0021617C CB E1 00 20 */ lfd f31, 0x20(r1) /* 80219240 00216180 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219244 00216184 48 14 8F DD */ bl func_80362220 +/* 80219244 00216184 48 14 8F DD */ bl _restgpr_27 /* 80219248 00216188 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021924C 0021618C 7C 08 03 A6 */ mtlr r0 /* 80219250 00216190 38 21 00 30 */ addi r1, r1, 0x30 @@ -10506,7 +10506,7 @@ dMeter2Draw_c_NS_setAlphaButtonAAnimeMax: /* 8021925C 0021619C 7C 08 02 A6 */ mflr r0 /* 80219260 002161A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80219264 002161A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219268 002161A8 48 14 8F 6D */ bl func_803621D4 +/* 80219268 002161A8 48 14 8F 6D */ bl _savegpr_27 /* 8021926C 002161AC 7C 7B 1B 78 */ mr r27, r3 /* 80219270 002161B0 80 63 03 00 */ lwz r3, 0x300(r3) /* 80219274 002161B4 48 03 C5 B5 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -10551,7 +10551,7 @@ lbl_802192FC: /* 80219304 00216244 3B FF 00 04 */ addi r31, r31, 4 /* 80219308 00216248 41 80 FF B8 */ blt lbl_802192C0 /* 8021930C 0021624C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219310 00216250 48 14 8F 11 */ bl func_80362220 +/* 80219310 00216250 48 14 8F 11 */ bl _restgpr_27 /* 80219314 00216254 80 01 00 24 */ lwz r0, 0x24(r1) /* 80219318 00216258 7C 08 03 A6 */ mtlr r0 /* 8021931C 0021625C 38 21 00 20 */ addi r1, r1, 0x20 @@ -10565,7 +10565,7 @@ dMeter2Draw_c_NS_setAlphaButtonBAnimeMin: /* 80219330 00216270 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80219334 00216274 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80219338 00216278 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021933C 0021627C 48 14 8E 99 */ bl func_803621D4 +/* 8021933C 0021627C 48 14 8E 99 */ bl _savegpr_27 /* 80219340 00216280 7C 7B 1B 78 */ mr r27, r3 /* 80219344 00216284 80 63 03 04 */ lwz r3, 0x304(r3) /* 80219348 00216288 48 03 C4 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -10642,7 +10642,7 @@ lbl_80219444: /* 80219454 00216394 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80219458 00216398 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8021945C 0021639C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219460 002163A0 48 14 8D C1 */ bl func_80362220 +/* 80219460 002163A0 48 14 8D C1 */ bl _restgpr_27 /* 80219464 002163A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80219468 002163A8 7C 08 03 A6 */ mtlr r0 /* 8021946C 002163AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -10654,7 +10654,7 @@ dMeter2Draw_c_NS_setAlphaButtonBAnimeMax: /* 80219478 002163B8 7C 08 02 A6 */ mflr r0 /* 8021947C 002163BC 90 01 00 24 */ stw r0, 0x24(r1) /* 80219480 002163C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219484 002163C4 48 14 8D 51 */ bl func_803621D4 +/* 80219484 002163C4 48 14 8D 51 */ bl _savegpr_27 /* 80219488 002163C8 7C 7B 1B 78 */ mr r27, r3 /* 8021948C 002163CC 80 63 03 04 */ lwz r3, 0x304(r3) /* 80219490 002163D0 48 03 C3 99 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -10725,7 +10725,7 @@ lbl_8021957C: /* 80219584 002164C4 3B FF 00 04 */ addi r31, r31, 4 /* 80219588 002164C8 41 80 FF B8 */ blt lbl_80219540 /* 8021958C 002164CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80219590 002164D0 48 14 8C 91 */ bl func_80362220 +/* 80219590 002164D0 48 14 8C 91 */ bl _restgpr_27 /* 80219594 002164D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80219598 002164D8 7C 08 03 A6 */ mtlr r0 /* 8021959C 002164DC 38 21 00 20 */ addi r1, r1, 0x20 @@ -11073,7 +11073,7 @@ dMeter2Draw_c_NS_setButtonIconMidonaAlpha: /* 80219AA0 002169E0 DB A1 00 30 */ stfd f29, 0x30(r1) /* 80219AA4 002169E4 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 80219AA8 002169E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80219AAC 002169EC 48 14 87 2D */ bl func_803621D8 +/* 80219AAC 002169EC 48 14 87 2D */ bl _savegpr_28 /* 80219AB0 002169F0 7C 7D 1B 78 */ mr r29, r3 /* 80219AB4 002169F4 7C 9E 23 78 */ mr r30, r4 /* 80219AB8 002169F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -11334,7 +11334,7 @@ lbl_80219E38: /* 80219E78 00216DB8 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 80219E7C 00216DBC CB A1 00 30 */ lfd f29, 0x30(r1) /* 80219E80 00216DC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80219E84 00216DC4 48 14 83 A1 */ bl func_80362224 +/* 80219E84 00216DC4 48 14 83 A1 */ bl _restgpr_28 /* 80219E88 00216DC8 80 01 00 64 */ lwz r0, 0x64(r1) /* 80219E8C 00216DCC 7C 08 03 A6 */ mtlr r0 /* 80219E90 00216DD0 38 21 00 60 */ addi r1, r1, 0x60 @@ -11647,7 +11647,7 @@ dMeter2Draw_c_NS_getActionString: /* 8021A2F8 00217238 7C 08 02 A6 */ mflr r0 /* 8021A2FC 0021723C 90 01 00 44 */ stw r0, 0x44(r1) /* 8021A300 00217240 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021A304 00217244 48 14 7E D5 */ bl func_803621D8 +/* 8021A304 00217244 48 14 7E D5 */ bl _savegpr_28 /* 8021A308 00217248 7C 9D 23 78 */ mr r29, r4 /* 8021A30C 0021724C 7C BC 2B 78 */ mr r28, r5 /* 8021A310 00217250 7C DF 33 78 */ mr r31, r6 @@ -11656,7 +11656,7 @@ dMeter2Draw_c_NS_getActionString: /* 8021A31C 0021725C 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8021A320 00217260 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8021A324 00217264 38 84 00 EF */ addi r4, r4, 0xef -/* 8021A328 00217268 48 14 E8 05 */ bl func_80368B2C +/* 8021A328 00217268 48 14 E8 05 */ bl strcpy /* 8021A32C 0021726C 28 1F 00 00 */ cmplwi r31, 0 /* 8021A330 00217270 41 82 00 0C */ beq lbl_8021A33C /* 8021A334 00217274 38 00 00 01 */ li r0, 1 @@ -11738,7 +11738,7 @@ lbl_8021A448: /* 8021A448 00217388 3C 60 80 43 */ lis r3, lbl_80430158@ha /* 8021A44C 0021738C 38 63 01 58 */ addi r3, r3, lbl_80430158@l /* 8021A450 00217390 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021A454 00217394 48 14 7D D1 */ bl func_80362224 +/* 8021A454 00217394 48 14 7D D1 */ bl _restgpr_28 /* 8021A458 00217398 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021A45C 0021739C 7C 08 03 A6 */ mtlr r0 /* 8021A460 002173A0 38 21 00 40 */ addi r1, r1, 0x40 @@ -12463,7 +12463,7 @@ dMeter2Draw_c_NS_drawItemNum: /* 8021AED4 00217E14 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8021AED8 00217E18 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8021AEDC 00217E1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021AEE0 00217E20 48 14 72 F9 */ bl func_803621D8 +/* 8021AEE0 00217E20 48 14 72 F9 */ bl _savegpr_28 /* 8021AEE4 00217E24 7C 7C 1B 78 */ mr r28, r3 /* 8021AEE8 00217E28 7C 9E 23 78 */ mr r30, r4 /* 8021AEEC 00217E2C C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) @@ -12498,7 +12498,7 @@ lbl_8021AF28: /* 8021AF58 00217E98 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8021AF5C 00217E9C CB E1 00 20 */ lfd f31, 0x20(r1) /* 8021AF60 00217EA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021AF64 00217EA4 48 14 72 C1 */ bl func_80362224 +/* 8021AF64 00217EA4 48 14 72 C1 */ bl _restgpr_28 /* 8021AF68 00217EA8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021AF6C 00217EAC 7C 08 03 A6 */ mtlr r0 /* 8021AF70 00217EB0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index f63f0c934b..fd9e0172f5 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -50,7 +50,7 @@ dMeter2Info_c_NS_init: /* 8021BE6C 00218DAC 7C 08 02 A6 */ mflr r0 /* 8021BE70 00218DB0 90 01 00 34 */ stw r0, 0x34(r1) /* 8021BE74 00218DB4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021BE78 00218DB8 48 14 63 5D */ bl func_803621D4 +/* 8021BE78 00218DB8 48 14 63 5D */ bl _savegpr_27 /* 8021BE7C 00218DBC 7C 7F 1B 78 */ mr r31, r3 /* 8021BE80 00218DC0 38 80 00 00 */ li r4, 0 /* 8021BE84 00218DC4 90 83 00 10 */ stw r4, 0x10(r3) @@ -205,7 +205,7 @@ lbl_8021C0BC: /* 8021C0C0 00219000 2C 1B 00 03 */ cmpwi r27, 3 /* 8021C0C4 00219004 41 80 FF D0 */ blt lbl_8021C094 /* 8021C0C8 00219008 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021C0CC 0021900C 48 14 61 55 */ bl func_80362220 +/* 8021C0CC 0021900C 48 14 61 55 */ bl _restgpr_27 /* 8021C0D0 00219010 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021C0D4 00219014 7C 08 03 A6 */ mtlr r0 /* 8021C0D8 00219018 38 21 00 30 */ addi r1, r1, 0x30 @@ -233,7 +233,7 @@ lbl_8021C0FC: /* 8021C120 00219060 7C 08 02 A6 */ mflr r0 /* 8021C124 00219064 90 01 00 74 */ stw r0, 0x74(r1) /* 8021C128 00219068 39 61 00 70 */ addi r11, r1, 0x70 -/* 8021C12C 0021906C 48 14 60 AD */ bl func_803621D8 +/* 8021C12C 0021906C 48 14 60 AD */ bl _savegpr_28 /* 8021C130 00219070 7C 7C 1B 78 */ mr r28, r3 /* 8021C134 00219074 7C 9D 23 78 */ mr r29, r4 /* 8021C138 00219078 7C BE 2B 78 */ mr r30, r5 @@ -274,7 +274,7 @@ lbl_8021C15C: /* 8021C1C0 00219100 38 60 00 01 */ li r3, 1 lbl_8021C1C4: /* 8021C1C4 00219104 39 61 00 70 */ addi r11, r1, 0x70 -/* 8021C1C8 00219108 48 14 60 5D */ bl func_80362224 +/* 8021C1C8 00219108 48 14 60 5D */ bl _restgpr_28 /* 8021C1CC 0021910C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8021C1D0 00219110 7C 08 03 A6 */ mtlr r0 /* 8021C1D4 00219114 38 21 00 70 */ addi r1, r1, 0x70 @@ -329,7 +329,7 @@ dMeter2Info_c_NS_getString: /* 8021C254 00219194 7C 08 02 A6 */ mflr r0 /* 8021C258 00219198 90 01 00 24 */ stw r0, 0x24(r1) /* 8021C25C 0021919C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021C260 002191A0 48 14 5F 75 */ bl func_803621D4 +/* 8021C260 002191A0 48 14 5F 75 */ bl _savegpr_27 /* 8021C264 002191A4 7C 7C 1B 78 */ mr r28, r3 /* 8021C268 002191A8 7C 9D 23 78 */ mr r29, r4 /* 8021C26C 002191AC 7C BE 2B 78 */ mr r30, r5 @@ -337,7 +337,7 @@ dMeter2Info_c_NS_getString: /* 8021C274 002191B4 7F C3 F3 78 */ mr r3, r30 /* 8021C278 002191B8 3C 80 80 3A */ lis r4, lbl_80399168@ha /* 8021C27C 002191BC 38 84 91 68 */ addi r4, r4, lbl_80399168@l -/* 8021C280 002191C0 48 14 C8 AD */ bl func_80368B2C +/* 8021C280 002191C0 48 14 C8 AD */ bl strcpy /* 8021C284 002191C4 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8021C288 002191C8 28 03 00 00 */ cmplwi r3, 0 /* 8021C28C 002191CC 40 82 00 34 */ bne lbl_8021C2C0 @@ -371,7 +371,7 @@ lbl_8021C2DC: /* 8021C2F4 00219234 7F C3 F3 78 */ mr r3, r30 /* 8021C2F8 00219238 80 1B 00 10 */ lwz r0, 0x10(r27) /* 8021C2FC 0021923C 7C 85 02 14 */ add r4, r5, r0 -/* 8021C300 00219240 48 14 C8 2D */ bl func_80368B2C +/* 8021C300 00219240 48 14 C8 2D */ bl strcpy /* 8021C304 00219244 28 1F 00 00 */ cmplwi r31, 0 /* 8021C308 00219248 41 82 00 50 */ beq lbl_8021C358 /* 8021C30C 0021924C 7F E3 FB 78 */ mr r3, r31 @@ -397,7 +397,7 @@ lbl_8021C324: /* 8021C354 00219294 4E 80 04 21 */ bctrl lbl_8021C358: /* 8021C358 00219298 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021C35C 0021929C 48 14 5E C5 */ bl func_80362220 +/* 8021C35C 0021929C 48 14 5E C5 */ bl _restgpr_27 /* 8021C360 002192A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021C364 002192A4 7C 08 03 A6 */ mtlr r0 /* 8021C368 002192A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -409,7 +409,7 @@ dMeter2Info_c_NS_getStringKana: /* 8021C374 002192B4 7C 08 02 A6 */ mflr r0 /* 8021C378 002192B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8021C37C 002192BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021C380 002192C0 48 14 5E 59 */ bl func_803621D8 +/* 8021C380 002192C0 48 14 5E 59 */ bl _savegpr_28 /* 8021C384 002192C4 7C 7C 1B 78 */ mr r28, r3 /* 8021C388 002192C8 7C 9D 23 78 */ mr r29, r4 /* 8021C38C 002192CC 7C BE 2B 78 */ mr r30, r5 @@ -417,7 +417,7 @@ dMeter2Info_c_NS_getStringKana: /* 8021C394 002192D4 7F C3 F3 78 */ mr r3, r30 /* 8021C398 002192D8 3C 80 80 3A */ lis r4, lbl_80399168@ha /* 8021C39C 002192DC 38 84 91 68 */ addi r4, r4, lbl_80399168@l -/* 8021C3A0 002192E0 48 14 C7 8D */ bl func_80368B2C +/* 8021C3A0 002192E0 48 14 C7 8D */ bl strcpy /* 8021C3A4 002192E4 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8021C3A8 002192E8 28 03 00 00 */ cmplwi r3, 0 /* 8021C3AC 002192EC 40 82 00 34 */ bne lbl_8021C3E0 @@ -530,7 +530,7 @@ lbl_8021C4F8: /* 8021C528 00219468 4E 80 04 21 */ bctrl lbl_8021C52C: /* 8021C52C 0021946C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021C530 00219470 48 14 5C F5 */ bl func_80362224 +/* 8021C530 00219470 48 14 5C F5 */ bl _restgpr_28 /* 8021C534 00219474 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021C538 00219478 7C 08 03 A6 */ mtlr r0 /* 8021C53C 0021947C 38 21 00 20 */ addi r1, r1, 0x20 @@ -542,7 +542,7 @@ dMeter2Info_c_NS_getStringKanji: /* 8021C548 00219488 7C 08 02 A6 */ mflr r0 /* 8021C54C 0021948C 90 01 00 24 */ stw r0, 0x24(r1) /* 8021C550 00219490 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021C554 00219494 48 14 5C 85 */ bl func_803621D8 +/* 8021C554 00219494 48 14 5C 85 */ bl _savegpr_28 /* 8021C558 00219498 7C 7C 1B 78 */ mr r28, r3 /* 8021C55C 0021949C 7C 9D 23 78 */ mr r29, r4 /* 8021C560 002194A0 7C BE 2B 78 */ mr r30, r5 @@ -550,7 +550,7 @@ dMeter2Info_c_NS_getStringKanji: /* 8021C568 002194A8 7F C3 F3 78 */ mr r3, r30 /* 8021C56C 002194AC 3C 80 80 3A */ lis r4, lbl_80399168@ha /* 8021C570 002194B0 38 84 91 68 */ addi r4, r4, lbl_80399168@l -/* 8021C574 002194B4 48 14 C5 B9 */ bl func_80368B2C +/* 8021C574 002194B4 48 14 C5 B9 */ bl strcpy /* 8021C578 002194B8 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8021C57C 002194BC 28 03 00 00 */ cmplwi r3, 0 /* 8021C580 002194C0 40 82 00 34 */ bne lbl_8021C5B4 @@ -630,7 +630,7 @@ lbl_8021C658: /* 8021C688 002195C8 4E 80 04 21 */ bctrl lbl_8021C68C: /* 8021C68C 002195CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021C690 002195D0 48 14 5B 95 */ bl func_80362224 +/* 8021C690 002195D0 48 14 5B 95 */ bl _restgpr_28 /* 8021C694 002195D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021C698 002195D8 7C 08 03 A6 */ mtlr r0 /* 8021C69C 002195DC 38 21 00 20 */ addi r1, r1, 0x20 @@ -900,14 +900,14 @@ dMeter2Info_c_NS_warpInProc: /* 8021CA30 00219970 7F E3 FB 78 */ mr r3, r31 /* 8021CA34 00219974 38 80 00 12 */ li r4, 0x12 /* 8021CA38 00219978 38 A0 00 01 */ li r5, 1 -/* 8021CA3C 0021997C 4B E1 65 F5 */ bl dSv_player_item_c_NS_getItem +/* 8021CA3C 0021997C 4B E1 65 F5 */ bl getItem__17dSv_player_item_cCFib /* 8021CA40 00219980 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8021CA44 00219984 28 00 00 EC */ cmplwi r0, 0xec /* 8021CA48 00219988 41 82 00 14 */ beq lbl_8021CA5C /* 8021CA4C 0021998C 7F E3 FB 78 */ mr r3, r31 /* 8021CA50 00219990 38 80 00 12 */ li r4, 0x12 /* 8021CA54 00219994 38 A0 00 25 */ li r5, 0x25 -/* 8021CA58 00219998 4B E1 65 61 */ bl dSv_player_item_c_NS_setItem +/* 8021CA58 00219998 4B E1 65 61 */ bl setItem__17dSv_player_item_cFiUc lbl_8021CA5C: /* 8021CA5C 0021999C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8021CA60 002199A0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1016,7 +1016,7 @@ lbl_8021CB9C: /* 8021CBD8 00219B18 38 63 00 9C */ addi r3, r3, 0x9c /* 8021CBDC 00219B1C 38 80 00 12 */ li r4, 0x12 /* 8021CBE0 00219B20 38 A0 00 27 */ li r5, 0x27 -/* 8021CBE4 00219B24 4B E1 63 D5 */ bl dSv_player_item_c_NS_setItem +/* 8021CBE4 00219B24 4B E1 63 D5 */ bl setItem__17dSv_player_item_cFiUc /* 8021CBE8 00219B28 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8021CBEC 00219B2C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8021CBF0 00219B30 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1044,7 +1044,7 @@ dMeter2Info_c_NS_setWarpInfo: /* 8021CC30 00219B70 7D 1E 43 78 */ mr r30, r8 /* 8021CC34 00219B74 7D 3F 4B 78 */ mr r31, r9 /* 8021CC38 00219B78 38 7A 00 38 */ addi r3, r26, 0x38 -/* 8021CC3C 00219B7C 48 14 BE F1 */ bl func_80368B2C +/* 8021CC3C 00219B7C 48 14 BE F1 */ bl strcpy /* 8021CC40 00219B80 C0 1B 00 00 */ lfs f0, 0(r27) /* 8021CC44 00219B84 D0 1A 00 40 */ stfs f0, 0x40(r26) /* 8021CC48 00219B88 C0 1B 00 04 */ lfs f0, 4(r27) @@ -2266,7 +2266,7 @@ dMeter2Info_c_NS_changeWater: /* 8021DD60 0021ACA0 7C 08 02 A6 */ mflr r0 /* 8021DD64 0021ACA4 90 01 00 24 */ stw r0, 0x24(r1) /* 8021DD68 0021ACA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DD6C 0021ACAC 48 14 44 6D */ bl func_803621D8 +/* 8021DD6C 0021ACAC 48 14 44 6D */ bl _savegpr_28 /* 8021DD70 0021ACB0 7C 9C 23 78 */ mr r28, r4 /* 8021DD74 0021ACB4 38 80 00 00 */ li r4, 0 /* 8021DD78 0021ACB8 57 9E 06 3E */ clrlwi r30, r28, 0x18 @@ -2280,14 +2280,14 @@ dMeter2Info_c_NS_changeWater: /* 8021DD98 0021ACD8 7F E3 FB 78 */ mr r3, r31 /* 8021DD9C 0021ACDC 7F C4 F3 78 */ mr r4, r30 /* 8021DDA0 0021ACE0 38 A0 00 01 */ li r5, 1 -/* 8021DDA4 0021ACE4 4B E1 52 8D */ bl dSv_player_item_c_NS_getItem +/* 8021DDA4 0021ACE4 4B E1 52 8D */ bl getItem__17dSv_player_item_cCFib /* 8021DDA8 0021ACE8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8021DDAC 0021ACEC 28 00 00 6B */ cmplwi r0, 0x6b /* 8021DDB0 0021ACF0 40 82 00 50 */ bne lbl_8021DE00 /* 8021DDB4 0021ACF4 7F E3 FB 78 */ mr r3, r31 /* 8021DDB8 0021ACF8 7F C4 F3 78 */ mr r4, r30 /* 8021DDBC 0021ACFC 38 A0 00 67 */ li r5, 0x67 -/* 8021DDC0 0021AD00 4B E1 51 F9 */ bl dSv_player_item_c_NS_setItem +/* 8021DDC0 0021AD00 4B E1 51 F9 */ bl setItem__17dSv_player_item_cFiUc /* 8021DDC4 0021AD04 3B A0 00 00 */ li r29, 0 /* 8021DDC8 0021AD08 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8021DDCC 0021AD0C 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l @@ -2307,7 +2307,7 @@ lbl_8021DDF4: /* 8021DDFC 0021AD3C 41 80 FF D8 */ blt lbl_8021DDD4 lbl_8021DE00: /* 8021DE00 0021AD40 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DE04 0021AD44 48 14 44 21 */ bl func_80362224 +/* 8021DE04 0021AD44 48 14 44 21 */ bl _restgpr_28 /* 8021DE08 0021AD48 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021DE0C 0021AD4C 7C 08 03 A6 */ mtlr r0 /* 8021DE10 0021AD50 38 21 00 20 */ addi r1, r1, 0x20 @@ -2343,7 +2343,7 @@ lbl_8021DE68: /* 8021DE74 0021ADB4 38 1F 00 0F */ addi r0, r31, 0xf /* 8021DE78 0021ADB8 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021DE7C 0021ADBC 38 A0 00 01 */ li r5, 1 -/* 8021DE80 0021ADC0 4B E1 51 B1 */ bl dSv_player_item_c_NS_getItem +/* 8021DE80 0021ADC0 4B E1 51 B1 */ bl getItem__17dSv_player_item_cCFib /* 8021DE84 0021ADC4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8021DE88 0021ADC8 28 00 00 FF */ cmplwi r0, 0xff /* 8021DE8C 0021ADCC 40 82 00 0C */ bne lbl_8021DE98 @@ -2389,14 +2389,14 @@ lbl_8021DEC4: /* 8021DF20 0021AE60 7F C3 F3 78 */ mr r3, r30 /* 8021DF24 0021AE64 38 80 00 04 */ li r4, 4 /* 8021DF28 0021AE68 38 A0 00 00 */ li r5, 0 -/* 8021DF2C 0021AE6C 4B E1 51 05 */ bl dSv_player_item_c_NS_getItem +/* 8021DF2C 0021AE6C 4B E1 51 05 */ bl getItem__17dSv_player_item_cCFib /* 8021DF30 0021AE70 98 7C 00 CE */ stb r3, 0xce(r28) /* 8021DF34 0021AE74 7F C3 F3 78 */ mr r3, r30 /* 8021DF38 0021AE78 88 9C 00 DC */ lbz r4, 0xdc(r28) /* 8021DF3C 0021AE7C 38 04 00 0F */ addi r0, r4, 0xf /* 8021DF40 0021AE80 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021DF44 0021AE84 38 A0 00 00 */ li r5, 0 -/* 8021DF48 0021AE88 4B E1 50 E9 */ bl dSv_player_item_c_NS_getItem +/* 8021DF48 0021AE88 4B E1 50 E9 */ bl getItem__17dSv_player_item_cCFib /* 8021DF4C 0021AE8C 98 7C 00 CF */ stb r3, 0xcf(r28) /* 8021DF50 0021AE90 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8021DF54 0021AE94 41 82 00 98 */ beq lbl_8021DFEC @@ -2415,7 +2415,7 @@ lbl_8021DF5C: /* 8021DF84 0021AEC4 7F C3 F3 78 */ mr r3, r30 /* 8021DF88 0021AEC8 38 80 00 04 */ li r4, 4 /* 8021DF8C 0021AECC 88 BC 00 DA */ lbz r5, 0xda(r28) -/* 8021DF90 0021AED0 4B E1 50 29 */ bl dSv_player_item_c_NS_setItem +/* 8021DF90 0021AED0 4B E1 50 29 */ bl setItem__17dSv_player_item_cFiUc /* 8021DF94 0021AED4 88 9C 00 DA */ lbz r4, 0xda(r28) /* 8021DF98 0021AED8 38 00 00 04 */ li r0, 4 /* 8021DF9C 0021AEDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2427,7 +2427,7 @@ lbl_8021DF5C: /* 8021DFB4 0021AEF4 38 04 00 0F */ addi r0, r4, 0xf /* 8021DFB8 0021AEF8 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021DFBC 0021AEFC 88 BC 00 DB */ lbz r5, 0xdb(r28) -/* 8021DFC0 0021AF00 4B E1 4F F9 */ bl dSv_player_item_c_NS_setItem +/* 8021DFC0 0021AF00 4B E1 4F F9 */ bl setItem__17dSv_player_item_cFiUc /* 8021DFC4 0021AF04 88 7C 00 DB */ lbz r3, 0xdb(r28) /* 8021DFC8 0021AF08 88 9C 00 DC */ lbz r4, 0xdc(r28) /* 8021DFCC 0021AF0C 38 04 00 0F */ addi r0, r4, 0xf @@ -2444,7 +2444,7 @@ lbl_8021DFEC: /* 8021DFF4 0021AF34 38 04 00 0F */ addi r0, r4, 0xf /* 8021DFF8 0021AF38 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021DFFC 0021AF3C 38 A0 00 70 */ li r5, 0x70 -/* 8021E000 0021AF40 4B E1 4F B9 */ bl dSv_player_item_c_NS_setItem +/* 8021E000 0021AF40 4B E1 4F B9 */ bl setItem__17dSv_player_item_cFiUc /* 8021E004 0021AF44 88 7C 00 DC */ lbz r3, 0xdc(r28) /* 8021E008 0021AF48 38 03 00 0F */ addi r0, r3, 0xf /* 8021E00C 0021AF4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2458,7 +2458,7 @@ lbl_8021DFEC: /* 8021E02C 0021AF6C 7F C3 F3 78 */ mr r3, r30 /* 8021E030 0021AF70 38 80 00 04 */ li r4, 4 /* 8021E034 0021AF74 38 A0 00 43 */ li r5, 0x43 -/* 8021E038 0021AF78 4B E1 4F 81 */ bl dSv_player_item_c_NS_setItem +/* 8021E038 0021AF78 4B E1 4F 81 */ bl setItem__17dSv_player_item_cFiUc /* 8021E03C 0021AF7C 38 00 00 04 */ li r0, 4 /* 8021E040 0021AF80 98 1B 5E 7D */ stb r0, 0x5e7d(r27) /* 8021E044 0021AF84 38 00 00 43 */ li r0, 0x43 @@ -2502,7 +2502,7 @@ dMeter2Info_c_NS_resetMiniGameItem: /* 8021E0C8 0021B008 7C 08 02 A6 */ mflr r0 /* 8021E0CC 0021B00C 90 01 00 24 */ stw r0, 0x24(r1) /* 8021E0D0 0021B010 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E0D4 0021B014 48 14 41 01 */ bl func_803621D4 +/* 8021E0D4 0021B014 48 14 41 01 */ bl _savegpr_27 /* 8021E0D8 0021B018 7C 7E 1B 78 */ mr r30, r3 /* 8021E0DC 0021B01C 7C 9F 23 78 */ mr r31, r4 /* 8021E0E0 0021B020 88 03 00 DD */ lbz r0, 0xdd(r3) @@ -2540,14 +2540,14 @@ lbl_8021E100: /* 8021E15C 0021B09C 7F 83 E3 78 */ mr r3, r28 /* 8021E160 0021B0A0 38 80 00 04 */ li r4, 4 /* 8021E164 0021B0A4 38 A0 00 00 */ li r5, 0 -/* 8021E168 0021B0A8 4B E1 4E C9 */ bl dSv_player_item_c_NS_getItem +/* 8021E168 0021B0A8 4B E1 4E C9 */ bl getItem__17dSv_player_item_cCFib /* 8021E16C 0021B0AC 98 7E 00 DA */ stb r3, 0xda(r30) /* 8021E170 0021B0B0 7F 83 E3 78 */ mr r3, r28 /* 8021E174 0021B0B4 88 9E 00 DC */ lbz r4, 0xdc(r30) /* 8021E178 0021B0B8 38 04 00 0F */ addi r0, r4, 0xf /* 8021E17C 0021B0BC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021E180 0021B0C0 38 A0 00 00 */ li r5, 0 -/* 8021E184 0021B0C4 4B E1 4E AD */ bl dSv_player_item_c_NS_getItem +/* 8021E184 0021B0C4 4B E1 4E AD */ bl getItem__17dSv_player_item_cCFib /* 8021E188 0021B0C8 98 7E 00 DB */ stb r3, 0xdb(r30) lbl_8021E18C: /* 8021E18C 0021B0CC 3B 60 00 00 */ li r27, 0 @@ -2568,7 +2568,7 @@ lbl_8021E190: /* 8021E1C4 0021B104 7F 83 E3 78 */ mr r3, r28 /* 8021E1C8 0021B108 38 80 00 04 */ li r4, 4 /* 8021E1CC 0021B10C 88 BE 00 CE */ lbz r5, 0xce(r30) -/* 8021E1D0 0021B110 4B E1 4D E9 */ bl dSv_player_item_c_NS_setItem +/* 8021E1D0 0021B110 4B E1 4D E9 */ bl setItem__17dSv_player_item_cFiUc /* 8021E1D4 0021B114 88 9E 00 CE */ lbz r4, 0xce(r30) /* 8021E1D8 0021B118 38 00 00 04 */ li r0, 4 /* 8021E1DC 0021B11C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2580,7 +2580,7 @@ lbl_8021E190: /* 8021E1F4 0021B134 38 04 00 0F */ addi r0, r4, 0xf /* 8021E1F8 0021B138 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8021E1FC 0021B13C 88 BE 00 CF */ lbz r5, 0xcf(r30) -/* 8021E200 0021B140 4B E1 4D B9 */ bl dSv_player_item_c_NS_setItem +/* 8021E200 0021B140 4B E1 4D B9 */ bl setItem__17dSv_player_item_cFiUc /* 8021E204 0021B144 88 7E 00 CF */ lbz r3, 0xcf(r30) /* 8021E208 0021B148 88 9E 00 DC */ lbz r4, 0xdc(r30) /* 8021E20C 0021B14C 38 04 00 0F */ addi r0, r4, 0xf @@ -2602,7 +2602,7 @@ lbl_8021E190: /* 8021E24C 0021B18C 98 1E 00 DC */ stb r0, 0xdc(r30) lbl_8021E250: /* 8021E250 0021B190 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E254 0021B194 48 14 3F CD */ bl func_80362220 +/* 8021E254 0021B194 48 14 3F CD */ bl _restgpr_27 /* 8021E258 0021B198 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021E25C 0021B19C 7C 08 03 A6 */ mtlr r0 /* 8021E260 0021B1A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2626,7 +2626,7 @@ dMeter2Info_c_NS_setSaveStageName: /* 8021E294 0021B1D4 7C 08 02 A6 */ mflr r0 /* 8021E298 0021B1D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8021E29C 0021B1DC 38 63 00 E9 */ addi r3, r3, 0xe9 -/* 8021E2A0 0021B1E0 48 14 A8 8D */ bl func_80368B2C +/* 8021E2A0 0021B1E0 48 14 A8 8D */ bl strcpy /* 8021E2A4 0021B1E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021E2A8 0021B1E8 7C 08 03 A6 */ mtlr r0 /* 8021E2AC 0021B1EC 38 21 00 10 */ addi r1, r1, 0x10 @@ -2981,7 +2981,7 @@ dMeter2Info_getNewLetterNum: /* 8021E758 0021B698 7C 08 02 A6 */ mflr r0 /* 8021E75C 0021B69C 90 01 00 24 */ stw r0, 0x24(r1) /* 8021E760 0021B6A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E764 0021B6A4 48 14 3A 71 */ bl func_803621D4 +/* 8021E764 0021B6A4 48 14 3A 71 */ bl _savegpr_27 /* 8021E768 0021B6A8 3B 80 00 00 */ li r28, 0 /* 8021E76C 0021B6AC 3B 60 00 00 */ li r27, 0 /* 8021E770 0021B6B0 3B E0 00 00 */ li r31, 0 @@ -3018,7 +3018,7 @@ lbl_8021E7D8: /* 8021E7E4 0021B724 41 80 FF A0 */ blt lbl_8021E784 /* 8021E7E8 0021B728 7F 83 E3 78 */ mr r3, r28 /* 8021E7EC 0021B72C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E7F0 0021B730 48 14 3A 31 */ bl func_80362220 +/* 8021E7F0 0021B730 48 14 3A 31 */ bl _restgpr_27 /* 8021E7F4 0021B734 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021E7F8 0021B738 7C 08 03 A6 */ mtlr r0 /* 8021E7FC 0021B73C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index f901b1fa5e..5cfbd031e9 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -1117,7 +1117,7 @@ jmessage_tReference_NS_inputNumber: /* 802294AC 002263EC 7C 08 02 A6 */ mflr r0 /* 802294B0 002263F0 90 01 00 34 */ stw r0, 0x34(r1) /* 802294B4 002263F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802294B8 002263F8 48 13 8D 1D */ bl func_803621D4 +/* 802294B8 002263F8 48 13 8D 1D */ bl _savegpr_27 /* 802294BC 002263FC 7C 7C 1B 78 */ mr r28, r3 /* 802294C0 00226400 80 63 00 08 */ lwz r3, 8(r3) /* 802294C4 00226404 4B E0 8C D9 */ bl STControl_NS_checkTrigger @@ -1290,7 +1290,7 @@ lbl_80229704: /* 80229710 00226650 80 7C 05 C0 */ lwz r3, 0x5c0(r28) /* 80229714 00226654 B3 A3 01 74 */ sth r29, 0x174(r3) /* 80229718 00226658 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022971C 0022665C 48 13 8B 05 */ bl func_80362220 +/* 8022971C 0022665C 48 13 8B 05 */ bl _restgpr_27 /* 80229720 00226660 80 01 00 34 */ lwz r0, 0x34(r1) /* 80229724 00226664 7C 08 03 A6 */ mtlr r0 /* 80229728 00226668 38 21 00 30 */ addi r1, r1, 0x30 @@ -1827,7 +1827,7 @@ lbl_80229DE8: /* 80229E48 00226D88 DB E1 00 40 */ stfd f31, 0x40(r1) /* 80229E4C 00226D8C F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80229E50 00226D90 39 61 00 40 */ addi r11, r1, 0x40 -/* 80229E54 00226D94 48 13 83 81 */ bl func_803621D4 +/* 80229E54 00226D94 48 13 83 81 */ bl _savegpr_27 /* 80229E58 00226D98 7C 7C 1B 78 */ mr r28, r3 /* 80229E5C 00226D9C 7C 9D 23 78 */ mr r29, r4 /* 80229E60 00226DA0 83 C3 00 04 */ lwz r30, 4(r3) @@ -2097,7 +2097,7 @@ lbl_8022A248: /* 8022A248 00227188 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8022A24C 0022718C CB E1 00 40 */ lfd f31, 0x40(r1) /* 8022A250 00227190 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022A254 00227194 48 13 7F CD */ bl func_80362220 +/* 8022A254 00227194 48 13 7F CD */ bl _restgpr_27 /* 8022A258 00227198 80 01 00 54 */ lwz r0, 0x54(r1) /* 8022A25C 0022719C 7C 08 03 A6 */ mtlr r0 /* 8022A260 002271A0 38 21 00 50 */ addi r1, r1, 0x50 @@ -2295,7 +2295,7 @@ lbl_8022A524: /* 8022A528 00227468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8022A52C 0022746C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8022A530 00227470 38 61 01 64 */ addi r3, r1, 0x164 -/* 8022A534 00227474 48 13 E5 F9 */ bl func_80368B2C +/* 8022A534 00227474 48 13 E5 F9 */ bl strcpy /* 8022A538 00227478 7F E3 FB 78 */ mr r3, r31 /* 8022A53C 0022747C 38 81 01 64 */ addi r4, r1, 0x164 /* 8022A540 00227480 48 00 0F A1 */ bl jmessage_tMeasureProcessor_NS_push_word @@ -2311,7 +2311,7 @@ lbl_8022A560: /* 8022A564 002274A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8022A568 002274A8 38 83 01 C5 */ addi r4, r3, 0x1c5 /* 8022A56C 002274AC 38 61 01 00 */ addi r3, r1, 0x100 -/* 8022A570 002274B0 48 13 E5 BD */ bl func_80368B2C +/* 8022A570 002274B0 48 13 E5 BD */ bl strcpy /* 8022A574 002274B4 7F E3 FB 78 */ mr r3, r31 /* 8022A578 002274B8 38 81 01 00 */ addi r4, r1, 0x100 /* 8022A57C 002274BC 48 00 0F 65 */ bl jmessage_tMeasureProcessor_NS_push_word @@ -3338,7 +3338,7 @@ jmessage_tMeasureProcessor_NS_do_rubyset: /* 8022B45C 0022839C 7C 08 02 A6 */ mflr r0 /* 8022B460 002283A0 90 01 00 24 */ stw r0, 0x24(r1) /* 8022B464 002283A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022B468 002283A8 48 13 6D 71 */ bl func_803621D8 +/* 8022B468 002283A8 48 13 6D 71 */ bl _savegpr_28 /* 8022B46C 002283AC 7C 9C 23 78 */ mr r28, r4 /* 8022B470 002283B0 88 03 00 44 */ lbz r0, 0x44(r3) /* 8022B474 002283B4 28 00 00 00 */ cmplwi r0, 0 @@ -3366,7 +3366,7 @@ lbl_8022B4C0: /* 8022B4C4 00228404 41 80 FF CC */ blt lbl_8022B490 lbl_8022B4C8: /* 8022B4C8 00228408 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022B4CC 0022840C 48 13 6D 59 */ bl func_80362224 +/* 8022B4CC 0022840C 48 13 6D 59 */ bl _restgpr_28 /* 8022B4D0 00228410 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022B4D4 00228414 7C 08 03 A6 */ mtlr r0 /* 8022B4D8 00228418 38 21 00 20 */ addi r1, r1, 0x20 @@ -3387,7 +3387,7 @@ jmessage_tMeasureProcessor_NS_push_word: /* 8022B508 00228448 7C 84 07 74 */ extsb r4, r4 /* 8022B50C 0022844C 4B FF E2 25 */ bl jmessage_tReference_NS_getWord /* 8022B510 00228450 7F C4 F3 78 */ mr r4, r30 -/* 8022B514 00228454 48 13 D6 19 */ bl func_80368B2C +/* 8022B514 00228454 48 13 D6 19 */ bl strcpy /* 8022B518 00228458 7F E3 FB 78 */ mr r3, r31 /* 8022B51C 0022845C 88 9D 00 4B */ lbz r4, 0x4b(r29) /* 8022B520 00228460 7C 84 07 74 */ extsb r4, r4 @@ -3476,7 +3476,7 @@ lbl_8022B638: /* 8022B65C 0022859C 7C 08 02 A6 */ mflr r0 /* 8022B660 002285A0 90 01 00 24 */ stw r0, 0x24(r1) /* 8022B664 002285A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022B668 002285A8 48 13 6B 71 */ bl func_803621D8 +/* 8022B668 002285A8 48 13 6B 71 */ bl _savegpr_28 /* 8022B66C 002285AC 7C 7C 1B 78 */ mr r28, r3 /* 8022B670 002285B0 7C 9D 23 78 */ mr r29, r4 /* 8022B674 002285B4 7C BE 2B 78 */ mr r30, r5 @@ -3737,7 +3737,7 @@ lbl_8022BA14: /* 8022BA1C 0022895C 38 00 00 00 */ li r0, 0 /* 8022BA20 00228960 98 1C 00 B5 */ stb r0, 0xb5(r28) /* 8022BA24 00228964 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022BA28 00228968 48 13 67 FD */ bl func_80362224 +/* 8022BA28 00228968 48 13 67 FD */ bl _restgpr_28 /* 8022BA2C 0022896C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022BA30 00228970 7C 08 03 A6 */ mtlr r0 /* 8022BA34 00228974 38 21 00 20 */ addi r1, r1, 0x20 @@ -4274,7 +4274,7 @@ lbl_8022C188: /* 8022C1A4 002290E4 7C 08 02 A6 */ mflr r0 /* 8022C1A8 002290E8 90 01 00 84 */ stw r0, 0x84(r1) /* 8022C1AC 002290EC 39 61 00 80 */ addi r11, r1, 0x80 -/* 8022C1B0 002290F0 48 13 60 29 */ bl func_803621D8 +/* 8022C1B0 002290F0 48 13 60 29 */ bl _savegpr_28 /* 8022C1B4 002290F4 7C 7C 1B 78 */ mr r28, r3 /* 8022C1B8 002290F8 7C 9D 23 78 */ mr r29, r4 /* 8022C1BC 002290FC 7C BE 2B 78 */ mr r30, r5 @@ -4685,7 +4685,7 @@ lbl_8022C75C: /* 8022C7A0 002296E0 7C 84 07 74 */ extsb r4, r4 /* 8022C7A4 002296E4 4B FF CF 8D */ bl jmessage_tReference_NS_getWord /* 8022C7A8 002296E8 38 81 00 48 */ addi r4, r1, 0x48 -/* 8022C7AC 002296EC 48 13 C3 81 */ bl func_80368B2C +/* 8022C7AC 002296EC 48 13 C3 81 */ bl strcpy /* 8022C7B0 002296F0 7F 83 E3 78 */ mr r3, r28 /* 8022C7B4 002296F4 48 00 02 F9 */ bl jmessage_tSequenceProcessor_NS_push_word /* 8022C7B8 002296F8 38 60 00 01 */ li r3, 1 @@ -4703,7 +4703,7 @@ lbl_8022C75C: /* 8022C7E8 00229728 7C 84 07 74 */ extsb r4, r4 /* 8022C7EC 0022972C 4B FF CF 45 */ bl jmessage_tReference_NS_getWord /* 8022C7F0 00229730 38 81 00 20 */ addi r4, r1, 0x20 -/* 8022C7F4 00229734 48 13 C3 39 */ bl func_80368B2C +/* 8022C7F4 00229734 48 13 C3 39 */ bl strcpy /* 8022C7F8 00229738 7F 83 E3 78 */ mr r3, r28 /* 8022C7FC 0022973C 48 00 02 B1 */ bl jmessage_tSequenceProcessor_NS_push_word /* 8022C800 00229740 38 60 00 01 */ li r3, 1 @@ -4776,7 +4776,7 @@ lbl_8022C8E0: /* 8022C8E0 00229820 38 60 00 00 */ li r3, 0 lbl_8022C8E4: /* 8022C8E4 00229824 39 61 00 80 */ addi r11, r1, 0x80 -/* 8022C8E8 00229828 48 13 59 3D */ bl func_80362224 +/* 8022C8E8 00229828 48 13 59 3D */ bl _restgpr_28 /* 8022C8EC 0022982C 80 01 00 84 */ lwz r0, 0x84(r1) /* 8022C8F0 00229830 7C 08 03 A6 */ mtlr r0 /* 8022C8F4 00229834 38 21 00 80 */ addi r1, r1, 0x80 @@ -4870,7 +4870,7 @@ jmessage_tSequenceProcessor_NS_do_rubyset: /* 8022CA28 00229968 7C 08 02 A6 */ mflr r0 /* 8022CA2C 0022996C 90 01 00 24 */ stw r0, 0x24(r1) /* 8022CA30 00229970 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022CA34 00229974 48 13 57 A5 */ bl func_803621D8 +/* 8022CA34 00229974 48 13 57 A5 */ bl _savegpr_28 /* 8022CA38 00229978 7C 9C 23 78 */ mr r28, r4 /* 8022CA3C 0022997C 88 03 00 AC */ lbz r0, 0xac(r3) /* 8022CA40 00229980 28 00 00 00 */ cmplwi r0, 0 @@ -4898,7 +4898,7 @@ lbl_8022CA8C: /* 8022CA90 002299D0 41 80 FF CC */ blt lbl_8022CA5C lbl_8022CA94: /* 8022CA94 002299D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022CA98 002299D8 48 13 57 8D */ bl func_80362224 +/* 8022CA98 002299D8 48 13 57 8D */ bl _restgpr_28 /* 8022CA9C 002299DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022CAA0 002299E0 7C 08 03 A6 */ mtlr r0 /* 8022CAA4 002299E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -4999,7 +4999,7 @@ jmessage_tSequenceProcessor_NS_calcStringLength: /* 8022CBEC 00229B2C 7C 08 02 A6 */ mflr r0 /* 8022CBF0 00229B30 90 01 00 24 */ stw r0, 0x24(r1) /* 8022CBF4 00229B34 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022CBF8 00229B38 48 13 55 E1 */ bl func_803621D8 +/* 8022CBF8 00229B38 48 13 55 E1 */ bl _savegpr_28 /* 8022CBFC 00229B3C 7C 7C 1B 78 */ mr r28, r3 /* 8022CC00 00229B40 83 A3 00 04 */ lwz r29, 4(r3) /* 8022CC04 00229B44 38 00 00 01 */ li r0, 1 @@ -5042,7 +5042,7 @@ jmessage_tSequenceProcessor_NS_calcStringLength: /* 8022CC90 00229BD0 38 00 00 00 */ li r0, 0 /* 8022CC94 00229BD4 98 1D 12 74 */ stb r0, 0x1274(r29) /* 8022CC98 00229BD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022CC9C 00229BDC 48 13 55 89 */ bl func_80362224 +/* 8022CC9C 00229BDC 48 13 55 89 */ bl _restgpr_28 /* 8022CCA0 00229BE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022CCA4 00229BE4 7C 08 03 A6 */ mtlr r0 /* 8022CCA8 00229BE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5190,17 +5190,17 @@ lbl_8022CEA8: /* 8022CEC4 00229E04 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022CEC8 00229E08 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022CECC 00229E0C 38 84 00 07 */ addi r4, r4, 7 -/* 8022CED0 00229E10 48 13 BC 5D */ bl func_80368B2C +/* 8022CED0 00229E10 48 13 BC 5D */ bl strcpy /* 8022CED4 00229E14 38 7F 0C 1C */ addi r3, r31, 0xc1c /* 8022CED8 00229E18 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022CEDC 00229E1C 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022CEE0 00229E20 38 84 00 07 */ addi r4, r4, 7 -/* 8022CEE4 00229E24 48 13 BC 49 */ bl func_80368B2C +/* 8022CEE4 00229E24 48 13 BC 49 */ bl strcpy /* 8022CEE8 00229E28 38 7F 0E 1C */ addi r3, r31, 0xe1c /* 8022CEEC 00229E2C 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022CEF0 00229E30 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022CEF4 00229E34 38 84 00 07 */ addi r4, r4, 7 -/* 8022CEF8 00229E38 48 13 BC 35 */ bl func_80368B2C +/* 8022CEF8 00229E38 48 13 BC 35 */ bl strcpy /* 8022CEFC 00229E3C 3B 40 00 00 */ li r26, 0 /* 8022CF00 00229E40 3B A0 00 00 */ li r29, 0 /* 8022CF04 00229E44 3B 80 00 00 */ li r28, 0 @@ -5210,11 +5210,11 @@ lbl_8022CF10: /* 8022CF10 00229E50 38 7C 10 1C */ addi r3, r28, 0x101c /* 8022CF14 00229E54 7C 7F 1A 14 */ add r3, r31, r3 /* 8022CF18 00229E58 38 9B 00 07 */ addi r4, r27, 7 -/* 8022CF1C 00229E5C 48 13 BC 11 */ bl func_80368B2C +/* 8022CF1C 00229E5C 48 13 BC 11 */ bl strcpy /* 8022CF20 00229E60 38 7D 10 B2 */ addi r3, r29, 0x10b2 /* 8022CF24 00229E64 7C 7F 1A 14 */ add r3, r31, r3 /* 8022CF28 00229E68 38 9B 00 07 */ addi r4, r27, 7 -/* 8022CF2C 00229E6C 48 13 BC 01 */ bl func_80368B2C +/* 8022CF2C 00229E6C 48 13 BC 01 */ bl strcpy /* 8022CF30 00229E70 3B 5A 00 01 */ addi r26, r26, 1 /* 8022CF34 00229E74 2C 1A 00 03 */ cmpwi r26, 3 /* 8022CF38 00229E78 3B BD 00 50 */ addi r29, r29, 0x50 @@ -5276,7 +5276,7 @@ lbl_8022D008: /* 8022D00C 00229F4C 48 00 B5 1D */ bl dMsgObject_c_NS_getSelectWord /* 8022D010 00229F50 7C 64 1B 78 */ mr r4, r3 /* 8022D014 00229F54 38 61 00 08 */ addi r3, r1, 8 -/* 8022D018 00229F58 48 13 BB 15 */ bl func_80368B2C +/* 8022D018 00229F58 48 13 BB 15 */ bl strcpy /* 8022D01C 00229F5C 88 1E 12 42 */ lbz r0, 0x1242(r30) /* 8022D020 00229F60 28 00 00 02 */ cmplwi r0, 2 /* 8022D024 00229F64 40 82 00 20 */ bne lbl_8022D044 @@ -5323,7 +5323,7 @@ lbl_8022D088: /* 8022D0B4 00229FF4 DB C1 00 50 */ stfd f30, 0x50(r1) /* 8022D0B8 00229FF8 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 8022D0BC 00229FFC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022D0C0 0022A000 48 13 51 15 */ bl func_803621D4 +/* 8022D0C0 0022A000 48 13 51 15 */ bl _savegpr_27 /* 8022D0C4 0022A004 7C 7C 1B 78 */ mr r28, r3 /* 8022D0C8 0022A008 7C 9D 23 78 */ mr r29, r4 /* 8022D0CC 0022A00C 83 C3 00 04 */ lwz r30, 4(r3) @@ -5756,7 +5756,7 @@ lbl_8022D724: /* 8022D72C 0022A66C E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 8022D730 0022A670 CB C1 00 50 */ lfd f30, 0x50(r1) /* 8022D734 0022A674 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022D738 0022A678 48 13 4A E9 */ bl func_80362220 +/* 8022D738 0022A678 48 13 4A E9 */ bl _restgpr_27 /* 8022D73C 0022A67C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8022D740 0022A680 7C 08 03 A6 */ mtlr r0 /* 8022D744 0022A684 38 21 00 70 */ addi r1, r1, 0x70 @@ -6185,7 +6185,7 @@ lbl_8022DD28: /* 8022DDA4 0022ACE4 7C 84 07 74 */ extsb r4, r4 /* 8022DDA8 0022ACE8 4B FF B9 89 */ bl jmessage_tReference_NS_getWord /* 8022DDAC 0022ACEC 38 81 00 30 */ addi r4, r1, 0x30 -/* 8022DDB0 0022ACF0 48 13 AD 7D */ bl func_80368B2C +/* 8022DDB0 0022ACF0 48 13 AD 7D */ bl strcpy /* 8022DDB4 0022ACF4 7F C3 F3 78 */ mr r3, r30 /* 8022DDB8 0022ACF8 48 00 19 7D */ bl jmessage_tRenderingProcessor_NS_push_word /* 8022DDBC 0022ACFC 38 60 00 01 */ li r3, 1 @@ -6203,7 +6203,7 @@ lbl_8022DD28: /* 8022DDEC 0022AD2C 7C 84 07 74 */ extsb r4, r4 /* 8022DDF0 0022AD30 4B FF B9 41 */ bl jmessage_tReference_NS_getWord /* 8022DDF4 0022AD34 38 81 00 08 */ addi r4, r1, 8 -/* 8022DDF8 0022AD38 48 13 AD 35 */ bl func_80368B2C +/* 8022DDF8 0022AD38 48 13 AD 35 */ bl strcpy /* 8022DDFC 0022AD3C 7F C3 F3 78 */ mr r3, r30 /* 8022DE00 0022AD40 48 00 19 35 */ bl jmessage_tRenderingProcessor_NS_push_word /* 8022DE04 0022AD44 38 60 00 01 */ li r3, 1 @@ -6920,7 +6920,7 @@ jmessage_tRenderingProcessor_NS_do_scale: /* 8022E864 0022B7A4 7C 08 02 A6 */ mflr r0 /* 8022E868 0022B7A8 90 01 00 54 */ stw r0, 0x54(r1) /* 8022E86C 0022B7AC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022E870 0022B7B0 48 13 39 69 */ bl func_803621D8 +/* 8022E870 0022B7B0 48 13 39 69 */ bl _savegpr_28 /* 8022E874 0022B7B4 7C 7C 1B 78 */ mr r28, r3 /* 8022E878 0022B7B8 80 83 00 04 */ lwz r4, 4(r3) /* 8022E87C 0022B7BC C0 04 04 54 */ lfs f0, 0x454(r4) @@ -6976,7 +6976,7 @@ lbl_8022E910: /* 8022E940 0022B880 38 E0 00 00 */ li r7, 0 /* 8022E944 0022B884 48 00 05 BD */ bl jmessage_tRenderingProcessor_NS_do_strcat /* 8022E948 0022B888 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022E94C 0022B88C 48 13 38 D9 */ bl func_80362224 +/* 8022E94C 0022B88C 48 13 38 D9 */ bl _restgpr_28 /* 8022E950 0022B890 80 01 00 54 */ lwz r0, 0x54(r1) /* 8022E954 0022B894 7C 08 03 A6 */ mtlr r0 /* 8022E958 0022B898 38 21 00 50 */ addi r1, r1, 0x50 @@ -7102,7 +7102,7 @@ jmessage_tRenderingProcessor_NS_do_outfont: /* 8022EB08 0022BA48 DB 81 00 40 */ stfd f28, 0x40(r1) /* 8022EB0C 0022BA4C F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 8022EB10 0022BA50 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022EB14 0022BA54 48 13 36 C1 */ bl func_803621D4 +/* 8022EB14 0022BA54 48 13 36 C1 */ bl _savegpr_27 /* 8022EB18 0022BA58 7C 7F 1B 78 */ mr r31, r3 /* 8022EB1C 0022BA5C 7C 9B 23 78 */ mr r27, r4 /* 8022EB20 0022BA60 7C BC 2B 78 */ mr r28, r5 @@ -7228,7 +7228,7 @@ lbl_8022EC50: /* 8022ECF0 0022BC30 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 8022ECF4 0022BC34 CB 81 00 40 */ lfd f28, 0x40(r1) /* 8022ECF8 0022BC38 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022ECFC 0022BC3C 48 13 35 25 */ bl func_80362220 +/* 8022ECFC 0022BC3C 48 13 35 25 */ bl _restgpr_27 /* 8022ED00 0022BC40 80 01 00 84 */ lwz r0, 0x84(r1) /* 8022ED04 0022BC44 7C 08 03 A6 */ mtlr r0 /* 8022ED08 0022BC48 38 21 00 80 */ addi r1, r1, 0x80 @@ -7494,7 +7494,7 @@ lbl_8022F06C: /* 8022F0D0 0022C010 B0 7C 01 4A */ sth r3, 0x14a(r28) /* 8022F0D4 0022C014 38 7C 01 84 */ addi r3, r28, 0x184 /* 8022F0D8 0022C018 7F A4 EB 78 */ mr r4, r29 -/* 8022F0DC 0022C01C 48 13 9A 51 */ bl func_80368B2C +/* 8022F0DC 0022C01C 48 13 9A 51 */ bl strcpy /* 8022F0E0 0022C020 38 7F 0A 1C */ addi r3, r31, 0xa1c /* 8022F0E4 0022C024 38 81 00 08 */ addi r4, r1, 8 /* 8022F0E8 0022C028 48 13 99 D5 */ bl func_80368ABC @@ -7686,7 +7686,7 @@ jmessage_tRenderingProcessor_NS_do_rubystrcat: /* 8022F398 0022C2D8 DB C1 00 50 */ stfd f30, 0x50(r1) /* 8022F39C 0022C2DC F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 8022F3A0 0022C2E0 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022F3A4 0022C2E4 48 13 2E 35 */ bl func_803621D8 +/* 8022F3A4 0022C2E4 48 13 2E 35 */ bl _savegpr_28 /* 8022F3A8 0022C2E8 7C 7C 1B 78 */ mr r28, r3 /* 8022F3AC 0022C2EC 7C 9D 23 78 */ mr r29, r4 /* 8022F3B0 0022C2F0 7C BE 2B 78 */ mr r30, r5 @@ -7787,7 +7787,7 @@ lbl_8022F514: /* 8022F51C 0022C45C E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 8022F520 0022C460 CB C1 00 50 */ lfd f30, 0x50(r1) /* 8022F524 0022C464 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022F528 0022C468 48 13 2C FD */ bl func_80362224 +/* 8022F528 0022C468 48 13 2C FD */ bl _restgpr_28 /* 8022F52C 0022C46C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8022F530 0022C470 7C 08 03 A6 */ mtlr r0 /* 8022F534 0022C474 38 21 00 70 */ addi r1, r1, 0x70 @@ -9212,7 +9212,7 @@ jmessage_string_tMeasureProcessor_NS_do_rubyset: /* 80230990 0022D8D0 7C 08 02 A6 */ mflr r0 /* 80230994 0022D8D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80230998 0022D8D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023099C 0022D8DC 48 13 18 3D */ bl func_803621D8 +/* 8023099C 0022D8DC 48 13 18 3D */ bl _savegpr_28 /* 802309A0 0022D8E0 7C 7C 1B 78 */ mr r28, r3 /* 802309A4 0022D8E4 7C 9D 23 78 */ mr r29, r4 /* 802309A8 0022D8E8 38 05 FF FF */ addi r0, r5, -1 @@ -9236,7 +9236,7 @@ lbl_802309E8: /* 802309E8 0022D928 7C 1E F8 00 */ cmpw r30, r31 /* 802309EC 0022D92C 41 80 FF CC */ blt lbl_802309B8 /* 802309F0 0022D930 39 61 00 20 */ addi r11, r1, 0x20 -/* 802309F4 0022D934 48 13 18 31 */ bl func_80362224 +/* 802309F4 0022D934 48 13 18 31 */ bl _restgpr_28 /* 802309F8 0022D938 80 01 00 24 */ lwz r0, 0x24(r1) /* 802309FC 0022D93C 7C 08 03 A6 */ mtlr r0 /* 80230A00 0022D940 38 21 00 20 */ addi r1, r1, 0x20 @@ -9452,7 +9452,7 @@ lbl_80230C54: /* 80230D08 0022DC48 41 82 00 10 */ beq lbl_80230D18 /* 80230D0C 0022DC4C 48 0C F9 4D */ bl J2DTextBox_NS_getStringPtr /* 80230D10 0022DC50 38 9F 00 54 */ addi r4, r31, 0x54 -/* 80230D14 0022DC54 48 13 7E 19 */ bl func_80368B2C +/* 80230D14 0022DC54 48 13 7E 19 */ bl strcpy lbl_80230D18: /* 80230D18 0022DC58 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230D1C 0022DC5C 80 63 00 0C */ lwz r3, 0xc(r3) @@ -9460,7 +9460,7 @@ lbl_80230D18: /* 80230D24 0022DC64 41 82 00 10 */ beq lbl_80230D34 /* 80230D28 0022DC68 48 0C F9 31 */ bl J2DTextBox_NS_getStringPtr /* 80230D2C 0022DC6C 38 9F 02 54 */ addi r4, r31, 0x254 -/* 80230D30 0022DC70 48 13 7D FD */ bl func_80368B2C +/* 80230D30 0022DC70 48 13 7D FD */ bl strcpy lbl_80230D34: /* 80230D34 0022DC74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80230D38 0022DC78 80 01 00 14 */ lwz r0, 0x14(r1) @@ -11264,7 +11264,7 @@ jmessage_string_tRenderingProcessor_NS_push_word: /* 802327C8 0022F708 93 E1 00 0C */ stw r31, 0xc(r1) /* 802327CC 0022F70C 7C 7F 1B 78 */ mr r31, r3 /* 802327D0 0022F710 38 7F 04 86 */ addi r3, r31, 0x486 -/* 802327D4 0022F714 48 13 63 59 */ bl func_80368B2C +/* 802327D4 0022F714 48 13 63 59 */ bl strcpy /* 802327D8 0022F718 7F E3 FB 78 */ mr r3, r31 /* 802327DC 0022F71C 38 9F 04 86 */ addi r4, r31, 0x486 /* 802327E0 0022F720 48 07 54 19 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 21dfe39c12..942d85dd7e 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -284,7 +284,7 @@ dMsgFlow_c_NS_doFlow: /* 8024A2DC 0024721C 7C 08 02 A6 */ mflr r0 /* 8024A2E0 00247220 90 01 00 24 */ stw r0, 0x24(r1) /* 8024A2E4 00247224 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A2E8 00247228 48 11 7E ED */ bl func_803621D4 +/* 8024A2E8 00247228 48 11 7E ED */ bl _savegpr_27 /* 8024A2EC 0024722C 7C 7B 1B 78 */ mr r27, r3 /* 8024A2F0 00247230 7C 9C 23 78 */ mr r28, r4 /* 8024A2F4 00247234 7C BD 2B 78 */ mr r29, r5 @@ -368,7 +368,7 @@ lbl_8024A408: /* 8024A408 00247348 54 03 06 3E */ clrlwi r3, r0, 0x18 lbl_8024A40C: /* 8024A40C 0024734C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A410 00247350 48 11 7E 11 */ bl func_80362220 +/* 8024A410 00247350 48 11 7E 11 */ bl _restgpr_27 /* 8024A414 00247354 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024A418 00247358 7C 08 03 A6 */ mtlr r0 /* 8024A41C 0024735C 38 21 00 20 */ addi r1, r1, 0x20 @@ -588,7 +588,7 @@ dMsgFlow_c_NS_getMsgDataBlock: /* 8024A6F0 00247630 7C 08 02 A6 */ mflr r0 /* 8024A6F4 00247634 90 01 00 24 */ stw r0, 0x24(r1) /* 8024A6F8 00247638 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A6FC 0024763C 48 11 7A DD */ bl func_803621D8 +/* 8024A6FC 0024763C 48 11 7A DD */ bl _savegpr_28 /* 8024A700 00247640 7C 9C 23 78 */ mr r28, r4 /* 8024A704 00247644 80 02 D1 A0 */ lwz r0, lbl_80456BA0-_SDA2_BASE_(r2) /* 8024A708 00247648 90 01 00 08 */ stw r0, 8(r1) @@ -621,7 +621,7 @@ lbl_8024A760: /* 8024A768 002476A8 38 60 00 00 */ li r3, 0 lbl_8024A76C: /* 8024A76C 002476AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A770 002476B0 48 11 7A B5 */ bl func_80362224 +/* 8024A770 002476B0 48 11 7A B5 */ bl _restgpr_28 /* 8024A774 002476B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024A778 002476B8 7C 08 03 A6 */ mtlr r0 /* 8024A77C 002476BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -657,7 +657,7 @@ dMsgFlow_c_NS_setNodeIndex: /* 8024A7D0 00247710 7C 08 02 A6 */ mflr r0 /* 8024A7D4 00247714 90 01 00 34 */ stw r0, 0x34(r1) /* 8024A7D8 00247718 39 61 00 30 */ addi r11, r1, 0x30 -/* 8024A7DC 0024771C 48 11 79 F9 */ bl func_803621D4 +/* 8024A7DC 0024771C 48 11 79 F9 */ bl _savegpr_27 /* 8024A7E0 00247720 7C 7D 1B 78 */ mr r29, r3 /* 8024A7E4 00247724 7C 9E 23 78 */ mr r30, r4 /* 8024A7E8 00247728 7C BF 2B 78 */ mr r31, r5 @@ -761,7 +761,7 @@ lbl_8024A904: lbl_8024A940: /* 8024A940 00247880 B3 DD 00 10 */ sth r30, 0x10(r29) /* 8024A944 00247884 39 61 00 30 */ addi r11, r1, 0x30 -/* 8024A948 00247888 48 11 78 D9 */ bl func_80362220 +/* 8024A948 00247888 48 11 78 D9 */ bl _restgpr_27 /* 8024A94C 0024788C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8024A950 00247890 7C 08 03 A6 */ mtlr r0 /* 8024A954 00247894 38 21 00 30 */ addi r1, r1, 0x30 @@ -773,7 +773,7 @@ dMsgFlow_c_NS_setSelectMsg: /* 8024A960 002478A0 7C 08 02 A6 */ mflr r0 /* 8024A964 002478A4 90 01 00 24 */ stw r0, 0x24(r1) /* 8024A968 002478A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A96C 002478AC 48 11 78 69 */ bl func_803621D4 +/* 8024A96C 002478AC 48 11 78 69 */ bl _savegpr_27 /* 8024A970 002478B0 7C 7F 1B 78 */ mr r31, r3 /* 8024A974 002478B4 7C 9B 23 78 */ mr r27, r4 /* 8024A978 002478B8 7C BD 2B 78 */ mr r29, r5 @@ -829,7 +829,7 @@ lbl_8024AA28: /* 8024AA34 00247974 38 60 00 01 */ li r3, 1 lbl_8024AA38: /* 8024AA38 00247978 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AA3C 0024797C 48 11 77 E5 */ bl func_80362220 +/* 8024AA3C 0024797C 48 11 77 E5 */ bl _restgpr_27 /* 8024AA40 00247980 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024AA44 00247984 7C 08 03 A6 */ mtlr r0 /* 8024AA48 00247988 38 21 00 20 */ addi r1, r1, 0x20 @@ -904,7 +904,7 @@ dMsgFlow_c_NS_messageNodeProc: /* 8024AB34 00247A74 7C 08 02 A6 */ mflr r0 /* 8024AB38 00247A78 90 01 00 24 */ stw r0, 0x24(r1) /* 8024AB3C 00247A7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AB40 00247A80 48 11 76 99 */ bl func_803621D8 +/* 8024AB40 00247A80 48 11 76 99 */ bl _savegpr_28 /* 8024AB44 00247A84 7C 7E 1B 78 */ mr r30, r3 /* 8024AB48 00247A88 7C 86 23 78 */ mr r6, r4 /* 8024AB4C 00247A8C 7C BC 2B 78 */ mr r28, r5 @@ -1045,7 +1045,7 @@ lbl_8024AD38: /* 8024AD38 00247C78 38 60 00 00 */ li r3, 0 lbl_8024AD3C: /* 8024AD3C 00247C7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AD40 00247C80 48 11 74 E5 */ bl func_80362224 +/* 8024AD40 00247C80 48 11 74 E5 */ bl _restgpr_28 /* 8024AD44 00247C84 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024AD48 00247C88 7C 08 03 A6 */ mtlr r0 /* 8024AD4C 00247C8C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1476,7 +1476,7 @@ dMsgFlow_c_NS_query005: /* 8024B338 00248278 DB E1 00 50 */ stfd f31, 0x50(r1) /* 8024B33C 0024827C F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8024B340 00248280 39 61 00 50 */ addi r11, r1, 0x50 -/* 8024B344 00248284 48 11 6E 91 */ bl func_803621D4 +/* 8024B344 00248284 48 11 6E 91 */ bl _savegpr_27 /* 8024B348 00248288 7C BF 2B 78 */ mr r31, r5 /* 8024B34C 0024828C A3 C4 00 04 */ lhz r30, 4(r4) /* 8024B350 00248290 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1542,7 +1542,7 @@ lbl_8024B3E8: /* 8024B43C 0024837C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8024B440 00248380 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8024B444 00248384 39 61 00 50 */ addi r11, r1, 0x50 -/* 8024B448 00248388 48 11 6D D9 */ bl func_80362220 +/* 8024B448 00248388 48 11 6D D9 */ bl _restgpr_27 /* 8024B44C 0024838C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8024B450 00248390 7C 08 03 A6 */ mtlr r0 /* 8024B454 00248394 38 21 00 60 */ addi r1, r1, 0x60 @@ -1811,7 +1811,7 @@ lbl_8024B828: /* 8024B848 00248788 7F A3 EB 78 */ mr r3, r29 /* 8024B84C 0024878C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024B850 00248790 38 A0 00 01 */ li r5, 1 -/* 8024B854 00248794 4B DE 77 DD */ bl dSv_player_item_c_NS_getItem +/* 8024B854 00248794 4B DE 77 DD */ bl getItem__17dSv_player_item_cCFib /* 8024B858 00248798 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B85C 0024879C 7C 1F 00 40 */ cmplw r31, r0 /* 8024B860 002487A0 41 82 00 64 */ beq lbl_8024B8C4 @@ -1823,7 +1823,7 @@ lbl_8024B828: /* 8024B878 002487B8 7F A3 EB 78 */ mr r3, r29 /* 8024B87C 002487BC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024B880 002487C0 38 A0 00 01 */ li r5, 1 -/* 8024B884 002487C4 4B DE 77 AD */ bl dSv_player_item_c_NS_getItem +/* 8024B884 002487C4 4B DE 77 AD */ bl getItem__17dSv_player_item_cCFib /* 8024B888 002487C8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B88C 002487CC 7C 1F 00 40 */ cmplw r31, r0 /* 8024B890 002487D0 41 82 00 34 */ beq lbl_8024B8C4 @@ -1835,7 +1835,7 @@ lbl_8024B828: /* 8024B8A8 002487E8 7F A3 EB 78 */ mr r3, r29 /* 8024B8AC 002487EC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024B8B0 002487F0 38 A0 00 01 */ li r5, 1 -/* 8024B8B4 002487F4 4B DE 77 7D */ bl dSv_player_item_c_NS_getItem +/* 8024B8B4 002487F4 4B DE 77 7D */ bl getItem__17dSv_player_item_cCFib /* 8024B8B8 002487F8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B8BC 002487FC 7C 1F 00 40 */ cmplw r31, r0 /* 8024B8C0 00248800 40 82 00 08 */ bne lbl_8024B8C8 @@ -1894,7 +1894,7 @@ lbl_8024B8C8: /* 8024B98C 002488CC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024B990 002488D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024B994 002488D4 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024B998 002488D8 4B DE 7E 55 */ bl dSv_player_item_c_NS_checkEmptyBottle +/* 8024B998 002488D8 4B DE 7E 55 */ bl checkEmptyBottle__17dSv_player_item_cFv /* 8024B99C 002488DC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B9A0 002488E0 7C 1F 00 50 */ subf r0, r31, r0 /* 8024B9A4 002488E4 54 03 0F FE */ srwi r3, r0, 0x1f @@ -2145,7 +2145,7 @@ lbl_8024BD38: /* 8024BD48 00248C88 38 04 00 0F */ addi r0, r4, 0xf /* 8024BD4C 00248C8C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BD50 00248C90 38 A0 00 00 */ li r5, 0 -/* 8024BD54 00248C94 4B DE 72 DD */ bl dSv_player_item_c_NS_getItem +/* 8024BD54 00248C94 4B DE 72 DD */ bl getItem__17dSv_player_item_cCFib /* 8024BD58 00248C98 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024BD5C 00248C9C 2C 00 00 71 */ cmpwi r0, 0x71 /* 8024BD60 00248CA0 41 82 00 28 */ beq lbl_8024BD88 @@ -2257,7 +2257,7 @@ lbl_8024BEC4: /* 8024BEE8 00248E28 38 1E 00 0F */ addi r0, r30, 0xf /* 8024BEEC 00248E2C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024BEF0 00248E30 38 A0 00 00 */ li r5, 0 -/* 8024BEF4 00248E34 4B DE 71 3D */ bl dSv_player_item_c_NS_getItem +/* 8024BEF4 00248E34 4B DE 71 3D */ bl getItem__17dSv_player_item_cCFib /* 8024BEF8 00248E38 7C 64 1B 78 */ mr r4, r3 /* 8024BEFC 00248E3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024BF00 00248E40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2476,7 +2476,7 @@ lbl_8024C204: /* 8024C224 00249164 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024C228 00249168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024C22C 0024916C 38 63 00 9C */ addi r3, r3, 0x9c -/* 8024C230 00249170 4B DE 75 25 */ bl dSv_player_item_c_NS_checkInsectBottle +/* 8024C230 00249170 4B DE 75 25 */ bl checkInsectBottle__17dSv_player_item_cFv /* 8024C234 00249174 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8024C238 00249178 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024C23C 0024917C 7C 08 03 A6 */ mtlr r0 @@ -3204,7 +3204,7 @@ lbl_8024CC88: /* 8024CCB0 00249BF0 7C 08 02 A6 */ mflr r0 /* 8024CCB4 00249BF4 90 01 00 24 */ stw r0, 0x24(r1) /* 8024CCB8 00249BF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024CCBC 00249BFC 48 11 55 19 */ bl func_803621D4 +/* 8024CCBC 00249BFC 48 11 55 19 */ bl _savegpr_27 /* 8024CCC0 00249C00 7C BB 2B 78 */ mr r27, r5 /* 8024CCC4 00249C04 38 84 00 04 */ addi r4, r4, 4 /* 8024CCC8 00249C08 4B FF E4 69 */ bl dMsgFlow_c_NS_getParam_X2_ @@ -3253,7 +3253,7 @@ lbl_8024CD48: lbl_8024CD68: /* 8024CD68 00249CA8 38 60 00 01 */ li r3, 1 /* 8024CD6C 00249CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024CD70 00249CB0 48 11 54 B1 */ bl func_80362220 +/* 8024CD70 00249CB0 48 11 54 B1 */ bl _restgpr_27 /* 8024CD74 00249CB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024CD78 00249CB8 7C 08 03 A6 */ mtlr r0 /* 8024CD7C 00249CBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3323,43 +3323,43 @@ lbl_8024CDCC: /* 8024CE78 00249DB8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CE7C 00249DBC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CE80 00249DC0 38 80 00 61 */ li r4, 0x61 -/* 8024CE84 00249DC4 4B DE 65 CD */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CE84 00249DC4 4B DE 65 CD */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CE88 00249DC8 48 00 00 90 */ b lbl_8024CF18 /* 8024CE8C 00249DCC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024CE90 00249DD0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CE94 00249DD4 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CE98 00249DD8 38 80 00 62 */ li r4, 0x62 -/* 8024CE9C 00249DDC 4B DE 65 B5 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CE9C 00249DDC 4B DE 65 B5 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEA0 00249DE0 48 00 00 78 */ b lbl_8024CF18 /* 8024CEA4 00249DE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024CEA8 00249DE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CEAC 00249DEC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEB0 00249DF0 38 80 00 63 */ li r4, 0x63 -/* 8024CEB4 00249DF4 4B DE 65 9D */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CEB4 00249DF4 4B DE 65 9D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEB8 00249DF8 48 00 00 60 */ b lbl_8024CF18 /* 8024CEBC 00249DFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024CEC0 00249E00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CEC4 00249E04 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEC8 00249E08 38 80 00 64 */ li r4, 0x64 -/* 8024CECC 00249E0C 4B DE 65 85 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CECC 00249E0C 4B DE 65 85 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CED0 00249E10 48 00 00 48 */ b lbl_8024CF18 /* 8024CED4 00249E14 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024CED8 00249E18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CEDC 00249E1C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEE0 00249E20 38 80 00 65 */ li r4, 0x65 -/* 8024CEE4 00249E24 4B DE 65 6D */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CEE4 00249E24 4B DE 65 6D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CEE8 00249E28 48 00 00 30 */ b lbl_8024CF18 /* 8024CEEC 00249E2C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024CEF0 00249E30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CEF4 00249E34 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CEF8 00249E38 38 80 00 66 */ li r4, 0x66 -/* 8024CEFC 00249E3C 4B DE 65 55 */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CEFC 00249E3C 4B DE 65 55 */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc /* 8024CF00 00249E40 48 00 00 18 */ b lbl_8024CF18 /* 8024CF04 00249E44 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024CF08 00249E48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024CF0C 00249E4C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024CF10 00249E50 38 80 00 6B */ li r4, 0x6b -/* 8024CF14 00249E54 4B DE 65 3D */ bl dSv_player_item_c_NS_setEmptyBottleItemIn +/* 8024CF14 00249E54 4B DE 65 3D */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc lbl_8024CF18: /* 8024CF18 00249E58 38 60 00 01 */ li r3, 1 /* 8024CF1C 00249E5C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3483,14 +3483,14 @@ lbl_8024D0A4: /* 8024D0DC 0024A01C 54 1D 06 3E */ clrlwi r29, r0, 0x18 /* 8024D0E0 0024A020 7F A4 EB 78 */ mr r4, r29 /* 8024D0E4 0024A024 38 A0 00 00 */ li r5, 0 -/* 8024D0E8 0024A028 4B DE 5F 49 */ bl dSv_player_item_c_NS_getItem +/* 8024D0E8 0024A028 4B DE 5F 49 */ bl getItem__17dSv_player_item_cCFib /* 8024D0EC 0024A02C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024D0F0 0024A030 28 00 00 50 */ cmplwi r0, 0x50 /* 8024D0F4 0024A034 40 82 00 14 */ bne lbl_8024D108 /* 8024D0F8 0024A038 7F C3 F3 78 */ mr r3, r30 /* 8024D0FC 0024A03C 7F A4 EB 78 */ mr r4, r29 /* 8024D100 0024A040 38 A0 00 70 */ li r5, 0x70 -/* 8024D104 0024A044 4B DE 5E B5 */ bl dSv_player_item_c_NS_setItem +/* 8024D104 0024A044 4B DE 5E B5 */ bl setItem__17dSv_player_item_cFiUc lbl_8024D108: /* 8024D108 0024A048 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D10C 0024A04C 28 00 00 00 */ cmplwi r0, 0 @@ -3524,14 +3524,14 @@ lbl_8024D130: /* 8024D178 0024A0B8 54 1E 06 3E */ clrlwi r30, r0, 0x18 /* 8024D17C 0024A0BC 7F C4 F3 78 */ mr r4, r30 /* 8024D180 0024A0C0 38 A0 00 00 */ li r5, 0 -/* 8024D184 0024A0C4 4B DE 5E AD */ bl dSv_player_item_c_NS_getItem +/* 8024D184 0024A0C4 4B DE 5E AD */ bl getItem__17dSv_player_item_cCFib /* 8024D188 0024A0C8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024D18C 0024A0CC 28 00 00 50 */ cmplwi r0, 0x50 /* 8024D190 0024A0D0 40 82 00 14 */ bne lbl_8024D1A4 /* 8024D194 0024A0D4 7F A3 EB 78 */ mr r3, r29 /* 8024D198 0024A0D8 7F C4 F3 78 */ mr r4, r30 /* 8024D19C 0024A0DC 38 A0 00 71 */ li r5, 0x71 -/* 8024D1A0 0024A0E0 4B DE 5E 19 */ bl dSv_player_item_c_NS_setItem +/* 8024D1A0 0024A0E0 4B DE 5E 19 */ bl setItem__17dSv_player_item_cFiUc lbl_8024D1A4: /* 8024D1A4 0024A0E4 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D1A8 0024A0E8 28 00 00 00 */ cmplwi r0, 0 @@ -3565,14 +3565,14 @@ lbl_8024D1CC: /* 8024D214 0024A154 54 1E 06 3E */ clrlwi r30, r0, 0x18 /* 8024D218 0024A158 7F C4 F3 78 */ mr r4, r30 /* 8024D21C 0024A15C 38 A0 00 00 */ li r5, 0 -/* 8024D220 0024A160 4B DE 5E 11 */ bl dSv_player_item_c_NS_getItem +/* 8024D220 0024A160 4B DE 5E 11 */ bl getItem__17dSv_player_item_cCFib /* 8024D224 0024A164 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024D228 0024A168 28 00 00 50 */ cmplwi r0, 0x50 /* 8024D22C 0024A16C 40 82 00 14 */ bne lbl_8024D240 /* 8024D230 0024A170 7F A3 EB 78 */ mr r3, r29 /* 8024D234 0024A174 7F C4 F3 78 */ mr r4, r30 /* 8024D238 0024A178 38 A0 00 72 */ li r5, 0x72 -/* 8024D23C 0024A17C 4B DE 5D 7D */ bl dSv_player_item_c_NS_setItem +/* 8024D23C 0024A17C 4B DE 5D 7D */ bl setItem__17dSv_player_item_cFiUc lbl_8024D240: /* 8024D240 0024A180 A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D244 0024A184 28 00 00 00 */ cmplwi r0, 0 @@ -3612,7 +3612,7 @@ lbl_8024D268: /* 8024D2C8 0024A208 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D2CC 0024A20C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D2D0 0024A210 38 A0 00 70 */ li r5, 0x70 -/* 8024D2D4 0024A214 4B DE 5C E5 */ bl dSv_player_item_c_NS_setItem +/* 8024D2D4 0024A214 4B DE 5C E5 */ bl setItem__17dSv_player_item_cFiUc /* 8024D2D8 0024A218 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024D2DC 0024A21C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024D2E0 0024A220 38 63 00 F8 */ addi r3, r3, 0xf8 @@ -3632,7 +3632,7 @@ lbl_8024D268: /* 8024D318 0024A258 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D31C 0024A25C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D320 0024A260 38 A0 00 71 */ li r5, 0x71 -/* 8024D324 0024A264 4B DE 5C 95 */ bl dSv_player_item_c_NS_setItem +/* 8024D324 0024A264 4B DE 5C 95 */ bl setItem__17dSv_player_item_cFiUc /* 8024D328 0024A268 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024D32C 0024A26C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024D330 0024A270 38 63 00 F8 */ addi r3, r3, 0xf8 @@ -3652,7 +3652,7 @@ lbl_8024D268: /* 8024D368 0024A2A8 38 1F 00 0F */ addi r0, r31, 0xf /* 8024D36C 0024A2AC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8024D370 0024A2B0 38 A0 00 72 */ li r5, 0x72 -/* 8024D374 0024A2B4 4B DE 5C 45 */ bl dSv_player_item_c_NS_setItem +/* 8024D374 0024A2B4 4B DE 5C 45 */ bl setItem__17dSv_player_item_cFiUc /* 8024D378 0024A2B8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024D37C 0024A2BC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024D380 0024A2C0 38 63 00 F8 */ addi r3, r3, 0xf8 @@ -3709,14 +3709,14 @@ lbl_8024D3A8: /* 8024D448 0024A388 57 9D 06 3E */ clrlwi r29, r28, 0x18 /* 8024D44C 0024A38C 7F A4 EB 78 */ mr r4, r29 /* 8024D450 0024A390 38 A0 00 01 */ li r5, 1 -/* 8024D454 0024A394 4B DE 5B DD */ bl dSv_player_item_c_NS_getItem +/* 8024D454 0024A394 4B DE 5B DD */ bl getItem__17dSv_player_item_cCFib /* 8024D458 0024A398 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024D45C 0024A39C 28 00 00 59 */ cmplwi r0, 0x59 /* 8024D460 0024A3A0 41 82 00 18 */ beq lbl_8024D478 /* 8024D464 0024A3A4 7F C3 F3 78 */ mr r3, r30 /* 8024D468 0024A3A8 7F A4 EB 78 */ mr r4, r29 /* 8024D46C 0024A3AC 38 A0 00 50 */ li r5, 0x50 -/* 8024D470 0024A3B0 4B DE 5B 49 */ bl dSv_player_item_c_NS_setItem +/* 8024D470 0024A3B0 4B DE 5B 49 */ bl setItem__17dSv_player_item_cFiUc /* 8024D474 0024A3B4 48 00 00 70 */ b lbl_8024D4E4 lbl_8024D478: /* 8024D478 0024A3B8 3B 60 00 00 */ li r27, 0 @@ -3747,7 +3747,7 @@ lbl_8024D4C8: /* 8024D4D4 0024A414 7F C3 F3 78 */ mr r3, r30 /* 8024D4D8 0024A418 7F A4 EB 78 */ mr r4, r29 /* 8024D4DC 0024A41C 38 A0 00 50 */ li r5, 0x50 -/* 8024D4E0 0024A420 4B DE 5A D9 */ bl dSv_player_item_c_NS_setItem +/* 8024D4E0 0024A420 4B DE 5A D9 */ bl setItem__17dSv_player_item_cFiUc lbl_8024D4E4: /* 8024D4E4 0024A424 38 60 00 01 */ li r3, 1 /* 8024D4E8 0024A428 39 61 00 20 */ addi r11, r1, 0x20 @@ -3971,7 +3971,7 @@ lbl_8024D818: /* 8024D820 0024A760 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D824 0024A764 38 80 00 13 */ li r4, 0x13 /* 8024D828 0024A768 38 A0 00 FF */ li r5, 0xff -/* 8024D82C 0024A76C 4B DE 57 8D */ bl dSv_player_item_c_NS_setItem +/* 8024D82C 0024A76C 4B DE 57 8D */ bl setItem__17dSv_player_item_cFiUc /* 8024D830 0024A770 48 00 00 2C */ b lbl_8024D85C lbl_8024D834: /* 8024D834 0024A774 38 04 FF 80 */ addi r0, r4, -128 @@ -4073,49 +4073,49 @@ lbl_8024D85C: /* 8024D9AC 0024A8EC 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9B0 0024A8F0 38 80 00 61 */ li r4, 0x61 /* 8024D9B4 0024A8F4 38 A0 00 60 */ li r5, 0x60 -/* 8024D9B8 0024A8F8 4B DE 59 B9 */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024D9B8 0024A8F8 4B DE 59 B9 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9BC 0024A8FC 48 00 00 A8 */ b lbl_8024DA64 /* 8024D9C0 0024A900 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024D9C4 0024A904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024D9C8 0024A908 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9CC 0024A90C 38 80 00 62 */ li r4, 0x62 /* 8024D9D0 0024A910 38 A0 00 60 */ li r5, 0x60 -/* 8024D9D4 0024A914 4B DE 59 9D */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024D9D4 0024A914 4B DE 59 9D */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9D8 0024A918 48 00 00 8C */ b lbl_8024DA64 /* 8024D9DC 0024A91C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024D9E0 0024A920 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024D9E4 0024A924 38 63 00 9C */ addi r3, r3, 0x9c /* 8024D9E8 0024A928 38 80 00 63 */ li r4, 0x63 /* 8024D9EC 0024A92C 38 A0 00 60 */ li r5, 0x60 -/* 8024D9F0 0024A930 4B DE 59 81 */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024D9F0 0024A930 4B DE 59 81 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024D9F4 0024A934 48 00 00 70 */ b lbl_8024DA64 /* 8024D9F8 0024A938 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024D9FC 0024A93C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024DA00 0024A940 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA04 0024A944 38 80 00 64 */ li r4, 0x64 /* 8024DA08 0024A948 38 A0 00 60 */ li r5, 0x60 -/* 8024DA0C 0024A94C 4B DE 59 65 */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024DA0C 0024A94C 4B DE 59 65 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA10 0024A950 48 00 00 54 */ b lbl_8024DA64 /* 8024DA14 0024A954 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024DA18 0024A958 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024DA1C 0024A95C 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA20 0024A960 38 80 00 65 */ li r4, 0x65 /* 8024DA24 0024A964 38 A0 00 60 */ li r5, 0x60 -/* 8024DA28 0024A968 4B DE 59 49 */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024DA28 0024A968 4B DE 59 49 */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA2C 0024A96C 48 00 00 38 */ b lbl_8024DA64 /* 8024DA30 0024A970 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024DA34 0024A974 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024DA38 0024A978 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA3C 0024A97C 38 80 00 66 */ li r4, 0x66 /* 8024DA40 0024A980 38 A0 00 60 */ li r5, 0x60 -/* 8024DA44 0024A984 4B DE 59 2D */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024DA44 0024A984 4B DE 59 2D */ bl setBottleItemIn__17dSv_player_item_cFUcUc /* 8024DA48 0024A988 48 00 00 1C */ b lbl_8024DA64 /* 8024DA4C 0024A98C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024DA50 0024A990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024DA54 0024A994 38 63 00 9C */ addi r3, r3, 0x9c /* 8024DA58 0024A998 38 80 00 6B */ li r4, 0x6b /* 8024DA5C 0024A99C 38 A0 00 60 */ li r5, 0x60 -/* 8024DA60 0024A9A0 4B DE 59 11 */ bl dSv_player_item_c_NS_setBottleItemIn +/* 8024DA60 0024A9A0 4B DE 59 11 */ bl setBottleItemIn__17dSv_player_item_cFUcUc lbl_8024DA64: /* 8024DA64 0024A9A4 38 60 00 01 */ li r3, 1 /* 8024DA68 0024A9A8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index d4c34920b9..1d808a1a59 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -845,17 +845,17 @@ lbl_80233678: /* 802336B8 002305F8 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802336BC 002305FC 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 802336C0 00230600 38 84 00 6E */ addi r4, r4, 0x6e -/* 802336C4 00230604 48 13 54 69 */ bl func_80368B2C +/* 802336C4 00230604 48 13 54 69 */ bl strcpy /* 802336C8 00230608 38 7B 0C 1C */ addi r3, r27, 0xc1c /* 802336CC 0023060C 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802336D0 00230610 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 802336D4 00230614 38 84 00 6E */ addi r4, r4, 0x6e -/* 802336D8 00230618 48 13 54 55 */ bl func_80368B2C +/* 802336D8 00230618 48 13 54 55 */ bl strcpy /* 802336DC 0023061C 38 7B 0E 1C */ addi r3, r27, 0xe1c /* 802336E0 00230620 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802336E4 00230624 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 802336E8 00230628 38 84 00 6E */ addi r4, r4, 0x6e -/* 802336EC 0023062C 48 13 54 41 */ bl func_80368B2C +/* 802336EC 0023062C 48 13 54 41 */ bl strcpy /* 802336F0 00230630 3B 40 00 00 */ li r26, 0 /* 802336F4 00230634 3B C0 00 00 */ li r30, 0 /* 802336F8 00230638 3B A0 00 00 */ li r29, 0 @@ -865,11 +865,11 @@ lbl_80233704: /* 80233704 00230644 38 7D 10 1C */ addi r3, r29, 0x101c /* 80233708 00230648 7C 7B 1A 14 */ add r3, r27, r3 /* 8023370C 0023064C 38 9C 00 6E */ addi r4, r28, 0x6e -/* 80233710 00230650 48 13 54 1D */ bl func_80368B2C +/* 80233710 00230650 48 13 54 1D */ bl strcpy /* 80233714 00230654 38 7E 10 B2 */ addi r3, r30, 0x10b2 /* 80233718 00230658 7C 7B 1A 14 */ add r3, r27, r3 /* 8023371C 0023065C 38 9C 00 6E */ addi r4, r28, 0x6e -/* 80233720 00230660 48 13 54 0D */ bl func_80368B2C +/* 80233720 00230660 48 13 54 0D */ bl strcpy /* 80233724 00230664 3B 5A 00 01 */ addi r26, r26, 1 /* 80233728 00230668 2C 1A 00 03 */ cmpwi r26, 3 /* 8023372C 0023066C 3B DE 00 50 */ addi r30, r30, 0x50 @@ -1288,7 +1288,7 @@ dMsgObject_c_NS_setMessageIndex: /* 80233D08 00230C48 7C 08 02 A6 */ mflr r0 /* 80233D0C 00230C4C 90 01 00 24 */ stw r0, 0x24(r1) /* 80233D10 00230C50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80233D14 00230C54 48 12 E4 C1 */ bl func_803621D4 +/* 80233D14 00230C54 48 12 E4 C1 */ bl _savegpr_27 /* 80233D18 00230C58 7C 7D 1B 78 */ mr r29, r3 /* 80233D1C 00230C5C 7C BB 2B 78 */ mr r27, r5 /* 80233D20 00230C60 7C DF 33 78 */ mr r31, r6 @@ -1376,7 +1376,7 @@ lbl_80233E3C: /* 80233E54 00230D94 48 07 3A A1 */ bl JMessage_NS_TControl_NS_setMessageID lbl_80233E58: /* 80233E58 00230D98 39 61 00 20 */ addi r11, r1, 0x20 -/* 80233E5C 00230D9C 48 12 E3 C5 */ bl func_80362220 +/* 80233E5C 00230D9C 48 12 E3 C5 */ bl _restgpr_27 /* 80233E60 00230DA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80233E64 00230DA4 7C 08 03 A6 */ mtlr r0 /* 80233E68 00230DA8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1388,7 +1388,7 @@ dMsgObject_c_NS_setMessageIndexDemo: /* 80233E74 00230DB4 7C 08 02 A6 */ mflr r0 /* 80233E78 00230DB8 90 01 00 24 */ stw r0, 0x24(r1) /* 80233E7C 00230DBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80233E80 00230DC0 48 12 E3 59 */ bl func_803621D8 +/* 80233E80 00230DC0 48 12 E3 59 */ bl _savegpr_28 /* 80233E84 00230DC4 7C 7E 1B 78 */ mr r30, r3 /* 80233E88 00230DC8 7C BF 2B 78 */ mr r31, r5 /* 80233E8C 00230DCC 90 83 01 58 */ stw r4, 0x158(r3) @@ -1450,7 +1450,7 @@ lbl_80233EF4: /* 80233F68 00230EA8 48 07 39 8D */ bl JMessage_NS_TControl_NS_setMessageID lbl_80233F6C: /* 80233F6C 00230EAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80233F70 00230EB0 48 12 E2 B5 */ bl func_80362224 +/* 80233F70 00230EB0 48 12 E2 B5 */ bl _restgpr_28 /* 80233F74 00230EB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80233F78 00230EB8 7C 08 03 A6 */ mtlr r0 /* 80233F7C 00230EBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1489,7 +1489,7 @@ dMsgObject_c_NS_getRevoMessageIndex: /* 80233FDC 00230F1C 7C 08 02 A6 */ mflr r0 /* 80233FE0 00230F20 90 01 00 24 */ stw r0, 0x24(r1) /* 80233FE4 00230F24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80233FE8 00230F28 48 12 E1 ED */ bl func_803621D4 +/* 80233FE8 00230F28 48 12 E1 ED */ bl _savegpr_27 /* 80233FEC 00230F2C 7C 7B 1B 78 */ mr r27, r3 /* 80233FF0 00230F30 7C 9E 23 78 */ mr r30, r4 /* 80233FF4 00230F34 3C A0 80 43 */ lis r5, lbl_8043028C@ha @@ -1550,7 +1550,7 @@ lbl_802340B8: /* 802340B8 00230FF8 7F 83 E3 78 */ mr r3, r28 lbl_802340BC: /* 802340BC 00230FFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802340C0 00231000 48 12 E1 61 */ bl func_80362220 +/* 802340C0 00231000 48 12 E1 61 */ bl _restgpr_27 /* 802340C4 00231004 80 01 00 24 */ lwz r0, 0x24(r1) /* 802340C8 00231008 7C 08 03 A6 */ mtlr r0 /* 802340CC 0023100C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2722,17 +2722,17 @@ lbl_80235144: /* 802351A4 002320E4 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802351A8 002320E8 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 802351AC 002320EC 38 84 00 6E */ addi r4, r4, 0x6e -/* 802351B0 002320F0 48 13 39 7D */ bl func_80368B2C +/* 802351B0 002320F0 48 13 39 7D */ bl strcpy /* 802351B4 002320F4 38 7F 0C 1C */ addi r3, r31, 0xc1c /* 802351B8 002320F8 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802351BC 002320FC 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 802351C0 00232100 38 84 00 6E */ addi r4, r4, 0x6e -/* 802351C4 00232104 48 13 39 69 */ bl func_80368B2C +/* 802351C4 00232104 48 13 39 69 */ bl strcpy /* 802351C8 00232108 38 7F 0E 1C */ addi r3, r31, 0xe1c /* 802351CC 0023210C 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802351D0 00232110 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 802351D4 00232114 38 84 00 6E */ addi r4, r4, 0x6e -/* 802351D8 00232118 48 13 39 55 */ bl func_80368B2C +/* 802351D8 00232118 48 13 39 55 */ bl strcpy /* 802351DC 0023211C 3B 40 00 00 */ li r26, 0 /* 802351E0 00232120 3B A0 00 00 */ li r29, 0 /* 802351E4 00232124 3B 80 00 00 */ li r28, 0 @@ -2742,11 +2742,11 @@ lbl_802351F0: /* 802351F0 00232130 38 7C 10 1C */ addi r3, r28, 0x101c /* 802351F4 00232134 7C 7F 1A 14 */ add r3, r31, r3 /* 802351F8 00232138 38 9B 00 6E */ addi r4, r27, 0x6e -/* 802351FC 0023213C 48 13 39 31 */ bl func_80368B2C +/* 802351FC 0023213C 48 13 39 31 */ bl strcpy /* 80235200 00232140 38 7D 10 B2 */ addi r3, r29, 0x10b2 /* 80235204 00232144 7C 7F 1A 14 */ add r3, r31, r3 /* 80235208 00232148 38 9B 00 6E */ addi r4, r27, 0x6e -/* 8023520C 0023214C 48 13 39 21 */ bl func_80368B2C +/* 8023520C 0023214C 48 13 39 21 */ bl strcpy /* 80235210 00232150 3B 5A 00 01 */ addi r26, r26, 1 /* 80235214 00232154 2C 1A 00 03 */ cmpwi r26, 3 /* 80235218 00232158 3B BD 00 50 */ addi r29, r29, 0x50 @@ -2823,7 +2823,7 @@ dMsgObject_c_NS_selectProc: /* 80235320 00232260 7C 08 02 A6 */ mflr r0 /* 80235324 00232264 90 01 00 34 */ stw r0, 0x34(r1) /* 80235328 00232268 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023532C 0023226C 48 12 CE A9 */ bl func_803621D4 +/* 8023532C 0023226C 48 12 CE A9 */ bl _savegpr_27 /* 80235330 00232270 7C 7F 1B 78 */ mr r31, r3 /* 80235334 00232274 3B 80 00 00 */ li r28, 0 /* 80235338 00232278 3B 60 00 00 */ li r27, 0 @@ -3187,7 +3187,7 @@ lbl_8023582C: /* 80235860 002327A0 48 07 61 25 */ bl Z2SeMgr_NS_seStart lbl_80235864: /* 80235864 002327A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80235868 002327A8 48 12 C9 B9 */ bl func_80362220 +/* 80235868 002327A8 48 12 C9 B9 */ bl _restgpr_27 /* 8023586C 002327AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80235870 002327B0 7C 08 03 A6 */ mtlr r0 /* 80235874 002327B4 38 21 00 30 */ addi r1, r1, 0x30 @@ -3225,7 +3225,7 @@ dMsgObject_c_NS_inputProc: /* 802358D8 00232818 7C 08 02 A6 */ mflr r0 /* 802358DC 0023281C 90 01 00 24 */ stw r0, 0x24(r1) /* 802358E0 00232820 39 61 00 20 */ addi r11, r1, 0x20 -/* 802358E4 00232824 48 12 C8 F1 */ bl func_803621D4 +/* 802358E4 00232824 48 12 C8 F1 */ bl _savegpr_27 /* 802358E8 00232828 7C 7C 1B 78 */ mr r28, r3 /* 802358EC 0023282C 38 00 00 01 */ li r0, 1 /* 802358F0 00232830 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -3353,7 +3353,7 @@ lbl_80235A84: /* 80235AB8 002329F8 48 00 0E 2D */ bl dMsgObject_c_NS_setStatusLocal lbl_80235ABC: /* 80235ABC 002329FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80235AC0 00232A00 48 12 C7 61 */ bl func_80362220 +/* 80235AC0 00232A00 48 12 C7 61 */ bl _restgpr_27 /* 80235AC4 00232A04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80235AC8 00232A08 7C 08 03 A6 */ mtlr r0 /* 80235ACC 00232A0C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3776,7 +3776,7 @@ dMsgObject_c_NS_talkStartInit: /* 802360AC 00232FEC DB E1 00 30 */ stfd f31, 0x30(r1) /* 802360B0 00232FF0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802360B4 00232FF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802360B8 00232FF8 48 12 C1 21 */ bl func_803621D8 +/* 802360B8 00232FF8 48 12 C1 21 */ bl _savegpr_28 /* 802360BC 00232FFC 7C 7F 1B 78 */ mr r31, r3 /* 802360C0 00233000 C3 E2 B0 BC */ lfs f31, lbl_80454ABC-_SDA2_BASE_(r2) /* 802360C4 00233004 4B DD E9 2D */ bl mDoExt_getMesgFont @@ -4206,7 +4206,7 @@ lbl_802366EC: /* 802366EC 0023362C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802366F0 00233630 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802366F4 00233634 39 61 00 30 */ addi r11, r1, 0x30 -/* 802366F8 00233638 48 12 BB 2D */ bl func_80362224 +/* 802366F8 00233638 48 12 BB 2D */ bl _restgpr_28 /* 802366FC 0023363C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80236700 00233640 7C 08 03 A6 */ mtlr r0 /* 80236704 00233644 38 21 00 40 */ addi r1, r1, 0x40 @@ -4862,19 +4862,19 @@ lbl_80236FCC: /* 80236FD0 00233F10 41 82 00 10 */ beq lbl_80236FE0 /* 80236FD4 00233F14 7F 63 DB 78 */ mr r3, r27 /* 80236FD8 00233F18 38 9F 0A 1C */ addi r4, r31, 0xa1c -/* 80236FDC 00233F1C 48 13 1B 51 */ bl func_80368B2C +/* 80236FDC 00233F1C 48 13 1B 51 */ bl strcpy lbl_80236FE0: /* 80236FE0 00233F20 28 1C 00 00 */ cmplwi r28, 0 /* 80236FE4 00233F24 41 82 00 10 */ beq lbl_80236FF4 /* 80236FE8 00233F28 7F 83 E3 78 */ mr r3, r28 /* 80236FEC 00233F2C 38 9F 0E 1C */ addi r4, r31, 0xe1c -/* 80236FF0 00233F30 48 13 1B 3D */ bl func_80368B2C +/* 80236FF0 00233F30 48 13 1B 3D */ bl strcpy lbl_80236FF4: /* 80236FF4 00233F34 28 1D 00 00 */ cmplwi r29, 0 /* 80236FF8 00233F38 41 82 00 10 */ beq lbl_80237008 /* 80236FFC 00233F3C 7F A3 EB 78 */ mr r3, r29 /* 80237000 00233F40 38 9F 0C 1C */ addi r4, r31, 0xc1c -/* 80237004 00233F44 48 13 1B 29 */ bl func_80368B2C +/* 80237004 00233F44 48 13 1B 29 */ bl strcpy lbl_80237008: /* 80237008 00233F48 80 78 01 14 */ lwz r3, 0x114(r24) /* 8023700C 00233F4C 48 07 05 C9 */ bl JMessage_NS_TControl_NS_reset @@ -5509,7 +5509,7 @@ lbl_802377BC: /* 802377D8 00234718 7F 23 CB 78 */ mr r3, r25 /* 802377DC 0023471C 38 9D 00 0F */ addi r4, r29, 0xf /* 802377E0 00234720 38 A0 00 00 */ li r5, 0 -/* 802377E4 00234724 4B DF B8 4D */ bl dSv_player_item_c_NS_getItem +/* 802377E4 00234724 4B DF B8 4D */ bl getItem__17dSv_player_item_cCFib /* 802377E8 00234728 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802377EC 0023472C 28 00 00 FF */ cmplwi r0, 0xff /* 802377F0 00234730 41 82 00 54 */ beq lbl_80237844 @@ -6206,7 +6206,7 @@ dMsgObject_c_NS_getString: /* 802380F8 00235038 7C 08 02 A6 */ mflr r0 /* 802380FC 0023503C 90 01 00 34 */ stw r0, 0x34(r1) /* 80238100 00235040 39 61 00 30 */ addi r11, r1, 0x30 -/* 80238104 00235044 48 12 A0 D1 */ bl func_803621D4 +/* 80238104 00235044 48 12 A0 D1 */ bl _savegpr_27 /* 80238108 00235048 7C 7B 1B 78 */ mr r27, r3 /* 8023810C 0023504C 7C 9C 23 78 */ mr r28, r4 /* 80238110 00235050 7C BD 2B 78 */ mr r29, r5 @@ -6229,7 +6229,7 @@ dMsgObject_c_NS_getString: /* 80238154 00235094 7D 6A 5B 78 */ mr r10, r11 /* 80238158 00235098 4B FF EC 8D */ bl dMsgObject_c_NS_getStringLocal /* 8023815C 0023509C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80238160 002350A0 48 12 A0 C1 */ bl func_80362220 +/* 80238160 002350A0 48 12 A0 C1 */ bl _restgpr_27 /* 80238164 002350A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80238168 002350A8 7C 08 03 A6 */ mtlr r0 /* 8023816C 002350AC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index 8ccaeb205d..ce8a2faba5 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -808,7 +808,7 @@ dMsgScrn3Select_c_NS_setString: /* 80239C7C 00236BBC 7C 08 02 A6 */ mflr r0 /* 80239C80 00236BC0 90 01 00 24 */ stw r0, 0x24(r1) /* 80239C84 00236BC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239C88 00236BC8 48 12 85 51 */ bl func_803621D8 +/* 80239C88 00236BC8 48 12 85 51 */ bl _savegpr_28 /* 80239C8C 00236BCC 7C 7C 1B 78 */ mr r28, r3 /* 80239C90 00236BD0 7C 9D 23 78 */ mr r29, r4 /* 80239C94 00236BD4 7C BE 2B 78 */ mr r30, r5 @@ -819,7 +819,7 @@ dMsgScrn3Select_c_NS_setString: /* 80239CA8 00236BE8 80 63 00 04 */ lwz r3, 4(r3) /* 80239CAC 00236BEC 48 0C 69 AD */ bl J2DTextBox_NS_getStringPtr /* 80239CB0 00236BF0 7F A4 EB 78 */ mr r4, r29 -/* 80239CB4 00236BF4 48 12 EE 79 */ bl func_80368B2C +/* 80239CB4 00236BF4 48 12 EE 79 */ bl strcpy lbl_80239CB8: /* 80239CB8 00236BF8 80 7C 00 20 */ lwz r3, 0x20(r28) /* 80239CBC 00236BFC 28 03 00 00 */ cmplwi r3, 0 @@ -827,7 +827,7 @@ lbl_80239CB8: /* 80239CC4 00236C04 80 63 00 04 */ lwz r3, 4(r3) /* 80239CC8 00236C08 48 0C 69 91 */ bl J2DTextBox_NS_getStringPtr /* 80239CCC 00236C0C 7F C4 F3 78 */ mr r4, r30 -/* 80239CD0 00236C10 48 12 EE 5D */ bl func_80368B2C +/* 80239CD0 00236C10 48 12 EE 5D */ bl strcpy lbl_80239CD4: /* 80239CD4 00236C14 80 7C 00 24 */ lwz r3, 0x24(r28) /* 80239CD8 00236C18 28 03 00 00 */ cmplwi r3, 0 @@ -835,10 +835,10 @@ lbl_80239CD4: /* 80239CE0 00236C20 80 63 00 04 */ lwz r3, 4(r3) /* 80239CE4 00236C24 48 0C 69 75 */ bl J2DTextBox_NS_getStringPtr /* 80239CE8 00236C28 7F E4 FB 78 */ mr r4, r31 -/* 80239CEC 00236C2C 48 12 EE 41 */ bl func_80368B2C +/* 80239CEC 00236C2C 48 12 EE 41 */ bl strcpy lbl_80239CF0: /* 80239CF0 00236C30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239CF4 00236C34 48 12 85 31 */ bl func_80362224 +/* 80239CF4 00236C34 48 12 85 31 */ bl _restgpr_28 /* 80239CF8 00236C38 80 01 00 24 */ lwz r0, 0x24(r1) /* 80239CFC 00236C3C 7C 08 03 A6 */ mtlr r0 /* 80239D00 00236C40 38 21 00 20 */ addi r1, r1, 0x20 @@ -850,7 +850,7 @@ dMsgScrn3Select_c_NS_setRubyString: /* 80239D0C 00236C4C 7C 08 02 A6 */ mflr r0 /* 80239D10 00236C50 90 01 00 24 */ stw r0, 0x24(r1) /* 80239D14 00236C54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239D18 00236C58 48 12 84 C1 */ bl func_803621D8 +/* 80239D18 00236C58 48 12 84 C1 */ bl _savegpr_28 /* 80239D1C 00236C5C 7C 7C 1B 78 */ mr r28, r3 /* 80239D20 00236C60 7C 9D 23 78 */ mr r29, r4 /* 80239D24 00236C64 7C BE 2B 78 */ mr r30, r5 @@ -861,7 +861,7 @@ dMsgScrn3Select_c_NS_setRubyString: /* 80239D38 00236C78 80 63 00 04 */ lwz r3, 4(r3) /* 80239D3C 00236C7C 48 0C 69 1D */ bl J2DTextBox_NS_getStringPtr /* 80239D40 00236C80 7F A4 EB 78 */ mr r4, r29 -/* 80239D44 00236C84 48 12 ED E9 */ bl func_80368B2C +/* 80239D44 00236C84 48 12 ED E9 */ bl strcpy lbl_80239D48: /* 80239D48 00236C88 80 7C 00 2C */ lwz r3, 0x2c(r28) /* 80239D4C 00236C8C 28 03 00 00 */ cmplwi r3, 0 @@ -869,7 +869,7 @@ lbl_80239D48: /* 80239D54 00236C94 80 63 00 04 */ lwz r3, 4(r3) /* 80239D58 00236C98 48 0C 69 01 */ bl J2DTextBox_NS_getStringPtr /* 80239D5C 00236C9C 7F C4 F3 78 */ mr r4, r30 -/* 80239D60 00236CA0 48 12 ED CD */ bl func_80368B2C +/* 80239D60 00236CA0 48 12 ED CD */ bl strcpy lbl_80239D64: /* 80239D64 00236CA4 80 7C 00 30 */ lwz r3, 0x30(r28) /* 80239D68 00236CA8 28 03 00 00 */ cmplwi r3, 0 @@ -877,10 +877,10 @@ lbl_80239D64: /* 80239D70 00236CB0 80 63 00 04 */ lwz r3, 4(r3) /* 80239D74 00236CB4 48 0C 68 E5 */ bl J2DTextBox_NS_getStringPtr /* 80239D78 00236CB8 7F E4 FB 78 */ mr r4, r31 -/* 80239D7C 00236CBC 48 12 ED B1 */ bl func_80368B2C +/* 80239D7C 00236CBC 48 12 ED B1 */ bl strcpy lbl_80239D80: /* 80239D80 00236CC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80239D84 00236CC4 48 12 84 A1 */ bl func_80362224 +/* 80239D84 00236CC4 48 12 84 A1 */ bl _restgpr_28 /* 80239D88 00236CC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80239D8C 00236CCC 7C 08 03 A6 */ mtlr r0 /* 80239D90 00236CD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -914,7 +914,7 @@ dMsgScrn3Select_c_NS_draw: /* 80239DE8 00236D28 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80239DEC 00236D2C F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80239DF0 00236D30 39 61 00 50 */ addi r11, r1, 0x50 -/* 80239DF4 00236D34 48 12 83 E1 */ bl func_803621D4 +/* 80239DF4 00236D34 48 12 83 E1 */ bl _savegpr_27 /* 80239DF8 00236D38 7C 7D 1B 78 */ mr r29, r3 /* 80239DFC 00236D3C FF C0 08 90 */ fmr f30, f1 /* 80239E00 00236D40 FF E0 10 90 */ fmr f31, f2 @@ -1084,7 +1084,7 @@ lbl_8023A06C: /* 8023A074 00236FB4 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 8023A078 00236FB8 CB C1 00 50 */ lfd f30, 0x50(r1) /* 8023A07C 00236FBC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8023A080 00236FC0 48 12 81 A1 */ bl func_80362220 +/* 8023A080 00236FC0 48 12 81 A1 */ bl _restgpr_27 /* 8023A084 00236FC4 80 01 00 74 */ lwz r0, 0x74(r1) /* 8023A088 00236FC8 7C 08 03 A6 */ mtlr r0 /* 8023A08C 00236FCC 38 21 00 70 */ addi r1, r1, 0x70 @@ -1304,7 +1304,7 @@ dMsgScrn3Select_c_NS_selAnimeMove: /* 8023A39C 002372DC 7C 08 02 A6 */ mflr r0 /* 8023A3A0 002372E0 90 01 00 34 */ stw r0, 0x34(r1) /* 8023A3A4 002372E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023A3A8 002372E8 48 12 7E 31 */ bl func_803621D8 +/* 8023A3A8 002372E8 48 12 7E 31 */ bl _savegpr_28 /* 8023A3AC 002372EC 7C 7E 1B 78 */ mr r30, r3 /* 8023A3B0 002372F0 98 A3 01 10 */ stb r5, 0x110(r3) /* 8023A3B4 002372F4 98 83 01 11 */ stb r4, 0x111(r3) @@ -1489,7 +1489,7 @@ lbl_8023A648: /* 8023A660 002375A0 7C 00 00 34 */ cntlzw r0, r0 /* 8023A664 002375A4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8023A668 002375A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023A66C 002375AC 48 12 7B B9 */ bl func_80362224 +/* 8023A66C 002375AC 48 12 7B B9 */ bl _restgpr_28 /* 8023A670 002375B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023A674 002375B4 7C 08 03 A6 */ mtlr r0 /* 8023A678 002375B8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1505,7 +1505,7 @@ dMsgScrn3Select_c_NS_selAnimeEnd: /* 8023A694 002375D4 DB C1 00 20 */ stfd f30, 0x20(r1) /* 8023A698 002375D8 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8023A69C 002375DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023A6A0 002375E0 48 12 7B 39 */ bl func_803621D8 +/* 8023A6A0 002375E0 48 12 7B 39 */ bl _savegpr_28 /* 8023A6A4 002375E4 7C 7F 1B 78 */ mr r31, r3 /* 8023A6A8 002375E8 88 03 01 13 */ lbz r0, 0x113(r3) /* 8023A6AC 002375EC 28 00 00 06 */ cmplwi r0, 6 @@ -1674,7 +1674,7 @@ lbl_8023A90C: /* 8023A914 00237854 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8023A918 00237858 CB C1 00 20 */ lfd f30, 0x20(r1) /* 8023A91C 0023785C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023A920 00237860 48 12 79 05 */ bl func_80362224 +/* 8023A920 00237860 48 12 79 05 */ bl _restgpr_28 /* 8023A924 00237864 80 01 00 44 */ lwz r0, 0x44(r1) /* 8023A928 00237868 7C 08 03 A6 */ mtlr r0 /* 8023A92C 0023786C 38 21 00 40 */ addi r1, r1, 0x40 @@ -1760,7 +1760,7 @@ dMsgScrn3Select_c_NS_getTextBoxGlobalPosY: /* 8023AA10 00237950 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8023AA14 00237954 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8023AA18 00237958 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AA1C 0023795C 48 12 77 BD */ bl func_803621D8 +/* 8023AA1C 0023795C 48 12 77 BD */ bl _savegpr_28 /* 8023AA20 00237960 7C 7C 1B 78 */ mr r28, r3 /* 8023AA24 00237964 3C 60 80 3A */ lis r3, lbl_80399828@ha /* 8023AA28 00237968 38 83 98 28 */ addi r4, r3, lbl_80399828@l @@ -1811,7 +1811,7 @@ lbl_8023AAC4: /* 8023AAD4 00237A14 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8023AAD8 00237A18 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8023AADC 00237A1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AAE0 00237A20 48 12 77 45 */ bl func_80362224 +/* 8023AAE0 00237A20 48 12 77 45 */ bl _restgpr_28 /* 8023AAE4 00237A24 80 01 00 44 */ lwz r0, 0x44(r1) /* 8023AAE8 00237A28 7C 08 03 A6 */ mtlr r0 /* 8023AAEC 00237A2C 38 21 00 40 */ addi r1, r1, 0x40 @@ -1824,7 +1824,7 @@ lbl_8023AAC4: /* 8023AB08 00237A48 DB C1 00 30 */ stfd f30, 0x30(r1) /* 8023AB0C 00237A4C F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 8023AB10 00237A50 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AB14 00237A54 48 12 76 C5 */ bl func_803621D8 +/* 8023AB14 00237A54 48 12 76 C5 */ bl _savegpr_28 /* 8023AB18 00237A58 7C 7F 1B 78 */ mr r31, r3 /* 8023AB1C 00237A5C 3C 60 80 3A */ lis r3, lbl_80399834@ha /* 8023AB20 00237A60 38 83 98 34 */ addi r4, r3, lbl_80399834@l @@ -1886,7 +1886,7 @@ lbl_8023AB9C: /* 8023ABF4 00237B34 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 8023ABF8 00237B38 CB C1 00 30 */ lfd f30, 0x30(r1) /* 8023ABFC 00237B3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023AC00 00237B40 48 12 76 25 */ bl func_80362224 +/* 8023AC00 00237B40 48 12 76 25 */ bl _restgpr_28 /* 8023AC04 00237B44 80 01 00 54 */ lwz r0, 0x54(r1) /* 8023AC08 00237B48 7C 08 03 A6 */ mtlr r0 /* 8023AC0C 00237B4C 38 21 00 50 */ addi r1, r1, 0x50 @@ -2271,7 +2271,7 @@ lbl_8023B134: /* 8023B15C 0023809C DB C1 00 20 */ stfd f30, 0x20(r1) /* 8023B160 002380A0 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8023B164 002380A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B168 002380A8 48 12 70 71 */ bl func_803621D8 +/* 8023B168 002380A8 48 12 70 71 */ bl _savegpr_28 /* 8023B16C 002380AC 7C 7C 1B 78 */ mr r28, r3 /* 8023B170 002380B0 80 63 00 14 */ lwz r3, 0x14(r3) /* 8023B174 002380B4 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) @@ -2316,7 +2316,7 @@ lbl_8023B200: /* 8023B208 00238148 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8023B20C 0023814C CB C1 00 20 */ lfd f30, 0x20(r1) /* 8023B210 00238150 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B214 00238154 48 12 70 11 */ bl func_80362224 +/* 8023B214 00238154 48 12 70 11 */ bl _restgpr_28 /* 8023B218 00238158 80 01 00 44 */ lwz r0, 0x44(r1) /* 8023B21C 0023815C 7C 08 03 A6 */ mtlr r0 /* 8023B220 00238160 38 21 00 40 */ addi r1, r1, 0x40 @@ -2330,7 +2330,7 @@ dMsgScrn3Select_c_NS_selectScale: /* 8023B234 00238174 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8023B238 00238178 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8023B23C 0023817C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B240 00238180 48 12 6F 99 */ bl func_803621D8 +/* 8023B240 00238180 48 12 6F 99 */ bl _savegpr_28 /* 8023B244 00238184 7C 7E 1B 78 */ mr r30, r3 /* 8023B248 00238188 C3 E2 B1 60 */ lfs f31, lbl_80454B60-_SDA2_BASE_(r2) /* 8023B24C 0023818C C0 03 01 04 */ lfs f0, 0x104(r3) @@ -2483,7 +2483,7 @@ lbl_8023B48C: /* 8023B48C 002383CC E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8023B490 002383D0 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8023B494 002383D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B498 002383D8 48 12 6D 8D */ bl func_80362224 +/* 8023B498 002383D8 48 12 6D 8D */ bl _restgpr_28 /* 8023B49C 002383DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023B4A0 002383E0 7C 08 03 A6 */ mtlr r0 /* 8023B4A4 002383E4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_base.s b/asm/d/msg/scrn/d_msg_scrn_base.s index 50dea6a308..759ce951f2 100644 --- a/asm/d/msg/scrn/d_msg_scrn_base.s +++ b/asm/d/msg/scrn/d_msg_scrn_base.s @@ -186,7 +186,7 @@ dMsgScrnBase_c_NS_setString: /* 8023C364 002392A4 7C 08 02 A6 */ mflr r0 /* 8023C368 002392A8 90 01 00 24 */ stw r0, 0x24(r1) /* 8023C36C 002392AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023C370 002392B0 48 12 5E 65 */ bl func_803621D4 +/* 8023C370 002392B0 48 12 5E 65 */ bl _savegpr_27 /* 8023C374 002392B4 7C 7B 1B 78 */ mr r27, r3 /* 8023C378 002392B8 7C 9C 23 78 */ mr r28, r4 /* 8023C37C 002392BC 7C BD 2B 78 */ mr r29, r5 @@ -202,20 +202,20 @@ lbl_8023C388: /* 8023C3A0 002392E0 80 63 00 04 */ lwz r3, 4(r3) /* 8023C3A4 002392E4 48 0C 42 B5 */ bl J2DTextBox_NS_getStringPtr /* 8023C3A8 002392E8 7F 84 E3 78 */ mr r4, r28 -/* 8023C3AC 002392EC 48 12 C7 81 */ bl func_80368B2C +/* 8023C3AC 002392EC 48 12 C7 81 */ bl strcpy /* 8023C3B0 002392F0 48 00 00 14 */ b lbl_8023C3C4 lbl_8023C3B4: /* 8023C3B4 002392F4 80 63 00 04 */ lwz r3, 4(r3) /* 8023C3B8 002392F8 48 0C 42 A1 */ bl J2DTextBox_NS_getStringPtr /* 8023C3BC 002392FC 7F A4 EB 78 */ mr r4, r29 -/* 8023C3C0 00239300 48 12 C7 6D */ bl func_80368B2C +/* 8023C3C0 00239300 48 12 C7 6D */ bl strcpy lbl_8023C3C4: /* 8023C3C4 00239304 3B DE 00 01 */ addi r30, r30, 1 /* 8023C3C8 00239308 2C 1E 00 07 */ cmpwi r30, 7 /* 8023C3CC 0023930C 3B FF 00 04 */ addi r31, r31, 4 /* 8023C3D0 00239310 41 80 FF B8 */ blt lbl_8023C388 /* 8023C3D4 00239314 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023C3D8 00239318 48 12 5E 49 */ bl func_80362220 +/* 8023C3D8 00239318 48 12 5E 49 */ bl _restgpr_27 /* 8023C3DC 0023931C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023C3E0 00239320 7C 08 03 A6 */ mtlr r0 /* 8023C3E4 00239324 38 21 00 20 */ addi r1, r1, 0x20 @@ -227,7 +227,7 @@ dMsgScrnBase_c_NS_setRubyString: /* 8023C3F0 00239330 7C 08 02 A6 */ mflr r0 /* 8023C3F4 00239334 90 01 00 24 */ stw r0, 0x24(r1) /* 8023C3F8 00239338 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023C3FC 0023933C 48 12 5D DD */ bl func_803621D8 +/* 8023C3FC 0023933C 48 12 5D DD */ bl _savegpr_28 /* 8023C400 00239340 7C 7C 1B 78 */ mr r28, r3 /* 8023C404 00239344 7C 9D 23 78 */ mr r29, r4 /* 8023C408 00239348 3B C0 00 00 */ li r30, 0 @@ -240,14 +240,14 @@ lbl_8023C410: /* 8023C420 00239360 80 63 00 04 */ lwz r3, 4(r3) /* 8023C424 00239364 48 0C 42 35 */ bl J2DTextBox_NS_getStringPtr /* 8023C428 00239368 7F A4 EB 78 */ mr r4, r29 -/* 8023C42C 0023936C 48 12 C7 01 */ bl func_80368B2C +/* 8023C42C 0023936C 48 12 C7 01 */ bl strcpy lbl_8023C430: /* 8023C430 00239370 3B DE 00 01 */ addi r30, r30, 1 /* 8023C434 00239374 2C 1E 00 03 */ cmpwi r30, 3 /* 8023C438 00239378 3B FF 00 04 */ addi r31, r31, 4 /* 8023C43C 0023937C 41 80 FF D4 */ blt lbl_8023C410 /* 8023C440 00239380 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023C444 00239384 48 12 5D E1 */ bl func_80362224 +/* 8023C444 00239384 48 12 5D E1 */ bl _restgpr_28 /* 8023C448 00239388 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023C44C 0023938C 7C 08 03 A6 */ mtlr r0 /* 8023C450 00239390 38 21 00 20 */ addi r1, r1, 0x20 @@ -296,7 +296,7 @@ lbl_8023C430: /* 8023C4FC 0023943C 90 01 00 24 */ stw r0, 0x24(r1) /* 8023C500 00239440 DB E1 00 18 */ stfd f31, 0x18(r1) /* 8023C504 00239444 39 61 00 18 */ addi r11, r1, 0x18 -/* 8023C508 00239448 48 12 5C D1 */ bl func_803621D8 +/* 8023C508 00239448 48 12 5C D1 */ bl _savegpr_28 /* 8023C50C 0023944C 7C 7C 1B 78 */ mr r28, r3 /* 8023C510 00239450 FF E0 08 90 */ fmr f31, f1 /* 8023C514 00239454 3B A0 00 00 */ li r29, 0 @@ -321,7 +321,7 @@ lbl_8023C548: /* 8023C554 00239494 41 80 FF C8 */ blt lbl_8023C51C /* 8023C558 00239498 CB E1 00 18 */ lfd f31, 0x18(r1) /* 8023C55C 0023949C 39 61 00 18 */ addi r11, r1, 0x18 -/* 8023C560 002394A0 48 12 5C C5 */ bl func_80362224 +/* 8023C560 002394A0 48 12 5C C5 */ bl _restgpr_28 /* 8023C564 002394A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023C568 002394A8 7C 08 03 A6 */ mtlr r0 /* 8023C56C 002394AC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index fc1f4be2ab..3712f6230d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -592,7 +592,7 @@ lbl_8023D46C: /* 8023D53C 0023A47C 7C 08 02 A6 */ mflr r0 /* 8023D540 0023A480 90 01 00 24 */ stw r0, 0x24(r1) /* 8023D544 0023A484 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023D548 0023A488 48 12 4C 8D */ bl func_803621D4 +/* 8023D548 0023A488 48 12 4C 8D */ bl _savegpr_27 /* 8023D54C 0023A48C 7C 7E 1B 79 */ or. r30, r3, r3 /* 8023D550 0023A490 7C 9F 23 78 */ mr r31, r4 /* 8023D554 0023A494 41 82 02 68 */ beq lbl_8023D7BC @@ -768,7 +768,7 @@ lbl_8023D758: lbl_8023D7BC: /* 8023D7BC 0023A6FC 7F C3 F3 78 */ mr r3, r30 /* 8023D7C0 0023A700 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023D7C4 0023A704 48 12 4A 5D */ bl func_80362220 +/* 8023D7C4 0023A704 48 12 4A 5D */ bl _restgpr_27 /* 8023D7C8 0023A708 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023D7CC 0023A70C 7C 08 03 A6 */ mtlr r0 /* 8023D7D0 0023A710 38 21 00 20 */ addi r1, r1, 0x20 @@ -784,7 +784,7 @@ dMsgScrnExplain_c_NS_move: /* 8023D7EC 0023A72C DB C1 00 20 */ stfd f30, 0x20(r1) /* 8023D7F0 0023A730 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8023D7F4 0023A734 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023D7F8 0023A738 48 12 49 DD */ bl func_803621D4 +/* 8023D7F8 0023A738 48 12 49 DD */ bl _savegpr_27 /* 8023D7FC 0023A73C 7C 7B 1B 78 */ mr r27, r3 /* 8023D800 0023A740 8B A3 00 60 */ lbz r29, 0x60(r3) /* 8023D804 0023A744 C3 C2 B1 C0 */ lfs f30, lbl_80454BC0-_SDA2_BASE_(r2) @@ -854,7 +854,7 @@ lbl_8023D8A8: /* 8023D8F8 0023A838 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8023D8FC 0023A83C CB C1 00 20 */ lfd f30, 0x20(r1) /* 8023D900 0023A840 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023D904 0023A844 48 12 49 1D */ bl func_80362220 +/* 8023D904 0023A844 48 12 49 1D */ bl _restgpr_27 /* 8023D908 0023A848 80 01 00 44 */ lwz r0, 0x44(r1) /* 8023D90C 0023A84C 7C 08 03 A6 */ mtlr r0 /* 8023D910 0023A850 38 21 00 40 */ addi r1, r1, 0x40 @@ -907,7 +907,7 @@ lbl_8023D9AC: /* 8023D9B4 0023A8F4 48 0C 2C A5 */ bl J2DTextBox_NS_getStringPtr /* 8023D9B8 0023A8F8 7C 64 1B 78 */ mr r4, r3 /* 8023D9BC 0023A8FC 38 61 00 08 */ addi r3, r1, 8 -/* 8023D9C0 0023A900 48 12 B1 6D */ bl func_80368B2C +/* 8023D9C0 0023A900 48 12 B1 6D */ bl strcpy /* 8023D9C4 0023A904 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8023D9C8 0023A908 C0 22 B1 C0 */ lfs f1, lbl_80454BC0-_SDA2_BASE_(r2) /* 8023D9CC 0023A90C FC 40 08 90 */ fmr f2, f1 @@ -937,7 +937,7 @@ lbl_8023D9AC: /* 8023DA2C 0023A96C 80 63 00 04 */ lwz r3, 4(r3) /* 8023DA30 0023A970 48 0C 2C 29 */ bl J2DTextBox_NS_getStringPtr /* 8023DA34 0023A974 38 81 00 08 */ addi r4, r1, 8 -/* 8023DA38 0023A978 48 12 B0 F5 */ bl func_80368B2C +/* 8023DA38 0023A978 48 12 B0 F5 */ bl strcpy /* 8023DA3C 0023A97C 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8023DA40 0023A980 28 03 00 00 */ cmplwi r3, 0 /* 8023DA44 0023A984 41 82 00 64 */ beq lbl_8023DAA8 @@ -989,7 +989,7 @@ dMsgScrnExplain_c_NS_open_request_init: /* 8023DAE0 0023AA20 7C 08 02 A6 */ mflr r0 /* 8023DAE4 0023AA24 90 01 06 24 */ stw r0, 0x624(r1) /* 8023DAE8 0023AA28 39 61 06 20 */ addi r11, r1, 0x620 -/* 8023DAEC 0023AA2C 48 12 46 ED */ bl func_803621D8 +/* 8023DAEC 0023AA2C 48 12 46 ED */ bl _savegpr_28 /* 8023DAF0 0023AA30 7C 7F 1B 78 */ mr r31, r3 /* 8023DAF4 0023AA34 3B 80 00 00 */ li r28, 0 /* 8023DAF8 0023AA38 80 63 00 08 */ lwz r3, 8(r3) @@ -1018,12 +1018,12 @@ lbl_8023DB10: /* 8023DB50 0023AA90 80 63 00 04 */ lwz r3, 4(r3) /* 8023DB54 0023AA94 48 0C 2B 05 */ bl J2DTextBox_NS_getStringPtr /* 8023DB58 0023AA98 38 81 04 10 */ addi r4, r1, 0x410 -/* 8023DB5C 0023AA9C 48 12 AF D1 */ bl func_80368B2C +/* 8023DB5C 0023AA9C 48 12 AF D1 */ bl strcpy /* 8023DB60 0023AAA0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023DB64 0023AAA4 80 63 00 04 */ lwz r3, 4(r3) /* 8023DB68 0023AAA8 48 0C 2A F1 */ bl J2DTextBox_NS_getStringPtr /* 8023DB6C 0023AAAC 38 81 00 10 */ addi r4, r1, 0x10 -/* 8023DB70 0023AAB0 48 12 AF BD */ bl func_80368B2C +/* 8023DB70 0023AAB0 48 12 AF BD */ bl strcpy /* 8023DB74 0023AAB4 3B 80 00 00 */ li r28, 0 /* 8023DB78 0023AAB8 3B C0 00 00 */ li r30, 0 lbl_8023DB7C: @@ -1034,7 +1034,7 @@ lbl_8023DB7C: /* 8023DB8C 0023AACC 80 63 00 04 */ lwz r3, 4(r3) /* 8023DB90 0023AAD0 48 0C 2A C9 */ bl J2DTextBox_NS_getStringPtr /* 8023DB94 0023AAD4 38 81 02 10 */ addi r4, r1, 0x210 -/* 8023DB98 0023AAD8 48 12 AF 95 */ bl func_80368B2C +/* 8023DB98 0023AAD8 48 12 AF 95 */ bl strcpy lbl_8023DB9C: /* 8023DB9C 0023AADC 3B 9C 00 01 */ addi r28, r28, 1 /* 8023DBA0 0023AAE0 2C 1C 00 02 */ cmpwi r28, 2 @@ -1051,7 +1051,7 @@ lbl_8023DBC4: /* 8023DBC8 0023AB08 98 1F 00 60 */ stb r0, 0x60(r31) lbl_8023DBCC: /* 8023DBCC 0023AB0C 39 61 06 20 */ addi r11, r1, 0x620 -/* 8023DBD0 0023AB10 48 12 46 55 */ bl func_80362224 +/* 8023DBD0 0023AB10 48 12 46 55 */ bl _restgpr_28 /* 8023DBD4 0023AB14 80 01 06 24 */ lwz r0, 0x624(r1) /* 8023DBD8 0023AB18 7C 08 03 A6 */ mtlr r0 /* 8023DBDC 0023AB1C 38 21 06 20 */ addi r1, r1, 0x620 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index 258d253227..ccda6e9871 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -2062,7 +2062,7 @@ dMsgScrnHowl_c_NS_drawGuide: /* 802427F4 0023F734 DA E1 01 20 */ stfd f23, 0x120(r1) /* 802427F8 0023F738 F2 E1 01 28 */ psq_st f23, 296(r1), 0, qr0 /* 802427FC 0023F73C 39 61 01 20 */ addi r11, r1, 0x120 -/* 80242800 0023F740 48 11 F9 D5 */ bl func_803621D4 +/* 80242800 0023F740 48 11 F9 D5 */ bl _savegpr_27 /* 80242804 0023F744 7C 7C 1B 78 */ mr r28, r3 /* 80242808 0023F748 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024280C 0023F74C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2578,7 +2578,7 @@ lbl_80242F78: /* 80242FC4 0023FF04 E2 E1 01 28 */ psq_l f23, 296(r1), 0, qr0 /* 80242FC8 0023FF08 CA E1 01 20 */ lfd f23, 0x120(r1) /* 80242FCC 0023FF0C 39 61 01 20 */ addi r11, r1, 0x120 -/* 80242FD0 0023FF10 48 11 F2 51 */ bl func_80362220 +/* 80242FD0 0023FF10 48 11 F2 51 */ bl _restgpr_27 /* 80242FD4 0023FF14 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 80242FD8 0023FF18 7C 08 03 A6 */ mtlr r0 /* 80242FDC 0023FF1C 38 21 01 B0 */ addi r1, r1, 0x1b0 @@ -3292,7 +3292,7 @@ dMsgScrnHowl_c_NS_calcGuide: /* 80243A54 00240994 7C 08 02 A6 */ mflr r0 /* 80243A58 00240998 90 01 00 24 */ stw r0, 0x24(r1) /* 80243A5C 0024099C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80243A60 002409A0 48 11 E7 79 */ bl func_803621D8 +/* 80243A60 002409A0 48 11 E7 79 */ bl _savegpr_28 /* 80243A64 002409A4 7C 7E 1B 78 */ mr r30, r3 /* 80243A68 002409A8 A0 03 21 38 */ lhz r0, 0x2138(r3) /* 80243A6C 002409AC 28 00 00 00 */ cmplwi r0, 0 @@ -3390,7 +3390,7 @@ lbl_80243B98: /* 80243BC4 00240B04 B0 1E 21 30 */ sth r0, 0x2130(r30) lbl_80243BC8: /* 80243BC8 00240B08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80243BCC 00240B0C 48 11 E6 59 */ bl func_80362224 +/* 80243BCC 00240B0C 48 11 E6 59 */ bl _restgpr_28 /* 80243BD0 00240B10 80 01 00 24 */ lwz r0, 0x24(r1) /* 80243BD4 00240B14 7C 08 03 A6 */ mtlr r0 /* 80243BD8 00240B18 38 21 00 20 */ addi r1, r1, 0x20 @@ -3406,7 +3406,7 @@ dMsgScrnHowl_c_NS_moveLineV: /* 80243BF4 00240B34 DB C1 00 20 */ stfd f30, 0x20(r1) /* 80243BF8 00240B38 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 80243BFC 00240B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80243C00 00240B40 48 11 E5 D9 */ bl func_803621D8 +/* 80243C00 00240B40 48 11 E5 D9 */ bl _savegpr_28 /* 80243C04 00240B44 7C 7C 1B 78 */ mr r28, r3 /* 80243C08 00240B48 80 A3 00 D0 */ lwz r5, 0xd0(r3) /* 80243C0C 00240B4C C0 45 00 24 */ lfs f2, 0x24(r5) @@ -3523,7 +3523,7 @@ lbl_80243D60: /* 80243DAC 00240CEC E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 80243DB0 00240CF0 CB C1 00 20 */ lfd f30, 0x20(r1) /* 80243DB4 00240CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80243DB8 00240CF8 48 11 E4 6D */ bl func_80362224 +/* 80243DB8 00240CF8 48 11 E4 6D */ bl _restgpr_28 /* 80243DBC 00240CFC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80243DC0 00240D00 7C 08 03 A6 */ mtlr r0 /* 80243DC4 00240D04 38 21 00 40 */ addi r1, r1, 0x40 @@ -3837,7 +3837,7 @@ dMsgScrnHowl_c_NS_initGuideData: /* 80244200 00241140 7C 08 02 A6 */ mflr r0 /* 80244204 00241144 90 01 00 24 */ stw r0, 0x24(r1) /* 80244208 00241148 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024420C 0024114C 48 11 DF CD */ bl func_803621D8 +/* 8024420C 0024114C 48 11 DF CD */ bl _savegpr_28 /* 80244210 00241150 7C 7C 1B 78 */ mr r28, r3 /* 80244214 00241154 4B FF FF 39 */ bl dMsgScrnHowl_c_NS_calcPitchLevel /* 80244218 00241158 3B A0 00 00 */ li r29, 0 @@ -3898,7 +3898,7 @@ lbl_802442DC: /* 802442E4 00241224 3B FF 00 04 */ addi r31, r31, 4 /* 802442E8 00241228 41 80 FF 38 */ blt lbl_80244220 /* 802442EC 0024122C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802442F0 00241230 48 11 DF 35 */ bl func_80362224 +/* 802442F0 00241230 48 11 DF 35 */ bl _restgpr_28 /* 802442F4 00241234 80 01 00 24 */ lwz r0, 0x24(r1) /* 802442F8 00241238 7C 08 03 A6 */ mtlr r0 /* 802442FC 0024123C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3910,7 +3910,7 @@ dMsgScrnHowl_c_NS_getGuideDataSize: /* 80244308 00241248 7C 08 02 A6 */ mflr r0 /* 8024430C 0024124C 90 01 00 24 */ stw r0, 0x24(r1) /* 80244310 00241250 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244314 00241254 48 11 DE C5 */ bl func_803621D8 +/* 80244314 00241254 48 11 DE C5 */ bl _savegpr_28 /* 80244318 00241258 7C 7C 1B 78 */ mr r28, r3 /* 8024431C 0024125C 8B C3 21 97 */ lbz r30, 0x2197(r3) /* 80244320 00241260 3B A0 00 00 */ li r29, 0 @@ -3937,7 +3937,7 @@ lbl_80244364: /* 8024436C 002412AC 41 80 FF C4 */ blt lbl_80244330 /* 80244370 002412B0 7F C3 F3 78 */ mr r3, r30 /* 80244374 002412B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244378 002412B8 48 11 DE AD */ bl func_80362224 +/* 80244378 002412B8 48 11 DE AD */ bl _restgpr_28 /* 8024437C 002412BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80244380 002412C0 7C 08 03 A6 */ mtlr r0 /* 80244384 002412C4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 33ab2a8cef..869d1fa310 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -1734,7 +1734,7 @@ lbl_8023FF00: /* 802400D8 0023D018 DB E1 00 20 */ stfd f31, 0x20(r1) /* 802400DC 0023D01C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 802400E0 0023D020 39 61 00 20 */ addi r11, r1, 0x20 -/* 802400E4 0023D024 48 12 20 F5 */ bl func_803621D8 +/* 802400E4 0023D024 48 12 20 F5 */ bl _savegpr_28 /* 802400E8 0023D028 7C 7C 1B 78 */ mr r28, r3 /* 802400EC 0023D02C FF E0 08 90 */ fmr f31, f1 /* 802400F0 0023D030 D3 E3 01 3C */ stfs f31, 0x13c(r3) @@ -1767,7 +1767,7 @@ lbl_80240144: /* 80240154 0023D094 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80240158 0023D098 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8024015C 0023D09C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80240160 0023D0A0 48 12 20 C5 */ bl func_80362224 +/* 80240160 0023D0A0 48 12 20 C5 */ bl _restgpr_28 /* 80240164 0023D0A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80240168 0023D0A8 7C 08 03 A6 */ mtlr r0 /* 8024016C 0023D0AC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index 2dcb7e56c6..630bfb61ee 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -349,7 +349,7 @@ lbl_80244A40: /* 80244A78 002419B8 7C 08 02 A6 */ mflr r0 /* 80244A7C 002419BC 90 01 00 24 */ stw r0, 0x24(r1) /* 80244A80 002419C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244A84 002419C4 48 11 D7 51 */ bl func_803621D4 +/* 80244A84 002419C4 48 11 D7 51 */ bl _savegpr_27 /* 80244A88 002419C8 7C 7E 1B 79 */ or. r30, r3, r3 /* 80244A8C 002419CC 7C 9F 23 78 */ mr r31, r4 /* 80244A90 002419D0 41 82 01 80 */ beq lbl_80244C10 @@ -459,7 +459,7 @@ lbl_80244B90: lbl_80244C10: /* 80244C10 00241B50 7F C3 F3 78 */ mr r3, r30 /* 80244C14 00241B54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244C18 00241B58 48 11 D6 09 */ bl func_80362220 +/* 80244C18 00241B58 48 11 D6 09 */ bl _restgpr_27 /* 80244C1C 00241B5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80244C20 00241B60 7C 08 03 A6 */ mtlr r0 /* 80244C24 00241B64 38 21 00 20 */ addi r1, r1, 0x20 @@ -561,7 +561,7 @@ lbl_80244D08: /* 80244D98 00241CD8 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80244D9C 00241CDC F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80244DA0 00241CE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244DA4 00241CE4 48 11 D4 35 */ bl func_803621D8 +/* 80244DA4 00241CE4 48 11 D4 35 */ bl _savegpr_28 /* 80244DA8 00241CE8 7C 7C 1B 78 */ mr r28, r3 /* 80244DAC 00241CEC FF E0 08 90 */ fmr f31, f1 /* 80244DB0 00241CF0 80 63 00 08 */ lwz r3, 8(r3) @@ -592,7 +592,7 @@ lbl_80244DFC: /* 80244E0C 00241D4C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80244E10 00241D50 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80244E14 00241D54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244E18 00241D58 48 11 D4 0D */ bl func_80362224 +/* 80244E18 00241D58 48 11 D4 0D */ bl _restgpr_28 /* 80244E1C 00241D5C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80244E20 00241D60 7C 08 03 A6 */ mtlr r0 /* 80244E24 00241D64 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_kanban.s b/asm/d/msg/scrn/d_msg_scrn_kanban.s index 42e229fe48..5a9f04f2a9 100644 --- a/asm/d/msg/scrn/d_msg_scrn_kanban.s +++ b/asm/d/msg/scrn/d_msg_scrn_kanban.s @@ -11,7 +11,7 @@ dMsgScrnKanban_c: /* 80244E44 00241D84 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80244E48 00241D88 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80244E4C 00241D8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80244E50 00241D90 48 11 D3 85 */ bl func_803621D4 +/* 80244E50 00241D90 48 11 D3 85 */ bl _savegpr_27 /* 80244E54 00241D94 7C 7F 1B 78 */ mr r31, r3 /* 80244E58 00241D98 7C 9B 23 78 */ mr r27, r4 /* 80244E5C 00241D9C 4B FF 72 81 */ bl dMsgScrnBase_c @@ -337,7 +337,7 @@ lbl_80245318: /* 8024532C 0024226C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80245330 00242270 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80245334 00242274 39 61 00 20 */ addi r11, r1, 0x20 -/* 80245338 00242278 48 11 CE E9 */ bl func_80362220 +/* 80245338 00242278 48 11 CE E9 */ bl _restgpr_27 /* 8024533C 0024227C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80245340 00242280 7C 08 03 A6 */ mtlr r0 /* 80245344 00242284 38 21 00 30 */ addi r1, r1, 0x30 @@ -346,7 +346,7 @@ lbl_80245318: /* 80245350 00242290 7C 08 02 A6 */ mflr r0 /* 80245354 00242294 90 01 00 24 */ stw r0, 0x24(r1) /* 80245358 00242298 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024535C 0024229C 48 11 CE 79 */ bl func_803621D4 +/* 8024535C 0024229C 48 11 CE 79 */ bl _savegpr_27 /* 80245360 002422A0 7C 7E 1B 79 */ or. r30, r3, r3 /* 80245364 002422A4 7C 9F 23 78 */ mr r31, r4 /* 80245368 002422A8 41 82 01 A4 */ beq lbl_8024550C @@ -467,7 +467,7 @@ lbl_802454C4: lbl_8024550C: /* 8024550C 0024244C 7F C3 F3 78 */ mr r3, r30 /* 80245510 00242450 39 61 00 20 */ addi r11, r1, 0x20 -/* 80245514 00242454 48 11 CD 0D */ bl func_80362220 +/* 80245514 00242454 48 11 CD 0D */ bl _restgpr_27 /* 80245518 00242458 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024551C 0024245C 7C 08 03 A6 */ mtlr r0 /* 80245520 00242460 38 21 00 20 */ addi r1, r1, 0x20 @@ -574,7 +574,7 @@ lbl_802455D4: /* 802456AC 002425EC DB E1 00 20 */ stfd f31, 0x20(r1) /* 802456B0 002425F0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 802456B4 002425F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802456B8 002425F8 48 11 CB 21 */ bl func_803621D8 +/* 802456B8 002425F8 48 11 CB 21 */ bl _savegpr_28 /* 802456BC 002425FC 7C 7C 1B 78 */ mr r28, r3 /* 802456C0 00242600 FF E0 08 90 */ fmr f31, f1 /* 802456C4 00242604 80 63 00 C4 */ lwz r3, 0xc4(r3) @@ -610,7 +610,7 @@ lbl_80245724: /* 80245734 00242674 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80245738 00242678 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8024573C 0024267C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80245740 00242680 48 11 CA E5 */ bl func_80362224 +/* 80245740 00242680 48 11 CA E5 */ bl _restgpr_28 /* 80245744 00242684 80 01 00 34 */ lwz r0, 0x34(r1) /* 80245748 00242688 7C 08 03 A6 */ mtlr r0 /* 8024574C 0024268C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index 3a3af83c01..d93aef8a42 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -13,7 +13,7 @@ dMsgScrnTalk_c: /* 80247004 00243F44 DB C1 00 30 */ stfd f30, 0x30(r1) /* 80247008 00243F48 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 8024700C 00243F4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80247010 00243F50 48 11 B1 C5 */ bl func_803621D4 +/* 80247010 00243F50 48 11 B1 C5 */ bl _savegpr_27 /* 80247014 00243F54 7C 7F 1B 78 */ mr r31, r3 /* 80247018 00243F58 7C 9D 23 78 */ mr r29, r4 /* 8024701C 00243F5C 7C BC 2B 78 */ mr r28, r5 @@ -726,7 +726,7 @@ lbl_80247A64: /* 80247A70 002449B0 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 80247A74 002449B4 CB C1 00 30 */ lfd f30, 0x30(r1) /* 80247A78 002449B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80247A7C 002449BC 48 11 A7 A5 */ bl func_80362220 +/* 80247A7C 002449BC 48 11 A7 A5 */ bl _restgpr_27 /* 80247A80 002449C0 80 01 00 54 */ lwz r0, 0x54(r1) /* 80247A84 002449C4 7C 08 03 A6 */ mtlr r0 /* 80247A88 002449C8 38 21 00 50 */ addi r1, r1, 0x50 @@ -921,7 +921,7 @@ lbl_80247D18: /* 80247D38 00244C78 7C 08 02 A6 */ mflr r0 /* 80247D3C 00244C7C 90 01 00 34 */ stw r0, 0x34(r1) /* 80247D40 00244C80 39 61 00 30 */ addi r11, r1, 0x30 -/* 80247D44 00244C84 48 11 A4 91 */ bl func_803621D4 +/* 80247D44 00244C84 48 11 A4 91 */ bl _savegpr_27 /* 80247D48 00244C88 7C 7F 1B 78 */ mr r31, r3 /* 80247D4C 00244C8C 4B FF 48 29 */ bl dMsgScrnBase_c_NS_isTalkNow /* 80247D50 00244C90 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -986,7 +986,7 @@ lbl_80247E20: /* 80247E2C 00244D6C 3B BD 00 04 */ addi r29, r29, 4 /* 80247E30 00244D70 41 80 FF 7C */ blt lbl_80247DAC /* 80247E34 00244D74 39 61 00 30 */ addi r11, r1, 0x30 -/* 80247E38 00244D78 48 11 A3 E9 */ bl func_80362220 +/* 80247E38 00244D78 48 11 A3 E9 */ bl _restgpr_27 /* 80247E3C 00244D7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80247E40 00244D80 7C 08 03 A6 */ mtlr r0 /* 80247E44 00244D84 38 21 00 30 */ addi r1, r1, 0x30 @@ -1300,7 +1300,7 @@ lbl_8024829C: /* 802482C0 00245200 DB E1 00 20 */ stfd f31, 0x20(r1) /* 802482C4 00245204 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 802482C8 00245208 39 61 00 20 */ addi r11, r1, 0x20 -/* 802482CC 0024520C 48 11 9F 0D */ bl func_803621D8 +/* 802482CC 0024520C 48 11 9F 0D */ bl _savegpr_28 /* 802482D0 00245210 7C 7C 1B 78 */ mr r28, r3 /* 802482D4 00245214 FF E0 08 90 */ fmr f31, f1 /* 802482D8 00245218 80 63 00 08 */ lwz r3, 8(r3) @@ -1334,7 +1334,7 @@ lbl_8024832C: /* 8024833C 0024527C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80248340 00245280 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80248344 00245284 39 61 00 20 */ addi r11, r1, 0x20 -/* 80248348 00245288 48 11 9E DD */ bl func_80362224 +/* 80248348 00245288 48 11 9E DD */ bl _restgpr_28 /* 8024834C 0024528C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80248350 00245290 7C 08 03 A6 */ mtlr r0 /* 80248354 00245294 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_tree.s b/asm/d/msg/scrn/d_msg_scrn_tree.s index 31d2e34279..1229f4e5c3 100644 --- a/asm/d/msg/scrn/d_msg_scrn_tree.s +++ b/asm/d/msg/scrn/d_msg_scrn_tree.s @@ -11,7 +11,7 @@ dMsgScrnTree_c: /* 80248960 002458A0 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80248964 002458A4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80248968 002458A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024896C 002458AC 48 11 98 69 */ bl func_803621D4 +/* 8024896C 002458AC 48 11 98 69 */ bl _savegpr_27 /* 80248970 002458B0 7C 7F 1B 78 */ mr r31, r3 /* 80248974 002458B4 7C 9C 23 78 */ mr r28, r4 /* 80248978 002458B8 7C BB 2B 78 */ mr r27, r5 @@ -382,7 +382,7 @@ lbl_80248EE0: /* 80248EF4 00245E34 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80248EF8 00245E38 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80248EFC 00245E3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80248F00 00245E40 48 11 93 21 */ bl func_80362220 +/* 80248F00 00245E40 48 11 93 21 */ bl _restgpr_27 /* 80248F04 00245E44 80 01 00 34 */ lwz r0, 0x34(r1) /* 80248F08 00245E48 7C 08 03 A6 */ mtlr r0 /* 80248F0C 00245E4C 38 21 00 30 */ addi r1, r1, 0x30 @@ -391,7 +391,7 @@ lbl_80248EE0: /* 80248F18 00245E58 7C 08 02 A6 */ mflr r0 /* 80248F1C 00245E5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80248F20 00245E60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80248F24 00245E64 48 11 92 B1 */ bl func_803621D4 +/* 80248F24 00245E64 48 11 92 B1 */ bl _savegpr_27 /* 80248F28 00245E68 7C 7E 1B 79 */ or. r30, r3, r3 /* 80248F2C 00245E6C 7C 9F 23 78 */ mr r31, r4 /* 80248F30 00245E70 41 82 01 CC */ beq lbl_802490FC @@ -523,7 +523,7 @@ lbl_802490B4: lbl_802490FC: /* 802490FC 0024603C 7F C3 F3 78 */ mr r3, r30 /* 80249100 00246040 39 61 00 20 */ addi r11, r1, 0x20 -/* 80249104 00246044 48 11 91 1D */ bl func_80362220 +/* 80249104 00246044 48 11 91 1D */ bl _restgpr_27 /* 80249108 00246048 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024910C 0024604C 7C 08 03 A6 */ mtlr r0 /* 80249110 00246050 38 21 00 20 */ addi r1, r1, 0x20 @@ -657,7 +657,7 @@ lbl_8024922C: /* 80249304 00246244 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80249308 00246248 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8024930C 0024624C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80249310 00246250 48 11 8E C9 */ bl func_803621D8 +/* 80249310 00246250 48 11 8E C9 */ bl _savegpr_28 /* 80249314 00246254 7C 7C 1B 78 */ mr r28, r3 /* 80249318 00246258 FF E0 08 90 */ fmr f31, f1 /* 8024931C 0024625C 80 63 00 C4 */ lwz r3, 0xc4(r3) @@ -693,7 +693,7 @@ lbl_8024937C: /* 8024938C 002462CC E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80249390 002462D0 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80249394 002462D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80249398 002462D8 48 11 8E 8D */ bl func_80362224 +/* 80249398 002462D8 48 11 8E 8D */ bl _restgpr_28 /* 8024939C 002462DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802493A0 002462E0 7C 08 03 A6 */ mtlr r0 /* 802493A4 002462E4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 040d7de41d..62a8bff8ab 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -113,7 +113,7 @@ dMsgStringBase_c_NS_dtor: /* 8024952C 0024646C 7C 08 02 A6 */ mflr r0 /* 80249530 00246470 90 01 00 34 */ stw r0, 0x34(r1) /* 80249534 00246474 39 61 00 30 */ addi r11, r1, 0x30 -/* 80249538 00246478 48 11 8C A1 */ bl func_803621D8 +/* 80249538 00246478 48 11 8C A1 */ bl _savegpr_28 /* 8024953C 0024647C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80249540 00246480 7C 9F 23 78 */ mr r31, r4 /* 80249544 00246484 41 82 01 A0 */ beq lbl_802496E4 @@ -232,7 +232,7 @@ lbl_802496D4: lbl_802496E4: /* 802496E4 00246624 7F C3 F3 78 */ mr r3, r30 /* 802496E8 00246628 39 61 00 30 */ addi r11, r1, 0x30 -/* 802496EC 0024662C 48 11 8B 39 */ bl func_80362224 +/* 802496EC 0024662C 48 11 8B 39 */ bl _restgpr_28 /* 802496F0 00246630 80 01 00 34 */ lwz r0, 0x34(r1) /* 802496F4 00246634 7C 08 03 A6 */ mtlr r0 /* 802496F8 00246638 38 21 00 30 */ addi r1, r1, 0x30 @@ -556,7 +556,7 @@ lbl_80249B78: /* 80249B80 00246AC0 80 7D 00 14 */ lwz r3, 0x14(r29) /* 80249B84 00246AC4 38 83 00 54 */ addi r4, r3, 0x54 /* 80249B88 00246AC8 7F E3 FB 78 */ mr r3, r31 -/* 80249B8C 00246ACC 48 11 EF A1 */ bl func_80368B2C +/* 80249B8C 00246ACC 48 11 EF A1 */ bl strcpy /* 80249B90 00246AD0 C0 22 B3 70 */ lfs f1, lbl_80454D70-_SDA2_BASE_(r2) /* 80249B94 00246AD4 39 61 00 20 */ addi r11, r1, 0x20 /* 80249B98 00246AD8 48 11 86 91 */ bl _restgpr_29 diff --git a/asm/d/pane/class/d_pane_class_alpha.s b/asm/d/pane/class/d_pane_class_alpha.s index 532f72aae5..ccaa99bec3 100644 --- a/asm/d/pane/class/d_pane_class_alpha.s +++ b/asm/d/pane/class/d_pane_class_alpha.s @@ -408,7 +408,7 @@ lbl_8025594C: /* 80255968 002528A8 7C 08 02 A6 */ mflr r0 /* 8025596C 002528AC 90 01 00 34 */ stw r0, 0x34(r1) /* 80255970 002528B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255974 002528B4 48 10 C8 65 */ bl func_803621D8 +/* 80255974 002528B4 48 10 C8 65 */ bl _savegpr_28 /* 80255978 002528B8 7C 7C 1B 78 */ mr r28, r3 /* 8025597C 002528BC 7C BD 2B 78 */ mr r29, r5 /* 80255980 002528C0 7C DE 33 78 */ mr r30, r6 @@ -464,7 +464,7 @@ lbl_802559D4: /* 80255A40 00252980 4E 80 04 21 */ bctrl /* 80255A44 00252984 7F E3 FB 78 */ mr r3, r31 /* 80255A48 00252988 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255A4C 0025298C 48 10 C7 D9 */ bl func_80362224 +/* 80255A4C 0025298C 48 10 C7 D9 */ bl _restgpr_28 /* 80255A50 00252990 80 01 00 34 */ lwz r0, 0x34(r1) /* 80255A54 00252994 7C 08 03 A6 */ mtlr r0 /* 80255A58 00252998 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index 05cd97e8d7..dda1528f9f 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -1078,7 +1078,7 @@ CPaneMgr_NS_colorAnime: /* 802548C0 00251800 7C 08 02 A6 */ mflr r0 /* 802548C4 00251804 90 01 00 54 */ stw r0, 0x54(r1) /* 802548C8 00251808 39 61 00 50 */ addi r11, r1, 0x50 -/* 802548CC 0025180C 48 10 D9 09 */ bl func_803621D4 +/* 802548CC 0025180C 48 10 D9 09 */ bl _savegpr_27 /* 802548D0 00251810 7C 7B 1B 78 */ mr r27, r3 /* 802548D4 00251814 7C BC 2B 78 */ mr r28, r5 /* 802548D8 00251818 7C DD 33 78 */ mr r29, r6 @@ -1331,7 +1331,7 @@ lbl_80254C74: /* 80254C74 00251BB4 38 60 00 00 */ li r3, 0 lbl_80254C78: /* 80254C78 00251BB8 39 61 00 50 */ addi r11, r1, 0x50 -/* 80254C7C 00251BBC 48 10 D5 A5 */ bl func_80362220 +/* 80254C7C 00251BBC 48 10 D5 A5 */ bl _restgpr_27 /* 80254C80 00251BC0 80 01 00 54 */ lwz r0, 0x54(r1) /* 80254C84 00251BC4 7C 08 03 A6 */ mtlr r0 /* 80254C88 00251BC8 38 21 00 50 */ addi r1, r1, 0x50 @@ -1493,7 +1493,7 @@ CPaneMgr_NS_getGlobalVtxCenter: /* 80254EC0 00251E00 7C 08 02 A6 */ mflr r0 /* 80254EC4 00251E04 90 01 00 94 */ stw r0, 0x94(r1) /* 80254EC8 00251E08 39 61 00 90 */ addi r11, r1, 0x90 -/* 80254ECC 00251E0C 48 10 D3 0D */ bl func_803621D8 +/* 80254ECC 00251E0C 48 10 D3 0D */ bl _savegpr_28 /* 80254ED0 00251E10 7C 7C 1B 78 */ mr r28, r3 /* 80254ED4 00251E14 7C 9D 23 78 */ mr r29, r4 /* 80254ED8 00251E18 7C BE 2B 78 */ mr r30, r5 @@ -1547,7 +1547,7 @@ CPaneMgr_NS_getGlobalVtxCenter: /* 80254F98 00251ED8 80 01 00 40 */ lwz r0, 0x40(r1) /* 80254F9C 00251EDC 90 1C 00 08 */ stw r0, 8(r28) /* 80254FA0 00251EE0 39 61 00 90 */ addi r11, r1, 0x90 -/* 80254FA4 00251EE4 48 10 D2 81 */ bl func_80362224 +/* 80254FA4 00251EE4 48 10 D2 81 */ bl _restgpr_28 /* 80254FA8 00251EE8 80 01 00 94 */ lwz r0, 0x94(r1) /* 80254FAC 00251EEC 7C 08 03 A6 */ mtlr r0 /* 80254FB0 00251EF0 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/s/d_s_logo.s b/asm/d/s/d_s_logo.s index 0043853b25..95ad40b6b3 100644 --- a/asm/d/s/d_s_logo.s +++ b/asm/d/s/d_s_logo.s @@ -140,7 +140,7 @@ dScnLogo_c_NS_draw: /* 80256268 002531A8 7C 08 02 A6 */ mflr r0 /* 8025626C 002531AC 90 01 00 24 */ stw r0, 0x24(r1) /* 80256270 002531B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256274 002531B4 48 10 BF 65 */ bl func_803621D8 +/* 80256274 002531B4 48 10 BF 65 */ bl _savegpr_28 /* 80256278 002531B8 7C 7C 1B 78 */ mr r28, r3 /* 8025627C 002531BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80256280 002531C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -178,7 +178,7 @@ dScnLogo_c_NS_draw: /* 80256300 00253240 98 1C 02 0B */ stb r0, 0x20b(r28) lbl_80256304: /* 80256304 00253244 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256308 00253248 48 10 BF 1D */ bl func_80362224 +/* 80256308 00253248 48 10 BF 1D */ bl _restgpr_28 /* 8025630C 0025324C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80256310 00253250 7C 08 03 A6 */ mtlr r0 /* 80256314 00253254 38 21 00 20 */ addi r1, r1, 0x20 @@ -187,7 +187,7 @@ lbl_80256304: /* 80256320 00253260 7C 08 02 A6 */ mflr r0 /* 80256324 00253264 90 01 00 94 */ stw r0, 0x94(r1) /* 80256328 00253268 39 61 00 90 */ addi r11, r1, 0x90 -/* 8025632C 0025326C 48 10 BE AD */ bl func_803621D8 +/* 8025632C 0025326C 48 10 BE AD */ bl _savegpr_28 /* 80256330 00253270 7C 7D 1B 78 */ mr r29, r3 /* 80256334 00253274 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80256338 00253278 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -566,7 +566,7 @@ lbl_802568C0: /* 802568C4 00253804 B0 1D 02 10 */ sth r0, 0x210(r29) lbl_802568C8: /* 802568C8 00253808 39 61 00 90 */ addi r11, r1, 0x90 -/* 802568CC 0025380C 48 10 B9 59 */ bl func_80362224 +/* 802568CC 0025380C 48 10 B9 59 */ bl _restgpr_28 /* 802568D0 00253810 80 01 00 94 */ lwz r0, 0x94(r1) /* 802568D4 00253814 7C 08 03 A6 */ mtlr r0 /* 802568D8 00253818 38 21 00 90 */ addi r1, r1, 0x90 @@ -575,7 +575,7 @@ lbl_802568C8: /* 802568E4 00253824 7C 08 02 A6 */ mflr r0 /* 802568E8 00253828 90 01 00 24 */ stw r0, 0x24(r1) /* 802568EC 0025382C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802568F0 00253830 48 10 B8 E9 */ bl func_803621D8 +/* 802568F0 00253830 48 10 B8 E9 */ bl _savegpr_28 /* 802568F4 00253834 7C 7F 1B 78 */ mr r31, r3 /* 802568F8 00253838 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 802568FC 0025383C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -658,7 +658,7 @@ lbl_802569F0: /* 80256A20 00253960 4E 80 04 21 */ bctrl lbl_80256A24: /* 80256A24 00253964 39 61 00 20 */ addi r11, r1, 0x20 -/* 80256A28 00253968 48 10 B7 FD */ bl func_80362224 +/* 80256A28 00253968 48 10 B7 FD */ bl _restgpr_28 /* 80256A2C 0025396C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80256A30 00253970 7C 08 03 A6 */ mtlr r0 /* 80256A34 00253974 38 21 00 20 */ addi r1, r1, 0x20 @@ -815,7 +815,7 @@ lbl_80256C54: /* 80256C6C 00253BAC 7C 08 02 A6 */ mflr r0 /* 80256C70 00253BB0 90 01 00 34 */ stw r0, 0x34(r1) /* 80256C74 00253BB4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80256C78 00253BB8 48 10 B5 61 */ bl func_803621D8 +/* 80256C78 00253BB8 48 10 B5 61 */ bl _savegpr_28 /* 80256C7C 00253BBC 7C 7F 1B 78 */ mr r31, r3 /* 80256C80 00253BC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80256C84 00253BC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -899,7 +899,7 @@ lbl_80256DA0: /* 80256DA8 00253CE8 98 03 00 15 */ stb r0, 0x15(r3) lbl_80256DAC: /* 80256DAC 00253CEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80256DB0 00253CF0 48 10 B4 75 */ bl func_80362224 +/* 80256DB0 00253CF0 48 10 B4 75 */ bl _restgpr_28 /* 80256DB4 00253CF4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80256DB8 00253CF8 7C 08 03 A6 */ mtlr r0 /* 80256DBC 00253CFC 38 21 00 30 */ addi r1, r1, 0x30 @@ -1235,7 +1235,7 @@ dScnLogo_c_NS_dtor: /* 802572BC 002541FC 7C 08 02 A6 */ mflr r0 /* 802572C0 00254200 90 01 00 24 */ stw r0, 0x24(r1) /* 802572C4 00254204 39 61 00 20 */ addi r11, r1, 0x20 -/* 802572C8 00254208 48 10 AF 0D */ bl func_803621D4 +/* 802572C8 00254208 48 10 AF 0D */ bl _savegpr_27 /* 802572CC 0025420C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802572D0 00254210 7C 9D 23 78 */ mr r29, r4 /* 802572D4 00254214 41 82 06 20 */ beq lbl_802578F4 @@ -1665,7 +1665,7 @@ lbl_802578BC: lbl_802578F4: /* 802578F4 00254834 7F E3 FB 78 */ mr r3, r31 /* 802578F8 00254838 39 61 00 20 */ addi r11, r1, 0x20 -/* 802578FC 0025483C 48 10 A9 25 */ bl func_80362220 +/* 802578FC 0025483C 48 10 A9 25 */ bl _restgpr_27 /* 80257900 00254840 80 01 00 24 */ lwz r0, 0x24(r1) /* 80257904 00254844 7C 08 03 A6 */ mtlr r0 /* 80257908 00254848 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/s/d_s_name.s b/asm/d/s/d_s_name.s index f27d7c6dac..134da8296d 100644 --- a/asm/d/s/d_s_name.s +++ b/asm/d/s/d_s_name.s @@ -91,7 +91,7 @@ dScnName_c_NS_create: /* 802588B4 002557F4 DB C1 00 30 */ stfd f30, 0x30(r1) /* 802588B8 002557F8 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802588BC 002557FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802588C0 00255800 48 10 99 19 */ bl func_803621D8 +/* 802588C0 00255800 48 10 99 19 */ bl _savegpr_28 /* 802588C4 00255804 7C 7D 1B 78 */ mr r29, r3 /* 802588C8 00255808 38 7D 01 C4 */ addi r3, r29, 0x1c4 /* 802588CC 0025580C 3C 80 80 3A */ lis r4, lbl_8039A2A8@ha @@ -245,7 +245,7 @@ lbl_80258B00: /* 80258B0C 00255A4C E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 80258B10 00255A50 CB C1 00 30 */ lfd f30, 0x30(r1) /* 80258B14 00255A54 39 61 00 30 */ addi r11, r1, 0x30 -/* 80258B18 00255A58 48 10 97 0D */ bl func_80362224 +/* 80258B18 00255A58 48 10 97 0D */ bl _restgpr_28 /* 80258B1C 00255A5C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80258B20 00255A60 7C 08 03 A6 */ mtlr r0 /* 80258B24 00255A64 38 21 00 50 */ addi r1, r1, 0x50 @@ -375,7 +375,7 @@ dScnName_c_NS_dtor: /* 80258CCC 00255C0C 7C 08 02 A6 */ mflr r0 /* 80258CD0 00255C10 90 01 00 24 */ stw r0, 0x24(r1) /* 80258CD4 00255C14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80258CD8 00255C18 48 10 95 01 */ bl func_803621D8 +/* 80258CD8 00255C18 48 10 95 01 */ bl _savegpr_28 /* 80258CDC 00255C1C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80258CE0 00255C20 7C 9C 23 78 */ mr r28, r4 /* 80258CE4 00255C24 41 82 00 D0 */ beq lbl_80258DB4 @@ -437,7 +437,7 @@ lbl_80258DA4: lbl_80258DB4: /* 80258DB4 00255CF4 7F E3 FB 78 */ mr r3, r31 /* 80258DB8 00255CF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80258DBC 00255CFC 48 10 94 69 */ bl func_80362224 +/* 80258DBC 00255CFC 48 10 94 69 */ bl _restgpr_28 /* 80258DC0 00255D00 80 01 00 24 */ lwz r0, 0x24(r1) /* 80258DC4 00255D04 7C 08 03 A6 */ mtlr r0 /* 80258DC8 00255D08 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 4c34a89084..6f3cae349c 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -60,7 +60,7 @@ dScnPly_env_debugHIO_c: /* 802594B0 002563F0 7C 08 02 A6 */ mflr r0 /* 802594B4 002563F4 90 01 00 44 */ stw r0, 0x44(r1) /* 802594B8 002563F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802594BC 002563FC 48 10 8D 1D */ bl func_803621D8 +/* 802594BC 002563FC 48 10 8D 1D */ bl _savegpr_28 /* 802594C0 00256400 7C 7C 1B 78 */ mr r28, r3 /* 802594C4 00256404 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 802594C8 00256408 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -263,7 +263,7 @@ lbl_80259774: lbl_8025979C: /* 8025979C 002566DC 38 60 00 01 */ li r3, 1 /* 802597A0 002566E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802597A4 002566E4 48 10 8A 81 */ bl func_80362224 +/* 802597A4 002566E4 48 10 8A 81 */ bl _restgpr_28 /* 802597A8 002566E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 802597AC 002566EC 7C 08 03 A6 */ mtlr r0 /* 802597B0 002566F0 38 21 00 40 */ addi r1, r1, 0x40 @@ -734,7 +734,7 @@ lbl_80259E20: /* 80259E6C 00256DAC 40 82 00 1C */ bne lbl_80259E88 /* 80259E70 00256DB0 38 63 00 28 */ addi r3, r3, 0x28 /* 80259E74 00256DB4 38 80 00 00 */ li r4, 0 -/* 80259E78 00256DB8 4B DD 8D 1D */ bl dSv_player_status_b_c_NS_onDarkClearLV +/* 80259E78 00256DB8 4B DD 8D 1D */ bl onDarkClearLV__21dSv_player_status_b_cFi /* 80259E7C 00256DBC 38 60 00 2F */ li r3, 0x2f /* 80259E80 00256DC0 4B E3 E0 0D */ bl execItemGet /* 80259E84 00256DC4 48 00 00 E4 */ b lbl_80259F68 @@ -756,7 +756,7 @@ lbl_80259E88: /* 80259EC0 00256E00 40 82 00 14 */ bne lbl_80259ED4 /* 80259EC4 00256E04 38 63 00 28 */ addi r3, r3, 0x28 /* 80259EC8 00256E08 38 80 00 01 */ li r4, 1 -/* 80259ECC 00256E0C 4B DD 8C C9 */ bl dSv_player_status_b_c_NS_onDarkClearLV +/* 80259ECC 00256E0C 4B DD 8C C9 */ bl onDarkClearLV__21dSv_player_status_b_cFi /* 80259ED0 00256E10 48 00 00 98 */ b lbl_80259F68 lbl_80259ED4: /* 80259ED4 00256E14 7F A3 EB 78 */ mr r3, r29 @@ -776,7 +776,7 @@ lbl_80259ED4: /* 80259F0C 00256E4C 40 82 00 14 */ bne lbl_80259F20 /* 80259F10 00256E50 38 63 00 28 */ addi r3, r3, 0x28 /* 80259F14 00256E54 38 80 00 02 */ li r4, 2 -/* 80259F18 00256E58 4B DD 8C 7D */ bl dSv_player_status_b_c_NS_onDarkClearLV +/* 80259F18 00256E58 4B DD 8C 7D */ bl onDarkClearLV__21dSv_player_status_b_cFi /* 80259F1C 00256E5C 48 00 00 4C */ b lbl_80259F68 lbl_80259F20: /* 80259F20 00256E60 7F A3 EB 78 */ mr r3, r29 @@ -796,7 +796,7 @@ lbl_80259F20: /* 80259F58 00256E98 40 82 00 10 */ bne lbl_80259F68 /* 80259F5C 00256E9C 38 63 00 28 */ addi r3, r3, 0x28 /* 80259F60 00256EA0 38 80 00 03 */ li r4, 3 -/* 80259F64 00256EA4 4B DD 8C 31 */ bl dSv_player_status_b_c_NS_onDarkClearLV +/* 80259F64 00256EA4 4B DD 8C 31 */ bl onDarkClearLV__21dSv_player_status_b_cFi lbl_80259F68: /* 80259F68 00256EA8 7F A3 EB 78 */ mr r3, r29 /* 80259F6C 00256EAC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha @@ -824,7 +824,7 @@ lbl_80259F68: /* 80259FC4 00256F04 38 63 00 9C */ addi r3, r3, 0x9c /* 80259FC8 00256F08 38 80 00 15 */ li r4, 0x15 /* 80259FCC 00256F0C 38 A0 00 84 */ li r5, 0x84 -/* 80259FD0 00256F10 4B DD 8F E9 */ bl dSv_player_item_c_NS_setItem +/* 80259FD0 00256F10 4B DD 8F E9 */ bl setItem__17dSv_player_item_cFiUc lbl_80259FD4: /* 80259FD4 00256F14 7F A3 EB 78 */ mr r3, r29 /* 80259FD8 00256F18 3C 80 80 40 */ lis r4, lbl_804061C0@ha @@ -990,7 +990,7 @@ lbl_8025A224: /* 8025A228 00257168 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8025A22C 0025716C 38 63 00 28 */ addi r3, r3, 0x28 /* 8025A230 00257170 38 80 00 00 */ li r4, 0 -/* 8025A234 00257174 4B DD 89 9D */ bl dSv_player_status_b_c_NS_onTransformLV +/* 8025A234 00257174 4B DD 89 9D */ bl onTransformLV__21dSv_player_status_b_cFi /* 8025A238 00257178 48 00 00 F8 */ b lbl_8025A330 lbl_8025A23C: /* 8025A23C 0025717C 7F A3 EB 78 */ mr r3, r29 @@ -1010,7 +1010,7 @@ lbl_8025A23C: /* 8025A274 002571B4 40 82 00 14 */ bne lbl_8025A288 /* 8025A278 002571B8 38 63 00 28 */ addi r3, r3, 0x28 /* 8025A27C 002571BC 38 80 00 01 */ li r4, 1 -/* 8025A280 002571C0 4B DD 89 51 */ bl dSv_player_status_b_c_NS_onTransformLV +/* 8025A280 002571C0 4B DD 89 51 */ bl onTransformLV__21dSv_player_status_b_cFi /* 8025A284 002571C4 48 00 00 AC */ b lbl_8025A330 lbl_8025A288: /* 8025A288 002571C8 7F A3 EB 78 */ mr r3, r29 @@ -1030,7 +1030,7 @@ lbl_8025A288: /* 8025A2C0 00257200 40 82 00 14 */ bne lbl_8025A2D4 /* 8025A2C4 00257204 38 63 00 28 */ addi r3, r3, 0x28 /* 8025A2C8 00257208 38 80 00 02 */ li r4, 2 -/* 8025A2CC 0025720C 4B DD 89 05 */ bl dSv_player_status_b_c_NS_onTransformLV +/* 8025A2CC 0025720C 4B DD 89 05 */ bl onTransformLV__21dSv_player_status_b_cFi /* 8025A2D0 00257210 48 00 00 60 */ b lbl_8025A330 lbl_8025A2D4: /* 8025A2D4 00257214 7F A3 EB 78 */ mr r3, r29 @@ -1056,7 +1056,7 @@ lbl_8025A31C: /* 8025A320 00257260 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8025A324 00257264 38 63 00 28 */ addi r3, r3, 0x28 /* 8025A328 00257268 38 80 00 03 */ li r4, 3 -/* 8025A32C 0025726C 4B DD 88 A5 */ bl dSv_player_status_b_c_NS_onTransformLV +/* 8025A32C 0025726C 4B DD 88 A5 */ bl onTransformLV__21dSv_player_status_b_cFi lbl_8025A330: /* 8025A330 00257270 7F A3 EB 78 */ mr r3, r29 /* 8025A334 00257274 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha @@ -1275,7 +1275,7 @@ lbl_8025A640: /* 8025A658 00257598 7C 08 02 A6 */ mflr r0 /* 8025A65C 0025759C 90 01 00 24 */ stw r0, 0x24(r1) /* 8025A660 002575A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025A664 002575A4 48 10 7B 75 */ bl func_803621D8 +/* 8025A664 002575A4 48 10 7B 75 */ bl _savegpr_28 /* 8025A668 002575A8 7C 7D 1B 78 */ mr r29, r3 /* 8025A66C 002575AC 80 63 01 CC */ lwz r3, 0x1cc(r3) /* 8025A670 002575B0 28 03 00 00 */ cmplwi r3, 0 @@ -1507,7 +1507,7 @@ lbl_8025A9CC: /* 8025A9D8 00257918 38 60 00 02 */ li r3, 2 lbl_8025A9DC: /* 8025A9DC 0025791C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025A9E0 00257920 48 10 78 45 */ bl func_80362224 +/* 8025A9E0 00257920 48 10 78 45 */ bl _restgpr_28 /* 8025A9E4 00257924 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025A9E8 00257928 7C 08 03 A6 */ mtlr r0 /* 8025A9EC 0025792C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index 896b6fe60c..d2e8546ae8 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -101,7 +101,7 @@ setArchiveBank: /* 8025AF50 00257E90 7C 08 02 A6 */ mflr r0 /* 8025AF54 00257E94 90 01 00 34 */ stw r0, 0x34(r1) /* 8025AF58 00257E98 39 61 00 30 */ addi r11, r1, 0x30 -/* 8025AF5C 00257E9C 48 10 72 79 */ bl func_803621D4 +/* 8025AF5C 00257E9C 48 10 72 79 */ bl _savegpr_27 /* 8025AF60 00257EA0 38 81 00 08 */ addi r4, r1, 8 /* 8025AF64 00257EA4 4B FF FE C1 */ bl getResetArchiveBank /* 8025AF68 00257EA8 7C 7C 1B 78 */ mr r28, r3 @@ -206,7 +206,7 @@ lbl_8025B0CC: /* 8025B0D4 00258014 38 60 00 01 */ li r3, 1 lbl_8025B0D8: /* 8025B0D8 00258018 39 61 00 30 */ addi r11, r1, 0x30 -/* 8025B0DC 0025801C 48 10 71 45 */ bl func_80362220 +/* 8025B0DC 0025801C 48 10 71 45 */ bl _restgpr_27 /* 8025B0E0 00258020 80 01 00 34 */ lwz r0, 0x34(r1) /* 8025B0E4 00258024 7C 08 03 A6 */ mtlr r0 /* 8025B0E8 00258028 38 21 00 30 */ addi r1, r1, 0x30 @@ -674,7 +674,7 @@ lbl_8025B728: /* 8025B740 00258680 7C 08 02 A6 */ mflr r0 /* 8025B744 00258684 90 01 00 24 */ stw r0, 0x24(r1) /* 8025B748 00258688 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B74C 0025868C 48 10 6A 8D */ bl func_803621D8 +/* 8025B74C 0025868C 48 10 6A 8D */ bl _savegpr_28 /* 8025B750 00258690 7C 7E 1B 78 */ mr r30, r3 /* 8025B754 00258694 83 E3 00 B0 */ lwz r31, 0xb0(r3) /* 8025B758 00258698 38 80 00 00 */ li r4, 0 @@ -744,7 +744,7 @@ lbl_8025B82C: /* 8025B850 00258790 4B DE B1 9D */ bl dEvent_manager_c_NS_roomFinish /* 8025B854 00258794 38 60 00 01 */ li r3, 1 /* 8025B858 00258798 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B85C 0025879C 48 10 69 C9 */ bl func_80362224 +/* 8025B85C 0025879C 48 10 69 C9 */ bl _restgpr_28 /* 8025B860 002587A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025B864 002587A4 7C 08 03 A6 */ mtlr r0 /* 8025B868 002587A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -827,7 +827,7 @@ lbl_8025B968: /* 8025B984 002588C4 7C 08 02 A6 */ mflr r0 /* 8025B988 002588C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8025B98C 002588CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B990 002588D0 48 10 68 49 */ bl func_803621D8 +/* 8025B990 002588D0 48 10 68 49 */ bl _savegpr_28 /* 8025B994 002588D4 7C 7C 1B 78 */ mr r28, r3 /* 8025B998 002588D8 80 63 00 B0 */ lwz r3, 0xb0(r3) /* 8025B99C 002588DC 4B DD 3B 21 */ bl dComIfG_getRoomArcName @@ -900,7 +900,7 @@ lbl_8025BA90: /* 8025BA90 002589D0 38 60 00 02 */ li r3, 2 lbl_8025BA94: /* 8025BA94 002589D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BA98 002589D8 48 10 67 8D */ bl func_80362224 +/* 8025BA98 002589D8 48 10 67 8D */ bl _restgpr_28 /* 8025BA9C 002589DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025BAA0 002589E0 7C 08 03 A6 */ mtlr r0 /* 8025BAA4 002589E4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index e78eae3a19..f7d6721e70 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -398,7 +398,7 @@ dSvBit_childDarknessHIO_c_NS_init: lbl_8025C060: /* 8025C060 00258FA0 7F E3 FB 78 */ mr r3, r31 /* 8025C064 00258FA4 7F C4 F3 78 */ mr r4, r30 -/* 8025C068 00258FA8 4B DD 6B 49 */ bl dSv_player_status_b_c_NS_isDarkClearLV +/* 8025C068 00258FA8 4B DD 6B 49 */ bl isDarkClearLV__21dSv_player_status_b_cCFi /* 8025C06C 00258FAC 7C 9D F2 14 */ add r4, r29, r30 /* 8025C070 00258FB0 98 64 00 05 */ stb r3, 5(r4) /* 8025C074 00258FB4 88 04 00 05 */ lbz r0, 5(r4) @@ -445,7 +445,7 @@ dSvBit_childTransformHIO_c_NS_init: lbl_8025C0FC: /* 8025C0FC 0025903C 7F E3 FB 78 */ mr r3, r31 /* 8025C100 00259040 7F C4 F3 78 */ mr r4, r30 -/* 8025C104 00259044 4B DD 6A E9 */ bl dSv_player_status_b_c_NS_isTransformLV +/* 8025C104 00259044 4B DD 6A E9 */ bl isTransformLV__21dSv_player_status_b_cCFi /* 8025C108 00259048 7C 9D F2 14 */ add r4, r29, r30 /* 8025C10C 0025904C 98 64 00 05 */ stb r3, 5(r4) /* 8025C110 00259050 88 04 00 05 */ lbz r0, 5(r4) diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index 1ac88dc4bb..ea75222d3e 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -1318,7 +1318,7 @@ dSelect_cursor_c_NS_setBpkAnimation: /* 80195464 001923A4 7C 08 02 A6 */ mflr r0 /* 80195468 001923A8 90 01 00 24 */ stw r0, 0x24(r1) /* 8019546C 001923AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80195470 001923B0 48 1C CD 65 */ bl func_803621D4 +/* 80195470 001923B0 48 1C CD 65 */ bl _savegpr_27 /* 80195474 001923B4 7C 7B 1B 78 */ mr r27, r3 /* 80195478 001923B8 7C 9C 23 78 */ mr r28, r4 /* 8019547C 001923BC 88 03 00 B5 */ lbz r0, 0xb5(r3) @@ -1416,7 +1416,7 @@ lbl_801955A0: /* 801955D4 00192514 4E 80 04 21 */ bctrl lbl_801955D8: /* 801955D8 00192518 39 61 00 20 */ addi r11, r1, 0x20 -/* 801955DC 0019251C 48 1C CC 45 */ bl func_80362220 +/* 801955DC 0019251C 48 1C CC 45 */ bl _restgpr_27 /* 801955E0 00192520 80 01 00 24 */ lwz r0, 0x24(r1) /* 801955E4 00192524 7C 08 03 A6 */ mtlr r0 /* 801955E8 00192528 38 21 00 20 */ addi r1, r1, 0x20 @@ -1428,7 +1428,7 @@ dSelect_cursor_c_NS_setBtk0Animation: /* 801955F4 00192534 7C 08 02 A6 */ mflr r0 /* 801955F8 00192538 90 01 00 24 */ stw r0, 0x24(r1) /* 801955FC 0019253C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80195600 00192540 48 1C CB D5 */ bl func_803621D4 +/* 80195600 00192540 48 1C CB D5 */ bl _savegpr_27 /* 80195604 00192544 7C 7B 1B 78 */ mr r27, r3 /* 80195608 00192548 7C 9C 23 78 */ mr r28, r4 /* 8019560C 0019254C 88 03 00 B5 */ lbz r0, 0xb5(r3) @@ -1502,7 +1502,7 @@ lbl_801956D8: /* 80195708 00192648 4E 80 04 21 */ bctrl lbl_8019570C: /* 8019570C 0019264C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80195710 00192650 48 1C CB 11 */ bl func_80362220 +/* 80195710 00192650 48 1C CB 11 */ bl _restgpr_27 /* 80195714 00192654 80 01 00 24 */ lwz r0, 0x24(r1) /* 80195718 00192658 7C 08 03 A6 */ mtlr r0 /* 8019571C 0019265C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/shop/d_shop_camera.s b/asm/d/shop/d_shop_camera.s index 6fa4280435..ff0eaaf4c7 100644 --- a/asm/d/shop/d_shop_camera.s +++ b/asm/d/shop/d_shop_camera.s @@ -109,7 +109,7 @@ lbl_80195DDC: /* 80195E2C 00192D6C DB C1 00 90 */ stfd f30, 0x90(r1) /* 80195E30 00192D70 F3 C1 00 98 */ psq_st f30, 152(r1), 0, qr0 /* 80195E34 00192D74 39 61 00 90 */ addi r11, r1, 0x90 -/* 80195E38 00192D78 48 1C C3 9D */ bl func_803621D4 +/* 80195E38 00192D78 48 1C C3 9D */ bl _savegpr_27 /* 80195E3C 00192D7C 7C 7B 1B 78 */ mr r27, r3 /* 80195E40 00192D80 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80195E44 00192D84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -440,7 +440,7 @@ lbl_80196298: /* 801962EC 0019322C E3 C1 00 98 */ psq_l f30, 152(r1), 0, qr0 /* 801962F0 00193230 CB C1 00 90 */ lfd f30, 0x90(r1) /* 801962F4 00193234 39 61 00 90 */ addi r11, r1, 0x90 -/* 801962F8 00193238 48 1C BF 29 */ bl func_80362220 +/* 801962F8 00193238 48 1C BF 29 */ bl _restgpr_27 /* 801962FC 0019323C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80196300 00193240 7C 08 03 A6 */ mtlr r0 /* 80196304 00193244 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index daf50505e0..587a5fdc27 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -9,7 +9,7 @@ dShopSystem_searchItemActor: /* 8019709C 00193FDC 7C 08 02 A6 */ mflr r0 /* 801970A0 00193FE0 90 01 00 24 */ stw r0, 0x24(r1) /* 801970A4 00193FE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801970A8 00193FE8 48 1C B1 2D */ bl func_803621D4 +/* 801970A8 00193FE8 48 1C B1 2D */ bl _savegpr_27 /* 801970AC 00193FEC 7C 7D 1B 78 */ mr r29, r3 /* 801970B0 00193FF0 7C 9B 23 78 */ mr r27, r4 /* 801970B4 00193FF4 4B E8 1C 2D */ bl fopAc_IsActor @@ -124,7 +124,7 @@ lbl_80197248: lbl_80197254: /* 80197254 00194194 38 60 00 00 */ li r3, 0 /* 80197258 00194198 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019725C 0019419C 48 1C AF C5 */ bl func_80362220 +/* 8019725C 0019419C 48 1C AF C5 */ bl _restgpr_27 /* 80197260 001941A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80197264 001941A4 7C 08 03 A6 */ mtlr r0 /* 80197268 001941A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -424,7 +424,7 @@ dShopSystem_c_NS_checkController: /* 80197674 001945B4 7C 08 02 A6 */ mflr r0 /* 80197678 001945B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8019767C 001945BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80197680 001945C0 48 1C AB 59 */ bl func_803621D8 +/* 80197680 001945C0 48 1C AB 59 */ bl _savegpr_28 /* 80197684 001945C4 7C 7D 1B 78 */ mr r29, r3 /* 80197688 001945C8 7C 9E 23 78 */ mr r30, r4 /* 8019768C 001945CC 7C BF 2B 78 */ mr r31, r5 @@ -529,7 +529,7 @@ lbl_801977EC: /* 801977EC 0019472C 38 60 00 00 */ li r3, 0 lbl_801977F0: /* 801977F0 00194730 39 61 00 20 */ addi r11, r1, 0x20 -/* 801977F4 00194734 48 1C AA 31 */ bl func_80362224 +/* 801977F4 00194734 48 1C AA 31 */ bl _restgpr_28 /* 801977F8 00194738 80 01 00 24 */ lwz r0, 0x24(r1) /* 801977FC 0019473C 7C 08 03 A6 */ mtlr r0 /* 80197800 00194740 38 21 00 20 */ addi r1, r1, 0x20 @@ -1814,7 +1814,7 @@ lbl_80198A04: /* 80198A30 00195970 7C 08 02 A6 */ mflr r0 /* 80198A34 00195974 90 01 00 64 */ stw r0, 0x64(r1) /* 80198A38 00195978 39 61 00 60 */ addi r11, r1, 0x60 -/* 80198A3C 0019597C 48 1C 97 9D */ bl func_803621D8 +/* 80198A3C 0019597C 48 1C 97 9D */ bl _savegpr_28 /* 80198A40 00195980 7C 7C 1B 78 */ mr r28, r3 /* 80198A44 00195984 7C 9D 23 78 */ mr r29, r4 /* 80198A48 00195988 80 03 0F 60 */ lwz r0, 0xf60(r3) @@ -2246,7 +2246,7 @@ lbl_80199064: lbl_80199094: /* 80199094 00195FD4 38 60 00 01 */ li r3, 1 /* 80199098 00195FD8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019909C 00195FDC 48 1C 91 89 */ bl func_80362224 +/* 8019909C 00195FDC 48 1C 91 89 */ bl _restgpr_28 /* 801990A0 00195FE0 80 01 00 64 */ lwz r0, 0x64(r1) /* 801990A4 00195FE4 7C 08 03 A6 */ mtlr r0 /* 801990A8 00195FE8 38 21 00 60 */ addi r1, r1, 0x60 @@ -2257,7 +2257,7 @@ lbl_80199094: /* 801990BC 00195FFC 7C 08 02 A6 */ mflr r0 /* 801990C0 00196000 90 01 00 44 */ stw r0, 0x44(r1) /* 801990C4 00196004 39 61 00 40 */ addi r11, r1, 0x40 -/* 801990C8 00196008 48 1C 91 11 */ bl func_803621D8 +/* 801990C8 00196008 48 1C 91 11 */ bl _savegpr_28 /* 801990CC 0019600C 7C 7D 1B 78 */ mr r29, r3 /* 801990D0 00196010 7C 9E 23 78 */ mr r30, r4 /* 801990D4 00196014 7C BF 2B 78 */ mr r31, r5 @@ -2432,7 +2432,7 @@ lbl_80199350: /* 80199350 00196290 38 60 00 00 */ li r3, 0 lbl_80199354: /* 80199354 00196294 39 61 00 40 */ addi r11, r1, 0x40 -/* 80199358 00196298 48 1C 8E CD */ bl func_80362224 +/* 80199358 00196298 48 1C 8E CD */ bl _restgpr_28 /* 8019935C 0019629C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80199360 001962A0 7C 08 03 A6 */ mtlr r0 /* 80199364 001962A4 38 21 00 40 */ addi r1, r1, 0x40 @@ -2590,7 +2590,7 @@ lbl_80199588: /* 801995A0 001964E0 7C 08 02 A6 */ mflr r0 /* 801995A4 001964E4 90 01 00 54 */ stw r0, 0x54(r1) /* 801995A8 001964E8 39 61 00 50 */ addi r11, r1, 0x50 -/* 801995AC 001964EC 48 1C 8C 2D */ bl func_803621D8 +/* 801995AC 001964EC 48 1C 8C 2D */ bl _savegpr_28 /* 801995B0 001964F0 7C 7C 1B 78 */ mr r28, r3 /* 801995B4 001964F4 7C 9D 23 78 */ mr r29, r4 /* 801995B8 001964F8 7C BE 2B 78 */ mr r30, r5 @@ -2892,7 +2892,7 @@ lbl_801999FC: /* 801999FC 0019693C 38 60 00 00 */ li r3, 0 lbl_80199A00: /* 80199A00 00196940 39 61 00 50 */ addi r11, r1, 0x50 -/* 80199A04 00196944 48 1C 88 21 */ bl func_80362224 +/* 80199A04 00196944 48 1C 88 21 */ bl _restgpr_28 /* 80199A08 00196948 80 01 00 54 */ lwz r0, 0x54(r1) /* 80199A0C 0019694C 7C 08 03 A6 */ mtlr r0 /* 80199A10 00196950 38 21 00 50 */ addi r1, r1, 0x50 @@ -3028,7 +3028,7 @@ lbl_80199BE0: /* 80199BFC 00196B3C 7C 08 02 A6 */ mflr r0 /* 80199C00 00196B40 90 01 00 24 */ stw r0, 0x24(r1) /* 80199C04 00196B44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199C08 00196B48 48 1C 85 D1 */ bl func_803621D8 +/* 80199C08 00196B48 48 1C 85 D1 */ bl _savegpr_28 /* 80199C0C 00196B4C 7C 7C 1B 78 */ mr r28, r3 /* 80199C10 00196B50 7C 9D 23 78 */ mr r29, r4 /* 80199C14 00196B54 7C BE 2B 78 */ mr r30, r5 @@ -3095,7 +3095,7 @@ lbl_80199CE4: lbl_80199CF8: /* 80199CF8 00196C38 38 60 00 00 */ li r3, 0 /* 80199CFC 00196C3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199D00 00196C40 48 1C 85 25 */ bl func_80362224 +/* 80199D00 00196C40 48 1C 85 25 */ bl _restgpr_28 /* 80199D04 00196C44 80 01 00 24 */ lwz r0, 0x24(r1) /* 80199D08 00196C48 7C 08 03 A6 */ mtlr r0 /* 80199D0C 00196C4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3457,7 +3457,7 @@ lbl_8019A21C: /* 8019A23C 0019717C 7C 08 02 A6 */ mflr r0 /* 8019A240 00197180 90 01 00 34 */ stw r0, 0x34(r1) /* 8019A244 00197184 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019A248 00197188 48 1C 7F 8D */ bl func_803621D4 +/* 8019A248 00197188 48 1C 7F 8D */ bl _savegpr_27 /* 8019A24C 0019718C 7C 7B 1B 78 */ mr r27, r3 /* 8019A250 00197190 2C 04 FF FF */ cmpwi r4, -1 /* 8019A254 00197194 41 82 00 D8 */ beq lbl_8019A32C @@ -3519,7 +3519,7 @@ lbl_8019A314: /* 8019A328 00197268 41 80 FF 54 */ blt lbl_8019A27C lbl_8019A32C: /* 8019A32C 0019726C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019A330 00197270 48 1C 7E F1 */ bl func_80362220 +/* 8019A330 00197270 48 1C 7E F1 */ bl _restgpr_27 /* 8019A334 00197274 80 01 00 34 */ lwz r0, 0x34(r1) /* 8019A338 00197278 7C 08 03 A6 */ mtlr r0 /* 8019A33C 0019727C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/shop/item/d_shop_item_ctrl.s b/asm/d/shop/item/d_shop_item_ctrl.s index f1da9b0799..2955c14009 100644 --- a/asm/d/shop/item/d_shop_item_ctrl.s +++ b/asm/d/shop/item/d_shop_item_ctrl.s @@ -147,7 +147,7 @@ dShopItemCtrl_c_NS_setRotateAnime: /* 80196AF4 00193A34 7C 08 02 A6 */ mflr r0 /* 80196AF8 00193A38 90 01 00 34 */ stw r0, 0x34(r1) /* 80196AFC 00193A3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80196B00 00193A40 48 1C B6 D5 */ bl func_803621D4 +/* 80196B00 00193A40 48 1C B6 D5 */ bl _savegpr_27 /* 80196B04 00193A44 7C 7B 1B 78 */ mr r27, r3 /* 80196B08 00193A48 7C 9C 23 78 */ mr r28, r4 /* 80196B0C 00193A4C 3B A0 00 00 */ li r29, 0 @@ -188,7 +188,7 @@ lbl_80196B7C: /* 80196B84 00193AC4 3B FF 00 04 */ addi r31, r31, 4 /* 80196B88 00193AC8 41 80 FF 8C */ blt lbl_80196B14 /* 80196B8C 00193ACC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80196B90 00193AD0 48 1C B6 91 */ bl func_80362220 +/* 80196B90 00193AD0 48 1C B6 91 */ bl _restgpr_27 /* 80196B94 00193AD4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80196B98 00193AD8 7C 08 03 A6 */ mtlr r0 /* 80196B9C 00193ADC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index 18e3495604..a89b802b7f 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -93,7 +93,7 @@ diff_model_c: /* 80048D84 00045CC4 7C 08 02 A6 */ mflr r0 /* 80048D88 00045CC8 90 01 00 24 */ stw r0, 0x24(r1) /* 80048D8C 00045CCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048D90 00045CD0 48 31 94 49 */ bl func_803621D8 +/* 80048D90 00045CD0 48 31 94 49 */ bl _savegpr_28 /* 80048D94 00045CD4 7C 7C 1B 79 */ or. r28, r3, r3 /* 80048D98 00045CD8 7C 9D 23 78 */ mr r29, r4 /* 80048D9C 00045CDC 41 82 00 54 */ beq lbl_80048DF0 @@ -122,7 +122,7 @@ lbl_80048DD0: lbl_80048DF0: /* 80048DF0 00045D30 7F 83 E3 78 */ mr r3, r28 /* 80048DF4 00045D34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048DF8 00045D38 48 31 94 2D */ bl func_80362224 +/* 80048DF8 00045D38 48 31 94 2D */ bl _restgpr_28 /* 80048DFC 00045D3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80048E00 00045D40 7C 08 03 A6 */ mtlr r0 /* 80048E04 00045D44 38 21 00 20 */ addi r1, r1, 0x20 @@ -347,7 +347,7 @@ diff_model_c_NS_create: /* 800490F0 00046030 7C 08 02 A6 */ mflr r0 /* 800490F4 00046034 90 01 00 34 */ stw r0, 0x34(r1) /* 800490F8 00046038 39 61 00 30 */ addi r11, r1, 0x30 -/* 800490FC 0004603C 48 31 90 DD */ bl func_803621D8 +/* 800490FC 0004603C 48 31 90 DD */ bl _savegpr_28 /* 80049100 00046040 7C 7C 1B 78 */ mr r28, r3 /* 80049104 00046044 7C 9D 23 78 */ mr r29, r4 /* 80049108 00046048 7C BE 2B 78 */ mr r30, r5 @@ -408,7 +408,7 @@ lbl_800491D8: /* 800491D8 00046118 38 60 00 00 */ li r3, 0 lbl_800491DC: /* 800491DC 0004611C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800491E0 00046120 48 31 90 45 */ bl func_80362224 +/* 800491E0 00046120 48 31 90 45 */ bl _restgpr_28 /* 800491E4 00046124 80 01 00 34 */ lwz r0, 0x34(r1) /* 800491E8 00046128 7C 08 03 A6 */ mtlr r0 /* 800491EC 0004612C 38 21 00 30 */ addi r1, r1, 0x30 @@ -539,7 +539,7 @@ diff_model_c_NS_isSame: /* 8004938C 000462CC 7C 08 02 A6 */ mflr r0 /* 80049390 000462D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80049394 000462D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80049398 000462D8 48 31 8E 41 */ bl func_803621D8 +/* 80049398 000462D8 48 31 8E 41 */ bl _savegpr_28 /* 8004939C 000462DC 7C 7C 1B 78 */ mr r28, r3 /* 800493A0 000462E0 7C 9D 23 78 */ mr r29, r4 /* 800493A4 000462E4 7C BE 2B 78 */ mr r30, r5 @@ -562,7 +562,7 @@ lbl_800493E0: /* 800493E0 00046320 38 60 00 00 */ li r3, 0 lbl_800493E4: /* 800493E4 00046324 39 61 00 20 */ addi r11, r1, 0x20 -/* 800493E8 00046328 48 31 8E 3D */ bl func_80362224 +/* 800493E8 00046328 48 31 8E 3D */ bl _restgpr_28 /* 800493EC 0004632C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800493F0 00046330 7C 08 03 A6 */ mtlr r0 /* 800493F4 00046334 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index 1eed6a2a8c..357cc1dfed 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -1342,7 +1342,7 @@ fopAcM_searchActorDistanceXZ2: /* 8001AAF4 00017A34 DB C1 00 20 */ stfd f30, 0x20(r1) /* 8001AAF8 00017A38 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8001AAFC 00017A3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001AB00 00017A40 48 34 76 D5 */ bl func_803621D4 +/* 8001AB00 00017A40 48 34 76 D5 */ bl _savegpr_27 /* 8001AB04 00017A44 7C 7B 1B 78 */ mr r27, r3 /* 8001AB08 00017A48 7C 9C 23 78 */ mr r28, r4 /* 8001AB0C 00017A4C 7C BD 2B 78 */ mr r29, r5 @@ -1422,7 +1422,7 @@ lbl_8001AC18: /* 8001AC20 00017B60 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8001AC24 00017B64 CB C1 00 20 */ lfd f30, 0x20(r1) /* 8001AC28 00017B68 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001AC2C 00017B6C 48 34 75 F5 */ bl func_80362220 +/* 8001AC2C 00017B6C 48 34 75 F5 */ bl _restgpr_27 /* 8001AC30 00017B70 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001AC34 00017B74 7C 08 03 A6 */ mtlr r0 /* 8001AC38 00017B78 38 21 00 40 */ addi r1, r1, 0x40 @@ -2368,7 +2368,7 @@ fopAcM_orderMapToolAutoNextEvent: /* 8001B90C 0001884C 7C 08 02 A6 */ mflr r0 /* 8001B910 00018850 90 01 00 34 */ stw r0, 0x34(r1) /* 8001B914 00018854 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B918 00018858 48 34 68 BD */ bl func_803621D4 +/* 8001B918 00018858 48 34 68 BD */ bl _savegpr_27 /* 8001B91C 0001885C 7C 7B 1B 78 */ mr r27, r3 /* 8001B920 00018860 7C 9C 23 78 */ mr r28, r4 /* 8001B924 00018864 7C BD 2B 78 */ mr r29, r5 @@ -2415,7 +2415,7 @@ lbl_8001B984: /* 8001B9B4 000188F4 48 02 5C B5 */ bl dEvt_control_c_NS_order lbl_8001B9B8: /* 8001B9B8 000188F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B9BC 000188FC 48 34 68 65 */ bl func_80362220 +/* 8001B9BC 000188FC 48 34 68 65 */ bl _restgpr_27 /* 8001B9C0 00018900 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001B9C4 00018904 7C 08 03 A6 */ mtlr r0 /* 8001B9C8 00018908 38 21 00 30 */ addi r1, r1, 0x30 @@ -4024,7 +4024,7 @@ lbl_8001D018: /* 8001D02C 00019F6C DB E1 00 50 */ stfd f31, 0x50(r1) /* 8001D030 00019F70 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8001D034 00019F74 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001D038 00019F78 48 34 51 9D */ bl func_803621D4 +/* 8001D038 00019F78 48 34 51 9D */ bl _savegpr_27 /* 8001D03C 00019F7C 7C 7B 1B 78 */ mr r27, r3 /* 8001D040 00019F80 7C 9C 23 78 */ mr r28, r4 /* 8001D044 00019F84 7C DD 33 78 */ mr r29, r6 @@ -4073,7 +4073,7 @@ lbl_8001D0EC: /* 8001D0EC 0001A02C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8001D0F0 0001A030 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8001D0F4 0001A034 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001D0F8 0001A038 48 34 51 29 */ bl func_80362220 +/* 8001D0F8 0001A038 48 34 51 29 */ bl _restgpr_27 /* 8001D0FC 0001A03C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8001D100 0001A040 7C 08 03 A6 */ mtlr r0 /* 8001D104 0001A044 38 21 00 60 */ addi r1, r1, 0x60 @@ -4087,7 +4087,7 @@ fopAcM_effHamonSet: /* 8001D118 0001A058 DB E1 00 50 */ stfd f31, 0x50(r1) /* 8001D11C 0001A05C F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8001D120 0001A060 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001D124 0001A064 48 34 50 B1 */ bl func_803621D4 +/* 8001D124 0001A064 48 34 50 B1 */ bl _savegpr_27 /* 8001D128 0001A068 7C 7B 1B 78 */ mr r27, r3 /* 8001D12C 0001A06C 7C 9C 23 78 */ mr r28, r4 /* 8001D130 0001A070 FF E0 10 90 */ fmr f31, f2 @@ -4136,7 +4136,7 @@ lbl_8001D1C0: /* 8001D1D4 0001A114 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8001D1D8 0001A118 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8001D1DC 0001A11C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8001D1E0 0001A120 48 34 50 41 */ bl func_80362220 +/* 8001D1E0 0001A120 48 34 50 41 */ bl _restgpr_27 /* 8001D1E4 0001A124 80 01 00 64 */ lwz r0, 0x64(r1) /* 8001D1E8 0001A128 7C 08 03 A6 */ mtlr r0 /* 8001D1EC 0001A12C 38 21 00 60 */ addi r1, r1, 0x60 @@ -4300,7 +4300,7 @@ fopAcM_setEffectMtx: /* 8001D430 0001A370 7C 08 02 A6 */ mflr r0 /* 8001D434 0001A374 90 01 00 B4 */ stw r0, 0xb4(r1) /* 8001D438 0001A378 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8001D43C 0001A37C 48 34 4D 99 */ bl func_803621D4 +/* 8001D43C 0001A37C 48 34 4D 99 */ bl _savegpr_27 /* 8001D440 0001A380 7C 7B 1B 78 */ mr r27, r3 /* 8001D444 0001A384 7C 9F 23 78 */ mr r31, r4 /* 8001D448 0001A388 3B BB 05 38 */ addi r29, r27, 0x538 @@ -4390,7 +4390,7 @@ lbl_8001D580: /* 8001D584 0001A4C4 7C 00 F8 40 */ cmplw r0, r31 /* 8001D588 0001A4C8 41 80 FF A4 */ blt lbl_8001D52C /* 8001D58C 0001A4CC 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8001D590 0001A4D0 48 34 4C 91 */ bl func_80362220 +/* 8001D590 0001A4D0 48 34 4C 91 */ bl _restgpr_27 /* 8001D594 0001A4D4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8001D598 0001A4D8 7C 08 03 A6 */ mtlr r0 /* 8001D59C 0001A4DC 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -4568,7 +4568,7 @@ fopAcM_searchFromName4Event: /* 8001D7CC 0001A70C B0 81 00 26 */ sth r4, 0x26(r1) /* 8001D7D0 0001A710 38 61 00 08 */ addi r3, r1, 8 /* 8001D7D4 0001A714 7C A4 2B 78 */ mr r4, r5 -/* 8001D7D8 0001A718 48 34 B3 55 */ bl func_80368B2C +/* 8001D7D8 0001A718 48 34 B3 55 */ bl strcpy /* 8001D7DC 0001A71C 38 61 00 08 */ addi r3, r1, 8 /* 8001D7E0 0001A720 38 80 00 3A */ li r4, 0x3a /* 8001D7E4 0001A724 48 34 B1 41 */ bl func_80368924 diff --git a/asm/f/op/kankyo/f_op_kankyo_mng.s b/asm/f/op/kankyo/f_op_kankyo_mng.s index 9d292ab0e9..38f08147d0 100644 --- a/asm/f/op/kankyo/f_op_kankyo_mng.s +++ b/asm/f/op/kankyo/f_op_kankyo_mng.s @@ -209,7 +209,7 @@ lbl_8001F8EC: /* 8001F910 0001C850 7C 08 02 A6 */ mflr r0 /* 8001F914 0001C854 90 01 00 44 */ stw r0, 0x44(r1) /* 8001F918 0001C858 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001F91C 0001C85C 48 34 28 BD */ bl func_803621D8 +/* 8001F91C 0001C85C 48 34 28 BD */ bl _savegpr_28 /* 8001F920 0001C860 7C 7C 1B 78 */ mr r28, r3 /* 8001F924 0001C864 D0 21 00 20 */ stfs f1, 0x20(r1) /* 8001F928 0001C868 D0 21 00 24 */ stfs f1, 0x24(r1) @@ -243,7 +243,7 @@ lbl_8001F940: /* 8001F994 0001C8D4 41 80 FF AC */ blt lbl_8001F940 /* 8001F998 0001C8D8 38 60 FF FF */ li r3, -1 /* 8001F99C 0001C8DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001F9A0 0001C8E0 48 34 28 85 */ bl func_80362224 +/* 8001F9A0 0001C8E0 48 34 28 85 */ bl _restgpr_28 /* 8001F9A4 0001C8E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001F9A8 0001C8E8 7C 08 03 A6 */ mtlr r0 /* 8001F9AC 0001C8EC 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/f/op/msg/f_op_msg_mng.s b/asm/f/op/msg/f_op_msg_mng.s index 510240fea4..6ce7cb09bd 100644 --- a/asm/f/op/msg/f_op_msg_mng.s +++ b/asm/f/op/msg/f_op_msg_mng.s @@ -144,7 +144,7 @@ createTimerAppend: /* 8001FB74 0001CAB4 DB 81 00 30 */ stfd f28, 0x30(r1) /* 8001FB78 0001CAB8 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 8001FB7C 0001CABC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001FB80 0001CAC0 48 34 26 55 */ bl func_803621D4 +/* 8001FB80 0001CAC0 48 34 26 55 */ bl _savegpr_27 /* 8001FB84 0001CAC4 7C 7B 1B 78 */ mr r27, r3 /* 8001FB88 0001CAC8 7C 9C 23 78 */ mr r28, r4 /* 8001FB8C 0001CACC 7C BD 2B 78 */ mr r29, r5 @@ -192,7 +192,7 @@ lbl_8001FC14: /* 8001FC2C 0001CB6C E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 8001FC30 0001CB70 CB 81 00 30 */ lfd f28, 0x30(r1) /* 8001FC34 0001CB74 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001FC38 0001CB78 48 34 25 E9 */ bl func_80362220 +/* 8001FC38 0001CB78 48 34 25 E9 */ bl _restgpr_27 /* 8001FC3C 0001CB7C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8001FC40 0001CB80 7C 08 03 A6 */ mtlr r0 /* 8001FC44 0001CB84 38 21 00 70 */ addi r1, r1, 0x70 @@ -272,7 +272,7 @@ fopMsgM_messageSet: /* 8001FD38 0001CC78 7C 08 02 A6 */ mflr r0 /* 8001FD3C 0001CC7C 90 01 00 34 */ stw r0, 0x34(r1) /* 8001FD40 0001CC80 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001FD44 0001CC84 48 34 24 95 */ bl func_803621D8 +/* 8001FD44 0001CC84 48 34 24 95 */ bl _savegpr_28 /* 8001FD48 0001CC88 7C 7C 1B 78 */ mr r28, r3 /* 8001FD4C 0001CC8C 7C 9D 23 78 */ mr r29, r4 /* 8001FD50 0001CC90 7C BE 2B 78 */ mr r30, r5 @@ -354,7 +354,7 @@ lbl_8001FE68: /* 8001FE68 0001CDA8 38 60 00 00 */ li r3, 0 lbl_8001FE6C: /* 8001FE6C 0001CDAC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001FE70 0001CDB0 48 34 23 B5 */ bl func_80362224 +/* 8001FE70 0001CDB0 48 34 23 B5 */ bl _restgpr_28 /* 8001FE74 0001CDB4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001FE78 0001CDB8 7C 08 03 A6 */ mtlr r0 /* 8001FE7C 0001CDBC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/f/pc/f_pc_layer.s b/asm/f/pc/f_pc_layer.s index 4e616ee583..9dec2cf0aa 100644 --- a/asm/f/pc/f_pc_layer.s +++ b/asm/f/pc/f_pc_layer.s @@ -289,7 +289,7 @@ fpcLy_Create: /* 800218CC 0001E80C 7C 08 02 A6 */ mflr r0 /* 800218D0 0001E810 90 01 00 24 */ stw r0, 0x24(r1) /* 800218D4 0001E814 39 61 00 20 */ addi r11, r1, 0x20 -/* 800218D8 0001E818 48 34 09 01 */ bl func_803621D8 +/* 800218D8 0001E818 48 34 09 01 */ bl _savegpr_28 /* 800218DC 0001E81C 7C 7C 1B 78 */ mr r28, r3 /* 800218E0 0001E820 7C 9D 23 78 */ mr r29, r4 /* 800218E4 0001E824 7C BE 2B 78 */ mr r30, r5 @@ -361,7 +361,7 @@ lbl_800219C8: /* 800219E0 0001E920 7F 83 E3 78 */ mr r3, r28 /* 800219E4 0001E924 4B FF FD D9 */ bl fpcLy_Regist /* 800219E8 0001E928 39 61 00 20 */ addi r11, r1, 0x20 -/* 800219EC 0001E92C 48 34 08 39 */ bl func_80362224 +/* 800219EC 0001E92C 48 34 08 39 */ bl _restgpr_28 /* 800219F0 0001E930 80 01 00 24 */ lwz r0, 0x24(r1) /* 800219F4 0001E934 7C 08 03 A6 */ mtlr r0 /* 800219F8 0001E938 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/f_pc_manager.s b/asm/f/pc/f_pc_manager.s index 395392dfd4..91185b9915 100644 --- a/asm/f/pc/f_pc_manager.s +++ b/asm/f/pc/f_pc_manager.s @@ -189,7 +189,7 @@ fpcM_FastCreate: /* 800222F8 0001F238 7C 08 02 A6 */ mflr r0 /* 800222FC 0001F23C 90 01 00 24 */ stw r0, 0x24(r1) /* 80022300 0001F240 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022304 0001F244 48 33 FE D5 */ bl func_803621D8 +/* 80022304 0001F244 48 33 FE D5 */ bl _savegpr_28 /* 80022308 0001F248 7C 7C 1B 78 */ mr r28, r3 /* 8002230C 0001F24C 7C 9D 23 78 */ mr r29, r4 /* 80022310 0001F250 7C BE 2B 78 */ mr r30, r5 @@ -201,7 +201,7 @@ fpcM_FastCreate: /* 80022328 0001F268 7F E7 FB 78 */ mr r7, r31 /* 8002232C 0001F26C 48 00 17 75 */ bl fpcFCtRq_Request /* 80022330 0001F270 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022334 0001F274 48 33 FE F1 */ bl func_80362224 +/* 80022334 0001F274 48 33 FE F1 */ bl _restgpr_28 /* 80022338 0001F278 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002233C 0001F27C 7C 08 03 A6 */ mtlr r0 /* 80022340 0001F280 38 21 00 20 */ addi r1, r1, 0x20 @@ -249,7 +249,7 @@ fpcM_JudgeInLayer: /* 800223B8 0001F2F8 7C 08 02 A6 */ mflr r0 /* 800223BC 0001F2FC 90 01 00 24 */ stw r0, 0x24(r1) /* 800223C0 0001F300 39 61 00 20 */ addi r11, r1, 0x20 -/* 800223C4 0001F304 48 33 FE 15 */ bl func_803621D8 +/* 800223C4 0001F304 48 33 FE 15 */ bl _savegpr_28 /* 800223C8 0001F308 7C 7C 1B 78 */ mr r28, r3 /* 800223CC 0001F30C 7C 9D 23 78 */ mr r29, r4 /* 800223D0 0001F310 7C BE 2B 78 */ mr r30, r5 @@ -271,7 +271,7 @@ lbl_8002240C: /* 8002240C 0001F34C 38 60 00 00 */ li r3, 0 lbl_80022410: /* 80022410 0001F350 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022414 0001F354 48 33 FE 11 */ bl func_80362224 +/* 80022414 0001F354 48 33 FE 11 */ bl _restgpr_28 /* 80022418 0001F358 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002241C 0001F35C 7C 08 03 A6 */ mtlr r0 /* 80022420 0001F360 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/f_pc_priority.s b/asm/f/pc/f_pc_priority.s index c9a683a172..22da0050ce 100644 --- a/asm/f/pc/f_pc_priority.s +++ b/asm/f/pc/f_pc_priority.s @@ -279,7 +279,7 @@ fpcPi_Init: /* 800234C0 00020400 7C 08 02 A6 */ mflr r0 /* 800234C4 00020404 90 01 00 24 */ stw r0, 0x24(r1) /* 800234C8 00020408 39 61 00 20 */ addi r11, r1, 0x20 -/* 800234CC 0002040C 48 33 ED 09 */ bl func_803621D4 +/* 800234CC 0002040C 48 33 ED 09 */ bl _savegpr_27 /* 800234D0 00020410 7C 7B 1B 78 */ mr r27, r3 /* 800234D4 00020414 7C 9C 23 78 */ mr r28, r4 /* 800234D8 00020418 7C BD 2B 78 */ mr r29, r5 @@ -314,7 +314,7 @@ lbl_80023504: /* 80023548 00020488 38 60 00 01 */ li r3, 1 lbl_8002354C: /* 8002354C 0002048C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023550 00020490 48 33 EC D1 */ bl func_80362220 +/* 80023550 00020490 48 33 EC D1 */ bl _restgpr_27 /* 80023554 00020494 80 01 00 24 */ lwz r0, 0x24(r1) /* 80023558 00020498 7C 08 03 A6 */ mtlr r0 /* 8002355C 0002049C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/layer/f_pc_layer_iter.s b/asm/f/pc/layer/f_pc_layer_iter.s index cea5c80d07..6d60f9d63e 100644 --- a/asm/f/pc/layer/f_pc_layer_iter.s +++ b/asm/f/pc/layer/f_pc_layer_iter.s @@ -26,7 +26,7 @@ fpcLyIt_OnlyHereLY: /* 80021BC4 0001EB04 7C 08 02 A6 */ mflr r0 /* 80021BC8 0001EB08 90 01 00 24 */ stw r0, 0x24(r1) /* 80021BCC 0001EB0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021BD0 0001EB10 48 34 06 09 */ bl func_803621D8 +/* 80021BD0 0001EB10 48 34 06 09 */ bl _savegpr_28 /* 80021BD4 0001EB14 7C 7C 1B 78 */ mr r28, r3 /* 80021BD8 0001EB18 7C 9D 23 78 */ mr r29, r4 /* 80021BDC 0001EB1C 7C BF 2B 78 */ mr r31, r5 @@ -43,7 +43,7 @@ fpcLyIt_OnlyHereLY: /* 80021C08 0001EB48 4B FF FA E5 */ bl fpcLy_SetCurrentLayer /* 80021C0C 0001EB4C 7F E3 FB 78 */ mr r3, r31 /* 80021C10 0001EB50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021C14 0001EB54 48 34 06 11 */ bl func_80362224 +/* 80021C14 0001EB54 48 34 06 11 */ bl _restgpr_28 /* 80021C18 0001EB58 80 01 00 24 */ lwz r0, 0x24(r1) /* 80021C1C 0001EB5C 7C 08 03 A6 */ mtlr r0 /* 80021C20 0001EB60 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/layer/f_pc_layer_tag.s b/asm/f/pc/layer/f_pc_layer_tag.s index a98fc3b138..f46b949f03 100644 --- a/asm/f/pc/layer/f_pc_layer_tag.s +++ b/asm/f/pc/layer/f_pc_layer_tag.s @@ -9,7 +9,7 @@ fpcLyTg_ToQueue: /* 80021CD8 0001EC18 7C 08 02 A6 */ mflr r0 /* 80021CDC 0001EC1C 90 01 00 24 */ stw r0, 0x24(r1) /* 80021CE0 0001EC20 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021CE4 0001EC24 48 34 04 F5 */ bl func_803621D8 +/* 80021CE4 0001EC24 48 34 04 F5 */ bl _savegpr_28 /* 80021CE8 0001EC28 7C 7C 1B 78 */ mr r28, r3 /* 80021CEC 0001EC2C 7C 9D 23 78 */ mr r29, r4 /* 80021CF0 0001EC30 7C BE 2B 78 */ mr r30, r5 @@ -68,7 +68,7 @@ lbl_80021DB0: /* 80021DB0 0001ECF0 38 60 00 00 */ li r3, 0 lbl_80021DB4: /* 80021DB4 0001ECF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021DB8 0001ECF8 48 34 04 6D */ bl func_80362224 +/* 80021DB8 0001ECF8 48 34 04 6D */ bl _restgpr_28 /* 80021DBC 0001ECFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80021DC0 0001ED00 7C 08 03 A6 */ mtlr r0 /* 80021DC4 0001ED04 38 21 00 20 */ addi r1, r1, 0x20 @@ -109,7 +109,7 @@ fpcLyTg_Move: /* 80021E30 0001ED70 7C 08 02 A6 */ mflr r0 /* 80021E34 0001ED74 90 01 00 24 */ stw r0, 0x24(r1) /* 80021E38 0001ED78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021E3C 0001ED7C 48 34 03 99 */ bl func_803621D4 +/* 80021E3C 0001ED7C 48 34 03 99 */ bl _savegpr_27 /* 80021E40 0001ED80 7C 7B 1B 78 */ mr r27, r3 /* 80021E44 0001ED84 7C 9C 23 78 */ mr r28, r4 /* 80021E48 0001ED88 7C BD 2B 78 */ mr r29, r5 @@ -136,7 +136,7 @@ lbl_80021E94: /* 80021E94 0001EDD4 38 60 00 00 */ li r3, 0 lbl_80021E98: /* 80021E98 0001EDD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021E9C 0001EDDC 48 34 03 85 */ bl func_80362220 +/* 80021E9C 0001EDDC 48 34 03 85 */ bl _restgpr_27 /* 80021EA0 0001EDE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80021EA4 0001EDE4 7C 08 03 A6 */ mtlr r0 /* 80021EA8 0001EDE8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/line/f_pc_line_iter.s b/asm/f/pc/line/f_pc_line_iter.s index f123890a51..9c2bd734bf 100644 --- a/asm/f/pc/line/f_pc_line_iter.s +++ b/asm/f/pc/line/f_pc_line_iter.s @@ -9,7 +9,7 @@ fpcLnIt_MethodCall: /* 800236C4 00020604 7C 08 02 A6 */ mflr r0 /* 800236C8 00020608 90 01 00 24 */ stw r0, 0x24(r1) /* 800236CC 0002060C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800236D0 00020610 48 33 EB 09 */ bl func_803621D8 +/* 800236D0 00020610 48 33 EB 09 */ bl _savegpr_28 /* 800236D4 00020614 7C 7C 1B 78 */ mr r28, r3 /* 800236D8 00020618 7C 9D 23 78 */ mr r29, r4 /* 800236DC 0002061C 80 63 00 0C */ lwz r3, 0xc(r3) @@ -26,7 +26,7 @@ fpcLnIt_MethodCall: /* 80023708 00020648 4B FF DF E5 */ bl fpcLy_SetCurrentLayer /* 8002370C 0002064C 7F E3 FB 78 */ mr r3, r31 /* 80023710 00020650 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023714 00020654 48 33 EB 11 */ bl func_80362224 +/* 80023714 00020654 48 33 EB 11 */ bl _restgpr_28 /* 80023718 00020658 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002371C 0002065C 7C 08 03 A6 */ mtlr r0 /* 80023720 00020660 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/node/f_pc_node_req.s b/asm/f/pc/node/f_pc_node_req.s index b366f3fe17..4049d51d85 100644 --- a/asm/f/pc/node/f_pc_node_req.s +++ b/asm/f/pc/node/f_pc_node_req.s @@ -483,7 +483,7 @@ fpcNdRq_ChangeNode: /* 80022E18 0001FD58 7C 08 02 A6 */ mflr r0 /* 80022E1C 0001FD5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80022E20 0001FD60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022E24 0001FD64 48 33 F3 B5 */ bl func_803621D8 +/* 80022E24 0001FD64 48 33 F3 B5 */ bl _savegpr_28 /* 80022E28 0001FD68 7C 7C 1B 78 */ mr r28, r3 /* 80022E2C 0001FD6C 7C 9D 23 78 */ mr r29, r4 /* 80022E30 0001FD70 7C BE 2B 78 */ mr r30, r5 @@ -515,7 +515,7 @@ lbl_80022E94: /* 80022E94 0001FDD4 38 60 00 00 */ li r3, 0 lbl_80022E98: /* 80022E98 0001FDD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022E9C 0001FDDC 48 33 F3 89 */ bl func_80362224 +/* 80022E9C 0001FDDC 48 33 F3 89 */ bl _restgpr_28 /* 80022EA0 0001FDE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80022EA4 0001FDE4 7C 08 03 A6 */ mtlr r0 /* 80022EA8 0001FDE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -567,7 +567,7 @@ fpcNdRq_CreateNode: /* 80022F40 0001FE80 7C 08 02 A6 */ mflr r0 /* 80022F44 0001FE84 90 01 00 24 */ stw r0, 0x24(r1) /* 80022F48 0001FE88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022F4C 0001FE8C 48 33 F2 8D */ bl func_803621D8 +/* 80022F4C 0001FE8C 48 33 F2 8D */ bl _savegpr_28 /* 80022F50 0001FE90 7C 7C 1B 78 */ mr r28, r3 /* 80022F54 0001FE94 7C 9D 23 78 */ mr r29, r4 /* 80022F58 0001FE98 7C BE 2B 78 */ mr r30, r5 @@ -604,7 +604,7 @@ lbl_80022FC4: /* 80022FCC 0001FF0C 93 C3 00 5C */ stw r30, 0x5c(r3) lbl_80022FD0: /* 80022FD0 0001FF10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022FD4 0001FF14 48 33 F2 51 */ bl func_80362224 +/* 80022FD4 0001FF14 48 33 F2 51 */ bl _restgpr_28 /* 80022FD8 0001FF18 80 01 00 24 */ lwz r0, 0x24(r1) /* 80022FDC 0001FF1C 7C 08 03 A6 */ mtlr r0 /* 80022FE0 0001FF20 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/stdcreate/f_pc_stdcreate_req.s b/asm/f/pc/stdcreate/f_pc_stdcreate_req.s index f92d962c21..fae547f42e 100644 --- a/asm/f/pc/stdcreate/f_pc_stdcreate_req.s +++ b/asm/f/pc/stdcreate/f_pc_stdcreate_req.s @@ -164,7 +164,7 @@ fpcSCtRq_Request: /* 80023D98 00020CD8 7C 08 02 A6 */ mflr r0 /* 80023D9C 00020CDC 90 01 00 24 */ stw r0, 0x24(r1) /* 80023DA0 00020CE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023DA4 00020CE4 48 33 E4 31 */ bl func_803621D4 +/* 80023DA4 00020CE4 48 33 E4 31 */ bl _savegpr_27 /* 80023DA8 00020CE8 7C 9B 23 78 */ mr r27, r4 /* 80023DAC 00020CEC 7C BC 2B 78 */ mr r28, r5 /* 80023DB0 00020CF0 7C DD 33 78 */ mr r29, r6 @@ -195,7 +195,7 @@ lbl_80023DEC: /* 80023E0C 00020D4C 80 7F 00 3C */ lwz r3, 0x3c(r31) lbl_80023E10: /* 80023E10 00020D50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023E14 00020D54 48 33 E4 0D */ bl func_80362220 +/* 80023E14 00020D54 48 33 E4 0D */ bl _restgpr_27 /* 80023E18 00020D58 80 01 00 24 */ lwz r0, 0x24(r1) /* 80023E1C 00020D5C 7C 08 03 A6 */ mtlr r0 /* 80023E20 00020D60 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/gf/GFPixel.s b/asm/gf/GFPixel.s index ca324e6dc8..c349f1b306 100644 --- a/asm/gf/GFPixel.s +++ b/asm/gf/GFPixel.s @@ -9,7 +9,7 @@ GFSetFog: /* 802CDEA0 002CADE0 7C 08 02 A6 */ mflr r0 /* 802CDEA4 002CADE4 90 01 00 34 */ stw r0, 0x34(r1) /* 802CDEA8 002CADE8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CDEAC 002CADEC 48 09 43 2D */ bl func_803621D8 +/* 802CDEAC 002CADEC 48 09 43 2D */ bl _savegpr_28 /* 802CDEB0 002CADF0 7C 7C 1B 78 */ mr r28, r3 /* 802CDEB4 002CADF4 7C 9F 23 78 */ mr r31, r4 /* 802CDEB8 002CADF8 FC 04 18 00 */ fcmpu cr0, f4, f3 @@ -98,7 +98,7 @@ lbl_802CDF40: /* 802CDFE4 002CAF24 98 A6 80 00 */ stb r5, -0x8000(r6) /* 802CDFE8 002CAF28 90 06 80 00 */ stw r0, -0x8000(r6) /* 802CDFEC 002CAF2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CDFF0 002CAF30 48 09 42 35 */ bl func_80362224 +/* 802CDFF0 002CAF30 48 09 42 35 */ bl _restgpr_28 /* 802CDFF4 002CAF34 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CDFF8 002CAF38 7C 08 03 A6 */ mtlr r0 /* 802CDFFC 002CAF3C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/m/Do/dvd/m_Do_dvd_thread.s b/asm/m/Do/dvd/m_Do_dvd_thread.s index 8d6c42e17a..b30f399b1c 100644 --- a/asm/m/Do/dvd/m_Do_dvd_thread.s +++ b/asm/m/Do/dvd/m_Do_dvd_thread.s @@ -463,7 +463,7 @@ mDoDvdThd_mountArchive_c_NS_create: /* 80015E18 00012D58 7C 08 02 A6 */ mflr r0 /* 80015E1C 00012D5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80015E20 00012D60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015E24 00012D64 48 34 C3 B5 */ bl func_803621D8 +/* 80015E24 00012D64 48 34 C3 B5 */ bl _savegpr_28 /* 80015E28 00012D68 7C 7C 1B 78 */ mr r28, r3 /* 80015E2C 00012D6C 7C 9D 23 78 */ mr r29, r4 /* 80015E30 00012D70 7C BE 2B 78 */ mr r30, r5 @@ -508,7 +508,7 @@ lbl_80015EAC: lbl_80015EC0: /* 80015EC0 00012E00 7F E3 FB 78 */ mr r3, r31 /* 80015EC4 00012E04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015EC8 00012E08 48 34 C3 5D */ bl func_80362224 +/* 80015EC8 00012E08 48 34 C3 5D */ bl _restgpr_28 /* 80015ECC 00012E0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80015ED0 00012E10 7C 08 03 A6 */ mtlr r0 /* 80015ED4 00012E14 38 21 00 20 */ addi r1, r1, 0x20 @@ -736,7 +736,7 @@ mDoDvdThd_mountXArchive_c_NS_create: /* 800161E4 00013124 7C 08 02 A6 */ mflr r0 /* 800161E8 00013128 90 01 00 24 */ stw r0, 0x24(r1) /* 800161EC 0001312C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800161F0 00013130 48 34 BF E5 */ bl func_803621D4 +/* 800161F0 00013130 48 34 BF E5 */ bl _savegpr_27 /* 800161F4 00013134 7C 7B 1B 78 */ mr r27, r3 /* 800161F8 00013138 7C 9C 23 78 */ mr r28, r4 /* 800161FC 0001313C 7C BD 2B 78 */ mr r29, r5 @@ -783,7 +783,7 @@ lbl_80016280: lbl_80016294: /* 80016294 000131D4 7F E3 FB 78 */ mr r3, r31 /* 80016298 000131D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001629C 000131DC 48 34 BF 85 */ bl func_80362220 +/* 8001629C 000131DC 48 34 BF 85 */ bl _restgpr_27 /* 800162A0 000131E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800162A4 000131E4 7C 08 03 A6 */ mtlr r0 /* 800162A8 000131E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -859,7 +859,7 @@ mDoDvdThd_toMainRam_c_NS_create: /* 80016398 000132D8 7C 08 02 A6 */ mflr r0 /* 8001639C 000132DC 90 01 00 24 */ stw r0, 0x24(r1) /* 800163A0 000132E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800163A4 000132E4 48 34 BE 35 */ bl func_803621D8 +/* 800163A4 000132E4 48 34 BE 35 */ bl _savegpr_28 /* 800163A8 000132E8 7C 7C 1B 78 */ mr r28, r3 /* 800163AC 000132EC 7C 9D 23 78 */ mr r29, r4 /* 800163B0 000132F0 7C BE 2B 78 */ mr r30, r5 @@ -904,7 +904,7 @@ lbl_8001642C: lbl_80016440: /* 80016440 00013380 7F E3 FB 78 */ mr r3, r31 /* 80016444 00013384 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016448 00013388 48 34 BD DD */ bl func_80362224 +/* 80016448 00013388 48 34 BD DD */ bl _restgpr_28 /* 8001644C 0001338C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80016450 00013390 7C 08 03 A6 */ mtlr r0 /* 80016454 00013394 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_MemCard.s b/asm/m/Do/m_Do_MemCard.s index 8e8cbee67d..fa3c1c48d4 100644 --- a/asm/m/Do/m_Do_MemCard.s +++ b/asm/m/Do/m_Do_MemCard.s @@ -272,7 +272,7 @@ mDoMemCd_Ctrl_c_NS_LoadSync: /* 80016AB4 000139F4 7C 08 02 A6 */ mflr r0 /* 80016AB8 000139F8 90 01 00 24 */ stw r0, 0x24(r1) /* 80016ABC 000139FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016AC0 00013A00 48 34 B7 15 */ bl func_803621D4 +/* 80016AC0 00013A00 48 34 B7 15 */ bl _savegpr_27 /* 80016AC4 00013A04 7C 7B 1B 78 */ mr r27, r3 /* 80016AC8 00013A08 7C 9C 23 78 */ mr r28, r4 /* 80016ACC 00013A0C 7C BD 2B 78 */ mr r29, r5 @@ -310,7 +310,7 @@ lbl_80016B3C: /* 80016B3C 00013A7C 7F E3 FB 78 */ mr r3, r31 lbl_80016B40: /* 80016B40 00013A80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016B44 00013A84 48 34 B6 DD */ bl func_80362220 +/* 80016B44 00013A84 48 34 B6 DD */ bl _restgpr_27 /* 80016B48 00013A88 80 01 00 24 */ lwz r0, 0x24(r1) /* 80016B4C 00013A8C 7C 08 03 A6 */ mtlr r0 /* 80016B50 00013A90 38 21 00 20 */ addi r1, r1, 0x20 @@ -322,7 +322,7 @@ mDoMemCd_Ctrl_c_NS_save: /* 80016B5C 00013A9C 7C 08 02 A6 */ mflr r0 /* 80016B60 00013AA0 90 01 00 24 */ stw r0, 0x24(r1) /* 80016B64 00013AA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016B68 00013AA8 48 34 B6 71 */ bl func_803621D8 +/* 80016B68 00013AA8 48 34 B6 71 */ bl _savegpr_28 /* 80016B6C 00013AAC 7C 7C 1B 78 */ mr r28, r3 /* 80016B70 00013AB0 7C 9D 23 78 */ mr r29, r4 /* 80016B74 00013AB4 7C BE 2B 78 */ mr r30, r5 @@ -345,7 +345,7 @@ mDoMemCd_Ctrl_c_NS_save: /* 80016BB8 00013AF8 48 32 88 4D */ bl OSSignalCond lbl_80016BBC: /* 80016BBC 00013AFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016BC0 00013B00 48 34 B6 65 */ bl func_80362224 +/* 80016BC0 00013B00 48 34 B6 65 */ bl _restgpr_28 /* 80016BC4 00013B04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80016BC8 00013B08 7C 08 03 A6 */ mtlr r0 /* 80016BCC 00013B0C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_MemCardRWmng.s b/asm/m/Do/m_Do_MemCardRWmng.s index b479194840..05473772e6 100644 --- a/asm/m/Do/m_Do_MemCardRWmng.s +++ b/asm/m/Do/m_Do_MemCardRWmng.s @@ -9,7 +9,7 @@ mDoMemCdRWm_Store: /* 8001749C 000143DC 7C 08 02 A6 */ mflr r0 /* 800174A0 000143E0 90 01 00 24 */ stw r0, 0x24(r1) /* 800174A4 000143E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800174A8 000143E8 48 34 AD 31 */ bl func_803621D8 +/* 800174A8 000143E8 48 34 AD 31 */ bl _savegpr_28 /* 800174AC 000143EC 7C 7D 1B 78 */ mr r29, r3 /* 800174B0 000143F0 7C 9E 23 78 */ mr r30, r4 /* 800174B4 000143F4 7C BF 2B 78 */ mr r31, r5 @@ -139,7 +139,7 @@ lbl_80017678: /* 80017680 000145C0 7F E3 FB 78 */ mr r3, r31 lbl_80017684: /* 80017684 000145C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80017688 000145C8 48 34 AB 9D */ bl func_80362224 +/* 80017688 000145C8 48 34 AB 9D */ bl _restgpr_28 /* 8001768C 000145CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80017690 000145D0 7C 08 03 A6 */ mtlr r0 /* 80017694 000145D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -283,7 +283,7 @@ mDoMemCdRWm_BuildHeader: /* 80017880 000147C0 7C 08 02 A6 */ mflr r0 /* 80017884 000147C4 90 01 00 44 */ stw r0, 0x44(r1) /* 80017888 000147C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001788C 000147CC 48 34 A9 4D */ bl func_803621D8 +/* 8001788C 000147CC 48 34 A9 4D */ bl _savegpr_28 /* 80017890 000147D0 7C 7F 1B 78 */ mr r31, r3 /* 80017894 000147D4 38 7F 24 00 */ addi r3, r31, 0x2400 /* 80017898 000147D8 38 80 00 20 */ li r4, 0x20 @@ -364,7 +364,7 @@ mDoMemCdRWm_BuildHeader: /* 800179C4 00014904 7D 89 03 A6 */ mtctr r12 /* 800179C8 00014908 4E 80 04 21 */ bctrl /* 800179CC 0001490C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800179D0 00014910 48 34 A8 55 */ bl func_80362224 +/* 800179D0 00014910 48 34 A8 55 */ bl _restgpr_28 /* 800179D4 00014914 80 01 00 44 */ lwz r0, 0x44(r1) /* 800179D8 00014918 7C 08 03 A6 */ mtlr r0 /* 800179DC 0001491C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/m/Do/m_Do_Reset.s b/asm/m/Do/m_Do_Reset.s index b0fae9f72d..6c5c0b1bed 100644 --- a/asm/m/Do/m_Do_Reset.s +++ b/asm/m/Do/m_Do_Reset.s @@ -30,7 +30,7 @@ mDoRst_reset: /* 80015618 00012558 7C 08 02 A6 */ mflr r0 /* 8001561C 0001255C 90 01 00 24 */ stw r0, 0x24(r1) /* 80015620 00012560 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015624 00012564 48 34 CB B1 */ bl func_803621D4 +/* 80015624 00012564 48 34 CB B1 */ bl _savegpr_27 /* 80015628 00012568 7C 7B 1B 78 */ mr r27, r3 /* 8001562C 0001256C 7C 9C 23 78 */ mr r28, r4 /* 80015630 00012570 7C BD 2B 78 */ mr r29, r5 diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index 73c613b65e..2518bd22d7 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -272,7 +272,7 @@ mDoExt_bpkAnm_NS_init: /* 8000D484 0000A3C4 90 01 00 34 */ stw r0, 0x34(r1) /* 8000D488 0000A3C8 DB E1 00 28 */ stfd f31, 0x28(r1) /* 8000D48C 0000A3CC 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D490 0000A3D0 48 35 4D 45 */ bl func_803621D4 +/* 8000D490 0000A3D0 48 35 4D 45 */ bl _savegpr_27 /* 8000D494 0000A3D4 7C 7B 1B 78 */ mr r27, r3 /* 8000D498 0000A3D8 7C DC 33 78 */ mr r28, r6 /* 8000D49C 0000A3DC 7C FD 3B 78 */ mr r29, r7 @@ -305,7 +305,7 @@ lbl_8000D4F8: lbl_8000D4FC: /* 8000D4FC 0000A43C CB E1 00 28 */ lfd f31, 0x28(r1) /* 8000D500 0000A440 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D504 0000A444 48 35 4D 1D */ bl func_80362220 +/* 8000D504 0000A444 48 35 4D 1D */ bl _restgpr_27 /* 8000D508 0000A448 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000D50C 0000A44C 7C 08 03 A6 */ mtlr r0 /* 8000D510 0000A450 38 21 00 30 */ addi r1, r1, 0x30 @@ -334,7 +334,7 @@ mDoExt_btpAnm_NS_init: /* 8000D554 0000A494 90 01 00 34 */ stw r0, 0x34(r1) /* 8000D558 0000A498 DB E1 00 28 */ stfd f31, 0x28(r1) /* 8000D55C 0000A49C 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D560 0000A4A0 48 35 4C 75 */ bl func_803621D4 +/* 8000D560 0000A4A0 48 35 4C 75 */ bl _savegpr_27 /* 8000D564 0000A4A4 7C 7B 1B 78 */ mr r27, r3 /* 8000D568 0000A4A8 7C DC 33 78 */ mr r28, r6 /* 8000D56C 0000A4AC 7C FD 3B 78 */ mr r29, r7 @@ -367,7 +367,7 @@ lbl_8000D5C8: lbl_8000D5CC: /* 8000D5CC 0000A50C CB E1 00 28 */ lfd f31, 0x28(r1) /* 8000D5D0 0000A510 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D5D4 0000A514 48 35 4C 4D */ bl func_80362220 +/* 8000D5D4 0000A514 48 35 4C 4D */ bl _restgpr_27 /* 8000D5D8 0000A518 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000D5DC 0000A51C 7C 08 03 A6 */ mtlr r0 /* 8000D5E0 0000A520 38 21 00 30 */ addi r1, r1, 0x30 @@ -404,7 +404,7 @@ mDoExt_btkAnm_NS_init: /* 8000D644 0000A584 90 01 00 34 */ stw r0, 0x34(r1) /* 8000D648 0000A588 DB E1 00 28 */ stfd f31, 0x28(r1) /* 8000D64C 0000A58C 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D650 0000A590 48 35 4B 85 */ bl func_803621D4 +/* 8000D650 0000A590 48 35 4B 85 */ bl _savegpr_27 /* 8000D654 0000A594 7C 7B 1B 78 */ mr r27, r3 /* 8000D658 0000A598 7C DC 33 78 */ mr r28, r6 /* 8000D65C 0000A59C 7C FD 3B 78 */ mr r29, r7 @@ -437,7 +437,7 @@ lbl_8000D6B8: lbl_8000D6BC: /* 8000D6BC 0000A5FC CB E1 00 28 */ lfd f31, 0x28(r1) /* 8000D6C0 0000A600 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D6C4 0000A604 48 35 4B 5D */ bl func_80362220 +/* 8000D6C4 0000A604 48 35 4B 5D */ bl _restgpr_27 /* 8000D6C8 0000A608 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000D6CC 0000A60C 7C 08 03 A6 */ mtlr r0 /* 8000D6D0 0000A610 38 21 00 30 */ addi r1, r1, 0x30 @@ -466,7 +466,7 @@ mDoExt_brkAnm_NS_init: /* 8000D714 0000A654 90 01 00 34 */ stw r0, 0x34(r1) /* 8000D718 0000A658 DB E1 00 28 */ stfd f31, 0x28(r1) /* 8000D71C 0000A65C 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D720 0000A660 48 35 4A B5 */ bl func_803621D4 +/* 8000D720 0000A660 48 35 4A B5 */ bl _savegpr_27 /* 8000D724 0000A664 7C 7B 1B 78 */ mr r27, r3 /* 8000D728 0000A668 7C DC 33 78 */ mr r28, r6 /* 8000D72C 0000A66C 7C FD 3B 78 */ mr r29, r7 @@ -499,7 +499,7 @@ lbl_8000D788: lbl_8000D78C: /* 8000D78C 0000A6CC CB E1 00 28 */ lfd f31, 0x28(r1) /* 8000D790 0000A6D0 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D794 0000A6D4 48 35 4A 8D */ bl func_80362220 +/* 8000D794 0000A6D4 48 35 4A 8D */ bl _restgpr_27 /* 8000D798 0000A6D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000D79C 0000A6DC 7C 08 03 A6 */ mtlr r0 /* 8000D7A0 0000A6E0 38 21 00 30 */ addi r1, r1, 0x30 @@ -528,7 +528,7 @@ mDoExt_bckAnm_NS_init: /* 8000D7E4 0000A724 90 01 00 34 */ stw r0, 0x34(r1) /* 8000D7E8 0000A728 DB E1 00 28 */ stfd f31, 0x28(r1) /* 8000D7EC 0000A72C 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D7F0 0000A730 48 35 49 E5 */ bl func_803621D4 +/* 8000D7F0 0000A730 48 35 49 E5 */ bl _savegpr_27 /* 8000D7F4 0000A734 7C 7F 1B 78 */ mr r31, r3 /* 8000D7F8 0000A738 7C BB 2B 78 */ mr r27, r5 /* 8000D7FC 0000A73C 7C DC 33 78 */ mr r28, r6 @@ -591,7 +591,7 @@ lbl_8000D8C4: lbl_8000D8C8: /* 8000D8C8 0000A808 CB E1 00 28 */ lfd f31, 0x28(r1) /* 8000D8CC 0000A80C 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000D8D0 0000A810 48 35 49 51 */ bl func_80362220 +/* 8000D8D0 0000A810 48 35 49 51 */ bl _restgpr_27 /* 8000D8D4 0000A814 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000D8D8 0000A818 7C 08 03 A6 */ mtlr r0 /* 8000D8DC 0000A81C 38 21 00 30 */ addi r1, r1, 0x30 @@ -689,7 +689,7 @@ mDoExt_blkAnm_NS_init: /* 8000DA10 0000A950 90 01 00 34 */ stw r0, 0x34(r1) /* 8000DA14 0000A954 DB E1 00 28 */ stfd f31, 0x28(r1) /* 8000DA18 0000A958 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000DA1C 0000A95C 48 35 47 B9 */ bl func_803621D4 +/* 8000DA1C 0000A95C 48 35 47 B9 */ bl _savegpr_27 /* 8000DA20 0000A960 7C 7B 1B 78 */ mr r27, r3 /* 8000DA24 0000A964 7C DC 33 78 */ mr r28, r6 /* 8000DA28 0000A968 7C FD 3B 78 */ mr r29, r7 @@ -723,7 +723,7 @@ lbl_8000DA88: lbl_8000DA8C: /* 8000DA8C 0000A9CC CB E1 00 28 */ lfd f31, 0x28(r1) /* 8000DA90 0000A9D0 39 61 00 28 */ addi r11, r1, 0x28 -/* 8000DA94 0000A9D4 48 35 47 8D */ bl func_80362220 +/* 8000DA94 0000A9D4 48 35 47 8D */ bl _restgpr_27 /* 8000DA98 0000A9D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000DA9C 0000A9DC 7C 08 03 A6 */ mtlr r0 /* 8000DAA0 0000A9E0 38 21 00 30 */ addi r1, r1, 0x30 @@ -964,7 +964,7 @@ lbl_8000DDC8: /* 8000DDF4 0000AD34 7C 08 02 A6 */ mflr r0 /* 8000DDF8 0000AD38 90 01 00 24 */ stw r0, 0x24(r1) /* 8000DDFC 0000AD3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000DE00 0000AD40 48 35 43 D5 */ bl func_803621D4 +/* 8000DE00 0000AD40 48 35 43 D5 */ bl _savegpr_27 /* 8000DE04 0000AD44 7C 7B 1B 78 */ mr r27, r3 /* 8000DE08 0000AD48 3B A0 00 00 */ li r29, 0 /* 8000DE0C 0000AD4C 3F E0 C0 00 */ lis r31, 0xc000 @@ -1001,7 +1001,7 @@ lbl_8000DE64: /* 8000DE6C 0000ADAC 7C 03 00 40 */ cmplw r3, r0 /* 8000DE70 0000ADB0 41 80 FF A4 */ blt lbl_8000DE14 /* 8000DE74 0000ADB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000DE78 0000ADB8 48 35 43 A9 */ bl func_80362220 +/* 8000DE78 0000ADB8 48 35 43 A9 */ bl _restgpr_27 /* 8000DE7C 0000ADBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000DE80 0000ADC0 7C 08 03 A6 */ mtlr r0 /* 8000DE84 0000ADC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1481,7 +1481,7 @@ J3DGXColor: /* 8000E540 0000B480 7C 08 02 A6 */ mflr r0 /* 8000E544 0000B484 90 01 00 24 */ stw r0, 0x24(r1) /* 8000E548 0000B488 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000E54C 0000B48C 48 35 3C 89 */ bl func_803621D4 +/* 8000E54C 0000B48C 48 35 3C 89 */ bl _savegpr_27 /* 8000E550 0000B490 7C 7B 1B 78 */ mr r27, r3 /* 8000E554 0000B494 7C 9C 23 78 */ mr r28, r4 /* 8000E558 0000B498 7C BD 2B 78 */ mr r29, r5 @@ -1527,7 +1527,7 @@ lbl_8000E5CC: /* 8000E5DC 0000B51C 38 60 00 01 */ li r3, 1 lbl_8000E5E0: /* 8000E5E0 0000B520 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000E5E4 0000B524 48 35 3C 3D */ bl func_80362220 +/* 8000E5E4 0000B524 48 35 3C 3D */ bl _restgpr_27 /* 8000E5E8 0000B528 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000E5EC 0000B52C 7C 08 03 A6 */ mtlr r0 /* 8000E5F0 0000B530 38 21 00 20 */ addi r1, r1, 0x20 @@ -1666,7 +1666,7 @@ lbl_8000E7A8: /* 8000E7C4 0000B704 7C 08 02 A6 */ mflr r0 /* 8000E7C8 0000B708 90 01 00 24 */ stw r0, 0x24(r1) /* 8000E7CC 0000B70C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000E7D0 0000B710 48 35 3A 05 */ bl func_803621D4 +/* 8000E7D0 0000B710 48 35 3A 05 */ bl _savegpr_27 /* 8000E7D4 0000B714 7C 7B 1B 78 */ mr r27, r3 /* 8000E7D8 0000B718 7C 9C 23 78 */ mr r28, r4 /* 8000E7DC 0000B71C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -1686,7 +1686,7 @@ lbl_8000E7A8: /* 8000E814 0000B754 93 DF 00 48 */ stw r30, 0x48(r31) /* 8000E818 0000B758 93 BF 00 4C */ stw r29, 0x4c(r31) /* 8000E81C 0000B75C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000E820 0000B760 48 35 3A 01 */ bl func_80362220 +/* 8000E820 0000B760 48 35 3A 01 */ bl _restgpr_27 /* 8000E824 0000B764 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000E828 0000B768 7C 08 03 A6 */ mtlr r0 /* 8000E82C 0000B76C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1851,7 +1851,7 @@ lbl_8000EA68: /* 8000EA84 0000B9C4 7C 08 02 A6 */ mflr r0 /* 8000EA88 0000B9C8 90 01 00 64 */ stw r0, 0x64(r1) /* 8000EA8C 0000B9CC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8000EA90 0000B9D0 48 35 37 45 */ bl func_803621D4 +/* 8000EA90 0000B9D0 48 35 37 45 */ bl _savegpr_27 /* 8000EA94 0000B9D4 7C 7B 1B 78 */ mr r27, r3 /* 8000EA98 0000B9D8 83 E3 00 6C */ lwz r31, 0x6c(r3) /* 8000EA9C 0000B9DC 28 1F 00 00 */ cmplwi r31, 0 @@ -1993,7 +1993,7 @@ lbl_8000EC98: /* 8000ECA4 0000BBE4 41 80 FF 80 */ blt lbl_8000EC24 lbl_8000ECA8: /* 8000ECA8 0000BBE8 39 61 00 60 */ addi r11, r1, 0x60 -/* 8000ECAC 0000BBEC 48 35 35 75 */ bl func_80362220 +/* 8000ECAC 0000BBEC 48 35 35 75 */ bl _restgpr_27 /* 8000ECB0 0000BBF0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8000ECB4 0000BBF4 7C 08 03 A6 */ mtlr r0 /* 8000ECB8 0000BBF8 38 21 00 60 */ addi r1, r1, 0x60 @@ -2477,7 +2477,7 @@ lbl_8000F258: /* 8000F280 0000C1C0 DB C1 00 E0 */ stfd f30, 0xe0(r1) /* 8000F284 0000C1C4 F3 C1 00 E8 */ psq_st f30, 232(r1), 0, qr0 /* 8000F288 0000C1C8 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8000F28C 0000C1CC 48 35 2F 49 */ bl func_803621D4 +/* 8000F28C 0000C1CC 48 35 2F 49 */ bl _savegpr_27 /* 8000F290 0000C1D0 7C 7B 1B 78 */ mr r27, r3 /* 8000F294 0000C1D4 80 6D 90 74 */ lwz r3, lbl_804515F4-_SDA_BASE_(r13) /* 8000F298 0000C1D8 A3 C3 00 14 */ lhz r30, 0x14(r3) @@ -2614,7 +2614,7 @@ lbl_8000F488: /* 8000F490 0000C3D0 E3 C1 00 E8 */ psq_l f30, 232(r1), 0, qr0 /* 8000F494 0000C3D4 CB C1 00 E0 */ lfd f30, 0xe0(r1) /* 8000F498 0000C3D8 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8000F49C 0000C3DC 48 35 2D 85 */ bl func_80362220 +/* 8000F49C 0000C3DC 48 35 2D 85 */ bl _restgpr_27 /* 8000F4A0 0000C3E0 80 01 01 04 */ lwz r0, 0x104(r1) /* 8000F4A4 0000C3E4 7C 08 03 A6 */ mtlr r0 /* 8000F4A8 0000C3E8 38 21 01 00 */ addi r1, r1, 0x100 @@ -3442,7 +3442,7 @@ lbl_80010054: /* 80010088 0000CFC8 DB C1 00 B0 */ stfd f30, 0xb0(r1) /* 8001008C 0000CFCC F3 C1 00 B8 */ psq_st f30, 184(r1), 0, qr0 /* 80010090 0000CFD0 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80010094 0000CFD4 48 35 21 45 */ bl func_803621D8 +/* 80010094 0000CFD4 48 35 21 45 */ bl _savegpr_28 /* 80010098 0000CFD8 7C 7C 1B 78 */ mr r28, r3 /* 8001009C 0000CFDC 80 03 00 04 */ lwz r0, 4(r3) /* 800100A0 0000CFE0 28 00 00 00 */ cmplwi r0, 0 @@ -3637,7 +3637,7 @@ lbl_80010354: /* 8001035C 0000D29C E3 C1 00 B8 */ psq_l f30, 184(r1), 0, qr0 /* 80010360 0000D2A0 CB C1 00 B0 */ lfd f30, 0xb0(r1) /* 80010364 0000D2A4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80010368 0000D2A8 48 35 1E BD */ bl func_80362224 +/* 80010368 0000D2A8 48 35 1E BD */ bl _restgpr_28 /* 8001036C 0000D2AC 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80010370 0000D2B0 7C 08 03 A6 */ mtlr r0 /* 80010374 0000D2B4 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -3655,7 +3655,7 @@ mDoExt_McaMorf_NS_setAnm: /* 80010398 0000D2D8 DB A1 00 30 */ stfd f29, 0x30(r1) /* 8001039C 0000D2DC F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 800103A0 0000D2E0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800103A4 0000D2E4 48 35 1E 35 */ bl func_803621D8 +/* 800103A4 0000D2E4 48 35 1E 35 */ bl _savegpr_28 /* 800103A8 0000D2E8 7C 7D 1B 78 */ mr r29, r3 /* 800103AC 0000D2EC 7C 9E 23 78 */ mr r30, r4 /* 800103B0 0000D2F0 7C BC 2B 78 */ mr r28, r5 @@ -3796,7 +3796,7 @@ lbl_80010598: /* 800105A8 0000D4E8 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 800105AC 0000D4EC CB A1 00 30 */ lfd f29, 0x30(r1) /* 800105B0 0000D4F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800105B4 0000D4F4 48 35 1C 71 */ bl func_80362224 +/* 800105B4 0000D4F4 48 35 1C 71 */ bl _restgpr_28 /* 800105B8 0000D4F8 80 01 00 64 */ lwz r0, 0x64(r1) /* 800105BC 0000D4FC 7C 08 03 A6 */ mtlr r0 /* 800105C0 0000D500 38 21 00 60 */ addi r1, r1, 0x60 @@ -3808,7 +3808,7 @@ mDoExt_McaMorf_NS_play: /* 800105CC 0000D50C 7C 08 02 A6 */ mflr r0 /* 800105D0 0000D510 90 01 00 24 */ stw r0, 0x24(r1) /* 800105D4 0000D514 39 61 00 20 */ addi r11, r1, 0x20 -/* 800105D8 0000D518 48 35 1C 01 */ bl func_803621D8 +/* 800105D8 0000D518 48 35 1C 01 */ bl _savegpr_28 /* 800105DC 0000D51C 7C 7C 1B 78 */ mr r28, r3 /* 800105E0 0000D520 7C 9D 23 78 */ mr r29, r4 /* 800105E4 0000D524 7C BE 2B 78 */ mr r30, r5 @@ -3847,7 +3847,7 @@ lbl_80010640: lbl_80010664: /* 80010664 0000D5A4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 80010668 0000D5A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001066C 0000D5AC 48 35 1B B9 */ bl func_80362224 +/* 8001066C 0000D5AC 48 35 1B B9 */ bl _restgpr_28 /* 80010670 0000D5B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80010674 0000D5B4 7C 08 03 A6 */ mtlr r0 /* 80010678 0000D5B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -4202,7 +4202,7 @@ lbl_80010B48: /* 80010B7C 0000DABC DB C1 00 B0 */ stfd f30, 0xb0(r1) /* 80010B80 0000DAC0 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, qr0 /* 80010B84 0000DAC4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80010B88 0000DAC8 48 35 16 51 */ bl func_803621D8 +/* 80010B88 0000DAC8 48 35 16 51 */ bl _savegpr_28 /* 80010B8C 0000DACC 7C 7C 1B 78 */ mr r28, r3 /* 80010B90 0000DAD0 80 03 00 04 */ lwz r0, 4(r3) /* 80010B94 0000DAD4 28 00 00 00 */ cmplwi r0, 0 @@ -4397,7 +4397,7 @@ lbl_80010E48: /* 80010E50 0000DD90 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, qr0 /* 80010E54 0000DD94 CB C1 00 B0 */ lfd f30, 0xb0(r1) /* 80010E58 0000DD98 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80010E5C 0000DD9C 48 35 13 C9 */ bl func_80362224 +/* 80010E5C 0000DD9C 48 35 13 C9 */ bl _restgpr_28 /* 80010E60 0000DDA0 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80010E64 0000DDA4 7C 08 03 A6 */ mtlr r0 /* 80010E68 0000DDA8 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -5449,7 +5449,7 @@ mDoExt_McaMorf2_NS_setAnm: /* 80011D94 0000ECD4 DB 81 00 30 */ stfd f28, 0x30(r1) /* 80011D98 0000ECD8 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80011D9C 0000ECDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80011DA0 0000ECE0 48 35 04 39 */ bl func_803621D8 +/* 80011DA0 0000ECE0 48 35 04 39 */ bl _savegpr_28 /* 80011DA4 0000ECE4 7C 7D 1B 78 */ mr r29, r3 /* 80011DA8 0000ECE8 7C 9E 23 78 */ mr r30, r4 /* 80011DAC 0000ECEC 7C BF 2B 78 */ mr r31, r5 @@ -5592,7 +5592,7 @@ lbl_80011F94: /* 80011FAC 0000EEEC E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 80011FB0 0000EEF0 CB 81 00 30 */ lfd f28, 0x30(r1) /* 80011FB4 0000EEF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80011FB8 0000EEF8 48 35 02 6D */ bl func_80362224 +/* 80011FB8 0000EEF8 48 35 02 6D */ bl _restgpr_28 /* 80011FBC 0000EEFC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80011FC0 0000EF00 7C 08 03 A6 */ mtlr r0 /* 80011FC4 0000EF04 38 21 00 70 */ addi r1, r1, 0x70 @@ -5885,7 +5885,7 @@ mDoExt_3Dline_c_NS_init: /* 800123D4 0000F314 7C 08 02 A6 */ mflr r0 /* 800123D8 0000F318 90 01 00 24 */ stw r0, 0x24(r1) /* 800123DC 0000F31C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800123E0 0000F320 48 34 FD F5 */ bl func_803621D4 +/* 800123E0 0000F320 48 34 FD F5 */ bl _savegpr_27 /* 800123E4 0000F324 7C 7C 1B 78 */ mr r28, r3 /* 800123E8 0000F328 7C 9F 23 78 */ mr r31, r4 /* 800123EC 0000F32C 7C BE 2B 78 */ mr r30, r5 @@ -6019,7 +6019,7 @@ lbl_800125C0: /* 800125C0 0000F500 38 60 00 01 */ li r3, 1 lbl_800125C4: /* 800125C4 0000F504 39 61 00 20 */ addi r11, r1, 0x20 -/* 800125C8 0000F508 48 34 FC 59 */ bl func_80362220 +/* 800125C8 0000F508 48 34 FC 59 */ bl _restgpr_27 /* 800125CC 0000F50C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800125D0 0000F510 7C 08 03 A6 */ mtlr r0 /* 800125D4 0000F514 38 21 00 20 */ addi r1, r1, 0x20 @@ -6142,7 +6142,7 @@ mDoExt_3Dline_c: /* 80012778 0000F6B8 7C 08 02 A6 */ mflr r0 /* 8001277C 0000F6BC 90 01 00 34 */ stw r0, 0x34(r1) /* 80012780 0000F6C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80012784 0000F6C4 48 34 FA 51 */ bl func_803621D4 +/* 80012784 0000F6C4 48 34 FA 51 */ bl _savegpr_27 /* 80012788 0000F6C8 7C 7F 1B 78 */ mr r31, r3 /* 8001278C 0000F6CC 80 03 00 08 */ lwz r0, 8(r3) /* 80012790 0000F6D0 90 01 00 08 */ stw r0, 8(r1) @@ -6202,7 +6202,7 @@ lbl_80012844: /* 80012854 0000F794 68 00 00 01 */ xori r0, r0, 1 /* 80012858 0000F798 98 1F 00 16 */ stb r0, 0x16(r31) /* 8001285C 0000F79C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80012860 0000F7A0 48 34 F9 C1 */ bl func_80362220 +/* 80012860 0000F7A0 48 34 F9 C1 */ bl _restgpr_27 /* 80012864 0000F7A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80012868 0000F7A8 7C 08 03 A6 */ mtlr r0 /* 8001286C 0000F7AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -7092,7 +7092,7 @@ lbl_800134E0: /* 800135D4 00010514 7C 08 02 A6 */ mflr r0 /* 800135D8 00010518 90 01 00 34 */ stw r0, 0x34(r1) /* 800135DC 0001051C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800135E0 00010520 48 34 EB F5 */ bl func_803621D4 +/* 800135E0 00010520 48 34 EB F5 */ bl _savegpr_27 /* 800135E4 00010524 7C 7F 1B 78 */ mr r31, r3 /* 800135E8 00010528 38 7F 00 08 */ addi r3, r31, 8 /* 800135EC 0001052C 38 80 00 00 */ li r4, 0 @@ -7179,7 +7179,7 @@ lbl_800136F8: /* 8001371C 0001065C 68 00 00 01 */ xori r0, r0, 1 /* 80013720 00010660 98 1F 00 36 */ stb r0, 0x36(r31) /* 80013724 00010664 39 61 00 30 */ addi r11, r1, 0x30 -/* 80013728 00010668 48 34 EA F9 */ bl func_80362220 +/* 80013728 00010668 48 34 EA F9 */ bl _restgpr_27 /* 8001372C 0001066C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80013730 00010670 7C 08 03 A6 */ mtlr r0 /* 80013734 00010674 38 21 00 30 */ addi r1, r1, 0x30 @@ -8644,7 +8644,7 @@ mDoExt_J3DModel__create: /* 80014C58 00011B98 7C 08 02 A6 */ mflr r0 /* 80014C5C 00011B9C 90 01 00 24 */ stw r0, 0x24(r1) /* 80014C60 00011BA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80014C64 00011BA4 48 34 D5 75 */ bl func_803621D8 +/* 80014C64 00011BA4 48 34 D5 75 */ bl _savegpr_28 /* 80014C68 00011BA8 7C 7C 1B 79 */ or. r28, r3, r3 /* 80014C6C 00011BAC 7C 9D 23 78 */ mr r29, r4 /* 80014C70 00011BB0 7C BE 2B 78 */ mr r30, r5 @@ -8708,7 +8708,7 @@ lbl_80014D40: /* 80014D40 00011C80 38 60 00 00 */ li r3, 0 lbl_80014D44: /* 80014D44 00011C84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80014D48 00011C88 48 34 D4 DD */ bl func_80362224 +/* 80014D48 00011C88 48 34 D4 DD */ bl _restgpr_28 /* 80014D4C 00011C8C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80014D50 00011C90 7C 08 03 A6 */ mtlr r0 /* 80014D54 00011C94 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_graphic.s b/asm/m/Do/m_Do_graphic.s index d882e80858..0acbf580ca 100644 --- a/asm/m/Do/m_Do_graphic.s +++ b/asm/m/Do/m_Do_graphic.s @@ -9,7 +9,7 @@ createTimg: /* 80007DA0 00004CE0 7C 08 02 A6 */ mflr r0 /* 80007DA4 00004CE4 90 01 00 24 */ stw r0, 0x24(r1) /* 80007DA8 00004CE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80007DAC 00004CEC 48 35 A4 29 */ bl func_803621D4 +/* 80007DAC 00004CEC 48 35 A4 29 */ bl _savegpr_27 /* 80007DB0 00004CF0 7C 7B 1B 78 */ mr r27, r3 /* 80007DB4 00004CF4 7C 9C 23 78 */ mr r28, r4 /* 80007DB8 00004CF8 7C BD 2B 78 */ mr r29, r5 @@ -44,7 +44,7 @@ lbl_80007DF0: /* 80007E28 00004D68 7F C3 F3 78 */ mr r3, r30 lbl_80007E2C: /* 80007E2C 00004D6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80007E30 00004D70 48 35 A3 F1 */ bl func_80362220 +/* 80007E30 00004D70 48 35 A3 F1 */ bl _restgpr_27 /* 80007E34 00004D74 80 01 00 24 */ lwz r0, 0x24(r1) /* 80007E38 00004D78 7C 08 03 A6 */ mtlr r0 /* 80007E3C 00004D7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1383,7 +1383,7 @@ trimming: /* 800091C4 00006104 7C 08 02 A6 */ mflr r0 /* 800091C8 00006108 90 01 00 74 */ stw r0, 0x74(r1) /* 800091CC 0000610C 39 61 00 70 */ addi r11, r1, 0x70 -/* 800091D0 00006110 48 35 90 09 */ bl func_803621D8 +/* 800091D0 00006110 48 35 90 09 */ bl _savegpr_28 /* 800091D4 00006114 7C 9F 23 78 */ mr r31, r4 /* 800091D8 00006118 C0 24 00 04 */ lfs f1, 4(r4) /* 800091DC 0000611C FC 00 08 1E */ fctiwz f0, f1 @@ -1565,7 +1565,7 @@ lbl_80009460: /* 80009494 000063D4 7F 86 E3 78 */ mr r6, r28 /* 80009498 000063D8 48 35 70 39 */ bl GXSetScissor /* 8000949C 000063DC 39 61 00 70 */ addi r11, r1, 0x70 -/* 800094A0 000063E0 48 35 8D 85 */ bl func_80362224 +/* 800094A0 000063E0 48 35 8D 85 */ bl _restgpr_28 /* 800094A4 000063E4 80 01 00 74 */ lwz r0, 0x74(r1) /* 800094A8 000063E8 7C 08 03 A6 */ mtlr r0 /* 800094AC 000063EC 38 21 00 70 */ addi r1, r1, 0x70 @@ -2409,7 +2409,7 @@ retry_captue_frame: /* 8000A164 000070A4 7C 08 02 A6 */ mflr r0 /* 8000A168 000070A8 90 01 00 44 */ stw r0, 0x44(r1) /* 8000A16C 000070AC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8000A170 000070B0 48 35 80 65 */ bl func_803621D4 +/* 8000A170 000070B0 48 35 80 65 */ bl _savegpr_27 /* 8000A174 000070B4 C0 04 00 00 */ lfs f0, 0(r4) /* 8000A178 000070B8 FC 00 00 1E */ fctiwz f0, f0 /* 8000A17C 000070BC D8 01 00 08 */ stfd f0, 8(r1) @@ -2478,7 +2478,7 @@ lbl_8000A22C: /* 8000A274 000071B4 48 35 43 F1 */ bl GXInvalidateTexAll lbl_8000A278: /* 8000A278 000071B8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8000A27C 000071BC 48 35 7F A5 */ bl func_80362220 +/* 8000A27C 000071BC 48 35 7F A5 */ bl _restgpr_27 /* 8000A280 000071C0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000A284 000071C4 7C 08 03 A6 */ mtlr r0 /* 8000A288 000071C8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/m/Do/m_Do_machine.s b/asm/m/Do/m_Do_machine.s index 7bf6fec4ce..043f072b30 100644 --- a/asm/m/Do/m_Do_machine.s +++ b/asm/m/Do/m_Do_machine.s @@ -156,7 +156,7 @@ myMemoryErrorRoutine: /* 8000B3F0 00008330 7C 08 02 A6 */ mflr r0 /* 8000B3F4 00008334 90 01 00 34 */ stw r0, 0x34(r1) /* 8000B3F8 00008338 39 61 00 30 */ addi r11, r1, 0x30 -/* 8000B3FC 0000833C 48 35 6D DD */ bl func_803621D8 +/* 8000B3FC 0000833C 48 35 6D DD */ bl _savegpr_28 /* 8000B400 00008340 7C 7F 1B 78 */ mr r31, r3 /* 8000B404 00008344 7C 9E 23 78 */ mr r30, r4 /* 8000B408 00008348 7C BD 2B 78 */ mr r29, r5 @@ -276,7 +276,7 @@ lbl_8000B5A4: /* 8000B5AC 000084EC 90 0D 86 88 */ stw r0, lbl_80450C08-_SDA_BASE_(r13) lbl_8000B5B0: /* 8000B5B0 000084F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8000B5B4 000084F4 48 35 6C 71 */ bl func_80362224 +/* 8000B5B4 000084F4 48 35 6C 71 */ bl _restgpr_28 /* 8000B5B8 000084F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000B5BC 000084FC 7C 08 03 A6 */ mtlr r0 /* 8000B5C0 00008500 38 21 00 30 */ addi r1, r1, 0x30 @@ -554,7 +554,7 @@ fault_callback_scroll: /* 8000B960 000088A0 7C 08 02 A6 */ mflr r0 /* 8000B964 000088A4 90 01 00 D4 */ stw r0, 0xd4(r1) /* 8000B968 000088A8 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8000B96C 000088AC 48 35 68 6D */ bl func_803621D8 +/* 8000B96C 000088AC 48 35 68 6D */ bl _savegpr_28 /* 8000B970 000088B0 83 8D 8F 88 */ lwz r28, lbl_80451508-_SDA_BASE_(r13) /* 8000B974 000088B4 83 ED 8F 9C */ lwz r31, lbl_8045151C-_SDA_BASE_(r13) /* 8000B978 000088B8 7F FE FB 78 */ mr r30, r31 diff --git a/asm/m/Do/m_Do_main.s b/asm/m/Do/m_Do_main.s index efd46b41e4..03d09cfec4 100644 --- a/asm/m/Do/m_Do_main.s +++ b/asm/m/Do/m_Do_main.s @@ -75,7 +75,7 @@ CheckHeap: /* 80005790 000026D0 7C 08 02 A6 */ mflr r0 /* 80005794 000026D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80005798 000026D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000579C 000026DC 48 35 CA 39 */ bl func_803621D4 +/* 8000579C 000026DC 48 35 CA 39 */ bl _savegpr_27 /* 800057A0 000026E0 7C 7B 1B 78 */ mr r27, r3 /* 800057A4 000026E4 48 00 5E C5 */ bl mDoMch_HeapCheckAll /* 800057A8 000026E8 48 33 C7 59 */ bl OSCheckActiveThreads @@ -116,7 +116,7 @@ lbl_80005820: /* 80005828 00002768 3B FF 00 04 */ addi r31, r31, 4 /* 8000582C 0000276C 41 80 FF C8 */ blt lbl_800057F4 /* 80005830 00002770 39 61 00 20 */ addi r11, r1, 0x20 -/* 80005834 00002774 48 35 C9 ED */ bl func_80362220 +/* 80005834 00002774 48 35 C9 ED */ bl _restgpr_27 /* 80005838 00002778 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000583C 0000277C 7C 08 03 A6 */ mtlr r0 /* 80005840 00002780 38 21 00 20 */ addi r1, r1, 0x20 @@ -477,7 +477,7 @@ Debug_console: /* 80005D60 00002CA0 DB C1 00 30 */ stfd f30, 0x30(r1) /* 80005D64 00002CA4 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 80005D68 00002CA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80005D6C 00002CAC 48 35 C4 6D */ bl func_803621D8 +/* 80005D6C 00002CAC 48 35 C4 6D */ bl _savegpr_28 /* 80005D70 00002CB0 83 ED 8C 38 */ lwz r31, lbl_804511B8-_SDA_BASE_(r13) /* 80005D74 00002CB4 28 1F 00 00 */ cmplwi r31, 0 /* 80005D78 00002CB8 41 82 03 A8 */ beq lbl_80006120 @@ -743,7 +743,7 @@ lbl_80006124: /* 8000612C 0000306C E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 80006130 00003070 CB C1 00 30 */ lfd f30, 0x30(r1) /* 80006134 00003074 39 61 00 30 */ addi r11, r1, 0x30 -/* 80006138 00003078 48 35 C0 ED */ bl func_80362224 +/* 80006138 00003078 48 35 C0 ED */ bl _restgpr_28 /* 8000613C 0000307C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80006140 00003080 7C 08 03 A6 */ mtlr r0 /* 80006144 00003084 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/os/OSExec.s b/asm/os/OSExec.s index d39fb65c8b..dc2c197d0e 100644 --- a/asm/os/OSExec.s +++ b/asm/os/OSExec.s @@ -33,7 +33,7 @@ lbl_8033CAD0: /* 8033CADC 00339A1C 80 9C 00 00 */ lwz r4, 0(r28) /* 8033CAE0 00339A20 7F 60 D8 50 */ subf r27, r0, r27 /* 8033CAE4 00339A24 38 7B 00 00 */ addi r3, r27, 0 -/* 8033CAE8 00339A28 48 02 C0 45 */ bl func_80368B2C +/* 8033CAE8 00339A28 48 02 C0 45 */ bl strcpy /* 8033CAEC 00339A2C 7C 1E D8 50 */ subf r0, r30, r27 /* 8033CAF0 00339A30 90 1C 00 00 */ stw r0, 0(r28) lbl_8033CAF4: diff --git a/include/d_save.h b/include/d_save.h index ddbd66365a..a4e3e97ed9 100644 --- a/include/d_save.h +++ b/include/d_save.h @@ -1,4 +1,6 @@ #include "dolphin/types.h" +#define MAX_BOTTLES 4 +#define MAX_ITEM_SLOTS 24 enum Wallets { WALLET, @@ -101,12 +103,12 @@ enum ItemTable { class dSv_player_status_a_c { public: void init(void); - void setSelectItemIndex(signed int select_item_index, u8 item_index); - u8 getSelectItemIndex(signed int select_item_index) const; - void setMixItemIndex(signed int mix_item_index, u8 item_index); - u8 getMixItemIndex(signed int mix_item_index) const; + void setSelectItemIndex(signed int, u8); + u8 getSelectItemIndex(signed int) const; + void setMixItemIndex(signed int, u8); + u8 getMixItemIndex(signed int) const; u16 getRupeeMax(void) const; - bool isMagicFlag(u8 unk_param) const; + bool isMagicFlag(u8) const; private: u16 max_health; @@ -114,17 +116,522 @@ class dSv_player_status_a_c { u16 current_rupees; u16 max_lantern_oil; u16 current_lantern_oil; - u8 _unk1; + u8 unk10; u8 select_item[3]; u8 mix_item[3]; - u8 _unk2; - u8 _unk3; + u8 unk17; + u8 unk18; u8 equipment[6]; u8 current_wallet; - u8 _unk6; - u8 _unk7; + u8 unk26; + u8 unk27; u8 magic_flag; - u8 _unk9; - u8 _unk10; - u8 _unk11[3]; -}; \ No newline at end of file + u8 unk29; + u8 unk30; + u8 unk31[3]; + u8 padding[6]; +}; + +class dSv_player_status_b_c { + public: + void init(void); + void onDarkClearLV(int); + bool isDarkClearLV(int) const; + void onTransformLV(int); + bool isTransformLV(int) const; + + private: + u32 unk0; + u32 unk4; + u8 transform_level_flag; + u8 dark_clear_level_flag; + u8 unk10; + u8 unk11; + float unk12; + u16 unk16; + u8 unk18[3]; + u8 padding61[3]; +}; + +// move to SComponent later +class cXyz { + public: + float x, y, z; +}; + +class dSv_horse_place_c { + public: + void init(void); + void set(const char*, const cXyz&, short, s8); + + private: + cXyz position; + u16 angle; + u8 current_stage[8]; + u8 spawn_id; + u8 room_id; +}; + +class dSv_player_return_place_c { + public: + void init(void); + void set(const char*, const cXyz&, short, s8); + + private: + u8 current_stage[8]; + u8 spawn_id; + u8 room_id; + u8 unk10; + u8 unk11; +}; + +class dSv_player_field_last_stay_info_c { + public: + void init(void); + bool isRegionBit(int unk) const; + void onRegionBit(int unk); + void set(const char*, const cXyz&, short, s8, u8); + + private: + cXyz last_position; + u16 last_angle; + u8 last_stage[8]; + u8 last_spawn_id; + u8 last_room_id; + u8 unk24; + u8 last_region; + u8 unk26[2]; +}; + +class dSv_player_last_mark_info_c { + public: + void init(void); + void setWarpItemData(const char*, const cXyz&, short, s8, u8, u8); + + private: + cXyz ooccoo_position; + u16 ooccoo_angle; + u8 ooccoo_stage[8]; + u8 ooccoo_spawn_id; + u8 ooccoo_room_id; + char unk24; + u8 unk25[3]; +}; + +class dSv_player_item_c { + public: + void init(void); + void setItem(int, u8); + u8 getItem(int, bool) const; + void setLineUpItem(void); + u8 getLineUpItem(int) const; + void setBottleItemIn(u8, u8); + void setEmptyBottleItemIn(u8); + void setEmptyBottle(void); + void setEmptyBottle(u8); + void setEquipBottleItemIn(u8, u8); + void setEquipBottleItemEmpty(u8); + u8 checkBottle(u8); + u8 checkInsectBottle(void); + u8 checkEmptyBottle(void); + void setBombBagItemIn(u8, u8, bool); + void setBombBagItemIn(u8, u8, u8, bool); + void setEmptyBombBagItemIn(u8, bool); + void setEmptyBombBagItemIn(u8, u8, bool); + void setEmptyBombBag(void); + void setEmptyBombBag(u8, u8); + u8 checkBombBag(u8); + void setWarashibeItem(u8); + void setRodTypeLevelUp(void); + void setBaitItem(u8); + + private: + u8 items[24]; + u8 item_slots[24]; +}; + +class dSv_player_get_item_c { + public: + void init(void); + void onFirstBit(u8); + void offFirstBit(u8); + u8 isFirstBit(u8) const; + + private: + u32 pause_menu_items[4]; +}; + +class dSv_player_item_record_c { + public: + void init(void); + void setBombNum(u8, u8); + u8 getBombNum(u8) const; + void setBottleNum(u8, u8); + u8 addBottleNum(u8, short); + u8 getBottleNum(u8) const; + + private: + u8 bow_ammo; + u8 bomb_bags_ammo[3]; + u8 unk4_ammo[4]; + u8 slingshot_ammo; + u8 unk5_ammo[3]; +}; + +class dSv_player_item_max_c { + public: + void init(void); + void setbombNum(u8, u8); + u8 getBombNum(u8) const; + + private: + u8 bow_ammo_max; + u8 bomb_bags_ammo_max[3]; + u8 unk_ammo_max[4]; +}; + +class dSv_player_collect_c { + public: + void init(void); + void setCollect(int, u8); + u8 isCollect(int, u8) const; + void onCollectCrystal(u8); + u8 isCollectCrystal(u8) const; + void onCollectMirror(u8); + u8 isCollectMirror(u8) const; + + private: + u8 unk0[8]; + u8 unk8; + u8 crystal; + u8 mirror; + u8 unk11; + u8 poe_count; +}; + +class dSv_player_wolf_c { + public: + void init(void); + + private: + u8 unk0[3]; + u8 unk3; +}; + +class dSv_light_drop_c { + public: + void init(void); + u8 getLightDropNum(u8) const; + void onLightDropGetFlag(u8); + u8 isLightDropGetFlag(u8) const; + + private: + u8 unk0[4]; + u8 light_drop_get_flag; + u8 unk5[3]; +}; + +class dSv_letter_info_c { + public: + void init(void); + void onLetterGetFlag(int); + u8 isLetterGetFlag(int) const; + void onLetterReadFlag(int); + u8 isLetterReadFlag(int) const; + + private: + u8 letter_read_flags[16]; + u8 unk16[64]; +}; + +class dSv_fishing_info_c { + public: + void init(void); + void addFishCount(u8); // merged with init in the assembly + + private: + u8 unk0[32]; + u8 unk32[16]; + u8 padding[4]; +}; + +class dSv_player_info_c { + public: + void init(void); + + private: + u8 unk0[4]; + u8 unk4[4]; + u8 unk8[4]; + u8 unk12[4]; + u8 unk16[2]; + u8 unk18[2]; + u8 link_name[16]; + u8 unk36; + u8 epona_name[16]; + u8 unk53; + u8 unk54; + u8 unk55[5]; + u8 padding[4]; +}; + +class dSv_player_config_c { + public: + void init(void); + u32 checkVibration(void) const; + u8 getSound(void); + void setSound(u8); + u8 getVibration(void); + void setVibration(u8); + + private: + u8 unk0; + u8 sound_mode; + u8 unk2; + u8 vibration_status; + u8 unk4; + u8 unk5; + u16 unk6; + u8 unk8; + u8 unk9; + u8 unk10; + u8 unk11; +}; + +class dSv_player_c { + public: + void init(void); + + private: + dSv_player_status_a_c player_status_a; + dSv_player_status_b_c player_status_b; + dSv_horse_place_c horse_place; + dSv_player_return_place_c player_return; + dSv_player_field_last_stay_info_c player_last_field; + dSv_player_last_mark_info_c player_last_mark; + dSv_player_item_c player_item; + dSv_player_get_item_c player_get_item; + dSv_player_item_record_c player_item_record; + dSv_player_item_max_c player_item_max; + dSv_player_collect_c player_collect; + dSv_player_wolf_c player_wolf; + dSv_light_drop_c light_drop; + dSv_letter_info_c letter_info; + dSv_fishing_info_c fishing_info; + dSv_player_info_c player_info; + dSv_player_config_c player_config; +}; + +#pragma pack(push, 1) +class dSv_memBit_c { + public: + void init(void); + void onTBox(int); // merged with init in the assembly + void offTbox(int); // merged with init in the assembly + u8 isTbox(int) const; + void onSwitch(int); + void offSwitch(int); + u8 isSwitch(int) const; + u8 revSwitch(int); + void onItem(int); + u8 isItem(int) const; + void onDungeonItem(int); + u8 isDungeonItem(int) const; + + private: + u32 area_flags_bitfields1[2]; + u32 area_flags_bitfields2[4]; + u32 rupee_flags_bitfields; + u8 small_key_flags; + u8 dungeons_flags; +}; +#pragma pack(pop) + +class dSv_event_c { + public: + void init(void); + void onEventBit(u16); + void offEventBit(u16); + bool isEventBit(u16) const; + void setEventReg(u16, u8); + u8 getEventReg(u16) const; + + private: + u8 events[256]; +}; + +class dSv_MiniGame_c { + public: + void init(void); + + private: + u8 unk0; + u8 unk1[3]; + u32 unk4; + u32 unk8; + u32 unk12; + u32 unk16; + u32 unk20; +}; + +class dSv_memory_c { + public: + dSv_memory_c(void); // the assembly for this is in d_com_inf_game.s + void init(void); + + private: + dSv_memBit_c temp_flags; + u8 padding30[2]; +}; + +class dSv_memory2_c { + public: + dSv_memory2_c(void); // the assembly for this is in d_com_inf_game.s + void init(void); + void onVisitedRoom(int); + void offVisitedRoom(int); + u8 isVisitedRoom(int); + + private: + u32 unk0[2]; +}; + +class dSv_danBit_c { + public: + void init(void); + void onSwitch(int); + void offSwitch(int); + u8 isSwitch(int) const; + u8 revSwitch(int); + void onItem(int); + u8 isItem(int) const; + + private: + u8 unk0; + u8 unk1; + u8 unk2[2]; + u32 unk4; + u32 unk8; + u32 unk12; + u32 unk16; + u32 unk20; + u32 unk24; + u16 unk28[16]; +}; + +class dSv_zoneBit_c { + public: + void init(void); + void clearRoomSwitch(void); + void clearRoomItem(void); + void onSwitch(int); + void offSwitch(int); + u8 isSwitch(int) const; + u8 revSwitch(int); + void onOneSwitch(int); + void offOneSwitch(int); + void isOneSwitch(int) const; + u8 revOneSwitch(int); + void onItem(int); + void isItem(int) const; + void onOneItem(int); + u8 isOneItem(int) const; + + private: + u16 unk0[2]; + u16 unk4; + u16 unk6[2]; + u16 unk10; + u16 unk12; +}; + +class dSv_zoneActor_c { + public: + void init(void); + void on(int); + void off(int); + u8 is(int) const; + + private: + u32 unk0[4]; +}; + +class dSv_zone_c { + public: + dSv_zone_c(void); // the assembly for this is in d_com_inf_game.s + void init(void); + + private: + u8 unk0; + u8 unk1; + dSv_zoneBit_c zone_bit; + dSv_zoneActor_c zone_actor; +}; + +class dSv_restart_c { + public: + void setRoom(const cXyz&, short, s8); + + private: + u8 unk0; + u8 unk1[5]; + short angle; + cXyz position; + u8 padding20[16]; +}; + +class dSv_turnRestart_c { + public: + void set(const cXyz&, short, s8, u32); + + private: + cXyz position; + u32 unk12; + short angle; + s8 unk18; +}; + +class dSv_save_c { + public: + void init(void); + dSv_memory2_c getSave2(int); + + private: + dSv_player_c player; + u8 unk476[20]; + dSv_memory_c area_flags[32]; + dSv_memory2_c unk_flags[64]; + dSv_event_c event_flags; + u8 unk2288[80]; + dSv_MiniGame_c minigame_flags; +}; + +class dSv_info_c { + public: + void init(void); + void getSave(int); + void putSave(int); + void initZone(void); + int createZone(int); + void onSwitch(int, int); + void offSwitch(int, int); + bool isSwitch(int, int) const; + u8 revSwitch(int, int); // merged with isSwitch in the assembly + void onItem(int, int); + bool isItem(int, int) const; + void onActor(int, int); + void offActor(int, int); // merged with onActor in the assembly + bool isActor(int, int) const; + void memory_to_card(char*, int); + void card_to_memory(char*, int); + void initdata_to_card(char*, int); + + private: + dSv_save_c save_file; + dSv_memory_c memory; + dSv_danBit_c dungeon_bit; + dSv_zone_c zones[32]; + dSv_restart_c restart; + dSv_event_c events; + dSv_turnRestart_c turn_restart; +}; diff --git a/ldscript.lcf b/ldscript.lcf index 48e2d8a49d..536ce3329a 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -25,6 +25,9 @@ SECTIONS { __ArenaLo = (_db_stack_addr + 0x1f) & ~0x1f; __ArenaHi = 0x81700000 ; } +FORCEACTIVE { + set__17dSv_horse_place_cFPCcRC4cXyzsSc +} /* .init 80003100 - 80005600 extab 80005600 - 80005660 diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index c66e00dcc8..146bc51256 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -1,39 +1,62 @@ #include "d_save.h" - -extern "C" void dComIfGp_setSelectItem(int); - -asm u8 dSv_item_rename(u8) { - nofralloc - clrlwi r0, r3, 0x18 - cmpwi r0, 0x69 - beq lbl_80032948 - bge lbl_80032934 - cmpwi r0, 0x68 - bge lbl_80032940 - blr -lbl_80032934: - cmpwi r0, 0x6e - beq lbl_80032950 - blr -lbl_80032940: - li r3, 0x66 - blr -lbl_80032948: - li r3, 0x61 - blr -lbl_80032950: - li r3, 0x6f - blr -} #pragma peephole on +// temporary externs until they've been defined in their proper header +extern "C" { + void dComIfGp_setSelectItem(int); + void OSReport_Error(void); + void dSv_event_c_NS_isEventBit(void); + void dComIfGs_setMixItemIndex(void); + void dComIfGs_setSelectItemIndex(void); + void dComIfGs_getMixItemIndex(void); + char* strcpy(char*,const char*); + void func_80362224(void); + void func_803621D8(void); + void func_8036221C(void); + void func_803621D0(void); + void _restgpr_29(void); + void _savegpr_29(void); + void _restgpr_28(void); + void _savegpr_28(void); + void _restgpr_27(void); + void _savegpr_27(void); + unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); + void setLineUpItem__17dSv_player_item_cFv(void); + void dMeter2Info_c_NS_setHotSpringTimer(void); + void setItem__17dSv_player_item_cFiUc(void); + void dSv_item_rename__FUc(void); + void setBottleItemIn__17dSv_player_item_cFUcUc(void); + void getItem__17dSv_player_item_cCFib(void); + void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8,u8); + void dSv_player_get_item_c_NS_isFirstBit(void); + void dSv_player_item_record_c_NS_setBombNum(void); + void dSv_player_item_max_c_NS_getBombNum(void); +} +extern float lbl_80451D5C; +extern u8 lbl_80379234[0x64]; +extern int lbl_804061C0; +extern float lbl_80451D58; +extern u8 lbl_803A7270[24]; +extern u8 lbl_80430188[16]; +extern u8 lbl_803A7288; +#define _SDA2_BASE_(dummy) 0 + +u8 dSv_item_rename(u8 item_id) { + switch (item_id) { + case LANTERN_OIL_2: return LANTERN_OIL; + case RED_POTION_2: return RED_POTION; + case LANTERN_OIL_3: return LANTERN_OIL_4; + default: return item_id; + } +} + void dSv_player_status_a_c::init() { max_health = 15; current_health = 12; current_rupees = 0; max_lantern_oil = 0; current_lantern_oil = 0; - _unk1 = 0; + unk10 = 0; for (int i = 0; i < 4; i++) { select_item[i] = NO_ITEM; @@ -51,14 +74,14 @@ void dSv_player_status_a_c::init() { equipment[3] = NO_ITEM; equipment[4] = NO_ITEM; current_wallet = WALLET; - _unk6 = 0; - _unk7 = 0; + unk26 = 0; + unk27 = 0; magic_flag = 0; - _unk9 = 0; - _unk10 = 0; + unk29 = 0; + unk30 = 0; for (int i = 0; i < 3; i++) { - _unk11[i] = 0; + unk31[i] = 0; } } @@ -99,4 +122,972 @@ u16 dSv_player_status_a_c::getRupeeMax(void) const { } } return 0; +} + +asm bool dSv_player_status_a_c::isMagicFlag(u8) const { + nofralloc + stwu r1, -0x10(r1) + mflr r0 + stw r0, 0x14(r1) + clrlwi. r4, r4, 0x18 + bne lbl_80032B24 + lis r3, lbl_804061C0@ha + addi r3, r3, lbl_804061C0@l + addi r3, r3, 0x7f0 + li r4, 0x2304 + bl dSv_event_c_NS_isEventBit + b lbl_80032B40 +lbl_80032B24: + lbz r3, 0x1c(r3) + li r0, 1 + slw r0, r0, r4 + clrlwi r0, r0, 0x18 + and r3, r3, r0 + addic r0, r3, -1 + subfe r3, r0, r3 +lbl_80032B40: + lwz r0, 0x14(r1) + mtlr r0 + addi r1, r1, 0x10 + blr +} + +void dSv_player_status_b_c::init() { + + unk4 = 0; + unk0 = 0; + transform_level_flag = 0; + dark_clear_level_flag = 0; + unk10 = 0; + unk12 = lbl_80451D58; + unk16 = 0; + + for (int i = 0; i < 3; i++) { + unk18[i] = 0; + } +} + +void dSv_player_status_b_c::onDarkClearLV(int flagOnOff) { + + dark_clear_level_flag = dark_clear_level_flag | (u8)(1 << flagOnOff); +} + +asm bool dSv_player_status_b_c::isDarkClearLV(int unk) const { + nofralloc + lbz r3, 9(r3) + li r0, 1 + slw r0, r0, r4 + clrlwi r0, r0, 0x18 + and r3, r3, r0 + addic r0, r3, -1 + subfe r3, r0, r3 + blr +} + +void dSv_player_status_b_c::onTransformLV(int flagOnOff) { + transform_level_flag = transform_level_flag | (u8)(1 << flagOnOff); +} + +asm bool dSv_player_status_b_c::isTransformLV(int unk) const { +nofralloc +lbz r3, 8(r3) +li r0, 1 +slw r0, r0, r4 +clrlwi r0, r0, 0x18 +and r3, r3, r0 +addic r0, r3, -1 +subfe r3, r0, r3 +blr +} + +void dSv_horse_place_c::init(void) { + float position_val; + char* default_stage; + + default_stage = strcpy((char*)current_stage, (char*)lbl_80379234); + position_val = lbl_80451D5C; + position.x = lbl_80451D5C; + position.y = position_val; + position.z = position_val; + angle = 0; + spawn_id = 0; + room_id = 0; +} + +void dSv_horse_place_c::set(const char* i_stage, const cXyz& i_position, short i_angle, signed char i_room_id) { + strcpy((char*)current_stage,i_stage); + position.x = i_position.x; + position.y = i_position.y; + position.z = i_position.z; + angle = i_angle; + room_id = i_room_id; +} + +asm void dSv_player_return_place_c::init(void) { +nofralloc +stwu r1, -0x10(r1) +mflr r0 +stw r0, 0x14(r1) +stw r31, 0xc(r1) +mr r31, r3 +lis r4, lbl_80379234@ha +addi r4, r4, lbl_80379234@l +addi r4, r4, 1 +bl strcpy +li r0, 1 +stb r0, 9(r31) +li r3, 0 +stb r3, 8(r31) +li r0, 0x15 +stb r0, 0xa(r31) +stb r3, 0xb(r31) +lwz r31, 0xc(r1) +lwz r0, 0x14(r1) +mtlr r0 +addi r1, r1, 0x10 +blr +stwu r1, -0x20(r1) +mflr r0 +stw r0, 0x24(r1) +addi r11, r1, 0x20 +bl _savegpr_29 +mr r29, r3 +mr r30, r5 +mr r31, r6 +bl strcpy +stb r30, 9(r29) +stb r31, 8(r29) +addi r11, r1, 0x20 +bl _restgpr_29 +lwz r0, 0x24(r1) +mtlr r0 +addi r1, r1, 0x20 +blr +} + +void dSv_player_field_last_stay_info_c::init() { + float position_val; + + strcpy((char*)last_stage, (char*)lbl_80379234); + position_val = lbl_80451D5C; + + last_position.x = lbl_80451D5C; + last_position.y = position_val; + last_position.z = position_val; + last_angle = 0; + last_spawn_id = 0; + last_room_id = 1; + unk24 = 0; + last_region = 0; + + for (int i = 0; i < 2; i++) { + unk26[i] = 0; + } +} + +void dSv_player_field_last_stay_info_c::set(const char* i_last_stage_name, const cXyz& i_last_position, short i_last_angle, signed char i_last_spawn_id, u8 i_last_room_id) { + strcpy((char*)last_stage, i_last_stage_name); + + last_position.x = i_last_position.x; + last_position.y = i_last_position.y; + last_position.z = i_last_position.z; + last_angle = i_last_angle; + last_spawn_id = i_last_spawn_id; + last_room_id = i_last_room_id; +} + +void dSv_player_field_last_stay_info_c::onRegionBit(int i_region_bit) { + if (i_region_bit < 0) { + return; + } + if (8 <= i_region_bit) { + return; + } + last_region = last_region | (u8)(1 << i_region_bit); +} + +asm bool dSv_player_field_last_stay_info_c::isRegionBit(int unk) const { +nofralloc +cmpwi r4, 0 +blt lbl_80032EA8 +cmpwi r4, 8 +bge lbl_80032EA8 +lbz r3, 0x19(r3) +li r0, 1 +slw r0, r0, r4 +clrlwi r0, r0, 0x18 +and r3, r3, r0 +addic r0, r3, -1 +subfe r3, r0, r3 +blr +lbl_80032EA8: +li r3, 0 +blr +} + +void dSv_player_last_mark_info_c::init(void) { + float position; + + strcpy((char*)ooccoo_stage,(char*)lbl_80379234); + position = lbl_80451D5C; + ooccoo_position.x = lbl_80451D5C; + ooccoo_position.y = position; + ooccoo_position.z = position; + ooccoo_angle = 0; + ooccoo_room_id = 0; + ooccoo_spawn_id = 0; + unk24 = -1; + + for (int i = 0; i < 3; i++) { + unk25[i] = 0; + } +} + +void dSv_player_last_mark_info_c::setWarpItemData(const char* i_ooccoo_stage, const cXyz& i_ooccoo_position, short i_ooccoo_angle, s8 i_ooccoo_room_id, u8 unk1, u8 unk2) { + strcpy((char*)ooccoo_stage,i_ooccoo_stage); + ooccoo_position.x = i_ooccoo_position.x; + ooccoo_position.y = i_ooccoo_position.y; + ooccoo_position.z = i_ooccoo_position.z; + ooccoo_angle = i_ooccoo_angle; + ooccoo_room_id = i_ooccoo_room_id; +} + +void dSv_player_item_c::init(void) { + for (int i = 0; i < 24; i++) { + items[i] = NO_ITEM; + item_slots[i] = NO_ITEM; + } +} + +asm void dSv_player_item_c::setItem(int current_items_index, u8 new_items_index) { +nofralloc +stwu r1, -0x20(r1) +mflr r0 +stw r0, 0x24(r1) +addi r11, r1, 0x20 +bl _savegpr_29 +mr r29, r4 +cmpwi r29, 0x18 +bge lbl_80032FE0 +stbx r5, r3, r29 +bl setLineUpItem__17dSv_player_item_cFv +lbl_80032FE0: +li r30, 0 +lis r3, lbl_804061C0@ha +addi r31, r3, lbl_804061C0@l +lbl_80032FEC: +mr r3, r31 +mr r4, r30 +bl getSelectItemIndex__21dSv_player_status_a_cCFi +clrlwi r0, r3, 0x18 +cmpw r29, r0 +bne lbl_8003300C +mr r3, r30 +bl dComIfGp_setSelectItem +lbl_8003300C: +addi r30, r30, 1 +cmpwi r30, 3 +blt lbl_80032FEC +addi r11, r1, 0x20 +bl _restgpr_29 +lwz r0, 0x24(r1) +mtlr r0 +addi r1, r1, 0x20 +blr +} + +asm u8 dSv_player_item_c::getItem(int, bool) const { +nofralloc +/* 80033030 0002FF70 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80033034 0002FF74 7C 08 02 A6 */ mflr r0 +/* 80033038 0002FF78 90 01 00 24 */ stw r0, 0x24(r1) +/* 8003303C 0002FF7C 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033040 0002FF80 48 32 F1 91 */ bl func_803621D0 +/* 80033044 0002FF84 7C 7A 1B 78 */ mr r26, r3 +/* 80033048 0002FF88 7C 9B 23 78 */ mr r27, r4 +/* 8003304C 0002FF8C 2C 1B 00 18 */ cmpwi r27, 0x18 +/* 80033050 0002FF90 40 80 02 8C */ bge lbl_800332DC +/* 80033054 0002FF94 54 A0 06 3F */ clrlwi. r0, r5, 0x18 +/* 80033058 0002FF98 41 82 02 7C */ beq lbl_800332D4 +/* 8003305C 0002FF9C 3B C0 00 00 */ li r30, 0 +/* 80033060 0002FFA0 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033064 0002FFA4 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l +lbl_80033068: +/* 80033068 0002FFA8 7F E3 FB 78 */ mr r3, r31 +/* 8003306C 0002FFAC 7F C4 F3 78 */ mr r4, r30 +/* 80033070 0002FFB0 4B FF F9 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 80033074 0002FFB4 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80033078 0002FFB8 7C 1B 00 00 */ cmpw r27, r0 +/* 8003307C 0002FFBC 41 82 00 18 */ beq lbl_80033094 +/* 80033080 0002FFC0 7F C3 F3 78 */ mr r3, r30 +/* 80033084 0002FFC4 4B FF AD 45 */ bl dComIfGs_getMixItemIndex +/* 80033088 0002FFC8 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 8003308C 0002FFCC 7C 1B 00 00 */ cmpw r27, r0 +/* 80033090 0002FFD0 40 82 02 38 */ bne lbl_800332C8 +lbl_80033094: +/* 80033094 0002FFD4 7F C3 F3 78 */ mr r3, r30 +/* 80033098 0002FFD8 4B FF AD 31 */ bl dComIfGs_getMixItemIndex +/* 8003309C 0002FFDC 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800330A0 0002FFE0 28 00 00 FF */ cmplwi r0, 0xff +/* 800330A4 0002FFE4 41 82 02 24 */ beq lbl_800332C8 +/* 800330A8 0002FFE8 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800330AC 0002FFEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800330B0 0002FFF0 7F C4 F3 78 */ mr r4, r30 +/* 800330B4 0002FFF4 4B FF F9 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 800330B8 0002FFF8 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800330BC 0002FFFC 7F BA 00 AE */ lbzx r29, r26, r0 +/* 800330C0 00030000 7F C3 F3 78 */ mr r3, r30 +/* 800330C4 00030004 4B FF AD 05 */ bl dComIfGs_getMixItemIndex +/* 800330C8 00030008 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800330CC 0003000C 7C 7A 00 AE */ lbzx r3, r26, r0 +/* 800330D0 00030010 7C 7C 1B 78 */ mr r28, r3 +/* 800330D4 00030014 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800330D8 00030018 28 00 00 43 */ cmplwi r0, 0x43 +/* 800330DC 0003001C 40 82 00 10 */ bne lbl_800330EC +/* 800330E0 00030020 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800330E4 00030024 28 00 00 70 */ cmplwi r0, 0x70 +/* 800330E8 00030028 41 82 00 1C */ beq lbl_80033104 +lbl_800330EC: +/* 800330EC 0003002C 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 800330F0 00030030 28 00 00 43 */ cmplwi r0, 0x43 +/* 800330F4 00030034 40 82 00 18 */ bne lbl_8003310C +/* 800330F8 00030038 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800330FC 0003003C 28 00 00 70 */ cmplwi r0, 0x70 +/* 80033100 00030040 40 82 00 0C */ bne lbl_8003310C +lbl_80033104: +/* 80033104 00030044 38 60 00 59 */ li r3, 0x59 +/* 80033108 00030048 48 00 01 D8 */ b lbl_800332E0 +lbl_8003310C: +/* 8003310C 0003004C 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033110 00030050 28 00 00 43 */ cmplwi r0, 0x43 +/* 80033114 00030054 40 82 00 10 */ bne lbl_80033124 +/* 80033118 00030058 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 8003311C 0003005C 28 00 00 71 */ cmplwi r0, 0x71 +/* 80033120 00030060 41 82 00 1C */ beq lbl_8003313C +lbl_80033124: +/* 80033124 00030064 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033128 00030068 28 00 00 43 */ cmplwi r0, 0x43 +/* 8003312C 0003006C 40 82 00 18 */ bne lbl_80033144 +/* 80033130 00030070 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033134 00030074 28 00 00 71 */ cmplwi r0, 0x71 +/* 80033138 00030078 40 82 00 0C */ bne lbl_80033144 +lbl_8003313C: +/* 8003313C 0003007C 38 60 00 59 */ li r3, 0x59 +/* 80033140 00030080 48 00 01 A0 */ b lbl_800332E0 +lbl_80033144: +/* 80033144 00030084 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033148 00030088 28 00 00 43 */ cmplwi r0, 0x43 +/* 8003314C 0003008C 40 82 00 10 */ bne lbl_8003315C +/* 80033150 00030090 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033154 00030094 28 00 00 72 */ cmplwi r0, 0x72 +/* 80033158 00030098 41 82 00 1C */ beq lbl_80033174 +lbl_8003315C: +/* 8003315C 0003009C 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033160 000300A0 28 00 00 43 */ cmplwi r0, 0x43 +/* 80033164 000300A4 40 82 00 18 */ bne lbl_8003317C +/* 80033168 000300A8 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 8003316C 000300AC 28 00 00 72 */ cmplwi r0, 0x72 +/* 80033170 000300B0 40 82 00 0C */ bne lbl_8003317C +lbl_80033174: +/* 80033174 000300B4 38 60 00 59 */ li r3, 0x59 +/* 80033178 000300B8 48 00 01 68 */ b lbl_800332E0 +lbl_8003317C: +/* 8003317C 000300BC 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033180 000300C0 28 00 00 43 */ cmplwi r0, 0x43 +/* 80033184 000300C4 40 82 00 10 */ bne lbl_80033194 +/* 80033188 000300C8 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 8003318C 000300CC 28 00 00 3E */ cmplwi r0, 0x3e +/* 80033190 000300D0 41 82 00 1C */ beq lbl_800331AC +lbl_80033194: +/* 80033194 000300D4 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033198 000300D8 28 00 00 43 */ cmplwi r0, 0x43 +/* 8003319C 000300DC 40 82 00 18 */ bne lbl_800331B4 +/* 800331A0 000300E0 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800331A4 000300E4 28 00 00 3E */ cmplwi r0, 0x3e +/* 800331A8 000300E8 40 82 00 0C */ bne lbl_800331B4 +lbl_800331AC: +/* 800331AC 000300EC 38 60 00 5A */ li r3, 0x5a +/* 800331B0 000300F0 48 00 01 30 */ b lbl_800332E0 +lbl_800331B4: +/* 800331B4 000300F4 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800331B8 000300F8 28 00 00 4A */ cmplwi r0, 0x4a +/* 800331BC 000300FC 40 82 00 10 */ bne lbl_800331CC +/* 800331C0 00030100 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 800331C4 00030104 28 00 00 76 */ cmplwi r0, 0x76 +/* 800331C8 00030108 41 82 00 1C */ beq lbl_800331E4 +lbl_800331CC: +/* 800331CC 0003010C 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 800331D0 00030110 28 00 00 4A */ cmplwi r0, 0x4a +/* 800331D4 00030114 40 82 00 18 */ bne lbl_800331EC +/* 800331D8 00030118 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800331DC 0003011C 28 00 00 76 */ cmplwi r0, 0x76 +/* 800331E0 00030120 40 82 00 0C */ bne lbl_800331EC +lbl_800331E4: +/* 800331E4 00030124 38 60 00 5B */ li r3, 0x5b +/* 800331E8 00030128 48 00 00 F8 */ b lbl_800332E0 +lbl_800331EC: +/* 800331EC 0003012C 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800331F0 00030130 28 00 00 4A */ cmplwi r0, 0x4a +/* 800331F4 00030134 40 82 00 10 */ bne lbl_80033204 +/* 800331F8 00030138 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 800331FC 0003013C 28 00 00 3D */ cmplwi r0, 0x3d +/* 80033200 00030140 41 82 00 1C */ beq lbl_8003321C +lbl_80033204: +/* 80033204 00030144 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033208 00030148 28 00 00 4A */ cmplwi r0, 0x4a +/* 8003320C 0003014C 40 82 00 18 */ bne lbl_80033224 +/* 80033210 00030150 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033214 00030154 28 00 00 3D */ cmplwi r0, 0x3d +/* 80033218 00030158 40 82 00 0C */ bne lbl_80033224 +lbl_8003321C: +/* 8003321C 0003015C 38 60 00 5C */ li r3, 0x5c +/* 80033220 00030160 48 00 00 C0 */ b lbl_800332E0 +lbl_80033224: +/* 80033224 00030164 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033228 00030168 28 00 00 4A */ cmplwi r0, 0x4a +/* 8003322C 0003016C 40 82 00 10 */ bne lbl_8003323C +/* 80033230 00030170 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033234 00030174 28 00 00 74 */ cmplwi r0, 0x74 +/* 80033238 00030178 41 82 00 1C */ beq lbl_80033254 +lbl_8003323C: +/* 8003323C 0003017C 57 80 06 3E */ clrlwi r0, r28, 0x18 +/* 80033240 00030180 28 00 00 4A */ cmplwi r0, 0x4a +/* 80033244 00030184 40 82 00 18 */ bne lbl_8003325C +/* 80033248 00030188 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 8003324C 0003018C 28 00 00 74 */ cmplwi r0, 0x74 +/* 80033250 00030190 40 82 00 0C */ bne lbl_8003325C +lbl_80033254: +/* 80033254 00030194 38 60 00 5D */ li r3, 0x5d +/* 80033258 00030198 48 00 00 88 */ b lbl_800332E0 +lbl_8003325C: +/* 8003325C 0003019C 2C 1E 00 03 */ cmpwi r30, 3 +/* 80033260 000301A0 40 82 00 4C */ bne lbl_800332AC +/* 80033264 000301A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033268 000301A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003326C 000301AC 7F C4 F3 78 */ mr r4, r30 +/* 80033270 000301B0 4B FF F7 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 80033274 000301B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80033278 000301B8 40 82 00 34 */ bne lbl_800332AC +/* 8003327C 000301BC 7F C3 F3 78 */ mr r3, r30 +/* 80033280 000301C0 4B FF AB 49 */ bl dComIfGs_getMixItemIndex +/* 80033284 000301C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 80033288 000301C8 40 82 00 24 */ bne lbl_800332AC +/* 8003328C 000301CC 7F C3 F3 78 */ mr r3, r30 +/* 80033290 000301D0 38 80 00 FF */ li r4, 0xff +/* 80033294 000301D4 4B FF AA 31 */ bl dComIfGs_setSelectItemIndex +/* 80033298 000301D8 7F C3 F3 78 */ mr r3, r30 +/* 8003329C 000301DC 38 80 00 FF */ li r4, 0xff +/* 800332A0 000301E0 4B FF AA 69 */ bl dComIfGs_setMixItemIndex +/* 800332A4 000301E4 38 60 00 FF */ li r3, 0xff +/* 800332A8 000301E8 48 00 00 38 */ b lbl_800332E0 +lbl_800332AC: +/* 800332AC 000301EC 3C 60 80 38 */ lis r3, lbl_80379234@ha +/* 800332B0 000301F0 38 63 92 34 */ addi r3, r3, lbl_80379234@l +/* 800332B4 000301F4 38 63 00 09 */ addi r3, r3, 9 +/* 800332B8 000301F8 57 A4 06 3E */ clrlwi r4, r29, 0x18 +/* 800332BC 000301FC 57 85 06 3E */ clrlwi r5, r28, 0x18 +/* 800332C0 00030200 4C C6 31 82 */ crclr 6 +/* 800332C4 00030204 4B FD 39 49 */ bl OSReport_Error +lbl_800332C8: +/* 800332C8 00030208 3B DE 00 01 */ addi r30, r30, 1 +/* 800332CC 0003020C 2C 1E 00 02 */ cmpwi r30, 2 +/* 800332D0 00030210 41 80 FD 98 */ blt lbl_80033068 +lbl_800332D4: +/* 800332D4 00030214 7C 7A D8 AE */ lbzx r3, r26, r27 +/* 800332D8 00030218 48 00 00 08 */ b lbl_800332E0 +lbl_800332DC: +/* 800332DC 0003021C 38 60 00 FF */ li r3, 0xff +lbl_800332E0: +/* 800332E0 00030220 39 61 00 20 */ addi r11, r1, 0x20 +/* 800332E4 00030224 48 32 EF 39 */ bl func_8036221C +/* 800332E8 00030228 80 01 00 24 */ lwz r0, 0x24(r1) +/* 800332EC 0003022C 7C 08 03 A6 */ mtlr r0 +/* 800332F0 00030230 38 21 00 20 */ addi r1, r1, 0x20 +/* 800332F4 00030234 4E 80 00 20 */ blr +} + +// void dSv_player_item_c::setLineUpItem(void) { +// u8* i_item_lst; + +// for (int i = 0; i < 24; i++) { +// item_slots[i] = 0xFF; +// } + +// i_item_lst = lbl_803A7270; + +// for (int i = 0; i < 23; i++) { +// if (items[*i_item_lst] != 0xFF) { +// item_slots[i] = *i_item_lst; +// } +// i_item_lst++; +// } +// } + +asm void dSv_player_item_c::setLineUpItem(void) { + nofralloc + /* 800332F8 00030238 38 A0 00 00 */ li r5, 0 +/* 800332FC 0003023C 38 C0 00 00 */ li r6, 0 +/* 80033300 00030240 38 80 00 FF */ li r4, 0xff +/* 80033304 00030244 38 00 00 18 */ li r0, 0x18 +/* 80033308 00030248 7C 09 03 A6 */ mtctr r0 +lbl_8003330C: +/* 8003330C 0003024C 38 06 00 18 */ addi r0, r6, 0x18 +/* 80033310 00030250 7C 83 01 AE */ stbx r4, r3, r0 +/* 80033314 00030254 38 C6 00 01 */ addi r6, r6, 1 +/* 80033318 00030258 42 00 FF F4 */ bdnz lbl_8003330C +/* 8003331C 0003025C 3C 80 80 3A */ lis r4, lbl_803A7270@ha +/* 80033320 00030260 38 84 72 70 */ addi r4, r4, lbl_803A7270@l +/* 80033324 00030264 38 00 00 17 */ li r0, 0x17 +/* 80033328 00030268 7C 09 03 A6 */ mtctr r0 +lbl_8003332C: +/* 8003332C 0003026C 88 C4 00 00 */ lbz r6, 0(r4) +/* 80033330 00030270 7C 03 30 AE */ lbzx r0, r3, r6 +/* 80033334 00030274 28 00 00 FF */ cmplwi r0, 0xff +/* 80033338 00030278 41 82 00 10 */ beq lbl_80033348 +/* 8003333C 0003027C 38 05 00 18 */ addi r0, r5, 0x18 +/* 80033340 00030280 7C C3 01 AE */ stbx r6, r3, r0 +/* 80033344 00030284 38 A5 00 01 */ addi r5, r5, 1 +lbl_80033348: +/* 80033348 00030288 38 84 00 01 */ addi r4, r4, 1 +/* 8003334C 0003028C 42 00 FF E0 */ bdnz lbl_8003332C +/* 80033350 00030290 4E 80 00 20 */ blr +} + +u8 dSv_player_item_c::getLineUpItem(int slot_number) const { + if (slot_number < MAX_ITEM_SLOTS) { + return item_slots[slot_number]; + } + return NO_ITEM; +} + +// void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2){ +// u8 current_item_index; +// u8 new_item_index; + +// current_item_index = dSv_item_rename(i_item_id_1); +// new_item_index = dSv_item_rename(i_item_id_2); + +// for (int i = 0; i < 4; i++) { +// // sanitize input to make sure it's only a bottle +// if (current_item_index == items[i+11]) { +// setItem(i+11,new_item_index); +// // if hotsprings water, turn on the timer +// if (new_item_index == 107) { +// setHotSpringTimer(i+11); +// } +// for (int j = 0; j < 4; j++) { +// j = getSelectItemIndex(i); +// if (i+11 == j) { +// dComIfGp_setSelectItem(j); +// } +// } +// } +// } +// } + +asm void dSv_player_item_c::setBottleItemIn(u8, u8){ + nofralloc + /* 80033370 000302B0 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80033374 000302B4 7C 08 02 A6 */ mflr r0 +/* 80033378 000302B8 90 01 00 24 */ stw r0, 0x24(r1) +/* 8003337C 000302BC 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033380 000302C0 48 32 EE 59 */ bl _savegpr_28 +/* 80033384 000302C4 7C 7C 1B 78 */ mr r28, r3 +/* 80033388 000302C8 7C BD 2B 78 */ mr r29, r5 +/* 8003338C 000302CC 7C 83 23 78 */ mr r3, r4 +/* 80033390 000302D0 4B FF F5 89 */ bl dSv_item_rename__FUc +/* 80033394 000302D4 7C 7E 1B 78 */ mr r30, r3 +/* 80033398 000302D8 7F A3 EB 78 */ mr r3, r29 +/* 8003339C 000302DC 4B FF F5 7D */ bl dSv_item_rename__FUc +/* 800333A0 000302E0 7C 7D 1B 78 */ mr r29, r3 +/* 800333A4 000302E4 3B E0 00 00 */ li r31, 0 +/* 800333A8 000302E8 57 C3 06 3E */ clrlwi r3, r30, 0x18 +/* 800333AC 000302EC 38 00 00 04 */ li r0, 4 +/* 800333B0 000302F0 7C 09 03 A6 */ mtctr r0 +lbl_800333B4: +/* 800333B4 000302F4 38 9F 00 0B */ addi r4, r31, 0xb +/* 800333B8 000302F8 7C 1C 20 AE */ lbzx r0, r28, r4 +/* 800333BC 000302FC 7C 03 00 40 */ cmplw r3, r0 +/* 800333C0 00030300 40 82 00 70 */ bne lbl_80033430 +/* 800333C4 00030304 7F 83 E3 78 */ mr r3, r28 +/* 800333C8 00030308 7F A5 EB 78 */ mr r5, r29 +/* 800333CC 0003030C 4B FF FB ED */ bl setItem__17dSv_player_item_cFiUc +/* 800333D0 00030310 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 800333D4 00030314 28 00 00 6B */ cmplwi r0, 0x6b +/* 800333D8 00030318 40 82 00 18 */ bne lbl_800333F0 +/* 800333DC 0003031C 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 800333E0 00030320 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 800333E4 00030324 38 1F 00 0B */ addi r0, r31, 0xb +/* 800333E8 00030328 54 04 06 3E */ clrlwi r4, r0, 0x18 +/* 800333EC 0003032C 48 1E A8 D9 */ bl dMeter2Info_c_NS_setHotSpringTimer +lbl_800333F0: +/* 800333F0 00030330 3B A0 00 00 */ li r29, 0 +/* 800333F4 00030334 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800333F8 00030338 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800333FC 0003033C 3B FF 00 0B */ addi r31, r31, 0xb +lbl_80033400: +/* 80033400 00030340 7F C3 F3 78 */ mr r3, r30 +/* 80033404 00030344 7F A4 EB 78 */ mr r4, r29 +/* 80033408 00030348 4B FF F6 55 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 8003340C 0003034C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80033410 00030350 7C 1F 00 00 */ cmpw r31, r0 +/* 80033414 00030354 40 82 00 0C */ bne lbl_80033420 +/* 80033418 00030358 7F A3 EB 78 */ mr r3, r29 +/* 8003341C 0003035C 4B FF A9 D9 */ bl dComIfGp_setSelectItem +lbl_80033420: +/* 80033420 00030360 3B BD 00 01 */ addi r29, r29, 1 +/* 80033424 00030364 2C 1D 00 03 */ cmpwi r29, 3 +/* 80033428 00030368 41 80 FF D8 */ blt lbl_80033400 +/* 8003342C 0003036C 48 00 00 0C */ b lbl_80033438 +lbl_80033430: +/* 80033430 00030370 3B FF 00 01 */ addi r31, r31, 1 +/* 80033434 00030374 42 00 FF 80 */ bdnz lbl_800333B4 +lbl_80033438: +/* 80033438 00030378 39 61 00 20 */ addi r11, r1, 0x20 +/* 8003343C 0003037C 48 32 ED E9 */ bl _restgpr_28 +/* 80033440 00030380 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80033444 00030384 7C 08 03 A6 */ mtlr r0 +/* 80033448 00030388 38 21 00 20 */ addi r1, r1, 0x20 +/* 8003344C 0003038C 4E 80 00 20 */ blr +} + +// this is 1 instruction off +// void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id){ +// u8 item_id; + +// item_id = dSv_item_rename(i_item_id); +// setBottleItemIn(EMPTY_BOTTLE,item_id); +// } + +asm void dSv_player_item_c::setEmptyBottleItemIn(u8){ + nofralloc + /* 80033450 00030390 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80033454 00030394 7C 08 02 A6 */ mflr r0 +/* 80033458 00030398 90 01 00 14 */ stw r0, 0x14(r1) +/* 8003345C 0003039C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80033460 000303A0 7C 7F 1B 78 */ mr r31, r3 +/* 80033464 000303A4 7C 85 23 78 */ mr r5, r4 +/* 80033468 000303A8 7C A3 2B 78 */ mr r3, r5 +/* 8003346C 000303AC 4B FF F4 AD */ bl dSv_item_rename__FUc +/* 80033470 000303B0 7C 65 1B 78 */ mr r5, r3 +/* 80033474 000303B4 7F E3 FB 78 */ mr r3, r31 +/* 80033478 000303B8 38 80 00 60 */ li r4, 0x60 +/* 8003347C 000303BC 4B FF FE F5 */ bl setBottleItemIn__17dSv_player_item_cFUcUc +/* 80033480 000303C0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80033484 000303C4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80033488 000303C8 7C 08 03 A6 */ mtlr r0 +/* 8003348C 000303CC 38 21 00 10 */ addi r1, r1, 0x10 +/* 80033490 000303D0 4E 80 00 20 */ blr +} + +asm void dSv_player_item_c::setEmptyBottle(void) { + nofralloc + /* 80033494 000303D4 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80033498 000303D8 7C 08 02 A6 */ mflr r0 +/* 8003349C 000303DC 90 01 00 24 */ stw r0, 0x24(r1) +/* 800334A0 000303E0 39 61 00 20 */ addi r11, r1, 0x20 +/* 800334A4 000303E4 48 32 ED 39 */ bl _savegpr_29 +/* 800334A8 000303E8 3B A0 00 00 */ li r29, 0 +/* 800334AC 000303EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800334B0 000303F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800334B4 000303F4 3B E3 00 9C */ addi r31, r3, 0x9c +lbl_800334B8: +/* 800334B8 000303F8 7F E3 FB 78 */ mr r3, r31 +/* 800334BC 000303FC 38 1D 00 0B */ addi r0, r29, 0xb +/* 800334C0 00030400 54 1E 06 3E */ clrlwi r30, r0, 0x18 +/* 800334C4 00030404 7F C4 F3 78 */ mr r4, r30 +/* 800334C8 00030408 38 A0 00 01 */ li r5, 1 +/* 800334CC 0003040C 4B FF FB 65 */ bl getItem__17dSv_player_item_cCFib +/* 800334D0 00030410 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800334D4 00030414 28 00 00 FF */ cmplwi r0, 0xff +/* 800334D8 00030418 40 82 00 18 */ bne lbl_800334F0 +/* 800334DC 0003041C 7F E3 FB 78 */ mr r3, r31 +/* 800334E0 00030420 7F C4 F3 78 */ mr r4, r30 +/* 800334E4 00030424 38 A0 00 60 */ li r5, 0x60 +/* 800334E8 00030428 4B FF FA D1 */ bl setItem__17dSv_player_item_cFiUc +/* 800334EC 0003042C 48 00 00 10 */ b lbl_800334FC +lbl_800334F0: +/* 800334F0 00030430 3B BD 00 01 */ addi r29, r29, 1 +/* 800334F4 00030434 2C 1D 00 04 */ cmpwi r29, 4 +/* 800334F8 00030438 41 80 FF C0 */ blt lbl_800334B8 +lbl_800334FC: +/* 800334FC 0003043C 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033500 00030440 48 32 ED 29 */ bl _restgpr_29 +/* 80033504 00030444 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80033508 00030448 7C 08 03 A6 */ mtlr r0 +/* 8003350C 0003044C 38 21 00 20 */ addi r1, r1, 0x20 +/* 80033510 00030450 4E 80 00 20 */ blr +} + +asm void dSv_player_item_c::setEmptyBottle(u8){ + nofralloc + /* 80033514 00030454 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80033518 00030458 7C 08 02 A6 */ mflr r0 +/* 8003351C 0003045C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80033520 00030460 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033524 00030464 48 32 EC B5 */ bl _savegpr_28 +/* 80033528 00030468 7C 9C 23 78 */ mr r28, r4 +/* 8003352C 0003046C 3B A0 00 00 */ li r29, 0 +/* 80033530 00030470 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033534 00030474 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033538 00030478 3B E3 00 9C */ addi r31, r3, 0x9c +lbl_8003353C: +/* 8003353C 0003047C 7F E3 FB 78 */ mr r3, r31 +/* 80033540 00030480 38 1D 00 0B */ addi r0, r29, 0xb +/* 80033544 00030484 54 1E 06 3E */ clrlwi r30, r0, 0x18 +/* 80033548 00030488 7F C4 F3 78 */ mr r4, r30 +/* 8003354C 0003048C 38 A0 00 01 */ li r5, 1 +/* 80033550 00030490 4B FF FA E1 */ bl getItem__17dSv_player_item_cCFib +/* 80033554 00030494 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 80033558 00030498 28 00 00 FF */ cmplwi r0, 0xff +/* 8003355C 0003049C 40 82 00 18 */ bne lbl_80033574 +/* 80033560 000304A0 7F E3 FB 78 */ mr r3, r31 +/* 80033564 000304A4 7F C4 F3 78 */ mr r4, r30 +/* 80033568 000304A8 7F 85 E3 78 */ mr r5, r28 +/* 8003356C 000304AC 4B FF FA 4D */ bl setItem__17dSv_player_item_cFiUc +/* 80033570 000304B0 48 00 00 10 */ b lbl_80033580 +lbl_80033574: +/* 80033574 000304B4 3B BD 00 01 */ addi r29, r29, 1 +/* 80033578 000304B8 2C 1D 00 04 */ cmpwi r29, 4 +/* 8003357C 000304BC 41 80 FF C0 */ blt lbl_8003353C +lbl_80033580: +/* 80033580 000304C0 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033584 000304C4 48 32 EC A1 */ bl _restgpr_28 +/* 80033588 000304C8 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8003358C 000304CC 7C 08 03 A6 */ mtlr r0 +/* 80033590 000304D0 38 21 00 20 */ addi r1, r1, 0x20 +/* 80033594 000304D4 4E 80 00 20 */ blr +} + +asm void dSv_player_item_c::setEquipBottleItemIn(u8, u8) { + nofralloc + /* 80033598 000304D8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8003359C 000304DC 7C 08 02 A6 */ mflr r0 +/* 800335A0 000304E0 90 01 00 24 */ stw r0, 0x24(r1) +/* 800335A4 000304E4 39 61 00 20 */ addi r11, r1, 0x20 +/* 800335A8 000304E8 48 32 EC 35 */ bl _savegpr_29 +/* 800335AC 000304EC 7C 7D 1B 78 */ mr r29, r3 +/* 800335B0 000304F0 7C 9F 23 78 */ mr r31, r4 +/* 800335B4 000304F4 7C BE 2B 78 */ mr r30, r5 +/* 800335B8 000304F8 7F C3 F3 78 */ mr r3, r30 +/* 800335BC 000304FC 4B FF F3 5D */ bl dSv_item_rename__FUc +/* 800335C0 00030500 7C 7E 1B 78 */ mr r30, r3 +/* 800335C4 00030504 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800335C8 00030508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800335CC 0003050C 57 FF 06 3E */ clrlwi r31, r31, 0x18 +/* 800335D0 00030510 7F E4 FB 78 */ mr r4, r31 +/* 800335D4 00030514 4B FF F4 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 800335D8 00030518 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800335DC 0003051C 28 00 00 0B */ cmplwi r0, 0xb +/* 800335E0 00030520 41 80 00 C4 */ blt lbl_800336A4 +/* 800335E4 00030524 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800335E8 00030528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800335EC 0003052C 7F E4 FB 78 */ mr r4, r31 +/* 800335F0 00030530 4B FF F4 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 800335F4 00030534 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800335F8 00030538 28 00 00 0E */ cmplwi r0, 0xe +/* 800335FC 0003053C 41 81 00 A8 */ bgt lbl_800336A4 +/* 80033600 00030540 57 C0 06 3E */ clrlwi r0, r30, 0x18 +/* 80033604 00030544 28 00 00 6B */ cmplwi r0, 0x6b +/* 80033608 00030548 40 82 00 24 */ bne lbl_8003362C +/* 8003360C 0003054C 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033610 00030550 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033614 00030554 7F E4 FB 78 */ mr r4, r31 +/* 80033618 00030558 4B FF F4 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 8003361C 0003055C 7C 64 1B 78 */ mr r4, r3 +/* 80033620 00030560 3C 60 80 43 */ lis r3, lbl_80430188@ha +/* 80033624 00030564 38 63 01 88 */ addi r3, r3, lbl_80430188@l +/* 80033628 00030568 48 1E A6 9D */ bl dMeter2Info_c_NS_setHotSpringTimer +lbl_8003362C: +/* 8003362C 0003056C 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033630 00030570 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033634 00030574 7F E4 FB 78 */ mr r4, r31 +/* 80033638 00030578 4B FF F4 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 8003363C 0003057C 7C 60 1B 78 */ mr r0, r3 +/* 80033640 00030580 7F A3 EB 78 */ mr r3, r29 +/* 80033644 00030584 54 04 06 3E */ clrlwi r4, r0, 0x18 +/* 80033648 00030588 7F C5 F3 78 */ mr r5, r30 +/* 8003364C 0003058C 4B FF F9 6D */ bl setItem__17dSv_player_item_cFiUc +/* 80033650 00030590 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033654 00030594 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033658 00030598 7F E4 FB 78 */ mr r4, r31 +/* 8003365C 0003059C 4B FF F4 01 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 80033660 000305A0 7C 60 1B 78 */ mr r0, r3 +/* 80033664 000305A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033668 000305A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003366C 000305AC 38 63 00 9C */ addi r3, r3, 0x9c +/* 80033670 000305B0 54 04 06 3E */ clrlwi r4, r0, 0x18 +/* 80033674 000305B4 7F C5 F3 78 */ mr r5, r30 +/* 80033678 000305B8 4B FF F9 41 */ bl setItem__17dSv_player_item_cFiUc +/* 8003367C 000305BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033680 000305C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033684 000305C4 7F E4 FB 78 */ mr r4, r31 +/* 80033688 000305C8 4B FF F3 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 8003368C 000305CC 3C 80 80 40 */ lis r4, lbl_804061C0@ha +/* 80033690 000305D0 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l +/* 80033694 000305D4 98 64 5E 7D */ stb r3, 0x5e7d(r4) +/* 80033698 000305D8 9B C4 5E 7E */ stb r30, 0x5e7e(r4) +/* 8003369C 000305DC 7F E3 FB 78 */ mr r3, r31 +/* 800336A0 000305E0 4B FF A7 55 */ bl dComIfGp_setSelectItem +lbl_800336A4: +/* 800336A4 000305E4 39 61 00 20 */ addi r11, r1, 0x20 +/* 800336A8 000305E8 48 32 EB 81 */ bl _restgpr_29 +/* 800336AC 000305EC 80 01 00 24 */ lwz r0, 0x24(r1) +/* 800336B0 000305F0 7C 08 03 A6 */ mtlr r0 +/* 800336B4 000305F4 38 21 00 20 */ addi r1, r1, 0x20 +/* 800336B8 000305F8 4E 80 00 20 */ blr +} + +// void dSv_player_item_c::setEquipBottleItemEmpty(u8 selected_index) { +// setEquipBottleItemIn__17dSv_player_item_cFUcUc(selected_index,(u8)EMPTY_BOTTLE); +// } + +asm void dSv_player_item_c::setEquipBottleItemEmpty(u8){ + nofralloc + /* 800336BC 000305FC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800336C0 00030600 7C 08 02 A6 */ mflr r0 +/* 800336C4 00030604 90 01 00 14 */ stw r0, 0x14(r1) +/* 800336C8 00030608 38 A0 00 60 */ li r5, 0x60 +/* 800336CC 0003060C 4B FF FE CD */ bl setEquipBottleItemIn__17dSv_player_item_cFUcUc +/* 800336D0 00030610 80 01 00 14 */ lwz r0, 0x14(r1) +/* 800336D4 00030614 7C 08 03 A6 */ mtlr r0 +/* 800336D8 00030618 38 21 00 10 */ addi r1, r1, 0x10 +/* 800336DC 0003061C 4E 80 00 20 */ blr +} + +u8 dSv_player_item_c::checkBottle(u8 i_item_id){ + u8 item_id; + u8 num_bottles = 0; + + item_id = dSv_item_rename(i_item_id); + for (int i = 0; i < MAX_BOTTLES; i++) { + if (item_id == items[i+0xb]) { + num_bottles++; + } + } + return num_bottles; +} + +asm u8 dSv_player_item_c::checkInsectBottle(void){ + nofralloc +/* 80033754 00030694 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 80033758 00030698 7C 08 02 A6 */ mflr r0 +/* 8003375C 0003069C 90 01 00 24 */ stw r0, 0x24(r1) +/* 80033760 000306A0 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033764 000306A4 48 32 EA 71 */ bl _savegpr_27 +/* 80033768 000306A8 3B 60 00 00 */ li r27, 0 +/* 8003376C 000306AC 3B E0 00 00 */ li r31, 0 +/* 80033770 000306B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033774 000306B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 80033778 000306B8 3B A3 00 CC */ addi r29, r3, 0xcc +/* 8003377C 000306BC 3B 83 07 F0 */ addi r28, r3, 0x7f0 +/* 80033780 000306C0 3C 60 80 3A */ lis r3, lbl_803A7288@ha +/* 80033784 000306C4 3B C3 72 88 */ addi r30, r3, lbl_803A7288@l +lbl_80033788: +/* 80033788 000306C8 7F A3 EB 78 */ mr r3, r29 +/* 8003378C 000306CC 38 1B 00 C0 */ addi r0, r27, 0xc0 +/* 80033790 000306D0 54 04 06 3E */ clrlwi r4, r0, 0x18 +/* 80033794 000306D4 48 00 07 35 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80033798 000306D8 2C 03 00 00 */ cmpwi r3, 0 +/* 8003379C 000306DC 41 82 00 24 */ beq lbl_800337C0 +/* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28 +/* 800337A4 000306E4 7C 9E FA 14 */ add r4, r30, r31 +/* 800337A8 000306E8 A0 84 03 22 */ lhz r4, 0x322(r4) +/* 800337AC 000306EC 48 00 12 11 */ bl dSv_event_c_NS_isEventBit +/* 800337B0 000306F0 2C 03 00 00 */ cmpwi r3, 0 +/* 800337B4 000306F4 40 82 00 0C */ bne lbl_800337C0 +/* 800337B8 000306F8 38 60 00 01 */ li r3, 1 +/* 800337BC 000306FC 48 00 00 18 */ b lbl_800337D4 +lbl_800337C0: +/* 800337C0 00030700 3B 7B 00 01 */ addi r27, r27, 1 +/* 800337C4 00030704 2C 1B 00 18 */ cmpwi r27, 0x18 +/* 800337C8 00030708 3B FF 00 02 */ addi r31, r31, 2 +/* 800337CC 0003070C 41 80 FF BC */ blt lbl_80033788 +/* 800337D0 00030710 38 60 00 00 */ li r3, 0 +lbl_800337D4: +/* 800337D4 00030714 39 61 00 20 */ addi r11, r1, 0x20 +/* 800337D8 00030718 48 32 EA 49 */ bl _restgpr_27 +/* 800337DC 0003071C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 800337E0 00030720 7C 08 03 A6 */ mtlr r0 +/* 800337E4 00030724 38 21 00 20 */ addi r1, r1, 0x20 +/* 800337E8 00030728 4E 80 00 20 */ blr +} + +u8 dSv_player_item_c::checkEmptyBottle(void) { + u8 num = 0; + + for(int i = 0; i < MAX_BOTTLES; i++) { + if(items[i+0xb] == EMPTY_BOTTLE) { + num++; + } + } + return num; +} + +asm void dSv_player_item_c::setBombBagItemIn(u8, u8, bool) { + nofralloc + /* 80033828 00030768 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8003382C 0003076C 7C 08 02 A6 */ mflr r0 +/* 80033830 00030770 90 01 00 24 */ stw r0, 0x24(r1) +/* 80033834 00030774 39 61 00 20 */ addi r11, r1, 0x20 +/* 80033838 00030778 48 32 E9 A5 */ bl _savegpr_29 +/* 8003383C 0003077C 7C BE 2B 78 */ mr r30, r5 +/* 80033840 00030780 7C DD 33 78 */ mr r29, r6 +/* 80033844 00030784 3B E0 00 00 */ li r31, 0 +/* 80033848 00030788 54 85 06 3E */ clrlwi r5, r4, 0x18 +/* 8003384C 0003078C 38 00 00 03 */ li r0, 3 +/* 80033850 00030790 7C 09 03 A6 */ mtctr r0 +lbl_80033854: +/* 80033854 00030794 38 9F 00 0F */ addi r4, r31, 0xf +/* 80033858 00030798 7C 03 20 AE */ lbzx r0, r3, r4 +/* 8003385C 0003079C 7C 05 00 40 */ cmplw r5, r0 +/* 80033860 000307A0 40 82 00 90 */ bne lbl_800338F0 +/* 80033864 000307A4 7F C5 F3 78 */ mr r5, r30 +/* 80033868 000307A8 4B FF F7 51 */ bl setItem__17dSv_player_item_cFiUc +/* 8003386C 000307AC 57 A0 06 3E */ clrlwi r0, r29, 0x18 +/* 80033870 000307B0 28 00 00 01 */ cmplwi r0, 1 +/* 80033874 000307B4 40 82 00 3C */ bne lbl_800338B0 +/* 80033878 000307B8 57 C0 06 3E */ clrlwi r0, r30, 0x18 +/* 8003387C 000307BC 28 00 00 50 */ cmplwi r0, 0x50 +/* 80033880 000307C0 41 82 00 30 */ beq lbl_800338B0 +/* 80033884 000307C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 8003388C 000307CC 38 63 00 F8 */ addi r3, r3, 0xf8 +/* 80033890 000307D0 7F C4 F3 78 */ mr r4, r30 +/* 80033894 000307D4 48 00 08 65 */ bl dSv_player_item_max_c_NS_getBombNum +/* 80033898 000307D8 7C 65 1B 78 */ mr r5, r3 +/* 8003389C 000307DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l +/* 800338A4 000307E4 38 63 00 EC */ addi r3, r3, 0xec +/* 800338A8 000307E8 57 E4 06 3E */ clrlwi r4, r31, 0x18 +/* 800338AC 000307EC 48 00 06 C1 */ bl dSv_player_item_record_c_NS_setBombNum +lbl_800338B0: +/* 800338B0 000307F0 3B A0 00 00 */ li r29, 0 +/* 800338B4 000307F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha +/* 800338B8 000307F8 3B C3 61 C0 */ addi r30, r3, lbl_804061C0@l +/* 800338BC 000307FC 3B FF 00 0F */ addi r31, r31, 0xf +lbl_800338C0: +/* 800338C0 00030800 7F C3 F3 78 */ mr r3, r30 +/* 800338C4 00030804 7F A4 EB 78 */ mr r4, r29 +/* 800338C8 00030808 4B FF F1 95 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi +/* 800338CC 0003080C 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 800338D0 00030810 7C 1F 00 00 */ cmpw r31, r0 +/* 800338D4 00030814 40 82 00 0C */ bne lbl_800338E0 +/* 800338D8 00030818 7F A3 EB 78 */ mr r3, r29 +/* 800338DC 0003081C 4B FF A5 19 */ bl dComIfGp_setSelectItem +lbl_800338E0: +/* 800338E0 00030820 3B BD 00 01 */ addi r29, r29, 1 +/* 800338E4 00030824 2C 1D 00 03 */ cmpwi r29, 3 +/* 800338E8 00030828 41 80 FF D8 */ blt lbl_800338C0 +/* 800338EC 0003082C 48 00 00 0C */ b lbl_800338F8 +lbl_800338F0: +/* 800338F0 00030830 3B FF 00 01 */ addi r31, r31, 1 +/* 800338F4 00030834 42 00 FF 60 */ bdnz lbl_80033854 +lbl_800338F8: +/* 800338F8 00030838 39 61 00 20 */ addi r11, r1, 0x20 +/* 800338FC 0003083C 48 32 E9 2D */ bl _restgpr_29 +/* 80033900 00030840 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80033904 00030844 7C 08 03 A6 */ mtlr r0 +/* 80033908 00030848 38 21 00 20 */ addi r1, r1, 0x20 +/* 8003390C 0003084C 4E 80 00 20 */ blr } \ No newline at end of file