From 3acc2e012b23cc6053422d3c2761ff0b4b0f452c Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 5 Sep 2020 15:40:08 -0400 Subject: [PATCH] Sorting files, adding CI checks, update Makefile (#3) * organize files, update makefile, add CI checks, begin adding d_save.cpp * Add discord server link * don't filter branches --- .github/workflows/c-cpp.yml | 20 + .gitignore | 5 +- Makefile | 17 +- README.md | 8 +- asm/DynamicLink.s | 4 +- asm/J2DGraph/J2DAnimation.s | 28 +- asm/J2DGraph/J2DGrafContext.s | 8 +- asm/J2DGraph/J2DManage.s | 4 +- asm/J2DGraph/J2DMatBlock.s | 48 +- asm/J2DGraph/J2DMaterialFactory.s | 4 +- asm/J2DGraph/J2DOrthoGraph.s | 4 +- asm/J2DGraph/J2DPane.s | 28 +- asm/J2DGraph/J2DPicture.s | 16 +- asm/J2DGraph/J2DPictureEx.s | 36 +- asm/J2DGraph/J2DPrint.s | 4 +- asm/J2DGraph/J2DTevs.s | 4 +- asm/J2DGraph/J2DTextBox.s | 8 +- asm/J2DGraph/J2DWindow.s | 12 +- asm/J2DGraph/J2DWindowEx.s | 28 +- asm/J3DGraphAnimator/J3DAnimation.s | 16 +- asm/J3DGraphAnimator/J3DCluster.s | 8 +- asm/J3DGraphAnimator/J3DModel.s | 4 +- asm/J3DGraphAnimator/J3DModelData.s | 8 +- asm/J3DGraphAnimator/J3DMtxBuffer.s | 8 +- asm/J3DGraphAnimator/J3DSkinDeform.s | 12 +- asm/J3DGraphBase/J3DGD.s | 8 +- asm/J3DGraphBase/J3DMatBlock.s | 44 +- asm/J3DGraphBase/J3DMaterial.s | 4 +- asm/J3DGraphBase/J3DShape.s | 8 +- asm/J3DGraphBase/J3DShapeMtx.s | 8 +- asm/J3DGraphBase/J3DVertex.s | 8 +- asm/J3DGraphLoader/J3DAnmLoader.s | 8 +- asm/J3DGraphLoader/J3DMaterialFactory.s | 8 +- .../J3DMaterialFactory_v21.s | 8 +- asm/J3DGraphLoader/J3DModelLoader.s | 12 +- asm/J3DGraphLoader/J3DShapeFactory.s | 4 +- asm/J3DU/J3DUClipper.s | 4 +- asm/JAudio2/JAISe.s | 4 +- asm/JAudio2/JAISeMgr.s | 24 +- asm/JAudio2/JAISeq.s | 16 +- asm/JAudio2/JAISeqMgr.s | 8 +- asm/JAudio2/JAIStream.s | 8 +- asm/JAudio2/JAIStreamMgr.s | 4 +- asm/JAudio2/JASAiCtrl.s | 4 +- asm/JAudio2/JASAramStream.s | 4 +- asm/JAudio2/JASBasicBank.s | 4 +- asm/JAudio2/JASBasicInst.s | 4 +- asm/JAudio2/JASBasicWaveBank.s | 12 +- asm/JAudio2/JASCallback.s | 4 +- asm/JAudio2/JASChannel.s | 8 +- asm/JAudio2/JASCmdStack.s | 4 +- asm/JAudio2/JASDSPInterface.s | 4 +- asm/JAudio2/JASDvdThread.s | 4 +- asm/JAudio2/JASHeapCtrl.s | 16 +- asm/JAudio2/JASSeqParser.s | 24 +- asm/JAudio2/JASSimpleWaveBank.s | 4 +- asm/JAudio2/JASTrack.s | 8 +- asm/JAudio2/JAUAudioArcLoader.s | 4 +- asm/JAudio2/JAUInitializer.s | 8 +- asm/JAudio2/JAUSectionHeap.s | 20 +- asm/JAudio2/JAUSeqDataBlockMgr.s | 4 +- asm/JFramework/JFWDisplay.s | 8 +- asm/JGadget/linklist.s | 4 +- asm/JGadget/std-vector.s | 4 +- asm/JKernel/JKRAram.s | 6 +- asm/JKernel/JKRAramArchive.s | 8 +- asm/JKernel/JKRAramHeap.s | 12 +- asm/JKernel/JKRArchivePri.s | 8 +- asm/JKernel/JKRArchivePub.s | 28 +- asm/JKernel/JKRCompArchive.s | 12 +- asm/JKernel/JKRDvdAramRipper.s | 8 +- asm/JKernel/JKRDvdArchive.s | 8 +- asm/JKernel/JKRDvdFile.s | 8 +- asm/JKernel/JKRDvdRipper.s | 8 +- asm/JKernel/JKRExpHeap.s | 36 +- asm/JKernel/JKRFileCache.s | 20 +- asm/JKernel/JKRFileLoader.s | 4 +- asm/JKernel/JKRHeap.s | 12 +- asm/JKernel/JKRMemArchive.s | 8 +- asm/JKernel/JKRSolidHeap.s | 16 +- asm/JKernel/JKRThread.s | 4 +- asm/JMessage/processor.s | 8 +- asm/JParticle/JPABaseShape.s | 20 +- asm/JParticle/JPAEmitterManager.s | 8 +- asm/JParticle/JPAFieldBlock.s | 16 +- asm/JParticle/JPAParticle.s | 8 +- asm/JStudio/functionvalue.s | 4 +- asm/JStudio/fvb.s | 8 +- asm/JStudio/jstudio-control.s | 4 +- asm/JStudio/jstudio-math.s | 4 +- asm/JStudio/jstudio-object.s | 16 +- asm/JStudio/stb.s | 8 +- asm/JStudio_JAudio2/control.s | 4 +- asm/JStudio_JParticle/control.s | 2 +- asm/JStudio_JParticle/object-particle.s | 2 +- asm/JStudio_JStage/object-actor.s | 8 +- asm/JStudio_JStage/object-ambientlight.s | 4 +- asm/JStudio_JStage/object-camera.s | 4 +- asm/JStudio_JStage/object-fog.s | 4 +- asm/JStudio_JStage/object-light.s | 12 +- asm/JSupport/JSUFileStream.s | 4 +- asm/JSupport/JSUInputStream.s | 4 +- asm/JSupport/JSUList.s | 12 +- asm/JUtility/JUTCacheFont.s | 4 +- asm/JUtility/JUTConsole.s | 16 +- asm/JUtility/JUTDbPrint.s | 4 +- asm/JUtility/JUTDirectFile.s | 8 +- asm/JUtility/JUTGamePad.s | 8 +- asm/JUtility/JUTPalette.s | 4 +- asm/JUtility/JUTResFont.s | 16 +- asm/JUtility/JUTResource.s | 4 +- asm/JUtility/JUTTexture.s | 8 +- asm/JUtility/JUTXfb.s | 4 +- asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s | 4 +- asm/SComponent/c/c_list.s | 4 +- asm/SComponent/c/c_m3d.s | 72 +- asm/SComponent/c/c_node.s | 4 +- asm/SComponent/c/cc/c_cc_s.s | 4 +- asm/SComponent/c/node/c_node_iter.s | 4 +- asm/Z2AudioLib/Z2Audience.s | 12 +- asm/Z2AudioLib/Z2AudioArcLoader.s | 4 +- asm/Z2AudioLib/Z2AudioMgr.s | 4 +- asm/Z2AudioLib/Z2Creature.s | 44 +- asm/Z2AudioLib/Z2EnvSeMgr.s | 20 +- asm/Z2AudioLib/Z2LinkMgr.s | 24 +- asm/Z2AudioLib/Z2SceneMgr.s | 4 +- asm/Z2AudioLib/Z2SeMgr.s | 8 +- asm/Z2AudioLib/Z2SeqMgr.s | 12 +- asm/Z2AudioLib/Z2SoundInfo.s | 4 +- asm/Z2AudioLib/Z2SoundObject.s | 28 +- asm/Z2AudioLib/Z2SoundStarter.s | 4 +- asm/Z2AudioLib/Z2SpeechMgr2.s | 4 +- asm/Z2AudioLib/Z2StatusMgr.s | 4 +- asm/Z2AudioLib/Z2WolfHowlMgr.s | 8 +- asm/clib.s | 8 +- asm/d/a/d_a_alink.s | 786 +++++++++--------- asm/d/a/d_a_npc.s | 52 +- asm/d/a/d_a_obj.s | 4 +- asm/d/a/d_a_player.s | 16 +- asm/d/a/npc/d_a_npc_cd.s | 12 +- asm/d/a/npc/d_a_npc_cd2.s | 16 +- asm/d/a/obj/d_a_obj_item.s | 16 +- asm/d/bg/d_bg_s.s | 40 +- asm/d/bg/d_bg_w.s | 28 +- asm/d/bg/s/d_bg_s_acch.s | 20 +- asm/d/bg/w/d_bg_w_kcol.s | 12 +- asm/d/cc/d_cc_d.s | 4 +- asm/d/cc/d_cc_s.s | 4 +- asm/d/cc/mass/d_cc_mass_s.s | 12 +- asm/d/com/d_com_static.s | 8 +- asm/d/com/inf/d_com_inf_game.s | 50 +- asm/d/d_attention.s | 8 +- asm/d/d_camera.s | 32 +- asm/d/d_demo.s | 8 +- asm/d/d_drawlist.s | 16 +- asm/d/d_event.s | 32 +- asm/d/d_gameover.s | 4 +- asm/d/d_item.s | 4 +- asm/d/d_kankyo.s | 56 +- asm/d/d_lib.s | 4 +- asm/d/d_map.s | 16 +- asm/d/d_meter2.s | 30 +- asm/d/d_name.s | 16 +- asm/d/d_particle.s | 32 +- asm/d/d_resorce.s | 12 +- asm/d/d_save.s | 240 +----- asm/d/d_scope.s | 4 +- asm/d/d_stage.s | 44 +- asm/d/d_timer.s | 8 +- asm/d/d_vibration.s | 12 +- asm/d/ev/d_ev_camera.s | 28 +- asm/d/event/d_event_data.s | 12 +- asm/d/event/d_event_manager.s | 36 +- asm/d/file/d_file_select.s | 92 +- asm/d/file/sel/d_file_sel_info.s | 8 +- asm/d/jnt/d_jnt_col.s | 4 +- asm/d/kankyo/d_kankyo_rain.s | 16 +- asm/d/kankyo/d_kankyo_wether.s | 28 +- asm/d/map/path/d_map_path_dmap.s | 16 +- asm/d/map/path/d_map_path_fmap.s | 12 +- asm/d/menu/d_menu_collect.s | 30 +- asm/d/menu/d_menu_dmap.s | 28 +- asm/d/menu/d_menu_fishing.s | 4 +- asm/d/menu/d_menu_fmap.s | 24 +- asm/d/menu/d_menu_fmap2D.s | 32 +- asm/d/menu/d_menu_insect.s | 4 +- asm/d/menu/d_menu_letter.s | 8 +- asm/d/menu/d_menu_option.s | 32 +- asm/d/menu/d_menu_ring.s | 70 +- asm/d/menu/d_menu_save.s | 80 +- asm/d/menu/d_menu_skill.s | 8 +- asm/d/menu/d_menu_window.s | 8 +- asm/d/menu/dmap/d_menu_dmap_map.s | 4 +- asm/d/menu/fmap/d_menu_fmap_map.s | 4 +- asm/d/menu/map/d_menu_map_common.s | 8 +- asm/d/meter/d_meter_HIO.s | 4 +- asm/d/meter/d_meter_button.s | 96 +-- asm/d/meter/d_meter_haihai.s | 4 +- asm/d/meter/d_meter_map.s | 8 +- asm/d/meter2/d_meter2_draw.s | 8 +- asm/d/meter2/d_meter2_info.s | 34 +- asm/d/msg/d_msg_class.s | 60 +- asm/d/msg/d_msg_flow.s | 38 +- asm/d/msg/d_msg_object.s | 36 +- asm/d/msg/out/d_msg_out_font.s | 8 +- asm/d/msg/scrn/d_msg_scrn_3select.s | 4 +- asm/d/msg/scrn/d_msg_scrn_boss.s | 4 +- asm/d/msg/scrn/d_msg_scrn_explain.s | 12 +- asm/d/msg/scrn/d_msg_scrn_howl.s | 4 +- asm/d/msg/scrn/d_msg_scrn_item.s | 4 +- asm/d/msg/scrn/d_msg_scrn_place.s | 4 +- asm/d/msg/scrn/d_msg_scrn_talk.s | 4 +- asm/d/msg/string/d_msg_string_base.s | 4 +- asm/d/pane/class/d_pane_class_alpha.s | 12 +- asm/d/pane/d_pane_class.s | 4 +- asm/d/particle/d_particle_copoly.s | 4 +- asm/d/s/d_s_logo.s | 4 +- asm/d/s/d_s_play.s | 8 +- asm/d/s/d_s_room.s | 12 +- asm/d/save/d_save_HIO.s | 32 +- asm/d/select/d_select_cursor.s | 4 +- asm/d/shop/d_shop_system.s | 36 +- asm/d/simple/d_simple_model.s | 8 +- asm/f/op/actor/f_op_actor_mng.s | 32 +- asm/f/op/camera/f_op_camera_mng.s | 4 +- asm/f/op/f_op_actor.s | 8 +- asm/f/op/kankyo/f_op_kankyo_mng.s | 8 +- asm/f/op/msg/f_op_msg_mng.s | 16 +- asm/f/op/overlap/f_op_overlap_req.s | 4 +- asm/f/pc/create/f_pc_create_req.s | 4 +- asm/f/pc/f_pc_deletor.s | 4 +- asm/f/pc/f_pc_draw.s | 4 +- asm/f/pc/f_pc_node.s | 4 +- asm/f/pc/method/f_pc_method_tag.s | 4 +- asm/f/pc/node/f_pc_node_req.s | 4 +- asm/m/Do/controller/m_Do_controller_pad.s | 4 +- asm/m/Do/dvd/m_Do_dvd_thread.s | 12 +- asm/m/Do/m_Do_DVDError.s | 4 +- asm/m/Do/m_Do_audio.s | 4 +- asm/m/Do/m_Do_ext.s | 40 +- asm/m/Do/m_Do_lib.s | 8 +- asm/m/Do/m_Do_mtx.s | 20 +- asm/m/Do/m_Do_printf.s | 12 +- include/d_save.h | 130 +++ .../JSystem/J2DGraph/J2DAnimation.cpp | 0 .../JSystem/J2DGraph/J2DAnmLoader.cpp | 0 .../JSystem/J2DGraph/J2DGrafContext.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DManage.cpp | 0 .../JSystem/J2DGraph/J2DMatBlock.cpp | 0 .../JSystem/J2DGraph/J2DMaterial.cpp | 0 .../JSystem/J2DGraph/J2DMaterialFactory.cpp | 0 .../JSystem/J2DGraph/J2DOrthoGraph.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DPane.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DPicture.cpp | 0 .../JSystem/J2DGraph/J2DPictureEx.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DPrint.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DScreen.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DTevs.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DTextBox.cpp | 0 .../JSystem/J2DGraph/J2DTextBoxEx.cpp | 0 {src => libs}/JSystem/J2DGraph/J2DWindow.cpp | 0 .../JSystem/J2DGraph/J2DWindowEx.cpp | 0 .../JSystem/J3DGraphAnimator/J3DAnimation.cpp | 0 .../JSystem/J3DGraphAnimator/J3DCluster.cpp | 0 .../JSystem/J3DGraphAnimator/J3DJoint.cpp | 0 .../JSystem/J3DGraphAnimator/J3DJointTree.cpp | 0 .../J3DGraphAnimator/J3DMaterialAnm.cpp | 0 .../J3DGraphAnimator/J3DMaterialAttach.cpp | 0 .../JSystem/J3DGraphAnimator/J3DModel.cpp | 0 .../JSystem/J3DGraphAnimator/J3DModelData.cpp | 0 .../JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp | 0 .../J3DGraphAnimator/J3DShapeTable.cpp | 0 .../J3DGraphAnimator/J3DSkinDeform.cpp | 0 .../JSystem/J3DGraphBase/J3DDrawBuffer.cpp | 0 {src => libs}/JSystem/J3DGraphBase/J3DGD.cpp | 0 .../JSystem/J3DGraphBase/J3DMatBlock.cpp | 0 .../JSystem/J3DGraphBase/J3DMaterial.cpp | 0 .../JSystem/J3DGraphBase/J3DPacket.cpp | 0 .../JSystem/J3DGraphBase/J3DShape.cpp | 0 .../JSystem/J3DGraphBase/J3DShapeDraw.cpp | 0 .../JSystem/J3DGraphBase/J3DShapeMtx.cpp | 0 .../JSystem/J3DGraphBase/J3DStruct.cpp | 0 {src => libs}/JSystem/J3DGraphBase/J3DSys.cpp | 0 .../JSystem/J3DGraphBase/J3DTevs.cpp | 0 .../JSystem/J3DGraphBase/J3DTexture.cpp | 0 .../JSystem/J3DGraphBase/J3DTransform.cpp | 0 .../JSystem/J3DGraphBase/J3DVertex.cpp | 0 .../JSystem/J3DGraphLoader/J3DAnmLoader.cpp | 0 .../J3DGraphLoader/J3DClusterLoader.cpp | 0 .../J3DGraphLoader/J3DJointFactory.cpp | 0 .../J3DGraphLoader/J3DMaterialFactory.cpp | 0 .../J3DGraphLoader/J3DMaterialFactory_v21.cpp | 0 .../JSystem/J3DGraphLoader/J3DModelLoader.cpp | 0 .../J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 0 .../J3DGraphLoader/J3DShapeFactory.cpp | 0 {src => libs}/JSystem/J3DU/J3DUClipper.cpp | 0 {src => libs}/JSystem/J3DU/J3DUDL.cpp | 0 {src => libs}/JSystem/JAudio2/JAIAudible.cpp | 0 {src => libs}/JSystem/JAudio2/JAIAudience.cpp | 0 {src => libs}/JSystem/JAudio2/JAISe.cpp | 0 {src => libs}/JSystem/JAudio2/JAISeMgr.cpp | 0 {src => libs}/JSystem/JAudio2/JAISeq.cpp | 0 .../JSystem/JAudio2/JAISeqDataMgr.cpp | 0 {src => libs}/JSystem/JAudio2/JAISeqMgr.cpp | 0 {src => libs}/JSystem/JAudio2/JAISound.cpp | 0 .../JSystem/JAudio2/JAISoundChild.cpp | 0 .../JSystem/JAudio2/JAISoundHandles.cpp | 0 .../JSystem/JAudio2/JAISoundInfo.cpp | 0 .../JSystem/JAudio2/JAISoundParams.cpp | 0 .../JSystem/JAudio2/JAISoundStarter.cpp | 0 {src => libs}/JSystem/JAudio2/JAIStream.cpp | 0 .../JSystem/JAudio2/JAIStreamDataMgr.cpp | 0 .../JSystem/JAudio2/JAIStreamMgr.cpp | 0 {src => libs}/JSystem/JAudio2/JASAiCtrl.cpp | 0 .../JSystem/JAudio2/JASAramStream.cpp | 0 .../JSystem/JAudio2/JASAudioReseter.cpp | 0 .../JSystem/JAudio2/JASAudioThread.cpp | 0 .../JSystem/JAudio2/JASBNKParser.cpp | 0 {src => libs}/JSystem/JAudio2/JASBank.cpp | 0 .../JSystem/JAudio2/JASBasicBank.cpp | 0 .../JSystem/JAudio2/JASBasicInst.cpp | 0 .../JSystem/JAudio2/JASBasicWaveBank.cpp | 0 {src => libs}/JSystem/JAudio2/JASCalc.cpp | 0 {src => libs}/JSystem/JAudio2/JASCallback.cpp | 0 {src => libs}/JSystem/JAudio2/JASChannel.cpp | 0 {src => libs}/JSystem/JAudio2/JASCmdStack.cpp | 0 .../JSystem/JAudio2/JASDSPChannel.cpp | 0 .../JSystem/JAudio2/JASDSPInterface.cpp | 0 {src => libs}/JSystem/JAudio2/JASDriverIF.cpp | 0 {src => libs}/JSystem/JAudio2/JASDrumSet.cpp | 0 .../JSystem/JAudio2/JASDvdThread.cpp | 0 {src => libs}/JSystem/JAudio2/JASHeapCtrl.cpp | 0 {src => libs}/JSystem/JAudio2/JASLfo.cpp | 0 .../JSystem/JAudio2/JASOscillator.cpp | 0 {src => libs}/JSystem/JAudio2/JASProbe.cpp | 0 .../JSystem/JAudio2/JASRegisterParam.cpp | 0 {src => libs}/JSystem/JAudio2/JASReport.cpp | 0 .../JSystem/JAudio2/JASResArcLoader.cpp | 0 {src => libs}/JSystem/JAudio2/JASSeqCtrl.cpp | 0 .../JSystem/JAudio2/JASSeqParser.cpp | 0 .../JSystem/JAudio2/JASSeqReader.cpp | 0 .../JSystem/JAudio2/JASSimpleWaveBank.cpp | 0 .../JSystem/JAudio2/JASSoundParams.cpp | 0 .../JSystem/JAudio2/JASTaskThread.cpp | 0 {src => libs}/JSystem/JAudio2/JASTrack.cpp | 0 .../JSystem/JAudio2/JASTrackPort.cpp | 0 .../JSystem/JAudio2/JASVoiceBank.cpp | 0 {src => libs}/JSystem/JAudio2/JASWSParser.cpp | 0 .../JSystem/JAudio2/JASWaveArcLoader.cpp | 0 .../JAudio2/JAUAudioArcInterpreter.cpp | 0 .../JSystem/JAudio2/JAUAudioArcLoader.cpp | 0 {src => libs}/JSystem/JAudio2/JAUAudioMgr.cpp | 0 .../JSystem/JAudio2/JAUBankTable.cpp | 0 .../JSystem/JAudio2/JAUClusterSound.cpp | 0 .../JSystem/JAudio2/JAUInitializer.cpp | 0 .../JSystem/JAudio2/JAUSectionHeap.cpp | 0 .../JSystem/JAudio2/JAUSeqCollection.cpp | 0 .../JSystem/JAudio2/JAUSeqDataBlockMgr.cpp | 0 .../JSystem/JAudio2/JAUSoundAnimator.cpp | 0 .../JSystem/JAudio2/JAUSoundTable.cpp | 0 .../JSystem/JAudio2/JAUStreamFileTable.cpp | 0 {src => libs}/JSystem/JAudio2/dspproc.cpp | 0 {src => libs}/JSystem/JAudio2/dsptask.cpp | 0 {src => libs}/JSystem/JAudio2/osdsp.cpp | 0 {src => libs}/JSystem/JAudio2/osdsp_task.cpp | 0 .../JSystem/JFramework/JFWDisplay.cpp | 0 .../JSystem/JFramework/JFWSystem.cpp | 0 {src => libs}/JSystem/JGadget/binary.cpp | 0 {src => libs}/JSystem/JGadget/linklist.cpp | 0 {src => libs}/JSystem/JGadget/std-vector.cpp | 0 {src => libs}/JSystem/JKernel/JKRAram.cpp | 0 .../JSystem/JKernel/JKRAramArchive.cpp | 0 .../JSystem/JKernel/JKRAramBlock.cpp | 0 {src => libs}/JSystem/JKernel/JKRAramHeap.cpp | 0 .../JSystem/JKernel/JKRAramPiece.cpp | 0 .../JSystem/JKernel/JKRAramStream.cpp | 0 .../JSystem/JKernel/JKRArchivePri.cpp | 0 .../JSystem/JKernel/JKRArchivePub.cpp | 0 .../JSystem/JKernel/JKRAssertHeap.cpp | 0 .../JSystem/JKernel/JKRCompArchive.cpp | 0 {src => libs}/JSystem/JKernel/JKRDecomp.cpp | 0 {src => libs}/JSystem/JKernel/JKRDisposer.cpp | 0 .../JSystem/JKernel/JKRDvdAramRipper.cpp | 0 .../JSystem/JKernel/JKRDvdArchive.cpp | 0 {src => libs}/JSystem/JKernel/JKRDvdFile.cpp | 0 .../JSystem/JKernel/JKRDvdRipper.cpp | 0 {src => libs}/JSystem/JKernel/JKRExpHeap.cpp | 0 {src => libs}/JSystem/JKernel/JKRFile.cpp | 0 .../JSystem/JKernel/JKRFileCache.cpp | 0 .../JSystem/JKernel/JKRFileFinder.cpp | 0 .../JSystem/JKernel/JKRFileLoader.cpp | 0 {src => libs}/JSystem/JKernel/JKRHeap.cpp | 0 .../JSystem/JKernel/JKRMemArchive.cpp | 0 .../JSystem/JKernel/JKRSolidHeap.cpp | 0 {src => libs}/JSystem/JKernel/JKRThread.cpp | 0 .../JSystem/JMath/JMATrigonometric.cpp | 0 {src => libs}/JSystem/JMath/JMath.cpp | 0 {src => libs}/JSystem/JMath/random.cpp | 0 {src => libs}/JSystem/JMessage/control.cpp | 0 {src => libs}/JSystem/JMessage/data.cpp | 0 {src => libs}/JSystem/JMessage/locale.cpp | 0 {src => libs}/JSystem/JMessage/processor.cpp | 0 {src => libs}/JSystem/JMessage/resource.cpp | 0 .../JSystem/JParticle/JPABaseShape.cpp | 0 .../JSystem/JParticle/JPAChildShape.cpp | 0 .../JSystem/JParticle/JPADynamicsBlock.cpp | 0 .../JSystem/JParticle/JPAEmitter.cpp | 0 .../JSystem/JParticle/JPAEmitterManager.cpp | 0 .../JSystem/JParticle/JPAExTexShape.cpp | 0 .../JSystem/JParticle/JPAExtraShape.cpp | 0 .../JSystem/JParticle/JPAFieldBlock.cpp | 0 .../JSystem/JParticle/JPAKeyBlock.cpp | 0 {src => libs}/JSystem/JParticle/JPAMath.cpp | 0 .../JSystem/JParticle/JPAParticle.cpp | 0 .../JSystem/JParticle/JPAResource.cpp | 0 .../JSystem/JParticle/JPAResourceLoader.cpp | 0 .../JSystem/JParticle/JPAResourceManager.cpp | 0 .../JSystem/JParticle/JPATexture.cpp | 0 {src => libs}/JSystem/JStage/JSGActor.cpp | 0 .../JSystem/JStage/JSGAmbientLight.cpp | 0 {src => libs}/JSystem/JStage/JSGCamera.cpp | 0 {src => libs}/JSystem/JStage/JSGFog.cpp | 0 {src => libs}/JSystem/JStage/JSGLight.cpp | 0 {src => libs}/JSystem/JStage/JSGObject.cpp | 0 {src => libs}/JSystem/JStage/JSGSystem.cpp | 0 {src => libs}/JSystem/JStudio/ctb-data.cpp | 0 {src => libs}/JSystem/JStudio/ctb.cpp | 0 .../JSystem/JStudio/functionvalue.cpp | 0 .../JSystem/JStudio/fvb-data-parse.cpp | 0 {src => libs}/JSystem/JStudio/fvb-data.cpp | 0 {src => libs}/JSystem/JStudio/fvb.cpp | 0 .../JSystem/JStudio/jstudio-control.cpp | 0 .../JSystem/JStudio/jstudio-data.cpp | 0 .../JSystem/JStudio/jstudio-math.cpp | 0 .../JSystem/JStudio/jstudio-object.cpp | 0 {src => libs}/JSystem/JStudio/object-id.cpp | 0 .../JSystem/JStudio}/object-particle.cpp | 0 .../JSystem/JStudio}/object-sound.cpp | 0 .../JSystem/JStudio/stb-data-parse.cpp | 0 .../JSystem/JStudio/stb-data.cpp | 0 .../JSystem/JStudio/stb.cpp | 0 .../JSystem/JStudio_JAudio2/control.cpp | 0 .../JSystem/JStudio_JAudio2/object-sound.cpp | 0 .../JSystem/JStudio_JParticle/control.cpp | 0 .../JStudio_JParticle/object-particle.cpp | 0 .../JSystem/JStudio_JStage/control.cpp | 0 .../JSystem/JStudio_JStage/object-actor.cpp | 0 .../JStudio_JStage/object-ambientlight.cpp | 0 .../JSystem/JStudio_JStage/object-camera.cpp | 0 .../JSystem/JStudio_JStage/object-fog.cpp | 0 .../JSystem/JStudio_JStage/object-light.cpp | 0 .../JSystem/JStudio_JStage/object.cpp | 0 .../JSystem/JSupport/JSUFileStream.cpp | 0 .../JSystem/JSupport/JSUInputStream.cpp | 0 .../JSystem/JSupport/JSUList.cpp | 0 .../JSystem/JSupport/JSUMemoryStream.cpp | 0 .../JSystem/JUtility/JUTAssert.cpp | 0 .../JSystem/JUtility/JUTCacheFont.cpp | 0 .../JSystem/JUtility/JUTConsole.cpp | 0 .../JSystem/JUtility/JUTDbPrint.cpp | 0 .../JSystem/JUtility/JUTDirectFile.cpp | 0 .../JSystem/JUtility/JUTDirectPrint.cpp | 0 .../JSystem/JUtility/JUTException.cpp | 0 .../JSystem/JUtility/JUTFader.cpp | 0 .../JSystem/JUtility/JUTFont.cpp | 0 .../JUtility/JUTFontData_Ascfont_fix12.cpp | 0 .../JSystem/JUtility/JUTGamePad.cpp | 0 .../JSystem/JUtility/JUTGraphFifo.cpp | 0 .../JSystem/JUtility/JUTNameTab.cpp | 0 .../JSystem/JUtility/JUTPalette.cpp | 0 .../JSystem/JUtility/JUTProcBar.cpp | 0 .../JSystem/JUtility/JUTResFont.cpp | 0 .../JSystem/JUtility/JUTResource.cpp | 0 .../JSystem/JUtility/JUTTexture.cpp | 0 .../JSystem/JUtility/JUTVideo.cpp | 0 .../JSystem/JUtility/JUTXfb.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/abort_exit.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/alloc.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/ansi_files.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/arith.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/buffer_io.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/char_io.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/ctype.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/direct_io.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/errno.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/extras.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/file_io.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/float.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/mbstring.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/mem.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/misc_io.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/printf.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/scanf.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/signal.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/string.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/strtoul.cpp | 0 .../MSL/MSL_C/MSL_Common/Src/wchar_io.cpp | 0 .../Math/Double_precision/e_acos.cpp | 0 .../Math/Double_precision/e_asin.cpp | 0 .../Math/Double_precision/e_atan2.cpp | 0 .../Math/Double_precision/e_exp.cpp | 0 .../Math/Double_precision/e_fmod.cpp | 0 .../Math/Double_precision/e_pow.cpp | 0 .../Math/Double_precision/e_rem_pio2.cpp | 0 .../Math/Double_precision/e_sqrt.cpp | 0 .../Math/Double_precision/k_cos.cpp | 0 .../Math/Double_precision/k_rem_pio2.cpp | 0 .../Math/Double_precision/k_sin.cpp | 0 .../Math/Double_precision/k_tan.cpp | 0 .../Math/Double_precision/s_atan.cpp | 0 .../Math/Double_precision/s_ceil.cpp | 0 .../Math/Double_precision/s_copysign.cpp | 0 .../Math/Double_precision/s_cos.cpp | 0 .../Math/Double_precision/s_floor.cpp | 0 .../Math/Double_precision/s_frexp.cpp | 0 .../Math/Double_precision/s_ldexp.cpp | 0 .../Math/Double_precision/s_modf.cpp | 0 .../Math/Double_precision/s_sin.cpp | 0 .../Math/Double_precision/s_tan.cpp | 0 .../Math/Double_precision/w_acos.cpp | 0 .../Math/Double_precision/w_asin.cpp | 0 .../Math/Double_precision/w_atan2.cpp | 0 .../Math/Double_precision/w_exp.cpp | 0 .../Math/Double_precision/w_fmod.cpp | 0 .../Math/Double_precision/w_pow.cpp | 0 .../Math/Double_precision/w_sqrt.cpp | 0 .../MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp | 0 .../SRC/critical_regions.gamecube.cpp | 0 .../MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp | 0 .../PPC_EABI/SRC/uart_console_io_gcn.cpp | 0 .../MSL/Runtime_PPCEABI_H/CPlusLibPPC.cpp | 0 .../MSL/Runtime_PPCEABI_H/GCN_mem_alloc.cpp | 0 .../Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp | 0 .../MSL/Runtime_PPCEABI_H/NMWException.cpp | 0 .../__init_cpp_exceptions.cpp | 0 .../MSL/Runtime_PPCEABI_H/__va_arg.cpp | 0 .../global_destructor_chain.cpp | 0 .../MSL/Runtime_PPCEABI_H/ptmf.cpp | 0 .../MSL/Runtime_PPCEABI_H/runtime.cpp | 0 .../SComponent/c_API.cpp | 0 .../SComponent/c_API_controller_pad.cpp | 0 .../SComponent/c_API_graphic.cpp | 0 .../SComponent/c_angle.cpp | 0 .../SComponent/c_bg_s_chk.cpp | 0 .../SComponent/c_bg_s_gnd_chk.cpp | 0 .../SComponent/c_bg_s_lin_chk.cpp | 0 .../SComponent/c_bg_s_poly_info.cpp | 0 .../SComponent/c_bg_s_shdw_draw.cpp | 0 .../c_lib.cpp => libs/SComponent/c_bg_w.cpp | 0 .../c_list.cpp => libs/SComponent/c_cc_d.cpp | 0 .../SComponent/c_cc_s.cpp | 0 .../SComponent/c_counter.cpp | 0 .../c_m3d.cpp => libs/SComponent/c_lib.cpp | 0 .../SComponent/c_list.cpp | 0 .../SComponent/c_list_iter.cpp | 0 .../SComponent/c_m2d.cpp | 0 .../SComponent/c_m3d.cpp | 0 .../SComponent/c_m3d_g_aab.cpp | 0 .../SComponent/c_m3d_g_cir.cpp | 0 .../SComponent/c_m3d_g_cps.cpp | 0 .../SComponent/c_m3d_g_cyl.cpp | 0 .../SComponent/c_m3d_g_lin.cpp | 0 .../SComponent/c_m3d_g_pla.cpp | 0 .../SComponent/c_m3d_g_sph.cpp | 0 .../SComponent/c_m3d_g_tri.cpp | 0 .../SComponent/c_malloc.cpp | 0 libs/SComponent/c_math.cpp | 14 + .../SComponent/c_node.cpp | 0 .../SComponent/c_node_iter.cpp | 0 .../c_tag.cpp => libs/SComponent/c_phase.cpp | 0 .../SComponent/c_request.cpp | 0 .../c_tree.cpp => libs/SComponent/c_sxyz.cpp | 0 .../SComponent/c_tag.cpp | 0 .../SComponent/c_tag_iter.cpp | 0 .../s_basic.cpp => libs/SComponent/c_tree.cpp | 0 .../SComponent/c_tree_iter.cpp | 0 .../SComponent/c_xyz.cpp | 0 .../SStandard/s_basic.cpp | 0 .../Z2AudioLib/Z2Audience.cpp | 0 .../Z2AudioLib/Z2AudioArcLoader.cpp | 0 .../Z2AudioLib/Z2AudioMgr.cpp | 0 .../Z2AudioLib/Z2Calc.cpp | 0 .../Z2AudioLib/Z2Creature.cpp | 0 .../Z2AudioLib/Z2EnvSeMgr.cpp | 0 .../Z2AudioLib/Z2FxLineMgr.cpp | 0 .../Z2AudioLib/Z2LinkMgr.cpp | 0 .../Z2AudioLib/Z2Param.cpp | 0 .../Z2AudioLib/Z2SceneMgr.cpp | 0 .../Z2AudioLib/Z2SeMgr.cpp | 0 .../Z2AudioLib/Z2SeqMgr.cpp | 0 .../Z2AudioLib/Z2SoundHandles.cpp | 0 .../Z2AudioLib/Z2SoundInfo.cpp | 0 .../Z2AudioLib/Z2SoundMgr.cpp | 0 .../Z2AudioLib/Z2SoundObjMgr.cpp | 0 .../Z2AudioLib/Z2SoundObject.cpp | 0 .../Z2AudioLib/Z2SoundStarter.cpp | 0 .../Z2AudioLib/Z2SpeechMgr2.cpp | 0 .../Z2AudioLib/Z2StatusMgr.cpp | 0 .../Z2AudioLib/Z2WolfHowlMgr.cpp | 0 .../debugger}/MetroTRK/Export/mslsupp.cpp | 0 .../MetroTRK/Os/dolphin/UDP_Stubs.cpp | 0 .../MetroTRK/Os/dolphin/dolphin_trk.cpp | 0 .../MetroTRK/Os/dolphin/dolphin_trk_glue.cpp | 0 .../MetroTRK/Os/dolphin/targcont.cpp | 0 .../MetroTRK/Os/dolphin/target_options.cpp | 0 .../debugger}/MetroTRK/Os/dolphin/usr_put.cpp | 0 .../debugger}/MetroTRK/Portable/dispatch.cpp | 0 .../debugger}/MetroTRK/Portable/main_TRK.cpp | 0 .../debugger}/MetroTRK/Portable/mainloop.cpp | 0 .../debugger}/MetroTRK/Portable/mem_TRK.cpp | 0 .../debugger}/MetroTRK/Portable/msg.cpp | 0 .../debugger}/MetroTRK/Portable/msgbuf.cpp | 0 .../debugger}/MetroTRK/Portable/msghndlr.cpp | 0 .../debugger}/MetroTRK/Portable/mutex_TRK.cpp | 0 .../debugger}/MetroTRK/Portable/notify.cpp | 0 .../debugger}/MetroTRK/Portable/nubevent.cpp | 0 .../debugger}/MetroTRK/Portable/nubinit.cpp | 0 .../debugger}/MetroTRK/Portable/serpoll.cpp | 0 .../debugger}/MetroTRK/Portable/support.cpp | 0 .../Processor/ppc/Export/targsupp.cpp | 0 .../Processor/ppc/Generic/flush_cache.cpp | 0 .../Processor/ppc/Generic/mpc_7xx_603e.cpp | 0 .../Processor/ppc/Generic/targimpl.cpp | 0 .../cc/exi2/GCN/EXI2_DDH_GCN/main.cpp | 0 .../cc/exi2/GCN/EXI2_GDEV_GCN/main.cpp | 0 .../MetroTRK}/utils/common/CircleBuffer.cpp | 0 .../MetroTRK}/utils/common/MWTrace.cpp | 0 .../utils/gc/MWCriticalSection_gc.cpp | 0 .../dolphin/OdemuExi2/DebuggerDriver.cpp | 0 .../PPCArch.cpp => libs/dolphin/ai/ai.cpp | 0 .../dolphin/amcstubs/AmcExi2Stubs.cpp | 0 .../CARDBlock.cpp => libs/dolphin/ar/ar.cpp | 0 .../CARDCheck.cpp => libs/dolphin/ar/arq.cpp | 0 .../dolphin/base/PPCArch.cpp | 0 .../dolphin/card/CARDBios.cpp | 0 .../dolphin/card/CARDBlock.cpp | 0 .../dolphin/card/CARDCheck.cpp | 0 .../dolphin/card/CARDCreate.cpp | 0 .../dolphin/card/CARDDir.cpp | 0 .../dolphin/card/CARDFormat.cpp | 0 .../dolphin/card/CARDMount.cpp | 0 .../dolphin/card/CARDNet.cpp | 0 .../dolphin/card/CARDOpen.cpp | 0 .../dolphin/card/CARDRdwr.cpp | 0 .../db.cpp => libs/dolphin/card/CARDRead.cpp | 0 .../dsp.cpp => libs/dolphin/card/CARDStat.cpp | 0 .../dolphin/card/CARDUnlock.cpp | 0 .../dolphin/card/CARDWrite.cpp | 0 src/dvd/dvd.cpp => libs/dolphin/db/db.cpp | 0 .../dvdFatal.cpp => libs/dolphin/dsp/dsp.cpp | 0 .../dolphin/dsp/dsp_debug.cpp | 0 .../dolphin/dsp/dsp_task.cpp | 0 .../dolphin/dvd/dvd.cpp | 0 .../dolphin/dvd/dvdFatal.cpp | 0 .../dolphin/dvd/dvderror.cpp | 0 .../fstload.cpp => libs/dolphin/dvd/dvdfs.cpp | 0 .../dolphin/dvd/dvdidutils.cpp | 0 .../dolphin/dvd/dvdlow.cpp | 0 .../dolphin/dvd/dvdqueue.cpp | 0 .../dolphin/dvd/fstload.cpp | 0 .../dolphin/exi/EXIBios.cpp | 0 .../dolphin/exi/EXIUart.cpp | 0 .../GFLight.cpp => libs/dolphin/gd/GDBase.cpp | 0 .../dolphin/gd/GDGeometry.cpp | 0 .../dolphin/gf/GFGeometry.cpp | 0 .../GXAttr.cpp => libs/dolphin/gf/GFLight.cpp | 0 .../GXBump.cpp => libs/dolphin/gf/GFPixel.cpp | 0 .../dolphin/gf/GFTev.cpp | 0 .../GXFifo.cpp => libs/dolphin/gx/GXAttr.cpp | 0 .../dolphin/gx/GXBump.cpp | 0 .../dolphin/gx/GXDisplayList.cpp | 0 .../GXInit.cpp => libs/dolphin/gx/GXFifo.cpp | 0 .../dolphin/gx/GXFrameBuf.cpp | 0 .../dolphin/gx/GXGeometry.cpp | 0 .../GXPerf.cpp => libs/dolphin/gx/GXInit.cpp | 0 .../dolphin/gx/GXLight.cpp | 0 .../GXTev.cpp => libs/dolphin/gx/GXMisc.cpp | 0 .../dolphin/gx/GXPerf.cpp | 0 .../dolphin/gx/GXPixel.cpp | 0 src/mtx/mtx.cpp => libs/dolphin/gx/GXTev.cpp | 0 .../dolphin/gx/GXTexture.cpp | 0 .../dolphin/gx/GXTransform.cpp | 0 src/mtx/quat.cpp => libs/dolphin/mtx/mtx.cpp | 0 src/mtx/vec.cpp => libs/dolphin/mtx/mtx44.cpp | 0 .../dolphin/mtx/mtxvec.cpp | 0 .../dolphin/mtx/quat.cpp | 0 .../dolphin/mtx/vec.cpp | 0 .../dolphin}/odenotstub/odenotstub.cpp | 0 {src => libs/dolphin}/os/OS.cpp | 0 {src => libs/dolphin}/os/OSAlarm.cpp | 0 {src => libs/dolphin}/os/OSAlloc.cpp | 0 {src => libs/dolphin}/os/OSArena.cpp | 0 {src => libs/dolphin}/os/OSAudioSystem.cpp | 0 {src => libs/dolphin}/os/OSCache.cpp | 0 {src => libs/dolphin}/os/OSContext.cpp | 0 {src => libs/dolphin}/os/OSError.cpp | 0 {src => libs/dolphin}/os/OSExec.cpp | 0 {src => libs/dolphin}/os/OSFont.cpp | 0 {src => libs/dolphin}/os/OSInterrupt.cpp | 0 {src => libs/dolphin}/os/OSLink.cpp | 0 {src => libs/dolphin}/os/OSMemory.cpp | 0 {src => libs/dolphin}/os/OSMessage.cpp | 0 {src => libs/dolphin}/os/OSMutex.cpp | 0 {src => libs/dolphin}/os/OSReboot.cpp | 0 {src => libs/dolphin}/os/OSReset.cpp | 0 {src => libs/dolphin}/os/OSResetSW.cpp | 0 {src => libs/dolphin}/os/OSRtc.cpp | 0 {src => libs/dolphin}/os/OSSync.cpp | 0 {src => libs/dolphin}/os/OSThread.cpp | 0 {src => libs/dolphin}/os/OSTime.cpp | 0 {src => libs/dolphin}/os/__ppc_eabi_init.cpp | 0 {src => libs/dolphin}/pad/Pad.cpp | 0 {src => libs/dolphin}/pad/Padclamp.cpp | 0 {src => libs/dolphin}/si/SIBios.cpp | 0 {src => libs/dolphin}/si/SISamplingRate.cpp | 0 {src => libs/dolphin}/vi/vi.cpp | 0 obj_files.mk | 3 +- src/d/d_save/d_save.cpp | 103 ++- src/d/d_save/d_save_HIO.cpp | 1 + .../dynamic/DynamicLink.cpp} | 0 src/stb/stb-data.cpp | 1 - src/stb/stb.cpp | 1 - 724 files changed, 2348 insertions(+), 2235 deletions(-) create mode 100644 .github/workflows/c-cpp.yml create mode 100644 include/d_save.h rename {src => libs}/JSystem/J2DGraph/J2DAnimation.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DAnmLoader.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DGrafContext.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DManage.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DMatBlock.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DMaterial.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DMaterialFactory.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DOrthoGraph.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DPane.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DPicture.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DPictureEx.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DPrint.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DScreen.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DTevs.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DTextBox.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DTextBoxEx.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DWindow.cpp (100%) rename {src => libs}/JSystem/J2DGraph/J2DWindowEx.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DAnimation.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DCluster.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DJoint.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DJointTree.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DModel.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DModelData.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DShapeTable.cpp (100%) rename {src => libs}/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DDrawBuffer.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DGD.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DMatBlock.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DMaterial.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DPacket.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DShape.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DShapeDraw.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DShapeMtx.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DStruct.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DSys.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DTevs.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DTexture.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DTransform.cpp (100%) rename {src => libs}/JSystem/J3DGraphBase/J3DVertex.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DAnmLoader.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DClusterLoader.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DJointFactory.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DModelLoader.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp (100%) rename {src => libs}/JSystem/J3DGraphLoader/J3DShapeFactory.cpp (100%) rename {src => libs}/JSystem/J3DU/J3DUClipper.cpp (100%) rename {src => libs}/JSystem/J3DU/J3DUDL.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAIAudible.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAIAudience.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISe.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISeMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISeq.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISeqDataMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISeqMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISound.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISoundChild.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISoundHandles.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISoundInfo.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISoundParams.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAISoundStarter.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAIStream.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAIStreamDataMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAIStreamMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASAiCtrl.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASAramStream.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASAudioReseter.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASAudioThread.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASBNKParser.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASBank.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASBasicBank.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASBasicInst.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASBasicWaveBank.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASCalc.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASCallback.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASChannel.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASCmdStack.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASDSPChannel.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASDSPInterface.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASDriverIF.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASDrumSet.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASDvdThread.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASHeapCtrl.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASLfo.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASOscillator.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASProbe.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASRegisterParam.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASReport.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASResArcLoader.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASSeqCtrl.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASSeqParser.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASSeqReader.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASSimpleWaveBank.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASSoundParams.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASTaskThread.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASTrack.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASTrackPort.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASVoiceBank.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASWSParser.cpp (100%) rename {src => libs}/JSystem/JAudio2/JASWaveArcLoader.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUAudioArcInterpreter.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUAudioArcLoader.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUAudioMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUBankTable.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUClusterSound.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUInitializer.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUSectionHeap.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUSeqCollection.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUSoundAnimator.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUSoundTable.cpp (100%) rename {src => libs}/JSystem/JAudio2/JAUStreamFileTable.cpp (100%) rename {src => libs}/JSystem/JAudio2/dspproc.cpp (100%) rename {src => libs}/JSystem/JAudio2/dsptask.cpp (100%) rename {src => libs}/JSystem/JAudio2/osdsp.cpp (100%) rename {src => libs}/JSystem/JAudio2/osdsp_task.cpp (100%) rename {src => libs}/JSystem/JFramework/JFWDisplay.cpp (100%) rename {src => libs}/JSystem/JFramework/JFWSystem.cpp (100%) rename {src => libs}/JSystem/JGadget/binary.cpp (100%) rename {src => libs}/JSystem/JGadget/linklist.cpp (100%) rename {src => libs}/JSystem/JGadget/std-vector.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAram.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAramArchive.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAramBlock.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAramHeap.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAramPiece.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAramStream.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRArchivePri.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRArchivePub.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRAssertHeap.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRCompArchive.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRDecomp.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRDisposer.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRDvdAramRipper.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRDvdArchive.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRDvdFile.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRDvdRipper.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRExpHeap.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRFile.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRFileCache.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRFileFinder.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRFileLoader.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRHeap.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRMemArchive.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRSolidHeap.cpp (100%) rename {src => libs}/JSystem/JKernel/JKRThread.cpp (100%) rename {src => libs}/JSystem/JMath/JMATrigonometric.cpp (100%) rename {src => libs}/JSystem/JMath/JMath.cpp (100%) rename {src => libs}/JSystem/JMath/random.cpp (100%) rename {src => libs}/JSystem/JMessage/control.cpp (100%) rename {src => libs}/JSystem/JMessage/data.cpp (100%) rename {src => libs}/JSystem/JMessage/locale.cpp (100%) rename {src => libs}/JSystem/JMessage/processor.cpp (100%) rename {src => libs}/JSystem/JMessage/resource.cpp (100%) rename {src => libs}/JSystem/JParticle/JPABaseShape.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAChildShape.cpp (100%) rename {src => libs}/JSystem/JParticle/JPADynamicsBlock.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAEmitter.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAEmitterManager.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAExTexShape.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAExtraShape.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAFieldBlock.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAKeyBlock.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAMath.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAParticle.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAResource.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAResourceLoader.cpp (100%) rename {src => libs}/JSystem/JParticle/JPAResourceManager.cpp (100%) rename {src => libs}/JSystem/JParticle/JPATexture.cpp (100%) rename {src => libs}/JSystem/JStage/JSGActor.cpp (100%) rename {src => libs}/JSystem/JStage/JSGAmbientLight.cpp (100%) rename {src => libs}/JSystem/JStage/JSGCamera.cpp (100%) rename {src => libs}/JSystem/JStage/JSGFog.cpp (100%) rename {src => libs}/JSystem/JStage/JSGLight.cpp (100%) rename {src => libs}/JSystem/JStage/JSGObject.cpp (100%) rename {src => libs}/JSystem/JStage/JSGSystem.cpp (100%) rename {src => libs}/JSystem/JStudio/ctb-data.cpp (100%) rename {src => libs}/JSystem/JStudio/ctb.cpp (100%) rename {src => libs}/JSystem/JStudio/functionvalue.cpp (100%) rename {src => libs}/JSystem/JStudio/fvb-data-parse.cpp (100%) rename {src => libs}/JSystem/JStudio/fvb-data.cpp (100%) rename {src => libs}/JSystem/JStudio/fvb.cpp (100%) rename {src => libs}/JSystem/JStudio/jstudio-control.cpp (100%) rename {src => libs}/JSystem/JStudio/jstudio-data.cpp (100%) rename {src => libs}/JSystem/JStudio/jstudio-math.cpp (100%) rename {src => libs}/JSystem/JStudio/jstudio-object.cpp (100%) rename {src => libs}/JSystem/JStudio/object-id.cpp (100%) rename {src/JSystem/JStudio_JParticle => libs/JSystem/JStudio}/object-particle.cpp (100%) rename {src/JSystem/JStudio_JAudio2 => libs/JSystem/JStudio}/object-sound.cpp (100%) rename src/JSystem/JStudio_JAudio2/control.cpp => libs/JSystem/JStudio/stb-data-parse.cpp (100%) rename src/JSystem/JStudio_JParticle/control.cpp => libs/JSystem/JStudio/stb-data.cpp (100%) rename src/JSystem/JStudio_JStage/control.cpp => libs/JSystem/JStudio/stb.cpp (100%) rename src/JSystem/JStudio_JStage/object-actor.cpp => libs/JSystem/JStudio_JAudio2/control.cpp (100%) rename src/JSystem/JStudio_JStage/object-ambientlight.cpp => libs/JSystem/JStudio_JAudio2/object-sound.cpp (100%) rename src/JSystem/JStudio_JStage/object-camera.cpp => libs/JSystem/JStudio_JParticle/control.cpp (100%) rename src/JSystem/JStudio_JStage/object-fog.cpp => libs/JSystem/JStudio_JParticle/object-particle.cpp (100%) rename src/JSystem/JStudio_JStage/object-light.cpp => libs/JSystem/JStudio_JStage/control.cpp (100%) rename src/JSystem/JStudio_JStage/object.cpp => libs/JSystem/JStudio_JStage/object-actor.cpp (100%) rename src/JSystem/JSupport/JSUFileStream.cpp => libs/JSystem/JStudio_JStage/object-ambientlight.cpp (100%) rename src/JSystem/JSupport/JSUInputStream.cpp => libs/JSystem/JStudio_JStage/object-camera.cpp (100%) rename src/JSystem/JSupport/JSUList.cpp => libs/JSystem/JStudio_JStage/object-fog.cpp (100%) rename src/JSystem/JSupport/JSUMemoryStream.cpp => libs/JSystem/JStudio_JStage/object-light.cpp (100%) rename src/JSystem/JUtility/JUTAssert.cpp => libs/JSystem/JStudio_JStage/object.cpp (100%) rename src/JSystem/JUtility/JUTCacheFont.cpp => libs/JSystem/JSupport/JSUFileStream.cpp (100%) rename src/JSystem/JUtility/JUTConsole.cpp => libs/JSystem/JSupport/JSUInputStream.cpp (100%) rename src/JSystem/JUtility/JUTDbPrint.cpp => libs/JSystem/JSupport/JSUList.cpp (100%) rename src/JSystem/JUtility/JUTDirectFile.cpp => libs/JSystem/JSupport/JSUMemoryStream.cpp (100%) rename src/JSystem/JUtility/JUTDirectPrint.cpp => libs/JSystem/JUtility/JUTAssert.cpp (100%) rename src/JSystem/JUtility/JUTException.cpp => libs/JSystem/JUtility/JUTCacheFont.cpp (100%) rename src/JSystem/JUtility/JUTFader.cpp => libs/JSystem/JUtility/JUTConsole.cpp (100%) rename src/JSystem/JUtility/JUTFont.cpp => libs/JSystem/JUtility/JUTDbPrint.cpp (100%) rename src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp => libs/JSystem/JUtility/JUTDirectFile.cpp (100%) rename src/JSystem/JUtility/JUTGamePad.cpp => libs/JSystem/JUtility/JUTDirectPrint.cpp (100%) rename src/JSystem/JUtility/JUTGraphFifo.cpp => libs/JSystem/JUtility/JUTException.cpp (100%) rename src/JSystem/JUtility/JUTNameTab.cpp => libs/JSystem/JUtility/JUTFader.cpp (100%) rename src/JSystem/JUtility/JUTPalette.cpp => libs/JSystem/JUtility/JUTFont.cpp (100%) rename src/JSystem/JUtility/JUTProcBar.cpp => libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp (100%) rename src/JSystem/JUtility/JUTResFont.cpp => libs/JSystem/JUtility/JUTGamePad.cpp (100%) rename src/JSystem/JUtility/JUTResource.cpp => libs/JSystem/JUtility/JUTGraphFifo.cpp (100%) rename src/JSystem/JUtility/JUTTexture.cpp => libs/JSystem/JUtility/JUTNameTab.cpp (100%) rename src/JSystem/JUtility/JUTVideo.cpp => libs/JSystem/JUtility/JUTPalette.cpp (100%) rename src/JSystem/JUtility/JUTXfb.cpp => libs/JSystem/JUtility/JUTProcBar.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp => libs/JSystem/JUtility/JUTResFont.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/abort_exit.cpp => libs/JSystem/JUtility/JUTResource.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/alloc.cpp => libs/JSystem/JUtility/JUTTexture.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/ansi_files.cpp => libs/JSystem/JUtility/JUTVideo.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/arith.cpp => libs/JSystem/JUtility/JUTXfb.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/buffer_io.cpp => libs/MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/char_io.cpp => libs/MSL/MSL_C/MSL_Common/Src/abort_exit.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/ctype.cpp => libs/MSL/MSL_C/MSL_Common/Src/alloc.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/direct_io.cpp => libs/MSL/MSL_C/MSL_Common/Src/ansi_files.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/errno.cpp => libs/MSL/MSL_C/MSL_Common/Src/arith.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/extras.cpp => libs/MSL/MSL_C/MSL_Common/Src/buffer_io.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/file_io.cpp => libs/MSL/MSL_C/MSL_Common/Src/char_io.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/float.cpp => libs/MSL/MSL_C/MSL_Common/Src/ctype.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/mbstring.cpp => libs/MSL/MSL_C/MSL_Common/Src/direct_io.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/mem.cpp => libs/MSL/MSL_C/MSL_Common/Src/errno.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp => libs/MSL/MSL_C/MSL_Common/Src/extras.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/misc_io.cpp => libs/MSL/MSL_C/MSL_Common/Src/file_io.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/printf.cpp => libs/MSL/MSL_C/MSL_Common/Src/float.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/scanf.cpp => libs/MSL/MSL_C/MSL_Common/Src/mbstring.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/signal.cpp => libs/MSL/MSL_C/MSL_Common/Src/mem.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/string.cpp => libs/MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/strtoul.cpp => libs/MSL/MSL_C/MSL_Common/Src/misc_io.cpp (100%) rename src/MSL/MSL_C/MSL_Common/Src/wchar_io.cpp => libs/MSL/MSL_C/MSL_Common/Src/printf.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.cpp => libs/MSL/MSL_C/MSL_Common/Src/scanf.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.cpp => libs/MSL/MSL_C/MSL_Common/Src/signal.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.cpp => libs/MSL/MSL_C/MSL_Common/Src/string.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.cpp => libs/MSL/MSL_C/MSL_Common/Src/strtoul.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.cpp => libs/MSL/MSL_C/MSL_Common/Src/wchar_io.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.cpp (100%) rename src/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.cpp (100%) rename src/MSL/MSL_C/PPC_EABI/SRC/critical_regions.gamecube.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.cpp (100%) rename src/MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.cpp (100%) rename src/MSL/MSL_C/PPC_EABI/SRC/uart_console_io_gcn.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.cpp (100%) rename src/OdemuExi2/DebuggerDriver.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.cpp (100%) rename src/Runtime_PPCEABI_H/CPlusLibPPC.cpp => libs/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp (100%) rename src/Runtime_PPCEABI_H/GCN_mem_alloc.cpp => libs/MSL/MSL_C/PPC_EABI/SRC/critical_regions.gamecube.cpp (100%) rename src/Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp => libs/MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp (100%) rename src/Runtime_PPCEABI_H/NMWException.cpp => libs/MSL/MSL_C/PPC_EABI/SRC/uart_console_io_gcn.cpp (100%) rename src/Runtime_PPCEABI_H/__init_cpp_exceptions.cpp => libs/MSL/Runtime_PPCEABI_H/CPlusLibPPC.cpp (100%) rename src/Runtime_PPCEABI_H/__va_arg.cpp => libs/MSL/Runtime_PPCEABI_H/GCN_mem_alloc.cpp (100%) rename src/Runtime_PPCEABI_H/global_destructor_chain.cpp => libs/MSL/Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp (100%) rename src/Runtime_PPCEABI_H/ptmf.cpp => libs/MSL/Runtime_PPCEABI_H/NMWException.cpp (100%) rename src/Runtime_PPCEABI_H/runtime.cpp => libs/MSL/Runtime_PPCEABI_H/__init_cpp_exceptions.cpp (100%) rename src/SComponent/c_API.cpp => libs/MSL/Runtime_PPCEABI_H/__va_arg.cpp (100%) rename src/SComponent/c_API_controller_pad.cpp => libs/MSL/Runtime_PPCEABI_H/global_destructor_chain.cpp (100%) rename src/SComponent/c_API_graphic.cpp => libs/MSL/Runtime_PPCEABI_H/ptmf.cpp (100%) rename src/SComponent/c_angle.cpp => libs/MSL/Runtime_PPCEABI_H/runtime.cpp (100%) rename src/SComponent/c_bg_s_chk.cpp => libs/SComponent/c_API.cpp (100%) rename src/SComponent/c_bg_s_gnd_chk.cpp => libs/SComponent/c_API_controller_pad.cpp (100%) rename src/SComponent/c_bg_s_lin_chk.cpp => libs/SComponent/c_API_graphic.cpp (100%) rename src/SComponent/c_bg_s_poly_info.cpp => libs/SComponent/c_angle.cpp (100%) rename src/SComponent/c_bg_s_shdw_draw.cpp => libs/SComponent/c_bg_s_chk.cpp (100%) rename src/SComponent/c_bg_w.cpp => libs/SComponent/c_bg_s_gnd_chk.cpp (100%) rename src/SComponent/c_cc_d.cpp => libs/SComponent/c_bg_s_lin_chk.cpp (100%) rename src/SComponent/c_cc_s.cpp => libs/SComponent/c_bg_s_poly_info.cpp (100%) rename src/SComponent/c_counter.cpp => libs/SComponent/c_bg_s_shdw_draw.cpp (100%) rename src/SComponent/c_lib.cpp => libs/SComponent/c_bg_w.cpp (100%) rename src/SComponent/c_list.cpp => libs/SComponent/c_cc_d.cpp (100%) rename src/SComponent/c_list_iter.cpp => libs/SComponent/c_cc_s.cpp (100%) rename src/SComponent/c_m2d.cpp => libs/SComponent/c_counter.cpp (100%) rename src/SComponent/c_m3d.cpp => libs/SComponent/c_lib.cpp (100%) rename src/SComponent/c_m3d_g_aab.cpp => libs/SComponent/c_list.cpp (100%) rename src/SComponent/c_m3d_g_cir.cpp => libs/SComponent/c_list_iter.cpp (100%) rename src/SComponent/c_m3d_g_cps.cpp => libs/SComponent/c_m2d.cpp (100%) rename src/SComponent/c_m3d_g_cyl.cpp => libs/SComponent/c_m3d.cpp (100%) rename src/SComponent/c_m3d_g_lin.cpp => libs/SComponent/c_m3d_g_aab.cpp (100%) rename src/SComponent/c_m3d_g_pla.cpp => libs/SComponent/c_m3d_g_cir.cpp (100%) rename src/SComponent/c_m3d_g_sph.cpp => libs/SComponent/c_m3d_g_cps.cpp (100%) rename src/SComponent/c_m3d_g_tri.cpp => libs/SComponent/c_m3d_g_cyl.cpp (100%) rename src/SComponent/c_malloc.cpp => libs/SComponent/c_m3d_g_lin.cpp (100%) rename src/SComponent/c_math.cpp => libs/SComponent/c_m3d_g_pla.cpp (100%) rename src/SComponent/c_node.cpp => libs/SComponent/c_m3d_g_sph.cpp (100%) rename src/SComponent/c_node_iter.cpp => libs/SComponent/c_m3d_g_tri.cpp (100%) rename src/SComponent/c_phase.cpp => libs/SComponent/c_malloc.cpp (100%) create mode 100644 libs/SComponent/c_math.cpp rename src/SComponent/c_request.cpp => libs/SComponent/c_node.cpp (100%) rename src/SComponent/c_sxyz.cpp => libs/SComponent/c_node_iter.cpp (100%) rename src/SComponent/c_tag.cpp => libs/SComponent/c_phase.cpp (100%) rename src/SComponent/c_tag_iter.cpp => libs/SComponent/c_request.cpp (100%) rename src/SComponent/c_tree.cpp => libs/SComponent/c_sxyz.cpp (100%) rename src/SComponent/c_tree_iter.cpp => libs/SComponent/c_tag.cpp (100%) rename src/SComponent/c_xyz.cpp => libs/SComponent/c_tag_iter.cpp (100%) rename src/SStandard/s_basic.cpp => libs/SComponent/c_tree.cpp (100%) rename src/Z2AudioLib/Z2Audience.cpp => libs/SComponent/c_tree_iter.cpp (100%) rename src/Z2AudioLib/Z2AudioArcLoader.cpp => libs/SComponent/c_xyz.cpp (100%) rename src/Z2AudioLib/Z2AudioMgr.cpp => libs/SStandard/s_basic.cpp (100%) rename src/Z2AudioLib/Z2Calc.cpp => libs/Z2AudioLib/Z2Audience.cpp (100%) rename src/Z2AudioLib/Z2Creature.cpp => libs/Z2AudioLib/Z2AudioArcLoader.cpp (100%) rename src/Z2AudioLib/Z2EnvSeMgr.cpp => libs/Z2AudioLib/Z2AudioMgr.cpp (100%) rename src/Z2AudioLib/Z2FxLineMgr.cpp => libs/Z2AudioLib/Z2Calc.cpp (100%) rename src/Z2AudioLib/Z2LinkMgr.cpp => libs/Z2AudioLib/Z2Creature.cpp (100%) rename src/Z2AudioLib/Z2Param.cpp => libs/Z2AudioLib/Z2EnvSeMgr.cpp (100%) rename src/Z2AudioLib/Z2SceneMgr.cpp => libs/Z2AudioLib/Z2FxLineMgr.cpp (100%) rename src/Z2AudioLib/Z2SeMgr.cpp => libs/Z2AudioLib/Z2LinkMgr.cpp (100%) rename src/Z2AudioLib/Z2SeqMgr.cpp => libs/Z2AudioLib/Z2Param.cpp (100%) rename src/Z2AudioLib/Z2SoundHandles.cpp => libs/Z2AudioLib/Z2SceneMgr.cpp (100%) rename src/Z2AudioLib/Z2SoundInfo.cpp => libs/Z2AudioLib/Z2SeMgr.cpp (100%) rename src/Z2AudioLib/Z2SoundMgr.cpp => libs/Z2AudioLib/Z2SeqMgr.cpp (100%) rename src/Z2AudioLib/Z2SoundObjMgr.cpp => libs/Z2AudioLib/Z2SoundHandles.cpp (100%) rename src/Z2AudioLib/Z2SoundObject.cpp => libs/Z2AudioLib/Z2SoundInfo.cpp (100%) rename src/Z2AudioLib/Z2SoundStarter.cpp => libs/Z2AudioLib/Z2SoundMgr.cpp (100%) rename src/Z2AudioLib/Z2SpeechMgr2.cpp => libs/Z2AudioLib/Z2SoundObjMgr.cpp (100%) rename src/Z2AudioLib/Z2StatusMgr.cpp => libs/Z2AudioLib/Z2SoundObject.cpp (100%) rename src/Z2AudioLib/Z2WolfHowlMgr.cpp => libs/Z2AudioLib/Z2SoundStarter.cpp (100%) rename src/ai/ai.cpp => libs/Z2AudioLib/Z2SpeechMgr2.cpp (100%) rename src/amcstubs/AmcExi2Stubs.cpp => libs/Z2AudioLib/Z2StatusMgr.cpp (100%) rename src/ar/ar.cpp => libs/Z2AudioLib/Z2WolfHowlMgr.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Export/mslsupp.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Os/dolphin/UDP_Stubs.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Os/dolphin/dolphin_trk.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Os/dolphin/dolphin_trk_glue.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Os/dolphin/targcont.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Os/dolphin/target_options.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Os/dolphin/usr_put.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/dispatch.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/main_TRK.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/mainloop.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/mem_TRK.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/msg.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/msgbuf.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/msghndlr.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/mutex_TRK.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/notify.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/nubevent.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/nubinit.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/serpoll.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Portable/support.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Processor/ppc/Export/targsupp.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Processor/ppc/Generic/flush_cache.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.cpp (100%) rename {src/runtime_libs/debugger/embedded => libs/debugger}/MetroTRK/Processor/ppc/Generic/targimpl.cpp (100%) rename {src/runtime_libs/gamedev/cust_connection => libs/debugger/MetroTRK}/cc/exi2/GCN/EXI2_DDH_GCN/main.cpp (100%) rename {src/runtime_libs/gamedev/cust_connection => libs/debugger/MetroTRK}/cc/exi2/GCN/EXI2_GDEV_GCN/main.cpp (100%) rename {src/runtime_libs/gamedev/cust_connection => libs/debugger/MetroTRK}/utils/common/CircleBuffer.cpp (100%) rename {src/runtime_libs/gamedev/cust_connection => libs/debugger/MetroTRK}/utils/common/MWTrace.cpp (100%) rename {src/runtime_libs/gamedev/cust_connection => libs/debugger/MetroTRK}/utils/gc/MWCriticalSection_gc.cpp (100%) rename src/ar/arq.cpp => libs/dolphin/OdemuExi2/DebuggerDriver.cpp (100%) rename src/base/PPCArch.cpp => libs/dolphin/ai/ai.cpp (100%) rename src/card/CARDBios.cpp => libs/dolphin/amcstubs/AmcExi2Stubs.cpp (100%) rename src/card/CARDBlock.cpp => libs/dolphin/ar/ar.cpp (100%) rename src/card/CARDCheck.cpp => libs/dolphin/ar/arq.cpp (100%) rename src/card/CARDCreate.cpp => libs/dolphin/base/PPCArch.cpp (100%) rename src/card/CARDDir.cpp => libs/dolphin/card/CARDBios.cpp (100%) rename src/card/CARDFormat.cpp => libs/dolphin/card/CARDBlock.cpp (100%) rename src/card/CARDMount.cpp => libs/dolphin/card/CARDCheck.cpp (100%) rename src/card/CARDNet.cpp => libs/dolphin/card/CARDCreate.cpp (100%) rename src/card/CARDOpen.cpp => libs/dolphin/card/CARDDir.cpp (100%) rename src/card/CARDRdwr.cpp => libs/dolphin/card/CARDFormat.cpp (100%) rename src/card/CARDRead.cpp => libs/dolphin/card/CARDMount.cpp (100%) rename src/card/CARDStat.cpp => libs/dolphin/card/CARDNet.cpp (100%) rename src/card/CARDUnlock.cpp => libs/dolphin/card/CARDOpen.cpp (100%) rename src/card/CARDWrite.cpp => libs/dolphin/card/CARDRdwr.cpp (100%) rename src/db/db.cpp => libs/dolphin/card/CARDRead.cpp (100%) rename src/dsp/dsp.cpp => libs/dolphin/card/CARDStat.cpp (100%) rename src/dsp/dsp_debug.cpp => libs/dolphin/card/CARDUnlock.cpp (100%) rename src/dsp/dsp_task.cpp => libs/dolphin/card/CARDWrite.cpp (100%) rename src/dvd/dvd.cpp => libs/dolphin/db/db.cpp (100%) rename src/dvd/dvdFatal.cpp => libs/dolphin/dsp/dsp.cpp (100%) rename src/dvd/dvderror.cpp => libs/dolphin/dsp/dsp_debug.cpp (100%) rename src/dvd/dvdfs.cpp => libs/dolphin/dsp/dsp_task.cpp (100%) rename src/dvd/dvdidutils.cpp => libs/dolphin/dvd/dvd.cpp (100%) rename src/dvd/dvdlow.cpp => libs/dolphin/dvd/dvdFatal.cpp (100%) rename src/dvd/dvdqueue.cpp => libs/dolphin/dvd/dvderror.cpp (100%) rename src/dvd/fstload.cpp => libs/dolphin/dvd/dvdfs.cpp (100%) rename src/dynamic/DynamicLink.cpp => libs/dolphin/dvd/dvdidutils.cpp (100%) rename src/exi/EXIBios.cpp => libs/dolphin/dvd/dvdlow.cpp (100%) rename src/exi/EXIUart.cpp => libs/dolphin/dvd/dvdqueue.cpp (100%) rename src/gd/GDBase.cpp => libs/dolphin/dvd/fstload.cpp (100%) rename src/gd/GDGeometry.cpp => libs/dolphin/exi/EXIBios.cpp (100%) rename src/gf/GFGeometry.cpp => libs/dolphin/exi/EXIUart.cpp (100%) rename src/gf/GFLight.cpp => libs/dolphin/gd/GDBase.cpp (100%) rename src/gf/GFPixel.cpp => libs/dolphin/gd/GDGeometry.cpp (100%) rename src/gf/GFTev.cpp => libs/dolphin/gf/GFGeometry.cpp (100%) rename src/gx/GXAttr.cpp => libs/dolphin/gf/GFLight.cpp (100%) rename src/gx/GXBump.cpp => libs/dolphin/gf/GFPixel.cpp (100%) rename src/gx/GXDisplayList.cpp => libs/dolphin/gf/GFTev.cpp (100%) rename src/gx/GXFifo.cpp => libs/dolphin/gx/GXAttr.cpp (100%) rename src/gx/GXFrameBuf.cpp => libs/dolphin/gx/GXBump.cpp (100%) rename src/gx/GXGeometry.cpp => libs/dolphin/gx/GXDisplayList.cpp (100%) rename src/gx/GXInit.cpp => libs/dolphin/gx/GXFifo.cpp (100%) rename src/gx/GXLight.cpp => libs/dolphin/gx/GXFrameBuf.cpp (100%) rename src/gx/GXMisc.cpp => libs/dolphin/gx/GXGeometry.cpp (100%) rename src/gx/GXPerf.cpp => libs/dolphin/gx/GXInit.cpp (100%) rename src/gx/GXPixel.cpp => libs/dolphin/gx/GXLight.cpp (100%) rename src/gx/GXTev.cpp => libs/dolphin/gx/GXMisc.cpp (100%) rename src/gx/GXTexture.cpp => libs/dolphin/gx/GXPerf.cpp (100%) rename src/gx/GXTransform.cpp => libs/dolphin/gx/GXPixel.cpp (100%) rename src/mtx/mtx.cpp => libs/dolphin/gx/GXTev.cpp (100%) rename src/mtx/mtx44.cpp => libs/dolphin/gx/GXTexture.cpp (100%) rename src/mtx/mtxvec.cpp => libs/dolphin/gx/GXTransform.cpp (100%) rename src/mtx/quat.cpp => libs/dolphin/mtx/mtx.cpp (100%) rename src/mtx/vec.cpp => libs/dolphin/mtx/mtx44.cpp (100%) rename src/object/object-id.cpp => libs/dolphin/mtx/mtxvec.cpp (100%) rename src/object/object-particle.cpp => libs/dolphin/mtx/quat.cpp (100%) rename src/object/object-sound.cpp => libs/dolphin/mtx/vec.cpp (100%) rename {src => libs/dolphin}/odenotstub/odenotstub.cpp (100%) rename {src => libs/dolphin}/os/OS.cpp (100%) rename {src => libs/dolphin}/os/OSAlarm.cpp (100%) rename {src => libs/dolphin}/os/OSAlloc.cpp (100%) rename {src => libs/dolphin}/os/OSArena.cpp (100%) rename {src => libs/dolphin}/os/OSAudioSystem.cpp (100%) rename {src => libs/dolphin}/os/OSCache.cpp (100%) rename {src => libs/dolphin}/os/OSContext.cpp (100%) rename {src => libs/dolphin}/os/OSError.cpp (100%) rename {src => libs/dolphin}/os/OSExec.cpp (100%) rename {src => libs/dolphin}/os/OSFont.cpp (100%) rename {src => libs/dolphin}/os/OSInterrupt.cpp (100%) rename {src => libs/dolphin}/os/OSLink.cpp (100%) rename {src => libs/dolphin}/os/OSMemory.cpp (100%) rename {src => libs/dolphin}/os/OSMessage.cpp (100%) rename {src => libs/dolphin}/os/OSMutex.cpp (100%) rename {src => libs/dolphin}/os/OSReboot.cpp (100%) rename {src => libs/dolphin}/os/OSReset.cpp (100%) rename {src => libs/dolphin}/os/OSResetSW.cpp (100%) rename {src => libs/dolphin}/os/OSRtc.cpp (100%) rename {src => libs/dolphin}/os/OSSync.cpp (100%) rename {src => libs/dolphin}/os/OSThread.cpp (100%) rename {src => libs/dolphin}/os/OSTime.cpp (100%) rename {src => libs/dolphin}/os/__ppc_eabi_init.cpp (100%) rename {src => libs/dolphin}/pad/Pad.cpp (100%) rename {src => libs/dolphin}/pad/Padclamp.cpp (100%) rename {src => libs/dolphin}/si/SIBios.cpp (100%) rename {src => libs/dolphin}/si/SISamplingRate.cpp (100%) rename {src => libs/dolphin}/vi/vi.cpp (100%) rename src/{stb/stb-data-parse.cpp => d/dynamic/DynamicLink.cpp} (100%) delete mode 100644 src/stb/stb-data.cpp delete mode 100644 src/stb/stb.cpp diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml new file mode 100644 index 00000000000..c9da2299e26 --- /dev/null +++ b/.github/workflows/c-cpp.yml @@ -0,0 +1,20 @@ +name: OK Check + +on: pull_request + +jobs: + build: + + runs-on: ubuntu-latest + container: + image: ghcr.io/pheenoh/zeldaret-tp:latest + + steps: + - name: Checkout + uses: actions/checkout@v1 + with: + token: ${{secrets.MY_REPO_PAT}} + - name: Copy in dol and compilers + run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && chown root /github/home/ + - name: Run Make (OK) + run: make \ No newline at end of file diff --git a/.gitignore b/.gitignore index 44dd6a2599c..942ca7a549c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,4 @@ build/ *.dump # IDE -.vscode/ - -# ASM -new.asm +.vscode/ \ No newline at end of file diff --git a/Makefile b/Makefile index 1e8d5e929a7..1e5077bb84d 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ TARGET := dolzel2 BUILD_DIR := build/$(TARGET) -SRC_DIRS := src -ASM_DIRS := asm $(wildcard asm/*.s asm/*/*.s asm/*/*/*.s asm/*/*/*/*.s asm/*/*/*/*/*.s asm/*/*/*/*/*/*.s) +SRC_DIRS := $(shell find src/ -type f -name '*.cpp') +ASM_DIRS := $(shell find asm/ -type f -name '*.s') # Inputs LDSCRIPT := $(BUILD_DIR)/ldscript.lcf @@ -32,7 +32,7 @@ O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(TEXT_O_FILES # Tools #------------------------------------------------------------------------------- -MWCC_VERSION := 3.0 +MWCC_VERSION := 2.7 # Programs ifeq ($(WINDOWS),1) @@ -53,11 +53,16 @@ PYTHON := python3 POSTPROC := tools/postprocess.py # Options -INCLUDES := -i include -i include/dolphin/ -i include/dolphin/mtx/ -i src -i src/msl -i src/msl/ppc_eabi -i src/runtime/ -i src/sysdolphin/ +INCLUDES := -i include -i include/dolphin/ -i src +# Assembler flags ASFLAGS := -mgekko -I include + +# Linker flags LDFLAGS := -map $(MAP) -fp hard -nodefaults -w off -CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O3,s -nodefaults -msgstyle gcc $(INCLUDES) + +# Compiler flags +CFLAGS := -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc $(INCLUDES) # for postprocess.py PROCFLAGS := -fprologue-fixup=old_stack @@ -105,7 +110,7 @@ $(ELF): $(O_FILES) $(LDSCRIPT) $(BUILD_DIR)/%.o: %.s $(AS) $(ASFLAGS) -o $@ $< -$(BUILD_DIR)/%.o: %.c +$(BUILD_DIR)/%.o: %.cpp $(CC) $(CFLAGS) -c -o $@ $< # TODO: See if this is necessary after actually adding some C code # $(PYTHON) $(POSTPROC) $(PROCFLAGS) $@ diff --git a/README.md b/README.md index 37473634203..8cf4ff0d499 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,11 @@ And will eventually build all the [RELs](./rels_sha1.md). ## Build Instructions 1. Obtain a clean DOL of TP (GCN USA) and place it at the root of the repo and name it `baserom.dol`. -2. Obtain a copy of the MWCC PowerPC (from GC CW 3.0) and place it in tools/mwcc_compiler/3.0/ folder in tools/. (NOTE: This compiler's executables [mwcceppc.exe mwasmeppc.exe and mwldeppc.exe] can be installed with Codewarrior 3.0 for Gamecube, but no license or crack is provided with this project. If you can't find it on your own just DM me Pheenoh#0001). -4. Run `make` at the root of the repo +2. Obtain a copy of the MWCC PowerPC compiler (version 2.7 to be exact). See below for a link to our Discord server which has the CodeWarrior compilers pinned in the #tp-decomp channel. +3. Run `make` at the root of the repo. ## Contributions -Contributions and PRs are welcome. +All contributions are welcome. This is a group effort, and even small contributions can make a difference. Some tasks also don't require much knowledge to get started. + +Most discussions happen on our [Discord Server](https://discord.zelda64.dev/), where you are welcome to ask if you need help getting started, or if you have any questions regarding this project and other decompilation projects. \ No newline at end of file diff --git a/asm/DynamicLink.s b/asm/DynamicLink.s index 108aae267bf..c1070baa450 100644 --- a/asm/DynamicLink.s +++ b/asm/DynamicLink.s @@ -1058,7 +1058,7 @@ lbl_80263058: /* 80263094 0025FFD4 7C 08 02 A6 */ mflr r0 /* 80263098 0025FFD8 90 01 00 24 */ stw r0, 0x24(r1) /* 8026309C 0025FFDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802630A0 0025FFE0 48 0F F1 3D */ bl func_803621DC +/* 802630A0 0025FFE0 48 0F F1 3D */ bl _savegpr_29 /* 802630A4 0025FFE4 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha /* 802630A8 0025FFE8 38 63 A4 A0 */ addi r3, r3, lbl_8039A4A0@l /* 802630AC 0025FFEC 38 63 02 D0 */ addi r3, r3, 0x2d0 @@ -1099,7 +1099,7 @@ lbl_80263120: /* 8026312C 0026006C 4C C6 31 82 */ crclr 6 /* 80263130 00260070 4B DA 3A DD */ bl OSReport_Error /* 80263134 00260074 39 61 00 20 */ addi r11, r1, 0x20 -/* 80263138 00260078 48 0F F0 F1 */ bl func_80362228 +/* 80263138 00260078 48 0F F0 F1 */ bl _restgpr_29 /* 8026313C 0026007C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80263140 00260080 7C 08 03 A6 */ mtlr r0 /* 80263144 00260084 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DAnimation.s b/asm/J2DGraph/J2DAnimation.s index 954ac5d75c4..4c5ad762ff0 100644 --- a/asm/J2DGraph/J2DAnimation.s +++ b/asm/J2DGraph/J2DAnimation.s @@ -683,7 +683,7 @@ lbl_8030AF04: /* 8030AF28 00307E68 7C 08 02 A6 */ mflr r0 /* 8030AF2C 00307E6C 90 01 00 24 */ stw r0, 0x24(r1) /* 8030AF30 00307E70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030AF34 00307E74 48 05 72 A9 */ bl func_803621DC +/* 8030AF34 00307E74 48 05 72 A9 */ bl _savegpr_29 /* 8030AF38 00307E78 7C 7D 1B 78 */ mr r29, r3 /* 8030AF3C 00307E7C 7C 9E 23 79 */ or. r30, r4, r4 /* 8030AF40 00307E80 41 82 00 70 */ beq lbl_8030AFB0 @@ -720,7 +720,7 @@ lbl_8030AFA0: /* 8030AFAC 00307EEC 41 80 FF AC */ blt lbl_8030AF58 lbl_8030AFB0: /* 8030AFB0 00307EF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030AFB4 00307EF4 48 05 72 75 */ bl func_80362228 +/* 8030AFB4 00307EF4 48 05 72 75 */ bl _restgpr_29 /* 8030AFB8 00307EF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030AFBC 00307EFC 7C 08 03 A6 */ mtlr r0 /* 8030AFC0 00307F00 38 21 00 20 */ addi r1, r1, 0x20 @@ -885,7 +885,7 @@ lbl_8030B1F8: /* 8030B20C 0030814C DB E1 00 30 */ stfd f31, 0x30(r1) /* 8030B210 00308150 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8030B214 00308154 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B218 00308158 48 05 6F C5 */ bl func_803621DC +/* 8030B218 00308158 48 05 6F C5 */ bl _savegpr_29 /* 8030B21C 0030815C 7C 7D 1B 78 */ mr r29, r3 /* 8030B220 00308160 7C BE 2B 78 */ mr r30, r5 /* 8030B224 00308164 80 63 00 40 */ lwz r3, 0x40(r3) @@ -1075,7 +1075,7 @@ lbl_8030B4A4: /* 8030B4A4 003083E4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8030B4A8 003083E8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8030B4AC 003083EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B4B0 003083F0 48 05 6D 79 */ bl func_80362228 +/* 8030B4B0 003083F0 48 05 6D 79 */ bl _restgpr_29 /* 8030B4B4 003083F4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030B4B8 003083F8 7C 08 03 A6 */ mtlr r0 /* 8030B4BC 003083FC 38 21 00 40 */ addi r1, r1, 0x40 @@ -1242,7 +1242,7 @@ lbl_8030B6FC: /* 8030B710 00308650 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8030B714 00308654 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8030B718 00308658 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B71C 0030865C 48 05 6A C1 */ bl func_803621DC +/* 8030B71C 0030865C 48 05 6A C1 */ bl _savegpr_29 /* 8030B720 00308660 7C 7D 1B 78 */ mr r29, r3 /* 8030B724 00308664 7C DE 33 78 */ mr r30, r6 /* 8030B728 00308668 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d @@ -1442,7 +1442,7 @@ lbl_8030B9D0: /* 8030B9D0 00308910 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8030B9D4 00308914 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8030B9D8 00308918 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030B9DC 0030891C 48 05 68 4D */ bl func_80362228 +/* 8030B9DC 0030891C 48 05 68 4D */ bl _restgpr_29 /* 8030B9E0 00308920 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030B9E4 00308924 7C 08 03 A6 */ mtlr r0 /* 8030B9E8 00308928 38 21 00 40 */ addi r1, r1, 0x40 @@ -1630,7 +1630,7 @@ lbl_8030BC40: /* 8030BC64 00308BA4 7C 08 02 A6 */ mflr r0 /* 8030BC68 00308BA8 90 01 00 24 */ stw r0, 0x24(r1) /* 8030BC6C 00308BAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030BC70 00308BB0 48 05 65 6D */ bl func_803621DC +/* 8030BC70 00308BB0 48 05 65 6D */ bl _savegpr_29 /* 8030BC74 00308BB4 7C 7D 1B 78 */ mr r29, r3 /* 8030BC78 00308BB8 7C 9E 23 79 */ or. r30, r4, r4 /* 8030BC7C 00308BBC 41 82 00 7C */ beq lbl_8030BCF8 @@ -1670,7 +1670,7 @@ lbl_8030BCDC: /* 8030BCF4 00308C34 41 80 FF A0 */ blt lbl_8030BC94 lbl_8030BCF8: /* 8030BCF8 00308C38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030BCFC 00308C3C 48 05 65 2D */ bl func_80362228 +/* 8030BCFC 00308C3C 48 05 65 2D */ bl _restgpr_29 /* 8030BD00 00308C40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030BD04 00308C44 7C 08 03 A6 */ mtlr r0 /* 8030BD08 00308C48 38 21 00 20 */ addi r1, r1, 0x20 @@ -1970,7 +1970,7 @@ J2DAnmTevRegKey_NS_getTevColorReg: /* 8030C0FC 0030903C DB E1 00 30 */ stfd f31, 0x30(r1) /* 8030C100 00309040 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8030C104 00309044 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C108 00309048 48 05 60 D5 */ bl func_803621DC +/* 8030C108 00309048 48 05 60 D5 */ bl _savegpr_29 /* 8030C10C 0030904C 7C 7D 1B 78 */ mr r29, r3 /* 8030C110 00309050 7C BE 2B 78 */ mr r30, r5 /* 8030C114 00309054 80 63 00 4C */ lwz r3, 0x4c(r3) @@ -2160,7 +2160,7 @@ lbl_8030C394: /* 8030C394 003092D4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8030C398 003092D8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8030C39C 003092DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C3A0 003092E0 48 05 5E 89 */ bl func_80362228 +/* 8030C3A0 003092E0 48 05 5E 89 */ bl _restgpr_29 /* 8030C3A4 003092E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030C3A8 003092E8 7C 08 03 A6 */ mtlr r0 /* 8030C3AC 003092EC 38 21 00 40 */ addi r1, r1, 0x40 @@ -2174,7 +2174,7 @@ J2DAnmTevRegKey_NS_getTevKonstReg: /* 8030C3C0 00309300 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8030C3C4 00309304 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8030C3C8 00309308 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C3CC 0030930C 48 05 5E 11 */ bl func_803621DC +/* 8030C3CC 0030930C 48 05 5E 11 */ bl _savegpr_29 /* 8030C3D0 00309310 7C 7D 1B 78 */ mr r29, r3 /* 8030C3D4 00309314 7C BE 2B 78 */ mr r30, r5 /* 8030C3D8 00309318 80 63 00 50 */ lwz r3, 0x50(r3) @@ -2364,7 +2364,7 @@ lbl_8030C658: /* 8030C658 00309598 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8030C65C 0030959C CB E1 00 30 */ lfd f31, 0x30(r1) /* 8030C660 003095A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030C664 003095A4 48 05 5B C5 */ bl func_80362228 +/* 8030C664 003095A4 48 05 5B C5 */ bl _restgpr_29 /* 8030C668 003095A8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030C66C 003095AC 7C 08 03 A6 */ mtlr r0 /* 8030C670 003095B0 38 21 00 40 */ addi r1, r1, 0x40 @@ -2373,7 +2373,7 @@ lbl_8030C658: /* 8030C67C 003095BC 7C 08 02 A6 */ mflr r0 /* 8030C680 003095C0 90 01 00 24 */ stw r0, 0x24(r1) /* 8030C684 003095C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030C688 003095C8 48 05 5B 55 */ bl func_803621DC +/* 8030C688 003095C8 48 05 5B 55 */ bl _savegpr_29 /* 8030C68C 003095CC 7C 7E 1B 78 */ mr r30, r3 /* 8030C690 003095D0 7C 9F 23 79 */ or. r31, r4, r4 /* 8030C694 003095D4 41 82 00 D0 */ beq lbl_8030C764 @@ -2438,7 +2438,7 @@ lbl_8030C754: /* 8030C760 003096A0 41 80 FF AC */ blt lbl_8030C70C lbl_8030C764: /* 8030C764 003096A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030C768 003096A8 48 05 5A C1 */ bl func_80362228 +/* 8030C768 003096A8 48 05 5A C1 */ bl _restgpr_29 /* 8030C76C 003096AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030C770 003096B0 7C 08 03 A6 */ mtlr r0 /* 8030C774 003096B4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DGrafContext.s b/asm/J2DGraph/J2DGrafContext.s index 94ab5286929..20b2b110ad5 100644 --- a/asm/J2DGraph/J2DGrafContext.s +++ b/asm/J2DGraph/J2DGrafContext.s @@ -224,7 +224,7 @@ J2DGrafContext_NS_setScissor: /* 802E8E44 002E5D84 DB 81 00 30 */ stfd f28, 0x30(r1) /* 802E8E48 002E5D88 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 802E8E4C 002E5D8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E8E50 002E5D90 48 07 93 8D */ bl func_803621DC +/* 802E8E50 002E5D90 48 07 93 8D */ bl _savegpr_29 /* 802E8E54 002E5D94 C0 23 00 14 */ lfs f1, 0x14(r3) /* 802E8E58 002E5D98 C3 A3 00 18 */ lfs f29, 0x18(r3) /* 802E8E5C 002E5D9C C3 E3 00 1C */ lfs f31, 0x1c(r3) @@ -393,7 +393,7 @@ lbl_802E9088: /* 802E90A0 002E5FE0 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 802E90A4 002E5FE4 CB 81 00 30 */ lfd f28, 0x30(r1) /* 802E90A8 002E5FE8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E90AC 002E5FEC 48 07 91 7D */ bl func_80362228 +/* 802E90AC 002E5FEC 48 07 91 7D */ bl _restgpr_29 /* 802E90B0 002E5FF0 80 01 00 74 */ lwz r0, 0x74(r1) /* 802E90B4 002E5FF4 7C 08 03 A6 */ mtlr r0 /* 802E90B8 002E5FF8 38 21 00 70 */ addi r1, r1, 0x70 @@ -662,7 +662,7 @@ J2DGrafContext_NS_line: /* 802E948C 002E63CC 7C 08 02 A6 */ mflr r0 /* 802E9490 002E63D0 90 01 00 24 */ stw r0, 0x24(r1) /* 802E9494 002E63D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E9498 002E63D8 48 07 8D 45 */ bl func_803621DC +/* 802E9498 002E63D8 48 07 8D 45 */ bl _savegpr_29 /* 802E949C 002E63DC 7C 7D 1B 78 */ mr r29, r3 /* 802E94A0 002E63E0 7C 9E 23 78 */ mr r30, r4 /* 802E94A4 002E63E4 7C BF 2B 78 */ mr r31, r5 @@ -708,7 +708,7 @@ J2DGrafContext_NS_line: /* 802E9544 002E6484 38 E0 00 00 */ li r7, 0 /* 802E9548 002E6488 48 07 20 7D */ bl GXSetVtxAttrFmt /* 802E954C 002E648C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E9550 002E6490 48 07 8C D9 */ bl func_80362228 +/* 802E9550 002E6490 48 07 8C D9 */ bl _restgpr_29 /* 802E9554 002E6494 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E9558 002E6498 7C 08 03 A6 */ mtlr r0 /* 802E955C 002E649C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DManage.s b/asm/J2DGraph/J2DManage.s index bbbf8162fe3..b61b2b3295e 100644 --- a/asm/J2DGraph/J2DManage.s +++ b/asm/J2DGraph/J2DManage.s @@ -41,7 +41,7 @@ J2DDataManage_NS_get_X1_: /* 8030CE80 00309DC0 7C 08 02 A6 */ mflr r0 /* 8030CE84 00309DC4 90 01 01 24 */ stw r0, 0x124(r1) /* 8030CE88 00309DC8 39 61 01 20 */ addi r11, r1, 0x120 -/* 8030CE8C 00309DCC 48 05 53 51 */ bl func_803621DC +/* 8030CE8C 00309DCC 48 05 53 51 */ bl _savegpr_29 /* 8030CE90 00309DD0 7C 7D 1B 78 */ mr r29, r3 /* 8030CE94 00309DD4 7C 9E 23 78 */ mr r30, r4 /* 8030CE98 00309DD8 7F C3 F3 78 */ mr r3, r30 @@ -71,7 +71,7 @@ lbl_8030CED4: /* 8030CEF4 00309E34 4B FF FF 25 */ bl J2DDataManage_NS_get lbl_8030CEF8: /* 8030CEF8 00309E38 39 61 01 20 */ addi r11, r1, 0x120 -/* 8030CEFC 00309E3C 48 05 53 2D */ bl func_80362228 +/* 8030CEFC 00309E3C 48 05 53 2D */ bl _restgpr_29 /* 8030CF00 00309E40 80 01 01 24 */ lwz r0, 0x124(r1) /* 8030CF04 00309E44 7C 08 03 A6 */ mtlr r0 /* 8030CF08 00309E48 38 21 01 20 */ addi r1, r1, 0x120 diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s index 791187bd158..19063dca15b 100644 --- a/asm/J2DGraph/J2DMatBlock.s +++ b/asm/J2DGraph/J2DMatBlock.s @@ -144,7 +144,7 @@ J2DTexGenBlock_NS_setGX: /* 802EB574 002E84B4 7C 08 02 A6 */ mflr r0 /* 802EB578 002E84B8 90 01 00 24 */ stw r0, 0x24(r1) /* 802EB57C 002E84BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EB580 002E84C0 48 07 6C 5D */ bl func_803621DC +/* 802EB580 002E84C0 48 07 6C 5D */ bl _savegpr_29 /* 802EB584 002E84C4 7C 7D 1B 78 */ mr r29, r3 /* 802EB588 002E84C8 80 03 00 00 */ lwz r0, 0(r3) /* 802EB58C 002E84CC 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -184,7 +184,7 @@ lbl_802EB5FC: /* 802EB600 002E8540 28 00 00 08 */ cmplwi r0, 8 /* 802EB604 002E8544 41 80 FF D8 */ blt lbl_802EB5DC /* 802EB608 002E8548 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EB60C 002E854C 48 07 6C 1D */ bl func_80362228 +/* 802EB60C 002E854C 48 07 6C 1D */ bl _restgpr_29 /* 802EB610 002E8550 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EB614 002E8554 7C 08 03 A6 */ mtlr r0 /* 802EB618 002E8558 38 21 00 20 */ addi r1, r1, 0x20 @@ -790,7 +790,7 @@ lbl_802EBE74: /* 802EBE90 002E8DD0 7C 08 02 A6 */ mflr r0 /* 802EBE94 002E8DD4 90 01 00 24 */ stw r0, 0x24(r1) /* 802EBE98 002E8DD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EBE9C 002E8DDC 48 07 63 41 */ bl func_803621DC +/* 802EBE9C 002E8DDC 48 07 63 41 */ bl _savegpr_29 /* 802EBEA0 002E8DE0 7C 7F 1B 78 */ mr r31, r3 /* 802EBEA4 002E8DE4 7C BD 2B 78 */ mr r29, r5 /* 802EBEA8 002E8DE8 28 04 00 00 */ cmplwi r4, 0 @@ -892,7 +892,7 @@ lbl_802EBFE4: /* 802EC000 002E8F40 38 60 00 01 */ li r3, 1 lbl_802EC004: /* 802EC004 002E8F44 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC008 002E8F48 48 07 62 21 */ bl func_80362228 +/* 802EC008 002E8F48 48 07 62 21 */ bl _restgpr_29 /* 802EC00C 002E8F4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EC010 002E8F50 7C 08 03 A6 */ mtlr r0 /* 802EC014 002E8F54 38 21 00 20 */ addi r1, r1, 0x20 @@ -973,7 +973,7 @@ lbl_802EC110: /* 802EC128 002E9068 7C 08 02 A6 */ mflr r0 /* 802EC12C 002E906C 90 01 00 24 */ stw r0, 0x24(r1) /* 802EC130 002E9070 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC134 002E9074 48 07 60 A9 */ bl func_803621DC +/* 802EC134 002E9074 48 07 60 A9 */ bl _savegpr_29 /* 802EC138 002E9078 7C 7D 1B 78 */ mr r29, r3 /* 802EC13C 002E907C 7C 9E 23 79 */ or. r30, r4, r4 /* 802EC140 002E9080 40 82 00 0C */ bne lbl_802EC14C @@ -1014,7 +1014,7 @@ lbl_802EC1A8: /* 802EC1BC 002E90FC 38 60 00 01 */ li r3, 1 lbl_802EC1C0: /* 802EC1C0 002E9100 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC1C4 002E9104 48 07 60 65 */ bl func_80362228 +/* 802EC1C4 002E9104 48 07 60 65 */ bl _restgpr_29 /* 802EC1C8 002E9108 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EC1CC 002E910C 7C 08 03 A6 */ mtlr r0 /* 802EC1D0 002E9110 38 21 00 20 */ addi r1, r1, 0x20 @@ -1058,7 +1058,7 @@ lbl_802EC240: /* 802EC25C 002E919C 7C 08 02 A6 */ mflr r0 /* 802EC260 002E91A0 90 01 00 24 */ stw r0, 0x24(r1) /* 802EC264 002E91A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC268 002E91A8 48 07 5F 75 */ bl func_803621DC +/* 802EC268 002E91A8 48 07 5F 75 */ bl _savegpr_29 /* 802EC26C 002E91AC 7C 7D 1B 78 */ mr r29, r3 /* 802EC270 002E91B0 7C BE 2B 78 */ mr r30, r5 /* 802EC274 002E91B4 28 04 00 00 */ cmplwi r4, 0 @@ -1104,7 +1104,7 @@ lbl_802EC2FC: /* 802EC2FC 002E923C 38 60 00 01 */ li r3, 1 lbl_802EC300: /* 802EC300 002E9240 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC304 002E9244 48 07 5F 25 */ bl func_80362228 +/* 802EC304 002E9244 48 07 5F 25 */ bl _restgpr_29 /* 802EC308 002E9248 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EC30C 002E924C 7C 08 03 A6 */ mtlr r0 /* 802EC310 002E9250 38 21 00 20 */ addi r1, r1, 0x20 @@ -1866,7 +1866,7 @@ lbl_802ECDD0: /* 802ECDEC 002E9D2C 7C 08 02 A6 */ mflr r0 /* 802ECDF0 002E9D30 90 01 00 24 */ stw r0, 0x24(r1) /* 802ECDF4 002E9D34 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECDF8 002E9D38 48 07 53 E5 */ bl func_803621DC +/* 802ECDF8 002E9D38 48 07 53 E5 */ bl _savegpr_29 /* 802ECDFC 002E9D3C 7C 7D 1B 78 */ mr r29, r3 /* 802ECE00 002E9D40 7C 9E 23 78 */ mr r30, r4 /* 802ECE04 002E9D44 7C BF 2B 78 */ mr r31, r5 @@ -1956,7 +1956,7 @@ lbl_802ECED4: /* 802ECF2C 002E9E6C 38 60 00 01 */ li r3, 1 lbl_802ECF30: /* 802ECF30 002E9E70 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECF34 002E9E74 48 07 52 F5 */ bl func_80362228 +/* 802ECF34 002E9E74 48 07 52 F5 */ bl _restgpr_29 /* 802ECF38 002E9E78 80 01 00 24 */ lwz r0, 0x24(r1) /* 802ECF3C 002E9E7C 7C 08 03 A6 */ mtlr r0 /* 802ECF40 002E9E80 38 21 00 20 */ addi r1, r1, 0x20 @@ -2219,7 +2219,7 @@ lbl_802ED2D8: /* 802ED2F4 002EA234 7C 08 02 A6 */ mflr r0 /* 802ED2F8 002EA238 90 01 00 24 */ stw r0, 0x24(r1) /* 802ED2FC 002EA23C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED300 002EA240 48 07 4E DD */ bl func_803621DC +/* 802ED300 002EA240 48 07 4E DD */ bl _savegpr_29 /* 802ED304 002EA244 7C 7D 1B 78 */ mr r29, r3 /* 802ED308 002EA248 7C 9E 23 79 */ or. r30, r4, r4 /* 802ED30C 002EA24C 40 82 00 0C */ bne lbl_802ED318 @@ -2260,7 +2260,7 @@ lbl_802ED374: /* 802ED388 002EA2C8 38 60 00 01 */ li r3, 1 lbl_802ED38C: /* 802ED38C 002EA2CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED390 002EA2D0 48 07 4E 99 */ bl func_80362228 +/* 802ED390 002EA2D0 48 07 4E 99 */ bl _restgpr_29 /* 802ED394 002EA2D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802ED398 002EA2D8 7C 08 03 A6 */ mtlr r0 /* 802ED39C 002EA2DC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3273,7 +3273,7 @@ lbl_802EE1BC: /* 802EE1D8 002EB118 7C 08 02 A6 */ mflr r0 /* 802EE1DC 002EB11C 90 01 00 24 */ stw r0, 0x24(r1) /* 802EE1E0 002EB120 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE1E4 002EB124 48 07 3F F9 */ bl func_803621DC +/* 802EE1E4 002EB124 48 07 3F F9 */ bl _savegpr_29 /* 802EE1E8 002EB128 7C 7D 1B 78 */ mr r29, r3 /* 802EE1EC 002EB12C 7C 9E 23 78 */ mr r30, r4 /* 802EE1F0 002EB130 7C BF 2B 78 */ mr r31, r5 @@ -3376,7 +3376,7 @@ lbl_802EE2E4: /* 802EE348 002EB288 38 60 00 01 */ li r3, 1 lbl_802EE34C: /* 802EE34C 002EB28C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE350 002EB290 48 07 3E D9 */ bl func_80362228 +/* 802EE350 002EB290 48 07 3E D9 */ bl _restgpr_29 /* 802EE354 002EB294 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EE358 002EB298 7C 08 03 A6 */ mtlr r0 /* 802EE35C 002EB29C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3680,7 +3680,7 @@ lbl_802EE780: /* 802EE79C 002EB6DC 7C 08 02 A6 */ mflr r0 /* 802EE7A0 002EB6E0 90 01 00 24 */ stw r0, 0x24(r1) /* 802EE7A4 002EB6E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE7A8 002EB6E8 48 07 3A 35 */ bl func_803621DC +/* 802EE7A8 002EB6E8 48 07 3A 35 */ bl _savegpr_29 /* 802EE7AC 002EB6EC 7C 7D 1B 78 */ mr r29, r3 /* 802EE7B0 002EB6F0 7C 9E 23 79 */ or. r30, r4, r4 /* 802EE7B4 002EB6F4 40 82 00 0C */ bne lbl_802EE7C0 @@ -3721,7 +3721,7 @@ lbl_802EE81C: /* 802EE830 002EB770 38 60 00 01 */ li r3, 1 lbl_802EE834: /* 802EE834 002EB774 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE838 002EB778 48 07 39 F1 */ bl func_80362228 +/* 802EE838 002EB778 48 07 39 F1 */ bl _restgpr_29 /* 802EE83C 002EB77C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EE840 002EB780 7C 08 03 A6 */ mtlr r0 /* 802EE844 002EB784 38 21 00 20 */ addi r1, r1, 0x20 @@ -4734,7 +4734,7 @@ lbl_802EF664: /* 802EF680 002EC5C0 7C 08 02 A6 */ mflr r0 /* 802EF684 002EC5C4 90 01 00 24 */ stw r0, 0x24(r1) /* 802EF688 002EC5C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF68C 002EC5CC 48 07 2B 51 */ bl func_803621DC +/* 802EF68C 002EC5CC 48 07 2B 51 */ bl _savegpr_29 /* 802EF690 002EC5D0 7C 7D 1B 78 */ mr r29, r3 /* 802EF694 002EC5D4 7C 9E 23 78 */ mr r30, r4 /* 802EF698 002EC5D8 7C BF 2B 78 */ mr r31, r5 @@ -4837,7 +4837,7 @@ lbl_802EF78C: /* 802EF7F0 002EC730 38 60 00 01 */ li r3, 1 lbl_802EF7F4: /* 802EF7F4 002EC734 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF7F8 002EC738 48 07 2A 31 */ bl func_80362228 +/* 802EF7F8 002EC738 48 07 2A 31 */ bl _restgpr_29 /* 802EF7FC 002EC73C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EF800 002EC740 7C 08 03 A6 */ mtlr r0 /* 802EF804 002EC744 38 21 00 20 */ addi r1, r1, 0x20 @@ -5141,7 +5141,7 @@ lbl_802EFC28: /* 802EFC44 002ECB84 7C 08 02 A6 */ mflr r0 /* 802EFC48 002ECB88 90 01 00 24 */ stw r0, 0x24(r1) /* 802EFC4C 002ECB8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFC50 002ECB90 48 07 25 8D */ bl func_803621DC +/* 802EFC50 002ECB90 48 07 25 8D */ bl _savegpr_29 /* 802EFC54 002ECB94 7C 7D 1B 78 */ mr r29, r3 /* 802EFC58 002ECB98 7C 9E 23 79 */ or. r30, r4, r4 /* 802EFC5C 002ECB9C 40 82 00 0C */ bne lbl_802EFC68 @@ -5180,7 +5180,7 @@ lbl_802EFCC4: /* 802EFCD0 002ECC10 38 60 00 01 */ li r3, 1 lbl_802EFCD4: /* 802EFCD4 002ECC14 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFCD8 002ECC18 48 07 25 51 */ bl func_80362228 +/* 802EFCD8 002ECC18 48 07 25 51 */ bl _restgpr_29 /* 802EFCDC 002ECC1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EFCE0 002ECC20 7C 08 03 A6 */ mtlr r0 /* 802EFCE4 002ECC24 38 21 00 20 */ addi r1, r1, 0x20 @@ -6184,7 +6184,7 @@ lbl_802F0AE4: /* 802F0B00 002EDA40 7C 08 02 A6 */ mflr r0 /* 802F0B04 002EDA44 90 01 00 24 */ stw r0, 0x24(r1) /* 802F0B08 002EDA48 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0B0C 002EDA4C 48 07 16 D1 */ bl func_803621DC +/* 802F0B0C 002EDA4C 48 07 16 D1 */ bl _savegpr_29 /* 802F0B10 002EDA50 7C 7D 1B 78 */ mr r29, r3 /* 802F0B14 002EDA54 7C 9E 23 78 */ mr r30, r4 /* 802F0B18 002EDA58 7C BF 2B 78 */ mr r31, r5 @@ -6287,7 +6287,7 @@ lbl_802F0C0C: /* 802F0C70 002EDBB0 38 60 00 01 */ li r3, 1 lbl_802F0C74: /* 802F0C74 002EDBB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0C78 002EDBB8 48 07 15 B1 */ bl func_80362228 +/* 802F0C78 002EDBB8 48 07 15 B1 */ bl _restgpr_29 /* 802F0C7C 002EDBBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F0C80 002EDBC0 7C 08 03 A6 */ mtlr r0 /* 802F0C84 002EDBC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -6591,7 +6591,7 @@ lbl_802F10A8: /* 802F10C4 002EE004 7C 08 02 A6 */ mflr r0 /* 802F10C8 002EE008 90 01 00 24 */ stw r0, 0x24(r1) /* 802F10CC 002EE00C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F10D0 002EE010 48 07 11 0D */ bl func_803621DC +/* 802F10D0 002EE010 48 07 11 0D */ bl _savegpr_29 /* 802F10D4 002EE014 7C 7D 1B 78 */ mr r29, r3 /* 802F10D8 002EE018 7C 9E 23 79 */ or. r30, r4, r4 /* 802F10DC 002EE01C 40 82 00 0C */ bne lbl_802F10E8 @@ -6630,7 +6630,7 @@ lbl_802F1144: /* 802F1150 002EE090 38 60 00 01 */ li r3, 1 lbl_802F1154: /* 802F1154 002EE094 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F1158 002EE098 48 07 10 D1 */ bl func_80362228 +/* 802F1158 002EE098 48 07 10 D1 */ bl _restgpr_29 /* 802F115C 002EE09C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F1160 002EE0A0 7C 08 03 A6 */ mtlr r0 /* 802F1164 002EE0A4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DMaterialFactory.s b/asm/J2DGraph/J2DMaterialFactory.s index 22a82524b33..6ed8df14079 100644 --- a/asm/J2DGraph/J2DMaterialFactory.s +++ b/asm/J2DGraph/J2DMaterialFactory.s @@ -931,7 +931,7 @@ J2DMaterialFactory_NS_newTexMtx: /* 802F3808 002F0748 7C 08 02 A6 */ mflr r0 /* 802F380C 002F074C 90 01 00 24 */ stw r0, 0x24(r1) /* 802F3810 002F0750 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F3814 002F0754 48 06 E9 C9 */ bl func_803621DC +/* 802F3814 002F0754 48 06 E9 C9 */ bl _savegpr_29 /* 802F3818 002F0758 7C 7D 1B 78 */ mr r29, r3 /* 802F381C 002F075C 3B C0 00 00 */ li r30, 0 /* 802F3820 002F0760 80 C3 00 04 */ lwz r6, 4(r3) @@ -979,7 +979,7 @@ lbl_802F38BC: lbl_802F38C4: /* 802F38C4 002F0804 7F C3 F3 78 */ mr r3, r30 /* 802F38C8 002F0808 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F38CC 002F080C 48 06 E9 5D */ bl func_80362228 +/* 802F38CC 002F080C 48 06 E9 5D */ bl _restgpr_29 /* 802F38D0 002F0810 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F38D4 002F0814 7C 08 03 A6 */ mtlr r0 /* 802F38D8 002F0818 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DOrthoGraph.s b/asm/J2DGraph/J2DOrthoGraph.s index 3c42d9905b4..bcdb0135716 100644 --- a/asm/J2DGraph/J2DOrthoGraph.s +++ b/asm/J2DGraph/J2DOrthoGraph.s @@ -393,7 +393,7 @@ J2DDrawFrame_X1_: /* 802E9BEC 002E6B2C 7C 08 02 A6 */ mflr r0 /* 802E9BF0 002E6B30 90 01 01 04 */ stw r0, 0x104(r1) /* 802E9BF4 002E6B34 39 61 01 00 */ addi r11, r1, 0x100 -/* 802E9BF8 002E6B38 48 07 85 E5 */ bl func_803621DC +/* 802E9BF8 002E6B38 48 07 85 E5 */ bl _savegpr_29 /* 802E9BFC 002E6B3C 7C 7D 1B 78 */ mr r29, r3 /* 802E9C00 002E6B40 7C 9E 23 78 */ mr r30, r4 /* 802E9C04 002E6B44 7C BF 2B 78 */ mr r31, r5 @@ -424,7 +424,7 @@ J2DDrawFrame_X1_: /* 802E9C68 002E6BA8 38 03 C9 B8 */ addi r0, r3, lbl_803CC9B8@l /* 802E9C6C 002E6BAC 90 01 00 1C */ stw r0, 0x1c(r1) /* 802E9C70 002E6BB0 39 61 01 00 */ addi r11, r1, 0x100 -/* 802E9C74 002E6BB4 48 07 85 B5 */ bl func_80362228 +/* 802E9C74 002E6BB4 48 07 85 B5 */ bl _restgpr_29 /* 802E9C78 002E6BB8 80 01 01 04 */ lwz r0, 0x104(r1) /* 802E9C7C 002E6BBC 7C 08 03 A6 */ mtlr r0 /* 802E9C80 002E6BC0 38 21 01 00 */ addi r1, r1, 0x100 diff --git a/asm/J2DGraph/J2DPane.s b/asm/J2DGraph/J2DPane.s index 3f058b28ce3..169e3e97c00 100644 --- a/asm/J2DGraph/J2DPane.s +++ b/asm/J2DGraph/J2DPane.s @@ -347,7 +347,7 @@ J2DPane_NS_makePaneStream: /* 802F60E0 002F3020 DB A1 00 50 */ stfd f29, 0x50(r1) /* 802F60E4 002F3024 F3 A1 00 58 */ psq_st f29, 88(r1), 0, qr0 /* 802F60E8 002F3028 39 61 00 50 */ addi r11, r1, 0x50 -/* 802F60EC 002F302C 48 06 C0 F1 */ bl func_803621DC +/* 802F60EC 002F302C 48 06 C0 F1 */ bl _savegpr_29 /* 802F60F0 002F3030 7C 7D 1B 78 */ mr r29, r3 /* 802F60F4 002F3034 7C 9E 23 78 */ mr r30, r4 /* 802F60F8 002F3038 7C BF 2B 78 */ mr r31, r5 @@ -544,7 +544,7 @@ lbl_802F6374: /* 802F63D8 002F3318 E3 A1 00 58 */ psq_l f29, 88(r1), 0, qr0 /* 802F63DC 002F331C CB A1 00 50 */ lfd f29, 0x50(r1) /* 802F63E0 002F3320 39 61 00 50 */ addi r11, r1, 0x50 -/* 802F63E4 002F3324 48 06 BE 45 */ bl func_80362228 +/* 802F63E4 002F3324 48 06 BE 45 */ bl _restgpr_29 /* 802F63E8 002F3328 80 01 00 84 */ lwz r0, 0x84(r1) /* 802F63EC 002F332C 7C 08 03 A6 */ mtlr r0 /* 802F63F0 002F3330 38 21 00 80 */ addi r1, r1, 0x80 @@ -667,7 +667,7 @@ J2DPane_NS_dtor: /* 802F6590 002F34D0 7C 08 02 A6 */ mflr r0 /* 802F6594 002F34D4 90 01 00 24 */ stw r0, 0x24(r1) /* 802F6598 002F34D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F659C 002F34DC 48 06 BC 41 */ bl func_803621DC +/* 802F659C 002F34DC 48 06 BC 41 */ bl _savegpr_29 /* 802F65A0 002F34E0 7C 7D 1B 79 */ or. r29, r3, r3 /* 802F65A4 002F34E4 7C 9E 23 78 */ mr r30, r4 /* 802F65A8 002F34E8 41 82 00 A8 */ beq lbl_802F6650 @@ -720,7 +720,7 @@ lbl_802F6640: lbl_802F6650: /* 802F6650 002F3590 7F A3 EB 78 */ mr r3, r29 /* 802F6654 002F3594 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F6658 002F3598 48 06 BB D1 */ bl func_80362228 +/* 802F6658 002F3598 48 06 BB D1 */ bl _restgpr_29 /* 802F665C 002F359C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F6660 002F35A0 7C 08 03 A6 */ mtlr r0 /* 802F6664 002F35A4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1607,7 +1607,7 @@ J2DPane_NS_search: /* 802F72E4 002F4224 7C 08 02 A6 */ mflr r0 /* 802F72E8 002F4228 90 01 00 24 */ stw r0, 0x24(r1) /* 802F72EC 002F422C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F72F0 002F4230 48 06 AE ED */ bl func_803621DC +/* 802F72F0 002F4230 48 06 AE ED */ bl _savegpr_29 /* 802F72F4 002F4234 7C BE 2B 78 */ mr r30, r5 /* 802F72F8 002F4238 7C DD 33 78 */ mr r29, r6 /* 802F72FC 002F423C 80 03 00 10 */ lwz r0, 0x10(r3) @@ -1645,7 +1645,7 @@ lbl_802F7364: /* 802F736C 002F42AC 38 60 00 00 */ li r3, 0 lbl_802F7370: /* 802F7370 002F42B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F7374 002F42B4 48 06 AE B5 */ bl func_80362228 +/* 802F7374 002F42B4 48 06 AE B5 */ bl _restgpr_29 /* 802F7378 002F42B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F737C 002F42BC 7C 08 03 A6 */ mtlr r0 /* 802F7380 002F42C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1657,7 +1657,7 @@ J2DPane_NS_searchUserInfo: /* 802F738C 002F42CC 7C 08 02 A6 */ mflr r0 /* 802F7390 002F42D0 90 01 00 24 */ stw r0, 0x24(r1) /* 802F7394 002F42D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F7398 002F42D8 48 06 AE 45 */ bl func_803621DC +/* 802F7398 002F42D8 48 06 AE 45 */ bl _savegpr_29 /* 802F739C 002F42DC 7C BE 2B 78 */ mr r30, r5 /* 802F73A0 002F42E0 7C DD 33 78 */ mr r29, r6 /* 802F73A4 002F42E4 80 03 00 18 */ lwz r0, 0x18(r3) @@ -1695,7 +1695,7 @@ lbl_802F740C: /* 802F7414 002F4354 38 60 00 00 */ li r3, 0 lbl_802F7418: /* 802F7418 002F4358 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F741C 002F435C 48 06 AE 0D */ bl func_80362228 +/* 802F741C 002F435C 48 06 AE 0D */ bl _restgpr_29 /* 802F7420 002F4360 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F7424 002F4364 7C 08 03 A6 */ mtlr r0 /* 802F7428 002F4368 38 21 00 20 */ addi r1, r1, 0x20 @@ -2212,7 +2212,7 @@ J2DPane_NS_makePaneExStream: /* 802F7B1C 002F4A5C 7C 08 02 A6 */ mflr r0 /* 802F7B20 002F4A60 90 01 00 64 */ stw r0, 0x64(r1) /* 802F7B24 002F4A64 39 61 00 60 */ addi r11, r1, 0x60 -/* 802F7B28 002F4A68 48 06 A6 B5 */ bl func_803621DC +/* 802F7B28 002F4A68 48 06 A6 B5 */ bl _savegpr_29 /* 802F7B2C 002F4A6C 7C 7E 1B 78 */ mr r30, r3 /* 802F7B30 002F4A70 7C 9F 23 78 */ mr r31, r4 /* 802F7B34 002F4A74 7C BD 2B 78 */ mr r29, r5 @@ -2333,7 +2333,7 @@ lbl_802F7CC0: /* 802F7CE0 002F4C20 7D 89 03 A6 */ mtctr r12 /* 802F7CE4 002F4C24 4E 80 04 21 */ bctrl /* 802F7CE8 002F4C28 39 61 00 60 */ addi r11, r1, 0x60 -/* 802F7CEC 002F4C2C 48 06 A5 3D */ bl func_80362228 +/* 802F7CEC 002F4C2C 48 06 A5 3D */ bl _restgpr_29 /* 802F7CF0 002F4C30 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F7CF4 002F4C34 7C 08 03 A6 */ mtlr r0 /* 802F7CF8 002F4C38 38 21 00 60 */ addi r1, r1, 0x60 @@ -2598,7 +2598,7 @@ lbl_802F8064: /* 802F8084 002F4FC4 7C 08 02 A6 */ mflr r0 /* 802F8088 002F4FC8 90 01 00 24 */ stw r0, 0x24(r1) /* 802F808C 002F4FCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8090 002F4FD0 48 06 A1 4D */ bl func_803621DC +/* 802F8090 002F4FD0 48 06 A1 4D */ bl _savegpr_29 /* 802F8094 002F4FD4 7C 7D 1B 78 */ mr r29, r3 /* 802F8098 002F4FD8 7C 9E 23 78 */ mr r30, r4 /* 802F809C 002F4FDC 80 03 00 F8 */ lwz r0, 0xf8(r3) @@ -2630,7 +2630,7 @@ lbl_802F80E8: /* 802F80F8 002F5038 48 00 01 C9 */ bl J2DPane_NS_updateTransform /* 802F80FC 002F503C 7F C3 F3 78 */ mr r3, r30 /* 802F8100 002F5040 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8104 002F5044 48 06 A1 25 */ bl func_80362228 +/* 802F8104 002F5044 48 06 A1 25 */ bl _restgpr_29 /* 802F8108 002F5048 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F810C 002F504C 7C 08 03 A6 */ mtlr r0 /* 802F8110 002F5050 38 21 00 20 */ addi r1, r1, 0x20 @@ -2720,7 +2720,7 @@ J2DPane_NS_animationPane: /* 802F822C 002F516C 7C 08 02 A6 */ mflr r0 /* 802F8230 002F5170 90 01 00 24 */ stw r0, 0x24(r1) /* 802F8234 002F5174 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F8238 002F5178 48 06 9F A5 */ bl func_803621DC +/* 802F8238 002F5178 48 06 9F A5 */ bl _savegpr_29 /* 802F823C 002F517C 7C 7D 1B 78 */ mr r29, r3 /* 802F8240 002F5180 7C 9E 23 78 */ mr r30, r4 /* 802F8244 002F5184 80 03 00 F8 */ lwz r0, 0xf8(r3) @@ -2752,7 +2752,7 @@ lbl_802F8290: /* 802F82A0 002F51E0 48 00 00 21 */ bl J2DPane_NS_updateTransform /* 802F82A4 002F51E4 7F C3 F3 78 */ mr r3, r30 /* 802F82A8 002F51E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F82AC 002F51EC 48 06 9F 7D */ bl func_80362228 +/* 802F82AC 002F51EC 48 06 9F 7D */ bl _restgpr_29 /* 802F82B0 002F51F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F82B4 002F51F4 7C 08 03 A6 */ mtlr r0 /* 802F82B8 002F51F8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index 6b1782a2c3c..a2f54745041 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -546,7 +546,7 @@ J2DPicture_X4_: /* 802FC804 002F9744 7C 08 02 A6 */ mflr r0 /* 802FC808 002F9748 90 01 00 24 */ stw r0, 0x24(r1) /* 802FC80C 002F974C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FC810 002F9750 48 06 59 CD */ bl func_803621DC +/* 802FC810 002F9750 48 06 59 CD */ bl _savegpr_29 /* 802FC814 002F9754 7C 7D 1B 78 */ mr r29, r3 /* 802FC818 002F9758 7D 1E 43 78 */ mr r30, r8 /* 802FC81C 002F975C 7D 3F 4B 78 */ mr r31, r9 @@ -600,7 +600,7 @@ lbl_802FC898: /* 802FC8C8 002F9808 48 00 05 D5 */ bl J2DPicture_NS_initinfo /* 802FC8CC 002F980C 7F A3 EB 78 */ mr r3, r29 /* 802FC8D0 002F9810 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FC8D4 002F9814 48 06 59 55 */ bl func_80362228 +/* 802FC8D4 002F9814 48 06 59 55 */ bl _restgpr_29 /* 802FC8D8 002F9818 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FC8DC 002F981C 7C 08 03 A6 */ mtlr r0 /* 802FC8E0 002F9820 38 21 00 20 */ addi r1, r1, 0x20 @@ -1425,7 +1425,7 @@ lbl_802FD494: /* 802FD4BC 002FA3FC 90 01 00 24 */ stw r0, 0x24(r1) /* 802FD4C0 002FA400 DB E1 00 18 */ stfd f31, 0x18(r1) /* 802FD4C4 002FA404 39 61 00 18 */ addi r11, r1, 0x18 -/* 802FD4C8 002FA408 48 06 4D 15 */ bl func_803621DC +/* 802FD4C8 002FA408 48 06 4D 15 */ bl _savegpr_29 /* 802FD4CC 002FA40C 7C 7D 1B 78 */ mr r29, r3 /* 802FD4D0 002FA410 7C BE 2B 78 */ mr r30, r5 /* 802FD4D4 002FA414 7C DF 33 78 */ mr r31, r6 @@ -1443,7 +1443,7 @@ lbl_802FD494: /* 802FD504 002FA444 4E 80 04 21 */ bctrl /* 802FD508 002FA448 CB E1 00 18 */ lfd f31, 0x18(r1) /* 802FD50C 002FA44C 39 61 00 18 */ addi r11, r1, 0x18 -/* 802FD510 002FA450 48 06 4D 19 */ bl func_80362228 +/* 802FD510 002FA450 48 06 4D 19 */ bl _restgpr_29 /* 802FD514 002FA454 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FD518 002FA458 7C 08 03 A6 */ mtlr r0 /* 802FD51C 002FA45C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1454,7 +1454,7 @@ lbl_802FD494: /* 802FD530 002FA470 DB E1 00 40 */ stfd f31, 0x40(r1) /* 802FD534 002FA474 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 802FD538 002FA478 39 61 00 40 */ addi r11, r1, 0x40 -/* 802FD53C 002FA47C 48 06 4C A1 */ bl func_803621DC +/* 802FD53C 002FA47C 48 06 4C A1 */ bl _savegpr_29 /* 802FD540 002FA480 7C 7D 1B 78 */ mr r29, r3 /* 802FD544 002FA484 7C 9E 23 79 */ or. r30, r4, r4 /* 802FD548 002FA488 7C BF 2B 78 */ mr r31, r5 @@ -1566,7 +1566,7 @@ lbl_802FD6D4: /* 802FD6D4 002FA614 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802FD6D8 002FA618 CB E1 00 40 */ lfd f31, 0x40(r1) /* 802FD6DC 002FA61C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802FD6E0 002FA620 48 06 4B 49 */ bl func_80362228 +/* 802FD6E0 002FA620 48 06 4B 49 */ bl _restgpr_29 /* 802FD6E4 002FA624 80 01 00 54 */ lwz r0, 0x54(r1) /* 802FD6E8 002FA628 7C 08 03 A6 */ mtlr r0 /* 802FD6EC 002FA62C 38 21 00 50 */ addi r1, r1, 0x50 @@ -1839,7 +1839,7 @@ lbl_802FDAB0: /* 802FDACC 002FAA0C 7C 08 02 A6 */ mflr r0 /* 802FDAD0 002FAA10 90 01 00 24 */ stw r0, 0x24(r1) /* 802FDAD4 002FAA14 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FDAD8 002FAA18 48 06 47 05 */ bl func_803621DC +/* 802FDAD8 002FAA18 48 06 47 05 */ bl _savegpr_29 /* 802FDADC 002FAA1C 7C 7D 1B 78 */ mr r29, r3 /* 802FDAE0 002FAA20 7C BE 2B 78 */ mr r30, r5 /* 802FDAE4 002FAA24 7C DF 33 78 */ mr r31, r6 @@ -1854,7 +1854,7 @@ lbl_802FDAB0: /* 802FDB08 002FAA48 7D 89 03 A6 */ mtctr r12 /* 802FDB0C 002FAA4C 4E 80 04 21 */ bctrl /* 802FDB10 002FAA50 39 61 00 20 */ addi r11, r1, 0x20 -/* 802FDB14 002FAA54 48 06 47 15 */ bl func_80362228 +/* 802FDB14 002FAA54 48 06 47 15 */ bl _restgpr_29 /* 802FDB18 002FAA58 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FDB1C 002FAA5C 7C 08 03 A6 */ mtlr r0 /* 802FDB20 002FAA60 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index aa6e4ac6180..e80d7a79908 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -652,7 +652,7 @@ lbl_80303FBC: /* 80303FE0 00300F20 90 01 00 24 */ stw r0, 0x24(r1) /* 80303FE4 00300F24 DB E1 00 18 */ stfd f31, 0x18(r1) /* 80303FE8 00300F28 39 61 00 18 */ addi r11, r1, 0x18 -/* 80303FEC 00300F2C 48 05 E1 F1 */ bl func_803621DC +/* 80303FEC 00300F2C 48 05 E1 F1 */ bl _savegpr_29 /* 80303FF0 00300F30 7C 7D 1B 78 */ mr r29, r3 /* 80303FF4 00300F34 7C BE 2B 78 */ mr r30, r5 /* 80303FF8 00300F38 7C DF 33 78 */ mr r31, r6 @@ -670,7 +670,7 @@ lbl_80303FBC: /* 80304028 00300F68 4E 80 04 21 */ bctrl /* 8030402C 00300F6C CB E1 00 18 */ lfd f31, 0x18(r1) /* 80304030 00300F70 39 61 00 18 */ addi r11, r1, 0x18 -/* 80304034 00300F74 48 05 E1 F5 */ bl func_80362228 +/* 80304034 00300F74 48 05 E1 F5 */ bl _restgpr_29 /* 80304038 00300F78 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030403C 00300F7C 7C 08 03 A6 */ mtlr r0 /* 80304040 00300F80 38 21 00 20 */ addi r1, r1, 0x20 @@ -680,7 +680,7 @@ lbl_80303FBC: /* 80304050 00300F90 90 01 00 24 */ stw r0, 0x24(r1) /* 80304054 00300F94 DB E1 00 18 */ stfd f31, 0x18(r1) /* 80304058 00300F98 39 61 00 18 */ addi r11, r1, 0x18 -/* 8030405C 00300F9C 48 05 E1 81 */ bl func_803621DC +/* 8030405C 00300F9C 48 05 E1 81 */ bl _savegpr_29 /* 80304060 00300FA0 7C 7D 1B 78 */ mr r29, r3 /* 80304064 00300FA4 7C 9E 23 79 */ or. r30, r4, r4 /* 80304068 00300FA8 7C BF 2B 78 */ mr r31, r5 @@ -712,7 +712,7 @@ lbl_80304094: lbl_803040C8: /* 803040C8 00301008 CB E1 00 18 */ lfd f31, 0x18(r1) /* 803040CC 0030100C 39 61 00 18 */ addi r11, r1, 0x18 -/* 803040D0 00301010 48 05 E1 59 */ bl func_80362228 +/* 803040D0 00301010 48 05 E1 59 */ bl _restgpr_29 /* 803040D4 00301014 80 01 00 24 */ lwz r0, 0x24(r1) /* 803040D8 00301018 7C 08 03 A6 */ mtlr r0 /* 803040DC 0030101C 38 21 00 20 */ addi r1, r1, 0x20 @@ -901,7 +901,7 @@ J2DPictureEx_NS_isInsert: /* 80304380 003012C0 7C 08 02 A6 */ mflr r0 /* 80304384 003012C4 90 01 00 24 */ stw r0, 0x24(r1) /* 80304388 003012C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030438C 003012CC 48 05 DE 51 */ bl func_803621DC +/* 8030438C 003012CC 48 05 DE 51 */ bl _savegpr_29 /* 80304390 003012D0 7C 7D 1B 78 */ mr r29, r3 /* 80304394 003012D4 80 A3 01 50 */ lwz r5, 0x150(r3) /* 80304398 003012D8 28 05 00 00 */ cmplwi r5, 0 @@ -959,7 +959,7 @@ lbl_80304450: /* 80304450 00301390 38 60 00 01 */ li r3, 1 lbl_80304454: /* 80304454 00301394 39 61 00 20 */ addi r11, r1, 0x20 -/* 80304458 00301398 48 05 DD D1 */ bl func_80362228 +/* 80304458 00301398 48 05 DD D1 */ bl _restgpr_29 /* 8030445C 0030139C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80304460 003013A0 7C 08 03 A6 */ mtlr r0 /* 80304464 003013A4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1685,7 +1685,7 @@ lbl_80304EAC: /* 80304F14 00301E54 DB 81 00 30 */ stfd f28, 0x30(r1) /* 80304F18 00301E58 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80304F1C 00301E5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80304F20 00301E60 48 05 D2 BD */ bl func_803621DC +/* 80304F20 00301E60 48 05 D2 BD */ bl _savegpr_29 /* 80304F24 00301E64 7C 7D 1B 78 */ mr r29, r3 /* 80304F28 00301E68 7C 9E 23 78 */ mr r30, r4 /* 80304F2C 00301E6C 7C BF 2B 78 */ mr r31, r5 @@ -1895,7 +1895,7 @@ lbl_8030522C: /* 80305244 00302184 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 80305248 00302188 CB 81 00 30 */ lfd f28, 0x30(r1) /* 8030524C 0030218C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80305250 00302190 48 05 CF D9 */ bl func_80362228 +/* 80305250 00302190 48 05 CF D9 */ bl _restgpr_29 /* 80305254 00302194 80 01 00 74 */ lwz r0, 0x74(r1) /* 80305258 00302198 7C 08 03 A6 */ mtlr r0 /* 8030525C 0030219C 38 21 00 70 */ addi r1, r1, 0x70 @@ -2376,7 +2376,7 @@ J2DPictureEx_NS_setTevKColor: /* 8030592C 0030286C 7C 08 02 A6 */ mflr r0 /* 80305930 00302870 90 01 00 64 */ stw r0, 0x64(r1) /* 80305934 00302874 39 61 00 60 */ addi r11, r1, 0x60 -/* 80305938 00302878 48 05 C8 A5 */ bl func_803621DC +/* 80305938 00302878 48 05 C8 A5 */ bl _savegpr_29 /* 8030593C 0030287C 7C 7F 1B 78 */ mr r31, r3 /* 80305940 00302880 54 83 06 3E */ clrlwi r3, r4, 0x18 /* 80305944 00302884 28 03 00 01 */ cmplwi r3, 1 @@ -2594,7 +2594,7 @@ lbl_80305C4C: /* 80305C54 00302B94 41 80 FF C8 */ blt lbl_80305C1C lbl_80305C58: /* 80305C58 00302B98 39 61 00 60 */ addi r11, r1, 0x60 -/* 80305C5C 00302B9C 48 05 C5 CD */ bl func_80362228 +/* 80305C5C 00302B9C 48 05 C5 CD */ bl _restgpr_29 /* 80305C60 00302BA0 80 01 00 64 */ lwz r0, 0x64(r1) /* 80305C64 00302BA4 7C 08 03 A6 */ mtlr r0 /* 80305C68 00302BA8 38 21 00 60 */ addi r1, r1, 0x60 @@ -2606,7 +2606,7 @@ J2DPictureEx_NS_setTevKColorSel: /* 80305C74 00302BB4 7C 08 02 A6 */ mflr r0 /* 80305C78 00302BB8 90 01 00 24 */ stw r0, 0x24(r1) /* 80305C7C 00302BBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80305C80 00302BC0 48 05 C5 5D */ bl func_803621DC +/* 80305C80 00302BC0 48 05 C5 5D */ bl _savegpr_29 /* 80305C84 00302BC4 7C 7D 1B 78 */ mr r29, r3 /* 80305C88 00302BC8 3B C0 00 00 */ li r30, 0 /* 80305C8C 00302BCC 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -2643,7 +2643,7 @@ lbl_80305CF4: /* 80305CF8 00302C38 7C 00 F8 40 */ cmplw r0, r31 /* 80305CFC 00302C3C 41 80 FF 98 */ blt lbl_80305C94 /* 80305D00 00302C40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80305D04 00302C44 48 05 C5 25 */ bl func_80362228 +/* 80305D04 00302C44 48 05 C5 25 */ bl _restgpr_29 /* 80305D08 00302C48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80305D0C 00302C4C 7C 08 03 A6 */ mtlr r0 /* 80305D10 00302C50 38 21 00 20 */ addi r1, r1, 0x20 @@ -2655,7 +2655,7 @@ J2DPictureEx_NS_setTevKAlphaSel: /* 80305D1C 00302C5C 7C 08 02 A6 */ mflr r0 /* 80305D20 00302C60 90 01 00 24 */ stw r0, 0x24(r1) /* 80305D24 00302C64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80305D28 00302C68 48 05 C4 B5 */ bl func_803621DC +/* 80305D28 00302C68 48 05 C4 B5 */ bl _savegpr_29 /* 80305D2C 00302C6C 7C 7D 1B 78 */ mr r29, r3 /* 80305D30 00302C70 3B C0 00 00 */ li r30, 0 /* 80305D34 00302C74 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -2692,7 +2692,7 @@ lbl_80305D9C: /* 80305DA0 00302CE0 7C 00 F8 40 */ cmplw r0, r31 /* 80305DA4 00302CE4 41 80 FF 98 */ blt lbl_80305D3C /* 80305DA8 00302CE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80305DAC 00302CEC 48 05 C4 7D */ bl func_80362228 +/* 80305DAC 00302CEC 48 05 C4 7D */ bl _restgpr_29 /* 80305DB0 00302CF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80305DB4 00302CF4 7C 08 03 A6 */ mtlr r0 /* 80305DB8 00302CF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3049,7 +3049,7 @@ lbl_80306280: /* 8030629C 003031DC 7C 08 02 A6 */ mflr r0 /* 803062A0 003031E0 90 01 00 24 */ stw r0, 0x24(r1) /* 803062A4 003031E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803062A8 003031E8 48 05 BF 35 */ bl func_803621DC +/* 803062A8 003031E8 48 05 BF 35 */ bl _savegpr_29 /* 803062AC 003031EC 7C 7D 1B 78 */ mr r29, r3 /* 803062B0 003031F0 7C BE 2B 78 */ mr r30, r5 /* 803062B4 003031F4 7C DF 33 78 */ mr r31, r6 @@ -3064,7 +3064,7 @@ lbl_80306280: /* 803062D8 00303218 7D 89 03 A6 */ mtctr r12 /* 803062DC 0030321C 4E 80 04 21 */ bctrl /* 803062E0 00303220 39 61 00 20 */ addi r11, r1, 0x20 -/* 803062E4 00303224 48 05 BF 45 */ bl func_80362228 +/* 803062E4 00303224 48 05 BF 45 */ bl _restgpr_29 /* 803062E8 00303228 80 01 00 24 */ lwz r0, 0x24(r1) /* 803062EC 0030322C 7C 08 03 A6 */ mtlr r0 /* 803062F0 00303230 38 21 00 20 */ addi r1, r1, 0x20 @@ -3570,7 +3570,7 @@ lbl_803069F8: /* 80306A28 00303968 7C 08 02 A6 */ mflr r0 /* 80306A2C 0030396C 90 01 00 24 */ stw r0, 0x24(r1) /* 80306A30 00303970 39 61 00 20 */ addi r11, r1, 0x20 -/* 80306A34 00303974 48 05 B7 A9 */ bl func_803621DC +/* 80306A34 00303974 48 05 B7 A9 */ bl _savegpr_29 /* 80306A38 00303978 7C 7D 1B 78 */ mr r29, r3 /* 80306A3C 0030397C 7C 9E 23 78 */ mr r30, r4 /* 80306A40 00303980 80 63 01 50 */ lwz r3, 0x150(r3) @@ -3605,7 +3605,7 @@ lbl_80306AA0: /* 80306AA8 003039E8 4B FF 09 89 */ bl J2DPane_NS_isUsed lbl_80306AAC: /* 80306AAC 003039EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80306AB0 003039F0 48 05 B7 79 */ bl func_80362228 +/* 80306AB0 003039F0 48 05 B7 79 */ bl _restgpr_29 /* 80306AB4 003039F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80306AB8 003039F8 7C 08 03 A6 */ mtlr r0 /* 80306ABC 003039FC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index dc7aa835cc6..cc5a8743e38 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -333,7 +333,7 @@ J2DPrint_NS_print: /* 802F477C 002F16BC 7C 08 02 A6 */ mflr r0 /* 802F4780 002F16C0 90 01 00 94 */ stw r0, 0x94(r1) /* 802F4784 002F16C4 39 61 00 90 */ addi r11, r1, 0x90 -/* 802F4788 002F16C8 48 06 DA 55 */ bl func_803621DC +/* 802F4788 002F16C8 48 06 DA 55 */ bl _savegpr_29 /* 802F478C 002F16CC 7C 7D 1B 78 */ mr r29, r3 /* 802F4790 002F16D0 7C 9E 23 78 */ mr r30, r4 /* 802F4794 002F16D4 7C BF 2B 78 */ mr r31, r5 @@ -369,7 +369,7 @@ lbl_802F47BC: /* 802F4808 002F1748 7F E5 FB 78 */ mr r5, r31 /* 802F480C 002F174C 4B FF FA E5 */ bl J2DPrint_print_alpha_va /* 802F4810 002F1750 39 61 00 90 */ addi r11, r1, 0x90 -/* 802F4814 002F1754 48 06 DA 15 */ bl func_80362228 +/* 802F4814 002F1754 48 06 DA 15 */ bl _restgpr_29 /* 802F4818 002F1758 80 01 00 94 */ lwz r0, 0x94(r1) /* 802F481C 002F175C 7C 08 03 A6 */ mtlr r0 /* 802F4820 002F1760 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/J2DGraph/J2DTevs.s b/asm/J2DGraph/J2DTevs.s index 55d98234af0..5362b5385d2 100644 --- a/asm/J2DGraph/J2DTevs.s +++ b/asm/J2DGraph/J2DTevs.s @@ -60,7 +60,7 @@ J2DTexMtx_NS_getTextureMtx: /* 802E9D40 002E6C80 DB C1 00 20 */ stfd f30, 0x20(r1) /* 802E9D44 002E6C84 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 802E9D48 002E6C88 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E9D4C 002E6C8C 48 07 84 91 */ bl func_803621DC +/* 802E9D4C 002E6C8C 48 07 84 91 */ bl _savegpr_29 /* 802E9D50 002E6C90 7C 9D 23 78 */ mr r29, r4 /* 802E9D54 002E6C94 7C BE 2B 78 */ mr r30, r5 /* 802E9D58 002E6C98 7C DF 33 78 */ mr r31, r6 @@ -147,7 +147,7 @@ J2DTexMtx_NS_getTextureMtx: /* 802E9E9C 002E6DDC E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 802E9EA0 002E6DE0 CB C1 00 20 */ lfd f30, 0x20(r1) /* 802E9EA4 002E6DE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E9EA8 002E6DE8 48 07 83 81 */ bl func_80362228 +/* 802E9EA8 002E6DE8 48 07 83 81 */ bl _restgpr_29 /* 802E9EAC 002E6DEC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802E9EB0 002E6DF0 7C 08 03 A6 */ mtlr r0 /* 802E9EB4 002E6DF4 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s index a29474dc009..6e09fc0743e 100644 --- a/asm/J2DGraph/J2DTextBox.s +++ b/asm/J2DGraph/J2DTextBox.s @@ -977,7 +977,7 @@ J2DTextBox_NS_draw_X1_: /* 803004AC 002FD3EC DB A1 00 C0 */ stfd f29, 0xc0(r1) /* 803004B0 002FD3F0 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, qr0 /* 803004B4 002FD3F4 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 803004B8 002FD3F8 48 06 1D 25 */ bl func_803621DC +/* 803004B8 002FD3F8 48 06 1D 25 */ bl _savegpr_29 /* 803004BC 002FD3FC 7C 7D 1B 78 */ mr r29, r3 /* 803004C0 002FD400 FF A0 08 90 */ fmr f29, f1 /* 803004C4 002FD404 FF C0 10 90 */ fmr f30, f2 @@ -1083,7 +1083,7 @@ lbl_80300628: /* 80300638 002FD578 E3 A1 00 C8 */ psq_l f29, 200(r1), 0, qr0 /* 8030063C 002FD57C CB A1 00 C0 */ lfd f29, 0xc0(r1) /* 80300640 002FD580 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80300644 002FD584 48 06 1B E5 */ bl func_80362228 +/* 80300644 002FD584 48 06 1B E5 */ bl _restgpr_29 /* 80300648 002FD588 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8030064C 002FD58C 7C 08 03 A6 */ mtlr r0 /* 80300650 002FD590 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -1100,7 +1100,7 @@ J2DTextBox_NS_setString: /* 80300664 002FD5A4 7C 08 02 A6 */ mflr r0 /* 80300668 002FD5A8 90 01 00 94 */ stw r0, 0x94(r1) /* 8030066C 002FD5AC 39 61 00 90 */ addi r11, r1, 0x90 -/* 80300670 002FD5B0 48 06 1B 6D */ bl func_803621DC +/* 80300670 002FD5B0 48 06 1B 6D */ bl _savegpr_29 /* 80300674 002FD5B4 7C 7D 1B 78 */ mr r29, r3 /* 80300678 002FD5B8 7C 9E 23 78 */ mr r30, r4 /* 8030067C 002FD5BC 40 86 00 24 */ bne cr1, lbl_803006A0 @@ -1153,7 +1153,7 @@ lbl_803006FC: lbl_80300730: /* 80300730 002FD670 7F E3 FB 78 */ mr r3, r31 /* 80300734 002FD674 39 61 00 90 */ addi r11, r1, 0x90 -/* 80300738 002FD678 48 06 1A F1 */ bl func_80362228 +/* 80300738 002FD678 48 06 1A F1 */ bl _restgpr_29 /* 8030073C 002FD67C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80300740 002FD680 7C 08 03 A6 */ mtlr r0 /* 80300744 002FD684 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/J2DGraph/J2DWindow.s b/asm/J2DGraph/J2DWindow.s index 51bfeb3d38c..f65abb207af 100644 --- a/asm/J2DGraph/J2DWindow.s +++ b/asm/J2DGraph/J2DWindow.s @@ -1362,7 +1362,7 @@ lbl_802FAE54: /* 802FAED4 002F7E14 7C 08 02 A6 */ mflr r0 /* 802FAED8 002F7E18 90 01 00 64 */ stw r0, 0x64(r1) /* 802FAEDC 002F7E1C 39 61 00 60 */ addi r11, r1, 0x60 -/* 802FAEE0 002F7E20 48 06 72 FD */ bl func_803621DC +/* 802FAEE0 002F7E20 48 06 72 FD */ bl _savegpr_29 /* 802FAEE4 002F7E24 7C 7D 1B 78 */ mr r29, r3 /* 802FAEE8 002F7E28 7C 9E 23 78 */ mr r30, r4 /* 802FAEEC 002F7E2C 7C BF 2B 78 */ mr r31, r5 @@ -1430,7 +1430,7 @@ lbl_802FAE54: /* 802FAFE4 002F7F24 48 06 52 69 */ bl GXLoadPosMtxImm lbl_802FAFE8: /* 802FAFE8 002F7F28 39 61 00 60 */ addi r11, r1, 0x60 -/* 802FAFEC 002F7F2C 48 06 72 3D */ bl func_80362228 +/* 802FAFEC 002F7F2C 48 06 72 3D */ bl _restgpr_29 /* 802FAFF0 002F7F30 80 01 00 64 */ lwz r0, 0x64(r1) /* 802FAFF4 002F7F34 7C 08 03 A6 */ mtlr r0 /* 802FAFF8 002F7F38 38 21 00 60 */ addi r1, r1, 0x60 @@ -1652,7 +1652,7 @@ lbl_802FB318: /* 802FB33C 002F827C 7C 08 02 A6 */ mflr r0 /* 802FB340 002F8280 90 01 00 34 */ stw r0, 0x34(r1) /* 802FB344 002F8284 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FB348 002F8288 48 06 6E 95 */ bl func_803621DC +/* 802FB348 002F8288 48 06 6E 95 */ bl _savegpr_29 /* 802FB34C 002F828C 7C 7E 1B 78 */ mr r30, r3 /* 802FB350 002F8290 7C 9F 23 78 */ mr r31, r4 /* 802FB354 002F8294 38 00 00 00 */ li r0, 0 @@ -1841,7 +1841,7 @@ lbl_802FB5CC: /* 802FB618 002F8558 48 00 02 51 */ bl J2DWindow_NS_drawContentsTexture lbl_802FB61C: /* 802FB61C 002F855C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FB620 002F8560 48 06 6C 09 */ bl func_80362228 +/* 802FB620 002F8560 48 06 6C 09 */ bl _restgpr_29 /* 802FB624 002F8564 80 01 00 34 */ lwz r0, 0x34(r1) /* 802FB628 002F8568 7C 08 03 A6 */ mtlr r0 /* 802FB62C 002F856C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2207,7 +2207,7 @@ J2DWindow_NS_setTevMode: /* 802FBB94 002F8AD4 7C 08 02 A6 */ mflr r0 /* 802FBB98 002F8AD8 90 01 00 34 */ stw r0, 0x34(r1) /* 802FBB9C 002F8ADC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FBBA0 002F8AE0 48 06 66 3D */ bl func_803621DC +/* 802FBBA0 002F8AE0 48 06 66 3D */ bl _savegpr_29 /* 802FBBA4 002F8AE4 7C 9D 23 78 */ mr r29, r4 /* 802FBBA8 002F8AE8 7C BE 2B 78 */ mr r30, r5 /* 802FBBAC 002F8AEC 7C DF 33 78 */ mr r31, r6 @@ -2384,7 +2384,7 @@ lbl_802FBE18: /* 802FBE40 002F8D80 38 C0 00 0F */ li r6, 0xf /* 802FBE44 002F8D84 48 06 3D AD */ bl GXSetBlendMode /* 802FBE48 002F8D88 39 61 00 30 */ addi r11, r1, 0x30 -/* 802FBE4C 002F8D8C 48 06 63 DD */ bl func_80362228 +/* 802FBE4C 002F8D8C 48 06 63 DD */ bl _restgpr_29 /* 802FBE50 002F8D90 80 01 00 34 */ lwz r0, 0x34(r1) /* 802FBE54 002F8D94 7C 08 03 A6 */ mtlr r0 /* 802FBE58 002F8D98 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index 3304d59125f..cf0789644e1 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -868,7 +868,7 @@ lbl_8030194C: /* 803019B8 002FE8F8 DB 81 00 40 */ stfd f28, 0x40(r1) /* 803019BC 002FE8FC F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 803019C0 002FE900 39 61 00 40 */ addi r11, r1, 0x40 -/* 803019C4 002FE904 48 06 08 19 */ bl func_803621DC +/* 803019C4 002FE904 48 06 08 19 */ bl _savegpr_29 /* 803019C8 002FE908 7C 7D 1B 78 */ mr r29, r3 /* 803019CC 002FE90C 7C 9E 23 78 */ mr r30, r4 /* 803019D0 002FE910 38 00 00 00 */ li r0, 0 @@ -1109,7 +1109,7 @@ lbl_80301D3C: /* 80301D54 002FEC94 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 80301D58 002FEC98 CB 81 00 40 */ lfd f28, 0x40(r1) /* 80301D5C 002FEC9C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80301D60 002FECA0 48 06 04 C9 */ bl func_80362228 +/* 80301D60 002FECA0 48 06 04 C9 */ bl _restgpr_29 /* 80301D64 002FECA4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80301D68 002FECA8 7C 08 03 A6 */ mtlr r0 /* 80301D6C 002FECAC 38 21 00 80 */ addi r1, r1, 0x80 @@ -1384,7 +1384,7 @@ lbl_8030214C: /* 80302168 002FF0A8 7C 08 02 A6 */ mflr r0 /* 8030216C 002FF0AC 90 01 00 64 */ stw r0, 0x64(r1) /* 80302170 002FF0B0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80302174 002FF0B4 48 06 00 69 */ bl func_803621DC +/* 80302174 002FF0B4 48 06 00 69 */ bl _savegpr_29 /* 80302178 002FF0B8 7C 7D 1B 78 */ mr r29, r3 /* 8030217C 002FF0BC 7C 9E 23 78 */ mr r30, r4 /* 80302180 002FF0C0 7C BF 2B 78 */ mr r31, r5 @@ -1449,7 +1449,7 @@ lbl_80302244: /* 80302264 002FF1A4 38 80 00 00 */ li r4, 0 /* 80302268 002FF1A8 48 05 DF E5 */ bl GXLoadPosMtxImm /* 8030226C 002FF1AC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80302270 002FF1B0 48 05 FF B9 */ bl func_80362228 +/* 80302270 002FF1B0 48 05 FF B9 */ bl _restgpr_29 /* 80302274 002FF1B4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80302278 002FF1B8 7C 08 03 A6 */ mtlr r0 /* 8030227C 002FF1BC 38 21 00 60 */ addi r1, r1, 0x60 @@ -2111,7 +2111,7 @@ J2DWindowEx_NS_isSetBlackWhite: /* 80302BEC 002FFB2C 7C 08 02 A6 */ mflr r0 /* 80302BF0 002FFB30 90 01 00 24 */ stw r0, 0x24(r1) /* 80302BF4 002FFB34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302BF8 002FFB38 48 05 F5 E5 */ bl func_803621DC +/* 80302BF8 002FFB38 48 05 F5 E5 */ bl _savegpr_29 /* 80302BFC 002FFB3C 7C 7D 1B 78 */ mr r29, r3 /* 80302C00 002FFB40 80 04 00 00 */ lwz r0, 0(r4) /* 80302C04 002FFB44 28 00 00 00 */ cmplwi r0, 0 @@ -2146,7 +2146,7 @@ lbl_80302C5C: /* 80302C6C 002FFBAC 38 60 00 01 */ li r3, 1 lbl_80302C70: /* 80302C70 002FFBB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80302C74 002FFBB4 48 05 F5 B5 */ bl func_80362228 +/* 80302C74 002FFBB4 48 05 F5 B5 */ bl _restgpr_29 /* 80302C78 002FFBB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80302C7C 002FFBBC 7C 08 03 A6 */ mtlr r0 /* 80302C80 002FFBC0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2398,7 +2398,7 @@ lbl_80302FE4: /* 80303000 002FFF40 7C 08 02 A6 */ mflr r0 /* 80303004 002FFF44 90 01 00 24 */ stw r0, 0x24(r1) /* 80303008 002FFF48 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030300C 002FFF4C 48 05 F1 D1 */ bl func_803621DC +/* 8030300C 002FFF4C 48 05 F1 D1 */ bl _savegpr_29 /* 80303010 002FFF50 7C 7D 1B 78 */ mr r29, r3 /* 80303014 002FFF54 7C 9E 23 78 */ mr r30, r4 /* 80303018 002FFF58 3B E0 00 00 */ li r31, 0 @@ -2427,7 +2427,7 @@ lbl_8030304C: /* 80303068 002FFFA8 4B FE 78 35 */ bl J2DMaterial_NS_setAnimation lbl_8030306C: /* 8030306C 002FFFAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303070 002FFFB0 48 05 F1 B9 */ bl func_80362228 +/* 80303070 002FFFB0 48 05 F1 B9 */ bl _restgpr_29 /* 80303074 002FFFB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80303078 002FFFB8 7C 08 03 A6 */ mtlr r0 /* 8030307C 002FFFBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2436,7 +2436,7 @@ lbl_8030306C: /* 80303088 002FFFC8 7C 08 02 A6 */ mflr r0 /* 8030308C 002FFFCC 90 01 00 24 */ stw r0, 0x24(r1) /* 80303090 002FFFD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303094 002FFFD4 48 05 F1 49 */ bl func_803621DC +/* 80303094 002FFFD4 48 05 F1 49 */ bl _savegpr_29 /* 80303098 002FFFD8 7C 7D 1B 78 */ mr r29, r3 /* 8030309C 002FFFDC 7C 9E 23 78 */ mr r30, r4 /* 803030A0 002FFFE0 3B E0 00 00 */ li r31, 0 @@ -2465,7 +2465,7 @@ lbl_803030D4: /* 803030F0 00300030 4B FE 78 5D */ bl J2DMaterial_NS_setAnimation_X1_ lbl_803030F4: /* 803030F4 00300034 39 61 00 20 */ addi r11, r1, 0x20 -/* 803030F8 00300038 48 05 F1 31 */ bl func_80362228 +/* 803030F8 00300038 48 05 F1 31 */ bl _restgpr_29 /* 803030FC 0030003C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80303100 00300040 7C 08 03 A6 */ mtlr r0 /* 80303104 00300044 38 21 00 20 */ addi r1, r1, 0x20 @@ -2474,7 +2474,7 @@ lbl_803030F4: /* 80303110 00300050 7C 08 02 A6 */ mflr r0 /* 80303114 00300054 90 01 00 24 */ stw r0, 0x24(r1) /* 80303118 00300058 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030311C 0030005C 48 05 F0 C1 */ bl func_803621DC +/* 8030311C 0030005C 48 05 F0 C1 */ bl _savegpr_29 /* 80303120 00300060 7C 7D 1B 78 */ mr r29, r3 /* 80303124 00300064 7C 9E 23 78 */ mr r30, r4 /* 80303128 00300068 3B E0 00 00 */ li r31, 0 @@ -2503,7 +2503,7 @@ lbl_8030315C: /* 80303178 003000B8 4B FE 78 B5 */ bl J2DMaterial_NS_setAnimation_X2_ lbl_8030317C: /* 8030317C 003000BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303180 003000C0 48 05 F0 A9 */ bl func_80362228 +/* 80303180 003000C0 48 05 F0 A9 */ bl _restgpr_29 /* 80303184 003000C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80303188 003000C8 7C 08 03 A6 */ mtlr r0 /* 8030318C 003000CC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2512,7 +2512,7 @@ lbl_8030317C: /* 80303198 003000D8 7C 08 02 A6 */ mflr r0 /* 8030319C 003000DC 90 01 00 24 */ stw r0, 0x24(r1) /* 803031A0 003000E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 803031A4 003000E4 48 05 F0 39 */ bl func_803621DC +/* 803031A4 003000E4 48 05 F0 39 */ bl _savegpr_29 /* 803031A8 003000E8 7C 7D 1B 78 */ mr r29, r3 /* 803031AC 003000EC 7C 9E 23 78 */ mr r30, r4 /* 803031B0 003000F0 3B E0 00 00 */ li r31, 0 @@ -2541,7 +2541,7 @@ lbl_803031E4: /* 80303200 00300140 4B FE 79 0D */ bl J2DMaterial_NS_setAnimation_X3_ lbl_80303204: /* 80303204 00300144 39 61 00 20 */ addi r11, r1, 0x20 -/* 80303208 00300148 48 05 F0 21 */ bl func_80362228 +/* 80303208 00300148 48 05 F0 21 */ bl _restgpr_29 /* 8030320C 0030014C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80303210 00300150 7C 08 03 A6 */ mtlr r0 /* 80303214 00300154 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DAnimation.s b/asm/J3DGraphAnimator/J3DAnimation.s index 55ea556901c..94916c00c4f 100644 --- a/asm/J3DGraphAnimator/J3DAnimation.s +++ b/asm/J3DGraphAnimator/J3DAnimation.s @@ -2363,7 +2363,7 @@ lbl_8032A514: /* 8032A548 00327488 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8032A54C 0032748C F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8032A550 00327490 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032A554 00327494 48 03 7C 89 */ bl func_803621DC +/* 8032A554 00327494 48 03 7C 89 */ bl _savegpr_29 /* 8032A558 00327498 7C 7D 1B 78 */ mr r29, r3 /* 8032A55C 0032749C 7C DE 33 78 */ mr r30, r6 /* 8032A560 003274A0 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d @@ -2563,7 +2563,7 @@ lbl_8032A808: /* 8032A808 00327748 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8032A80C 0032774C CB E1 00 30 */ lfd f31, 0x30(r1) /* 8032A810 00327750 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032A814 00327754 48 03 7A 15 */ bl func_80362228 +/* 8032A814 00327754 48 03 7A 15 */ bl _restgpr_29 /* 8032A818 00327758 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032A81C 0032775C 7C 08 03 A6 */ mtlr r0 /* 8032A820 00327760 38 21 00 40 */ addi r1, r1, 0x40 @@ -2802,7 +2802,7 @@ J3DAnmColorKey: /* 8032AB60 00327AA0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8032AB64 00327AA4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8032AB68 00327AA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032AB6C 00327AAC 48 03 76 71 */ bl func_803621DC +/* 8032AB6C 00327AAC 48 03 76 71 */ bl _savegpr_29 /* 8032AB70 00327AB0 7C 7D 1B 78 */ mr r29, r3 /* 8032AB74 00327AB4 7C BE 2B 78 */ mr r30, r5 /* 8032AB78 00327AB8 80 63 00 3C */ lwz r3, 0x3c(r3) @@ -2992,7 +2992,7 @@ lbl_8032ADF8: /* 8032ADF8 00327D38 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8032ADFC 00327D3C CB E1 00 30 */ lfd f31, 0x30(r1) /* 8032AE00 00327D40 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032AE04 00327D44 48 03 74 25 */ bl func_80362228 +/* 8032AE04 00327D44 48 03 74 25 */ bl _restgpr_29 /* 8032AE08 00327D48 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032AE0C 00327D4C 7C 08 03 A6 */ mtlr r0 /* 8032AE10 00327D50 38 21 00 40 */ addi r1, r1, 0x40 @@ -3290,7 +3290,7 @@ J3DAnmTevRegKey_NS_getTevColorReg: /* 8032B204 00328144 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8032B208 00328148 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8032B20C 0032814C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032B210 00328150 48 03 6F CD */ bl func_803621DC +/* 8032B210 00328150 48 03 6F CD */ bl _savegpr_29 /* 8032B214 00328154 7C 7D 1B 78 */ mr r29, r3 /* 8032B218 00328158 7C BE 2B 78 */ mr r30, r5 /* 8032B21C 0032815C 80 63 00 48 */ lwz r3, 0x48(r3) @@ -3480,7 +3480,7 @@ lbl_8032B49C: /* 8032B49C 003283DC E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8032B4A0 003283E0 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8032B4A4 003283E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032B4A8 003283E8 48 03 6D 81 */ bl func_80362228 +/* 8032B4A8 003283E8 48 03 6D 81 */ bl _restgpr_29 /* 8032B4AC 003283EC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032B4B0 003283F0 7C 08 03 A6 */ mtlr r0 /* 8032B4B4 003283F4 38 21 00 40 */ addi r1, r1, 0x40 @@ -3494,7 +3494,7 @@ J3DAnmTevRegKey_NS_getTevKonstReg: /* 8032B4C8 00328408 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8032B4CC 0032840C F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8032B4D0 00328410 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032B4D4 00328414 48 03 6D 09 */ bl func_803621DC +/* 8032B4D4 00328414 48 03 6D 09 */ bl _savegpr_29 /* 8032B4D8 00328418 7C 7D 1B 78 */ mr r29, r3 /* 8032B4DC 0032841C 7C BE 2B 78 */ mr r30, r5 /* 8032B4E0 00328420 80 63 00 4C */ lwz r3, 0x4c(r3) @@ -3684,7 +3684,7 @@ lbl_8032B760: /* 8032B760 003286A0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8032B764 003286A4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8032B768 003286A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032B76C 003286AC 48 03 6A BD */ bl func_80362228 +/* 8032B76C 003286AC 48 03 6A BD */ bl _restgpr_29 /* 8032B770 003286B0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032B774 003286B4 7C 08 03 A6 */ mtlr r0 /* 8032B778 003286B8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphAnimator/J3DCluster.s b/asm/J3DGraphAnimator/J3DCluster.s index 092dcb4f7d2..1367d095cf2 100644 --- a/asm/J3DGraphAnimator/J3DCluster.s +++ b/asm/J3DGraphAnimator/J3DCluster.s @@ -60,7 +60,7 @@ J3DDeformData_NS_deform_X1_: /* 8032E29C 0032B1DC 7C 08 02 A6 */ mflr r0 /* 8032E2A0 0032B1E0 90 01 00 24 */ stw r0, 0x24(r1) /* 8032E2A4 0032B1E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032E2A8 0032B1E8 48 03 3F 35 */ bl func_803621DC +/* 8032E2A8 0032B1E8 48 03 3F 35 */ bl _savegpr_29 /* 8032E2AC 0032B1EC 7C 7D 1B 78 */ mr r29, r3 /* 8032E2B0 0032B1F0 7C 9F 23 78 */ mr r31, r4 /* 8032E2B4 0032B1F4 80 64 00 04 */ lwz r3, 4(r4) @@ -104,7 +104,7 @@ lbl_8032E300: /* 8032E344 0032B284 80 1F 00 0C */ lwz r0, 0xc(r31) /* 8032E348 0032B288 90 1F 00 30 */ stw r0, 0x30(r31) /* 8032E34C 0032B28C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032E350 0032B290 48 03 3E D9 */ bl func_80362228 +/* 8032E350 0032B290 48 03 3E D9 */ bl _restgpr_29 /* 8032E354 0032B294 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032E358 0032B298 7C 08 03 A6 */ mtlr r0 /* 8032E35C 0032B29C 38 21 00 20 */ addi r1, r1, 0x20 @@ -212,7 +212,7 @@ J3DDeformer_NS_deform_VtxPosF32: /* 8032E4A8 0032B3E8 7C 08 02 A6 */ mflr r0 /* 8032E4AC 0032B3EC 90 01 00 24 */ stw r0, 0x24(r1) /* 8032E4B0 0032B3F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032E4B4 0032B3F4 48 03 3D 29 */ bl func_803621DC +/* 8032E4B4 0032B3F4 48 03 3D 29 */ bl _savegpr_29 /* 8032E4B8 0032B3F8 A0 05 00 12 */ lhz r0, 0x12(r5) /* 8032E4BC 0032B3FC A1 05 00 10 */ lhz r8, 0x10(r5) /* 8032E4C0 0032B400 80 84 00 04 */ lwz r4, 4(r4) @@ -299,7 +299,7 @@ lbl_8032E5E8: /* 8032E5EC 0032B52C 7C 03 00 00 */ cmpw r3, r0 /* 8032E5F0 0032B530 41 80 FF 34 */ blt lbl_8032E524 /* 8032E5F4 0032B534 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032E5F8 0032B538 48 03 3C 31 */ bl func_80362228 +/* 8032E5F8 0032B538 48 03 3C 31 */ bl _restgpr_29 /* 8032E5FC 0032B53C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032E600 0032B540 7C 08 03 A6 */ mtlr r0 /* 8032E604 0032B544 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index ba161fc3fac..8b43975115d 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -157,7 +157,7 @@ J3DModel_NS_createShapePacket: /* 80327304 00324244 7C 08 02 A6 */ mflr r0 /* 80327308 00324248 90 01 00 24 */ stw r0, 0x24(r1) /* 8032730C 0032424C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80327310 00324250 48 03 AE CD */ bl func_803621DC +/* 80327310 00324250 48 03 AE CD */ bl _savegpr_29 /* 80327314 00324254 7C 7E 1B 78 */ mr r30, r3 /* 80327318 00324258 7C 9F 23 78 */ mr r31, r4 /* 8032731C 0032425C A0 04 00 7C */ lhz r0, 0x7c(r4) @@ -208,7 +208,7 @@ lbl_803273B0: /* 803273B0 003242F0 38 60 00 00 */ li r3, 0 lbl_803273B4: /* 803273B4 003242F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803273B8 003242F8 48 03 AE 71 */ bl func_80362228 +/* 803273B8 003242F8 48 03 AE 71 */ bl _restgpr_29 /* 803273BC 003242FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 803273C0 00324300 7C 08 03 A6 */ mtlr r0 /* 803273C4 00324304 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DModelData.s b/asm/J3DGraphAnimator/J3DModelData.s index e1af0c31672..2940c277676 100644 --- a/asm/J3DGraphAnimator/J3DModelData.s +++ b/asm/J3DGraphAnimator/J3DModelData.s @@ -160,7 +160,7 @@ J3DModelData_NS_makeSharedDL: /* 80325F98 00322ED8 7C 08 02 A6 */ mflr r0 /* 80325F9C 00322EDC 90 01 00 24 */ stw r0, 0x24(r1) /* 80325FA0 00322EE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325FA4 00322EE4 48 03 C2 39 */ bl func_803621DC +/* 80325FA4 00322EE4 48 03 C2 39 */ bl _savegpr_29 /* 80325FA8 00322EE8 7C 7D 1B 78 */ mr r29, r3 /* 80325FAC 00322EEC 80 03 00 6C */ lwz r0, 0x6c(r3) /* 80325FB0 00322EF0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -183,7 +183,7 @@ lbl_80325FE8: /* 80325FEC 00322F2C 7C 00 F8 40 */ cmplw r0, r31 /* 80325FF0 00322F30 41 80 FF D8 */ blt lbl_80325FC8 /* 80325FF4 00322F34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80325FF8 00322F38 48 03 C2 31 */ bl func_80362228 +/* 80325FF8 00322F38 48 03 C2 31 */ bl _restgpr_29 /* 80325FFC 00322F3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80326000 00322F40 7C 08 03 A6 */ mtlr r0 /* 80326004 00322F44 38 21 00 20 */ addi r1, r1, 0x20 @@ -195,7 +195,7 @@ J3DModelData_NS_simpleCalcMaterial: /* 80326010 00322F50 7C 08 02 A6 */ mflr r0 /* 80326014 00322F54 90 01 00 24 */ stw r0, 0x24(r1) /* 80326018 00322F58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032601C 00322F5C 48 03 C1 C1 */ bl func_803621DC +/* 8032601C 00322F5C 48 03 C1 C1 */ bl _savegpr_29 /* 80326020 00322F60 7C 7F 1B 78 */ mr r31, r3 /* 80326024 00322F64 7C 9E 23 78 */ mr r30, r4 /* 80326028 00322F68 7C BD 2B 78 */ mr r29, r5 @@ -241,7 +241,7 @@ lbl_803260AC: /* 803260AC 00322FEC 28 1E 00 00 */ cmplwi r30, 0 /* 803260B0 00322FF0 40 82 FF 98 */ bne lbl_80326048 /* 803260B4 00322FF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803260B8 00322FF8 48 03 C1 71 */ bl func_80362228 +/* 803260B8 00322FF8 48 03 C1 71 */ bl _restgpr_29 /* 803260BC 00322FFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 803260C0 00323000 7C 08 03 A6 */ mtlr r0 /* 803260C4 00323004 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DMtxBuffer.s b/asm/J3DGraphAnimator/J3DMtxBuffer.s index 369d1b2d437..cfa4c15a247 100644 --- a/asm/J3DGraphAnimator/J3DMtxBuffer.s +++ b/asm/J3DGraphAnimator/J3DMtxBuffer.s @@ -525,7 +525,7 @@ J3DMtxBuffer_NS_calcWeightEnvelopeMtx: /* 80326900 00323840 DB 61 00 20 */ stfd f27, 0x20(r1) /* 80326904 00323844 F3 61 00 28 */ psq_st f27, 40(r1), 0, qr0 /* 80326908 00323848 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032690C 0032384C 48 03 B8 D1 */ bl func_803621DC +/* 8032690C 0032384C 48 03 B8 D1 */ bl _savegpr_29 /* 80326910 00323850 38 ED 83 F8 */ addi r7, r13, lbl_80450978-_SDA_BASE_ /* 80326914 00323854 3B E0 FF FF */ li r31, -1 /* 80326918 00323858 38 80 FF D0 */ li r4, -48 @@ -635,7 +635,7 @@ lbl_80326A7C: /* 80326AAC 003239EC E3 61 00 28 */ psq_l f27, 40(r1), 0, qr0 /* 80326AB0 003239F0 CB 61 00 20 */ lfd f27, 0x20(r1) /* 80326AB4 003239F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80326AB8 003239F8 48 03 B7 71 */ bl func_80362228 +/* 80326AB8 003239F8 48 03 B7 71 */ bl _restgpr_29 /* 80326ABC 003239FC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80326AC0 00323A00 7C 08 03 A6 */ mtlr r0 /* 80326AC4 00323A04 38 21 00 70 */ addi r1, r1, 0x70 @@ -819,7 +819,7 @@ J3DMtxBuffer_NS_calcNrmMtx: /* 80326D40 00323C80 7C 08 02 A6 */ mflr r0 /* 80326D44 00323C84 90 01 00 24 */ stw r0, 0x24(r1) /* 80326D48 00323C88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80326D4C 00323C8C 48 03 B4 91 */ bl func_803621DC +/* 80326D4C 00323C8C 48 03 B4 91 */ bl _savegpr_29 /* 80326D50 00323C90 7C 7E 1B 78 */ mr r30, r3 /* 80326D54 00323C94 80 63 00 00 */ lwz r3, 0(r3) /* 80326D58 00323C98 A3 A3 00 34 */ lhz r29, 0x34(r3) @@ -925,7 +925,7 @@ lbl_80326ECC: /* 80326ED0 00323E10 7C 00 E8 40 */ cmplw r0, r29 /* 80326ED4 00323E14 41 80 FE 90 */ blt lbl_80326D64 /* 80326ED8 00323E18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80326EDC 00323E1C 48 03 B3 4D */ bl func_80362228 +/* 80326EDC 00323E1C 48 03 B3 4D */ bl _restgpr_29 /* 80326EE0 00323E20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80326EE4 00323E24 7C 08 03 A6 */ mtlr r0 /* 80326EE8 00323E28 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index affdb7dafe2..b0e70296b7a 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -1477,7 +1477,7 @@ J3DSkinDeform_NS_deformVtxPos_F32: /* 8032DB54 0032AA94 7C 08 02 A6 */ mflr r0 /* 8032DB58 0032AA98 90 01 00 24 */ stw r0, 0x24(r1) /* 8032DB5C 0032AA9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032DB60 0032AAA0 48 03 46 7D */ bl func_803621DC +/* 8032DB60 0032AAA0 48 03 46 7D */ bl _savegpr_29 /* 8032DB64 0032AAA4 7C 9E 23 78 */ mr r30, r4 /* 8032DB68 0032AAA8 80 05 00 0C */ lwz r0, 0xc(r5) /* 8032DB6C 0032AAAC 90 01 00 08 */ stw r0, 8(r1) @@ -1543,7 +1543,7 @@ lbl_8032DC44: /* 8032DC54 0032AB94 48 00 D9 89 */ bl DCStoreRange /* 8032DC58 0032AB98 93 FE 00 2C */ stw r31, 0x2c(r30) /* 8032DC5C 0032AB9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032DC60 0032ABA0 48 03 45 C9 */ bl func_80362228 +/* 8032DC60 0032ABA0 48 03 45 C9 */ bl _restgpr_29 /* 8032DC64 0032ABA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032DC68 0032ABA8 7C 08 03 A6 */ mtlr r0 /* 8032DC6C 0032ABAC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1711,7 +1711,7 @@ J3DSkinDeform_NS_deformVtxNrm_S16: /* 8032DEC0 0032AE00 7C 08 02 A6 */ mflr r0 /* 8032DEC4 0032AE04 90 01 00 24 */ stw r0, 0x24(r1) /* 8032DEC8 0032AE08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032DECC 0032AE0C 48 03 43 11 */ bl func_803621DC +/* 8032DECC 0032AE0C 48 03 43 11 */ bl _savegpr_29 /* 8032DED0 0032AE10 7C 7D 1B 78 */ mr r29, r3 /* 8032DED4 0032AE14 7C 9F 23 78 */ mr r31, r4 /* 8032DED8 0032AE18 80 64 00 00 */ lwz r3, 0(r4) @@ -1776,7 +1776,7 @@ lbl_8032DFAC: /* 8032DFBC 0032AEFC 48 00 D6 21 */ bl DCStoreRange /* 8032DFC0 0032AF00 93 DF 00 30 */ stw r30, 0x30(r31) /* 8032DFC4 0032AF04 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032DFC8 0032AF08 48 03 42 61 */ bl func_80362228 +/* 8032DFC8 0032AF08 48 03 42 61 */ bl _restgpr_29 /* 8032DFCC 0032AF0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032DFD0 0032AF10 7C 08 03 A6 */ mtlr r0 /* 8032DFD4 0032AF14 38 21 00 20 */ addi r1, r1, 0x20 @@ -1826,7 +1826,7 @@ lbl_8032E03C: /* 8032E068 0032AFA8 7C 08 02 A6 */ mflr r0 /* 8032E06C 0032AFAC 90 01 00 24 */ stw r0, 0x24(r1) /* 8032E070 0032AFB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032E074 0032AFB4 48 03 41 69 */ bl func_803621DC +/* 8032E074 0032AFB4 48 03 41 69 */ bl _savegpr_29 /* 8032E078 0032AFB8 7C 7E 1B 78 */ mr r30, r3 /* 8032E07C 0032AFBC 7C 9F 23 78 */ mr r31, r4 /* 8032E080 0032AFC0 7C BD 2B 78 */ mr r29, r5 @@ -1895,7 +1895,7 @@ lbl_8032E15C: /* 8032E164 0032B0A4 4B FF FD 59 */ bl J3DSkinDeform_NS_deformVtxNrm_S16 lbl_8032E168: /* 8032E168 0032B0A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8032E16C 0032B0AC 48 03 40 BD */ bl func_80362228 +/* 8032E16C 0032B0AC 48 03 40 BD */ bl _restgpr_29 /* 8032E170 0032B0B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032E174 0032B0B4 7C 08 03 A6 */ mtlr r0 /* 8032E178 0032B0B8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DGD.s b/asm/J3DGraphBase/J3DGD.s index b0e56c8148d..da8e2185038 100644 --- a/asm/J3DGraphBase/J3DGD.s +++ b/asm/J3DGraphBase/J3DGD.s @@ -107,7 +107,7 @@ J3DGDSetGenMode_3Param: /* 8030D214 0030A154 7C 08 02 A6 */ mflr r0 /* 8030D218 0030A158 90 01 00 24 */ stw r0, 0x24(r1) /* 8030D21C 0030A15C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030D220 0030A160 48 05 4F BD */ bl func_803621DC +/* 8030D220 0030A160 48 05 4F BD */ bl _savegpr_29 /* 8030D224 0030A164 7C 7D 1B 78 */ mr r29, r3 /* 8030D228 0030A168 7C 9E 23 78 */ mr r30, r4 /* 8030D22C 0030A16C 7C BF 2B 78 */ mr r31, r5 @@ -184,7 +184,7 @@ lbl_8030D24C: /* 8030D344 0030A284 90 04 00 08 */ stw r0, 8(r4) /* 8030D348 0030A288 98 C3 00 00 */ stb r6, 0(r3) /* 8030D34C 0030A28C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8030D350 0030A290 48 05 4E D9 */ bl func_80362228 +/* 8030D350 0030A290 48 05 4E D9 */ bl _restgpr_29 /* 8030D354 0030A294 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030D358 0030A298 7C 08 03 A6 */ mtlr r0 /* 8030D35C 0030A29C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2524,7 +2524,7 @@ J3DGDSetFog: /* 8030F634 0030C574 7C 08 02 A6 */ mflr r0 /* 8030F638 0030C578 90 01 00 34 */ stw r0, 0x34(r1) /* 8030F63C 0030C57C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030F640 0030C580 48 05 2B 9D */ bl func_803621DC +/* 8030F640 0030C580 48 05 2B 9D */ bl _savegpr_29 /* 8030F644 0030C584 7C 7D 1B 78 */ mr r29, r3 /* 8030F648 0030C588 7C 9E 23 78 */ mr r30, r4 /* 8030F64C 0030C58C FC 04 18 00 */ fcmpu cr0, f4, f3 @@ -2740,7 +2740,7 @@ lbl_8030F6D4: /* 8030F974 0030C8B4 90 04 00 08 */ stw r0, 8(r4) /* 8030F978 0030C8B8 98 C3 00 00 */ stb r6, 0(r3) /* 8030F97C 0030C8BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030F980 0030C8C0 48 05 28 A9 */ bl func_80362228 +/* 8030F980 0030C8C0 48 05 28 A9 */ bl _restgpr_29 /* 8030F984 0030C8C4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030F988 0030C8C8 7C 08 03 A6 */ mtlr r0 /* 8030F98C 0030C8CC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DMatBlock.s b/asm/J3DGraphBase/J3DMatBlock.s index 0e519dd147c..c75db9cbf89 100644 --- a/asm/J3DGraphBase/J3DMatBlock.s +++ b/asm/J3DGraphBase/J3DMatBlock.s @@ -1331,7 +1331,7 @@ lbl_80318770: /* 803187F8 00315738 7C 08 02 A6 */ mflr r0 /* 803187FC 0031573C 90 01 00 34 */ stw r0, 0x34(r1) /* 80318800 00315740 39 61 00 30 */ addi r11, r1, 0x30 -/* 80318804 00315744 48 04 99 D9 */ bl func_803621DC +/* 80318804 00315744 48 04 99 D9 */ bl _savegpr_29 /* 80318808 00315748 7C 7F 1B 78 */ mr r31, r3 /* 8031880C 0031574C 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 80318810 00315750 80 64 00 08 */ lwz r3, 8(r4) @@ -1761,7 +1761,7 @@ lbl_80318E8C: /* 80318E94 00315DD4 3B DE 00 04 */ addi r30, r30, 4 /* 80318E98 00315DD8 41 80 FF DC */ blt lbl_80318E74 /* 80318E9C 00315DDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80318EA0 00315DE0 48 04 93 89 */ bl func_80362228 +/* 80318EA0 00315DE0 48 04 93 89 */ bl _restgpr_29 /* 80318EA4 00315DE4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80318EA8 00315DE8 7C 08 03 A6 */ mtlr r0 /* 80318EAC 00315DEC 38 21 00 30 */ addi r1, r1, 0x30 @@ -3746,7 +3746,7 @@ lbl_8031ACB8: /* 8031ACD4 00317C14 7C 08 02 A6 */ mflr r0 /* 8031ACD8 00317C18 90 01 00 24 */ stw r0, 0x24(r1) /* 8031ACDC 00317C1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031ACE0 00317C20 48 04 74 FD */ bl func_803621DC +/* 8031ACE0 00317C20 48 04 74 FD */ bl _savegpr_29 /* 8031ACE4 00317C24 7C 7D 1B 78 */ mr r29, r3 /* 8031ACE8 00317C28 3B C0 00 00 */ li r30, 0 /* 8031ACEC 00317C2C 3B E0 00 00 */ li r31, 0 @@ -3763,7 +3763,7 @@ lbl_8031AD08: /* 8031AD10 00317C50 3B FF 00 04 */ addi r31, r31, 4 /* 8031AD14 00317C54 41 80 FF DC */ blt lbl_8031ACF0 /* 8031AD18 00317C58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031AD1C 00317C5C 48 04 75 0D */ bl func_80362228 +/* 8031AD1C 00317C5C 48 04 75 0D */ bl _restgpr_29 /* 8031AD20 00317C60 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031AD24 00317C64 7C 08 03 A6 */ mtlr r0 /* 8031AD28 00317C68 38 21 00 20 */ addi r1, r1, 0x20 @@ -5936,7 +5936,7 @@ lbl_8031CDE8: /* 8031CE04 00319D44 7C 08 02 A6 */ mflr r0 /* 8031CE08 00319D48 90 01 00 24 */ stw r0, 0x24(r1) /* 8031CE0C 00319D4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CE10 00319D50 48 04 53 CD */ bl func_803621DC +/* 8031CE10 00319D50 48 04 53 CD */ bl _savegpr_29 /* 8031CE14 00319D54 7C 7D 1B 78 */ mr r29, r3 /* 8031CE18 00319D58 3B C0 00 00 */ li r30, 0 /* 8031CE1C 00319D5C 3B E0 00 00 */ li r31, 0 @@ -5954,7 +5954,7 @@ lbl_8031CE3C: /* 8031CE44 00319D84 3B FF 00 02 */ addi r31, r31, 2 /* 8031CE48 00319D88 41 80 FF D8 */ blt lbl_8031CE20 /* 8031CE4C 00319D8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031CE50 00319D90 48 04 53 D9 */ bl func_80362228 +/* 8031CE50 00319D90 48 04 53 D9 */ bl _restgpr_29 /* 8031CE54 00319D94 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031CE58 00319D98 7C 08 03 A6 */ mtlr r0 /* 8031CE5C 00319D9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6078,7 +6078,7 @@ lbl_8031CF90: /* 8031D02C 00319F6C 7C 08 02 A6 */ mflr r0 /* 8031D030 00319F70 90 01 00 34 */ stw r0, 0x34(r1) /* 8031D034 00319F74 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D038 00319F78 48 04 51 A5 */ bl func_803621DC +/* 8031D038 00319F78 48 04 51 A5 */ bl _savegpr_29 /* 8031D03C 00319F7C 7C 7D 1B 78 */ mr r29, r3 /* 8031D040 00319F80 3B C0 00 00 */ li r30, 0 /* 8031D044 00319F84 3B E0 00 00 */ li r31, 0 @@ -6110,7 +6110,7 @@ lbl_8031D084: /* 8031D0A4 00319FE4 3B FF 00 04 */ addi r31, r31, 4 /* 8031D0A8 00319FE8 41 80 FF DC */ blt lbl_8031D084 /* 8031D0AC 00319FEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D0B0 00319FF0 48 04 51 79 */ bl func_80362228 +/* 8031D0B0 00319FF0 48 04 51 79 */ bl _restgpr_29 /* 8031D0B4 00319FF4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031D0B8 00319FF8 7C 08 03 A6 */ mtlr r0 /* 8031D0BC 00319FFC 38 21 00 30 */ addi r1, r1, 0x30 @@ -6317,7 +6317,7 @@ lbl_8031D1E4: /* 8031D3D4 0031A314 7C 08 02 A6 */ mflr r0 /* 8031D3D8 0031A318 90 01 00 24 */ stw r0, 0x24(r1) /* 8031D3DC 0031A31C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D3E0 0031A320 48 04 4D FD */ bl func_803621DC +/* 8031D3E0 0031A320 48 04 4D FD */ bl _savegpr_29 /* 8031D3E4 0031A324 7C 7D 1B 78 */ mr r29, r3 /* 8031D3E8 0031A328 3B C0 00 00 */ li r30, 0 /* 8031D3EC 0031A32C 3B E0 00 00 */ li r31, 0 @@ -6335,7 +6335,7 @@ lbl_8031D40C: /* 8031D414 0031A354 3B FF 00 02 */ addi r31, r31, 2 /* 8031D418 0031A358 41 80 FF D8 */ blt lbl_8031D3F0 /* 8031D41C 0031A35C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D420 0031A360 48 04 4E 09 */ bl func_80362228 +/* 8031D420 0031A360 48 04 4E 09 */ bl _restgpr_29 /* 8031D424 0031A364 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031D428 0031A368 7C 08 03 A6 */ mtlr r0 /* 8031D42C 0031A36C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6344,7 +6344,7 @@ lbl_8031D40C: /* 8031D438 0031A378 7C 08 02 A6 */ mflr r0 /* 8031D43C 0031A37C 90 01 00 34 */ stw r0, 0x34(r1) /* 8031D440 0031A380 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D444 0031A384 48 04 4D 99 */ bl func_803621DC +/* 8031D444 0031A384 48 04 4D 99 */ bl _savegpr_29 /* 8031D448 0031A388 7C 7D 1B 78 */ mr r29, r3 /* 8031D44C 0031A38C 3B C0 00 00 */ li r30, 0 /* 8031D450 0031A390 3B E0 00 00 */ li r31, 0 @@ -6376,7 +6376,7 @@ lbl_8031D490: /* 8031D4B0 0031A3F0 3B FF 00 04 */ addi r31, r31, 4 /* 8031D4B4 0031A3F4 41 80 FF DC */ blt lbl_8031D490 /* 8031D4B8 0031A3F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D4BC 0031A3FC 48 04 4D 6D */ bl func_80362228 +/* 8031D4BC 0031A3FC 48 04 4D 6D */ bl _restgpr_29 /* 8031D4C0 0031A400 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031D4C4 0031A404 7C 08 03 A6 */ mtlr r0 /* 8031D4C8 0031A408 38 21 00 30 */ addi r1, r1, 0x30 @@ -6549,7 +6549,7 @@ lbl_8031D5FC: /* 8031D75C 0031A69C 7C 08 02 A6 */ mflr r0 /* 8031D760 0031A6A0 90 01 00 24 */ stw r0, 0x24(r1) /* 8031D764 0031A6A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D768 0031A6A8 48 04 4A 75 */ bl func_803621DC +/* 8031D768 0031A6A8 48 04 4A 75 */ bl _savegpr_29 /* 8031D76C 0031A6AC 7C 7D 1B 78 */ mr r29, r3 /* 8031D770 0031A6B0 3B C0 00 00 */ li r30, 0 /* 8031D774 0031A6B4 3B E0 00 00 */ li r31, 0 @@ -6567,7 +6567,7 @@ lbl_8031D794: /* 8031D79C 0031A6DC 3B FF 00 02 */ addi r31, r31, 2 /* 8031D7A0 0031A6E0 41 80 FF D8 */ blt lbl_8031D778 /* 8031D7A4 0031A6E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031D7A8 0031A6E8 48 04 4A 81 */ bl func_80362228 +/* 8031D7A8 0031A6E8 48 04 4A 81 */ bl _restgpr_29 /* 8031D7AC 0031A6EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031D7B0 0031A6F0 7C 08 03 A6 */ mtlr r0 /* 8031D7B4 0031A6F4 38 21 00 20 */ addi r1, r1, 0x20 @@ -6576,7 +6576,7 @@ lbl_8031D794: /* 8031D7C0 0031A700 7C 08 02 A6 */ mflr r0 /* 8031D7C4 0031A704 90 01 00 34 */ stw r0, 0x34(r1) /* 8031D7C8 0031A708 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D7CC 0031A70C 48 04 4A 11 */ bl func_803621DC +/* 8031D7CC 0031A70C 48 04 4A 11 */ bl _savegpr_29 /* 8031D7D0 0031A710 7C 7D 1B 78 */ mr r29, r3 /* 8031D7D4 0031A714 3B C0 00 00 */ li r30, 0 /* 8031D7D8 0031A718 3B E0 00 00 */ li r31, 0 @@ -6608,7 +6608,7 @@ lbl_8031D818: /* 8031D838 0031A778 3B FF 00 04 */ addi r31, r31, 4 /* 8031D83C 0031A77C 41 80 FF DC */ blt lbl_8031D818 /* 8031D840 0031A780 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031D844 0031A784 48 04 49 E5 */ bl func_80362228 +/* 8031D844 0031A784 48 04 49 E5 */ bl _restgpr_29 /* 8031D848 0031A788 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031D84C 0031A78C 7C 08 03 A6 */ mtlr r0 /* 8031D850 0031A790 38 21 00 30 */ addi r1, r1, 0x30 @@ -6796,7 +6796,7 @@ lbl_8031DAF4: /* 8031DB18 0031AA58 7C 08 02 A6 */ mflr r0 /* 8031DB1C 0031AA5C 90 01 00 24 */ stw r0, 0x24(r1) /* 8031DB20 0031AA60 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DB24 0031AA64 48 04 46 B9 */ bl func_803621DC +/* 8031DB24 0031AA64 48 04 46 B9 */ bl _savegpr_29 /* 8031DB28 0031AA68 7C 7D 1B 78 */ mr r29, r3 /* 8031DB2C 0031AA6C 3B C0 00 00 */ li r30, 0 /* 8031DB30 0031AA70 3B E0 00 00 */ li r31, 0 @@ -6814,7 +6814,7 @@ lbl_8031DB50: /* 8031DB58 0031AA98 3B FF 00 02 */ addi r31, r31, 2 /* 8031DB5C 0031AA9C 41 80 FF D8 */ blt lbl_8031DB34 /* 8031DB60 0031AAA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031DB64 0031AAA4 48 04 46 C5 */ bl func_80362228 +/* 8031DB64 0031AAA4 48 04 46 C5 */ bl _restgpr_29 /* 8031DB68 0031AAA8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031DB6C 0031AAAC 7C 08 03 A6 */ mtlr r0 /* 8031DB70 0031AAB0 38 21 00 20 */ addi r1, r1, 0x20 @@ -6823,7 +6823,7 @@ lbl_8031DB50: /* 8031DB7C 0031AABC 7C 08 02 A6 */ mflr r0 /* 8031DB80 0031AAC0 90 01 00 34 */ stw r0, 0x34(r1) /* 8031DB84 0031AAC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DB88 0031AAC8 48 04 46 55 */ bl func_803621DC +/* 8031DB88 0031AAC8 48 04 46 55 */ bl _savegpr_29 /* 8031DB8C 0031AACC 7C 7D 1B 78 */ mr r29, r3 /* 8031DB90 0031AAD0 3B C0 00 00 */ li r30, 0 /* 8031DB94 0031AAD4 3B E0 00 00 */ li r31, 0 @@ -6855,7 +6855,7 @@ lbl_8031DBD4: /* 8031DBF4 0031AB34 3B FF 00 04 */ addi r31, r31, 4 /* 8031DBF8 0031AB38 41 80 FF DC */ blt lbl_8031DBD4 /* 8031DBFC 0031AB3C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DC00 0031AB40 48 04 46 29 */ bl func_80362228 +/* 8031DC00 0031AB40 48 04 46 29 */ bl _restgpr_29 /* 8031DC04 0031AB44 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031DC08 0031AB48 7C 08 03 A6 */ mtlr r0 /* 8031DC0C 0031AB4C 38 21 00 30 */ addi r1, r1, 0x30 @@ -7164,7 +7164,7 @@ J3DTevBlock_NS_indexToPtr_private: /* 8031E09C 0031AFDC 7C 08 02 A6 */ mflr r0 /* 8031E0A0 0031AFE0 90 01 00 24 */ stw r0, 0x24(r1) /* 8031E0A4 0031AFE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031E0A8 0031AFE8 48 04 41 35 */ bl func_803621DC +/* 8031E0A8 0031AFE8 48 04 41 35 */ bl _savegpr_29 /* 8031E0AC 0031AFEC 80 6D 94 00 */ lwz r3, lbl_80451980-_SDA_BASE_(r13) /* 8031E0B0 0031AFF0 80 03 00 00 */ lwz r0, 0(r3) /* 8031E0B4 0031AFF4 7C 00 22 14 */ add r0, r0, r4 @@ -7194,7 +7194,7 @@ lbl_8031E100: /* 8031E10C 0031B04C 7C 9F 00 50 */ subf r4, r31, r0 /* 8031E110 0031B050 48 01 D4 CD */ bl DCStoreRange /* 8031E114 0031B054 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031E118 0031B058 48 04 41 11 */ bl func_80362228 +/* 8031E118 0031B058 48 04 41 11 */ bl _restgpr_29 /* 8031E11C 0031B05C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031E120 0031B060 7C 08 03 A6 */ mtlr r0 /* 8031E124 0031B064 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DMaterial.s b/asm/J3DGraphBase/J3DMaterial.s index ac7f41ff44c..716b420f07f 100644 --- a/asm/J3DGraphBase/J3DMaterial.s +++ b/asm/J3DGraphBase/J3DMaterial.s @@ -852,7 +852,7 @@ J3DMaterial_NS_countDLSize: /* 80316294 003131D4 7C 08 02 A6 */ mflr r0 /* 80316298 003131D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8031629C 003131DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 803162A0 003131E0 48 04 BF 3D */ bl func_803621DC +/* 803162A0 003131E0 48 04 BF 3D */ bl _savegpr_29 /* 803162A4 003131E4 7C 7D 1B 78 */ mr r29, r3 /* 803162A8 003131E8 80 63 00 28 */ lwz r3, 0x28(r3) /* 803162AC 003131EC 81 83 00 00 */ lwz r12, 0(r3) @@ -888,7 +888,7 @@ J3DMaterial_NS_countDLSize: /* 80316324 00313264 7C 1E 02 14 */ add r0, r30, r0 /* 80316328 00313268 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a /* 8031632C 0031326C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80316330 00313270 48 04 BE F9 */ bl func_80362228 +/* 80316330 00313270 48 04 BE F9 */ bl _restgpr_29 /* 80316334 00313274 80 01 00 24 */ lwz r0, 0x24(r1) /* 80316338 00313278 7C 08 03 A6 */ mtlr r0 /* 8031633C 0031327C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DShape.s b/asm/J3DGraphBase/J3DShape.s index 54c54c71224..0a79fbb86b6 100644 --- a/asm/J3DGraphBase/J3DShape.s +++ b/asm/J3DGraphBase/J3DShape.s @@ -799,7 +799,7 @@ lbl_803155C8: /* 8031562C 0031256C 7C 08 02 A6 */ mflr r0 /* 80315630 00312570 90 01 00 24 */ stw r0, 0x24(r1) /* 80315634 00312574 39 61 00 20 */ addi r11, r1, 0x20 -/* 80315638 00312578 48 04 CB A5 */ bl func_803621DC +/* 80315638 00312578 48 04 CB A5 */ bl _savegpr_29 /* 8031563C 0031257C 7C 7E 1B 78 */ mr r30, r3 /* 80315640 00312580 38 00 00 00 */ li r0, 0 /* 80315644 00312584 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) @@ -826,7 +826,7 @@ lbl_80315688: /* 8031568C 003125CC 7C 00 F8 40 */ cmplw r0, r31 /* 80315690 003125D0 41 80 FF E0 */ blt lbl_80315670 /* 80315694 003125D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80315698 003125D8 48 04 CB 91 */ bl func_80362228 +/* 80315698 003125D8 48 04 CB 91 */ bl _restgpr_29 /* 8031569C 003125DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 803156A0 003125E0 7C 08 03 A6 */ mtlr r0 /* 803156A4 003125E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -835,7 +835,7 @@ lbl_80315688: /* 803156B0 003125F0 7C 08 02 A6 */ mflr r0 /* 803156B4 003125F4 90 01 00 24 */ stw r0, 0x24(r1) /* 803156B8 003125F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 803156BC 003125FC 48 04 CB 21 */ bl func_803621DC +/* 803156BC 003125FC 48 04 CB 21 */ bl _savegpr_29 /* 803156C0 00312600 7C 7E 1B 78 */ mr r30, r3 /* 803156C4 00312604 80 0D 90 50 */ lwz r0, lbl_804515D0-_SDA_BASE_(r13) /* 803156C8 00312608 80 63 00 2C */ lwz r3, 0x2c(r3) @@ -892,7 +892,7 @@ lbl_8031577C: /* 80315780 003126C0 7C 00 F8 40 */ cmplw r0, r31 /* 80315784 003126C4 41 80 FF E0 */ blt lbl_80315764 /* 80315788 003126C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031578C 003126CC 48 04 CA 9D */ bl func_80362228 +/* 8031578C 003126CC 48 04 CA 9D */ bl _restgpr_29 /* 80315790 003126D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80315794 003126D4 7C 08 03 A6 */ mtlr r0 /* 80315798 003126D8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index bc5ad4c584f..f37f7ce8184 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -518,7 +518,7 @@ lbl_80313810: /* 8031382C 0031076C 7C 08 02 A6 */ mflr r0 /* 80313830 00310770 90 01 00 54 */ stw r0, 0x54(r1) /* 80313834 00310774 39 61 00 50 */ addi r11, r1, 0x50 -/* 80313838 00310778 48 04 E9 A5 */ bl func_803621DC +/* 80313838 00310778 48 04 E9 A5 */ bl _savegpr_29 /* 8031383C 0031077C 7C 7D 1B 78 */ mr r29, r3 /* 80313840 00310780 7C 9E 23 78 */ mr r30, r4 /* 80313844 00310784 7C BF 2B 78 */ mr r31, r5 @@ -550,7 +550,7 @@ lbl_80313884: /* 803138A8 003107E8 7D 89 03 A6 */ mtctr r12 /* 803138AC 003107EC 4E 80 04 21 */ bctrl /* 803138B0 003107F0 39 61 00 50 */ addi r11, r1, 0x50 -/* 803138B4 003107F4 48 04 E9 75 */ bl func_80362228 +/* 803138B4 003107F4 48 04 E9 75 */ bl _restgpr_29 /* 803138B8 003107F8 80 01 00 54 */ lwz r0, 0x54(r1) /* 803138BC 003107FC 7C 08 03 A6 */ mtlr r0 /* 803138C0 00310800 38 21 00 50 */ addi r1, r1, 0x50 @@ -692,7 +692,7 @@ lbl_80313AB0: /* 80313ACC 00310A0C 7C 08 02 A6 */ mflr r0 /* 80313AD0 00310A10 90 01 00 54 */ stw r0, 0x54(r1) /* 80313AD4 00310A14 39 61 00 50 */ addi r11, r1, 0x50 -/* 80313AD8 00310A18 48 04 E7 05 */ bl func_803621DC +/* 80313AD8 00310A18 48 04 E7 05 */ bl _savegpr_29 /* 80313ADC 00310A1C 7C 7D 1B 78 */ mr r29, r3 /* 80313AE0 00310A20 7C 9E 23 78 */ mr r30, r4 /* 80313AE4 00310A24 7C BF 2B 78 */ mr r31, r5 @@ -735,7 +735,7 @@ lbl_80313B50: /* 80313B74 00310AB4 7D 89 03 A6 */ mtctr r12 /* 80313B78 00310AB8 4E 80 04 21 */ bctrl /* 80313B7C 00310ABC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80313B80 00310AC0 48 04 E6 A9 */ bl func_80362228 +/* 80313B80 00310AC0 48 04 E6 A9 */ bl _restgpr_29 /* 80313B84 00310AC4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80313B88 00310AC8 7C 08 03 A6 */ mtlr r0 /* 80313B8C 00310ACC 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/J3DGraphBase/J3DVertex.s b/asm/J3DGraphBase/J3DVertex.s index cad32f7383d..6886079b28f 100644 --- a/asm/J3DGraphBase/J3DVertex.s +++ b/asm/J3DGraphBase/J3DVertex.s @@ -415,7 +415,7 @@ J3DVertexBuffer_NS_allocTransformedVtxPosArray: /* 8031147C 0030E3BC 7C 08 02 A6 */ mflr r0 /* 80311480 0030E3C0 90 01 00 24 */ stw r0, 0x24(r1) /* 80311484 0030E3C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80311488 0030E3C8 48 05 0D 55 */ bl func_803621DC +/* 80311488 0030E3C8 48 05 0D 55 */ bl _savegpr_29 /* 8031148C 0030E3CC 7C 7D 1B 78 */ mr r29, r3 /* 80311490 0030E3D0 80 03 00 1C */ lwz r0, 0x1c(r3) /* 80311494 0030E3D4 28 00 00 00 */ cmplwi r0, 0 @@ -456,7 +456,7 @@ lbl_80311500: /* 80311510 0030E450 38 60 00 00 */ li r3, 0 lbl_80311514: /* 80311514 0030E454 39 61 00 20 */ addi r11, r1, 0x20 -/* 80311518 0030E458 48 05 0D 11 */ bl func_80362228 +/* 80311518 0030E458 48 05 0D 11 */ bl _restgpr_29 /* 8031151C 0030E45C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80311520 0030E460 7C 08 03 A6 */ mtlr r0 /* 80311524 0030E464 38 21 00 20 */ addi r1, r1, 0x20 @@ -468,7 +468,7 @@ J3DVertexBuffer_NS_allocTransformedVtxNrmArray: /* 80311530 0030E470 7C 08 02 A6 */ mflr r0 /* 80311534 0030E474 90 01 00 24 */ stw r0, 0x24(r1) /* 80311538 0030E478 39 61 00 20 */ addi r11, r1, 0x20 -/* 8031153C 0030E47C 48 05 0C A1 */ bl func_803621DC +/* 8031153C 0030E47C 48 05 0C A1 */ bl _savegpr_29 /* 80311540 0030E480 7C 7D 1B 78 */ mr r29, r3 /* 80311544 0030E484 80 03 00 24 */ lwz r0, 0x24(r3) /* 80311548 0030E488 28 00 00 00 */ cmplwi r0, 0 @@ -509,7 +509,7 @@ lbl_803115B4: /* 803115C4 0030E504 38 60 00 00 */ li r3, 0 lbl_803115C8: /* 803115C8 0030E508 39 61 00 20 */ addi r11, r1, 0x20 -/* 803115CC 0030E50C 48 05 0C 5D */ bl func_80362228 +/* 803115CC 0030E50C 48 05 0C 5D */ bl _restgpr_29 /* 803115D0 0030E510 80 01 00 24 */ lwz r0, 0x24(r1) /* 803115D4 0030E514 7C 08 03 A6 */ mtlr r0 /* 803115D8 0030E518 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphLoader/J3DAnmLoader.s b/asm/J3DGraphLoader/J3DAnmLoader.s index a36de45b958..93ed642351d 100644 --- a/asm/J3DGraphLoader/J3DAnmLoader.s +++ b/asm/J3DGraphLoader/J3DAnmLoader.s @@ -1211,7 +1211,7 @@ J3DAnmFullLoader_v15_NS_setAnmVtxColor: /* 80338BE0 00335B20 7C 08 02 A6 */ mflr r0 /* 80338BE4 00335B24 90 01 00 24 */ stw r0, 0x24(r1) /* 80338BE8 00335B28 39 61 00 20 */ addi r11, r1, 0x20 -/* 80338BEC 00335B2C 48 02 95 F1 */ bl func_803621DC +/* 80338BEC 00335B2C 48 02 95 F1 */ bl _savegpr_29 /* 80338BF0 00335B30 7C 9E 23 78 */ mr r30, r4 /* 80338BF4 00335B34 7C BF 2B 78 */ mr r31, r5 /* 80338BF8 00335B38 A8 05 00 0A */ lha r0, 0xa(r5) @@ -1296,7 +1296,7 @@ lbl_80338CE0: /* 80338D24 00335C64 4B FB B5 3D */ bl JSUConvertOffsetToPtr_X24_ /* 80338D28 00335C68 90 7E 00 2C */ stw r3, 0x2c(r30) /* 80338D2C 00335C6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80338D30 00335C70 48 02 94 F9 */ bl func_80362228 +/* 80338D30 00335C70 48 02 94 F9 */ bl _restgpr_29 /* 80338D34 00335C74 80 01 00 24 */ lwz r0, 0x24(r1) /* 80338D38 00335C78 7C 08 03 A6 */ mtlr r0 /* 80338D3C 00335C7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1947,7 +1947,7 @@ J3DAnmKeyLoader_v15_NS_setAnmVtxColor: /* 80339638 00336578 7C 08 02 A6 */ mflr r0 /* 8033963C 0033657C 90 01 00 24 */ stw r0, 0x24(r1) /* 80339640 00336580 39 61 00 20 */ addi r11, r1, 0x20 -/* 80339644 00336584 48 02 8B 99 */ bl func_803621DC +/* 80339644 00336584 48 02 8B 99 */ bl _savegpr_29 /* 80339648 00336588 7C 9E 23 78 */ mr r30, r4 /* 8033964C 0033658C 7C BF 2B 78 */ mr r31, r5 /* 80339650 00336590 A8 05 00 0A */ lha r0, 0xa(r5) @@ -2032,7 +2032,7 @@ lbl_80339738: /* 8033977C 003366BC 4B FD 0D CD */ bl JSUConvertOffsetToPtr_X40_ /* 80339780 003366C0 90 7E 00 2C */ stw r3, 0x2c(r30) /* 80339784 003366C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80339788 003366C8 48 02 8A A1 */ bl func_80362228 +/* 80339788 003366C8 48 02 8A A1 */ bl _restgpr_29 /* 8033978C 003366CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80339790 003366D0 7C 08 03 A6 */ mtlr r0 /* 80339794 003366D4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphLoader/J3DMaterialFactory.s b/asm/J3DGraphLoader/J3DMaterialFactory.s index b99422b07d8..c2b7314894d 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory.s @@ -2280,7 +2280,7 @@ J3DMaterialFactory_NS_newTexMtx: /* 80332048 0032EF88 7C 08 02 A6 */ mflr r0 /* 8033204C 0032EF8C 90 01 00 24 */ stw r0, 0x24(r1) /* 80332050 0032EF90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80332054 0032EF94 48 03 01 89 */ bl func_803621DC +/* 80332054 0032EF94 48 03 01 89 */ bl _savegpr_29 /* 80332058 0032EF98 7C 7D 1B 78 */ mr r29, r3 /* 8033205C 0032EF9C 38 60 00 00 */ li r3, 0 /* 80332060 0032EFA0 80 FD 00 04 */ lwz r7, 4(r29) @@ -2307,7 +2307,7 @@ lbl_803320B0: /* 803320B0 0032EFF0 7F E3 FB 78 */ mr r3, r31 lbl_803320B4: /* 803320B4 0032EFF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 803320B8 0032EFF8 48 03 01 71 */ bl func_80362228 +/* 803320B8 0032EFF8 48 03 01 71 */ bl _restgpr_29 /* 803320BC 0032EFFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 803320C0 0032F000 7C 08 03 A6 */ mtlr r0 /* 803320C4 0032F004 38 21 00 20 */ addi r1, r1, 0x20 @@ -2746,7 +2746,7 @@ J3DMaterialFactory_NS_newFog: /* 80332690 0032F5D0 7C 08 02 A6 */ mflr r0 /* 80332694 0032F5D4 90 01 00 74 */ stw r0, 0x74(r1) /* 80332698 0032F5D8 39 61 00 70 */ addi r11, r1, 0x70 -/* 8033269C 0032F5DC 48 02 FB 41 */ bl func_803621DC +/* 8033269C 0032F5DC 48 02 FB 41 */ bl _savegpr_29 /* 803326A0 0032F5E0 7C 7F 1B 78 */ mr r31, r3 /* 803326A4 0032F5E4 7C 9D 23 78 */ mr r29, r4 /* 803326A8 0032F5E8 7C BE 2B 78 */ mr r30, r5 @@ -2795,7 +2795,7 @@ lbl_80332734: /* 80332748 0032F688 80 04 00 04 */ lwz r0, 4(r4) /* 8033274C 0032F68C 90 05 00 04 */ stw r0, 4(r5) /* 80332750 0032F690 39 61 00 70 */ addi r11, r1, 0x70 -/* 80332754 0032F694 48 02 FA D5 */ bl func_80362228 +/* 80332754 0032F694 48 02 FA D5 */ bl _restgpr_29 /* 80332758 0032F698 80 01 00 74 */ lwz r0, 0x74(r1) /* 8033275C 0032F69C 7C 08 03 A6 */ mtlr r0 /* 80332760 0032F6A0 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s index b3485047c81..05bffbb0a41 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s @@ -918,7 +918,7 @@ J3DMaterialFactory_v21_NS_newTexMtx: /* 80333AAC 003309EC 7C 08 02 A6 */ mflr r0 /* 80333AB0 003309F0 90 01 00 24 */ stw r0, 0x24(r1) /* 80333AB4 003309F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80333AB8 003309F8 48 02 E7 25 */ bl func_803621DC +/* 80333AB8 003309F8 48 02 E7 25 */ bl _savegpr_29 /* 80333ABC 003309FC 7C 7D 1B 78 */ mr r29, r3 /* 80333AC0 00330A00 38 60 00 00 */ li r3, 0 /* 80333AC4 00330A04 80 FD 00 04 */ lwz r7, 4(r29) @@ -945,7 +945,7 @@ lbl_80333B14: /* 80333B14 00330A54 7F E3 FB 78 */ mr r3, r31 lbl_80333B18: /* 80333B18 00330A58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80333B1C 00330A5C 48 02 E7 0D */ bl func_80362228 +/* 80333B1C 00330A5C 48 02 E7 0D */ bl _restgpr_29 /* 80333B20 00330A60 80 01 00 24 */ lwz r0, 0x24(r1) /* 80333B24 00330A64 7C 08 03 A6 */ mtlr r0 /* 80333B28 00330A68 38 21 00 20 */ addi r1, r1, 0x20 @@ -1173,7 +1173,7 @@ J3DMaterialFactory_v21_NS_newFog: /* 80333E08 00330D48 7C 08 02 A6 */ mflr r0 /* 80333E0C 00330D4C 90 01 00 74 */ stw r0, 0x74(r1) /* 80333E10 00330D50 39 61 00 70 */ addi r11, r1, 0x70 -/* 80333E14 00330D54 48 02 E3 C9 */ bl func_803621DC +/* 80333E14 00330D54 48 02 E3 C9 */ bl _savegpr_29 /* 80333E18 00330D58 7C 7F 1B 78 */ mr r31, r3 /* 80333E1C 00330D5C 7C 9D 23 78 */ mr r29, r4 /* 80333E20 00330D60 7C BE 2B 78 */ mr r30, r5 @@ -1222,7 +1222,7 @@ lbl_80333EAC: /* 80333EC0 00330E00 80 04 00 04 */ lwz r0, 4(r4) /* 80333EC4 00330E04 90 05 00 04 */ stw r0, 4(r5) /* 80333EC8 00330E08 39 61 00 70 */ addi r11, r1, 0x70 -/* 80333ECC 00330E0C 48 02 E3 5D */ bl func_80362228 +/* 80333ECC 00330E0C 48 02 E3 5D */ bl _restgpr_29 /* 80333ED0 00330E10 80 01 00 74 */ lwz r0, 0x74(r1) /* 80333ED4 00330E14 7C 08 03 A6 */ mtlr r0 /* 80333ED8 00330E18 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/J3DGraphLoader/J3DModelLoader.s b/asm/J3DGraphLoader/J3DModelLoader.s index c107dde2065..cc3098a041e 100644 --- a/asm/J3DGraphLoader/J3DModelLoader.s +++ b/asm/J3DGraphLoader/J3DModelLoader.s @@ -971,7 +971,7 @@ J3DModelLoader_NS_readEnvelop: /* 803353F4 00332334 7C 08 02 A6 */ mflr r0 /* 803353F8 00332338 90 01 00 24 */ stw r0, 0x24(r1) /* 803353FC 0033233C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335400 00332340 48 02 CD DD */ bl func_803621DC +/* 80335400 00332340 48 02 CD DD */ bl _savegpr_29 /* 80335404 00332344 7C 7D 1B 78 */ mr r29, r3 /* 80335408 00332348 7C 9E 23 78 */ mr r30, r4 /* 8033540C 0033234C 80 63 00 04 */ lwz r3, 4(r3) @@ -998,7 +998,7 @@ J3DModelLoader_NS_readEnvelop: /* 80335460 003323A0 48 00 12 A5 */ bl JSUConvertOffsetToPtr_X67_ /* 80335464 003323A4 90 7F 00 3C */ stw r3, 0x3c(r31) /* 80335468 003323A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8033546C 003323AC 48 02 CD BD */ bl func_80362228 +/* 8033546C 003323AC 48 02 CD BD */ bl _restgpr_29 /* 80335470 003323B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80335474 003323B4 7C 08 03 A6 */ mtlr r0 /* 80335478 003323B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1010,7 +1010,7 @@ J3DModelLoader_NS_readDraw: /* 80335484 003323C4 7C 08 02 A6 */ mflr r0 /* 80335488 003323C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8033548C 003323CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335490 003323D0 48 02 CD 4D */ bl func_803621DC +/* 80335490 003323D0 48 02 CD 4D */ bl _savegpr_29 /* 80335494 003323D4 7C 7D 1B 78 */ mr r29, r3 /* 80335498 003323D8 7C 9F 23 78 */ mr r31, r4 /* 8033549C 003323DC 83 C3 00 04 */ lwz r30, 4(r3) @@ -1048,7 +1048,7 @@ lbl_80335500: /* 80335510 00332450 4B F9 97 B5 */ bl __nwa /* 80335514 00332454 90 7F 00 40 */ stw r3, 0x40(r31) /* 80335518 00332458 39 61 00 20 */ addi r11, r1, 0x20 -/* 8033551C 0033245C 48 02 CD 0D */ bl func_80362228 +/* 8033551C 0033245C 48 02 CD 0D */ bl _restgpr_29 /* 80335520 00332460 80 01 00 24 */ lwz r0, 0x24(r1) /* 80335524 00332464 7C 08 03 A6 */ mtlr r0 /* 80335528 00332468 38 21 00 20 */ addi r1, r1, 0x20 @@ -1060,7 +1060,7 @@ J3DModelLoader_NS_readJoint: /* 80335534 00332474 7C 08 02 A6 */ mflr r0 /* 80335538 00332478 90 01 00 24 */ stw r0, 0x24(r1) /* 8033553C 0033247C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335540 00332480 48 02 CC 9D */ bl func_803621DC +/* 80335540 00332480 48 02 CC 9D */ bl _savegpr_29 /* 80335544 00332484 7C 7F 1B 78 */ mr r31, r3 /* 80335548 00332488 7C 9D 23 78 */ mr r29, r4 /* 8033554C 0033248C 38 61 00 08 */ addi r3, r1, 8 @@ -1113,7 +1113,7 @@ lbl_803355E8: /* 803355F4 00332534 7C 00 18 40 */ cmplw r0, r3 /* 803355F8 00332538 41 80 FF D4 */ blt lbl_803355CC /* 803355FC 0033253C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80335600 00332540 48 02 CC 29 */ bl func_80362228 +/* 80335600 00332540 48 02 CC 29 */ bl _restgpr_29 /* 80335604 00332544 80 01 00 24 */ lwz r0, 0x24(r1) /* 80335608 00332548 7C 08 03 A6 */ mtlr r0 /* 8033560C 0033254C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DGraphLoader/J3DShapeFactory.s b/asm/J3DGraphLoader/J3DShapeFactory.s index 9c97ff282f6..b76fcb83c04 100644 --- a/asm/J3DGraphLoader/J3DShapeFactory.s +++ b/asm/J3DGraphLoader/J3DShapeFactory.s @@ -173,7 +173,7 @@ J3DShapeFactory_NS_newShapeMtx: /* 803375C0 00334500 7C 08 02 A6 */ mflr r0 /* 803375C4 00334504 90 01 00 24 */ stw r0, 0x24(r1) /* 803375C8 00334508 39 61 00 20 */ addi r11, r1, 0x20 -/* 803375CC 0033450C 48 02 AC 11 */ bl func_803621DC +/* 803375CC 0033450C 48 02 AC 11 */ bl _savegpr_29 /* 803375D0 00334510 7C 7D 1B 78 */ mr r29, r3 /* 803375D4 00334514 3B E0 00 00 */ li r31, 0 /* 803375D8 00334518 80 E3 00 00 */ lwz r7, 0(r3) @@ -346,7 +346,7 @@ lbl_80337820: lbl_80337830: /* 80337830 00334770 7F E3 FB 78 */ mr r3, r31 /* 80337834 00334774 39 61 00 20 */ addi r11, r1, 0x20 -/* 80337838 00334778 48 02 A9 F1 */ bl func_80362228 +/* 80337838 00334778 48 02 A9 F1 */ bl _restgpr_29 /* 8033783C 0033477C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80337840 00334780 7C 08 03 A6 */ mtlr r0 /* 80337844 00334784 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/J3DU/J3DUClipper.s b/asm/J3DU/J3DUClipper.s index abb32f33c34..a35fdaff8ed 100644 --- a/asm/J3DU/J3DUClipper.s +++ b/asm/J3DU/J3DUClipper.s @@ -233,7 +233,7 @@ J3DUClipper_NS_clip_X1_: /* 80273AC0 00270A00 DA 21 00 A0 */ stfd f17, 0xa0(r1) /* 80273AC4 00270A04 F2 21 00 A8 */ psq_st f17, 168(r1), 0, qr0 /* 80273AC8 00270A08 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80273ACC 00270A0C 48 0E E7 11 */ bl func_803621DC +/* 80273ACC 00270A0C 48 0E E7 11 */ bl _savegpr_29 /* 80273AD0 00270A10 7C 9F 23 78 */ mr r31, r4 /* 80273AD4 00270A14 38 80 00 00 */ li r4, 0 /* 80273AD8 00270A18 7C 88 23 78 */ mr r8, r4 @@ -450,7 +450,7 @@ lbl_80273D78: /* 80273DE8 00270D28 E2 21 00 A8 */ psq_l f17, 168(r1), 0, qr0 /* 80273DEC 00270D2C CA 21 00 A0 */ lfd f17, 0xa0(r1) /* 80273DF0 00270D30 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80273DF4 00270D34 48 0E E4 35 */ bl func_80362228 +/* 80273DF4 00270D34 48 0E E4 35 */ bl _restgpr_29 /* 80273DF8 00270D38 80 01 01 94 */ lwz r0, 0x194(r1) /* 80273DFC 00270D3C 7C 08 03 A6 */ mtlr r0 /* 80273E00 00270D40 38 21 01 90 */ addi r1, r1, 0x190 diff --git a/asm/JAudio2/JAISe.s b/asm/JAudio2/JAISe.s index 71984cfdca7..871c92155a2 100644 --- a/asm/JAudio2/JAISe.s +++ b/asm/JAudio2/JAISe.s @@ -59,7 +59,7 @@ JAISe_NS_mixOut_: /* 8029F0FC 0029C03C 7C 08 02 A6 */ mflr r0 /* 8029F100 0029C040 90 01 00 34 */ stw r0, 0x34(r1) /* 8029F104 0029C044 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029F108 0029C048 48 0C 30 D5 */ bl func_803621DC +/* 8029F108 0029C048 48 0C 30 D5 */ bl _savegpr_29 /* 8029F10C 0029C04C 7C 7D 1B 78 */ mr r29, r3 /* 8029F110 0029C050 7C 9E 23 78 */ mr r30, r4 /* 8029F114 0029C054 38 7D 00 C8 */ addi r3, r29, 0xc8 @@ -126,7 +126,7 @@ lbl_8029F1D4: /* 8029F1F8 0029C138 D0 1D 00 C4 */ stfs f0, 0xc4(r29) lbl_8029F1FC: /* 8029F1FC 0029C13C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029F200 0029C140 48 0C 30 29 */ bl func_80362228 +/* 8029F200 0029C140 48 0C 30 29 */ bl _restgpr_29 /* 8029F204 0029C144 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029F208 0029C148 7C 08 03 A6 */ mtlr r0 /* 8029F20C 0029C14C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index ba691b54881..63246396cba 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -45,7 +45,7 @@ JAISeCategoryMgr_NS_releaseSeqData: /* 8029F920 0029C860 7C 08 02 A6 */ mflr r0 /* 8029F924 0029C864 90 01 00 24 */ stw r0, 0x24(r1) /* 8029F928 0029C868 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029F92C 0029C86C 48 0C 28 B1 */ bl func_803621DC +/* 8029F92C 0029C86C 48 0C 28 B1 */ bl _savegpr_29 /* 8029F930 0029C870 38 A0 00 00 */ li r5, 0 /* 8029F934 0029C874 83 A3 00 58 */ lwz r29, 0x58(r3) /* 8029F938 0029C878 83 C4 00 00 */ lwz r30, 0(r4) @@ -85,7 +85,7 @@ lbl_8029F994: /* 8029F9A8 0029C8E8 38 60 00 01 */ li r3, 1 lbl_8029F9AC: /* 8029F9AC 0029C8EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029F9B0 0029C8F0 48 0C 28 79 */ bl func_80362228 +/* 8029F9B0 0029C8F0 48 0C 28 79 */ bl _restgpr_29 /* 8029F9B4 0029C8F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029F9B8 0029C8F8 7C 08 03 A6 */ mtlr r0 /* 8029F9BC 0029C8FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -361,7 +361,7 @@ JAISeCategoryMgr_NS_sortByPriority_: /* 8029FD44 0029CC84 7C 08 02 A6 */ mflr r0 /* 8029FD48 0029CC88 90 01 00 24 */ stw r0, 0x24(r1) /* 8029FD4C 0029CC8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029FD50 0029CC90 48 0C 24 8D */ bl func_803621DC +/* 8029FD50 0029CC90 48 0C 24 8D */ bl _savegpr_29 /* 8029FD54 0029CC94 7C 7D 1B 78 */ mr r29, r3 /* 8029FD58 0029CC98 83 E3 00 60 */ lwz r31, 0x60(r3) /* 8029FD5C 0029CC9C 48 00 00 64 */ b lbl_8029FDC0 @@ -397,7 +397,7 @@ lbl_8029FDC0: /* 8029FDC0 0029CD00 28 1F 00 00 */ cmplwi r31, 0 /* 8029FDC4 0029CD04 40 82 FF 9C */ bne lbl_8029FD60 /* 8029FDC8 0029CD08 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029FDCC 0029CD0C 48 0C 24 5D */ bl func_80362228 +/* 8029FDCC 0029CD0C 48 0C 24 5D */ bl _restgpr_29 /* 8029FDD0 0029CD10 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029FDD4 0029CD14 7C 08 03 A6 */ mtlr r0 /* 8029FDD8 0029CD18 38 21 00 20 */ addi r1, r1, 0x20 @@ -509,7 +509,7 @@ JAISeCategoryMgr_NS_JAISeMgr_mixOut_: /* 8029FF1C 0029CE5C 7C 08 02 A6 */ mflr r0 /* 8029FF20 0029CE60 90 01 00 44 */ stw r0, 0x44(r1) /* 8029FF24 0029CE64 39 61 00 40 */ addi r11, r1, 0x40 -/* 8029FF28 0029CE68 48 0C 22 B5 */ bl func_803621DC +/* 8029FF28 0029CE68 48 0C 22 B5 */ bl _savegpr_29 /* 8029FF2C 0029CE6C 7C 7E 1B 78 */ mr r30, r3 /* 8029FF30 0029CE70 7C BD 2B 78 */ mr r29, r5 /* 8029FF34 0029CE74 C0 02 BD 8C */ lfs f0, lbl_8045578C-_SDA2_BASE_(r2) @@ -596,7 +596,7 @@ lbl_802A0054: /* 802A0058 0029CF98 40 82 FF DC */ bne lbl_802A0034 lbl_802A005C: /* 802A005C 0029CF9C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A0060 0029CFA0 48 0C 21 C9 */ bl func_80362228 +/* 802A0060 0029CFA0 48 0C 21 C9 */ bl _restgpr_29 /* 802A0064 0029CFA4 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A0068 0029CFA8 7C 08 03 A6 */ mtlr r0 /* 802A006C 0029CFAC 38 21 00 40 */ addi r1, r1, 0x40 @@ -767,7 +767,7 @@ JAISeMgr_NS_stop: /* 802A02A4 0029D1E4 7C 08 02 A6 */ mflr r0 /* 802A02A8 0029D1E8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A02AC 0029D1EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A02B0 0029D1F0 48 0C 1F 2D */ bl func_803621DC +/* 802A02B0 0029D1F0 48 0C 1F 2D */ bl _savegpr_29 /* 802A02B4 0029D1F4 7C 7D 1B 78 */ mr r29, r3 /* 802A02B8 0029D1F8 3B C0 00 00 */ li r30, 0 /* 802A02BC 0029D1FC 3B E0 00 00 */ li r31, 0 @@ -780,7 +780,7 @@ lbl_802A02C0: /* 802A02D4 0029D214 3B FF 00 6C */ addi r31, r31, 0x6c /* 802A02D8 0029D218 41 80 FF E8 */ blt lbl_802A02C0 /* 802A02DC 0029D21C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A02E0 0029D220 48 0C 1F 49 */ bl func_80362228 +/* 802A02E0 0029D220 48 0C 1F 49 */ bl _restgpr_29 /* 802A02E4 0029D224 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A02E8 0029D228 7C 08 03 A6 */ mtlr r0 /* 802A02EC 0029D22C 38 21 00 20 */ addi r1, r1, 0x20 @@ -981,7 +981,7 @@ JAISeMgr_NS_calc: /* 802A0578 0029D4B8 7C 08 02 A6 */ mflr r0 /* 802A057C 0029D4BC 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0580 0029D4C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0584 0029D4C4 48 0C 1C 59 */ bl func_803621DC +/* 802A0584 0029D4C4 48 0C 1C 59 */ bl _savegpr_29 /* 802A0588 0029D4C8 7C 7F 1B 78 */ mr r31, r3 /* 802A058C 0029D4CC C0 23 06 D4 */ lfs f1, 0x6d4(r3) /* 802A0590 0029D4D0 80 63 06 F0 */ lwz r3, 0x6f0(r3) @@ -1084,7 +1084,7 @@ lbl_802A06D0: /* 802A06E4 0029D624 3B DE 00 6C */ addi r30, r30, 0x6c /* 802A06E8 0029D628 41 80 FF E8 */ blt lbl_802A06D0 /* 802A06EC 0029D62C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A06F0 0029D630 48 0C 1B 39 */ bl func_80362228 +/* 802A06F0 0029D630 48 0C 1B 39 */ bl _restgpr_29 /* 802A06F4 0029D634 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A06F8 0029D638 7C 08 03 A6 */ mtlr r0 /* 802A06FC 0029D63C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1096,7 +1096,7 @@ JAISeMgr_NS_mixOut: /* 802A0708 0029D648 7C 08 02 A6 */ mflr r0 /* 802A070C 0029D64C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0710 0029D650 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0714 0029D654 48 0C 1A C9 */ bl func_803621DC +/* 802A0714 0029D654 48 0C 1A C9 */ bl _savegpr_29 /* 802A0718 0029D658 7C 7D 1B 78 */ mr r29, r3 /* 802A071C 0029D65C 3B C0 00 00 */ li r30, 0 /* 802A0720 0029D660 3B E0 00 00 */ li r31, 0 @@ -1113,7 +1113,7 @@ lbl_802A0724: /* 802A0748 0029D688 3B FF 00 6C */ addi r31, r31, 0x6c /* 802A074C 0029D68C 41 80 FF D8 */ blt lbl_802A0724 /* 802A0750 0029D690 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0754 0029D694 48 0C 1A D5 */ bl func_80362228 +/* 802A0754 0029D694 48 0C 1A D5 */ bl _restgpr_29 /* 802A0758 0029D698 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A075C 0029D69C 7C 08 03 A6 */ mtlr r0 /* 802A0760 0029D6A0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAISeq.s b/asm/JAudio2/JAISeq.s index a58e64218f1..9145a4de198 100644 --- a/asm/JAudio2/JAISeq.s +++ b/asm/JAudio2/JAISeq.s @@ -124,7 +124,7 @@ JAISeq_NS_playSeqData_: /* 802A0C08 0029DB48 7C 08 02 A6 */ mflr r0 /* 802A0C0C 0029DB4C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0C10 0029DB50 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0C14 0029DB54 48 0C 15 C9 */ bl func_803621DC +/* 802A0C14 0029DB54 48 0C 15 C9 */ bl _savegpr_29 /* 802A0C18 0029DB58 7C 7D 1B 78 */ mr r29, r3 /* 802A0C1C 0029DB5C 7C 9E 23 78 */ mr r30, r4 /* 802A0C20 0029DB60 7C BF 2B 78 */ mr r31, r5 @@ -157,7 +157,7 @@ lbl_802A0C6C: /* 802A0C84 0029DBC4 38 7D 00 A8 */ addi r3, r29, 0xa8 /* 802A0C88 0029DBC8 4B FF 0D A1 */ bl JASTrack_NS_startSeq /* 802A0C8C 0029DBCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0C90 0029DBD0 48 0C 15 99 */ bl func_80362228 +/* 802A0C90 0029DBD0 48 0C 15 99 */ bl _restgpr_29 /* 802A0C94 0029DBD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A0C98 0029DBD8 7C 08 03 A6 */ mtlr r0 /* 802A0C9C 0029DBDC 38 21 00 20 */ addi r1, r1, 0x20 @@ -388,7 +388,7 @@ JAISeq_NS_prepare_: /* 802A0F94 0029DED4 7C 08 02 A6 */ mflr r0 /* 802A0F98 0029DED8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A0F9C 0029DEDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A0FA0 0029DEE0 48 0C 12 3D */ bl func_803621DC +/* 802A0FA0 0029DEE0 48 0C 12 3D */ bl _savegpr_29 /* 802A0FA4 0029DEE4 7C 7F 1B 78 */ mr r31, r3 /* 802A0FA8 0029DEE8 7C 9D 23 78 */ mr r29, r4 /* 802A0FAC 0029DEEC 7C BE 2B 78 */ mr r30, r5 @@ -445,7 +445,7 @@ lbl_802A1070: /* 802A1070 0029DFB0 38 60 00 00 */ li r3, 0 lbl_802A1074: /* 802A1074 0029DFB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1078 0029DFB8 48 0C 11 B1 */ bl func_80362228 +/* 802A1078 0029DFB8 48 0C 11 B1 */ bl _restgpr_29 /* 802A107C 0029DFBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A1080 0029DFC0 7C 08 03 A6 */ mtlr r0 /* 802A1084 0029DFC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -457,7 +457,7 @@ JAISeq_NS_JAISeqMgr_calc_: /* 802A1090 0029DFD0 7C 08 02 A6 */ mflr r0 /* 802A1094 0029DFD4 90 01 00 24 */ stw r0, 0x24(r1) /* 802A1098 0029DFD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A109C 0029DFDC 48 0C 11 41 */ bl func_803621DC +/* 802A109C 0029DFDC 48 0C 11 41 */ bl _savegpr_29 /* 802A10A0 0029DFE0 7C 7D 1B 78 */ mr r29, r3 /* 802A10A4 0029DFE4 88 03 02 BD */ lbz r0, 0x2bd(r3) /* 802A10A8 0029DFE8 28 00 00 02 */ cmplwi r0, 2 @@ -516,7 +516,7 @@ lbl_802A1138: /* 802A1164 0029E0A4 4E 80 04 21 */ bctrl lbl_802A1168: /* 802A1168 0029E0A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A116C 0029E0AC 48 0C 10 BD */ bl func_80362228 +/* 802A116C 0029E0AC 48 0C 10 BD */ bl _restgpr_29 /* 802A1170 0029E0B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A1174 0029E0B4 7C 08 03 A6 */ mtlr r0 /* 802A1178 0029E0B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -779,7 +779,7 @@ JAISeq_NS_JAISeqMgr_mixOut_: /* 802A1500 0029E440 7C 08 02 A6 */ mflr r0 /* 802A1504 0029E444 90 01 00 24 */ stw r0, 0x24(r1) /* 802A1508 0029E448 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A150C 0029E44C 48 0C 0C D1 */ bl func_803621DC +/* 802A150C 0029E44C 48 0C 0C D1 */ bl _savegpr_29 /* 802A1510 0029E450 7C 7D 1B 78 */ mr r29, r3 /* 802A1514 0029E454 7C 9E 23 78 */ mr r30, r4 /* 802A1518 0029E458 7C BF 2B 78 */ mr r31, r5 @@ -800,7 +800,7 @@ JAISeq_NS_JAISeqMgr_mixOut_: /* 802A1554 0029E494 4B FF FD F5 */ bl JAISeq_NS_mixOut_ lbl_802A1558: /* 802A1558 0029E498 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A155C 0029E49C 48 0C 0C CD */ bl func_80362228 +/* 802A155C 0029E49C 48 0C 0C CD */ bl _restgpr_29 /* 802A1560 0029E4A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A1564 0029E4A4 7C 08 03 A6 */ mtlr r0 /* 802A1568 0029E4A8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAISeqMgr.s b/asm/JAudio2/JAISeqMgr.s index 28a50e96708..9efd75dbda1 100644 --- a/asm/JAudio2/JAISeqMgr.s +++ b/asm/JAudio2/JAISeqMgr.s @@ -40,7 +40,7 @@ lbl_802A1860: /* 802A1874 0029E7B4 7C 08 02 A6 */ mflr r0 /* 802A1878 0029E7B8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A187C 0029E7BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1880 0029E7C0 48 0C 09 5D */ bl func_803621DC +/* 802A1880 0029E7C0 48 0C 09 5D */ bl _savegpr_29 /* 802A1884 0029E7C4 38 A0 00 00 */ li r5, 0 /* 802A1888 0029E7C8 83 A3 00 64 */ lwz r29, 0x64(r3) /* 802A188C 0029E7CC 83 C4 00 00 */ lwz r30, 0(r4) @@ -79,7 +79,7 @@ lbl_802A18E4: /* 802A18F8 0029E838 38 60 00 01 */ li r3, 1 lbl_802A18FC: /* 802A18FC 0029E83C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1900 0029E840 48 0C 09 29 */ bl func_80362228 +/* 802A1900 0029E840 48 0C 09 29 */ bl _restgpr_29 /* 802A1904 0029E844 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A1908 0029E848 7C 08 03 A6 */ mtlr r0 /* 802A190C 0029E84C 38 21 00 20 */ addi r1, r1, 0x20 @@ -156,7 +156,7 @@ JAISeqMgr_NS_freeDeadSeq_: /* 802A1A0C 0029E94C 7C 08 02 A6 */ mflr r0 /* 802A1A10 0029E950 90 01 00 24 */ stw r0, 0x24(r1) /* 802A1A14 0029E954 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1A18 0029E958 48 0C 07 C5 */ bl func_803621DC +/* 802A1A18 0029E958 48 0C 07 C5 */ bl _savegpr_29 /* 802A1A1C 0029E95C 7C 7D 1B 78 */ mr r29, r3 /* 802A1A20 0029E960 80 83 00 64 */ lwz r4, 0x64(r3) /* 802A1A24 0029E964 48 00 00 B0 */ b lbl_802A1AD4 @@ -214,7 +214,7 @@ lbl_802A1AD4: /* 802A1AD4 0029EA14 28 04 00 00 */ cmplwi r4, 0 /* 802A1AD8 0029EA18 40 82 FF 50 */ bne lbl_802A1A28 /* 802A1ADC 0029EA1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A1AE0 0029EA20 48 0C 07 49 */ bl func_80362228 +/* 802A1AE0 0029EA20 48 0C 07 49 */ bl _restgpr_29 /* 802A1AE4 0029EA24 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A1AE8 0029EA28 7C 08 03 A6 */ mtlr r0 /* 802A1AEC 0029EA2C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAIStream.s b/asm/JAudio2/JAIStream.s index bfbe58cdbe7..ef71a81ee31 100644 --- a/asm/JAudio2/JAIStream.s +++ b/asm/JAudio2/JAIStream.s @@ -26,7 +26,7 @@ JAIStream: /* 802A3108 002A0048 7C 08 02 A6 */ mflr r0 /* 802A310C 002A004C 90 01 00 24 */ stw r0, 0x24(r1) /* 802A3110 002A0050 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A3114 002A0054 48 0B F0 C9 */ bl func_803621DC +/* 802A3114 002A0054 48 0B F0 C9 */ bl _savegpr_29 /* 802A3118 002A0058 7C 7D 1B 78 */ mr r29, r3 /* 802A311C 002A005C 7C 9E 23 78 */ mr r30, r4 /* 802A3120 002A0060 7C BF 2B 78 */ mr r31, r5 @@ -56,7 +56,7 @@ lbl_802A3170: /* 802A317C 002A00BC 42 00 FF F4 */ bdnz lbl_802A3170 /* 802A3180 002A00C0 7F A3 EB 78 */ mr r3, r29 /* 802A3184 002A00C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A3188 002A00C8 48 0B F0 A1 */ bl func_80362228 +/* 802A3188 002A00C8 48 0B F0 A1 */ bl _restgpr_29 /* 802A318C 002A00CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A3190 002A00D0 7C 08 03 A6 */ mtlr r0 /* 802A3194 002A00D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -580,7 +580,7 @@ JAIStream_NS_JAIStreamMgr_calc_: /* 802A3890 002A07D0 7C 08 02 A6 */ mflr r0 /* 802A3894 002A07D4 90 01 00 24 */ stw r0, 0x24(r1) /* 802A3898 002A07D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A389C 002A07DC 48 0B E9 41 */ bl func_803621DC +/* 802A389C 002A07DC 48 0B E9 41 */ bl _savegpr_29 /* 802A38A0 002A07E0 7C 7D 1B 78 */ mr r29, r3 /* 802A38A4 002A07E4 88 03 02 C6 */ lbz r0, 0x2c6(r3) /* 802A38A8 002A07E8 28 00 00 00 */ cmplwi r0, 0 @@ -622,7 +622,7 @@ lbl_802A3900: /* 802A392C 002A086C 4E 80 04 21 */ bctrl lbl_802A3930: /* 802A3930 002A0870 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A3934 002A0874 48 0B E8 F5 */ bl func_80362228 +/* 802A3934 002A0874 48 0B E8 F5 */ bl _restgpr_29 /* 802A3938 002A0878 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A393C 002A087C 7C 08 03 A6 */ mtlr r0 /* 802A3940 002A0880 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAIStreamMgr.s b/asm/JAudio2/JAIStreamMgr.s index e7323f5e124..0f72d318f0f 100644 --- a/asm/JAudio2/JAIStreamMgr.s +++ b/asm/JAudio2/JAIStreamMgr.s @@ -153,7 +153,7 @@ JAIStreamMgr_NS_freeDeadStream_: /* 802A3D74 002A0CB4 7C 08 02 A6 */ mflr r0 /* 802A3D78 002A0CB8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A3D7C 002A0CBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A3D80 002A0CC0 48 0B E4 5D */ bl func_803621DC +/* 802A3D80 002A0CC0 48 0B E4 5D */ bl _savegpr_29 /* 802A3D84 002A0CC4 7C 7D 1B 78 */ mr r29, r3 /* 802A3D88 002A0CC8 80 83 00 58 */ lwz r4, 0x58(r3) /* 802A3D8C 002A0CCC 48 00 00 BC */ b lbl_802A3E48 @@ -214,7 +214,7 @@ lbl_802A3E48: /* 802A3E48 002A0D88 28 04 00 00 */ cmplwi r4, 0 /* 802A3E4C 002A0D8C 40 82 FF 44 */ bne lbl_802A3D90 /* 802A3E50 002A0D90 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A3E54 002A0D94 48 0B E3 D5 */ bl func_80362228 +/* 802A3E54 002A0D94 48 0B E3 D5 */ bl _restgpr_29 /* 802A3E58 002A0D98 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A3E5C 002A0D9C 7C 08 03 A6 */ mtlr r0 /* 802A3E60 002A0DA0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASAiCtrl.s b/asm/JAudio2/JASAiCtrl.s index 8030d95cb8b..8b1d880fd8f 100644 --- a/asm/JAudio2/JASAiCtrl.s +++ b/asm/JAudio2/JASAiCtrl.s @@ -635,7 +635,7 @@ lbl_8029CC38: /* 8029CC54 00299B94 7C 08 02 A6 */ mflr r0 /* 8029CC58 00299B98 90 01 00 24 */ stw r0, 0x24(r1) /* 8029CC5C 00299B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CC60 00299BA0 48 0C 55 7D */ bl func_803621DC +/* 8029CC60 00299BA0 48 0C 55 7D */ bl _savegpr_29 /* 8029CC64 00299BA4 7C 7E 1B 78 */ mr r30, r3 /* 8029CC68 00299BA8 7C 9D 23 78 */ mr r29, r4 /* 8029CC6C 00299BAC 7F A3 EB 78 */ mr r3, r29 @@ -662,7 +662,7 @@ lbl_8029CCB4: /* 8029CCB8 00299BF8 40 82 FF DC */ bne lbl_8029CC94 lbl_8029CCBC: /* 8029CCBC 00299BFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029CCC0 00299C00 48 0C 55 69 */ bl func_80362228 +/* 8029CCC0 00299C00 48 0C 55 69 */ bl _restgpr_29 /* 8029CCC4 00299C04 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029CCC8 00299C08 7C 08 03 A6 */ mtlr r0 /* 8029CCCC 00299C0C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index 43d2597a9a9..b3adc05dd6a 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -465,7 +465,7 @@ JASAramStream_NS_headerLoad: /* 80296924 00293864 7C 08 02 A6 */ mflr r0 /* 80296928 00293868 90 01 00 34 */ stw r0, 0x34(r1) /* 8029692C 0029386C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80296930 00293870 48 0C B8 AD */ bl func_803621DC +/* 80296930 00293870 48 0C B8 AD */ bl _savegpr_29 /* 80296934 00293874 7C 7D 1B 78 */ mr r29, r3 /* 80296938 00293878 7C 9E 23 78 */ mr r30, r4 /* 8029693C 0029387C 7C BF 2B 78 */ mr r31, r5 @@ -580,7 +580,7 @@ lbl_80296AB4: /* 80296ACC 00293A0C 38 60 00 01 */ li r3, 1 lbl_80296AD0: /* 80296AD0 00293A10 39 61 00 30 */ addi r11, r1, 0x30 -/* 80296AD4 00293A14 48 0C B7 55 */ bl func_80362228 +/* 80296AD4 00293A14 48 0C B7 55 */ bl _restgpr_29 /* 80296AD8 00293A18 80 01 00 34 */ lwz r0, 0x34(r1) /* 80296ADC 00293A1C 7C 08 03 A6 */ mtlr r0 /* 80296AE0 00293A20 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JASBasicBank.s b/asm/JAudio2/JASBasicBank.s index 72061ed85a4..8e9930974c8 100644 --- a/asm/JAudio2/JASBasicBank.s +++ b/asm/JAudio2/JASBasicBank.s @@ -47,7 +47,7 @@ lbl_80297DEC: /* 80297E04 00294D44 7C 08 02 A6 */ mflr r0 /* 80297E08 00294D48 90 01 00 24 */ stw r0, 0x24(r1) /* 80297E0C 00294D4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80297E10 00294D50 48 0C A3 CD */ bl func_803621DC +/* 80297E10 00294D50 48 0C A3 CD */ bl _savegpr_29 /* 80297E14 00294D54 7C BD 2B 78 */ mr r29, r5 /* 80297E18 00294D58 7C DE 33 78 */ mr r30, r6 /* 80297E1C 00294D5C 7C FF 3B 78 */ mr r31, r7 @@ -66,7 +66,7 @@ lbl_80297E34: /* 80297E4C 00294D8C 4E 80 04 21 */ bctrl lbl_80297E50: /* 80297E50 00294D90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80297E54 00294D94 48 0C A3 D5 */ bl func_80362228 +/* 80297E54 00294D94 48 0C A3 D5 */ bl _restgpr_29 /* 80297E58 00294D98 80 01 00 24 */ lwz r0, 0x24(r1) /* 80297E5C 00294D9C 7C 08 03 A6 */ mtlr r0 /* 80297E60 00294DA0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASBasicInst.s b/asm/JAudio2/JASBasicInst.s index 2fde4a7d792..0d53652866f 100644 --- a/asm/JAudio2/JASBasicInst.s +++ b/asm/JAudio2/JASBasicInst.s @@ -118,7 +118,7 @@ JASBasicInst_NS_setKeyRegionCount: /* 802981A0 002950E0 7C 08 02 A6 */ mflr r0 /* 802981A4 002950E4 90 01 00 24 */ stw r0, 0x24(r1) /* 802981A8 002950E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802981AC 002950EC 48 0C A0 31 */ bl func_803621DC +/* 802981AC 002950EC 48 0C A0 31 */ bl _savegpr_29 /* 802981B0 002950F0 7C 7D 1B 78 */ mr r29, r3 /* 802981B4 002950F4 7C 9E 23 78 */ mr r30, r4 /* 802981B8 002950F8 7C BF 2B 78 */ mr r31, r5 @@ -147,7 +147,7 @@ JASBasicInst_NS_setKeyRegionCount: /* 802981FC 0029513C 90 7D 00 18 */ stw r3, 0x18(r29) /* 80298200 00295140 93 DD 00 14 */ stw r30, 0x14(r29) /* 80298204 00295144 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298208 00295148 48 0C A0 21 */ bl func_80362228 +/* 80298208 00295148 48 0C A0 21 */ bl _restgpr_29 /* 8029820C 0029514C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80298210 00295150 7C 08 03 A6 */ mtlr r0 /* 80298214 00295154 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASBasicWaveBank.s b/asm/JAudio2/JASBasicWaveBank.s index c09992c7a55..890f409d18c 100644 --- a/asm/JAudio2/JASBasicWaveBank.s +++ b/asm/JAudio2/JASBasicWaveBank.s @@ -117,7 +117,7 @@ JASBasicWaveBank_NS_setGroupCount: /* 80298668 002955A8 7C 08 02 A6 */ mflr r0 /* 8029866C 002955AC 90 01 00 24 */ stw r0, 0x24(r1) /* 80298670 002955B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298674 002955B4 48 0C 9B 69 */ bl func_803621DC +/* 80298674 002955B4 48 0C 9B 69 */ bl _savegpr_29 /* 80298678 002955B8 7C 7D 1B 78 */ mr r29, r3 /* 8029867C 002955BC 7C 9E 23 78 */ mr r30, r4 /* 80298680 002955C0 7C BF 2B 78 */ mr r31, r5 @@ -159,7 +159,7 @@ lbl_802986EC: /* 802986F0 00295630 7C 05 00 00 */ cmpw r5, r0 /* 802986F4 00295634 41 80 FF E4 */ blt lbl_802986D8 /* 802986F8 00295638 39 61 00 20 */ addi r11, r1, 0x20 -/* 802986FC 0029563C 48 0C 9B 2D */ bl func_80362228 +/* 802986FC 0029563C 48 0C 9B 2D */ bl _restgpr_29 /* 80298700 00295640 80 01 00 24 */ lwz r0, 0x24(r1) /* 80298704 00295644 7C 08 03 A6 */ mtlr r0 /* 80298708 00295648 38 21 00 20 */ addi r1, r1, 0x20 @@ -171,7 +171,7 @@ JASBasicWaveBank_NS_setWaveTableSize: /* 80298714 00295654 7C 08 02 A6 */ mflr r0 /* 80298718 00295658 90 01 00 24 */ stw r0, 0x24(r1) /* 8029871C 0029565C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298720 00295660 48 0C 9A BD */ bl func_803621DC +/* 80298720 00295660 48 0C 9A BD */ bl _savegpr_29 /* 80298724 00295664 7C 7D 1B 78 */ mr r29, r3 /* 80298728 00295668 7C 9E 23 78 */ mr r30, r4 /* 8029872C 0029566C 7C BF 2B 78 */ mr r31, r5 @@ -200,7 +200,7 @@ JASBasicWaveBank_NS_setWaveTableSize: /* 80298770 002956B0 90 7D 00 1C */ stw r3, 0x1c(r29) /* 80298774 002956B4 B3 DD 00 24 */ sth r30, 0x24(r29) /* 80298778 002956B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029877C 002956BC 48 0C 9A AD */ bl func_80362228 +/* 8029877C 002956BC 48 0C 9A AD */ bl _restgpr_29 /* 80298780 002956C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80298784 002956C4 7C 08 03 A6 */ mtlr r0 /* 80298788 002956C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -423,7 +423,7 @@ JASBasicWaveBank_NS_TWaveGroup_NS_setWaveCount: /* 80298A88 002959C8 7C 08 02 A6 */ mflr r0 /* 80298A8C 002959CC 90 01 00 24 */ stw r0, 0x24(r1) /* 80298A90 002959D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298A94 002959D4 48 0C 97 49 */ bl func_803621DC +/* 80298A94 002959D4 48 0C 97 49 */ bl _savegpr_29 /* 80298A98 002959D8 7C 7D 1B 78 */ mr r29, r3 /* 80298A9C 002959DC 7C 9E 23 78 */ mr r30, r4 /* 80298AA0 002959E0 7C BF 2B 78 */ mr r31, r5 @@ -449,7 +449,7 @@ lbl_80298AB8: /* 80298AE4 00295A24 48 0C 94 31 */ bl func_80361F14 /* 80298AE8 00295A28 90 7D 00 78 */ stw r3, 0x78(r29) /* 80298AEC 00295A2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298AF0 00295A30 48 0C 97 39 */ bl func_80362228 +/* 80298AF0 00295A30 48 0C 97 39 */ bl _restgpr_29 /* 80298AF4 00295A34 80 01 00 24 */ lwz r0, 0x24(r1) /* 80298AF8 00295A38 7C 08 03 A6 */ mtlr r0 /* 80298AFC 00295A3C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASCallback.s b/asm/JAudio2/JASCallback.s index d291bf536f5..49a1436a27f 100644 --- a/asm/JAudio2/JASCallback.s +++ b/asm/JAudio2/JASCallback.s @@ -9,7 +9,7 @@ JASCallbackMgr_NS_regist: /* 8028FFAC 0028CEEC 7C 08 02 A6 */ mflr r0 /* 8028FFB0 0028CEF0 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FFB4 0028CEF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FFB8 0028CEF8 48 0D 22 25 */ bl func_803621DC +/* 8028FFB8 0028CEF8 48 0D 22 25 */ bl _savegpr_29 /* 8028FFBC 0028CEFC 7C 7D 1B 78 */ mr r29, r3 /* 8028FFC0 0028CF00 7C 9E 23 78 */ mr r30, r4 /* 8028FFC4 0028CF04 7C BF 2B 78 */ mr r31, r5 @@ -37,7 +37,7 @@ lbl_80290004: /* 80290014 0028CF54 38 60 00 00 */ li r3, 0 lbl_80290018: /* 80290018 0028CF58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029001C 0028CF5C 48 0D 22 0D */ bl func_80362228 +/* 8029001C 0028CF5C 48 0D 22 0D */ bl _restgpr_29 /* 80290020 0028CF60 80 01 00 24 */ lwz r0, 0x24(r1) /* 80290024 0028CF64 7C 08 03 A6 */ mtlr r0 /* 80290028 0028CF68 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASChannel.s b/asm/JAudio2/JASChannel.s index 6d5c3439285..888ec394190 100644 --- a/asm/JAudio2/JASChannel.s +++ b/asm/JAudio2/JASChannel.s @@ -217,7 +217,7 @@ JASChannel_NS_release: /* 8029AAD4 00297A14 7C 08 02 A6 */ mflr r0 /* 8029AAD8 00297A18 90 01 00 24 */ stw r0, 0x24(r1) /* 8029AADC 00297A1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029AAE0 00297A20 48 0C 76 FD */ bl func_803621DC +/* 8029AAE0 00297A20 48 0C 76 FD */ bl _savegpr_29 /* 8029AAE4 00297A24 7C 7D 1B 78 */ mr r29, r3 /* 8029AAE8 00297A28 80 03 00 00 */ lwz r0, 0(r3) /* 8029AAEC 00297A2C 2C 00 00 01 */ cmpwi r0, 1 @@ -249,7 +249,7 @@ lbl_8029AB20: /* 8029AB48 00297A88 90 1D 00 00 */ stw r0, 0(r29) lbl_8029AB4C: /* 8029AB4C 00297A8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029AB50 00297A90 48 0C 76 D9 */ bl func_80362228 +/* 8029AB50 00297A90 48 0C 76 D9 */ bl _restgpr_29 /* 8029AB54 00297A94 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029AB58 00297A98 7C 08 03 A6 */ mtlr r0 /* 8029AB5C 00297A9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -307,7 +307,7 @@ JASChannel_NS_effectOsc: /* 8029ABF0 00297B30 7C 08 02 A6 */ mflr r0 /* 8029ABF4 00297B34 90 01 00 24 */ stw r0, 0x24(r1) /* 8029ABF8 00297B38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029ABFC 00297B3C 48 0C 75 E1 */ bl func_803621DC +/* 8029ABFC 00297B3C 48 0C 75 E1 */ bl _savegpr_29 /* 8029AC00 00297B40 7C 7D 1B 78 */ mr r29, r3 /* 8029AC04 00297B44 7C BE 2B 78 */ mr r30, r5 /* 8029AC08 00297B48 54 9F 28 34 */ slwi r31, r4, 5 @@ -357,7 +357,7 @@ JASChannel_NS_effectOsc: /* 8029ACB8 00297BF8 D0 1E 00 18 */ stfs f0, 0x18(r30) lbl_8029ACBC: /* 8029ACBC 00297BFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029ACC0 00297C00 48 0C 75 69 */ bl func_80362228 +/* 8029ACC0 00297C00 48 0C 75 69 */ bl _restgpr_29 /* 8029ACC4 00297C04 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029ACC8 00297C08 7C 08 03 A6 */ mtlr r0 /* 8029ACCC 00297C0C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASCmdStack.s b/asm/JAudio2/JASCmdStack.s index d8833092e84..49eae92fb4b 100644 --- a/asm/JAudio2/JASCmdStack.s +++ b/asm/JAudio2/JASCmdStack.s @@ -25,7 +25,7 @@ JASPortCmd_NS_TPortHead_NS_execCommandOnce: /* 80291098 0028DFD8 7C 08 02 A6 */ mflr r0 /* 8029109C 0028DFDC 90 01 00 24 */ stw r0, 0x24(r1) /* 802910A0 0028DFE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802910A4 0028DFE4 48 0D 11 39 */ bl func_803621DC +/* 802910A4 0028DFE4 48 0D 11 39 */ bl _savegpr_29 /* 802910A8 0028DFE8 7C 7D 1B 78 */ mr r29, r3 /* 802910AC 0028DFEC 48 0A C6 49 */ bl __RAS_OSDisableInterrupts_begin /* 802910B0 0028DFF0 90 61 00 08 */ stw r3, 8(r1) @@ -48,7 +48,7 @@ lbl_802910E4: /* 802910EC 0028E02C 80 61 00 08 */ lwz r3, 8(r1) /* 802910F0 0028E030 48 0A C6 2D */ bl OSRestoreInterrupts /* 802910F4 0028E034 39 61 00 20 */ addi r11, r1, 0x20 -/* 802910F8 0028E038 48 0D 11 31 */ bl func_80362228 +/* 802910F8 0028E038 48 0D 11 31 */ bl _restgpr_29 /* 802910FC 0028E03C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80291100 0028E040 7C 08 03 A6 */ mtlr r0 /* 80291104 0028E044 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASDSPInterface.s b/asm/JAudio2/JASDSPInterface.s index c0e8c9d63cb..c47aace09f4 100644 --- a/asm/JAudio2/JASDSPInterface.s +++ b/asm/JAudio2/JASDSPInterface.s @@ -611,7 +611,7 @@ DSP_CreateMap2: /* 8029E0C0 0029B000 7C 08 02 A6 */ mflr r0 /* 8029E0C4 0029B004 90 01 00 24 */ stw r0, 0x24(r1) /* 8029E0C8 0029B008 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029E0CC 0029B00C 48 0C 41 11 */ bl func_803621DC +/* 8029E0CC 0029B00C 48 0C 41 11 */ bl _savegpr_29 /* 8029E0D0 0029B010 3B E0 00 00 */ li r31, 0 /* 8029E0D4 0029B014 80 8D 8D 68 */ lwz r4, lbl_804512E8-_SDA_BASE_(r13) /* 8029E0D8 0029B018 54 60 20 36 */ slwi r0, r3, 4 @@ -633,7 +633,7 @@ lbl_8029E104: /* 8029E110 0029B050 41 80 FF D8 */ blt lbl_8029E0E8 /* 8029E114 0029B054 7F E3 FB 78 */ mr r3, r31 /* 8029E118 0029B058 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029E11C 0029B05C 48 0C 41 0D */ bl func_80362228 +/* 8029E11C 0029B05C 48 0C 41 0D */ bl _restgpr_29 /* 8029E120 0029B060 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029E124 0029B064 7C 08 03 A6 */ mtlr r0 /* 8029E128 0029B068 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASDvdThread.s b/asm/JAudio2/JASDvdThread.s index 52e32d14170..2b1b97055f8 100644 --- a/asm/JAudio2/JASDvdThread.s +++ b/asm/JAudio2/JASDvdThread.s @@ -14,7 +14,7 @@ JASDvd_NS_createThread: /* 8028FF08 0028CE48 7C 08 02 A6 */ mflr r0 /* 8028FF0C 0028CE4C 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FF10 0028CE50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FF14 0028CE54 48 0D 22 C9 */ bl func_803621DC +/* 8028FF14 0028CE54 48 0D 22 C9 */ bl _savegpr_29 /* 8028FF18 0028CE58 7C 7D 1B 78 */ mr r29, r3 /* 8028FF1C 0028CE5C 7C 9E 23 78 */ mr r30, r4 /* 8028FF20 0028CE60 7C BF 2B 78 */ mr r31, r5 @@ -51,7 +51,7 @@ lbl_8028FF7C: /* 8028FF8C 0028CECC 38 60 00 01 */ li r3, 1 lbl_8028FF90: /* 8028FF90 0028CED0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028FF94 0028CED4 48 0D 22 95 */ bl func_80362228 +/* 8028FF94 0028CED4 48 0D 22 95 */ bl _restgpr_29 /* 8028FF98 0028CED8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028FF9C 0028CEDC 7C 08 03 A6 */ mtlr r0 /* 8028FFA0 0028CEE0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASHeapCtrl.s b/asm/JAudio2/JASHeapCtrl.s index 437677ca46e..9e657323d26 100644 --- a/asm/JAudio2/JASHeapCtrl.s +++ b/asm/JAudio2/JASHeapCtrl.s @@ -9,7 +9,7 @@ JASHeap: /* 80290144 0028D084 7C 08 02 A6 */ mflr r0 /* 80290148 0028D088 90 01 00 24 */ stw r0, 0x24(r1) /* 8029014C 0028D08C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290150 0028D090 48 0D 20 8D */ bl func_803621DC +/* 80290150 0028D090 48 0D 20 8D */ bl _savegpr_29 /* 80290154 0028D094 7C 7D 1B 78 */ mr r29, r3 /* 80290158 0028D098 7C 9F 23 78 */ mr r31, r4 /* 8029015C 0028D09C 7F A0 EB 78 */ mr r0, r29 @@ -27,7 +27,7 @@ JASHeap: /* 8029018C 0028D0CC 48 0A EE 7D */ bl OSInitMutex /* 80290190 0028D0D0 7F A3 EB 78 */ mr r3, r29 /* 80290194 0028D0D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290198 0028D0D8 48 0D 20 91 */ bl func_80362228 +/* 80290198 0028D0D8 48 0D 20 91 */ bl _restgpr_29 /* 8029019C 0028D0DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802901A0 0028D0E0 7C 08 03 A6 */ mtlr r0 /* 802901A4 0028D0E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -39,7 +39,7 @@ JASHeap_NS_initRootHeap: /* 802901B0 0028D0F0 7C 08 02 A6 */ mflr r0 /* 802901B4 0028D0F4 90 01 00 24 */ stw r0, 0x24(r1) /* 802901B8 0028D0F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802901BC 0028D0FC 48 0D 20 21 */ bl func_803621DC +/* 802901BC 0028D0FC 48 0D 20 21 */ bl _savegpr_29 /* 802901C0 0028D100 7C 7D 1B 78 */ mr r29, r3 /* 802901C4 0028D104 7C 9E 23 78 */ mr r30, r4 /* 802901C8 0028D108 7C BF 2B 78 */ mr r31, r5 @@ -58,7 +58,7 @@ JASHeap_NS_initRootHeap: /* 802901FC 0028D13C 80 61 00 08 */ lwz r3, 8(r1) /* 80290200 0028D140 48 0A EF 1D */ bl OSUnlockMutex /* 80290204 0028D144 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290208 0028D148 48 0D 20 21 */ bl func_80362228 +/* 80290208 0028D148 48 0D 20 21 */ bl _restgpr_29 /* 8029020C 0028D14C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80290210 0028D150 7C 08 03 A6 */ mtlr r0 /* 80290214 0028D154 38 21 00 20 */ addi r1, r1, 0x20 @@ -536,7 +536,7 @@ JASGenericMemPool_NS_dtor: /* 80290864 0028D7A4 7C 08 02 A6 */ mflr r0 /* 80290868 0028D7A8 90 01 00 24 */ stw r0, 0x24(r1) /* 8029086C 0028D7AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290870 0028D7B0 48 0D 19 6D */ bl func_803621DC +/* 80290870 0028D7B0 48 0D 19 6D */ bl _savegpr_29 /* 80290874 0028D7B4 7C 7D 1B 79 */ or. r29, r3, r3 /* 80290878 0028D7B8 7C 9E 23 78 */ mr r30, r4 /* 8029087C 0028D7BC 41 82 00 30 */ beq lbl_802908AC @@ -556,7 +556,7 @@ lbl_80290894: lbl_802908AC: /* 802908AC 0028D7EC 7F A3 EB 78 */ mr r3, r29 /* 802908B0 0028D7F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802908B4 0028D7F4 48 0D 19 75 */ bl func_80362228 +/* 802908B4 0028D7F4 48 0D 19 75 */ bl _restgpr_29 /* 802908B8 0028D7F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802908BC 0028D7FC 7C 08 03 A6 */ mtlr r0 /* 802908C0 0028D800 38 21 00 20 */ addi r1, r1, 0x20 @@ -641,7 +641,7 @@ JASKernel_NS_setupRootHeap: /* 802909BC 0028D8FC 7C 08 02 A6 */ mflr r0 /* 802909C0 0028D900 90 01 00 24 */ stw r0, 0x24(r1) /* 802909C4 0028D904 39 61 00 20 */ addi r11, r1, 0x20 -/* 802909C8 0028D908 48 0D 18 15 */ bl func_803621DC +/* 802909C8 0028D908 48 0D 18 15 */ bl _savegpr_29 /* 802909CC 0028D90C 7C 7D 1B 78 */ mr r29, r3 /* 802909D0 0028D910 7C 83 23 78 */ mr r3, r4 /* 802909D4 0028D914 7F A4 EB 78 */ mr r4, r29 @@ -702,7 +702,7 @@ lbl_80290AA0: /* 80290AA0 0028D9E0 93 ED 8C 9C */ stw r31, lbl_8045121C-_SDA_BASE_(r13) /* 80290AA4 0028D9E4 93 AD 8C 90 */ stw r29, lbl_80451210-_SDA_BASE_(r13) /* 80290AA8 0028D9E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80290AAC 0028D9EC 48 0D 17 7D */ bl func_80362228 +/* 80290AAC 0028D9EC 48 0D 17 7D */ bl _restgpr_29 /* 80290AB0 0028D9F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80290AB4 0028D9F4 7C 08 03 A6 */ mtlr r0 /* 80290AB8 0028D9F8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASSeqParser.s b/asm/JAudio2/JASSeqParser.s index 779ed9e5da3..b1a28ac663e 100644 --- a/asm/JAudio2/JASSeqParser.s +++ b/asm/JAudio2/JASSeqParser.s @@ -73,7 +73,7 @@ JASSeqParser_NS_writeReg: /* 80293DC8 00290D08 7C 08 02 A6 */ mflr r0 /* 80293DCC 00290D0C 90 01 00 24 */ stw r0, 0x24(r1) /* 80293DD0 00290D10 39 61 00 20 */ addi r11, r1, 0x20 -/* 80293DD4 00290D14 48 0C E4 09 */ bl func_803621DC +/* 80293DD4 00290D14 48 0C E4 09 */ bl _savegpr_29 /* 80293DD8 00290D18 7C 9D 23 78 */ mr r29, r4 /* 80293DDC 00290D1C 7C BE 2B 78 */ mr r30, r5 /* 80293DE0 00290D20 7C DF 33 78 */ mr r31, r6 @@ -195,7 +195,7 @@ lbl_80293E10: /* 80293FAC 00290EEC B3 FD 01 F2 */ sth r31, 0x1f2(r29) lbl_80293FB0: /* 80293FB0 00290EF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80293FB4 00290EF4 48 0C E2 75 */ bl func_80362228 +/* 80293FB4 00290EF4 48 0C E2 75 */ bl _restgpr_29 /* 80293FB8 00290EF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80293FBC 00290EFC 7C 08 03 A6 */ mtlr r0 /* 80293FC0 00290F00 38 21 00 20 */ addi r1, r1, 0x20 @@ -325,7 +325,7 @@ lbl_80294178: /* 8029418C 002910CC 7C 08 02 A6 */ mflr r0 /* 80294190 002910D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80294194 002910D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294198 002910D8 48 0C E0 45 */ bl func_803621DC +/* 80294198 002910D8 48 0C E0 45 */ bl _savegpr_29 /* 8029419C 002910DC 7C 9D 23 78 */ mr r29, r4 /* 802941A0 002910E0 83 E5 00 04 */ lwz r31, 4(r5) /* 802941A4 002910E4 7F A3 EB 78 */ mr r3, r29 @@ -344,7 +344,7 @@ lbl_802941C0: /* 802941D4 00291114 38 60 00 00 */ li r3, 0 lbl_802941D8: /* 802941D8 00291118 39 61 00 20 */ addi r11, r1, 0x20 -/* 802941DC 0029111C 48 0C E0 4D */ bl func_80362228 +/* 802941DC 0029111C 48 0C E0 4D */ bl _restgpr_29 /* 802941E0 00291120 80 01 00 24 */ lwz r0, 0x24(r1) /* 802941E4 00291124 7C 08 03 A6 */ mtlr r0 /* 802941E8 00291128 38 21 00 20 */ addi r1, r1, 0x20 @@ -563,7 +563,7 @@ lbl_8029437C: /* 8029452C 0029146C 7C 08 02 A6 */ mflr r0 /* 80294530 00291470 90 01 00 24 */ stw r0, 0x24(r1) /* 80294534 00291474 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294538 00291478 48 0C DC A5 */ bl func_803621DC +/* 80294538 00291478 48 0C DC A5 */ bl _savegpr_29 /* 8029453C 0029147C 7C 7D 1B 78 */ mr r29, r3 /* 80294540 00291480 7C 9E 23 78 */ mr r30, r4 /* 80294544 00291484 7C BF 2B 78 */ mr r31, r5 @@ -578,7 +578,7 @@ lbl_8029437C: /* 80294568 002914A8 4B FF F8 5D */ bl JASSeqParser_NS_writeReg /* 8029456C 002914AC 38 60 00 00 */ li r3, 0 /* 80294570 002914B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294574 002914B4 48 0C DC B5 */ bl func_80362228 +/* 80294574 002914B4 48 0C DC B5 */ bl _restgpr_29 /* 80294578 002914B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029457C 002914BC 7C 08 03 A6 */ mtlr r0 /* 80294580 002914C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -636,7 +636,7 @@ lbl_80294630: /* 80294648 00291588 7C 08 02 A6 */ mflr r0 /* 8029464C 0029158C 90 01 00 24 */ stw r0, 0x24(r1) /* 80294650 00291590 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294654 00291594 48 0C DB 89 */ bl func_803621DC +/* 80294654 00291594 48 0C DB 89 */ bl _savegpr_29 /* 80294658 00291598 7C 7D 1B 78 */ mr r29, r3 /* 8029465C 0029159C 7C 9E 23 78 */ mr r30, r4 /* 80294660 002915A0 7C BF 2B 78 */ mr r31, r5 @@ -654,7 +654,7 @@ lbl_80294630: lbl_80294690: /* 80294690 002915D0 38 60 00 00 */ li r3, 0 /* 80294694 002915D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294698 002915D8 48 0C DB 91 */ bl func_80362228 +/* 80294698 002915D8 48 0C DB 91 */ bl _restgpr_29 /* 8029469C 002915DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802946A0 002915E0 7C 08 03 A6 */ mtlr r0 /* 802946A4 002915E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -663,7 +663,7 @@ lbl_80294690: /* 802946B0 002915F0 7C 08 02 A6 */ mflr r0 /* 802946B4 002915F4 90 01 00 24 */ stw r0, 0x24(r1) /* 802946B8 002915F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802946BC 002915FC 48 0C DB 21 */ bl func_803621DC +/* 802946BC 002915FC 48 0C DB 21 */ bl _savegpr_29 /* 802946C0 00291600 7C 7D 1B 78 */ mr r29, r3 /* 802946C4 00291604 7C 9E 23 78 */ mr r30, r4 /* 802946C8 00291608 7C BF 2B 78 */ mr r31, r5 @@ -685,7 +685,7 @@ lbl_80294690: lbl_80294708: /* 80294708 00291648 38 60 00 00 */ li r3, 0 /* 8029470C 0029164C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294710 00291650 48 0C DB 19 */ bl func_80362228 +/* 80294710 00291650 48 0C DB 19 */ bl _restgpr_29 /* 80294714 00291654 80 01 00 24 */ lwz r0, 0x24(r1) /* 80294718 00291658 7C 08 03 A6 */ mtlr r0 /* 8029471C 0029165C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1223,7 +1223,7 @@ lbl_80294EF8: /* 80294F44 00291E84 7C 08 02 A6 */ mflr r0 /* 80294F48 00291E88 90 01 00 24 */ stw r0, 0x24(r1) /* 80294F4C 00291E8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294F50 00291E90 48 0C D2 8D */ bl func_803621DC +/* 80294F50 00291E90 48 0C D2 8D */ bl _savegpr_29 /* 80294F54 00291E94 7C 7D 1B 78 */ mr r29, r3 /* 80294F58 00291E98 7C 9E 23 78 */ mr r30, r4 /* 80294F5C 00291E9C 83 E5 00 04 */ lwz r31, 4(r5) @@ -1247,7 +1247,7 @@ lbl_80294F88: /* 80294F98 00291ED8 38 60 00 00 */ li r3, 0 lbl_80294F9C: /* 80294F9C 00291EDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80294FA0 00291EE0 48 0C D2 89 */ bl func_80362228 +/* 80294FA0 00291EE0 48 0C D2 89 */ bl _restgpr_29 /* 80294FA4 00291EE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80294FA8 00291EE8 7C 08 03 A6 */ mtlr r0 /* 80294FAC 00291EEC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASSimpleWaveBank.s b/asm/JAudio2/JASSimpleWaveBank.s index 35f08c7ac2e..0edcfb227b6 100644 --- a/asm/JAudio2/JASSimpleWaveBank.s +++ b/asm/JAudio2/JASSimpleWaveBank.s @@ -105,7 +105,7 @@ JASSimpleWaveBank_NS_setWaveTableSize: /* 80298DE4 00295D24 7C 08 02 A6 */ mflr r0 /* 80298DE8 00295D28 90 01 00 24 */ stw r0, 0x24(r1) /* 80298DEC 00295D2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298DF0 00295D30 48 0C 93 ED */ bl func_803621DC +/* 80298DF0 00295D30 48 0C 93 ED */ bl _savegpr_29 /* 80298DF4 00295D34 7C 7D 1B 78 */ mr r29, r3 /* 80298DF8 00295D38 7C 9E 23 78 */ mr r30, r4 /* 80298DFC 00295D3C 7C BF 2B 78 */ mr r31, r5 @@ -134,7 +134,7 @@ JASSimpleWaveBank_NS_setWaveTableSize: /* 80298E40 00295D80 90 7D 00 78 */ stw r3, 0x78(r29) /* 80298E44 00295D84 93 DD 00 7C */ stw r30, 0x7c(r29) /* 80298E48 00295D88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80298E4C 00295D8C 48 0C 93 DD */ bl func_80362228 +/* 80298E4C 00295D8C 48 0C 93 DD */ bl _restgpr_29 /* 80298E50 00295D90 80 01 00 24 */ lwz r0, 0x24(r1) /* 80298E54 00295D94 7C 08 03 A6 */ mtlr r0 /* 80298E58 00295D98 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JASTrack.s b/asm/JAudio2/JASTrack.s index 51d3ef7798c..9c67386ad40 100644 --- a/asm/JAudio2/JASTrack.s +++ b/asm/JAudio2/JASTrack.s @@ -2234,7 +2234,7 @@ JASTrack_NS_TList_NS_seqMain: /* 80293020 0028FF60 7C 08 02 A6 */ mflr r0 /* 80293024 0028FF64 90 01 00 44 */ stw r0, 0x44(r1) /* 80293028 0028FF68 39 61 00 40 */ addi r11, r1, 0x40 -/* 8029302C 0028FF6C 48 0C F1 B1 */ bl func_803621DC +/* 8029302C 0028FF6C 48 0C F1 B1 */ bl _savegpr_29 /* 80293030 0028FF70 7C 7D 1B 78 */ mr r29, r3 /* 80293034 0028FF74 80 03 00 04 */ lwz r0, 4(r3) /* 80293038 0028FF78 90 01 00 1C */ stw r0, 0x1c(r1) @@ -2276,7 +2276,7 @@ lbl_802930A8: /* 802930BC 0028FFFC 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f /* 802930C0 00290000 41 82 FF A0 */ beq lbl_80293060 /* 802930C4 00290004 39 61 00 40 */ addi r11, r1, 0x40 -/* 802930C8 00290008 48 0C F1 61 */ bl func_80362228 +/* 802930C8 00290008 48 0C F1 61 */ bl _restgpr_29 /* 802930CC 0029000C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802930D0 00290010 7C 08 03 A6 */ mtlr r0 /* 802930D4 00290014 38 21 00 40 */ addi r1, r1, 0x40 @@ -2384,7 +2384,7 @@ JASTrack_NS_TChannelMgr_NS_noteOff: /* 80293224 00290164 7C 08 02 A6 */ mflr r0 /* 80293228 00290168 90 01 00 24 */ stw r0, 0x24(r1) /* 8029322C 0029016C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80293230 00290170 48 0C EF AD */ bl func_803621DC +/* 80293230 00290170 48 0C EF AD */ bl _savegpr_29 /* 80293234 00290174 7C 7D 1B 78 */ mr r29, r3 /* 80293238 00290178 54 9F 10 3A */ slwi r31, r4, 2 /* 8029323C 0029017C 7F DD F8 2E */ lwzx r30, r29, r31 @@ -2411,7 +2411,7 @@ lbl_80293274: /* 80293284 002901C4 38 60 00 01 */ li r3, 1 lbl_80293288: /* 80293288 002901C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8029328C 002901CC 48 0C EF 9D */ bl func_80362228 +/* 8029328C 002901CC 48 0C EF 9D */ bl _restgpr_29 /* 80293290 002901D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80293294 002901D4 7C 08 03 A6 */ mtlr r0 /* 80293298 002901D8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUAudioArcLoader.s b/asm/JAudio2/JAUAudioArcLoader.s index cc888d8646c..ab5a322b734 100644 --- a/asm/JAudio2/JAUAudioArcLoader.s +++ b/asm/JAudio2/JAUAudioArcLoader.s @@ -39,7 +39,7 @@ JAUAudioArcLoader_NS_load: /* 802A47B0 002A16F0 7C 08 02 A6 */ mflr r0 /* 802A47B4 002A16F4 90 01 00 24 */ stw r0, 0x24(r1) /* 802A47B8 002A16F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A47BC 002A16FC 48 0B DA 21 */ bl func_803621DC +/* 802A47BC 002A16FC 48 0B DA 21 */ bl _savegpr_29 /* 802A47C0 002A1700 7C 7D 1B 78 */ mr r29, r3 /* 802A47C4 002A1704 7C 9E 23 78 */ mr r30, r4 /* 802A47C8 002A1708 7C DF 33 78 */ mr r31, r6 @@ -53,7 +53,7 @@ JAUAudioArcLoader_NS_load: /* 802A47E8 002A1728 48 00 11 61 */ bl JAUSection_NS_loadWaveArc lbl_802A47EC: /* 802A47EC 002A172C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A47F0 002A1730 48 0B DA 39 */ bl func_80362228 +/* 802A47F0 002A1730 48 0B DA 39 */ bl _restgpr_29 /* 802A47F4 002A1734 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A47F8 002A1738 7C 08 03 A6 */ mtlr r0 /* 802A47FC 002A173C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUInitializer.s b/asm/JAudio2/JAUInitializer.s index f6a0b94b179..9d102c6034e 100644 --- a/asm/JAudio2/JAUInitializer.s +++ b/asm/JAudio2/JAUInitializer.s @@ -34,7 +34,7 @@ JAU_JASInitializer_NS_initJASystem: /* 802A4B2C 002A1A6C 7C 08 02 A6 */ mflr r0 /* 802A4B30 002A1A70 90 01 00 24 */ stw r0, 0x24(r1) /* 802A4B34 002A1A74 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4B38 002A1A78 48 0B D6 A5 */ bl func_803621DC +/* 802A4B38 002A1A78 48 0B D6 A5 */ bl _savegpr_29 /* 802A4B3C 002A1A7C 7C 7F 1B 78 */ mr r31, r3 /* 802A4B40 002A1A80 7C 9D 23 78 */ mr r29, r4 /* 802A4B44 002A1A84 80 0D 86 0C */ lwz r0, lbl_80450B8C-_SDA_BASE_(r13) @@ -174,7 +174,7 @@ lbl_802A4D1C: /* 802A4D20 002A1C60 4B FF 94 59 */ bl JASDriver_NS_setOutputMode lbl_802A4D24: /* 802A4D24 002A1C64 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4D28 002A1C68 48 0B D5 01 */ bl func_80362228 +/* 802A4D28 002A1C68 48 0B D5 01 */ bl _restgpr_29 /* 802A4D2C 002A1C6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A4D30 002A1C70 7C 08 03 A6 */ mtlr r0 /* 802A4D34 002A1C74 38 21 00 20 */ addi r1, r1, 0x20 @@ -198,7 +198,7 @@ JAU_JAIInitializer_NS_initJAInterface: /* 802A4D64 002A1CA4 7C 08 02 A6 */ mflr r0 /* 802A4D68 002A1CA8 90 01 00 24 */ stw r0, 0x24(r1) /* 802A4D6C 002A1CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4D70 002A1CB0 48 0B D4 6D */ bl func_803621DC +/* 802A4D70 002A1CB0 48 0B D4 6D */ bl _savegpr_29 /* 802A4D74 002A1CB4 7C 7E 1B 78 */ mr r30, r3 /* 802A4D78 002A1CB8 3C 60 80 43 */ lis r3, lbl_80434110@ha /* 802A4D7C 002A1CBC 3B E3 41 10 */ addi r31, r3, lbl_80434110@l @@ -299,7 +299,7 @@ lbl_802A4EB4: /* 802A4EC8 002A1E08 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13) /* 802A4ECC 002A1E0C 48 02 98 61 */ bl JKRHeap_NS_getFreeSize /* 802A4ED0 002A1E10 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A4ED4 002A1E14 48 0B D3 55 */ bl func_80362228 +/* 802A4ED4 002A1E14 48 0B D3 55 */ bl _restgpr_29 /* 802A4ED8 002A1E18 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A4EDC 002A1E1C 7C 08 03 A6 */ mtlr r0 /* 802A4EE0 002A1E20 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUSectionHeap.s b/asm/JAudio2/JAUSectionHeap.s index cdb7546fe2c..047c3c0d734 100644 --- a/asm/JAudio2/JAUSectionHeap.s +++ b/asm/JAudio2/JAUSectionHeap.s @@ -445,7 +445,7 @@ JAUSection_NS_newSeSeqCollection: /* 802A5504 002A2444 7C 08 02 A6 */ mflr r0 /* 802A5508 002A2448 90 01 00 24 */ stw r0, 0x24(r1) /* 802A550C 002A244C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5510 002A2450 48 0B CC CD */ bl func_803621DC +/* 802A5510 002A2450 48 0B CC CD */ bl _savegpr_29 /* 802A5514 002A2454 7C 7D 1B 78 */ mr r29, r3 /* 802A5518 002A2458 7C 9E 23 78 */ mr r30, r4 /* 802A551C 002A245C 28 05 00 00 */ cmplwi r5, 0 @@ -476,7 +476,7 @@ lbl_802A5558: /* 802A5578 002A24B8 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A557C 002A24BC 80 63 05 24 */ lwz r3, 0x524(r3) /* 802A5580 002A24C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5584 002A24C4 48 0B CC A5 */ bl func_80362228 +/* 802A5584 002A24C4 48 0B CC A5 */ bl _restgpr_29 /* 802A5588 002A24C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A558C 002A24CC 7C 08 03 A6 */ mtlr r0 /* 802A5590 002A24D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -605,7 +605,7 @@ JAUSection_NS_newStaticSeqData_X1_: /* 802A5734 002A2674 7C 08 02 A6 */ mflr r0 /* 802A5738 002A2678 90 01 00 34 */ stw r0, 0x34(r1) /* 802A573C 002A267C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A5740 002A2680 48 0B CA 9D */ bl func_803621DC +/* 802A5740 002A2680 48 0B CA 9D */ bl _savegpr_29 /* 802A5744 002A2684 7C 7D 1B 78 */ mr r29, r3 /* 802A5748 002A2688 7C 9E 23 78 */ mr r30, r4 /* 802A574C 002A268C 83 E3 00 5C */ lwz r31, 0x5c(r3) @@ -647,7 +647,7 @@ lbl_802A57D4: /* 802A57D4 002A2714 38 60 00 00 */ li r3, 0 lbl_802A57D8: /* 802A57D8 002A2718 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A57DC 002A271C 48 0B CA 4D */ bl func_80362228 +/* 802A57DC 002A271C 48 0B CA 4D */ bl _restgpr_29 /* 802A57E0 002A2720 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A57E4 002A2724 7C 08 03 A6 */ mtlr r0 /* 802A57E8 002A2728 38 21 00 30 */ addi r1, r1, 0x30 @@ -659,7 +659,7 @@ JAUSection_NS_newCopy: /* 802A57F4 002A2734 7C 08 02 A6 */ mflr r0 /* 802A57F8 002A2738 90 01 00 24 */ stw r0, 0x24(r1) /* 802A57FC 002A273C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5800 002A2740 48 0B C9 DD */ bl func_803621DC +/* 802A5800 002A2740 48 0B C9 DD */ bl _savegpr_29 /* 802A5804 002A2744 7C 67 1B 78 */ mr r7, r3 /* 802A5808 002A2748 7C 9D 23 78 */ mr r29, r4 /* 802A580C 002A274C 7C BE 2B 78 */ mr r30, r5 @@ -676,7 +676,7 @@ JAUSection_NS_newCopy: lbl_802A5838: /* 802A5838 002A2778 7F E3 FB 78 */ mr r3, r31 /* 802A583C 002A277C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5840 002A2780 48 0B C9 E9 */ bl func_80362228 +/* 802A5840 002A2780 48 0B C9 E9 */ bl _restgpr_29 /* 802A5844 002A2784 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A5848 002A2788 7C 08 03 A6 */ mtlr r0 /* 802A584C 002A278C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1240,7 +1240,7 @@ JAUSectionHeap: /* 802A5FE4 002A2F24 7C 08 02 A6 */ mflr r0 /* 802A5FE8 002A2F28 90 01 00 24 */ stw r0, 0x24(r1) /* 802A5FEC 002A2F2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A5FF0 002A2F30 48 0B C1 ED */ bl func_803621DC +/* 802A5FF0 002A2F30 48 0B C1 ED */ bl _savegpr_29 /* 802A5FF4 002A2F34 7C 7D 1B 78 */ mr r29, r3 /* 802A5FF8 002A2F38 7C 9E 23 78 */ mr r30, r4 /* 802A5FFC 002A2F3C 7C BF 2B 78 */ mr r31, r5 @@ -1279,7 +1279,7 @@ lbl_802A6070: /* 802A6074 002A2FB4 48 03 5E D9 */ bl JSUPtrList_NS_append /* 802A6078 002A2FB8 7F A3 EB 78 */ mr r3, r29 /* 802A607C 002A2FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6080 002A2FC0 48 0B C1 A9 */ bl func_80362228 +/* 802A6080 002A2FC0 48 0B C1 A9 */ bl _restgpr_29 /* 802A6084 002A2FC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A6088 002A2FC8 7C 08 03 A6 */ mtlr r0 /* 802A608C 002A2FCC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1434,7 +1434,7 @@ JAUSectionHeap_NS_dtor: /* 802A627C 002A31BC 7C 08 02 A6 */ mflr r0 /* 802A6280 002A31C0 90 01 00 24 */ stw r0, 0x24(r1) /* 802A6284 002A31C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6288 002A31C8 48 0B BF 55 */ bl func_803621DC +/* 802A6288 002A31C8 48 0B BF 55 */ bl _savegpr_29 /* 802A628C 002A31CC 7C 7E 1B 79 */ or. r30, r3, r3 /* 802A6290 002A31D0 7C 9F 23 78 */ mr r31, r4 /* 802A6294 002A31D4 41 82 01 90 */ beq lbl_802A6424 @@ -1554,7 +1554,7 @@ lbl_802A6414: lbl_802A6424: /* 802A6424 002A3364 7F C3 F3 78 */ mr r3, r30 /* 802A6428 002A3368 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A642C 002A336C 48 0B BD FD */ bl func_80362228 +/* 802A642C 002A336C 48 0B BD FD */ bl _restgpr_29 /* 802A6430 002A3370 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A6434 002A3374 7C 08 03 A6 */ mtlr r0 /* 802A6438 002A3378 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/JAUSeqDataBlockMgr.s b/asm/JAudio2/JAUSeqDataBlockMgr.s index 1314b829d73..fd99330cbfa 100644 --- a/asm/JAudio2/JAUSeqDataBlockMgr.s +++ b/asm/JAudio2/JAUSeqDataBlockMgr.s @@ -464,7 +464,7 @@ JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_: /* 802A6EE0 002A3E20 7C 08 02 A6 */ mflr r0 /* 802A6EE4 002A3E24 90 01 00 24 */ stw r0, 0x24(r1) /* 802A6EE8 002A3E28 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6EEC 002A3E2C 48 0B B2 F1 */ bl func_803621DC +/* 802A6EEC 002A3E2C 48 0B B2 F1 */ bl _savegpr_29 /* 802A6EF0 002A3E30 7C 7D 1B 78 */ mr r29, r3 /* 802A6EF4 002A3E34 83 C3 00 0C */ lwz r30, 0xc(r3) /* 802A6EF8 002A3E38 48 00 00 58 */ b lbl_802A6F50 @@ -496,7 +496,7 @@ lbl_802A6F50: /* 802A6F50 002A3E90 28 1E 00 00 */ cmplwi r30, 0 /* 802A6F54 002A3E94 40 82 FF A8 */ bne lbl_802A6EFC /* 802A6F58 002A3E98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A6F5C 002A3E9C 48 0B B2 CD */ bl func_80362228 +/* 802A6F5C 002A3E9C 48 0B B2 CD */ bl _restgpr_29 /* 802A6F60 002A3EA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A6F64 002A3EA4 7C 08 03 A6 */ mtlr r0 /* 802A6F68 002A3EA8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JFramework/JFWDisplay.s b/asm/JFramework/JFWDisplay.s index 61718d6a9e3..199d2d33e04 100644 --- a/asm/JFramework/JFWDisplay.s +++ b/asm/JFramework/JFWDisplay.s @@ -58,7 +58,7 @@ JFWDisplay: /* 802720FC 0026F03C 7C 08 02 A6 */ mflr r0 /* 80272100 0026F040 90 01 00 24 */ stw r0, 0x24(r1) /* 80272104 0026F044 39 61 00 20 */ addi r11, r1, 0x20 -/* 80272108 0026F048 48 0F 00 D5 */ bl func_803621DC +/* 80272108 0026F048 48 0F 00 D5 */ bl _savegpr_29 /* 8027210C 0026F04C 7C 7D 1B 78 */ mr r29, r3 /* 80272110 0026F050 7C 9E 23 78 */ mr r30, r4 /* 80272114 0026F054 7C BF 2B 78 */ mr r31, r5 @@ -75,7 +75,7 @@ JFWDisplay: /* 80272140 0026F080 90 7D 00 10 */ stw r3, 0x10(r29) /* 80272144 0026F084 7F A3 EB 78 */ mr r3, r29 /* 80272148 0026F088 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027214C 0026F08C 48 0F 00 DD */ bl func_80362228 +/* 8027214C 0026F08C 48 0F 00 DD */ bl _restgpr_29 /* 80272150 0026F090 80 01 00 24 */ lwz r0, 0x24(r1) /* 80272154 0026F094 7C 08 03 A6 */ mtlr r0 /* 80272158 0026F098 38 21 00 20 */ addi r1, r1, 0x20 @@ -120,7 +120,7 @@ JFWDisplay_NS_createManager: /* 802721E0 0026F120 7C 08 02 A6 */ mflr r0 /* 802721E4 0026F124 90 01 00 24 */ stw r0, 0x24(r1) /* 802721E8 0026F128 39 61 00 20 */ addi r11, r1, 0x20 -/* 802721EC 0026F12C 48 0E FF F1 */ bl func_803621DC +/* 802721EC 0026F12C 48 0E FF F1 */ bl _savegpr_29 /* 802721F0 0026F130 7C 60 1B 79 */ or. r0, r3, r3 /* 802721F4 0026F134 7C 9D 23 78 */ mr r29, r4 /* 802721F8 0026F138 7C BE 2B 78 */ mr r30, r5 @@ -147,7 +147,7 @@ lbl_80272240: lbl_80272244: /* 80272244 0026F184 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 80272248 0026F188 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027224C 0026F18C 48 0E FF DD */ bl func_80362228 +/* 8027224C 0026F18C 48 0E FF DD */ bl _restgpr_29 /* 80272250 0026F190 80 01 00 24 */ lwz r0, 0x24(r1) /* 80272254 0026F194 7C 08 03 A6 */ mtlr r0 /* 80272258 0026F198 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JGadget/linklist.s b/asm/JGadget/linklist.s index 9df8f10939a..1288ccf63bf 100644 --- a/asm/JGadget/linklist.s +++ b/asm/JGadget/linklist.s @@ -80,7 +80,7 @@ JGadget_NS_TNodeLinkList_NS_splice: /* 802DCB0C 002D9A4C 7C 08 02 A6 */ mflr r0 /* 802DCB10 002D9A50 90 01 00 44 */ stw r0, 0x44(r1) /* 802DCB14 002D9A54 39 61 00 40 */ addi r11, r1, 0x40 -/* 802DCB18 002D9A58 48 08 56 C5 */ bl func_803621DC +/* 802DCB18 002D9A58 48 08 56 C5 */ bl _savegpr_29 /* 802DCB1C 002D9A5C 7C 7D 1B 78 */ mr r29, r3 /* 802DCB20 002D9A60 7C 9E 23 78 */ mr r30, r4 /* 802DCB24 002D9A64 80 C6 00 00 */ lwz r6, 0(r6) @@ -113,7 +113,7 @@ lbl_802DCB60: /* 802DCB8C 002D9ACC 48 00 00 1D */ bl JGadget_NS_TNodeLinkList_NS_Insert lbl_802DCB90: /* 802DCB90 002D9AD0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802DCB94 002D9AD4 48 08 56 95 */ bl func_80362228 +/* 802DCB94 002D9AD4 48 08 56 95 */ bl _restgpr_29 /* 802DCB98 002D9AD8 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DCB9C 002D9ADC 7C 08 03 A6 */ mtlr r0 /* 802DCBA0 002D9AE0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JGadget/std-vector.s b/asm/JGadget/std-vector.s index 743c31a6f88..0d820cc8bd9 100644 --- a/asm/JGadget/std-vector.s +++ b/asm/JGadget/std-vector.s @@ -121,7 +121,7 @@ JGadget_NS_TVector: /* 802DCE20 002D9D60 7C 08 02 A6 */ mflr r0 /* 802DCE24 002D9D64 90 01 00 24 */ stw r0, 0x24(r1) /* 802DCE28 002D9D68 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DCE2C 002D9D6C 48 08 53 B1 */ bl func_803621DC +/* 802DCE2C 002D9D6C 48 08 53 B1 */ bl _savegpr_29 /* 802DCE30 002D9D70 7C 7D 1B 78 */ mr r29, r3 /* 802DCE34 002D9D74 7C BE 2B 79 */ or. r30, r5, r5 /* 802DCE38 002D9D78 7C DF 33 78 */ mr r31, r6 @@ -143,7 +143,7 @@ lbl_802DCE6C: /* 802DCE70 002D9DB0 42 00 FF F0 */ bdnz lbl_802DCE60 lbl_802DCE74: /* 802DCE74 002D9DB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DCE78 002D9DB8 48 08 53 B1 */ bl func_80362228 +/* 802DCE78 002D9DB8 48 08 53 B1 */ bl _restgpr_29 /* 802DCE7C 002D9DBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DCE80 002D9DC0 7C 08 03 A6 */ mtlr r0 /* 802DCE84 002D9DC4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRAram.s b/asm/JKernel/JKRAram.s index d90b49f4afb..3ad978b8ad3 100644 --- a/asm/JKernel/JKRAram.s +++ b/asm/JKernel/JKRAram.s @@ -163,7 +163,7 @@ lbl_802D21C0: /* 802D21E0 002CF120 7C 08 02 A6 */ mflr r0 /* 802D21E4 002CF124 90 01 00 24 */ stw r0, 0x24(r1) /* 802D21E8 002CF128 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D21EC 002CF12C 48 08 FF F1 */ bl func_803621DC +/* 802D21EC 002CF12C 48 08 FF F1 */ bl _savegpr_29 /* 802D21F0 002CF130 3C 60 80 3D */ lis r3, lbl_803CC138@ha /* 802D21F4 002CF134 38 63 C1 38 */ addi r3, r3, lbl_803CC138@l /* 802D21F8 002CF138 3C 80 80 3D */ lis r4, lbl_803CC128@ha @@ -732,7 +732,7 @@ decompSZS_subroutine: /* 802D29A4 002CF8E4 7C 08 02 A6 */ mflr r0 /* 802D29A8 002CF8E8 90 01 00 24 */ stw r0, 0x24(r1) /* 802D29AC 002CF8EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D29B0 002CF8F0 48 08 F8 2D */ bl func_803621DC +/* 802D29B0 002CF8F0 48 08 F8 2D */ bl _savegpr_29 /* 802D29B4 002CF8F4 7C 9D 23 78 */ mr r29, r4 /* 802D29B8 002CF8F8 38 80 00 00 */ li r4, 0 /* 802D29BC 002CF8FC 38 00 00 00 */ li r0, 0 @@ -914,7 +914,7 @@ lbl_802D2C1C: /* 802D2C24 002CFB64 38 60 00 00 */ li r3, 0 lbl_802D2C28: /* 802D2C28 002CFB68 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2C2C 002CFB6C 48 08 F5 FD */ bl func_80362228 +/* 802D2C2C 002CFB6C 48 08 F5 FD */ bl _restgpr_29 /* 802D2C30 002CFB70 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D2C34 002CFB74 7C 08 03 A6 */ mtlr r0 /* 802D2C38 002CFB78 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRAramArchive.s b/asm/JKernel/JKRAramArchive.s index 4a40b25847c..f9919ed1606 100644 --- a/asm/JKernel/JKRAramArchive.s +++ b/asm/JKernel/JKRAramArchive.s @@ -9,7 +9,7 @@ JKRAramArchive: /* 802D70C4 002D4004 7C 08 02 A6 */ mflr r0 /* 802D70C8 002D4008 90 01 00 24 */ stw r0, 0x24(r1) /* 802D70CC 002D400C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D70D0 002D4010 48 08 B1 0D */ bl func_803621DC +/* 802D70D0 002D4010 48 08 B1 0D */ bl _savegpr_29 /* 802D70D4 002D4014 7C 7D 1B 78 */ mr r29, r3 /* 802D70D8 002D4018 7C 9E 23 78 */ mr r30, r4 /* 802D70DC 002D401C 7C BF 2B 78 */ mr r31, r5 @@ -44,7 +44,7 @@ lbl_802D7114: /* 802D714C 002D408C 7F A3 EB 78 */ mr r3, r29 lbl_802D7150: /* 802D7150 002D4090 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7154 002D4094 48 08 B0 D5 */ bl func_80362228 +/* 802D7154 002D4094 48 08 B0 D5 */ bl _restgpr_29 /* 802D7158 002D4098 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D715C 002D409C 7C 08 03 A6 */ mtlr r0 /* 802D7160 002D40A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -699,7 +699,7 @@ lbl_802D7A4C: /* 802D7A68 002D49A8 7C 08 02 A6 */ mflr r0 /* 802D7A6C 002D49AC 90 01 00 64 */ stw r0, 0x64(r1) /* 802D7A70 002D49B0 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D7A74 002D49B4 48 08 A7 69 */ bl func_803621DC +/* 802D7A74 002D49B4 48 08 A7 69 */ bl _savegpr_29 /* 802D7A78 002D49B8 7C 7F 1B 78 */ mr r31, r3 /* 802D7A7C 002D49BC 7C 9E 23 78 */ mr r30, r4 /* 802D7A80 002D49C0 80 03 00 50 */ lwz r0, 0x50(r3) @@ -770,7 +770,7 @@ lbl_802D7B00: /* 802D7B74 002D4AB4 7F C3 F3 78 */ mr r3, r30 lbl_802D7B78: /* 802D7B78 002D4AB8 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D7B7C 002D4ABC 48 08 A6 AD */ bl func_80362228 +/* 802D7B7C 002D4ABC 48 08 A6 AD */ bl _restgpr_29 /* 802D7B80 002D4AC0 80 01 00 64 */ lwz r0, 0x64(r1) /* 802D7B84 002D4AC4 7C 08 03 A6 */ mtlr r0 /* 802D7B88 002D4AC8 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JKernel/JKRAramHeap.s b/asm/JKernel/JKRAramHeap.s index 3f402f3d84d..a63184c38a0 100644 --- a/asm/JKernel/JKRAramHeap.s +++ b/asm/JKernel/JKRAramHeap.s @@ -9,7 +9,7 @@ JKRAramHeap: /* 802D2E48 002CFD88 7C 08 02 A6 */ mflr r0 /* 802D2E4C 002CFD8C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D2E50 002CFD90 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2E54 002CFD94 48 08 F3 89 */ bl func_803621DC +/* 802D2E54 002CFD94 48 08 F3 89 */ bl _savegpr_29 /* 802D2E58 002CFD98 7C 7D 1B 78 */ mr r29, r3 /* 802D2E5C 002CFD9C 7C 9E 23 78 */ mr r30, r4 /* 802D2E60 002CFDA0 7C BF 2B 78 */ mr r31, r5 @@ -53,7 +53,7 @@ lbl_802D2EE8: /* 802D2EF4 002CFE34 48 00 90 59 */ bl JSUPtrList_NS_append /* 802D2EF8 002CFE38 7F A3 EB 78 */ mr r3, r29 /* 802D2EFC 002CFE3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2F00 002CFE40 48 08 F3 29 */ bl func_80362228 +/* 802D2F00 002CFE40 48 08 F3 29 */ bl _restgpr_29 /* 802D2F04 002CFE44 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D2F08 002CFE48 7C 08 03 A6 */ mtlr r0 /* 802D2F0C 002CFE4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -62,7 +62,7 @@ lbl_802D2EE8: /* 802D2F18 002CFE58 7C 08 02 A6 */ mflr r0 /* 802D2F1C 002CFE5C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D2F20 002CFE60 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2F24 002CFE64 48 08 F2 B9 */ bl func_803621DC +/* 802D2F24 002CFE64 48 08 F2 B9 */ bl _savegpr_29 /* 802D2F28 002CFE68 7C 7D 1B 79 */ or. r29, r3, r3 /* 802D2F2C 002CFE6C 7C 9E 23 78 */ mr r30, r4 /* 802D2F30 002CFE70 41 82 00 70 */ beq lbl_802D2FA0 @@ -98,7 +98,7 @@ lbl_802D2F7C: lbl_802D2FA0: /* 802D2FA0 002CFEE0 7F A3 EB 78 */ mr r3, r29 /* 802D2FA4 002CFEE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2FA8 002CFEE8 48 08 F2 81 */ bl func_80362228 +/* 802D2FA8 002CFEE8 48 08 F2 81 */ bl _restgpr_29 /* 802D2FAC 002CFEEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D2FB0 002CFEF0 7C 08 03 A6 */ mtlr r0 /* 802D2FB4 002CFEF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -110,7 +110,7 @@ JKRAramHeap_NS_alloc: /* 802D2FC0 002CFF00 7C 08 02 A6 */ mflr r0 /* 802D2FC4 002CFF04 90 01 00 24 */ stw r0, 0x24(r1) /* 802D2FC8 002CFF08 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D2FCC 002CFF0C 48 08 F2 11 */ bl func_803621DC +/* 802D2FCC 002CFF0C 48 08 F2 11 */ bl _savegpr_29 /* 802D2FD0 002CFF10 7C 7D 1B 78 */ mr r29, r3 /* 802D2FD4 002CFF14 7C 9E 23 78 */ mr r30, r4 /* 802D2FD8 002CFF18 7C BF 2B 78 */ mr r31, r5 @@ -133,7 +133,7 @@ lbl_802D3010: /* 802D3014 002CFF54 48 06 C1 09 */ bl OSUnlockMutex /* 802D3018 002CFF58 7F E3 FB 78 */ mr r3, r31 /* 802D301C 002CFF5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D3020 002CFF60 48 08 F2 09 */ bl func_80362228 +/* 802D3020 002CFF60 48 08 F2 09 */ bl _restgpr_29 /* 802D3024 002CFF64 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D3028 002CFF68 7C 08 03 A6 */ mtlr r0 /* 802D302C 002CFF6C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRArchivePri.s b/asm/JKernel/JKRArchivePri.s index 2030e748c19..d0bfcc3e984 100644 --- a/asm/JKernel/JKRArchivePri.s +++ b/asm/JKernel/JKRArchivePri.s @@ -9,7 +9,7 @@ JKRArchive: /* 802D6298 002D31D8 7C 08 02 A6 */ mflr r0 /* 802D629C 002D31DC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D62A0 002D31E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D62A4 002D31E4 48 08 BF 39 */ bl func_803621DC +/* 802D62A4 002D31E4 48 08 BF 39 */ bl _savegpr_29 /* 802D62A8 002D31E8 7C 7D 1B 78 */ mr r29, r3 /* 802D62AC 002D31EC 7C 9E 23 78 */ mr r30, r4 /* 802D62B0 002D31F0 7C BF 2B 78 */ mr r31, r5 @@ -42,7 +42,7 @@ lbl_802D62FC: lbl_802D6318: /* 802D6318 002D3258 7F A3 EB 78 */ mr r3, r29 /* 802D631C 002D325C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6320 002D3260 48 08 BF 09 */ bl func_80362228 +/* 802D6320 002D3260 48 08 BF 09 */ bl _restgpr_29 /* 802D6324 002D3264 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6328 002D3268 7C 08 03 A6 */ mtlr r0 /* 802D632C 002D326C 38 21 00 20 */ addi r1, r1, 0x20 @@ -424,7 +424,7 @@ JKRArchive_NS_CArcName_NS_store: /* 802D67F8 002D3738 7C 08 02 A6 */ mflr r0 /* 802D67FC 002D373C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D6800 002D3740 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6804 002D3744 48 08 B9 D9 */ bl func_803621DC +/* 802D6804 002D3744 48 08 B9 D9 */ bl _savegpr_29 /* 802D6808 002D3748 7C 7D 1B 78 */ mr r29, r3 /* 802D680C 002D374C 7C 9E 23 78 */ mr r30, r4 /* 802D6810 002D3750 38 00 00 00 */ li r0, 0 @@ -454,7 +454,7 @@ lbl_802D6850: /* 802D6864 002D37A4 7C 7D FA 14 */ add r3, r29, r31 /* 802D6868 002D37A8 98 03 00 04 */ stb r0, 4(r3) /* 802D686C 002D37AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6870 002D37B0 48 08 B9 B9 */ bl func_80362228 +/* 802D6870 002D37B0 48 08 B9 B9 */ bl _restgpr_29 /* 802D6874 002D37B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6878 002D37B8 7C 08 03 A6 */ mtlr r0 /* 802D687C 002D37BC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRArchivePub.s b/asm/JKernel/JKRArchivePub.s index 30a19a30bd5..805d6f19a2c 100644 --- a/asm/JKernel/JKRArchivePub.s +++ b/asm/JKernel/JKRArchivePub.s @@ -43,7 +43,7 @@ JKRArchive_NS_mount: /* 802D57E8 002D2728 7C 08 02 A6 */ mflr r0 /* 802D57EC 002D272C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D57F0 002D2730 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D57F4 002D2734 48 08 C9 E9 */ bl func_803621DC +/* 802D57F4 002D2734 48 08 C9 E9 */ bl _savegpr_29 /* 802D57F8 002D2738 7C 9D 23 78 */ mr r29, r4 /* 802D57FC 002D273C 7C BE 2B 78 */ mr r30, r5 /* 802D5800 002D2740 7C DF 33 78 */ mr r31, r6 @@ -59,7 +59,7 @@ lbl_802D5818: /* 802D5824 002D2764 48 00 00 A5 */ bl JKRArchive_NS_mount_X2_ lbl_802D5828: /* 802D5828 002D2768 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D582C 002D276C 48 08 C9 FD */ bl func_80362228 +/* 802D582C 002D276C 48 08 C9 FD */ bl _restgpr_29 /* 802D5830 002D2770 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5834 002D2774 7C 08 03 A6 */ mtlr r0 /* 802D5838 002D2778 38 21 00 20 */ addi r1, r1, 0x20 @@ -71,7 +71,7 @@ JKRArchive_NS_mount_X1_: /* 802D5844 002D2784 7C 08 02 A6 */ mflr r0 /* 802D5848 002D2788 90 01 00 24 */ stw r0, 0x24(r1) /* 802D584C 002D278C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5850 002D2790 48 08 C9 8D */ bl func_803621DC +/* 802D5850 002D2790 48 08 C9 8D */ bl _savegpr_29 /* 802D5854 002D2794 7C 7D 1B 78 */ mr r29, r3 /* 802D5858 002D2798 7C 9E 23 78 */ mr r30, r4 /* 802D585C 002D279C 7C BF 2B 78 */ mr r31, r5 @@ -100,7 +100,7 @@ lbl_802D58AC: /* 802D58AC 002D27EC 7C 03 03 78 */ mr r3, r0 lbl_802D58B0: /* 802D58B0 002D27F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D58B4 002D27F4 48 08 C9 75 */ bl func_80362228 +/* 802D58B4 002D27F4 48 08 C9 75 */ bl _restgpr_29 /* 802D58B8 002D27F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D58BC 002D27FC 7C 08 03 A6 */ mtlr r0 /* 802D58C0 002D2800 38 21 00 20 */ addi r1, r1, 0x20 @@ -295,7 +295,7 @@ JKRArchive_NS_getGlbResource: /* 802D5B3C 002D2A7C 7C 08 02 A6 */ mflr r0 /* 802D5B40 002D2A80 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5B44 002D2A84 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5B48 002D2A88 48 08 C6 95 */ bl func_803621DC +/* 802D5B48 002D2A88 48 08 C6 95 */ bl _savegpr_29 /* 802D5B4C 002D2A8C 7C 7D 1B 78 */ mr r29, r3 /* 802D5B50 002D2A90 7C 9E 23 78 */ mr r30, r4 /* 802D5B54 002D2A94 38 C0 00 00 */ li r6, 0 @@ -336,7 +336,7 @@ lbl_802D5BCC: /* 802D5BCC 002D2B0C 7C C3 33 78 */ mr r3, r6 lbl_802D5BD0: /* 802D5BD0 002D2B10 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5BD4 002D2B14 48 08 C6 55 */ bl func_80362228 +/* 802D5BD4 002D2B14 48 08 C6 55 */ bl _restgpr_29 /* 802D5BD8 002D2B18 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5BDC 002D2B1C 7C 08 03 A6 */ mtlr r0 /* 802D5BE0 002D2B20 38 21 00 20 */ addi r1, r1, 0x20 @@ -469,7 +469,7 @@ lbl_802D5D78: /* 802D5D90 002D2CD0 7C 08 02 A6 */ mflr r0 /* 802D5D94 002D2CD4 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5D98 002D2CD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5D9C 002D2CDC 48 08 C4 41 */ bl func_803621DC +/* 802D5D9C 002D2CDC 48 08 C4 41 */ bl _savegpr_29 /* 802D5DA0 002D2CE0 7C 7D 1B 78 */ mr r29, r3 /* 802D5DA4 002D2CE4 7C 9E 23 78 */ mr r30, r4 /* 802D5DA8 002D2CE8 7C BF 2B 78 */ mr r31, r5 @@ -506,7 +506,7 @@ lbl_802D5E14: /* 802D5E14 002D2D54 38 60 00 00 */ li r3, 0 lbl_802D5E18: /* 802D5E18 002D2D58 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5E1C 002D2D5C 48 08 C4 0D */ bl func_80362228 +/* 802D5E1C 002D2D5C 48 08 C4 0D */ bl _restgpr_29 /* 802D5E20 002D2D60 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5E24 002D2D64 7C 08 03 A6 */ mtlr r0 /* 802D5E28 002D2D68 38 21 00 20 */ addi r1, r1, 0x20 @@ -515,7 +515,7 @@ lbl_802D5E18: /* 802D5E34 002D2D74 7C 08 02 A6 */ mflr r0 /* 802D5E38 002D2D78 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5E3C 002D2D7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5E40 002D2D80 48 08 C3 9D */ bl func_803621DC +/* 802D5E40 002D2D80 48 08 C3 9D */ bl _savegpr_29 /* 802D5E44 002D2D84 7C 7D 1B 78 */ mr r29, r3 /* 802D5E48 002D2D88 7C 9E 23 78 */ mr r30, r4 /* 802D5E4C 002D2D8C 7C BF 2B 78 */ mr r31, r5 @@ -549,7 +549,7 @@ lbl_802D5EB0: /* 802D5EB0 002D2DF0 38 60 00 00 */ li r3, 0 lbl_802D5EB4: /* 802D5EB4 002D2DF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5EB8 002D2DF8 48 08 C3 71 */ bl func_80362228 +/* 802D5EB8 002D2DF8 48 08 C3 71 */ bl _restgpr_29 /* 802D5EBC 002D2DFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5EC0 002D2E00 7C 08 03 A6 */ mtlr r0 /* 802D5EC4 002D2E04 38 21 00 20 */ addi r1, r1, 0x20 @@ -561,7 +561,7 @@ JKRArchive_NS_readIdxResource: /* 802D5ED0 002D2E10 7C 08 02 A6 */ mflr r0 /* 802D5ED4 002D2E14 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5ED8 002D2E18 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5EDC 002D2E1C 48 08 C3 01 */ bl func_803621DC +/* 802D5EDC 002D2E1C 48 08 C3 01 */ bl _savegpr_29 /* 802D5EE0 002D2E20 7C 7D 1B 78 */ mr r29, r3 /* 802D5EE4 002D2E24 7C 9E 23 78 */ mr r30, r4 /* 802D5EE8 002D2E28 7C BF 2B 78 */ mr r31, r5 @@ -583,7 +583,7 @@ lbl_802D5F24: /* 802D5F24 002D2E64 38 60 00 00 */ li r3, 0 lbl_802D5F28: /* 802D5F28 002D2E68 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5F2C 002D2E6C 48 08 C2 FD */ bl func_80362228 +/* 802D5F2C 002D2E6C 48 08 C2 FD */ bl _restgpr_29 /* 802D5F30 002D2E70 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5F34 002D2E74 7C 08 03 A6 */ mtlr r0 /* 802D5F38 002D2E78 38 21 00 20 */ addi r1, r1, 0x20 @@ -595,7 +595,7 @@ JKRArchive_NS_readResource_X2_: /* 802D5F44 002D2E84 7C 08 02 A6 */ mflr r0 /* 802D5F48 002D2E88 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5F4C 002D2E8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5F50 002D2E90 48 08 C2 8D */ bl func_803621DC +/* 802D5F50 002D2E90 48 08 C2 8D */ bl _savegpr_29 /* 802D5F54 002D2E94 7C 7D 1B 78 */ mr r29, r3 /* 802D5F58 002D2E98 7C 9E 23 78 */ mr r30, r4 /* 802D5F5C 002D2E9C 7C BF 2B 78 */ mr r31, r5 @@ -617,7 +617,7 @@ lbl_802D5F98: /* 802D5F98 002D2ED8 38 60 00 00 */ li r3, 0 lbl_802D5F9C: /* 802D5F9C 002D2EDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5FA0 002D2EE0 48 08 C2 89 */ bl func_80362228 +/* 802D5FA0 002D2EE0 48 08 C2 89 */ bl _restgpr_29 /* 802D5FA4 002D2EE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5FA8 002D2EE8 7C 08 03 A6 */ mtlr r0 /* 802D5FAC 002D2EEC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRCompArchive.s b/asm/JKernel/JKRCompArchive.s index e3c8a5376aa..f1765164d56 100644 --- a/asm/JKernel/JKRCompArchive.s +++ b/asm/JKernel/JKRCompArchive.s @@ -9,7 +9,7 @@ JKRCompArchive: /* 802D87D8 002D5718 7C 08 02 A6 */ mflr r0 /* 802D87DC 002D571C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D87E0 002D5720 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D87E4 002D5724 48 08 99 F9 */ bl func_803621DC +/* 802D87E4 002D5724 48 08 99 F9 */ bl _savegpr_29 /* 802D87E8 002D5728 7C 7D 1B 78 */ mr r29, r3 /* 802D87EC 002D572C 7C 9E 23 78 */ mr r30, r4 /* 802D87F0 002D5730 7C BF 2B 78 */ mr r31, r5 @@ -44,7 +44,7 @@ lbl_802D8828: /* 802D8860 002D57A0 7F A3 EB 78 */ mr r3, r29 lbl_802D8864: /* 802D8864 002D57A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D8868 002D57A8 48 08 99 C1 */ bl func_80362228 +/* 802D8868 002D57A8 48 08 99 C1 */ bl _restgpr_29 /* 802D886C 002D57AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D8870 002D57B0 7C 08 03 A6 */ mtlr r0 /* 802D8874 002D57B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -785,7 +785,7 @@ lbl_802D92DC: /* 802D92F8 002D6238 7C 08 02 A6 */ mflr r0 /* 802D92FC 002D623C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D9300 002D6240 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9304 002D6244 48 08 8E D9 */ bl func_803621DC +/* 802D9304 002D6244 48 08 8E D9 */ bl _savegpr_29 /* 802D9308 002D6248 7C 7D 1B 78 */ mr r29, r3 /* 802D930C 002D624C 7C 9E 23 78 */ mr r30, r4 /* 802D9310 002D6250 4B FF D4 25 */ bl JKRArchive_NS_findPtrResource @@ -806,7 +806,7 @@ lbl_802D933C: /* 802D9344 002D6284 38 60 00 01 */ li r3, 1 lbl_802D9348: /* 802D9348 002D6288 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D934C 002D628C 48 08 8E DD */ bl func_80362228 +/* 802D934C 002D628C 48 08 8E DD */ bl _restgpr_29 /* 802D9350 002D6290 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D9354 002D6294 7C 08 03 A6 */ mtlr r0 /* 802D9358 002D6298 38 21 00 20 */ addi r1, r1, 0x20 @@ -815,7 +815,7 @@ lbl_802D9348: /* 802D9364 002D62A4 7C 08 02 A6 */ mflr r0 /* 802D9368 002D62A8 90 01 00 64 */ stw r0, 0x64(r1) /* 802D936C 002D62AC 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D9370 002D62B0 48 08 8E 6D */ bl func_803621DC +/* 802D9370 002D62B0 48 08 8E 6D */ bl _savegpr_29 /* 802D9374 002D62B4 7C 7E 1B 78 */ mr r30, r3 /* 802D9378 002D62B8 7C 9D 23 78 */ mr r29, r4 /* 802D937C 002D62BC 80 03 00 50 */ lwz r0, 0x50(r3) @@ -924,7 +924,7 @@ lbl_802D94C0: /* 802D94FC 002D643C 7F A3 EB 78 */ mr r3, r29 lbl_802D9500: /* 802D9500 002D6440 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D9504 002D6444 48 08 8D 25 */ bl func_80362228 +/* 802D9504 002D6444 48 08 8D 25 */ bl _restgpr_29 /* 802D9508 002D6448 80 01 00 64 */ lwz r0, 0x64(r1) /* 802D950C 002D644C 7C 08 03 A6 */ mtlr r0 /* 802D9510 002D6450 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JKernel/JKRDvdAramRipper.s b/asm/JKernel/JKRDvdAramRipper.s index b133678a23a..a9718147bc2 100644 --- a/asm/JKernel/JKRDvdAramRipper.s +++ b/asm/JKernel/JKRDvdAramRipper.s @@ -429,7 +429,7 @@ JKRDvdAramRipper_NS_syncAram: /* 802DAE4C 002D7D8C 7C 08 02 A6 */ mflr r0 /* 802DAE50 002D7D90 90 01 00 24 */ stw r0, 0x24(r1) /* 802DAE54 002D7D94 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DAE58 002D7D98 48 08 73 85 */ bl func_803621DC +/* 802DAE58 002D7D98 48 08 73 85 */ bl _savegpr_29 /* 802DAE5C 002D7D9C 7C 7D 1B 78 */ mr r29, r3 /* 802DAE60 002D7DA0 7C 9E 23 78 */ mr r30, r4 /* 802DAE64 002D7DA4 83 E3 00 28 */ lwz r31, 0x28(r3) @@ -477,7 +477,7 @@ lbl_802DAEF0: /* 802DAF00 002D7E40 38 60 00 01 */ li r3, 1 lbl_802DAF04: /* 802DAF04 002D7E44 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DAF08 002D7E48 48 08 73 21 */ bl func_80362228 +/* 802DAF08 002D7E48 48 08 73 21 */ bl _restgpr_29 /* 802DAF0C 002D7E4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DAF10 002D7E50 7C 08 03 A6 */ mtlr r0 /* 802DAF14 002D7E54 38 21 00 20 */ addi r1, r1, 0x20 @@ -888,7 +888,7 @@ nextSrcData_X2_: /* 802DB4A0 002D83E0 7C 08 02 A6 */ mflr r0 /* 802DB4A4 002D83E4 90 01 00 24 */ stw r0, 0x24(r1) /* 802DB4A8 002D83E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB4AC 002D83EC 48 08 6D 31 */ bl func_803621DC +/* 802DB4AC 002D83EC 48 08 6D 31 */ bl _savegpr_29 /* 802DB4B0 002D83F0 7C 64 1B 78 */ mr r4, r3 /* 802DB4B4 002D83F4 80 0D 8E EC */ lwz r0, lbl_8045146C-_SDA_BASE_(r13) /* 802DB4B8 002D83F8 7F C4 00 50 */ subf r30, r4, r0 @@ -943,7 +943,7 @@ lbl_802DB564: /* 802DB564 002D84A4 7F A3 EB 78 */ mr r3, r29 lbl_802DB568: /* 802DB568 002D84A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DB56C 002D84AC 48 08 6C BD */ bl func_80362228 +/* 802DB56C 002D84AC 48 08 6C BD */ bl _restgpr_29 /* 802DB570 002D84B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DB574 002D84B4 7C 08 03 A6 */ mtlr r0 /* 802DB578 002D84B8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRDvdArchive.s b/asm/JKernel/JKRDvdArchive.s index 55355951f52..6b6412609bf 100644 --- a/asm/JKernel/JKRDvdArchive.s +++ b/asm/JKernel/JKRDvdArchive.s @@ -9,7 +9,7 @@ JKRDvdArchive: /* 802D7BF4 002D4B34 7C 08 02 A6 */ mflr r0 /* 802D7BF8 002D4B38 90 01 00 24 */ stw r0, 0x24(r1) /* 802D7BFC 002D4B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7C00 002D4B40 48 08 A5 DD */ bl func_803621DC +/* 802D7C00 002D4B40 48 08 A5 DD */ bl _savegpr_29 /* 802D7C04 002D4B44 7C 7D 1B 78 */ mr r29, r3 /* 802D7C08 002D4B48 7C 9E 23 78 */ mr r30, r4 /* 802D7C0C 002D4B4C 7C BF 2B 78 */ mr r31, r5 @@ -44,7 +44,7 @@ lbl_802D7C44: /* 802D7C7C 002D4BBC 7F A3 EB 78 */ mr r3, r29 lbl_802D7C80: /* 802D7C80 002D4BC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D7C84 002D4BC4 48 08 A5 A5 */ bl func_80362228 +/* 802D7C84 002D4BC4 48 08 A5 A5 */ bl _restgpr_29 /* 802D7C88 002D4BC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D7C8C 002D4BCC 7C 08 03 A6 */ mtlr r0 /* 802D7C90 002D4BD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -761,7 +761,7 @@ lbl_802D8680: /* 802D869C 002D55DC 7C 08 02 A6 */ mflr r0 /* 802D86A0 002D55E0 90 01 00 64 */ stw r0, 0x64(r1) /* 802D86A4 002D55E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D86A8 002D55E8 48 08 9B 35 */ bl func_803621DC +/* 802D86A8 002D55E8 48 08 9B 35 */ bl _savegpr_29 /* 802D86AC 002D55EC 7C 7F 1B 78 */ mr r31, r3 /* 802D86B0 002D55F0 7C 9E 23 78 */ mr r30, r4 /* 802D86B4 002D55F4 80 03 00 50 */ lwz r0, 0x50(r3) @@ -836,7 +836,7 @@ lbl_802D8734: /* 802D87B8 002D56F8 7F C3 F3 78 */ mr r3, r30 lbl_802D87BC: /* 802D87BC 002D56FC 39 61 00 60 */ addi r11, r1, 0x60 -/* 802D87C0 002D5700 48 08 9A 69 */ bl func_80362228 +/* 802D87C0 002D5700 48 08 9A 69 */ bl _restgpr_29 /* 802D87C4 002D5704 80 01 00 64 */ lwz r0, 0x64(r1) /* 802D87C8 002D5708 7C 08 03 A6 */ mtlr r0 /* 802D87CC 002D570C 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JKernel/JKRDvdFile.s b/asm/JKernel/JKRDvdFile.s index a5eda08f033..004b904c560 100644 --- a/asm/JKernel/JKRDvdFile.s +++ b/asm/JKernel/JKRDvdFile.s @@ -41,7 +41,7 @@ JKRDvdFile_X1_: /* 802D95FC 002D653C 7C 08 02 A6 */ mflr r0 /* 802D9600 002D6540 90 01 00 24 */ stw r0, 0x24(r1) /* 802D9604 002D6544 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9608 002D6548 48 08 8B D5 */ bl func_803621DC +/* 802D9608 002D6548 48 08 8B D5 */ bl _savegpr_29 /* 802D960C 002D654C 7C 7D 1B 78 */ mr r29, r3 /* 802D9610 002D6550 7C 9F 23 78 */ mr r31, r4 /* 802D9614 002D6554 7F A0 EB 78 */ mr r0, r29 @@ -76,7 +76,7 @@ lbl_802D9684: /* 802D9684 002D65C4 7F A3 EB 78 */ mr r3, r29 lbl_802D9688: /* 802D9688 002D65C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D968C 002D65CC 48 08 8B 9D */ bl func_80362228 +/* 802D968C 002D65CC 48 08 8B 9D */ bl _restgpr_29 /* 802D9690 002D65D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D9694 002D65D4 7C 08 03 A6 */ mtlr r0 /* 802D9698 002D65D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -88,7 +88,7 @@ JKRDvdFile_X2_: /* 802D96A4 002D65E4 7C 08 02 A6 */ mflr r0 /* 802D96A8 002D65E8 90 01 00 24 */ stw r0, 0x24(r1) /* 802D96AC 002D65EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D96B0 002D65F0 48 08 8B 2D */ bl func_803621DC +/* 802D96B0 002D65F0 48 08 8B 2D */ bl _savegpr_29 /* 802D96B4 002D65F4 7C 7D 1B 78 */ mr r29, r3 /* 802D96B8 002D65F8 7C 9F 23 78 */ mr r31, r4 /* 802D96BC 002D65FC 7F A0 EB 78 */ mr r0, r29 @@ -123,7 +123,7 @@ lbl_802D972C: /* 802D972C 002D666C 7F A3 EB 78 */ mr r3, r29 lbl_802D9730: /* 802D9730 002D6670 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D9734 002D6674 48 08 8A F5 */ bl func_80362228 +/* 802D9734 002D6674 48 08 8A F5 */ bl _restgpr_29 /* 802D9738 002D6678 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D973C 002D667C 7C 08 03 A6 */ mtlr r0 /* 802D9740 002D6680 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRDvdRipper.s b/asm/JKernel/JKRDvdRipper.s index 9902e08b805..d88c4a779de 100644 --- a/asm/JKernel/JKRDvdRipper.s +++ b/asm/JKernel/JKRDvdRipper.s @@ -576,7 +576,7 @@ decompSZS_subroutine_X1_: /* 802DA360 002D72A0 7C 08 02 A6 */ mflr r0 /* 802DA364 002D72A4 90 01 00 24 */ stw r0, 0x24(r1) /* 802DA368 002D72A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DA36C 002D72AC 48 08 7E 71 */ bl func_803621DC +/* 802DA36C 002D72AC 48 08 7E 71 */ bl _savegpr_29 /* 802DA370 002D72B0 7C 9D 23 78 */ mr r29, r4 /* 802DA374 002D72B4 38 80 00 00 */ li r4, 0 /* 802DA378 002D72B8 38 00 00 00 */ li r0, 0 @@ -762,7 +762,7 @@ lbl_802DA5E8: /* 802DA5F0 002D7530 38 60 00 00 */ li r3, 0 lbl_802DA5F4: /* 802DA5F4 002D7534 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DA5F8 002D7538 48 08 7C 31 */ bl func_80362228 +/* 802DA5F8 002D7538 48 08 7C 31 */ bl _restgpr_29 /* 802DA5FC 002D753C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DA600 002D7540 7C 08 03 A6 */ mtlr r0 /* 802DA604 002D7544 38 21 00 20 */ addi r1, r1, 0x20 @@ -774,7 +774,7 @@ firstSrcData_X1_: /* 802DA610 002D7550 7C 08 02 A6 */ mflr r0 /* 802DA614 002D7554 90 01 00 24 */ stw r0, 0x24(r1) /* 802DA618 002D7558 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DA61C 002D755C 48 08 7B C1 */ bl func_803621DC +/* 802DA61C 002D755C 48 08 7B C1 */ bl _savegpr_29 /* 802DA620 002D7560 80 6D 8E AC */ lwz r3, lbl_8045142C-_SDA_BASE_(r13) /* 802DA624 002D7564 38 03 FF E7 */ addi r0, r3, -25 /* 802DA628 002D7568 90 0D 8E C4 */ stw r0, lbl_80451444-_SDA_BASE_(r13) @@ -822,7 +822,7 @@ lbl_802DA698: /* 802DA6BC 002D75FC 7F A3 EB 78 */ mr r3, r29 lbl_802DA6C0: /* 802DA6C0 002D7600 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DA6C4 002D7604 48 08 7B 65 */ bl func_80362228 +/* 802DA6C4 002D7604 48 08 7B 65 */ bl _restgpr_29 /* 802DA6C8 002D7608 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DA6CC 002D760C 7C 08 03 A6 */ mtlr r0 /* 802DA6D0 002D7610 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRExpHeap.s b/asm/JKernel/JKRExpHeap.s index 665d2390bc1..304b1af54c2 100644 --- a/asm/JKernel/JKRExpHeap.s +++ b/asm/JKernel/JKRExpHeap.s @@ -107,7 +107,7 @@ JKRExpHeap_NS_create_X1_: /* 802CEF04 002CBE44 7C 08 02 A6 */ mflr r0 /* 802CEF08 002CBE48 90 01 00 24 */ stw r0, 0x24(r1) /* 802CEF0C 002CBE4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEF10 002CBE50 48 09 32 CD */ bl func_803621DC +/* 802CEF10 002CBE50 48 09 32 CD */ bl _savegpr_29 /* 802CEF14 002CBE54 7C 7D 1B 78 */ mr r29, r3 /* 802CEF18 002CBE58 7C 9E 23 78 */ mr r30, r4 /* 802CEF1C 002CBE5C 7C DF 33 78 */ mr r31, r6 @@ -146,7 +146,7 @@ lbl_802CEF84: /* 802CEF90 002CBED0 93 C3 00 74 */ stw r30, 0x74(r3) lbl_802CEF94: /* 802CEF94 002CBED4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CEF98 002CBED8 48 09 32 91 */ bl func_80362228 +/* 802CEF98 002CBED8 48 09 32 91 */ bl _restgpr_29 /* 802CEF9C 002CBEDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CEFA0 002CBEE0 7C 08 03 A6 */ mtlr r0 /* 802CEFA4 002CBEE4 38 21 00 20 */ addi r1, r1, 0x20 @@ -193,7 +193,7 @@ JKRExpHeap: /* 802CF034 002CBF74 7C 08 02 A6 */ mflr r0 /* 802CF038 002CBF78 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF03C 002CBF7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF040 002CBF80 48 09 31 9D */ bl func_803621DC +/* 802CF040 002CBF80 48 09 31 9D */ bl _savegpr_29 /* 802CF044 002CBF84 7C 7D 1B 78 */ mr r29, r3 /* 802CF048 002CBF88 7C 9E 23 78 */ mr r30, r4 /* 802CF04C 002CBF8C 7C BF 2B 78 */ mr r31, r5 @@ -220,7 +220,7 @@ JKRExpHeap: /* 802CF0A0 002CBFE0 90 1D 00 84 */ stw r0, 0x84(r29) /* 802CF0A4 002CBFE4 7F A3 EB 78 */ mr r3, r29 /* 802CF0A8 002CBFE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF0AC 002CBFEC 48 09 31 7D */ bl func_80362228 +/* 802CF0AC 002CBFEC 48 09 31 7D */ bl _restgpr_29 /* 802CF0B0 002CBFF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF0B4 002CBFF4 7C 08 03 A6 */ mtlr r0 /* 802CF0B8 002CBFF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -668,7 +668,7 @@ JKRExpHeap_NS_allocFromTail_X1_: /* 802CF6D8 002CC618 7C 08 02 A6 */ mflr r0 /* 802CF6DC 002CC61C 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF6E0 002CC620 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF6E4 002CC624 48 09 2A F9 */ bl func_803621DC +/* 802CF6E4 002CC624 48 09 2A F9 */ bl _savegpr_29 /* 802CF6E8 002CC628 7C 7D 1B 78 */ mr r29, r3 /* 802CF6EC 002CC62C 38 04 00 03 */ addi r0, r4, 3 /* 802CF6F0 002CC630 54 04 00 3A */ rlwinm r4, r0, 0, 0, 0x1d @@ -722,7 +722,7 @@ lbl_802CF790: /* 802CF790 002CC6D0 38 60 00 00 */ li r3, 0 lbl_802CF794: /* 802CF794 002CC6D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF798 002CC6D8 48 09 2A 91 */ bl func_80362228 +/* 802CF798 002CC6D8 48 09 2A 91 */ bl _restgpr_29 /* 802CF79C 002CC6DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF7A0 002CC6E0 7C 08 03 A6 */ mtlr r0 /* 802CF7A4 002CC6E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -792,7 +792,7 @@ lbl_802CF800: /* 802CF8A0 002CC7E0 7C 08 02 A6 */ mflr r0 /* 802CF8A4 002CC7E4 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF8A8 002CC7E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF8AC 002CC7EC 48 09 29 31 */ bl func_803621DC +/* 802CF8AC 002CC7EC 48 09 29 31 */ bl _savegpr_29 /* 802CF8B0 002CC7F0 7C 7D 1B 78 */ mr r29, r3 /* 802CF8B4 002CC7F4 38 7D 00 18 */ addi r3, r29, 0x18 /* 802CF8B8 002CC7F8 48 06 F7 89 */ bl OSLockMutex @@ -820,7 +820,7 @@ lbl_802CF8FC: /* 802CF904 002CC844 38 7D 00 18 */ addi r3, r29, 0x18 /* 802CF908 002CC848 48 06 F8 15 */ bl OSUnlockMutex /* 802CF90C 002CC84C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF910 002CC850 48 09 29 19 */ bl func_80362228 +/* 802CF910 002CC850 48 09 29 19 */ bl _restgpr_29 /* 802CF914 002CC854 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF918 002CC858 7C 08 03 A6 */ mtlr r0 /* 802CF91C 002CC85C 38 21 00 20 */ addi r1, r1, 0x20 @@ -830,7 +830,7 @@ lbl_802CF8FC: /* 802CF92C 002CC86C 7C 08 02 A6 */ mflr r0 /* 802CF930 002CC870 90 01 00 24 */ stw r0, 0x24(r1) /* 802CF934 002CC874 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF938 002CC878 48 09 28 A5 */ bl func_803621DC +/* 802CF938 002CC878 48 09 28 A5 */ bl _savegpr_29 /* 802CF93C 002CC87C 7C 7D 1B 78 */ mr r29, r3 /* 802CF940 002CC880 7C 9E 23 78 */ mr r30, r4 /* 802CF944 002CC884 38 7D 00 18 */ addi r3, r29, 0x18 @@ -841,7 +841,7 @@ lbl_802CF8FC: /* 802CF958 002CC898 48 06 F7 C5 */ bl OSUnlockMutex /* 802CF95C 002CC89C 7F E3 FB 78 */ mr r3, r31 /* 802CF960 002CC8A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CF964 002CC8A4 48 09 28 C5 */ bl func_80362228 +/* 802CF964 002CC8A4 48 09 28 C5 */ bl _restgpr_29 /* 802CF968 002CC8A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF96C 002CC8AC 7C 08 03 A6 */ mtlr r0 /* 802CF970 002CC8B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -969,7 +969,7 @@ lbl_802CFB0C: /* 802CFB28 002CCA68 7C 08 02 A6 */ mflr r0 /* 802CFB2C 002CCA6C 90 01 00 24 */ stw r0, 0x24(r1) /* 802CFB30 002CCA70 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CFB34 002CCA74 48 09 26 A9 */ bl func_803621DC +/* 802CFB34 002CCA74 48 09 26 A9 */ bl _savegpr_29 /* 802CFB38 002CCA78 7C 7D 1B 78 */ mr r29, r3 /* 802CFB3C 002CCA7C 7C 9E 23 78 */ mr r30, r4 /* 802CFB40 002CCA80 38 7D 00 18 */ addi r3, r29, 0x18 @@ -995,7 +995,7 @@ lbl_802CFB80: /* 802CFB88 002CCAC8 80 7F 00 04 */ lwz r3, 4(r31) lbl_802CFB8C: /* 802CFB8C 002CCACC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CFB90 002CCAD0 48 09 26 99 */ bl func_80362228 +/* 802CFB90 002CCAD0 48 09 26 99 */ bl _restgpr_29 /* 802CFB94 002CCAD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CFB98 002CCAD8 7C 08 03 A6 */ mtlr r0 /* 802CFB9C 002CCADC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1096,7 +1096,7 @@ JKRExpHeap_NS_getUsedSize: /* 802CFCEC 002CCC2C 7C 08 02 A6 */ mflr r0 /* 802CFCF0 002CCC30 90 01 00 24 */ stw r0, 0x24(r1) /* 802CFCF4 002CCC34 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CFCF8 002CCC38 48 09 24 E5 */ bl func_803621DC +/* 802CFCF8 002CCC38 48 09 24 E5 */ bl _savegpr_29 /* 802CFCFC 002CCC3C 7C 7D 1B 78 */ mr r29, r3 /* 802CFD00 002CCC40 7C 9E 23 78 */ mr r30, r4 /* 802CFD04 002CCC44 38 7D 00 18 */ addi r3, r29, 0x18 @@ -1121,7 +1121,7 @@ lbl_802CFD38: /* 802CFD44 002CCC84 48 06 F3 D9 */ bl OSUnlockMutex /* 802CFD48 002CCC88 7F E3 FB 78 */ mr r3, r31 /* 802CFD4C 002CCC8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CFD50 002CCC90 48 09 24 D9 */ bl func_80362228 +/* 802CFD50 002CCC90 48 09 24 D9 */ bl _restgpr_29 /* 802CFD54 002CCC94 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CFD58 002CCC98 7C 08 03 A6 */ mtlr r0 /* 802CFD5C 002CCC9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1274,7 +1274,7 @@ JKRExpHeap_NS_recycleFreeBlock: /* 802CFF20 002CCE60 7C 08 02 A6 */ mflr r0 /* 802CFF24 002CCE64 90 01 00 24 */ stw r0, 0x24(r1) /* 802CFF28 002CCE68 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CFF2C 002CCE6C 48 09 22 B1 */ bl func_803621DC +/* 802CFF2C 002CCE6C 48 09 22 B1 */ bl _savegpr_29 /* 802CFF30 002CCE70 7C 7D 1B 78 */ mr r29, r3 /* 802CFF34 002CCE74 7C 9F 23 78 */ mr r31, r4 /* 802CFF38 002CCE78 80 C4 00 04 */ lwz r6, 4(r4) @@ -1375,7 +1375,7 @@ lbl_802D0094: /* 802D0098 002CCFD8 40 82 FF AC */ bne lbl_802D0044 lbl_802D009C: /* 802D009C 002CCFDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D00A0 002CCFE0 48 09 21 89 */ bl func_80362228 +/* 802D00A0 002CCFE0 48 09 21 89 */ bl _restgpr_29 /* 802D00A4 002CCFE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D00A8 002CCFE8 7C 08 03 A6 */ mtlr r0 /* 802D00AC 002CCFEC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1987,7 +1987,7 @@ lbl_802D0930: /* 802D093C 002CD87C 7C 08 02 A6 */ mflr r0 /* 802D0940 002CD880 90 01 00 24 */ stw r0, 0x24(r1) /* 802D0944 002CD884 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0948 002CD888 48 09 18 95 */ bl func_803621DC +/* 802D0948 002CD888 48 09 18 95 */ bl _savegpr_29 /* 802D094C 002CD88C 7C 7D 1B 78 */ mr r29, r3 /* 802D0950 002CD890 7C 9E 23 78 */ mr r30, r4 /* 802D0954 002CD894 7C BF 2B 78 */ mr r31, r5 @@ -2026,7 +2026,7 @@ lbl_802D09BC: /* 802D09C0 002CD900 40 82 FF D0 */ bne lbl_802D0990 /* 802D09C4 002CD904 90 7E 00 04 */ stw r3, 4(r30) /* 802D09C8 002CD908 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D09CC 002CD90C 48 09 18 5D */ bl func_80362228 +/* 802D09CC 002CD90C 48 09 18 5D */ bl _restgpr_29 /* 802D09D0 002CD910 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D09D4 002CD914 7C 08 03 A6 */ mtlr r0 /* 802D09D8 002CD918 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRFileCache.s b/asm/JKernel/JKRFileCache.s index f68aab12605..fc4d8fc12aa 100644 --- a/asm/JKernel/JKRFileCache.s +++ b/asm/JKernel/JKRFileCache.s @@ -257,7 +257,7 @@ lbl_802D4D28: /* 802D4D48 002D1C88 7C 08 02 A6 */ mflr r0 /* 802D4D4C 002D1C8C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D4D50 002D1C90 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4D54 002D1C94 48 08 D4 89 */ bl func_803621DC +/* 802D4D54 002D1C94 48 08 D4 89 */ bl _savegpr_29 /* 802D4D58 002D1C98 7C 7D 1B 78 */ mr r29, r3 /* 802D4D5C 002D1C9C 48 00 07 C1 */ bl JKRFileCache_NS_getDvdPathName /* 802D4D60 002D1CA0 7C 7F 1B 78 */ mr r31, r3 @@ -287,7 +287,7 @@ lbl_802D4DB0: lbl_802D4DBC: /* 802D4DBC 002D1CFC 7F C3 F3 78 */ mr r3, r30 /* 802D4DC0 002D1D00 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D4DC4 002D1D04 48 08 D4 65 */ bl func_80362228 +/* 802D4DC4 002D1D04 48 08 D4 65 */ bl _restgpr_29 /* 802D4DC8 002D1D08 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D4DCC 002D1D0C 7C 08 03 A6 */ mtlr r0 /* 802D4DD0 002D1D10 38 21 00 20 */ addi r1, r1, 0x20 @@ -364,7 +364,7 @@ lbl_802D4EA8: /* 802D4EE0 002D1E20 7C 08 02 A6 */ mflr r0 /* 802D4EE4 002D1E24 90 01 01 24 */ stw r0, 0x124(r1) /* 802D4EE8 002D1E28 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D4EEC 002D1E2C 48 08 D2 F1 */ bl func_803621DC +/* 802D4EEC 002D1E2C 48 08 D2 F1 */ bl _savegpr_29 /* 802D4EF0 002D1E30 7C 7D 1B 78 */ mr r29, r3 /* 802D4EF4 002D1E34 7C BE 2B 78 */ mr r30, r5 /* 802D4EF8 002D1E38 80 63 00 48 */ lwz r3, 0x48(r3) @@ -391,7 +391,7 @@ lbl_802D4F48: /* 802D4F48 002D1E88 38 60 00 00 */ li r3, 0 lbl_802D4F4C: /* 802D4F4C 002D1E8C 39 61 01 20 */ addi r11, r1, 0x120 -/* 802D4F50 002D1E90 48 08 D2 D9 */ bl func_80362228 +/* 802D4F50 002D1E90 48 08 D2 D9 */ bl _restgpr_29 /* 802D4F54 002D1E94 80 01 01 24 */ lwz r0, 0x124(r1) /* 802D4F58 002D1E98 7C 08 03 A6 */ mtlr r0 /* 802D4F5C 002D1E9C 38 21 01 20 */ addi r1, r1, 0x120 @@ -498,7 +498,7 @@ lbl_802D50BC: /* 802D50D8 002D2018 7C 08 02 A6 */ mflr r0 /* 802D50DC 002D201C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D50E0 002D2020 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D50E4 002D2024 48 08 D0 F9 */ bl func_803621DC +/* 802D50E4 002D2024 48 08 D0 F9 */ bl _savegpr_29 /* 802D50E8 002D2028 7C 7D 1B 78 */ mr r29, r3 /* 802D50EC 002D202C 83 C3 00 3C */ lwz r30, 0x3c(r3) /* 802D50F0 002D2030 48 00 00 54 */ b lbl_802D5144 @@ -528,7 +528,7 @@ lbl_802D5144: /* 802D5144 002D2084 28 1E 00 00 */ cmplwi r30, 0 /* 802D5148 002D2088 40 82 FF AC */ bne lbl_802D50F4 /* 802D514C 002D208C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5150 002D2090 48 08 D0 D9 */ bl func_80362228 +/* 802D5150 002D2090 48 08 D0 D9 */ bl _restgpr_29 /* 802D5154 002D2094 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5158 002D2098 7C 08 03 A6 */ mtlr r0 /* 802D515C 002D209C 38 21 00 20 */ addi r1, r1, 0x20 @@ -537,7 +537,7 @@ lbl_802D5144: /* 802D5168 002D20A8 7C 08 02 A6 */ mflr r0 /* 802D516C 002D20AC 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5170 002D20B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5174 002D20B4 48 08 D0 69 */ bl func_803621DC +/* 802D5174 002D20B4 48 08 D0 69 */ bl _savegpr_29 /* 802D5178 002D20B8 7C 7D 1B 78 */ mr r29, r3 /* 802D517C 002D20BC 7C 9E 23 78 */ mr r30, r4 /* 802D5180 002D20C0 48 00 02 39 */ bl JKRFileCache_NS_findCacheBlock @@ -569,7 +569,7 @@ lbl_802D51DC: /* 802D51DC 002D211C 38 60 00 01 */ li r3, 1 lbl_802D51E0: /* 802D51E0 002D2120 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D51E4 002D2124 48 08 D0 45 */ bl func_80362228 +/* 802D51E4 002D2124 48 08 D0 45 */ bl _restgpr_29 /* 802D51E8 002D2128 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D51EC 002D212C 7C 08 03 A6 */ mtlr r0 /* 802D51F0 002D2130 38 21 00 20 */ addi r1, r1, 0x20 @@ -813,7 +813,7 @@ JKRFileCache_NS_getDvdPathName: /* 802D5520 002D2460 7C 08 02 A6 */ mflr r0 /* 802D5524 002D2464 90 01 00 24 */ stw r0, 0x24(r1) /* 802D5528 002D2468 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D552C 002D246C 48 08 CC B1 */ bl func_803621DC +/* 802D552C 002D246C 48 08 CC B1 */ bl _savegpr_29 /* 802D5530 002D2470 7C 7D 1B 78 */ mr r29, r3 /* 802D5534 002D2474 7C 9E 23 78 */ mr r30, r4 /* 802D5538 002D2478 88 04 00 00 */ lbz r0, 0(r4) @@ -873,7 +873,7 @@ lbl_802D55FC: /* 802D5604 002D2544 48 00 00 21 */ bl JKRFileCache_NS_convStrLower /* 802D5608 002D2548 7F E3 FB 78 */ mr r3, r31 /* 802D560C 002D254C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D5610 002D2550 48 08 CC 19 */ bl func_80362228 +/* 802D5610 002D2550 48 08 CC 19 */ bl _restgpr_29 /* 802D5614 002D2554 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D5618 002D2558 7C 08 03 A6 */ mtlr r0 /* 802D561C 002D255C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRFileLoader.s b/asm/JKernel/JKRFileLoader.s index 09d866431f3..66bf70cf324 100644 --- a/asm/JKernel/JKRFileLoader.s +++ b/asm/JKernel/JKRFileLoader.s @@ -300,7 +300,7 @@ JKRFileLoader_NS_fetchVolumeName: /* 802D44C8 002D1408 7C 08 02 A6 */ mflr r0 /* 802D44CC 002D140C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D44D0 002D1410 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D44D4 002D1414 48 08 DD 09 */ bl func_803621DC +/* 802D44D4 002D1414 48 08 DD 09 */ bl _savegpr_29 /* 802D44D8 002D1418 7C 7D 1B 78 */ mr r29, r3 /* 802D44DC 002D141C 7C 9E 23 78 */ mr r30, r4 /* 802D44E0 002D1420 7C BF 2B 78 */ mr r31, r5 @@ -355,7 +355,7 @@ lbl_802D4584: /* 802D4584 002D14C4 7F E3 FB 78 */ mr r3, r31 lbl_802D4588: /* 802D4588 002D14C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D458C 002D14CC 48 08 DC 9D */ bl func_80362228 +/* 802D458C 002D14CC 48 08 DC 9D */ bl _restgpr_29 /* 802D4590 002D14D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D4594 002D14D4 7C 08 03 A6 */ mtlr r0 /* 802D4598 002D14D8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRHeap.s b/asm/JKernel/JKRHeap.s index 5efd28e72db..7eb2c95fcbb 100644 --- a/asm/JKernel/JKRHeap.s +++ b/asm/JKernel/JKRHeap.s @@ -529,7 +529,7 @@ JKRHeap_NS_getMaxAllocatableSize: /* 802CE7E0 002CB720 7C 08 02 A6 */ mflr r0 /* 802CE7E4 002CB724 90 01 00 24 */ stw r0, 0x24(r1) /* 802CE7E8 002CB728 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE7EC 002CB72C 48 09 39 F1 */ bl func_803621DC +/* 802CE7EC 002CB72C 48 09 39 F1 */ bl _savegpr_29 /* 802CE7F0 002CB730 7C 7D 1B 78 */ mr r29, r3 /* 802CE7F4 002CB734 7C 9E 23 78 */ mr r30, r4 /* 802CE7F8 002CB738 4B FF FF 61 */ bl JKRHeap_NS_getMaxFreeBlock @@ -544,7 +544,7 @@ JKRHeap_NS_getMaxAllocatableSize: /* 802CE81C 002CB75C 7C 80 20 F8 */ nor r0, r4, r4 /* 802CE820 002CB760 7C 03 18 38 */ and r3, r0, r3 /* 802CE824 002CB764 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE828 002CB768 48 09 3A 01 */ bl func_80362228 +/* 802CE828 002CB768 48 09 3A 01 */ bl _restgpr_29 /* 802CE82C 002CB76C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE830 002CB770 7C 08 03 A6 */ mtlr r0 /* 802CE834 002CB774 38 21 00 20 */ addi r1, r1, 0x20 @@ -584,7 +584,7 @@ JKRHeap_NS_find: /* 802CE898 002CB7D8 7C 08 02 A6 */ mflr r0 /* 802CE89C 002CB7DC 90 01 00 24 */ stw r0, 0x24(r1) /* 802CE8A0 002CB7E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE8A4 002CB7E4 48 09 39 39 */ bl func_803621DC +/* 802CE8A4 002CB7E4 48 09 39 39 */ bl _savegpr_29 /* 802CE8A8 002CB7E8 7C 7D 1B 78 */ mr r29, r3 /* 802CE8AC 002CB7EC 7C 9E 23 78 */ mr r30, r4 /* 802CE8B0 002CB7F0 80 03 00 30 */ lwz r0, 0x30(r3) @@ -623,7 +623,7 @@ lbl_802CE920: /* 802CE920 002CB860 38 60 00 00 */ li r3, 0 lbl_802CE924: /* 802CE924 002CB864 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE928 002CB868 48 09 39 01 */ bl func_80362228 +/* 802CE928 002CB868 48 09 39 01 */ bl _restgpr_29 /* 802CE92C 002CB86C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE930 002CB870 7C 08 03 A6 */ mtlr r0 /* 802CE934 002CB874 38 21 00 20 */ addi r1, r1, 0x20 @@ -635,7 +635,7 @@ JKRHeap_NS_findAllHeap: /* 802CE940 002CB880 7C 08 02 A6 */ mflr r0 /* 802CE944 002CB884 90 01 00 24 */ stw r0, 0x24(r1) /* 802CE948 002CB888 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE94C 002CB88C 48 09 38 91 */ bl func_803621DC +/* 802CE94C 002CB88C 48 09 38 91 */ bl _savegpr_29 /* 802CE950 002CB890 7C 7D 1B 78 */ mr r29, r3 /* 802CE954 002CB894 7C 9E 23 78 */ mr r30, r4 /* 802CE958 002CB898 80 03 00 48 */ lwz r0, 0x48(r3) @@ -674,7 +674,7 @@ lbl_802CE9C8: /* 802CE9C8 002CB908 38 60 00 00 */ li r3, 0 lbl_802CE9CC: /* 802CE9CC 002CB90C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CE9D0 002CB910 48 09 38 59 */ bl func_80362228 +/* 802CE9D0 002CB910 48 09 38 59 */ bl _restgpr_29 /* 802CE9D4 002CB914 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE9D8 002CB918 7C 08 03 A6 */ mtlr r0 /* 802CE9DC 002CB91C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRMemArchive.s b/asm/JKernel/JKRMemArchive.s index 69ccda88730..3731234e84b 100644 --- a/asm/JKernel/JKRMemArchive.s +++ b/asm/JKernel/JKRMemArchive.s @@ -9,7 +9,7 @@ JKRMemArchive: /* 802D69BC 002D38FC 7C 08 02 A6 */ mflr r0 /* 802D69C0 002D3900 90 01 00 24 */ stw r0, 0x24(r1) /* 802D69C4 002D3904 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D69C8 002D3908 48 08 B8 15 */ bl func_803621DC +/* 802D69C8 002D3908 48 08 B8 15 */ bl _savegpr_29 /* 802D69CC 002D390C 7C 7D 1B 78 */ mr r29, r3 /* 802D69D0 002D3910 7C 9E 23 78 */ mr r30, r4 /* 802D69D4 002D3914 7C BF 2B 78 */ mr r31, r5 @@ -47,7 +47,7 @@ lbl_802D6A18: /* 802D6A50 002D3990 7F A3 EB 78 */ mr r3, r29 lbl_802D6A54: /* 802D6A54 002D3994 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6A58 002D3998 48 08 B7 D1 */ bl func_80362228 +/* 802D6A58 002D3998 48 08 B7 D1 */ bl _restgpr_29 /* 802D6A5C 002D399C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6A60 002D39A0 7C 08 03 A6 */ mtlr r0 /* 802D6A64 002D39A4 38 21 00 20 */ addi r1, r1, 0x20 @@ -309,7 +309,7 @@ lbl_802D6E08: /* 802D6E14 002D3D54 7C 08 02 A6 */ mflr r0 /* 802D6E18 002D3D58 90 01 00 24 */ stw r0, 0x24(r1) /* 802D6E1C 002D3D5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6E20 002D3D60 48 08 B3 BD */ bl func_803621DC +/* 802D6E20 002D3D60 48 08 B3 BD */ bl _savegpr_29 /* 802D6E24 002D3D64 7C 9D 23 78 */ mr r29, r4 /* 802D6E28 002D3D68 7C A8 2B 78 */ mr r8, r5 /* 802D6E2C 002D3D6C 7C FE 3B 78 */ mr r30, r7 @@ -355,7 +355,7 @@ lbl_802D6EA8: lbl_802D6EB4: /* 802D6EB4 002D3DF4 7F A3 EB 78 */ mr r3, r29 /* 802D6EB8 002D3DF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D6EBC 002D3DFC 48 08 B3 6D */ bl func_80362228 +/* 802D6EBC 002D3DFC 48 08 B3 6D */ bl _restgpr_29 /* 802D6EC0 002D3E00 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6EC4 002D3E04 7C 08 03 A6 */ mtlr r0 /* 802D6EC8 002D3E08 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JKernel/JKRSolidHeap.s b/asm/JKernel/JKRSolidHeap.s index 0bf0e3f75a1..479523244ca 100644 --- a/asm/JKernel/JKRSolidHeap.s +++ b/asm/JKernel/JKRSolidHeap.s @@ -9,7 +9,7 @@ JKRSolidHeap_NS_create: /* 802D0A28 002CD968 7C 08 02 A6 */ mflr r0 /* 802D0A2C 002CD96C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D0A30 002CD970 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0A34 002CD974 48 09 17 A9 */ bl func_803621DC +/* 802D0A34 002CD974 48 09 17 A9 */ bl _savegpr_29 /* 802D0A38 002CD978 7C 9D 23 79 */ or. r29, r4, r4 /* 802D0A3C 002CD97C 7C BE 2B 78 */ mr r30, r5 /* 802D0A40 002CD980 40 82 00 08 */ bne lbl_802D0A48 @@ -49,7 +49,7 @@ lbl_802D0AB4: /* 802D0AB4 002CD9F4 7C 03 03 78 */ mr r3, r0 lbl_802D0AB8: /* 802D0AB8 002CD9F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0ABC 002CD9FC 48 09 17 6D */ bl func_80362228 +/* 802D0ABC 002CD9FC 48 09 17 6D */ bl _restgpr_29 /* 802D0AC0 002CDA00 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D0AC4 002CDA04 7C 08 03 A6 */ mtlr r0 /* 802D0AC8 002CDA08 38 21 00 20 */ addi r1, r1, 0x20 @@ -139,7 +139,7 @@ JKRSolidHeap_NS_adjustSize: /* 802D0BF8 002CDB38 7C 08 02 A6 */ mflr r0 /* 802D0BFC 002CDB3C 90 01 00 24 */ stw r0, 0x24(r1) /* 802D0C00 002CDB40 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0C04 002CDB44 48 09 15 D9 */ bl func_803621DC +/* 802D0C04 002CDB44 48 09 15 D9 */ bl _savegpr_29 /* 802D0C08 002CDB48 7C 7D 1B 78 */ mr r29, r3 /* 802D0C0C 002CDB4C 80 63 00 50 */ lwz r3, 0x50(r3) /* 802D0C10 002CDB50 83 E3 00 0C */ lwz r31, 0xc(r3) @@ -180,7 +180,7 @@ lbl_802D0C94: /* 802D0C94 002CDBD4 38 60 FF FF */ li r3, -1 lbl_802D0C98: /* 802D0C98 002CDBD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0C9C 002CDBDC 48 09 15 8D */ bl func_80362228 +/* 802D0C9C 002CDBDC 48 09 15 8D */ bl _restgpr_29 /* 802D0CA0 002CDBE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D0CA4 002CDBE4 7C 08 03 A6 */ mtlr r0 /* 802D0CA8 002CDBE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -189,7 +189,7 @@ lbl_802D0C98: /* 802D0CB4 002CDBF4 7C 08 02 A6 */ mflr r0 /* 802D0CB8 002CDBF8 90 01 00 24 */ stw r0, 0x24(r1) /* 802D0CBC 002CDBFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0CC0 002CDC00 48 09 15 1D */ bl func_803621DC +/* 802D0CC0 002CDC00 48 09 15 1D */ bl _savegpr_29 /* 802D0CC4 002CDC04 7C 7D 1B 78 */ mr r29, r3 /* 802D0CC8 002CDC08 7C 9E 23 78 */ mr r30, r4 /* 802D0CCC 002CDC0C 7C BF 2B 78 */ mr r31, r5 @@ -227,7 +227,7 @@ lbl_802D0D34: /* 802D0D38 002CDC78 48 06 E3 E5 */ bl OSUnlockMutex /* 802D0D3C 002CDC7C 7F E3 FB 78 */ mr r3, r31 /* 802D0D40 002CDC80 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D0D44 002CDC84 48 09 14 E5 */ bl func_80362228 +/* 802D0D44 002CDC84 48 09 14 E5 */ bl _restgpr_29 /* 802D0D48 002CDC88 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D0D4C 002CDC8C 7C 08 03 A6 */ mtlr r0 /* 802D0D50 002CDC90 38 21 00 20 */ addi r1, r1, 0x20 @@ -483,7 +483,7 @@ lbl_802D10D8: /* 802D1100 002CE040 7C 08 02 A6 */ mflr r0 /* 802D1104 002CE044 90 01 00 34 */ stw r0, 0x34(r1) /* 802D1108 002CE048 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D110C 002CE04C 48 09 10 D1 */ bl func_803621DC +/* 802D110C 002CE04C 48 09 10 D1 */ bl _savegpr_29 /* 802D1110 002CE050 7C 7E 1B 78 */ mr r30, r3 /* 802D1114 002CE054 81 83 00 00 */ lwz r12, 0(r3) /* 802D1118 002CE058 81 8C 00 14 */ lwz r12, 0x14(r12) @@ -538,7 +538,7 @@ lbl_802D10D8: /* 802D11DC 002CE11C 48 06 DF 41 */ bl OSUnlockMutex /* 802D11E0 002CE120 7F E3 FB 78 */ mr r3, r31 /* 802D11E4 002CE124 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D11E8 002CE128 48 09 10 41 */ bl func_80362228 +/* 802D11E8 002CE128 48 09 10 41 */ bl _restgpr_29 /* 802D11EC 002CE12C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D11F0 002CE130 7C 08 03 A6 */ mtlr r0 /* 802D11F4 002CE134 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JKernel/JKRThread.s b/asm/JKernel/JKRThread.s index 97340ddcdf0..e238ccefb35 100644 --- a/asm/JKernel/JKRThread.s +++ b/asm/JKernel/JKRThread.s @@ -101,7 +101,7 @@ JKRThread_X2_: /* 802D16BC 002CE5FC 7C 08 02 A6 */ mflr r0 /* 802D16C0 002CE600 90 01 00 24 */ stw r0, 0x24(r1) /* 802D16C4 002CE604 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D16C8 002CE608 48 09 0B 15 */ bl func_803621DC +/* 802D16C8 002CE608 48 09 0B 15 */ bl _savegpr_29 /* 802D16CC 002CE60C 7C 7D 1B 78 */ mr r29, r3 /* 802D16D0 002CE610 7C 9E 23 78 */ mr r30, r4 /* 802D16D4 002CE614 7C BF 2B 78 */ mr r31, r5 @@ -132,7 +132,7 @@ JKRThread_X2_: /* 802D1738 002CE678 48 00 00 F9 */ bl JKRThread_NS_setCommon_mesgQueue /* 802D173C 002CE67C 7F A3 EB 78 */ mr r3, r29 /* 802D1740 002CE680 39 61 00 20 */ addi r11, r1, 0x20 -/* 802D1744 002CE684 48 09 0A E5 */ bl func_80362228 +/* 802D1744 002CE684 48 09 0A E5 */ bl _restgpr_29 /* 802D1748 002CE688 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D174C 002CE68C 7C 08 03 A6 */ mtlr r0 /* 802D1750 002CE690 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JMessage/processor.s b/asm/JMessage/processor.s index f792bae4e39..c7760e2c01b 100644 --- a/asm/JMessage/processor.s +++ b/asm/JMessage/processor.s @@ -847,7 +847,7 @@ JMessage_NS_TSequenceProcessor_NS_on_jump: /* 802A8614 002A5554 7C 08 02 A6 */ mflr r0 /* 802A8618 002A5558 90 01 00 24 */ stw r0, 0x24(r1) /* 802A861C 002A555C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A8620 002A5560 48 0B 9B BD */ bl func_803621DC +/* 802A8620 002A5560 48 0B 9B BD */ bl _savegpr_29 /* 802A8624 002A5564 7C 7D 1B 78 */ mr r29, r3 /* 802A8628 002A5568 7C 9E 23 78 */ mr r30, r4 /* 802A862C 002A556C 7C BF 2B 78 */ mr r31, r5 @@ -872,7 +872,7 @@ JMessage_NS_TSequenceProcessor_NS_on_jump: /* 802A8670 002A55B0 7D 89 03 A6 */ mtctr r12 /* 802A8674 002A55B4 4E 80 04 21 */ bctrl /* 802A8678 002A55B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A867C 002A55BC 48 0B 9B AD */ bl func_80362228 +/* 802A867C 002A55BC 48 0B 9B AD */ bl _restgpr_29 /* 802A8680 002A55C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A8684 002A55C4 7C 08 03 A6 */ mtlr r0 /* 802A8688 002A55C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -921,7 +921,7 @@ JMessage_NS_TSequenceProcessor_NS_on_branch: /* 802A8704 002A5644 7C 08 02 A6 */ mflr r0 /* 802A8708 002A5648 90 01 00 24 */ stw r0, 0x24(r1) /* 802A870C 002A564C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A8710 002A5650 48 0B 9A CD */ bl func_803621DC +/* 802A8710 002A5650 48 0B 9A CD */ bl _savegpr_29 /* 802A8714 002A5654 7C 7D 1B 78 */ mr r29, r3 /* 802A8718 002A5658 7C 9E 23 78 */ mr r30, r4 /* 802A871C 002A565C 7C BF 2B 78 */ mr r31, r5 @@ -946,7 +946,7 @@ JMessage_NS_TSequenceProcessor_NS_on_branch: /* 802A8760 002A56A0 7D 89 03 A6 */ mtctr r12 /* 802A8764 002A56A4 4E 80 04 21 */ bctrl /* 802A8768 002A56A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A876C 002A56AC 48 0B 9A BD */ bl func_80362228 +/* 802A876C 002A56AC 48 0B 9A BD */ bl _restgpr_29 /* 802A8770 002A56B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A8774 002A56B4 7C 08 03 A6 */ mtlr r0 /* 802A8778 002A56B8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index de80f22acf8..a0fb7197b0c 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -1885,7 +1885,7 @@ JPADrawDirection: /* 8027862C 0027556C DB 41 00 60 */ stfd f26, 0x60(r1) /* 80278630 00275570 F3 41 00 68 */ psq_st f26, 104(r1), 0, qr0 /* 80278634 00275574 39 61 00 60 */ addi r11, r1, 0x60 -/* 80278638 00275578 48 0E 9B A5 */ bl func_803621DC +/* 80278638 00275578 48 0E 9B A5 */ bl _savegpr_29 /* 8027863C 0027557C 7C 7E 1B 78 */ mr r30, r3 /* 80278640 00275580 7C 9D 23 78 */ mr r29, r4 /* 80278644 00275584 3C A0 80 3C */ lis r5, lbl_803C42E0@ha @@ -2105,7 +2105,7 @@ lbl_8027894C: /* 80278974 002758B4 E3 41 00 68 */ psq_l f26, 104(r1), 0, qr0 /* 80278978 002758B8 CB 41 00 60 */ lfd f26, 0x60(r1) /* 8027897C 002758BC 39 61 00 60 */ addi r11, r1, 0x60 -/* 80278980 002758C0 48 0E 98 A9 */ bl func_80362228 +/* 80278980 002758C0 48 0E 98 A9 */ bl _restgpr_29 /* 80278984 002758C4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80278988 002758C8 7C 08 03 A6 */ mtlr r0 /* 8027898C 002758CC 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -2132,7 +2132,7 @@ JPADrawRotDirection: /* 802789D8 00275918 DB 01 00 90 */ stfd f24, 0x90(r1) /* 802789DC 0027591C F3 01 00 98 */ psq_st f24, 152(r1), 0, qr0 /* 802789E0 00275920 39 61 00 90 */ addi r11, r1, 0x90 -/* 802789E4 00275924 48 0E 97 F9 */ bl func_803621DC +/* 802789E4 00275924 48 0E 97 F9 */ bl _savegpr_29 /* 802789E8 00275928 7C 7D 1B 78 */ mr r29, r3 /* 802789EC 0027592C 7C 9E 23 78 */ mr r30, r4 /* 802789F0 00275930 3C A0 80 3C */ lis r5, lbl_803C42E0@ha @@ -2378,7 +2378,7 @@ lbl_80278D50: /* 80278D88 00275CC8 E3 01 00 98 */ psq_l f24, 152(r1), 0, qr0 /* 80278D8C 00275CCC CB 01 00 90 */ lfd f24, 0x90(r1) /* 80278D90 00275CD0 39 61 00 90 */ addi r11, r1, 0x90 -/* 80278D94 00275CD4 48 0E 94 95 */ bl func_80362228 +/* 80278D94 00275CD4 48 0E 94 95 */ bl _restgpr_29 /* 80278D98 00275CD8 80 01 01 14 */ lwz r0, 0x114(r1) /* 80278D9C 00275CDC 7C 08 03 A6 */ mtlr r0 /* 80278DA0 00275CE0 38 21 01 10 */ addi r1, r1, 0x110 @@ -2393,7 +2393,7 @@ JPADrawDBillboard: /* 80278DBC 00275CFC DB C1 00 70 */ stfd f30, 0x70(r1) /* 80278DC0 00275D00 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 80278DC4 00275D04 39 61 00 70 */ addi r11, r1, 0x70 -/* 80278DC8 00275D08 48 0E 94 15 */ bl func_803621DC +/* 80278DC8 00275D08 48 0E 94 15 */ bl _savegpr_29 /* 80278DCC 00275D0C 7C 7D 1B 78 */ mr r29, r3 /* 80278DD0 00275D10 7C 9E 23 78 */ mr r30, r4 /* 80278DD4 00275D14 3C A0 80 3C */ lis r5, lbl_803C42E0@ha @@ -2520,7 +2520,7 @@ lbl_80278FA0: /* 80278FA8 00275EE8 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 80278FAC 00275EEC CB C1 00 70 */ lfd f30, 0x70(r1) /* 80278FB0 00275EF0 39 61 00 70 */ addi r11, r1, 0x70 -/* 80278FB4 00275EF4 48 0E 92 75 */ bl func_80362228 +/* 80278FB4 00275EF4 48 0E 92 75 */ bl _restgpr_29 /* 80278FB8 00275EF8 80 01 00 94 */ lwz r0, 0x94(r1) /* 80278FBC 00275EFC 7C 08 03 A6 */ mtlr r0 /* 80278FC0 00275F00 38 21 00 90 */ addi r1, r1, 0x90 @@ -2535,7 +2535,7 @@ JPADrawRotation: /* 80278FDC 00275F1C DB C1 00 50 */ stfd f30, 0x50(r1) /* 80278FE0 00275F20 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80278FE4 00275F24 39 61 00 50 */ addi r11, r1, 0x50 -/* 80278FE8 00275F28 48 0E 91 F5 */ bl func_803621DC +/* 80278FE8 00275F28 48 0E 91 F5 */ bl _savegpr_29 /* 80278FEC 00275F2C 7C 7D 1B 78 */ mr r29, r3 /* 80278FF0 00275F30 7C 9E 23 78 */ mr r30, r4 /* 80278FF4 00275F34 3C 60 80 3C */ lis r3, lbl_803C42E0@ha @@ -2605,7 +2605,7 @@ lbl_802790E8: /* 802790F0 00276030 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 802790F4 00276034 CB C1 00 50 */ lfd f30, 0x50(r1) /* 802790F8 00276038 39 61 00 50 */ addi r11, r1, 0x50 -/* 802790FC 0027603C 48 0E 91 2D */ bl func_80362228 +/* 802790FC 0027603C 48 0E 91 2D */ bl _restgpr_29 /* 80279100 00276040 80 01 00 74 */ lwz r0, 0x74(r1) /* 80279104 00276044 7C 08 03 A6 */ mtlr r0 /* 80279108 00276048 38 21 00 70 */ addi r1, r1, 0x70 @@ -4096,7 +4096,7 @@ JPABaseShape: /* 8027A6E0 00277620 7C 08 02 A6 */ mflr r0 /* 8027A6E4 00277624 90 01 00 24 */ stw r0, 0x24(r1) /* 8027A6E8 00277628 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027A6EC 0027762C 48 0E 7A F1 */ bl func_803621DC +/* 8027A6EC 0027762C 48 0E 7A F1 */ bl _savegpr_29 /* 8027A6F0 00277630 7C 7D 1B 78 */ mr r29, r3 /* 8027A6F4 00277634 7C 9E 23 78 */ mr r30, r4 /* 8027A6F8 00277638 7C BF 2B 78 */ mr r31, r5 @@ -4163,7 +4163,7 @@ lbl_8027A7C4: lbl_8027A7CC: /* 8027A7CC 0027770C 7F A3 EB 78 */ mr r3, r29 /* 8027A7D0 00277710 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027A7D4 00277714 48 0E 7A 55 */ bl func_80362228 +/* 8027A7D4 00277714 48 0E 7A 55 */ bl _restgpr_29 /* 8027A7D8 00277718 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027A7DC 0027771C 7C 08 03 A6 */ mtlr r0 /* 8027A7E0 00277720 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JParticle/JPAEmitterManager.s b/asm/JParticle/JPAEmitterManager.s index c5e565a93a7..a67b84d65e5 100644 --- a/asm/JParticle/JPAEmitterManager.s +++ b/asm/JParticle/JPAEmitterManager.s @@ -230,7 +230,7 @@ JPAEmitterManager_NS_calc: /* 8027DFA4 0027AEE4 7C 08 02 A6 */ mflr r0 /* 8027DFA8 0027AEE8 90 01 00 24 */ stw r0, 0x24(r1) /* 8027DFAC 0027AEEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027DFB0 0027AEF0 48 0E 42 2D */ bl func_803621DC +/* 8027DFB0 0027AEF0 48 0E 42 2D */ bl _savegpr_29 /* 8027DFB4 0027AEF4 7C 7D 1B 78 */ mr r29, r3 /* 8027DFB8 0027AEF8 80 63 00 00 */ lwz r3, 0(r3) /* 8027DFBC 0027AEFC 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -258,7 +258,7 @@ lbl_8027E008: /* 8027E008 0027AF48 28 03 00 00 */ cmplwi r3, 0 /* 8027E00C 0027AF4C 40 82 FF C0 */ bne lbl_8027DFCC /* 8027E010 0027AF50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027E014 0027AF54 48 0E 42 15 */ bl func_80362228 +/* 8027E014 0027AF54 48 0E 42 15 */ bl _restgpr_29 /* 8027E018 0027AF58 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027E01C 0027AF5C 7C 08 03 A6 */ mtlr r0 /* 8027E020 0027AF60 38 21 00 20 */ addi r1, r1, 0x20 @@ -270,7 +270,7 @@ JPAEmitterManager_NS_draw: /* 8027E02C 0027AF6C 7C 08 02 A6 */ mflr r0 /* 8027E030 0027AF70 90 01 00 24 */ stw r0, 0x24(r1) /* 8027E034 0027AF74 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027E038 0027AF78 48 0E 41 A5 */ bl func_803621DC +/* 8027E038 0027AF78 48 0E 41 A5 */ bl _savegpr_29 /* 8027E03C 0027AF7C 7C 7D 1B 78 */ mr r29, r3 /* 8027E040 0027AF80 7C 9E 23 78 */ mr r30, r4 /* 8027E044 0027AF84 7C BF 2B 78 */ mr r31, r5 @@ -390,7 +390,7 @@ lbl_8027E200: /* 8027E200 0027B140 28 1F 00 00 */ cmplwi r31, 0 /* 8027E204 0027B144 40 82 FF C4 */ bne lbl_8027E1C8 /* 8027E208 0027B148 39 61 00 20 */ addi r11, r1, 0x20 -/* 8027E20C 0027B14C 48 0E 40 1D */ bl func_80362228 +/* 8027E20C 0027B14C 48 0E 40 1D */ bl _restgpr_29 /* 8027E210 0027B150 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027E214 0027B154 7C 08 03 A6 */ mtlr r0 /* 8027E218 0027B158 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JParticle/JPAFieldBlock.s b/asm/JParticle/JPAFieldBlock.s index f7f37b869b4..0eb8b89864c 100644 --- a/asm/JParticle/JPAFieldBlock.s +++ b/asm/JParticle/JPAFieldBlock.s @@ -592,7 +592,7 @@ lbl_8027C630: /* 8027C680 002795C0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8027C684 002795C4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8027C688 002795C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027C68C 002795CC 48 0E 5B 51 */ bl func_803621DC +/* 8027C68C 002795CC 48 0E 5B 51 */ bl _savegpr_29 /* 8027C690 002795D0 7C 7D 1B 78 */ mr r29, r3 /* 8027C694 002795D4 7C BE 2B 78 */ mr r30, r5 /* 8027C698 002795D8 7C DF 33 78 */ mr r31, r6 @@ -690,7 +690,7 @@ lbl_8027C7BC: /* 8027C7F4 00279734 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8027C7F8 00279738 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8027C7FC 0027973C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027C800 00279740 48 0E 5A 29 */ bl func_80362228 +/* 8027C800 00279740 48 0E 5A 29 */ bl _restgpr_29 /* 8027C804 00279744 80 01 00 44 */ lwz r0, 0x44(r1) /* 8027C808 00279748 7C 08 03 A6 */ mtlr r0 /* 8027C80C 0027974C 38 21 00 40 */ addi r1, r1, 0x40 @@ -711,7 +711,7 @@ lbl_8027C7BC: /* 8027C848 00279788 DB 41 00 30 */ stfd f26, 0x30(r1) /* 8027C84C 0027978C F3 41 00 38 */ psq_st f26, 56(r1), 0, qr0 /* 8027C850 00279790 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027C854 00279794 48 0E 59 89 */ bl func_803621DC +/* 8027C854 00279794 48 0E 59 89 */ bl _savegpr_29 /* 8027C858 00279798 7C 7D 1B 78 */ mr r29, r3 /* 8027C85C 0027979C 7C 9E 23 78 */ mr r30, r4 /* 8027C860 002797A0 7C BF 2B 78 */ mr r31, r5 @@ -859,7 +859,7 @@ lbl_8027CA4C: /* 8027CA74 002799B4 E3 41 00 38 */ psq_l f26, 56(r1), 0, qr0 /* 8027CA78 002799B8 CB 41 00 30 */ lfd f26, 0x30(r1) /* 8027CA7C 002799BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027CA80 002799C0 48 0E 57 A9 */ bl func_80362228 +/* 8027CA80 002799C0 48 0E 57 A9 */ bl _restgpr_29 /* 8027CA84 002799C4 80 01 00 94 */ lwz r0, 0x94(r1) /* 8027CA88 002799C8 7C 08 03 A6 */ mtlr r0 /* 8027CA8C 002799CC 38 21 00 90 */ addi r1, r1, 0x90 @@ -872,7 +872,7 @@ lbl_8027CA4C: /* 8027CAA8 002799E8 DB C1 00 40 */ stfd f30, 0x40(r1) /* 8027CAAC 002799EC F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 8027CAB0 002799F0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027CAB4 002799F4 48 0E 57 29 */ bl func_803621DC +/* 8027CAB4 002799F4 48 0E 57 29 */ bl _savegpr_29 /* 8027CAB8 002799F8 7C 7D 1B 78 */ mr r29, r3 /* 8027CABC 002799FC 7C BE 2B 78 */ mr r30, r5 /* 8027CAC0 00279A00 7C DF 33 78 */ mr r31, r6 @@ -1008,7 +1008,7 @@ lbl_8027CC94: /* 8027CCAC 00279BEC E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 8027CCB0 00279BF0 CB C1 00 40 */ lfd f30, 0x40(r1) /* 8027CCB4 00279BF4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8027CCB8 00279BF8 48 0E 55 71 */ bl func_80362228 +/* 8027CCB8 00279BF8 48 0E 55 71 */ bl _restgpr_29 /* 8027CCBC 00279BFC 80 01 00 64 */ lwz r0, 0x64(r1) /* 8027CCC0 00279C00 7C 08 03 A6 */ mtlr r0 /* 8027CCC4 00279C04 38 21 00 60 */ addi r1, r1, 0x60 @@ -1207,7 +1207,7 @@ lbl_8027CF28: /* 8027CFAC 00279EEC 7C 08 02 A6 */ mflr r0 /* 8027CFB0 00279EF0 90 01 00 64 */ stw r0, 0x64(r1) /* 8027CFB4 00279EF4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8027CFB8 00279EF8 48 0E 52 25 */ bl func_803621DC +/* 8027CFB8 00279EF8 48 0E 52 25 */ bl _savegpr_29 /* 8027CFBC 00279EFC 7C 7D 1B 78 */ mr r29, r3 /* 8027CFC0 00279F00 7C BE 2B 78 */ mr r30, r5 /* 8027CFC4 00279F04 7C DF 33 78 */ mr r31, r6 @@ -1254,7 +1254,7 @@ lbl_8027CF28: /* 8027D068 00279FA8 7F E5 FB 78 */ mr r5, r31 /* 8027D06C 00279FAC 4B FF ED 81 */ bl JPAFieldBase_NS_calcAffect /* 8027D070 00279FB0 39 61 00 60 */ addi r11, r1, 0x60 -/* 8027D074 00279FB4 48 0E 51 B5 */ bl func_80362228 +/* 8027D074 00279FB4 48 0E 51 B5 */ bl _restgpr_29 /* 8027D078 00279FB8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8027D07C 00279FBC 7C 08 03 A6 */ mtlr r0 /* 8027D080 00279FC0 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/JParticle/JPAParticle.s b/asm/JParticle/JPAParticle.s index 1d69d255323..c79e83406ec 100644 --- a/asm/JParticle/JPAParticle.s +++ b/asm/JParticle/JPAParticle.s @@ -628,7 +628,7 @@ JPABaseParticle_NS_init_c: /* 8027F8D4 0027C814 DB E1 00 B0 */ stfd f31, 0xb0(r1) /* 8027F8D8 0027C818 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, qr0 /* 8027F8DC 0027C81C 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8027F8E0 0027C820 48 0E 28 FD */ bl func_803621DC +/* 8027F8E0 0027C820 48 0E 28 FD */ bl _savegpr_29 /* 8027F8E4 0027C824 7C 7D 1B 78 */ mr r29, r3 /* 8027F8E8 0027C828 7C BE 2B 78 */ mr r30, r5 /* 8027F8EC 0027C82C 80 64 00 00 */ lwz r3, 0(r4) @@ -1085,7 +1085,7 @@ lbl_8027FFA8: /* 8027FFB0 0027CEF0 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 /* 8027FFB4 0027CEF4 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 8027FFB8 0027CEF8 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 8027FFBC 0027CEFC 48 0E 22 6D */ bl func_80362228 +/* 8027FFBC 0027CEFC 48 0E 22 6D */ bl _restgpr_29 /* 8027FFC0 0027CF00 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8027FFC4 0027CF04 7C 08 03 A6 */ mtlr r0 /* 8027FFC8 0027CF08 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -1099,7 +1099,7 @@ JPABaseParticle_NS_calc_p: /* 8027FFDC 0027CF1C DB E1 00 30 */ stfd f31, 0x30(r1) /* 8027FFE0 0027CF20 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8027FFE4 0027CF24 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027FFE8 0027CF28 48 0E 21 F5 */ bl func_803621DC +/* 8027FFE8 0027CF28 48 0E 21 F5 */ bl _savegpr_29 /* 8027FFEC 0027CF2C 7C 7E 1B 78 */ mr r30, r3 /* 8027FFF0 0027CF30 7C 9F 23 78 */ mr r31, r4 /* 8027FFF4 0027CF34 A8 63 00 80 */ lha r3, 0x80(r3) @@ -1261,7 +1261,7 @@ lbl_80280240: /* 80280240 0027D180 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80280244 0027D184 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80280248 0027D188 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028024C 0027D18C 48 0E 1F DD */ bl func_80362228 +/* 8028024C 0027D18C 48 0E 1F DD */ bl _restgpr_29 /* 80280250 0027D190 80 01 00 44 */ lwz r0, 0x44(r1) /* 80280254 0027D194 7C 08 03 A6 */ mtlr r0 /* 80280258 0027D198 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JStudio/functionvalue.s b/asm/JStudio/functionvalue.s index 31539ccbfbe..20a5926816c 100644 --- a/asm/JStudio/functionvalue.s +++ b/asm/JStudio/functionvalue.s @@ -623,7 +623,7 @@ lbl_80281EB8: /* 80281ED0 0027EE10 90 01 00 44 */ stw r0, 0x44(r1) /* 80281ED4 0027EE14 DB E1 00 38 */ stfd f31, 0x38(r1) /* 80281ED8 0027EE18 39 61 00 38 */ addi r11, r1, 0x38 -/* 80281EDC 0027EE1C 48 0E 03 01 */ bl func_803621DC +/* 80281EDC 0027EE1C 48 0E 03 01 */ bl _savegpr_29 /* 80281EE0 0027EE20 7C 9D 23 78 */ mr r29, r4 /* 80281EE4 0027EE24 FF E0 08 90 */ fmr f31, f1 /* 80281EE8 0027EE28 83 C3 00 04 */ lwz r30, 4(r3) @@ -713,7 +713,7 @@ lbl_80281FF0: lbl_80282010: /* 80282010 0027EF50 CB E1 00 38 */ lfd f31, 0x38(r1) /* 80282014 0027EF54 39 61 00 38 */ addi r11, r1, 0x38 -/* 80282018 0027EF58 48 0E 02 11 */ bl func_80362228 +/* 80282018 0027EF58 48 0E 02 11 */ bl _restgpr_29 /* 8028201C 0027EF5C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80282020 0027EF60 7C 08 03 A6 */ mtlr r0 /* 80282024 0027EF64 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/JStudio/fvb.s b/asm/JStudio/fvb.s index 3bcb2f384e8..1cad946839e 100644 --- a/asm/JStudio/fvb.s +++ b/asm/JStudio/fvb.s @@ -242,7 +242,7 @@ lbl_80284284: /* 802842D8 00281218 7C 08 02 A6 */ mflr r0 /* 802842DC 0028121C 90 01 00 24 */ stw r0, 0x24(r1) /* 802842E0 00281220 39 61 00 20 */ addi r11, r1, 0x20 -/* 802842E4 00281224 48 0D DE F9 */ bl func_803621DC +/* 802842E4 00281224 48 0D DE F9 */ bl _savegpr_29 /* 802842E8 00281228 7C 7D 1B 78 */ mr r29, r3 /* 802842EC 0028122C 83 C4 00 08 */ lwz r30, 8(r4) /* 802842F0 00281230 80 7E 00 00 */ lwz r3, 0(r30) @@ -258,7 +258,7 @@ lbl_80284284: /* 80284318 00281258 C8 01 00 08 */ lfd f0, 8(r1) /* 8028431C 0028125C D8 1D 00 38 */ stfd f0, 0x38(r29) /* 80284320 00281260 39 61 00 20 */ addi r11, r1, 0x20 -/* 80284324 00281264 48 0D DF 05 */ bl func_80362228 +/* 80284324 00281264 48 0D DF 05 */ bl _restgpr_29 /* 80284328 00281268 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028432C 0028126C 7C 08 03 A6 */ mtlr r0 /* 80284330 00281270 38 21 00 20 */ addi r1, r1, 0x20 @@ -910,7 +910,7 @@ lbl_80284BDC: /* 80284BF4 00281B34 7C 08 02 A6 */ mflr r0 /* 80284BF8 00281B38 90 01 00 24 */ stw r0, 0x24(r1) /* 80284BFC 00281B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80284C00 00281B40 48 0D D5 DD */ bl func_803621DC +/* 80284C00 00281B40 48 0D D5 DD */ bl _savegpr_29 /* 80284C04 00281B44 7C DD 33 78 */ mr r29, r6 /* 80284C08 00281B48 80 C4 00 00 */ lwz r6, 0(r4) /* 80284C0C 00281B4C 90 C1 00 08 */ stw r6, 8(r1) @@ -968,7 +968,7 @@ lbl_80284CB0: /* 80284CC8 00281C08 38 60 00 01 */ li r3, 1 lbl_80284CCC: /* 80284CCC 00281C0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80284CD0 00281C10 48 0D D5 59 */ bl func_80362228 +/* 80284CD0 00281C10 48 0D D5 59 */ bl _restgpr_29 /* 80284CD4 00281C14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80284CD8 00281C18 7C 08 03 A6 */ mtlr r0 /* 80284CDC 00281C1C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio/jstudio-control.s b/asm/JStudio/jstudio-control.s index c2edaffbe0f..f5f6c27b595 100644 --- a/asm/JStudio/jstudio-control.s +++ b/asm/JStudio/jstudio-control.s @@ -432,7 +432,7 @@ lbl_802856EC: /* 8028570C 0028264C 7C 08 02 A6 */ mflr r0 /* 80285710 00282650 90 01 00 34 */ stw r0, 0x34(r1) /* 80285714 00282654 39 61 00 30 */ addi r11, r1, 0x30 -/* 80285718 00282658 48 0D CA C5 */ bl func_803621DC +/* 80285718 00282658 48 0D CA C5 */ bl _savegpr_29 /* 8028571C 0028265C 7C 7D 1B 78 */ mr r29, r3 /* 80285720 00282660 7C BE 2B 78 */ mr r30, r5 /* 80285724 00282664 80 64 00 00 */ lwz r3, 0(r4) @@ -483,7 +483,7 @@ lbl_802857C8: /* 802857C8 00282708 38 60 00 01 */ li r3, 1 lbl_802857CC: /* 802857CC 0028270C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802857D0 00282710 48 0D CA 59 */ bl func_80362228 +/* 802857D0 00282710 48 0D CA 59 */ bl _restgpr_29 /* 802857D4 00282714 80 01 00 34 */ lwz r0, 0x34(r1) /* 802857D8 00282718 7C 08 03 A6 */ mtlr r0 /* 802857DC 0028271C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/jstudio-math.s b/asm/JStudio/jstudio-math.s index d6f07717875..4ede7e0c7ed 100644 --- a/asm/JStudio/jstudio-math.s +++ b/asm/JStudio/jstudio-math.s @@ -102,7 +102,7 @@ JStudio_NS_math_NS_getTransformation_SRxyzT: /* 80285B48 00282A88 7C 08 02 A6 */ mflr r0 /* 80285B4C 00282A8C 90 01 00 B4 */ stw r0, 0xb4(r1) /* 80285B50 00282A90 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80285B54 00282A94 48 0D C6 89 */ bl func_803621DC +/* 80285B54 00282A94 48 0D C6 89 */ bl _savegpr_29 /* 80285B58 00282A98 7C 7D 1B 78 */ mr r29, r3 /* 80285B5C 00282A9C 7C BE 2B 78 */ mr r30, r5 /* 80285B60 00282AA0 7C DF 33 78 */ mr r31, r6 @@ -127,7 +127,7 @@ JStudio_NS_math_NS_getTransformation_SRxyzT: /* 80285BAC 00282AEC C0 7F 00 08 */ lfs f3, 8(r31) /* 80285BB0 00282AF0 48 0C 0D 6D */ bl PSMTXTransApply /* 80285BB4 00282AF4 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80285BB8 00282AF8 48 0D C6 71 */ bl func_80362228 +/* 80285BB8 00282AF8 48 0D C6 71 */ bl _restgpr_29 /* 80285BBC 00282AFC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80285BC0 00282B00 7C 08 03 A6 */ mtlr r0 /* 80285BC4 00282B04 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/JStudio/jstudio-object.s b/asm/JStudio/jstudio-object.s index 630e066a718..724fc6dc43f 100644 --- a/asm/JStudio/jstudio-object.s +++ b/asm/JStudio/jstudio-object.s @@ -868,7 +868,7 @@ JStudio_NS_TObject_actor: /* 80286950 00283890 7C 08 02 A6 */ mflr r0 /* 80286954 00283894 90 01 00 34 */ stw r0, 0x34(r1) /* 80286958 00283898 39 61 00 30 */ addi r11, r1, 0x30 -/* 8028695C 0028389C 48 0D B8 81 */ bl func_803621DC +/* 8028695C 0028389C 48 0D B8 81 */ bl _savegpr_29 /* 80286960 002838A0 7C A8 2B 78 */ mr r8, r5 /* 80286964 002838A4 7C C9 33 78 */ mr r9, r6 /* 80286968 002838A8 3C A0 80 3A */ lis r5, lbl_8039AA68@ha @@ -1080,7 +1080,7 @@ lbl_80286C68: /* 80286C80 00283BC0 60 00 00 00 */ nop lbl_80286C84: /* 80286C84 00283BC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80286C88 00283BC8 48 0D B5 A1 */ bl func_80362228 +/* 80286C88 00283BC8 48 0D B5 A1 */ bl _restgpr_29 /* 80286C8C 00283BCC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80286C90 00283BD0 7C 08 03 A6 */ mtlr r0 /* 80286C94 00283BD4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1248,7 +1248,7 @@ JStudio_NS_TObject_camera: /* 80286EBC 00283DFC 7C 08 02 A6 */ mflr r0 /* 80286EC0 00283E00 90 01 00 34 */ stw r0, 0x34(r1) /* 80286EC4 00283E04 39 61 00 30 */ addi r11, r1, 0x30 -/* 80286EC8 00283E08 48 0D B3 15 */ bl func_803621DC +/* 80286EC8 00283E08 48 0D B3 15 */ bl _savegpr_29 /* 80286ECC 00283E0C 7C A8 2B 78 */ mr r8, r5 /* 80286ED0 00283E10 7C C9 33 78 */ mr r9, r6 /* 80286ED4 00283E14 3C A0 80 3C */ lis r5, lbl_803C4B00@ha @@ -1425,7 +1425,7 @@ lbl_80287148: /* 80287160 002840A0 60 00 00 00 */ nop lbl_80287164: /* 80287164 002840A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80287168 002840A8 48 0D B0 C1 */ bl func_80362228 +/* 80287168 002840A8 48 0D B0 C1 */ bl _restgpr_29 /* 8028716C 002840AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80287170 002840B0 7C 08 03 A6 */ mtlr r0 /* 80287174 002840B4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1872,7 +1872,7 @@ JStudio_NS_TObject_particle: /* 802877AC 002846EC 7C 08 02 A6 */ mflr r0 /* 802877B0 002846F0 90 01 00 34 */ stw r0, 0x34(r1) /* 802877B4 002846F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802877B8 002846F8 48 0D AA 25 */ bl func_803621DC +/* 802877B8 002846F8 48 0D AA 25 */ bl _savegpr_29 /* 802877BC 002846FC 7C A8 2B 78 */ mr r8, r5 /* 802877C0 00284700 7C C9 33 78 */ mr r9, r6 /* 802877C4 00284704 3C A0 80 43 */ lis r5, lbl_80431010@ha @@ -2101,7 +2101,7 @@ lbl_80287B08: /* 80287B20 00284A60 60 00 00 00 */ nop lbl_80287B24: /* 80287B24 00284A64 39 61 00 30 */ addi r11, r1, 0x30 -/* 80287B28 00284A68 48 0D A7 01 */ bl func_80362228 +/* 80287B28 00284A68 48 0D A7 01 */ bl _restgpr_29 /* 80287B2C 00284A6C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80287B30 00284A70 7C 08 03 A6 */ mtlr r0 /* 80287B34 00284A74 38 21 00 30 */ addi r1, r1, 0x30 @@ -2156,7 +2156,7 @@ JStudio_NS_TObject_sound: /* 80287BDC 00284B1C 7C 08 02 A6 */ mflr r0 /* 80287BE0 00284B20 90 01 00 34 */ stw r0, 0x34(r1) /* 80287BE4 00284B24 39 61 00 30 */ addi r11, r1, 0x30 -/* 80287BE8 00284B28 48 0D A5 F5 */ bl func_803621DC +/* 80287BE8 00284B28 48 0D A5 F5 */ bl _savegpr_29 /* 80287BEC 00284B2C 7C A8 2B 78 */ mr r8, r5 /* 80287BF0 00284B30 7C C9 33 78 */ mr r9, r6 /* 80287BF4 00284B34 3C A0 80 43 */ lis r5, lbl_80431010@ha @@ -2359,7 +2359,7 @@ lbl_80287ED0: /* 80287EE8 00284E28 60 00 00 00 */ nop lbl_80287EEC: /* 80287EEC 00284E2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80287EF0 00284E30 48 0D A3 39 */ bl func_80362228 +/* 80287EF0 00284E30 48 0D A3 39 */ bl _restgpr_29 /* 80287EF4 00284E34 80 01 00 34 */ lwz r0, 0x34(r1) /* 80287EF8 00284E38 7C 08 03 A6 */ mtlr r0 /* 80287EFC 00284E3C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JStudio/stb.s b/asm/JStudio/stb.s index 1bc7b33af80..8ffac3a208a 100644 --- a/asm/JStudio/stb.s +++ b/asm/JStudio/stb.s @@ -121,7 +121,7 @@ JStudio_NS_stb_NS_TObject_NS_forward: /* 80288BEC 00285B2C 7C 08 02 A6 */ mflr r0 /* 80288BF0 00285B30 90 01 00 24 */ stw r0, 0x24(r1) /* 80288BF4 00285B34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80288BF8 00285B38 48 0D 95 E5 */ bl func_803621DC +/* 80288BF8 00285B38 48 0D 95 E5 */ bl _savegpr_29 /* 80288BFC 00285B3C 7C 7E 1B 78 */ mr r30, r3 /* 80288C00 00285B40 7C 9F 23 78 */ mr r31, r4 /* 80288C04 00285B44 3B A0 00 00 */ li r29, 0 @@ -269,7 +269,7 @@ lbl_80288DDC: /* 80288DFC 00285D3C 38 60 00 01 */ li r3, 1 lbl_80288E00: /* 80288E00 00285D40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80288E04 00285D44 48 0D 94 25 */ bl func_80362228 +/* 80288E04 00285D44 48 0D 94 25 */ bl _restgpr_29 /* 80288E08 00285D48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80288E0C 00285D4C 7C 08 03 A6 */ mtlr r0 /* 80288E10 00285D50 38 21 00 20 */ addi r1, r1, 0x20 @@ -1011,7 +1011,7 @@ JStudio_NS_stb_NS_TParse_NS_parseBlock_block: /* 80289824 00286764 7C 08 02 A6 */ mflr r0 /* 80289828 00286768 90 01 00 24 */ stw r0, 0x24(r1) /* 8028982C 0028676C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289830 00286770 48 0D 89 AD */ bl func_803621DC +/* 80289830 00286770 48 0D 89 AD */ bl _savegpr_29 /* 80289834 00286774 7C 9D 23 78 */ mr r29, r4 /* 80289838 00286778 7C BE 2B 78 */ mr r30, r5 /* 8028983C 0028677C 83 E3 00 04 */ lwz r31, 4(r3) @@ -1074,7 +1074,7 @@ lbl_80289904: /* 8028990C 0028684C 38 60 00 01 */ li r3, 1 lbl_80289910: /* 80289910 00286850 39 61 00 20 */ addi r11, r1, 0x20 -/* 80289914 00286854 48 0D 89 15 */ bl func_80362228 +/* 80289914 00286854 48 0D 89 15 */ bl _restgpr_29 /* 80289918 00286858 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028991C 0028685C 7C 08 03 A6 */ mtlr r0 /* 80289920 00286860 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio_JAudio2/control.s b/asm/JStudio_JAudio2/control.s index 8482b0ce6c0..a442e1e8b0d 100644 --- a/asm/JStudio_JAudio2/control.s +++ b/asm/JStudio_JAudio2/control.s @@ -69,7 +69,7 @@ JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_: /* 8028D628 0028A568 7C 08 02 A6 */ mflr r0 /* 8028D62C 0028A56C 90 01 00 24 */ stw r0, 0x24(r1) /* 8028D630 0028A570 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028D634 0028A574 48 0D 4B A9 */ bl func_803621DC +/* 8028D634 0028A574 48 0D 4B A9 */ bl _savegpr_29 /* 8028D638 0028A578 7C 7D 1B 78 */ mr r29, r3 /* 8028D63C 0028A57C 7C 9E 23 78 */ mr r30, r4 /* 8028D640 0028A580 38 60 01 48 */ li r3, 0x148 @@ -134,7 +134,7 @@ lbl_8028D70C: /* 8028D70C 0028A64C 7F C3 F3 78 */ mr r3, r30 lbl_8028D710: /* 8028D710 0028A650 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028D714 0028A654 48 0D 4B 15 */ bl func_80362228 +/* 8028D714 0028A654 48 0D 4B 15 */ bl _restgpr_29 /* 8028D718 0028A658 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028D71C 0028A65C 7C 08 03 A6 */ mtlr r0 /* 8028D720 0028A660 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio_JParticle/control.s b/asm/JStudio_JParticle/control.s index 35b8d37283b..e2c874beb7c 100644 --- a/asm/JStudio_JParticle/control.s +++ b/asm/JStudio_JParticle/control.s @@ -108,7 +108,7 @@ JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_: /* 8028E50C 0028B44C 7C 08 02 A6 */ mflr r0 /* 8028E510 0028B450 90 01 00 24 */ stw r0, 0x24(r1) /* 8028E514 0028B454 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028E518 0028B458 48 0D 3C C5 */ bl func_803621DC +/* 8028E518 0028B458 48 0D 3C C5 */ bl _savegpr_29 /* 8028E51C 0028B45C 7C 7D 1B 78 */ mr r29, r3 /* 8028E520 0028B460 7C 9E 23 78 */ mr r30, r4 /* 8028E524 0028B464 38 60 01 DC */ li r3, 0x1dc diff --git a/asm/JStudio_JParticle/object-particle.s b/asm/JStudio_JParticle/object-particle.s index 73552ce82fa..6c6be6d1e8c 100644 --- a/asm/JStudio_JParticle/object-particle.s +++ b/asm/JStudio_JParticle/object-particle.s @@ -61,7 +61,7 @@ lbl_8028E5F0: /* 8028E5F0 0028B530 7F C3 F3 78 */ mr r3, r30 lbl_8028E5F4: /* 8028E5F4 0028B534 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028E5F8 0028B538 48 0D 3C 31 */ bl func_80362228 +/* 8028E5F8 0028B538 48 0D 3C 31 */ bl _restgpr_29 /* 8028E5FC 0028B53C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028E600 0028B540 7C 08 03 A6 */ mtlr r0 /* 8028E604 0028B544 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 2c64ca11ad1..98567c69c49 100644 --- a/asm/JStudio_JStage/object-actor.s +++ b/asm/JStudio_JStage/object-actor.s @@ -9,7 +9,7 @@ JStudio_JStage_NS_TAdaptor_actor: /* 8028A5F4 00287534 7C 08 02 A6 */ mflr r0 /* 8028A5F8 00287538 90 01 00 24 */ stw r0, 0x24(r1) /* 8028A5FC 0028753C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A600 00287540 48 0D 7B DD */ bl func_803621DC +/* 8028A600 00287540 48 0D 7B DD */ bl _savegpr_29 /* 8028A604 00287544 7C 7D 1B 78 */ mr r29, r3 /* 8028A608 00287548 7C 9E 23 78 */ mr r30, r4 /* 8028A60C 0028754C 7C BF 2B 78 */ mr r31, r5 @@ -51,7 +51,7 @@ JStudio_JStage_NS_TAdaptor_actor: /* 8028A694 002875D4 90 1D 01 4C */ stw r0, 0x14c(r29) /* 8028A698 002875D8 7F A3 EB 78 */ mr r3, r29 /* 8028A69C 002875DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028A6A0 002875E0 48 0D 7B 89 */ bl func_80362228 +/* 8028A6A0 002875E0 48 0D 7B 89 */ bl _restgpr_29 /* 8028A6A4 002875E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028A6A8 002875E8 7C 08 03 A6 */ mtlr r0 /* 8028A6AC 002875EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -630,7 +630,7 @@ JStudio_JStage_NS_TAdaptor_actor_NS_getJSG_SRT_: /* 8028AED0 00287E10 7C 08 02 A6 */ mflr r0 /* 8028AED4 00287E14 90 01 00 94 */ stw r0, 0x94(r1) /* 8028AED8 00287E18 39 61 00 90 */ addi r11, r1, 0x90 -/* 8028AEDC 00287E1C 48 0D 73 01 */ bl func_803621DC +/* 8028AEDC 00287E1C 48 0D 73 01 */ bl _savegpr_29 /* 8028AEE0 00287E20 7C 7D 1B 78 */ mr r29, r3 /* 8028AEE4 00287E24 7C 9E 23 78 */ mr r30, r4 /* 8028AEE8 00287E28 83 E3 01 2C */ lwz r31, 0x12c(r3) @@ -731,7 +731,7 @@ lbl_8028B010: /* 8028B048 00287F88 4B FF B1 BD */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec lbl_8028B04C: /* 8028B04C 00287F8C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8028B050 00287F90 48 0D 71 D9 */ bl func_80362228 +/* 8028B050 00287F90 48 0D 71 D9 */ bl _restgpr_29 /* 8028B054 00287F94 80 01 00 94 */ lwz r0, 0x94(r1) /* 8028B058 00287F98 7C 08 03 A6 */ mtlr r0 /* 8028B05C 00287F9C 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/JStudio_JStage/object-ambientlight.s b/asm/JStudio_JStage/object-ambientlight.s index c00dff8f399..ce167498e11 100644 --- a/asm/JStudio_JStage/object-ambientlight.s +++ b/asm/JStudio_JStage/object-ambientlight.s @@ -9,7 +9,7 @@ JStudio_JStage_NS_TAdaptor_ambientLight: /* 8028B614 00288554 7C 08 02 A6 */ mflr r0 /* 8028B618 00288558 90 01 00 24 */ stw r0, 0x24(r1) /* 8028B61C 0028855C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B620 00288560 48 0D 6B BD */ bl func_803621DC +/* 8028B620 00288560 48 0D 6B BD */ bl _savegpr_29 /* 8028B624 00288564 7C 7D 1B 78 */ mr r29, r3 /* 8028B628 00288568 7C 9E 23 78 */ mr r30, r4 /* 8028B62C 0028856C 7C BF 2B 78 */ mr r31, r5 @@ -41,7 +41,7 @@ JStudio_JStage_NS_TAdaptor_ambientLight: /* 8028B68C 002885CC 90 1D 00 00 */ stw r0, 0(r29) /* 8028B690 002885D0 7F A3 EB 78 */ mr r3, r29 /* 8028B694 002885D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B698 002885D8 48 0D 6B 91 */ bl func_80362228 +/* 8028B698 002885D8 48 0D 6B 91 */ bl _restgpr_29 /* 8028B69C 002885DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028B6A0 002885E0 7C 08 03 A6 */ mtlr r0 /* 8028B6A4 002885E4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio_JStage/object-camera.s b/asm/JStudio_JStage/object-camera.s index 476a040d6d2..2c1fcf70f23 100644 --- a/asm/JStudio_JStage/object-camera.s +++ b/asm/JStudio_JStage/object-camera.s @@ -9,7 +9,7 @@ JStudio_JStage_NS_TAdaptor_camera: /* 8028B8A4 002887E4 7C 08 02 A6 */ mflr r0 /* 8028B8A8 002887E8 90 01 00 24 */ stw r0, 0x24(r1) /* 8028B8AC 002887EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B8B0 002887F0 48 0D 69 2D */ bl func_803621DC +/* 8028B8B0 002887F0 48 0D 69 2D */ bl _savegpr_29 /* 8028B8B4 002887F4 7C 7D 1B 78 */ mr r29, r3 /* 8028B8B8 002887F8 7C 9E 23 78 */ mr r30, r4 /* 8028B8BC 002887FC 7C BF 2B 78 */ mr r31, r5 @@ -50,7 +50,7 @@ JStudio_JStage_NS_TAdaptor_camera: /* 8028B940 00288880 98 7D 01 20 */ stb r3, 0x120(r29) /* 8028B944 00288884 7F A3 EB 78 */ mr r3, r29 /* 8028B948 00288888 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028B94C 0028888C 48 0D 68 DD */ bl func_80362228 +/* 8028B94C 0028888C 48 0D 68 DD */ bl _restgpr_29 /* 8028B950 00288890 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028B954 00288894 7C 08 03 A6 */ mtlr r0 /* 8028B958 00288898 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 18e56394089..83811213109 100644 --- a/asm/JStudio_JStage/object-fog.s +++ b/asm/JStudio_JStage/object-fog.s @@ -9,7 +9,7 @@ JStudio_JStage_NS_TAdaptor_fog: /* 8028C578 002894B8 7C 08 02 A6 */ mflr r0 /* 8028C57C 002894BC 90 01 00 24 */ stw r0, 0x24(r1) /* 8028C580 002894C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028C584 002894C4 48 0D 5C 59 */ bl func_803621DC +/* 8028C584 002894C4 48 0D 5C 59 */ bl _savegpr_29 /* 8028C588 002894C8 7C 7D 1B 78 */ mr r29, r3 /* 8028C58C 002894CC 7C 9E 23 78 */ mr r30, r4 /* 8028C590 002894D0 7C BF 2B 78 */ mr r31, r5 @@ -41,7 +41,7 @@ JStudio_JStage_NS_TAdaptor_fog: /* 8028C5F0 00289530 90 1D 00 00 */ stw r0, 0(r29) /* 8028C5F4 00289534 7F A3 EB 78 */ mr r3, r29 /* 8028C5F8 00289538 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028C5FC 0028953C 48 0D 5C 2D */ bl func_80362228 +/* 8028C5FC 0028953C 48 0D 5C 2D */ bl _restgpr_29 /* 8028C600 00289540 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028C604 00289544 7C 08 03 A6 */ mtlr r0 /* 8028C608 00289548 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JStudio_JStage/object-light.s b/asm/JStudio_JStage/object-light.s index fab6b8a66fb..5f08c8408d3 100644 --- a/asm/JStudio_JStage/object-light.s +++ b/asm/JStudio_JStage/object-light.s @@ -9,7 +9,7 @@ JStudio_JStage_NS_TAdaptor_light: /* 8028CB54 00289A94 7C 08 02 A6 */ mflr r0 /* 8028CB58 00289A98 90 01 00 24 */ stw r0, 0x24(r1) /* 8028CB5C 00289A9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028CB60 00289AA0 48 0D 56 7D */ bl func_803621DC +/* 8028CB60 00289AA0 48 0D 56 7D */ bl _savegpr_29 /* 8028CB64 00289AA4 7C 7D 1B 78 */ mr r29, r3 /* 8028CB68 00289AA8 7C 9E 23 78 */ mr r30, r4 /* 8028CB6C 00289AAC 7C BF 2B 78 */ mr r31, r5 @@ -43,7 +43,7 @@ JStudio_JStage_NS_TAdaptor_light: /* 8028CBD4 00289B14 90 1D 01 1C */ stw r0, 0x11c(r29) /* 8028CBD8 00289B18 7F A3 EB 78 */ mr r3, r29 /* 8028CBDC 00289B1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8028CBE0 00289B20 48 0D 56 49 */ bl func_80362228 +/* 8028CBE0 00289B20 48 0D 56 49 */ bl _restgpr_29 /* 8028CBE4 00289B24 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028CBE8 00289B28 7C 08 03 A6 */ mtlr r0 /* 8028CBEC 00289B2C 38 21 00 20 */ addi r1, r1, 0x20 @@ -110,7 +110,7 @@ lbl_8028CCA0: /* 8028CCCC 00289C0C DB A1 00 60 */ stfd f29, 0x60(r1) /* 8028CCD0 00289C10 F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 8028CCD4 00289C14 39 61 00 60 */ addi r11, r1, 0x60 -/* 8028CCD8 00289C18 48 0D 55 05 */ bl func_803621DC +/* 8028CCD8 00289C18 48 0D 55 05 */ bl _savegpr_29 /* 8028CCDC 00289C1C 7C 7E 1B 78 */ mr r30, r3 /* 8028CCE0 00289C20 83 E3 01 18 */ lwz r31, 0x118(r3) /* 8028CCE4 00289C24 7F E3 FB 78 */ mr r3, r31 @@ -282,7 +282,7 @@ lbl_8028CEC4: /* 8028CF48 00289E88 E3 A1 00 68 */ psq_l f29, 104(r1), 0, qr0 /* 8028CF4C 00289E8C CB A1 00 60 */ lfd f29, 0x60(r1) /* 8028CF50 00289E90 39 61 00 60 */ addi r11, r1, 0x60 -/* 8028CF54 00289E94 48 0D 52 D5 */ bl func_80362228 +/* 8028CF54 00289E94 48 0D 52 D5 */ bl _restgpr_29 /* 8028CF58 00289E98 80 01 00 94 */ lwz r0, 0x94(r1) /* 8028CF5C 00289E9C 7C 08 03 A6 */ mtlr r0 /* 8028CF60 00289EA0 38 21 00 90 */ addi r1, r1, 0x90 @@ -318,7 +318,7 @@ lbl_8028CEC4: /* 8028CFD8 00289F18 DB A1 00 60 */ stfd f29, 0x60(r1) /* 8028CFDC 00289F1C F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 8028CFE0 00289F20 39 61 00 60 */ addi r11, r1, 0x60 -/* 8028CFE4 00289F24 48 0D 51 F9 */ bl func_803621DC +/* 8028CFE4 00289F24 48 0D 51 F9 */ bl _savegpr_29 /* 8028CFE8 00289F28 7C 7D 1B 78 */ mr r29, r3 /* 8028CFEC 00289F2C 83 C3 01 18 */ lwz r30, 0x118(r3) /* 8028CFF0 00289F30 80 83 00 04 */ lwz r4, 4(r3) @@ -424,7 +424,7 @@ lbl_8028D118: /* 8028D16C 0028A0AC E3 A1 00 68 */ psq_l f29, 104(r1), 0, qr0 /* 8028D170 0028A0B0 CB A1 00 60 */ lfd f29, 0x60(r1) /* 8028D174 0028A0B4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8028D178 0028A0B8 48 0D 50 B1 */ bl func_80362228 +/* 8028D178 0028A0B8 48 0D 50 B1 */ bl _restgpr_29 /* 8028D17C 0028A0BC 80 01 00 94 */ lwz r0, 0x94(r1) /* 8028D180 0028A0C0 7C 08 03 A6 */ mtlr r0 /* 8028D184 0028A0C4 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/JSupport/JSUFileStream.s b/asm/JSupport/JSUFileStream.s index 9baff2fdd4d..79ff4106d68 100644 --- a/asm/JSupport/JSUFileStream.s +++ b/asm/JSupport/JSUFileStream.s @@ -82,7 +82,7 @@ lbl_802DC734: /* 802DC750 002D9690 7C 08 02 A6 */ mflr r0 /* 802DC754 002D9694 90 01 00 24 */ stw r0, 0x24(r1) /* 802DC758 002D9698 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC75C 002D969C 48 08 5A 81 */ bl func_803621DC +/* 802DC75C 002D969C 48 08 5A 81 */ bl _savegpr_29 /* 802DC760 002D96A0 7C 7D 1B 78 */ mr r29, r3 /* 802DC764 002D96A4 7C 9E 23 78 */ mr r30, r4 /* 802DC768 002D96A8 83 E3 00 0C */ lwz r31, 0xc(r3) @@ -136,7 +136,7 @@ lbl_802DC80C: /* 802DC80C 002D974C 80 1D 00 0C */ lwz r0, 0xc(r29) /* 802DC810 002D9750 7C 7F 00 50 */ subf r3, r31, r0 /* 802DC814 002D9754 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC818 002D9758 48 08 5A 11 */ bl func_80362228 +/* 802DC818 002D9758 48 08 5A 11 */ bl _restgpr_29 /* 802DC81C 002D975C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DC820 002D9760 7C 08 03 A6 */ mtlr r0 /* 802DC824 002D9764 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JSupport/JSUInputStream.s b/asm/JSupport/JSUInputStream.s index 1bbc1dae042..6b9746080eb 100644 --- a/asm/JSupport/JSUInputStream.s +++ b/asm/JSupport/JSUInputStream.s @@ -60,7 +60,7 @@ lbl_802DC2D8: /* 802DC2F4 002D9234 7C 08 02 A6 */ mflr r0 /* 802DC2F8 002D9238 90 01 00 24 */ stw r0, 0x24(r1) /* 802DC2FC 002D923C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC300 002D9240 48 08 5E DD */ bl func_803621DC +/* 802DC300 002D9240 48 08 5E DD */ bl _savegpr_29 /* 802DC304 002D9244 7C 7D 1B 78 */ mr r29, r3 /* 802DC308 002D9248 7C 9E 23 78 */ mr r30, r4 /* 802DC30C 002D924C 3B E0 00 00 */ li r31, 0 @@ -87,7 +87,7 @@ lbl_802DC34C: lbl_802DC354: /* 802DC354 002D9294 7F E3 FB 78 */ mr r3, r31 /* 802DC358 002D9298 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC35C 002D929C 48 08 5E CD */ bl func_80362228 +/* 802DC35C 002D929C 48 08 5E CD */ bl _restgpr_29 /* 802DC360 002D92A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DC364 002D92A4 7C 08 03 A6 */ mtlr r0 /* 802DC368 002D92A8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JSupport/JSUList.s b/asm/JSupport/JSUList.s index 96501f110bf..99198271416 100644 --- a/asm/JSupport/JSUList.s +++ b/asm/JSupport/JSUList.s @@ -117,7 +117,7 @@ JSUPtrList_NS_append: /* 802DBF50 002D8E90 7C 08 02 A6 */ mflr r0 /* 802DBF54 002D8E94 90 01 00 24 */ stw r0, 0x24(r1) /* 802DBF58 002D8E98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBF5C 002D8E9C 48 08 62 81 */ bl func_803621DC +/* 802DBF5C 002D8E9C 48 08 62 81 */ bl _savegpr_29 /* 802DBF60 002D8EA0 7C 7D 1B 78 */ mr r29, r3 /* 802DBF64 002D8EA4 7C 9E 23 78 */ mr r30, r4 /* 802DBF68 002D8EA8 80 64 00 04 */ lwz r3, 4(r4) @@ -152,7 +152,7 @@ lbl_802DBFA8: lbl_802DBFD4: /* 802DBFD4 002D8F14 7F E3 FB 78 */ mr r3, r31 /* 802DBFD8 002D8F18 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DBFDC 002D8F1C 48 08 62 4D */ bl func_80362228 +/* 802DBFDC 002D8F1C 48 08 62 4D */ bl _restgpr_29 /* 802DBFE0 002D8F20 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DBFE4 002D8F24 7C 08 03 A6 */ mtlr r0 /* 802DBFE8 002D8F28 38 21 00 20 */ addi r1, r1, 0x20 @@ -164,7 +164,7 @@ JSUPtrList_NS_prepend: /* 802DBFF4 002D8F34 7C 08 02 A6 */ mflr r0 /* 802DBFF8 002D8F38 90 01 00 24 */ stw r0, 0x24(r1) /* 802DBFFC 002D8F3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC000 002D8F40 48 08 61 DD */ bl func_803621DC +/* 802DC000 002D8F40 48 08 61 DD */ bl _savegpr_29 /* 802DC004 002D8F44 7C 7D 1B 78 */ mr r29, r3 /* 802DC008 002D8F48 7C 9E 23 78 */ mr r30, r4 /* 802DC00C 002D8F4C 80 64 00 04 */ lwz r3, 4(r4) @@ -199,7 +199,7 @@ lbl_802DC04C: lbl_802DC078: /* 802DC078 002D8FB8 7F E3 FB 78 */ mr r3, r31 /* 802DC07C 002D8FBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC080 002D8FC0 48 08 61 A9 */ bl func_80362228 +/* 802DC080 002D8FC0 48 08 61 A9 */ bl _restgpr_29 /* 802DC084 002D8FC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DC088 002D8FC8 7C 08 03 A6 */ mtlr r0 /* 802DC08C 002D8FCC 38 21 00 20 */ addi r1, r1, 0x20 @@ -211,7 +211,7 @@ JSUPtrList_NS_insert: /* 802DC098 002D8FD8 7C 08 02 A6 */ mflr r0 /* 802DC09C 002D8FDC 90 01 00 24 */ stw r0, 0x24(r1) /* 802DC0A0 002D8FE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC0A4 002D8FE4 48 08 61 39 */ bl func_803621DC +/* 802DC0A4 002D8FE4 48 08 61 39 */ bl _savegpr_29 /* 802DC0A8 002D8FE8 7C 7D 1B 78 */ mr r29, r3 /* 802DC0AC 002D8FEC 7C 9E 23 78 */ mr r30, r4 /* 802DC0B0 002D8FF0 7C BF 2B 78 */ mr r31, r5 @@ -258,7 +258,7 @@ lbl_802DC140: /* 802DC140 002D9080 7C 83 23 78 */ mr r3, r4 lbl_802DC144: /* 802DC144 002D9084 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DC148 002D9088 48 08 60 E1 */ bl func_80362228 +/* 802DC148 002D9088 48 08 60 E1 */ bl _restgpr_29 /* 802DC14C 002D908C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DC150 002D9090 7C 08 03 A6 */ mtlr r0 /* 802DC154 002D9094 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTCacheFont.s b/asm/JUtility/JUTCacheFont.s index c14a5af22dc..2e7b757b1c8 100644 --- a/asm/JUtility/JUTCacheFont.s +++ b/asm/JUtility/JUTCacheFont.s @@ -826,7 +826,7 @@ lbl_802DDC40: /* 802DDCE8 002DAC28 7C 08 02 A6 */ mflr r0 /* 802DDCEC 002DAC2C 90 01 00 24 */ stw r0, 0x24(r1) /* 802DDCF0 002DAC30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DDCF4 002DAC34 48 08 44 E9 */ bl func_803621DC +/* 802DDCF4 002DAC34 48 08 44 E9 */ bl _savegpr_29 /* 802DDCF8 002DAC38 7C 7D 1B 78 */ mr r29, r3 /* 802DDCFC 002DAC3C 90 81 00 08 */ stw r4, 8(r1) /* 802DDD00 002DAC40 7C BE 2B 78 */ mr r30, r5 @@ -863,7 +863,7 @@ lbl_802DDC40: /* 802DDD7C 002DACBC 48 00 02 31 */ bl JUTCacheFont_NS_prepend lbl_802DDD80: /* 802DDD80 002DACC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DDD84 002DACC4 48 08 44 A5 */ bl func_80362228 +/* 802DDD84 002DACC4 48 08 44 A5 */ bl _restgpr_29 /* 802DDD88 002DACC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DDD8C 002DACCC 7C 08 03 A6 */ mtlr r0 /* 802DDD90 002DACD0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTConsole.s b/asm/JUtility/JUTConsole.s index a47af08c30d..5e9eea8ea0b 100644 --- a/asm/JUtility/JUTConsole.s +++ b/asm/JUtility/JUTConsole.s @@ -625,7 +625,7 @@ JUTConsole_NS_print: /* 802E7C3C 002E4B7C 7C 08 02 A6 */ mflr r0 /* 802E7C40 002E4B80 90 01 00 24 */ stw r0, 0x24(r1) /* 802E7C44 002E4B84 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E7C48 002E4B88 48 07 A5 95 */ bl func_803621DC +/* 802E7C48 002E4B88 48 07 A5 95 */ bl _savegpr_29 /* 802E7C4C 002E4B8C 7C 7D 1B 78 */ mr r29, r3 /* 802E7C50 002E4B90 80 03 00 58 */ lwz r0, 0x58(r3) /* 802E7C54 002E4B94 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -823,7 +823,7 @@ lbl_802E7F10: /* 802E7F14 002E4E54 98 1E 00 00 */ stb r0, 0(r30) lbl_802E7F18: /* 802E7F18 002E4E58 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E7F1C 002E4E5C 48 07 A3 0D */ bl func_80362228 +/* 802E7F1C 002E4E5C 48 07 A3 0D */ bl _restgpr_29 /* 802E7F20 002E4E60 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E7F24 002E4E64 7C 08 03 A6 */ mtlr r0 /* 802E7F28 002E4E68 38 21 00 20 */ addi r1, r1, 0x20 @@ -857,7 +857,7 @@ JUTConsole_NS_dumpToTerminal: /* 802E7F80 002E4EC0 7C 08 02 A6 */ mflr r0 /* 802E7F84 002E4EC4 90 01 00 24 */ stw r0, 0x24(r1) /* 802E7F88 002E4EC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E7F8C 002E4ECC 48 07 A2 51 */ bl func_803621DC +/* 802E7F8C 002E4ECC 48 07 A2 51 */ bl _savegpr_29 /* 802E7F90 002E4ED0 7C 7D 1B 78 */ mr r29, r3 /* 802E7F94 002E4ED4 28 04 00 00 */ cmplwi r4, 0 /* 802E7F98 002E4ED8 41 82 00 F8 */ beq lbl_802E8090 @@ -930,7 +930,7 @@ lbl_802E8060: /* 802E808C 002E4FCC 40 82 FF 74 */ bne lbl_802E8000 lbl_802E8090: /* 802E8090 002E4FD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E8094 002E4FD4 48 07 A1 95 */ bl func_80362228 +/* 802E8094 002E4FD4 48 07 A1 95 */ bl _restgpr_29 /* 802E8098 002E4FD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E809C 002E4FDC 7C 08 03 A6 */ mtlr r0 /* 802E80A0 002E4FE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1167,7 +1167,7 @@ JUTConsoleManager_NS_draw: /* 802E8388 002E52C8 7C 08 02 A6 */ mflr r0 /* 802E838C 002E52CC 90 01 00 64 */ stw r0, 0x64(r1) /* 802E8390 002E52D0 39 61 00 60 */ addi r11, r1, 0x60 -/* 802E8394 002E52D4 48 07 9E 49 */ bl func_803621DC +/* 802E8394 002E52D4 48 07 9E 49 */ bl _savegpr_29 /* 802E8398 002E52D8 7C 7D 1B 78 */ mr r29, r3 /* 802E839C 002E52DC 3B DD 00 04 */ addi r30, r29, 4 /* 802E83A0 002E52E0 80 03 00 04 */ lwz r0, 4(r3) @@ -1213,7 +1213,7 @@ lbl_802E8408: /* 802E8434 002E5374 4B FF F2 15 */ bl JUTConsole_NS_doDraw lbl_802E8438: /* 802E8438 002E5378 39 61 00 60 */ addi r11, r1, 0x60 -/* 802E843C 002E537C 48 07 9D ED */ bl func_80362228 +/* 802E843C 002E537C 48 07 9D ED */ bl _restgpr_29 /* 802E8440 002E5380 80 01 00 64 */ lwz r0, 0x64(r1) /* 802E8444 002E5384 7C 08 03 A6 */ mtlr r0 /* 802E8448 002E5388 38 21 00 60 */ addi r1, r1, 0x60 @@ -1225,7 +1225,7 @@ JUTConsoleManager_NS_drawDirect: /* 802E8454 002E5394 7C 08 02 A6 */ mflr r0 /* 802E8458 002E5398 90 01 00 24 */ stw r0, 0x24(r1) /* 802E845C 002E539C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E8460 002E53A0 48 07 9D 7D */ bl func_803621DC +/* 802E8460 002E53A0 48 07 9D 7D */ bl _savegpr_29 /* 802E8464 002E53A4 7C 7D 1B 78 */ mr r29, r3 /* 802E8468 002E53A8 80 03 00 10 */ lwz r0, 0x10(r3) /* 802E846C 002E53AC 28 00 00 00 */ cmplwi r0, 0 @@ -1248,7 +1248,7 @@ lbl_802E84A0: /* 802E84A8 002E53E8 4B FF F1 A1 */ bl JUTConsole_NS_doDraw lbl_802E84AC: /* 802E84AC 002E53EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E84B0 002E53F0 48 07 9D 79 */ bl func_80362228 +/* 802E84B0 002E53F0 48 07 9D 79 */ bl _restgpr_29 /* 802E84B4 002E53F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E84B8 002E53F8 7C 08 03 A6 */ mtlr r0 /* 802E84BC 002E53FC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTDbPrint.s b/asm/JUtility/JUTDbPrint.s index 77922780abd..fb734982493 100644 --- a/asm/JUtility/JUTDbPrint.s +++ b/asm/JUtility/JUTDbPrint.s @@ -350,7 +350,7 @@ JUTReport_X1_: /* 802E0604 002DD544 7C 08 02 A6 */ mflr r0 /* 802E0608 002DD548 90 01 01 94 */ stw r0, 0x194(r1) /* 802E060C 002DD54C 39 61 01 90 */ addi r11, r1, 0x190 -/* 802E0610 002DD550 48 08 1B CD */ bl func_803621DC +/* 802E0610 002DD550 48 08 1B CD */ bl _savegpr_29 /* 802E0614 002DD554 7C 7D 1B 78 */ mr r29, r3 /* 802E0618 002DD558 7C 9E 23 78 */ mr r30, r4 /* 802E061C 002DD55C 7C BF 2B 78 */ mr r31, r5 @@ -399,7 +399,7 @@ lbl_802E06C0: /* 802E06C0 002DD600 4B FF FB 5D */ bl JUTDbPrint_NS_enter lbl_802E06C4: /* 802E06C4 002DD604 39 61 01 90 */ addi r11, r1, 0x190 -/* 802E06C8 002DD608 48 08 1B 61 */ bl func_80362228 +/* 802E06C8 002DD608 48 08 1B 61 */ bl _restgpr_29 /* 802E06CC 002DD60C 80 01 01 94 */ lwz r0, 0x194(r1) /* 802E06D0 002DD610 7C 08 03 A6 */ mtlr r0 /* 802E06D4 002DD614 38 21 01 90 */ addi r1, r1, 0x190 diff --git a/asm/JUtility/JUTDirectFile.s b/asm/JUtility/JUTDirectFile.s index 92237c2fc5c..a8e414bfca7 100644 --- a/asm/JUtility/JUTDirectFile.s +++ b/asm/JUtility/JUTDirectFile.s @@ -9,7 +9,7 @@ JUTDirectFile_NS_fetch32byte: /* 802E8734 002E5674 7C 08 02 A6 */ mflr r0 /* 802E8738 002E5678 90 01 00 24 */ stw r0, 0x24(r1) /* 802E873C 002E567C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E8740 002E5680 48 07 9A 9D */ bl func_803621DC +/* 802E8740 002E5680 48 07 9A 9D */ bl _savegpr_29 /* 802E8744 002E5684 7C 7D 1B 78 */ mr r29, r3 /* 802E8748 002E5688 80 03 08 2C */ lwz r0, 0x82c(r3) /* 802E874C 002E568C 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a @@ -54,7 +54,7 @@ lbl_802E87C4: /* 802E87DC 002E571C 80 7D 08 24 */ lwz r3, 0x824(r29) lbl_802E87E0: /* 802E87E0 002E5720 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E87E4 002E5724 48 07 9A 45 */ bl func_80362228 +/* 802E87E4 002E5724 48 07 9A 45 */ bl _restgpr_29 /* 802E87E8 002E5728 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E87EC 002E572C 7C 08 03 A6 */ mtlr r0 /* 802E87F0 002E5730 38 21 00 20 */ addi r1, r1, 0x20 @@ -99,7 +99,7 @@ JUTDirectFile_NS_fopen: /* 802E8864 002E57A4 7C 08 02 A6 */ mflr r0 /* 802E8868 002E57A8 90 01 00 24 */ stw r0, 0x24(r1) /* 802E886C 002E57AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E8870 002E57B0 48 07 99 6D */ bl func_803621DC +/* 802E8870 002E57B0 48 07 99 6D */ bl _savegpr_29 /* 802E8874 002E57B4 7C 7D 1B 78 */ mr r29, r3 /* 802E8878 002E57B8 7C 9F 23 79 */ or. r31, r4, r4 /* 802E887C 002E57BC 40 82 00 0C */ bne lbl_802E8888 @@ -132,7 +132,7 @@ lbl_802E88C0: /* 802E88E0 002E5820 38 60 00 01 */ li r3, 1 lbl_802E88E4: /* 802E88E4 002E5824 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E88E8 002E5828 48 07 99 41 */ bl func_80362228 +/* 802E88E8 002E5828 48 07 99 41 */ bl _restgpr_29 /* 802E88EC 002E582C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E88F0 002E5830 7C 08 03 A6 */ mtlr r0 /* 802E88F4 002E5834 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTGamePad.s b/asm/JUtility/JUTGamePad.s index ca1a22b356a..ca9715caf85 100644 --- a/asm/JUtility/JUTGamePad.s +++ b/asm/JUtility/JUTGamePad.s @@ -823,7 +823,7 @@ JUTGamePad_NS_CStick_NS_update: /* 802E123C 002DE17C 7C 08 02 A6 */ mflr r0 /* 802E1240 002DE180 90 01 00 44 */ stw r0, 0x44(r1) /* 802E1244 002DE184 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E1248 002DE188 48 08 0F 95 */ bl func_803621DC +/* 802E1248 002DE188 48 08 0F 95 */ bl _savegpr_29 /* 802E124C 002DE18C 7C 7D 1B 78 */ mr r29, r3 /* 802E1250 002DE190 7C FE 3B 78 */ mr r30, r7 /* 802E1254 002DE194 7D 1F 43 78 */ mr r31, r8 @@ -1014,7 +1014,7 @@ lbl_802E14E0: /* 802E14E0 002DE420 7F E4 04 30 */ srw r4, r31, r0 /* 802E14E4 002DE424 48 00 00 1D */ bl JUTGamePad_NS_CStick_NS_getButton /* 802E14E8 002DE428 39 61 00 40 */ addi r11, r1, 0x40 -/* 802E14EC 002DE42C 48 08 0D 3D */ bl func_80362228 +/* 802E14EC 002DE42C 48 08 0D 3D */ bl _restgpr_29 /* 802E14F0 002DE430 80 01 00 44 */ lwz r0, 0x44(r1) /* 802E14F4 002DE434 7C 08 03 A6 */ mtlr r0 /* 802E14F8 002DE438 38 21 00 40 */ addi r1, r1, 0x40 @@ -1189,7 +1189,7 @@ JUTGamePad_NS_CRumble_NS_update: /* 802E1724 002DE664 7C 08 02 A6 */ mflr r0 /* 802E1728 002DE668 90 01 00 24 */ stw r0, 0x24(r1) /* 802E172C 002DE66C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E1730 002DE670 48 08 0A AD */ bl func_803621DC +/* 802E1730 002DE670 48 08 0A AD */ bl _savegpr_29 /* 802E1734 002DE674 7C 7E 1B 78 */ mr r30, r3 /* 802E1738 002DE678 7C 9D 23 78 */ mr r29, r4 /* 802E173C 002DE67C 80 8D 8F 68 */ lwz r4, lbl_804514E8-_SDA_BASE_(r13) @@ -1285,7 +1285,7 @@ lbl_802E1880: /* 802E1888 002DE7C8 90 1E 00 00 */ stw r0, 0(r30) lbl_802E188C: /* 802E188C 002DE7CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E1890 002DE7D0 48 08 09 99 */ bl func_80362228 +/* 802E1890 002DE7D0 48 08 09 99 */ bl _restgpr_29 /* 802E1894 002DE7D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E1898 002DE7D8 7C 08 03 A6 */ mtlr r0 /* 802E189C 002DE7DC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTPalette.s b/asm/JUtility/JUTPalette.s index d5dd1f4fe1a..31ca58348d5 100644 --- a/asm/JUtility/JUTPalette.s +++ b/asm/JUtility/JUTPalette.s @@ -9,7 +9,7 @@ JUTPalette_NS_storeTLUT: /* 802DE894 002DB7D4 7C 08 02 A6 */ mflr r0 /* 802DE898 002DB7D8 90 01 00 24 */ stw r0, 0x24(r1) /* 802DE89C 002DB7DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE8A0 002DB7E0 48 08 39 3D */ bl func_803621DC +/* 802DE8A0 002DB7E0 48 08 39 3D */ bl _savegpr_29 /* 802DE8A4 002DB7E4 7C 7D 1B 78 */ mr r29, r3 /* 802DE8A8 002DB7E8 7C 9E 23 78 */ mr r30, r4 /* 802DE8AC 002DB7EC 7C BF 2B 79 */ or. r31, r5, r5 @@ -36,7 +36,7 @@ lbl_802DE8CC: /* 802DE8FC 002DB83C A0 DD 00 14 */ lhz r6, 0x14(r29) /* 802DE900 002DB840 48 07 FB 69 */ bl GXInitTlutObj /* 802DE904 002DB844 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE908 002DB848 48 08 39 21 */ bl func_80362228 +/* 802DE908 002DB848 48 08 39 21 */ bl _restgpr_29 /* 802DE90C 002DB84C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DE910 002DB850 7C 08 03 A6 */ mtlr r0 /* 802DE914 002DB854 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTResFont.s b/asm/JUtility/JUTResFont.s index d078f3731b6..bffb4fa1605 100644 --- a/asm/JUtility/JUTResFont.s +++ b/asm/JUtility/JUTResFont.s @@ -31,7 +31,7 @@ JUTResFont_X1_: /* 802DEF98 002DBED8 7C 08 02 A6 */ mflr r0 /* 802DEF9C 002DBEDC 90 01 00 24 */ stw r0, 0x24(r1) /* 802DEFA0 002DBEE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEFA4 002DBEE4 48 08 32 39 */ bl func_803621DC +/* 802DEFA4 002DBEE4 48 08 32 39 */ bl _savegpr_29 /* 802DEFA8 002DBEE8 7C 7D 1B 78 */ mr r29, r3 /* 802DEFAC 002DBEEC 7C 9E 23 78 */ mr r30, r4 /* 802DEFB0 002DBEF0 7C BF 2B 78 */ mr r31, r5 @@ -49,7 +49,7 @@ JUTResFont_X1_: /* 802DEFE0 002DBF20 48 00 00 FD */ bl JUTResFont_NS_initiate /* 802DEFE4 002DBF24 7F A3 EB 78 */ mr r3, r29 /* 802DEFE8 002DBF28 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DEFEC 002DBF2C 48 08 32 3D */ bl func_80362228 +/* 802DEFEC 002DBF2C 48 08 32 3D */ bl _restgpr_29 /* 802DEFF0 002DBF30 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DEFF4 002DBF34 7C 08 03 A6 */ mtlr r0 /* 802DEFF8 002DBF38 38 21 00 20 */ addi r1, r1, 0x20 @@ -157,7 +157,7 @@ JUTResFont_NS_protected_initiate: /* 802DF140 002DC080 7C 08 02 A6 */ mflr r0 /* 802DF144 002DC084 90 01 00 24 */ stw r0, 0x24(r1) /* 802DF148 002DC088 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DF14C 002DC08C 48 08 30 91 */ bl func_803621DC +/* 802DF14C 002DC08C 48 08 30 91 */ bl _savegpr_29 /* 802DF150 002DC090 7C 7D 1B 78 */ mr r29, r3 /* 802DF154 002DC094 7C 9E 23 78 */ mr r30, r4 /* 802DF158 002DC098 7C BF 2B 78 */ mr r31, r5 @@ -221,7 +221,7 @@ lbl_802DF218: /* 802DF22C 002DC16C 38 60 00 01 */ li r3, 1 lbl_802DF230: /* 802DF230 002DC170 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DF234 002DC174 48 08 2F F5 */ bl func_80362228 +/* 802DF234 002DC174 48 08 2F F5 */ bl _restgpr_29 /* 802DF238 002DC178 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DF23C 002DC17C 7C 08 03 A6 */ mtlr r0 /* 802DF240 002DC180 38 21 00 20 */ addi r1, r1, 0x20 @@ -877,7 +877,7 @@ JUTResFont_NS_loadFont: /* 802DFBEC 002DCB2C 7C 08 02 A6 */ mflr r0 /* 802DFBF0 002DCB30 90 01 00 24 */ stw r0, 0x24(r1) /* 802DFBF4 002DCB34 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFBF8 002DCB38 48 08 25 E5 */ bl func_803621DC +/* 802DFBF8 002DCB38 48 08 25 E5 */ bl _savegpr_29 /* 802DFBFC 002DCB3C 7C 7D 1B 78 */ mr r29, r3 /* 802DFC00 002DCB40 7C 9E 23 78 */ mr r30, r4 /* 802DFC04 002DCB44 7C BF 2B 78 */ mr r31, r5 @@ -900,7 +900,7 @@ lbl_802DFC24: /* 802DFC44 002DCB84 7D 89 03 A6 */ mtctr r12 /* 802DFC48 002DCB88 4E 80 04 21 */ bctrl /* 802DFC4C 002DCB8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFC50 002DCB90 48 08 25 D9 */ bl func_80362228 +/* 802DFC50 002DCB90 48 08 25 D9 */ bl _restgpr_29 /* 802DFC54 002DCB94 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DFC58 002DCB98 7C 08 03 A6 */ mtlr r0 /* 802DFC5C 002DCB9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1012,7 +1012,7 @@ JUTResFont_NS_getFontCode: /* 802DFDDC 002DCD1C 7C 08 02 A6 */ mflr r0 /* 802DFDE0 002DCD20 90 01 00 24 */ stw r0, 0x24(r1) /* 802DFDE4 002DCD24 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFDE8 002DCD28 48 08 23 F5 */ bl func_803621DC +/* 802DFDE8 002DCD28 48 08 23 F5 */ bl _savegpr_29 /* 802DFDEC 002DCD2C 7C 7D 1B 78 */ mr r29, r3 /* 802DFDF0 002DCD30 7C 9E 23 78 */ mr r30, r4 /* 802DFDF4 002DCD34 80 83 00 4C */ lwz r4, 0x4c(r3) @@ -1113,7 +1113,7 @@ lbl_802DFF3C: lbl_802DFF44: /* 802DFF44 002DCE84 7F E3 FB 78 */ mr r3, r31 /* 802DFF48 002DCE88 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DFF4C 002DCE8C 48 08 22 DD */ bl func_80362228 +/* 802DFF4C 002DCE8C 48 08 22 DD */ bl _restgpr_29 /* 802DFF50 002DCE90 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DFF54 002DCE94 7C 08 03 A6 */ mtlr r0 /* 802DFF58 002DCE98 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTResource.s b/asm/JUtility/JUTResource.s index 8dacd91842f..9104b85a1c9 100644 --- a/asm/JUtility/JUTResource.s +++ b/asm/JUtility/JUTResource.s @@ -56,7 +56,7 @@ JUTResReference_NS_getResource_X1_: /* 802DE124 002DB064 7C 08 02 A6 */ mflr r0 /* 802DE128 002DB068 90 01 00 24 */ stw r0, 0x24(r1) /* 802DE12C 002DB06C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE130 002DB070 48 08 40 AD */ bl func_803621DC +/* 802DE130 002DB070 48 08 40 AD */ bl _savegpr_29 /* 802DE134 002DB074 7C 7D 1B 78 */ mr r29, r3 /* 802DE138 002DB078 7C BE 2B 78 */ mr r30, r5 /* 802DE13C 002DB07C 7C DF 33 78 */ mr r31, r6 @@ -89,7 +89,7 @@ lbl_802DE194: /* 802DE19C 002DB0DC 7F E5 FB 78 */ mr r5, r31 /* 802DE1A0 002DB0E0 48 00 00 1D */ bl JUTResReference_NS_getResource_X2_ /* 802DE1A4 002DB0E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE1A8 002DB0E8 48 08 40 81 */ bl func_80362228 +/* 802DE1A8 002DB0E8 48 08 40 81 */ bl _restgpr_29 /* 802DE1AC 002DB0EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DE1B0 002DB0F0 7C 08 03 A6 */ mtlr r0 /* 802DE1B4 002DB0F4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTTexture.s b/asm/JUtility/JUTTexture.s index 587899a31e5..fadb6b8bade 100644 --- a/asm/JUtility/JUTTexture.s +++ b/asm/JUtility/JUTTexture.s @@ -44,7 +44,7 @@ JUTTexture_NS_storeTIMG: /* 802DE2AC 002DB1EC 7C 08 02 A6 */ mflr r0 /* 802DE2B0 002DB1F0 90 01 00 24 */ stw r0, 0x24(r1) /* 802DE2B4 002DB1F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE2B8 002DB1F8 48 08 3F 25 */ bl func_803621DC +/* 802DE2B8 002DB1F8 48 08 3F 25 */ bl _savegpr_29 /* 802DE2BC 002DB1FC 7C 7F 1B 78 */ mr r31, r3 /* 802DE2C0 002DB200 28 04 00 00 */ cmplwi r4, 0 /* 802DE2C4 002DB204 41 82 01 70 */ beq lbl_802DE434 @@ -149,7 +149,7 @@ lbl_802DE428: /* 802DE430 002DB370 48 00 01 81 */ bl JUTTexture_NS_attachPalette lbl_802DE434: /* 802DE434 002DB374 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE438 002DB378 48 08 3D F1 */ bl func_80362228 +/* 802DE438 002DB378 48 08 3D F1 */ bl _restgpr_29 /* 802DE43C 002DB37C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DE440 002DB380 7C 08 03 A6 */ mtlr r0 /* 802DE444 002DB384 38 21 00 20 */ addi r1, r1, 0x20 @@ -179,7 +179,7 @@ JUTTexture_NS_storeTIMG_X2_: /* 802DE484 002DB3C4 7C 08 02 A6 */ mflr r0 /* 802DE488 002DB3C8 90 01 00 24 */ stw r0, 0x24(r1) /* 802DE48C 002DB3CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE490 002DB3D0 48 08 3D 4D */ bl func_803621DC +/* 802DE490 002DB3D0 48 08 3D 4D */ bl _savegpr_29 /* 802DE494 002DB3D4 7C 7D 1B 78 */ mr r29, r3 /* 802DE498 002DB3D8 7C BE 2B 78 */ mr r30, r5 /* 802DE49C 002DB3DC 7C DF 33 78 */ mr r31, r6 @@ -250,7 +250,7 @@ lbl_802DE534: /* 802DE594 002DB4D4 48 00 00 75 */ bl JUTTexture_NS_init lbl_802DE598: /* 802DE598 002DB4D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802DE59C 002DB4DC 48 08 3C 8D */ bl func_80362228 +/* 802DE59C 002DB4DC 48 08 3C 8D */ bl _restgpr_29 /* 802DE5A0 002DB4E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DE5A4 002DB4E4 7C 08 03 A6 */ mtlr r0 /* 802DE5A8 002DB4E8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JUtility/JUTXfb.s b/asm/JUtility/JUTXfb.s index d947a067f91..aabd35bb157 100644 --- a/asm/JUtility/JUTXfb.s +++ b/asm/JUtility/JUTXfb.s @@ -81,7 +81,7 @@ JUTXfb_NS_dtor: /* 802E530C 002E224C 7C 08 02 A6 */ mflr r0 /* 802E5310 002E2250 90 01 00 24 */ stw r0, 0x24(r1) /* 802E5314 002E2254 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5318 002E2258 48 07 CE C5 */ bl func_803621DC +/* 802E5318 002E2258 48 07 CE C5 */ bl _savegpr_29 /* 802E531C 002E225C 7C 7D 1B 79 */ or. r29, r3, r3 /* 802E5320 002E2260 7C 9E 23 78 */ mr r30, r4 /* 802E5324 002E2264 41 82 00 38 */ beq lbl_802E535C @@ -102,7 +102,7 @@ lbl_802E532C: lbl_802E535C: /* 802E535C 002E229C 7F A3 EB 78 */ mr r3, r29 /* 802E5360 002E22A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5364 002E22A4 48 07 CE C5 */ bl func_80362228 +/* 802E5364 002E22A4 48 07 CE C5 */ bl _restgpr_29 /* 802E5368 002E22A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E536C 002E22AC 7C 08 03 A6 */ mtlr r0 /* 802E5370 002E22B0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s b/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s index fa3183df650..8a6e2ce5003 100644 --- a/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s +++ b/asm/SComponent/c/bg/s/lin/c_bg_s_lin_chk.s @@ -113,7 +113,7 @@ cBgS_LinChk_NS_Set2: /* 80267ED4 00264E14 7C 08 02 A6 */ mflr r0 /* 80267ED8 00264E18 90 01 00 24 */ stw r0, 0x24(r1) /* 80267EDC 00264E1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80267EE0 00264E20 48 0F A2 FD */ bl func_803621DC +/* 80267EE0 00264E20 48 0F A2 FD */ bl _savegpr_29 /* 80267EE4 00264E24 7C 7D 1B 78 */ mr r29, r3 /* 80267EE8 00264E28 7C BE 2B 78 */ mr r30, r5 /* 80267EEC 00264E2C 7C DF 33 78 */ mr r31, r6 @@ -132,7 +132,7 @@ cBgS_LinChk_NS_Set2: /* 80267F20 00264E60 38 7D 00 14 */ addi r3, r29, 0x14 /* 80267F24 00264E64 48 00 01 FD */ bl cBgS_PolyInfo_NS_ClearPi /* 80267F28 00264E68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80267F2C 00264E6C 48 0F A2 FD */ bl func_80362228 +/* 80267F2C 00264E6C 48 0F A2 FD */ bl _restgpr_29 /* 80267F30 00264E70 80 01 00 24 */ lwz r0, 0x24(r1) /* 80267F34 00264E74 7C 08 03 A6 */ mtlr r0 /* 80267F38 00264E78 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/SComponent/c/c_list.s b/asm/SComponent/c/c_list.s index db4f9557040..549471be668 100644 --- a/asm/SComponent/c/c_list.s +++ b/asm/SComponent/c/c_list.s @@ -89,7 +89,7 @@ cLs_Insert: /* 80265F74 00262EB4 7C 08 02 A6 */ mflr r0 /* 80265F78 00262EB8 90 01 00 24 */ stw r0, 0x24(r1) /* 80265F7C 00262EBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80265F80 00262EC0 48 0F C2 5D */ bl func_803621DC +/* 80265F80 00262EC0 48 0F C2 5D */ bl _savegpr_29 /* 80265F84 00262EC4 7C 7D 1B 78 */ mr r29, r3 /* 80265F88 00262EC8 7C BE 2B 78 */ mr r30, r5 /* 80265F8C 00262ECC 80 63 00 00 */ lwz r3, 0(r3) @@ -116,7 +116,7 @@ lbl_80265FAC: /* 80265FDC 00262F1C 80 7D 00 08 */ lwz r3, 8(r29) lbl_80265FE0: /* 80265FE0 00262F20 39 61 00 20 */ addi r11, r1, 0x20 -/* 80265FE4 00262F24 48 0F C2 45 */ bl func_80362228 +/* 80265FE4 00262F24 48 0F C2 45 */ bl _restgpr_29 /* 80265FE8 00262F28 80 01 00 24 */ lwz r0, 0x24(r1) /* 80265FEC 00262F2C 7C 08 03 A6 */ mtlr r0 /* 80265FF0 00262F30 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 c4ab905adcb..f22f9bb4ae3 100644 --- a/asm/SComponent/c/c_m3d.s +++ b/asm/SComponent/c/c_m3d.s @@ -250,7 +250,7 @@ cM3d_VectorProduct2d: /* 802688B8 002657F8 7C 08 02 A6 */ mflr r0 /* 802688BC 002657FC 90 01 00 34 */ stw r0, 0x34(r1) /* 802688C0 00265800 39 61 00 30 */ addi r11, r1, 0x30 -/* 802688C4 00265804 48 0F 99 19 */ bl func_803621DC +/* 802688C4 00265804 48 0F 99 19 */ bl _savegpr_29 /* 802688C8 00265808 7C 7D 1B 78 */ mr r29, r3 /* 802688CC 0026580C 7C BE 2B 78 */ mr r30, r5 /* 802688D0 00265810 7C DF 33 78 */ mr r31, r6 @@ -267,7 +267,7 @@ cM3d_VectorProduct2d: /* 802688FC 0026583C 7F E5 FB 78 */ mr r5, r31 /* 80268900 00265840 48 0D E8 B5 */ bl PSVECCrossProduct /* 80268904 00265844 39 61 00 30 */ addi r11, r1, 0x30 -/* 80268908 00265848 48 0F 99 21 */ bl func_80362228 +/* 80268908 00265848 48 0F 99 21 */ bl _restgpr_29 /* 8026890C 0026584C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80268910 00265850 7C 08 03 A6 */ mtlr r0 /* 80268914 00265854 38 21 00 30 */ addi r1, r1, 0x30 @@ -2535,7 +2535,7 @@ cM3d_CrossY_Tri_X2_: /* 8026A8C4 00267804 7C 08 02 A6 */ mflr r0 /* 8026A8C8 00267808 90 01 00 24 */ stw r0, 0x24(r1) /* 8026A8CC 0026780C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026A8D0 00267810 48 0F 79 0D */ bl func_803621DC +/* 8026A8D0 00267810 48 0F 79 0D */ bl _savegpr_29 /* 8026A8D4 00267814 7C 7D 1B 78 */ mr r29, r3 /* 8026A8D8 00267818 7C 9E 23 78 */ mr r30, r4 /* 8026A8DC 0026781C 7C BF 2B 78 */ mr r31, r5 @@ -2561,7 +2561,7 @@ lbl_8026A928: /* 8026A928 00267868 38 60 00 00 */ li r3, 0 lbl_8026A92C: /* 8026A92C 0026786C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026A930 00267870 48 0F 78 F9 */ bl func_80362228 +/* 8026A930 00267870 48 0F 78 F9 */ bl _restgpr_29 /* 8026A934 00267874 80 01 00 24 */ lwz r0, 0x24(r1) /* 8026A938 00267878 7C 08 03 A6 */ mtlr r0 /* 8026A93C 0026787C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3225,7 +3225,7 @@ cM3d_Cross_LinSph: /* 8026B28C 002681CC DB E1 00 40 */ stfd f31, 0x40(r1) /* 8026B290 002681D0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8026B294 002681D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026B298 002681D8 48 0F 6F 45 */ bl func_803621DC +/* 8026B298 002681D8 48 0F 6F 45 */ bl _savegpr_29 /* 8026B29C 002681DC 7C 7D 1B 78 */ mr r29, r3 /* 8026B2A0 002681E0 7C 9F 23 78 */ mr r31, r4 /* 8026B2A4 002681E4 7C BE 2B 78 */ mr r30, r5 @@ -3380,7 +3380,7 @@ lbl_8026B4C8: /* 8026B4C8 00268408 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8026B4CC 0026840C CB E1 00 40 */ lfd f31, 0x40(r1) /* 8026B4D0 00268410 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026B4D4 00268414 48 0F 6D 55 */ bl func_80362228 +/* 8026B4D4 00268414 48 0F 6D 55 */ bl _restgpr_29 /* 8026B4D8 00268418 80 01 00 54 */ lwz r0, 0x54(r1) /* 8026B4DC 0026841C 7C 08 03 A6 */ mtlr r0 /* 8026B4E0 00268420 38 21 00 50 */ addi r1, r1, 0x50 @@ -3662,7 +3662,7 @@ cM3d_Cross_CylSph: /* 8026B8B0 002687F0 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8026B8B4 002687F4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8026B8B8 002687F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026B8BC 002687FC 48 0F 69 21 */ bl func_803621DC +/* 8026B8BC 002687FC 48 0F 69 21 */ bl _savegpr_29 /* 8026B8C0 00268800 7C 7D 1B 78 */ mr r29, r3 /* 8026B8C4 00268804 7C 9E 23 78 */ mr r30, r4 /* 8026B8C8 00268808 7C BF 2B 78 */ mr r31, r5 @@ -3768,7 +3768,7 @@ lbl_8026BA28: /* 8026BA28 00268968 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8026BA2C 0026896C CB E1 00 20 */ lfd f31, 0x20(r1) /* 8026BA30 00268970 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026BA34 00268974 48 0F 67 F5 */ bl func_80362228 +/* 8026BA34 00268974 48 0F 67 F5 */ bl _restgpr_29 /* 8026BA38 00268978 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026BA3C 0026897C 7C 08 03 A6 */ mtlr r0 /* 8026BA40 00268980 38 21 00 30 */ addi r1, r1, 0x30 @@ -3939,7 +3939,7 @@ cM3d_Cross_SphSph: /* 8026BC80 00268BC0 7C 08 02 A6 */ mflr r0 /* 8026BC84 00268BC4 90 01 00 34 */ stw r0, 0x34(r1) /* 8026BC88 00268BC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BC8C 00268BCC 48 0F 65 51 */ bl func_803621DC +/* 8026BC8C 00268BCC 48 0F 65 51 */ bl _savegpr_29 /* 8026BC90 00268BD0 7C 7D 1B 78 */ mr r29, r3 /* 8026BC94 00268BD4 7C 9E 23 78 */ mr r30, r4 /* 8026BC98 00268BD8 7C BF 2B 78 */ mr r31, r5 @@ -3964,7 +3964,7 @@ lbl_8026BCD8: /* 8026BCE0 00268C20 38 60 00 00 */ li r3, 0 lbl_8026BCE4: /* 8026BCE4 00268C24 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BCE8 00268C28 48 0F 65 41 */ bl func_80362228 +/* 8026BCE8 00268C28 48 0F 65 41 */ bl _restgpr_29 /* 8026BCEC 00268C2C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026BCF0 00268C30 7C 08 03 A6 */ mtlr r0 /* 8026BCF4 00268C34 38 21 00 30 */ addi r1, r1, 0x30 @@ -4018,7 +4018,7 @@ cM3d_Cross_SphSph_X2_: /* 8026BD94 00268CD4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8026BD98 00268CD8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8026BD9C 00268CDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BDA0 00268CE0 48 0F 64 3D */ bl func_803621DC +/* 8026BDA0 00268CE0 48 0F 64 3D */ bl _savegpr_29 /* 8026BDA4 00268CE4 7C 7D 1B 78 */ mr r29, r3 /* 8026BDA8 00268CE8 7C 9E 23 78 */ mr r30, r4 /* 8026BDAC 00268CEC 7C BF 2B 78 */ mr r31, r5 @@ -4064,7 +4064,7 @@ lbl_8026BE3C: /* 8026BE3C 00268D7C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8026BE40 00268D80 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8026BE44 00268D84 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BE48 00268D88 48 0F 63 E1 */ bl func_80362228 +/* 8026BE48 00268D88 48 0F 63 E1 */ bl _restgpr_29 /* 8026BE4C 00268D8C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026BE50 00268D90 7C 08 03 A6 */ mtlr r0 /* 8026BE54 00268D94 38 21 00 40 */ addi r1, r1, 0x40 @@ -4123,7 +4123,7 @@ cM3d_Cross_SphTri: /* 8026BF08 00268E48 7C 08 02 A6 */ mflr r0 /* 8026BF0C 00268E4C 90 01 00 F4 */ stw r0, 0xf4(r1) /* 8026BF10 00268E50 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8026BF14 00268E54 48 0F 62 C9 */ bl func_803621DC +/* 8026BF14 00268E54 48 0F 62 C9 */ bl _savegpr_29 /* 8026BF18 00268E58 7C 7D 1B 78 */ mr r29, r3 /* 8026BF1C 00268E5C 7C 9E 23 78 */ mr r30, r4 /* 8026BF20 00268E60 7C BF 2B 78 */ mr r31, r5 @@ -4331,7 +4331,7 @@ lbl_8026C1FC: /* 8026C210 00269150 38 60 00 00 */ li r3, 0 lbl_8026C214: /* 8026C214 00269154 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8026C218 00269158 48 0F 60 11 */ bl func_80362228 +/* 8026C218 00269158 48 0F 60 11 */ bl _restgpr_29 /* 8026C21C 0026915C 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8026C220 00269160 7C 08 03 A6 */ mtlr r0 /* 8026C224 00269164 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -4618,7 +4618,7 @@ cM3d_Cross_CylTri: /* 8026C5E4 00269524 DB C1 00 70 */ stfd f30, 0x70(r1) /* 8026C5E8 00269528 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 8026C5EC 0026952C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8026C5F0 00269530 48 0F 5B ED */ bl func_803621DC +/* 8026C5F0 00269530 48 0F 5B ED */ bl _savegpr_29 /* 8026C5F4 00269534 7C 7D 1B 78 */ mr r29, r3 /* 8026C5F8 00269538 7C 9E 23 78 */ mr r30, r4 /* 8026C5FC 0026953C 7C BF 2B 78 */ mr r31, r5 @@ -4846,7 +4846,7 @@ lbl_8026C91C: /* 8026C924 00269864 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 8026C928 00269868 CB C1 00 70 */ lfd f30, 0x70(r1) /* 8026C92C 0026986C 39 61 00 70 */ addi r11, r1, 0x70 -/* 8026C930 00269870 48 0F 58 F9 */ bl func_80362228 +/* 8026C930 00269870 48 0F 58 F9 */ bl _restgpr_29 /* 8026C934 00269874 80 01 00 94 */ lwz r0, 0x94(r1) /* 8026C938 00269878 7C 08 03 A6 */ mtlr r0 /* 8026C93C 0026987C 38 21 00 90 */ addi r1, r1, 0x90 @@ -5353,7 +5353,7 @@ cM3d_Cross_CylPntPnt: /* 8026D048 00269F88 7C 08 02 A6 */ mflr r0 /* 8026D04C 00269F8C 90 01 00 44 */ stw r0, 0x44(r1) /* 8026D050 00269F90 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026D054 00269F94 48 0F 51 89 */ bl func_803621DC +/* 8026D054 00269F94 48 0F 51 89 */ bl _savegpr_29 /* 8026D058 00269F98 7C 7D 1B 78 */ mr r29, r3 /* 8026D05C 00269F9C 7C DE 33 78 */ mr r30, r6 /* 8026D060 00269FA0 7C FF 3B 78 */ mr r31, r7 @@ -5371,7 +5371,7 @@ cM3d_Cross_CylPntPnt: /* 8026D090 00269FD0 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l /* 8026D094 00269FD4 90 01 00 20 */ stw r0, 0x20(r1) /* 8026D098 00269FD8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026D09C 00269FDC 48 0F 51 8D */ bl func_80362228 +/* 8026D09C 00269FDC 48 0F 51 8D */ bl _restgpr_29 /* 8026D0A0 00269FE0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026D0A4 00269FE4 7C 08 03 A6 */ mtlr r0 /* 8026D0A8 00269FE8 38 21 00 40 */ addi r1, r1, 0x40 @@ -5412,7 +5412,7 @@ cM3d_Cross_CpsCps: /* 8026D118 0026A058 7C 08 02 A6 */ mflr r0 /* 8026D11C 0026A05C 90 01 00 54 */ stw r0, 0x54(r1) /* 8026D120 0026A060 39 61 00 50 */ addi r11, r1, 0x50 -/* 8026D124 0026A064 48 0F 50 B9 */ bl func_803621DC +/* 8026D124 0026A064 48 0F 50 B9 */ bl _savegpr_29 /* 8026D128 0026A068 7C 7D 1B 78 */ mr r29, r3 /* 8026D12C 0026A06C 7C 9E 23 78 */ mr r30, r4 /* 8026D130 0026A070 7C BF 2B 78 */ mr r31, r5 @@ -5593,7 +5593,7 @@ lbl_8026D3B8: /* 8026D3B8 0026A2F8 38 60 00 00 */ li r3, 0 lbl_8026D3BC: /* 8026D3BC 0026A2FC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8026D3C0 0026A300 48 0F 4E 69 */ bl func_80362228 +/* 8026D3C0 0026A300 48 0F 4E 69 */ bl _restgpr_29 /* 8026D3C4 0026A304 80 01 00 54 */ lwz r0, 0x54(r1) /* 8026D3C8 0026A308 7C 08 03 A6 */ mtlr r0 /* 8026D3CC 0026A30C 38 21 00 50 */ addi r1, r1, 0x50 @@ -6184,7 +6184,7 @@ cM3d_Cross_CpsSph: /* 8026DC40 0026AB80 7C 08 02 A6 */ mflr r0 /* 8026DC44 0026AB84 90 01 00 34 */ stw r0, 0x34(r1) /* 8026DC48 0026AB88 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026DC4C 0026AB8C 48 0F 45 91 */ bl func_803621DC +/* 8026DC4C 0026AB8C 48 0F 45 91 */ bl _savegpr_29 /* 8026DC50 0026AB90 7C 7D 1B 78 */ mr r29, r3 /* 8026DC54 0026AB94 7C 9E 23 78 */ mr r30, r4 /* 8026DC58 0026AB98 7C BF 2B 78 */ mr r31, r5 @@ -6312,7 +6312,7 @@ lbl_8026DE10: /* 8026DE10 0026AD50 38 60 00 00 */ li r3, 0 lbl_8026DE14: /* 8026DE14 0026AD54 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026DE18 0026AD58 48 0F 44 11 */ bl func_80362228 +/* 8026DE18 0026AD58 48 0F 44 11 */ bl _restgpr_29 /* 8026DE1C 0026AD5C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026DE20 0026AD60 7C 08 03 A6 */ mtlr r0 /* 8026DE24 0026AD64 38 21 00 30 */ addi r1, r1, 0x30 @@ -6328,7 +6328,7 @@ cM3d_Cross_TriTri: /* 8026DE40 0026AD80 DB C1 00 40 */ stfd f30, 0x40(r1) /* 8026DE44 0026AD84 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 8026DE48 0026AD88 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026DE4C 0026AD8C 48 0F 43 91 */ bl func_803621DC +/* 8026DE4C 0026AD8C 48 0F 43 91 */ bl _savegpr_29 /* 8026DE50 0026AD90 7C 7D 1B 78 */ mr r29, r3 /* 8026DE54 0026AD94 7C 9E 23 78 */ mr r30, r4 /* 8026DE58 0026AD98 7C BF 2B 78 */ mr r31, r5 @@ -6520,7 +6520,7 @@ lbl_8026E104: /* 8026E10C 0026B04C E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 8026E110 0026B050 CB C1 00 40 */ lfd f30, 0x40(r1) /* 8026E114 0026B054 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E118 0026B058 48 0F 41 11 */ bl func_80362228 +/* 8026E118 0026B058 48 0F 41 11 */ bl _restgpr_29 /* 8026E11C 0026B05C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8026E120 0026B060 7C 08 03 A6 */ mtlr r0 /* 8026E124 0026B064 38 21 00 60 */ addi r1, r1, 0x60 @@ -6534,7 +6534,7 @@ cM3d_Cross_CpsTri: /* 8026E138 0026B078 DB E1 00 A0 */ stfd f31, 0xa0(r1) /* 8026E13C 0026B07C F3 E1 00 A8 */ psq_st f31, 168(r1), 0, qr0 /* 8026E140 0026B080 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8026E144 0026B084 48 0F 40 99 */ bl func_803621DC +/* 8026E144 0026B084 48 0F 40 99 */ bl _savegpr_29 /* 8026E148 0026B088 7C 7D 1B 78 */ mr r29, r3 /* 8026E14C 0026B08C 7C 9E 23 78 */ mr r30, r4 /* 8026E150 0026B090 7C BF 2B 78 */ mr r31, r5 @@ -6775,7 +6775,7 @@ lbl_8026E4DC: /* 8026E4DC 0026B41C E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 8026E4E0 0026B420 CB E1 00 A0 */ lfd f31, 0xa0(r1) /* 8026E4E4 0026B424 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8026E4E8 0026B428 48 0F 3D 41 */ bl func_80362228 +/* 8026E4E8 0026B428 48 0F 3D 41 */ bl _restgpr_29 /* 8026E4EC 0026B42C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8026E4F0 0026B430 7C 08 03 A6 */ mtlr r0 /* 8026E4F4 0026B434 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -6784,7 +6784,7 @@ lbl_8026E4DC: /* 8026E500 0026B440 7C 08 02 A6 */ mflr r0 /* 8026E504 0026B444 90 01 00 24 */ stw r0, 0x24(r1) /* 8026E508 0026B448 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026E50C 0026B44C 48 0F 3C D1 */ bl func_803621DC +/* 8026E50C 0026B44C 48 0F 3C D1 */ bl _savegpr_29 /* 8026E510 0026B450 7C 7D 1B 78 */ mr r29, r3 /* 8026E514 0026B454 7C 9E 23 78 */ mr r30, r4 /* 8026E518 0026B458 7C BF 2B 78 */ mr r31, r5 @@ -6804,7 +6804,7 @@ lbl_8026E4DC: /* 8026E550 0026B490 4B FF 91 25 */ bl cM_atan2s /* 8026E554 0026B494 B0 7F 00 00 */ sth r3, 0(r31) /* 8026E558 0026B498 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026E55C 0026B49C 48 0F 3C CD */ bl func_80362228 +/* 8026E55C 0026B49C 48 0F 3C CD */ bl _restgpr_29 /* 8026E560 0026B4A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8026E564 0026B4A4 7C 08 03 A6 */ mtlr r0 /* 8026E568 0026B4A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -6927,7 +6927,7 @@ cM3d_2PlaneCrossLine: /* 8026E6F4 0026B634 7C 08 02 A6 */ mflr r0 /* 8026E6F8 0026B638 90 01 00 34 */ stw r0, 0x34(r1) /* 8026E6FC 0026B63C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026E700 0026B640 48 0F 3A DD */ bl func_803621DC +/* 8026E700 0026B640 48 0F 3A DD */ bl _savegpr_29 /* 8026E704 0026B644 7C 7D 1B 78 */ mr r29, r3 /* 8026E708 0026B648 7C 9E 23 78 */ mr r30, r4 /* 8026E70C 0026B64C 7C BF 2B 78 */ mr r31, r5 @@ -7032,7 +7032,7 @@ lbl_8026E868: /* 8026E884 0026B7C4 38 60 00 01 */ li r3, 1 lbl_8026E888: /* 8026E888 0026B7C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026E88C 0026B7CC 48 0F 39 9D */ bl func_80362228 +/* 8026E88C 0026B7CC 48 0F 39 9D */ bl _restgpr_29 /* 8026E890 0026B7D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026E894 0026B7D4 7C 08 03 A6 */ mtlr r0 /* 8026E898 0026B7D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -7046,7 +7046,7 @@ cM3d_3PlaneCrossPos: /* 8026E8AC 0026B7EC DB E1 00 40 */ stfd f31, 0x40(r1) /* 8026E8B0 0026B7F0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8026E8B4 0026B7F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E8B8 0026B7F8 48 0F 39 25 */ bl func_803621DC +/* 8026E8B8 0026B7F8 48 0F 39 25 */ bl _savegpr_29 /* 8026E8BC 0026B7FC 7C BD 2B 78 */ mr r29, r5 /* 8026E8C0 0026B800 7C DE 33 78 */ mr r30, r6 /* 8026E8C4 0026B804 3C A0 80 3A */ lis r5, lbl_803A78F8@ha @@ -7094,7 +7094,7 @@ lbl_8026E960: /* 8026E960 0026B8A0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8026E964 0026B8A4 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8026E968 0026B8A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E96C 0026B8AC 48 0F 38 BD */ bl func_80362228 +/* 8026E96C 0026B8AC 48 0F 38 BD */ bl _restgpr_29 /* 8026E970 0026B8B0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8026E974 0026B8B4 7C 08 03 A6 */ mtlr r0 /* 8026E978 0026B8B8 38 21 00 50 */ addi r1, r1, 0x50 @@ -7108,7 +7108,7 @@ cM3d_lineVsPosSuisenCross: /* 8026E98C 0026B8CC DB E1 00 40 */ stfd f31, 0x40(r1) /* 8026E990 0026B8D0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8026E994 0026B8D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E998 0026B8D8 48 0F 38 45 */ bl func_803621DC +/* 8026E998 0026B8D8 48 0F 38 45 */ bl _savegpr_29 /* 8026E99C 0026B8DC 7C 7D 1B 78 */ mr r29, r3 /* 8026E9A0 0026B8E0 7C 9E 23 78 */ mr r30, r4 /* 8026E9A4 0026B8E4 7C BF 2B 78 */ mr r31, r5 @@ -7154,7 +7154,7 @@ lbl_8026EA3C: /* 8026EA3C 0026B97C E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8026EA40 0026B980 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8026EA44 0026B984 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026EA48 0026B988 48 0F 37 E1 */ bl func_80362228 +/* 8026EA48 0026B988 48 0F 37 E1 */ bl _restgpr_29 /* 8026EA4C 0026B98C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8026EA50 0026B990 7C 08 03 A6 */ mtlr r0 /* 8026EA54 0026B994 38 21 00 50 */ addi r1, r1, 0x50 @@ -7168,7 +7168,7 @@ cM3d_lineVsPosSuisenCross_X1_: /* 8026EA68 0026B9A8 DB E1 00 40 */ stfd f31, 0x40(r1) /* 8026EA6C 0026B9AC F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8026EA70 0026B9B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026EA74 0026B9B4 48 0F 37 69 */ bl func_803621DC +/* 8026EA74 0026B9B4 48 0F 37 69 */ bl _savegpr_29 /* 8026EA78 0026B9B8 7C 7D 1B 78 */ mr r29, r3 /* 8026EA7C 0026B9BC 7C BE 2B 78 */ mr r30, r5 /* 8026EA80 0026B9C0 7C DF 33 78 */ mr r31, r6 @@ -7214,7 +7214,7 @@ lbl_8026EB18: /* 8026EB18 0026BA58 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8026EB1C 0026BA5C CB E1 00 40 */ lfd f31, 0x40(r1) /* 8026EB20 0026BA60 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026EB24 0026BA64 48 0F 37 05 */ bl func_80362228 +/* 8026EB24 0026BA64 48 0F 37 05 */ bl _restgpr_29 /* 8026EB28 0026BA68 80 01 00 54 */ lwz r0, 0x54(r1) /* 8026EB2C 0026BA6C 7C 08 03 A6 */ mtlr r0 /* 8026EB30 0026BA70 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/SComponent/c/c_node.s b/asm/SComponent/c/c_node.s index 8fc9c7e7c80..316e0981adc 100644 --- a/asm/SComponent/c/c_node.s +++ b/asm/SComponent/c/c_node.s @@ -143,7 +143,7 @@ cNd_Insert: /* 80266248 00263188 7C 08 02 A6 */ mflr r0 /* 8026624C 0026318C 90 01 00 24 */ stw r0, 0x24(r1) /* 80266250 00263190 39 61 00 20 */ addi r11, r1, 0x20 -/* 80266254 00263194 48 0F BF 89 */ bl func_803621DC +/* 80266254 00263194 48 0F BF 89 */ bl _savegpr_29 /* 80266258 00263198 7C 7D 1B 78 */ mr r29, r3 /* 8026625C 0026319C 7C 9E 23 78 */ mr r30, r4 /* 80266260 002631A0 83 E3 00 00 */ lwz r31, 0(r3) @@ -163,7 +163,7 @@ lbl_8026627C: /* 80266294 002631D4 4B FF FF 7D */ bl cNd_Addition lbl_80266298: /* 80266298 002631D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026629C 002631DC 48 0F BF 8D */ bl func_80362228 +/* 8026629C 002631DC 48 0F BF 8D */ bl _restgpr_29 /* 802662A0 002631E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802662A4 002631E4 7C 08 03 A6 */ mtlr r0 /* 802662A8 002631E8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/SComponent/c/cc/c_cc_s.s b/asm/SComponent/c/cc/c_cc_s.s index 85a383b0a74..aa4d061222d 100644 --- a/asm/SComponent/c/cc/c_cc_s.s +++ b/asm/SComponent/c/cc/c_cc_s.s @@ -1238,7 +1238,7 @@ cCcS_NS_CalcArea: /* 80265BB8 00262AF8 7C 08 02 A6 */ mflr r0 /* 80265BBC 00262AFC 90 01 00 44 */ stw r0, 0x44(r1) /* 80265BC0 00262B00 39 61 00 40 */ addi r11, r1, 0x40 -/* 80265BC4 00262B04 48 0F C6 19 */ bl func_803621DC +/* 80265BC4 00262B04 48 0F C6 19 */ bl _savegpr_29 /* 80265BC8 00262B08 7C 7F 1B 78 */ mr r31, r3 /* 80265BCC 00262B0C 3C 60 80 3A */ lis r3, lbl_803A7218@ha /* 80265BD0 00262B10 38 03 72 18 */ addi r0, r3, lbl_803A7218@l @@ -1305,7 +1305,7 @@ lbl_80265C90: /* 80265CAC 00262BEC 38 03 72 18 */ addi r0, r3, lbl_803A7218@l /* 80265CB0 00262BF0 90 01 00 20 */ stw r0, 0x20(r1) /* 80265CB4 00262BF4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80265CB8 00262BF8 48 0F C5 71 */ bl func_80362228 +/* 80265CB8 00262BF8 48 0F C5 71 */ bl _restgpr_29 /* 80265CBC 00262BFC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80265CC0 00262C00 7C 08 03 A6 */ mtlr r0 /* 80265CC4 00262C04 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/SComponent/c/node/c_node_iter.s b/asm/SComponent/c/node/c_node_iter.s index 171b95a4092..8bad11b7d17 100644 --- a/asm/SComponent/c/node/c_node_iter.s +++ b/asm/SComponent/c/node/c_node_iter.s @@ -53,7 +53,7 @@ cNdIt_Judge: /* 802663B8 002632F8 7C 08 02 A6 */ mflr r0 /* 802663BC 002632FC 90 01 00 24 */ stw r0, 0x24(r1) /* 802663C0 00263300 39 61 00 20 */ addi r11, r1, 0x20 -/* 802663C4 00263304 48 0F BE 19 */ bl func_803621DC +/* 802663C4 00263304 48 0F BE 19 */ bl _savegpr_29 /* 802663C8 00263308 7C 9D 23 78 */ mr r29, r4 /* 802663CC 0026330C 7C BE 2B 78 */ mr r30, r5 /* 802663D0 00263310 28 03 00 00 */ cmplwi r3, 0 @@ -85,7 +85,7 @@ lbl_8026641C: /* 80266424 00263364 38 60 00 00 */ li r3, 0 lbl_80266428: /* 80266428 00263368 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026642C 0026336C 48 0F BD FD */ bl func_80362228 +/* 8026642C 0026336C 48 0F BD FD */ bl _restgpr_29 /* 80266430 00263370 80 01 00 24 */ lwz r0, 0x24(r1) /* 80266434 00263374 7C 08 03 A6 */ mtlr r0 /* 80266438 00263378 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2Audience.s b/asm/Z2AudioLib/Z2Audience.s index 655badb54f8..4c49fdeb3d0 100644 --- a/asm/Z2AudioLib/Z2Audience.s +++ b/asm/Z2AudioLib/Z2Audience.s @@ -163,7 +163,7 @@ Z2Audible_NS_setOuterParams: /* 802BBF08 002B8E48 DB 81 00 40 */ stfd f28, 0x40(r1) /* 802BBF0C 002B8E4C F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 802BBF10 002B8E50 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BBF14 002B8E54 48 0A 62 C9 */ bl func_803621DC +/* 802BBF14 002B8E54 48 0A 62 C9 */ bl _savegpr_29 /* 802BBF18 002B8E58 7C 9D 23 78 */ mr r29, r4 /* 802BBF1C 002B8E5C 7C BE 2B 78 */ mr r30, r5 /* 802BBF20 002B8E60 1C C6 00 38 */ mulli r6, r6, 0x38 @@ -358,7 +358,7 @@ lbl_802BC1CC: /* 802BC1E4 002B9124 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 802BC1E8 002B9128 CB 81 00 40 */ lfd f28, 0x40(r1) /* 802BC1EC 002B912C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802BC1F0 002B9130 48 0A 60 39 */ bl func_80362228 +/* 802BC1F0 002B9130 48 0A 60 39 */ bl _restgpr_29 /* 802BC1F4 002B9134 80 01 00 84 */ lwz r0, 0x84(r1) /* 802BC1F8 002B9138 7C 08 03 A6 */ mtlr r0 /* 802BC1FC 002B913C 38 21 00 80 */ addi r1, r1, 0x80 @@ -1065,7 +1065,7 @@ Z2AudioCamera_NS_convertAbsToRel: /* 802BCBF0 002B9B30 7C 08 02 A6 */ mflr r0 /* 802BCBF4 002B9B34 90 01 00 34 */ stw r0, 0x34(r1) /* 802BCBF8 002B9B38 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BCBFC 002B9B3C 48 0A 55 E1 */ bl func_803621DC +/* 802BCBFC 002B9B3C 48 0A 55 E1 */ bl _savegpr_29 /* 802BCC00 002B9B40 7C 7D 1B 78 */ mr r29, r3 /* 802BCC04 002B9B44 7C 9E 23 78 */ mr r30, r4 /* 802BCC08 002B9B48 7F C3 F3 78 */ mr r3, r30 @@ -1093,7 +1093,7 @@ Z2AudioCamera_NS_convertAbsToRel: /* 802BCC60 002B9BA0 D0 3F 00 10 */ stfs f1, 0x10(r31) lbl_802BCC64: /* 802BCC64 002B9BA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BCC68 002B9BA8 48 0A 55 C1 */ bl func_80362228 +/* 802BCC68 002B9BA8 48 0A 55 C1 */ bl _restgpr_29 /* 802BCC6C 002B9BAC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802BCC70 002B9BB0 7C 08 03 A6 */ mtlr r0 /* 802BCC74 002B9BB4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1584,7 +1584,7 @@ Z2Audience_NS_setAudioCamera: /* 802BD2E0 002BA220 7C 08 02 A6 */ mflr r0 /* 802BD2E4 002BA224 90 01 00 24 */ stw r0, 0x24(r1) /* 802BD2E8 002BA228 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BD2EC 002BA22C 48 0A 4E F1 */ bl func_803621DC +/* 802BD2EC 002BA22C 48 0A 4E F1 */ bl _savegpr_29 /* 802BD2F0 002BA230 7C 7D 1B 78 */ mr r29, r3 /* 802BD2F4 002BA234 7D 1E 43 78 */ mr r30, r8 /* 802BD2F8 002BA238 1C 7E 00 74 */ mulli r3, r30, 0x74 @@ -1598,7 +1598,7 @@ Z2Audience_NS_setAudioCamera: /* 802BD318 002BA258 7F C5 F3 78 */ mr r5, r30 /* 802BD31C 002BA25C 4B FF FA F9 */ bl Z2SpotMic_NS_setMicState /* 802BD320 002BA260 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BD324 002BA264 48 0A 4F 05 */ bl func_80362228 +/* 802BD324 002BA264 48 0A 4F 05 */ bl _restgpr_29 /* 802BD328 002BA268 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BD32C 002BA26C 7C 08 03 A6 */ mtlr r0 /* 802BD330 002BA270 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2AudioArcLoader.s b/asm/Z2AudioLib/Z2AudioArcLoader.s index 0180f3125d6..22457cc52fb 100644 --- a/asm/Z2AudioLib/Z2AudioArcLoader.s +++ b/asm/Z2AudioLib/Z2AudioArcLoader.s @@ -51,7 +51,7 @@ Z2AudioArcLoader_NS_readBFCA: /* 802A9ACC 002A6A0C 7C 08 02 A6 */ mflr r0 /* 802A9AD0 002A6A10 90 01 00 24 */ stw r0, 0x24(r1) /* 802A9AD4 002A6A14 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A9AD8 002A6A18 48 0B 87 05 */ bl func_803621DC +/* 802A9AD8 002A6A18 48 0B 87 05 */ bl _savegpr_29 /* 802A9ADC 002A6A1C 7C 9D 23 78 */ mr r29, r4 /* 802A9AE0 002A6A20 83 CD 87 40 */ lwz r30, lbl_80450CC0-_SDA_BASE_(r13) /* 802A9AE4 002A6A24 7F C3 F3 78 */ mr r3, r30 @@ -79,7 +79,7 @@ lbl_802A9B04: /* 802A9B34 002A6A74 7D 89 03 A6 */ mtctr r12 /* 802A9B38 002A6A78 4E 80 04 21 */ bctrl /* 802A9B3C 002A6A7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802A9B40 002A6A80 48 0B 86 E9 */ bl func_80362228 +/* 802A9B40 002A6A80 48 0B 86 E9 */ bl _restgpr_29 /* 802A9B44 002A6A84 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A9B48 002A6A88 7C 08 03 A6 */ mtlr r0 /* 802A9B4C 002A6A8C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2AudioMgr.s b/asm/Z2AudioLib/Z2AudioMgr.s index 0f5d93e52b1..d91ee6eddfe 100644 --- a/asm/Z2AudioLib/Z2AudioMgr.s +++ b/asm/Z2AudioLib/Z2AudioMgr.s @@ -510,7 +510,7 @@ Z2AudioMgr_NS_resetProcess: /* 802CD978 002CA8B8 7C 08 02 A6 */ mflr r0 /* 802CD97C 002CA8BC 90 01 00 24 */ stw r0, 0x24(r1) /* 802CD980 002CA8C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CD984 002CA8C4 48 09 48 59 */ bl func_803621DC +/* 802CD984 002CA8C4 48 09 48 59 */ bl _savegpr_29 /* 802CD988 002CA8C8 7C 7D 1B 78 */ mr r29, r3 /* 802CD98C 002CA8CC 7C 9E 23 78 */ mr r30, r4 /* 802CD990 002CA8D0 7C BF 2B 78 */ mr r31, r5 @@ -523,7 +523,7 @@ Z2AudioMgr_NS_resetProcess: /* 802CD9AC 002CA8EC 38 00 00 01 */ li r0, 1 /* 802CD9B0 002CA8F0 98 1D 05 18 */ stb r0, 0x518(r29) /* 802CD9B4 002CA8F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802CD9B8 002CA8F8 48 09 48 71 */ bl func_80362228 +/* 802CD9B8 002CA8F8 48 09 48 71 */ bl _restgpr_29 /* 802CD9BC 002CA8FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CD9C0 002CA900 7C 08 03 A6 */ mtlr r0 /* 802CD9C4 002CA904 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s index 44a2268b9a9..3193250b1ab 100644 --- a/asm/Z2AudioLib/Z2Creature.s +++ b/asm/Z2AudioLib/Z2Creature.s @@ -149,7 +149,7 @@ Z2Creature_NS_init_X1_: /* 802C05B4 002BD4F4 7C 08 02 A6 */ mflr r0 /* 802C05B8 002BD4F8 90 01 00 24 */ stw r0, 0x24(r1) /* 802C05BC 002BD4FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C05C0 002BD500 48 0A 1C 1D */ bl func_803621DC +/* 802C05C0 002BD500 48 0A 1C 1D */ bl _savegpr_29 /* 802C05C4 002BD504 7C 7D 1B 78 */ mr r29, r3 /* 802C05C8 002BD508 7C DE 33 78 */ mr r30, r6 /* 802C05CC 002BD50C 7D 3F 4B 78 */ mr r31, r9 @@ -167,7 +167,7 @@ Z2Creature_NS_init_X1_: /* 802C05FC 002BD53C 4E 80 04 21 */ bctrl lbl_802C0600: /* 802C0600 002BD540 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0604 002BD544 48 0A 1C 25 */ bl func_80362228 +/* 802C0604 002BD544 48 0A 1C 25 */ bl _restgpr_29 /* 802C0608 002BD548 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C060C 002BD54C 7C 08 03 A6 */ mtlr r0 /* 802C0610 002BD550 38 21 00 20 */ addi r1, r1, 0x20 @@ -195,7 +195,7 @@ Z2Creature_NS_framework: /* 802C0650 002BD590 7C 08 02 A6 */ mflr r0 /* 802C0654 002BD594 90 01 00 24 */ stw r0, 0x24(r1) /* 802C0658 002BD598 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C065C 002BD59C 48 0A 1B 81 */ bl func_803621DC +/* 802C065C 002BD59C 48 0A 1B 81 */ bl _savegpr_29 /* 802C0660 002BD5A0 7C 7D 1B 78 */ mr r29, r3 /* 802C0664 002BD5A4 7C 9E 23 78 */ mr r30, r4 /* 802C0668 002BD5A8 7C BF 2B 78 */ mr r31, r5 @@ -219,7 +219,7 @@ Z2Creature_NS_framework: /* 802C06B0 002BD5F0 7D 89 03 A6 */ mtctr r12 /* 802C06B4 002BD5F4 4E 80 04 21 */ bctrl /* 802C06B8 002BD5F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C06BC 002BD5FC 48 0A 1B 6D */ bl func_80362228 +/* 802C06BC 002BD5FC 48 0A 1B 6D */ bl _restgpr_29 /* 802C06C0 002BD600 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C06C4 002BD604 7C 08 03 A6 */ mtlr r0 /* 802C06C8 002BD608 38 21 00 20 */ addi r1, r1, 0x20 @@ -253,7 +253,7 @@ Z2Creature_NS_updateAnime: /* 802C072C 002BD66C DB E1 00 30 */ stfd f31, 0x30(r1) /* 802C0730 002BD670 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802C0734 002BD674 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C0738 002BD678 48 0A 1A A5 */ bl func_803621DC +/* 802C0738 002BD678 48 0A 1A A5 */ bl _savegpr_29 /* 802C073C 002BD67C 7C 9D 23 78 */ mr r29, r4 /* 802C0740 002BD680 7C BE 2B 78 */ mr r30, r5 /* 802C0744 002BD684 80 E4 00 00 */ lwz r7, 0(r4) @@ -334,7 +334,7 @@ lbl_802C085C: /* 802C085C 002BD79C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802C0860 002BD7A0 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802C0864 002BD7A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C0868 002BD7A8 48 0A 19 C1 */ bl func_80362228 +/* 802C0868 002BD7A8 48 0A 19 C1 */ bl _restgpr_29 /* 802C086C 002BD7AC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C0870 002BD7B0 7C 08 03 A6 */ mtlr r0 /* 802C0874 002BD7B4 38 21 00 40 */ addi r1, r1, 0x40 @@ -347,7 +347,7 @@ lbl_802C085C: /* 802C0890 002BD7D0 DB C1 00 30 */ stfd f30, 0x30(r1) /* 802C0894 002BD7D4 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802C0898 002BD7D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C089C 002BD7DC 48 0A 19 41 */ bl func_803621DC +/* 802C089C 002BD7DC 48 0A 19 41 */ bl _savegpr_29 /* 802C08A0 002BD7E0 7C 67 1B 78 */ mr r7, r3 /* 802C08A4 002BD7E4 7C 9D 23 78 */ mr r29, r4 /* 802C08A8 002BD7E8 7C BE 2B 78 */ mr r30, r5 @@ -457,7 +457,7 @@ lbl_802C0A24: /* 802C0A2C 002BD96C E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 802C0A30 002BD970 CB C1 00 30 */ lfd f30, 0x30(r1) /* 802C0A34 002BD974 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C0A38 002BD978 48 0A 17 F1 */ bl func_80362228 +/* 802C0A38 002BD978 48 0A 17 F1 */ bl _restgpr_29 /* 802C0A3C 002BD97C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C0A40 002BD980 7C 08 03 A6 */ mtlr r0 /* 802C0A44 002BD984 38 21 00 50 */ addi r1, r1, 0x50 @@ -469,7 +469,7 @@ Z2Creature_NS_startCreatureVoice: /* 802C0A50 002BD990 7C 08 02 A6 */ mflr r0 /* 802C0A54 002BD994 90 01 00 24 */ stw r0, 0x24(r1) /* 802C0A58 002BD998 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0A5C 002BD99C 48 0A 17 81 */ bl func_803621DC +/* 802C0A5C 002BD99C 48 0A 17 81 */ bl _savegpr_29 /* 802C0A60 002BD9A0 7C 7D 1B 78 */ mr r29, r3 /* 802C0A64 002BD9A4 7C 9E 23 78 */ mr r30, r4 /* 802C0A68 002BD9A8 7C BF 2B 78 */ mr r31, r5 @@ -507,7 +507,7 @@ lbl_802C0AB8: /* 802C0ADC 002BDA1C 4E 80 04 21 */ bctrl lbl_802C0AE0: /* 802C0AE0 002BDA20 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C0AE4 002BDA24 48 0A 17 45 */ bl func_80362228 +/* 802C0AE4 002BDA24 48 0A 17 45 */ bl _restgpr_29 /* 802C0AE8 002BDA28 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C0AEC 002BDA2C 7C 08 03 A6 */ mtlr r0 /* 802C0AF0 002BDA30 38 21 00 20 */ addi r1, r1, 0x20 @@ -1304,7 +1304,7 @@ lbl_802C1664: /* 802C1690 002BE5D0 7C 08 02 A6 */ mflr r0 /* 802C1694 002BE5D4 90 01 00 44 */ stw r0, 0x44(r1) /* 802C1698 002BE5D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C169C 002BE5DC 48 0A 0B 41 */ bl func_803621DC +/* 802C169C 002BE5DC 48 0A 0B 41 */ bl _savegpr_29 /* 802C16A0 002BE5E0 7C 7E 1B 78 */ mr r30, r3 /* 802C16A4 002BE5E4 7C 9F 23 78 */ mr r31, r4 /* 802C16A8 002BE5E8 7C A6 2B 78 */ mr r6, r5 @@ -1492,7 +1492,7 @@ lbl_802C1910: lbl_802C192C: /* 802C192C 002BE86C 7F A3 EB 78 */ mr r3, r29 /* 802C1930 002BE870 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1934 002BE874 48 0A 08 F5 */ bl func_80362228 +/* 802C1934 002BE874 48 0A 08 F5 */ bl _restgpr_29 /* 802C1938 002BE878 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C193C 002BE87C 7C 08 03 A6 */ mtlr r0 /* 802C1940 002BE880 38 21 00 40 */ addi r1, r1, 0x40 @@ -1553,7 +1553,7 @@ lbl_802C196C: /* 802C1A18 002BE958 7C 08 02 A6 */ mflr r0 /* 802C1A1C 002BE95C 90 01 00 24 */ stw r0, 0x24(r1) /* 802C1A20 002BE960 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C1A24 002BE964 48 0A 07 B9 */ bl func_803621DC +/* 802C1A24 002BE964 48 0A 07 B9 */ bl _savegpr_29 /* 802C1A28 002BE968 7C 7D 1B 78 */ mr r29, r3 /* 802C1A2C 002BE96C 7C 9E 23 78 */ mr r30, r4 /* 802C1A30 002BE970 7C BF 2B 78 */ mr r31, r5 @@ -1644,7 +1644,7 @@ lbl_802C1B50: /* 802C1B60 002BEAA0 4B FF C9 45 */ bl Z2SoundObjBase_NS_startCollisionSE lbl_802C1B64: /* 802C1B64 002BEAA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C1B68 002BEAA8 48 0A 06 C1 */ bl func_80362228 +/* 802C1B68 002BEAA8 48 0A 06 C1 */ bl _restgpr_29 /* 802C1B6C 002BEAAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C1B70 002BEAB0 7C 08 03 A6 */ mtlr r0 /* 802C1B74 002BEAB4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1787,7 +1787,7 @@ lbl_802C1CF4: /* 802C1D70 002BECB0 7C 08 02 A6 */ mflr r0 /* 802C1D74 002BECB4 90 01 00 44 */ stw r0, 0x44(r1) /* 802C1D78 002BECB8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1D7C 002BECBC 48 0A 04 61 */ bl func_803621DC +/* 802C1D7C 002BECBC 48 0A 04 61 */ bl _savegpr_29 /* 802C1D80 002BECC0 7C 7E 1B 78 */ mr r30, r3 /* 802C1D84 002BECC4 7C BF 2B 78 */ mr r31, r5 /* 802C1D88 002BECC8 54 A0 06 3F */ clrlwi. r0, r5, 0x18 @@ -1910,7 +1910,7 @@ lbl_802C1EE4: /* 802C1F38 002BEE78 4B FE 0E 7D */ bl JAISoundParamsMove_NS_moveVolume lbl_802C1F3C: /* 802C1F3C 002BEE7C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C1F40 002BEE80 48 0A 02 E9 */ bl func_80362228 +/* 802C1F40 002BEE80 48 0A 02 E9 */ bl _restgpr_29 /* 802C1F44 002BEE84 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C1F48 002BEE88 7C 08 03 A6 */ mtlr r0 /* 802C1F4C 002BEE8C 38 21 00 40 */ addi r1, r1, 0x40 @@ -2024,7 +2024,7 @@ lbl_802C20D0: /* 802C20EC 002BF02C 7C 08 02 A6 */ mflr r0 /* 802C20F0 002BF030 90 01 00 24 */ stw r0, 0x24(r1) /* 802C20F4 002BF034 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C20F8 002BF038 48 0A 00 E5 */ bl func_803621DC +/* 802C20F8 002BF038 48 0A 00 E5 */ bl _savegpr_29 /* 802C20FC 002BF03C 7C 7D 1B 78 */ mr r29, r3 /* 802C2100 002BF040 7C 9E 23 78 */ mr r30, r4 /* 802C2104 002BF044 7C BF 2B 78 */ mr r31, r5 @@ -2058,7 +2058,7 @@ lbl_802C20D0: /* 802C2174 002BF0B4 7D 89 03 A6 */ mtctr r12 /* 802C2178 002BF0B8 4E 80 04 21 */ bctrl /* 802C217C 002BF0BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C2180 002BF0C0 48 0A 00 A9 */ bl func_80362228 +/* 802C2180 002BF0C0 48 0A 00 A9 */ bl _restgpr_29 /* 802C2184 002BF0C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C2188 002BF0C8 7C 08 03 A6 */ mtlr r0 /* 802C218C 002BF0CC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2296,7 +2296,7 @@ lbl_802C2494: /* 802C24D4 002BF414 7C 08 02 A6 */ mflr r0 /* 802C24D8 002BF418 90 01 00 34 */ stw r0, 0x34(r1) /* 802C24DC 002BF41C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C24E0 002BF420 48 09 FC FD */ bl func_803621DC +/* 802C24E0 002BF420 48 09 FC FD */ bl _savegpr_29 /* 802C24E4 002BF424 7C 7D 1B 78 */ mr r29, r3 /* 802C24E8 002BF428 7C 9E 23 78 */ mr r30, r4 /* 802C24EC 002BF42C 7C BF 2B 78 */ mr r31, r5 @@ -2332,7 +2332,7 @@ lbl_802C2538: /* 802C255C 002BF49C 4E 80 04 21 */ bctrl lbl_802C2560: /* 802C2560 002BF4A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C2564 002BF4A4 48 09 FC C5 */ bl func_80362228 +/* 802C2564 002BF4A4 48 09 FC C5 */ bl _restgpr_29 /* 802C2568 002BF4A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C256C 002BF4AC 7C 08 03 A6 */ mtlr r0 /* 802C2570 002BF4B0 38 21 00 30 */ addi r1, r1, 0x30 @@ -2541,7 +2541,7 @@ lbl_802C284C: /* 802C2868 002BF7A8 7C 08 02 A6 */ mflr r0 /* 802C286C 002BF7AC 90 01 00 24 */ stw r0, 0x24(r1) /* 802C2870 002BF7B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C2874 002BF7B4 48 09 F9 69 */ bl func_803621DC +/* 802C2874 002BF7B4 48 09 F9 69 */ bl _savegpr_29 /* 802C2878 002BF7B8 7C 7D 1B 78 */ mr r29, r3 /* 802C287C 002BF7BC 7C 9E 23 78 */ mr r30, r4 /* 802C2880 002BF7C0 7C BF 2B 78 */ mr r31, r5 @@ -2624,7 +2624,7 @@ lbl_802C284C: /* 802C29B4 002BF8F4 7D 89 03 A6 */ mtctr r12 /* 802C29B8 002BF8F8 4E 80 04 21 */ bctrl /* 802C29BC 002BF8FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C29C0 002BF900 48 09 F8 69 */ bl func_80362228 +/* 802C29C0 002BF900 48 09 F8 69 */ bl _restgpr_29 /* 802C29C4 002BF904 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C29C8 002BF908 7C 08 03 A6 */ mtlr r0 /* 802C29CC 002BF90C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s index cc5b8181018..13c934108ba 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr.s @@ -56,7 +56,7 @@ Z2EnvSeBase_NS_startEnvSe: /* 802C593C 002C287C DB 41 00 30 */ stfd f26, 0x30(r1) /* 802C5940 002C2880 F3 41 00 38 */ psq_st f26, 56(r1), 0, qr0 /* 802C5944 002C2884 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C5948 002C2888 48 09 C8 95 */ bl func_803621DC +/* 802C5948 002C2888 48 09 C8 95 */ bl _savegpr_29 /* 802C594C 002C288C 7C 7D 1B 78 */ mr r29, r3 /* 802C5950 002C2890 7C 9E 23 78 */ mr r30, r4 /* 802C5954 002C2894 FF 40 08 90 */ fmr f26, f1 @@ -146,7 +146,7 @@ lbl_802C5A68: /* 802C5A94 002C29D4 E3 41 00 38 */ psq_l f26, 56(r1), 0, qr0 /* 802C5A98 002C29D8 CB 41 00 30 */ lfd f26, 0x30(r1) /* 802C5A9C 002C29DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C5AA0 002C29E0 48 09 C7 89 */ bl func_80362228 +/* 802C5AA0 002C29E0 48 09 C7 89 */ bl _restgpr_29 /* 802C5AA4 002C29E4 80 01 00 94 */ lwz r0, 0x94(r1) /* 802C5AA8 002C29E8 7C 08 03 A6 */ mtlr r0 /* 802C5AAC 002C29EC 38 21 00 90 */ addi r1, r1, 0x90 @@ -170,7 +170,7 @@ Z2EnvSeBase_NS_startEnvSeLevel: /* 802C5AE8 002C2A28 DB 41 00 30 */ stfd f26, 0x30(r1) /* 802C5AEC 002C2A2C F3 41 00 38 */ psq_st f26, 56(r1), 0, qr0 /* 802C5AF0 002C2A30 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C5AF4 002C2A34 48 09 C6 E9 */ bl func_803621DC +/* 802C5AF4 002C2A34 48 09 C6 E9 */ bl _savegpr_29 /* 802C5AF8 002C2A38 7C 7E 1B 78 */ mr r30, r3 /* 802C5AFC 002C2A3C 7C 9D 23 78 */ mr r29, r4 /* 802C5B00 002C2A40 FF 40 08 90 */ fmr f26, f1 @@ -276,7 +276,7 @@ lbl_802C5C50: /* 802C5C7C 002C2BBC E3 41 00 38 */ psq_l f26, 56(r1), 0, qr0 /* 802C5C80 002C2BC0 CB 41 00 30 */ lfd f26, 0x30(r1) /* 802C5C84 002C2BC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C5C88 002C2BC8 48 09 C5 A1 */ bl func_80362228 +/* 802C5C88 002C2BC8 48 09 C5 A1 */ bl _restgpr_29 /* 802C5C8C 002C2BCC 80 01 00 94 */ lwz r0, 0x94(r1) /* 802C5C90 002C2BD0 7C 08 03 A6 */ mtlr r0 /* 802C5C94 002C2BD4 38 21 00 90 */ addi r1, r1, 0x90 @@ -985,7 +985,7 @@ Z2EnvSeMgr_NS_framework: /* 802C66C4 002C3604 DB C1 00 30 */ stfd f30, 0x30(r1) /* 802C66C8 002C3608 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802C66CC 002C360C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C66D0 002C3610 48 09 BB 0D */ bl func_803621DC +/* 802C66D0 002C3610 48 09 BB 0D */ bl _savegpr_29 /* 802C66D4 002C3614 7C 7F 1B 78 */ mr r31, r3 /* 802C66D8 002C3618 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) /* 802C66DC 002C361C 83 C3 00 04 */ lwz r30, 4(r3) @@ -1177,7 +1177,7 @@ lbl_802C6970: /* 802C6978 002C38B8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 802C697C 002C38BC CB C1 00 30 */ lfd f30, 0x30(r1) /* 802C6980 002C38C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C6984 002C38C4 48 09 B8 A5 */ bl func_80362228 +/* 802C6984 002C38C4 48 09 B8 A5 */ bl _restgpr_29 /* 802C6988 002C38C8 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C698C 002C38CC 7C 08 03 A6 */ mtlr r0 /* 802C6990 002C38D0 38 21 00 50 */ addi r1, r1, 0x50 @@ -2969,7 +2969,7 @@ Z2EnvSeMgr_NS_startRiverSe: /* 802C832C 002C526C DB 61 00 50 */ stfd f27, 0x50(r1) /* 802C8330 002C5270 F3 61 00 58 */ psq_st f27, 88(r1), 0, qr0 /* 802C8334 002C5274 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C8338 002C5278 48 09 9E A5 */ bl func_803621DC +/* 802C8338 002C5278 48 09 9E A5 */ bl _savegpr_29 /* 802C833C 002C527C 7C 7F 1B 78 */ mr r31, r3 /* 802C8340 002C5280 7C 9D 23 78 */ mr r29, r4 /* 802C8344 002C5284 80 AD 85 FC */ lwz r5, lbl_80450B7C-_SDA_BASE_(r13) @@ -3235,7 +3235,7 @@ lbl_802C86F0: /* 802C8710 002C5650 E3 61 00 58 */ psq_l f27, 88(r1), 0, qr0 /* 802C8714 002C5654 CB 61 00 50 */ lfd f27, 0x50(r1) /* 802C8718 002C5658 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C871C 002C565C 48 09 9B 0D */ bl func_80362228 +/* 802C871C 002C565C 48 09 9B 0D */ bl _restgpr_29 /* 802C8720 002C5660 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802C8724 002C5664 7C 08 03 A6 */ mtlr r0 /* 802C8728 002C5668 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -3630,7 +3630,7 @@ Z2EnvSeMgr_NS_startEtcSe: /* 802C8C7C 002C5BBC DB 41 00 50 */ stfd f26, 0x50(r1) /* 802C8C80 002C5BC0 F3 41 00 58 */ psq_st f26, 88(r1), 0, qr0 /* 802C8C84 002C5BC4 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C8C88 002C5BC8 48 09 95 55 */ bl func_803621DC +/* 802C8C88 002C5BC8 48 09 95 55 */ bl _savegpr_29 /* 802C8C8C 002C5BCC 7C 7F 1B 78 */ mr r31, r3 /* 802C8C90 002C5BD0 7C 80 07 74 */ extsb r0, r4 /* 802C8C94 002C5BD4 C8 22 C4 20 */ lfd f1, lbl_80455E20-_SDA2_BASE_(r2) @@ -4042,7 +4042,7 @@ lbl_802C9280: /* 802C92A8 002C61E8 E3 41 00 58 */ psq_l f26, 88(r1), 0, qr0 /* 802C92AC 002C61EC CB 41 00 50 */ lfd f26, 0x50(r1) /* 802C92B0 002C61F0 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C92B4 002C61F4 48 09 8F 75 */ bl func_80362228 +/* 802C92B4 002C61F4 48 09 8F 75 */ bl _restgpr_29 /* 802C92B8 002C61F8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802C92BC 002C61FC 7C 08 03 A6 */ mtlr r0 /* 802C92C0 002C6200 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/Z2AudioLib/Z2LinkMgr.s b/asm/Z2AudioLib/Z2LinkMgr.s index 28b3a2d80c7..9493d002939 100644 --- a/asm/Z2AudioLib/Z2LinkMgr.s +++ b/asm/Z2AudioLib/Z2LinkMgr.s @@ -401,7 +401,7 @@ Z2CreatureLink_NS_setKanteraState: /* 802C378C 002C06CC DB E1 00 30 */ stfd f31, 0x30(r1) /* 802C3790 002C06D0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802C3794 002C06D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C3798 002C06D8 48 09 EA 45 */ bl func_803621DC +/* 802C3798 002C06D8 48 09 EA 45 */ bl _savegpr_29 /* 802C379C 002C06DC 7C 7F 1B 78 */ mr r31, r3 /* 802C37A0 002C06E0 7C 9D 23 78 */ mr r29, r4 /* 802C37A4 002C06E4 7C BE 2B 78 */ mr r30, r5 @@ -593,7 +593,7 @@ lbl_802C3A44: /* 802C3A44 002C0984 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802C3A48 002C0988 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802C3A4C 002C098C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C3A50 002C0990 48 09 E7 D9 */ bl func_80362228 +/* 802C3A50 002C0990 48 09 E7 D9 */ bl _restgpr_29 /* 802C3A54 002C0994 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C3A58 002C0998 7C 08 03 A6 */ mtlr r0 /* 802C3A5C 002C099C 38 21 00 40 */ addi r1, r1, 0x40 @@ -718,7 +718,7 @@ Z2CreatureLink_NS_startLinkSound: /* 802C3BE8 002C0B28 DB C1 00 30 */ stfd f30, 0x30(r1) /* 802C3BEC 002C0B2C F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 802C3BF0 002C0B30 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C3BF4 002C0B34 48 09 E5 E9 */ bl func_803621DC +/* 802C3BF4 002C0B34 48 09 E5 E9 */ bl _savegpr_29 /* 802C3BF8 002C0B38 7C 7E 1B 78 */ mr r30, r3 /* 802C3BFC 002C0B3C 7C 9D 23 78 */ mr r29, r4 /* 802C3C00 002C0B40 80 04 00 00 */ lwz r0, 0(r4) @@ -876,7 +876,7 @@ lbl_802C3E3C: /* 802C3E48 002C0D88 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 802C3E4C 002C0D8C CB C1 00 30 */ lfd f30, 0x30(r1) /* 802C3E50 002C0D90 39 61 00 30 */ addi r11, r1, 0x30 -/* 802C3E54 002C0D94 48 09 E3 D5 */ bl func_80362228 +/* 802C3E54 002C0D94 48 09 E3 D5 */ bl _restgpr_29 /* 802C3E58 002C0D98 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C3E5C 002C0D9C 7C 08 03 A6 */ mtlr r0 /* 802C3E60 002C0DA0 38 21 00 50 */ addi r1, r1, 0x50 @@ -1213,7 +1213,7 @@ Z2CreatureLink_NS_startLinkVoice: /* 802C4324 002C1264 7C 08 02 A6 */ mflr r0 /* 802C4328 002C1268 90 01 00 44 */ stw r0, 0x44(r1) /* 802C432C 002C126C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C4330 002C1270 48 09 DE AD */ bl func_803621DC +/* 802C4330 002C1270 48 09 DE AD */ bl _savegpr_29 /* 802C4334 002C1274 7C 7D 1B 78 */ mr r29, r3 /* 802C4338 002C1278 7C 9E 23 78 */ mr r30, r4 /* 802C433C 002C127C 7C BF 2B 78 */ mr r31, r5 @@ -1390,7 +1390,7 @@ lbl_802C4574: /* 802C4594 002C14D4 4E 80 04 21 */ bctrl lbl_802C4598: /* 802C4598 002C14D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C459C 002C14DC 48 09 DC 8D */ bl func_80362228 +/* 802C459C 002C14DC 48 09 DC 8D */ bl _restgpr_29 /* 802C45A0 002C14E0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C45A4 002C14E4 7C 08 03 A6 */ mtlr r0 /* 802C45A8 002C14E8 38 21 00 40 */ addi r1, r1, 0x40 @@ -1536,7 +1536,7 @@ lbl_802C4774: /* 802C4788 002C16C8 7C 08 02 A6 */ mflr r0 /* 802C478C 002C16CC 90 01 00 24 */ stw r0, 0x24(r1) /* 802C4790 002C16D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C4794 002C16D4 48 09 DA 49 */ bl func_803621DC +/* 802C4794 002C16D4 48 09 DA 49 */ bl _savegpr_29 /* 802C4798 002C16D8 7C 7D 1B 78 */ mr r29, r3 /* 802C479C 002C16DC 7C 9E 23 78 */ mr r30, r4 /* 802C47A0 002C16E0 7C BF 2B 78 */ mr r31, r5 @@ -1566,7 +1566,7 @@ lbl_802C47E8: /* 802C47F4 002C1734 38 C0 00 00 */ li r6, 0 /* 802C47F8 002C1738 4B FF 9C AD */ bl Z2SoundObjBase_NS_startCollisionSE /* 802C47FC 002C173C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C4800 002C1740 48 09 DA 29 */ bl func_80362228 +/* 802C4800 002C1740 48 09 DA 29 */ bl _restgpr_29 /* 802C4804 002C1744 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C4808 002C1748 7C 08 03 A6 */ mtlr r0 /* 802C480C 002C174C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2311,7 +2311,7 @@ Z2RideSoundStarter: /* 802C5290 002C21D0 DB E1 00 40 */ stfd f31, 0x40(r1) /* 802C5294 002C21D4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 802C5298 002C21D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C529C 002C21DC 48 09 CF 41 */ bl func_803621DC +/* 802C529C 002C21DC 48 09 CF 41 */ bl _savegpr_29 /* 802C52A0 002C21E0 7C 7D 1B 78 */ mr r29, r3 /* 802C52A4 002C21E4 FF E0 08 90 */ fmr f31, f1 /* 802C52A8 002C21E8 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) @@ -2452,7 +2452,7 @@ lbl_802C5498: /* 802C5498 002C23D8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802C549C 002C23DC CB E1 00 40 */ lfd f31, 0x40(r1) /* 802C54A0 002C23E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802C54A4 002C23E4 48 09 CD 85 */ bl func_80362228 +/* 802C54A4 002C23E4 48 09 CD 85 */ bl _restgpr_29 /* 802C54A8 002C23E8 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C54AC 002C23EC 7C 08 03 A6 */ mtlr r0 /* 802C54B0 002C23F0 38 21 00 50 */ addi r1, r1, 0x50 @@ -2658,7 +2658,7 @@ lbl_802C57A4: /* 802C57C4 002C2704 7C 08 02 A6 */ mflr r0 /* 802C57C8 002C2708 90 01 00 24 */ stw r0, 0x24(r1) /* 802C57CC 002C270C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C57D0 002C2710 48 09 CA 0D */ bl func_803621DC +/* 802C57D0 002C2710 48 09 CA 0D */ bl _savegpr_29 /* 802C57D4 002C2714 7C 7D 1B 78 */ mr r29, r3 /* 802C57D8 002C2718 7C 9E 23 78 */ mr r30, r4 /* 802C57DC 002C271C 80 04 00 00 */ lwz r0, 0(r4) @@ -2701,7 +2701,7 @@ lbl_802C57A4: lbl_802C5870: /* 802C5870 002C27B0 7F E3 FB 78 */ mr r3, r31 /* 802C5874 002C27B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802C5878 002C27B8 48 09 C9 B1 */ bl func_80362228 +/* 802C5878 002C27B8 48 09 C9 B1 */ bl _restgpr_29 /* 802C587C 002C27BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C5880 002C27C0 7C 08 03 A6 */ mtlr r0 /* 802C5884 002C27C4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SceneMgr.s b/asm/Z2AudioLib/Z2SceneMgr.s index c02558b3720..81c95582edb 100644 --- a/asm/Z2AudioLib/Z2SceneMgr.s +++ b/asm/Z2AudioLib/Z2SceneMgr.s @@ -3971,7 +3971,7 @@ Z2SceneMgr_NS_check1stDynamicWave: /* 802BA0A0 002B6FE0 7C 08 02 A6 */ mflr r0 /* 802BA0A4 002B6FE4 90 01 00 24 */ stw r0, 0x24(r1) /* 802BA0A8 002B6FE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BA0AC 002B6FEC 48 0A 81 31 */ bl func_803621DC +/* 802BA0AC 002B6FEC 48 0A 81 31 */ bl _savegpr_29 /* 802BA0B0 002B6FF0 7C 7D 1B 78 */ mr r29, r3 /* 802BA0B4 002B6FF4 3B E0 00 01 */ li r31, 1 /* 802BA0B8 002B6FF8 7F FE FB 78 */ mr r30, r31 @@ -3997,7 +3997,7 @@ lbl_802BA0E0: lbl_802BA104: /* 802BA104 002B7044 7F E3 FB 78 */ mr r3, r31 /* 802BA108 002B7048 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BA10C 002B704C 48 0A 81 1D */ bl func_80362228 +/* 802BA10C 002B704C 48 0A 81 1D */ bl _restgpr_29 /* 802BA110 002B7050 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BA114 002B7054 7C 08 03 A6 */ mtlr r0 /* 802BA118 002B7058 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SeMgr.s b/asm/Z2AudioLib/Z2SeMgr.s index 6720c9ab30c..fb1eb81a326 100644 --- a/asm/Z2AudioLib/Z2SeMgr.s +++ b/asm/Z2AudioLib/Z2SeMgr.s @@ -2826,7 +2826,7 @@ Z2SeMgr_NS_setLevObjSE: /* 802ADE60 002AADA0 7C 08 02 A6 */ mflr r0 /* 802ADE64 002AADA4 90 01 00 34 */ stw r0, 0x34(r1) /* 802ADE68 002AADA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ADE6C 002AADAC 48 0B 43 71 */ bl func_803621DC +/* 802ADE6C 002AADAC 48 0B 43 71 */ bl _savegpr_29 /* 802ADE70 002AADB0 7C 7E 1B 78 */ mr r30, r3 /* 802ADE74 002AADB4 7C DF 33 78 */ mr r31, r6 /* 802ADE78 002AADB8 38 60 00 00 */ li r3, 0 @@ -2930,7 +2930,7 @@ lbl_802ADFA0: /* 802ADFD8 002AAF18 9B E4 00 88 */ stb r31, 0x88(r4) lbl_802ADFDC: /* 802ADFDC 002AAF1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ADFE0 002AAF20 48 0B 42 49 */ bl func_80362228 +/* 802ADFE0 002AAF20 48 0B 42 49 */ bl _restgpr_29 /* 802ADFE4 002AAF24 80 01 00 34 */ lwz r0, 0x34(r1) /* 802ADFE8 002AAF28 7C 08 03 A6 */ mtlr r0 /* 802ADFEC 002AAF2C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2942,7 +2942,7 @@ Z2SeMgr_NS_setMultiTriggerSE: /* 802ADFF8 002AAF38 7C 08 02 A6 */ mflr r0 /* 802ADFFC 002AAF3C 90 01 00 34 */ stw r0, 0x34(r1) /* 802AE000 002AAF40 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AE004 002AAF44 48 0B 41 D9 */ bl func_803621DC +/* 802AE004 002AAF44 48 0B 41 D9 */ bl _savegpr_29 /* 802AE008 002AAF48 7C 7E 1B 78 */ mr r30, r3 /* 802AE00C 002AAF4C 7C DF 33 78 */ mr r31, r6 /* 802AE010 002AAF50 38 E0 00 00 */ li r7, 0 @@ -3044,7 +3044,7 @@ lbl_802AE130: /* 802AE168 002AB0A8 9B E4 01 F4 */ stb r31, 0x1f4(r4) lbl_802AE16C: /* 802AE16C 002AB0AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AE170 002AB0B0 48 0B 40 B9 */ bl func_80362228 +/* 802AE170 002AB0B0 48 0B 40 B9 */ bl _restgpr_29 /* 802AE174 002AB0B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AE178 002AB0B8 7C 08 03 A6 */ mtlr r0 /* 802AE17C 002AB0BC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2SeqMgr.s b/asm/Z2AudioLib/Z2SeqMgr.s index 93062217e5f..19323be938c 100644 --- a/asm/Z2AudioLib/Z2SeqMgr.s +++ b/asm/Z2AudioLib/Z2SeqMgr.s @@ -387,7 +387,7 @@ Z2SeqMgr_NS_bgmStop: /* 802AF40C 002AC34C 7C 08 02 A6 */ mflr r0 /* 802AF410 002AC350 90 01 00 24 */ stw r0, 0x24(r1) /* 802AF414 002AC354 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AF418 002AC358 48 0B 2D C5 */ bl func_803621DC +/* 802AF418 002AC358 48 0B 2D C5 */ bl _savegpr_29 /* 802AF41C 002AC35C 7C 7D 1B 78 */ mr r29, r3 /* 802AF420 002AC360 7C 9E 23 78 */ mr r30, r4 /* 802AF424 002AC364 7C BF 2B 78 */ mr r31, r5 @@ -419,7 +419,7 @@ lbl_802AF468: /* 802AF480 002AC3C0 D0 1D 00 1C */ stfs f0, 0x1c(r29) lbl_802AF484: /* 802AF484 002AC3C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AF488 002AC3C8 48 0B 2D A1 */ bl func_80362228 +/* 802AF488 002AC3C8 48 0B 2D A1 */ bl _restgpr_29 /* 802AF48C 002AC3CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AF490 002AC3D0 7C 08 03 A6 */ mtlr r0 /* 802AF494 002AC3D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1235,7 +1235,7 @@ Z2SeqMgr_NS_changeBgmStatus: /* 802AFFB0 002ACEF0 DB 81 00 40 */ stfd f28, 0x40(r1) /* 802AFFB4 002ACEF4 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 802AFFB8 002ACEF8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802AFFBC 002ACEFC 48 0B 22 21 */ bl func_803621DC +/* 802AFFBC 002ACEFC 48 0B 22 21 */ bl _savegpr_29 /* 802AFFC0 002ACF00 7C 7D 1B 78 */ mr r29, r3 /* 802AFFC4 002ACF04 7C 9E 23 78 */ mr r30, r4 /* 802AFFC8 002ACF08 80 63 00 00 */ lwz r3, 0(r3) @@ -3260,7 +3260,7 @@ lbl_802B1DBC: /* 802B1DD4 002AED14 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 802B1DD8 002AED18 CB 81 00 40 */ lfd f28, 0x40(r1) /* 802B1DDC 002AED1C 39 61 00 40 */ addi r11, r1, 0x40 -/* 802B1DE0 002AED20 48 0B 04 49 */ bl func_80362228 +/* 802B1DE0 002AED20 48 0B 04 49 */ bl _restgpr_29 /* 802B1DE4 002AED24 80 01 00 84 */ lwz r0, 0x84(r1) /* 802B1DE8 002AED28 7C 08 03 A6 */ mtlr r0 /* 802B1DEC 002AED2C 38 21 00 80 */ addi r1, r1, 0x80 @@ -5658,7 +5658,7 @@ Z2SeqMgr_NS_setChildTrackVolume: /* 802B4008 002B0F48 DB A1 00 20 */ stfd f29, 0x20(r1) /* 802B400C 002B0F4C F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 802B4010 002B0F50 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B4014 002B0F54 48 0A E1 C9 */ bl func_803621DC +/* 802B4014 002B0F54 48 0A E1 C9 */ bl _savegpr_29 /* 802B4018 002B0F58 7C BD 2B 78 */ mr r29, r5 /* 802B401C 002B0F5C FF A0 08 90 */ fmr f29, f1 /* 802B4020 002B0F60 7C DE 33 78 */ mr r30, r6 @@ -5726,7 +5726,7 @@ lbl_802B40F8: /* 802B4108 002B1048 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 802B410C 002B104C CB A1 00 20 */ lfd f29, 0x20(r1) /* 802B4110 002B1050 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B4114 002B1054 48 0A E1 15 */ bl func_80362228 +/* 802B4114 002B1054 48 0A E1 15 */ bl _restgpr_29 /* 802B4118 002B1058 80 01 00 54 */ lwz r0, 0x54(r1) /* 802B411C 002B105C 7C 08 03 A6 */ mtlr r0 /* 802B4120 002B1060 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/Z2AudioLib/Z2SoundInfo.s b/asm/Z2AudioLib/Z2SoundInfo.s index 2ed8b8d3aec..101ccaf2905 100644 --- a/asm/Z2AudioLib/Z2SoundInfo.s +++ b/asm/Z2AudioLib/Z2SoundInfo.s @@ -811,7 +811,7 @@ Z2SoundInfo_NS_getSoundInfo_: /* 802BBB4C 002B8A8C 7C 08 02 A6 */ mflr r0 /* 802BBB50 002B8A90 90 01 00 34 */ stw r0, 0x34(r1) /* 802BBB54 002B8A94 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BBB58 002B8A98 48 0A 66 85 */ bl func_803621DC +/* 802BBB58 002B8A98 48 0A 66 85 */ bl _savegpr_29 /* 802BBB5C 002B8A9C 7C 9D 23 78 */ mr r29, r4 /* 802BBB60 002B8AA0 7C BE 2B 78 */ mr r30, r5 /* 802BBB64 002B8AA4 80 04 00 00 */ lwz r0, 0(r4) @@ -841,7 +841,7 @@ Z2SoundInfo_NS_getSoundInfo_: /* 802BBBC4 002B8B04 D0 1E 00 3C */ stfs f0, 0x3c(r30) lbl_802BBBC8: /* 802BBBC8 002B8B08 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BBBCC 002B8B0C 48 0A 66 5D */ bl func_80362228 +/* 802BBBCC 002B8B0C 48 0A 66 5D */ bl _restgpr_29 /* 802BBBD0 002B8B10 80 01 00 34 */ lwz r0, 0x34(r1) /* 802BBBD4 002B8B14 7C 08 03 A6 */ mtlr r0 /* 802BBBD8 002B8B18 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2SoundObject.s b/asm/Z2AudioLib/Z2SoundObject.s index fd7e059bc05..298d3c3b149 100644 --- a/asm/Z2AudioLib/Z2SoundObject.s +++ b/asm/Z2AudioLib/Z2SoundObject.s @@ -119,7 +119,7 @@ lbl_802BE060: /* 802BE074 002BAFB4 7C 08 02 A6 */ mflr r0 /* 802BE078 002BAFB8 90 01 00 24 */ stw r0, 0x24(r1) /* 802BE07C 002BAFBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE080 002BAFC0 48 0A 41 5D */ bl func_803621DC +/* 802BE080 002BAFC0 48 0A 41 5D */ bl _savegpr_29 /* 802BE084 002BAFC4 7C 7D 1B 78 */ mr r29, r3 /* 802BE088 002BAFC8 83 C3 00 00 */ lwz r30, 0(r3) /* 802BE08C 002BAFCC 48 00 00 50 */ b lbl_802BE0DC @@ -151,7 +151,7 @@ lbl_802BE0DC: /* 802BE0E4 002BB024 38 00 00 00 */ li r0, 0 /* 802BE0E8 002BB028 98 1D 00 1F */ stb r0, 0x1f(r29) /* 802BE0EC 002BB02C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE0F0 002BB030 48 0A 41 39 */ bl func_80362228 +/* 802BE0F0 002BB030 48 0A 41 39 */ bl _restgpr_29 /* 802BE0F4 002BB034 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BE0F8 002BB038 7C 08 03 A6 */ mtlr r0 /* 802BE0FC 002BB03C 38 21 00 20 */ addi r1, r1, 0x20 @@ -588,7 +588,7 @@ lbl_802BE700: /* 802BE718 002BB658 7C 08 02 A6 */ mflr r0 /* 802BE71C 002BB65C 90 01 00 24 */ stw r0, 0x24(r1) /* 802BE720 002BB660 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE724 002BB664 48 0A 3A B9 */ bl func_803621DC +/* 802BE724 002BB664 48 0A 3A B9 */ bl _savegpr_29 /* 802BE728 002BB668 7C 7D 1B 78 */ mr r29, r3 /* 802BE72C 002BB66C 83 E3 00 18 */ lwz r31, 0x18(r3) /* 802BE730 002BB670 38 00 00 00 */ li r0, 0 @@ -618,7 +618,7 @@ lbl_802BE78C: /* 802BE78C 002BB6CC 93 FD 00 18 */ stw r31, 0x18(r29) /* 802BE790 002BB6D0 7F C3 F3 78 */ mr r3, r30 /* 802BE794 002BB6D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE798 002BB6D8 48 0A 3A 91 */ bl func_80362228 +/* 802BE798 002BB6D8 48 0A 3A 91 */ bl _restgpr_29 /* 802BE79C 002BB6DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BE7A0 002BB6E0 7C 08 03 A6 */ mtlr r0 /* 802BE7A4 002BB6E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -627,7 +627,7 @@ lbl_802BE78C: /* 802BE7B0 002BB6F0 7C 08 02 A6 */ mflr r0 /* 802BE7B4 002BB6F4 90 01 00 24 */ stw r0, 0x24(r1) /* 802BE7B8 002BB6F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE7BC 002BB6FC 48 0A 3A 21 */ bl func_803621DC +/* 802BE7BC 002BB6FC 48 0A 3A 21 */ bl _savegpr_29 /* 802BE7C0 002BB700 7C 7D 1B 78 */ mr r29, r3 /* 802BE7C4 002BB704 83 E3 00 18 */ lwz r31, 0x18(r3) /* 802BE7C8 002BB708 38 00 00 00 */ li r0, 0 @@ -657,7 +657,7 @@ lbl_802BE824: /* 802BE824 002BB764 93 FD 00 18 */ stw r31, 0x18(r29) /* 802BE828 002BB768 7F C3 F3 78 */ mr r3, r30 /* 802BE82C 002BB76C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BE830 002BB770 48 0A 39 F9 */ bl func_80362228 +/* 802BE830 002BB770 48 0A 39 F9 */ bl _restgpr_29 /* 802BE834 002BB774 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BE838 002BB778 7C 08 03 A6 */ mtlr r0 /* 802BE83C 002BB77C 38 21 00 20 */ addi r1, r1, 0x20 @@ -694,7 +694,7 @@ Z2SoundObjSimple: /* 802BE8AC 002BB7EC DB E1 00 30 */ stfd f31, 0x30(r1) /* 802BE8B0 002BB7F0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802BE8B4 002BB7F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BE8B8 002BB7F8 48 0A 39 25 */ bl func_803621DC +/* 802BE8B8 002BB7F8 48 0A 39 25 */ bl _savegpr_29 /* 802BE8BC 002BB7FC 7C 9D 23 78 */ mr r29, r4 /* 802BE8C0 002BB800 7C BE 2B 78 */ mr r30, r5 /* 802BE8C4 002BB804 80 04 00 00 */ lwz r0, 0(r4) @@ -752,7 +752,7 @@ lbl_802BE98C: /* 802BE990 002BB8D0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802BE994 002BB8D4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802BE998 002BB8D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BE99C 002BB8DC 48 0A 38 8D */ bl func_80362228 +/* 802BE99C 002BB8DC 48 0A 38 8D */ bl _restgpr_29 /* 802BE9A0 002BB8E0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BE9A4 002BB8E4 7C 08 03 A6 */ mtlr r0 /* 802BE9A8 002BB8E8 38 21 00 40 */ addi r1, r1, 0x40 @@ -763,7 +763,7 @@ lbl_802BE98C: /* 802BE9BC 002BB8FC DB E1 00 30 */ stfd f31, 0x30(r1) /* 802BE9C0 002BB900 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 802BE9C4 002BB904 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BE9C8 002BB908 48 0A 38 15 */ bl func_803621DC +/* 802BE9C8 002BB908 48 0A 38 15 */ bl _savegpr_29 /* 802BE9CC 002BB90C 7C 9D 23 78 */ mr r29, r4 /* 802BE9D0 002BB910 7C BE 2B 78 */ mr r30, r5 /* 802BE9D4 002BB914 80 04 00 00 */ lwz r0, 0(r4) @@ -855,7 +855,7 @@ lbl_802BEB14: /* 802BEB18 002BBA58 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802BEB1C 002BBA5C CB E1 00 30 */ lfd f31, 0x30(r1) /* 802BEB20 002BBA60 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BEB24 002BBA64 48 0A 37 05 */ bl func_80362228 +/* 802BEB24 002BBA64 48 0A 37 05 */ bl _restgpr_29 /* 802BEB28 002BBA68 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BEB2C 002BBA6C 7C 08 03 A6 */ mtlr r0 /* 802BEB30 002BBA70 38 21 00 40 */ addi r1, r1, 0x40 @@ -923,7 +923,7 @@ Z2SoundObjAnime_NS_initAnime: /* 802BEC10 002BBB50 DB C1 00 20 */ stfd f30, 0x20(r1) /* 802BEC14 002BBB54 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 802BEC18 002BBB58 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BEC1C 002BBB5C 48 0A 35 C1 */ bl func_803621DC +/* 802BEC1C 002BBB5C 48 0A 35 C1 */ bl _savegpr_29 /* 802BEC20 002BBB60 7C 7F 1B 78 */ mr r31, r3 /* 802BEC24 002BBB64 7C 9D 23 78 */ mr r29, r4 /* 802BEC28 002BBB68 7C BE 2B 78 */ mr r30, r5 @@ -1006,7 +1006,7 @@ lbl_802BED40: /* 802BED48 002BBC88 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 802BED4C 002BBC8C CB C1 00 20 */ lfd f30, 0x20(r1) /* 802BED50 002BBC90 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BED54 002BBC94 48 0A 34 D5 */ bl func_80362228 +/* 802BED54 002BBC94 48 0A 34 D5 */ bl _restgpr_29 /* 802BED58 002BBC98 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BED5C 002BBC9C 7C 08 03 A6 */ mtlr r0 /* 802BED60 002BBCA0 38 21 00 40 */ addi r1, r1, 0x40 @@ -1129,7 +1129,7 @@ Z2SoundObjAnime_NS_updateAnime: /* 802BEEE8 002BBE28 DB C1 00 20 */ stfd f30, 0x20(r1) /* 802BEEEC 002BBE2C F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 802BEEF0 002BBE30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BEEF4 002BBE34 48 0A 32 E9 */ bl func_803621DC +/* 802BEEF4 002BBE34 48 0A 32 E9 */ bl _savegpr_29 /* 802BEEF8 002BBE38 7C 7F 1B 78 */ mr r31, r3 /* 802BEEFC 002BBE3C FF C0 08 90 */ fmr f30, f1 /* 802BEF00 002BBE40 FF E0 10 90 */ fmr f31, f2 @@ -1422,7 +1422,7 @@ lbl_802BF2DC: /* 802BF2E4 002BC224 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 802BF2E8 002BC228 CB C1 00 20 */ lfd f30, 0x20(r1) /* 802BF2EC 002BC22C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802BF2F0 002BC230 48 0A 2F 39 */ bl func_80362228 +/* 802BF2F0 002BC230 48 0A 2F 39 */ bl _restgpr_29 /* 802BF2F4 002BC234 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BF2F8 002BC238 7C 08 03 A6 */ mtlr r0 /* 802BF2FC 002BC23C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/Z2AudioLib/Z2SoundStarter.s b/asm/Z2AudioLib/Z2SoundStarter.s index eb6b2a1c8db..fd40c173f79 100644 --- a/asm/Z2AudioLib/Z2SoundStarter.s +++ b/asm/Z2AudioLib/Z2SoundStarter.s @@ -241,7 +241,7 @@ Z2SoundStarter_NS_setPortData: /* 802AAEE0 002A7E20 7C 08 02 A6 */ mflr r0 /* 802AAEE4 002A7E24 90 01 00 24 */ stw r0, 0x24(r1) /* 802AAEE8 002A7E28 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AAEEC 002A7E2C 48 0B 72 F1 */ bl func_803621DC +/* 802AAEEC 002A7E2C 48 0B 72 F1 */ bl _savegpr_29 /* 802AAEF0 002A7E30 7C BD 2B 78 */ mr r29, r5 /* 802AAEF4 002A7E34 7C DE 33 78 */ mr r30, r6 /* 802AAEF8 002A7E38 7C FF 3B 78 */ mr r31, r7 @@ -273,7 +273,7 @@ lbl_802AAF4C: /* 802AAF58 002A7E98 4B FE 79 C1 */ bl JASTrack_NS_writePort lbl_802AAF5C: /* 802AAF5C 002A7E9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802AAF60 002A7EA0 48 0B 72 C9 */ bl func_80362228 +/* 802AAF60 002A7EA0 48 0B 72 C9 */ bl _restgpr_29 /* 802AAF64 002A7EA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AAF68 002A7EA8 7C 08 03 A6 */ mtlr r0 /* 802AAF6C 002A7EAC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2SpeechMgr2.s b/asm/Z2AudioLib/Z2SpeechMgr2.s index 9a1adc9b4ed..ec6c22a42d5 100644 --- a/asm/Z2AudioLib/Z2SpeechMgr2.s +++ b/asm/Z2AudioLib/Z2SpeechMgr2.s @@ -377,7 +377,7 @@ Z2SpeechMgr2_NS_speakOneWord: /* 802CC194 002C90D4 7C 08 02 A6 */ mflr r0 /* 802CC198 002C90D8 90 01 00 34 */ stw r0, 0x34(r1) /* 802CC19C 002C90DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CC1A0 002C90E0 48 09 60 3D */ bl func_803621DC +/* 802CC1A0 002C90E0 48 09 60 3D */ bl _savegpr_29 /* 802CC1A4 002C90E4 7C 7E 1B 78 */ mr r30, r3 /* 802CC1A8 002C90E8 7C 9F 23 78 */ mr r31, r4 /* 802CC1AC 002C90EC 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) @@ -463,7 +463,7 @@ lbl_802CC21C: /* 802CC2E0 002C9220 48 00 01 E1 */ bl Z2SpeechMgr2_NS_selectUnit lbl_802CC2E4: /* 802CC2E4 002C9224 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CC2E8 002C9228 48 09 5F 41 */ bl func_80362228 +/* 802CC2E8 002C9228 48 09 5F 41 */ bl _restgpr_29 /* 802CC2EC 002C922C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CC2F0 002C9230 7C 08 03 A6 */ mtlr r0 /* 802CC2F4 002C9234 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/Z2AudioLib/Z2StatusMgr.s b/asm/Z2AudioLib/Z2StatusMgr.s index d1c68c7c3bb..ec554d86165 100644 --- a/asm/Z2AudioLib/Z2StatusMgr.s +++ b/asm/Z2AudioLib/Z2StatusMgr.s @@ -222,7 +222,7 @@ Z2StatusMgr_NS_setDemoName: /* 802B61EC 002B312C 7C 08 02 A6 */ mflr r0 /* 802B61F0 002B3130 90 01 00 24 */ stw r0, 0x24(r1) /* 802B61F4 002B3134 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B61F8 002B3138 48 0A BF E5 */ bl func_803621DC +/* 802B61F8 002B3138 48 0A BF E5 */ bl _savegpr_29 /* 802B61FC 002B313C 7C 7D 1B 78 */ mr r29, r3 /* 802B6200 002B3140 7C 9E 23 78 */ mr r30, r4 /* 802B6204 002B3144 88 03 00 2C */ lbz r0, 0x2c(r3) @@ -569,7 +569,7 @@ lbl_802B66F0: /* 802B6700 002B3640 98 1D 00 2C */ stb r0, 0x2c(r29) lbl_802B6704: /* 802B6704 002B3644 39 61 00 20 */ addi r11, r1, 0x20 -/* 802B6708 002B3648 48 0A BB 21 */ bl func_80362228 +/* 802B6708 002B3648 48 0A BB 21 */ bl _restgpr_29 /* 802B670C 002B364C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B6710 002B3650 7C 08 03 A6 */ mtlr r0 /* 802B6714 002B3654 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/Z2AudioLib/Z2WolfHowlMgr.s b/asm/Z2AudioLib/Z2WolfHowlMgr.s index 494e2b39cf9..dea2d14d3de 100644 --- a/asm/Z2AudioLib/Z2WolfHowlMgr.s +++ b/asm/Z2AudioLib/Z2WolfHowlMgr.s @@ -464,7 +464,7 @@ Z2WolfHowlMgr_NS_setCorrectData: /* 802CB104 002C8044 7C 08 02 A6 */ mflr r0 /* 802CB108 002C8048 90 01 00 34 */ stw r0, 0x34(r1) /* 802CB10C 002C804C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB110 002C8050 48 09 70 CD */ bl func_803621DC +/* 802CB110 002C8050 48 09 70 CD */ bl _savegpr_29 /* 802CB114 002C8054 7C 7F 1B 78 */ mr r31, r3 /* 802CB118 002C8058 7C 86 07 74 */ extsb r6, r4 /* 802CB11C 002C805C 88 03 00 8E */ lbz r0, 0x8e(r3) @@ -606,7 +606,7 @@ lbl_802CB2E0: /* 802CB304 002C8244 B0 1F 00 BE */ sth r0, 0xbe(r31) lbl_802CB308: /* 802CB308 002C8248 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CB30C 002C824C 48 09 6F 1D */ bl func_80362228 +/* 802CB30C 002C824C 48 09 6F 1D */ bl _restgpr_29 /* 802CB310 002C8250 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CB314 002C8254 7C 08 03 A6 */ mtlr r0 /* 802CB318 002C8258 38 21 00 30 */ addi r1, r1, 0x30 @@ -899,7 +899,7 @@ lbl_802CB6D8: /* 802CB6F0 002C8630 7C 08 02 A6 */ mflr r0 /* 802CB6F4 002C8634 90 01 00 44 */ stw r0, 0x44(r1) /* 802CB6F8 002C8638 39 61 00 40 */ addi r11, r1, 0x40 -/* 802CB6FC 002C863C 48 09 6A E1 */ bl func_803621DC +/* 802CB6FC 002C863C 48 09 6A E1 */ bl _savegpr_29 /* 802CB700 002C8640 7C 7D 1B 78 */ mr r29, r3 /* 802CB704 002C8644 7C 9E 23 78 */ mr r30, r4 /* 802CB708 002C8648 7C BF 2B 79 */ or. r31, r5, r5 @@ -1146,7 +1146,7 @@ lbl_802CBA5C: /* 802CBA6C 002C89AC 4B FD 73 49 */ bl JAISoundParamsMove_NS_moveVolume lbl_802CBA70: /* 802CBA70 002C89B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802CBA74 002C89B4 48 09 67 B5 */ bl func_80362228 +/* 802CBA74 002C89B4 48 09 67 B5 */ bl _restgpr_29 /* 802CBA78 002C89B8 80 01 00 44 */ lwz r0, 0x44(r1) /* 802CBA7C 002C89BC 7C 08 03 A6 */ mtlr r0 /* 802CBA80 002C89C0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/clib.s b/asm/clib.s index 08d83f02281..41c23bc9ca6 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -573,8 +573,8 @@ func_803621D4: func_803621D8: /* 803621D8 0035F118 93 8B FF F0 */ stw r28, -0x10(r11) -.global func_803621DC -func_803621DC: +.global _savegpr_29 +_savegpr_29: /* 803621DC 0035F11C 93 AB FF F4 */ stw r29, -0xc(r11) /* 803621E0 0035F120 93 CB FF F8 */ stw r30, -8(r11) /* 803621E4 0035F124 93 EB FF FC */ stw r31, -4(r11) @@ -640,8 +640,8 @@ func_80362220: func_80362224: /* 80362224 0035F164 83 8B FF F0 */ lwz r28, -0x10(r11) -.global func_80362228 -func_80362228: +.global _restgpr_29 +_restgpr_29: /* 80362228 0035F168 83 AB FF F4 */ lwz r29, -0xc(r11) /* 8036222C 0035F16C 83 CB FF F8 */ lwz r30, -8(r11) /* 80362230 0035F170 83 EB FF FC */ lwz r31, -4(r11) diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index ed47ea4dead..fa5d275e02a 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -222,7 +222,7 @@ daAlink_c_NS_coHitCallback: /* 8009DB68 0009AAA8 7C 08 02 A6 */ mflr r0 /* 8009DB6C 0009AAAC 90 01 00 24 */ stw r0, 0x24(r1) /* 8009DB70 0009AAB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009DB74 0009AAB4 48 2C 46 69 */ bl func_803621DC +/* 8009DB74 0009AAB4 48 2C 46 69 */ bl _savegpr_29 /* 8009DB78 0009AAB8 7C 7E 1B 78 */ mr r30, r3 /* 8009DB7C 0009AABC 7C 9D 23 78 */ mr r29, r4 /* 8009DB80 0009AAC0 7C BF 2B 78 */ mr r31, r5 @@ -287,7 +287,7 @@ lbl_8009DC48: /* 8009DC50 0009AB90 90 1E 05 8C */ stw r0, 0x58c(r30) lbl_8009DC54: /* 8009DC54 0009AB94 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009DC58 0009AB98 48 2C 45 D1 */ bl func_80362228 +/* 8009DC58 0009AB98 48 2C 45 D1 */ bl _restgpr_29 /* 8009DC5C 0009AB9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009DC60 0009ABA0 7C 08 03 A6 */ mtlr r0 /* 8009DC64 0009ABA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1451,7 +1451,7 @@ daAlink_c_NS_headModelCallBack: /* 8009ECA4 0009BBE4 7C 08 02 A6 */ mflr r0 /* 8009ECA8 0009BBE8 90 01 00 24 */ stw r0, 0x24(r1) /* 8009ECAC 0009BBEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009ECB0 0009BBF0 48 2C 35 2D */ bl func_803621DC +/* 8009ECB0 0009BBF0 48 2C 35 2D */ bl _savegpr_29 /* 8009ECB4 0009BBF4 7C 7F 1B 78 */ mr r31, r3 /* 8009ECB8 0009BBF8 7C 9E 23 78 */ mr r30, r4 /* 8009ECBC 0009BBFC 80 63 06 B0 */ lwz r3, 0x6b0(r3) @@ -1617,7 +1617,7 @@ lbl_8009EEAC: lbl_8009EF1C: /* 8009EF1C 0009BE5C 38 60 00 01 */ li r3, 1 /* 8009EF20 0009BE60 39 61 00 20 */ addi r11, r1, 0x20 -/* 8009EF24 0009BE64 48 2C 33 05 */ bl func_80362228 +/* 8009EF24 0009BE64 48 2C 33 05 */ bl _restgpr_29 /* 8009EF28 0009BE68 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009EF2C 0009BE6C 7C 08 03 A6 */ mtlr r0 /* 8009EF30 0009BE70 38 21 00 20 */ addi r1, r1, 0x20 @@ -5290,7 +5290,7 @@ daAlink_c_NS_setMoveSlantAngle: /* 800A22F4 0009F234 DB E1 00 40 */ stfd f31, 0x40(r1) /* 800A22F8 0009F238 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 800A22FC 0009F23C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800A2300 0009F240 48 2B FE DD */ bl func_803621DC +/* 800A2300 0009F240 48 2B FE DD */ bl _savegpr_29 /* 800A2304 0009F244 7C 7E 1B 78 */ mr r30, r3 /* 800A2308 0009F248 C0 23 05 2C */ lfs f1, 0x52c(r3) /* 800A230C 0009F24C C0 03 05 94 */ lfs f0, 0x594(r3) @@ -5574,7 +5574,7 @@ lbl_800A26F0: /* 800A26F0 0009F630 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 800A26F4 0009F634 CB E1 00 40 */ lfd f31, 0x40(r1) /* 800A26F8 0009F638 39 61 00 40 */ addi r11, r1, 0x40 -/* 800A26FC 0009F63C 48 2B FB 2D */ bl func_80362228 +/* 800A26FC 0009F63C 48 2B FB 2D */ bl _restgpr_29 /* 800A2700 0009F640 80 01 00 54 */ lwz r0, 0x54(r1) /* 800A2704 0009F644 7C 08 03 A6 */ mtlr r0 /* 800A2708 0009F648 38 21 00 50 */ addi r1, r1, 0x50 @@ -7260,7 +7260,7 @@ daAlink_c_NS_initDemoModel: /* 800A3F04 000A0E44 7C 08 02 A6 */ mflr r0 /* 800A3F08 000A0E48 90 01 00 24 */ stw r0, 0x24(r1) /* 800A3F0C 000A0E4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A3F10 000A0E50 48 2B E2 CD */ bl func_803621DC +/* 800A3F10 000A0E50 48 2B E2 CD */ bl _savegpr_29 /* 800A3F14 000A0E54 7C 7D 1B 78 */ mr r29, r3 /* 800A3F18 000A0E58 7C 9E 23 78 */ mr r30, r4 /* 800A3F1C 000A0E5C 7C DF 33 78 */ mr r31, r6 @@ -7291,7 +7291,7 @@ lbl_800A3F7C: /* 800A3F7C 000A0EBC 38 60 00 01 */ li r3, 1 lbl_800A3F80: /* 800A3F80 000A0EC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A3F84 000A0EC4 48 2B E2 A5 */ bl func_80362228 +/* 800A3F84 000A0EC4 48 2B E2 A5 */ bl _restgpr_29 /* 800A3F88 000A0EC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A3F8C 000A0ECC 7C 08 03 A6 */ mtlr r0 /* 800A3F90 000A0ED0 38 21 00 20 */ addi r1, r1, 0x20 @@ -7303,7 +7303,7 @@ daAlink_c_NS_initDemoBck: /* 800A3F9C 000A0EDC 7C 08 02 A6 */ mflr r0 /* 800A3FA0 000A0EE0 90 01 00 24 */ stw r0, 0x24(r1) /* 800A3FA4 000A0EE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A3FA8 000A0EE8 48 2B E2 35 */ bl func_803621DC +/* 800A3FA8 000A0EE8 48 2B E2 35 */ bl _savegpr_29 /* 800A3FAC 000A0EEC 7C 7D 1B 78 */ mr r29, r3 /* 800A3FB0 000A0EF0 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 800A3FB4 000A0EF4 38 63 61 94 */ addi r3, r3, lbl_80406194@l @@ -7350,7 +7350,7 @@ lbl_800A404C: /* 800A404C 000A0F8C 38 60 00 01 */ li r3, 1 lbl_800A4050: /* 800A4050 000A0F90 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A4054 000A0F94 48 2B E1 D5 */ bl func_80362228 +/* 800A4054 000A0F94 48 2B E1 D5 */ bl _restgpr_29 /* 800A4058 000A0F98 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A405C 000A0F9C 7C 08 03 A6 */ mtlr r0 /* 800A4060 000A0FA0 38 21 00 20 */ addi r1, r1, 0x20 @@ -10057,7 +10057,7 @@ daAlink_c_NS_setRoomInfo: /* 800A6630 000A3570 7C 08 02 A6 */ mflr r0 /* 800A6634 000A3574 90 01 00 24 */ stw r0, 0x24(r1) /* 800A6638 000A3578 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A663C 000A357C 48 2B BB A1 */ bl func_803621DC +/* 800A663C 000A357C 48 2B BB A1 */ bl _savegpr_29 /* 800A6640 000A3580 7C 7E 1B 78 */ mr r30, r3 /* 800A6644 000A3584 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) /* 800A6648 000A3588 28 00 01 58 */ cmplwi r0, 0x158 @@ -10166,7 +10166,7 @@ lbl_800A67BC: lbl_800A67C4: /* 800A67C4 000A3704 7F E3 FB 78 */ mr r3, r31 /* 800A67C8 000A3708 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A67CC 000A370C 48 2B BA 5D */ bl func_80362228 +/* 800A67CC 000A370C 48 2B BA 5D */ bl _restgpr_29 /* 800A67D0 000A3710 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A67D4 000A3714 7C 08 03 A6 */ mtlr r0 /* 800A67D8 000A3718 38 21 00 20 */ addi r1, r1, 0x20 @@ -10986,7 +10986,7 @@ daAlink_c_NS_setPolygonSpeed: /* 800A736C 000A42AC DB C1 00 80 */ stfd f30, 0x80(r1) /* 800A7370 000A42B0 F3 C1 00 88 */ psq_st f30, 136(r1), 0, qr0 /* 800A7374 000A42B4 39 61 00 80 */ addi r11, r1, 0x80 -/* 800A7378 000A42B8 48 2B AE 65 */ bl func_803621DC +/* 800A7378 000A42B8 48 2B AE 65 */ bl _savegpr_29 /* 800A737C 000A42BC 7C 7E 1B 78 */ mr r30, r3 /* 800A7380 000A42C0 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800A7384 000A42C4 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -11387,7 +11387,7 @@ lbl_800A7928: /* 800A7930 000A4870 E3 C1 00 88 */ psq_l f30, 136(r1), 0, qr0 /* 800A7934 000A4874 CB C1 00 80 */ lfd f30, 0x80(r1) /* 800A7938 000A4878 39 61 00 80 */ addi r11, r1, 0x80 -/* 800A793C 000A487C 48 2B A8 ED */ bl func_80362228 +/* 800A793C 000A487C 48 2B A8 ED */ bl _restgpr_29 /* 800A7940 000A4880 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800A7944 000A4884 7C 08 03 A6 */ mtlr r0 /* 800A7948 000A4888 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -11445,7 +11445,7 @@ daAlink_c_NS_checkWindSpeedOnAngleAnime: /* 800A79F0 000A4930 7C 08 02 A6 */ mflr r0 /* 800A79F4 000A4934 90 01 00 24 */ stw r0, 0x24(r1) /* 800A79F8 000A4938 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A79FC 000A493C 48 2B A7 E1 */ bl func_803621DC +/* 800A79FC 000A493C 48 2B A7 E1 */ bl _savegpr_29 /* 800A7A00 000A4940 7C 7D 1B 78 */ mr r29, r3 /* 800A7A04 000A4944 7C 9E 23 78 */ mr r30, r4 /* 800A7A08 000A4948 3B E0 00 00 */ li r31, 0 @@ -11466,7 +11466,7 @@ lbl_800A7A3C: lbl_800A7A40: /* 800A7A40 000A4980 7F E3 FB 78 */ mr r3, r31 /* 800A7A44 000A4984 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A7A48 000A4988 48 2B A7 E1 */ bl func_80362228 +/* 800A7A48 000A4988 48 2B A7 E1 */ bl _restgpr_29 /* 800A7A4C 000A498C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A7A50 000A4990 7C 08 03 A6 */ mtlr r0 /* 800A7A54 000A4994 38 21 00 20 */ addi r1, r1, 0x20 @@ -11648,7 +11648,7 @@ daAlink_c_NS_setWindSpeed: /* 800A7CBC 000A4BFC DB E1 00 70 */ stfd f31, 0x70(r1) /* 800A7CC0 000A4C00 F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 800A7CC4 000A4C04 39 61 00 70 */ addi r11, r1, 0x70 -/* 800A7CC8 000A4C08 48 2B A5 15 */ bl func_803621DC +/* 800A7CC8 000A4C08 48 2B A5 15 */ bl _savegpr_29 /* 800A7CCC 000A4C0C 7C 7F 1B 78 */ mr r31, r3 /* 800A7CD0 000A4C10 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800A7CD4 000A4C14 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd @@ -12090,7 +12090,7 @@ lbl_800A82F0: /* 800A82F0 000A5230 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 800A82F4 000A5234 CB E1 00 70 */ lfd f31, 0x70(r1) /* 800A82F8 000A5238 39 61 00 70 */ addi r11, r1, 0x70 -/* 800A82FC 000A523C 48 2B 9F 2D */ bl func_80362228 +/* 800A82FC 000A523C 48 2B 9F 2D */ bl _restgpr_29 /* 800A8300 000A5240 80 01 00 84 */ lwz r0, 0x84(r1) /* 800A8304 000A5244 7C 08 03 A6 */ mtlr r0 /* 800A8308 000A5248 38 21 00 80 */ addi r1, r1, 0x80 @@ -14865,7 +14865,7 @@ daAlink_c_NS_setAtCollision: /* 800AAAD0 000A7A10 DB C1 01 00 */ stfd f30, 0x100(r1) /* 800AAAD4 000A7A14 F3 C1 01 08 */ psq_st f30, 264(r1), 0, qr0 /* 800AAAD8 000A7A18 39 61 01 00 */ addi r11, r1, 0x100 -/* 800AAADC 000A7A1C 48 2B 77 01 */ bl func_803621DC +/* 800AAADC 000A7A1C 48 2B 77 01 */ bl _savegpr_29 /* 800AAAE0 000A7A20 7C 7E 1B 78 */ mr r30, r3 /* 800AAAE4 000A7A24 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800AAAE8 000A7A28 3B E3 D6 58 */ addi r31, r3, lbl_8038D658@l @@ -15789,7 +15789,7 @@ lbl_800AB850: /* 800AB858 000A8798 E3 C1 01 08 */ psq_l f30, 264(r1), 0, qr0 /* 800AB85C 000A879C CB C1 01 00 */ lfd f30, 0x100(r1) /* 800AB860 000A87A0 39 61 01 00 */ addi r11, r1, 0x100 -/* 800AB864 000A87A4 48 2B 69 C5 */ bl func_80362228 +/* 800AB864 000A87A4 48 2B 69 C5 */ bl _restgpr_29 /* 800AB868 000A87A8 80 01 01 24 */ lwz r0, 0x124(r1) /* 800AB86C 000A87AC 7C 08 03 A6 */ mtlr r0 /* 800AB870 000A87B0 38 21 01 20 */ addi r1, r1, 0x120 @@ -16639,7 +16639,7 @@ daAlink_c_NS_getMainBckData: /* 800AC454 000A9394 7C 08 02 A6 */ mflr r0 /* 800AC458 000A9398 90 01 00 24 */ stw r0, 0x24(r1) /* 800AC45C 000A939C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AC460 000A93A0 48 2B 5D 7D */ bl func_803621DC +/* 800AC460 000A93A0 48 2B 5D 7D */ bl _savegpr_29 /* 800AC464 000A93A4 7C 7D 1B 78 */ mr r29, r3 /* 800AC468 000A93A8 7C 9E 23 78 */ mr r30, r4 /* 800AC46C 000A93AC 3C 60 80 39 */ lis r3, lbl_8038D658@ha @@ -16704,7 +16704,7 @@ lbl_800AC534: /* 800AC53C 000A947C 7C 63 02 14 */ add r3, r3, r0 lbl_800AC540: /* 800AC540 000A9480 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AC544 000A9484 48 2B 5C E5 */ bl func_80362228 +/* 800AC544 000A9484 48 2B 5C E5 */ bl _restgpr_29 /* 800AC548 000A9488 80 01 00 24 */ lwz r0, 0x24(r1) /* 800AC54C 000A948C 7C 08 03 A6 */ mtlr r0 /* 800AC550 000A9490 38 21 00 20 */ addi r1, r1, 0x20 @@ -17485,7 +17485,7 @@ daAlink_c_NS_setSingleAnime: /* 800AD028 000A9F68 DB A1 00 20 */ stfd f29, 0x20(r1) /* 800AD02C 000A9F6C F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0 /* 800AD030 000A9F70 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AD034 000A9F74 48 2B 51 A9 */ bl func_803621DC +/* 800AD034 000A9F74 48 2B 51 A9 */ bl _savegpr_29 /* 800AD038 000A9F78 7C 7D 1B 78 */ mr r29, r3 /* 800AD03C 000A9F7C 7C 9E 23 78 */ mr r30, r4 /* 800AD040 000A9F80 FF A0 08 90 */ fmr f29, f1 @@ -17529,7 +17529,7 @@ lbl_800AD0A8: /* 800AD0D4 000AA014 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0 /* 800AD0D8 000AA018 CB A1 00 20 */ lfd f29, 0x20(r1) /* 800AD0DC 000AA01C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AD0E0 000AA020 48 2B 51 49 */ bl func_80362228 +/* 800AD0E0 000AA020 48 2B 51 49 */ bl _restgpr_29 /* 800AD0E4 000AA024 80 01 00 54 */ lwz r0, 0x54(r1) /* 800AD0E8 000AA028 7C 08 03 A6 */ mtlr r0 /* 800AD0EC 000AA02C 38 21 00 50 */ addi r1, r1, 0x50 @@ -18001,7 +18001,7 @@ daAlink_c_NS_resetUpperAnime: /* 800AD730 000AA670 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800AD734 000AA674 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800AD738 000AA678 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AD73C 000AA67C 48 2B 4A A1 */ bl func_803621DC +/* 800AD73C 000AA67C 48 2B 4A A1 */ bl _savegpr_29 /* 800AD740 000AA680 7C 7D 1B 78 */ mr r29, r3 /* 800AD744 000AA684 7C 9E 23 78 */ mr r30, r4 /* 800AD748 000AA688 FF E0 08 90 */ fmr f31, f1 @@ -18119,7 +18119,7 @@ lbl_800AD8B8: /* 800AD8D4 000AA814 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800AD8D8 000AA818 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800AD8DC 000AA81C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AD8E0 000AA820 48 2B 49 49 */ bl func_80362228 +/* 800AD8E0 000AA820 48 2B 49 49 */ bl _restgpr_29 /* 800AD8E4 000AA824 80 01 00 34 */ lwz r0, 0x34(r1) /* 800AD8E8 000AA828 7C 08 03 A6 */ mtlr r0 /* 800AD8EC 000AA82C 38 21 00 30 */ addi r1, r1, 0x30 @@ -20107,7 +20107,7 @@ daAlink_c_NS_setFaceBck: /* 800AF4B4 000AC3F4 7C 08 02 A6 */ mflr r0 /* 800AF4B8 000AC3F8 90 01 00 24 */ stw r0, 0x24(r1) /* 800AF4BC 000AC3FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AF4C0 000AC400 48 2B 2D 1D */ bl func_803621DC +/* 800AF4C0 000AC400 48 2B 2D 1D */ bl _savegpr_29 /* 800AF4C4 000AC404 7C 7F 1B 78 */ mr r31, r3 /* 800AF4C8 000AC408 B0 81 00 08 */ sth r4, 8(r1) /* 800AF4CC 000AC40C 7C BD 2B 78 */ mr r29, r5 @@ -20199,7 +20199,7 @@ lbl_800AF5D0: /* 800AF600 000AC540 D0 1E 00 08 */ stfs f0, 8(r30) lbl_800AF604: /* 800AF604 000AC544 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AF608 000AC548 48 2B 2C 21 */ bl func_80362228 +/* 800AF608 000AC548 48 2B 2C 21 */ bl _restgpr_29 /* 800AF60C 000AC54C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800AF610 000AC550 7C 08 03 A6 */ mtlr r0 /* 800AF614 000AC554 38 21 00 20 */ addi r1, r1, 0x20 @@ -20394,7 +20394,7 @@ daAlink_c_NS_setFaceBasicTexture: /* 800AF8A4 000AC7E4 7C 08 02 A6 */ mflr r0 /* 800AF8A8 000AC7E8 90 01 00 24 */ stw r0, 0x24(r1) /* 800AF8AC 000AC7EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AF8B0 000AC7F0 48 2B 29 2D */ bl func_803621DC +/* 800AF8B0 000AC7F0 48 2B 29 2D */ bl _savegpr_29 /* 800AF8B4 000AC7F4 7C 7D 1B 78 */ mr r29, r3 /* 800AF8B8 000AC7F8 7C 9E 23 78 */ mr r30, r4 /* 800AF8BC 000AC7FC 38 80 00 00 */ li r4, 0 @@ -20458,7 +20458,7 @@ lbl_800AF94C: /* 800AF988 000AC8C8 4B FF FE 49 */ bl daAlink_c_NS_setFaceBtk /* 800AF98C 000AC8CC 7F C3 F3 78 */ mr r3, r30 /* 800AF990 000AC8D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AF994 000AC8D4 48 2B 28 95 */ bl func_80362228 +/* 800AF994 000AC8D4 48 2B 28 95 */ bl _restgpr_29 /* 800AF998 000AC8D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800AF99C 000AC8DC 7C 08 03 A6 */ mtlr r0 /* 800AF9A0 000AC8E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -20976,7 +20976,7 @@ daAlink_c_NS_getGroundAngle: /* 800B009C 000ACFDC 7C 08 02 A6 */ mflr r0 /* 800B00A0 000ACFE0 90 01 00 34 */ stw r0, 0x34(r1) /* 800B00A4 000ACFE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B00A8 000ACFE8 48 2B 21 35 */ bl func_803621DC +/* 800B00A8 000ACFE8 48 2B 21 35 */ bl _savegpr_29 /* 800B00AC 000ACFEC 7C 9D 23 78 */ mr r29, r4 /* 800B00B0 000ACFF0 7C BE 2B 78 */ mr r30, r5 /* 800B00B4 000ACFF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -21017,7 +21017,7 @@ lbl_800B0120: /* 800B0134 000AD074 90 01 00 18 */ stw r0, 0x18(r1) lbl_800B0138: /* 800B0138 000AD078 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B013C 000AD07C 48 2B 20 ED */ bl func_80362228 +/* 800B013C 000AD07C 48 2B 20 ED */ bl _restgpr_29 /* 800B0140 000AD080 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B0144 000AD084 7C 08 03 A6 */ mtlr r0 /* 800B0148 000AD088 38 21 00 30 */ addi r1, r1, 0x30 @@ -21029,7 +21029,7 @@ daAlink_c_NS_getRoofAngle: /* 800B0154 000AD094 7C 08 02 A6 */ mflr r0 /* 800B0158 000AD098 90 01 00 34 */ stw r0, 0x34(r1) /* 800B015C 000AD09C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B0160 000AD0A0 48 2B 20 7D */ bl func_803621DC +/* 800B0160 000AD0A0 48 2B 20 7D */ bl _savegpr_29 /* 800B0164 000AD0A4 7C 9D 23 78 */ mr r29, r4 /* 800B0168 000AD0A8 7C BE 2B 78 */ mr r30, r5 /* 800B016C 000AD0AC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -21066,7 +21066,7 @@ lbl_800B01C0: /* 800B01E0 000AD120 90 01 00 18 */ stw r0, 0x18(r1) lbl_800B01E4: /* 800B01E4 000AD124 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B01E8 000AD128 48 2B 20 41 */ bl func_80362228 +/* 800B01E8 000AD128 48 2B 20 41 */ bl _restgpr_29 /* 800B01EC 000AD12C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B01F0 000AD130 7C 08 03 A6 */ mtlr r0 /* 800B01F4 000AD134 38 21 00 30 */ addi r1, r1, 0x30 @@ -22426,7 +22426,7 @@ daAlink_c_NS_setHangWaterY: /* 800B1550 000AE490 7C 08 02 A6 */ mflr r0 /* 800B1554 000AE494 90 01 00 34 */ stw r0, 0x34(r1) /* 800B1558 000AE498 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B155C 000AE49C 48 2B 0C 81 */ bl func_803621DC +/* 800B155C 000AE49C 48 2B 0C 81 */ bl _savegpr_29 /* 800B1560 000AE4A0 7C 7F 1B 78 */ mr r31, r3 /* 800B1564 000AE4A4 80 63 06 50 */ lwz r3, 0x650(r3) /* 800B1568 000AE4A8 80 63 00 84 */ lwz r3, 0x84(r3) @@ -22546,7 +22546,7 @@ lbl_800B170C: /* 800B170C 000AE64C C0 01 00 18 */ lfs f0, 0x18(r1) /* 800B1710 000AE650 D0 1F 33 BC */ stfs f0, 0x33bc(r31) /* 800B1714 000AE654 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B1718 000AE658 48 2B 0B 11 */ bl func_80362228 +/* 800B1718 000AE658 48 2B 0B 11 */ bl _restgpr_29 /* 800B171C 000AE65C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B1720 000AE660 7C 08 03 A6 */ mtlr r0 /* 800B1724 000AE664 38 21 00 30 */ addi r1, r1, 0x30 @@ -23477,7 +23477,7 @@ lbl_800B23E4: /* 800B2400 000AF340 7C 08 02 A6 */ mflr r0 /* 800B2404 000AF344 90 01 00 24 */ stw r0, 0x24(r1) /* 800B2408 000AF348 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B240C 000AF34C 48 2A FD D1 */ bl func_803621DC +/* 800B240C 000AF34C 48 2A FD D1 */ bl _savegpr_29 /* 800B2410 000AF350 7C 7D 1B 78 */ mr r29, r3 /* 800B2414 000AF354 7C 9E 23 78 */ mr r30, r4 /* 800B2418 000AF358 7C BF 2B 78 */ mr r31, r5 @@ -23534,7 +23534,7 @@ lbl_800B24D4: /* 800B24D8 000AF418 48 1B 14 85 */ bl cCcD_Stts_NS_ClrCcMove lbl_800B24DC: /* 800B24DC 000AF41C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B24E0 000AF420 48 2A FD 49 */ bl func_80362228 +/* 800B24E0 000AF420 48 2A FD 49 */ bl _restgpr_29 /* 800B24E4 000AF424 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B24E8 000AF428 7C 08 03 A6 */ mtlr r0 /* 800B24EC 000AF42C 38 21 00 20 */ addi r1, r1, 0x20 @@ -23716,7 +23716,7 @@ daAlink_c_NS_setStickData: /* 800B2720 000AF660 7C 08 02 A6 */ mflr r0 /* 800B2724 000AF664 90 01 00 24 */ stw r0, 0x24(r1) /* 800B2728 000AF668 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B272C 000AF66C 48 2A FA B1 */ bl func_803621DC +/* 800B272C 000AF66C 48 2A FA B1 */ bl _savegpr_29 /* 800B2730 000AF670 7C 7E 1B 78 */ mr r30, r3 /* 800B2734 000AF674 3B E0 00 00 */ li r31, 0 /* 800B2738 000AF678 88 03 2F 8E */ lbz r0, 0x2f8e(r3) @@ -24245,7 +24245,7 @@ lbl_800B2E5C: /* 800B2E88 000AFDC8 98 03 5E B8 */ stb r0, 0x5eb8(r3) lbl_800B2E8C: /* 800B2E8C 000AFDCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B2E90 000AFDD0 48 2A F3 99 */ bl func_80362228 +/* 800B2E90 000AFDD0 48 2A F3 99 */ bl _restgpr_29 /* 800B2E94 000AFDD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B2E98 000AFDD8 7C 08 03 A6 */ mtlr r0 /* 800B2E9C 000AFDDC 38 21 00 20 */ addi r1, r1, 0x20 @@ -24257,7 +24257,7 @@ daAlink_c_NS_setAtnList: /* 800B2EA8 000AFDE8 7C 08 02 A6 */ mflr r0 /* 800B2EAC 000AFDEC 90 01 00 24 */ stw r0, 0x24(r1) /* 800B2EB0 000AFDF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B2EB4 000AFDF4 48 2A F3 29 */ bl func_803621DC +/* 800B2EB4 000AFDF4 48 2A F3 29 */ bl _savegpr_29 /* 800B2EB8 000AFDF8 7C 7F 1B 78 */ mr r31, r3 /* 800B2EBC 000AFDFC 38 00 00 00 */ li r0, 0 /* 800B2EC0 000AFE00 90 03 27 E4 */ stw r0, 0x27e4(r3) @@ -24497,7 +24497,7 @@ lbl_800B31F0: lbl_800B3204: /* 800B3204 000B0144 98 7F 2D 6A */ stb r3, 0x2d6a(r31) /* 800B3208 000B0148 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B320C 000B014C 48 2A F0 1D */ bl func_80362228 +/* 800B320C 000B014C 48 2A F0 1D */ bl _restgpr_29 /* 800B3210 000B0150 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B3214 000B0154 7C 08 03 A6 */ mtlr r0 /* 800B3218 000B0158 38 21 00 20 */ addi r1, r1, 0x20 @@ -24899,7 +24899,7 @@ daAlink_c_NS_setShapeAngleToAtnActor: /* 800B3738 000B0678 7C 08 02 A6 */ mflr r0 /* 800B373C 000B067C 90 01 00 24 */ stw r0, 0x24(r1) /* 800B3740 000B0680 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B3744 000B0684 48 2A EA 99 */ bl func_803621DC +/* 800B3744 000B0684 48 2A EA 99 */ bl _savegpr_29 /* 800B3748 000B0688 7C 7D 1B 78 */ mr r29, r3 /* 800B374C 000B068C 7C 9E 23 78 */ mr r30, r4 /* 800B3750 000B0690 80 83 27 EC */ lwz r4, 0x27ec(r3) @@ -24965,7 +24965,7 @@ lbl_800B3828: /* 800B3828 000B0768 38 60 00 00 */ li r3, 0 lbl_800B382C: /* 800B382C 000B076C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B3830 000B0770 48 2A E9 F9 */ bl func_80362228 +/* 800B3830 000B0770 48 2A E9 F9 */ bl _restgpr_29 /* 800B3834 000B0774 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B3838 000B0778 7C 08 03 A6 */ mtlr r0 /* 800B383C 000B077C 38 21 00 20 */ addi r1, r1, 0x20 @@ -28557,7 +28557,7 @@ daAlink_c_NS_checkFrontWallTypeAction: /* 800B6A3C 000B397C DB E1 00 50 */ stfd f31, 0x50(r1) /* 800B6A40 000B3980 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 800B6A44 000B3984 39 61 00 50 */ addi r11, r1, 0x50 -/* 800B6A48 000B3988 48 2A B7 95 */ bl func_803621DC +/* 800B6A48 000B3988 48 2A B7 95 */ bl _savegpr_29 /* 800B6A4C 000B398C 7C 7E 1B 78 */ mr r30, r3 /* 800B6A50 000B3990 4B FF 98 6D */ bl daAlink_c_NS_setFrontWallType /* 800B6A54 000B3994 AB FE 30 78 */ lha r31, 0x3078(r30) @@ -28896,7 +28896,7 @@ lbl_800B6F08: /* 800B6F08 000B3E48 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 800B6F0C 000B3E4C CB E1 00 50 */ lfd f31, 0x50(r1) /* 800B6F10 000B3E50 39 61 00 50 */ addi r11, r1, 0x50 -/* 800B6F14 000B3E54 48 2A B3 15 */ bl func_80362228 +/* 800B6F14 000B3E54 48 2A B3 15 */ bl _restgpr_29 /* 800B6F18 000B3E58 80 01 00 64 */ lwz r0, 0x64(r1) /* 800B6F1C 000B3E5C 7C 08 03 A6 */ mtlr r0 /* 800B6F20 000B3E60 38 21 00 60 */ addi r1, r1, 0x60 @@ -29359,7 +29359,7 @@ daAlink_c_NS_checkItemButtonChange: /* 800B752C 000B446C 7C 08 02 A6 */ mflr r0 /* 800B7530 000B4470 90 01 00 24 */ stw r0, 0x24(r1) /* 800B7534 000B4474 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B7538 000B4478 48 2A AC A5 */ bl func_803621DC +/* 800B7538 000B4478 48 2A AC A5 */ bl _savegpr_29 /* 800B753C 000B447C 7C 7D 1B 78 */ mr r29, r3 /* 800B7540 000B4480 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) /* 800B7544 000B4484 28 00 00 92 */ cmplwi r0, 0x92 @@ -29404,7 +29404,7 @@ lbl_800B75C8: /* 800B75D0 000B4510 41 80 FF 9C */ blt lbl_800B756C lbl_800B75D4: /* 800B75D4 000B4514 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B75D8 000B4518 48 2A AC 51 */ bl func_80362228 +/* 800B75D8 000B4518 48 2A AC 51 */ bl _restgpr_29 /* 800B75DC 000B451C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B75E0 000B4520 7C 08 03 A6 */ mtlr r0 /* 800B75E4 000B4524 38 21 00 20 */ addi r1, r1, 0x20 @@ -29416,7 +29416,7 @@ daAlink_c_NS_checkUpperItemAction: /* 800B75F0 000B4530 7C 08 02 A6 */ mflr r0 /* 800B75F4 000B4534 90 01 00 24 */ stw r0, 0x24(r1) /* 800B75F8 000B4538 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B75FC 000B453C 48 2A AB E1 */ bl func_803621DC +/* 800B75FC 000B453C 48 2A AB E1 */ bl _savegpr_29 /* 800B7600 000B4540 7C 7F 1B 78 */ mr r31, r3 /* 800B7604 000B4544 48 00 1C 51 */ bl daAlink_c_NS_checkNoUpperAnime /* 800B7608 000B4548 2C 03 00 00 */ cmpwi r3, 0 @@ -29810,7 +29810,7 @@ lbl_800B7B60: /* 800B7B60 000B4AA0 38 60 00 00 */ li r3, 0 lbl_800B7B64: /* 800B7B64 000B4AA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B7B68 000B4AA8 48 2A A6 C1 */ bl func_80362228 +/* 800B7B68 000B4AA8 48 2A A6 C1 */ bl _restgpr_29 /* 800B7B6C 000B4AAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B7B70 000B4AB0 7C 08 03 A6 */ mtlr r0 /* 800B7B74 000B4AB4 38 21 00 20 */ addi r1, r1, 0x20 @@ -31315,7 +31315,7 @@ daAlink_c_NS_checkMoveDoAction: /* 800B901C 000B5F5C 7C 08 02 A6 */ mflr r0 /* 800B9020 000B5F60 90 01 00 24 */ stw r0, 0x24(r1) /* 800B9024 000B5F64 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B9028 000B5F68 48 2A 91 B5 */ bl func_803621DC +/* 800B9028 000B5F68 48 2A 91 B5 */ bl _savegpr_29 /* 800B902C 000B5F6C 7C 7F 1B 78 */ mr r31, r3 /* 800B9030 000B5F70 88 03 2F 8D */ lbz r0, 0x2f8d(r3) /* 800B9034 000B5F74 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -31390,7 +31390,7 @@ lbl_800B912C: /* 800B912C 000B606C 38 60 00 00 */ li r3, 0 lbl_800B9130: /* 800B9130 000B6070 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B9134 000B6074 48 2A 90 F5 */ bl func_80362228 +/* 800B9134 000B6074 48 2A 90 F5 */ bl _restgpr_29 /* 800B9138 000B6078 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B913C 000B607C 7C 08 03 A6 */ mtlr r0 /* 800B9140 000B6080 38 21 00 20 */ addi r1, r1, 0x20 @@ -31611,7 +31611,7 @@ daAlink_c_NS_swordEquip: /* 800B93F8 000B6338 7C 08 02 A6 */ mflr r0 /* 800B93FC 000B633C 90 01 00 24 */ stw r0, 0x24(r1) /* 800B9400 000B6340 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B9404 000B6344 48 2A 8D D9 */ bl func_803621DC +/* 800B9404 000B6344 48 2A 8D D9 */ bl _savegpr_29 /* 800B9408 000B6348 7C 7F 1B 78 */ mr r31, r3 /* 800B940C 000B634C 7C 9D 23 78 */ mr r29, r4 /* 800B9410 000B6350 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -31710,7 +31710,7 @@ lbl_800B9554: /* 800B9564 000B64A4 98 1F 2F 97 */ stb r0, 0x2f97(r31) lbl_800B9568: /* 800B9568 000B64A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B956C 000B64AC 48 2A 8C BD */ bl func_80362228 +/* 800B956C 000B64AC 48 2A 8C BD */ bl _restgpr_29 /* 800B9570 000B64B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B9574 000B64B4 7C 08 03 A6 */ mtlr r0 /* 800B9578 000B64B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -31810,7 +31810,7 @@ daAlink_c_NS_itemUnequip: /* 800B96B0 000B65F0 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800B96B4 000B65F4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800B96B8 000B65F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B96BC 000B65FC 48 2A 8B 21 */ bl func_803621DC +/* 800B96BC 000B65FC 48 2A 8B 21 */ bl _savegpr_29 /* 800B96C0 000B6600 7C 7F 1B 78 */ mr r31, r3 /* 800B96C4 000B6604 FF E0 08 90 */ fmr f31, f1 /* 800B96C8 000B6608 54 9E 04 3E */ clrlwi r30, r4, 0x10 @@ -31888,7 +31888,7 @@ lbl_800B97B0: /* 800B97CC 000B670C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800B97D0 000B6710 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800B97D4 000B6714 39 61 00 20 */ addi r11, r1, 0x20 -/* 800B97D8 000B6718 48 2A 8A 51 */ bl func_80362228 +/* 800B97D8 000B6718 48 2A 8A 51 */ bl _restgpr_29 /* 800B97DC 000B671C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B97E0 000B6720 7C 08 03 A6 */ mtlr r0 /* 800B97E4 000B6724 38 21 00 30 */ addi r1, r1, 0x30 @@ -33144,7 +33144,7 @@ daAlink_c_NS_setItemAction: /* 800BA920 000B7860 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800BA924 000B7864 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 800BA928 000B7868 39 61 00 30 */ addi r11, r1, 0x30 -/* 800BA92C 000B786C 48 2A 78 B1 */ bl func_803621DC +/* 800BA92C 000B786C 48 2A 78 B1 */ bl _savegpr_29 /* 800BA930 000B7870 7C 7D 1B 78 */ mr r29, r3 /* 800BA934 000B7874 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800BA938 000B7878 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -33552,7 +33552,7 @@ lbl_800BAEE8: /* 800BAEE8 000B7E28 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 800BAEEC 000B7E2C CB E1 00 30 */ lfd f31, 0x30(r1) /* 800BAEF0 000B7E30 39 61 00 30 */ addi r11, r1, 0x30 -/* 800BAEF4 000B7E34 48 2A 73 35 */ bl func_80362228 +/* 800BAEF4 000B7E34 48 2A 73 35 */ bl _restgpr_29 /* 800BAEF8 000B7E38 80 01 00 44 */ lwz r0, 0x44(r1) /* 800BAEFC 000B7E3C 7C 08 03 A6 */ mtlr r0 /* 800BAF00 000B7E40 38 21 00 40 */ addi r1, r1, 0x40 @@ -33984,7 +33984,7 @@ daAlink_c_NS_checkHeavyStateOn: /* 800BB4BC 000B83FC 7C 08 02 A6 */ mflr r0 /* 800BB4C0 000B8400 90 01 00 24 */ stw r0, 0x24(r1) /* 800BB4C4 000B8404 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB4C8 000B8408 48 2A 6D 15 */ bl func_803621DC +/* 800BB4C8 000B8408 48 2A 6D 15 */ bl _savegpr_29 /* 800BB4CC 000B840C 7C 7D 1B 78 */ mr r29, r3 /* 800BB4D0 000B8410 7C 9E 23 78 */ mr r30, r4 /* 800BB4D4 000B8414 7C BF 2B 78 */ mr r31, r5 @@ -34022,7 +34022,7 @@ lbl_800BB544: /* 800BB544 000B8484 38 60 00 00 */ li r3, 0 lbl_800BB548: /* 800BB548 000B8488 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB54C 000B848C 48 2A 6C DD */ bl func_80362228 +/* 800BB54C 000B848C 48 2A 6C DD */ bl _restgpr_29 /* 800BB550 000B8490 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BB554 000B8494 7C 08 03 A6 */ mtlr r0 /* 800BB558 000B8498 38 21 00 20 */ addi r1, r1, 0x20 @@ -34033,7 +34033,7 @@ lbl_800BB548: /* 800BB56C 000B84AC DB E1 00 20 */ stfd f31, 0x20(r1) /* 800BB570 000B84B0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800BB574 000B84B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB578 000B84B8 48 2A 6C 65 */ bl func_803621DC +/* 800BB578 000B84B8 48 2A 6C 65 */ bl _savegpr_29 /* 800BB57C 000B84BC 7C 7D 1B 78 */ mr r29, r3 /* 800BB580 000B84C0 FF E0 08 90 */ fmr f31, f1 /* 800BB584 000B84C4 7C 9E 23 78 */ mr r30, r4 @@ -34083,7 +34083,7 @@ lbl_800BB624: /* 800BB624 000B8564 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800BB628 000B8568 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800BB62C 000B856C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB630 000B8570 48 2A 6B F9 */ bl func_80362228 +/* 800BB630 000B8570 48 2A 6B F9 */ bl _restgpr_29 /* 800BB634 000B8574 80 01 00 34 */ lwz r0, 0x34(r1) /* 800BB638 000B8578 7C 08 03 A6 */ mtlr r0 /* 800BB63C 000B857C 38 21 00 30 */ addi r1, r1, 0x30 @@ -37297,7 +37297,7 @@ daAlink_c_NS_checkRestartRoom: /* 800BE3F0 000BB330 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800BE3F4 000BB334 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800BE3F8 000BB338 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BE3FC 000BB33C 48 2A 3D E1 */ bl func_803621DC +/* 800BE3FC 000BB33C 48 2A 3D E1 */ bl _savegpr_29 /* 800BE400 000BB340 7C 7D 1B 78 */ mr r29, r3 /* 800BE404 000BB344 80 83 05 70 */ lwz r4, 0x570(r3) /* 800BE408 000BB348 54 80 04 E7 */ rlwinm. r0, r4, 0, 0x13, 0x13 @@ -37702,7 +37702,7 @@ lbl_800BE9B4: /* 800BE9B4 000BB8F4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800BE9B8 000BB8F8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800BE9BC 000BB8FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BE9C0 000BB900 48 2A 38 69 */ bl func_80362228 +/* 800BE9C0 000BB900 48 2A 38 69 */ bl _restgpr_29 /* 800BE9C4 000BB904 80 01 00 34 */ lwz r0, 0x34(r1) /* 800BE9C8 000BB908 7C 08 03 A6 */ mtlr r0 /* 800BE9CC 000BB90C 38 21 00 30 */ addi r1, r1, 0x30 @@ -38303,7 +38303,7 @@ daAlink_c_NS_setBasAnime: /* 800BF208 000BC148 7C 08 02 A6 */ mflr r0 /* 800BF20C 000BC14C 90 01 00 24 */ stw r0, 0x24(r1) /* 800BF210 000BC150 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BF214 000BC154 48 2A 2F C9 */ bl func_803621DC +/* 800BF214 000BC154 48 2A 2F C9 */ bl _savegpr_29 /* 800BF218 000BC158 7C 7D 1B 78 */ mr r29, r3 /* 800BF21C 000BC15C 1C A4 00 14 */ mulli r5, r4, 0x14 /* 800BF220 000BC160 3B E5 1F 58 */ addi r31, r5, 0x1f58 @@ -38394,7 +38394,7 @@ lbl_800BF320: /* 800BF360 000BC2A0 48 00 00 1D */ bl daAlink_c_NS_initBasAnime lbl_800BF364: /* 800BF364 000BC2A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BF368 000BC2A8 48 2A 2E C1 */ bl func_80362228 +/* 800BF368 000BC2A8 48 2A 2E C1 */ bl _restgpr_29 /* 800BF36C 000BC2AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BF370 000BC2B0 7C 08 03 A6 */ mtlr r0 /* 800BF374 000BC2B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -38696,7 +38696,7 @@ daAlink_c_NS_setMetamorphoseModel: /* 800BF7A0 000BC6E0 7C 08 02 A6 */ mflr r0 /* 800BF7A4 000BC6E4 90 01 00 24 */ stw r0, 0x24(r1) /* 800BF7A8 000BC6E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BF7AC 000BC6EC 48 2A 2A 31 */ bl func_803621DC +/* 800BF7AC 000BC6EC 48 2A 2A 31 */ bl _savegpr_29 /* 800BF7B0 000BC6F0 7C 7D 1B 78 */ mr r29, r3 /* 800BF7B4 000BC6F4 38 7D 21 D8 */ addi r3, r29, 0x21d8 /* 800BF7B8 000BC6F8 20 04 00 00 */ subfic r0, r4, 0 @@ -38733,7 +38733,7 @@ daAlink_c_NS_setMetamorphoseModel: /* 800BF834 000BC774 C0 1D 1F E0 */ lfs f0, 0x1fe0(r29) /* 800BF838 000BC778 D0 1D 33 DC */ stfs f0, 0x33dc(r29) /* 800BF83C 000BC77C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BF840 000BC780 48 2A 29 E9 */ bl func_80362228 +/* 800BF840 000BC780 48 2A 29 E9 */ bl _restgpr_29 /* 800BF844 000BC784 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BF848 000BC788 7C 08 03 A6 */ mtlr r0 /* 800BF84C 000BC78C 38 21 00 20 */ addi r1, r1, 0x20 @@ -39232,7 +39232,7 @@ daAlink_c_NS_loadAram: /* 800BFF08 000BCE48 7C 08 02 A6 */ mflr r0 /* 800BFF0C 000BCE4C 90 01 00 24 */ stw r0, 0x24(r1) /* 800BFF10 000BCE50 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFF14 000BCE54 48 2A 22 C9 */ bl func_803621DC +/* 800BFF14 000BCE54 48 2A 22 C9 */ bl _savegpr_29 /* 800BFF18 000BCE58 7C 9D 23 78 */ mr r29, r4 /* 800BFF1C 000BCE5C 7C BE 2B 78 */ mr r30, r5 /* 800BFF20 000BCE60 7F C3 F3 78 */ mr r3, r30 @@ -39250,7 +39250,7 @@ daAlink_c_NS_loadAram: /* 800BFF50 000BCE90 38 80 00 00 */ li r4, 0 /* 800BFF54 000BCE94 48 27 7B ED */ bl J3DAnmLoaderDataBase_NS_load /* 800BFF58 000BCE98 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BFF5C 000BCE9C 48 2A 22 CD */ bl func_80362228 +/* 800BFF5C 000BCE9C 48 2A 22 CD */ bl _restgpr_29 /* 800BFF60 000BCEA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BFF64 000BCEA4 7C 08 03 A6 */ mtlr r0 /* 800BFF68 000BCEA8 38 21 00 20 */ addi r1, r1, 0x20 @@ -40688,7 +40688,7 @@ daAlink_c_NS_deleteEquipItem: /* 800C12E0 000BE220 7C 08 02 A6 */ mflr r0 /* 800C12E4 000BE224 90 01 00 54 */ stw r0, 0x54(r1) /* 800C12E8 000BE228 39 61 00 50 */ addi r11, r1, 0x50 -/* 800C12EC 000BE22C 48 2A 0E F1 */ bl func_803621DC +/* 800C12EC 000BE22C 48 2A 0E F1 */ bl _savegpr_29 /* 800C12F0 000BE230 7C 7F 1B 78 */ mr r31, r3 /* 800C12F4 000BE234 7C 9D 23 78 */ mr r29, r4 /* 800C12F8 000BE238 2C 05 00 00 */ cmpwi r5, 0 @@ -40970,7 +40970,7 @@ lbl_800C1630: /* 800C16E8 000BE628 90 1F 07 6C */ stw r0, 0x76c(r31) lbl_800C16EC: /* 800C16EC 000BE62C 39 61 00 50 */ addi r11, r1, 0x50 -/* 800C16F0 000BE630 48 2A 0B 39 */ bl func_80362228 +/* 800C16F0 000BE630 48 2A 0B 39 */ bl _restgpr_29 /* 800C16F4 000BE634 80 01 00 54 */ lwz r0, 0x54(r1) /* 800C16F8 000BE638 7C 08 03 A6 */ mtlr r0 /* 800C16FC 000BE63C 38 21 00 50 */ addi r1, r1, 0x50 @@ -42599,7 +42599,7 @@ daAlink_c_NS_procPreActionUnequipInit: /* 800C2DE0 000BFD20 7C 08 02 A6 */ mflr r0 /* 800C2DE4 000BFD24 90 01 00 24 */ stw r0, 0x24(r1) /* 800C2DE8 000BFD28 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C2DEC 000BFD2C 48 29 F3 F1 */ bl func_803621DC +/* 800C2DEC 000BFD2C 48 29 F3 F1 */ bl _savegpr_29 /* 800C2DF0 000BFD30 7C 7D 1B 78 */ mr r29, r3 /* 800C2DF4 000BFD34 7C 9E 23 78 */ mr r30, r4 /* 800C2DF8 000BFD38 7C BF 2B 78 */ mr r31, r5 @@ -42645,7 +42645,7 @@ lbl_800C2E8C: /* 800C2E8C 000BFDCC 93 DD 31 98 */ stw r30, 0x3198(r29) /* 800C2E90 000BFDD0 38 60 00 01 */ li r3, 1 /* 800C2E94 000BFDD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C2E98 000BFDD8 48 29 F3 91 */ bl func_80362228 +/* 800C2E98 000BFDD8 48 29 F3 91 */ bl _restgpr_29 /* 800C2E9C 000BFDDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C2EA0 000BFDE0 7C 08 03 A6 */ mtlr r0 /* 800C2EA4 000BFDE4 38 21 00 20 */ addi r1, r1, 0x20 @@ -42910,7 +42910,7 @@ daAlink_c_NS_procTiredWaitInit: /* 800C3230 000C0170 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800C3234 000C0174 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800C3238 000C0178 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C323C 000C017C 48 29 EF A1 */ bl func_803621DC +/* 800C323C 000C017C 48 29 EF A1 */ bl _savegpr_29 /* 800C3240 000C0180 7C 7D 1B 78 */ mr r29, r3 /* 800C3244 000C0184 A0 A3 1F BC */ lhz r5, 0x1fbc(r3) /* 800C3248 000C0188 3C 80 00 01 */ lis r4, 0x0000FFFF@ha @@ -42976,7 +42976,7 @@ lbl_800C3318: /* 800C3318 000C0258 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800C331C 000C025C CB E1 00 20 */ lfd f31, 0x20(r1) /* 800C3320 000C0260 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C3324 000C0264 48 29 EF 05 */ bl func_80362228 +/* 800C3324 000C0264 48 29 EF 05 */ bl _restgpr_29 /* 800C3328 000C0268 80 01 00 34 */ lwz r0, 0x34(r1) /* 800C332C 000C026C 7C 08 03 A6 */ mtlr r0 /* 800C3330 000C0270 38 21 00 30 */ addi r1, r1, 0x30 @@ -43115,7 +43115,7 @@ lbl_800C34EC: /* 800C3508 000C0448 7C 08 02 A6 */ mflr r0 /* 800C350C 000C044C 90 01 00 24 */ stw r0, 0x24(r1) /* 800C3510 000C0450 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C3514 000C0454 48 29 EC C9 */ bl func_803621DC +/* 800C3514 000C0454 48 29 EC C9 */ bl _savegpr_29 /* 800C3518 000C0458 7C 7E 1B 78 */ mr r30, r3 /* 800C351C 000C045C 38 80 00 1A */ li r4, 0x1a /* 800C3520 000C0460 4B FE 90 39 */ bl daAlink_c_NS_checkUnderMove0BckNoArc @@ -43228,7 +43228,7 @@ lbl_800C36B0: /* 800C36B0 000C05F0 38 60 00 01 */ li r3, 1 lbl_800C36B4: /* 800C36B4 000C05F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C36B8 000C05F8 48 29 EB 71 */ bl func_80362228 +/* 800C36B8 000C05F8 48 29 EB 71 */ bl _restgpr_29 /* 800C36BC 000C05FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C36C0 000C0600 7C 08 03 A6 */ mtlr r0 /* 800C36C4 000C0604 38 21 00 20 */ addi r1, r1, 0x20 @@ -44678,7 +44678,7 @@ lbl_800C4B28: /* 800C4B44 000C1A84 7C 08 02 A6 */ mflr r0 /* 800C4B48 000C1A88 90 01 00 44 */ stw r0, 0x44(r1) /* 800C4B4C 000C1A8C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800C4B50 000C1A90 48 29 D6 8D */ bl func_803621DC +/* 800C4B50 000C1A90 48 29 D6 8D */ bl _savegpr_29 /* 800C4B54 000C1A94 7C 7E 1B 78 */ mr r30, r3 /* 800C4B58 000C1A98 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800C4B5C 000C1A9C 80 03 05 88 */ lwz r0, 0x588(r3) @@ -44933,7 +44933,7 @@ lbl_800C4EEC: /* 800C4EF4 000C1E34 90 01 00 24 */ stw r0, 0x24(r1) /* 800C4EF8 000C1E38 38 60 00 01 */ li r3, 1 /* 800C4EFC 000C1E3C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800C4F00 000C1E40 48 29 D3 29 */ bl func_80362228 +/* 800C4F00 000C1E40 48 29 D3 29 */ bl _restgpr_29 /* 800C4F04 000C1E44 80 01 00 44 */ lwz r0, 0x44(r1) /* 800C4F08 000C1E48 7C 08 03 A6 */ mtlr r0 /* 800C4F0C 000C1E4C 38 21 00 40 */ addi r1, r1, 0x40 @@ -45225,7 +45225,7 @@ daAlink_c_NS_procSideRollInit: /* 800C532C 000C226C 7C 08 02 A6 */ mflr r0 /* 800C5330 000C2270 90 01 00 24 */ stw r0, 0x24(r1) /* 800C5334 000C2274 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5338 000C2278 48 29 CE A5 */ bl func_803621DC +/* 800C5338 000C2278 48 29 CE A5 */ bl _savegpr_29 /* 800C533C 000C227C 7C 7E 1B 78 */ mr r30, r3 /* 800C5340 000C2280 7C 9D 23 78 */ mr r29, r4 /* 800C5344 000C2284 48 01 7A AD */ bl daAlink_c_NS_checkUpperGuardAnime @@ -45310,7 +45310,7 @@ lbl_800C5460: /* 800C5468 000C23A8 38 60 00 01 */ li r3, 1 lbl_800C546C: /* 800C546C 000C23AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5470 000C23B0 48 29 CD B9 */ bl func_80362228 +/* 800C5470 000C23B0 48 29 CD B9 */ bl _restgpr_29 /* 800C5474 000C23B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C5478 000C23B8 7C 08 03 A6 */ mtlr r0 /* 800C547C 000C23BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -45319,7 +45319,7 @@ lbl_800C546C: /* 800C5488 000C23C8 7C 08 02 A6 */ mflr r0 /* 800C548C 000C23CC 90 01 00 44 */ stw r0, 0x44(r1) /* 800C5490 000C23D0 39 61 00 40 */ addi r11, r1, 0x40 -/* 800C5494 000C23D4 48 29 CD 49 */ bl func_803621DC +/* 800C5494 000C23D4 48 29 CD 49 */ bl _savegpr_29 /* 800C5498 000C23D8 7C 7F 1B 78 */ mr r31, r3 /* 800C549C 000C23DC 80 03 05 88 */ lwz r0, 0x588(r3) /* 800C54A0 000C23E0 64 00 08 00 */ oris r0, r0, 0x800 @@ -45482,7 +45482,7 @@ lbl_800C56D8: /* 800C56E0 000C2620 90 01 00 24 */ stw r0, 0x24(r1) /* 800C56E4 000C2624 38 60 00 01 */ li r3, 1 /* 800C56E8 000C2628 39 61 00 40 */ addi r11, r1, 0x40 -/* 800C56EC 000C262C 48 29 CB 3D */ bl func_80362228 +/* 800C56EC 000C262C 48 29 CB 3D */ bl _restgpr_29 /* 800C56F0 000C2630 80 01 00 44 */ lwz r0, 0x44(r1) /* 800C56F4 000C2634 7C 08 03 A6 */ mtlr r0 /* 800C56F8 000C2638 38 21 00 40 */ addi r1, r1, 0x40 @@ -45766,7 +45766,7 @@ daAlink_c_NS_procBackJumpLandInit: /* 800C5AF4 000C2A34 7C 08 02 A6 */ mflr r0 /* 800C5AF8 000C2A38 90 01 00 24 */ stw r0, 0x24(r1) /* 800C5AFC 000C2A3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5B00 000C2A40 48 29 C6 DD */ bl func_803621DC +/* 800C5B00 000C2A40 48 29 C6 DD */ bl _savegpr_29 /* 800C5B04 000C2A44 7C 7F 1B 78 */ mr r31, r3 /* 800C5B08 000C2A48 3B BF 1F D0 */ addi r29, r31, 0x1fd0 /* 800C5B0C 000C2A4C 88 03 2F CC */ lbz r0, 0x2fcc(r3) @@ -45844,7 +45844,7 @@ lbl_800C5C0C: /* 800C5C0C 000C2B4C 38 60 00 01 */ li r3, 1 lbl_800C5C10: /* 800C5C10 000C2B50 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C5C14 000C2B54 48 29 C6 15 */ bl func_80362228 +/* 800C5C14 000C2B54 48 29 C6 15 */ bl _restgpr_29 /* 800C5C18 000C2B58 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C5C1C 000C2B5C 7C 08 03 A6 */ mtlr r0 /* 800C5C20 000C2B60 38 21 00 20 */ addi r1, r1, 0x20 @@ -47721,7 +47721,7 @@ lbl_800C76E4: /* 800C76FC 000C463C 7C 08 02 A6 */ mflr r0 /* 800C7700 000C4640 90 01 00 24 */ stw r0, 0x24(r1) /* 800C7704 000C4644 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C7708 000C4648 48 29 AA D5 */ bl func_803621DC +/* 800C7708 000C4648 48 29 AA D5 */ bl _savegpr_29 /* 800C770C 000C464C 7C 7D 1B 78 */ mr r29, r3 /* 800C7710 000C4650 38 7D 33 98 */ addi r3, r29, 0x3398 /* 800C7714 000C4654 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -47780,7 +47780,7 @@ lbl_800C77CC: lbl_800C77D8: /* 800C77D8 000C4718 38 60 00 01 */ li r3, 1 /* 800C77DC 000C471C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800C77E0 000C4720 48 29 AA 49 */ bl func_80362228 +/* 800C77E0 000C4720 48 29 AA 49 */ bl _restgpr_29 /* 800C77E4 000C4724 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C77E8 000C4728 7C 08 03 A6 */ mtlr r0 /* 800C77EC 000C472C 38 21 00 20 */ addi r1, r1, 0x20 @@ -51681,7 +51681,7 @@ daAlink_c_NS_setDrawHand: /* 800CAFCC 000C7F0C 7C 08 02 A6 */ mflr r0 /* 800CAFD0 000C7F10 90 01 00 24 */ stw r0, 0x24(r1) /* 800CAFD4 000C7F14 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CAFD8 000C7F18 48 29 72 05 */ bl func_803621DC +/* 800CAFD8 000C7F18 48 29 72 05 */ bl _savegpr_29 /* 800CAFDC 000C7F1C 7C 7D 1B 78 */ mr r29, r3 /* 800CAFE0 000C7F20 80 63 06 D0 */ lwz r3, 0x6d0(r3) /* 800CAFE4 000C7F24 80 03 00 0C */ lwz r0, 0xc(r3) @@ -52014,7 +52014,7 @@ lbl_800CB458: /* 800CB464 000C83A4 90 03 00 0C */ stw r0, 0xc(r3) lbl_800CB468: /* 800CB468 000C83A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CB46C 000C83AC 48 29 6D BD */ bl func_80362228 +/* 800CB46C 000C83AC 48 29 6D BD */ bl _restgpr_29 /* 800CB470 000C83B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800CB474 000C83B4 7C 08 03 A6 */ mtlr r0 /* 800CB478 000C83B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -52434,7 +52434,7 @@ lbl_800CBA0C: /* 800CBA3C 000C897C 7C 08 02 A6 */ mflr r0 /* 800CBA40 000C8980 90 01 00 24 */ stw r0, 0x24(r1) /* 800CBA44 000C8984 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CBA48 000C8988 48 29 67 95 */ bl func_803621DC +/* 800CBA48 000C8988 48 29 67 95 */ bl _savegpr_29 /* 800CBA4C 000C898C 7C 7E 1B 78 */ mr r30, r3 /* 800CBA50 000C8990 3B E0 00 00 */ li r31, 0 /* 800CBA54 000C8994 A8 63 2F F8 */ lha r3, 0x2ff8(r3) @@ -52555,7 +52555,7 @@ lbl_800CBB98: /* 800CBBF8 000C8B38 D0 7E 04 4C */ stfs f3, 0x44c(r30) /* 800CBBFC 000C8B3C 7F E3 FB 78 */ mr r3, r31 /* 800CBC00 000C8B40 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CBC04 000C8B44 48 29 66 25 */ bl func_80362228 +/* 800CBC04 000C8B44 48 29 66 25 */ bl _restgpr_29 /* 800CBC08 000C8B48 80 01 00 24 */ lwz r0, 0x24(r1) /* 800CBC0C 000C8B4C 7C 08 03 A6 */ mtlr r0 /* 800CBC10 000C8B50 38 21 00 20 */ addi r1, r1, 0x20 @@ -53091,7 +53091,7 @@ daAlink_c_NS_setWaterDropColor: /* 800CC368 000C92A8 7C 08 02 A6 */ mflr r0 /* 800CC36C 000C92AC 90 01 00 24 */ stw r0, 0x24(r1) /* 800CC370 000C92B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CC374 000C92B4 48 29 5E 69 */ bl func_803621DC +/* 800CC374 000C92B4 48 29 5E 69 */ bl _savegpr_29 /* 800CC378 000C92B8 7C 7D 1B 78 */ mr r29, r3 /* 800CC37C 000C92BC 7C 9E 23 78 */ mr r30, r4 /* 800CC380 000C92C0 38 1D 32 A0 */ addi r0, r29, 0x32a0 @@ -53376,7 +53376,7 @@ lbl_800CC658: /* 800CC7C0 000C9700 4E 80 04 21 */ bctrl lbl_800CC7C4: /* 800CC7C4 000C9704 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CC7C8 000C9708 48 29 5A 61 */ bl func_80362228 +/* 800CC7C8 000C9708 48 29 5A 61 */ bl _restgpr_29 /* 800CC7CC 000C970C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800CC7D0 000C9710 7C 08 03 A6 */ mtlr r0 /* 800CC7D4 000C9714 38 21 00 20 */ addi r1, r1, 0x20 @@ -56007,7 +56007,7 @@ daAlink_c_NS_searchPeepObj: /* 800CECE8 000CBC28 7C 08 02 A6 */ mflr r0 /* 800CECEC 000CBC2C 90 01 00 24 */ stw r0, 0x24(r1) /* 800CECF0 000CBC30 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CECF4 000CBC34 48 29 34 E9 */ bl func_803621DC +/* 800CECF4 000CBC34 48 29 34 E9 */ bl _savegpr_29 /* 800CECF8 000CBC38 7C 7D 1B 78 */ mr r29, r3 /* 800CECFC 000CBC3C 7C 9E 23 78 */ mr r30, r4 /* 800CED00 000CBC40 7C BF 2B 78 */ mr r31, r5 @@ -56024,7 +56024,7 @@ daAlink_c_NS_searchPeepObj: /* 800CED2C 000CBC6C 93 DF 00 00 */ stw r30, 0(r31) lbl_800CED30: /* 800CED30 000CBC70 39 61 00 20 */ addi r11, r1, 0x20 -/* 800CED34 000CBC74 48 29 34 F5 */ bl func_80362228 +/* 800CED34 000CBC74 48 29 34 F5 */ bl _restgpr_29 /* 800CED38 000CBC78 80 01 00 24 */ lwz r0, 0x24(r1) /* 800CED3C 000CBC7C 7C 08 03 A6 */ mtlr r0 /* 800CED40 000CBC80 38 21 00 20 */ addi r1, r1, 0x20 @@ -58871,7 +58871,7 @@ daAlink_c_NS_checkComboCnt: /* 800D1458 000CE398 7C 08 02 A6 */ mflr r0 /* 800D145C 000CE39C 90 01 00 24 */ stw r0, 0x24(r1) /* 800D1460 000CE3A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1464 000CE3A4 48 29 0D 79 */ bl func_803621DC +/* 800D1464 000CE3A4 48 29 0D 79 */ bl _savegpr_29 /* 800D1468 000CE3A8 7C 7D 1B 78 */ mr r29, r3 /* 800D146C 000CE3AC A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800D1470 000CE3B0 28 00 01 03 */ cmplwi r0, 0x103 @@ -58921,7 +58921,7 @@ lbl_800D1508: /* 800D1510 000CE450 4B FF FF 21 */ bl daAlink_c_NS_resetCombo lbl_800D1514: /* 800D1514 000CE454 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1518 000CE458 48 29 0D 11 */ bl func_80362228 +/* 800D1518 000CE458 48 29 0D 11 */ bl _restgpr_29 /* 800D151C 000CE45C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D1520 000CE460 7C 08 03 A6 */ mtlr r0 /* 800D1524 000CE464 38 21 00 20 */ addi r1, r1, 0x20 @@ -59586,7 +59586,7 @@ daAlink_c_NS_setCutDash: /* 800D1E20 000CED60 7C 08 02 A6 */ mflr r0 /* 800D1E24 000CED64 90 01 00 24 */ stw r0, 0x24(r1) /* 800D1E28 000CED68 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D1E2C 000CED6C 48 29 03 B1 */ bl func_803621DC +/* 800D1E2C 000CED6C 48 29 03 B1 */ bl _savegpr_29 /* 800D1E30 000CED70 7C 7F 1B 78 */ mr r31, r3 /* 800D1E34 000CED74 7C BD 2B 78 */ mr r29, r5 /* 800D1E38 000CED78 3C A0 80 39 */ lis r5, lbl_8038D658@ha @@ -59757,7 +59757,7 @@ lbl_800D2028: /* 800D2098 000CEFD8 98 1F 2F B7 */ stb r0, 0x2fb7(r31) lbl_800D209C: /* 800D209C 000CEFDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D20A0 000CEFE0 48 29 01 89 */ bl func_80362228 +/* 800D20A0 000CEFE0 48 29 01 89 */ bl _restgpr_29 /* 800D20A4 000CEFE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D20A8 000CEFE8 7C 08 03 A6 */ mtlr r0 /* 800D20AC 000CEFEC 38 21 00 20 */ addi r1, r1, 0x20 @@ -61684,7 +61684,7 @@ daAlink_c_NS_procCutFinishJumpUpInit: /* 800D3AE8 000D0A28 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800D3AEC 000D0A2C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800D3AF0 000D0A30 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D3AF4 000D0A34 48 28 E6 E9 */ bl func_803621DC +/* 800D3AF4 000D0A34 48 28 E6 E9 */ bl _savegpr_29 /* 800D3AF8 000D0A38 7C 7E 1B 78 */ mr r30, r3 /* 800D3AFC 000D0A3C 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800D3B00 000D0A40 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -61803,7 +61803,7 @@ lbl_800D3BF8: /* 800D3CAC 000D0BEC E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800D3CB0 000D0BF0 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800D3CB4 000D0BF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D3CB8 000D0BF8 48 28 E5 71 */ bl func_80362228 +/* 800D3CB8 000D0BF8 48 28 E5 71 */ bl _restgpr_29 /* 800D3CBC 000D0BFC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800D3CC0 000D0C00 7C 08 03 A6 */ mtlr r0 /* 800D3CC4 000D0C04 38 21 00 30 */ addi r1, r1, 0x30 @@ -62768,7 +62768,7 @@ lbl_800D49DC: /* 800D4A78 000D19B8 7C 08 02 A6 */ mflr r0 /* 800D4A7C 000D19BC 90 01 00 24 */ stw r0, 0x24(r1) /* 800D4A80 000D19C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D4A84 000D19C4 48 28 D7 59 */ bl func_803621DC +/* 800D4A84 000D19C4 48 28 D7 59 */ bl _savegpr_29 /* 800D4A88 000D19C8 7C 7F 1B 78 */ mr r31, r3 /* 800D4A8C 000D19CC 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800D4A90 000D19D0 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l @@ -62895,7 +62895,7 @@ lbl_800D4C4C: /* 800D4C4C 000D1B8C 38 60 00 01 */ li r3, 1 lbl_800D4C50: /* 800D4C50 000D1B90 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D4C54 000D1B94 48 28 D5 D5 */ bl func_80362228 +/* 800D4C54 000D1B94 48 28 D5 D5 */ bl _restgpr_29 /* 800D4C58 000D1B98 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D4C5C 000D1B9C 7C 08 03 A6 */ mtlr r0 /* 800D4C60 000D1BA0 38 21 00 20 */ addi r1, r1, 0x20 @@ -63091,7 +63091,7 @@ lbl_800D4EBC: /* 800D4F10 000D1E50 DB C1 00 20 */ stfd f30, 0x20(r1) /* 800D4F14 000D1E54 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 800D4F18 000D1E58 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D4F1C 000D1E5C 48 28 D2 C1 */ bl func_803621DC +/* 800D4F1C 000D1E5C 48 28 D2 C1 */ bl _savegpr_29 /* 800D4F20 000D1E60 7C 7F 1B 78 */ mr r31, r3 /* 800D4F24 000D1E64 38 80 00 00 */ li r4, 0 /* 800D4F28 000D1E68 4B FD E8 0D */ bl daAlink_c_NS_setShapeAngleToAtnActor @@ -63420,7 +63420,7 @@ lbl_800D53A0: /* 800D53A8 000D22E8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 800D53AC 000D22EC CB C1 00 20 */ lfd f30, 0x20(r1) /* 800D53B0 000D22F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800D53B4 000D22F4 48 28 CE 75 */ bl func_80362228 +/* 800D53B4 000D22F4 48 28 CE 75 */ bl _restgpr_29 /* 800D53B8 000D22F8 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D53BC 000D22FC 7C 08 03 A6 */ mtlr r0 /* 800D53C0 000D2300 38 21 00 40 */ addi r1, r1, 0x40 @@ -65606,7 +65606,7 @@ daAlink_c_NS_setDamagePoint: /* 800D72C0 000D4200 7C 08 02 A6 */ mflr r0 /* 800D72C4 000D4204 90 01 00 34 */ stw r0, 0x34(r1) /* 800D72C8 000D4208 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D72CC 000D420C 48 28 AF 11 */ bl func_803621DC +/* 800D72CC 000D420C 48 28 AF 11 */ bl _savegpr_29 /* 800D72D0 000D4210 7C 7D 1B 78 */ mr r29, r3 /* 800D72D4 000D4214 7C 9E 23 79 */ or. r30, r4, r4 /* 800D72D8 000D4218 7C DF 33 78 */ mr r31, r6 @@ -65715,7 +65715,7 @@ lbl_800D7454: /* 800D745C 000D439C 38 60 00 00 */ li r3, 0 lbl_800D7460: /* 800D7460 000D43A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D7464 000D43A4 48 28 AD C5 */ bl func_80362228 +/* 800D7464 000D43A4 48 28 AD C5 */ bl _restgpr_29 /* 800D7468 000D43A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800D746C 000D43AC 7C 08 03 A6 */ mtlr r0 /* 800D7470 000D43B0 38 21 00 30 */ addi r1, r1, 0x30 @@ -65764,7 +65764,7 @@ daAlink_c_NS_getDamageVec: /* 800D74F8 000D4438 7C 08 02 A6 */ mflr r0 /* 800D74FC 000D443C 90 01 00 54 */ stw r0, 0x54(r1) /* 800D7500 000D4440 39 61 00 50 */ addi r11, r1, 0x50 -/* 800D7504 000D4444 48 28 AC D9 */ bl func_803621DC +/* 800D7504 000D4444 48 28 AC D9 */ bl _savegpr_29 /* 800D7508 000D4448 7C 7D 1B 78 */ mr r29, r3 /* 800D750C 000D444C 7C 9E 23 78 */ mr r30, r4 /* 800D7510 000D4450 3B FE 00 C8 */ addi r31, r30, 0xc8 @@ -65878,7 +65878,7 @@ lbl_800D769C: /* 800D76A4 000D45E4 48 00 AD D9 */ bl daAlink_c_NS_multVecMagneBootInvMtx /* 800D76A8 000D45E8 7F E3 FB 78 */ mr r3, r31 /* 800D76AC 000D45EC 39 61 00 50 */ addi r11, r1, 0x50 -/* 800D76B0 000D45F0 48 28 AB 79 */ bl func_80362228 +/* 800D76B0 000D45F0 48 28 AB 79 */ bl _restgpr_29 /* 800D76B4 000D45F4 80 01 00 54 */ lwz r0, 0x54(r1) /* 800D76B8 000D45F8 7C 08 03 A6 */ mtlr r0 /* 800D76BC 000D45FC 38 21 00 50 */ addi r1, r1, 0x50 @@ -68694,7 +68694,7 @@ lbl_800D9E70: /* 800D9E8C 000D6DCC 7C 08 02 A6 */ mflr r0 /* 800D9E90 000D6DD0 90 01 00 34 */ stw r0, 0x34(r1) /* 800D9E94 000D6DD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D9E98 000D6DD8 48 28 83 45 */ bl func_803621DC +/* 800D9E98 000D6DD8 48 28 83 45 */ bl _savegpr_29 /* 800D9E9C 000D6DDC 7C 7F 1B 78 */ mr r31, r3 /* 800D9EA0 000D6DE0 80 63 32 CC */ lwz r3, 0x32cc(r3) /* 800D9EA4 000D6DE4 28 03 00 00 */ cmplwi r3, 0 @@ -68892,7 +68892,7 @@ lbl_800DA164: /* 800DA164 000D70A4 38 60 00 01 */ li r3, 1 lbl_800DA168: /* 800DA168 000D70A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DA16C 000D70AC 48 28 80 BD */ bl func_80362228 +/* 800DA16C 000D70AC 48 28 80 BD */ bl _restgpr_29 /* 800DA170 000D70B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DA174 000D70B4 7C 08 03 A6 */ mtlr r0 /* 800DA178 000D70B8 38 21 00 30 */ addi r1, r1, 0x30 @@ -70967,7 +70967,7 @@ daAlink_c_NS_procCoLavaReturnInit: /* 800DBEDC 000D8E1C 7C 08 02 A6 */ mflr r0 /* 800DBEE0 000D8E20 90 01 00 44 */ stw r0, 0x44(r1) /* 800DBEE4 000D8E24 39 61 00 40 */ addi r11, r1, 0x40 -/* 800DBEE8 000D8E28 48 28 62 F5 */ bl func_803621DC +/* 800DBEE8 000D8E28 48 28 62 F5 */ bl _savegpr_29 /* 800DBEEC 000D8E2C 7C 7E 1B 78 */ mr r30, r3 /* 800DBEF0 000D8E30 7C 9F 23 78 */ mr r31, r4 /* 800DBEF4 000D8E34 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -71178,7 +71178,7 @@ lbl_800DC1CC: /* 800DC1F8 000D9138 38 60 00 01 */ li r3, 1 lbl_800DC1FC: /* 800DC1FC 000D913C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800DC200 000D9140 48 28 60 29 */ bl func_80362228 +/* 800DC200 000D9140 48 28 60 29 */ bl _restgpr_29 /* 800DC204 000D9144 80 01 00 44 */ lwz r0, 0x44(r1) /* 800DC208 000D9148 7C 08 03 A6 */ mtlr r0 /* 800DC20C 000D914C 38 21 00 40 */ addi r1, r1, 0x40 @@ -71457,7 +71457,7 @@ daAlink_c_NS_checkShieldAttackEmphasys: /* 800DC5E0 000D9520 7C 08 02 A6 */ mflr r0 /* 800DC5E4 000D9524 90 01 00 24 */ stw r0, 0x24(r1) /* 800DC5E8 000D9528 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC5EC 000D952C 48 28 5B F1 */ bl func_803621DC +/* 800DC5EC 000D952C 48 28 5B F1 */ bl _savegpr_29 /* 800DC5F0 000D9530 7C 7D 1B 78 */ mr r29, r3 /* 800DC5F4 000D9534 3B C0 00 00 */ li r30, 0 /* 800DC5F8 000D9538 7F DF F3 78 */ mr r31, r30 @@ -71490,7 +71490,7 @@ lbl_800DC650: lbl_800DC65C: /* 800DC65C 000D959C 57 C3 06 3E */ clrlwi r3, r30, 0x18 /* 800DC660 000D95A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC664 000D95A4 48 28 5B C5 */ bl func_80362228 +/* 800DC664 000D95A4 48 28 5B C5 */ bl _restgpr_29 /* 800DC668 000D95A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DC66C 000D95AC 7C 08 03 A6 */ mtlr r0 /* 800DC670 000D95B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -71667,7 +71667,7 @@ lbl_800DC8AC: /* 800DC8C8 000D9808 7C 08 02 A6 */ mflr r0 /* 800DC8CC 000D980C 90 01 00 24 */ stw r0, 0x24(r1) /* 800DC8D0 000D9810 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC8D4 000D9814 48 28 59 09 */ bl func_803621DC +/* 800DC8D4 000D9814 48 28 59 09 */ bl _savegpr_29 /* 800DC8D8 000D9818 7C 7D 1B 78 */ mr r29, r3 /* 800DC8DC 000D981C 7C BE 2B 78 */ mr r30, r5 /* 800DC8E0 000D9820 28 04 00 00 */ cmplwi r4, 0 @@ -71759,7 +71759,7 @@ lbl_800DC9E8: /* 800DCA10 000D9950 98 1D 2F CB */ stb r0, 0x2fcb(r29) lbl_800DCA14: /* 800DCA14 000D9954 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DCA18 000D9958 48 28 58 11 */ bl func_80362228 +/* 800DCA18 000D9958 48 28 58 11 */ bl _restgpr_29 /* 800DCA1C 000D995C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DCA20 000D9960 7C 08 03 A6 */ mtlr r0 /* 800DCA24 000D9964 38 21 00 20 */ addi r1, r1, 0x20 @@ -73013,7 +73013,7 @@ lbl_800DDB90: /* 800DDBAC 000DAAEC 7C 08 02 A6 */ mflr r0 /* 800DDBB0 000DAAF0 90 01 00 34 */ stw r0, 0x34(r1) /* 800DDBB4 000DAAF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DDBB8 000DAAF8 48 28 46 25 */ bl func_803621DC +/* 800DDBB8 000DAAF8 48 28 46 25 */ bl _savegpr_29 /* 800DDBBC 000DAAFC 7C 7E 1B 78 */ mr r30, r3 /* 800DDBC0 000DAB00 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800DDBC4 000DAB04 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) @@ -73192,7 +73192,7 @@ lbl_800DDE3C: /* 800DDE3C 000DAD7C 38 60 00 01 */ li r3, 1 lbl_800DDE40: /* 800DDE40 000DAD80 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DDE44 000DAD84 48 28 43 E5 */ bl func_80362228 +/* 800DDE44 000DAD84 48 28 43 E5 */ bl _restgpr_29 /* 800DDE48 000DAD88 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DDE4C 000DAD8C 7C 08 03 A6 */ mtlr r0 /* 800DDE50 000DAD90 38 21 00 30 */ addi r1, r1, 0x30 @@ -73564,7 +73564,7 @@ lbl_800DE364: /* 800DE384 000DB2C4 7C 08 02 A6 */ mflr r0 /* 800DE388 000DB2C8 90 01 00 34 */ stw r0, 0x34(r1) /* 800DE38C 000DB2CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DE390 000DB2D0 48 28 3E 4D */ bl func_803621DC +/* 800DE390 000DB2D0 48 28 3E 4D */ bl _savegpr_29 /* 800DE394 000DB2D4 7C 7E 1B 78 */ mr r30, r3 /* 800DE398 000DB2D8 80 03 05 88 */ lwz r0, 0x588(r3) /* 800DE39C 000DB2DC 64 00 08 00 */ oris r0, r0, 0x800 @@ -73745,7 +73745,7 @@ lbl_800DE630: /* 800DE630 000DB570 38 60 00 01 */ li r3, 1 lbl_800DE634: /* 800DE634 000DB574 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DE638 000DB578 48 28 3B F1 */ bl func_80362228 +/* 800DE638 000DB578 48 28 3B F1 */ bl _restgpr_29 /* 800DE63C 000DB57C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DE640 000DB580 7C 08 03 A6 */ mtlr r0 /* 800DE644 000DB584 38 21 00 30 */ addi r1, r1, 0x30 @@ -73869,7 +73869,7 @@ daAlink_c_NS_setSlingModel: /* 800DE7D8 000DB718 7C 08 02 A6 */ mflr r0 /* 800DE7DC 000DB71C 90 01 00 24 */ stw r0, 0x24(r1) /* 800DE7E0 000DB720 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE7E4 000DB724 48 28 39 F9 */ bl func_803621DC +/* 800DE7E4 000DB724 48 28 39 F9 */ bl _savegpr_29 /* 800DE7E8 000DB728 7C 7D 1B 78 */ mr r29, r3 /* 800DE7EC 000DB72C 38 7D 21 D8 */ addi r3, r29, 0x21d8 /* 800DE7F0 000DB730 38 80 01 F9 */ li r4, 0x1f9 @@ -73904,7 +73904,7 @@ daAlink_c_NS_setSlingModel: /* 800DE864 000DB7A4 38 00 00 67 */ li r0, 0x67 /* 800DE868 000DB7A8 98 1D 2F 94 */ stb r0, 0x2f94(r29) /* 800DE86C 000DB7AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DE870 000DB7B0 48 28 39 B9 */ bl func_80362228 +/* 800DE870 000DB7B0 48 28 39 B9 */ bl _restgpr_29 /* 800DE874 000DB7B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DE878 000DB7B8 7C 08 03 A6 */ mtlr r0 /* 800DE87C 000DB7BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -74161,7 +74161,7 @@ daAlink_c_NS_changeArrowType: /* 800DEBCC 000DBB0C 7C 08 02 A6 */ mflr r0 /* 800DEBD0 000DBB10 90 01 00 24 */ stw r0, 0x24(r1) /* 800DEBD4 000DBB14 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEBD8 000DBB18 48 28 36 05 */ bl func_803621DC +/* 800DEBD8 000DBB18 48 28 36 05 */ bl _savegpr_29 /* 800DEBDC 000DBB1C 7C 7F 1B 78 */ mr r31, r3 /* 800DEBE0 000DBB20 88 03 05 6A */ lbz r0, 0x56a(r3) /* 800DEBE4 000DBB24 28 00 00 2D */ cmplwi r0, 0x2d @@ -74273,7 +74273,7 @@ lbl_800DED4C: /* 800DED6C 000DBCAC 48 00 02 4D */ bl daAlink_c_NS_setBowReloadAnime lbl_800DED70: /* 800DED70 000DBCB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DED74 000DBCB4 48 28 34 B5 */ bl func_80362228 +/* 800DED74 000DBCB4 48 28 34 B5 */ bl _restgpr_29 /* 800DED78 000DBCB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DED7C 000DBCBC 7C 08 03 A6 */ mtlr r0 /* 800DED80 000DBCC0 38 21 00 20 */ addi r1, r1, 0x20 @@ -74328,7 +74328,7 @@ daAlink_c_NS_cancelBowMove: /* 800DEE20 000DBD60 7C 08 02 A6 */ mflr r0 /* 800DEE24 000DBD64 90 01 00 24 */ stw r0, 0x24(r1) /* 800DEE28 000DBD68 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEE2C 000DBD6C 48 28 33 B1 */ bl func_803621DC +/* 800DEE2C 000DBD6C 48 28 33 B1 */ bl _savegpr_29 /* 800DEE30 000DBD70 7C 7D 1B 78 */ mr r29, r3 /* 800DEE34 000DBD74 80 03 27 EC */ lwz r0, 0x27ec(r3) /* 800DEE38 000DBD78 28 00 00 00 */ cmplwi r0, 0 @@ -74371,7 +74371,7 @@ lbl_800DEEC0: /* 800DEEC0 000DBE00 38 60 00 00 */ li r3, 0 lbl_800DEEC4: /* 800DEEC4 000DBE04 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DEEC8 000DBE08 48 28 33 61 */ bl func_80362228 +/* 800DEEC8 000DBE08 48 28 33 61 */ bl _restgpr_29 /* 800DEECC 000DBE0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DEED0 000DBE10 7C 08 03 A6 */ mtlr r0 /* 800DEED4 000DBE14 38 21 00 20 */ addi r1, r1, 0x20 @@ -74518,7 +74518,7 @@ daAlink_c_NS_checkUpperItemActionBow: /* 800DF0C0 000DC000 7C 08 02 A6 */ mflr r0 /* 800DF0C4 000DC004 90 01 00 54 */ stw r0, 0x54(r1) /* 800DF0C8 000DC008 39 61 00 50 */ addi r11, r1, 0x50 -/* 800DF0CC 000DC00C 48 28 31 11 */ bl func_803621DC +/* 800DF0CC 000DC00C 48 28 31 11 */ bl _savegpr_29 /* 800DF0D0 000DC010 7C 7F 1B 78 */ mr r31, r3 /* 800DF0D4 000DC014 3B DF 20 48 */ addi r30, r31, 0x2048 /* 800DF0D8 000DC018 A0 03 2F DC */ lhz r0, 0x2fdc(r3) @@ -74985,7 +74985,7 @@ lbl_800DF774: /* 800DF77C 000DC6BC 4B FD 7A 71 */ bl daAlink_c_NS_cancelUpperItemReadyAnime lbl_800DF780: /* 800DF780 000DC6C0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800DF784 000DC6C4 48 28 2A A5 */ bl func_80362228 +/* 800DF784 000DC6C4 48 28 2A A5 */ bl _restgpr_29 /* 800DF788 000DC6C8 80 01 00 54 */ lwz r0, 0x54(r1) /* 800DF78C 000DC6CC 7C 08 03 A6 */ mtlr r0 /* 800DF790 000DC6D0 38 21 00 50 */ addi r1, r1, 0x50 @@ -75236,7 +75236,7 @@ daAlink_c_NS_setBowModel: /* 800DFAEC 000DCA2C 7C 08 02 A6 */ mflr r0 /* 800DFAF0 000DCA30 90 01 00 24 */ stw r0, 0x24(r1) /* 800DFAF4 000DCA34 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DFAF8 000DCA38 48 28 26 E5 */ bl func_803621DC +/* 800DFAF8 000DCA38 48 28 26 E5 */ bl _savegpr_29 /* 800DFAFC 000DCA3C 7C 7D 1B 78 */ mr r29, r3 /* 800DFB00 000DCA40 38 7D 21 D8 */ addi r3, r29, 0x21d8 /* 800DFB04 000DCA44 38 80 00 59 */ li r4, 0x59 @@ -75283,7 +75283,7 @@ daAlink_c_NS_setBowModel: /* 800DFBA8 000DCAE8 38 00 00 67 */ li r0, 0x67 /* 800DFBAC 000DCAEC 98 1D 2F 94 */ stb r0, 0x2f94(r29) /* 800DFBB0 000DCAF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DFBB4 000DCAF4 48 28 26 75 */ bl func_80362228 +/* 800DFBB4 000DCAF4 48 28 26 75 */ bl _restgpr_29 /* 800DFBB8 000DCAF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DFBBC 000DCAFC 7C 08 03 A6 */ mtlr r0 /* 800DFBC0 000DCB00 38 21 00 20 */ addi r1, r1, 0x20 @@ -76007,7 +76007,7 @@ daAlink_c_NS_setBoomerangReadyAnime: /* 800E0560 000DD4A0 7C 08 02 A6 */ mflr r0 /* 800E0564 000DD4A4 90 01 00 24 */ stw r0, 0x24(r1) /* 800E0568 000DD4A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E056C 000DD4AC 48 28 1C 71 */ bl func_803621DC +/* 800E056C 000DD4AC 48 28 1C 71 */ bl _savegpr_29 /* 800E0570 000DD4B0 7C 7D 1B 78 */ mr r29, r3 /* 800E0574 000DD4B4 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800E0578 000DD4B8 3B C0 00 01 */ li r30, 1 @@ -76036,7 +76036,7 @@ lbl_800E05C0: /* 800E05C8 000DD508 7F A3 EB 78 */ mr r3, r29 /* 800E05CC 000DD50C 4B FF FF 1D */ bl daAlink_c_NS_setBoomerangReadyQuake /* 800E05D0 000DD510 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E05D4 000DD514 48 28 1C 55 */ bl func_80362228 +/* 800E05D4 000DD514 48 28 1C 55 */ bl _restgpr_29 /* 800E05D8 000DD518 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E05DC 000DD51C 7C 08 03 A6 */ mtlr r0 /* 800E05E0 000DD520 38 21 00 20 */ addi r1, r1, 0x20 @@ -76107,7 +76107,7 @@ daAlink_c_NS_throwBoomerang: /* 800E06BC 000DD5FC 7C 08 02 A6 */ mflr r0 /* 800E06C0 000DD600 90 01 00 24 */ stw r0, 0x24(r1) /* 800E06C4 000DD604 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E06C8 000DD608 48 28 1B 15 */ bl func_803621DC +/* 800E06C8 000DD608 48 28 1B 15 */ bl _savegpr_29 /* 800E06CC 000DD60C 7C 7D 1B 78 */ mr r29, r3 /* 800E06D0 000DD610 83 E3 28 28 */ lwz r31, 0x2828(r3) /* 800E06D4 000DD614 80 03 05 74 */ lwz r0, 0x574(r3) @@ -76238,7 +76238,7 @@ lbl_800E0898: /* 800E08A8 000DD7E8 4B F2 EF A1 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf lbl_800E08AC: /* 800E08AC 000DD7EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E08B0 000DD7F0 48 28 19 79 */ bl func_80362228 +/* 800E08B0 000DD7F0 48 28 19 79 */ bl _restgpr_29 /* 800E08B4 000DD7F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E08B8 000DD7F8 7C 08 03 A6 */ mtlr r0 /* 800E08BC 000DD7FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -76472,7 +76472,7 @@ daAlink_c_NS_checkNextActionBoomerang: /* 800E0BE8 000DDB28 7C 08 02 A6 */ mflr r0 /* 800E0BEC 000DDB2C 90 01 00 24 */ stw r0, 0x24(r1) /* 800E0BF0 000DDB30 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E0BF4 000DDB34 48 28 15 E9 */ bl func_803621DC +/* 800E0BF4 000DDB34 48 28 15 E9 */ bl _savegpr_29 /* 800E0BF8 000DDB38 7C 7F 1B 78 */ mr r31, r3 /* 800E0BFC 000DDB3C A0 03 1F BC */ lhz r0, 0x1fbc(r3) /* 800E0C00 000DDB40 28 00 00 52 */ cmplwi r0, 0x52 @@ -76582,7 +76582,7 @@ lbl_800E0D6C: /* 800E0D70 000DDCB0 48 00 02 F1 */ bl daAlink_c_NS_procBoomerangMoveInit lbl_800E0D74: /* 800E0D74 000DDCB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E0D78 000DDCB8 48 28 14 B1 */ bl func_80362228 +/* 800E0D78 000DDCB8 48 28 14 B1 */ bl _restgpr_29 /* 800E0D7C 000DDCBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E0D80 000DDCC0 7C 08 03 A6 */ mtlr r0 /* 800E0D84 000DDCC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -77222,7 +77222,7 @@ daAlink_c_NS_setCopyRodControllUpperSpeedRate: /* 800E1608 000DE548 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800E160C 000DE54C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800E1610 000DE550 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1614 000DE554 48 28 0B C9 */ bl func_803621DC +/* 800E1614 000DE554 48 28 0B C9 */ bl _savegpr_29 /* 800E1618 000DE558 7C 7D 1B 78 */ mr r29, r3 /* 800E161C 000DE55C 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800E1620 000DE560 3B C0 00 01 */ li r30, 1 @@ -77300,7 +77300,7 @@ lbl_800E16E0: /* 800E1728 000DE668 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800E172C 000DE66C CB E1 00 20 */ lfd f31, 0x20(r1) /* 800E1730 000DE670 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1734 000DE674 48 28 0A F5 */ bl func_80362228 +/* 800E1734 000DE674 48 28 0A F5 */ bl _restgpr_29 /* 800E1738 000DE678 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E173C 000DE67C 7C 08 03 A6 */ mtlr r0 /* 800E1740 000DE680 38 21 00 30 */ addi r1, r1, 0x30 @@ -77377,7 +77377,7 @@ daAlink_c_NS_setCopyRodReadyAnime: /* 800E1844 000DE784 7C 08 02 A6 */ mflr r0 /* 800E1848 000DE788 90 01 00 24 */ stw r0, 0x24(r1) /* 800E184C 000DE78C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1850 000DE790 48 28 09 8D */ bl func_803621DC +/* 800E1850 000DE790 48 28 09 8D */ bl _savegpr_29 /* 800E1854 000DE794 7C 7D 1B 78 */ mr r29, r3 /* 800E1858 000DE798 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800E185C 000DE79C 3B C0 00 01 */ li r30, 1 @@ -77428,7 +77428,7 @@ lbl_800E18EC: /* 800E18FC 000DE83C 7F A3 EB 78 */ mr r3, r29 /* 800E1900 000DE840 4B FC A1 E1 */ bl daAlink_c_NS_initLockAt /* 800E1904 000DE844 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1908 000DE848 48 28 09 21 */ bl func_80362228 +/* 800E1908 000DE848 48 28 09 21 */ bl _restgpr_29 /* 800E190C 000DE84C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E1910 000DE850 7C 08 03 A6 */ mtlr r0 /* 800E1914 000DE854 38 21 00 20 */ addi r1, r1, 0x20 @@ -77665,7 +77665,7 @@ daAlink_c_NS_checkNextActionCopyRod: /* 800E1C48 000DEB88 7C 08 02 A6 */ mflr r0 /* 800E1C4C 000DEB8C 90 01 00 24 */ stw r0, 0x24(r1) /* 800E1C50 000DEB90 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1C54 000DEB94 48 28 05 89 */ bl func_803621DC +/* 800E1C54 000DEB94 48 28 05 89 */ bl _savegpr_29 /* 800E1C58 000DEB98 7C 7F 1B 78 */ mr r31, r3 /* 800E1C5C 000DEB9C A0 03 1F BC */ lhz r0, 0x1fbc(r3) /* 800E1C60 000DEBA0 28 00 00 52 */ cmplwi r0, 0x52 @@ -77739,7 +77739,7 @@ lbl_800E1D4C: /* 800E1D50 000DEC90 48 00 02 19 */ bl daAlink_c_NS_procCopyRodMoveInit lbl_800E1D54: /* 800E1D54 000DEC94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E1D58 000DEC98 48 28 04 D1 */ bl func_80362228 +/* 800E1D58 000DEC98 48 28 04 D1 */ bl _restgpr_29 /* 800E1D5C 000DEC9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E1D60 000DECA0 7C 08 03 A6 */ mtlr r0 /* 800E1D64 000DECA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -79774,7 +79774,7 @@ lbl_800E39DC: /* 800E3A18 000E0958 7C 08 02 A6 */ mflr r0 /* 800E3A1C 000E095C 90 01 00 24 */ stw r0, 0x24(r1) /* 800E3A20 000E0960 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3A24 000E0964 48 27 E7 B9 */ bl func_803621DC +/* 800E3A24 000E0964 48 27 E7 B9 */ bl _savegpr_29 /* 800E3A28 000E0968 7C 7D 1B 78 */ mr r29, r3 /* 800E3A2C 000E096C 7C 9E 23 78 */ mr r30, r4 /* 800E3A30 000E0970 83 E3 28 30 */ lwz r31, 0x2830(r3) @@ -79802,7 +79802,7 @@ lbl_800E3A74: /* 800E3A80 000E09C0 38 60 00 01 */ li r3, 1 lbl_800E3A84: /* 800E3A84 000E09C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3A88 000E09C8 48 27 E7 A1 */ bl func_80362228 +/* 800E3A88 000E09C8 48 27 E7 A1 */ bl _restgpr_29 /* 800E3A8C 000E09CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E3A90 000E09D0 7C 08 03 A6 */ mtlr r0 /* 800E3A94 000E09D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -79811,7 +79811,7 @@ lbl_800E3A84: /* 800E3AA0 000E09E0 7C 08 02 A6 */ mflr r0 /* 800E3AA4 000E09E4 90 01 00 24 */ stw r0, 0x24(r1) /* 800E3AA8 000E09E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3AAC 000E09EC 48 27 E7 31 */ bl func_803621DC +/* 800E3AAC 000E09EC 48 27 E7 31 */ bl _savegpr_29 /* 800E3AB0 000E09F0 7C 7D 1B 78 */ mr r29, r3 /* 800E3AB4 000E09F4 7C 9E 23 78 */ mr r30, r4 /* 800E3AB8 000E09F8 7C DF 33 78 */ mr r31, r6 @@ -79888,7 +79888,7 @@ lbl_800E3BB0: /* 800E3BB0 000E0AF0 38 60 00 00 */ li r3, 0 lbl_800E3BB4: /* 800E3BB4 000E0AF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3BB8 000E0AF8 48 27 E6 71 */ bl func_80362228 +/* 800E3BB8 000E0AF8 48 27 E6 71 */ bl _restgpr_29 /* 800E3BBC 000E0AFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E3BC0 000E0B00 7C 08 03 A6 */ mtlr r0 /* 800E3BC4 000E0B04 38 21 00 20 */ addi r1, r1, 0x20 @@ -81035,7 +81035,7 @@ daAlink_c_NS_freeGrabItem: /* 800E4BD8 000E1B18 7C 08 02 A6 */ mflr r0 /* 800E4BDC 000E1B1C 90 01 00 54 */ stw r0, 0x54(r1) /* 800E4BE0 000E1B20 39 61 00 50 */ addi r11, r1, 0x50 -/* 800E4BE4 000E1B24 48 27 D5 F9 */ bl func_803621DC +/* 800E4BE4 000E1B24 48 27 D5 F9 */ bl _savegpr_29 /* 800E4BE8 000E1B28 7C 7F 1B 78 */ mr r31, r3 /* 800E4BEC 000E1B2C 83 C3 28 30 */ lwz r30, 0x2830(r3) /* 800E4BF0 000E1B30 28 1E 00 00 */ cmplwi r30, 0 @@ -81172,7 +81172,7 @@ lbl_800E4D98: /* 800E4DCC 000E1D0C 38 63 00 06 */ addi r3, r3, 6 /* 800E4DD0 000E1D10 42 00 FF C8 */ bdnz lbl_800E4D98 /* 800E4DD4 000E1D14 39 61 00 50 */ addi r11, r1, 0x50 -/* 800E4DD8 000E1D18 48 27 D4 51 */ bl func_80362228 +/* 800E4DD8 000E1D18 48 27 D4 51 */ bl _restgpr_29 /* 800E4DDC 000E1D1C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800E4DE0 000E1D20 7C 08 03 A6 */ mtlr r0 /* 800E4DE4 000E1D24 38 21 00 50 */ addi r1, r1, 0x50 @@ -81186,7 +81186,7 @@ daAlink_c_NS_setGrabUpperSpeedRate: /* 800E4DF8 000E1D38 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800E4DFC 000E1D3C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800E4E00 000E1D40 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E4E04 000E1D44 48 27 D3 D9 */ bl func_803621DC +/* 800E4E04 000E1D44 48 27 D3 D9 */ bl _savegpr_29 /* 800E4E08 000E1D48 7C 7D 1B 78 */ mr r29, r3 /* 800E4E0C 000E1D4C 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800E4E10 000E1D50 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 @@ -81294,7 +81294,7 @@ lbl_800E4F40: /* 800E4F88 000E1EC8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800E4F8C 000E1ECC CB E1 00 20 */ lfd f31, 0x20(r1) /* 800E4F90 000E1ED0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E4F94 000E1ED4 48 27 D2 95 */ bl func_80362228 +/* 800E4F94 000E1ED4 48 27 D2 95 */ bl _restgpr_29 /* 800E4F98 000E1ED8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E4F9C 000E1EDC 7C 08 03 A6 */ mtlr r0 /* 800E4FA0 000E1EE0 38 21 00 30 */ addi r1, r1, 0x30 @@ -82621,7 +82621,7 @@ lbl_800E61F8: /* 800E6234 000E3174 7C 08 02 A6 */ mflr r0 /* 800E6238 000E3178 90 01 00 34 */ stw r0, 0x34(r1) /* 800E623C 000E317C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E6240 000E3180 48 27 BF 9D */ bl func_803621DC +/* 800E6240 000E3180 48 27 BF 9D */ bl _savegpr_29 /* 800E6244 000E3184 7C 7D 1B 78 */ mr r29, r3 /* 800E6248 000E3188 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 800E624C 000E318C 83 E3 28 30 */ lwz r31, 0x2830(r3) @@ -82703,7 +82703,7 @@ lbl_800E6360: /* 800E6360 000E32A0 38 60 00 01 */ li r3, 1 lbl_800E6364: /* 800E6364 000E32A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E6368 000E32A8 48 27 BE C1 */ bl func_80362228 +/* 800E6368 000E32A8 48 27 BE C1 */ bl _restgpr_29 /* 800E636C 000E32AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E6370 000E32B0 7C 08 03 A6 */ mtlr r0 /* 800E6374 000E32B4 38 21 00 30 */ addi r1, r1, 0x30 @@ -82747,7 +82747,7 @@ daAlink_c_NS_procGrabThrowInit: /* 800E63F4 000E3334 7C 08 02 A6 */ mflr r0 /* 800E63F8 000E3338 90 01 00 24 */ stw r0, 0x24(r1) /* 800E63FC 000E333C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E6400 000E3340 48 27 BD DD */ bl func_803621DC +/* 800E6400 000E3340 48 27 BD DD */ bl _savegpr_29 /* 800E6404 000E3344 7C 7F 1B 78 */ mr r31, r3 /* 800E6408 000E3348 7C 9D 23 78 */ mr r29, r4 /* 800E640C 000E334C 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -82879,7 +82879,7 @@ lbl_800E65BC: /* 800E65DC 000E351C 38 60 00 01 */ li r3, 1 lbl_800E65E0: /* 800E65E0 000E3520 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E65E4 000E3524 48 27 BC 45 */ bl func_80362228 +/* 800E65E4 000E3524 48 27 BC 45 */ bl _restgpr_29 /* 800E65E8 000E3528 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E65EC 000E352C 7C 08 03 A6 */ mtlr r0 /* 800E65F0 000E3530 38 21 00 20 */ addi r1, r1, 0x20 @@ -83107,7 +83107,7 @@ lbl_800E68FC: /* 800E6918 000E3858 7C 08 02 A6 */ mflr r0 /* 800E691C 000E385C 90 01 00 34 */ stw r0, 0x34(r1) /* 800E6920 000E3860 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E6924 000E3864 48 27 B8 B9 */ bl func_803621DC +/* 800E6924 000E3864 48 27 B8 B9 */ bl _savegpr_29 /* 800E6928 000E3868 7C 7D 1B 78 */ mr r29, r3 /* 800E692C 000E386C 83 E3 28 30 */ lwz r31, 0x2830(r3) /* 800E6930 000E3870 38 7D 04 E6 */ addi r3, r29, 0x4e6 @@ -83203,7 +83203,7 @@ lbl_800E6A58: lbl_800E6A80: /* 800E6A80 000E39C0 38 60 00 01 */ li r3, 1 /* 800E6A84 000E39C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E6A88 000E39C8 48 27 B7 A1 */ bl func_80362228 +/* 800E6A88 000E39C8 48 27 B7 A1 */ bl _restgpr_29 /* 800E6A8C 000E39CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E6A90 000E39D0 7C 08 03 A6 */ mtlr r0 /* 800E6A94 000E39D4 38 21 00 30 */ addi r1, r1, 0x30 @@ -83330,7 +83330,7 @@ lbl_800E6C14: /* 800E6C38 000E3B78 7C 08 02 A6 */ mflr r0 /* 800E6C3C 000E3B7C 90 01 00 24 */ stw r0, 0x24(r1) /* 800E6C40 000E3B80 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E6C44 000E3B84 48 27 B5 99 */ bl func_803621DC +/* 800E6C44 000E3B84 48 27 B5 99 */ bl _savegpr_29 /* 800E6C48 000E3B88 7C 7D 1B 78 */ mr r29, r3 /* 800E6C4C 000E3B8C 80 03 28 30 */ lwz r0, 0x2830(r3) /* 800E6C50 000E3B90 28 00 00 00 */ cmplwi r0, 0 @@ -83407,7 +83407,7 @@ lbl_800E6D50: /* 800E6D50 000E3C90 38 60 00 01 */ li r3, 1 lbl_800E6D54: /* 800E6D54 000E3C94 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E6D58 000E3C98 48 27 B4 D1 */ bl func_80362228 +/* 800E6D58 000E3C98 48 27 B4 D1 */ bl _restgpr_29 /* 800E6D5C 000E3C9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E6D60 000E3CA0 7C 08 03 A6 */ mtlr r0 /* 800E6D64 000E3CA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -84082,7 +84082,7 @@ lbl_800E76C8: /* 800E76E4 000E4624 7C 08 02 A6 */ mflr r0 /* 800E76E8 000E4628 90 01 00 34 */ stw r0, 0x34(r1) /* 800E76EC 000E462C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E76F0 000E4630 48 27 AA ED */ bl func_803621DC +/* 800E76F0 000E4630 48 27 AA ED */ bl _savegpr_29 /* 800E76F4 000E4634 7C 7F 1B 78 */ mr r31, r3 /* 800E76F8 000E4638 83 C3 28 28 */ lwz r30, 0x2828(r3) /* 800E76FC 000E463C 28 1E 00 00 */ cmplwi r30, 0 @@ -84190,7 +84190,7 @@ lbl_800E7878: /* 800E7878 000E47B8 38 60 00 01 */ li r3, 1 lbl_800E787C: /* 800E787C 000E47BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E7880 000E47C0 48 27 A9 A9 */ bl func_80362228 +/* 800E7880 000E47C0 48 27 A9 A9 */ bl _restgpr_29 /* 800E7884 000E47C4 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E7888 000E47C8 7C 08 03 A6 */ mtlr r0 /* 800E788C 000E47CC 38 21 00 30 */ addi r1, r1, 0x30 @@ -84202,7 +84202,7 @@ daAlink_c_NS_checkSetChainPullAnime: /* 800E7898 000E47D8 7C 08 02 A6 */ mflr r0 /* 800E789C 000E47DC 90 01 00 24 */ stw r0, 0x24(r1) /* 800E78A0 000E47E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E78A4 000E47E4 48 27 A9 39 */ bl func_803621DC +/* 800E78A4 000E47E4 48 27 A9 39 */ bl _savegpr_29 /* 800E78A8 000E47E8 7C 7D 1B 78 */ mr r29, r3 /* 800E78AC 000E47EC 7C 9E 23 78 */ mr r30, r4 /* 800E78B0 000E47F0 3B E0 00 00 */ li r31, 0 @@ -84244,7 +84244,7 @@ lbl_800E792C: lbl_800E7930: /* 800E7930 000E4870 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 800E7934 000E4874 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E7938 000E4878 48 27 A8 F1 */ bl func_80362228 +/* 800E7938 000E4878 48 27 A8 F1 */ bl _restgpr_29 /* 800E793C 000E487C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E7940 000E4880 7C 08 03 A6 */ mtlr r0 /* 800E7944 000E4884 38 21 00 20 */ addi r1, r1, 0x20 @@ -84312,7 +84312,7 @@ daAlink_c_NS_searchFmChainPos: /* 800E7A0C 000E494C DB C1 00 30 */ stfd f30, 0x30(r1) /* 800E7A10 000E4950 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 800E7A14 000E4954 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E7A18 000E4958 48 27 A7 C5 */ bl func_803621DC +/* 800E7A18 000E4958 48 27 A7 C5 */ bl _savegpr_29 /* 800E7A1C 000E495C 7C 7D 1B 78 */ mr r29, r3 /* 800E7A20 000E4960 80 03 28 48 */ lwz r0, 0x2848(r3) /* 800E7A24 000E4964 28 00 00 00 */ cmplwi r0, 0 @@ -84364,7 +84364,7 @@ lbl_800E7AC4: /* 800E7ACC 000E4A0C E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 800E7AD0 000E4A10 CB C1 00 30 */ lfd f30, 0x30(r1) /* 800E7AD4 000E4A14 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E7AD8 000E4A18 48 27 A7 51 */ bl func_80362228 +/* 800E7AD8 000E4A18 48 27 A7 51 */ bl _restgpr_29 /* 800E7ADC 000E4A1C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800E7AE0 000E4A20 7C 08 03 A6 */ mtlr r0 /* 800E7AE4 000E4A24 38 21 00 50 */ addi r1, r1, 0x50 @@ -84510,7 +84510,7 @@ lbl_800E7CAC: /* 800E7CC4 000E4C04 7C 08 02 A6 */ mflr r0 /* 800E7CC8 000E4C08 90 01 00 24 */ stw r0, 0x24(r1) /* 800E7CCC 000E4C0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E7CD0 000E4C10 48 27 A5 0D */ bl func_803621DC +/* 800E7CD0 000E4C10 48 27 A5 0D */ bl _savegpr_29 /* 800E7CD4 000E4C14 7C 7D 1B 78 */ mr r29, r3 /* 800E7CD8 000E4C18 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 800E7CDC 000E4C1C 38 80 00 96 */ li r4, 0x96 @@ -84575,7 +84575,7 @@ lbl_800E7DB0: lbl_800E7DBC: /* 800E7DBC 000E4CFC 38 60 00 01 */ li r3, 1 /* 800E7DC0 000E4D00 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E7DC4 000E4D04 48 27 A4 65 */ bl func_80362228 +/* 800E7DC4 000E4D04 48 27 A4 65 */ bl _restgpr_29 /* 800E7DC8 000E4D08 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E7DCC 000E4D0C 7C 08 03 A6 */ mtlr r0 /* 800E7DD0 000E4D10 38 21 00 20 */ addi r1, r1, 0x20 @@ -84695,7 +84695,7 @@ daAlink_c_NS_setPushPullKeepData: /* 800E7F40 000E4E80 7C 08 02 A6 */ mflr r0 /* 800E7F44 000E4E84 90 01 00 24 */ stw r0, 0x24(r1) /* 800E7F48 000E4E88 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E7F4C 000E4E8C 48 27 A2 91 */ bl func_803621DC +/* 800E7F4C 000E4E8C 48 27 A2 91 */ bl _savegpr_29 /* 800E7F50 000E4E90 7C 7F 1B 78 */ mr r31, r3 /* 800E7F54 000E4E94 7C 9D 23 79 */ or. r29, r4, r4 /* 800E7F58 000E4E98 7C BE 2B 78 */ mr r30, r5 @@ -84782,7 +84782,7 @@ lbl_800E8068: /* 800E8088 000E4FC8 38 60 00 01 */ li r3, 1 lbl_800E808C: /* 800E808C 000E4FCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E8090 000E4FD0 48 27 A1 99 */ bl func_80362228 +/* 800E8090 000E4FD0 48 27 A1 99 */ bl _restgpr_29 /* 800E8094 000E4FD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E8098 000E4FD8 7C 08 03 A6 */ mtlr r0 /* 800E809C 000E4FDC 38 21 00 20 */ addi r1, r1, 0x20 @@ -85460,7 +85460,7 @@ lbl_800E89D0: /* 800E89F4 000E5934 7C 08 02 A6 */ mflr r0 /* 800E89F8 000E5938 90 01 00 24 */ stw r0, 0x24(r1) /* 800E89FC 000E593C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E8A00 000E5940 48 27 97 DD */ bl func_803621DC +/* 800E8A00 000E5940 48 27 97 DD */ bl _savegpr_29 /* 800E8A04 000E5944 7C 7D 1B 78 */ mr r29, r3 /* 800E8A08 000E5948 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 800E8A0C 000E594C 3B C0 01 60 */ li r30, 0x160 @@ -85677,7 +85677,7 @@ lbl_800E8D00: /* 800E8D00 000E5C40 38 60 00 01 */ li r3, 1 lbl_800E8D04: /* 800E8D04 000E5C44 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E8D08 000E5C48 48 27 95 21 */ bl func_80362228 +/* 800E8D08 000E5C48 48 27 95 21 */ bl _restgpr_29 /* 800E8D0C 000E5C4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E8D10 000E5C50 7C 08 03 A6 */ mtlr r0 /* 800E8D14 000E5C54 38 21 00 20 */ addi r1, r1, 0x20 @@ -86504,7 +86504,7 @@ daAlink_c_NS_procGoatCatchInit: /* 800E98A0 000E67E0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800E98A4 000E67E4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 800E98A8 000E67E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E98AC 000E67EC 48 27 89 31 */ bl func_803621DC +/* 800E98AC 000E67EC 48 27 89 31 */ bl _savegpr_29 /* 800E98B0 000E67F0 7C 7E 1B 78 */ mr r30, r3 /* 800E98B4 000E67F4 7C 9F 23 78 */ mr r31, r4 /* 800E98B8 000E67F8 FF E0 08 90 */ fmr f31, f1 @@ -86715,7 +86715,7 @@ lbl_800E9BB0: /* 800E9BB0 000E6AF0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 800E9BB4 000E6AF4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 800E9BB8 000E6AF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800E9BBC 000E6AFC 48 27 86 6D */ bl func_80362228 +/* 800E9BBC 000E6AFC 48 27 86 6D */ bl _restgpr_29 /* 800E9BC0 000E6B00 80 01 00 44 */ lwz r0, 0x44(r1) /* 800E9BC4 000E6B04 7C 08 03 A6 */ mtlr r0 /* 800E9BC8 000E6B08 38 21 00 40 */ addi r1, r1, 0x40 @@ -87749,7 +87749,7 @@ lbl_800EAA14: /* 800EAA2C 000E796C 7C 08 02 A6 */ mflr r0 /* 800EAA30 000E7970 90 01 00 24 */ stw r0, 0x24(r1) /* 800EAA34 000E7974 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EAA38 000E7978 48 27 77 A5 */ bl func_803621DC +/* 800EAA38 000E7978 48 27 77 A5 */ bl _savegpr_29 /* 800EAA3C 000E797C 7C 7F 1B 78 */ mr r31, r3 /* 800EAA40 000E7980 38 00 00 04 */ li r0, 4 /* 800EAA44 000E7984 98 03 2F 99 */ stb r0, 0x2f99(r3) @@ -87889,7 +87889,7 @@ lbl_800EAC30: /* 800EAC30 000E7B70 38 60 00 01 */ li r3, 1 lbl_800EAC34: /* 800EAC34 000E7B74 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EAC38 000E7B78 48 27 75 F1 */ bl func_80362228 +/* 800EAC38 000E7B78 48 27 75 F1 */ bl _restgpr_29 /* 800EAC3C 000E7B7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EAC40 000E7B80 7C 08 03 A6 */ mtlr r0 /* 800EAC44 000E7B84 38 21 00 20 */ addi r1, r1, 0x20 @@ -87984,7 +87984,7 @@ lbl_800EAD34: /* 800EAD88 000E7CC8 7C 08 02 A6 */ mflr r0 /* 800EAD8C 000E7CCC 90 01 00 34 */ stw r0, 0x34(r1) /* 800EAD90 000E7CD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800EAD94 000E7CD4 48 27 74 49 */ bl func_803621DC +/* 800EAD94 000E7CD4 48 27 74 49 */ bl _savegpr_29 /* 800EAD98 000E7CD8 7C 7D 1B 78 */ mr r29, r3 /* 800EAD9C 000E7CDC 38 00 00 04 */ li r0, 4 /* 800EADA0 000E7CE0 98 03 2F 99 */ stb r0, 0x2f99(r3) @@ -88293,7 +88293,7 @@ lbl_800EB1EC: /* 800EB1EC 000E812C 38 60 00 01 */ li r3, 1 lbl_800EB1F0: /* 800EB1F0 000E8130 39 61 00 30 */ addi r11, r1, 0x30 -/* 800EB1F4 000E8134 48 27 70 35 */ bl func_80362228 +/* 800EB1F4 000E8134 48 27 70 35 */ bl _restgpr_29 /* 800EB1F8 000E8138 80 01 00 34 */ lwz r0, 0x34(r1) /* 800EB1FC 000E813C 7C 08 03 A6 */ mtlr r0 /* 800EB200 000E8140 38 21 00 30 */ addi r1, r1, 0x30 @@ -88350,7 +88350,7 @@ daAlink_c_NS_procSumouSideMoveInit: /* 800EB2C0 000E8200 7C 08 02 A6 */ mflr r0 /* 800EB2C4 000E8204 90 01 00 24 */ stw r0, 0x24(r1) /* 800EB2C8 000E8208 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EB2CC 000E820C 48 27 6F 11 */ bl func_803621DC +/* 800EB2CC 000E820C 48 27 6F 11 */ bl _savegpr_29 /* 800EB2D0 000E8210 7C 7F 1B 78 */ mr r31, r3 /* 800EB2D4 000E8214 38 00 00 04 */ li r0, 4 /* 800EB2D8 000E8218 98 03 2F 99 */ stb r0, 0x2f99(r3) @@ -88577,7 +88577,7 @@ lbl_800EB608: /* 800EB608 000E8548 38 60 00 01 */ li r3, 1 lbl_800EB60C: /* 800EB60C 000E854C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EB610 000E8550 48 27 6C 19 */ bl func_80362228 +/* 800EB610 000E8550 48 27 6C 19 */ bl _restgpr_29 /* 800EB614 000E8554 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EB618 000E8558 7C 08 03 A6 */ mtlr r0 /* 800EB61C 000E855C 38 21 00 20 */ addi r1, r1, 0x20 @@ -89443,7 +89443,7 @@ daAlink_c_NS_procSumouWinLoseInit: /* 800EC218 000E9158 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800EC21C 000E915C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800EC220 000E9160 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EC224 000E9164 48 27 5F B9 */ bl func_803621DC +/* 800EC224 000E9164 48 27 5F B9 */ bl _savegpr_29 /* 800EC228 000E9168 7C 7F 1B 78 */ mr r31, r3 /* 800EC22C 000E916C 88 03 05 6A */ lbz r0, 0x56a(r3) /* 800EC230 000E9170 28 00 00 0B */ cmplwi r0, 0xb @@ -89556,7 +89556,7 @@ lbl_800EC3B8: /* 800EC3B8 000E92F8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800EC3BC 000E92FC CB E1 00 20 */ lfd f31, 0x20(r1) /* 800EC3C0 000E9300 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EC3C4 000E9304 48 27 5E 65 */ bl func_80362228 +/* 800EC3C4 000E9304 48 27 5E 65 */ bl _restgpr_29 /* 800EC3C8 000E9308 80 01 00 34 */ lwz r0, 0x34(r1) /* 800EC3CC 000E930C 7C 08 03 A6 */ mtlr r0 /* 800EC3D0 000E9310 38 21 00 30 */ addi r1, r1, 0x30 @@ -89944,7 +89944,7 @@ daAlink_c_NS_checkReinRideBgCheck: /* 800EC8FC 000E983C 7C 08 02 A6 */ mflr r0 /* 800EC900 000E9840 90 01 00 34 */ stw r0, 0x34(r1) /* 800EC904 000E9844 39 61 00 30 */ addi r11, r1, 0x30 -/* 800EC908 000E9848 48 27 58 D5 */ bl func_803621DC +/* 800EC908 000E9848 48 27 58 D5 */ bl _savegpr_29 /* 800EC90C 000E984C 7C 7D 1B 78 */ mr r29, r3 /* 800EC910 000E9850 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800EC914 000E9854 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l @@ -90026,7 +90026,7 @@ lbl_800ECA14: /* 800ECA20 000E9960 38 60 00 01 */ li r3, 1 lbl_800ECA24: /* 800ECA24 000E9964 39 61 00 30 */ addi r11, r1, 0x30 -/* 800ECA28 000E9968 48 27 58 01 */ bl func_80362228 +/* 800ECA28 000E9968 48 27 58 01 */ bl _restgpr_29 /* 800ECA2C 000E996C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800ECA30 000E9970 7C 08 03 A6 */ mtlr r0 /* 800ECA34 000E9974 38 21 00 30 */ addi r1, r1, 0x30 @@ -91112,7 +91112,7 @@ daAlink_c_NS_setSyncBoarRunPos: /* 800ED910 000EA850 7C 08 02 A6 */ mflr r0 /* 800ED914 000EA854 90 01 00 24 */ stw r0, 0x24(r1) /* 800ED918 000EA858 39 61 00 20 */ addi r11, r1, 0x20 -/* 800ED91C 000EA85C 48 27 48 C1 */ bl func_803621DC +/* 800ED91C 000EA85C 48 27 48 C1 */ bl _savegpr_29 /* 800ED920 000EA860 7C 7E 1B 78 */ mr r30, r3 /* 800ED924 000EA864 83 E3 28 18 */ lwz r31, 0x2818(r3) /* 800ED928 000EA868 28 1F 00 00 */ cmplwi r31, 0 @@ -91178,7 +91178,7 @@ lbl_800EDA08: /* 800EDA08 000EA948 38 60 00 01 */ li r3, 1 lbl_800EDA0C: /* 800EDA0C 000EA94C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EDA10 000EA950 48 27 48 19 */ bl func_80362228 +/* 800EDA10 000EA950 48 27 48 19 */ bl _restgpr_29 /* 800EDA14 000EA954 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EDA18 000EA958 7C 08 03 A6 */ mtlr r0 /* 800EDA1C 000EA95C 38 21 00 20 */ addi r1, r1, 0x20 @@ -92519,7 +92519,7 @@ daAlink_c_NS_setBaseBoarAnime: /* 800EEC9C 000EBBDC 7C 08 02 A6 */ mflr r0 /* 800EECA0 000EBBE0 90 01 00 24 */ stw r0, 0x24(r1) /* 800EECA4 000EBBE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EECA8 000EBBE8 48 27 35 35 */ bl func_803621DC +/* 800EECA8 000EBBE8 48 27 35 35 */ bl _savegpr_29 /* 800EECAC 000EBBEC 7C 7D 1B 78 */ mr r29, r3 /* 800EECB0 000EBBF0 83 C3 28 18 */ lwz r30, 0x2818(r3) /* 800EECB4 000EBBF4 48 02 6F 6D */ bl daAlink_c_NS_checkEventRun @@ -92579,7 +92579,7 @@ lbl_800EED54: /* 800EED7C 000EBCBC 4B FB DC 99 */ bl daAlink_c_NS_setDoubleAnime lbl_800EED80: /* 800EED80 000EBCC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EED84 000EBCC4 48 27 34 A5 */ bl func_80362228 +/* 800EED84 000EBCC4 48 27 34 A5 */ bl _restgpr_29 /* 800EED88 000EBCC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EED8C 000EBCCC 7C 08 03 A6 */ mtlr r0 /* 800EED90 000EBCD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -92837,7 +92837,7 @@ daAlink_c_NS_checkHorseGetOffWallCheck: /* 800EF0EC 000EC02C 7C 08 02 A6 */ mflr r0 /* 800EF0F0 000EC030 90 01 00 24 */ stw r0, 0x24(r1) /* 800EF0F4 000EC034 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF0F8 000EC038 48 27 30 E5 */ bl func_803621DC +/* 800EF0F8 000EC038 48 27 30 E5 */ bl _savegpr_29 /* 800EF0FC 000EC03C 7C 7D 1B 78 */ mr r29, r3 /* 800EF100 000EC040 7C DE 33 78 */ mr r30, r6 /* 800EF104 000EC044 4B FB 30 95 */ bl daAlink_c_NS_commonLineCheck @@ -92875,7 +92875,7 @@ lbl_800EF130: /* 800EF17C 000EC0BC 54 03 0F FE */ srwi r3, r0, 0x1f lbl_800EF180: /* 800EF180 000EC0C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF184 000EC0C4 48 27 30 A5 */ bl func_80362228 +/* 800EF184 000EC0C4 48 27 30 A5 */ bl _restgpr_29 /* 800EF188 000EC0C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EF18C 000EC0CC 7C 08 03 A6 */ mtlr r0 /* 800EF190 000EC0D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -93385,7 +93385,7 @@ daAlink_c_NS_setHorseGetOff: /* 800EF888 000EC7C8 7C 08 02 A6 */ mflr r0 /* 800EF88C 000EC7CC 90 01 00 24 */ stw r0, 0x24(r1) /* 800EF890 000EC7D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF894 000EC7D4 48 27 29 49 */ bl func_803621DC +/* 800EF894 000EC7D4 48 27 29 49 */ bl _savegpr_29 /* 800EF898 000EC7D8 7C 7D 1B 78 */ mr r29, r3 /* 800EF89C 000EC7DC 7C 9E 23 78 */ mr r30, r4 /* 800EF8A0 000EC7E0 3C 80 80 40 */ lis r4, lbl_804061C0@ha @@ -93435,7 +93435,7 @@ lbl_800EF940: /* 800EF940 000EC880 38 60 00 00 */ li r3, 0 lbl_800EF944: /* 800EF944 000EC884 39 61 00 20 */ addi r11, r1, 0x20 -/* 800EF948 000EC888 48 27 28 E1 */ bl func_80362228 +/* 800EF948 000EC888 48 27 28 E1 */ bl _restgpr_29 /* 800EF94C 000EC88C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EF950 000EC890 7C 08 03 A6 */ mtlr r0 /* 800EF954 000EC894 38 21 00 20 */ addi r1, r1, 0x20 @@ -94139,7 +94139,7 @@ daAlink_c_NS_procHorseGetOffInit: /* 800F0390 000ED2D0 7C 08 02 A6 */ mflr r0 /* 800F0394 000ED2D4 90 01 00 34 */ stw r0, 0x34(r1) /* 800F0398 000ED2D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F039C 000ED2DC 48 27 1E 41 */ bl func_803621DC +/* 800F039C 000ED2DC 48 27 1E 41 */ bl _savegpr_29 /* 800F03A0 000ED2E0 7C 7E 1B 78 */ mr r30, r3 /* 800F03A4 000ED2E4 7C 9D 23 78 */ mr r29, r4 /* 800F03A8 000ED2E8 38 80 00 3B */ li r4, 0x3b @@ -94306,7 +94306,7 @@ lbl_800F05DC: /* 800F0600 000ED540 48 03 0B C1 */ bl daAlink_c_NS_setFootEffectProcType /* 800F0604 000ED544 38 60 00 01 */ li r3, 1 /* 800F0608 000ED548 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F060C 000ED54C 48 27 1C 1D */ bl func_80362228 +/* 800F060C 000ED54C 48 27 1C 1D */ bl _restgpr_29 /* 800F0610 000ED550 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F0614 000ED554 7C 08 03 A6 */ mtlr r0 /* 800F0618 000ED558 38 21 00 30 */ addi r1, r1, 0x30 @@ -94315,7 +94315,7 @@ lbl_800F05DC: /* 800F0624 000ED564 7C 08 02 A6 */ mflr r0 /* 800F0628 000ED568 90 01 00 34 */ stw r0, 0x34(r1) /* 800F062C 000ED56C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F0630 000ED570 48 27 1B AD */ bl func_803621DC +/* 800F0630 000ED570 48 27 1B AD */ bl _savegpr_29 /* 800F0634 000ED574 7C 7E 1B 78 */ mr r30, r3 /* 800F0638 000ED578 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800F063C 000ED57C 83 A3 28 18 */ lwz r29, 0x2818(r3) @@ -94536,7 +94536,7 @@ lbl_800F0964: /* 800F0964 000ED8A4 38 60 00 01 */ li r3, 1 lbl_800F0968: /* 800F0968 000ED8A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F096C 000ED8AC 48 27 18 BD */ bl func_80362228 +/* 800F096C 000ED8AC 48 27 18 BD */ bl _restgpr_29 /* 800F0970 000ED8B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F0974 000ED8B4 7C 08 03 A6 */ mtlr r0 /* 800F0978 000ED8B8 38 21 00 30 */ addi r1, r1, 0x30 @@ -94628,7 +94628,7 @@ lbl_800F0A8C: /* 800F0AA8 000ED9E8 7C 08 02 A6 */ mflr r0 /* 800F0AAC 000ED9EC 90 01 00 34 */ stw r0, 0x34(r1) /* 800F0AB0 000ED9F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F0AB4 000ED9F4 48 27 17 29 */ bl func_803621DC +/* 800F0AB4 000ED9F4 48 27 17 29 */ bl _savegpr_29 /* 800F0AB8 000ED9F8 7C 7F 1B 78 */ mr r31, r3 /* 800F0ABC 000ED9FC 4B FF EB F5 */ bl daAlink_c_NS_checkHorseGetOffAndSetDoStatus /* 800F0AC0 000EDA00 7C 7D 1B 78 */ mr r29, r3 @@ -94742,7 +94742,7 @@ lbl_800F0C50: /* 800F0C50 000EDB90 38 60 00 01 */ li r3, 1 lbl_800F0C54: /* 800F0C54 000EDB94 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F0C58 000EDB98 48 27 15 D1 */ bl func_80362228 +/* 800F0C58 000EDB98 48 27 15 D1 */ bl _restgpr_29 /* 800F0C5C 000EDB9C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F0C60 000EDBA0 7C 08 03 A6 */ mtlr r0 /* 800F0C64 000EDBA4 38 21 00 30 */ addi r1, r1, 0x30 @@ -94785,7 +94785,7 @@ lbl_800F0CB4: /* 800F0CE8 000EDC28 7C 08 02 A6 */ mflr r0 /* 800F0CEC 000EDC2C 90 01 00 24 */ stw r0, 0x24(r1) /* 800F0CF0 000EDC30 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F0CF4 000EDC34 48 27 14 E9 */ bl func_803621DC +/* 800F0CF4 000EDC34 48 27 14 E9 */ bl _savegpr_29 /* 800F0CF8 000EDC38 7C 7E 1B 78 */ mr r30, r3 /* 800F0CFC 000EDC3C 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 800F0D00 000EDC40 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l @@ -95022,7 +95022,7 @@ lbl_800F1044: /* 800F1044 000EDF84 38 60 00 01 */ li r3, 1 lbl_800F1048: /* 800F1048 000EDF88 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F104C 000EDF8C 48 27 11 DD */ bl func_80362228 +/* 800F104C 000EDF8C 48 27 11 DD */ bl _restgpr_29 /* 800F1050 000EDF90 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F1054 000EDF94 7C 08 03 A6 */ mtlr r0 /* 800F1058 000EDF98 38 21 00 20 */ addi r1, r1, 0x20 @@ -95670,7 +95670,7 @@ lbl_800F1910: /* 800F1950 000EE890 7C 08 02 A6 */ mflr r0 /* 800F1954 000EE894 90 01 00 24 */ stw r0, 0x24(r1) /* 800F1958 000EE898 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F195C 000EE89C 48 27 08 81 */ bl func_803621DC +/* 800F195C 000EE89C 48 27 08 81 */ bl _savegpr_29 /* 800F1960 000EE8A0 7C 7E 1B 78 */ mr r30, r3 /* 800F1964 000EE8A4 3B BE 20 48 */ addi r29, r30, 0x2048 /* 800F1968 000EE8A8 38 80 00 01 */ li r4, 1 @@ -95758,7 +95758,7 @@ lbl_800F1A90: /* 800F1A90 000EE9D0 38 60 00 01 */ li r3, 1 lbl_800F1A94: /* 800F1A94 000EE9D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F1A98 000EE9D8 48 27 07 91 */ bl func_80362228 +/* 800F1A98 000EE9D8 48 27 07 91 */ bl _restgpr_29 /* 800F1A9C 000EE9DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F1AA0 000EE9E0 7C 08 03 A6 */ mtlr r0 /* 800F1AA4 000EE9E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -95937,7 +95937,7 @@ daAlink_c_NS_procHorseDamageInit: /* 800F1D1C 000EEC5C 7C 08 02 A6 */ mflr r0 /* 800F1D20 000EEC60 90 01 00 34 */ stw r0, 0x34(r1) /* 800F1D24 000EEC64 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F1D28 000EEC68 48 27 04 B5 */ bl func_803621DC +/* 800F1D28 000EEC68 48 27 04 B5 */ bl _savegpr_29 /* 800F1D2C 000EEC6C 7C 7F 1B 78 */ mr r31, r3 /* 800F1D30 000EEC70 7C 9D 23 78 */ mr r29, r4 /* 800F1D34 000EEC74 38 80 00 44 */ li r4, 0x44 @@ -96135,7 +96135,7 @@ lbl_800F1F6C: /* 800F2008 000EEF48 90 1F 05 74 */ stw r0, 0x574(r31) /* 800F200C 000EEF4C 38 60 00 01 */ li r3, 1 /* 800F2010 000EEF50 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F2014 000EEF54 48 27 02 15 */ bl func_80362228 +/* 800F2014 000EEF54 48 27 02 15 */ bl _restgpr_29 /* 800F2018 000EEF58 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F201C 000EEF5C 7C 08 03 A6 */ mtlr r0 /* 800F2020 000EEF60 38 21 00 30 */ addi r1, r1, 0x30 @@ -97567,7 +97567,7 @@ daAlink_c_NS_procHorseHangInit: /* 800F3434 000F0374 7C 08 02 A6 */ mflr r0 /* 800F3438 000F0378 90 01 00 24 */ stw r0, 0x24(r1) /* 800F343C 000F037C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3440 000F0380 48 26 ED 9D */ bl func_803621DC +/* 800F3440 000F0380 48 26 ED 9D */ bl _savegpr_29 /* 800F3444 000F0384 7C 7D 1B 78 */ mr r29, r3 /* 800F3448 000F0388 7C 9E 23 78 */ mr r30, r4 /* 800F344C 000F038C 7C BF 2B 78 */ mr r31, r5 @@ -97647,7 +97647,7 @@ lbl_800F3564: /* 800F3564 000F04A4 38 60 00 01 */ li r3, 1 lbl_800F3568: /* 800F3568 000F04A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F356C 000F04AC 48 26 EC BD */ bl func_80362228 +/* 800F356C 000F04AC 48 26 EC BD */ bl _restgpr_29 /* 800F3570 000F04B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F3574 000F04B4 7C 08 03 A6 */ mtlr r0 /* 800F3578 000F04B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -98286,7 +98286,7 @@ daAlink_c_NS_getCanoePaddleMatrix: /* 800F3E50 000F0D90 7C 08 02 A6 */ mflr r0 /* 800F3E54 000F0D94 90 01 00 24 */ stw r0, 0x24(r1) /* 800F3E58 000F0D98 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3E5C 000F0D9C 48 26 E3 81 */ bl func_803621DC +/* 800F3E5C 000F0D9C 48 26 E3 81 */ bl _savegpr_29 /* 800F3E60 000F0DA0 7C 7D 1B 78 */ mr r29, r3 /* 800F3E64 000F0DA4 7C 9E 23 78 */ mr r30, r4 /* 800F3E68 000F0DA8 3B E0 00 00 */ li r31, 0 @@ -98307,7 +98307,7 @@ lbl_800F3E90: lbl_800F3E9C: /* 800F3E9C 000F0DDC 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 800F3EA0 000F0DE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F3EA4 000F0DE4 48 26 E3 85 */ bl func_80362228 +/* 800F3EA4 000F0DE4 48 26 E3 85 */ bl _restgpr_29 /* 800F3EA8 000F0DE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F3EAC 000F0DEC 7C 08 03 A6 */ mtlr r0 /* 800F3EB0 000F0DF0 38 21 00 20 */ addi r1, r1, 0x20 @@ -98804,7 +98804,7 @@ daAlink_c_NS_setSyncCanoePos: /* 800F45A8 000F14E8 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800F45AC 000F14EC F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800F45B0 000F14F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F45B4 000F14F4 48 26 DC 29 */ bl func_803621DC +/* 800F45B4 000F14F4 48 26 DC 29 */ bl _savegpr_29 /* 800F45B8 000F14F8 7C 7E 1B 78 */ mr r30, r3 /* 800F45BC 000F14FC 83 E3 28 18 */ lwz r31, 0x2818(r3) /* 800F45C0 000F1500 80 1F 00 B0 */ lwz r0, 0xb0(r31) @@ -98947,7 +98947,7 @@ lbl_800F478C: /* 800F47B8 000F16F8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800F47BC 000F16FC CB E1 00 20 */ lfd f31, 0x20(r1) /* 800F47C0 000F1700 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F47C4 000F1704 48 26 DA 65 */ bl func_80362228 +/* 800F47C4 000F1704 48 26 DA 65 */ bl _restgpr_29 /* 800F47C8 000F1708 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F47CC 000F170C 7C 08 03 A6 */ mtlr r0 /* 800F47D0 000F1710 38 21 00 30 */ addi r1, r1, 0x30 @@ -99227,7 +99227,7 @@ lbl_800F4B3C: /* 800F4B94 000F1AD4 7C 08 02 A6 */ mflr r0 /* 800F4B98 000F1AD8 90 01 00 24 */ stw r0, 0x24(r1) /* 800F4B9C 000F1ADC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4BA0 000F1AE0 48 26 D6 3D */ bl func_803621DC +/* 800F4BA0 000F1AE0 48 26 D6 3D */ bl _savegpr_29 /* 800F4BA4 000F1AE4 7C 7D 1B 78 */ mr r29, r3 /* 800F4BA8 000F1AE8 83 E3 28 18 */ lwz r31, 0x2818(r3) /* 800F4BAC 000F1AEC 28 1F 00 00 */ cmplwi r31, 0 @@ -99282,7 +99282,7 @@ lbl_800F4C5C: /* 800F4C5C 000F1B9C 38 60 00 01 */ li r3, 1 lbl_800F4C60: /* 800F4C60 000F1BA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4C64 000F1BA4 48 26 D5 C5 */ bl func_80362228 +/* 800F4C64 000F1BA4 48 26 D5 C5 */ bl _restgpr_29 /* 800F4C68 000F1BA8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F4C6C 000F1BAC 7C 08 03 A6 */ mtlr r0 /* 800F4C70 000F1BB0 38 21 00 20 */ addi r1, r1, 0x20 @@ -99294,7 +99294,7 @@ daAlink_c_NS_procCanoeJumpRideInit: /* 800F4C7C 000F1BBC 7C 08 02 A6 */ mflr r0 /* 800F4C80 000F1BC0 90 01 00 24 */ stw r0, 0x24(r1) /* 800F4C84 000F1BC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4C88 000F1BC8 48 26 D5 55 */ bl func_803621DC +/* 800F4C88 000F1BC8 48 26 D5 55 */ bl _savegpr_29 /* 800F4C8C 000F1BCC 7C 7D 1B 78 */ mr r29, r3 /* 800F4C90 000F1BD0 7C 9E 23 78 */ mr r30, r4 /* 800F4C94 000F1BD4 38 80 00 8D */ li r4, 0x8d @@ -99357,7 +99357,7 @@ lbl_800F4CC4: lbl_800F4D68: /* 800F4D68 000F1CA8 38 60 00 01 */ li r3, 1 /* 800F4D6C 000F1CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F4D70 000F1CB0 48 26 D4 B9 */ bl func_80362228 +/* 800F4D70 000F1CB0 48 26 D4 B9 */ bl _restgpr_29 /* 800F4D74 000F1CB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F4D78 000F1CB8 7C 08 03 A6 */ mtlr r0 /* 800F4D7C 000F1CBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -99401,7 +99401,7 @@ daAlink_c_NS_procCanoeGetOffInit: /* 800F4DFC 000F1D3C 7C 08 02 A6 */ mflr r0 /* 800F4E00 000F1D40 90 01 00 34 */ stw r0, 0x34(r1) /* 800F4E04 000F1D44 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F4E08 000F1D48 48 26 D3 D5 */ bl func_803621DC +/* 800F4E08 000F1D48 48 26 D3 D5 */ bl _savegpr_29 /* 800F4E0C 000F1D4C 7C 7E 1B 78 */ mr r30, r3 /* 800F4E10 000F1D50 38 80 00 8E */ li r4, 0x8e /* 800F4E14 000F1D54 4B FC D1 59 */ bl daAlink_c_NS_commonProcInit @@ -99546,7 +99546,7 @@ lbl_800F4FDC: /* 800F5028 000F1F68 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800F502C 000F1F6C 38 60 00 01 */ li r3, 1 /* 800F5030 000F1F70 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F5034 000F1F74 48 26 D1 F5 */ bl func_80362228 +/* 800F5034 000F1F74 48 26 D1 F5 */ bl _restgpr_29 /* 800F5038 000F1F78 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F503C 000F1F7C 7C 08 03 A6 */ mtlr r0 /* 800F5040 000F1F80 38 21 00 30 */ addi r1, r1, 0x30 @@ -100260,7 +100260,7 @@ lbl_800F59FC: /* 800F5A28 000F2968 DB E1 00 20 */ stfd f31, 0x20(r1) /* 800F5A2C 000F296C F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 800F5A30 000F2970 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F5A34 000F2974 48 26 C7 A9 */ bl func_803621DC +/* 800F5A34 000F2974 48 26 C7 A9 */ bl _savegpr_29 /* 800F5A38 000F2978 7C 7D 1B 78 */ mr r29, r3 /* 800F5A3C 000F297C 83 E3 28 18 */ lwz r31, 0x2818(r3) /* 800F5A40 000F2980 4B FF ED 99 */ bl daAlink_c_NS_canoeCommon @@ -100456,7 +100456,7 @@ lbl_800F5CE4: /* 800F5CE4 000F2C24 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 800F5CE8 000F2C28 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800F5CEC 000F2C2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F5CF0 000F2C30 48 26 C5 39 */ bl func_80362228 +/* 800F5CF0 000F2C30 48 26 C5 39 */ bl _restgpr_29 /* 800F5CF4 000F2C34 80 01 00 34 */ lwz r0, 0x34(r1) /* 800F5CF8 000F2C38 7C 08 03 A6 */ mtlr r0 /* 800F5CFC 000F2C3C 38 21 00 30 */ addi r1, r1, 0x30 @@ -101629,7 +101629,7 @@ lbl_800F6D50: /* 800F6D68 000F3CA8 7C 08 02 A6 */ mflr r0 /* 800F6D6C 000F3CAC 90 01 00 24 */ stw r0, 0x24(r1) /* 800F6D70 000F3CB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F6D74 000F3CB4 48 26 B4 69 */ bl func_803621DC +/* 800F6D74 000F3CB4 48 26 B4 69 */ bl _savegpr_29 /* 800F6D78 000F3CB8 7C 7D 1B 78 */ mr r29, r3 /* 800F6D7C 000F3CBC 38 80 00 12 */ li r4, 0x12 /* 800F6D80 000F3CC0 4B FB C4 D1 */ bl daAlink_c_NS_setDoStatus @@ -101658,7 +101658,7 @@ lbl_800F6DD4: /* 800F6DD4 000F3D14 38 60 00 01 */ li r3, 1 lbl_800F6DD8: /* 800F6DD8 000F3D18 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F6DDC 000F3D1C 48 26 B4 4D */ bl func_80362228 +/* 800F6DDC 000F3D1C 48 26 B4 4D */ bl _restgpr_29 /* 800F6DE0 000F3D20 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F6DE4 000F3D24 7C 08 03 A6 */ mtlr r0 /* 800F6DE8 000F3D28 38 21 00 20 */ addi r1, r1, 0x20 @@ -101826,7 +101826,7 @@ lbl_800F6FFC: /* 800F7014 000F3F54 7C 08 02 A6 */ mflr r0 /* 800F7018 000F3F58 90 01 00 24 */ stw r0, 0x24(r1) /* 800F701C 000F3F5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F7020 000F3F60 48 26 B1 BD */ bl func_803621DC +/* 800F7020 000F3F60 48 26 B1 BD */ bl _savegpr_29 /* 800F7024 000F3F64 7C 7D 1B 78 */ mr r29, r3 /* 800F7028 000F3F68 4B FC 02 BD */ bl daAlink_c_NS_checkItemActorPointer /* 800F702C 000F3F6C 2C 03 00 00 */ cmpwi r3, 0 @@ -101881,7 +101881,7 @@ lbl_800F70D4: /* 800F70D4 000F4014 38 60 00 01 */ li r3, 1 lbl_800F70D8: /* 800F70D8 000F4018 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F70DC 000F401C 48 26 B1 4D */ bl func_80362228 +/* 800F70DC 000F401C 48 26 B1 4D */ bl _restgpr_29 /* 800F70E0 000F4020 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F70E4 000F4024 7C 08 03 A6 */ mtlr r0 /* 800F70E8 000F4028 38 21 00 20 */ addi r1, r1, 0x20 @@ -102004,7 +102004,7 @@ lbl_800F7260: /* 800F7278 000F41B8 7C 08 02 A6 */ mflr r0 /* 800F727C 000F41BC 90 01 00 24 */ stw r0, 0x24(r1) /* 800F7280 000F41C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F7284 000F41C4 48 26 AF 59 */ bl func_803621DC +/* 800F7284 000F41C4 48 26 AF 59 */ bl _savegpr_29 /* 800F7288 000F41C8 7C 7D 1B 78 */ mr r29, r3 /* 800F728C 000F41CC 48 01 17 8D */ bl daAlink_c_NS_checkHookshotWait /* 800F7290 000F41D0 2C 03 00 00 */ cmpwi r3, 0 @@ -102042,7 +102042,7 @@ lbl_800F7300: /* 800F7300 000F4240 38 60 00 01 */ li r3, 1 lbl_800F7304: /* 800F7304 000F4244 39 61 00 20 */ addi r11, r1, 0x20 -/* 800F7308 000F4248 48 26 AF 21 */ bl func_80362228 +/* 800F7308 000F4248 48 26 AF 21 */ bl _restgpr_29 /* 800F730C 000F424C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F7310 000F4250 7C 08 03 A6 */ mtlr r0 /* 800F7314 000F4254 38 21 00 20 */ addi r1, r1, 0x20 @@ -102867,7 +102867,7 @@ daAlink_c_NS_changeCrawlAutoMoveProc: /* 800F7E7C 000F4DBC DB 41 00 90 */ stfd f26, 0x90(r1) /* 800F7E80 000F4DC0 F3 41 00 98 */ psq_st f26, 152(r1), 0, qr0 /* 800F7E84 000F4DC4 39 61 00 90 */ addi r11, r1, 0x90 -/* 800F7E88 000F4DC8 48 26 A3 55 */ bl func_803621DC +/* 800F7E88 000F4DC8 48 26 A3 55 */ bl _savegpr_29 /* 800F7E8C 000F4DCC 7C 7F 1B 78 */ mr r31, r3 /* 800F7E90 000F4DD0 7C 9D 23 78 */ mr r29, r4 /* 800F7E94 000F4DD4 A8 03 04 DE */ lha r0, 0x4de(r3) @@ -103077,7 +103077,7 @@ lbl_800F8178: /* 800F81A0 000F50E0 E3 41 00 98 */ psq_l f26, 152(r1), 0, qr0 /* 800F81A4 000F50E4 CB 41 00 90 */ lfd f26, 0x90(r1) /* 800F81A8 000F50E8 39 61 00 90 */ addi r11, r1, 0x90 -/* 800F81AC 000F50EC 48 26 A0 7D */ bl func_80362228 +/* 800F81AC 000F50EC 48 26 A0 7D */ bl _restgpr_29 /* 800F81B0 000F50F0 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 800F81B4 000F50F4 7C 08 03 A6 */ mtlr r0 /* 800F81B8 000F50F8 38 21 00 F0 */ addi r1, r1, 0xf0 @@ -103686,7 +103686,7 @@ daAlink_c_NS_checkNotCrawlStand_X1_: /* 800F8A54 000F5994 7C 08 02 A6 */ mflr r0 /* 800F8A58 000F5998 90 01 00 44 */ stw r0, 0x44(r1) /* 800F8A5C 000F599C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800F8A60 000F59A0 48 26 97 7D */ bl func_803621DC +/* 800F8A60 000F59A0 48 26 97 7D */ bl _savegpr_29 /* 800F8A64 000F59A4 7C 7D 1B 78 */ mr r29, r3 /* 800F8A68 000F59A8 7C 9E 23 78 */ mr r30, r4 /* 800F8A6C 000F59AC 7C BF 2B 78 */ mr r31, r5 @@ -103723,7 +103723,7 @@ lbl_800F8AAC: /* 800F8AE4 000F5A24 7C 60 19 10 */ subfe r3, r0, r3 lbl_800F8AE8: /* 800F8AE8 000F5A28 39 61 00 40 */ addi r11, r1, 0x40 -/* 800F8AEC 000F5A2C 48 26 97 3D */ bl func_80362228 +/* 800F8AEC 000F5A2C 48 26 97 3D */ bl _restgpr_29 /* 800F8AF0 000F5A30 80 01 00 44 */ lwz r0, 0x44(r1) /* 800F8AF4 000F5A34 7C 08 03 A6 */ mtlr r0 /* 800F8AF8 000F5A38 38 21 00 40 */ addi r1, r1, 0x40 @@ -106225,7 +106225,7 @@ daAlink_c_NS_procHangFallStartInit: /* 800FAEE0 000F7E20 DB C1 00 30 */ stfd f30, 0x30(r1) /* 800FAEE4 000F7E24 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 800FAEE8 000F7E28 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FAEEC 000F7E2C 48 26 72 F1 */ bl func_803621DC +/* 800FAEEC 000F7E2C 48 26 72 F1 */ bl _savegpr_29 /* 800FAEF0 000F7E30 7C 7F 1B 78 */ mr r31, r3 /* 800FAEF4 000F7E34 7C 9E 23 78 */ mr r30, r4 /* 800FAEF8 000F7E38 7F C3 F3 78 */ mr r3, r30 @@ -106401,7 +106401,7 @@ lbl_800FB17C: /* 800FB184 000F80C4 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 800FB188 000F80C8 CB C1 00 30 */ lfd f30, 0x30(r1) /* 800FB18C 000F80CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FB190 000F80D0 48 26 70 99 */ bl func_80362228 +/* 800FB190 000F80D0 48 26 70 99 */ bl _restgpr_29 /* 800FB194 000F80D4 80 01 00 54 */ lwz r0, 0x54(r1) /* 800FB198 000F80D8 7C 08 03 A6 */ mtlr r0 /* 800FB19C 000F80DC 38 21 00 50 */ addi r1, r1, 0x50 @@ -106410,7 +106410,7 @@ lbl_800FB17C: /* 800FB1A8 000F80E8 7C 08 02 A6 */ mflr r0 /* 800FB1AC 000F80EC 90 01 00 34 */ stw r0, 0x34(r1) /* 800FB1B0 000F80F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FB1B4 000F80F4 48 26 70 29 */ bl func_803621DC +/* 800FB1B4 000F80F4 48 26 70 29 */ bl _savegpr_29 /* 800FB1B8 000F80F8 7C 7D 1B 78 */ mr r29, r3 /* 800FB1BC 000F80FC 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 800FB1C0 000F8100 7F E3 FB 78 */ mr r3, r31 @@ -106471,7 +106471,7 @@ lbl_800FB284: /* 800FB284 000F81C4 38 60 00 01 */ li r3, 1 lbl_800FB288: /* 800FB288 000F81C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800FB28C 000F81CC 48 26 6F 9D */ bl func_80362228 +/* 800FB28C 000F81CC 48 26 6F 9D */ bl _restgpr_29 /* 800FB290 000F81D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 800FB294 000F81D4 7C 08 03 A6 */ mtlr r0 /* 800FB298 000F81D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -106664,7 +106664,7 @@ lbl_800FB4F4: /* 800FB548 000F8488 7C 08 02 A6 */ mflr r0 /* 800FB54C 000F848C 90 01 00 24 */ stw r0, 0x24(r1) /* 800FB550 000F8490 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FB554 000F8494 48 26 6C 89 */ bl func_803621DC +/* 800FB554 000F8494 48 26 6C 89 */ bl _savegpr_29 /* 800FB558 000F8498 7C 7D 1B 78 */ mr r29, r3 /* 800FB55C 000F849C 4B FF F2 31 */ bl daAlink_c_NS_changeHangEndProc /* 800FB560 000F84A0 2C 03 00 00 */ cmpwi r3, 0 @@ -106727,7 +106727,7 @@ lbl_800FB634: /* 800FB634 000F8574 38 60 00 01 */ li r3, 1 lbl_800FB638: /* 800FB638 000F8578 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FB63C 000F857C 48 26 6B ED */ bl func_80362228 +/* 800FB63C 000F857C 48 26 6B ED */ bl _restgpr_29 /* 800FB640 000F8580 80 01 00 24 */ lwz r0, 0x24(r1) /* 800FB644 000F8584 7C 08 03 A6 */ mtlr r0 /* 800FB648 000F8588 38 21 00 20 */ addi r1, r1, 0x20 @@ -106739,7 +106739,7 @@ daAlink_c_NS_procHangMoveInit: /* 800FB654 000F8594 7C 08 02 A6 */ mflr r0 /* 800FB658 000F8598 90 01 00 24 */ stw r0, 0x24(r1) /* 800FB65C 000F859C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FB660 000F85A0 48 26 6B 7D */ bl func_803621DC +/* 800FB660 000F85A0 48 26 6B 7D */ bl _savegpr_29 /* 800FB664 000F85A4 7C 7F 1B 78 */ mr r31, r3 /* 800FB668 000F85A8 7C 9D 23 78 */ mr r29, r4 /* 800FB66C 000F85AC 38 80 00 59 */ li r4, 0x59 @@ -106817,7 +106817,7 @@ lbl_800FB740: /* 800FB770 000F86B0 4B FF EF 75 */ bl daAlink_c_NS_setHangGroundY /* 800FB774 000F86B4 38 60 00 01 */ li r3, 1 /* 800FB778 000F86B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FB77C 000F86BC 48 26 6A AD */ bl func_80362228 +/* 800FB77C 000F86BC 48 26 6A AD */ bl _restgpr_29 /* 800FB780 000F86C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800FB784 000F86C4 7C 08 03 A6 */ mtlr r0 /* 800FB788 000F86C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -106828,7 +106828,7 @@ lbl_800FB740: /* 800FB79C 000F86DC DB E1 00 60 */ stfd f31, 0x60(r1) /* 800FB7A0 000F86E0 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 800FB7A4 000F86E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 800FB7A8 000F86E8 48 26 6A 35 */ bl func_803621DC +/* 800FB7A8 000F86E8 48 26 6A 35 */ bl _savegpr_29 /* 800FB7AC 000F86EC 7C 7E 1B 78 */ mr r30, r3 /* 800FB7B0 000F86F0 4B FF E8 4D */ bl daAlink_c_NS_getHangDirectionFromAngle /* 800FB7B4 000F86F4 7C 7D 1B 78 */ mr r29, r3 @@ -107102,7 +107102,7 @@ lbl_800FBBA4: /* 800FBBA8 000F8AE8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 800FBBAC 000F8AEC CB E1 00 60 */ lfd f31, 0x60(r1) /* 800FBBB0 000F8AF0 39 61 00 60 */ addi r11, r1, 0x60 -/* 800FBBB4 000F8AF4 48 26 66 75 */ bl func_80362228 +/* 800FBBB4 000F8AF4 48 26 66 75 */ bl _restgpr_29 /* 800FBBB8 000F8AF8 80 01 00 74 */ lwz r0, 0x74(r1) /* 800FBBBC 000F8AFC 7C 08 03 A6 */ mtlr r0 /* 800FBBC0 000F8B00 38 21 00 70 */ addi r1, r1, 0x70 @@ -107659,7 +107659,7 @@ lbl_800FC37C: /* 800FC394 000F92D4 7C 08 02 A6 */ mflr r0 /* 800FC398 000F92D8 90 01 00 24 */ stw r0, 0x24(r1) /* 800FC39C 000F92DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FC3A0 000F92E0 48 26 5E 3D */ bl func_803621DC +/* 800FC3A0 000F92E0 48 26 5E 3D */ bl _savegpr_29 /* 800FC3A4 000F92E4 7C 7F 1B 78 */ mr r31, r3 /* 800FC3A8 000F92E8 83 C3 28 10 */ lwz r30, 0x2810(r3) /* 800FC3AC 000F92EC 28 1E 00 00 */ cmplwi r30, 0 @@ -107776,7 +107776,7 @@ lbl_800FC54C: /* 800FC54C 000F948C 38 60 00 01 */ li r3, 1 lbl_800FC550: /* 800FC550 000F9490 39 61 00 20 */ addi r11, r1, 0x20 -/* 800FC554 000F9494 48 26 5C D5 */ bl func_80362228 +/* 800FC554 000F9494 48 26 5C D5 */ bl _restgpr_29 /* 800FC558 000F9498 80 01 00 24 */ lwz r0, 0x24(r1) /* 800FC55C 000F949C 7C 08 03 A6 */ mtlr r0 /* 800FC560 000F94A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -111092,7 +111092,7 @@ daAlink_c_NS_procClimbUpStartInit: /* 800FF454 000FC394 7C 08 02 A6 */ mflr r0 /* 800FF458 000FC398 90 01 00 44 */ stw r0, 0x44(r1) /* 800FF45C 000FC39C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800FF460 000FC3A0 48 26 2D 7D */ bl func_803621DC +/* 800FF460 000FC3A0 48 26 2D 7D */ bl _savegpr_29 /* 800FF464 000FC3A4 7C 7E 1B 78 */ mr r30, r3 /* 800FF468 000FC3A8 7C 9F 23 78 */ mr r31, r4 /* 800FF46C 000FC3AC 4B FB 0E 51 */ bl daAlink_c_NS_setFrontWallType @@ -111262,7 +111262,7 @@ lbl_800FF59C: /* 800FF6E8 000FC628 38 60 00 01 */ li r3, 1 lbl_800FF6EC: /* 800FF6EC 000FC62C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800FF6F0 000FC630 48 26 2B 39 */ bl func_80362228 +/* 800FF6F0 000FC630 48 26 2B 39 */ bl _restgpr_29 /* 800FF6F4 000FC634 80 01 00 44 */ lwz r0, 0x44(r1) /* 800FF6F8 000FC638 7C 08 03 A6 */ mtlr r0 /* 800FF6FC 000FC63C 38 21 00 40 */ addi r1, r1, 0x40 @@ -111966,7 +111966,7 @@ daAlink_c_NS_procClimbWaitInit: /* 801000FC 000FD03C 7C 08 02 A6 */ mflr r0 /* 80100100 000FD040 90 01 00 24 */ stw r0, 0x24(r1) /* 80100104 000FD044 39 61 00 20 */ addi r11, r1, 0x20 -/* 80100108 000FD048 48 26 20 D5 */ bl func_803621DC +/* 80100108 000FD048 48 26 20 D5 */ bl _savegpr_29 /* 8010010C 000FD04C 7C 7D 1B 78 */ mr r29, r3 /* 80100110 000FD050 7C 9E 23 78 */ mr r30, r4 /* 80100114 000FD054 7C BF 2B 78 */ mr r31, r5 @@ -112053,7 +112053,7 @@ lbl_80100228: /* 8010023C 000FD17C 38 60 00 01 */ li r3, 1 lbl_80100240: /* 80100240 000FD180 39 61 00 20 */ addi r11, r1, 0x20 -/* 80100244 000FD184 48 26 1F E5 */ bl func_80362228 +/* 80100244 000FD184 48 26 1F E5 */ bl _restgpr_29 /* 80100248 000FD188 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010024C 000FD18C 7C 08 03 A6 */ mtlr r0 /* 80100250 000FD190 38 21 00 20 */ addi r1, r1, 0x20 @@ -112523,7 +112523,7 @@ daAlink_c_NS_checkNextActionRoofHang: /* 801008F0 000FD830 7C 08 02 A6 */ mflr r0 /* 801008F4 000FD834 90 01 00 24 */ stw r0, 0x24(r1) /* 801008F8 000FD838 39 61 00 20 */ addi r11, r1, 0x20 -/* 801008FC 000FD83C 48 26 18 E1 */ bl func_803621DC +/* 801008FC 000FD83C 48 26 18 E1 */ bl _savegpr_29 /* 80100900 000FD840 7C 7D 1B 78 */ mr r29, r3 /* 80100904 000FD844 C0 23 33 AC */ lfs f1, 0x33ac(r3) /* 80100908 000FD848 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -112598,7 +112598,7 @@ lbl_801009F4: /* 801009F4 000FD934 38 60 00 01 */ li r3, 1 lbl_801009F8: /* 801009F8 000FD938 39 61 00 20 */ addi r11, r1, 0x20 -/* 801009FC 000FD93C 48 26 18 2D */ bl func_80362228 +/* 801009FC 000FD93C 48 26 18 2D */ bl _restgpr_29 /* 80100A00 000FD940 80 01 00 24 */ lwz r0, 0x24(r1) /* 80100A04 000FD944 7C 08 03 A6 */ mtlr r0 /* 80100A08 000FD948 38 21 00 20 */ addi r1, r1, 0x20 @@ -113824,7 +113824,7 @@ daAlink_c_NS_checkOxygenTimer: /* 80101B48 000FEA88 7C 08 02 A6 */ mflr r0 /* 80101B4C 000FEA8C 90 01 00 24 */ stw r0, 0x24(r1) /* 80101B50 000FEA90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80101B54 000FEA94 48 26 06 89 */ bl func_803621DC +/* 80101B54 000FEA94 48 26 06 89 */ bl _savegpr_29 /* 80101B58 000FEA98 7C 7D 1B 78 */ mr r29, r3 /* 80101B5C 000FEA9C 80 03 05 70 */ lwz r0, 0x570(r3) /* 80101B60 000FEAA0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 @@ -113908,7 +113908,7 @@ lbl_80101C64: /* 80101C78 000FEBB8 90 03 5D E0 */ stw r0, 0x5de0(r3) lbl_80101C7C: /* 80101C7C 000FEBBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80101C80 000FEBC0 48 26 05 A9 */ bl func_80362228 +/* 80101C80 000FEBC0 48 26 05 A9 */ bl _restgpr_29 /* 80101C84 000FEBC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80101C88 000FEBC8 7C 08 03 A6 */ mtlr r0 /* 80101C8C 000FEBCC 38 21 00 20 */ addi r1, r1, 0x20 @@ -114445,7 +114445,7 @@ daAlink_c_NS_setSpeedAndAngleSwim: /* 801023F0 000FF330 DB E1 00 40 */ stfd f31, 0x40(r1) /* 801023F4 000FF334 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 801023F8 000FF338 39 61 00 40 */ addi r11, r1, 0x40 -/* 801023FC 000FF33C 48 25 FD E1 */ bl func_803621DC +/* 801023FC 000FF33C 48 25 FD E1 */ bl _savegpr_29 /* 80102400 000FF340 7C 7F 1B 78 */ mr r31, r3 /* 80102404 000FF344 81 83 06 28 */ lwz r12, 0x628(r3) /* 80102408 000FF348 81 8C 02 80 */ lwz r12, 0x280(r12) @@ -114847,7 +114847,7 @@ lbl_801029A8: /* 801029A8 000FF8E8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 801029AC 000FF8EC CB E1 00 40 */ lfd f31, 0x40(r1) /* 801029B0 000FF8F0 39 61 00 40 */ addi r11, r1, 0x40 -/* 801029B4 000FF8F4 48 25 F8 75 */ bl func_80362228 +/* 801029B4 000FF8F4 48 25 F8 75 */ bl _restgpr_29 /* 801029B8 000FF8F8 80 01 00 54 */ lwz r0, 0x54(r1) /* 801029BC 000FF8FC 7C 08 03 A6 */ mtlr r0 /* 801029C0 000FF900 38 21 00 50 */ addi r1, r1, 0x50 @@ -116678,7 +116678,7 @@ daAlink_c_NS_procSwimWaitInit: /* 801042FC 0010123C 7C 08 02 A6 */ mflr r0 /* 80104300 00101240 90 01 00 24 */ stw r0, 0x24(r1) /* 80104304 00101244 39 61 00 20 */ addi r11, r1, 0x20 -/* 80104308 00101248 48 25 DE D5 */ bl func_803621DC +/* 80104308 00101248 48 25 DE D5 */ bl _savegpr_29 /* 8010430C 0010124C 7C 7F 1B 78 */ mr r31, r3 /* 80104310 00101250 7C 9D 23 78 */ mr r29, r4 /* 80104314 00101254 80 03 31 A0 */ lwz r0, 0x31a0(r3) @@ -116787,7 +116787,7 @@ lbl_80104480: /* 80104494 001013D4 D0 3F 05 94 */ stfs f1, 0x594(r31) /* 80104498 001013D8 38 60 00 01 */ li r3, 1 /* 8010449C 001013DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801044A0 001013E0 48 25 DD 89 */ bl func_80362228 +/* 801044A0 001013E0 48 25 DD 89 */ bl _restgpr_29 /* 801044A4 001013E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801044A8 001013E8 7C 08 03 A6 */ mtlr r0 /* 801044AC 001013EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -119450,7 +119450,7 @@ daAlink_c_NS_procBoardWaitInit: /* 80106A3C 0010397C 7C 08 02 A6 */ mflr r0 /* 80106A40 00103980 90 01 00 24 */ stw r0, 0x24(r1) /* 80106A44 00103984 39 61 00 20 */ addi r11, r1, 0x20 -/* 80106A48 00103988 48 25 B7 95 */ bl func_803621DC +/* 80106A48 00103988 48 25 B7 95 */ bl _savegpr_29 /* 80106A4C 0010398C 7C 7F 1B 78 */ mr r31, r3 /* 80106A50 00103990 7C 9D 23 78 */ mr r29, r4 /* 80106A54 00103994 A0 03 2F DC */ lhz r0, 0x2fdc(r3) @@ -119552,7 +119552,7 @@ lbl_80106B9C: /* 80106BB0 00103AF0 38 60 00 01 */ li r3, 1 lbl_80106BB4: /* 80106BB4 00103AF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80106BB8 00103AF8 48 25 B6 71 */ bl func_80362228 +/* 80106BB8 00103AF8 48 25 B6 71 */ bl _restgpr_29 /* 80106BBC 00103AFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80106BC0 00103B00 7C 08 03 A6 */ mtlr r0 /* 80106BC4 00103B04 38 21 00 20 */ addi r1, r1, 0x20 @@ -120139,7 +120139,7 @@ daAlink_c_NS_procBoardSubjectivityInit: /* 8010741C 0010435C 7C 08 02 A6 */ mflr r0 /* 80107420 00104360 90 01 00 24 */ stw r0, 0x24(r1) /* 80107424 00104364 39 61 00 20 */ addi r11, r1, 0x20 -/* 80107428 00104368 48 25 AD B5 */ bl func_803621DC +/* 80107428 00104368 48 25 AD B5 */ bl _savegpr_29 /* 8010742C 0010436C 7C 7D 1B 78 */ mr r29, r3 /* 80107430 00104370 80 03 05 80 */ lwz r0, 0x580(r3) /* 80107434 00104374 64 00 04 00 */ oris r0, r0, 0x400 @@ -120171,7 +120171,7 @@ lbl_80107490: /* 80107490 001043D0 38 60 00 01 */ li r3, 1 lbl_80107494: /* 80107494 001043D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80107498 001043D8 48 25 AD 91 */ bl func_80362228 +/* 80107498 001043D8 48 25 AD 91 */ bl _restgpr_29 /* 8010749C 001043DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801074A0 001043E0 7C 08 03 A6 */ mtlr r0 /* 801074A4 001043E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -121782,7 +121782,7 @@ daAlink_c_NS_setHookshotModel: /* 80108B38 00105A78 7C 08 02 A6 */ mflr r0 /* 80108B3C 00105A7C 90 01 00 24 */ stw r0, 0x24(r1) /* 80108B40 00105A80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80108B44 00105A84 48 25 96 99 */ bl func_803621DC +/* 80108B44 00105A84 48 25 96 99 */ bl _savegpr_29 /* 80108B48 00105A88 7C 7E 1B 78 */ mr r30, r3 /* 80108B4C 00105A8C 38 7E 21 D8 */ addi r3, r30, 0x21d8 /* 80108B50 00105A90 38 80 01 7E */ li r4, 0x17e @@ -121939,7 +121939,7 @@ lbl_80108D24: /* 80108D94 00105CD4 7D 89 03 A6 */ mtctr r12 /* 80108D98 00105CD8 4E 80 04 21 */ bctrl /* 80108D9C 00105CDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80108DA0 00105CE0 48 25 94 89 */ bl func_80362228 +/* 80108DA0 00105CE0 48 25 94 89 */ bl _restgpr_29 /* 80108DA4 00105CE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80108DA8 00105CE8 7C 08 03 A6 */ mtlr r0 /* 80108DAC 00105CEC 38 21 00 20 */ addi r1, r1, 0x20 @@ -122076,7 +122076,7 @@ daAlink_c_NS_cancelHookshotMove: /* 80108F68 00105EA8 7C 08 02 A6 */ mflr r0 /* 80108F6C 00105EAC 90 01 00 24 */ stw r0, 0x24(r1) /* 80108F70 00105EB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80108F74 00105EB4 48 25 92 69 */ bl func_803621DC +/* 80108F74 00105EB4 48 25 92 69 */ bl _savegpr_29 /* 80108F78 00105EB8 7C 7D 1B 78 */ mr r29, r3 /* 80108F7C 00105EBC A8 03 30 8E */ lha r0, 0x308e(r3) /* 80108F80 00105EC0 2C 00 00 00 */ cmpwi r0, 0 @@ -122128,7 +122128,7 @@ lbl_80109020: /* 80109020 00105F60 38 60 00 00 */ li r3, 0 lbl_80109024: /* 80109024 00105F64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80109028 00105F68 48 25 92 01 */ bl func_80362228 +/* 80109028 00105F68 48 25 92 01 */ bl _restgpr_29 /* 8010902C 00105F6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80109030 00105F70 7C 08 03 A6 */ mtlr r0 /* 80109034 00105F74 38 21 00 20 */ addi r1, r1, 0x20 @@ -122268,7 +122268,7 @@ daAlink_c_NS_setHookshotReadyAnime: /* 801091E8 00106128 7C 08 02 A6 */ mflr r0 /* 801091EC 0010612C 90 01 00 24 */ stw r0, 0x24(r1) /* 801091F0 00106130 39 61 00 20 */ addi r11, r1, 0x20 -/* 801091F4 00106134 48 25 8F E9 */ bl func_803621DC +/* 801091F4 00106134 48 25 8F E9 */ bl _savegpr_29 /* 801091F8 00106138 7C 7D 1B 78 */ mr r29, r3 /* 801091FC 0010613C 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 80109200 00106140 3B C0 00 01 */ li r30, 1 @@ -122302,7 +122302,7 @@ lbl_8010924C: /* 80109264 001061A4 7F A3 EB 78 */ mr r3, r29 /* 80109268 001061A8 4B FF FF 09 */ bl daAlink_c_NS_initHookshotReady /* 8010926C 001061AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80109270 001061B0 48 25 8F B9 */ bl func_80362228 +/* 80109270 001061B0 48 25 8F B9 */ bl _restgpr_29 /* 80109274 001061B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80109278 001061B8 7C 08 03 A6 */ mtlr r0 /* 8010927C 001061BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -122314,7 +122314,7 @@ daAlink_c_NS_checkUpperItemActionHookshot: /* 80109288 001061C8 7C 08 02 A6 */ mflr r0 /* 8010928C 001061CC 90 01 00 34 */ stw r0, 0x34(r1) /* 80109290 001061D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80109294 001061D4 48 25 8F 49 */ bl func_803621DC +/* 80109294 001061D4 48 25 8F 49 */ bl _savegpr_29 /* 80109298 001061D8 7C 7F 1B 78 */ mr r31, r3 /* 8010929C 001061DC 4B FF F7 7D */ bl daAlink_c_NS_checkHookshotWait /* 801092A0 001061E0 2C 03 00 00 */ cmpwi r3, 0 @@ -122536,7 +122536,7 @@ lbl_801095A4: /* 801095AC 001064EC 4B FA DC 41 */ bl daAlink_c_NS_cancelUpperItemReadyAnime lbl_801095B0: /* 801095B0 001064F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801095B4 001064F4 48 25 8C 75 */ bl func_80362228 +/* 801095B4 001064F4 48 25 8C 75 */ bl _restgpr_29 /* 801095B8 001064F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801095BC 001064FC 7C 08 03 A6 */ mtlr r0 /* 801095C0 00106500 38 21 00 30 */ addi r1, r1, 0x30 @@ -122548,7 +122548,7 @@ daAlink_c_NS_checkNextActionHookshot: /* 801095CC 0010650C 7C 08 02 A6 */ mflr r0 /* 801095D0 00106510 90 01 00 24 */ stw r0, 0x24(r1) /* 801095D4 00106514 39 61 00 20 */ addi r11, r1, 0x20 -/* 801095D8 00106518 48 25 8C 05 */ bl func_803621DC +/* 801095D8 00106518 48 25 8C 05 */ bl _savegpr_29 /* 801095DC 0010651C 7C 7F 1B 78 */ mr r31, r3 /* 801095E0 00106520 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) /* 801095E4 00106524 28 00 00 C8 */ cmplwi r0, 0xc8 @@ -122673,7 +122673,7 @@ lbl_80109780: /* 80109784 001066C4 48 00 24 85 */ bl daAlink_c_NS_procHookshotMoveInit lbl_80109788: /* 80109788 001066C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010978C 001066CC 48 25 8A 9D */ bl func_80362228 +/* 8010978C 001066CC 48 25 8A 9D */ bl _restgpr_29 /* 80109790 001066D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80109794 001066D4 7C 08 03 A6 */ mtlr r0 /* 80109798 001066D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -122685,7 +122685,7 @@ daAlink_c_NS_setHookshotReturnEnd: /* 801097A4 001066E4 7C 08 02 A6 */ mflr r0 /* 801097A8 001066E8 90 01 00 24 */ stw r0, 0x24(r1) /* 801097AC 001066EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801097B0 001066F0 48 25 8A 2D */ bl func_803621DC +/* 801097B0 001066F0 48 25 8A 2D */ bl _savegpr_29 /* 801097B4 001066F4 7C 7D 1B 78 */ mr r29, r3 /* 801097B8 001066F8 4B FF EF 25 */ bl daAlink_c_NS_resetHookshotMode /* 801097BC 001066FC 7F A3 EB 78 */ mr r3, r29 @@ -122741,7 +122741,7 @@ lbl_80109870: /* 80109870 001067B0 38 00 00 00 */ li r0, 0 /* 80109874 001067B4 B0 1D 30 8E */ sth r0, 0x308e(r29) /* 80109878 001067B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010987C 001067BC 48 25 89 AD */ bl func_80362228 +/* 8010987C 001067BC 48 25 89 AD */ bl _restgpr_29 /* 80109880 001067C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80109884 001067C4 7C 08 03 A6 */ mtlr r0 /* 80109888 001067C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -122755,7 +122755,7 @@ daAlink_c_NS_setHookshotHangMoveBGCollect: /* 8010989C 001067DC DB E1 00 50 */ stfd f31, 0x50(r1) /* 801098A0 001067E0 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 801098A4 001067E4 39 61 00 50 */ addi r11, r1, 0x50 -/* 801098A8 001067E8 48 25 89 35 */ bl func_803621DC +/* 801098A8 001067E8 48 25 89 35 */ bl _savegpr_29 /* 801098AC 001067EC 7C 7F 1B 78 */ mr r31, r3 /* 801098B0 001067F0 A8 03 30 1A */ lha r0, 0x301a(r3) /* 801098B4 001067F4 2C 00 00 04 */ cmpwi r0, 4 @@ -122887,7 +122887,7 @@ lbl_80109A8C: /* 80109A8C 001069CC E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 80109A90 001069D0 CB E1 00 50 */ lfd f31, 0x50(r1) /* 80109A94 001069D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80109A98 001069D8 48 25 87 91 */ bl func_80362228 +/* 80109A98 001069D8 48 25 87 91 */ bl _restgpr_29 /* 80109A9C 001069DC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80109AA0 001069E0 7C 08 03 A6 */ mtlr r0 /* 80109AA4 001069E4 38 21 00 60 */ addi r1, r1, 0x60 @@ -122899,7 +122899,7 @@ daAlink_c_NS_setHookshotTopPosFly: /* 80109AB0 001069F0 7C 08 02 A6 */ mflr r0 /* 80109AB4 001069F4 90 01 00 24 */ stw r0, 0x24(r1) /* 80109AB8 001069F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80109ABC 001069FC 48 25 87 21 */ bl func_803621DC +/* 80109ABC 001069FC 48 25 87 21 */ bl _savegpr_29 /* 80109AC0 00106A00 7C 7F 1B 78 */ mr r31, r3 /* 80109AC4 00106A04 83 C3 28 50 */ lwz r30, 0x2850(r3) /* 80109AC8 00106A08 A8 03 30 1A */ lha r0, 0x301a(r3) @@ -122971,7 +122971,7 @@ lbl_80109B70: /* 80109BC0 00106B00 B0 1F 30 1E */ sth r0, 0x301e(r31) lbl_80109BC4: /* 80109BC4 00106B04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80109BC8 00106B08 48 25 86 61 */ bl func_80362228 +/* 80109BC8 00106B08 48 25 86 61 */ bl _restgpr_29 /* 80109BCC 00106B0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80109BD0 00106B10 7C 08 03 A6 */ mtlr r0 /* 80109BD4 00106B14 38 21 00 20 */ addi r1, r1, 0x20 @@ -124647,7 +124647,7 @@ daAlink_c_NS_hookshotRoofTurn: /* 8010B3C8 00108308 DB A1 00 30 */ stfd f29, 0x30(r1) /* 8010B3CC 0010830C F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 8010B3D0 00108310 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010B3D4 00108314 48 25 6E 09 */ bl func_803621DC +/* 8010B3D4 00108314 48 25 6E 09 */ bl _savegpr_29 /* 8010B3D8 00108318 7C 7E 1B 78 */ mr r30, r3 /* 8010B3DC 0010831C 3B E0 00 00 */ li r31, 0 /* 8010B3E0 00108320 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -124810,7 +124810,7 @@ lbl_8010B614: /* 8010B624 00108564 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 8010B628 00108568 CB A1 00 30 */ lfd f29, 0x30(r1) /* 8010B62C 0010856C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010B630 00108570 48 25 6B F9 */ bl func_80362228 +/* 8010B630 00108570 48 25 6B F9 */ bl _restgpr_29 /* 8010B634 00108574 80 01 00 64 */ lwz r0, 0x64(r1) /* 8010B638 00108578 7C 08 03 A6 */ mtlr r0 /* 8010B63C 0010857C 38 21 00 60 */ addi r1, r1, 0x60 @@ -129361,7 +129361,7 @@ daAlink_c_NS_procBottleOpenInit: /* 8010F6F8 0010C638 7C 08 02 A6 */ mflr r0 /* 8010F6FC 0010C63C 90 01 00 24 */ stw r0, 0x24(r1) /* 8010F700 0010C640 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010F704 0010C644 48 25 2A D9 */ bl func_803621DC +/* 8010F704 0010C644 48 25 2A D9 */ bl _savegpr_29 /* 8010F708 0010C648 7C 7E 1B 78 */ mr r30, r3 /* 8010F70C 0010C64C 7C 9F 23 78 */ mr r31, r4 /* 8010F710 0010C650 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -129483,7 +129483,7 @@ lbl_8010F8C0: /* 8010F8C8 0010C808 38 60 00 01 */ li r3, 1 lbl_8010F8CC: /* 8010F8CC 0010C80C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010F8D0 0010C810 48 25 29 59 */ bl func_80362228 +/* 8010F8D0 0010C810 48 25 29 59 */ bl _restgpr_29 /* 8010F8D4 0010C814 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010F8D8 0010C818 7C 08 03 A6 */ mtlr r0 /* 8010F8DC 0010C81C 38 21 00 20 */ addi r1, r1, 0x20 @@ -129723,7 +129723,7 @@ daAlink_c_NS_procBottleSwingInit: /* 8010FC3C 0010CB7C 7C 08 02 A6 */ mflr r0 /* 8010FC40 0010CB80 90 01 00 24 */ stw r0, 0x24(r1) /* 8010FC44 0010CB84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010FC48 0010CB88 48 25 25 95 */ bl func_803621DC +/* 8010FC48 0010CB88 48 25 25 95 */ bl _savegpr_29 /* 8010FC4C 0010CB8C 7C 7D 1B 78 */ mr r29, r3 /* 8010FC50 0010CB90 7C 9F 23 79 */ or. r31, r4, r4 /* 8010FC54 0010CB94 7C BE 2B 78 */ mr r30, r5 @@ -129931,7 +129931,7 @@ lbl_8010FEF4: /* 8010FF3C 0010CE7C 38 60 00 01 */ li r3, 1 lbl_8010FF40: /* 8010FF40 0010CE80 39 61 00 20 */ addi r11, r1, 0x20 -/* 8010FF44 0010CE84 48 25 22 E5 */ bl func_80362228 +/* 8010FF44 0010CE84 48 25 22 E5 */ bl _restgpr_29 /* 8010FF48 0010CE88 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010FF4C 0010CE8C 7C 08 03 A6 */ mtlr r0 /* 8010FF50 0010CE90 38 21 00 20 */ addi r1, r1, 0x20 @@ -129940,7 +129940,7 @@ lbl_8010FF40: /* 8010FF5C 0010CE9C 7C 08 02 A6 */ mflr r0 /* 8010FF60 0010CEA0 90 01 00 34 */ stw r0, 0x34(r1) /* 8010FF64 0010CEA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8010FF68 0010CEA8 48 25 22 75 */ bl func_803621DC +/* 8010FF68 0010CEA8 48 25 22 75 */ bl _savegpr_29 /* 8010FF6C 0010CEAC 7C 7E 1B 78 */ mr r30, r3 /* 8010FF70 0010CEB0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8010FF74 0010CEB4 A8 03 30 0C */ lha r0, 0x300c(r3) @@ -130170,7 +130170,7 @@ lbl_80110280: lbl_801102B4: /* 801102B4 0010D1F4 38 60 00 01 */ li r3, 1 /* 801102B8 0010D1F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801102BC 0010D1FC 48 25 1F 6D */ bl func_80362228 +/* 801102BC 0010D1FC 48 25 1F 6D */ bl _restgpr_29 /* 801102C0 0010D200 80 01 00 34 */ lwz r0, 0x34(r1) /* 801102C4 0010D204 7C 08 03 A6 */ mtlr r0 /* 801102C8 0010D208 38 21 00 30 */ addi r1, r1, 0x30 @@ -130182,7 +130182,7 @@ daAlink_c_NS_procBottleGetInit: /* 801102D4 0010D214 7C 08 02 A6 */ mflr r0 /* 801102D8 0010D218 90 01 00 24 */ stw r0, 0x24(r1) /* 801102DC 0010D21C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801102E0 0010D220 48 25 1E FD */ bl func_803621DC +/* 801102E0 0010D220 48 25 1E FD */ bl _savegpr_29 /* 801102E4 0010D224 7C 7F 1B 78 */ mr r31, r3 /* 801102E8 0010D228 7C 9D 23 78 */ mr r29, r4 /* 801102EC 0010D22C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) @@ -130332,7 +130332,7 @@ lbl_801104C4: lbl_801104FC: /* 801104FC 0010D43C 38 60 00 01 */ li r3, 1 /* 80110500 0010D440 39 61 00 20 */ addi r11, r1, 0x20 -/* 80110504 0010D444 48 25 1D 25 */ bl func_80362228 +/* 80110504 0010D444 48 25 1D 25 */ bl _restgpr_29 /* 80110508 0010D448 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011050C 0010D44C 7C 08 03 A6 */ mtlr r0 /* 80110510 0010D450 38 21 00 20 */ addi r1, r1, 0x20 @@ -131650,7 +131650,7 @@ daAlink_c_NS_setGrassWhistleModel: /* 80111788 0010E6C8 7C 08 02 A6 */ mflr r0 /* 8011178C 0010E6CC 90 01 00 24 */ stw r0, 0x24(r1) /* 80111790 0010E6D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80111794 0010E6D4 48 25 0A 49 */ bl func_803621DC +/* 80111794 0010E6D4 48 25 0A 49 */ bl _savegpr_29 /* 80111798 0010E6D8 7C 7D 1B 78 */ mr r29, r3 /* 8011179C 0010E6DC 7C 9E 23 78 */ mr r30, r4 /* 801117A0 0010E6E0 4B F9 24 ED */ bl daAlink_c_NS_setItemHeap @@ -131679,7 +131679,7 @@ daAlink_c_NS_setGrassWhistleModel: /* 801117FC 0010E73C 38 00 00 02 */ li r0, 2 /* 80111800 0010E740 98 1D 2F 94 */ stb r0, 0x2f94(r29) /* 80111804 0010E744 39 61 00 20 */ addi r11, r1, 0x20 -/* 80111808 0010E748 48 25 0A 21 */ bl func_80362228 +/* 80111808 0010E748 48 25 0A 21 */ bl _restgpr_29 /* 8011180C 0010E74C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80111810 0010E750 7C 08 03 A6 */ mtlr r0 /* 80111814 0010E754 38 21 00 20 */ addi r1, r1, 0x20 @@ -132001,7 +132001,7 @@ lbl_80111C8C: /* 80111CA8 0010EBE8 7C 08 02 A6 */ mflr r0 /* 80111CAC 0010EBEC 90 01 00 24 */ stw r0, 0x24(r1) /* 80111CB0 0010EBF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80111CB4 0010EBF4 48 25 05 29 */ bl func_803621DC +/* 80111CB4 0010EBF4 48 25 05 29 */ bl _savegpr_29 /* 80111CB8 0010EBF8 7C 7F 1B 78 */ mr r31, r3 /* 80111CBC 0010EBFC A8 03 30 12 */ lha r0, 0x3012(r3) /* 80111CC0 0010EC00 2C 00 00 00 */ cmpwi r0, 0 @@ -132224,7 +132224,7 @@ lbl_80111FD4: /* 80111FD4 0010EF14 38 60 00 01 */ li r3, 1 lbl_80111FD8: /* 80111FD8 0010EF18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80111FDC 0010EF1C 48 25 02 4D */ bl func_80362228 +/* 80111FDC 0010EF1C 48 25 02 4D */ bl _restgpr_29 /* 80111FE0 0010EF20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80111FE4 0010EF24 7C 08 03 A6 */ mtlr r0 /* 80111FE8 0010EF28 38 21 00 20 */ addi r1, r1, 0x20 @@ -132814,7 +132814,7 @@ daAlink_c_NS_setIronBallModel: /* 801127F4 0010F734 7C 08 02 A6 */ mflr r0 /* 801127F8 0010F738 90 01 00 24 */ stw r0, 0x24(r1) /* 801127FC 0010F73C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80112800 0010F740 48 24 F9 DD */ bl func_803621DC +/* 80112800 0010F740 48 24 F9 DD */ bl _savegpr_29 /* 80112804 0010F744 7C 7F 1B 78 */ mr r31, r3 /* 80112808 0010F748 4B F9 14 85 */ bl daAlink_c_NS_setItemHeap /* 8011280C 0010F74C 7C 7E 1B 78 */ mr r30, r3 @@ -133110,7 +133110,7 @@ lbl_80112A94: /* 80112C60 0010FBA0 38 80 00 60 */ li r4, 0x60 /* 80112C64 0010FBA4 48 15 1C B9 */ bl cCcD_ObjCo_NS_SetVsGrp /* 80112C68 0010FBA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80112C6C 0010FBAC 48 24 F5 BD */ bl func_80362228 +/* 80112C6C 0010FBAC 48 24 F5 BD */ bl _restgpr_29 /* 80112C70 0010FBB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80112C74 0010FBB4 7C 08 03 A6 */ mtlr r0 /* 80112C78 0010FBB8 38 21 00 20 */ addi r1, r1, 0x20 @@ -135844,7 +135844,7 @@ daAlink_c_NS_checkNextActionIronBall: /* 801153FC 0011233C 7C 08 02 A6 */ mflr r0 /* 80115400 00112340 90 01 00 24 */ stw r0, 0x24(r1) /* 80115404 00112344 39 61 00 20 */ addi r11, r1, 0x20 -/* 80115408 00112348 48 24 CD D5 */ bl func_803621DC +/* 80115408 00112348 48 24 CD D5 */ bl _savegpr_29 /* 8011540C 0011234C 7C 7D 1B 78 */ mr r29, r3 /* 80115410 00112350 A8 63 30 8E */ lha r3, 0x308e(r3) /* 80115414 00112354 2C 03 00 00 */ cmpwi r3, 0 @@ -135900,7 +135900,7 @@ lbl_801154C4: /* 801154C8 00112408 48 00 01 25 */ bl daAlink_c_NS_procIronBallMoveInit lbl_801154CC: /* 801154CC 0011240C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801154D0 00112410 48 24 CD 59 */ bl func_80362228 +/* 801154D0 00112410 48 24 CD 59 */ bl _restgpr_29 /* 801154D4 00112414 80 01 00 24 */ lwz r0, 0x24(r1) /* 801154D8 00112418 7C 08 03 A6 */ mtlr r0 /* 801154DC 0011241C 38 21 00 20 */ addi r1, r1, 0x20 @@ -139209,7 +139209,7 @@ daAlink_c_NS_setTalkStartBack: /* 8011830C 0011524C 7C 08 02 A6 */ mflr r0 /* 80118310 00115250 90 01 00 44 */ stw r0, 0x44(r1) /* 80118314 00115254 39 61 00 40 */ addi r11, r1, 0x40 -/* 80118318 00115258 48 24 9E C5 */ bl func_803621DC +/* 80118318 00115258 48 24 9E C5 */ bl _savegpr_29 /* 8011831C 0011525C 7C 7D 1B 78 */ mr r29, r3 /* 80118320 00115260 7C 9E 23 78 */ mr r30, r4 /* 80118324 00115264 4B F0 37 F1 */ bl fopAcM_getTalkEventPartner @@ -139366,7 +139366,7 @@ lbl_80118550: /* 80118550 00115490 38 60 00 00 */ li r3, 0 lbl_80118554: /* 80118554 00115494 39 61 00 40 */ addi r11, r1, 0x40 -/* 80118558 00115498 48 24 9C D1 */ bl func_80362228 +/* 80118558 00115498 48 24 9C D1 */ bl _restgpr_29 /* 8011855C 0011549C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80118560 001154A0 7C 08 03 A6 */ mtlr r0 /* 80118564 001154A4 38 21 00 40 */ addi r1, r1, 0x40 @@ -139378,7 +139378,7 @@ daAlink_c_NS_setShapeAngleToTalkActor: /* 80118570 001154B0 7C 08 02 A6 */ mflr r0 /* 80118574 001154B4 90 01 00 24 */ stw r0, 0x24(r1) /* 80118578 001154B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011857C 001154BC 48 24 9C 61 */ bl func_803621DC +/* 8011857C 001154BC 48 24 9C 61 */ bl _savegpr_29 /* 80118580 001154C0 7C 7D 1B 78 */ mr r29, r3 /* 80118584 001154C4 4B F0 35 91 */ bl fopAcM_getTalkEventPartner /* 80118588 001154C8 7C 7E 1B 79 */ or. r30, r3, r3 @@ -139434,7 +139434,7 @@ lbl_80118628: /* 80118638 00115578 48 15 7F 09 */ bl cLib_addCalcAngleS lbl_8011863C: /* 8011863C 0011557C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80118640 00115580 48 24 9B E9 */ bl func_80362228 +/* 80118640 00115580 48 24 9B E9 */ bl _restgpr_29 /* 80118644 00115584 80 01 00 24 */ lwz r0, 0x24(r1) /* 80118648 00115588 7C 08 03 A6 */ mtlr r0 /* 8011864C 0011558C 38 21 00 20 */ addi r1, r1, 0x20 @@ -139722,7 +139722,7 @@ daAlink_c_NS_setDemoBodyBck: /* 801189FC 0011593C 7C 08 02 A6 */ mflr r0 /* 80118A00 00115940 90 01 00 24 */ stw r0, 0x24(r1) /* 80118A04 00115944 39 61 00 20 */ addi r11, r1, 0x20 -/* 80118A08 00115948 48 24 97 D5 */ bl func_803621DC +/* 80118A08 00115948 48 24 97 D5 */ bl _savegpr_29 /* 80118A0C 0011594C 7C 7D 1B 78 */ mr r29, r3 /* 80118A10 00115950 7C 9E 23 78 */ mr r30, r4 /* 80118A14 00115954 38 7D 1F 58 */ addi r3, r29, 0x1f58 @@ -139769,7 +139769,7 @@ lbl_80118A80: /* 80118AB4 001159F4 4B FA 67 51 */ bl daAlink_c_NS_setBasAnime lbl_80118AB8: /* 80118AB8 001159F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80118ABC 001159FC 48 24 97 6D */ bl func_80362228 +/* 80118ABC 001159FC 48 24 97 6D */ bl _restgpr_29 /* 80118AC0 00115A00 80 01 00 24 */ lwz r0, 0x24(r1) /* 80118AC4 00115A04 7C 08 03 A6 */ mtlr r0 /* 80118AC8 00115A08 38 21 00 20 */ addi r1, r1, 0x20 @@ -140240,7 +140240,7 @@ daAlink_c_NS_setDemoBrk: /* 80119138 00116078 7C 08 02 A6 */ mflr r0 /* 8011913C 0011607C 90 01 00 24 */ stw r0, 0x24(r1) /* 80119140 00116080 39 61 00 20 */ addi r11, r1, 0x20 -/* 80119144 00116084 48 24 90 99 */ bl func_803621DC +/* 80119144 00116084 48 24 90 99 */ bl _savegpr_29 /* 80119148 00116088 7C 9D 23 78 */ mr r29, r4 /* 8011914C 0011608C 7C BE 2B 78 */ mr r30, r5 /* 80119150 00116090 3C 60 80 40 */ lis r3, lbl_80406194@ha @@ -140268,7 +140268,7 @@ daAlink_c_NS_setDemoBrk: /* 801191A8 001160E8 93 FD 00 00 */ stw r31, 0(r29) lbl_801191AC: /* 801191AC 001160EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801191B0 001160F0 48 24 90 79 */ bl func_80362228 +/* 801191B0 001160F0 48 24 90 79 */ bl _restgpr_29 /* 801191B4 001160F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801191B8 001160F8 7C 08 03 A6 */ mtlr r0 /* 801191BC 001160FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -141791,7 +141791,7 @@ lbl_8011A73C: /* 8011A73C 0011767C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8011A740 00117680 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8011A744 00117684 A3 E3 00 04 */ lhz r31, 4(r3) -/* 8011A748 00117688 4B F1 83 61 */ bl dSv_player_status_a_c_NS_getRupeeMax +/* 8011A748 00117688 4B F1 83 61 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 8011A74C 0011768C 54 65 04 3E */ clrlwi r5, r3, 0x10 /* 8011A750 00117690 38 1E FF FC */ addi r0, r30, -4 /* 8011A754 00117694 54 00 10 3A */ slwi r0, r0, 2 @@ -143419,7 +143419,7 @@ daAlink_c_NS_procCoDeadInit: /* 8011BE58 00118D98 7C 08 02 A6 */ mflr r0 /* 8011BE5C 00118D9C 90 01 00 24 */ stw r0, 0x24(r1) /* 8011BE60 00118DA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011BE64 00118DA4 48 24 63 79 */ bl func_803621DC +/* 8011BE64 00118DA4 48 24 63 79 */ bl _savegpr_29 /* 8011BE68 00118DA8 7C 7E 1B 78 */ mr r30, r3 /* 8011BE6C 00118DAC 7C 9D 23 78 */ mr r29, r4 /* 8011BE70 00118DB0 38 80 01 50 */ li r4, 0x150 @@ -143645,7 +143645,7 @@ lbl_8011C14C: /* 8011C198 001190D8 38 60 00 01 */ li r3, 1 lbl_8011C19C: /* 8011C19C 001190DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011C1A0 001190E0 48 24 60 89 */ bl func_80362228 +/* 8011C1A0 001190E0 48 24 60 89 */ bl _restgpr_29 /* 8011C1A4 001190E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011C1A8 001190E8 7C 08 03 A6 */ mtlr r0 /* 8011C1AC 001190EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -145264,7 +145264,7 @@ lbl_8011D8E4: /* 8011D8FC 0011A83C 7C 08 02 A6 */ mflr r0 /* 8011D900 0011A840 90 01 00 24 */ stw r0, 0x24(r1) /* 8011D904 0011A844 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011D908 0011A848 48 24 48 D5 */ bl func_803621DC +/* 8011D908 0011A848 48 24 48 D5 */ bl _savegpr_29 /* 8011D90C 0011A84C 7C 7E 1B 78 */ mr r30, r3 /* 8011D910 0011A850 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8011D914 0011A854 A8 03 30 0E */ lha r0, 0x300e(r3) @@ -145393,7 +145393,7 @@ lbl_8011DAE8: /* 8011DAE8 0011AA28 38 60 00 01 */ li r3, 1 lbl_8011DAEC: /* 8011DAEC 0011AA2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011DAF0 0011AA30 48 24 47 39 */ bl func_80362228 +/* 8011DAF0 0011AA30 48 24 47 39 */ bl _restgpr_29 /* 8011DAF4 0011AA34 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011DAF8 0011AA38 7C 08 03 A6 */ mtlr r0 /* 8011DAFC 0011AA3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -146058,7 +146058,7 @@ daAlink_c_NS_procNotUseItemInit: /* 8011E44C 0011B38C 7C 08 02 A6 */ mflr r0 /* 8011E450 0011B390 90 01 00 24 */ stw r0, 0x24(r1) /* 8011E454 0011B394 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011E458 0011B398 48 24 3D 85 */ bl func_803621DC +/* 8011E458 0011B398 48 24 3D 85 */ bl _savegpr_29 /* 8011E45C 0011B39C 7C 7F 1B 78 */ mr r31, r3 /* 8011E460 0011B3A0 7C 9D 23 78 */ mr r29, r4 /* 8011E464 0011B3A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -146131,7 +146131,7 @@ lbl_8011E560: /* 8011E560 0011B4A0 38 60 00 01 */ li r3, 1 lbl_8011E564: /* 8011E564 0011B4A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011E568 0011B4A8 48 24 3C C1 */ bl func_80362228 +/* 8011E568 0011B4A8 48 24 3C C1 */ bl _restgpr_29 /* 8011E56C 0011B4AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011E570 0011B4B0 7C 08 03 A6 */ mtlr r0 /* 8011E574 0011B4B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -147414,7 +147414,7 @@ daAlink_c_NS_dungeonReturnWarp: /* 8011F7DC 0011C71C 7C 08 02 A6 */ mflr r0 /* 8011F7E0 0011C720 90 01 00 44 */ stw r0, 0x44(r1) /* 8011F7E4 0011C724 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011F7E8 0011C728 48 24 29 F5 */ bl func_803621DC +/* 8011F7E8 0011C728 48 24 29 F5 */ bl _savegpr_29 /* 8011F7EC 0011C72C 4B F0 FA D1 */ bl dComIfGs_getWarpPlayerPos /* 8011F7F0 0011C730 C0 03 00 00 */ lfs f0, 0(r3) /* 8011F7F4 0011C734 D0 01 00 18 */ stfs f0, 0x18(r1) @@ -147461,7 +147461,7 @@ daAlink_c_NS_dungeonReturnWarp: /* 8011F898 0011C7D8 48 03 F1 75 */ bl daPy_py_c_NS_setParamData /* 8011F89C 0011C7DC 90 7F 00 14 */ stw r3, 0x14(r31) /* 8011F8A0 0011C7E0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011F8A4 0011C7E4 48 24 29 85 */ bl func_80362228 +/* 8011F8A4 0011C7E4 48 24 29 85 */ bl _restgpr_29 /* 8011F8A8 0011C7E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8011F8AC 0011C7EC 7C 08 03 A6 */ mtlr r0 /* 8011F8B0 0011C7F0 38 21 00 40 */ addi r1, r1, 0x40 @@ -147554,7 +147554,7 @@ daAlink_c_NS_checkWarpStart: /* 8011F9F0 0011C930 7C 08 02 A6 */ mflr r0 /* 8011F9F4 0011C934 90 01 00 24 */ stw r0, 0x24(r1) /* 8011F9F8 0011C938 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011F9FC 0011C93C 48 24 27 E1 */ bl func_803621DC +/* 8011F9FC 0011C93C 48 24 27 E1 */ bl _savegpr_29 /* 8011FA00 0011C940 7C 7E 1B 78 */ mr r30, r3 /* 8011FA04 0011C944 3C 60 80 3B */ lis r3, lbl_803AF990@ha /* 8011FA08 0011C948 3B E3 F9 90 */ addi r31, r3, lbl_803AF990@l @@ -147673,7 +147673,7 @@ lbl_8011FB9C: /* 8011FBA4 0011CAE4 48 0F CE 39 */ bl dMeter2Info_c_NS_resetWarpStatus lbl_8011FBA8: /* 8011FBA8 0011CAE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011FBAC 0011CAEC 48 24 26 7D */ bl func_80362228 +/* 8011FBAC 0011CAEC 48 24 26 7D */ bl _restgpr_29 /* 8011FBB0 0011CAF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011FBB4 0011CAF4 7C 08 03 A6 */ mtlr r0 /* 8011FBB8 0011CAF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -149248,7 +149248,7 @@ daAlink_c_NS_setWolfFootOn: /* 80121218 0011E158 7C 08 02 A6 */ mflr r0 /* 8012121C 0011E15C 90 01 00 24 */ stw r0, 0x24(r1) /* 80121220 0011E160 39 61 00 20 */ addi r11, r1, 0x20 -/* 80121224 0011E164 48 24 0F B9 */ bl func_803621DC +/* 80121224 0011E164 48 24 0F B9 */ bl _savegpr_29 /* 80121228 0011E168 7C 7F 1B 78 */ mr r31, r3 /* 8012122C 0011E16C 3B BF 1F E8 */ addi r29, r31, 0x1fe8 /* 80121230 0011E170 7F A3 EB 78 */ mr r3, r29 @@ -149303,7 +149303,7 @@ lbl_801212C0: /* 801212E8 0011E228 90 1F 05 84 */ stw r0, 0x584(r31) lbl_801212EC: /* 801212EC 0011E22C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801212F0 0011E230 48 24 0F 39 */ bl func_80362228 +/* 801212F0 0011E230 48 24 0F 39 */ bl _restgpr_29 /* 801212F4 0011E234 80 01 00 24 */ lwz r0, 0x24(r1) /* 801212F8 0011E238 7C 08 03 A6 */ mtlr r0 /* 801212FC 0011E23C 38 21 00 20 */ addi r1, r1, 0x20 @@ -150626,7 +150626,7 @@ daAlink_c_NS_setWaterfallEffect: /* 801225EC 0011F52C 7C 08 02 A6 */ mflr r0 /* 801225F0 0011F530 90 01 00 24 */ stw r0, 0x24(r1) /* 801225F4 0011F534 39 61 00 20 */ addi r11, r1, 0x20 -/* 801225F8 0011F538 48 23 FB E5 */ bl func_803621DC +/* 801225F8 0011F538 48 23 FB E5 */ bl _savegpr_29 /* 801225FC 0011F53C 7C 7D 1B 78 */ mr r29, r3 /* 80122600 0011F540 7C 9E 23 78 */ mr r30, r4 /* 80122604 0011F544 7C BF 2B 78 */ mr r31, r5 @@ -150644,7 +150644,7 @@ daAlink_c_NS_setWaterfallEffect: /* 80122634 0011F574 38 E0 00 00 */ li r7, 0 /* 80122638 0011F578 4B FF DF 49 */ bl daAlink_c_NS_setEmitter /* 8012263C 0011F57C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80122640 0011F580 48 23 FB E9 */ bl func_80362228 +/* 80122640 0011F580 48 23 FB E9 */ bl _restgpr_29 /* 80122644 0011F584 80 01 00 24 */ lwz r0, 0x24(r1) /* 80122648 0011F588 7C 08 03 A6 */ mtlr r0 /* 8012264C 0011F58C 38 21 00 20 */ addi r1, r1, 0x20 @@ -153278,7 +153278,7 @@ daAlink_c_NS_setBottleEffect: /* 80124BA8 00121AE8 7C 08 02 A6 */ mflr r0 /* 80124BAC 00121AEC 90 01 00 64 */ stw r0, 0x64(r1) /* 80124BB0 00121AF0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80124BB4 00121AF4 48 23 D6 29 */ bl func_803621DC +/* 80124BB4 00121AF4 48 23 D6 29 */ bl _savegpr_29 /* 80124BB8 00121AF8 7C 7F 1B 78 */ mr r31, r3 /* 80124BBC 00121AFC 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80124BC0 00121B00 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l @@ -153435,7 +153435,7 @@ lbl_80124D5C: /* 80124E0C 00121D4C B0 1F 27 CE */ sth r0, 0x27ce(r31) lbl_80124E10: /* 80124E10 00121D50 39 61 00 60 */ addi r11, r1, 0x60 -/* 80124E14 00121D54 48 23 D4 15 */ bl func_80362228 +/* 80124E14 00121D54 48 23 D4 15 */ bl _restgpr_29 /* 80124E18 00121D58 80 01 00 64 */ lwz r0, 0x64(r1) /* 80124E1C 00121D5C 7C 08 03 A6 */ mtlr r0 /* 80124E20 00121D60 38 21 00 60 */ addi r1, r1, 0x60 @@ -153979,7 +153979,7 @@ daAlink_c_NS_clearWoodShieldBurnEffect: /* 801255C0 00122500 7C 08 02 A6 */ mflr r0 /* 801255C4 00122504 90 01 00 24 */ stw r0, 0x24(r1) /* 801255C8 00122508 39 61 00 20 */ addi r11, r1, 0x20 -/* 801255CC 0012250C 48 23 CC 11 */ bl func_803621DC +/* 801255CC 0012250C 48 23 CC 11 */ bl _savegpr_29 /* 801255D0 00122510 7C 7D 1B 78 */ mr r29, r3 /* 801255D4 00122514 88 03 2F CB */ lbz r0, 0x2fcb(r3) /* 801255D8 00122518 28 00 00 00 */ cmplwi r0, 0 @@ -153999,7 +153999,7 @@ lbl_801255E8: /* 8012560C 0012254C 98 1D 2F CB */ stb r0, 0x2fcb(r29) lbl_80125610: /* 80125610 00122550 39 61 00 20 */ addi r11, r1, 0x20 -/* 80125614 00122554 48 23 CC 15 */ bl func_80362228 +/* 80125614 00122554 48 23 CC 15 */ bl _restgpr_29 /* 80125618 00122558 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012561C 0012255C 7C 08 03 A6 */ mtlr r0 /* 80125620 00122560 38 21 00 20 */ addi r1, r1, 0x20 @@ -157930,7 +157930,7 @@ daAlink_c_NS_setWolfAtnMoveDirection: /* 80128F60 00125EA0 7C 08 02 A6 */ mflr r0 /* 80128F64 00125EA4 90 01 00 24 */ stw r0, 0x24(r1) /* 80128F68 00125EA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80128F6C 00125EAC 48 23 92 71 */ bl func_803621DC +/* 80128F6C 00125EAC 48 23 92 71 */ bl _savegpr_29 /* 80128F70 00125EB0 7C 7F 1B 78 */ mr r31, r3 /* 80128F74 00125EB4 4B F8 A5 8D */ bl daAlink_c_NS_checkAttentionState /* 80128F78 00125EB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -158043,7 +158043,7 @@ lbl_801290F4: /* 801290F8 00126038 98 1F 2F 98 */ stb r0, 0x2f98(r31) lbl_801290FC: /* 801290FC 0012603C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80129100 00126040 48 23 91 29 */ bl func_80362228 +/* 80129100 00126040 48 23 91 29 */ bl _restgpr_29 /* 80129104 00126044 80 01 00 24 */ lwz r0, 0x24(r1) /* 80129108 00126048 7C 08 03 A6 */ mtlr r0 /* 8012910C 0012604C 38 21 00 20 */ addi r1, r1, 0x20 @@ -158059,7 +158059,7 @@ daAlink_c_NS_setBlendWolfAtnMoveAnime: /* 80129128 00126068 DB C1 00 20 */ stfd f30, 0x20(r1) /* 8012912C 0012606C F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 80129130 00126070 39 61 00 20 */ addi r11, r1, 0x20 -/* 80129134 00126074 48 23 90 A9 */ bl func_803621DC +/* 80129134 00126074 48 23 90 A9 */ bl _savegpr_29 /* 80129138 00126078 7C 7E 1B 78 */ mr r30, r3 /* 8012913C 0012607C FF C0 08 90 */ fmr f30, f1 /* 80129140 00126080 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -158197,7 +158197,7 @@ lbl_80129314: /* 8012931C 0012625C E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 80129320 00126260 CB C1 00 20 */ lfd f30, 0x20(r1) /* 80129324 00126264 39 61 00 20 */ addi r11, r1, 0x20 -/* 80129328 00126268 48 23 8F 01 */ bl func_80362228 +/* 80129328 00126268 48 23 8F 01 */ bl _restgpr_29 /* 8012932C 0012626C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80129330 00126270 7C 08 03 A6 */ mtlr r0 /* 80129334 00126274 38 21 00 40 */ addi r1, r1, 0x40 @@ -158213,7 +158213,7 @@ daAlink_c_NS_setBlendWolfAtnBackMoveAnime: /* 80129350 00126290 DB C1 00 20 */ stfd f30, 0x20(r1) /* 80129354 00126294 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 80129358 00126298 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012935C 0012629C 48 23 8E 81 */ bl func_803621DC +/* 8012935C 0012629C 48 23 8E 81 */ bl _savegpr_29 /* 80129360 001262A0 7C 7F 1B 78 */ mr r31, r3 /* 80129364 001262A4 FF C0 08 90 */ fmr f30, f1 /* 80129368 001262A8 3C 60 80 39 */ lis r3, lbl_8038D658@ha @@ -158290,7 +158290,7 @@ lbl_80129464: /* 8012946C 001263AC E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 80129470 001263B0 CB C1 00 20 */ lfd f30, 0x20(r1) /* 80129474 001263B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80129478 001263B8 48 23 8D B1 */ bl func_80362228 +/* 80129478 001263B8 48 23 8D B1 */ bl _restgpr_29 /* 8012947C 001263BC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80129480 001263C0 7C 08 03 A6 */ mtlr r0 /* 80129484 001263C4 38 21 00 40 */ addi r1, r1, 0x40 @@ -158797,7 +158797,7 @@ daAlink_c_NS_checkNextActionWolf: /* 80129B48 00126A88 7C 08 02 A6 */ mflr r0 /* 80129B4C 00126A8C 90 01 00 24 */ stw r0, 0x24(r1) /* 80129B50 00126A90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80129B54 00126A94 48 23 86 89 */ bl func_803621DC +/* 80129B54 00126A94 48 23 86 89 */ bl _savegpr_29 /* 80129B58 00126A98 7C 7D 1B 78 */ mr r29, r3 /* 80129B5C 00126A9C 7C 9E 23 78 */ mr r30, r4 /* 80129B60 00126AA0 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -159141,7 +159141,7 @@ lbl_8012A010: /* 8012A010 00126F50 7F C3 F3 78 */ mr r3, r30 lbl_8012A014: /* 8012A014 00126F54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012A018 00126F58 48 23 82 11 */ bl func_80362228 +/* 8012A018 00126F58 48 23 82 11 */ bl _restgpr_29 /* 8012A01C 00126F5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012A020 00126F60 7C 08 03 A6 */ mtlr r0 /* 8012A024 00126F64 38 21 00 20 */ addi r1, r1, 0x20 @@ -163913,7 +163913,7 @@ daAlink_c_NS_procWolfBackJumpInit: /* 8012E39C 0012B2DC 7C 08 02 A6 */ mflr r0 /* 8012E3A0 0012B2E0 90 01 00 24 */ stw r0, 0x24(r1) /* 8012E3A4 0012B2E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E3A8 0012B2E8 48 23 3E 35 */ bl func_803621DC +/* 8012E3A8 0012B2E8 48 23 3E 35 */ bl _savegpr_29 /* 8012E3AC 0012B2EC 7C 7D 1B 78 */ mr r29, r3 /* 8012E3B0 0012B2F0 7C 9E 23 78 */ mr r30, r4 /* 8012E3B4 0012B2F4 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -164004,7 +164004,7 @@ lbl_8012E4E8: lbl_8012E4EC: /* 8012E4EC 0012B42C 38 60 00 01 */ li r3, 1 /* 8012E4F0 0012B430 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E4F4 0012B434 48 23 3D 35 */ bl func_80362228 +/* 8012E4F4 0012B434 48 23 3D 35 */ bl _restgpr_29 /* 8012E4F8 0012B438 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012E4FC 0012B43C 7C 08 03 A6 */ mtlr r0 /* 8012E500 0012B440 38 21 00 20 */ addi r1, r1, 0x20 @@ -164078,7 +164078,7 @@ daAlink_c_NS_procWolfBackJumpLandInit: /* 8012E5F8 0012B538 7C 08 02 A6 */ mflr r0 /* 8012E5FC 0012B53C 90 01 00 24 */ stw r0, 0x24(r1) /* 8012E600 0012B540 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E604 0012B544 48 23 3B D9 */ bl func_803621DC +/* 8012E604 0012B544 48 23 3B D9 */ bl _savegpr_29 /* 8012E608 0012B548 7C 7D 1B 78 */ mr r29, r3 /* 8012E60C 0012B54C 7C 9E 23 78 */ mr r30, r4 /* 8012E610 0012B550 7C BF 2B 78 */ mr r31, r5 @@ -164105,7 +164105,7 @@ daAlink_c_NS_procWolfBackJumpLandInit: /* 8012E664 0012B5A4 4B F8 76 01 */ bl daAlink_c_NS_setStepLandVibration /* 8012E668 0012B5A8 38 60 00 01 */ li r3, 1 /* 8012E66C 0012B5AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E670 0012B5B0 48 23 3B B9 */ bl func_80362228 +/* 8012E670 0012B5B0 48 23 3B B9 */ bl _restgpr_29 /* 8012E674 0012B5B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012E678 0012B5B8 7C 08 03 A6 */ mtlr r0 /* 8012E67C 0012B5BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -164352,7 +164352,7 @@ daAlink_c_NS_procWolfAutoJumpInit: /* 8012E9DC 0012B91C DB C1 00 20 */ stfd f30, 0x20(r1) /* 8012E9E0 0012B920 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 8012E9E4 0012B924 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012E9E8 0012B928 48 23 37 F5 */ bl func_803621DC +/* 8012E9E8 0012B928 48 23 37 F5 */ bl _savegpr_29 /* 8012E9EC 0012B92C 7C 7F 1B 78 */ mr r31, r3 /* 8012E9F0 0012B930 7C 9D 23 78 */ mr r29, r4 /* 8012E9F4 0012B934 38 80 00 FC */ li r4, 0xfc @@ -164459,7 +164459,7 @@ lbl_8012EAC4: /* 8012EB74 0012BAB4 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 8012EB78 0012BAB8 CB C1 00 20 */ lfd f30, 0x20(r1) /* 8012EB7C 0012BABC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012EB80 0012BAC0 48 23 36 A9 */ bl func_80362228 +/* 8012EB80 0012BAC0 48 23 36 A9 */ bl _restgpr_29 /* 8012EB84 0012BAC4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8012EB88 0012BAC8 7C 08 03 A6 */ mtlr r0 /* 8012EB8C 0012BACC 38 21 00 40 */ addi r1, r1, 0x40 @@ -165008,7 +165008,7 @@ lbl_8012F340: /* 8012F35C 0012C29C 7C 08 02 A6 */ mflr r0 /* 8012F360 0012C2A0 90 01 00 24 */ stw r0, 0x24(r1) /* 8012F364 0012C2A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012F368 0012C2A8 48 23 2E 75 */ bl func_803621DC +/* 8012F368 0012C2A8 48 23 2E 75 */ bl _savegpr_29 /* 8012F36C 0012C2AC 7C 7D 1B 78 */ mr r29, r3 /* 8012F370 0012C2B0 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 8012F374 0012C2B4 3B E3 D6 58 */ addi r31, r3, lbl_8038D658@l @@ -165052,7 +165052,7 @@ lbl_8012F3D0: lbl_8012F400: /* 8012F400 0012C340 38 60 00 01 */ li r3, 1 /* 8012F404 0012C344 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012F408 0012C348 48 23 2E 21 */ bl func_80362228 +/* 8012F408 0012C348 48 23 2E 21 */ bl _restgpr_29 /* 8012F40C 0012C34C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012F410 0012C350 7C 08 03 A6 */ mtlr r0 /* 8012F414 0012C354 38 21 00 20 */ addi r1, r1, 0x20 @@ -165619,7 +165619,7 @@ daAlink_c_NS_procWolfSlideReadyInit: /* 8012FC3C 0012CB7C 7C 08 02 A6 */ mflr r0 /* 8012FC40 0012CB80 90 01 00 24 */ stw r0, 0x24(r1) /* 8012FC44 0012CB84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012FC48 0012CB88 48 23 25 95 */ bl func_803621DC +/* 8012FC48 0012CB88 48 23 25 95 */ bl _savegpr_29 /* 8012FC4C 0012CB8C 7C 7D 1B 78 */ mr r29, r3 /* 8012FC50 0012CB90 7C 9E 23 78 */ mr r30, r4 /* 8012FC54 0012CB94 7C BF 2B 78 */ mr r31, r5 @@ -165671,7 +165671,7 @@ daAlink_c_NS_procWolfSlideReadyInit: /* 8012FD0C 0012CC4C 98 1D 08 28 */ stb r0, 0x828(r29) /* 8012FD10 0012CC50 38 60 00 01 */ li r3, 1 /* 8012FD14 0012CC54 39 61 00 20 */ addi r11, r1, 0x20 -/* 8012FD18 0012CC58 48 23 25 11 */ bl func_80362228 +/* 8012FD18 0012CC58 48 23 25 11 */ bl _restgpr_29 /* 8012FD1C 0012CC5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012FD20 0012CC60 7C 08 03 A6 */ mtlr r0 /* 8012FD24 0012CC64 38 21 00 20 */ addi r1, r1, 0x20 @@ -165773,7 +165773,7 @@ daAlink_c_NS_procWolfSlideInit: /* 8012FE84 0012CDC4 7C 08 02 A6 */ mflr r0 /* 8012FE88 0012CDC8 90 01 00 34 */ stw r0, 0x34(r1) /* 8012FE8C 0012CDCC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8012FE90 0012CDD0 48 23 23 4D */ bl func_803621DC +/* 8012FE90 0012CDD0 48 23 23 4D */ bl _savegpr_29 /* 8012FE94 0012CDD4 7C 7F 1B 78 */ mr r31, r3 /* 8012FE98 0012CDD8 7C 9E 23 78 */ mr r30, r4 /* 8012FE9C 0012CDDC 7C BD 2B 78 */ mr r29, r5 @@ -165840,7 +165840,7 @@ lbl_8012FF50: /* 8012FF88 0012CEC8 38 60 00 01 */ li r3, 1 lbl_8012FF8C: /* 8012FF8C 0012CECC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8012FF90 0012CED0 48 23 22 99 */ bl func_80362228 +/* 8012FF90 0012CED0 48 23 22 99 */ bl _restgpr_29 /* 8012FF94 0012CED4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8012FF98 0012CED8 7C 08 03 A6 */ mtlr r0 /* 8012FF9C 0012CEDC 38 21 00 30 */ addi r1, r1, 0x30 @@ -167515,7 +167515,7 @@ daAlink_c_NS_setWolfRopePosY: /* 80131724 0012E664 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80131728 0012E668 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8013172C 0012E66C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80131730 0012E670 48 23 0A AD */ bl func_803621DC +/* 80131730 0012E670 48 23 0A AD */ bl _savegpr_29 /* 80131734 0012E674 7C 7D 1B 78 */ mr r29, r3 /* 80131738 0012E678 83 C3 28 10 */ lwz r30, 0x2810(r3) /* 8013173C 0012E67C 80 7E 10 A8 */ lwz r3, 0x10a8(r30) @@ -167704,7 +167704,7 @@ lbl_801319D0: /* 801319D0 0012E910 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 801319D4 0012E914 CB E1 00 50 */ lfd f31, 0x50(r1) /* 801319D8 0012E918 39 61 00 50 */ addi r11, r1, 0x50 -/* 801319DC 0012E91C 48 23 08 4D */ bl func_80362228 +/* 801319DC 0012E91C 48 23 08 4D */ bl _restgpr_29 /* 801319E0 0012E920 80 01 00 64 */ lwz r0, 0x64(r1) /* 801319E4 0012E924 7C 08 03 A6 */ mtlr r0 /* 801319E8 0012E928 38 21 00 60 */ addi r1, r1, 0x60 @@ -168658,7 +168658,7 @@ daAlink_c_NS_procWolfRopeHangInit: /* 8013273C 0012F67C 7C 08 02 A6 */ mflr r0 /* 80132740 0012F680 90 01 00 34 */ stw r0, 0x34(r1) /* 80132744 0012F684 39 61 00 30 */ addi r11, r1, 0x30 -/* 80132748 0012F688 48 22 FA 95 */ bl func_803621DC +/* 80132748 0012F688 48 22 FA 95 */ bl _savegpr_29 /* 8013274C 0012F68C 7C 7F 1B 78 */ mr r31, r3 /* 80132750 0012F690 7C 9D 23 78 */ mr r29, r4 /* 80132754 0012F694 83 C3 28 10 */ lwz r30, 0x2810(r3) @@ -168776,7 +168776,7 @@ lbl_801328A8: /* 801328F4 0012F834 B0 1F 04 E4 */ sth r0, 0x4e4(r31) /* 801328F8 0012F838 38 60 00 01 */ li r3, 1 /* 801328FC 0012F83C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80132900 0012F840 48 22 F9 29 */ bl func_80362228 +/* 80132900 0012F840 48 22 F9 29 */ bl _restgpr_29 /* 80132904 0012F844 80 01 00 34 */ lwz r0, 0x34(r1) /* 80132908 0012F848 7C 08 03 A6 */ mtlr r0 /* 8013290C 0012F84C 38 21 00 30 */ addi r1, r1, 0x30 @@ -168787,7 +168787,7 @@ lbl_801328A8: /* 80132920 0012F860 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80132924 0012F864 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80132928 0012F868 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013292C 0012F86C 48 22 F8 B1 */ bl func_803621DC +/* 8013292C 0012F86C 48 22 F8 B1 */ bl _savegpr_29 /* 80132930 0012F870 7C 7E 1B 78 */ mr r30, r3 /* 80132934 0012F874 3B BE 1F D0 */ addi r29, r30, 0x1fd0 /* 80132938 0012F878 83 E3 28 10 */ lwz r31, 0x2810(r3) @@ -169081,7 +169081,7 @@ lbl_80132D48: /* 80132D48 0012FC88 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80132D4C 0012FC8C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80132D50 0012FC90 39 61 00 30 */ addi r11, r1, 0x30 -/* 80132D54 0012FC94 48 22 F4 D5 */ bl func_80362228 +/* 80132D54 0012FC94 48 22 F4 D5 */ bl _restgpr_29 /* 80132D58 0012FC98 80 01 00 44 */ lwz r0, 0x44(r1) /* 80132D5C 0012FC9C 7C 08 03 A6 */ mtlr r0 /* 80132D60 0012FCA0 38 21 00 40 */ addi r1, r1, 0x40 @@ -169167,7 +169167,7 @@ daAlink_c_NS_procWolfRopeTurnInit: /* 80132E94 0012FDD4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80132E98 0012FDD8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80132E9C 0012FDDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80132EA0 0012FDE0 48 22 F3 3D */ bl func_803621DC +/* 80132EA0 0012FDE0 48 22 F3 3D */ bl _savegpr_29 /* 80132EA4 0012FDE4 7C 7E 1B 78 */ mr r30, r3 /* 80132EA8 0012FDE8 3B BE 1F D0 */ addi r29, r30, 0x1fd0 /* 80132EAC 0012FDEC 83 E3 28 10 */ lwz r31, 0x2810(r3) @@ -169279,7 +169279,7 @@ lbl_80133034: /* 80133034 0012FF74 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80133038 0012FF78 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8013303C 0012FF7C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80133040 0012FF80 48 22 F1 E9 */ bl func_80362228 +/* 80133040 0012FF80 48 22 F1 E9 */ bl _restgpr_29 /* 80133044 0012FF84 80 01 00 44 */ lwz r0, 0x44(r1) /* 80133048 0012FF88 7C 08 03 A6 */ mtlr r0 /* 8013304C 0012FF8C 38 21 00 40 */ addi r1, r1, 0x40 @@ -169370,7 +169370,7 @@ lbl_80133134: /* 80133180 001300C0 DB A1 00 70 */ stfd f29, 0x70(r1) /* 80133184 001300C4 F3 A1 00 78 */ psq_st f29, 120(r1), 0, qr0 /* 80133188 001300C8 39 61 00 70 */ addi r11, r1, 0x70 -/* 8013318C 001300CC 48 22 F0 51 */ bl func_803621DC +/* 8013318C 001300CC 48 22 F0 51 */ bl _savegpr_29 /* 80133190 001300D0 7C 7D 1B 78 */ mr r29, r3 /* 80133194 001300D4 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 80133198 001300D8 83 C3 28 10 */ lwz r30, 0x2810(r3) @@ -169846,7 +169846,7 @@ lbl_8013381C: /* 8013382C 0013076C E3 A1 00 78 */ psq_l f29, 120(r1), 0, qr0 /* 80133830 00130770 CB A1 00 70 */ lfd f29, 0x70(r1) /* 80133834 00130774 39 61 00 70 */ addi r11, r1, 0x70 -/* 80133838 00130778 48 22 E9 F1 */ bl func_80362228 +/* 80133838 00130778 48 22 E9 F1 */ bl _restgpr_29 /* 8013383C 0013077C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80133840 00130780 7C 08 03 A6 */ mtlr r0 /* 80133844 00130784 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -170984,7 +170984,7 @@ lbl_801347B8: /* 8013483C 0013177C 7C 08 02 A6 */ mflr r0 /* 80134840 00131780 90 01 00 54 */ stw r0, 0x54(r1) /* 80134844 00131784 39 61 00 50 */ addi r11, r1, 0x50 -/* 80134848 00131788 48 22 D9 95 */ bl func_803621DC +/* 80134848 00131788 48 22 D9 95 */ bl _savegpr_29 /* 8013484C 0013178C 7C 7D 1B 78 */ mr r29, r3 /* 80134850 00131790 83 E3 28 10 */ lwz r31, 0x2810(r3) /* 80134854 00131794 3B DD 1F D0 */ addi r30, r29, 0x1fd0 @@ -171362,7 +171362,7 @@ lbl_80134D9C: /* 80134D9C 00131CDC 38 60 00 01 */ li r3, 1 lbl_80134DA0: /* 80134DA0 00131CE0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80134DA4 00131CE4 48 22 D4 85 */ bl func_80362228 +/* 80134DA4 00131CE4 48 22 D4 85 */ bl _restgpr_29 /* 80134DA8 00131CE8 80 01 00 54 */ lwz r0, 0x54(r1) /* 80134DAC 00131CEC 7C 08 03 A6 */ mtlr r0 /* 80134DB0 00131CF0 38 21 00 50 */ addi r1, r1, 0x50 @@ -172033,7 +172033,7 @@ daAlink_c_NS_procWolfHangWallCatchInit: /* 801356F4 00132634 7C 08 02 A6 */ mflr r0 /* 801356F8 00132638 90 01 00 54 */ stw r0, 0x54(r1) /* 801356FC 0013263C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80135700 00132640 48 22 CA DD */ bl func_803621DC +/* 80135700 00132640 48 22 CA DD */ bl _savegpr_29 /* 80135704 00132644 7C 7E 1B 78 */ mr r30, r3 /* 80135708 00132648 7C 9F 23 78 */ mr r31, r4 /* 8013570C 0013264C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) @@ -172302,7 +172302,7 @@ lbl_80135A64: /* 80135AD8 00132A18 38 60 00 01 */ li r3, 1 lbl_80135ADC: /* 80135ADC 00132A1C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80135AE0 00132A20 48 22 C7 49 */ bl func_80362228 +/* 80135AE0 00132A20 48 22 C7 49 */ bl _restgpr_29 /* 80135AE4 00132A24 80 01 00 54 */ lwz r0, 0x54(r1) /* 80135AE8 00132A28 7C 08 03 A6 */ mtlr r0 /* 80135AEC 00132A2C 38 21 00 50 */ addi r1, r1, 0x50 @@ -172444,7 +172444,7 @@ daAlink_c_NS_procWolfHangFallStartInit: /* 80135CDC 00132C1C 7C 08 02 A6 */ mflr r0 /* 80135CE0 00132C20 90 01 00 44 */ stw r0, 0x44(r1) /* 80135CE4 00132C24 39 61 00 40 */ addi r11, r1, 0x40 -/* 80135CE8 00132C28 48 22 C4 F5 */ bl func_803621DC +/* 80135CE8 00132C28 48 22 C4 F5 */ bl _savegpr_29 /* 80135CEC 00132C2C 7C 7F 1B 78 */ mr r31, r3 /* 80135CF0 00132C30 7C 9D 23 78 */ mr r29, r4 /* 80135CF4 00132C34 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) @@ -172580,7 +172580,7 @@ lbl_80135EB4: /* 80135EE4 00132E24 38 60 00 01 */ li r3, 1 lbl_80135EE8: /* 80135EE8 00132E28 39 61 00 40 */ addi r11, r1, 0x40 -/* 80135EEC 00132E2C 48 22 C3 3D */ bl func_80362228 +/* 80135EEC 00132E2C 48 22 C3 3D */ bl _restgpr_29 /* 80135EF0 00132E30 80 01 00 44 */ lwz r0, 0x44(r1) /* 80135EF4 00132E34 7C 08 03 A6 */ mtlr r0 /* 80135EF8 00132E38 38 21 00 40 */ addi r1, r1, 0x40 @@ -172729,7 +172729,7 @@ daAlink_c_NS_procWolfDamageInit: /* 80136100 00133040 DB C1 00 40 */ stfd f30, 0x40(r1) /* 80136104 00133044 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 80136108 00133048 39 61 00 40 */ addi r11, r1, 0x40 -/* 8013610C 0013304C 48 22 C0 D1 */ bl func_803621DC +/* 8013610C 0013304C 48 22 C0 D1 */ bl _savegpr_29 /* 80136110 00133050 7C 7D 1B 78 */ mr r29, r3 /* 80136114 00133054 7C 9E 23 78 */ mr r30, r4 /* 80136118 00133058 38 80 01 07 */ li r4, 0x107 @@ -172998,7 +172998,7 @@ lbl_801364D4: /* 801364E8 00133428 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 801364EC 0013342C CB C1 00 40 */ lfd f30, 0x40(r1) /* 801364F0 00133430 39 61 00 40 */ addi r11, r1, 0x40 -/* 801364F4 00133434 48 22 BD 35 */ bl func_80362228 +/* 801364F4 00133434 48 22 BD 35 */ bl _restgpr_29 /* 801364F8 00133438 80 01 00 64 */ lwz r0, 0x64(r1) /* 801364FC 0013343C 7C 08 03 A6 */ mtlr r0 /* 80136500 00133440 38 21 00 60 */ addi r1, r1, 0x60 @@ -175888,7 +175888,7 @@ daAlink_c_NS_setWolfBallModel: /* 80138DC4 00135D04 7C 08 02 A6 */ mflr r0 /* 80138DC8 00135D08 90 01 00 24 */ stw r0, 0x24(r1) /* 80138DCC 00135D0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80138DD0 00135D10 48 22 94 0D */ bl func_803621DC +/* 80138DD0 00135D10 48 22 94 0D */ bl _savegpr_29 /* 80138DD4 00135D14 7C 7D 1B 78 */ mr r29, r3 /* 80138DD8 00135D18 4B F6 AE B5 */ bl daAlink_c_NS_setItemHeap /* 80138DDC 00135D1C 7C 7E 1B 78 */ mr r30, r3 @@ -175966,7 +175966,7 @@ lbl_80138E5C: /* 80138EF8 00135E38 7D 89 03 A6 */ mtctr r12 /* 80138EFC 00135E3C 4E 80 04 21 */ bctrl /* 80138F00 00135E40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80138F04 00135E44 48 22 93 25 */ bl func_80362228 +/* 80138F04 00135E44 48 22 93 25 */ bl _restgpr_29 /* 80138F08 00135E48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80138F0C 00135E4C 7C 08 03 A6 */ mtlr r0 /* 80138F10 00135E50 38 21 00 20 */ addi r1, r1, 0x20 @@ -176182,7 +176182,7 @@ daAlink_c_NS_searchWolfLockEnemy: /* 801391E8 00136128 7C 08 02 A6 */ mflr r0 /* 801391EC 0013612C 90 01 00 24 */ stw r0, 0x24(r1) /* 801391F0 00136130 39 61 00 20 */ addi r11, r1, 0x20 -/* 801391F4 00136134 48 22 8F E9 */ bl func_803621DC +/* 801391F4 00136134 48 22 8F E9 */ bl _savegpr_29 /* 801391F8 00136138 7C 7D 1B 78 */ mr r29, r3 /* 801391FC 0013613C 7C 9E 23 78 */ mr r30, r4 /* 80139200 00136140 7C BF 2B 78 */ mr r31, r5 @@ -176225,7 +176225,7 @@ lbl_80139230: /* 8013928C 001361CC 93 DF 00 00 */ stw r30, 0(r31) lbl_80139290: /* 80139290 001361D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139294 001361D4 48 22 8F 95 */ bl func_80362228 +/* 80139294 001361D4 48 22 8F 95 */ bl _restgpr_29 /* 80139298 001361D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013929C 001361DC 7C 08 03 A6 */ mtlr r0 /* 801392A0 001361E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -176254,7 +176254,7 @@ daAlink_c_NS_checkWolfComboCnt: /* 801392E8 00136228 7C 08 02 A6 */ mflr r0 /* 801392EC 0013622C 90 01 00 24 */ stw r0, 0x24(r1) /* 801392F0 00136230 39 61 00 20 */ addi r11, r1, 0x20 -/* 801392F4 00136234 48 22 8E E9 */ bl func_803621DC +/* 801392F4 00136234 48 22 8E E9 */ bl _savegpr_29 /* 801392F8 00136238 7C 7D 1B 78 */ mr r29, r3 /* 801392FC 0013623C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80139300 00136240 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -176297,7 +176297,7 @@ lbl_80139380: /* 80139388 001362C8 4B F9 80 A9 */ bl daAlink_c_NS_resetCombo lbl_8013938C: /* 8013938C 001362CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139390 001362D0 48 22 8E 99 */ bl func_80362228 +/* 80139390 001362D0 48 22 8E 99 */ bl _restgpr_29 /* 80139394 001362D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80139398 001362D8 7C 08 03 A6 */ mtlr r0 /* 8013939C 001362DC 38 21 00 20 */ addi r1, r1, 0x20 @@ -176599,7 +176599,7 @@ daAlink_c_NS_checkWolfLockAttackChargeState: /* 801397A8 001366E8 7C 08 02 A6 */ mflr r0 /* 801397AC 001366EC 90 01 00 24 */ stw r0, 0x24(r1) /* 801397B0 001366F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801397B4 001366F4 48 22 8A 29 */ bl func_803621DC +/* 801397B4 001366F4 48 22 8A 29 */ bl _savegpr_29 /* 801397B8 001366F8 3B E0 00 00 */ li r31, 0 /* 801397BC 001366FC 7F FE FB 78 */ mr r30, r31 /* 801397C0 00136700 7F FD FB 78 */ mr r29, r31 @@ -176660,7 +176660,7 @@ lbl_80139880: lbl_8013988C: /* 8013988C 001367CC 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 80139890 001367D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80139894 001367D4 48 22 89 95 */ bl func_80362228 +/* 80139894 001367D4 48 22 89 95 */ bl _restgpr_29 /* 80139898 001367D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013989C 001367DC 7C 08 03 A6 */ mtlr r0 /* 801398A0 001367E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -177055,7 +177055,7 @@ daAlink_c_NS_procWolfJumpAttackInit: /* 80139E14 00136D54 DB 41 00 50 */ stfd f26, 0x50(r1) /* 80139E18 00136D58 F3 41 00 58 */ psq_st f26, 88(r1), 0, qr0 /* 80139E1C 00136D5C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80139E20 00136D60 48 22 83 BD */ bl func_803621DC +/* 80139E20 00136D60 48 22 83 BD */ bl _savegpr_29 /* 80139E24 00136D64 7C 7D 1B 78 */ mr r29, r3 /* 80139E28 00136D68 7C 9E 23 78 */ mr r30, r4 /* 80139E2C 00136D6C 3C 80 80 39 */ lis r4, lbl_8038D658@ha @@ -177529,7 +177529,7 @@ lbl_8013A4AC: /* 8013A4D8 00137418 E3 41 00 58 */ psq_l f26, 88(r1), 0, qr0 /* 8013A4DC 0013741C CB 41 00 50 */ lfd f26, 0x50(r1) /* 8013A4E0 00137420 39 61 00 50 */ addi r11, r1, 0x50 -/* 8013A4E4 00137424 48 22 7D 45 */ bl func_80362228 +/* 8013A4E4 00137424 48 22 7D 45 */ bl _restgpr_29 /* 8013A4E8 00137428 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8013A4EC 0013742C 7C 08 03 A6 */ mtlr r0 /* 8013A4F0 00137430 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -177538,7 +177538,7 @@ lbl_8013A4AC: /* 8013A4FC 0013743C 7C 08 02 A6 */ mflr r0 /* 8013A500 00137440 90 01 00 34 */ stw r0, 0x34(r1) /* 8013A504 00137444 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013A508 00137448 48 22 7C D5 */ bl func_803621DC +/* 8013A508 00137448 48 22 7C D5 */ bl _savegpr_29 /* 8013A50C 0013744C 7C 7D 1B 78 */ mr r29, r3 /* 8013A510 00137450 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 8013A514 00137454 3B E3 D6 58 */ addi r31, r3, lbl_8038D658@l @@ -177735,7 +177735,7 @@ lbl_8013A7D0: /* 8013A7D0 00137710 38 60 00 01 */ li r3, 1 lbl_8013A7D4: /* 8013A7D4 00137714 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013A7D8 00137718 48 22 7A 51 */ bl func_80362228 +/* 8013A7D8 00137718 48 22 7A 51 */ bl _restgpr_29 /* 8013A7DC 0013771C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8013A7E0 00137720 7C 08 03 A6 */ mtlr r0 /* 8013A7E4 00137724 38 21 00 30 */ addi r1, r1, 0x30 @@ -178490,7 +178490,7 @@ daAlink_c_NS_procWolfRollAttackInit: /* 8013B2A4 001381E4 7C 08 02 A6 */ mflr r0 /* 8013B2A8 001381E8 90 01 00 34 */ stw r0, 0x34(r1) /* 8013B2AC 001381EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013B2B0 001381F0 48 22 6F 2D */ bl func_803621DC +/* 8013B2B0 001381F0 48 22 6F 2D */ bl _savegpr_29 /* 8013B2B4 001381F4 7C 7F 1B 78 */ mr r31, r3 /* 8013B2B8 001381F8 7C 9E 23 78 */ mr r30, r4 /* 8013B2BC 001381FC 7C BD 2B 78 */ mr r29, r5 @@ -178583,7 +178583,7 @@ lbl_8013B3F8: /* 8013B404 00138344 90 1F 31 80 */ stw r0, 0x3180(r31) /* 8013B408 00138348 38 60 00 01 */ li r3, 1 /* 8013B40C 0013834C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013B410 00138350 48 22 6E 19 */ bl func_80362228 +/* 8013B410 00138350 48 22 6E 19 */ bl _restgpr_29 /* 8013B414 00138354 80 01 00 34 */ lwz r0, 0x34(r1) /* 8013B418 00138358 7C 08 03 A6 */ mtlr r0 /* 8013B41C 0013835C 38 21 00 30 */ addi r1, r1, 0x30 @@ -179016,7 +179016,7 @@ daAlink_c_NS_procWolfDownAtLandInit: /* 8013BA48 00138988 7C 08 02 A6 */ mflr r0 /* 8013BA4C 0013898C 90 01 00 54 */ stw r0, 0x54(r1) /* 8013BA50 00138990 39 61 00 50 */ addi r11, r1, 0x50 -/* 8013BA54 00138994 48 22 67 89 */ bl func_803621DC +/* 8013BA54 00138994 48 22 67 89 */ bl _savegpr_29 /* 8013BA58 00138998 7C 7F 1B 78 */ mr r31, r3 /* 8013BA5C 0013899C 4B FE E0 25 */ bl daAlink_c_NS_checkWolfGroundSpecialMode /* 8013BA60 001389A0 2C 03 00 00 */ cmpwi r3, 0 @@ -179162,7 +179162,7 @@ lbl_8013BC78: /* 8013BC78 00138BB8 38 60 00 01 */ li r3, 1 lbl_8013BC7C: /* 8013BC7C 00138BBC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8013BC80 00138BC0 48 22 65 A9 */ bl func_80362228 +/* 8013BC80 00138BC0 48 22 65 A9 */ bl _restgpr_29 /* 8013BC84 00138BC4 80 01 00 54 */ lwz r0, 0x54(r1) /* 8013BC88 00138BC8 7C 08 03 A6 */ mtlr r0 /* 8013BC8C 00138BCC 38 21 00 50 */ addi r1, r1, 0x50 @@ -180204,7 +180204,7 @@ daAlink_c_NS_procWolfEnemyThrowInit: /* 8013CB54 00139A94 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8013CB58 00139A98 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8013CB5C 00139A9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013CB60 00139AA0 48 22 56 7D */ bl func_803621DC +/* 8013CB60 00139AA0 48 22 56 7D */ bl _savegpr_29 /* 8013CB64 00139AA4 7C 7D 1B 78 */ mr r29, r3 /* 8013CB68 00139AA8 7C 9E 23 78 */ mr r30, r4 /* 8013CB6C 00139AAC 38 80 01 35 */ li r4, 0x135 @@ -180267,7 +180267,7 @@ lbl_8013CBCC: /* 8013CC3C 00139B7C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8013CC40 00139B80 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8013CC44 00139B84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013CC48 00139B88 48 22 55 E1 */ bl func_80362228 +/* 8013CC48 00139B88 48 22 55 E1 */ bl _restgpr_29 /* 8013CC4C 00139B8C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8013CC50 00139B90 7C 08 03 A6 */ mtlr r0 /* 8013CC54 00139B94 38 21 00 30 */ addi r1, r1, 0x30 @@ -180385,7 +180385,7 @@ lbl_8013CDD8: /* 8013CDF0 00139D30 7C 08 02 A6 */ mflr r0 /* 8013CDF4 00139D34 90 01 00 24 */ stw r0, 0x24(r1) /* 8013CDF8 00139D38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013CDFC 00139D3C 48 22 53 E1 */ bl func_803621DC +/* 8013CDFC 00139D3C 48 22 53 E1 */ bl _savegpr_29 /* 8013CE00 00139D40 7C 7D 1B 78 */ mr r29, r3 /* 8013CE04 00139D44 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 8013CE08 00139D48 83 C3 28 20 */ lwz r30, 0x2820(r3) @@ -180582,7 +180582,7 @@ lbl_8013D0B8: /* 8013D0B8 00139FF8 38 60 00 01 */ li r3, 1 lbl_8013D0BC: /* 8013D0BC 00139FFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013D0C0 0013A000 48 22 51 69 */ bl func_80362228 +/* 8013D0C0 0013A000 48 22 51 69 */ bl _restgpr_29 /* 8013D0C4 0013A004 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013D0C8 0013A008 7C 08 03 A6 */ mtlr r0 /* 8013D0CC 0013A00C 38 21 00 20 */ addi r1, r1, 0x20 @@ -180812,7 +180812,7 @@ lbl_8013D3E0: /* 8013D400 0013A340 7C 08 02 A6 */ mflr r0 /* 8013D404 0013A344 90 01 00 24 */ stw r0, 0x24(r1) /* 8013D408 0013A348 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013D40C 0013A34C 48 22 4D D1 */ bl func_803621DC +/* 8013D40C 0013A34C 48 22 4D D1 */ bl _savegpr_29 /* 8013D410 0013A350 7C 7D 1B 78 */ mr r29, r3 /* 8013D414 0013A354 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 8013D418 0013A358 83 E3 28 30 */ lwz r31, 0x2830(r3) @@ -180908,7 +180908,7 @@ lbl_8013D56C: /* 8013D56C 0013A4AC 38 60 00 01 */ li r3, 1 lbl_8013D570: /* 8013D570 0013A4B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013D574 0013A4B4 48 22 4C B5 */ bl func_80362228 +/* 8013D574 0013A4B4 48 22 4C B5 */ bl _restgpr_29 /* 8013D578 0013A4B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013D57C 0013A4BC 7C 08 03 A6 */ mtlr r0 /* 8013D580 0013A4C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -180977,7 +180977,7 @@ lbl_8013D644: /* 8013D660 0013A5A0 7C 08 02 A6 */ mflr r0 /* 8013D664 0013A5A4 90 01 00 34 */ stw r0, 0x34(r1) /* 8013D668 0013A5A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013D66C 0013A5AC 48 22 4B 71 */ bl func_803621DC +/* 8013D66C 0013A5AC 48 22 4B 71 */ bl _savegpr_29 /* 8013D670 0013A5B0 7C 7F 1B 78 */ mr r31, r3 /* 8013D674 0013A5B4 3B BF 1F D0 */ addi r29, r31, 0x1fd0 /* 8013D678 0013A5B8 83 C3 28 30 */ lwz r30, 0x2830(r3) @@ -181087,7 +181087,7 @@ lbl_8013D7FC: /* 8013D7FC 0013A73C 38 60 00 01 */ li r3, 1 lbl_8013D800: /* 8013D800 0013A740 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013D804 0013A744 48 22 4A 25 */ bl func_80362228 +/* 8013D804 0013A744 48 22 4A 25 */ bl _restgpr_29 /* 8013D808 0013A748 80 01 00 34 */ lwz r0, 0x34(r1) /* 8013D80C 0013A74C 7C 08 03 A6 */ mtlr r0 /* 8013D810 0013A750 38 21 00 30 */ addi r1, r1, 0x30 @@ -181543,7 +181543,7 @@ lbl_8013DE5C: /* 8013DE74 0013ADB4 7C 08 02 A6 */ mflr r0 /* 8013DE78 0013ADB8 90 01 00 24 */ stw r0, 0x24(r1) /* 8013DE7C 0013ADBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013DE80 0013ADC0 48 22 43 5D */ bl func_803621DC +/* 8013DE80 0013ADC0 48 22 43 5D */ bl _savegpr_29 /* 8013DE84 0013ADC4 7C 7D 1B 78 */ mr r29, r3 /* 8013DE88 0013ADC8 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 8013DE8C 0013ADCC 38 80 00 96 */ li r4, 0x96 @@ -181584,7 +181584,7 @@ lbl_8013DED0: lbl_8013DF14: /* 8013DF14 0013AE54 38 60 00 01 */ li r3, 1 /* 8013DF18 0013AE58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8013DF1C 0013AE5C 48 22 43 0D */ bl func_80362228 +/* 8013DF1C 0013AE5C 48 22 43 0D */ bl _restgpr_29 /* 8013DF20 0013AE60 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013DF24 0013AE64 7C 08 03 A6 */ mtlr r0 /* 8013DF28 0013AE68 38 21 00 20 */ addi r1, r1, 0x20 @@ -182218,7 +182218,7 @@ lbl_8013E798: /* 8013E818 0013B758 DB E1 00 90 */ stfd f31, 0x90(r1) /* 8013E81C 0013B75C F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 8013E820 0013B760 39 61 00 90 */ addi r11, r1, 0x90 -/* 8013E824 0013B764 48 22 39 B9 */ bl func_803621DC +/* 8013E824 0013B764 48 22 39 B9 */ bl _savegpr_29 /* 8013E828 0013B768 7C 7D 1B 78 */ mr r29, r3 /* 8013E82C 0013B76C 83 E3 28 10 */ lwz r31, 0x2810(r3) /* 8013E830 0013B770 28 1F 00 00 */ cmplwi r31, 0 @@ -182565,7 +182565,7 @@ lbl_8013ED24: /* 8013ED24 0013BC64 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 8013ED28 0013BC68 CB E1 00 90 */ lfd f31, 0x90(r1) /* 8013ED2C 0013BC6C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8013ED30 0013BC70 48 22 34 F9 */ bl func_80362228 +/* 8013ED30 0013BC70 48 22 34 F9 */ bl _restgpr_29 /* 8013ED34 0013BC74 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8013ED38 0013BC78 7C 08 03 A6 */ mtlr r0 /* 8013ED3C 0013BC7C 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -182579,7 +182579,7 @@ daAlink_c_NS_procWolfDigInit: /* 8013ED50 0013BC90 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8013ED54 0013BC94 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8013ED58 0013BC98 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013ED5C 0013BC9C 48 22 34 81 */ bl func_803621DC +/* 8013ED5C 0013BC9C 48 22 34 81 */ bl _savegpr_29 /* 8013ED60 0013BCA0 7C 7E 1B 78 */ mr r30, r3 /* 8013ED64 0013BCA4 3B E0 00 01 */ li r31, 1 /* 8013ED68 0013BCA8 80 03 05 8C */ lwz r0, 0x58c(r3) @@ -182896,7 +182896,7 @@ lbl_8013F1D0: /* 8013F1D0 0013C110 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8013F1D4 0013C114 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8013F1D8 0013C118 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013F1DC 0013C11C 48 22 30 4D */ bl func_80362228 +/* 8013F1DC 0013C11C 48 22 30 4D */ bl _restgpr_29 /* 8013F1E0 0013C120 80 01 00 44 */ lwz r0, 0x44(r1) /* 8013F1E4 0013C124 7C 08 03 A6 */ mtlr r0 /* 8013F1E8 0013C128 38 21 00 40 */ addi r1, r1, 0x40 @@ -182905,7 +182905,7 @@ lbl_8013F1D0: /* 8013F1F4 0013C134 7C 08 02 A6 */ mflr r0 /* 8013F1F8 0013C138 90 01 00 34 */ stw r0, 0x34(r1) /* 8013F1FC 0013C13C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013F200 0013C140 48 22 2F DD */ bl func_803621DC +/* 8013F200 0013C140 48 22 2F DD */ bl _savegpr_29 /* 8013F204 0013C144 7C 7F 1B 78 */ mr r31, r3 /* 8013F208 0013C148 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 8013F20C 0013C14C A8 03 30 12 */ lha r0, 0x3012(r3) @@ -183083,7 +183083,7 @@ lbl_8013F450: lbl_8013F48C: /* 8013F48C 0013C3CC 38 60 00 01 */ li r3, 1 /* 8013F490 0013C3D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8013F494 0013C3D4 48 22 2D 95 */ bl func_80362228 +/* 8013F494 0013C3D4 48 22 2D 95 */ bl _restgpr_29 /* 8013F498 0013C3D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8013F49C 0013C3DC 7C 08 03 A6 */ mtlr r0 /* 8013F4A0 0013C3E0 38 21 00 30 */ addi r1, r1, 0x30 @@ -184516,7 +184516,7 @@ daAlink_c_NS_statusWindowExecute: /* 8014088C 0013D7CC 7C 08 02 A6 */ mflr r0 /* 80140890 0013D7D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80140894 0013D7D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140898 0013D7D8 48 22 19 45 */ bl func_803621DC +/* 80140898 0013D7D8 48 22 19 45 */ bl _savegpr_29 /* 8014089C 0013D7DC 7C 7D 1B 78 */ mr r29, r3 /* 801408A0 0013D7E0 7C 9E 23 78 */ mr r30, r4 /* 801408A4 0013D7E4 7C BF 2B 78 */ mr r31, r5 @@ -184574,7 +184574,7 @@ lbl_80140960: /* 80140968 0013D8A8 4B F6 8A E9 */ bl daAlink_c_NS_setItemMatrix lbl_8014096C: /* 8014096C 0013D8AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140970 0013D8B0 48 22 18 B9 */ bl func_80362228 +/* 80140970 0013D8B0 48 22 18 B9 */ bl _restgpr_29 /* 80140974 0013D8B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80140978 0013D8B8 7C 08 03 A6 */ mtlr r0 /* 8014097C 0013D8BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -184586,7 +184586,7 @@ daAlink_c_NS_statusWindowDraw: /* 80140988 0013D8C8 7C 08 02 A6 */ mflr r0 /* 8014098C 0013D8CC 90 01 00 24 */ stw r0, 0x24(r1) /* 80140990 0013D8D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140994 0013D8D4 48 22 18 49 */ bl func_803621DC +/* 80140994 0013D8D4 48 22 18 49 */ bl _savegpr_29 /* 80140998 0013D8D8 7C 7D 1B 78 */ mr r29, r3 /* 8014099C 0013D8DC 88 03 2F BF */ lbz r0, 0x2fbf(r3) /* 801409A0 0013D8E0 28 00 00 00 */ cmplwi r0, 0 @@ -184663,7 +184663,7 @@ lbl_80140A94: /* 80140AAC 0013D9EC 4B F8 B7 ED */ bl daAlink_c_NS_basicModelDraw lbl_80140AB0: /* 80140AB0 0013D9F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140AB4 0013D9F4 48 22 17 75 */ bl func_80362228 +/* 80140AB4 0013D9F4 48 22 17 75 */ bl _restgpr_29 /* 80140AB8 0013D9F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80140ABC 0013D9FC 7C 08 03 A6 */ mtlr r0 /* 80140AC0 0013DA00 38 21 00 20 */ addi r1, r1, 0x20 @@ -185946,7 +185946,7 @@ lbl_80141AFC: /* 80141B08 0013EA48 7C 08 02 A6 */ mflr r0 /* 80141B0C 0013EA4C 90 01 00 34 */ stw r0, 0x34(r1) /* 80141B10 0013EA50 39 61 00 30 */ addi r11, r1, 0x30 -/* 80141B14 0013EA54 48 22 06 C9 */ bl func_803621DC +/* 80141B14 0013EA54 48 22 06 C9 */ bl _savegpr_29 /* 80141B18 0013EA58 3C 60 80 3B */ lis r3, lbl_803AF990@ha /* 80141B1C 0013EA5C 3B E3 F9 90 */ addi r31, r3, lbl_803AF990@l /* 80141B20 0013EA60 3C 60 80 42 */ lis r3, lbl_80425508@ha @@ -188741,7 +188741,7 @@ lbl_80141AFC: /* 801446B4 001415F4 38 BE 01 E4 */ addi r5, r30, 0x1e4 /* 801446B8 001415F8 48 21 D5 6D */ bl func_80361C24 /* 801446BC 001415FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801446C0 00141600 48 21 DB 69 */ bl func_80362228 +/* 801446C0 00141600 48 21 DB 69 */ bl _restgpr_29 /* 801446C4 00141604 80 01 00 34 */ lwz r0, 0x34(r1) /* 801446C8 00141608 7C 08 03 A6 */ mtlr r0 /* 801446CC 0014160C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 1a20f0d3fa0..8cb011b8b2d 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -2963,7 +2963,7 @@ daNpcT_c_NS_setMcaMorfAnm: /* 80148228 00145168 DB 81 00 30 */ stfd f28, 0x30(r1) /* 8014822C 0014516C F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 80148230 00145170 39 61 00 30 */ addi r11, r1, 0x30 -/* 80148234 00145174 48 21 9F A9 */ bl func_803621DC +/* 80148234 00145174 48 21 9F A9 */ bl _savegpr_29 /* 80148238 00145178 7C 7D 1B 78 */ mr r29, r3 /* 8014823C 0014517C 7C 9E 23 78 */ mr r30, r4 /* 80148240 00145180 FF 80 08 90 */ fmr f28, f1 @@ -3008,7 +3008,7 @@ lbl_801482BC: /* 801482D8 00145218 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 801482DC 0014521C CB 81 00 30 */ lfd f28, 0x30(r1) /* 801482E0 00145220 39 61 00 30 */ addi r11, r1, 0x30 -/* 801482E4 00145224 48 21 9F 45 */ bl func_80362228 +/* 801482E4 00145224 48 21 9F 45 */ bl _restgpr_29 /* 801482E8 00145228 80 01 00 74 */ lwz r0, 0x74(r1) /* 801482EC 0014522C 7C 08 03 A6 */ mtlr r0 /* 801482F0 00145230 38 21 00 70 */ addi r1, r1, 0x70 @@ -5730,7 +5730,7 @@ lbl_8014A8E8: /* 8014AA44 00147984 7C 08 02 A6 */ mflr r0 /* 8014AA48 00147988 90 01 00 24 */ stw r0, 0x24(r1) /* 8014AA4C 0014798C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014AA50 00147990 48 21 77 8D */ bl func_803621DC +/* 8014AA50 00147990 48 21 77 8D */ bl _savegpr_29 /* 8014AA54 00147994 7C 7D 1B 78 */ mr r29, r3 /* 8014AA58 00147998 7C 9E 23 78 */ mr r30, r4 /* 8014AA5C 0014799C 7C BF 2B 78 */ mr r31, r5 @@ -5760,7 +5760,7 @@ lbl_8014AAB4: /* 8014AAB4 001479F4 38 60 00 00 */ li r3, 0 lbl_8014AAB8: /* 8014AAB8 001479F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014AABC 001479FC 48 21 77 6D */ bl func_80362228 +/* 8014AABC 001479FC 48 21 77 6D */ bl _restgpr_29 /* 8014AAC0 00147A00 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014AAC4 00147A04 7C 08 03 A6 */ mtlr r0 /* 8014AAC8 00147A08 38 21 00 20 */ addi r1, r1, 0x20 @@ -5841,7 +5841,7 @@ daNpcT_c_NS_chkActorInSight: /* 8014ABD4 00147B14 7C 08 02 A6 */ mflr r0 /* 8014ABD8 00147B18 90 01 00 64 */ stw r0, 0x64(r1) /* 8014ABDC 00147B1C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8014ABE0 00147B20 48 21 75 FD */ bl func_803621DC +/* 8014ABE0 00147B20 48 21 75 FD */ bl _savegpr_29 /* 8014ABE4 00147B24 7C 7D 1B 78 */ mr r29, r3 /* 8014ABE8 00147B28 7C 80 23 78 */ mr r0, r4 /* 8014ABEC 00147B2C 7C BE 2B 78 */ mr r30, r5 @@ -5908,7 +5908,7 @@ lbl_8014ACD4: /* 8014ACD4 00147C14 38 60 00 01 */ li r3, 1 lbl_8014ACD8: /* 8014ACD8 00147C18 39 61 00 60 */ addi r11, r1, 0x60 -/* 8014ACDC 00147C1C 48 21 75 4D */ bl func_80362228 +/* 8014ACDC 00147C1C 48 21 75 4D */ bl _restgpr_29 /* 8014ACE0 00147C20 80 01 00 64 */ lwz r0, 0x64(r1) /* 8014ACE4 00147C24 7C 08 03 A6 */ mtlr r0 /* 8014ACE8 00147C28 38 21 00 60 */ addi r1, r1, 0x60 @@ -6683,7 +6683,7 @@ lbl_8014B7D4: /* 8014B80C 0014874C 7C 08 02 A6 */ mflr r0 /* 8014B810 00148750 90 01 00 54 */ stw r0, 0x54(r1) /* 8014B814 00148754 39 61 00 50 */ addi r11, r1, 0x50 -/* 8014B818 00148758 48 21 69 C5 */ bl func_803621DC +/* 8014B818 00148758 48 21 69 C5 */ bl _savegpr_29 /* 8014B81C 0014875C 7C 7F 1B 78 */ mr r31, r3 /* 8014B820 00148760 7C DD 33 78 */ mr r29, r6 /* 8014B824 00148764 7C FE 3B 78 */ mr r30, r7 @@ -6886,7 +6886,7 @@ lbl_8014BAA8: /* 8014BAE4 00148A24 D0 1F 05 2C */ stfs f0, 0x52c(r31) lbl_8014BAE8: /* 8014BAE8 00148A28 39 61 00 50 */ addi r11, r1, 0x50 -/* 8014BAEC 00148A2C 48 21 67 3D */ bl func_80362228 +/* 8014BAEC 00148A2C 48 21 67 3D */ bl _restgpr_29 /* 8014BAF0 00148A30 80 01 00 54 */ lwz r0, 0x54(r1) /* 8014BAF4 00148A34 7C 08 03 A6 */ mtlr r0 /* 8014BAF8 00148A38 38 21 00 50 */ addi r1, r1, 0x50 @@ -11874,7 +11874,7 @@ daBaseNpc_getGroundAngle: /* 80150234 0014D174 7C 08 02 A6 */ mflr r0 /* 80150238 0014D178 90 01 00 34 */ stw r0, 0x34(r1) /* 8015023C 0014D17C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80150240 0014D180 48 21 1F 9D */ bl func_803621DC +/* 80150240 0014D180 48 21 1F 9D */ bl _savegpr_29 /* 80150244 0014D184 7C 7D 1B 78 */ mr r29, r3 /* 80150248 0014D188 7C 9E 23 78 */ mr r30, r4 /* 8015024C 0014D18C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -11916,7 +11916,7 @@ lbl_801502D0: /* 801502D0 0014D210 38 60 00 00 */ li r3, 0 lbl_801502D4: /* 801502D4 0014D214 39 61 00 30 */ addi r11, r1, 0x30 -/* 801502D8 0014D218 48 21 1F 51 */ bl func_80362228 +/* 801502D8 0014D218 48 21 1F 51 */ bl _restgpr_29 /* 801502DC 0014D21C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801502E0 0014D220 7C 08 03 A6 */ mtlr r0 /* 801502E4 0014D224 38 21 00 30 */ addi r1, r1, 0x30 @@ -12922,7 +12922,7 @@ lbl_80151050: /* 801510FC 0014E03C DB 01 00 60 */ stfd f24, 0x60(r1) /* 80151100 0014E040 F3 01 00 68 */ psq_st f24, 104(r1), 0, qr0 /* 80151104 0014E044 39 61 00 60 */ addi r11, r1, 0x60 -/* 80151108 0014E048 48 21 10 D5 */ bl func_803621DC +/* 80151108 0014E048 48 21 10 D5 */ bl _savegpr_29 /* 8015110C 0014E04C 7C 7D 1B 78 */ mr r29, r3 /* 80151110 0014E050 FF 40 08 90 */ fmr f26, f1 /* 80151114 0014E054 FF 00 10 90 */ fmr f24, f2 @@ -13064,7 +13064,7 @@ lbl_80151178: /* 80151330 0014E270 E3 01 00 68 */ psq_l f24, 104(r1), 0, qr0 /* 80151334 0014E274 CB 01 00 60 */ lfd f24, 0x60(r1) /* 80151338 0014E278 39 61 00 60 */ addi r11, r1, 0x60 -/* 8015133C 0014E27C 48 21 0E ED */ bl func_80362228 +/* 8015133C 0014E27C 48 21 0E ED */ bl _restgpr_29 /* 80151340 0014E280 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80151344 0014E284 7C 08 03 A6 */ mtlr r0 /* 80151348 0014E288 38 21 00 E0 */ addi r1, r1, 0xe0 @@ -14569,7 +14569,7 @@ lbl_801528B0: /* 801528CC 0014F80C 7C 08 02 A6 */ mflr r0 /* 801528D0 0014F810 90 01 00 24 */ stw r0, 0x24(r1) /* 801528D4 0014F814 39 61 00 20 */ addi r11, r1, 0x20 -/* 801528D8 0014F818 48 20 F9 05 */ bl func_803621DC +/* 801528D8 0014F818 48 20 F9 05 */ bl _savegpr_29 /* 801528DC 0014F81C 7C 7F 1B 78 */ mr r31, r3 /* 801528E0 0014F820 38 7F 08 24 */ addi r3, r31, 0x824 /* 801528E4 0014F824 4B FF DD FD */ bl daNpcF_ActorMngr_c_NS_remove @@ -14718,7 +14718,7 @@ lbl_80152A5C: /* 80152B0C 0014FA4C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80152B10 0014FA50 B0 1F 09 D2 */ sth r0, 0x9d2(r31) /* 80152B14 0014FA54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80152B18 0014FA58 48 20 F7 11 */ bl func_80362228 +/* 80152B18 0014FA58 48 20 F7 11 */ bl _restgpr_29 /* 80152B1C 0014FA5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80152B20 0014FA60 7C 08 03 A6 */ mtlr r0 /* 80152B24 0014FA64 38 21 00 20 */ addi r1, r1, 0x20 @@ -15307,7 +15307,7 @@ lbl_8015335C: /* 80153380 001502C0 7C 08 02 A6 */ mflr r0 /* 80153384 001502C4 90 01 00 C4 */ stw r0, 0xc4(r1) /* 80153388 001502C8 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 8015338C 001502CC 48 20 EE 51 */ bl func_803621DC +/* 8015338C 001502CC 48 20 EE 51 */ bl _savegpr_29 /* 80153390 001502D0 7C 7D 1B 78 */ mr r29, r3 /* 80153394 001502D4 7C 9E 23 78 */ mr r30, r4 /* 80153398 001502D8 7C BF 2B 78 */ mr r31, r5 @@ -15432,7 +15432,7 @@ lbl_80153538: /* 8015355C 0015049C 48 1F 2F 89 */ bl PSMTXConcat lbl_80153560: /* 80153560 001504A0 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80153564 001504A4 48 20 EC C5 */ bl func_80362228 +/* 80153564 001504A4 48 20 EC C5 */ bl _restgpr_29 /* 80153568 001504A8 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8015356C 001504AC 7C 08 03 A6 */ mtlr r0 /* 80153570 001504B0 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -15501,7 +15501,7 @@ lbl_80153640: /* 8015365C 0015059C 7C 08 02 A6 */ mflr r0 /* 80153660 001505A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80153664 001505A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153668 001505A8 48 20 EB 75 */ bl func_803621DC +/* 80153668 001505A8 48 20 EB 75 */ bl _savegpr_29 /* 8015366C 001505AC 7C 7D 1B 78 */ mr r29, r3 /* 80153670 001505B0 7C 9E 23 78 */ mr r30, r4 /* 80153674 001505B4 7C DF 33 78 */ mr r31, r6 @@ -15542,7 +15542,7 @@ lbl_801536C0: /* 801536F8 00150638 38 00 00 01 */ li r0, 1 /* 801536FC 0015063C 98 1D 09 F0 */ stb r0, 0x9f0(r29) /* 80153700 00150640 39 61 00 20 */ addi r11, r1, 0x20 -/* 80153704 00150644 48 20 EB 25 */ bl func_80362228 +/* 80153704 00150644 48 20 EB 25 */ bl _restgpr_29 /* 80153708 00150648 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015370C 0015064C 7C 08 03 A6 */ mtlr r0 /* 80153710 00150650 38 21 00 20 */ addi r1, r1, 0x20 @@ -16203,7 +16203,7 @@ lbl_80154088: /* 801540A8 00150FE8 7C 08 02 A6 */ mflr r0 /* 801540AC 00150FEC 90 01 00 34 */ stw r0, 0x34(r1) /* 801540B0 00150FF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801540B4 00150FF4 48 20 E1 29 */ bl func_803621DC +/* 801540B4 00150FF4 48 20 E1 29 */ bl _savegpr_29 /* 801540B8 00150FF8 7C 7F 1B 78 */ mr r31, r3 /* 801540BC 00150FFC 7C 9D 23 78 */ mr r29, r4 /* 801540C0 00151000 7C DE 33 78 */ mr r30, r6 @@ -16307,7 +16307,7 @@ lbl_8015421C: /* 80154230 00151170 7C 00 18 50 */ subf r0, r0, r3 /* 80154234 00151174 54 03 0F FE */ srwi r3, r0, 0x1f /* 80154238 00151178 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015423C 0015117C 48 20 DF ED */ bl func_80362228 +/* 8015423C 0015117C 48 20 DF ED */ bl _restgpr_29 /* 80154240 00151180 80 01 00 34 */ lwz r0, 0x34(r1) /* 80154244 00151184 7C 08 03 A6 */ mtlr r0 /* 80154248 00151188 38 21 00 30 */ addi r1, r1, 0x30 @@ -16654,7 +16654,7 @@ daNpcF_c_NS_chkActorInSight2: /* 80154734 00151674 7C 08 02 A6 */ mflr r0 /* 80154738 00151678 90 01 00 64 */ stw r0, 0x64(r1) /* 8015473C 0015167C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80154740 00151680 48 20 DA 9D */ bl func_803621DC +/* 80154740 00151680 48 20 DA 9D */ bl _savegpr_29 /* 80154744 00151684 7C 7D 1B 78 */ mr r29, r3 /* 80154748 00151688 7C 80 23 78 */ mr r0, r4 /* 8015474C 0015168C 7C BE 2B 78 */ mr r30, r5 @@ -16713,7 +16713,7 @@ lbl_80154818: /* 80154818 00151758 38 60 00 01 */ li r3, 1 lbl_8015481C: /* 8015481C 0015175C 39 61 00 60 */ addi r11, r1, 0x60 -/* 80154820 00151760 48 20 DA 09 */ bl func_80362228 +/* 80154820 00151760 48 20 DA 09 */ bl _restgpr_29 /* 80154824 00151764 80 01 00 64 */ lwz r0, 0x64(r1) /* 80154828 00151768 7C 08 03 A6 */ mtlr r0 /* 8015482C 0015176C 38 21 00 60 */ addi r1, r1, 0x60 @@ -17646,7 +17646,7 @@ daNpcF_getGroundAngle: /* 80155570 001524B0 7C 08 02 A6 */ mflr r0 /* 80155574 001524B4 90 01 00 34 */ stw r0, 0x34(r1) /* 80155578 001524B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015557C 001524BC 48 20 CC 61 */ bl func_803621DC +/* 8015557C 001524BC 48 20 CC 61 */ bl _savegpr_29 /* 80155580 001524C0 7C 7D 1B 78 */ mr r29, r3 /* 80155584 001524C4 7C 9E 23 78 */ mr r30, r4 /* 80155588 001524C8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -17691,7 +17691,7 @@ lbl_8015560C: /* 80155618 00152558 38 60 00 00 */ li r3, 0 lbl_8015561C: /* 8015561C 0015255C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80155620 00152560 48 20 CC 09 */ bl func_80362228 +/* 80155620 00152560 48 20 CC 09 */ bl _restgpr_29 /* 80155624 00152564 80 01 00 34 */ lwz r0, 0x34(r1) /* 80155628 00152568 7C 08 03 A6 */ mtlr r0 /* 8015562C 0015256C 38 21 00 30 */ addi r1, r1, 0x30 @@ -17933,7 +17933,7 @@ daNpcF_chkPointInArea: /* 8015598C 001528CC DB 81 00 40 */ stfd f28, 0x40(r1) /* 80155990 001528D0 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 80155994 001528D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80155998 001528D8 48 20 C8 45 */ bl func_803621DC +/* 80155998 001528D8 48 20 C8 45 */ bl _savegpr_29 /* 8015599C 001528DC 7C 7D 1B 78 */ mr r29, r3 /* 801559A0 001528E0 7C 9E 23 78 */ mr r30, r4 /* 801559A4 001528E4 7C BF 2B 78 */ mr r31, r5 @@ -18010,7 +18010,7 @@ lbl_80155A9C: /* 80155AB4 001529F4 E3 81 00 48 */ psq_l f28, 72(r1), 0, qr0 /* 80155AB8 001529F8 CB 81 00 40 */ lfd f28, 0x40(r1) /* 80155ABC 001529FC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80155AC0 00152A00 48 20 C7 69 */ bl func_80362228 +/* 80155AC0 00152A00 48 20 C7 69 */ bl _restgpr_29 /* 80155AC4 00152A04 80 01 00 84 */ lwz r0, 0x84(r1) /* 80155AC8 00152A08 7C 08 03 A6 */ mtlr r0 /* 80155ACC 00152A0C 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/a/d_a_obj.s b/asm/d/a/d_a_obj.s index 6d4b4016151..838ec56e00a 100644 --- a/asm/d/a/d_a_obj.s +++ b/asm/d/a/d_a_obj.s @@ -324,7 +324,7 @@ daObj_NS__unnamed_d_a_obj_cpp__NS_posMoveF_grade_acc: /* 80037500 00034440 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80037504 00034444 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80037508 00034448 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003750C 0003444C 48 32 AC D1 */ bl func_803621DC +/* 8003750C 0003444C 48 32 AC D1 */ bl _savegpr_29 /* 80037510 00034450 7C 7D 1B 78 */ mr r29, r3 /* 80037514 00034454 7C 9E 23 78 */ mr r30, r4 /* 80037518 00034458 7C BF 2B 79 */ or. r31, r5, r5 @@ -391,7 +391,7 @@ lbl_800375F8: /* 80037600 00034540 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 80037604 00034544 CB C1 00 50 */ lfd f30, 0x50(r1) /* 80037608 00034548 39 61 00 50 */ addi r11, r1, 0x50 -/* 8003760C 0003454C 48 32 AC 1D */ bl func_80362228 +/* 8003760C 0003454C 48 32 AC 1D */ bl _restgpr_29 /* 80037610 00034550 80 01 00 74 */ lwz r0, 0x74(r1) /* 80037614 00034554 7C 08 03 A6 */ mtlr r0 /* 80037618 00034558 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/a/d_a_player.s b/asm/d/a/d_a_player.s index de66e786e6b..8acf0d4341f 100644 --- a/asm/d/a/d_a_player.s +++ b/asm/d/a/d_a_player.s @@ -79,7 +79,7 @@ daPy_boomerangMove_c_NS_initOffset: /* 8015E5B4 0015B4F4 7C 08 02 A6 */ mflr r0 /* 8015E5B8 0015B4F8 90 01 00 24 */ stw r0, 0x24(r1) /* 8015E5BC 0015B4FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015E5C0 0015B500 48 20 3C 1D */ bl func_803621DC +/* 8015E5C0 0015B500 48 20 3C 1D */ bl _savegpr_29 /* 8015E5C4 0015B504 7C 7D 1B 78 */ mr r29, r3 /* 8015E5C8 0015B508 7C 9E 23 78 */ mr r30, r4 /* 8015E5CC 0015B50C 48 00 13 05 */ bl daPy_py_c_NS_getThrowBoomerangActor @@ -113,7 +113,7 @@ lbl_8015E634: /* 8015E634 0015B574 38 00 00 00 */ li r0, 0 /* 8015E638 0015B578 98 1D 00 00 */ stb r0, 0(r29) /* 8015E63C 0015B57C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015E640 0015B580 48 20 3B E9 */ bl func_80362228 +/* 8015E640 0015B580 48 20 3B E9 */ bl _restgpr_29 /* 8015E644 0015B584 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015E648 0015B588 7C 08 03 A6 */ mtlr r0 /* 8015E64C 0015B58C 38 21 00 20 */ addi r1, r1, 0x20 @@ -277,7 +277,7 @@ daPy_boomerangMove_c_NS_bgCheckAfterOffset: /* 8015E880 0015B7C0 7C 08 02 A6 */ mflr r0 /* 8015E884 0015B7C4 90 01 00 44 */ stw r0, 0x44(r1) /* 8015E888 0015B7C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8015E88C 0015B7CC 48 20 39 51 */ bl func_803621DC +/* 8015E88C 0015B7CC 48 20 39 51 */ bl _savegpr_29 /* 8015E890 0015B7D0 7C 7D 1B 78 */ mr r29, r3 /* 8015E894 0015B7D4 7C 9E 23 78 */ mr r30, r4 /* 8015E898 0015B7D8 48 00 10 39 */ bl daPy_py_c_NS_getThrowBoomerangActor @@ -378,7 +378,7 @@ lbl_8015E9D0: /* 8015E9F0 0015B930 B0 7D 00 02 */ sth r3, 2(r29) lbl_8015E9F4: /* 8015E9F4 0015B934 39 61 00 40 */ addi r11, r1, 0x40 -/* 8015E9F8 0015B938 48 20 38 31 */ bl func_80362228 +/* 8015E9F8 0015B938 48 20 38 31 */ bl _restgpr_29 /* 8015E9FC 0015B93C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8015EA00 0015B940 7C 08 03 A6 */ mtlr r0 /* 8015EA04 0015B944 38 21 00 40 */ addi r1, r1, 0x40 @@ -730,7 +730,7 @@ daPy_anmHeap_c_NS_createHeap: /* 8015EE04 0015BD44 7C 08 02 A6 */ mflr r0 /* 8015EE08 0015BD48 90 01 00 24 */ stw r0, 0x24(r1) /* 8015EE0C 0015BD4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015EE10 0015BD50 48 20 33 CD */ bl func_803621DC +/* 8015EE10 0015BD50 48 20 33 CD */ bl _savegpr_29 /* 8015EE14 0015BD54 7C 7D 1B 78 */ mr r29, r3 /* 8015EE18 0015BD58 7C 9E 23 78 */ mr r30, r4 /* 8015EE1C 0015BD5C 2C 1E 00 04 */ cmpwi r30, 4 @@ -828,7 +828,7 @@ lbl_8015EF5C: /* 8015EF64 0015BEA4 80 7D 00 10 */ lwz r3, 0x10(r29) /* 8015EF68 0015BEA8 4B EB 01 25 */ bl mDoExt_adjustSolidHeap /* 8015EF6C 0015BEAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015EF70 0015BEB0 48 20 32 B9 */ bl func_80362228 +/* 8015EF70 0015BEB0 48 20 32 B9 */ bl _restgpr_29 /* 8015EF74 0015BEB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015EF78 0015BEB8 7C 08 03 A6 */ mtlr r0 /* 8015EF7C 0015BEBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1265,7 +1265,7 @@ daPy_py_c_NS_linkGrabSubjectNoDraw: /* 8015F560 0015C4A0 7C 08 02 A6 */ mflr r0 /* 8015F564 0015C4A4 90 01 00 24 */ stw r0, 0x24(r1) /* 8015F568 0015C4A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015F56C 0015C4AC 48 20 2C 71 */ bl func_803621DC +/* 8015F56C 0015C4AC 48 20 2C 71 */ bl _savegpr_29 /* 8015F570 0015C4B0 3B E0 00 00 */ li r31, 0 /* 8015F574 0015C4B4 7F FE FB 78 */ mr r30, r31 /* 8015F578 0015C4B8 80 03 04 9C */ lwz r0, 0x49c(r3) @@ -1304,7 +1304,7 @@ lbl_8015F5C0: lbl_8015F5F0: /* 8015F5F0 0015C530 7F E3 FB 78 */ mr r3, r31 /* 8015F5F4 0015C534 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015F5F8 0015C538 48 20 2C 31 */ bl func_80362228 +/* 8015F5F8 0015C538 48 20 2C 31 */ bl _restgpr_29 /* 8015F5FC 0015C53C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015F600 0015C540 7C 08 03 A6 */ mtlr r0 /* 8015F604 0015C544 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 d5d3ca8f3d7..e33f48967b1 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -29,7 +29,7 @@ lbl_80156048: /* 80156060 00152FA0 7C 08 02 A6 */ mflr r0 /* 80156064 00152FA4 90 01 00 44 */ stw r0, 0x44(r1) /* 80156068 00152FA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8015606C 00152FAC 48 20 C1 71 */ bl func_803621DC +/* 8015606C 00152FAC 48 20 C1 71 */ bl _savegpr_29 /* 80156070 00152FB0 7C 7D 1B 78 */ mr r29, r3 /* 80156074 00152FB4 7C 9E 23 78 */ mr r30, r4 /* 80156078 00152FB8 48 00 14 AD */ bl daNpcCd_c_NS_getNpcMdlDataP @@ -127,7 +127,7 @@ lbl_801561B0: /* 801561CC 0015310C 38 60 00 01 */ li r3, 1 lbl_801561D0: /* 801561D0 00153110 39 61 00 40 */ addi r11, r1, 0x40 -/* 801561D4 00153114 48 20 C0 55 */ bl func_80362228 +/* 801561D4 00153114 48 20 C0 55 */ bl _restgpr_29 /* 801561D8 00153118 80 01 00 44 */ lwz r0, 0x44(r1) /* 801561DC 0015311C 7C 08 03 A6 */ mtlr r0 /* 801561E0 00153120 38 21 00 40 */ addi r1, r1, 0x40 @@ -282,7 +282,7 @@ lbl_801563B4: /* 801563CC 0015330C 7C 08 02 A6 */ mflr r0 /* 801563D0 00153310 90 01 01 94 */ stw r0, 0x194(r1) /* 801563D4 00153314 39 61 01 90 */ addi r11, r1, 0x190 -/* 801563D8 00153318 48 20 BE 05 */ bl func_803621DC +/* 801563D8 00153318 48 20 BE 05 */ bl _savegpr_29 /* 801563DC 0015331C 7C 7E 1B 78 */ mr r30, r3 /* 801563E0 00153320 7C 9D 23 78 */ mr r29, r4 /* 801563E4 00153324 3C 60 80 42 */ lis r3, lbl_80425978@ha @@ -757,7 +757,7 @@ lbl_80156AFC: /* 80156B2C 00153A6C D0 7E 05 58 */ stfs f3, 0x558(r30) /* 80156B30 00153A70 38 60 00 01 */ li r3, 1 /* 80156B34 00153A74 39 61 01 90 */ addi r11, r1, 0x190 -/* 80156B38 00153A78 48 20 B6 F1 */ bl func_80362228 +/* 80156B38 00153A78 48 20 B6 F1 */ bl _restgpr_29 /* 80156B3C 00153A7C 80 01 01 94 */ lwz r0, 0x194(r1) /* 80156B40 00153A80 7C 08 03 A6 */ mtlr r0 /* 80156B44 00153A84 38 21 01 90 */ addi r1, r1, 0x190 @@ -985,7 +985,7 @@ lbl_80156E7C: /* 80156E94 00153DD4 90 01 00 24 */ stw r0, 0x24(r1) /* 80156E98 00153DD8 DB E1 00 18 */ stfd f31, 0x18(r1) /* 80156E9C 00153DDC 39 61 00 18 */ addi r11, r1, 0x18 -/* 80156EA0 00153DE0 48 20 B3 3D */ bl func_803621DC +/* 80156EA0 00153DE0 48 20 B3 3D */ bl _savegpr_29 /* 80156EA4 00153DE4 7C 7D 1B 78 */ mr r29, r3 /* 80156EA8 00153DE8 7C 9F 23 78 */ mr r31, r4 /* 80156EAC 00153DEC 7C BE 2B 78 */ mr r30, r5 @@ -1036,7 +1036,7 @@ lbl_80156F54: lbl_80156F58: /* 80156F58 00153E98 CB E1 00 18 */ lfd f31, 0x18(r1) /* 80156F5C 00153E9C 39 61 00 18 */ addi r11, r1, 0x18 -/* 80156F60 00153EA0 48 20 B2 C9 */ bl func_80362228 +/* 80156F60 00153EA0 48 20 B2 C9 */ bl _restgpr_29 /* 80156F64 00153EA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80156F68 00153EA8 7C 08 03 A6 */ mtlr r0 /* 80156F6C 00153EAC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index f35748b94dc..199c1e289ea 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -547,7 +547,7 @@ lbl_8015840C: /* 80158424 00155364 7C 08 02 A6 */ mflr r0 /* 80158428 00155368 90 01 01 94 */ stw r0, 0x194(r1) /* 8015842C 0015536C 39 61 01 90 */ addi r11, r1, 0x190 -/* 80158430 00155370 48 20 9D AD */ bl func_803621DC +/* 80158430 00155370 48 20 9D AD */ bl _savegpr_29 /* 80158434 00155374 7C 7E 1B 78 */ mr r30, r3 /* 80158438 00155378 7C 9D 23 78 */ mr r29, r4 /* 8015843C 0015537C 3C 60 80 43 */ lis r3, lbl_80428610@ha @@ -1027,7 +1027,7 @@ lbl_80158B68: /* 80158B98 00155AD8 D0 7E 05 58 */ stfs f3, 0x558(r30) /* 80158B9C 00155ADC 38 60 00 01 */ li r3, 1 /* 80158BA0 00155AE0 39 61 01 90 */ addi r11, r1, 0x190 -/* 80158BA4 00155AE4 48 20 96 85 */ bl func_80362228 +/* 80158BA4 00155AE4 48 20 96 85 */ bl _restgpr_29 /* 80158BA8 00155AE8 80 01 01 94 */ lwz r0, 0x194(r1) /* 80158BAC 00155AEC 7C 08 03 A6 */ mtlr r0 /* 80158BB0 00155AF0 38 21 01 90 */ addi r1, r1, 0x190 @@ -1322,7 +1322,7 @@ lbl_80158FD4: /* 80158FF8 00155F38 90 01 00 24 */ stw r0, 0x24(r1) /* 80158FFC 00155F3C DB E1 00 18 */ stfd f31, 0x18(r1) /* 80159000 00155F40 39 61 00 18 */ addi r11, r1, 0x18 -/* 80159004 00155F44 48 20 91 D9 */ bl func_803621DC +/* 80159004 00155F44 48 20 91 D9 */ bl _savegpr_29 /* 80159008 00155F48 7C 7D 1B 78 */ mr r29, r3 /* 8015900C 00155F4C 7C 9E 23 78 */ mr r30, r4 /* 80159010 00155F50 7C BF 2B 79 */ or. r31, r5, r5 @@ -1383,7 +1383,7 @@ lbl_801590DC: lbl_801590E0: /* 801590E0 00156020 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801590E4 00156024 39 61 00 18 */ addi r11, r1, 0x18 -/* 801590E8 00156028 48 20 91 41 */ bl func_80362228 +/* 801590E8 00156028 48 20 91 41 */ bl _restgpr_29 /* 801590EC 0015602C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801590F0 00156030 7C 08 03 A6 */ mtlr r0 /* 801590F4 00156034 38 21 00 20 */ addi r1, r1, 0x20 @@ -1884,7 +1884,7 @@ lbl_801597A8: /* 80159824 00156764 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80159828 00156768 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8015982C 0015676C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80159830 00156770 48 20 89 AD */ bl func_803621DC +/* 80159830 00156770 48 20 89 AD */ bl _savegpr_29 /* 80159834 00156774 7C 7D 1B 78 */ mr r29, r3 /* 80159838 00156778 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8015983C 0015677C 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -1928,7 +1928,7 @@ lbl_801598C4: /* 801598C8 00156808 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801598CC 0015680C CB E1 00 20 */ lfd f31, 0x20(r1) /* 801598D0 00156810 39 61 00 20 */ addi r11, r1, 0x20 -/* 801598D4 00156814 48 20 89 55 */ bl func_80362228 +/* 801598D4 00156814 48 20 89 55 */ bl _restgpr_29 /* 801598D8 00156818 80 01 00 34 */ lwz r0, 0x34(r1) /* 801598DC 0015681C 7C 08 03 A6 */ mtlr r0 /* 801598E0 00156820 38 21 00 30 */ addi r1, r1, 0x30 @@ -2367,7 +2367,7 @@ PathTrace_c_NS_setAvoidPoint: /* 80159ED0 00156E10 7C 08 02 A6 */ mflr r0 /* 80159ED4 00156E14 90 01 00 24 */ stw r0, 0x24(r1) /* 80159ED8 00156E18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80159EDC 00156E1C 48 20 83 01 */ bl func_803621DC +/* 80159EDC 00156E1C 48 20 83 01 */ bl _savegpr_29 /* 80159EE0 00156E20 7C 7F 1B 78 */ mr r31, r3 /* 80159EE4 00156E24 80 63 00 00 */ lwz r3, 0(r3) /* 80159EE8 00156E28 3B A3 04 D0 */ addi r29, r3, 0x4d0 @@ -2410,7 +2410,7 @@ lbl_80159F3C: /* 80159F78 00156EB8 7C 85 23 78 */ mr r5, r4 /* 80159F7C 00156EBC 48 1E CD F1 */ bl PSMTXMultVec /* 80159F80 00156EC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80159F84 00156EC4 48 20 82 A5 */ bl func_80362228 +/* 80159F84 00156EC4 48 20 82 A5 */ bl _restgpr_29 /* 80159F88 00156EC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80159F8C 00156ECC 7C 08 03 A6 */ mtlr r0 /* 80159F90 00156ED0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index 421092fff56..9359940aea7 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -1643,7 +1643,7 @@ daItem_c_NS_procInitBoomerangCarry: /* 8015C518 00159458 7C 08 02 A6 */ mflr r0 /* 8015C51C 0015945C 90 01 00 24 */ stw r0, 0x24(r1) /* 8015C520 00159460 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015C524 00159464 48 20 5C B9 */ bl func_803621DC +/* 8015C524 00159464 48 20 5C B9 */ bl _savegpr_29 /* 8015C528 00159468 7C 7D 1B 78 */ mr r29, r3 /* 8015C52C 0015946C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8015C530 00159470 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -1692,7 +1692,7 @@ lbl_8015C59C: /* 8015C5D4 00159514 38 9D 07 E0 */ addi r4, r29, 0x7e0 /* 8015C5D8 00159518 48 10 85 D1 */ bl cCcS_NS_Set /* 8015C5DC 0015951C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015C5E0 00159520 48 20 5C 49 */ bl func_80362228 +/* 8015C5E0 00159520 48 20 5C 49 */ bl _restgpr_29 /* 8015C5E4 00159524 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015C5E8 00159528 7C 08 03 A6 */ mtlr r0 /* 8015C5EC 0015952C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2040,7 +2040,7 @@ daItem_c_NS_move_proc_call: /* 8015CABC 001599FC 7C 08 02 A6 */ mflr r0 /* 8015CAC0 00159A00 90 01 00 24 */ stw r0, 0x24(r1) /* 8015CAC4 00159A04 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015CAC8 00159A08 48 20 57 15 */ bl func_803621DC +/* 8015CAC8 00159A08 48 20 57 15 */ bl _savegpr_29 /* 8015CACC 00159A0C 7C 7E 1B 78 */ mr r30, r3 /* 8015CAD0 00159A10 3C 60 80 3C */ lis r3, lbl_803B9DA0@ha /* 8015CAD4 00159A14 3B E3 9D A0 */ addi r31, r3, lbl_803B9DA0@l @@ -2139,7 +2139,7 @@ lbl_8015CC18: /* 8015CC30 00159B70 60 00 00 00 */ nop lbl_8015CC34: /* 8015CC34 00159B74 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015CC38 00159B78 48 20 55 F1 */ bl func_80362228 +/* 8015CC38 00159B78 48 20 55 F1 */ bl _restgpr_29 /* 8015CC3C 00159B7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015CC40 00159B80 7C 08 03 A6 */ mtlr r0 /* 8015CC44 00159B84 38 21 00 20 */ addi r1, r1, 0x20 @@ -2340,7 +2340,7 @@ daItem_c_NS_itemGetNextExecute: /* 8015CEF0 00159E30 7C 08 02 A6 */ mflr r0 /* 8015CEF4 00159E34 90 01 00 24 */ stw r0, 0x24(r1) /* 8015CEF8 00159E38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015CEFC 00159E3C 48 20 52 E1 */ bl func_803621DC +/* 8015CEFC 00159E3C 48 20 52 E1 */ bl _savegpr_29 /* 8015CF00 00159E40 7C 7F 1B 78 */ mr r31, r3 /* 8015CF04 00159E44 88 83 09 48 */ lbz r4, 0x948(r3) /* 8015CF08 00159E48 54 80 06 B5 */ rlwinm. r0, r4, 0, 0x1a, 0x1a @@ -2453,7 +2453,7 @@ lbl_8015D03C: /* 8015D08C 00159FCC 4E 80 04 21 */ bctrl lbl_8015D090: /* 8015D090 00159FD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015D094 00159FD4 48 20 51 95 */ bl func_80362228 +/* 8015D094 00159FD4 48 20 51 95 */ bl _restgpr_29 /* 8015D098 00159FD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015D09C 00159FDC 7C 08 03 A6 */ mtlr r0 /* 8015D0A0 00159FE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3303,7 +3303,7 @@ daItem_c_NS_initSpeed: /* 8015DC54 0015AB94 DB C1 00 40 */ stfd f30, 0x40(r1) /* 8015DC58 0015AB98 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 8015DC5C 0015AB9C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8015DC60 0015ABA0 48 20 45 7D */ bl func_803621DC +/* 8015DC60 0015ABA0 48 20 45 7D */ bl _savegpr_29 /* 8015DC64 0015ABA4 7C 7D 1B 78 */ mr r29, r3 /* 8015DC68 0015ABA8 7C 9E 23 78 */ mr r30, r4 /* 8015DC6C 0015ABAC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -3422,7 +3422,7 @@ lbl_8015DDEC: /* 8015DE18 0015AD58 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 8015DE1C 0015AD5C CB C1 00 40 */ lfd f30, 0x40(r1) /* 8015DE20 0015AD60 39 61 00 40 */ addi r11, r1, 0x40 -/* 8015DE24 0015AD64 48 20 44 05 */ bl func_80362228 +/* 8015DE24 0015AD64 48 20 44 05 */ bl _restgpr_29 /* 8015DE28 0015AD68 80 01 00 64 */ lwz r0, 0x64(r1) /* 8015DE2C 0015AD6C 7C 08 03 A6 */ mtlr r0 /* 8015DE30 0015AD70 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index e56adc383cb..484de7e9a58 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -113,7 +113,7 @@ cBgS_NS_Release: /* 80074254 00071194 7C 08 02 A6 */ mflr r0 /* 80074258 00071198 90 01 00 24 */ stw r0, 0x24(r1) /* 8007425C 0007119C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074260 000711A0 48 2E DF 7D */ bl func_803621DC +/* 80074260 000711A0 48 2E DF 7D */ bl _savegpr_29 /* 80074264 000711A4 7C 7D 1B 78 */ mr r29, r3 /* 80074268 000711A8 7C 9E 23 79 */ or. r30, r4, r4 /* 8007426C 000711AC 40 82 00 0C */ bne lbl_80074278 @@ -145,7 +145,7 @@ lbl_800742C8: /* 800742C8 00071208 38 60 00 00 */ li r3, 0 lbl_800742CC: /* 800742CC 0007120C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800742D0 00071210 48 2E DF 59 */ bl func_80362228 +/* 800742D0 00071210 48 2E DF 59 */ bl _restgpr_29 /* 800742D4 00071214 80 01 00 24 */ lwz r0, 0x24(r1) /* 800742D8 00071218 7C 08 03 A6 */ mtlr r0 /* 800742DC 0007121C 38 21 00 20 */ addi r1, r1, 0x20 @@ -157,7 +157,7 @@ cBgS_NS_Ct: /* 800742E8 00071228 7C 08 02 A6 */ mflr r0 /* 800742EC 0007122C 90 01 00 24 */ stw r0, 0x24(r1) /* 800742F0 00071230 39 61 00 20 */ addi r11, r1, 0x20 -/* 800742F4 00071234 48 2E DE E9 */ bl func_803621DC +/* 800742F4 00071234 48 2E DE E9 */ bl _savegpr_29 /* 800742F8 00071238 7C 7D 1B 78 */ mr r29, r3 /* 800742FC 0007123C 3B E0 00 00 */ li r31, 0 /* 80074300 00071240 93 ED 89 E0 */ stw r31, lbl_80450F60-_SDA_BASE_(r13) @@ -170,7 +170,7 @@ lbl_80074308: /* 80074318 00071258 3B FF 00 14 */ addi r31, r31, 0x14 /* 8007431C 0007125C 41 80 FF EC */ blt lbl_80074308 /* 80074320 00071260 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074324 00071264 48 2E DF 05 */ bl func_80362228 +/* 80074324 00071264 48 2E DF 05 */ bl _restgpr_29 /* 80074328 00071268 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007432C 0007126C 7C 08 03 A6 */ mtlr r0 /* 80074330 00071270 38 21 00 20 */ addi r1, r1, 0x20 @@ -182,7 +182,7 @@ cBgS_NS_Dt: /* 8007433C 0007127C 7C 08 02 A6 */ mflr r0 /* 80074340 00071280 90 01 00 24 */ stw r0, 0x24(r1) /* 80074344 00071284 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074348 00071288 48 2E DE 95 */ bl func_803621DC +/* 80074348 00071288 48 2E DE 95 */ bl _savegpr_29 /* 8007434C 0007128C 7C 7D 1B 78 */ mr r29, r3 /* 80074350 00071290 3B C0 00 00 */ li r30, 0 /* 80074354 00071294 3B E0 00 00 */ li r31, 0 @@ -207,7 +207,7 @@ lbl_80074384: /* 80074394 000712D4 3B FF 00 14 */ addi r31, r31, 0x14 /* 80074398 000712D8 41 80 FF EC */ blt lbl_80074384 /* 8007439C 000712DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800743A0 000712E0 48 2E DE 89 */ bl func_80362228 +/* 800743A0 000712E0 48 2E DE 89 */ bl _restgpr_29 /* 800743A4 000712E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800743A8 000712E8 7C 08 03 A6 */ mtlr r0 /* 800743AC 000712EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -219,7 +219,7 @@ cBgS_NS_LineCross: /* 800743B8 000712F8 7C 08 02 A6 */ mflr r0 /* 800743BC 000712FC 90 01 00 24 */ stw r0, 0x24(r1) /* 800743C0 00071300 39 61 00 20 */ addi r11, r1, 0x20 -/* 800743C4 00071304 48 2E DE 19 */ bl func_803621DC +/* 800743C4 00071304 48 2E DE 19 */ bl _savegpr_29 /* 800743C8 00071308 7C 7E 1B 78 */ mr r30, r3 /* 800743CC 0007130C 7C 9D 23 78 */ mr r29, r4 /* 800743D0 00071310 38 7D 00 14 */ addi r3, r29, 0x14 @@ -271,7 +271,7 @@ lbl_80074470: /* 80074480 000713C0 80 1D 00 4C */ lwz r0, 0x4c(r29) /* 80074484 000713C4 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f /* 80074488 000713C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007448C 000713CC 48 2E DD 9D */ bl func_80362228 +/* 8007448C 000713CC 48 2E DD 9D */ bl _restgpr_29 /* 80074490 000713D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80074494 000713D4 7C 08 03 A6 */ mtlr r0 /* 80074498 000713D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -283,7 +283,7 @@ cBgS_NS_GroundCross: /* 800744A4 000713E4 7C 08 02 A6 */ mflr r0 /* 800744A8 000713E8 90 01 00 24 */ stw r0, 0x24(r1) /* 800744AC 000713EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800744B0 000713F0 48 2E DD 2D */ bl func_803621DC +/* 800744B0 000713F0 48 2E DD 2D */ bl _savegpr_29 /* 800744B4 000713F4 7C 7E 1B 78 */ mr r30, r3 /* 800744B8 000713F8 7C 9D 23 78 */ mr r29, r4 /* 800744BC 000713FC C0 02 8C B8 */ lfs f0, lbl_804526B8-_SDA2_BASE_(r2) @@ -330,7 +330,7 @@ lbl_8007454C: /* 80074558 00071498 41 80 FF 84 */ blt lbl_800744DC /* 8007455C 0007149C C0 3D 00 34 */ lfs f1, 0x34(r29) /* 80074560 000714A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074564 000714A4 48 2E DC C5 */ bl func_80362228 +/* 80074564 000714A4 48 2E DC C5 */ bl _restgpr_29 /* 80074568 000714A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007456C 000714AC 7C 08 03 A6 */ mtlr r0 /* 80074570 000714B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -559,7 +559,7 @@ cBgS_NS_ShdwDraw: /* 80074844 00071784 7C 08 02 A6 */ mflr r0 /* 80074848 00071788 90 01 00 24 */ stw r0, 0x24(r1) /* 8007484C 0007178C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074850 00071790 48 2E D9 8D */ bl func_803621DC +/* 80074850 00071790 48 2E D9 8D */ bl _savegpr_29 /* 80074854 00071794 7C 9D 23 78 */ mr r29, r4 /* 80074858 00071798 7C 7F 1B 78 */ mr r31, r3 /* 8007485C 0007179C 3B C0 00 00 */ li r30, 0 @@ -579,7 +579,7 @@ lbl_80074884: /* 8007488C 000717CC 3B FF 00 14 */ addi r31, r31, 0x14 /* 80074890 000717D0 41 80 FF D0 */ blt lbl_80074860 /* 80074894 000717D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074898 000717D8 48 2E D9 91 */ bl func_80362228 +/* 80074898 000717D8 48 2E D9 91 */ bl _restgpr_29 /* 8007489C 000717DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800748A0 000717E0 7C 08 03 A6 */ mtlr r0 /* 800748A4 000717E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -632,7 +632,7 @@ dBgS_NS_ClrMoveFlag: /* 80074940 00071880 7C 08 02 A6 */ mflr r0 /* 80074944 00071884 90 01 00 24 */ stw r0, 0x24(r1) /* 80074948 00071888 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007494C 0007188C 48 2E D8 91 */ bl func_803621DC +/* 8007494C 0007188C 48 2E D8 91 */ bl _savegpr_29 /* 80074950 00071890 7C 7D 1B 78 */ mr r29, r3 /* 80074954 00071894 3B C0 00 00 */ li r30, 0 /* 80074958 00071898 3B E0 00 00 */ li r31, 0 @@ -652,7 +652,7 @@ lbl_80074980: /* 80074988 000718C8 3B FF 00 14 */ addi r31, r31, 0x14 /* 8007498C 000718CC 41 80 FF D0 */ blt lbl_8007495C /* 80074990 000718D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074994 000718D4 48 2E D8 95 */ bl func_80362228 +/* 80074994 000718D4 48 2E D8 95 */ bl _restgpr_29 /* 80074998 000718D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007499C 000718DC 7C 08 03 A6 */ mtlr r0 /* 800749A0 000718E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -693,7 +693,7 @@ dBgS_NS_Regist: /* 80074A0C 0007194C 7C 08 02 A6 */ mflr r0 /* 80074A10 00071950 90 01 00 24 */ stw r0, 0x24(r1) /* 80074A14 00071954 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074A18 00071958 48 2E D7 C5 */ bl func_803621DC +/* 80074A18 00071958 48 2E D7 C5 */ bl _savegpr_29 /* 80074A1C 0007195C 7C 7D 1B 78 */ mr r29, r3 /* 80074A20 00071960 7C 9E 23 79 */ or. r30, r4, r4 /* 80074A24 00071964 7C BF 2B 78 */ mr r31, r5 @@ -732,7 +732,7 @@ lbl_80074A94: /* 80074A98 000719D8 4B FF F6 AD */ bl cBgS_NS_Regist lbl_80074A9C: /* 80074A9C 000719DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074AA0 000719E0 48 2E D7 89 */ bl func_80362228 +/* 80074AA0 000719E0 48 2E D7 89 */ bl _restgpr_29 /* 80074AA4 000719E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80074AA8 000719E8 7C 08 03 A6 */ mtlr r0 /* 80074AAC 000719EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1239,7 +1239,7 @@ dBgS_NS_GetRoomId: /* 80075104 00072044 7C 08 02 A6 */ mflr r0 /* 80075108 00072048 90 01 00 24 */ stw r0, 0x24(r1) /* 8007510C 0007204C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075110 00072050 48 2E D0 CD */ bl func_803621DC +/* 80075110 00072050 48 2E D0 CD */ bl _savegpr_29 /* 80075114 00072054 7C 7D 1B 78 */ mr r29, r3 /* 80075118 00072058 7C 9E 23 78 */ mr r30, r4 /* 8007511C 0007205C 7F C3 F3 78 */ mr r3, r30 @@ -1272,7 +1272,7 @@ lbl_80075154: /* 80075180 000720C0 38 60 FF FF */ li r3, -1 lbl_80075184: /* 80075184 000720C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075188 000720C8 48 2E D0 A1 */ bl func_80362228 +/* 80075188 000720C8 48 2E D0 A1 */ bl _restgpr_29 /* 8007518C 000720CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80075190 000720D0 7C 08 03 A6 */ mtlr r0 /* 80075194 000720D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1500,7 +1500,7 @@ dBgS_NS_RoofChk: /* 800754A0 000723E0 7C 08 02 A6 */ mflr r0 /* 800754A4 000723E4 90 01 00 24 */ stw r0, 0x24(r1) /* 800754A8 000723E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800754AC 000723EC 48 2E CD 31 */ bl func_803621DC +/* 800754AC 000723EC 48 2E CD 31 */ bl _savegpr_29 /* 800754B0 000723F0 7C 7E 1B 78 */ mr r30, r3 /* 800754B4 000723F4 7C 9D 23 78 */ mr r29, r4 /* 800754B8 000723F8 7F A3 EB 78 */ mr r3, r29 @@ -1543,7 +1543,7 @@ lbl_80075538: /* 80075544 00072484 41 80 FF 84 */ blt lbl_800754C8 /* 80075548 00072488 C0 3D 00 4C */ lfs f1, 0x4c(r29) /* 8007554C 0007248C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075550 00072490 48 2E CC D9 */ bl func_80362228 +/* 80075550 00072490 48 2E CC D9 */ bl _restgpr_29 /* 80075554 00072494 80 01 00 24 */ lwz r0, 0x24(r1) /* 80075558 00072498 7C 08 03 A6 */ mtlr r0 /* 8007555C 0007249C 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 2fca2544d5a..a3770bf89da 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -159,7 +159,7 @@ cBgW_NS_GlobalVtx: /* 800793C8 00076308 7C 08 02 A6 */ mflr r0 /* 800793CC 0007630C 90 01 00 24 */ stw r0, 0x24(r1) /* 800793D0 00076310 39 61 00 20 */ addi r11, r1, 0x20 -/* 800793D4 00076314 48 2E 8E 09 */ bl func_803621DC +/* 800793D4 00076314 48 2E 8E 09 */ bl _savegpr_29 /* 800793D8 00076318 7C 7D 1B 78 */ mr r29, r3 /* 800793DC 0007631C 80 03 00 18 */ lwz r0, 0x18(r3) /* 800793E0 00076320 28 00 00 00 */ cmplwi r0, 0 @@ -204,7 +204,7 @@ lbl_8007945C: /* 80079468 000763A8 41 80 FF D4 */ blt lbl_8007943C lbl_8007946C: /* 8007946C 000763AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079470 000763B0 48 2E 8D B9 */ bl func_80362228 +/* 80079470 000763B0 48 2E 8D B9 */ bl _restgpr_29 /* 80079474 000763B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80079478 000763B8 7C 08 03 A6 */ mtlr r0 /* 8007947C 000763BC 38 21 00 20 */ addi r1, r1, 0x20 @@ -900,7 +900,7 @@ cBgW_NS_MakeNodeTree: /* 80079DF4 00076D34 7C 08 02 A6 */ mflr r0 /* 80079DF8 00076D38 90 01 00 24 */ stw r0, 0x24(r1) /* 80079DFC 00076D3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079E00 00076D40 48 2E 83 DD */ bl func_803621DC +/* 80079E00 00076D40 48 2E 83 DD */ bl _savegpr_29 /* 80079E04 00076D44 7C 7F 1B 78 */ mr r31, r3 /* 80079E08 00076D48 80 03 00 9C */ lwz r0, 0x9c(r3) /* 80079E0C 00076D4C 28 00 00 00 */ cmplwi r0, 0 @@ -962,7 +962,7 @@ lbl_80079EC8: /* 80079ED0 00076E10 42 00 FF D4 */ bdnz lbl_80079EA4 lbl_80079ED4: /* 80079ED4 00076E14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80079ED8 00076E18 48 2E 83 51 */ bl func_80362228 +/* 80079ED8 00076E18 48 2E 83 51 */ bl _restgpr_29 /* 80079EDC 00076E1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80079EE0 00076E20 7C 08 03 A6 */ mtlr r0 /* 80079EE4 00076E24 38 21 00 20 */ addi r1, r1, 0x20 @@ -1523,7 +1523,7 @@ cBgW_NS_RwgGroundCheckCommon: /* 8007A68C 000775CC DB E1 00 20 */ stfd f31, 0x20(r1) /* 8007A690 000775D0 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8007A694 000775D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A698 000775D8 48 2E 7B 45 */ bl func_803621DC +/* 8007A698 000775D8 48 2E 7B 45 */ bl _savegpr_29 /* 8007A69C 000775DC 7C 7D 1B 78 */ mr r29, r3 /* 8007A6A0 000775E0 FF E0 08 90 */ fmr f31, f1 /* 8007A6A4 000775E4 7C 9F 23 78 */ mr r31, r4 @@ -1575,7 +1575,7 @@ lbl_8007A754: /* 8007A754 00077694 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8007A758 00077698 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8007A75C 0007769C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007A760 000776A0 48 2E 7A C9 */ bl func_80362228 +/* 8007A760 000776A0 48 2E 7A C9 */ bl _restgpr_29 /* 8007A764 000776A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007A768 000776A8 7C 08 03 A6 */ mtlr r0 /* 8007A76C 000776AC 38 21 00 30 */ addi r1, r1, 0x30 @@ -2180,7 +2180,7 @@ cBgW_NS_ShdwDrawGrpRp: /* 8007AFC4 00077F04 7C 08 02 A6 */ mflr r0 /* 8007AFC8 00077F08 90 01 00 24 */ stw r0, 0x24(r1) /* 8007AFCC 00077F0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007AFD0 00077F10 48 2E 72 0D */ bl func_803621DC +/* 8007AFD0 00077F10 48 2E 72 0D */ bl _savegpr_29 /* 8007AFD4 00077F14 7C 7E 1B 78 */ mr r30, r3 /* 8007AFD8 00077F18 7C 9F 23 78 */ mr r31, r4 /* 8007AFDC 00077F1C 7C BD 2B 78 */ mr r29, r5 @@ -2223,7 +2223,7 @@ lbl_8007B038: /* 8007B068 00077FA8 4B FF FF D0 */ b lbl_8007B038 lbl_8007B06C: /* 8007B06C 00077FAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B070 00077FB0 48 2E 71 B9 */ bl func_80362228 +/* 8007B070 00077FB0 48 2E 71 B9 */ bl _restgpr_29 /* 8007B074 00077FB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007B078 00077FB8 7C 08 03 A6 */ mtlr r0 /* 8007B07C 00077FBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -2406,7 +2406,7 @@ cBgW_NS_GetPolyInf0: /* 8007B310 00078250 7C 08 02 A6 */ mflr r0 /* 8007B314 00078254 90 01 00 24 */ stw r0, 0x24(r1) /* 8007B318 00078258 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B31C 0007825C 48 2E 6E C1 */ bl func_803621DC +/* 8007B31C 0007825C 48 2E 6E C1 */ bl _savegpr_29 /* 8007B320 00078260 7C 7D 1B 78 */ mr r29, r3 /* 8007B324 00078264 7C BE 2B 78 */ mr r30, r5 /* 8007B328 00078268 7C DF 33 78 */ mr r31, r6 @@ -2418,7 +2418,7 @@ cBgW_NS_GetPolyInf0: /* 8007B340 00078280 7F C0 00 38 */ and r0, r30, r0 /* 8007B344 00078284 7C 03 FC 30 */ srw r3, r0, r31 /* 8007B348 00078288 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B34C 0007828C 48 2E 6E DD */ bl func_80362228 +/* 8007B34C 0007828C 48 2E 6E DD */ bl _restgpr_29 /* 8007B350 00078290 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007B354 00078294 7C 08 03 A6 */ mtlr r0 /* 8007B358 00078298 38 21 00 20 */ addi r1, r1, 0x20 @@ -2622,7 +2622,7 @@ cBgW_NS_GetPolyInf1: /* 8007B658 00078598 7C 08 02 A6 */ mflr r0 /* 8007B65C 0007859C 90 01 00 24 */ stw r0, 0x24(r1) /* 8007B660 000785A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B664 000785A4 48 2E 6B 79 */ bl func_803621DC +/* 8007B664 000785A4 48 2E 6B 79 */ bl _savegpr_29 /* 8007B668 000785A8 7C 7D 1B 78 */ mr r29, r3 /* 8007B66C 000785AC 7C BE 2B 78 */ mr r30, r5 /* 8007B670 000785B0 7C DF 33 78 */ mr r31, r6 @@ -2635,7 +2635,7 @@ cBgW_NS_GetPolyInf1: /* 8007B68C 000785CC 7F C0 00 38 */ and r0, r30, r0 /* 8007B690 000785D0 7C 03 FC 30 */ srw r3, r0, r31 /* 8007B694 000785D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B698 000785D8 48 2E 6B 91 */ bl func_80362228 +/* 8007B698 000785D8 48 2E 6B 91 */ bl _restgpr_29 /* 8007B69C 000785DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007B6A0 000785E0 7C 08 03 A6 */ mtlr r0 /* 8007B6A4 000785E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2744,7 +2744,7 @@ cBgW_NS_GetPolyInf2: /* 8007B828 00078768 7C 08 02 A6 */ mflr r0 /* 8007B82C 0007876C 90 01 00 24 */ stw r0, 0x24(r1) /* 8007B830 00078770 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B834 00078774 48 2E 69 A9 */ bl func_803621DC +/* 8007B834 00078774 48 2E 69 A9 */ bl _savegpr_29 /* 8007B838 00078778 7C 7D 1B 78 */ mr r29, r3 /* 8007B83C 0007877C 7C BE 2B 78 */ mr r30, r5 /* 8007B840 00078780 7C DF 33 78 */ mr r31, r6 @@ -2757,7 +2757,7 @@ cBgW_NS_GetPolyInf2: /* 8007B85C 0007879C 7F C0 00 38 */ and r0, r30, r0 /* 8007B860 000787A0 7C 03 FC 30 */ srw r3, r0, r31 /* 8007B864 000787A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007B868 000787A8 48 2E 69 C1 */ bl func_80362228 +/* 8007B868 000787A8 48 2E 69 C1 */ bl _restgpr_29 /* 8007B86C 000787AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007B870 000787B0 7C 08 03 A6 */ mtlr r0 /* 8007B874 000787B4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index a786ca23164..fc229c33dab 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -238,7 +238,7 @@ dBgS_Acch_NS_Init: /* 800761D0 00073110 7C 08 02 A6 */ mflr r0 /* 800761D4 00073114 90 01 00 24 */ stw r0, 0x24(r1) /* 800761D8 00073118 39 61 00 20 */ addi r11, r1, 0x20 -/* 800761DC 0007311C 48 2E C0 01 */ bl func_803621DC +/* 800761DC 0007311C 48 2E C0 01 */ bl _savegpr_29 /* 800761E0 00073120 7C 7D 1B 78 */ mr r29, r3 /* 800761E4 00073124 80 03 00 2C */ lwz r0, 0x2c(r3) /* 800761E8 00073128 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a @@ -262,7 +262,7 @@ lbl_80076224: /* 80076228 00073168 7C 1E 00 00 */ cmpw r30, r0 /* 8007622C 0007316C 41 80 FF D0 */ blt lbl_800761FC /* 80076230 00073170 39 61 00 20 */ addi r11, r1, 0x20 -/* 80076234 00073174 48 2E BF F5 */ bl func_80362228 +/* 80076234 00073174 48 2E BF F5 */ bl _restgpr_29 /* 80076238 00073178 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007623C 0007317C 7C 08 03 A6 */ mtlr r0 /* 80076240 00073180 38 21 00 20 */ addi r1, r1, 0x20 @@ -864,7 +864,7 @@ dBgS_Acch_NS_CrrPos: /* 80076AC8 00073A08 DB A1 00 A0 */ stfd f29, 0xa0(r1) /* 80076ACC 00073A0C F3 A1 00 A8 */ psq_st f29, 168(r1), 0, qr0 /* 80076AD0 00073A10 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80076AD4 00073A14 48 2E B7 09 */ bl func_803621DC +/* 80076AD4 00073A14 48 2E B7 09 */ bl _savegpr_29 /* 80076AD8 00073A18 7C 7E 1B 78 */ mr r30, r3 /* 80076ADC 00073A1C 7C 9F 23 78 */ mr r31, r4 /* 80076AE0 00073A20 80 A3 00 2C */ lwz r5, 0x2c(r3) @@ -1177,7 +1177,7 @@ lbl_80076F54: /* 80076F64 00073EA4 E3 A1 00 A8 */ psq_l f29, 168(r1), 0, qr0 /* 80076F68 00073EA8 CB A1 00 A0 */ lfd f29, 0xa0(r1) /* 80076F6C 00073EAC 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 80076F70 00073EB0 48 2E B2 B9 */ bl func_80362228 +/* 80076F70 00073EB0 48 2E B2 B9 */ bl _restgpr_29 /* 80076F74 00073EB4 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80076F78 00073EB8 7C 08 03 A6 */ mtlr r0 /* 80076F7C 00073EBC 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -1209,7 +1209,7 @@ dBgS_Acch_NS_SetWallCir: /* 80076FC4 00073F04 7C 08 02 A6 */ mflr r0 /* 80076FC8 00073F08 90 01 00 24 */ stw r0, 0x24(r1) /* 80076FCC 00073F0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80076FD0 00073F10 48 2E B2 0D */ bl func_803621DC +/* 80076FD0 00073F10 48 2E B2 0D */ bl _savegpr_29 /* 80076FD4 00073F14 7C 7D 1B 78 */ mr r29, r3 /* 80076FD8 00073F18 3B C0 00 00 */ li r30, 0 /* 80076FDC 00073F1C 3B E0 00 00 */ li r31, 0 @@ -1233,7 +1233,7 @@ lbl_80077018: /* 8007701C 00073F5C 7C 1E 00 00 */ cmpw r30, r0 /* 80077020 00073F60 41 80 FF C4 */ blt lbl_80076FE4 /* 80077024 00073F64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80077028 00073F68 48 2E B2 01 */ bl func_80362228 +/* 80077028 00073F68 48 2E B2 01 */ bl _restgpr_29 /* 8007702C 00073F6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80077030 00073F70 7C 08 03 A6 */ mtlr r0 /* 80077034 00073F74 38 21 00 20 */ addi r1, r1, 0x20 @@ -1429,7 +1429,7 @@ dBgS_Acch_NS_SetWallPolyIndex: /* 8007728C 000741CC 7C 08 02 A6 */ mflr r0 /* 80077290 000741D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80077294 000741D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80077298 000741D8 48 2E AF 45 */ bl func_803621DC +/* 80077298 000741D8 48 2E AF 45 */ bl _savegpr_29 /* 8007729C 000741DC 7C 7D 1B 78 */ mr r29, r3 /* 800772A0 000741E0 7C BE 2B 78 */ mr r30, r5 /* 800772A4 000741E4 80 03 00 8C */ lwz r0, 0x8c(r3) @@ -1444,7 +1444,7 @@ dBgS_Acch_NS_SetWallPolyIndex: /* 800772C8 00074208 7F C4 F3 78 */ mr r4, r30 /* 800772CC 0007420C 48 1F 0E D9 */ bl cBgS_PolyInfo_NS_SetPolyIndex /* 800772D0 00074210 39 61 00 20 */ addi r11, r1, 0x20 -/* 800772D4 00074214 48 2E AF 55 */ bl func_80362228 +/* 800772D4 00074214 48 2E AF 55 */ bl _restgpr_29 /* 800772D8 00074218 80 01 00 24 */ lwz r0, 0x24(r1) /* 800772DC 0007421C 7C 08 03 A6 */ mtlr r0 /* 800772E0 00074220 38 21 00 20 */ addi r1, r1, 0x20 @@ -1476,7 +1476,7 @@ dBgS_Acch_NS_CalcWallRR: /* 80077330 00074270 7C 08 02 A6 */ mflr r0 /* 80077334 00074274 90 01 00 24 */ stw r0, 0x24(r1) /* 80077338 00074278 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007733C 0007427C 48 2E AE A1 */ bl func_803621DC +/* 8007733C 0007427C 48 2E AE A1 */ bl _savegpr_29 /* 80077340 00074280 7C 7D 1B 78 */ mr r29, r3 /* 80077344 00074284 3B C0 00 00 */ li r30, 0 /* 80077348 00074288 3B E0 00 00 */ li r31, 0 @@ -1492,7 +1492,7 @@ lbl_80077364: /* 80077368 000742A8 7C 1E 00 00 */ cmpw r30, r0 /* 8007736C 000742AC 41 80 FF E4 */ blt lbl_80077350 /* 80077370 000742B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80077374 000742B4 48 2E AE B5 */ bl func_80362228 +/* 80077374 000742B4 48 2E AE B5 */ bl _restgpr_29 /* 80077378 000742B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007737C 000742BC 7C 08 03 A6 */ mtlr r0 /* 80077380 000742C0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index 4b1e5882426..1f3e4057eac 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -80,7 +80,7 @@ dBgWKCol_NS_initKCollision: /* 8007E808 0007B748 7C 08 02 A6 */ mflr r0 /* 8007E80C 0007B74C 90 01 00 24 */ stw r0, 0x24(r1) /* 8007E810 0007B750 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007E814 0007B754 48 2E 39 C9 */ bl func_803621DC +/* 8007E814 0007B754 48 2E 39 C9 */ bl _savegpr_29 /* 8007E818 0007B758 7C 7D 1B 78 */ mr r29, r3 /* 8007E81C 0007B75C 7C 9E 23 78 */ mr r30, r4 /* 8007E820 0007B760 7C BF 2B 78 */ mr r31, r5 @@ -90,7 +90,7 @@ dBgWKCol_NS_initKCollision: /* 8007E830 0007B770 7F E4 FB 78 */ mr r4, r31 /* 8007E834 0007B774 4B FF 58 89 */ bl dBgPlc_NS_setBase /* 8007E838 0007B778 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007E83C 0007B77C 48 2E 39 ED */ bl func_80362228 +/* 8007E83C 0007B77C 48 2E 39 ED */ bl _restgpr_29 /* 8007E840 0007B780 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007E844 0007B784 7C 08 03 A6 */ mtlr r0 /* 8007E848 0007B788 38 21 00 20 */ addi r1, r1, 0x20 @@ -133,7 +133,7 @@ dBgWKCol_NS_GetTriPla_X1_: /* 8007E8C4 0007B804 7C 08 02 A6 */ mflr r0 /* 8007E8C8 0007B808 90 01 00 34 */ stw r0, 0x34(r1) /* 8007E8CC 0007B80C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007E8D0 0007B810 48 2E 39 0D */ bl func_803621DC +/* 8007E8D0 0007B810 48 2E 39 0D */ bl _savegpr_29 /* 8007E8D4 0007B814 7C 7D 1B 78 */ mr r29, r3 /* 8007E8D8 0007B818 7C 9E 23 78 */ mr r30, r4 /* 8007E8DC 0007B81C 80 64 00 18 */ lwz r3, 0x18(r4) @@ -172,7 +172,7 @@ dBgWKCol_NS_GetTriPla_X1_: /* 8007E960 0007B8A0 D0 1D 00 0C */ stfs f0, 0xc(r29) /* 8007E964 0007B8A4 90 01 00 1C */ stw r0, 0x1c(r1) /* 8007E968 0007B8A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007E96C 0007B8AC 48 2E 38 BD */ bl func_80362228 +/* 8007E96C 0007B8AC 48 2E 38 BD */ bl _restgpr_29 /* 8007E970 0007B8B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007E974 0007B8B4 7C 08 03 A6 */ mtlr r0 /* 8007E978 0007B8B8 38 21 00 30 */ addi r1, r1, 0x30 @@ -341,7 +341,7 @@ dBgWKCol_NS_chkPolyThrough: /* 8007EBC8 0007BB08 7C 08 02 A6 */ mflr r0 /* 8007EBCC 0007BB0C 90 01 00 24 */ stw r0, 0x24(r1) /* 8007EBD0 0007BB10 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007EBD4 0007BB14 48 2E 36 09 */ bl func_803621DC +/* 8007EBD4 0007BB14 48 2E 36 09 */ bl _savegpr_29 /* 8007EBD8 0007BB18 7C 9D 23 78 */ mr r29, r4 /* 8007EBDC 0007BB1C 7C FE 3B 78 */ mr r30, r7 /* 8007EBE0 0007BB20 28 06 00 00 */ cmplwi r6, 0 @@ -506,7 +506,7 @@ lbl_8007EE18: /* 8007EE18 0007BD58 38 60 00 00 */ li r3, 0 lbl_8007EE1C: /* 8007EE1C 0007BD5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007EE20 0007BD60 48 2E 34 09 */ bl func_80362228 +/* 8007EE20 0007BD60 48 2E 34 09 */ bl _restgpr_29 /* 8007EE24 0007BD64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007EE28 0007BD68 7C 08 03 A6 */ mtlr r0 /* 8007EE2C 0007BD6C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/cc/d_cc_d.s b/asm/d/cc/d_cc_d.s index 46961a7a91f..39c6687a78d 100644 --- a/asm/d/cc/d_cc_d.s +++ b/asm/d/cc/d_cc_d.s @@ -311,7 +311,7 @@ dCcD_GObjInf: /* 80083A2C 0008096C 7C 08 02 A6 */ mflr r0 /* 80083A30 00080970 90 01 00 24 */ stw r0, 0x24(r1) /* 80083A34 00080974 39 61 00 20 */ addi r11, r1, 0x20 -/* 80083A38 00080978 48 2D E7 A5 */ bl func_803621DC +/* 80083A38 00080978 48 2D E7 A5 */ bl _savegpr_29 /* 80083A3C 0008097C 7C 7F 1B 78 */ mr r31, r3 /* 80083A40 00080980 7F FD FB 78 */ mr r29, r31 /* 80083A44 00080984 3C 80 80 3B */ lis r4, lbl_803AC2D8@ha @@ -391,7 +391,7 @@ dCcD_GObjInf: /* 80083B6C 00080AAC 90 1D 00 18 */ stw r0, 0x18(r29) /* 80083B70 00080AB0 7F E3 FB 78 */ mr r3, r31 /* 80083B74 00080AB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80083B78 00080AB8 48 2D E6 B1 */ bl func_80362228 +/* 80083B78 00080AB8 48 2D E6 B1 */ bl _restgpr_29 /* 80083B7C 00080ABC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80083B80 00080AC0 7C 08 03 A6 */ mtlr r0 /* 80083B84 00080AC4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index 58f3cd5c489..7f604649f45 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -607,7 +607,7 @@ lbl_80086724: /* 80086758 00083698 7C 08 02 A6 */ mflr r0 /* 8008675C 0008369C 90 01 00 34 */ stw r0, 0x34(r1) /* 80086760 000836A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086764 000836A4 48 2D BA 79 */ bl func_803621DC +/* 80086764 000836A4 48 2D BA 79 */ bl _savegpr_29 /* 80086768 000836A8 7C BD 2B 78 */ mr r29, r5 /* 8008676C 000836AC 7C DE 33 78 */ mr r30, r6 /* 80086770 000836B0 7C FF 3B 78 */ mr r31, r7 @@ -669,7 +669,7 @@ lbl_80086838: /* 8008683C 0008377C 7F E4 FB 78 */ mr r4, r31 /* 80086840 00083780 48 1E 7D 31 */ bl cM3d_CalcVecZAngle /* 80086844 00083784 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086848 00083788 48 2D B9 E1 */ bl func_80362228 +/* 80086848 00083788 48 2D B9 E1 */ bl _restgpr_29 /* 8008684C 0008378C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80086850 00083790 7C 08 03 A6 */ mtlr r0 /* 80086854 00083794 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/cc/mass/d_cc_mass_s.s b/asm/d/cc/mass/d_cc_mass_s.s index 96370c2e36f..9bfec0977ff 100644 --- a/asm/d/cc/mass/d_cc_mass_s.s +++ b/asm/d/cc/mass/d_cc_mass_s.s @@ -255,7 +255,7 @@ dCcMassS_Mng_NS_Ct: /* 80085638 00082578 90 01 00 24 */ stw r0, 0x24(r1) /* 8008563C 0008257C DB E1 00 18 */ stfd f31, 0x18(r1) /* 80085640 00082580 39 61 00 18 */ addi r11, r1, 0x18 -/* 80085644 00082584 48 2D CB 99 */ bl func_803621DC +/* 80085644 00082584 48 2D CB 99 */ bl _savegpr_29 /* 80085648 00082588 7C 7D 1B 78 */ mr r29, r3 /* 8008564C 0008258C FF E0 10 90 */ fmr f31, f2 /* 80085650 00082590 7C 9E 23 78 */ mr r30, r4 @@ -269,7 +269,7 @@ dCcMassS_Mng_NS_Ct: /* 80085670 000825B0 9B FD 02 01 */ stb r31, 0x201(r29) /* 80085674 000825B4 CB E1 00 18 */ lfd f31, 0x18(r1) /* 80085678 000825B8 39 61 00 18 */ addi r11, r1, 0x18 -/* 8008567C 000825BC 48 2D CB AD */ bl func_80362228 +/* 8008567C 000825BC 48 2D CB AD */ bl _restgpr_29 /* 80085680 000825C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80085684 000825C4 7C 08 03 A6 */ mtlr r0 /* 80085688 000825C8 38 21 00 20 */ addi r1, r1, 0x20 @@ -281,7 +281,7 @@ dCcMassS_Mng_NS_Prepare: /* 80085694 000825D4 7C 08 02 A6 */ mflr r0 /* 80085698 000825D8 90 01 00 44 */ stw r0, 0x44(r1) /* 8008569C 000825DC 39 61 00 40 */ addi r11, r1, 0x40 -/* 800856A0 000825E0 48 2D CB 3D */ bl func_803621DC +/* 800856A0 000825E0 48 2D CB 3D */ bl _savegpr_29 /* 800856A4 000825E4 7C 7F 1B 78 */ mr r31, r3 /* 800856A8 000825E8 3C 60 80 3A */ lis r3, lbl_803A7218@ha /* 800856AC 000825EC 38 03 72 18 */ addi r0, r3, lbl_803A7218@l @@ -417,7 +417,7 @@ lbl_8008585C: /* 8008588C 000827CC 38 03 72 18 */ addi r0, r3, lbl_803A7218@l /* 80085890 000827D0 90 01 00 20 */ stw r0, 0x20(r1) /* 80085894 000827D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80085898 000827D8 48 2D C9 91 */ bl func_80362228 +/* 80085898 000827D8 48 2D C9 91 */ bl _restgpr_29 /* 8008589C 000827DC 80 01 00 44 */ lwz r0, 0x44(r1) /* 800858A0 000827E0 7C 08 03 A6 */ mtlr r0 /* 800858A4 000827E4 38 21 00 40 */ addi r1, r1, 0x40 @@ -717,7 +717,7 @@ dCcMassS_Mng_NS_Clear: /* 80085CF4 00082C34 7C 08 02 A6 */ mflr r0 /* 80085CF8 00082C38 90 01 00 24 */ stw r0, 0x24(r1) /* 80085CFC 00082C3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80085D00 00082C40 48 2D C4 DD */ bl func_803621DC +/* 80085D00 00082C40 48 2D C4 DD */ bl _savegpr_29 /* 80085D04 00082C44 7C 7D 1B 78 */ mr r29, r3 /* 80085D08 00082C48 3B E0 00 00 */ li r31, 0 /* 80085D0C 00082C4C 93 E3 00 40 */ stw r31, 0x40(r3) @@ -752,7 +752,7 @@ lbl_80085D3C: /* 80085D78 00082CB8 38 00 00 04 */ li r0, 4 /* 80085D7C 00082CBC 98 1D 02 01 */ stb r0, 0x201(r29) /* 80085D80 00082CC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80085D84 00082CC4 48 2D C4 A5 */ bl func_80362228 +/* 80085D84 00082CC4 48 2D C4 A5 */ bl _restgpr_29 /* 80085D88 00082CC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80085D8C 00082CCC 7C 08 03 A6 */ mtlr r0 /* 80085D90 00082CD0 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 64dd98f8416..3bd269a54c0 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -134,7 +134,7 @@ daSus_c_NS_data_c_NS_check_X1_: /* 800310CC 0002E00C 7C 08 02 A6 */ mflr r0 /* 800310D0 0002E010 90 01 00 24 */ stw r0, 0x24(r1) /* 800310D4 0002E014 39 61 00 20 */ addi r11, r1, 0x20 -/* 800310D8 0002E018 48 33 11 05 */ bl func_803621DC +/* 800310D8 0002E018 48 33 11 05 */ bl _savegpr_29 /* 800310DC 0002E01C 7C 7D 1B 78 */ mr r29, r3 /* 800310E0 0002E020 7C 9E 23 78 */ mr r30, r4 /* 800310E4 0002E024 88 03 00 03 */ lbz r0, 3(r3) @@ -163,7 +163,7 @@ lbl_80031134: /* 80031134 0002E074 7F E3 FB 78 */ mr r3, r31 lbl_80031138: /* 80031138 0002E078 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003113C 0002E07C 48 33 10 ED */ bl func_80362228 +/* 8003113C 0002E07C 48 33 10 ED */ bl _restgpr_29 /* 80031140 0002E080 80 01 00 24 */ lwz r0, 0x24(r1) /* 80031144 0002E084 7C 08 03 A6 */ mtlr r0 /* 80031148 0002E088 38 21 00 20 */ addi r1, r1, 0x20 @@ -249,7 +249,7 @@ lbl_80031234: /* 8003124C 0002E18C 7C 08 02 A6 */ mflr r0 /* 80031250 0002E190 90 01 00 24 */ stw r0, 0x24(r1) /* 80031254 0002E194 39 61 00 20 */ addi r11, r1, 0x20 -/* 80031258 0002E198 48 33 0F 85 */ bl func_803621DC +/* 80031258 0002E198 48 33 0F 85 */ bl _savegpr_29 /* 8003125C 0002E19C 7C 7F 1B 78 */ mr r31, r3 /* 80031260 0002E1A0 7C 8C 23 78 */ mr r12, r4 /* 80031264 0002E1A4 7C AB 2B 78 */ mr r11, r5 @@ -340,7 +340,7 @@ lbl_80031394: /* 800313A0 0002E2E0 38 60 00 00 */ li r3, 0 lbl_800313A4: /* 800313A4 0002E2E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800313A8 0002E2E8 48 33 0E 81 */ bl func_80362228 +/* 800313A8 0002E2E8 48 33 0E 81 */ bl _restgpr_29 /* 800313AC 0002E2EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800313B0 0002E2F0 7C 08 03 A6 */ mtlr r0 /* 800313B4 0002E2F4 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 dc188209d51..16161df8228 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -197,7 +197,7 @@ dComIfG_play_c_NS_getLayerNo_common_common: /* 8002B438 00028378 7C 08 02 A6 */ mflr r0 /* 8002B43C 0002837C 90 01 00 24 */ stw r0, 0x24(r1) /* 8002B440 00028380 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002B444 00028384 48 33 6D 99 */ bl func_803621DC +/* 8002B444 00028384 48 33 6D 99 */ bl _savegpr_29 /* 8002B448 00028388 7C 7F 1B 78 */ mr r31, r3 /* 8002B44C 0002838C 7C 9E 23 78 */ mr r30, r4 /* 8002B450 00028390 90 A1 00 08 */ stw r5, 8(r1) @@ -1650,7 +1650,7 @@ lbl_8002C92C: lbl_8002C934: /* 8002C934 00029874 80 61 00 08 */ lwz r3, 8(r1) /* 8002C938 00029878 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002C93C 0002987C 48 33 58 ED */ bl func_80362228 +/* 8002C93C 0002987C 48 33 58 ED */ bl _restgpr_29 /* 8002C940 00029880 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002C944 00029884 7C 08 03 A6 */ mtlr r0 /* 8002C948 00029888 38 21 00 20 */ addi r1, r1, 0x20 @@ -3136,7 +3136,7 @@ dComIfGs_setSelectItemIndex: /* 8002DCDC 0002AC1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DCE0 0002AC20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DCE4 0002AC24 7F E4 FB 78 */ mr r4, r31 -/* 8002DCE8 0002AC28 48 00 4D 61 */ bl dSv_player_status_a_c_NS_setSelectItemIndex +/* 8002DCE8 0002AC28 48 00 4D 61 */ bl setSelectItemIndex__21dSv_player_status_a_cFiUc /* 8002DCEC 0002AC2C 7F E3 FB 78 */ mr r3, r31 /* 8002DCF0 0002AC30 48 00 01 05 */ bl dComIfGp_setSelectItem /* 8002DCF4 0002AC34 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3155,7 +3155,7 @@ dComIfGs_setMixItemIndex: /* 8002DD1C 0002AC5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DD20 0002AC60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DD24 0002AC64 7C 04 03 78 */ mr r4, r0 -/* 8002DD28 0002AC68 48 00 4D 51 */ bl dSv_player_status_a_c_NS_setMixItemIndex +/* 8002DD28 0002AC68 48 00 4D 51 */ bl setMixItemIndex__21dSv_player_status_a_cFiUc /* 8002DD2C 0002AC6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002DD30 0002AC70 7C 08 03 A6 */ mtlr r0 /* 8002DD34 0002AC74 38 21 00 10 */ addi r1, r1, 0x10 @@ -3172,7 +3172,7 @@ dComIfGs_getSelectMixItemNoArrowIndex: /* 8002DD54 0002AC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DD58 0002AC98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DD5C 0002AC9C 7F C4 F3 78 */ mr r4, r30 -/* 8002DD60 0002ACA0 48 00 4C FD */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002DD60 0002ACA0 48 00 4C FD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DD64 0002ACA4 7C 7F 1B 78 */ mr r31, r3 /* 8002DD68 0002ACA8 7F C3 F3 78 */ mr r3, r30 /* 8002DD6C 0002ACAC 48 00 00 5D */ bl dComIfGs_getMixItemIndex @@ -3210,7 +3210,7 @@ dComIfGs_getMixItemIndex: /* 8002DDD4 0002AD14 7C 64 1B 78 */ mr r4, r3 /* 8002DDD8 0002AD18 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DDDC 0002AD1C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8002DDE0 0002AD20 48 00 4C AD */ bl dSv_player_status_a_c_NS_getMixItemIndex +/* 8002DDE0 0002AD20 48 00 4C AD */ bl getMixItemIndex__21dSv_player_status_a_cCFi /* 8002DDE4 0002AD24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002DDE8 0002AD28 7C 08 03 A6 */ mtlr r0 /* 8002DDEC 0002AD2C 38 21 00 10 */ addi r1, r1, 0x10 @@ -3228,14 +3228,14 @@ dComIfGp_setSelectItem: /* 8002DE10 0002AD50 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DE14 0002AD54 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DE18 0002AD58 7F E4 FB 78 */ mr r4, r31 -/* 8002DE1C 0002AD5C 48 00 4C 41 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002DE1C 0002AD5C 48 00 4C 41 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DE20 0002AD60 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002DE24 0002AD64 28 00 00 FF */ cmplwi r0, 0xff /* 8002DE28 0002AD68 41 82 00 40 */ beq lbl_8002DE68 /* 8002DE2C 0002AD6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DE30 0002AD70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DE34 0002AD74 7F E4 FB 78 */ mr r4, r31 -/* 8002DE38 0002AD78 48 00 4C 25 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002DE38 0002AD78 48 00 4C 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DE3C 0002AD7C 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8002DE40 0002AD80 38 04 61 C0 */ addi r0, r4, lbl_804061C0@l /* 8002DE44 0002AD84 7C 80 FA 14 */ add r4, r0, r31 @@ -3258,14 +3258,14 @@ lbl_8002DE80: /* 8002DE80 0002ADC0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DE84 0002ADC4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DE88 0002ADC8 7F E4 FB 78 */ mr r4, r31 -/* 8002DE8C 0002ADCC 48 00 4B D1 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002DE8C 0002ADCC 48 00 4B D1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DE90 0002ADD0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002DE94 0002ADD4 28 00 00 FF */ cmplwi r0, 0xff /* 8002DE98 0002ADD8 41 82 00 5C */ beq lbl_8002DEF4 /* 8002DE9C 0002ADDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DEA0 0002ADE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002DEA4 0002ADE4 7F E4 FB 78 */ mr r4, r31 -/* 8002DEA8 0002ADE8 48 00 4B B5 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002DEA8 0002ADE8 48 00 4B B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DEAC 0002ADEC 7C 60 1B 78 */ mr r0, r3 /* 8002DEB0 0002ADF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002DEB4 0002ADF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3843,7 +3843,7 @@ lbl_8002E638: /* 8002E640 0002B580 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002E644 0002B584 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002E648 0002B588 7F E4 FB 78 */ mr r4, r31 -/* 8002E64C 0002B58C 48 00 44 11 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002E64C 0002B58C 48 00 44 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E650 0002B590 7C 64 1B 78 */ mr r4, r3 /* 8002E654 0002B594 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002E658 0002B598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3961,7 +3961,7 @@ lbl_8002E7D0: /* 8002E7D8 0002B718 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002E7DC 0002B71C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002E7E0 0002B720 7F 84 E3 78 */ mr r4, r28 -/* 8002E7E4 0002B724 48 00 42 79 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002E7E4 0002B724 48 00 42 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E7E8 0002B728 38 03 FF F5 */ addi r0, r3, -11 /* 8002E7EC 0002B72C 54 1C 06 3E */ clrlwi r28, r0, 0x18 /* 8002E7F0 0002B730 4B FF FD C9 */ bl dComIfGs_getBottleMax @@ -4029,7 +4029,7 @@ lbl_8002E8C0: /* 8002E8C8 0002B808 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002E8CC 0002B80C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002E8D0 0002B810 7F C4 F3 78 */ mr r4, r30 -/* 8002E8D4 0002B814 48 00 41 89 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8002E8D4 0002B814 48 00 41 89 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E8D8 0002B818 7C 64 1B 78 */ mr r4, r3 /* 8002E8DC 0002B81C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8002E8E0 0002B820 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -4582,7 +4582,7 @@ dComIfGs_setKeyNum: /* 8002F044 0002BF84 7C 08 02 A6 */ mflr r0 /* 8002F048 0002BF88 90 01 00 24 */ stw r0, 0x24(r1) /* 8002F04C 0002BF8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F050 0002BF90 48 33 31 8D */ bl func_803621DC +/* 8002F050 0002BF90 48 33 31 8D */ bl _savegpr_29 /* 8002F054 0002BF94 7C 7D 1B 78 */ mr r29, r3 /* 8002F058 0002BF98 7C 9E 23 78 */ mr r30, r4 /* 8002F05C 0002BF9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4614,7 +4614,7 @@ lbl_8002F0B4: /* 8002F0C0 0002C000 7C 60 22 14 */ add r3, r0, r4 /* 8002F0C4 0002C004 9B C3 02 0C */ stb r30, 0x20c(r3) /* 8002F0C8 0002C008 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F0CC 0002C00C 48 33 31 5D */ bl func_80362228 +/* 8002F0CC 0002C00C 48 33 31 5D */ bl _restgpr_29 /* 8002F0D0 0002C010 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002F0D4 0002C014 7C 08 03 A6 */ mtlr r0 /* 8002F0D8 0002C018 38 21 00 20 */ addi r1, r1, 0x20 @@ -4951,7 +4951,7 @@ dComIfGp_world_dark_get: /* 8002F530 0002C470 7C 08 02 A6 */ mflr r0 /* 8002F534 0002C474 90 01 00 24 */ stw r0, 0x24(r1) /* 8002F538 0002C478 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F53C 0002C47C 48 33 2C A1 */ bl func_803621DC +/* 8002F53C 0002C47C 48 33 2C A1 */ bl _savegpr_29 /* 8002F540 0002C480 7C 7D 1B 78 */ mr r29, r3 /* 8002F544 0002C484 7C 9E 23 78 */ mr r30, r4 /* 8002F548 0002C488 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4984,7 +4984,7 @@ lbl_8002F5A4: /* 8002F5A4 0002C4E4 38 60 00 00 */ li r3, 0 lbl_8002F5A8: /* 8002F5A8 0002C4E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F5AC 0002C4EC 48 33 2C 7D */ bl func_80362228 +/* 8002F5AC 0002C4EC 48 33 2C 7D */ bl _restgpr_29 /* 8002F5B0 0002C4F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002F5B4 0002C4F4 7C 08 03 A6 */ mtlr r0 /* 8002F5B8 0002C4F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5059,7 +5059,7 @@ lbl_8002F698: /* 8002F6B4 0002C5F4 7C 08 02 A6 */ mflr r0 /* 8002F6B8 0002C5F8 90 01 00 24 */ stw r0, 0x24(r1) /* 8002F6BC 0002C5FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F6C0 0002C600 48 33 2B 1D */ bl func_803621DC +/* 8002F6C0 0002C600 48 33 2B 1D */ bl _savegpr_29 /* 8002F6C4 0002C604 7C 7D 1B 78 */ mr r29, r3 /* 8002F6C8 0002C608 7C 9E 23 78 */ mr r30, r4 /* 8002F6CC 0002C60C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -5084,7 +5084,7 @@ lbl_8002F710: /* 8002F710 0002C650 38 60 00 00 */ li r3, 0 lbl_8002F714: /* 8002F714 0002C654 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002F718 0002C658 48 33 2B 11 */ bl func_80362228 +/* 8002F718 0002C658 48 33 2B 11 */ bl _restgpr_29 /* 8002F71C 0002C65C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002F720 0002C660 7C 08 03 A6 */ mtlr r0 /* 8002F724 0002C664 38 21 00 20 */ addi r1, r1, 0x20 @@ -5392,7 +5392,7 @@ dComLbG_PhaseHandler: /* 8002FB24 0002CA64 7C 08 02 A6 */ mflr r0 /* 8002FB28 0002CA68 90 01 00 24 */ stw r0, 0x24(r1) /* 8002FB2C 0002CA6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FB30 0002CA70 48 33 26 AD */ bl func_803621DC +/* 8002FB30 0002CA70 48 33 26 AD */ bl _savegpr_29 /* 8002FB34 0002CA74 7C 7D 1B 78 */ mr r29, r3 /* 8002FB38 0002CA78 7C 9E 23 78 */ mr r30, r4 /* 8002FB3C 0002CA7C 7C BF 2B 78 */ mr r31, r5 @@ -5409,7 +5409,7 @@ lbl_8002FB58: /* 8002FB64 0002CAA4 4B FF FF BD */ bl dComLbG_PhaseHandler lbl_8002FB68: /* 8002FB68 0002CAA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FB6C 0002CAAC 48 33 26 BD */ bl func_80362228 +/* 8002FB6C 0002CAAC 48 33 26 BD */ bl _restgpr_29 /* 8002FB70 0002CAB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002FB74 0002CAB4 7C 08 03 A6 */ mtlr r0 /* 8002FB78 0002CAB8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5700,7 +5700,7 @@ dCcS_NS_dtor: /* 8002FF44 0002CE84 7C 08 02 A6 */ mflr r0 /* 8002FF48 0002CE88 90 01 00 24 */ stw r0, 0x24(r1) /* 8002FF4C 0002CE8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002FF50 0002CE90 48 33 22 8D */ bl func_803621DC +/* 8002FF50 0002CE90 48 33 22 8D */ bl _savegpr_29 /* 8002FF54 0002CE94 7C 7E 1B 79 */ or. r30, r3, r3 /* 8002FF58 0002CE98 7C 9F 23 78 */ mr r31, r4 /* 8002FF5C 0002CE9C 41 82 01 7C */ beq lbl_800300D8 @@ -5811,7 +5811,7 @@ lbl_800300C8: lbl_800300D8: /* 800300D8 0002D018 7F C3 F3 78 */ mr r3, r30 /* 800300DC 0002D01C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800300E0 0002D020 48 33 21 49 */ bl func_80362228 +/* 800300E0 0002D020 48 33 21 49 */ bl _restgpr_29 /* 800300E4 0002D024 80 01 00 24 */ lwz r0, 0x24(r1) /* 800300E8 0002D028 7C 08 03 A6 */ mtlr r0 /* 800300EC 0002D02C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5923,7 +5923,7 @@ dComIfG_inf_c: /* 80030248 0002D188 7C 08 02 A6 */ mflr r0 /* 8003024C 0002D18C 90 01 00 24 */ stw r0, 0x24(r1) /* 80030250 0002D190 39 61 00 20 */ addi r11, r1, 0x20 -/* 80030254 0002D194 48 33 1F 89 */ bl func_803621DC +/* 80030254 0002D194 48 33 1F 89 */ bl _savegpr_29 /* 80030258 0002D198 7C 7F 1B 78 */ mr r31, r3 /* 8003025C 0002D19C 7C 7D 1B 78 */ mr r29, r3 /* 80030260 0002D1A0 7C 7E 1B 78 */ mr r30, r3 @@ -6113,7 +6113,7 @@ dComIfG_inf_c: /* 800304A8 0002D3E8 4B FF C7 3D */ bl dComIfG_inf_c_NS_ct /* 800304AC 0002D3EC 7F E3 FB 78 */ mr r3, r31 /* 800304B0 0002D3F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800304B4 0002D3F4 48 33 1D 75 */ bl func_80362228 +/* 800304B4 0002D3F4 48 33 1D 75 */ bl _restgpr_29 /* 800304B8 0002D3F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800304BC 0002D3FC 7C 08 03 A6 */ mtlr r0 /* 800304C0 0002D400 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_attention.s b/asm/d/d_attention.s index 829a3dd36b5..4001968a343 100644 --- a/asm/d/d_attention.s +++ b/asm/d/d_attention.s @@ -1494,7 +1494,7 @@ dAttention_c_NS_SelectAttention: /* 80071494 0006E3D4 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80071498 0006E3D8 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8007149C 0006E3DC 39 61 00 50 */ addi r11, r1, 0x50 -/* 800714A0 0006E3E0 48 2F 0D 3D */ bl func_803621DC +/* 800714A0 0006E3E0 48 2F 0D 3D */ bl _savegpr_29 /* 800714A4 0006E3E4 7C 7E 1B 78 */ mr r30, r3 /* 800714A8 0006E3E8 7C 9F 23 78 */ mr r31, r4 /* 800714AC 0006E3EC 80 63 00 00 */ lwz r3, 0(r3) @@ -1614,7 +1614,7 @@ lbl_8007165C: /* 8007165C 0006E59C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 80071660 0006E5A0 CB E1 00 50 */ lfd f31, 0x50(r1) /* 80071664 0006E5A4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80071668 0006E5A8 48 2F 0B C1 */ bl func_80362228 +/* 80071668 0006E5A8 48 2F 0B C1 */ bl _restgpr_29 /* 8007166C 0006E5AC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80071670 0006E5B0 7C 08 03 A6 */ mtlr r0 /* 80071674 0006E5B4 38 21 00 60 */ addi r1, r1, 0x60 @@ -3171,7 +3171,7 @@ dAttention_c_NS_Draw: /* 80072BD8 0006FB18 7C 08 02 A6 */ mflr r0 /* 80072BDC 0006FB1C 90 01 00 54 */ stw r0, 0x54(r1) /* 80072BE0 0006FB20 39 61 00 50 */ addi r11, r1, 0x50 -/* 80072BE4 0006FB24 48 2E F5 F9 */ bl func_803621DC +/* 80072BE4 0006FB24 48 2E F5 F9 */ bl _savegpr_29 /* 80072BE8 0006FB28 7C 7F 1B 78 */ mr r31, r3 /* 80072BEC 0006FB2C A0 03 04 C8 */ lhz r0, 0x4c8(r3) /* 80072BF0 0006FB30 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -3280,7 +3280,7 @@ lbl_80072D58: /* 80072D64 0006FCA4 48 00 05 4D */ bl dAttDraw_c_NS_draw lbl_80072D68: /* 80072D68 0006FCA8 39 61 00 50 */ addi r11, r1, 0x50 -/* 80072D6C 0006FCAC 48 2E F4 BD */ bl func_80362228 +/* 80072D6C 0006FCAC 48 2E F4 BD */ bl _restgpr_29 /* 80072D70 0006FCB0 80 01 00 54 */ lwz r0, 0x54(r1) /* 80072D74 0006FCB4 7C 08 03 A6 */ mtlr r0 /* 80072D78 0006FCB8 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index 6465c02178d..b26e400da1b 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -3536,7 +3536,7 @@ dCamera_c_NS_NotRun: /* 80162D44 0015FC84 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80162D48 0015FC88 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80162D4C 0015FC8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80162D50 0015FC90 48 1F F4 8D */ bl func_803621DC +/* 80162D50 0015FC90 48 1F F4 8D */ bl _savegpr_29 /* 80162D54 0015FC94 7C 7E 1B 78 */ mr r30, r3 /* 80162D58 0015FC98 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80162D5C 0015FC9C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3692,7 +3692,7 @@ lbl_80162F44: /* 80162F98 0015FED8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80162F9C 0015FEDC CB E1 00 20 */ lfd f31, 0x20(r1) /* 80162FA0 0015FEE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80162FA4 0015FEE4 48 1F F2 85 */ bl func_80362228 +/* 80162FA4 0015FEE4 48 1F F2 85 */ bl _restgpr_29 /* 80162FA8 0015FEE8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80162FAC 0015FEEC 7C 08 03 A6 */ mtlr r0 /* 80162FB0 0015FEF0 38 21 00 30 */ addi r1, r1, 0x30 @@ -5346,7 +5346,7 @@ dCamera_c_NS_onStyleChange: /* 801646A0 001615E0 7C 08 02 A6 */ mflr r0 /* 801646A4 001615E4 90 01 00 24 */ stw r0, 0x24(r1) /* 801646A8 001615E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801646AC 001615EC 48 1F DB 31 */ bl func_803621DC +/* 801646AC 001615EC 48 1F DB 31 */ bl _savegpr_29 /* 801646B0 001615F0 7C 7F 1B 78 */ mr r31, r3 /* 801646B4 001615F4 7C BD 2B 78 */ mr r29, r5 /* 801646B8 001615F8 38 00 00 00 */ li r0, 0 @@ -5411,7 +5411,7 @@ lbl_8016478C: lbl_80164794: /* 80164794 001616D4 38 60 00 01 */ li r3, 1 /* 80164798 001616D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8016479C 001616DC 48 1F DA 8D */ bl func_80362228 +/* 8016479C 001616DC 48 1F DA 8D */ bl _restgpr_29 /* 801647A0 001616E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801647A4 001616E4 7C 08 03 A6 */ mtlr r0 /* 801647A8 001616E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5423,7 +5423,7 @@ dCamera_c_NS_onRoomChange: /* 801647B4 001616F4 7C 08 02 A6 */ mflr r0 /* 801647B8 001616F8 90 01 00 24 */ stw r0, 0x24(r1) /* 801647BC 001616FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801647C0 00161700 48 1F DA 1D */ bl func_803621DC +/* 801647C0 00161700 48 1F DA 1D */ bl _savegpr_29 /* 801647C4 00161704 7C 7D 1B 78 */ mr r29, r3 /* 801647C8 00161708 7C 9E 23 78 */ mr r30, r4 /* 801647CC 0016170C 93 C3 00 04 */ stw r30, 4(r3) @@ -5467,7 +5467,7 @@ lbl_8016483C: lbl_8016485C: /* 8016485C 0016179C 38 60 00 01 */ li r3, 1 /* 80164860 001617A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80164864 001617A4 48 1F D9 C5 */ bl func_80362228 +/* 80164864 001617A4 48 1F D9 C5 */ bl _restgpr_29 /* 80164868 001617A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8016486C 001617AC 7C 08 03 A6 */ mtlr r0 /* 80164870 001617B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -9080,7 +9080,7 @@ dCamera_c_NS_radiusActorInSight_X1_: /* 80167C30 00164B70 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80167C34 00164B74 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80167C38 00164B78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80167C3C 00164B7C 48 1F A5 A1 */ bl func_803621DC +/* 80167C3C 00164B7C 48 1F A5 A1 */ bl _savegpr_29 /* 80167C40 00164B80 7C 7D 1B 78 */ mr r29, r3 /* 80167C44 00164B84 7C 9E 23 78 */ mr r30, r4 /* 80167C48 00164B88 7C DF 33 78 */ mr r31, r6 @@ -9107,7 +9107,7 @@ lbl_80167C98: /* 80167C98 00164BD8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80167C9C 00164BDC CB E1 00 20 */ lfd f31, 0x20(r1) /* 80167CA0 00164BE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80167CA4 00164BE4 48 1F A5 85 */ bl func_80362228 +/* 80167CA4 00164BE4 48 1F A5 85 */ bl _restgpr_29 /* 80167CA8 00164BE8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80167CAC 00164BEC 7C 08 03 A6 */ mtlr r0 /* 80167CB0 00164BF0 38 21 00 30 */ addi r1, r1, 0x30 @@ -24946,7 +24946,7 @@ lbl_80176528: /* 8017685C 0017379C DA 81 01 30 */ stfd f20, 0x130(r1) /* 80176860 001737A0 F2 81 01 38 */ psq_st f20, 312(r1), 0, qr0 /* 80176864 001737A4 39 61 01 30 */ addi r11, r1, 0x130 -/* 80176868 001737A8 48 1E B9 75 */ bl func_803621DC +/* 80176868 001737A8 48 1E B9 75 */ bl _savegpr_29 /* 8017686C 001737AC 7C 7D 1B 78 */ mr r29, r3 /* 80176870 001737B0 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 80176874 001737B4 1F E4 00 78 */ mulli r31, r4, 0x78 @@ -25310,7 +25310,7 @@ lbl_80176D78: /* 80176DD0 00173D10 E2 81 01 38 */ psq_l f20, 312(r1), 0, qr0 /* 80176DD4 00173D14 CA 81 01 30 */ lfd f20, 0x130(r1) /* 80176DD8 00173D18 39 61 01 30 */ addi r11, r1, 0x130 -/* 80176DDC 00173D1C 48 1E B4 4D */ bl func_80362228 +/* 80176DDC 00173D1C 48 1E B4 4D */ bl _restgpr_29 /* 80176DE0 00173D20 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 80176DE4 00173D24 7C 08 03 A6 */ mtlr r0 /* 80176DE8 00173D28 38 21 01 F0 */ addi r1, r1, 0x1f0 @@ -32513,7 +32513,7 @@ _unnamed_d_camera_cpp__NS_sAngleY: /* 8017D9A0 0017A8E0 DB 81 00 F0 */ stfd f28, 0xf0(r1) /* 8017D9A4 0017A8E4 F3 81 00 F8 */ psq_st f28, 248(r1), 0, qr0 /* 8017D9A8 0017A8E8 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8017D9AC 0017A8EC 48 1E 48 31 */ bl func_803621DC +/* 8017D9AC 0017A8EC 48 1E 48 31 */ bl _savegpr_29 /* 8017D9B0 0017A8F0 7C 7D 1B 78 */ mr r29, r3 /* 8017D9B4 0017A8F4 7C 9E 23 78 */ mr r30, r4 /* 8017D9B8 0017A8F8 C3 E3 09 BC */ lfs f31, 0x9bc(r3) @@ -32911,7 +32911,7 @@ lbl_8017DF24: /* 8017DF8C 0017AECC E3 81 00 F8 */ psq_l f28, 248(r1), 0, qr0 /* 8017DF90 0017AED0 CB 81 00 F0 */ lfd f28, 0xf0(r1) /* 8017DF94 0017AED4 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8017DF98 0017AED8 48 1E 42 91 */ bl func_80362228 +/* 8017DF98 0017AED8 48 1E 42 91 */ bl _restgpr_29 /* 8017DF9C 0017AEDC 80 01 01 34 */ lwz r0, 0x134(r1) /* 8017DFA0 0017AEE0 7C 08 03 A6 */ mtlr r0 /* 8017DFA4 0017AEE4 38 21 01 30 */ addi r1, r1, 0x130 @@ -34597,7 +34597,7 @@ dCamera_c_NS_eventCamera: /* 8017F82C 0017C76C 7C 08 02 A6 */ mflr r0 /* 8017F830 0017C770 90 01 02 54 */ stw r0, 0x254(r1) /* 8017F834 0017C774 39 61 02 50 */ addi r11, r1, 0x250 -/* 8017F838 0017C778 48 1E 29 A5 */ bl func_803621DC +/* 8017F838 0017C778 48 1E 29 A5 */ bl _savegpr_29 /* 8017F83C 0017C77C 7C 7D 1B 78 */ mr r29, r3 /* 8017F840 0017C780 3C 60 80 3C */ lis r3, lbl_803BA160@ha /* 8017F844 0017C784 3B E3 A1 60 */ addi r31, r3, lbl_803BA160@l @@ -35480,7 +35480,7 @@ lbl_801804F0: /* 801804F0 0017D430 38 60 00 01 */ li r3, 1 lbl_801804F4: /* 801804F4 0017D434 39 61 02 50 */ addi r11, r1, 0x250 -/* 801804F8 0017D438 48 1E 1D 31 */ bl func_80362228 +/* 801804F8 0017D438 48 1E 1D 31 */ bl _restgpr_29 /* 801804FC 0017D43C 80 01 02 54 */ lwz r0, 0x254(r1) /* 80180500 0017D440 7C 08 03 A6 */ mtlr r0 /* 80180504 0017D444 38 21 02 50 */ addi r1, r1, 0x250 @@ -36754,7 +36754,7 @@ view_setup: /* 8018170C 0017E64C 7C 08 02 A6 */ mflr r0 /* 80181710 0017E650 90 01 00 24 */ stw r0, 0x24(r1) /* 80181714 0017E654 39 61 00 20 */ addi r11, r1, 0x20 -/* 80181718 0017E658 48 1E 0A C5 */ bl func_803621DC +/* 80181718 0017E658 48 1E 0A C5 */ bl _savegpr_29 /* 8018171C 0017E65C 7C 7D 1B 78 */ mr r29, r3 /* 80181720 0017E660 4B E9 CB E9 */ bl fopCamM_GetParam /* 80181724 0017E664 3C 80 80 40 */ lis r4, lbl_804061C0@ha @@ -36810,7 +36810,7 @@ lbl_801817DC: /* 801817E4 0017E724 C0 7D 00 C8 */ lfs f3, 0xc8(r29) /* 801817E8 0017E728 4B E9 3A A5 */ bl mDoLib_clipper_NS_setup /* 801817EC 0017E72C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801817F0 0017E730 48 1E 0A 39 */ bl func_80362228 +/* 801817F0 0017E730 48 1E 0A 39 */ bl _restgpr_29 /* 801817F4 0017E734 80 01 00 24 */ lwz r0, 0x24(r1) /* 801817F8 0017E738 7C 08 03 A6 */ mtlr r0 /* 801817FC 0017E73C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index 10d6ece5c2f..4f978f668e3 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -1271,7 +1271,7 @@ dDemo_object_c_NS_appendActor: /* 80038FC4 00035F04 7C 08 02 A6 */ mflr r0 /* 80038FC8 00035F08 90 01 00 24 */ stw r0, 0x24(r1) /* 80038FCC 00035F0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80038FD0 00035F10 48 32 92 0D */ bl func_803621DC +/* 80038FD0 00035F10 48 32 92 0D */ bl _savegpr_29 /* 80038FD4 00035F14 7C 7D 1B 78 */ mr r29, r3 /* 80038FD8 00035F18 7C 9E 23 78 */ mr r30, r4 /* 80038FDC 00035F1C 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) @@ -1318,7 +1318,7 @@ lbl_8003906C: /* 8003906C 00035FAC 7F E3 FB 78 */ mr r3, r31 lbl_80039070: /* 80039070 00035FB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80039074 00035FB4 48 32 91 B5 */ bl func_80362228 +/* 80039074 00035FB4 48 32 91 B5 */ bl _restgpr_29 /* 80039078 00035FB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003907C 00035FBC 7C 08 03 A6 */ mtlr r0 /* 80039080 00035FC0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2122,7 +2122,7 @@ dDemo_c_NS_start: /* 80039B78 00036AB8 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80039B7C 00036ABC F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80039B80 00036AC0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80039B84 00036AC4 48 32 86 59 */ bl func_803621DC +/* 80039B84 00036AC4 48 32 86 59 */ bl _savegpr_29 /* 80039B88 00036AC8 7C 7F 1B 78 */ mr r31, r3 /* 80039B8C 00036ACC 7C 9D 23 78 */ mr r29, r4 /* 80039B90 00036AD0 FF E0 08 90 */ fmr f31, f1 @@ -2215,7 +2215,7 @@ lbl_80039CD8: /* 80039CD8 00036C18 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80039CDC 00036C1C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80039CE0 00036C20 39 61 00 30 */ addi r11, r1, 0x30 -/* 80039CE4 00036C24 48 32 85 45 */ bl func_80362228 +/* 80039CE4 00036C24 48 32 85 45 */ bl _restgpr_29 /* 80039CE8 00036C28 80 01 00 44 */ lwz r0, 0x44(r1) /* 80039CEC 00036C2C 7C 08 03 A6 */ mtlr r0 /* 80039CF0 00036C30 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index e195dd46872..6d87ab25668 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -3739,7 +3739,7 @@ dDlst_shadowSimple_c_NS_draw: /* 80055210 00052150 7C 08 02 A6 */ mflr r0 /* 80055214 00052154 90 01 00 24 */ stw r0, 0x24(r1) /* 80055218 00052158 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005521C 0005215C 48 30 CF C1 */ bl func_803621DC +/* 8005521C 0005215C 48 30 CF C1 */ bl _savegpr_29 /* 80055220 00052160 7C 7D 1B 78 */ mr r29, r3 /* 80055224 00052164 3C 60 80 3B */ lis r3, lbl_803A87A0@ha /* 80055228 00052168 3B C3 87 A0 */ addi r30, r3, lbl_803A87A0@l @@ -3852,7 +3852,7 @@ lbl_80055388: /* 800553CC 0005230C 38 80 00 40 */ li r4, 0x40 /* 800553D0 00052310 48 30 AB 21 */ bl GXCallDisplayList /* 800553D4 00052314 39 61 00 20 */ addi r11, r1, 0x20 -/* 800553D8 00052318 48 30 CE 51 */ bl func_80362228 +/* 800553D8 00052318 48 30 CE 51 */ bl _restgpr_29 /* 800553DC 0005231C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800553E0 00052320 7C 08 03 A6 */ mtlr r0 /* 800553E4 00052324 38 21 00 20 */ addi r1, r1, 0x20 @@ -4102,7 +4102,7 @@ dDlst_shadowControl_c_NS_reset: /* 8005576C 000526AC 7C 08 02 A6 */ mflr r0 /* 80055770 000526B0 90 01 00 24 */ stw r0, 0x24(r1) /* 80055774 000526B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80055778 000526B8 48 30 CA 65 */ bl func_803621DC +/* 80055778 000526B8 48 30 CA 65 */ bl _savegpr_29 /* 8005577C 000526BC 7C 7D 1B 78 */ mr r29, r3 /* 80055780 000526C0 3B FD 34 10 */ addi r31, r29, 0x3410 /* 80055784 000526C4 3B C0 00 00 */ li r30, 0 @@ -4118,7 +4118,7 @@ lbl_80055788: /* 800557A8 000526E8 98 1D 00 01 */ stb r0, 1(r29) /* 800557AC 000526EC 90 1D 00 04 */ stw r0, 4(r29) /* 800557B0 000526F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800557B4 000526F4 48 30 CA 75 */ bl func_80362228 +/* 800557B4 000526F4 48 30 CA 75 */ bl _restgpr_29 /* 800557B8 000526F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800557BC 000526FC 7C 08 03 A6 */ mtlr r0 /* 800557C0 00052700 38 21 00 20 */ addi r1, r1, 0x20 @@ -4754,7 +4754,7 @@ dDlst_peekZ_c_NS_peekData: /* 80056084 00052FC4 7C 08 02 A6 */ mflr r0 /* 80056088 00052FC8 90 01 00 24 */ stw r0, 0x24(r1) /* 8005608C 00052FCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056090 00052FD0 48 30 C1 4D */ bl func_803621DC +/* 80056090 00052FD0 48 30 C1 4D */ bl _savegpr_29 /* 80056094 00052FD4 7C 7D 1B 78 */ mr r29, r3 /* 80056098 00052FD8 3B FD 00 04 */ addi r31, r29, 4 /* 8005609C 00052FDC 3B C0 00 00 */ li r30, 0 @@ -4775,7 +4775,7 @@ lbl_800560C4: /* 800560D0 00053010 38 00 00 00 */ li r0, 0 /* 800560D4 00053014 98 1D 00 00 */ stb r0, 0(r29) /* 800560D8 00053018 39 61 00 20 */ addi r11, r1, 0x20 -/* 800560DC 0005301C 48 30 C1 4D */ bl func_80362228 +/* 800560DC 0005301C 48 30 C1 4D */ bl _restgpr_29 /* 800560E0 00053020 80 01 00 24 */ lwz r0, 0x24(r1) /* 800560E4 00053024 7C 08 03 A6 */ mtlr r0 /* 800560E8 00053028 38 21 00 20 */ addi r1, r1, 0x20 @@ -5112,7 +5112,7 @@ dDlst_list_c_NS_reset: /* 8005653C 0005347C 7C 08 02 A6 */ mflr r0 /* 80056540 00053480 90 01 00 24 */ stw r0, 0x24(r1) /* 80056544 00053484 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056548 00053488 48 30 BC 95 */ bl func_803621DC +/* 80056548 00053488 48 30 BC 95 */ bl _savegpr_29 /* 8005654C 0005348C 7C 7D 1B 78 */ mr r29, r3 /* 80056550 00053490 7F BF EB 78 */ mr r31, r29 /* 80056554 00053494 3B C0 00 00 */ li r30, 0 @@ -5150,7 +5150,7 @@ lbl_800565C0: /* 800565CC 0005350C 38 63 00 14 */ addi r3, r3, 0x14 /* 800565D0 00053510 42 00 FF F0 */ bdnz lbl_800565C0 /* 800565D4 00053514 39 61 00 20 */ addi r11, r1, 0x20 -/* 800565D8 00053518 48 30 BC 51 */ bl func_80362228 +/* 800565D8 00053518 48 30 BC 51 */ bl _restgpr_29 /* 800565DC 0005351C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800565E0 00053520 7C 08 03 A6 */ mtlr r0 /* 800565E4 00053524 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index c11b753f3b3..f6ce4a13ee7 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -420,7 +420,7 @@ dEvt_control_c_NS_talkCheck: /* 80041A24 0003E964 7C 08 02 A6 */ mflr r0 /* 80041A28 0003E968 90 01 00 24 */ stw r0, 0x24(r1) /* 80041A2C 0003E96C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041A30 0003E970 48 32 07 AD */ bl func_803621DC +/* 80041A30 0003E970 48 32 07 AD */ bl _savegpr_29 /* 80041A34 0003E974 7C 7F 1B 78 */ mr r31, r3 /* 80041A38 0003E978 3C 60 80 38 */ lis r3, lbl_80379D80@ha /* 80041A3C 0003E97C 38 63 9D 80 */ addi r3, r3, lbl_80379D80@l @@ -498,7 +498,7 @@ lbl_80041B3C: /* 80041B3C 0003EA7C 38 60 00 00 */ li r3, 0 lbl_80041B40: /* 80041B40 0003EA80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041B44 0003EA84 48 32 06 E5 */ bl func_80362228 +/* 80041B44 0003EA84 48 32 06 E5 */ bl _restgpr_29 /* 80041B48 0003EA88 80 01 00 24 */ lwz r0, 0x24(r1) /* 80041B4C 0003EA8C 7C 08 03 A6 */ mtlr r0 /* 80041B50 0003EA90 38 21 00 20 */ addi r1, r1, 0x20 @@ -829,7 +829,7 @@ dEvt_control_c_NS_potentialCheck: /* 80041FA4 0003EEE4 7C 08 02 A6 */ mflr r0 /* 80041FA8 0003EEE8 90 01 00 24 */ stw r0, 0x24(r1) /* 80041FAC 0003EEEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041FB0 0003EEF0 48 32 02 2D */ bl func_803621DC +/* 80041FB0 0003EEF0 48 32 02 2D */ bl _savegpr_29 /* 80041FB4 0003EEF4 7C 7D 1B 78 */ mr r29, r3 /* 80041FB8 0003EEF8 7C 9E 23 78 */ mr r30, r4 /* 80041FBC 0003EEFC 83 E4 00 08 */ lwz r31, 8(r4) @@ -851,7 +851,7 @@ lbl_80041FD4: /* 80041FF8 0003EF38 38 60 00 01 */ li r3, 1 lbl_80041FFC: /* 80041FFC 0003EF3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042000 0003EF40 48 32 02 29 */ bl func_80362228 +/* 80042000 0003EF40 48 32 02 29 */ bl _restgpr_29 /* 80042004 0003EF44 80 01 00 24 */ lwz r0, 0x24(r1) /* 80042008 0003EF48 7C 08 03 A6 */ mtlr r0 /* 8004200C 0003EF4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -863,7 +863,7 @@ dEvt_control_c_NS_doorCheck: /* 80042018 0003EF58 7C 08 02 A6 */ mflr r0 /* 8004201C 0003EF5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80042020 0003EF60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042024 0003EF64 48 32 01 B9 */ bl func_803621DC +/* 80042024 0003EF64 48 32 01 B9 */ bl _savegpr_29 /* 80042028 0003EF68 7C 7D 1B 78 */ mr r29, r3 /* 8004202C 0003EF6C 7C 9E 23 78 */ mr r30, r4 /* 80042030 0003EF70 38 A0 00 04 */ li r5, 4 @@ -932,7 +932,7 @@ lbl_80042110: /* 80042110 0003F050 38 60 00 00 */ li r3, 0 lbl_80042114: /* 80042114 0003F054 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042118 0003F058 48 32 01 11 */ bl func_80362228 +/* 80042118 0003F058 48 32 01 11 */ bl _restgpr_29 /* 8004211C 0003F05C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80042120 0003F060 7C 08 03 A6 */ mtlr r0 /* 80042124 0003F064 38 21 00 20 */ addi r1, r1, 0x20 @@ -944,7 +944,7 @@ dEvt_control_c_NS_itemCheck: /* 80042130 0003F070 7C 08 02 A6 */ mflr r0 /* 80042134 0003F074 90 01 00 24 */ stw r0, 0x24(r1) /* 80042138 0003F078 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004213C 0003F07C 48 32 00 A1 */ bl func_803621DC +/* 8004213C 0003F07C 48 32 00 A1 */ bl _savegpr_29 /* 80042140 0003F080 7C 7D 1B 78 */ mr r29, r3 /* 80042144 0003F084 3C A0 80 38 */ lis r5, lbl_80379D80@ha /* 80042148 0003F088 38 A5 9D 80 */ addi r5, r5, lbl_80379D80@l @@ -974,7 +974,7 @@ lbl_800421A4: /* 800421A4 0003F0E4 38 60 00 00 */ li r3, 0 lbl_800421A8: /* 800421A8 0003F0E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800421AC 0003F0EC 48 32 00 7D */ bl func_80362228 +/* 800421AC 0003F0EC 48 32 00 7D */ bl _restgpr_29 /* 800421B0 0003F0F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800421B4 0003F0F4 7C 08 03 A6 */ mtlr r0 /* 800421B8 0003F0F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1062,7 +1062,7 @@ dEvt_control_c_NS_entry: /* 800422C4 0003F204 7C 08 02 A6 */ mflr r0 /* 800422C8 0003F208 90 01 00 24 */ stw r0, 0x24(r1) /* 800422CC 0003F20C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800422D0 0003F210 48 31 FF 0D */ bl func_803621DC +/* 800422D0 0003F210 48 31 FF 0D */ bl _savegpr_29 /* 800422D4 0003F214 7C 7D 1B 78 */ mr r29, r3 /* 800422D8 0003F218 88 03 00 E2 */ lbz r0, 0xe2(r3) /* 800422DC 0003F21C 7C 00 07 75 */ extsb. r0, r0 @@ -1163,7 +1163,7 @@ lbl_8004244C: /* 8004244C 0003F38C 38 60 00 00 */ li r3, 0 lbl_80042450: /* 80042450 0003F390 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042454 0003F394 48 31 FD D5 */ bl func_80362228 +/* 80042454 0003F394 48 31 FD D5 */ bl _restgpr_29 /* 80042458 0003F398 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004245C 0003F39C 7C 08 03 A6 */ mtlr r0 /* 80042460 0003F3A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1175,7 +1175,7 @@ dEvt_control_c_NS_reset: /* 8004246C 0003F3AC 7C 08 02 A6 */ mflr r0 /* 80042470 0003F3B0 90 01 00 24 */ stw r0, 0x24(r1) /* 80042474 0003F3B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042478 0003F3B8 48 31 FD 65 */ bl func_803621DC +/* 80042478 0003F3B8 48 31 FD 65 */ bl _savegpr_29 /* 8004247C 0003F3BC 7C 7D 1B 78 */ mr r29, r3 /* 80042480 0003F3C0 88 03 00 EC */ lbz r0, 0xec(r3) /* 80042484 0003F3C4 28 00 00 FF */ cmplwi r0, 0xff @@ -1211,7 +1211,7 @@ lbl_800424F4: /* 800424F8 0003F438 60 00 00 08 */ ori r0, r0, 8 /* 800424FC 0003F43C B0 1D 00 D8 */ sth r0, 0xd8(r29) /* 80042500 0003F440 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042504 0003F444 48 31 FD 25 */ bl func_80362228 +/* 80042504 0003F444 48 31 FD 25 */ bl _restgpr_29 /* 80042508 0003F448 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004250C 0003F44C 7C 08 03 A6 */ mtlr r0 /* 80042510 0003F450 38 21 00 20 */ addi r1, r1, 0x20 @@ -1223,7 +1223,7 @@ dEvt_control_c_NS_reset_X1_: /* 8004251C 0003F45C 7C 08 02 A6 */ mflr r0 /* 80042520 0003F460 90 01 00 24 */ stw r0, 0x24(r1) /* 80042524 0003F464 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042528 0003F468 48 31 FC B5 */ bl func_803621DC +/* 80042528 0003F468 48 31 FC B5 */ bl _savegpr_29 /* 8004252C 0003F46C 7C 7D 1B 78 */ mr r29, r3 /* 80042530 0003F470 7C 9E 23 78 */ mr r30, r4 /* 80042534 0003F474 88 A3 00 EC */ lbz r5, 0xec(r3) @@ -1254,7 +1254,7 @@ lbl_8004258C: /* 80042594 0003F4D4 60 00 00 08 */ ori r0, r0, 8 /* 80042598 0003F4D8 B0 1D 00 D8 */ sth r0, 0xd8(r29) /* 8004259C 0003F4DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800425A0 0003F4E0 48 31 FC 89 */ bl func_80362228 +/* 800425A0 0003F4E0 48 31 FC 89 */ bl _restgpr_29 /* 800425A4 0003F4E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800425A8 0003F4E8 7C 08 03 A6 */ mtlr r0 /* 800425AC 0003F4EC 38 21 00 20 */ addi r1, r1, 0x20 @@ -1576,7 +1576,7 @@ dEvt_control_c_NS_skipper: /* 800429D8 0003F918 7C 08 02 A6 */ mflr r0 /* 800429DC 0003F91C 90 01 00 24 */ stw r0, 0x24(r1) /* 800429E0 0003F920 39 61 00 20 */ addi r11, r1, 0x20 -/* 800429E4 0003F924 48 31 F7 F9 */ bl func_803621DC +/* 800429E4 0003F924 48 31 F7 F9 */ bl _savegpr_29 /* 800429E8 0003F928 7C 7D 1B 78 */ mr r29, r3 /* 800429EC 0003F92C 3B E0 00 00 */ li r31, 0 /* 800429F0 0003F930 3B C0 00 00 */ li r30, 0 @@ -1701,7 +1701,7 @@ lbl_80042B94: lbl_80042BA0: /* 80042BA0 0003FAE0 7F E3 FB 78 */ mr r3, r31 /* 80042BA4 0003FAE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042BA8 0003FAE8 48 31 F6 81 */ bl func_80362228 +/* 80042BA8 0003FAE8 48 31 F6 81 */ bl _restgpr_29 /* 80042BAC 0003FAEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80042BB0 0003FAF0 7C 08 03 A6 */ mtlr r0 /* 80042BB4 0003FAF4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index a2a77116d1b..63086ecf9c3 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -415,7 +415,7 @@ dGameover_c_NS__execute: /* 8019B2F8 00198238 7C 08 02 A6 */ mflr r0 /* 8019B2FC 0019823C 90 01 00 24 */ stw r0, 0x24(r1) /* 8019B300 00198240 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019B304 00198244 48 1C 6E D9 */ bl func_803621DC +/* 8019B304 00198244 48 1C 6E D9 */ bl _savegpr_29 /* 8019B308 00198248 7C 7D 1B 78 */ mr r29, r3 /* 8019B30C 0019824C 80 63 01 10 */ lwz r3, 0x110(r3) /* 8019B310 00198250 4B E7 3E BD */ bl mDoExt_setCurrentHeap @@ -443,7 +443,7 @@ lbl_8019B360: /* 8019B364 001982A4 4B E7 3E 69 */ bl mDoExt_setCurrentHeap /* 8019B368 001982A8 38 60 00 01 */ li r3, 1 /* 8019B36C 001982AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019B370 001982B0 48 1C 6E B9 */ bl func_80362228 +/* 8019B370 001982B0 48 1C 6E B9 */ bl _restgpr_29 /* 8019B374 001982B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019B378 001982B8 7C 08 03 A6 */ mtlr r0 /* 8019B37C 001982BC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_item.s b/asm/d/d_item.s index 59a74dfca40..2a3d3ac3c55 100644 --- a/asm/d/d_item.s +++ b/asm/d/d_item.s @@ -1064,7 +1064,7 @@ item_func_BEE_CHILD: /* 80098EE8 00095E28 7C 08 02 A6 */ mflr r0 /* 80098EEC 00095E2C 90 01 00 24 */ stw r0, 0x24(r1) /* 80098EF0 00095E30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80098EF4 00095E34 48 2C 92 E9 */ bl func_803621DC +/* 80098EF4 00095E34 48 2C 92 E9 */ bl _savegpr_29 /* 80098EF8 00095E38 3B C0 00 FF */ li r30, 0xff /* 80098EFC 00095E3C 3B A0 00 00 */ li r29, 0 /* 80098F00 00095E40 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1098,7 +1098,7 @@ lbl_80098F3C: /* 80098F64 00095EA4 4B F9 A4 ED */ bl dSv_player_item_c_NS_setEmptyBottleItemIn lbl_80098F68: /* 80098F68 00095EA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80098F6C 00095EAC 48 2C 92 BD */ bl func_80362228 +/* 80098F6C 00095EAC 48 2C 92 BD */ bl _restgpr_29 /* 80098F70 00095EB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80098F74 00095EB4 7C 08 03 A6 */ mtlr r0 /* 80098F78 00095EB8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index 46da33b2335..87a298f996a 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -861,7 +861,7 @@ dKy_twi_wolflight_set: /* 8019CFE8 00199F28 7C 08 02 A6 */ mflr r0 /* 8019CFEC 00199F2C 90 01 00 44 */ stw r0, 0x44(r1) /* 8019CFF0 00199F30 39 61 00 40 */ addi r11, r1, 0x40 -/* 8019CFF4 00199F34 48 1C 51 E9 */ bl func_803621DC +/* 8019CFF4 00199F34 48 1C 51 E9 */ bl _savegpr_29 /* 8019CFF8 00199F38 7C 7D 1B 78 */ mr r29, r3 /* 8019CFFC 00199F3C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019D000 00199F40 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -971,7 +971,7 @@ lbl_8019D11C: /* 8019D184 0019A0C4 D0 03 0C 38 */ stfs f0, 0xc38(r3) lbl_8019D188: /* 8019D188 0019A0C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8019D18C 0019A0CC 48 1C 50 9D */ bl func_80362228 +/* 8019D18C 0019A0CC 48 1C 50 9D */ bl _restgpr_29 /* 8019D190 0019A0D0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8019D194 0019A0D4 7C 08 03 A6 */ mtlr r0 /* 8019D198 0019A0D8 38 21 00 40 */ addi r1, r1, 0x40 @@ -1304,7 +1304,7 @@ kankyo_color_ratio_calc: /* 8019D624 0019A564 90 01 00 24 */ stw r0, 0x24(r1) /* 8019D628 0019A568 DB E1 00 18 */ stfd f31, 0x18(r1) /* 8019D62C 0019A56C 39 61 00 18 */ addi r11, r1, 0x18 -/* 8019D630 0019A570 48 1C 4B AD */ bl func_803621DC +/* 8019D630 0019A570 48 1C 4B AD */ bl _savegpr_29 /* 8019D634 0019A574 7C 7D 1B 78 */ mr r29, r3 /* 8019D638 0019A578 FF E0 08 90 */ fmr f31, f1 /* 8019D63C 0019A57C AB E4 00 02 */ lha r31, 2(r4) @@ -1322,7 +1322,7 @@ kankyo_color_ratio_calc: /* 8019D66C 0019A5AC 98 7D 00 02 */ stb r3, 2(r29) /* 8019D670 0019A5B0 CB E1 00 18 */ lfd f31, 0x18(r1) /* 8019D674 0019A5B4 39 61 00 18 */ addi r11, r1, 0x18 -/* 8019D678 0019A5B8 48 1C 4B B1 */ bl func_80362228 +/* 8019D678 0019A5B8 48 1C 4B B1 */ bl _restgpr_29 /* 8019D67C 0019A5BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019D680 0019A5C0 7C 08 03 A6 */ mtlr r0 /* 8019D684 0019A5C4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1496,7 +1496,7 @@ dKy_FiveSenses_fullthrottle_dark_static1: /* 8019D8D0 0019A810 7C 08 02 A6 */ mflr r0 /* 8019D8D4 0019A814 90 01 00 64 */ stw r0, 0x64(r1) /* 8019D8D8 0019A818 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019D8DC 0019A81C 48 1C 49 01 */ bl func_803621DC +/* 8019D8DC 0019A81C 48 1C 49 01 */ bl _savegpr_29 /* 8019D8E0 0019A820 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019D8E4 0019A824 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 8019D8E8 0019A828 3B C0 00 00 */ li r30, 0 @@ -1790,7 +1790,7 @@ lbl_8019DD2C: /* 8019DD30 0019AC70 98 1F 0F 3C */ stb r0, 0xf3c(r31) lbl_8019DD34: /* 8019DD34 0019AC74 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019DD38 0019AC78 48 1C 44 F1 */ bl func_80362228 +/* 8019DD38 0019AC78 48 1C 44 F1 */ bl _restgpr_29 /* 8019DD3C 0019AC7C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8019DD40 0019AC80 7C 08 03 A6 */ mtlr r0 /* 8019DD44 0019AC84 38 21 00 60 */ addi r1, r1, 0x60 @@ -2860,7 +2860,7 @@ dKy_light_size_get: /* 8019EBD4 0019BB14 7C 08 02 A6 */ mflr r0 /* 8019EBD8 0019BB18 90 01 00 24 */ stw r0, 0x24(r1) /* 8019EBDC 0019BB1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019EBE0 0019BB20 48 1C 35 FD */ bl func_803621DC +/* 8019EBE0 0019BB20 48 1C 35 FD */ bl _savegpr_29 /* 8019EBE4 0019BB24 7C 7D 1B 78 */ mr r29, r3 /* 8019EBE8 0019BB28 4B EB 7E 95 */ bl dKyd_light_size_tbl_getp /* 8019EBEC 0019BB2C 7C 7F 1B 78 */ mr r31, r3 @@ -2907,7 +2907,7 @@ lbl_8019EC70: /* 8019EC7C 0019BBBC 41 80 FF CC */ blt lbl_8019EC48 lbl_8019EC80: /* 8019EC80 0019BBC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019EC84 0019BBC4 48 1C 35 A5 */ bl func_80362228 +/* 8019EC84 0019BBC4 48 1C 35 A5 */ bl _restgpr_29 /* 8019EC88 0019BBC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019EC8C 0019BBCC 7C 08 03 A6 */ mtlr r0 /* 8019EC90 0019BBD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3529,7 +3529,7 @@ dScnKy_env_light_c_NS_setDaytime: /* 8019F500 0019C440 7C 08 02 A6 */ mflr r0 /* 8019F504 0019C444 90 01 00 24 */ stw r0, 0x24(r1) /* 8019F508 0019C448 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019F50C 0019C44C 48 1C 2C D1 */ bl func_803621DC +/* 8019F50C 0019C44C 48 1C 2C D1 */ bl _savegpr_29 /* 8019F510 0019C450 7C 7E 1B 78 */ mr r30, r3 /* 8019F514 0019C454 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8019F518 0019C458 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -3690,7 +3690,7 @@ lbl_8019F724: /* 8019F760 0019C6A0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8019F764 0019C6A4 98 03 12 FB */ stb r0, 0x12fb(r3) /* 8019F768 0019C6A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019F76C 0019C6AC 48 1C 2A BD */ bl func_80362228 +/* 8019F76C 0019C6AC 48 1C 2A BD */ bl _restgpr_29 /* 8019F770 0019C6B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019F774 0019C6B4 7C 08 03 A6 */ mtlr r0 /* 8019F778 0019C6B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3711,7 +3711,7 @@ dScnKy_env_light_c_NS_setSunpos: /* 8019F79C 0019C6DC DB C1 00 30 */ stfd f30, 0x30(r1) /* 8019F7A0 0019C6E0 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 8019F7A4 0019C6E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019F7A8 0019C6E8 48 1C 2A 35 */ bl func_803621DC +/* 8019F7A8 0019C6E8 48 1C 2A 35 */ bl _savegpr_29 /* 8019F7AC 0019C6EC 7C 7D 1B 78 */ mr r29, r3 /* 8019F7B0 0019C6F0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8019F7B4 0019C6F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3866,7 +3866,7 @@ lbl_8019F9E0: /* 8019F9E8 0019C928 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 8019F9EC 0019C92C CB C1 00 30 */ lfd f30, 0x30(r1) /* 8019F9F0 0019C930 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019F9F4 0019C934 48 1C 28 35 */ bl func_80362228 +/* 8019F9F4 0019C934 48 1C 28 35 */ bl _restgpr_29 /* 8019F9F8 0019C938 80 01 00 54 */ lwz r0, 0x54(r1) /* 8019F9FC 0019C93C 7C 08 03 A6 */ mtlr r0 /* 8019FA00 0019C940 38 21 00 50 */ addi r1, r1, 0x50 @@ -9774,7 +9774,7 @@ dScnKy_env_light_c_NS_Eflight_flush_proc: /* 801A4F70 001A1EB0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801A4F74 001A1EB4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801A4F78 001A1EB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A4F7C 001A1EBC 48 1B D2 61 */ bl func_803621DC +/* 801A4F7C 001A1EBC 48 1B D2 61 */ bl _savegpr_29 /* 801A4F80 001A1EC0 7C 7E 1B 78 */ mr r30, r3 /* 801A4F84 001A1EC4 3C 60 80 3C */ lis r3, lbl_803BBDB8@ha /* 801A4F88 001A1EC8 38 63 BD B8 */ addi r3, r3, lbl_803BBDB8@l @@ -9906,7 +9906,7 @@ lbl_801A514C: /* 801A514C 001A208C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801A5150 001A2090 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801A5154 001A2094 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A5158 001A2098 48 1B D0 D1 */ bl func_80362228 +/* 801A5158 001A2098 48 1B D0 D1 */ bl _restgpr_29 /* 801A515C 001A209C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801A5160 001A20A0 7C 08 03 A6 */ mtlr r0 /* 801A5164 001A20A4 38 21 00 40 */ addi r1, r1, 0x40 @@ -9918,7 +9918,7 @@ dScnKy_env_light_c_NS_SetBaseLight: /* 801A5170 001A20B0 7C 08 02 A6 */ mflr r0 /* 801A5174 001A20B4 90 01 00 34 */ stw r0, 0x34(r1) /* 801A5178 001A20B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A517C 001A20BC 48 1B D0 61 */ bl func_803621DC +/* 801A517C 001A20BC 48 1B D0 61 */ bl _savegpr_29 /* 801A5180 001A20C0 7C 7D 1B 78 */ mr r29, r3 /* 801A5184 001A20C4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5188 001A20C8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -9984,7 +9984,7 @@ lbl_801A5250: /* 801A5268 001A21A8 D0 1D 00 2C */ stfs f0, 0x2c(r29) /* 801A526C 001A21AC D0 1D 00 30 */ stfs f0, 0x30(r29) /* 801A5270 001A21B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A5274 001A21B4 48 1B CF B5 */ bl func_80362228 +/* 801A5274 001A21B4 48 1B CF B5 */ bl _restgpr_29 /* 801A5278 001A21B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A527C 001A21BC 7C 08 03 A6 */ mtlr r0 /* 801A5280 001A21C0 38 21 00 30 */ addi r1, r1, 0x30 @@ -11773,7 +11773,7 @@ dKy_setLight_nowroom_grass: /* 801A6C64 001A3BA4 DB E1 00 20 */ stfd f31, 0x20(r1) /* 801A6C68 001A3BA8 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 801A6C6C 001A3BAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A6C70 001A3BB0 48 1B B5 6D */ bl func_803621DC +/* 801A6C70 001A3BB0 48 1B B5 6D */ bl _savegpr_29 /* 801A6C74 001A3BB4 7C 7D 1B 78 */ mr r29, r3 /* 801A6C78 001A3BB8 FF E0 08 90 */ fmr f31, f1 /* 801A6C7C 001A3BBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -11828,7 +11828,7 @@ lbl_801A6D2C: /* 801A6D2C 001A3C6C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801A6D30 001A3C70 CB E1 00 20 */ lfd f31, 0x20(r1) /* 801A6D34 001A3C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A6D38 001A3C78 48 1B B4 F1 */ bl func_80362228 +/* 801A6D38 001A3C78 48 1B B4 F1 */ bl _restgpr_29 /* 801A6D3C 001A3C7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A6D40 001A3C80 7C 08 03 A6 */ mtlr r0 /* 801A6D44 001A3C84 38 21 00 30 */ addi r1, r1, 0x30 @@ -13055,7 +13055,7 @@ dKy_actor_addcol_set: /* 801A7E90 001A4DD0 90 01 00 24 */ stw r0, 0x24(r1) /* 801A7E94 001A4DD4 DB E1 00 18 */ stfd f31, 0x18(r1) /* 801A7E98 001A4DD8 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A7E9C 001A4DDC 48 1B A3 41 */ bl func_803621DC +/* 801A7E9C 001A4DDC 48 1B A3 41 */ bl _savegpr_29 /* 801A7EA0 001A4DE0 7C 7D 1B 78 */ mr r29, r3 /* 801A7EA4 001A4DE4 7C 9E 23 78 */ mr r30, r4 /* 801A7EA8 001A4DE8 7C BF 2B 78 */ mr r31, r5 @@ -13083,7 +13083,7 @@ dKy_actor_addcol_set: /* 801A7F00 001A4E40 4B FF FE 49 */ bl dKy_bg3_addcol_amb_set /* 801A7F04 001A4E44 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801A7F08 001A4E48 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A7F0C 001A4E4C 48 1B A3 1D */ bl func_80362228 +/* 801A7F0C 001A4E4C 48 1B A3 1D */ bl _restgpr_29 /* 801A7F10 001A4E50 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A7F14 001A4E54 7C 08 03 A6 */ mtlr r0 /* 801A7F18 001A4E58 38 21 00 20 */ addi r1, r1, 0x20 @@ -13182,7 +13182,7 @@ dKy_vrbox_addcol_set: /* 801A8068 001A4FA8 90 01 00 24 */ stw r0, 0x24(r1) /* 801A806C 001A4FAC DB E1 00 18 */ stfd f31, 0x18(r1) /* 801A8070 001A4FB0 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A8074 001A4FB4 48 1B A1 69 */ bl func_803621DC +/* 801A8074 001A4FB4 48 1B A1 69 */ bl _savegpr_29 /* 801A8078 001A4FB8 7C 7D 1B 78 */ mr r29, r3 /* 801A807C 001A4FBC 7C 9E 23 78 */ mr r30, r4 /* 801A8080 001A4FC0 7C BF 2B 78 */ mr r31, r5 @@ -13200,7 +13200,7 @@ dKy_vrbox_addcol_set: /* 801A80B0 001A4FF0 4B FF FD 39 */ bl dKy_addcol_fog_set /* 801A80B4 001A4FF4 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801A80B8 001A4FF8 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A80BC 001A4FFC 48 1B A1 6D */ bl func_80362228 +/* 801A80BC 001A4FFC 48 1B A1 6D */ bl _restgpr_29 /* 801A80C0 001A5000 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A80C4 001A5004 7C 08 03 A6 */ mtlr r0 /* 801A80C8 001A5008 38 21 00 20 */ addi r1, r1, 0x20 @@ -13490,7 +13490,7 @@ dKy_SordFlush_set: /* 801A8488 001A53C8 7C 08 02 A6 */ mflr r0 /* 801A848C 001A53CC 90 01 00 24 */ stw r0, 0x24(r1) /* 801A8490 001A53D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A8494 001A53D4 48 1B 9D 49 */ bl func_803621DC +/* 801A8494 001A53D4 48 1B 9D 49 */ bl _savegpr_29 /* 801A8498 001A53D8 7C 7D 1B 78 */ mr r29, r3 /* 801A849C 001A53DC 7C 9E 23 78 */ mr r30, r4 /* 801A84A0 001A53E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -13529,7 +13529,7 @@ lbl_801A8510: /* 801A851C 001A545C 98 03 07 A4 */ stb r0, 0x7a4(r3) lbl_801A8520: /* 801A8520 001A5460 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A8524 001A5464 48 1B 9D 05 */ bl func_80362228 +/* 801A8524 001A5464 48 1B 9D 05 */ bl _restgpr_29 /* 801A8528 001A5468 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A852C 001A546C 7C 08 03 A6 */ mtlr r0 /* 801A8530 001A5470 38 21 00 20 */ addi r1, r1, 0x20 @@ -13798,7 +13798,7 @@ dKy_tevstr_init: /* 801A88F0 001A5830 7C 08 02 A6 */ mflr r0 /* 801A88F4 001A5834 90 01 00 24 */ stw r0, 0x24(r1) /* 801A88F8 001A5838 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A88FC 001A583C 48 1B 98 E1 */ bl func_803621DC +/* 801A88FC 001A583C 48 1B 98 E1 */ bl _savegpr_29 /* 801A8900 001A5840 7C 7F 1B 78 */ mr r31, r3 /* 801A8904 001A5844 7C 9D 23 78 */ mr r29, r4 /* 801A8908 001A5848 7C BE 2B 78 */ mr r30, r5 @@ -13874,7 +13874,7 @@ lbl_801A89B4: /* 801A8A14 001A5954 38 A5 00 74 */ addi r5, r5, 0x74 /* 801A8A18 001A5958 42 00 FF 9C */ bdnz lbl_801A89B4 /* 801A8A1C 001A595C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801A8A20 001A5960 48 1B 98 09 */ bl func_80362228 +/* 801A8A20 001A5960 48 1B 98 09 */ bl _restgpr_29 /* 801A8A24 001A5964 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A8A28 001A5968 7C 08 03 A6 */ mtlr r0 /* 801A8A2C 001A596C 38 21 00 20 */ addi r1, r1, 0x20 @@ -17926,7 +17926,7 @@ dKy_depth_dist_set: /* 801AC2F4 001A9234 DB E1 00 70 */ stfd f31, 0x70(r1) /* 801AC2F8 001A9238 F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 801AC2FC 001A923C 39 61 00 70 */ addi r11, r1, 0x70 -/* 801AC300 001A9240 48 1B 5E DD */ bl func_803621DC +/* 801AC300 001A9240 48 1B 5E DD */ bl _savegpr_29 /* 801AC304 001A9244 7C 7E 1B 78 */ mr r30, r3 /* 801AC308 001A9248 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AC30C 001A924C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -18092,7 +18092,7 @@ lbl_801AC55C: /* 801AC55C 001A949C E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 801AC560 001A94A0 CB E1 00 70 */ lfd f31, 0x70(r1) /* 801AC564 001A94A4 39 61 00 70 */ addi r11, r1, 0x70 -/* 801AC568 001A94A8 48 1B 5C C1 */ bl func_80362228 +/* 801AC568 001A94A8 48 1B 5C C1 */ bl _restgpr_29 /* 801AC56C 001A94AC 80 01 00 84 */ lwz r0, 0x84(r1) /* 801AC570 001A94B0 7C 08 03 A6 */ mtlr r0 /* 801AC574 001A94B4 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/d_lib.s b/asm/d/d_lib.s index d61df6fcdb5..521681c5131 100644 --- a/asm/d/d_lib.s +++ b/asm/d/d_lib.s @@ -458,7 +458,7 @@ lbl_80032644: /* 80032658 0002F598 7C 08 02 A6 */ mflr r0 /* 8003265C 0002F59C 90 01 00 34 */ stw r0, 0x34(r1) /* 80032660 0002F5A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80032664 0002F5A4 48 32 FB 79 */ bl func_803621DC +/* 80032664 0002F5A4 48 32 FB 79 */ bl _savegpr_29 /* 80032668 0002F5A8 7C 67 1B 78 */ mr r7, r3 /* 8003266C 0002F5AC 7C 9D 23 78 */ mr r29, r4 /* 80032670 0002F5B0 7C BE 2B 78 */ mr r30, r5 @@ -508,7 +508,7 @@ lbl_8003271C: /* 8003271C 0002F65C 38 60 00 00 */ li r3, 0 lbl_80032720: /* 80032720 0002F660 39 61 00 30 */ addi r11, r1, 0x30 -/* 80032724 0002F664 48 32 FB 05 */ bl func_80362228 +/* 80032724 0002F664 48 32 FB 05 */ bl _restgpr_29 /* 80032728 0002F668 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003272C 0002F66C 7C 08 03 A6 */ mtlr r0 /* 80032730 0002F670 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_map.s b/asm/d/d_map.s index afa8512456b..4d702dd6d76 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -639,7 +639,7 @@ lbl_80028DC0: /* 80028DF8 00025D38 7C 08 02 A6 */ mflr r0 /* 80028DFC 00025D3C 90 01 00 24 */ stw r0, 0x24(r1) /* 80028E00 00025D40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80028E04 00025D44 48 33 93 D9 */ bl func_803621DC +/* 80028E04 00025D44 48 33 93 D9 */ bl _savegpr_29 /* 80028E08 00025D48 7C 9D 23 78 */ mr r29, r4 /* 80028E0C 00025D4C 3C 80 80 38 */ lis r4, lbl_80378E48@ha /* 80028E10 00025D50 3B E4 8E 48 */ addi r31, r4, lbl_80378E48@l @@ -696,7 +696,7 @@ lbl_80028EC4: /* 80028EC4 00025E04 57 A0 10 3A */ slwi r0, r29, 2 /* 80028EC8 00025E08 7C 7E 02 14 */ add r3, r30, r0 /* 80028ECC 00025E0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80028ED0 00025E10 48 33 93 59 */ bl func_80362228 +/* 80028ED0 00025E10 48 33 93 59 */ bl _restgpr_29 /* 80028ED4 00025E14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80028ED8 00025E18 7C 08 03 A6 */ mtlr r0 /* 80028EDC 00025E1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -761,7 +761,7 @@ lbl_80028F9C: /* 80028FB8 00025EF8 7C 08 02 A6 */ mflr r0 /* 80028FBC 00025EFC 90 01 00 24 */ stw r0, 0x24(r1) /* 80028FC0 00025F00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80028FC4 00025F04 48 33 92 19 */ bl func_803621DC +/* 80028FC4 00025F04 48 33 92 19 */ bl _savegpr_29 /* 80028FC8 00025F08 7C 7D 1B 78 */ mr r29, r3 /* 80028FCC 00025F0C 7C 9E 23 78 */ mr r30, r4 /* 80028FD0 00025F10 7C BF 2B 78 */ mr r31, r5 @@ -787,7 +787,7 @@ lbl_80029004: /* 8002901C 00025F5C 4E 80 04 21 */ bctrl lbl_80029020: /* 80029020 00025F60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80029024 00025F64 48 33 92 05 */ bl func_80362228 +/* 80029024 00025F64 48 33 92 05 */ bl _restgpr_29 /* 80029028 00025F68 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002902C 00025F6C 7C 08 03 A6 */ mtlr r0 /* 80029030 00025F70 38 21 00 20 */ addi r1, r1, 0x20 @@ -1769,7 +1769,7 @@ dMap_c_NS_calcMapCmPerTexel: /* 80029E28 00026D68 DB E1 00 40 */ stfd f31, 0x40(r1) /* 80029E2C 00026D6C F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80029E30 00026D70 39 61 00 40 */ addi r11, r1, 0x40 -/* 80029E34 00026D74 48 33 83 A9 */ bl func_803621DC +/* 80029E34 00026D74 48 33 83 A9 */ bl _savegpr_29 /* 80029E38 00026D78 7C 7D 1B 78 */ mr r29, r3 /* 80029E3C 00026D7C 7C 9E 23 79 */ or. r30, r4, r4 /* 80029E40 00026D80 7C BF 2B 78 */ mr r31, r5 @@ -1855,7 +1855,7 @@ lbl_80029F64: /* 80029F64 00026EA4 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80029F68 00026EA8 CB E1 00 40 */ lfd f31, 0x40(r1) /* 80029F6C 00026EAC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80029F70 00026EB0 48 33 82 B9 */ bl func_80362228 +/* 80029F70 00026EB0 48 33 82 B9 */ bl _restgpr_29 /* 80029F74 00026EB4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80029F78 00026EB8 7C 08 03 A6 */ mtlr r0 /* 80029F7C 00026EBC 38 21 00 50 */ addi r1, r1, 0x50 @@ -2131,7 +2131,7 @@ dMap_c_NS__move: /* 8002A338 00027278 DB E1 00 50 */ stfd f31, 0x50(r1) /* 8002A33C 0002727C F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8002A340 00027280 39 61 00 50 */ addi r11, r1, 0x50 -/* 8002A344 00027284 48 33 7E 99 */ bl func_803621DC +/* 8002A344 00027284 48 33 7E 99 */ bl _savegpr_29 /* 8002A348 00027288 7C 7E 1B 78 */ mr r30, r3 /* 8002A34C 0002728C 7C 9F 23 78 */ mr r31, r4 /* 8002A350 00027290 FF E0 18 90 */ fmr f31, f3 @@ -2669,7 +2669,7 @@ lbl_8002AB2C: /* 8002AB34 00027A74 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8002AB38 00027A78 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8002AB3C 00027A7C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8002AB40 00027A80 48 33 76 E9 */ bl func_80362228 +/* 8002AB40 00027A80 48 33 76 E9 */ bl _restgpr_29 /* 8002AB44 00027A84 80 01 00 64 */ lwz r0, 0x64(r1) /* 8002AB48 00027A88 7C 08 03 A6 */ mtlr r0 /* 8002AB4C 00027A8C 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index b707ffe907c..2f5c1656ac4 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -99,7 +99,7 @@ lbl_8021EB20: lbl_8021EB70: /* 8021EB70 0021BAB0 7F 63 DB 78 */ mr r3, r27 /* 8021EB74 0021BAB4 7F 24 CB 78 */ mr r4, r25 -/* 8021EB78 0021BAB8 4B E1 3E E5 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8021EB78 0021BAB8 4B E1 3E E5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8021EB7C 0021BABC 38 19 01 F9 */ addi r0, r25, 0x1f9 /* 8021EB80 0021BAC0 7C 7F 01 AE */ stbx r3, r31, r0 /* 8021EB84 0021BAC4 3B 39 00 01 */ addi r25, r25, 1 @@ -491,7 +491,7 @@ dMeter2_c_NS__execute: /* 8021F12C 0021C06C 7C 08 02 A6 */ mflr r0 /* 8021F130 0021C070 90 01 00 24 */ stw r0, 0x24(r1) /* 8021F134 0021C074 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021F138 0021C078 48 14 30 A5 */ bl func_803621DC +/* 8021F138 0021C078 48 14 30 A5 */ bl _savegpr_29 /* 8021F13C 0021C07C 7C 7D 1B 78 */ mr r29, r3 /* 8021F140 0021C080 80 63 01 00 */ lwz r3, 0x100(r3) /* 8021F144 0021C084 4B DF 00 89 */ bl mDoExt_setCurrentHeap @@ -633,7 +633,7 @@ lbl_8021F2E0: /* 8021F350 0021C290 4B DE FE 7D */ bl mDoExt_setCurrentHeap /* 8021F354 0021C294 38 60 00 01 */ li r3, 1 /* 8021F358 0021C298 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021F35C 0021C29C 48 14 2E CD */ bl func_80362228 +/* 8021F35C 0021C29C 48 14 2E CD */ bl _restgpr_29 /* 8021F360 0021C2A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021F364 0021C2A4 7C 08 03 A6 */ mtlr r0 /* 8021F368 0021C2A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -948,7 +948,7 @@ dMeter2_c_NS_checkStatus: /* 8021F7B4 0021C6F4 7C 08 02 A6 */ mflr r0 /* 8021F7B8 0021C6F8 90 01 00 24 */ stw r0, 0x24(r1) /* 8021F7BC 0021C6FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021F7C0 0021C700 48 14 2A 1D */ bl func_803621DC +/* 8021F7C0 0021C700 48 14 2A 1D */ bl _savegpr_29 /* 8021F7C4 0021C704 7C 7F 1B 78 */ mr r31, r3 /* 8021F7C8 0021C708 38 00 00 00 */ li r0, 0 /* 8021F7CC 0021C70C 90 03 01 24 */ stw r0, 0x124(r3) @@ -1328,7 +1328,7 @@ lbl_8021FD3C: /* 8021FD44 0021CC84 90 1F 01 24 */ stw r0, 0x124(r31) lbl_8021FD48: /* 8021FD48 0021CC88 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021FD4C 0021CC8C 48 14 24 DD */ bl func_80362228 +/* 8021FD4C 0021CC8C 48 14 24 DD */ bl _restgpr_29 /* 8021FD50 0021CC90 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021FD54 0021CC94 7C 08 03 A6 */ mtlr r0 /* 8021FD58 0021CC98 38 21 00 20 */ addi r1, r1, 0x20 @@ -2386,7 +2386,7 @@ dMeter2_c_NS_moveRupee: /* 80220C44 0021DB84 7C 7E 1B 78 */ mr r30, r3 /* 80220C48 0021DB88 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80220C4C 0021DB8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 80220C50 0021DB90 4B E1 1E 59 */ bl dSv_player_status_a_c_NS_getRupeeMax +/* 80220C50 0021DB90 4B E1 1E 59 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 80220C54 0021DB94 7C 65 07 34 */ extsh r5, r3 /* 80220C58 0021DB98 3B E0 00 00 */ li r31, 0 /* 80220C5C 0021DB9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -6033,7 +6033,7 @@ lbl_80223FD4: lbl_80223FF8: /* 80223FF8 00220F38 7E 63 9B 78 */ mr r3, r19 /* 80223FFC 00220F3C 7E 44 93 78 */ mr r4, r18 -/* 80224000 00220F40 4B E0 EA 5D */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 80224000 00220F40 4B E0 EA 5D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 80224004 00220F44 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80224008 00220F48 7C 14 00 00 */ cmpw r20, r0 /* 8022400C 00220F4C 41 82 00 18 */ beq lbl_80224024 @@ -6153,7 +6153,7 @@ lbl_8022418C: lbl_802241A4: /* 802241A4 002210E4 7F 03 C3 78 */ mr r3, r24 /* 802241A8 002210E8 7E 44 93 78 */ mr r4, r18 -/* 802241AC 002210EC 4B E0 E8 B1 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 802241AC 002210EC 4B E0 E8 B1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 802241B0 002210F0 3A 72 01 F9 */ addi r19, r18, 0x1f9 /* 802241B4 002210F4 7C 95 98 AE */ lbzx r4, r21, r19 /* 802241B8 002210F8 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -6165,7 +6165,7 @@ lbl_802241A4: lbl_802241D0: /* 802241D0 00221110 7E E3 BB 78 */ mr r3, r23 /* 802241D4 00221114 7E 44 93 78 */ mr r4, r18 -/* 802241D8 00221118 4B E0 E8 85 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 802241D8 00221118 4B E0 E8 85 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 802241DC 0022111C 38 94 00 0F */ addi r4, r20, 0xf /* 802241E0 00221120 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802241E4 00221124 7C 04 00 00 */ cmpw r4, r0 @@ -6187,7 +6187,7 @@ lbl_80224214: /* 80224220 00221160 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80224224 00221164 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80224228 00221168 7E 44 93 78 */ mr r4, r18 -/* 8022422C 0022116C 4B E0 E8 31 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8022422C 0022116C 4B E0 E8 31 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 80224230 00221170 7C 75 99 AE */ stbx r3, r21, r19 lbl_80224234: /* 80224234 00221174 3A 52 00 01 */ addi r18, r18, 1 @@ -6237,7 +6237,7 @@ lbl_80224284: lbl_802242D4: /* 802242D4 00221214 7F 63 DB 78 */ mr r3, r27 /* 802242D8 00221218 7E E4 BB 78 */ mr r4, r23 -/* 802242DC 0022121C 4B E0 E7 81 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 802242DC 0022121C 4B E0 E7 81 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 802242E0 00221220 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802242E4 00221224 7C 1C 00 00 */ cmpw r28, r0 /* 802242E8 00221228 40 82 00 3C */ bne lbl_80224324 @@ -6501,7 +6501,7 @@ dMeter2_c_NS_movePachinkoNum: /* 80224684 002215C4 7C 08 02 A6 */ mflr r0 /* 80224688 002215C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8022468C 002215CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80224690 002215D0 48 13 DB 4D */ bl func_803621DC +/* 80224690 002215D0 48 13 DB 4D */ bl _savegpr_29 /* 80224694 002215D4 7C 7F 1B 78 */ mr r31, r3 /* 80224698 002215D8 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 8022469C 002215DC 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l @@ -6658,7 +6658,7 @@ lbl_802248BC: /* 802248C8 00221808 41 80 FF D0 */ blt lbl_80224898 lbl_802248CC: /* 802248CC 0022180C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802248D0 00221810 48 13 D9 59 */ bl func_80362228 +/* 802248D0 00221810 48 13 D9 59 */ bl _restgpr_29 /* 802248D4 00221814 80 01 00 24 */ lwz r0, 0x24(r1) /* 802248D8 00221818 7C 08 03 A6 */ mtlr r0 /* 802248DC 0022181C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6869,7 +6869,7 @@ dMeter2_c_NS_alphaAnimeOxygen: /* 80224BB0 00221AF0 7C 08 02 A6 */ mflr r0 /* 80224BB4 00221AF4 90 01 00 24 */ stw r0, 0x24(r1) /* 80224BB8 00221AF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80224BBC 00221AFC 48 13 D6 21 */ bl func_803621DC +/* 80224BBC 00221AFC 48 13 D6 21 */ bl _savegpr_29 /* 80224BC0 00221B00 7C 7E 1B 78 */ mr r30, r3 /* 80224BC4 00221B04 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80224BC8 00221B08 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -6980,7 +6980,7 @@ lbl_80224D48: /* 80224D4C 00221C8C 38 80 00 00 */ li r4, 0 /* 80224D50 00221C90 4B FF 0B A1 */ bl dMeter2Draw_c_NS_setAlphaOxygenChange /* 80224D54 00221C94 39 61 00 20 */ addi r11, r1, 0x20 -/* 80224D58 00221C98 48 13 D4 D1 */ bl func_80362228 +/* 80224D58 00221C98 48 13 D4 D1 */ bl _restgpr_29 /* 80224D5C 00221C9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80224D60 00221CA0 7C 08 03 A6 */ mtlr r0 /* 80224D64 00221CA4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_name.s b/asm/d/d_name.s index d42c59dad02..485a0298313 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -298,7 +298,7 @@ dName_c_NS_showIcon: /* 8024E7F0 0024B730 7C 08 02 A6 */ mflr r0 /* 8024E7F4 0024B734 90 01 00 44 */ stw r0, 0x44(r1) /* 8024E7F8 0024B738 39 61 00 40 */ addi r11, r1, 0x40 -/* 8024E7FC 0024B73C 48 11 39 E1 */ bl func_803621DC +/* 8024E7FC 0024B73C 48 11 39 E1 */ bl _savegpr_29 /* 8024E800 0024B740 7C 7F 1B 78 */ mr r31, r3 /* 8024E804 0024B744 88 03 02 AB */ lbz r0, 0x2ab(r3) /* 8024E808 0024B748 2C 00 00 04 */ cmpwi r0, 4 @@ -401,7 +401,7 @@ lbl_8024E8F8: /* 8024E984 0024B8C4 4B F4 69 1D */ bl dSelect_cursor_c_NS_setAlphaRate lbl_8024E988: /* 8024E988 0024B8C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8024E98C 0024B8CC 48 11 38 9D */ bl func_80362228 +/* 8024E98C 0024B8CC 48 11 38 9D */ bl _restgpr_29 /* 8024E990 0024B8D0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8024E994 0024B8D4 7C 08 03 A6 */ mtlr r0 /* 8024E998 0024B8D8 38 21 00 40 */ addi r1, r1, 0x40 @@ -1879,7 +1879,7 @@ lbl_8024FE9C: /* 8024FEB8 0024CDF8 7C 08 02 A6 */ mflr r0 /* 8024FEBC 0024CDFC 90 01 00 24 */ stw r0, 0x24(r1) /* 8024FEC0 0024CE00 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024FEC4 0024CE04 48 11 23 19 */ bl func_803621DC +/* 8024FEC4 0024CE04 48 11 23 19 */ bl _savegpr_29 /* 8024FEC8 0024CE08 7C 7D 1B 78 */ mr r29, r3 /* 8024FECC 0024CE0C 88 83 02 B0 */ lbz r4, 0x2b0(r3) /* 8024FED0 0024CE10 48 00 11 79 */ bl dName_c_NS_getMenuPosIdx @@ -1932,7 +1932,7 @@ lbl_8024FF70: /* 8024FF84 0024CEC4 98 1D 02 AD */ stb r0, 0x2ad(r29) lbl_8024FF88: /* 8024FF88 0024CEC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024FF8C 0024CECC 48 11 22 9D */ bl func_80362228 +/* 8024FF8C 0024CECC 48 11 22 9D */ bl _restgpr_29 /* 8024FF90 0024CED0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024FF94 0024CED4 7C 08 03 A6 */ mtlr r0 /* 8024FF98 0024CED8 38 21 00 20 */ addi r1, r1, 0x20 @@ -2153,7 +2153,7 @@ dName_c_NS_menuCursorMove: /* 80250288 0024D1C8 7C 08 02 A6 */ mflr r0 /* 8025028C 0024D1CC 90 01 00 44 */ stw r0, 0x44(r1) /* 80250290 0024D1D0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250294 0024D1D4 48 11 1F 49 */ bl func_803621DC +/* 80250294 0024D1D4 48 11 1F 49 */ bl _savegpr_29 /* 80250298 0024D1D8 7C 7D 1B 78 */ mr r29, r3 /* 8025029C 0024D1DC 88 83 02 AF */ lbz r4, 0x2af(r3) /* 802502A0 0024D1E0 48 00 0D A9 */ bl dName_c_NS_getMenuPosIdx @@ -2207,7 +2207,7 @@ dName_c_NS_menuCursorMove: /* 80250360 0024D2A0 C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) /* 80250364 0024D2A4 4B F4 4F 3D */ bl dSelect_cursor_c_NS_setAlphaRate /* 80250368 0024D2A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025036C 0024D2AC 48 11 1E BD */ bl func_80362228 +/* 8025036C 0024D2AC 48 11 1E BD */ bl _restgpr_29 /* 80250370 0024D2B0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80250374 0024D2B4 7C 08 03 A6 */ mtlr r0 /* 80250378 0024D2B8 38 21 00 40 */ addi r1, r1, 0x40 @@ -2219,7 +2219,7 @@ dName_c_NS_menuCursorMove2: /* 80250384 0024D2C4 7C 08 02 A6 */ mflr r0 /* 80250388 0024D2C8 90 01 00 44 */ stw r0, 0x44(r1) /* 8025038C 0024D2CC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250390 0024D2D0 48 11 1E 4D */ bl func_803621DC +/* 80250390 0024D2D0 48 11 1E 4D */ bl _savegpr_29 /* 80250394 0024D2D4 7C 7F 1B 78 */ mr r31, r3 /* 80250398 0024D2D8 88 83 02 AF */ lbz r4, 0x2af(r3) /* 8025039C 0024D2DC 48 00 0C AD */ bl dName_c_NS_getMenuPosIdx @@ -2283,7 +2283,7 @@ lbl_80250428: /* 80250480 0024D3C0 C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) /* 80250484 0024D3C4 4B F4 4E 1D */ bl dSelect_cursor_c_NS_setAlphaRate /* 80250488 0024D3C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025048C 0024D3CC 48 11 1D 9D */ bl func_80362228 +/* 8025048C 0024D3CC 48 11 1D 9D */ bl _restgpr_29 /* 80250490 0024D3D0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80250494 0024D3D4 7C 08 03 A6 */ mtlr r0 /* 80250498 0024D3D8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index c11923043a7..f3fb1f6ee8f 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -1937,7 +1937,7 @@ dPa_simpleEcallBack_NS_create: /* 8004AF9C 00047EDC 7C 08 02 A6 */ mflr r0 /* 8004AFA0 00047EE0 90 01 00 24 */ stw r0, 0x24(r1) /* 8004AFA4 00047EE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004AFA8 00047EE8 48 31 72 35 */ bl func_803621DC +/* 8004AFA8 00047EE8 48 31 72 35 */ bl _savegpr_29 /* 8004AFAC 00047EEC 7C 7D 1B 78 */ mr r29, r3 /* 8004AFB0 00047EF0 7C 9E 23 78 */ mr r30, r4 /* 8004AFB4 00047EF4 38 00 00 00 */ li r0, 0 @@ -1967,7 +1967,7 @@ dPa_simpleEcallBack_NS_create: /* 8004B004 00047F44 48 00 00 61 */ bl dPa_simpleEcallBack_NS_createEmitter /* 8004B008 00047F48 80 7D 00 04 */ lwz r3, 4(r29) /* 8004B00C 00047F4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B010 00047F50 48 31 72 19 */ bl func_80362228 +/* 8004B010 00047F50 48 31 72 19 */ bl _restgpr_29 /* 8004B014 00047F54 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004B018 00047F58 7C 08 03 A6 */ mtlr r0 /* 8004B01C 00047F5C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2000,7 +2000,7 @@ dPa_simpleEcallBack_NS_createEmitter: /* 8004B068 00047FA8 7C 08 02 A6 */ mflr r0 /* 8004B06C 00047FAC 90 01 00 24 */ stw r0, 0x24(r1) /* 8004B070 00047FB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B074 00047FB4 48 31 71 69 */ bl func_803621DC +/* 8004B074 00047FB4 48 31 71 69 */ bl _savegpr_29 /* 8004B078 00047FB8 7C 7F 1B 78 */ mr r31, r3 /* 8004B07C 00047FBC 7C 9D 23 78 */ mr r29, r4 /* 8004B080 00047FC0 A0 63 00 08 */ lhz r3, 8(r3) @@ -2061,7 +2061,7 @@ lbl_8004B14C: /* 8004B14C 0004808C 80 7F 00 04 */ lwz r3, 4(r31) lbl_8004B150: /* 8004B150 00048090 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B154 00048094 48 31 70 D5 */ bl func_80362228 +/* 8004B154 00048094 48 31 70 D5 */ bl _restgpr_29 /* 8004B158 00048098 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004B15C 0004809C 7C 08 03 A6 */ mtlr r0 /* 8004B160 000480A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2341,7 +2341,7 @@ dPa_control_c_NS_level_c_NS_emitter_c_NS_entry: /* 8004B548 00048488 7C 08 02 A6 */ mflr r0 /* 8004B54C 0004848C 90 01 00 24 */ stw r0, 0x24(r1) /* 8004B550 00048490 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B554 00048494 48 31 6C 89 */ bl func_803621DC +/* 8004B554 00048494 48 31 6C 89 */ bl _savegpr_29 /* 8004B558 00048498 7C 7D 1B 78 */ mr r29, r3 /* 8004B55C 0004849C 7C DE 33 78 */ mr r30, r6 /* 8004B560 000484A0 7C FF 3B 78 */ mr r31, r7 @@ -2358,7 +2358,7 @@ dPa_control_c_NS_level_c_NS_emitter_c_NS_entry: /* 8004B58C 000484CC 60 00 00 40 */ ori r0, r0, 0x40 /* 8004B590 000484D0 90 03 00 F4 */ stw r0, 0xf4(r3) /* 8004B594 000484D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B598 000484D8 48 31 6C 91 */ bl func_80362228 +/* 8004B598 000484D8 48 31 6C 91 */ bl _restgpr_29 /* 8004B59C 000484DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004B5A0 000484E0 7C 08 03 A6 */ mtlr r0 /* 8004B5A4 000484E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2516,7 +2516,7 @@ dPa_control_c_NS_level_c_NS_execute_X1_: /* 8004B7AC 000486EC 7C 08 02 A6 */ mflr r0 /* 8004B7B0 000486F0 90 01 00 24 */ stw r0, 0x24(r1) /* 8004B7B4 000486F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B7B8 000486F8 48 31 6A 25 */ bl func_803621DC +/* 8004B7B8 000486F8 48 31 6A 25 */ bl _savegpr_29 /* 8004B7BC 000486FC 7C 7D 1B 78 */ mr r29, r3 /* 8004B7C0 00048700 3B FD 00 08 */ addi r31, r29, 8 /* 8004B7C4 00048704 3B C0 00 00 */ li r30, 0 @@ -2533,7 +2533,7 @@ lbl_8004B7E0: /* 8004B7E8 00048728 3B FF 00 18 */ addi r31, r31, 0x18 /* 8004B7EC 0004872C 41 80 FF DC */ blt lbl_8004B7C8 /* 8004B7F0 00048730 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004B7F4 00048734 48 31 6A 35 */ bl func_80362228 +/* 8004B7F4 00048734 48 31 6A 35 */ bl _restgpr_29 /* 8004B7F8 00048738 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004B7FC 0004873C 7C 08 03 A6 */ mtlr r0 /* 8004B800 00048740 38 21 00 20 */ addi r1, r1, 0x20 @@ -2993,7 +2993,7 @@ dPa_control_c_NS_readScene: /* 8004BE00 00048D40 7C 08 02 A6 */ mflr r0 /* 8004BE04 00048D44 90 01 00 24 */ stw r0, 0x24(r1) /* 8004BE08 00048D48 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004BE0C 00048D4C 48 31 63 D1 */ bl func_803621DC +/* 8004BE0C 00048D4C 48 31 63 D1 */ bl _savegpr_29 /* 8004BE10 00048D50 7C 7D 1B 78 */ mr r29, r3 /* 8004BE14 00048D54 7C 9E 23 78 */ mr r30, r4 /* 8004BE18 00048D58 7C BF 2B 78 */ mr r31, r5 @@ -3033,7 +3033,7 @@ lbl_8004BE58: /* 8004BE94 00048DD4 38 60 00 01 */ li r3, 1 lbl_8004BE98: /* 8004BE98 00048DD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004BE9C 00048DDC 48 31 63 8D */ bl func_80362228 +/* 8004BE9C 00048DDC 48 31 63 8D */ bl _restgpr_29 /* 8004BEA0 00048DE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004BEA4 00048DE4 7C 08 03 A6 */ mtlr r0 /* 8004BEA8 00048DE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -5204,7 +5204,7 @@ lbl_8004DD04: /* 8004DD90 0004ACD0 DA 41 01 50 */ stfd f18, 0x150(r1) /* 8004DD94 0004ACD4 F2 41 01 58 */ psq_st f18, 344(r1), 0, qr0 /* 8004DD98 0004ACD8 39 61 01 50 */ addi r11, r1, 0x150 -/* 8004DD9C 0004ACDC 48 31 44 41 */ bl func_803621DC +/* 8004DD9C 0004ACDC 48 31 44 41 */ bl _savegpr_29 /* 8004DDA0 0004ACE0 7C 9D 23 78 */ mr r29, r4 /* 8004DDA4 0004ACE4 7C BE 2B 78 */ mr r30, r5 /* 8004DDA8 0004ACE8 8B E4 00 BB */ lbz r31, 0xbb(r4) @@ -5805,7 +5805,7 @@ lbl_8004E450: /* 8004E688 0004B5C8 E2 41 01 58 */ psq_l f18, 344(r1), 0, qr0 /* 8004E68C 0004B5CC CA 41 01 50 */ lfd f18, 0x150(r1) /* 8004E690 0004B5D0 39 61 01 50 */ addi r11, r1, 0x150 -/* 8004E694 0004B5D4 48 31 3B 95 */ bl func_80362228 +/* 8004E694 0004B5D4 48 31 3B 95 */ bl _restgpr_29 /* 8004E698 0004B5D8 80 01 02 34 */ lwz r0, 0x234(r1) /* 8004E69C 0004B5DC 7C 08 03 A6 */ mtlr r0 /* 8004E6A0 0004B5E0 38 21 02 30 */ addi r1, r1, 0x230 @@ -5840,7 +5840,7 @@ lbl_8004E450: /* 8004E714 0004B654 DA 61 00 90 */ stfd f19, 0x90(r1) /* 8004E718 0004B658 F2 61 00 98 */ psq_st f19, 152(r1), 0, qr0 /* 8004E71C 0004B65C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8004E720 0004B660 48 31 3A BD */ bl func_803621DC +/* 8004E720 0004B660 48 31 3A BD */ bl _savegpr_29 /* 8004E724 0004B664 7C 9D 23 78 */ mr r29, r4 /* 8004E728 0004B668 7C BE 2B 78 */ mr r30, r5 /* 8004E72C 0004B66C 8B E4 00 BB */ lbz r31, 0xbb(r4) @@ -6243,7 +6243,7 @@ lbl_8004EAF8: /* 8004ED24 0004BC64 E2 61 00 98 */ psq_l f19, 152(r1), 0, qr0 /* 8004ED28 0004BC68 CA 61 00 90 */ lfd f19, 0x90(r1) /* 8004ED2C 0004BC6C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8004ED30 0004BC70 48 31 34 F9 */ bl func_80362228 +/* 8004ED30 0004BC70 48 31 34 F9 */ bl _restgpr_29 /* 8004ED34 0004BC74 80 01 01 64 */ lwz r0, 0x164(r1) /* 8004ED38 0004BC78 7C 08 03 A6 */ mtlr r0 /* 8004ED3C 0004BC7C 38 21 01 60 */ addi r1, r1, 0x160 @@ -6280,7 +6280,7 @@ lbl_8004EAF8: /* 8004EDB8 0004BCF8 DA 41 01 50 */ stfd f18, 0x150(r1) /* 8004EDBC 0004BCFC F2 41 01 58 */ psq_st f18, 344(r1), 0, qr0 /* 8004EDC0 0004BD00 39 61 01 50 */ addi r11, r1, 0x150 -/* 8004EDC4 0004BD04 48 31 34 19 */ bl func_803621DC +/* 8004EDC4 0004BD04 48 31 34 19 */ bl _savegpr_29 /* 8004EDC8 0004BD08 7C 9D 23 78 */ mr r29, r4 /* 8004EDCC 0004BD0C 7C BE 2B 78 */ mr r30, r5 /* 8004EDD0 0004BD10 8B E4 00 BB */ lbz r31, 0xbb(r4) @@ -6875,7 +6875,7 @@ lbl_8004F464: /* 8004F698 0004C5D8 E2 41 01 58 */ psq_l f18, 344(r1), 0, qr0 /* 8004F69C 0004C5DC CA 41 01 50 */ lfd f18, 0x150(r1) /* 8004F6A0 0004C5E0 39 61 01 50 */ addi r11, r1, 0x150 -/* 8004F6A4 0004C5E4 48 31 2B 85 */ bl func_80362228 +/* 8004F6A4 0004C5E4 48 31 2B 85 */ bl _restgpr_29 /* 8004F6A8 0004C5E8 80 01 02 34 */ lwz r0, 0x234(r1) /* 8004F6AC 0004C5EC 7C 08 03 A6 */ mtlr r0 /* 8004F6B0 0004C5F0 38 21 02 30 */ addi r1, r1, 0x230 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index a3ff10b603e..52c11aebf03 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -2416,7 +2416,7 @@ dRes_control_c_NS_getRes_X1_: /* 8003C380 000392C0 7C 08 02 A6 */ mflr r0 /* 8003C384 000392C4 90 01 00 24 */ stw r0, 0x24(r1) /* 8003C388 000392C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C38C 000392CC 48 32 5E 51 */ bl func_803621DC +/* 8003C38C 000392CC 48 32 5E 51 */ bl _savegpr_29 /* 8003C390 000392D0 7C 9D 23 78 */ mr r29, r4 /* 8003C394 000392D4 7C A4 2B 78 */ mr r4, r5 /* 8003C398 000392D8 7C C5 33 78 */ mr r5, r6 @@ -2443,7 +2443,7 @@ lbl_8003C3E4: /* 8003C3E4 00039324 38 60 00 00 */ li r3, 0 lbl_8003C3E8: /* 8003C3E8 00039328 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C3EC 0003932C 48 32 5E 3D */ bl func_80362228 +/* 8003C3EC 0003932C 48 32 5E 3D */ bl _restgpr_29 /* 8003C3F0 00039330 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003C3F4 00039334 7C 08 03 A6 */ mtlr r0 /* 8003C3F8 00039338 38 21 00 20 */ addi r1, r1, 0x20 @@ -2489,7 +2489,7 @@ dRes_control_c_NS_syncAllRes: /* 8003C474 000393B4 7C 08 02 A6 */ mflr r0 /* 8003C478 000393B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8003C47C 000393BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C480 000393C0 48 32 5D 5D */ bl func_803621DC +/* 8003C480 000393C0 48 32 5D 5D */ bl _savegpr_29 /* 8003C484 000393C4 7C 7D 1B 78 */ mr r29, r3 /* 8003C488 000393C8 7C 9E 23 78 */ mr r30, r4 /* 8003C48C 000393CC 3B E0 00 00 */ li r31, 0 @@ -2513,7 +2513,7 @@ lbl_8003C4C0: /* 8003C4C8 00039408 38 60 00 00 */ li r3, 0 lbl_8003C4CC: /* 8003C4CC 0003940C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C4D0 00039410 48 32 5D 59 */ bl func_80362228 +/* 8003C4D0 00039410 48 32 5D 59 */ bl _restgpr_29 /* 8003C4D4 00039414 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003C4D8 00039418 7C 08 03 A6 */ mtlr r0 /* 8003C4DC 0003941C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2587,7 +2587,7 @@ dRes_control_c_NS_setStageRes: /* 8003C5C0 00039500 7C 08 02 A6 */ mflr r0 /* 8003C5C4 00039504 90 01 00 34 */ stw r0, 0x34(r1) /* 8003C5C8 00039508 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003C5CC 0003950C 48 32 5C 11 */ bl func_803621DC +/* 8003C5CC 0003950C 48 32 5C 11 */ bl _savegpr_29 /* 8003C5D0 00039510 7C 7D 1B 78 */ mr r29, r3 /* 8003C5D4 00039514 7C 9E 23 78 */ mr r30, r4 /* 8003C5D8 00039518 7C BF 2B 78 */ mr r31, r5 @@ -2609,7 +2609,7 @@ dRes_control_c_NS_setStageRes: /* 8003C618 00039558 7F E8 FB 78 */ mr r8, r31 /* 8003C61C 0003955C 4B FF FA 5D */ bl dRes_control_c_NS_setRes /* 8003C620 00039560 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003C624 00039564 48 32 5C 05 */ bl func_80362228 +/* 8003C624 00039564 48 32 5C 05 */ bl _restgpr_29 /* 8003C628 00039568 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003C62C 0003956C 7C 08 03 A6 */ mtlr r0 /* 8003C630 00039570 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/d_save.s b/asm/d/d_save.s index 077812b6f59..f9ca940d6e2 100644 --- a/asm/d/d_save.s +++ b/asm/d/d_save.s @@ -1,162 +1,6 @@ .include "macros.inc" -.section .text, "ax" # 80032918 - - -.global dSv_item_rename -dSv_item_rename: -/* 80032918 0002F858 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8003291C 0002F85C 2C 00 00 69 */ cmpwi r0, 0x69 -/* 80032920 0002F860 41 82 00 28 */ beq lbl_80032948 -/* 80032924 0002F864 40 80 00 10 */ bge lbl_80032934 -/* 80032928 0002F868 2C 00 00 68 */ cmpwi r0, 0x68 -/* 8003292C 0002F86C 40 80 00 14 */ bge lbl_80032940 -/* 80032930 0002F870 4E 80 00 20 */ blr -lbl_80032934: -/* 80032934 0002F874 2C 00 00 6E */ cmpwi r0, 0x6e -/* 80032938 0002F878 41 82 00 18 */ beq lbl_80032950 -/* 8003293C 0002F87C 4E 80 00 20 */ blr -lbl_80032940: -/* 80032940 0002F880 38 60 00 66 */ li r3, 0x66 -/* 80032944 0002F884 4E 80 00 20 */ blr -lbl_80032948: -/* 80032948 0002F888 38 60 00 61 */ li r3, 0x61 -/* 8003294C 0002F88C 4E 80 00 20 */ blr -lbl_80032950: -/* 80032950 0002F890 38 60 00 6F */ li r3, 0x6f -/* 80032954 0002F894 4E 80 00 20 */ blr - -.global dSv_player_status_a_c_NS_init -dSv_player_status_a_c_NS_init: -/* 80032958 0002F898 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003295C 0002F89C 7C 08 02 A6 */ mflr r0 -/* 80032960 0002F8A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80032964 0002F8A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032968 0002F8A8 48 32 F8 75 */ bl func_803621DC -/* 8003296C 0002F8AC 7C 7D 1B 78 */ mr r29, r3 -/* 80032970 0002F8B0 38 00 00 0F */ li r0, 0xf -/* 80032974 0002F8B4 B0 03 00 00 */ sth r0, 0(r3) -/* 80032978 0002F8B8 38 00 00 0C */ li r0, 0xc -/* 8003297C 0002F8BC B0 03 00 02 */ sth r0, 2(r3) -/* 80032980 0002F8C0 38 00 00 00 */ li r0, 0 -/* 80032984 0002F8C4 B0 03 00 04 */ sth r0, 4(r3) -/* 80032988 0002F8C8 B0 03 00 06 */ sth r0, 6(r3) -/* 8003298C 0002F8CC B0 03 00 08 */ sth r0, 8(r3) -/* 80032990 0002F8D0 98 03 00 0A */ stb r0, 0xa(r3) -/* 80032994 0002F8D4 3B C0 00 00 */ li r30, 0 -/* 80032998 0002F8D8 3B E0 00 FF */ li r31, 0xff -lbl_8003299C: -/* 8003299C 0002F8DC 7C 7D F2 14 */ add r3, r29, r30 -/* 800329A0 0002F8E0 9B E3 00 0B */ stb r31, 0xb(r3) -/* 800329A4 0002F8E4 9B E3 00 0F */ stb r31, 0xf(r3) -/* 800329A8 0002F8E8 7F C3 F3 78 */ mr r3, r30 -/* 800329AC 0002F8EC 4B FF B4 49 */ bl dComIfGp_setSelectItem -/* 800329B0 0002F8F0 3B DE 00 01 */ addi r30, r30, 1 -/* 800329B4 0002F8F4 2C 1E 00 04 */ cmpwi r30, 4 -/* 800329B8 0002F8F8 41 80 FF E4 */ blt lbl_8003299C -/* 800329BC 0002F8FC 38 80 00 00 */ li r4, 0 -/* 800329C0 0002F900 38 60 00 00 */ li r3, 0 -/* 800329C4 0002F904 38 00 00 06 */ li r0, 6 -/* 800329C8 0002F908 7C 09 03 A6 */ mtctr r0 -lbl_800329CC: -/* 800329CC 0002F90C 38 04 00 13 */ addi r0, r4, 0x13 -/* 800329D0 0002F910 7C 7D 01 AE */ stbx r3, r29, r0 -/* 800329D4 0002F914 38 84 00 01 */ addi r4, r4, 1 -/* 800329D8 0002F918 42 00 FF F4 */ bdnz lbl_800329CC -/* 800329DC 0002F91C 38 00 00 2E */ li r0, 0x2e -/* 800329E0 0002F920 98 1D 00 13 */ stb r0, 0x13(r29) -/* 800329E4 0002F924 38 00 00 FF */ li r0, 0xff -/* 800329E8 0002F928 98 1D 00 14 */ stb r0, 0x14(r29) -/* 800329EC 0002F92C 98 1D 00 15 */ stb r0, 0x15(r29) -/* 800329F0 0002F930 98 1D 00 16 */ stb r0, 0x16(r29) -/* 800329F4 0002F934 98 1D 00 17 */ stb r0, 0x17(r29) -/* 800329F8 0002F938 38 60 00 00 */ li r3, 0 -/* 800329FC 0002F93C 98 7D 00 19 */ stb r3, 0x19(r29) -/* 80032A00 0002F940 98 7D 00 1A */ stb r3, 0x1a(r29) -/* 80032A04 0002F944 98 7D 00 1B */ stb r3, 0x1b(r29) -/* 80032A08 0002F948 98 7D 00 1C */ stb r3, 0x1c(r29) -/* 80032A0C 0002F94C 98 7D 00 1D */ stb r3, 0x1d(r29) -/* 80032A10 0002F950 98 7D 00 1E */ stb r3, 0x1e(r29) -/* 80032A14 0002F954 38 80 00 00 */ li r4, 0 -/* 80032A18 0002F958 38 00 00 03 */ li r0, 3 -/* 80032A1C 0002F95C 7C 09 03 A6 */ mtctr r0 -lbl_80032A20: -/* 80032A20 0002F960 38 04 00 1F */ addi r0, r4, 0x1f -/* 80032A24 0002F964 7C 7D 01 AE */ stbx r3, r29, r0 -/* 80032A28 0002F968 38 84 00 01 */ addi r4, r4, 1 -/* 80032A2C 0002F96C 42 00 FF F4 */ bdnz lbl_80032A20 -/* 80032A30 0002F970 39 61 00 20 */ addi r11, r1, 0x20 -/* 80032A34 0002F974 48 32 F7 F5 */ bl func_80362228 -/* 80032A38 0002F978 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032A3C 0002F97C 7C 08 03 A6 */ mtlr r0 -/* 80032A40 0002F980 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032A44 0002F984 4E 80 00 20 */ blr - -.global dSv_player_status_a_c_NS_setSelectItemIndex -dSv_player_status_a_c_NS_setSelectItemIndex: -/* 80032A48 0002F988 2C 04 00 04 */ cmpwi r4, 4 -/* 80032A4C 0002F98C 4C 80 00 20 */ bgelr -/* 80032A50 0002F990 7C 63 22 14 */ add r3, r3, r4 -/* 80032A54 0002F994 98 A3 00 0B */ stb r5, 0xb(r3) -/* 80032A58 0002F998 4E 80 00 20 */ blr - -.global dSv_player_status_a_c_NS_getSelectItemIndex -dSv_player_status_a_c_NS_getSelectItemIndex: -/* 80032A5C 0002F99C 2C 04 00 04 */ cmpwi r4, 4 -/* 80032A60 0002F9A0 40 80 00 10 */ bge lbl_80032A70 -/* 80032A64 0002F9A4 7C 63 22 14 */ add r3, r3, r4 -/* 80032A68 0002F9A8 88 63 00 0B */ lbz r3, 0xb(r3) -/* 80032A6C 0002F9AC 4E 80 00 20 */ blr -lbl_80032A70: -/* 80032A70 0002F9B0 38 60 00 00 */ li r3, 0 -/* 80032A74 0002F9B4 4E 80 00 20 */ blr - -.global dSv_player_status_a_c_NS_setMixItemIndex -dSv_player_status_a_c_NS_setMixItemIndex: -/* 80032A78 0002F9B8 2C 04 00 04 */ cmpwi r4, 4 -/* 80032A7C 0002F9BC 4C 80 00 20 */ bgelr -/* 80032A80 0002F9C0 7C 63 22 14 */ add r3, r3, r4 -/* 80032A84 0002F9C4 98 A3 00 0F */ stb r5, 0xf(r3) -/* 80032A88 0002F9C8 4E 80 00 20 */ blr - -.global dSv_player_status_a_c_NS_getMixItemIndex -dSv_player_status_a_c_NS_getMixItemIndex: -/* 80032A8C 0002F9CC 2C 04 00 04 */ cmpwi r4, 4 -/* 80032A90 0002F9D0 40 80 00 10 */ bge lbl_80032AA0 -/* 80032A94 0002F9D4 7C 63 22 14 */ add r3, r3, r4 -/* 80032A98 0002F9D8 88 63 00 0F */ lbz r3, 0xf(r3) -/* 80032A9C 0002F9DC 4E 80 00 20 */ blr -lbl_80032AA0: -/* 80032AA0 0002F9E0 38 60 00 00 */ li r3, 0 -/* 80032AA4 0002F9E4 4E 80 00 20 */ blr - -.global dSv_player_status_a_c_NS_getRupeeMax -dSv_player_status_a_c_NS_getRupeeMax: -/* 80032AA8 0002F9E8 88 03 00 19 */ lbz r0, 0x19(r3) -/* 80032AAC 0002F9EC 28 00 00 03 */ cmplwi r0, 3 -/* 80032AB0 0002F9F0 40 80 00 40 */ bge lbl_80032AF0 -/* 80032AB4 0002F9F4 2C 00 00 01 */ cmpwi r0, 1 -/* 80032AB8 0002F9F8 41 82 00 28 */ beq lbl_80032AE0 -/* 80032ABC 0002F9FC 40 80 00 10 */ bge lbl_80032ACC -/* 80032AC0 0002FA00 2C 00 00 00 */ cmpwi r0, 0 -/* 80032AC4 0002FA04 40 80 00 14 */ bge lbl_80032AD8 -/* 80032AC8 0002FA08 48 00 00 28 */ b lbl_80032AF0 -lbl_80032ACC: -/* 80032ACC 0002FA0C 2C 00 00 03 */ cmpwi r0, 3 -/* 80032AD0 0002FA10 40 80 00 20 */ bge lbl_80032AF0 -/* 80032AD4 0002FA14 48 00 00 14 */ b lbl_80032AE8 -lbl_80032AD8: -/* 80032AD8 0002FA18 38 60 01 2C */ li r3, 0x12c -/* 80032ADC 0002FA1C 4E 80 00 20 */ blr -lbl_80032AE0: -/* 80032AE0 0002FA20 38 60 02 58 */ li r3, 0x258 -/* 80032AE4 0002FA24 4E 80 00 20 */ blr -lbl_80032AE8: -/* 80032AE8 0002FA28 38 60 03 E8 */ li r3, 0x3e8 -/* 80032AEC 0002FA2C 4E 80 00 20 */ blr -lbl_80032AF0: -/* 80032AF0 0002FA30 38 60 00 00 */ li r3, 0 -/* 80032AF4 0002FA34 4E 80 00 20 */ blr +.section .text, "ax" # 80032918 .global dSv_player_status_a_c_NS_isMagicFlag dSv_player_status_a_c_NS_isMagicFlag: @@ -183,7 +27,7 @@ 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 +/* 80032B4C 0002FA8C 4E 80 00 20 */ blr .global dSv_player_status_b_c_NS_init dSv_player_status_b_c_NS_init: @@ -325,7 +169,7 @@ dSv_player_return_place_c_NS_init: /* 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 func_803621DC +/* 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 @@ -333,7 +177,7 @@ dSv_player_return_place_c_NS_init: /* 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 func_80362228 +/* 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 @@ -520,7 +364,7 @@ dSv_player_item_c_NS_setItem: /* 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 func_803621DC +/* 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 @@ -533,7 +377,7 @@ lbl_80032FE0: 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -544,7 +388,7 @@ lbl_8003300C: /* 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 func_80362228 +/* 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 @@ -569,7 +413,7 @@ dSv_player_item_c_NS_getItem: 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -587,7 +431,7 @@ lbl_80033094: /* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -719,7 +563,7 @@ lbl_8003325C: /* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -809,10 +653,10 @@ dSv_player_item_c_NS_setBottleItemIn: /* 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 +/* 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 +/* 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 @@ -842,7 +686,7 @@ lbl_800333F0: 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -873,7 +717,7 @@ dSv_player_item_c_NS_setEmptyBottleItemIn: /* 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 +/* 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 @@ -890,7 +734,7 @@ dSv_player_item_c_NS_setEmptyBottle: /* 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 func_803621DC +/* 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 @@ -916,7 +760,7 @@ lbl_800334F0: /* 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 func_80362228 +/* 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 @@ -967,25 +811,25 @@ dSv_player_item_c_NS_setEquipBottleItemIn: /* 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 func_803621DC +/* 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 +/* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -995,7 +839,7 @@ dSv_player_item_c_NS_setEquipBottleItemIn: /* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -1004,7 +848,7 @@ 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -1013,7 +857,7 @@ lbl_8003362C: /* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -1024,7 +868,7 @@ lbl_8003362C: /* 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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) @@ -1033,7 +877,7 @@ lbl_8003362C: /* 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 func_80362228 +/* 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 @@ -1061,7 +905,7 @@ dSv_player_item_c_NS_checkBottle: /* 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 +/* 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 @@ -1155,7 +999,7 @@ dSv_player_item_c_NS_setBombBagItemIn: /* 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 func_803621DC +/* 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 @@ -1194,7 +1038,7 @@ lbl_800338B0: 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 dSv_player_status_a_c_NS_getSelectItemIndex +/* 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 @@ -1210,7 +1054,7 @@ lbl_800338F0: /* 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 func_80362228 +/* 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 @@ -1272,7 +1116,7 @@ lbl_800339C0: lbl_800339D0: /* 800339D0 00030910 7F C3 F3 78 */ mr r3, r30 /* 800339D4 00030914 7F A4 EB 78 */ mr r4, r29 -/* 800339D8 00030918 4B FF F0 85 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 800339D8 00030918 4B FF F0 85 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 800339DC 0003091C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800339E0 00030920 7C 1F 00 00 */ cmpw r31, r0 /* 800339E4 00030924 40 82 00 0C */ bne lbl_800339F0 @@ -1332,7 +1176,7 @@ dSv_player_item_c_NS_setEmptyBombBag: /* 80033A8C 000309CC 7C 08 02 A6 */ mflr r0 /* 80033A90 000309D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80033A94 000309D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033A98 000309D8 48 32 E7 45 */ bl func_803621DC +/* 80033A98 000309D8 48 32 E7 45 */ bl _savegpr_29 /* 80033A9C 000309DC 3B A0 00 00 */ li r29, 0 /* 80033AA0 000309E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80033AA4 000309E4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -1358,7 +1202,7 @@ lbl_80033AE4: /* 80033AEC 00030A2C 41 80 FF C0 */ blt lbl_80033AAC lbl_80033AF0: /* 80033AF0 00030A30 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033AF4 00030A34 48 32 E7 35 */ bl func_80362228 +/* 80033AF4 00030A34 48 32 E7 35 */ bl _restgpr_29 /* 80033AF8 00030A38 80 01 00 24 */ lwz r0, 0x24(r1) /* 80033AFC 00030A3C 7C 08 03 A6 */ mtlr r0 /* 80033B00 00030A40 38 21 00 20 */ addi r1, r1, 0x20 @@ -1455,7 +1299,7 @@ dSv_player_item_c_NS_setWarashibeItem: /* 80033C30 00030B70 7C 08 02 A6 */ mflr r0 /* 80033C34 00030B74 90 01 00 24 */ stw r0, 0x24(r1) /* 80033C38 00030B78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033C3C 00030B7C 48 32 E5 A1 */ bl func_803621DC +/* 80033C3C 00030B7C 48 32 E5 A1 */ bl _savegpr_29 /* 80033C40 00030B80 7C 9D 23 78 */ mr r29, r4 /* 80033C44 00030B84 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80033C48 00030B88 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -1473,7 +1317,7 @@ lbl_80033C74: /* 80033C74 00030BB4 7F E3 FB 78 */ mr r3, r31 /* 80033C78 00030BB8 57 BE 06 3E */ clrlwi r30, r29, 0x18 /* 80033C7C 00030BBC 7F C4 F3 78 */ mr r4, r30 -/* 80033C80 00030BC0 4B FF ED DD */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 80033C80 00030BC0 4B FF ED DD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 80033C84 00030BC4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80033C88 00030BC8 28 00 00 15 */ cmplwi r0, 0x15 /* 80033C8C 00030BCC 40 82 00 0C */ bne lbl_80033C98 @@ -1484,7 +1328,7 @@ lbl_80033C98: /* 80033C9C 00030BDC 2C 1D 00 04 */ cmpwi r29, 4 /* 80033CA0 00030BE0 41 80 FF D4 */ blt lbl_80033C74 /* 80033CA4 00030BE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80033CA8 00030BE8 48 32 E5 81 */ bl func_80362228 +/* 80033CA8 00030BE8 48 32 E5 81 */ bl _restgpr_29 /* 80033CAC 00030BEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80033CB0 00030BF0 7C 08 03 A6 */ mtlr r0 /* 80033CB4 00030BF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1836,7 +1680,7 @@ dSv_player_item_max_c_NS_getBombNum: /* 800340FC 0003103C 7C 08 02 A6 */ mflr r0 /* 80034100 00031040 90 01 00 24 */ stw r0, 0x24(r1) /* 80034104 00031044 39 61 00 20 */ addi r11, r1, 0x20 -/* 80034108 00031048 48 32 E0 D5 */ bl func_803621DC +/* 80034108 00031048 48 32 E0 D5 */ bl _savegpr_29 /* 8003410C 0003104C 7C 7D 1B 78 */ mr r29, r3 /* 80034110 00031050 7C 9E 23 78 */ mr r30, r4 /* 80034114 00031054 3B E0 00 01 */ li r31, 1 @@ -1879,7 +1723,7 @@ lbl_80034190: /* 80034190 000310D0 38 60 00 00 */ li r3, 0 lbl_80034194: /* 80034194 000310D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80034198 000310D8 48 32 E0 91 */ bl func_80362228 +/* 80034198 000310D8 48 32 E0 91 */ bl _restgpr_29 /* 8003419C 000310DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800341A0 000310E0 7C 08 03 A6 */ mtlr r0 /* 800341A4 000310E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2301,7 +2145,7 @@ dSv_player_c_NS_init: /* 800346AC 000315EC 90 01 00 14 */ stw r0, 0x14(r1) /* 800346B0 000315F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800346B4 000315F4 7C 7F 1B 78 */ mr r31, r3 -/* 800346B8 000315F8 4B FF E2 A1 */ bl dSv_player_status_a_c_NS_init +/* 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 /* 800346C4 00031604 38 7F 00 40 */ addi r3, r31, 0x40 @@ -3077,7 +2921,7 @@ dSv_save_c_NS_init: /* 80035020 00031F60 7C 08 02 A6 */ mflr r0 /* 80035024 00031F64 90 01 00 24 */ stw r0, 0x24(r1) /* 80035028 00031F68 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003502C 00031F6C 48 32 D1 B1 */ bl func_803621DC +/* 8003502C 00031F6C 48 32 D1 B1 */ bl _savegpr_29 /* 80035030 00031F70 7C 7D 1B 78 */ mr r29, r3 /* 80035034 00031F74 4B FF F6 71 */ bl dSv_player_c_NS_init /* 80035038 00031F78 3B C0 00 00 */ li r30, 0 @@ -3105,7 +2949,7 @@ lbl_80035064: /* 80035088 00031FC8 38 7D 09 40 */ addi r3, r29, 0x940 /* 8003508C 00031FCC 4B FF F9 91 */ bl dSv_MiniGame_c_NS_init /* 80035090 00031FD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80035094 00031FD4 48 32 D1 95 */ bl func_80362228 +/* 80035094 00031FD4 48 32 D1 95 */ bl _restgpr_29 /* 80035098 00031FD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003509C 00031FDC 7C 08 03 A6 */ mtlr r0 /* 800350A0 00031FE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3170,7 +3014,7 @@ dSv_info_c_NS_initZone: /* 80035150 00032090 7C 08 02 A6 */ mflr r0 /* 80035154 00032094 90 01 00 24 */ stw r0, 0x24(r1) /* 80035158 00032098 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003515C 0003209C 48 32 D0 81 */ bl func_803621DC +/* 8003515C 0003209C 48 32 D0 81 */ bl _savegpr_29 /* 80035160 000320A0 7C 7D 1B 78 */ mr r29, r3 /* 80035164 000320A4 3B C0 00 00 */ li r30, 0 /* 80035168 000320A8 3B E0 00 00 */ li r31, 0 @@ -3184,7 +3028,7 @@ lbl_8003516C: /* 80035184 000320C4 3B FF 00 20 */ addi r31, r31, 0x20 /* 80035188 000320C8 41 80 FF E4 */ blt lbl_8003516C /* 8003518C 000320CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80035190 000320D0 48 32 D0 99 */ bl func_80362228 +/* 80035190 000320D0 48 32 D0 99 */ bl _restgpr_29 /* 80035194 000320D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80035198 000320D8 7C 08 03 A6 */ mtlr r0 /* 8003519C 000320DC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index c6c690819c7..ae4dcd295ee 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -9,7 +9,7 @@ dScope_c: /* 80193694 001905D4 7C 08 02 A6 */ mflr r0 /* 80193698 001905D8 90 01 00 54 */ stw r0, 0x54(r1) /* 8019369C 001905DC 39 61 00 50 */ addi r11, r1, 0x50 -/* 801936A0 001905E0 48 1C EB 3D */ bl func_803621DC +/* 801936A0 001905E0 48 1C EB 3D */ bl _savegpr_29 /* 801936A4 001905E4 7C 7D 1B 78 */ mr r29, r3 /* 801936A8 001905E8 7C 9E 23 78 */ mr r30, r4 /* 801936AC 001905EC 3C 60 80 3A */ lis r3, lbl_803A6F88@ha @@ -189,7 +189,7 @@ lbl_801938A8: /* 80193940 00190880 60 00 00 00 */ nop /* 80193944 00190884 7F A3 EB 78 */ mr r3, r29 /* 80193948 00190888 39 61 00 50 */ addi r11, r1, 0x50 -/* 8019394C 0019088C 48 1C E8 DD */ bl func_80362228 +/* 8019394C 0019088C 48 1C E8 DD */ bl _restgpr_29 /* 80193950 00190890 80 01 00 54 */ lwz r0, 0x54(r1) /* 80193954 00190894 7C 08 03 A6 */ mtlr r0 /* 80193958 00190898 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index 02c8d577521..656820fe0bb 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -762,7 +762,7 @@ dStage_roomControl_c_NS_createMemoryBlock: /* 80024848 00021788 7C 08 02 A6 */ mflr r0 /* 8002484C 0002178C 90 01 00 24 */ stw r0, 0x24(r1) /* 80024850 00021790 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024854 00021794 48 33 D9 89 */ bl func_803621DC +/* 80024854 00021794 48 33 D9 89 */ bl _savegpr_29 /* 80024858 00021798 7C 9D 23 78 */ mr r29, r4 /* 8002485C 0002179C 54 7E 10 3A */ slwi r30, r3, 2 /* 80024860 000217A0 3C 60 80 3A */ lis r3, lbl_803A6920@ha @@ -779,7 +779,7 @@ dStage_roomControl_c_NS_createMemoryBlock: lbl_8002488C: /* 8002488C 000217CC 7C 7F F0 2E */ lwzx r3, r31, r30 /* 80024890 000217D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024894 000217D4 48 33 D9 95 */ bl func_80362228 +/* 80024894 000217D4 48 33 D9 95 */ bl _restgpr_29 /* 80024898 000217D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002489C 000217DC 7C 08 03 A6 */ mtlr r0 /* 800248A0 000217E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1115,7 +1115,7 @@ dStage_roomInit: /* 80024D14 00021C54 7C 08 02 A6 */ mflr r0 /* 80024D18 00021C58 90 01 00 24 */ stw r0, 0x24(r1) /* 80024D1C 00021C5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024D20 00021C60 48 33 D4 BD */ bl func_803621DC +/* 80024D20 00021C60 48 33 D4 BD */ bl _savegpr_29 /* 80024D24 00021C64 7C 7D 1B 78 */ mr r29, r3 /* 80024D28 00021C68 4B FF F6 C1 */ bl dStage_roomControl_c_NS_setStayNo /* 80024D2C 00021C6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1148,7 +1148,7 @@ lbl_80024D94: /* 80024D94 00021CD4 38 60 00 01 */ li r3, 1 lbl_80024D98: /* 80024D98 00021CD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024D9C 00021CDC 48 33 D4 8D */ bl func_80362228 +/* 80024D9C 00021CDC 48 33 D4 8D */ bl _restgpr_29 /* 80024DA0 00021CE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80024DA4 00021CE4 7C 08 03 A6 */ mtlr r0 /* 80024DA8 00021CE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1167,7 +1167,7 @@ dStage_searchName: /* 80024DC4 00021D04 7C 08 02 A6 */ mflr r0 /* 80024DC8 00021D08 90 01 00 24 */ stw r0, 0x24(r1) /* 80024DCC 00021D0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024DD0 00021D10 48 33 D4 0D */ bl func_803621DC +/* 80024DD0 00021D10 48 33 D4 0D */ bl _savegpr_29 /* 80024DD4 00021D14 7C 7D 1B 78 */ mr r29, r3 /* 80024DD8 00021D18 3C 60 80 3A */ lis r3, lbl_803A3B18@ha /* 80024DDC 00021D1C 38 03 3B 18 */ addi r0, r3, lbl_803A3B18@l @@ -1189,7 +1189,7 @@ lbl_80024E04: /* 80024E14 00021D54 38 60 00 00 */ li r3, 0 lbl_80024E18: /* 80024E18 00021D58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80024E1C 00021D5C 48 33 D4 0D */ bl func_80362228 +/* 80024E1C 00021D5C 48 33 D4 0D */ bl _restgpr_29 /* 80024E20 00021D60 80 01 00 24 */ lwz r0, 0x24(r1) /* 80024E24 00021D64 7C 08 03 A6 */ mtlr r0 /* 80024E28 00021D68 38 21 00 20 */ addi r1, r1, 0x20 @@ -1792,7 +1792,7 @@ lbl_800255CC: /* 800256B0 000225F0 7C 08 02 A6 */ mflr r0 /* 800256B4 000225F4 90 01 00 24 */ stw r0, 0x24(r1) /* 800256B8 000225F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800256BC 000225FC 48 33 CB 21 */ bl func_803621DC +/* 800256BC 000225FC 48 33 CB 21 */ bl _savegpr_29 /* 800256C0 00022600 7C 7D 1B 78 */ mr r29, r3 /* 800256C4 00022604 7C 9E 23 78 */ mr r30, r4 /* 800256C8 00022608 7C BF 2B 78 */ mr r31, r5 @@ -1820,7 +1820,7 @@ lbl_80025704: lbl_8002571C: /* 8002571C 0002265C 38 60 00 01 */ li r3, 1 /* 80025720 00022660 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025724 00022664 48 33 CB 05 */ bl func_80362228 +/* 80025724 00022664 48 33 CB 05 */ bl _restgpr_29 /* 80025728 00022668 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002572C 0002266C 7C 08 03 A6 */ mtlr r0 /* 80025730 00022670 38 21 00 20 */ addi r1, r1, 0x20 @@ -2272,7 +2272,7 @@ lbl_80025D80: /* 80025DAC 00022CEC 7C 08 02 A6 */ mflr r0 /* 80025DB0 00022CF0 90 01 00 24 */ stw r0, 0x24(r1) /* 80025DB4 00022CF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025DB8 00022CF8 48 33 C4 25 */ bl func_803621DC +/* 80025DB8 00022CF8 48 33 C4 25 */ bl _savegpr_29 /* 80025DBC 00022CFC 7C DD 33 78 */ mr r29, r6 /* 80025DC0 00022D00 3B E4 00 04 */ addi r31, r4, 4 /* 80025DC4 00022D04 83 C4 00 08 */ lwz r30, 8(r4) @@ -2304,7 +2304,7 @@ lbl_80025E18: /* 80025E20 00022D60 41 80 FF CC */ blt lbl_80025DEC /* 80025E24 00022D64 38 60 00 01 */ li r3, 1 /* 80025E28 00022D68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80025E2C 00022D6C 48 33 C3 FD */ bl func_80362228 +/* 80025E2C 00022D6C 48 33 C3 FD */ bl _restgpr_29 /* 80025E30 00022D70 80 01 00 24 */ lwz r0, 0x24(r1) /* 80025E34 00022D74 7C 08 03 A6 */ mtlr r0 /* 80025E38 00022D78 38 21 00 20 */ addi r1, r1, 0x20 @@ -2585,7 +2585,7 @@ lbl_80026164: /* 8002621C 0002315C 7C 08 02 A6 */ mflr r0 /* 80026220 00023160 90 01 00 24 */ stw r0, 0x24(r1) /* 80026224 00023164 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026228 00023168 48 33 BF B5 */ bl func_803621DC +/* 80026228 00023168 48 33 BF B5 */ bl _savegpr_29 /* 8002622C 0002316C 3B E4 00 04 */ addi r31, r4, 4 /* 80026230 00023170 7F E4 FB 78 */ mr r4, r31 /* 80026234 00023174 81 83 00 00 */ lwz r12, 0(r3) @@ -2611,7 +2611,7 @@ lbl_80026270: lbl_8002627C: /* 8002627C 000231BC 38 60 00 01 */ li r3, 1 /* 80026280 000231C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026284 000231C4 48 33 BF A5 */ bl func_80362228 +/* 80026284 000231C4 48 33 BF A5 */ bl _restgpr_29 /* 80026288 000231C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002628C 000231CC 7C 08 03 A6 */ mtlr r0 /* 80026290 000231D0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3254,7 +3254,7 @@ dStage_dt_c_roomLoader: /* 80026BC0 00023B00 7C 08 02 A6 */ mflr r0 /* 80026BC4 00023B04 90 01 00 24 */ stw r0, 0x24(r1) /* 80026BC8 00023B08 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026BCC 00023B0C 48 33 B6 11 */ bl func_803621DC +/* 80026BCC 00023B0C 48 33 B6 11 */ bl _savegpr_29 /* 80026BD0 00023B10 7C 7D 1B 78 */ mr r29, r3 /* 80026BD4 00023B14 7C 9E 23 78 */ mr r30, r4 /* 80026BD8 00023B18 7C BF 2B 78 */ mr r31, r5 @@ -3275,7 +3275,7 @@ dStage_dt_c_roomLoader: /* 80026C14 00023B54 7F E5 FB 78 */ mr r5, r31 /* 80026C18 00023B58 4B FF FD 9D */ bl layerTableLoader /* 80026C1C 00023B5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026C20 00023B60 48 33 B6 09 */ bl func_80362228 +/* 80026C20 00023B60 48 33 B6 09 */ bl _restgpr_29 /* 80026C24 00023B64 80 01 00 24 */ lwz r0, 0x24(r1) /* 80026C28 00023B68 7C 08 03 A6 */ mtlr r0 /* 80026C2C 00023B6C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3287,7 +3287,7 @@ dStage_dt_c_roomReLoader: /* 80026C38 00023B78 7C 08 02 A6 */ mflr r0 /* 80026C3C 00023B7C 90 01 00 24 */ stw r0, 0x24(r1) /* 80026C40 00023B80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026C44 00023B84 48 33 B5 99 */ bl func_803621DC +/* 80026C44 00023B84 48 33 B5 99 */ bl _savegpr_29 /* 80026C48 00023B88 7C 7D 1B 78 */ mr r29, r3 /* 80026C4C 00023B8C 7C 9E 23 78 */ mr r30, r4 /* 80026C50 00023B90 7C BF 2B 78 */ mr r31, r5 @@ -3300,7 +3300,7 @@ dStage_dt_c_roomReLoader: /* 80026C6C 00023BAC 7F E5 FB 78 */ mr r5, r31 /* 80026C70 00023BB0 4B FF FE 81 */ bl layerActorLoader /* 80026C74 00023BB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026C78 00023BB8 48 33 B5 B1 */ bl func_80362228 +/* 80026C78 00023BB8 48 33 B5 B1 */ bl _restgpr_29 /* 80026C7C 00023BBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80026C80 00023BC0 7C 08 03 A6 */ mtlr r0 /* 80026C84 00023BC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -3414,7 +3414,7 @@ dStage_Delete: /* 80026DFC 00023D3C 7C 08 02 A6 */ mflr r0 /* 80026E00 00023D40 90 01 00 24 */ stw r0, 0x24(r1) /* 80026E04 00023D44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026E08 00023D48 48 33 B3 D5 */ bl func_803621DC +/* 80026E08 00023D48 48 33 B3 D5 */ bl _savegpr_29 /* 80026E0C 00023D4C 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 80026E10 00023D50 8C 03 61 94 */ lbzu r0, lbl_80406194@l(r3) /* 80026E14 00023D54 7C 00 07 75 */ extsb. r0, r0 @@ -3530,7 +3530,7 @@ lbl_80026F68: /* 80026FBC 00023EFC 7D 89 03 A6 */ mtctr r12 /* 80026FC0 00023F00 4E 80 04 21 */ bctrl /* 80026FC4 00023F04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026FC8 00023F08 48 33 B2 61 */ bl func_80362228 +/* 80026FC8 00023F08 48 33 B2 61 */ bl _restgpr_29 /* 80026FCC 00023F0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80026FD0 00023F10 7C 08 03 A6 */ mtlr r0 /* 80026FD4 00023F14 38 21 00 20 */ addi r1, r1, 0x20 @@ -3545,7 +3545,7 @@ dStage_RoomCheck: /* 80026FEC 00023F2C 7C 08 02 A6 */ mflr r0 /* 80026FF0 00023F30 90 01 00 24 */ stw r0, 0x24(r1) /* 80026FF4 00023F34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80026FF8 00023F38 48 33 B1 E5 */ bl func_803621DC +/* 80026FF8 00023F38 48 33 B1 E5 */ bl _savegpr_29 /* 80026FFC 00023F3C 7C 64 1B 79 */ or. r4, r3, r3 /* 80027000 00023F40 8B ED 80 70 */ lbz r31, lbl_804505F0-_SDA_BASE_(r13) /* 80027004 00023F44 7F FF 07 74 */ extsb r31, r31 @@ -3612,7 +3612,7 @@ lbl_800270E0: /* 800270E0 00024020 38 60 00 01 */ li r3, 1 lbl_800270E4: /* 800270E4 00024024 39 61 00 20 */ addi r11, r1, 0x20 -/* 800270E8 00024028 48 33 B1 41 */ bl func_80362228 +/* 800270E8 00024028 48 33 B1 41 */ bl _restgpr_29 /* 800270EC 0002402C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800270F0 00024030 7C 08 03 A6 */ mtlr r0 /* 800270F4 00024034 38 21 00 20 */ addi r1, r1, 0x20 @@ -3625,7 +3625,7 @@ dStage_changeSceneExitId: /* 80027104 00024044 90 01 00 24 */ stw r0, 0x24(r1) /* 80027108 00024048 DB E1 00 18 */ stfd f31, 0x18(r1) /* 8002710C 0002404C 39 61 00 18 */ addi r11, r1, 0x18 -/* 80027110 00024050 48 33 B0 CD */ bl func_803621DC +/* 80027110 00024050 48 33 B0 CD */ bl _savegpr_29 /* 80027114 00024054 7C 60 1B 78 */ mr r0, r3 /* 80027118 00024058 FF E0 08 90 */ fmr f31, f1 /* 8002711C 0002405C 7C 9D 23 78 */ mr r29, r4 @@ -3644,7 +3644,7 @@ dStage_changeSceneExitId: /* 80027150 00024090 48 00 00 21 */ bl dStage_changeScene /* 80027154 00024094 CB E1 00 18 */ lfd f31, 0x18(r1) /* 80027158 00024098 39 61 00 18 */ addi r11, r1, 0x18 -/* 8002715C 0002409C 48 33 B0 CD */ bl func_80362228 +/* 8002715C 0002409C 48 33 B0 CD */ bl _restgpr_29 /* 80027160 000240A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80027164 000240A4 7C 08 03 A6 */ mtlr r0 /* 80027168 000240A8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 74a1cf34e57..40282109af5 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -1288,7 +1288,7 @@ dDlst_TimerScrnDraw_c_NS_setHIO: /* 8025DBE4 0025AB24 7C 08 02 A6 */ mflr r0 /* 8025DBE8 0025AB28 90 01 00 24 */ stw r0, 0x24(r1) /* 8025DBEC 0025AB2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025DBF0 0025AB30 48 10 45 ED */ bl func_803621DC +/* 8025DBF0 0025AB30 48 10 45 ED */ bl _savegpr_29 /* 8025DBF4 0025AB34 7C 7E 1B 78 */ mr r30, r3 /* 8025DBF8 0025AB38 3B E0 00 00 */ li r31, 0 /* 8025DBFC 0025AB3C 80 03 00 10 */ lwz r0, 0x10(r3) @@ -1541,7 +1541,7 @@ lbl_8025DF94: /* 8025DFA0 0025AEE0 D0 1E 03 BC */ stfs f0, 0x3bc(r30) lbl_8025DFA4: /* 8025DFA4 0025AEE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025DFA8 0025AEE8 48 10 42 81 */ bl func_80362228 +/* 8025DFA8 0025AEE8 48 10 42 81 */ bl _restgpr_29 /* 8025DFAC 0025AEEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025DFB0 0025AEF0 7C 08 03 A6 */ mtlr r0 /* 8025DFB4 0025AEF4 38 21 00 20 */ addi r1, r1, 0x20 @@ -3473,7 +3473,7 @@ dDlst_TimerScrnDraw_c_NS_anime: /* 8025FB88 0025CAC8 DB C1 00 40 */ stfd f30, 0x40(r1) /* 8025FB8C 0025CACC F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 8025FB90 0025CAD0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025FB94 0025CAD4 48 10 26 49 */ bl func_803621DC +/* 8025FB94 0025CAD4 48 10 26 49 */ bl _savegpr_29 /* 8025FB98 0025CAD8 7C 7D 1B 78 */ mr r29, r3 /* 8025FB9C 0025CADC 88 03 03 DE */ lbz r0, 0x3de(r3) /* 8025FBA0 0025CAE0 28 00 00 00 */ cmplwi r0, 0 @@ -3735,7 +3735,7 @@ lbl_8025FF70: /* 8025FF78 0025CEB8 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 8025FF7C 0025CEBC CB C1 00 40 */ lfd f30, 0x40(r1) /* 8025FF80 0025CEC0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8025FF84 0025CEC4 48 10 22 A5 */ bl func_80362228 +/* 8025FF84 0025CEC4 48 10 22 A5 */ bl _restgpr_29 /* 8025FF88 0025CEC8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8025FF8C 0025CECC 7C 08 03 A6 */ mtlr r0 /* 8025FF90 0025CED0 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/d_vibration.s b/asm/d/d_vibration.s index 56317e8ddce..a9a1f1e451a 100644 --- a/asm/d/d_vibration.s +++ b/asm/d/d_vibration.s @@ -89,7 +89,7 @@ dVibration_c_NS_Run: /* 8006F26C 0006C1AC 7C 08 02 A6 */ mflr r0 /* 8006F270 0006C1B0 90 01 00 64 */ stw r0, 0x64(r1) /* 8006F274 0006C1B4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8006F278 0006C1B8 48 2F 2F 65 */ bl func_803621DC +/* 8006F278 0006C1B8 48 2F 2F 65 */ bl _savegpr_29 /* 8006F27C 0006C1BC 7C 7F 1B 78 */ mr r31, r3 /* 8006F280 0006C1C0 38 00 00 01 */ li r0, 1 /* 8006F284 0006C1C4 90 03 00 8C */ stw r0, 0x8c(r3) @@ -620,7 +620,7 @@ lbl_8006F9FC: /* 8006FA04 0006C944 90 1F 00 88 */ stw r0, 0x88(r31) /* 8006FA08 0006C948 38 60 00 01 */ li r3, 1 /* 8006FA0C 0006C94C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8006FA10 0006C950 48 2F 28 19 */ bl func_80362228 +/* 8006FA10 0006C950 48 2F 28 19 */ bl _restgpr_29 /* 8006FA14 0006C954 80 01 00 64 */ lwz r0, 0x64(r1) /* 8006FA18 0006C958 7C 08 03 A6 */ mtlr r0 /* 8006FA1C 0006C95C 38 21 00 60 */ addi r1, r1, 0x60 @@ -632,7 +632,7 @@ dVibration_c_NS_StartShock: /* 8006FA28 0006C968 7C 08 02 A6 */ mflr r0 /* 8006FA2C 0006C96C 90 01 00 24 */ stw r0, 0x24(r1) /* 8006FA30 0006C970 39 61 00 20 */ addi r11, r1, 0x20 -/* 8006FA34 0006C974 48 2F 27 A9 */ bl func_803621DC +/* 8006FA34 0006C974 48 2F 27 A9 */ bl _savegpr_29 /* 8006FA38 0006C978 7C 7E 1B 78 */ mr r30, r3 /* 8006FA3C 0006C97C 7C 9F 23 78 */ mr r31, r4 /* 8006FA40 0006C980 3B A0 00 00 */ li r29, 0 @@ -684,7 +684,7 @@ lbl_8006FAA0: lbl_8006FAF4: /* 8006FAF4 0006CA34 7F A3 EB 78 */ mr r3, r29 /* 8006FAF8 0006CA38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8006FAFC 0006CA3C 48 2F 27 2D */ bl func_80362228 +/* 8006FAFC 0006CA3C 48 2F 27 2D */ bl _restgpr_29 /* 8006FB00 0006CA40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8006FB04 0006CA44 7C 08 03 A6 */ mtlr r0 /* 8006FB08 0006CA48 38 21 00 20 */ addi r1, r1, 0x20 @@ -696,7 +696,7 @@ dVibration_c_NS_StartQuake: /* 8006FB14 0006CA54 7C 08 02 A6 */ mflr r0 /* 8006FB18 0006CA58 90 01 00 24 */ stw r0, 0x24(r1) /* 8006FB1C 0006CA5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8006FB20 0006CA60 48 2F 26 BD */ bl func_803621DC +/* 8006FB20 0006CA60 48 2F 26 BD */ bl _savegpr_29 /* 8006FB24 0006CA64 7C 7E 1B 78 */ mr r30, r3 /* 8006FB28 0006CA68 7C 9F 23 78 */ mr r31, r4 /* 8006FB2C 0006CA6C 3B A0 00 00 */ li r29, 0 @@ -752,7 +752,7 @@ lbl_8006FB8C: lbl_8006FBF0: /* 8006FBF0 0006CB30 7F A3 EB 78 */ mr r3, r29 /* 8006FBF4 0006CB34 39 61 00 20 */ addi r11, r1, 0x20 -/* 8006FBF8 0006CB38 48 2F 26 31 */ bl func_80362228 +/* 8006FBF8 0006CB38 48 2F 26 31 */ bl _restgpr_29 /* 8006FBFC 0006CB3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8006FC00 0006CB40 7C 08 03 A6 */ mtlr r0 /* 8006FC04 0006CB44 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 26a4c88f073..57f0c96b918 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -451,7 +451,7 @@ dCamera_c_NS_getEvStringPntData: /* 80088FE4 00085F24 7C 08 02 A6 */ mflr r0 /* 80088FE8 00085F28 90 01 00 24 */ stw r0, 0x24(r1) /* 80088FEC 00085F2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80088FF0 00085F30 48 2D 91 ED */ bl func_803621DC +/* 80088FF0 00085F30 48 2D 91 ED */ bl _savegpr_29 /* 80088FF4 00085F34 7C 7D 1B 78 */ mr r29, r3 /* 80088FF8 00085F38 7C 9E 23 78 */ mr r30, r4 /* 80088FFC 00085F3C 80 03 06 0C */ lwz r0, 0x60c(r3) @@ -489,7 +489,7 @@ lbl_80089068: /* 80089070 00085FB0 38 60 00 00 */ li r3, 0 lbl_80089074: /* 80089074 00085FB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80089078 00085FB8 48 2D 91 B1 */ bl func_80362228 +/* 80089078 00085FB8 48 2D 91 B1 */ bl _restgpr_29 /* 8008907C 00085FBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80089080 00085FC0 7C 08 03 A6 */ mtlr r0 /* 80089084 00085FC4 38 21 00 20 */ addi r1, r1, 0x20 @@ -7761,7 +7761,7 @@ _unnamed_d_ev_camera_cpp__NS_lineCollisionCheck: /* 8008FAF4 0008CA34 DB E1 00 F0 */ stfd f31, 0xf0(r1) /* 8008FAF8 0008CA38 F3 E1 00 F8 */ psq_st f31, 248(r1), 0, qr0 /* 8008FAFC 0008CA3C 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8008FB00 0008CA40 48 2D 26 DD */ bl func_803621DC +/* 8008FB00 0008CA40 48 2D 26 DD */ bl _savegpr_29 /* 8008FB04 0008CA44 7C 7E 1B 78 */ mr r30, r3 /* 8008FB08 0008CA48 88 0D 8A 0A */ lbz r0, lbl_80450F8A-_SDA_BASE_(r13) /* 8008FB0C 0008CA4C 7C 00 07 75 */ extsb. r0, r0 @@ -8192,7 +8192,7 @@ lbl_80090154: /* 80090154 0008D094 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, qr0 /* 80090158 0008D098 CB E1 00 F0 */ lfd f31, 0xf0(r1) /* 8009015C 0008D09C 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 80090160 0008D0A0 48 2D 20 C9 */ bl func_80362228 +/* 80090160 0008D0A0 48 2D 20 C9 */ bl _restgpr_29 /* 80090164 0008D0A4 80 01 01 04 */ lwz r0, 0x104(r1) /* 80090168 0008D0A8 7C 08 03 A6 */ mtlr r0 /* 8009016C 0008D0AC 38 21 01 00 */ addi r1, r1, 0x100 @@ -8250,7 +8250,7 @@ lbl_800901F0: /* 80090234 0008D174 7C 08 02 A6 */ mflr r0 /* 80090238 0008D178 90 01 00 24 */ stw r0, 0x24(r1) /* 8009023C 0008D17C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80090240 0008D180 48 2D 1F 9D */ bl func_803621DC +/* 80090240 0008D180 48 2D 1F 9D */ bl _savegpr_29 /* 80090244 0008D184 7C 7E 1B 78 */ mr r30, r3 /* 80090248 0008D188 80 03 01 74 */ lwz r0, 0x174(r3) /* 8009024C 0008D18C 28 00 00 00 */ cmplwi r0, 0 @@ -8400,7 +8400,7 @@ lbl_8009045C: /* 8009045C 0008D39C 38 60 00 00 */ li r3, 0 lbl_80090460: /* 80090460 0008D3A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80090464 0008D3A4 48 2D 1D C5 */ bl func_80362228 +/* 80090464 0008D3A4 48 2D 1D C5 */ bl _restgpr_29 /* 80090468 0008D3A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8009046C 0008D3AC 7C 08 03 A6 */ mtlr r0 /* 80090470 0008D3B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -10626,7 +10626,7 @@ lbl_8009256C: /* 80092598 0008F4D8 DB E1 00 C0 */ stfd f31, 0xc0(r1) /* 8009259C 0008F4DC F3 E1 00 C8 */ psq_st f31, 200(r1), 0, qr0 /* 800925A0 0008F4E0 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 800925A4 0008F4E4 48 2C FC 39 */ bl func_803621DC +/* 800925A4 0008F4E4 48 2C FC 39 */ bl _savegpr_29 /* 800925A8 0008F4E8 7C 7E 1B 78 */ mr r30, r3 /* 800925AC 0008F4EC 3B FE 03 E8 */ addi r31, r30, 0x3e8 /* 800925B0 0008F4F0 38 A1 00 7C */ addi r5, r1, 0x7c @@ -10889,7 +10889,7 @@ lbl_8009298C: /* 8009298C 0008F8CC E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0 /* 80092990 0008F8D0 CB E1 00 C0 */ lfd f31, 0xc0(r1) /* 80092994 0008F8D4 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80092998 0008F8D8 48 2C F8 91 */ bl func_80362228 +/* 80092998 0008F8D8 48 2C F8 91 */ bl _restgpr_29 /* 8009299C 0008F8DC 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800929A0 0008F8E0 7C 08 03 A6 */ mtlr r0 /* 800929A4 0008F8E4 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -13066,7 +13066,7 @@ lbl_80094A50: /* 80094A7C 000919BC DB E1 01 10 */ stfd f31, 0x110(r1) /* 80094A80 000919C0 F3 E1 01 18 */ psq_st f31, 280(r1), 0, qr0 /* 80094A84 000919C4 39 61 01 10 */ addi r11, r1, 0x110 -/* 80094A88 000919C8 48 2C D7 55 */ bl func_803621DC +/* 80094A88 000919C8 48 2C D7 55 */ bl _savegpr_29 /* 80094A8C 000919CC 7C 7E 1B 78 */ mr r30, r3 /* 80094A90 000919D0 3B E0 00 00 */ li r31, 0 /* 80094A94 000919D4 80 03 01 74 */ lwz r0, 0x174(r3) @@ -13429,7 +13429,7 @@ lbl_80094FF0: /* 80094FF0 00091F30 E3 E1 01 18 */ psq_l f31, 280(r1), 0, qr0 /* 80094FF4 00091F34 CB E1 01 10 */ lfd f31, 0x110(r1) /* 80094FF8 00091F38 39 61 01 10 */ addi r11, r1, 0x110 -/* 80094FFC 00091F3C 48 2C D2 2D */ bl func_80362228 +/* 80094FFC 00091F3C 48 2C D2 2D */ bl _restgpr_29 /* 80095000 00091F40 80 01 01 24 */ lwz r0, 0x124(r1) /* 80095004 00091F44 7C 08 03 A6 */ mtlr r0 /* 80095008 00091F48 38 21 01 20 */ addi r1, r1, 0x120 @@ -13906,7 +13906,7 @@ lbl_800956CC: /* 800956E8 00092628 7C 08 02 A6 */ mflr r0 /* 800956EC 0009262C 90 01 01 44 */ stw r0, 0x144(r1) /* 800956F0 00092630 39 61 01 40 */ addi r11, r1, 0x140 -/* 800956F4 00092634 48 2C CA E9 */ bl func_803621DC +/* 800956F4 00092634 48 2C CA E9 */ bl _savegpr_29 /* 800956F8 00092638 7C 7E 1B 78 */ mr r30, r3 /* 800956FC 0009263C 88 0D 8A 0B */ lbz r0, lbl_80450F8B-_SDA_BASE_(r13) /* 80095700 00092640 7C 00 07 75 */ extsb. r0, r0 @@ -14416,7 +14416,7 @@ lbl_80095D88: /* 80095E60 00092DA0 38 60 00 01 */ li r3, 1 lbl_80095E64: /* 80095E64 00092DA4 39 61 01 40 */ addi r11, r1, 0x140 -/* 80095E68 00092DA8 48 2C C3 C1 */ bl func_80362228 +/* 80095E68 00092DA8 48 2C C3 C1 */ bl _restgpr_29 /* 80095E6C 00092DAC 80 01 01 44 */ lwz r0, 0x144(r1) /* 80095E70 00092DB0 7C 08 03 A6 */ mtlr r0 /* 80095E74 00092DB4 38 21 01 40 */ addi r1, r1, 0x140 @@ -15515,7 +15515,7 @@ lbl_80096EB4: /* 80096EE0 00093E20 7C 08 02 A6 */ mflr r0 /* 80096EE4 00093E24 90 01 01 54 */ stw r0, 0x154(r1) /* 80096EE8 00093E28 39 61 01 50 */ addi r11, r1, 0x150 -/* 80096EEC 00093E2C 48 2C B2 F1 */ bl func_803621DC +/* 80096EEC 00093E2C 48 2C B2 F1 */ bl _savegpr_29 /* 80096EF0 00093E30 7C 7E 1B 78 */ mr r30, r3 /* 80096EF4 00093E34 3B FE 03 E8 */ addi r31, r30, 0x3e8 /* 80096EF8 00093E38 3C 80 80 38 */ lis r4, lbl_8037AAE4@ha @@ -16028,7 +16028,7 @@ lbl_80097678: /* 80097678 000945B8 38 60 00 01 */ li r3, 1 lbl_8009767C: /* 8009767C 000945BC 39 61 01 50 */ addi r11, r1, 0x150 -/* 80097680 000945C0 48 2C AB A9 */ bl func_80362228 +/* 80097680 000945C0 48 2C AB A9 */ bl _restgpr_29 /* 80097684 000945C4 80 01 01 54 */ lwz r0, 0x154(r1) /* 80097688 000945C8 7C 08 03 A6 */ mtlr r0 /* 8009768C 000945CC 38 21 01 50 */ addi r1, r1, 0x150 diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index 38aa01e95bf..113bc8cd950 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -69,7 +69,7 @@ getStartTelopNo: /* 800437F4 00040734 7C 08 02 A6 */ mflr r0 /* 800437F8 00040738 90 01 00 24 */ stw r0, 0x24(r1) /* 800437FC 0004073C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043800 00040740 48 31 E9 DD */ bl func_803621DC +/* 80043800 00040740 48 31 E9 DD */ bl _savegpr_29 /* 80043804 00040744 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80043808 00040748 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8004380C 0004074C 3B A3 4E 00 */ addi r29, r3, 0x4e00 @@ -214,7 +214,7 @@ lbl_800439F8: /* 800439F8 00040938 A0 7E 00 04 */ lhz r3, 4(r30) lbl_800439FC: /* 800439FC 0004093C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80043A00 00040940 48 31 E8 29 */ bl func_80362228 +/* 80043A00 00040940 48 31 E8 29 */ bl _restgpr_29 /* 80043A04 00040944 80 01 00 24 */ lwz r0, 0x24(r1) /* 80043A08 00040948 7C 08 03 A6 */ mtlr r0 /* 80043A0C 0004094C 38 21 00 20 */ addi r1, r1, 0x20 @@ -779,7 +779,7 @@ dEvDtStaff_c_NS_specialProcLight: /* 80044194 000410D4 7C 08 02 A6 */ mflr r0 /* 80044198 000410D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8004419C 000410DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800441A0 000410E0 48 31 E0 3D */ bl func_803621DC +/* 800441A0 000410E0 48 31 E0 3D */ bl _savegpr_29 /* 800441A4 000410E4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 800441A8 000410E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800441AC 000410EC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 @@ -879,7 +879,7 @@ lbl_80044300: /* 80044308 00041248 48 00 3E 75 */ bl dEvent_manager_c_NS_cutEnd lbl_8004430C: /* 8004430C 0004124C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80044310 00041250 48 31 DF 19 */ bl func_80362228 +/* 80044310 00041250 48 31 DF 19 */ bl _restgpr_29 /* 80044314 00041254 80 01 00 24 */ lwz r0, 0x24(r1) /* 80044318 00041258 7C 08 03 A6 */ mtlr r0 /* 8004431C 0004125C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3032,7 +3032,7 @@ dEvDtBase_c_NS_init_X1_: /* 80046170 000430B0 7C 08 02 A6 */ mflr r0 /* 80046174 000430B4 90 01 00 24 */ stw r0, 0x24(r1) /* 80046178 000430B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004617C 000430BC 48 31 C0 61 */ bl func_803621DC +/* 8004617C 000430BC 48 31 C0 61 */ bl _savegpr_29 /* 80046180 000430C0 7C 7D 1B 78 */ mr r29, r3 /* 80046184 000430C4 7C 9E 23 78 */ mr r30, r4 /* 80046188 000430C8 7C BF 2B 78 */ mr r31, r5 @@ -3104,7 +3104,7 @@ lbl_80046268: /* 80046270 000431B0 80 63 00 04 */ lwz r3, 4(r3) lbl_80046274: /* 80046274 000431B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046278 000431B8 48 31 BF B1 */ bl func_80362228 +/* 80046278 000431B8 48 31 BF B1 */ bl _restgpr_29 /* 8004627C 000431BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046280 000431C0 7C 08 03 A6 */ mtlr r0 /* 80046284 000431C4 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 67e07495b90..20801a235d1 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -17,7 +17,7 @@ dEvent_exception_c_NS_setStartDemo: /* 800463F4 00043334 7C 08 02 A6 */ mflr r0 /* 800463F8 00043338 90 01 00 24 */ stw r0, 0x24(r1) /* 800463FC 0004333C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046400 00043340 48 31 BD DD */ bl func_803621DC +/* 80046400 00043340 48 31 BD DD */ bl _savegpr_29 /* 80046404 00043344 7C 7D 1B 78 */ mr r29, r3 /* 80046408 00043348 7C 9E 23 78 */ mr r30, r4 /* 8004640C 0004334C 8B ED 87 E4 */ lbz r31, lbl_80450D64-_SDA_BASE_(r13) @@ -47,7 +47,7 @@ lbl_80046464: /* 80046464 000433A4 7F C3 F3 78 */ mr r3, r30 lbl_80046468: /* 80046468 000433A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004646C 000433AC 48 31 BD BD */ bl func_80362228 +/* 8004646C 000433AC 48 31 BD BD */ bl _restgpr_29 /* 80046470 000433B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046474 000433B4 7C 08 03 A6 */ mtlr r0 /* 80046478 000433B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -256,7 +256,7 @@ dEvent_manager_c_NS_create: /* 80046714 00043654 7C 08 02 A6 */ mflr r0 /* 80046718 00043658 90 01 00 24 */ stw r0, 0x24(r1) /* 8004671C 0004365C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046720 00043660 48 31 BA BD */ bl func_803621DC +/* 80046720 00043660 48 31 BA BD */ bl _savegpr_29 /* 80046724 00043664 7C 7D 1B 78 */ mr r29, r3 /* 80046728 00043668 38 00 00 00 */ li r0, 0 /* 8004672C 0004366C 90 03 01 8C */ stw r0, 0x18c(r3) @@ -308,7 +308,7 @@ lbl_80046764: /* 800467E0 00043720 4B FF F9 59 */ bl dEvDtBase_c_NS_init /* 800467E4 00043724 38 60 00 01 */ li r3, 1 /* 800467E8 00043728 39 61 00 20 */ addi r11, r1, 0x20 -/* 800467EC 0004372C 48 31 BA 3D */ bl func_80362228 +/* 800467EC 0004372C 48 31 BA 3D */ bl _restgpr_29 /* 800467F0 00043730 80 01 00 24 */ lwz r0, 0x24(r1) /* 800467F4 00043734 7C 08 03 A6 */ mtlr r0 /* 800467F8 00043738 38 21 00 20 */ addi r1, r1, 0x20 @@ -494,7 +494,7 @@ dEvent_manager_c_NS_orderStartDemo: /* 80046A5C 0004399C 7C 08 02 A6 */ mflr r0 /* 80046A60 000439A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80046A64 000439A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046A68 000439A8 48 31 B7 75 */ bl func_803621DC +/* 80046A68 000439A8 48 31 B7 75 */ bl _savegpr_29 /* 80046A6C 000439AC 7C 7F 1B 78 */ mr r31, r3 /* 80046A70 000439B0 38 60 00 00 */ li r3, 0 /* 80046A74 000439B4 80 1F 01 90 */ lwz r0, 0x190(r31) @@ -602,7 +602,7 @@ lbl_80046BF0: /* 80046BF0 00043B30 7F C3 07 34 */ extsh r3, r30 lbl_80046BF4: /* 80046BF4 00043B34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046BF8 00043B38 48 31 B6 31 */ bl func_80362228 +/* 80046BF8 00043B38 48 31 B6 31 */ bl _restgpr_29 /* 80046BFC 00043B3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046C00 00043B40 7C 08 03 A6 */ mtlr r0 /* 80046C04 00043B44 38 21 00 20 */ addi r1, r1, 0x20 @@ -614,7 +614,7 @@ dEvent_manager_c_NS_remove: /* 80046C10 00043B50 7C 08 02 A6 */ mflr r0 /* 80046C14 00043B54 90 01 00 24 */ stw r0, 0x24(r1) /* 80046C18 00043B58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046C1C 00043B5C 48 31 B5 C1 */ bl func_803621DC +/* 80046C1C 00043B5C 48 31 B5 C1 */ bl _savegpr_29 /* 80046C20 00043B60 7C 7D 1B 78 */ mr r29, r3 /* 80046C24 00043B64 3B C0 00 00 */ li r30, 0 /* 80046C28 00043B68 3B E0 00 00 */ li r31, 0 @@ -632,7 +632,7 @@ lbl_80046C2C: /* 80046C54 00043B94 38 7D 01 BC */ addi r3, r29, 0x1bc /* 80046C58 00043B98 4B FF D2 01 */ bl dEvDtFlag_c_NS_init /* 80046C5C 00043B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046C60 00043BA0 48 31 B5 C9 */ bl func_80362228 +/* 80046C60 00043BA0 48 31 B5 C9 */ bl _restgpr_29 /* 80046C64 00043BA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046C68 00043BA8 7C 08 03 A6 */ mtlr r0 /* 80046C6C 00043BAC 38 21 00 20 */ addi r1, r1, 0x20 @@ -739,7 +739,7 @@ dEvent_manager_c_NS_endProc: /* 80046DB0 00043CF0 7C 08 02 A6 */ mflr r0 /* 80046DB4 00043CF4 90 01 00 24 */ stw r0, 0x24(r1) /* 80046DB8 00043CF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046DBC 00043CFC 48 31 B4 21 */ bl func_803621DC +/* 80046DBC 00043CFC 48 31 B4 21 */ bl _savegpr_29 /* 80046DC0 00043D00 7C 7D 1B 78 */ mr r29, r3 /* 80046DC4 00043D04 7C BE 2B 78 */ mr r30, r5 /* 80046DC8 00043D08 48 00 06 F5 */ bl dEvent_manager_c_NS_getEventData_X1_ @@ -780,7 +780,7 @@ lbl_80046DE8: /* 80046E48 00043D88 4B FF C8 75 */ bl dEvt_control_c_NS_setPtI lbl_80046E4C: /* 80046E4C 00043D8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046E50 00043D90 48 31 B3 D9 */ bl func_80362228 +/* 80046E50 00043D90 48 31 B3 D9 */ bl _restgpr_29 /* 80046E54 00043D94 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046E58 00043D98 7C 08 03 A6 */ mtlr r0 /* 80046E5C 00043D9C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1397,7 +1397,7 @@ dEvent_manager_c_NS_getEventIdx_X1_: /* 8004769C 000445DC 7C 08 02 A6 */ mflr r0 /* 800476A0 000445E0 90 01 00 24 */ stw r0, 0x24(r1) /* 800476A4 000445E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800476A8 000445E8 48 31 AB 35 */ bl func_803621DC +/* 800476A8 000445E8 48 31 AB 35 */ bl _savegpr_29 /* 800476AC 000445EC 7C 7D 1B 78 */ mr r29, r3 /* 800476B0 000445F0 7C 9E 23 78 */ mr r30, r4 /* 800476B4 000445F4 7C BF 2B 78 */ mr r31, r5 @@ -1439,7 +1439,7 @@ lbl_8004773C: /* 8004773C 0004467C 38 60 FF FF */ li r3, -1 lbl_80047740: /* 80047740 00044680 39 61 00 20 */ addi r11, r1, 0x20 -/* 80047744 00044684 48 31 AA E5 */ bl func_80362228 +/* 80047744 00044684 48 31 AA E5 */ bl _restgpr_29 /* 80047748 00044688 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004774C 0004468C 7C 08 03 A6 */ mtlr r0 /* 80047750 00044690 38 21 00 20 */ addi r1, r1, 0x20 @@ -2086,7 +2086,7 @@ dEvent_manager_c_NS_getMyDataP: /* 80047FCC 00044F0C 7C 08 02 A6 */ mflr r0 /* 80047FD0 00044F10 90 01 00 24 */ stw r0, 0x24(r1) /* 80047FD4 00044F14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80047FD8 00044F18 48 31 A2 05 */ bl func_803621DC +/* 80047FD8 00044F18 48 31 A2 05 */ bl _savegpr_29 /* 80047FDC 00044F1C 7C 7E 1B 78 */ mr r30, r3 /* 80047FE0 00044F20 7C BF 2B 78 */ mr r31, r5 /* 80047FE4 00044F24 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2159,7 +2159,7 @@ lbl_800480C8: /* 800480D0 00045010 38 60 00 00 */ li r3, 0 lbl_800480D4: /* 800480D4 00045014 39 61 00 20 */ addi r11, r1, 0x20 -/* 800480D8 00045018 48 31 A1 51 */ bl func_80362228 +/* 800480D8 00045018 48 31 A1 51 */ bl _restgpr_29 /* 800480DC 0004501C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800480E0 00045020 7C 08 03 A6 */ mtlr r0 /* 800480E4 00045024 38 21 00 20 */ addi r1, r1, 0x20 @@ -2493,7 +2493,7 @@ dEvent_manager_c_NS_specialCast_Shutter: /* 80048524 00045464 7C 08 02 A6 */ mflr r0 /* 80048528 00045468 90 01 00 34 */ stw r0, 0x34(r1) /* 8004852C 0004546C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80048530 00045470 48 31 9C AD */ bl func_803621DC +/* 80048530 00045470 48 31 9C AD */ bl _savegpr_29 /* 80048534 00045474 7C 7F 1B 78 */ mr r31, r3 /* 80048538 00045478 7C BD 2B 78 */ mr r29, r5 /* 8004853C 0004547C B0 81 00 08 */ sth r4, 8(r1) @@ -2549,7 +2549,7 @@ dEvent_manager_c_NS_specialCast_Shutter: lbl_800485FC: /* 800485FC 0004553C 7F C3 F3 78 */ mr r3, r30 /* 80048600 00045540 39 61 00 30 */ addi r11, r1, 0x30 -/* 80048604 00045544 48 31 9C 25 */ bl func_80362228 +/* 80048604 00045544 48 31 9C 25 */ bl _restgpr_29 /* 80048608 00045548 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004860C 0004554C 7C 08 03 A6 */ mtlr r0 /* 80048610 00045550 38 21 00 30 */ addi r1, r1, 0x30 @@ -2561,7 +2561,7 @@ dEvent_manager_c_NS_specialCast: /* 8004861C 0004555C 7C 08 02 A6 */ mflr r0 /* 80048620 00045560 90 01 00 24 */ stw r0, 0x24(r1) /* 80048624 00045564 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048628 00045568 48 31 9B B5 */ bl func_803621DC +/* 80048628 00045568 48 31 9B B5 */ bl _savegpr_29 /* 8004862C 0004556C 7C 7D 1B 78 */ mr r29, r3 /* 80048630 00045570 7C BE 2B 78 */ mr r30, r5 /* 80048634 00045574 3B E0 00 00 */ li r31, 0 @@ -2637,7 +2637,7 @@ lbl_8004872C: /* 8004872C 0004566C 7F E3 FB 78 */ mr r3, r31 lbl_80048730: /* 80048730 00045670 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048734 00045674 48 31 9A F5 */ bl func_80362228 +/* 80048734 00045674 48 31 9A F5 */ bl _restgpr_29 /* 80048738 00045678 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004873C 0004567C 7C 08 03 A6 */ mtlr r0 /* 80048740 00045680 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 252632b9afc..36724b20fe3 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -1615,7 +1615,7 @@ dFile_select_c_NS_selectDataBaseMoveAnmInitSet: /* 80184CB8 00181BF8 7C 08 02 A6 */ mflr r0 /* 80184CBC 00181BFC 90 01 00 24 */ stw r0, 0x24(r1) /* 80184CC0 00181C00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80184CC4 00181C04 48 1D D5 19 */ bl func_803621DC +/* 80184CC4 00181C04 48 1D D5 19 */ bl _savegpr_29 /* 80184CC8 00181C08 7C 7D 1B 78 */ mr r29, r3 /* 80184CCC 00181C0C 7C 9E 23 78 */ mr r30, r4 /* 80184CD0 00181C10 7C BF 2B 78 */ mr r31, r5 @@ -1644,7 +1644,7 @@ dFile_select_c_NS_selectDataBaseMoveAnmInitSet: /* 80184D2C 00181C6C 38 00 00 01 */ li r0, 1 /* 80184D30 00181C70 98 1D 00 B9 */ stb r0, 0xb9(r29) /* 80184D34 00181C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80184D38 00181C78 48 1D D4 F1 */ bl func_80362228 +/* 80184D38 00181C78 48 1D D4 F1 */ bl _restgpr_29 /* 80184D3C 00181C7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80184D40 00181C80 7C 08 03 A6 */ mtlr r0 /* 80184D44 00181C84 38 21 00 20 */ addi r1, r1, 0x20 @@ -2483,7 +2483,7 @@ dFile_select_c_NS_selectDataMoveAnmInitSet: /* 80185998 001828D8 7C 08 02 A6 */ mflr r0 /* 8018599C 001828DC 90 01 00 24 */ stw r0, 0x24(r1) /* 801859A0 001828E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801859A4 001828E4 48 1D C8 39 */ bl func_803621DC +/* 801859A4 001828E4 48 1D C8 39 */ bl _savegpr_29 /* 801859A8 001828E8 7C 7F 1B 78 */ mr r31, r3 /* 801859AC 001828EC 7C 9D 23 78 */ mr r29, r4 /* 801859B0 001828F0 7C BE 2B 78 */ mr r30, r5 @@ -2544,7 +2544,7 @@ dFile_select_c_NS_selectDataMoveAnmInitSet: /* 80185A8C 001829CC 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80185A90 001829D0 48 17 25 3D */ bl J2DPane_NS_animationTransform /* 80185A94 001829D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80185A98 001829D8 48 1D C7 91 */ bl func_80362228 +/* 80185A98 001829D8 48 1D C7 91 */ bl _restgpr_29 /* 80185A9C 001829DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80185AA0 001829E0 7C 08 03 A6 */ mtlr r0 /* 80185AA4 001829E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2556,7 +2556,7 @@ dFile_select_c_NS_selectDataMoveAnm: /* 80185AB0 001829F0 7C 08 02 A6 */ mflr r0 /* 80185AB4 001829F4 90 01 00 24 */ stw r0, 0x24(r1) /* 80185AB8 001829F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80185ABC 001829FC 48 1D C7 21 */ bl func_803621DC +/* 80185ABC 001829FC 48 1D C7 21 */ bl _savegpr_29 /* 80185AC0 00182A00 7C 7F 1B 78 */ mr r31, r3 /* 80185AC4 00182A04 88 03 02 65 */ lbz r0, 0x265(r3) /* 80185AC8 00182A08 54 00 10 3A */ slwi r0, r0, 2 @@ -2650,7 +2650,7 @@ lbl_80185C10: /* 80185C10 00182B50 38 60 00 00 */ li r3, 0 lbl_80185C14: /* 80185C14 00182B54 39 61 00 20 */ addi r11, r1, 0x20 -/* 80185C18 00182B58 48 1D C6 11 */ bl func_80362228 +/* 80185C18 00182B58 48 1D C6 11 */ bl _restgpr_29 /* 80185C1C 00182B5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80185C20 00182B60 7C 08 03 A6 */ mtlr r0 /* 80185C24 00182B64 38 21 00 20 */ addi r1, r1, 0x20 @@ -3980,7 +3980,7 @@ lbl_80186F84: /* 80186F9C 00183EDC 7C 08 02 A6 */ mflr r0 /* 80186FA0 00183EE0 90 01 00 24 */ stw r0, 0x24(r1) /* 80186FA4 00183EE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80186FA8 00183EE8 48 1D B2 35 */ bl func_803621DC +/* 80186FA8 00183EE8 48 1D B2 35 */ bl _savegpr_29 /* 80186FAC 00183EEC 7C 7E 1B 78 */ mr r30, r3 /* 80186FB0 00183EF0 3B E0 00 01 */ li r31, 1 /* 80186FB4 00183EF4 88 03 02 67 */ lbz r0, 0x267(r3) @@ -4142,7 +4142,7 @@ lbl_801871FC: /* 80187200 00184140 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_80187204: /* 80187204 00184144 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187208 00184148 48 1D B0 21 */ bl func_80362228 +/* 80187208 00184148 48 1D B0 21 */ bl _restgpr_29 /* 8018720C 0018414C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80187210 00184150 7C 08 03 A6 */ mtlr r0 /* 80187214 00184154 38 21 00 20 */ addi r1, r1, 0x20 @@ -4802,7 +4802,7 @@ dFile_select_c_NS_copySelMoveAnmInitSet: /* 80187BEC 00184B2C 7C 08 02 A6 */ mflr r0 /* 80187BF0 00184B30 90 01 00 24 */ stw r0, 0x24(r1) /* 80187BF4 00184B34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187BF8 00184B38 48 1D A5 E5 */ bl func_803621DC +/* 80187BF8 00184B38 48 1D A5 E5 */ bl _savegpr_29 /* 80187BFC 00184B3C 7C 7D 1B 78 */ mr r29, r3 /* 80187C00 00184B40 7C 9E 23 78 */ mr r30, r4 /* 80187C04 00184B44 7C BF 2B 78 */ mr r31, r5 @@ -4910,7 +4910,7 @@ lbl_80187D50: /* 80187D98 00184CD8 80 7D 01 1C */ lwz r3, 0x11c(r29) /* 80187D9C 00184CDC 48 17 02 31 */ bl J2DPane_NS_animationTransform /* 80187DA0 00184CE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80187DA4 00184CE4 48 1D A4 85 */ bl func_80362228 +/* 80187DA4 00184CE4 48 1D A4 85 */ bl _restgpr_29 /* 80187DA8 00184CE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80187DAC 00184CEC 7C 08 03 A6 */ mtlr r0 /* 80187DB0 00184CF0 38 21 00 20 */ addi r1, r1, 0x20 @@ -5873,7 +5873,7 @@ dFile_select_c_NS_yesnoMenuMoveAnmInitSet: /* 80188BC0 00185B00 7C 08 02 A6 */ mflr r0 /* 80188BC4 00185B04 90 01 00 34 */ stw r0, 0x34(r1) /* 80188BC8 00185B08 39 61 00 30 */ addi r11, r1, 0x30 -/* 80188BCC 00185B0C 48 1D 96 11 */ bl func_803621DC +/* 80188BCC 00185B0C 48 1D 96 11 */ bl _savegpr_29 /* 80188BD0 00185B10 7C 7D 1B 78 */ mr r29, r3 /* 80188BD4 00185B14 7C 9E 23 78 */ mr r30, r4 /* 80188BD8 00185B18 7C BF 2B 78 */ mr r31, r5 @@ -5961,7 +5961,7 @@ lbl_80188C94: /* 80188D18 00185C58 80 63 00 04 */ lwz r3, 4(r3) /* 80188D1C 00185C5C 48 16 F2 B1 */ bl J2DPane_NS_animationTransform /* 80188D20 00185C60 39 61 00 30 */ addi r11, r1, 0x30 -/* 80188D24 00185C64 48 1D 95 05 */ bl func_80362228 +/* 80188D24 00185C64 48 1D 95 05 */ bl _restgpr_29 /* 80188D28 00185C68 80 01 00 34 */ lwz r0, 0x34(r1) /* 80188D2C 00185C6C 7C 08 03 A6 */ mtlr r0 /* 80188D30 00185C70 38 21 00 30 */ addi r1, r1, 0x30 @@ -6084,7 +6084,7 @@ dFile_select_c_NS_yesnoSelectMoveAnm: /* 80188ED4 00185E14 7C 08 02 A6 */ mflr r0 /* 80188ED8 00185E18 90 01 00 24 */ stw r0, 0x24(r1) /* 80188EDC 00185E1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80188EE0 00185E20 48 1D 92 FD */ bl func_803621DC +/* 80188EE0 00185E20 48 1D 92 FD */ bl _savegpr_29 /* 80188EE4 00185E24 7C 7D 1B 78 */ mr r29, r3 /* 80188EE8 00185E28 3B E0 00 00 */ li r31, 0 /* 80188EEC 00185E2C 3B C0 00 01 */ li r30, 1 @@ -6235,7 +6235,7 @@ lbl_8018910C: lbl_80189110: /* 80189110 00186050 7F E3 FB 78 */ mr r3, r31 /* 80189114 00186054 39 61 00 20 */ addi r11, r1, 0x20 -/* 80189118 00186058 48 1D 91 11 */ bl func_80362228 +/* 80189118 00186058 48 1D 91 11 */ bl _restgpr_29 /* 8018911C 0018605C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80189120 00186060 7C 08 03 A6 */ mtlr r0 /* 80189124 00186064 38 21 00 20 */ addi r1, r1, 0x20 @@ -7352,7 +7352,7 @@ lbl_8018A180: /* 8018A198 001870D8 7C 08 02 A6 */ mflr r0 /* 8018A19C 001870DC 90 01 00 24 */ stw r0, 0x24(r1) /* 8018A1A0 001870E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A1A4 001870E4 48 1D 80 39 */ bl func_803621DC +/* 8018A1A4 001870E4 48 1D 80 39 */ bl _savegpr_29 /* 8018A1A8 001870E8 7C 7F 1B 78 */ mr r31, r3 /* 8018A1AC 001870EC 88 03 02 65 */ lbz r0, 0x265(r3) /* 8018A1B0 001870F0 54 00 10 3A */ slwi r0, r0, 2 @@ -7428,7 +7428,7 @@ lbl_8018A23C: /* 8018A2C0 00187200 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_8018A2C4: /* 8018A2C4 00187204 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A2C8 00187208 48 1D 7F 61 */ bl func_80362228 +/* 8018A2C8 00187208 48 1D 7F 61 */ bl _restgpr_29 /* 8018A2CC 0018720C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018A2D0 00187210 7C 08 03 A6 */ mtlr r0 /* 8018A2D4 00187214 38 21 00 20 */ addi r1, r1, 0x20 @@ -7437,7 +7437,7 @@ lbl_8018A2C4: /* 8018A2E0 00187220 7C 08 02 A6 */ mflr r0 /* 8018A2E4 00187224 90 01 00 24 */ stw r0, 0x24(r1) /* 8018A2E8 00187228 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A2EC 0018722C 48 1D 7E F1 */ bl func_803621DC +/* 8018A2EC 0018722C 48 1D 7E F1 */ bl _savegpr_29 /* 8018A2F0 00187230 7C 7F 1B 78 */ mr r31, r3 /* 8018A2F4 00187234 48 00 2F 69 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 8018A2F8 00187238 7C 7D 1B 78 */ mr r29, r3 @@ -7482,7 +7482,7 @@ lbl_8018A2C4: /* 8018A394 001872D4 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_8018A398: /* 8018A398 001872D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A39C 001872DC 48 1D 7E 8D */ bl func_80362228 +/* 8018A39C 001872DC 48 1D 7E 8D */ bl _restgpr_29 /* 8018A3A0 001872E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018A3A4 001872E4 7C 08 03 A6 */ mtlr r0 /* 8018A3A8 001872E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -7530,7 +7530,7 @@ lbl_8018A430: /* 8018A448 00187388 7C 08 02 A6 */ mflr r0 /* 8018A44C 0018738C 90 01 00 24 */ stw r0, 0x24(r1) /* 8018A450 00187390 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A454 00187394 48 1D 7D 89 */ bl func_803621DC +/* 8018A454 00187394 48 1D 7D 89 */ bl _savegpr_29 /* 8018A458 00187398 7C 7D 1B 78 */ mr r29, r3 /* 8018A45C 0018739C 48 00 2E 01 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 8018A460 001873A0 7C 7E 1B 78 */ mr r30, r3 @@ -7557,7 +7557,7 @@ lbl_8018A430: /* 8018A4B4 001873F4 98 1D 02 6F */ stb r0, 0x26f(r29) lbl_8018A4B8: /* 8018A4B8 001873F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018A4BC 001873FC 48 1D 7D 6D */ bl func_80362228 +/* 8018A4BC 001873FC 48 1D 7D 6D */ bl _restgpr_29 /* 8018A4C0 00187400 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018A4C4 00187404 7C 08 03 A6 */ mtlr r0 /* 8018A4C8 00187408 38 21 00 20 */ addi r1, r1, 0x20 @@ -10731,7 +10731,7 @@ dFile_select_c_NS_modoruTxtDispAnm: /* 8018D420 0018A360 7C 08 02 A6 */ mflr r0 /* 8018D424 0018A364 90 01 00 24 */ stw r0, 0x24(r1) /* 8018D428 0018A368 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D42C 0018A36C 48 1D 4D B1 */ bl func_803621DC +/* 8018D42C 0018A36C 48 1D 4D B1 */ bl _savegpr_29 /* 8018D430 0018A370 7C 7D 1B 78 */ mr r29, r3 /* 8018D434 0018A374 88 03 02 4A */ lbz r0, 0x24a(r3) /* 8018D438 0018A378 28 00 00 00 */ cmplwi r0, 0 @@ -10781,7 +10781,7 @@ lbl_8018D4DC: /* 8018D4DC 0018A41C 38 60 00 00 */ li r3, 0 lbl_8018D4E0: /* 8018D4E0 0018A420 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D4E4 0018A424 48 1D 4D 45 */ bl func_80362228 +/* 8018D4E4 0018A424 48 1D 4D 45 */ bl _restgpr_29 /* 8018D4E8 0018A428 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018D4EC 0018A42C 7C 08 03 A6 */ mtlr r0 /* 8018D4F0 0018A430 38 21 00 20 */ addi r1, r1, 0x20 @@ -10830,7 +10830,7 @@ dFile_select_c_NS_ketteiTxtDispAnm: /* 8018D578 0018A4B8 7C 08 02 A6 */ mflr r0 /* 8018D57C 0018A4BC 90 01 00 24 */ stw r0, 0x24(r1) /* 8018D580 0018A4C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D584 0018A4C4 48 1D 4C 59 */ bl func_803621DC +/* 8018D584 0018A4C4 48 1D 4C 59 */ bl _savegpr_29 /* 8018D588 0018A4C8 7C 7D 1B 78 */ mr r29, r3 /* 8018D58C 0018A4CC 88 03 02 4B */ lbz r0, 0x24b(r3) /* 8018D590 0018A4D0 28 00 00 00 */ cmplwi r0, 0 @@ -10880,7 +10880,7 @@ lbl_8018D634: /* 8018D634 0018A574 38 60 00 00 */ li r3, 0 lbl_8018D638: /* 8018D638 0018A578 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018D63C 0018A57C 48 1D 4B ED */ bl func_80362228 +/* 8018D63C 0018A57C 48 1D 4B ED */ bl _restgpr_29 /* 8018D640 0018A580 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018D644 0018A584 7C 08 03 A6 */ mtlr r0 /* 8018D648 0018A588 38 21 00 20 */ addi r1, r1, 0x20 @@ -11481,7 +11481,7 @@ lbl_8018DEA4: /* 8018DEF8 0018AE38 7C 08 02 A6 */ mflr r0 /* 8018DEFC 0018AE3C 90 01 00 84 */ stw r0, 0x84(r1) /* 8018DF00 0018AE40 39 61 00 80 */ addi r11, r1, 0x80 -/* 8018DF04 0018AE44 48 1D 42 D9 */ bl func_803621DC +/* 8018DF04 0018AE44 48 1D 42 D9 */ bl _savegpr_29 /* 8018DF08 0018AE48 7C 7D 1B 78 */ mr r29, r3 /* 8018DF0C 0018AE4C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8018DF10 0018AE50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -11538,7 +11538,7 @@ lbl_8018DEA4: /* 8018DFDC 0018AF1C 7F E4 FB 78 */ mr r4, r31 /* 8018DFE0 0018AF20 48 16 AE F5 */ bl J2DScreen_NS_draw /* 8018DFE4 0018AF24 39 61 00 80 */ addi r11, r1, 0x80 -/* 8018DFE8 0018AF28 48 1D 42 41 */ bl func_80362228 +/* 8018DFE8 0018AF28 48 1D 42 41 */ bl _restgpr_29 /* 8018DFEC 0018AF2C 80 01 00 84 */ lwz r0, 0x84(r1) /* 8018DFF0 0018AF30 7C 08 03 A6 */ mtlr r0 /* 8018DFF4 0018AF34 38 21 00 80 */ addi r1, r1, 0x80 @@ -11547,7 +11547,7 @@ lbl_8018DEA4: /* 8018E000 0018AF40 7C 08 02 A6 */ mflr r0 /* 8018E004 0018AF44 90 01 00 54 */ stw r0, 0x54(r1) /* 8018E008 0018AF48 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018E00C 0018AF4C 48 1D 41 D1 */ bl func_803621DC +/* 8018E00C 0018AF4C 48 1D 41 D1 */ bl _savegpr_29 /* 8018E010 0018AF50 7C 7D 1B 78 */ mr r29, r3 /* 8018E014 0018AF54 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8018E018 0018AF58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -11587,7 +11587,7 @@ lbl_8018DEA4: /* 8018E0A0 0018AFE0 7F E4 FB 78 */ mr r4, r31 /* 8018E0A4 0018AFE4 48 16 AE 31 */ bl J2DScreen_NS_draw /* 8018E0A8 0018AFE8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018E0AC 0018AFEC 48 1D 41 7D */ bl func_80362228 +/* 8018E0AC 0018AFEC 48 1D 41 7D */ bl _restgpr_29 /* 8018E0B0 0018AFF0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8018E0B4 0018AFF4 7C 08 03 A6 */ mtlr r0 /* 8018E0B8 0018AFF8 38 21 00 50 */ addi r1, r1, 0x50 @@ -11627,7 +11627,7 @@ dFile_select_c_NS_errorMoveAnmInitSet: /* 8018E134 0018B074 7C 08 02 A6 */ mflr r0 /* 8018E138 0018B078 90 01 00 24 */ stw r0, 0x24(r1) /* 8018E13C 0018B07C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018E140 0018B080 48 1D 40 9D */ bl func_803621DC +/* 8018E140 0018B080 48 1D 40 9D */ bl _savegpr_29 /* 8018E144 0018B084 7C 7D 1B 78 */ mr r29, r3 /* 8018E148 0018B088 7C 9E 23 78 */ mr r30, r4 /* 8018E14C 0018B08C 7C BF 2B 78 */ mr r31, r5 @@ -11654,7 +11654,7 @@ dFile_select_c_NS_errorMoveAnmInitSet: /* 8018E1A0 0018B0E0 38 00 00 01 */ li r0, 1 /* 8018E1A4 0018B0E4 98 1D 01 4B */ stb r0, 0x14b(r29) /* 8018E1A8 0018B0E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018E1AC 0018B0EC 48 1D 40 7D */ bl func_80362228 +/* 8018E1AC 0018B0EC 48 1D 40 7D */ bl _restgpr_29 /* 8018E1B0 0018B0F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018E1B4 0018B0F4 7C 08 03 A6 */ mtlr r0 /* 8018E1B8 0018B0F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -12266,7 +12266,7 @@ lbl_8018EA28: /* 8018EA94 0018B9D4 7C 08 02 A6 */ mflr r0 /* 8018EA98 0018B9D8 90 01 00 24 */ stw r0, 0x24(r1) /* 8018EA9C 0018B9DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018EAA0 0018B9E0 48 1D 37 3D */ bl func_803621DC +/* 8018EAA0 0018B9E0 48 1D 37 3D */ bl _savegpr_29 /* 8018EAA4 0018B9E4 7C 7D 1B 78 */ mr r29, r3 /* 8018EAA8 0018B9E8 48 00 12 89 */ bl dFile_select_c_NS_errorTxtChangeAnm /* 8018EAAC 0018B9EC 7C 7E 1B 78 */ mr r30, r3 @@ -12290,7 +12290,7 @@ lbl_8018EA28: /* 8018EAF4 0018BA34 98 1D 02 71 */ stb r0, 0x271(r29) lbl_8018EAF8: /* 8018EAF8 0018BA38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018EAFC 0018BA3C 48 1D 37 2D */ bl func_80362228 +/* 8018EAFC 0018BA3C 48 1D 37 2D */ bl _restgpr_29 /* 8018EB00 0018BA40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018EB04 0018BA44 7C 08 03 A6 */ mtlr r0 /* 8018EB08 0018BA48 38 21 00 20 */ addi r1, r1, 0x20 @@ -12637,7 +12637,7 @@ dFile_select_c_NS_formatNoSelDispInitSet: /* 8018F000 0018BF40 7C 08 02 A6 */ mflr r0 /* 8018F004 0018BF44 90 01 00 24 */ stw r0, 0x24(r1) /* 8018F008 0018BF48 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F00C 0018BF4C 48 1D 31 D1 */ bl func_803621DC +/* 8018F00C 0018BF4C 48 1D 31 D1 */ bl _savegpr_29 /* 8018F010 0018BF50 7C 7D 1B 78 */ mr r29, r3 /* 8018F014 0018BF54 48 00 0D 1D */ bl dFile_select_c_NS_errorTxtChangeAnm /* 8018F018 0018BF58 7C 7E 1B 78 */ mr r30, r3 @@ -12662,7 +12662,7 @@ dFile_select_c_NS_formatNoSelDispInitSet: /* 8018F064 0018BFA4 98 1D 02 71 */ stb r0, 0x271(r29) lbl_8018F068: /* 8018F068 0018BFA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F06C 0018BFAC 48 1D 31 BD */ bl func_80362228 +/* 8018F06C 0018BFAC 48 1D 31 BD */ bl _restgpr_29 /* 8018F070 0018BFB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018F074 0018BFB4 7C 08 03 A6 */ mtlr r0 /* 8018F078 0018BFB8 38 21 00 20 */ addi r1, r1, 0x20 @@ -12948,7 +12948,7 @@ lbl_8018F474: /* 8018F48C 0018C3CC 7C 08 02 A6 */ mflr r0 /* 8018F490 0018C3D0 90 01 00 24 */ stw r0, 0x24(r1) /* 8018F494 0018C3D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F498 0018C3D8 48 1D 2D 45 */ bl func_803621DC +/* 8018F498 0018C3D8 48 1D 2D 45 */ bl _savegpr_29 /* 8018F49C 0018C3DC 7C 7F 1B 78 */ mr r31, r3 /* 8018F4A0 0018C3E0 48 00 08 91 */ bl dFile_select_c_NS_errorTxtChangeAnm /* 8018F4A4 0018C3E4 7C 7D 1B 78 */ mr r29, r3 @@ -13003,7 +13003,7 @@ lbl_8018F518: /* 8018F564 0018C4A4 98 1F 02 71 */ stb r0, 0x271(r31) lbl_8018F568: /* 8018F568 0018C4A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F56C 0018C4AC 48 1D 2C BD */ bl func_80362228 +/* 8018F56C 0018C4AC 48 1D 2C BD */ bl _restgpr_29 /* 8018F570 0018C4B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018F574 0018C4B4 7C 08 03 A6 */ mtlr r0 /* 8018F578 0018C4B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -13248,7 +13248,7 @@ lbl_8018F8C0: /* 8018F8DC 0018C81C 7C 08 02 A6 */ mflr r0 /* 8018F8E0 0018C820 90 01 00 24 */ stw r0, 0x24(r1) /* 8018F8E4 0018C824 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F8E8 0018C828 48 1D 28 F5 */ bl func_803621DC +/* 8018F8E8 0018C828 48 1D 28 F5 */ bl _savegpr_29 /* 8018F8EC 0018C82C 7C 7D 1B 78 */ mr r29, r3 /* 8018F8F0 0018C830 4B FF E8 D1 */ bl dFile_select_c_NS_errorMoveAnm /* 8018F8F4 0018C834 7C 7F 1B 78 */ mr r31, r3 @@ -13281,7 +13281,7 @@ lbl_8018F954: /* 8018F958 0018C898 98 1D 02 71 */ stb r0, 0x271(r29) lbl_8018F95C: /* 8018F95C 0018C89C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F960 0018C8A0 48 1D 28 C9 */ bl func_80362228 +/* 8018F960 0018C8A0 48 1D 28 C9 */ bl _restgpr_29 /* 8018F964 0018C8A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018F968 0018C8A8 7C 08 03 A6 */ mtlr r0 /* 8018F96C 0018C8AC 38 21 00 20 */ addi r1, r1, 0x20 @@ -13290,7 +13290,7 @@ lbl_8018F95C: /* 8018F978 0018C8B8 7C 08 02 A6 */ mflr r0 /* 8018F97C 0018C8BC 90 01 00 24 */ stw r0, 0x24(r1) /* 8018F980 0018C8C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018F984 0018C8C4 48 1D 28 59 */ bl func_803621DC +/* 8018F984 0018C8C4 48 1D 28 59 */ bl _savegpr_29 /* 8018F988 0018C8C8 7C 7D 1B 78 */ mr r29, r3 /* 8018F98C 0018C8CC 4B FF E8 35 */ bl dFile_select_c_NS_errorMoveAnm /* 8018F990 0018C8D0 7C 7F 1B 78 */ mr r31, r3 @@ -13330,7 +13330,7 @@ lbl_8018FA0C: /* 8018FA10 0018C950 98 1D 02 71 */ stb r0, 0x271(r29) lbl_8018FA14: /* 8018FA14 0018C954 39 61 00 20 */ addi r11, r1, 0x20 -/* 8018FA18 0018C958 48 1D 28 11 */ bl func_80362228 +/* 8018FA18 0018C958 48 1D 28 11 */ bl _restgpr_29 /* 8018FA1C 0018C95C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018FA20 0018C960 7C 08 03 A6 */ mtlr r0 /* 8018FA24 0018C964 38 21 00 20 */ addi r1, r1, 0x20 @@ -13789,7 +13789,7 @@ dFile_select_c_NS_nameMoveAnmInitSet: /* 80190078 0018CFB8 7C 08 02 A6 */ mflr r0 /* 8019007C 0018CFBC 90 01 00 24 */ stw r0, 0x24(r1) /* 80190080 0018CFC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80190084 0018CFC4 48 1D 21 59 */ bl func_803621DC +/* 80190084 0018CFC4 48 1D 21 59 */ bl _savegpr_29 /* 80190088 0018CFC8 7C 7D 1B 78 */ mr r29, r3 /* 8019008C 0018CFCC 7C 9E 23 78 */ mr r30, r4 /* 80190090 0018CFD0 7C BF 2B 78 */ mr r31, r5 @@ -13826,7 +13826,7 @@ lbl_801900BC: /* 80190104 0018D044 80 7D 01 1C */ lwz r3, 0x11c(r29) /* 80190108 0018D048 48 16 7E C5 */ bl J2DPane_NS_animationTransform /* 8019010C 0018D04C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80190110 0018D050 48 1D 21 19 */ bl func_80362228 +/* 80190110 0018D050 48 1D 21 19 */ bl _restgpr_29 /* 80190114 0018D054 80 01 00 24 */ lwz r0, 0x24(r1) /* 80190118 0018D058 7C 08 03 A6 */ mtlr r0 /* 8019011C 0018D05C 38 21 00 20 */ addi r1, r1, 0x20 @@ -13923,7 +13923,7 @@ dFile_select_c_NS_setInitSaveData: /* 80190258 0018D198 7C 08 02 A6 */ mflr r0 /* 8019025C 0018D19C 90 01 00 24 */ stw r0, 0x24(r1) /* 80190260 0018D1A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80190264 0018D1A4 48 1D 1F 79 */ bl func_803621DC +/* 80190264 0018D1A4 48 1D 1F 79 */ bl _savegpr_29 /* 80190268 0018D1A8 7C 7D 1B 78 */ mr r29, r3 /* 8019026C 0018D1AC 3B C0 00 00 */ li r30, 0 /* 80190270 0018D1B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -13940,7 +13940,7 @@ lbl_80190278: /* 80190298 0018D1D8 2C 1E 00 03 */ cmpwi r30, 3 /* 8019029C 0018D1DC 41 80 FF DC */ blt lbl_80190278 /* 801902A0 0018D1E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801902A4 0018D1E4 48 1D 1F 85 */ bl func_80362228 +/* 801902A4 0018D1E4 48 1D 1F 85 */ bl _restgpr_29 /* 801902A8 0018D1E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801902AC 0018D1EC 7C 08 03 A6 */ mtlr r0 /* 801902B0 0018D1F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -14034,7 +14034,7 @@ dFile_select3D_c_NS__create: /* 801903E0 0018D320 7C 08 02 A6 */ mflr r0 /* 801903E4 0018D324 90 01 00 24 */ stw r0, 0x24(r1) /* 801903E8 0018D328 39 61 00 20 */ addi r11, r1, 0x20 -/* 801903EC 0018D32C 48 1D 1D F1 */ bl func_803621DC +/* 801903EC 0018D32C 48 1D 1D F1 */ bl _savegpr_29 /* 801903F0 0018D330 7C 7D 1B 78 */ mr r29, r3 /* 801903F4 0018D334 7C 9E 23 78 */ mr r30, r4 /* 801903F8 0018D338 7C BF 2B 78 */ mr r31, r5 @@ -14076,7 +14076,7 @@ lbl_80190450: /* 80190480 0018D3C0 48 00 04 DD */ bl dFile_select3D_c_NS_set_mtx lbl_80190484: /* 80190484 0018D3C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80190488 0018D3C8 48 1D 1D A1 */ bl func_80362228 +/* 80190488 0018D3C8 48 1D 1D A1 */ bl _restgpr_29 /* 8019048C 0018D3CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80190490 0018D3D0 7C 08 03 A6 */ mtlr r0 /* 80190494 0018D3D4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/file/sel/d_file_sel_info.s b/asm/d/file/sel/d_file_sel_info.s index 846df59c470..f7eda0b1284 100644 --- a/asm/d/file/sel/d_file_sel_info.s +++ b/asm/d/file/sel/d_file_sel_info.s @@ -353,7 +353,7 @@ dFile_info_c_NS_setSaveData: /* 80192958 0018F898 7C 08 02 A6 */ mflr r0 /* 8019295C 0018F89C 90 01 00 24 */ stw r0, 0x24(r1) /* 80192960 0018F8A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192964 0018F8A4 48 1C F8 79 */ bl func_803621DC +/* 80192964 0018F8A4 48 1C F8 79 */ bl _savegpr_29 /* 80192968 0018F8A8 7C 7F 1B 78 */ mr r31, r3 /* 8019296C 0018F8AC 7C 9D 23 78 */ mr r29, r4 /* 80192970 0018F8B0 2C 05 00 00 */ cmpwi r5, 0 @@ -431,7 +431,7 @@ lbl_80192A6C: /* 80192A84 0018F9C4 38 60 FF FF */ li r3, -1 lbl_80192A88: /* 80192A88 0018F9C8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80192A8C 0018F9CC 48 1C F7 9D */ bl func_80362228 +/* 80192A8C 0018F9CC 48 1C F7 9D */ bl _restgpr_29 /* 80192A90 0018F9D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80192A94 0018F9D4 7C 08 03 A6 */ mtlr r0 /* 80192A98 0018F9D8 38 21 00 20 */ addi r1, r1, 0x20 @@ -651,7 +651,7 @@ dFile_info_c_NS__draw: /* 80192DA0 0018FCE0 7C 08 02 A6 */ mflr r0 /* 80192DA4 0018FCE4 90 01 00 54 */ stw r0, 0x54(r1) /* 80192DA8 0018FCE8 39 61 00 50 */ addi r11, r1, 0x50 -/* 80192DAC 0018FCEC 48 1C F4 31 */ bl func_803621DC +/* 80192DAC 0018FCEC 48 1C F4 31 */ bl _savegpr_29 /* 80192DB0 0018FCF0 7C 7D 1B 78 */ mr r29, r3 /* 80192DB4 0018FCF4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80192DB8 0018FCF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -702,7 +702,7 @@ lbl_80192E5C: /* 80192E68 0018FDA8 7F E4 FB 78 */ mr r4, r31 /* 80192E6C 0018FDAC 48 16 60 69 */ bl J2DScreen_NS_draw /* 80192E70 0018FDB0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80192E74 0018FDB4 48 1C F3 B5 */ bl func_80362228 +/* 80192E74 0018FDB4 48 1C F3 B5 */ bl _restgpr_29 /* 80192E78 0018FDB8 80 01 00 54 */ lwz r0, 0x54(r1) /* 80192E7C 0018FDBC 7C 08 03 A6 */ mtlr r0 /* 80192E80 0018FDC0 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/jnt/d_jnt_col.s b/asm/d/jnt/d_jnt_col.s index 398f1a205f8..32bc35e7a22 100644 --- a/asm/d/jnt/d_jnt_col.s +++ b/asm/d/jnt/d_jnt_col.s @@ -31,7 +31,7 @@ dJntCol_c_NS_setNowLine: /* 80035CCC 00032C0C 7C 08 02 A6 */ mflr r0 /* 80035CD0 00032C10 90 01 00 64 */ stw r0, 0x64(r1) /* 80035CD4 00032C14 39 61 00 60 */ addi r11, r1, 0x60 -/* 80035CD8 00032C18 48 32 C5 05 */ bl func_803621DC +/* 80035CD8 00032C18 48 32 C5 05 */ bl _savegpr_29 /* 80035CDC 00032C1C 7C 7D 1B 78 */ mr r29, r3 /* 80035CE0 00032C20 7C 9E 23 78 */ mr r30, r4 /* 80035CE4 00032C24 7C DF 33 78 */ mr r31, r6 @@ -88,7 +88,7 @@ lbl_80035D30: /* 80035DA8 00032CE8 38 A1 00 38 */ addi r5, r1, 0x38 /* 80035DAC 00032CEC 48 23 95 3D */ bl cM3dGLin_NS_SetStartEnd /* 80035DB0 00032CF0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80035DB4 00032CF4 48 32 C4 75 */ bl func_80362228 +/* 80035DB4 00032CF4 48 32 C4 75 */ bl _restgpr_29 /* 80035DB8 00032CF8 80 01 00 64 */ lwz r0, 0x64(r1) /* 80035DBC 00032CFC 7C 08 03 A6 */ mtlr r0 /* 80035DC0 00032D00 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index 89e6f9586f9..a848ff263c2 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -208,7 +208,7 @@ dKyr_set_btitex_common: /* 8005B930 00058870 7C 08 02 A6 */ mflr r0 /* 8005B934 00058874 90 01 00 34 */ stw r0, 0x34(r1) /* 8005B938 00058878 39 61 00 30 */ addi r11, r1, 0x30 -/* 8005B93C 0005887C 48 30 68 A1 */ bl func_803621DC +/* 8005B93C 0005887C 48 30 68 A1 */ bl _savegpr_29 /* 8005B940 00058880 7C 7D 1B 78 */ mr r29, r3 /* 8005B944 00058884 7C 9E 23 78 */ mr r30, r4 /* 8005B948 00058888 7C BF 2B 78 */ mr r31, r5 @@ -261,7 +261,7 @@ dKyr_set_btitex_common: /* 8005BA04 00058944 7F E4 FB 78 */ mr r4, r31 /* 8005BA08 00058948 48 30 2A 0D */ bl GXLoadTexObj /* 8005BA0C 0005894C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8005BA10 00058950 48 30 68 19 */ bl func_80362228 +/* 8005BA10 00058950 48 30 68 19 */ bl _restgpr_29 /* 8005BA14 00058954 80 01 00 34 */ lwz r0, 0x34(r1) /* 8005BA18 00058958 7C 08 03 A6 */ mtlr r0 /* 8005BA1C 0005895C 38 21 00 30 */ addi r1, r1, 0x30 @@ -1528,7 +1528,7 @@ dKyr_rain_init: /* 8005CC60 00059BA0 7C 08 02 A6 */ mflr r0 /* 8005CC64 00059BA4 90 01 00 24 */ stw r0, 0x24(r1) /* 8005CC68 00059BA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005CC6C 00059BAC 48 30 55 71 */ bl func_803621DC +/* 8005CC6C 00059BAC 48 30 55 71 */ bl _savegpr_29 /* 8005CC70 00059BB0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8005CC74 00059BB4 38 A3 61 C0 */ addi r5, r3, lbl_804061C0@l /* 8005CC78 00059BB8 83 A5 5D 74 */ lwz r29, 0x5d74(r5) @@ -1603,7 +1603,7 @@ lbl_8005CD70: /* 8005CD88 00059CC8 80 7F 0E 84 */ lwz r3, 0xe84(r31) /* 8005CD8C 00059CCC B0 03 36 D0 */ sth r0, 0x36d0(r3) /* 8005CD90 00059CD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005CD94 00059CD4 48 30 54 95 */ bl func_80362228 +/* 8005CD94 00059CD4 48 30 54 95 */ bl _restgpr_29 /* 8005CD98 00059CD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005CD9C 00059CDC 7C 08 03 A6 */ mtlr r0 /* 8005CDA0 00059CE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -1628,7 +1628,7 @@ overhead_bg_chk: /* 8005CDD4 00059D14 7C 08 02 A6 */ mflr r0 /* 8005CDD8 00059D18 90 01 00 D4 */ stw r0, 0xd4(r1) /* 8005CDDC 00059D1C 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8005CDE0 00059D20 48 30 53 FD */ bl func_803621DC +/* 8005CDE0 00059D20 48 30 53 FD */ bl _savegpr_29 /* 8005CDE4 00059D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8005CDE8 00059D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8005CDEC 00059D2C 83 E3 5D 74 */ lwz r31, 0x5d74(r3) @@ -1728,7 +1728,7 @@ lbl_8005CF44: /* 8005CF5C 00059E9C 7F C3 F3 78 */ mr r3, r30 lbl_8005CF60: /* 8005CF60 00059EA0 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8005CF64 00059EA4 48 30 52 C5 */ bl func_80362228 +/* 8005CF64 00059EA4 48 30 52 C5 */ bl _restgpr_29 /* 8005CF68 00059EA8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8005CF6C 00059EAC 7C 08 03 A6 */ mtlr r0 /* 8005CF70 00059EB0 38 21 00 D0 */ addi r1, r1, 0xd0 @@ -4877,7 +4877,7 @@ dKyr_snow_init: /* 8005FBE0 0005CB20 7C 08 02 A6 */ mflr r0 /* 8005FBE4 0005CB24 90 01 00 24 */ stw r0, 0x24(r1) /* 8005FBE8 0005CB28 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005FBEC 0005CB2C 48 30 25 F1 */ bl func_803621DC +/* 8005FBEC 0005CB2C 48 30 25 F1 */ bl _savegpr_29 /* 8005FBF0 0005CB30 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8005FBF4 0005CB34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8005FBF8 0005CB38 83 C3 5D 74 */ lwz r30, 0x5d74(r3) @@ -4966,7 +4966,7 @@ lbl_8005FCB0: /* 8005FD2C 0005CC6C 98 03 6D 93 */ stb r0, 0x6d93(r3) lbl_8005FD30: /* 8005FD30 0005CC70 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005FD34 0005CC74 48 30 24 F5 */ bl func_80362228 +/* 8005FD34 0005CC74 48 30 24 F5 */ bl _restgpr_29 /* 8005FD38 0005CC78 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005FD3C 0005CC7C 7C 08 03 A6 */ mtlr r0 /* 8005FD40 0005CC80 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/kankyo/d_kankyo_wether.s b/asm/d/kankyo/d_kankyo_wether.s index 40aacc1de25..238555da33a 100644 --- a/asm/d/kankyo/d_kankyo_wether.s +++ b/asm/d/kankyo/d_kankyo_wether.s @@ -59,7 +59,7 @@ dKyw_setDrawPacketListSky: /* 80056B4C 00053A8C 7C 08 02 A6 */ mflr r0 /* 80056B50 00053A90 90 01 00 24 */ stw r0, 0x24(r1) /* 80056B54 00053A94 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056B58 00053A98 48 30 B6 85 */ bl func_803621DC +/* 80056B58 00053A98 48 30 B6 85 */ bl _savegpr_29 /* 80056B5C 00053A9C 7C 7D 1B 79 */ or. r29, r3, r3 /* 80056B60 00053AA0 40 82 00 0C */ bne lbl_80056B6C /* 80056B64 00053AA4 38 60 00 00 */ li r3, 0 @@ -88,7 +88,7 @@ lbl_80056B6C: /* 80056BBC 00053AFC 7F A3 EB 78 */ mr r3, r29 lbl_80056BC0: /* 80056BC0 00053B00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056BC4 00053B04 48 30 B6 65 */ bl func_80362228 +/* 80056BC4 00053B04 48 30 B6 65 */ bl _restgpr_29 /* 80056BC8 00053B08 80 01 00 24 */ lwz r0, 0x24(r1) /* 80056BCC 00053B0C 7C 08 03 A6 */ mtlr r0 /* 80056BD0 00053B10 38 21 00 20 */ addi r1, r1, 0x20 @@ -100,7 +100,7 @@ dKyw_setDrawPacketListXluBg: /* 80056BDC 00053B1C 7C 08 02 A6 */ mflr r0 /* 80056BE0 00053B20 90 01 00 24 */ stw r0, 0x24(r1) /* 80056BE4 00053B24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056BE8 00053B28 48 30 B5 F5 */ bl func_803621DC +/* 80056BE8 00053B28 48 30 B5 F5 */ bl _savegpr_29 /* 80056BEC 00053B2C 7C 7D 1B 79 */ or. r29, r3, r3 /* 80056BF0 00053B30 40 82 00 0C */ bne lbl_80056BFC /* 80056BF4 00053B34 38 60 00 00 */ li r3, 0 @@ -127,7 +127,7 @@ lbl_80056BFC: /* 80056C44 00053B84 7F A3 EB 78 */ mr r3, r29 lbl_80056C48: /* 80056C48 00053B88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056C4C 00053B8C 48 30 B5 DD */ bl func_80362228 +/* 80056C4C 00053B8C 48 30 B5 DD */ bl _restgpr_29 /* 80056C50 00053B90 80 01 00 24 */ lwz r0, 0x24(r1) /* 80056C54 00053B94 7C 08 03 A6 */ mtlr r0 /* 80056C58 00053B98 38 21 00 20 */ addi r1, r1, 0x20 @@ -2380,7 +2380,7 @@ wether_move_star: /* 80058B98 00055AD8 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80058B9C 00055ADC F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80058BA0 00055AE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80058BA4 00055AE4 48 30 96 39 */ bl func_803621DC +/* 80058BA4 00055AE4 48 30 96 39 */ bl _savegpr_29 /* 80058BA8 00055AE8 3B C0 00 00 */ li r30, 0 /* 80058BAC 00055AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80058BB0 00055AF0 3B A3 61 C0 */ addi r29, r3, lbl_804061C0@l @@ -2615,7 +2615,7 @@ lbl_80058EF8: /* 80058EF8 00055E38 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80058EFC 00055E3C CB E1 00 20 */ lfd f31, 0x20(r1) /* 80058F00 00055E40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80058F04 00055E44 48 30 93 25 */ bl func_80362228 +/* 80058F04 00055E44 48 30 93 25 */ bl _restgpr_29 /* 80058F08 00055E48 80 01 00 34 */ lwz r0, 0x34(r1) /* 80058F0C 00055E4C 7C 08 03 A6 */ mtlr r0 /* 80058F10 00055E50 38 21 00 30 */ addi r1, r1, 0x30 @@ -2627,7 +2627,7 @@ wether_move_housi: /* 80058F1C 00055E5C 7C 08 02 A6 */ mflr r0 /* 80058F20 00055E60 90 01 00 24 */ stw r0, 0x24(r1) /* 80058F24 00055E64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80058F28 00055E68 48 30 92 B5 */ bl func_803621DC +/* 80058F28 00055E68 48 30 92 B5 */ bl _savegpr_29 /* 80058F2C 00055E6C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80058F30 00055E70 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80058F34 00055E74 3B E3 4E 00 */ addi r31, r3, 0x4e00 @@ -2948,7 +2948,7 @@ lbl_800593AC: /* 800593C0 00056300 90 1E 0E AC */ stw r0, 0xeac(r30) lbl_800593C4: /* 800593C4 00056304 39 61 00 20 */ addi r11, r1, 0x20 -/* 800593C8 00056308 48 30 8E 61 */ bl func_80362228 +/* 800593C8 00056308 48 30 8E 61 */ bl _restgpr_29 /* 800593CC 0005630C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800593D0 00056310 7C 08 03 A6 */ mtlr r0 /* 800593D4 00056314 38 21 00 20 */ addi r1, r1, 0x20 @@ -2960,7 +2960,7 @@ wether_move_odour: /* 800593E0 00056320 7C 08 02 A6 */ mflr r0 /* 800593E4 00056324 90 01 00 24 */ stw r0, 0x24(r1) /* 800593E8 00056328 39 61 00 20 */ addi r11, r1, 0x20 -/* 800593EC 0005632C 48 30 8D F1 */ bl func_803621DC +/* 800593EC 0005632C 48 30 8D F1 */ bl _savegpr_29 /* 800593F0 00056330 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800593F4 00056334 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 800593F8 00056338 88 1F 0F 20 */ lbz r0, 0xf20(r31) @@ -3069,7 +3069,7 @@ lbl_80059560: /* 80059564 000564A4 90 1F 0F 28 */ stw r0, 0xf28(r31) lbl_80059568: /* 80059568 000564A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8005956C 000564AC 48 30 8C BD */ bl func_80362228 +/* 8005956C 000564AC 48 30 8C BD */ bl _restgpr_29 /* 80059570 000564B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80059574 000564B4 7C 08 03 A6 */ mtlr r0 /* 80059578 000564B8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3081,7 +3081,7 @@ wether_move_moya: /* 80059584 000564C4 7C 08 02 A6 */ mflr r0 /* 80059588 000564C8 90 01 00 24 */ stw r0, 0x24(r1) /* 8005958C 000564CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80059590 000564D0 48 30 8C 4D */ bl func_803621DC +/* 80059590 000564D0 48 30 8C 4D */ bl _savegpr_29 /* 80059594 000564D4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059598 000564D8 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 8005959C 000564DC 88 1F 0E B4 */ lbz r0, 0xeb4(r31) @@ -3189,7 +3189,7 @@ lbl_80059708: /* 8005970C 0005664C 90 1E 0E C0 */ stw r0, 0xec0(r30) lbl_80059710: /* 80059710 00056650 39 61 00 20 */ addi r11, r1, 0x20 -/* 80059714 00056654 48 30 8B 15 */ bl func_80362228 +/* 80059714 00056654 48 30 8B 15 */ bl _restgpr_29 /* 80059718 00056658 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005971C 0005665C 7C 08 03 A6 */ mtlr r0 /* 80059720 00056660 38 21 00 20 */ addi r1, r1, 0x20 @@ -5195,7 +5195,7 @@ dKyw_get_AllWind_vec: /* 8005B2FC 0005823C 7C 08 02 A6 */ mflr r0 /* 8005B300 00058240 90 01 00 74 */ stw r0, 0x74(r1) /* 8005B304 00058244 39 61 00 70 */ addi r11, r1, 0x70 -/* 8005B308 00058248 48 30 6E D5 */ bl func_803621DC +/* 8005B308 00058248 48 30 6E D5 */ bl _savegpr_29 /* 8005B30C 0005824C 7C 9F 23 78 */ mr r31, r4 /* 8005B310 00058250 7C BD 2B 78 */ mr r29, r5 /* 8005B314 00058254 3C C0 80 43 */ lis r6, lbl_8042CA54@ha @@ -5339,7 +5339,7 @@ lbl_8005B500: /* 8005B514 00058454 D0 1F 00 08 */ stfs f0, 8(r31) lbl_8005B518: /* 8005B518 00058458 39 61 00 70 */ addi r11, r1, 0x70 -/* 8005B51C 0005845C 48 30 6D 0D */ bl func_80362228 +/* 8005B51C 0005845C 48 30 6D 0D */ bl _restgpr_29 /* 8005B520 00058460 80 01 00 74 */ lwz r0, 0x74(r1) /* 8005B524 00058464 7C 08 03 A6 */ mtlr r0 /* 8005B528 00058468 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index c31a388b418..ced20fac8e1 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -1566,7 +1566,7 @@ lbl_800401CC: /* 800401EC 0003D12C 7C 08 02 A6 */ mflr r0 /* 800401F0 0003D130 90 01 00 24 */ stw r0, 0x24(r1) /* 800401F4 0003D134 39 61 00 20 */ addi r11, r1, 0x20 -/* 800401F8 0003D138 48 32 1F E5 */ bl func_803621DC +/* 800401F8 0003D138 48 32 1F E5 */ bl _savegpr_29 /* 800401FC 0003D13C 7C 7D 1B 78 */ mr r29, r3 /* 80040200 0003D140 3B E0 00 00 */ li r31, 0 /* 80040204 0003D144 3B C0 00 00 */ li r30, 0 @@ -1617,7 +1617,7 @@ lbl_80040294: lbl_800402A4: /* 800402A4 0003D1E4 7F E3 FB 78 */ mr r3, r31 /* 800402A8 0003D1E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800402AC 0003D1EC 48 32 1F 7D */ bl func_80362228 +/* 800402AC 0003D1EC 48 32 1F 7D */ bl _restgpr_29 /* 800402B0 0003D1F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800402B4 0003D1F4 7C 08 03 A6 */ mtlr r0 /* 800402B8 0003D1F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -1646,7 +1646,7 @@ renderingPlusDoorAndCursor_c_NS_afterDrawPath: /* 80040308 0003D248 DB E1 00 40 */ stfd f31, 0x40(r1) /* 8004030C 0003D24C F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80040310 0003D250 39 61 00 40 */ addi r11, r1, 0x40 -/* 80040314 0003D254 48 32 1E C9 */ bl func_803621DC +/* 80040314 0003D254 48 32 1E C9 */ bl _savegpr_29 /* 80040318 0003D258 7C 7F 1B 78 */ mr r31, r3 /* 8004031C 0003D25C 48 00 01 FD */ bl renderingPlusDoor_c_NS_afterDrawPath /* 80040320 0003D260 7F E3 FB 78 */ mr r3, r31 @@ -1776,7 +1776,7 @@ lbl_800404F8: /* 800404F8 0003D438 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 800404FC 0003D43C CB E1 00 40 */ lfd f31, 0x40(r1) /* 80040500 0003D440 39 61 00 40 */ addi r11, r1, 0x40 -/* 80040504 0003D444 48 32 1D 25 */ bl func_80362228 +/* 80040504 0003D444 48 32 1D 25 */ bl _restgpr_29 /* 80040508 0003D448 80 01 00 54 */ lwz r0, 0x54(r1) /* 8004050C 0003D44C 7C 08 03 A6 */ mtlr r0 /* 80040510 0003D450 38 21 00 50 */ addi r1, r1, 0x50 @@ -1931,7 +1931,7 @@ renderingPlusDoor_c_NS_checkDispDoorS: /* 80040718 0003D658 90 01 00 24 */ stw r0, 0x24(r1) /* 8004071C 0003D65C DB E1 00 18 */ stfd f31, 0x18(r1) /* 80040720 0003D660 39 61 00 18 */ addi r11, r1, 0x18 -/* 80040724 0003D664 48 32 1A B9 */ bl func_803621DC +/* 80040724 0003D664 48 32 1A B9 */ bl _savegpr_29 /* 80040728 0003D668 7C 7D 1B 78 */ mr r29, r3 /* 8004072C 0003D66C 7C 9E 23 78 */ mr r30, r4 /* 80040730 0003D670 7C BF 2B 78 */ mr r31, r5 @@ -2000,7 +2000,7 @@ lbl_80040818: lbl_8004081C: /* 8004081C 0003D75C CB E1 00 18 */ lfd f31, 0x18(r1) /* 80040820 0003D760 39 61 00 18 */ addi r11, r1, 0x18 -/* 80040824 0003D764 48 32 1A 05 */ bl func_80362228 +/* 80040824 0003D764 48 32 1A 05 */ bl _restgpr_29 /* 80040828 0003D768 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004082C 0003D76C 7C 08 03 A6 */ mtlr r0 /* 80040830 0003D770 38 21 00 20 */ addi r1, r1, 0x20 @@ -2012,7 +2012,7 @@ renderingPlusDoor_c_NS_drawNormalDoorS: /* 8004083C 0003D77C 7C 08 02 A6 */ mflr r0 /* 80040840 0003D780 90 01 00 74 */ stw r0, 0x74(r1) /* 80040844 0003D784 39 61 00 70 */ addi r11, r1, 0x70 -/* 80040848 0003D788 48 32 19 95 */ bl func_803621DC +/* 80040848 0003D788 48 32 19 95 */ bl _savegpr_29 /* 8004084C 0003D78C 7C 9D 23 78 */ mr r29, r4 /* 80040850 0003D790 7C BE 2B 78 */ mr r30, r5 /* 80040854 0003D794 7C FF 3B 78 */ mr r31, r7 @@ -2104,7 +2104,7 @@ lbl_80040990: /* 80040994 0003D8D4 28 00 00 04 */ cmplwi r0, 4 /* 80040998 0003D8D8 41 80 FF C8 */ blt lbl_80040960 /* 8004099C 0003D8DC 39 61 00 70 */ addi r11, r1, 0x70 -/* 800409A0 0003D8E0 48 32 18 89 */ bl func_80362228 +/* 800409A0 0003D8E0 48 32 18 89 */ bl _restgpr_29 /* 800409A4 0003D8E4 80 01 00 74 */ lwz r0, 0x74(r1) /* 800409A8 0003D8E8 7C 08 03 A6 */ mtlr r0 /* 800409AC 0003D8EC 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index 3d14c41019a..9567b5bd77f 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -149,7 +149,7 @@ dMenu_Fmap_stage_data_c_NS_isArrival: /* 8003D960 0003A8A0 7C 08 02 A6 */ mflr r0 /* 8003D964 0003A8A4 90 01 00 24 */ stw r0, 0x24(r1) /* 8003D968 0003A8A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D96C 0003A8AC 48 32 48 71 */ bl func_803621DC +/* 8003D96C 0003A8AC 48 32 48 71 */ bl _savegpr_29 /* 8003D970 0003A8B0 38 80 00 00 */ li r4, 0 /* 8003D974 0003A8B4 83 C3 00 0C */ lwz r30, 0xc(r3) /* 8003D978 0003A8B8 80 63 00 08 */ lwz r3, 8(r3) @@ -174,7 +174,7 @@ lbl_8003D9AC: lbl_8003D9BC: /* 8003D9BC 0003A8FC 7C 83 23 78 */ mr r3, r4 /* 8003D9C0 0003A900 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003D9C4 0003A904 48 32 48 65 */ bl func_80362228 +/* 8003D9C4 0003A904 48 32 48 65 */ bl _restgpr_29 /* 8003D9C8 0003A908 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003D9CC 0003A90C 7C 08 03 A6 */ mtlr r0 /* 8003D9D0 0003A910 38 21 00 20 */ addi r1, r1, 0x20 @@ -558,7 +558,7 @@ dMenu_Fmap_region_data_c_NS_buildFmapRegionData: /* 8003DF04 0003AE44 DB 81 00 20 */ stfd f28, 0x20(r1) /* 8003DF08 0003AE48 F3 81 00 28 */ psq_st f28, 40(r1), 0, qr0 /* 8003DF0C 0003AE4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003DF10 0003AE50 48 32 42 CD */ bl func_803621DC +/* 8003DF10 0003AE50 48 32 42 CD */ bl _savegpr_29 /* 8003DF14 0003AE54 7C 7D 1B 78 */ mr r29, r3 /* 8003DF18 0003AE58 3C 60 80 45 */ lis r3, lbl_80450AE8@ha /* 8003DF1C 0003AE5C C0 03 0A E8 */ lfs f0, lbl_80450AE8@l(r3) @@ -631,7 +631,7 @@ lbl_8003DFEC: /* 8003E008 0003AF48 E3 81 00 28 */ psq_l f28, 40(r1), 0, qr0 /* 8003E00C 0003AF4C CB 81 00 20 */ lfd f28, 0x20(r1) /* 8003E010 0003AF50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E014 0003AF54 48 32 42 15 */ bl func_80362228 +/* 8003E014 0003AF54 48 32 42 15 */ bl _restgpr_29 /* 8003E018 0003AF58 80 01 00 64 */ lwz r0, 0x64(r1) /* 8003E01C 0003AF5C 7C 08 03 A6 */ mtlr r0 /* 8003E020 0003AF60 38 21 00 60 */ addi r1, r1, 0x60 @@ -1010,7 +1010,7 @@ dMenuFmapIconPointer_c_NS_getValidData: /* 8003E514 0003B454 7C 08 02 A6 */ mflr r0 /* 8003E518 0003B458 90 01 00 24 */ stw r0, 0x24(r1) /* 8003E51C 0003B45C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E520 0003B460 48 32 3C BD */ bl func_803621DC +/* 8003E520 0003B460 48 32 3C BD */ bl _savegpr_29 /* 8003E524 0003B464 7C 7D 1B 78 */ mr r29, r3 /* 8003E528 0003B468 3B C0 00 00 */ li r30, 0 lbl_8003E52C: @@ -1030,7 +1030,7 @@ lbl_8003E54C: lbl_8003E55C: /* 8003E55C 0003B49C 7F C3 F3 78 */ mr r3, r30 /* 8003E560 0003B4A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003E564 0003B4A4 48 32 3C C5 */ bl func_80362228 +/* 8003E564 0003B4A4 48 32 3C C5 */ bl _restgpr_29 /* 8003E568 0003B4A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003E56C 0003B4AC 7C 08 03 A6 */ mtlr r0 /* 8003E570 0003B4B0 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 4cc281da945..21f41476655 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -1633,7 +1633,7 @@ lbl_801B14D0: /* 801B150C 001AE44C B0 7F 01 D0 */ sth r3, 0x1d0(r31) /* 801B1510 001AE450 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801B1514 001AE454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 801B1518 001AE458 4B E8 15 91 */ bl dSv_player_status_a_c_NS_getRupeeMax +/* 801B1518 001AE458 4B E8 15 91 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B151C 001AE45C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801B1520 001AE460 28 00 01 2C */ cmplwi r0, 0x12c /* 801B1524 001AE464 40 82 00 10 */ bne lbl_801B1534 @@ -1643,7 +1643,7 @@ lbl_801B14D0: lbl_801B1534: /* 801B1534 001AE474 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801B1538 001AE478 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 801B153C 001AE47C 4B E8 15 6D */ bl dSv_player_status_a_c_NS_getRupeeMax +/* 801B153C 001AE47C 4B E8 15 6D */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B1540 001AE480 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801B1544 001AE484 28 00 02 58 */ cmplwi r0, 0x258 /* 801B1548 001AE488 40 82 00 10 */ bne lbl_801B1558 @@ -2102,7 +2102,7 @@ lbl_801B1BB0: /* 801B1BEC 001AEB2C 48 00 14 DD */ bl dMenu_Collect2D_c_NS_setArrowMaxNum /* 801B1BF0 001AEB30 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801B1BF4 001AEB34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 801B1BF8 001AEB38 4B E8 0E B1 */ bl dSv_player_status_a_c_NS_getRupeeMax +/* 801B1BF8 001AEB38 4B E8 0E B1 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B1BFC 001AEB3C 7C 64 1B 78 */ mr r4, r3 /* 801B1C00 001AEB40 7F E3 FB 78 */ mr r3, r31 /* 801B1C04 001AEB44 48 00 17 3D */ bl dMenu_Collect2D_c_NS_setWalletMaxNum @@ -3987,7 +3987,7 @@ dMenu_Collect2D_c_NS_setPohMaxNum: /* 801B3710 001B0650 7C 08 02 A6 */ mflr r0 /* 801B3714 001B0654 90 01 00 24 */ stw r0, 0x24(r1) /* 801B3718 001B0658 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B371C 001B065C 48 1A EA C1 */ bl func_803621DC +/* 801B371C 001B065C 48 1A EA C1 */ bl _savegpr_29 /* 801B3720 001B0660 7C 7E 1B 78 */ mr r30, r3 /* 801B3724 001B0664 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 801B3728 001B0668 28 00 00 64 */ cmplwi r0, 0x64 @@ -4163,7 +4163,7 @@ lbl_801B3934: /* 801B39B4 001B08F4 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_801B39B8: /* 801B39B8 001B08F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B39BC 001B08FC 48 1A E8 6D */ bl func_80362228 +/* 801B39BC 001B08FC 48 1A E8 6D */ bl _restgpr_29 /* 801B39C0 001B0900 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B39C4 001B0904 7C 08 03 A6 */ mtlr r0 /* 801B39C8 001B0908 38 21 00 20 */ addi r1, r1, 0x20 @@ -7279,7 +7279,7 @@ dMenu_Collect3D_c_NS__move: /* 801B66DC 001B361C DB C1 00 70 */ stfd f30, 0x70(r1) /* 801B66E0 001B3620 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 801B66E4 001B3624 39 61 00 70 */ addi r11, r1, 0x70 -/* 801B66E8 001B3628 48 1A BA F5 */ bl func_803621DC +/* 801B66E8 001B3628 48 1A BA F5 */ bl _savegpr_29 /* 801B66EC 001B362C 7C 7F 1B 78 */ mr r31, r3 /* 801B66F0 001B3630 7C 9D 23 78 */ mr r29, r4 /* 801B66F4 001B3634 7C BE 2B 78 */ mr r30, r5 @@ -7448,7 +7448,7 @@ lbl_801B6944: /* 801B694C 001B388C E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 801B6950 001B3890 CB C1 00 70 */ lfd f30, 0x70(r1) /* 801B6954 001B3894 39 61 00 70 */ addi r11, r1, 0x70 -/* 801B6958 001B3898 48 1A B8 D1 */ bl func_80362228 +/* 801B6958 001B3898 48 1A B8 D1 */ bl _restgpr_29 /* 801B695C 001B389C 80 01 00 94 */ lwz r0, 0x94(r1) /* 801B6960 001B38A0 7C 08 03 A6 */ mtlr r0 /* 801B6964 001B38A4 38 21 00 90 */ addi r1, r1, 0x90 @@ -7943,7 +7943,7 @@ dMenu_Collect3D_c_NS_createMaskModel: /* 801B7018 001B3F58 7C 08 02 A6 */ mflr r0 /* 801B701C 001B3F5C 90 01 00 24 */ stw r0, 0x24(r1) /* 801B7020 001B3F60 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B7024 001B3F64 48 1A B1 B9 */ bl func_803621DC +/* 801B7024 001B3F64 48 1A B1 B9 */ bl _savegpr_29 /* 801B7028 001B3F68 7C 7F 1B 78 */ mr r31, r3 /* 801B702C 001B3F6C 3C 60 80 39 */ lis r3, lbl_80394F78@ha /* 801B7030 001B3F70 3B A3 4F 78 */ addi r29, r3, lbl_80394F78@l @@ -8047,7 +8047,7 @@ lbl_801B716C: /* 801B71A8 001B40E8 90 03 00 0C */ stw r0, 0xc(r3) lbl_801B71AC: /* 801B71AC 001B40EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B71B0 001B40F0 48 1A B0 79 */ bl func_80362228 +/* 801B71B0 001B40F0 48 1A B0 79 */ bl _restgpr_29 /* 801B71B4 001B40F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B71B8 001B40F8 7C 08 03 A6 */ mtlr r0 /* 801B71BC 001B40FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -8059,7 +8059,7 @@ dMenu_Collect3D_c_NS_createMirrorModel: /* 801B71C8 001B4108 7C 08 02 A6 */ mflr r0 /* 801B71CC 001B410C 90 01 00 24 */ stw r0, 0x24(r1) /* 801B71D0 001B4110 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B71D4 001B4114 48 1A B0 09 */ bl func_803621DC +/* 801B71D4 001B4114 48 1A B0 09 */ bl _savegpr_29 /* 801B71D8 001B4118 7C 7F 1B 78 */ mr r31, r3 /* 801B71DC 001B411C 3C 60 80 39 */ lis r3, lbl_80394F78@ha /* 801B71E0 001B4120 3B A3 4F 78 */ addi r29, r3, lbl_80394F78@l @@ -8211,7 +8211,7 @@ lbl_801B739C: /* 801B7418 001B4358 90 03 00 0C */ stw r0, 0xc(r3) lbl_801B741C: /* 801B741C 001B435C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B7420 001B4360 48 1A AE 09 */ bl func_80362228 +/* 801B7420 001B4360 48 1A AE 09 */ bl _restgpr_29 /* 801B7424 001B4364 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B7428 001B4368 7C 08 03 A6 */ mtlr r0 /* 801B742C 001B436C 38 21 00 20 */ addi r1, r1, 0x20 @@ -8223,7 +8223,7 @@ dMenu_Collect3D_c_NS_getCrystalNum: /* 801B7438 001B4378 7C 08 02 A6 */ mflr r0 /* 801B743C 001B437C 90 01 00 24 */ stw r0, 0x24(r1) /* 801B7440 001B4380 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B7444 001B4384 48 1A AD 99 */ bl func_803621DC +/* 801B7444 001B4384 48 1A AD 99 */ bl _savegpr_29 /* 801B7448 001B4388 3B C0 00 00 */ li r30, 0 /* 801B744C 001B438C 3B A0 00 00 */ li r29, 0 /* 801B7450 001B4390 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -8242,7 +8242,7 @@ lbl_801B745C: lbl_801B7480: /* 801B7480 001B43C0 7F C3 F3 78 */ mr r3, r30 /* 801B7484 001B43C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B7488 001B43C8 48 1A AD A1 */ bl func_80362228 +/* 801B7488 001B43C8 48 1A AD A1 */ bl _restgpr_29 /* 801B748C 001B43CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B7490 001B43D0 7C 08 03 A6 */ mtlr r0 /* 801B7494 001B43D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -8254,7 +8254,7 @@ dMenu_Collect3D_c_NS_getMirrorNum: /* 801B74A0 001B43E0 7C 08 02 A6 */ mflr r0 /* 801B74A4 001B43E4 90 01 00 24 */ stw r0, 0x24(r1) /* 801B74A8 001B43E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B74AC 001B43EC 48 1A AD 31 */ bl func_803621DC +/* 801B74AC 001B43EC 48 1A AD 31 */ bl _savegpr_29 /* 801B74B0 001B43F0 3B C0 00 00 */ li r30, 0 /* 801B74B4 001B43F4 3B A0 00 00 */ li r29, 0 /* 801B74B8 001B43F8 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -8273,7 +8273,7 @@ lbl_801B74C4: lbl_801B74E8: /* 801B74E8 001B4428 7F C3 F3 78 */ mr r3, r30 /* 801B74EC 001B442C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801B74F0 001B4430 48 1A AD 39 */ bl func_80362228 +/* 801B74F0 001B4430 48 1A AD 39 */ bl _restgpr_29 /* 801B74F4 001B4434 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B74F8 001B4438 7C 08 03 A6 */ mtlr r0 /* 801B74FC 001B443C 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 780b3ae1c5d..e9ea1344ea4 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -9,7 +9,7 @@ dMenu_DmapBg_c: /* 801B7F24 001B4E64 7C 08 02 A6 */ mflr r0 /* 801B7F28 001B4E68 90 01 00 44 */ stw r0, 0x44(r1) /* 801B7F2C 001B4E6C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801B7F30 001B4E70 48 1A A2 AD */ bl func_803621DC +/* 801B7F30 001B4E70 48 1A A2 AD */ bl _savegpr_29 /* 801B7F34 001B4E74 7C 7F 1B 78 */ mr r31, r3 /* 801B7F38 001B4E78 7C 9D 23 78 */ mr r29, r4 /* 801B7F3C 001B4E7C 7C BE 2B 78 */ mr r30, r5 @@ -129,7 +129,7 @@ lbl_801B80C0: /* 801B80F0 001B5030 98 1F 0D D0 */ stb r0, 0xdd0(r31) /* 801B80F4 001B5034 7F E3 FB 78 */ mr r3, r31 /* 801B80F8 001B5038 39 61 00 40 */ addi r11, r1, 0x40 -/* 801B80FC 001B503C 48 1A A1 2D */ bl func_80362228 +/* 801B80FC 001B503C 48 1A A1 2D */ bl _restgpr_29 /* 801B8100 001B5040 80 01 00 44 */ lwz r0, 0x44(r1) /* 801B8104 001B5044 7C 08 03 A6 */ mtlr r0 /* 801B8108 001B5048 38 21 00 40 */ addi r1, r1, 0x40 @@ -2650,7 +2650,7 @@ dMenu_DmapBg_c_NS_setAllAlphaRate: /* 801BA614 001B7554 90 01 00 24 */ stw r0, 0x24(r1) /* 801BA618 001B7558 DB E1 00 18 */ stfd f31, 0x18(r1) /* 801BA61C 001B755C 39 61 00 18 */ addi r11, r1, 0x18 -/* 801BA620 001B7560 48 1A 7B BD */ bl func_803621DC +/* 801BA620 001B7560 48 1A 7B BD */ bl _savegpr_29 /* 801BA624 001B7564 7C 7D 1B 78 */ mr r29, r3 /* 801BA628 001B7568 FF E0 08 90 */ fmr f31, f1 /* 801BA62C 001B756C D3 E3 0D 9C */ stfs f31, 0xd9c(r3) @@ -2705,7 +2705,7 @@ lbl_801BA6A4: lbl_801BA6E4: /* 801BA6E4 001B7624 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801BA6E8 001B7628 39 61 00 18 */ addi r11, r1, 0x18 -/* 801BA6EC 001B762C 48 1A 7B 3D */ bl func_80362228 +/* 801BA6EC 001B762C 48 1A 7B 3D */ bl _restgpr_29 /* 801BA6F0 001B7630 80 01 00 24 */ lwz r0, 0x24(r1) /* 801BA6F4 001B7634 7C 08 03 A6 */ mtlr r0 /* 801BA6F8 001B7638 38 21 00 20 */ addi r1, r1, 0x20 @@ -3004,7 +3004,7 @@ lbl_801BAAF4: /* 801BAB34 001B7A74 DB 81 02 90 */ stfd f28, 0x290(r1) /* 801BAB38 001B7A78 F3 81 02 98 */ psq_st f28, 664(r1), 0, qr0 /* 801BAB3C 001B7A7C 39 61 02 90 */ addi r11, r1, 0x290 -/* 801BAB40 001B7A80 48 1A 76 9D */ bl func_803621DC +/* 801BAB40 001B7A80 48 1A 76 9D */ bl _savegpr_29 /* 801BAB44 001B7A84 7C 7E 1B 78 */ mr r30, r3 /* 801BAB48 001B7A88 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801BAB4C 001B7A8C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3513,7 +3513,7 @@ lbl_801BB238: /* 801BB314 001B8254 E3 81 02 98 */ psq_l f28, 664(r1), 0, qr0 /* 801BB318 001B8258 CB 81 02 90 */ lfd f28, 0x290(r1) /* 801BB31C 001B825C 39 61 02 90 */ addi r11, r1, 0x290 -/* 801BB320 001B8260 48 1A 6F 09 */ bl func_80362228 +/* 801BB320 001B8260 48 1A 6F 09 */ bl _restgpr_29 /* 801BB324 001B8264 80 01 02 D4 */ lwz r0, 0x2d4(r1) /* 801BB328 001B8268 7C 08 03 A6 */ mtlr r0 /* 801BB32C 001B826C 38 21 02 D0 */ addi r1, r1, 0x2d0 @@ -6450,7 +6450,7 @@ dMenu_Dmap_c_NS__move: /* 801BDDA8 001BACE8 7C 08 02 A6 */ mflr r0 /* 801BDDAC 001BACEC 90 01 00 24 */ stw r0, 0x24(r1) /* 801BDDB0 001BACF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BDDB4 001BACF4 48 1A 44 29 */ bl func_803621DC +/* 801BDDB4 001BACF4 48 1A 44 29 */ bl _savegpr_29 /* 801BDDB8 001BACF8 7C 7D 1B 78 */ mr r29, r3 /* 801BDDBC 001BACFC 8B E3 01 7B */ lbz r31, 0x17b(r3) /* 801BDDC0 001BAD00 80 63 00 EC */ lwz r3, 0xec(r3) @@ -6530,7 +6530,7 @@ lbl_801BDEB8: /* 801BDED8 001BAE18 7F C3 F3 78 */ mr r3, r30 /* 801BDEDC 001BAE1C 4B E5 12 F1 */ bl mDoExt_setCurrentHeap /* 801BDEE0 001BAE20 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BDEE4 001BAE24 48 1A 43 45 */ bl func_80362228 +/* 801BDEE4 001BAE24 48 1A 43 45 */ bl _restgpr_29 /* 801BDEE8 001BAE28 80 01 00 24 */ lwz r0, 0x24(r1) /* 801BDEEC 001BAE2C 7C 08 03 A6 */ mtlr r0 /* 801BDEF0 001BAE30 38 21 00 20 */ addi r1, r1, 0x20 @@ -6587,7 +6587,7 @@ dMenu_Dmap_c_NS_mapControl: /* 801BDF98 001BAED8 DB 61 00 20 */ stfd f27, 0x20(r1) /* 801BDF9C 001BAEDC F3 61 00 28 */ psq_st f27, 40(r1), 0, qr0 /* 801BDFA0 001BAEE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BDFA4 001BAEE4 48 1A 42 39 */ bl func_803621DC +/* 801BDFA4 001BAEE4 48 1A 42 39 */ bl _savegpr_29 /* 801BDFA8 001BAEE8 7C 7E 1B 78 */ mr r30, r3 /* 801BDFAC 001BAEEC 8B A3 01 7E */ lbz r29, 0x17e(r3) /* 801BDFB0 001BAEF0 88 03 01 7B */ lbz r0, 0x17b(r3) @@ -6826,7 +6826,7 @@ lbl_801BE2E8: /* 801BE308 001BB248 E3 61 00 28 */ psq_l f27, 40(r1), 0, qr0 /* 801BE30C 001BB24C CB 61 00 20 */ lfd f27, 0x20(r1) /* 801BE310 001BB250 39 61 00 20 */ addi r11, r1, 0x20 -/* 801BE314 001BB254 48 1A 3F 15 */ bl func_80362228 +/* 801BE314 001BB254 48 1A 3F 15 */ bl _restgpr_29 /* 801BE318 001BB258 80 01 00 74 */ lwz r0, 0x74(r1) /* 801BE31C 001BB25C 7C 08 03 A6 */ mtlr r0 /* 801BE320 001BB260 38 21 00 70 */ addi r1, r1, 0x70 @@ -8069,7 +8069,7 @@ lbl_801BF490: /* 801BF52C 001BC46C 7C 08 02 A6 */ mflr r0 /* 801BF530 001BC470 90 01 00 34 */ stw r0, 0x34(r1) /* 801BF534 001BC474 39 61 00 30 */ addi r11, r1, 0x30 -/* 801BF538 001BC478 48 1A 2C A5 */ bl func_803621DC +/* 801BF538 001BC478 48 1A 2C A5 */ bl _savegpr_29 /* 801BF53C 001BC47C 7C 7F 1B 78 */ mr r31, r3 /* 801BF540 001BC480 4B FF DC 95 */ bl dMenu_Dmap_c_NS_getCurFloorPos /* 801BF544 001BC484 7C 60 07 74 */ extsb r0, r3 @@ -8149,7 +8149,7 @@ lbl_801BF668: /* 801BF668 001BC5A8 7F E3 FB 78 */ mr r3, r31 /* 801BF66C 001BC5AC 4B FF DB 9D */ bl dMenu_Dmap_c_NS_iconMoveCalc /* 801BF670 001BC5B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801BF674 001BC5B4 48 1A 2B B5 */ bl func_80362228 +/* 801BF674 001BC5B4 48 1A 2B B5 */ bl _restgpr_29 /* 801BF678 001BC5B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801BF67C 001BC5BC 7C 08 03 A6 */ mtlr r0 /* 801BF680 001BC5C0 38 21 00 30 */ addi r1, r1, 0x30 @@ -8191,7 +8191,7 @@ lbl_801BF668: /* 801BF710 001BC650 7C 08 02 A6 */ mflr r0 /* 801BF714 001BC654 90 01 00 34 */ stw r0, 0x34(r1) /* 801BF718 001BC658 39 61 00 30 */ addi r11, r1, 0x30 -/* 801BF71C 001BC65C 48 1A 2A C1 */ bl func_803621DC +/* 801BF71C 001BC65C 48 1A 2A C1 */ bl _savegpr_29 /* 801BF720 001BC660 7C 7F 1B 78 */ mr r31, r3 /* 801BF724 001BC664 4B FF DA B1 */ bl dMenu_Dmap_c_NS_getCurFloorPos /* 801BF728 001BC668 7C 60 07 74 */ extsb r0, r3 @@ -8284,7 +8284,7 @@ lbl_801BF880: /* 801BF880 001BC7C0 7F E3 FB 78 */ mr r3, r31 /* 801BF884 001BC7C4 4B FF D9 85 */ bl dMenu_Dmap_c_NS_iconMoveCalc /* 801BF888 001BC7C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801BF88C 001BC7CC 48 1A 29 9D */ bl func_80362228 +/* 801BF88C 001BC7CC 48 1A 29 9D */ bl _restgpr_29 /* 801BF890 001BC7D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801BF894 001BC7D4 7C 08 03 A6 */ mtlr r0 /* 801BF898 001BC7D8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index efa88689751..e199f013d62 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -251,7 +251,7 @@ dMenu_Fishing_c_NS__move: /* 801C50B8 001C1FF8 7C 08 02 A6 */ mflr r0 /* 801C50BC 001C1FFC 90 01 00 24 */ stw r0, 0x24(r1) /* 801C50C0 001C2000 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C50C4 001C2004 48 19 D1 19 */ bl func_803621DC +/* 801C50C4 001C2004 48 19 D1 19 */ bl _savegpr_29 /* 801C50C8 001C2008 7C 7D 1B 78 */ mr r29, r3 /* 801C50CC 001C200C 80 63 00 04 */ lwz r3, 4(r3) /* 801C50D0 001C2010 4B E4 A0 FD */ bl mDoExt_setCurrentHeap @@ -281,7 +281,7 @@ lbl_801C5120: /* 801C512C 001C206C 7F C3 F3 78 */ mr r3, r30 /* 801C5130 001C2070 4B E4 A0 9D */ bl mDoExt_setCurrentHeap /* 801C5134 001C2074 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C5138 001C2078 48 19 D0 F1 */ bl func_80362228 +/* 801C5138 001C2078 48 19 D0 F1 */ bl _restgpr_29 /* 801C513C 001C207C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C5140 001C2080 7C 08 03 A6 */ mtlr r0 /* 801C5144 001C2084 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 6a055fd90e5..aaf9bf5f6cc 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -1547,7 +1547,7 @@ lbl_801C7BB4: /* 801C7C30 001C4B70 7C 08 02 A6 */ mflr r0 /* 801C7C34 001C4B74 90 01 00 44 */ stw r0, 0x44(r1) /* 801C7C38 001C4B78 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C7C3C 001C4B7C 48 19 A5 A1 */ bl func_803621DC +/* 801C7C3C 001C4B7C 48 19 A5 A1 */ bl _savegpr_29 /* 801C7C40 001C4B80 7C 7E 1B 78 */ mr r30, r3 /* 801C7C44 001C4B84 80 63 00 0C */ lwz r3, 0xc(r3) /* 801C7C48 001C4B88 4B E6 A5 55 */ bl STControl_NS_checkTrigger @@ -1945,7 +1945,7 @@ lbl_801C8204: /* 801C8214 001C5154 98 1E 03 09 */ stb r0, 0x309(r30) lbl_801C8218: /* 801C8218 001C5158 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C821C 001C515C 48 19 A0 0D */ bl func_80362228 +/* 801C821C 001C515C 48 19 A0 0D */ bl _restgpr_29 /* 801C8220 001C5160 80 01 00 44 */ lwz r0, 0x44(r1) /* 801C8224 001C5164 7C 08 03 A6 */ mtlr r0 /* 801C8228 001C5168 38 21 00 40 */ addi r1, r1, 0x40 @@ -4173,7 +4173,7 @@ lbl_801CA338: /* 801CA360 001C72A0 7C 08 02 A6 */ mflr r0 /* 801CA364 001C72A4 90 01 00 24 */ stw r0, 0x24(r1) /* 801CA368 001C72A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CA36C 001C72AC 48 19 7E 71 */ bl func_803621DC +/* 801CA36C 001C72AC 48 19 7E 71 */ bl _savegpr_29 /* 801CA370 001C72B0 7C 7D 1B 78 */ mr r29, r3 /* 801CA374 001C72B4 48 06 DE B9 */ bl dMsgObject_c_NS_getStatus /* 801CA378 001C72B8 54 60 04 3E */ clrlwi r0, r3, 0x10 @@ -4210,7 +4210,7 @@ lbl_801CA3D4: /* 801CA3F0 001C7330 4B E6 A5 9D */ bl dSv_event_c_NS_onEventBit lbl_801CA3F4: /* 801CA3F4 001C7334 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CA3F8 001C7338 48 19 7E 31 */ bl func_80362228 +/* 801CA3F8 001C7338 48 19 7E 31 */ bl _restgpr_29 /* 801CA3FC 001C733C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CA400 001C7340 7C 08 03 A6 */ mtlr r0 /* 801CA404 001C7344 38 21 00 20 */ addi r1, r1, 0x20 @@ -4507,7 +4507,7 @@ lbl_801CA860: /* 801CA878 001C77B8 7C 08 02 A6 */ mflr r0 /* 801CA87C 001C77BC 90 01 00 64 */ stw r0, 0x64(r1) /* 801CA880 001C77C0 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CA884 001C77C4 48 19 79 59 */ bl func_803621DC +/* 801CA884 001C77C4 48 19 79 59 */ bl _savegpr_29 /* 801CA888 001C77C8 7C 7F 1B 78 */ mr r31, r3 /* 801CA88C 001C77CC 38 00 FF F6 */ li r0, -10 /* 801CA890 001C77D0 B0 03 02 14 */ sth r0, 0x214(r3) @@ -4583,7 +4583,7 @@ lbl_801CA98C: /* 801CA994 001C78D4 3B DE 00 04 */ addi r30, r30, 4 /* 801CA998 001C78D8 41 80 FF 48 */ blt lbl_801CA8E0 /* 801CA99C 001C78DC 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CA9A0 001C78E0 48 19 78 89 */ bl func_80362228 +/* 801CA9A0 001C78E0 48 19 78 89 */ bl _restgpr_29 /* 801CA9A4 001C78E4 80 01 00 64 */ lwz r0, 0x64(r1) /* 801CA9A8 001C78E8 7C 08 03 A6 */ mtlr r0 /* 801CA9AC 001C78EC 38 21 00 60 */ addi r1, r1, 0x60 @@ -4863,7 +4863,7 @@ dMenu_Fmap_c_NS_isOpen: /* 801CADC8 001C7D08 7C 08 02 A6 */ mflr r0 /* 801CADCC 001C7D0C 90 01 00 34 */ stw r0, 0x34(r1) /* 801CADD0 001C7D10 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CADD4 001C7D14 48 19 74 09 */ bl func_803621DC +/* 801CADD4 001C7D14 48 19 74 09 */ bl _savegpr_29 /* 801CADD8 001C7D18 7C 7D 1B 78 */ mr r29, r3 /* 801CADDC 001C7D1C 3B E0 00 00 */ li r31, 0 /* 801CADE0 001C7D20 3B C0 00 00 */ li r30, 0 @@ -5022,7 +5022,7 @@ lbl_801CAFC8: /* 801CB01C 001C7F5C 7F E3 FB 78 */ mr r3, r31 lbl_801CB020: /* 801CB020 001C7F60 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CB024 001C7F64 48 19 72 05 */ bl func_80362228 +/* 801CB024 001C7F64 48 19 72 05 */ bl _restgpr_29 /* 801CB028 001C7F68 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CB02C 001C7F6C 7C 08 03 A6 */ mtlr r0 /* 801CB030 001C7F70 38 21 00 30 */ addi r1, r1, 0x30 @@ -5034,7 +5034,7 @@ dMenu_Fmap_c_NS_isClose: /* 801CB03C 001C7F7C 7C 08 02 A6 */ mflr r0 /* 801CB040 001C7F80 90 01 00 34 */ stw r0, 0x34(r1) /* 801CB044 001C7F84 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CB048 001C7F88 48 19 71 95 */ bl func_803621DC +/* 801CB048 001C7F88 48 19 71 95 */ bl _savegpr_29 /* 801CB04C 001C7F8C 7C 7D 1B 78 */ mr r29, r3 /* 801CB050 001C7F90 3B E0 00 01 */ li r31, 1 /* 801CB054 001C7F94 3B C0 00 00 */ li r30, 0 @@ -5137,7 +5137,7 @@ lbl_801CB174: /* 801CB1BC 001C80FC 48 00 BA 89 */ bl dMenu_Fmap2DTop_c_NS_setAllAlphaRate /* 801CB1C0 001C8100 7F E3 FB 78 */ mr r3, r31 /* 801CB1C4 001C8104 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CB1C8 001C8108 48 19 70 61 */ bl func_80362228 +/* 801CB1C8 001C8108 48 19 70 61 */ bl _restgpr_29 /* 801CB1CC 001C810C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CB1D0 001C8110 7C 08 03 A6 */ mtlr r0 /* 801CB1D4 001C8114 38 21 00 30 */ addi r1, r1, 0x30 @@ -5536,7 +5536,7 @@ dMenu_Fmap_c_NS_setFlash: /* 801CB6E4 001C8624 7C 08 02 A6 */ mflr r0 /* 801CB6E8 001C8628 90 01 00 24 */ stw r0, 0x24(r1) /* 801CB6EC 001C862C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB6F0 001C8630 48 19 6A ED */ bl func_803621DC +/* 801CB6F0 001C8630 48 19 6A ED */ bl _savegpr_29 /* 801CB6F4 001C8634 7C 7D 1B 78 */ mr r29, r3 /* 801CB6F8 001C8638 7C 9E 23 78 */ mr r30, r4 /* 801CB6FC 001C863C 7C BF 2B 78 */ mr r31, r5 @@ -5565,7 +5565,7 @@ lbl_801CB738: /* 801CB754 001C8694 48 00 3A 8D */ bl dMenu_FmapMap_c_NS_setFlashOn lbl_801CB758: /* 801CB758 001C8698 39 61 00 20 */ addi r11, r1, 0x20 -/* 801CB75C 001C869C 48 19 6A CD */ bl func_80362228 +/* 801CB75C 001C869C 48 19 6A CD */ bl _restgpr_29 /* 801CB760 001C86A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CB764 001C86A4 7C 08 03 A6 */ mtlr r0 /* 801CB768 001C86A8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index f0ad49becb0..98d89d9b22f 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -1268,7 +1268,7 @@ dMenu_Fmap2DBack_c_NS_setRegionTexData: /* 801D0850 001CD790 DA E1 00 30 */ stfd f23, 0x30(r1) /* 801D0854 001CD794 F2 E1 00 38 */ psq_st f23, 56(r1), 0, qr0 /* 801D0858 001CD798 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D085C 001CD79C 48 19 19 81 */ bl func_803621DC +/* 801D085C 001CD79C 48 19 19 81 */ bl _savegpr_29 /* 801D0860 001CD7A0 7C 7E 1B 78 */ mr r30, r3 /* 801D0864 001CD7A4 7C 9F 23 78 */ mr r31, r4 /* 801D0868 001CD7A8 7C BD 2B 78 */ mr r29, r5 @@ -1427,7 +1427,7 @@ lbl_801D0A58: /* 801D0AA8 001CD9E8 E2 E1 00 38 */ psq_l f23, 56(r1), 0, qr0 /* 801D0AAC 001CD9EC CA E1 00 30 */ lfd f23, 0x30(r1) /* 801D0AB0 001CD9F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D0AB4 001CD9F4 48 19 17 75 */ bl func_80362228 +/* 801D0AB4 001CD9F4 48 19 17 75 */ bl _restgpr_29 /* 801D0AB8 001CD9F8 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801D0ABC 001CD9FC 7C 08 03 A6 */ mtlr r0 /* 801D0AC0 001CDA00 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -1557,7 +1557,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst: /* 801D0C80 001CDBC0 DB C1 00 20 */ stfd f30, 0x20(r1) /* 801D0C84 001CDBC4 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801D0C88 001CDBC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0C8C 001CDBCC 48 19 15 51 */ bl func_803621DC +/* 801D0C8C 001CDBCC 48 19 15 51 */ bl _savegpr_29 /* 801D0C90 001CDBD0 7C 7D 1B 78 */ mr r29, r3 /* 801D0C94 001CDBD4 7C 9E 23 78 */ mr r30, r4 /* 801D0C98 001CDBD8 7C BF 2B 78 */ mr r31, r5 @@ -1587,7 +1587,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst: /* 801D0CF8 001CDC38 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801D0CFC 001CDC3C CB C1 00 20 */ lfd f30, 0x20(r1) /* 801D0D00 001CDC40 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0D04 001CDC44 48 19 15 25 */ bl func_80362228 +/* 801D0D04 001CDC44 48 19 15 25 */ bl _restgpr_29 /* 801D0D08 001CDC48 80 01 00 44 */ lwz r0, 0x44(r1) /* 801D0D0C 001CDC4C 7C 08 03 A6 */ mtlr r0 /* 801D0D10 001CDC50 38 21 00 40 */ addi r1, r1, 0x40 @@ -1620,7 +1620,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_: /* 801D0D64 001CDCA4 DB C1 00 20 */ stfd f30, 0x20(r1) /* 801D0D68 001CDCA8 F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801D0D6C 001CDCAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0D70 001CDCB0 48 19 14 6D */ bl func_803621DC +/* 801D0D70 001CDCB0 48 19 14 6D */ bl _savegpr_29 /* 801D0D74 001CDCB4 7C 7D 1B 78 */ mr r29, r3 /* 801D0D78 001CDCB8 7C 80 23 78 */ mr r0, r4 /* 801D0D7C 001CDCBC FF C0 08 90 */ fmr f30, f1 @@ -1651,7 +1651,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_: /* 801D0DE0 001CDD20 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801D0DE4 001CDD24 CB C1 00 20 */ lfd f30, 0x20(r1) /* 801D0DE8 001CDD28 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0DEC 001CDD2C 48 19 14 3D */ bl func_80362228 +/* 801D0DEC 001CDD2C 48 19 14 3D */ bl _restgpr_29 /* 801D0DF0 001CDD30 80 01 00 44 */ lwz r0, 0x44(r1) /* 801D0DF4 001CDD34 7C 08 03 A6 */ mtlr r0 /* 801D0DF8 001CDD38 38 21 00 40 */ addi r1, r1, 0x40 @@ -1679,7 +1679,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_: /* 801D0E44 001CDD84 DB 01 00 20 */ stfd f24, 0x20(r1) /* 801D0E48 001CDD88 F3 01 00 28 */ psq_st f24, 40(r1), 0, qr0 /* 801D0E4C 001CDD8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0E50 001CDD90 48 19 13 8D */ bl func_803621DC +/* 801D0E50 001CDD90 48 19 13 8D */ bl _savegpr_29 /* 801D0E54 001CDD94 7C 7D 1B 78 */ mr r29, r3 /* 801D0E58 001CDD98 FF 40 08 90 */ fmr f26, f1 /* 801D0E5C 001CDD9C FF 60 10 90 */ fmr f27, f2 @@ -1749,7 +1749,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_: /* 801D0F5C 001CDE9C E3 01 00 28 */ psq_l f24, 40(r1), 0, qr0 /* 801D0F60 001CDEA0 CB 01 00 20 */ lfd f24, 0x20(r1) /* 801D0F64 001CDEA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0F68 001CDEA8 48 19 12 C1 */ bl func_80362228 +/* 801D0F68 001CDEA8 48 19 12 C1 */ bl _restgpr_29 /* 801D0F6C 001CDEAC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801D0F70 001CDEB0 7C 08 03 A6 */ mtlr r0 /* 801D0F74 001CDEB4 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -1769,7 +1769,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld: /* 801D0FA0 001CDEE0 DB 81 00 20 */ stfd f28, 0x20(r1) /* 801D0FA4 001CDEE4 F3 81 00 28 */ psq_st f28, 40(r1), 0, qr0 /* 801D0FA8 001CDEE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D0FAC 001CDEEC 48 19 12 31 */ bl func_803621DC +/* 801D0FAC 001CDEEC 48 19 12 31 */ bl _savegpr_29 /* 801D0FB0 001CDEF0 7C 7D 1B 78 */ mr r29, r3 /* 801D0FB4 001CDEF4 7C 9E 23 78 */ mr r30, r4 /* 801D0FB8 001CDEF8 7C BF 2B 78 */ mr r31, r5 @@ -1822,7 +1822,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld: /* 801D1074 001CDFB4 E3 81 00 28 */ psq_l f28, 40(r1), 0, qr0 /* 801D1078 001CDFB8 CB 81 00 20 */ lfd f28, 0x20(r1) /* 801D107C 001CDFBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D1080 001CDFC0 48 19 11 A9 */ bl func_80362228 +/* 801D1080 001CDFC0 48 19 11 A9 */ bl _restgpr_29 /* 801D1084 001CDFC4 80 01 00 64 */ lwz r0, 0x64(r1) /* 801D1088 001CDFC8 7C 08 03 A6 */ mtlr r0 /* 801D108C 001CDFCC 38 21 00 60 */ addi r1, r1, 0x60 @@ -4783,7 +4783,7 @@ dMenu_Fmap2DBack_c_NS_regionOriginDraw: /* 801D3AFC 001D0A3C 7C 08 02 A6 */ mflr r0 /* 801D3B00 001D0A40 90 01 00 34 */ stw r0, 0x34(r1) /* 801D3B04 001D0A44 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3B08 001D0A48 48 18 E6 D5 */ bl func_803621DC +/* 801D3B08 001D0A48 48 18 E6 D5 */ bl _savegpr_29 /* 801D3B0C 001D0A4C 7C 7D 1B 78 */ mr r29, r3 /* 801D3B10 001D0A50 3B C0 00 00 */ li r30, 0 /* 801D3B14 001D0A54 3B E0 00 00 */ li r31, 0 @@ -4825,7 +4825,7 @@ lbl_801D3B94: /* 801D3B9C 001D0ADC 3B FF 00 04 */ addi r31, r31, 4 /* 801D3BA0 001D0AE0 41 80 FF 78 */ blt lbl_801D3B18 /* 801D3BA4 001D0AE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D3BA8 001D0AE8 48 18 E6 81 */ bl func_80362228 +/* 801D3BA8 001D0AE8 48 18 E6 81 */ bl _restgpr_29 /* 801D3BAC 001D0AEC 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D3BB0 001D0AF0 7C 08 03 A6 */ mtlr r0 /* 801D3BB4 001D0AF4 38 21 00 30 */ addi r1, r1, 0x30 @@ -5865,7 +5865,7 @@ dMenu_Fmap2DBack_c_NS_regionMapMove: /* 801D4B50 001D1A90 DB 81 00 30 */ stfd f28, 0x30(r1) /* 801D4B54 001D1A94 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 801D4B58 001D1A98 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D4B5C 001D1A9C 48 18 D6 81 */ bl func_803621DC +/* 801D4B5C 001D1A9C 48 18 D6 81 */ bl _savegpr_29 /* 801D4B60 001D1AA0 7C 7F 1B 78 */ mr r31, r3 /* 801D4B64 001D1AA4 7C 9D 23 78 */ mr r29, r4 /* 801D4B68 001D1AA8 4B FF DC 29 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY @@ -6073,7 +6073,7 @@ lbl_801D4E48: /* 801D4E60 001D1DA0 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 801D4E64 001D1DA4 CB 81 00 30 */ lfd f28, 0x30(r1) /* 801D4E68 001D1DA8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D4E6C 001D1DAC 48 18 D3 BD */ bl func_80362228 +/* 801D4E6C 001D1DAC 48 18 D3 BD */ bl _restgpr_29 /* 801D4E70 001D1DB0 80 01 00 74 */ lwz r0, 0x74(r1) /* 801D4E74 001D1DB4 7C 08 03 A6 */ mtlr r0 /* 801D4E78 001D1DB8 38 21 00 70 */ addi r1, r1, 0x70 @@ -8844,7 +8844,7 @@ dMenu_Fmap2DTop_c_NS_createExplain: /* 801D7644 001D4584 7C 08 02 A6 */ mflr r0 /* 801D7648 001D4588 90 01 00 24 */ stw r0, 0x24(r1) /* 801D764C 001D458C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D7650 001D4590 48 18 AB 8D */ bl func_803621DC +/* 801D7650 001D4590 48 18 AB 8D */ bl _savegpr_29 /* 801D7654 001D4594 7C 7D 1B 78 */ mr r29, r3 /* 801D7658 001D4598 7C BE 2B 78 */ mr r30, r5 /* 801D765C 001D459C 80 03 00 6C */ lwz r0, 0x6c(r3) @@ -8869,7 +8869,7 @@ lbl_801D769C: /* 801D76A4 001D45E4 4B E3 7B 29 */ bl mDoExt_setCurrentHeap lbl_801D76A8: /* 801D76A8 001D45E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D76AC 001D45EC 48 18 AB 7D */ bl func_80362228 +/* 801D76AC 001D45EC 48 18 AB 7D */ bl _restgpr_29 /* 801D76B0 001D45F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D76B4 001D45F4 7C 08 03 A6 */ mtlr r0 /* 801D76B8 001D45F8 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 c60d9d429f5..091d62a8bbb 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -406,7 +406,7 @@ dMenu_Insect_c_NS__move: /* 801D86CC 001D560C 7C 08 02 A6 */ mflr r0 /* 801D86D0 001D5610 90 01 00 24 */ stw r0, 0x24(r1) /* 801D86D4 001D5614 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D86D8 001D5618 48 18 9B 05 */ bl func_803621DC +/* 801D86D8 001D5618 48 18 9B 05 */ bl _savegpr_29 /* 801D86DC 001D561C 7C 7D 1B 78 */ mr r29, r3 /* 801D86E0 001D5620 80 63 00 04 */ lwz r3, 4(r3) /* 801D86E4 001D5624 4B E3 6A E9 */ bl mDoExt_setCurrentHeap @@ -436,7 +436,7 @@ lbl_801D8734: /* 801D8740 001D5680 7F C3 F3 78 */ mr r3, r30 /* 801D8744 001D5684 4B E3 6A 89 */ bl mDoExt_setCurrentHeap /* 801D8748 001D5688 39 61 00 20 */ addi r11, r1, 0x20 -/* 801D874C 001D568C 48 18 9A DD */ bl func_80362228 +/* 801D874C 001D568C 48 18 9A DD */ bl _restgpr_29 /* 801D8750 001D5690 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D8754 001D5694 7C 08 03 A6 */ mtlr r0 /* 801D8758 001D5698 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 e7039e62521..68db0285e7a 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -486,7 +486,7 @@ dMenu_Letter_c_NS__move: /* 801DD478 001DA3B8 7C 08 02 A6 */ mflr r0 /* 801DD47C 001DA3BC 90 01 00 24 */ stw r0, 0x24(r1) /* 801DD480 001DA3C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DD484 001DA3C4 48 18 4D 59 */ bl func_803621DC +/* 801DD484 001DA3C4 48 18 4D 59 */ bl _savegpr_29 /* 801DD488 001DA3C8 7C 7D 1B 78 */ mr r29, r3 /* 801DD48C 001DA3CC 80 63 00 04 */ lwz r3, 4(r3) /* 801DD490 001DA3D0 4B E3 1D 3D */ bl mDoExt_setCurrentHeap @@ -516,7 +516,7 @@ lbl_801DD4E0: /* 801DD4EC 001DA42C 7F C3 F3 78 */ mr r3, r30 /* 801DD4F0 001DA430 4B E3 1C DD */ bl mDoExt_setCurrentHeap /* 801DD4F4 001DA434 39 61 00 20 */ addi r11, r1, 0x20 -/* 801DD4F8 001DA438 48 18 4D 31 */ bl func_80362228 +/* 801DD4F8 001DA438 48 18 4D 31 */ bl _restgpr_29 /* 801DD4FC 001DA43C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801DD500 001DA440 7C 08 03 A6 */ mtlr r0 /* 801DD504 001DA444 38 21 00 20 */ addi r1, r1, 0x20 @@ -1166,7 +1166,7 @@ lbl_801DDDF8: /* 801DDE58 001DAD98 7C 08 02 A6 */ mflr r0 /* 801DDE5C 001DAD9C 90 01 00 34 */ stw r0, 0x34(r1) /* 801DDE60 001DADA0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DDE64 001DADA4 48 18 43 79 */ bl func_803621DC +/* 801DDE64 001DADA4 48 18 43 79 */ bl _savegpr_29 /* 801DDE68 001DADA8 7C 7E 1B 78 */ mr r30, r3 /* 801DDE6C 001DADAC 8B E3 03 6E */ lbz r31, 0x36e(r3) /* 801DDE70 001DADB0 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) @@ -1362,7 +1362,7 @@ lbl_801DE138: /* 801DE148 001DB088 48 00 2A 69 */ bl dMenu_Letter_c_NS_changeActiveColor lbl_801DE14C: /* 801DE14C 001DB08C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DE150 001DB090 48 18 40 D9 */ bl func_80362228 +/* 801DE150 001DB090 48 18 40 D9 */ bl _restgpr_29 /* 801DE154 001DB094 80 01 00 34 */ lwz r0, 0x34(r1) /* 801DE158 001DB098 7C 08 03 A6 */ mtlr r0 /* 801DE15C 001DB09C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index 32acdc60cd5..df9c2f7076d 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -2261,7 +2261,7 @@ dMenu_Option_c_NS_atten_init: /* 801E3FC8 001E0F08 7C 08 02 A6 */ mflr r0 /* 801E3FCC 001E0F0C 90 01 00 34 */ stw r0, 0x34(r1) /* 801E3FD0 001E0F10 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E3FD4 001E0F14 48 17 E2 09 */ bl func_803621DC +/* 801E3FD4 001E0F14 48 17 E2 09 */ bl _savegpr_29 /* 801E3FD8 001E0F18 7C 7F 1B 78 */ mr r31, r3 /* 801E3FDC 001E0F1C 80 63 00 58 */ lwz r3, 0x58(r3) /* 801E3FE0 001E0F20 4B E4 E5 C1 */ bl STControl_NS_checkDownTrigger @@ -2380,7 +2380,7 @@ lbl_801E4180: /* 801E4184 001E10C4 48 00 3C 71 */ bl dMenu_Option_c_NS_changeTVCheck lbl_801E4188: /* 801E4188 001E10C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E418C 001E10CC 48 17 E0 9D */ bl func_80362228 +/* 801E418C 001E10CC 48 17 E0 9D */ bl _restgpr_29 /* 801E4190 001E10D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E4194 001E10D4 7C 08 03 A6 */ mtlr r0 /* 801E4198 001E10D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -2607,7 +2607,7 @@ lbl_801E4470: /* 801E44E4 001E1424 7C 08 02 A6 */ mflr r0 /* 801E44E8 001E1428 90 01 00 44 */ stw r0, 0x44(r1) /* 801E44EC 001E142C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801E44F0 001E1430 48 17 DC ED */ bl func_803621DC +/* 801E44F0 001E1430 48 17 DC ED */ bl _savegpr_29 /* 801E44F4 001E1434 7C 7F 1B 78 */ mr r31, r3 /* 801E44F8 001E1438 80 63 00 58 */ lwz r3, 0x58(r3) /* 801E44FC 001E143C 4B E4 E0 29 */ bl STControl_NS_checkUpTrigger @@ -2860,7 +2860,7 @@ lbl_801E488C: /* 801E4890 001E17D0 48 00 35 65 */ bl dMenu_Option_c_NS_changeTVCheck lbl_801E4894: /* 801E4894 001E17D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 801E4898 001E17D8 48 17 D9 91 */ bl func_80362228 +/* 801E4898 001E17D8 48 17 D9 91 */ bl _restgpr_29 /* 801E489C 001E17DC 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E48A0 001E17E0 7C 08 03 A6 */ mtlr r0 /* 801E48A4 001E17E4 38 21 00 40 */ addi r1, r1, 0x40 @@ -3105,7 +3105,7 @@ lbl_801E4B70: /* 801E4C14 001E1B54 7C 08 02 A6 */ mflr r0 /* 801E4C18 001E1B58 90 01 00 24 */ stw r0, 0x24(r1) /* 801E4C1C 001E1B5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E4C20 001E1B60 48 17 D5 BD */ bl func_803621DC +/* 801E4C20 001E1B60 48 17 D5 BD */ bl _savegpr_29 /* 801E4C24 001E1B64 7C 7D 1B 78 */ mr r29, r3 /* 801E4C28 001E1B68 80 83 00 34 */ lwz r4, 0x34(r3) /* 801E4C2C 001E1B6C 88 84 00 3D */ lbz r4, 0x3d(r4) @@ -3151,7 +3151,7 @@ lbl_801E4CBC: /* 801E4CC4 001E1C04 7F A3 EB 78 */ mr r3, r29 /* 801E4CC8 001E1C08 4B FF EE 25 */ bl dMenu_Option_c_NS_setAnimation /* 801E4CCC 001E1C0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E4CD0 001E1C10 48 17 D5 59 */ bl func_80362228 +/* 801E4CD0 001E1C10 48 17 D5 59 */ bl _restgpr_29 /* 801E4CD4 001E1C14 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E4CD8 001E1C18 7C 08 03 A6 */ mtlr r0 /* 801E4CDC 001E1C1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5751,7 +5751,7 @@ dMenu_Option_c_NS_setCursorPos: /* 801E7318 001E4258 7C 08 02 A6 */ mflr r0 /* 801E731C 001E425C 90 01 00 34 */ stw r0, 0x34(r1) /* 801E7320 001E4260 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E7324 001E4264 48 17 AE B9 */ bl func_803621DC +/* 801E7324 001E4264 48 17 AE B9 */ bl _savegpr_29 /* 801E7328 001E4268 7C 7D 1B 78 */ mr r29, r3 /* 801E732C 001E426C 7C 9E 23 78 */ mr r30, r4 /* 801E7330 001E4270 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -5792,7 +5792,7 @@ lbl_801E7340: /* 801E73B8 001E42F8 38 80 00 00 */ li r4, 0 /* 801E73BC 001E42FC 48 00 03 5D */ bl dMenu_Option_c_NS_changeBarColor /* 801E73C0 001E4300 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E73C4 001E4304 48 17 AE 65 */ bl func_80362228 +/* 801E73C4 001E4304 48 17 AE 65 */ bl _restgpr_29 /* 801E73C8 001E4308 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E73CC 001E430C 7C 08 03 A6 */ mtlr r0 /* 801E73D0 001E4310 38 21 00 30 */ addi r1, r1, 0x30 @@ -6464,7 +6464,7 @@ dMenu_Option_c_NS_setZButtonString: /* 801E7D64 001E4CA4 7C 08 02 A6 */ mflr r0 /* 801E7D68 001E4CA8 90 01 00 24 */ stw r0, 0x24(r1) /* 801E7D6C 001E4CAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E7D70 001E4CB0 48 17 A4 6D */ bl func_803621DC +/* 801E7D70 001E4CB0 48 17 A4 6D */ bl _savegpr_29 /* 801E7D74 001E4CB4 7C 7D 1B 78 */ mr r29, r3 /* 801E7D78 001E4CB8 54 80 04 3F */ clrlwi. r0, r4, 0x10 /* 801E7D7C 001E4CBC 40 82 00 34 */ bne lbl_801E7DB0 @@ -6498,7 +6498,7 @@ lbl_801E7DCC: /* 801E7DD8 001E4D18 41 80 FF E0 */ blt lbl_801E7DB8 lbl_801E7DDC: /* 801E7DDC 001E4D1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E7DE0 001E4D20 48 17 A4 49 */ bl func_80362228 +/* 801E7DE0 001E4D20 48 17 A4 49 */ bl _restgpr_29 /* 801E7DE4 001E4D24 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E7DE8 001E4D28 7C 08 03 A6 */ mtlr r0 /* 801E7DEC 001E4D2C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6714,7 +6714,7 @@ dMenu_Option_c_NS_paneResize: /* 801E80C8 001E5008 DB C1 00 20 */ stfd f30, 0x20(r1) /* 801E80CC 001E500C F3 C1 00 28 */ psq_st f30, 40(r1), 0, qr0 /* 801E80D0 001E5010 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E80D4 001E5014 48 17 A1 09 */ bl func_803621DC +/* 801E80D4 001E5014 48 17 A1 09 */ bl _savegpr_29 /* 801E80D8 001E5018 7C 7D 1B 78 */ mr r29, r3 /* 801E80DC 001E501C 7C BF 2B 78 */ mr r31, r5 /* 801E80E0 001E5020 7C DE 33 78 */ mr r30, r6 @@ -6788,7 +6788,7 @@ dMenu_Option_c_NS_paneResize: /* 801E81F0 001E5130 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 /* 801E81F4 001E5134 CB C1 00 20 */ lfd f30, 0x20(r1) /* 801E81F8 001E5138 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E81FC 001E513C 48 17 A0 2D */ bl func_80362228 +/* 801E81FC 001E513C 48 17 A0 2D */ bl _restgpr_29 /* 801E8200 001E5140 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E8204 001E5144 7C 08 03 A6 */ mtlr r0 /* 801E8208 001E5148 38 21 00 40 */ addi r1, r1, 0x40 @@ -6850,7 +6850,7 @@ dMenu_Option_c_NS_yesnoMenuMoveAnmInitSet: /* 801E82C8 001E5208 7C 08 02 A6 */ mflr r0 /* 801E82CC 001E520C 90 01 00 34 */ stw r0, 0x34(r1) /* 801E82D0 001E5210 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E82D4 001E5214 48 17 9F 09 */ bl func_803621DC +/* 801E82D4 001E5214 48 17 9F 09 */ bl _savegpr_29 /* 801E82D8 001E5218 7C 7D 1B 78 */ mr r29, r3 /* 801E82DC 001E521C 7C 9E 23 78 */ mr r30, r4 /* 801E82E0 001E5220 7C BF 2B 78 */ mr r31, r5 @@ -6936,7 +6936,7 @@ lbl_801E8394: /* 801E8418 001E5358 80 63 00 04 */ lwz r3, 4(r3) /* 801E841C 001E535C 48 10 FB B1 */ bl J2DPane_NS_animationTransform /* 801E8420 001E5360 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E8424 001E5364 48 17 9E 05 */ bl func_80362228 +/* 801E8424 001E5364 48 17 9E 05 */ bl _restgpr_29 /* 801E8428 001E5368 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E842C 001E536C 7C 08 03 A6 */ mtlr r0 /* 801E8430 001E5370 38 21 00 30 */ addi r1, r1, 0x30 @@ -7060,7 +7060,7 @@ dMenu_Option_c_NS_yesnoSelectMoveAnm: /* 801E85D8 001E5518 7C 08 02 A6 */ mflr r0 /* 801E85DC 001E551C 90 01 00 24 */ stw r0, 0x24(r1) /* 801E85E0 001E5520 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E85E4 001E5524 48 17 9B F9 */ bl func_803621DC +/* 801E85E4 001E5524 48 17 9B F9 */ bl _savegpr_29 /* 801E85E8 001E5528 7C 7D 1B 78 */ mr r29, r3 /* 801E85EC 001E552C 3B E0 00 00 */ li r31, 0 /* 801E85F0 001E5530 88 03 03 FA */ lbz r0, 0x3fa(r3) @@ -7239,7 +7239,7 @@ lbl_801E8868: lbl_801E886C: /* 801E886C 001E57AC 7F E3 FB 78 */ mr r3, r31 /* 801E8870 001E57B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801E8874 001E57B4 48 17 99 B5 */ bl func_80362228 +/* 801E8874 001E57B4 48 17 99 B5 */ bl _restgpr_29 /* 801E8878 001E57B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E887C 001E57BC 7C 08 03 A6 */ mtlr r0 /* 801E8880 001E57C0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index 49df08921d0..e24810236f8 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -326,7 +326,7 @@ lbl_801E9590: /* 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 -/* 801E95BC 001E64FC 4B E4 94 A1 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801E95BC 001E64FC 4B E4 94 A1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801E95C0 001E6500 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801E95C4 001E6504 56 80 06 3E */ clrlwi r0, r20, 0x18 /* 801E95C8 001E6508 7C 03 00 40 */ cmplw r3, r0 @@ -339,7 +339,7 @@ lbl_801E95D4: /* 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 -/* 801E95EC 001E652C 4B E4 94 71 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801E95EC 001E652C 4B E4 94 71 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801E95F0 001E6530 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801E95F4 001E6534 56 80 06 3E */ clrlwi r0, r20, 0x18 /* 801E95F8 001E6538 7C 03 00 40 */ cmplw r3, r0 @@ -350,7 +350,7 @@ lbl_801E9604: /* 801E9608 001E6548 8A 83 5E 95 */ lbz r20, 0x5e95(r3) /* 801E960C 001E654C 7E 63 9B 78 */ mr r3, r19 /* 801E9610 001E6550 38 80 00 02 */ li r4, 2 -/* 801E9614 001E6554 4B E4 94 49 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801E9614 001E6554 4B E4 94 49 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801E9618 001E6558 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801E961C 001E655C 7C 00 A0 40 */ cmplw r0, r20 /* 801E9620 001E6560 40 82 00 08 */ bne lbl_801E9628 @@ -2386,7 +2386,7 @@ dMenu_Ring_c_NS_isClose: /* 801EB3D0 001E8310 7C 08 02 A6 */ mflr r0 /* 801EB3D4 001E8314 90 01 00 34 */ stw r0, 0x34(r1) /* 801EB3D8 001E8318 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EB3DC 001E831C 48 17 6E 01 */ bl func_803621DC +/* 801EB3DC 001E831C 48 17 6E 01 */ bl _savegpr_29 /* 801EB3E0 001E8320 7C 7E 1B 78 */ mr r30, r3 /* 801EB3E4 001E8324 3B E0 00 01 */ li r31, 1 /* 801EB3E8 001E8328 A8 03 06 74 */ lha r0, 0x674(r3) @@ -2539,7 +2539,7 @@ lbl_801EB608: /* 801EB608 001E8548 7F E3 FB 78 */ mr r3, r31 lbl_801EB60C: /* 801EB60C 001E854C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EB610 001E8550 48 17 6C 19 */ bl func_80362228 +/* 801EB610 001E8550 48 17 6C 19 */ bl _restgpr_29 /* 801EB614 001E8554 80 01 00 34 */ lwz r0, 0x34(r1) /* 801EB618 001E8558 7C 08 03 A6 */ mtlr r0 /* 801EB61C 001E855C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2842,7 +2842,7 @@ dMenu_Ring_c_NS_setItemScale: /* 801EBA40 001E8980 90 01 00 24 */ stw r0, 0x24(r1) /* 801EBA44 001E8984 DB E1 00 18 */ stfd f31, 0x18(r1) /* 801EBA48 001E8988 39 61 00 18 */ addi r11, r1, 0x18 -/* 801EBA4C 001E898C 48 17 67 91 */ bl func_803621DC +/* 801EBA4C 001E898C 48 17 67 91 */ bl _savegpr_29 /* 801EBA50 001E8990 FF E0 08 90 */ fmr f31, f1 /* 801EBA54 001E8994 3B A0 00 00 */ li r29, 0 /* 801EBA58 001E8998 3B E0 00 00 */ li r31, 0 @@ -2866,7 +2866,7 @@ lbl_801EBA8C: /* 801EBA98 001E89D8 41 80 FF CC */ blt lbl_801EBA64 /* 801EBA9C 001E89DC CB E1 00 18 */ lfd f31, 0x18(r1) /* 801EBAA0 001E89E0 39 61 00 18 */ addi r11, r1, 0x18 -/* 801EBAA4 001E89E4 48 17 67 85 */ bl func_80362228 +/* 801EBAA4 001E89E4 48 17 67 85 */ bl _restgpr_29 /* 801EBAA8 001E89E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801EBAAC 001E89EC 7C 08 03 A6 */ mtlr r0 /* 801EBAB0 001E89F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2964,7 +2964,7 @@ lbl_801EBBB4: /* 801EBBE0 001E8B20 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBBE4 001E8B24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBBE8 001E8B28 38 80 00 01 */ li r4, 1 -/* 801EBBEC 001E8B2C 4B E4 6E 71 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBBEC 001E8B2C 4B E4 6E 71 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBBF0 001E8B30 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EBBF4 001E8B34 7C 9E 02 14 */ add r4, r30, r0 /* 801EBBF8 001E8B38 88 84 06 90 */ lbz r4, 0x690(r4) @@ -2974,7 +2974,7 @@ lbl_801EBBB4: /* 801EBC08 001E8B48 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBC0C 001E8B4C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBC10 001E8B50 38 80 00 00 */ li r4, 0 -/* 801EBC14 001E8B54 4B E4 6E 49 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBC14 001E8B54 4B E4 6E 49 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBC18 001E8B58 7C 7A 1B 78 */ mr r26, r3 /* 801EBC1C 001E8B5C 7F 5B D3 78 */ mr r27, r26 /* 801EBC20 001E8B60 38 60 00 00 */ li r3, 0 @@ -3009,7 +3009,7 @@ lbl_801EBC68: /* 801EBC88 001E8BC8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBC8C 001E8BCC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBC90 001E8BD0 38 80 00 00 */ li r4, 0 -/* 801EBC94 001E8BD4 4B E4 6D C9 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBC94 001E8BD4 4B E4 6D C9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBC98 001E8BD8 7C 7B 1B 78 */ mr r27, r3 /* 801EBC9C 001E8BDC 3B 20 00 FF */ li r25, 0xff /* 801EBCA0 001E8BE0 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -3042,7 +3042,7 @@ lbl_801EBCF4: /* 801EBCFC 001E8C3C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBD00 001E8C40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBD04 001E8C44 38 80 00 00 */ li r4, 0 -/* 801EBD08 001E8C48 4B E4 6D 55 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBD08 001E8C48 4B E4 6D 55 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBD0C 001E8C4C 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EBD10 001E8C50 7C 9E 02 14 */ add r4, r30, r0 /* 801EBD14 001E8C54 88 84 06 90 */ lbz r4, 0x690(r4) @@ -3052,7 +3052,7 @@ lbl_801EBCF4: /* 801EBD24 001E8C64 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBD28 001E8C68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBD2C 001E8C6C 38 80 00 01 */ li r4, 1 -/* 801EBD30 001E8C70 4B E4 6D 2D */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBD30 001E8C70 4B E4 6D 2D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBD34 001E8C74 7C 79 1B 78 */ mr r25, r3 /* 801EBD38 001E8C78 7F 3C CB 78 */ mr r28, r25 /* 801EBD3C 001E8C7C 38 60 00 01 */ li r3, 1 @@ -3087,7 +3087,7 @@ lbl_801EBD84: /* 801EBDA4 001E8CE4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBDA8 001E8CE8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBDAC 001E8CEC 38 80 00 01 */ li r4, 1 -/* 801EBDB0 001E8CF0 4B E4 6C AD */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBDB0 001E8CF0 4B E4 6C AD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBDB4 001E8CF4 7C 7C 1B 78 */ mr r28, r3 /* 801EBDB8 001E8CF8 3B 40 00 FF */ li r26, 0xff /* 801EBDBC 001E8CFC 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -3140,7 +3140,7 @@ dMenu_Ring_c_NS_setJumpItem: /* 801EBE5C 001E8D9C 7C 08 02 A6 */ mflr r0 /* 801EBE60 001E8DA0 90 01 00 34 */ stw r0, 0x34(r1) /* 801EBE64 001E8DA4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EBE68 001E8DA8 48 17 63 75 */ bl func_803621DC +/* 801EBE68 001E8DA8 48 17 63 75 */ bl _savegpr_29 /* 801EBE6C 001E8DAC 7C 7E 1B 78 */ mr r30, r3 /* 801EBE70 001E8DB0 7C 9F 23 78 */ mr r31, r4 /* 801EBE74 001E8DB4 3B A0 00 00 */ li r29, 0 @@ -3244,7 +3244,7 @@ lbl_801EBFB8: /* 801EBFDC 001E8F1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EBFE0 001E8F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EBFE4 001E8F24 38 80 00 00 */ li r4, 0 -/* 801EBFE8 001E8F28 4B E4 6A 75 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EBFE8 001E8F28 4B E4 6A 75 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EBFEC 001E8F2C 88 9E 06 B4 */ lbz r4, 0x6b4(r30) /* 801EBFF0 001E8F30 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EBFF4 001E8F34 7C 04 00 40 */ cmplw r4, r0 @@ -3271,7 +3271,7 @@ lbl_801EC020: /* 801EC040 001E8F80 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC044 001E8F84 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EC048 001E8F88 38 80 00 01 */ li r4, 1 -/* 801EC04C 001E8F8C 4B E4 6A 11 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EC04C 001E8F8C 4B E4 6A 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC050 001E8F90 88 9E 06 B5 */ lbz r4, 0x6b5(r30) /* 801EC054 001E8F94 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC058 001E8F98 7C 04 00 40 */ cmplw r4, r0 @@ -3389,7 +3389,7 @@ lbl_801EC1C0: /* 801EC1F0 001E9130 48 0B F7 95 */ bl Z2SeMgr_NS_seStart lbl_801EC1F4: /* 801EC1F4 001E9134 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EC1F8 001E9138 48 17 60 31 */ bl func_80362228 +/* 801EC1F8 001E9138 48 17 60 31 */ bl _restgpr_29 /* 801EC1FC 001E913C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801EC200 001E9140 7C 08 03 A6 */ mtlr r0 /* 801EC204 001E9144 38 21 00 30 */ addi r1, r1, 0x30 @@ -3790,12 +3790,12 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC794 001E96D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC798 001E96D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EC79C 001E96DC 38 80 00 00 */ li r4, 0 -/* 801EC7A0 001E96E0 4B E4 62 BD */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EC7A0 001E96E0 4B E4 62 BD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC7A4 001E96E4 7C 7E 1B 78 */ mr r30, r3 /* 801EC7A8 001E96E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC7AC 001E96EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EC7B0 001E96F0 38 80 00 01 */ li r4, 1 -/* 801EC7B4 001E96F4 4B E4 62 A9 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EC7B4 001E96F4 4B E4 62 A9 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC7B8 001E96F8 7C 7D 1B 78 */ mr r29, r3 /* 801EC7BC 001E96FC 80 02 A9 DC */ lwz r0, lbl_804543DC-_SDA2_BASE_(r2) /* 801EC7C0 001E9700 90 01 00 18 */ stw r0, 0x18(r1) @@ -3807,7 +3807,7 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC7D8 001E9718 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC7DC 001E971C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EC7E0 001E9720 38 80 00 00 */ li r4, 0 -/* 801EC7E4 001E9724 4B E4 62 79 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EC7E4 001E9724 4B E4 62 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC7E8 001E9728 88 1B 06 A8 */ lbz r0, 0x6a8(r27) /* 801EC7EC 001E972C 7C 9B 02 14 */ add r4, r27, r0 /* 801EC7F0 001E9730 88 84 06 90 */ lbz r4, 0x690(r4) @@ -3849,7 +3849,7 @@ lbl_801EC868: /* 801EC87C 001E97BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC880 001E97C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EC884 001E97C4 38 80 00 01 */ li r4, 1 -/* 801EC888 001E97C8 4B E4 61 D5 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EC888 001E97C8 4B E4 61 D5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC88C 001E97CC 88 1B 06 A8 */ lbz r0, 0x6a8(r27) /* 801EC890 001E97D0 7C 9B 02 14 */ add r4, r27, r0 /* 801EC894 001E97D4 88 84 06 90 */ lbz r4, 0x690(r4) @@ -3896,7 +3896,7 @@ lbl_801EC92C: /* 801EC92C 001E986C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC930 001E9870 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EC934 001E9874 38 80 00 00 */ li r4, 0 -/* 801EC938 001E9878 4B E4 61 25 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EC938 001E9878 4B E4 61 25 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EC93C 001E987C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC940 001E9880 28 00 00 04 */ cmplwi r0, 4 /* 801EC944 001E9884 40 82 00 18 */ bne lbl_801EC95C @@ -3950,7 +3950,7 @@ lbl_801EC9F8: /* 801EC9F8 001E9938 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EC9FC 001E993C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801ECA00 001E9940 38 80 00 01 */ li r4, 1 -/* 801ECA04 001E9944 4B E4 60 59 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801ECA04 001E9944 4B E4 60 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801ECA08 001E9948 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801ECA0C 001E994C 28 00 00 04 */ cmplwi r0, 4 /* 801ECA10 001E9950 40 82 00 18 */ bne lbl_801ECA28 @@ -5121,7 +5121,7 @@ dMenu_Ring_c_NS_setSelectItem: /* 801EDB18 001EAA58 7C 08 02 A6 */ mflr r0 /* 801EDB1C 001EAA5C 90 01 00 44 */ stw r0, 0x44(r1) /* 801EDB20 001EAA60 39 61 00 40 */ addi r11, r1, 0x40 -/* 801EDB24 001EAA64 48 17 46 B9 */ bl func_803621DC +/* 801EDB24 001EAA64 48 17 46 B9 */ bl _savegpr_29 /* 801EDB28 001EAA68 7C 7D 1B 78 */ mr r29, r3 /* 801EDB2C 001EAA6C 7C 9E 23 78 */ mr r30, r4 /* 801EDB30 001EAA70 7C BF 2B 78 */ mr r31, r5 @@ -5212,7 +5212,7 @@ lbl_801EDC04: /* 801EDC78 001EABB8 EC 00 00 F2 */ fmuls f0, f0, f3 /* 801EDC7C 001EABBC D0 04 05 58 */ stfs f0, 0x558(r4) /* 801EDC80 001EABC0 39 61 00 40 */ addi r11, r1, 0x40 -/* 801EDC84 001EABC4 48 17 45 A5 */ bl func_80362228 +/* 801EDC84 001EABC4 48 17 45 A5 */ bl _restgpr_29 /* 801EDC88 001EABC8 80 01 00 44 */ lwz r0, 0x44(r1) /* 801EDC8C 001EABCC 7C 08 03 A6 */ mtlr r0 /* 801EDC90 001EABD0 38 21 00 40 */ addi r1, r1, 0x40 @@ -5632,7 +5632,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE240 001EB180 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE244 001EB184 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EE248 001EB188 38 80 00 00 */ li r4, 0 -/* 801EE24C 001EB18C 4B E4 48 11 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EE24C 001EB18C 4B E4 48 11 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE250 001EB190 7C 60 1B 78 */ mr r0, r3 /* 801EE254 001EB194 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE258 001EB198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -5645,7 +5645,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE274 001EB1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE278 001EB1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EE27C 001EB1BC 38 80 00 01 */ li r4, 1 -/* 801EE280 001EB1C0 4B E4 47 DD */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EE280 001EB1C0 4B E4 47 DD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE284 001EB1C4 7C 60 1B 78 */ mr r0, r3 /* 801EE288 001EB1C8 7F 83 E3 78 */ mr r3, r28 /* 801EE28C 001EB1CC 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -5655,7 +5655,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 801EE29C 001EB1DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EE2A0 001EB1E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EE2A4 001EB1E4 38 80 00 02 */ li r4, 2 -/* 801EE2A8 001EB1E8 4B E4 47 B5 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EE2A8 001EB1E8 4B E4 47 B5 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE2AC 001EB1EC 7C 60 1B 78 */ mr r0, r3 /* 801EE2B0 001EB1F0 7F 83 E3 78 */ mr r3, r28 /* 801EE2B4 001EB1F4 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -5664,7 +5664,7 @@ dMenu_Ring_c_NS_checkExplainForce: /* 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 -/* 801EE2CC 001EB20C 4B E4 47 91 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EE2CC 001EB20C 4B E4 47 91 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EE2D0 001EB210 7C 60 1B 78 */ mr r0, r3 /* 801EE2D4 001EB214 7F 83 E3 78 */ mr r3, r28 /* 801EE2D8 001EB218 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -6214,7 +6214,7 @@ dMenu_Ring_c_NS_getItem: /* 801EEA88 001EB9C8 7C 08 02 A6 */ mflr r0 /* 801EEA8C 001EB9CC 90 01 00 24 */ stw r0, 0x24(r1) /* 801EEA90 001EB9D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801EEA94 001EB9D4 48 17 37 49 */ bl func_803621DC +/* 801EEA94 001EB9D4 48 17 37 49 */ bl _savegpr_29 /* 801EEA98 001EB9D8 7C BD 2B 78 */ mr r29, r5 /* 801EEA9C 001EB9DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EEAA0 001EB9E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -6229,7 +6229,7 @@ dMenu_Ring_c_NS_getItem: /* 801EEAC4 001EBA04 4B E4 45 6D */ bl dSv_player_item_c_NS_getItem /* 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 func_80362228 +/* 801EEAD0 001EBA10 48 17 37 59 */ bl _restgpr_29 /* 801EEAD4 001EBA14 80 01 00 24 */ lwz r0, 0x24(r1) /* 801EEAD8 001EBA18 7C 08 03 A6 */ mtlr r0 /* 801EEADC 001EBA1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6312,7 +6312,7 @@ lbl_801EEBE4: /* 801EEBE4 001EBB24 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EEBE8 001EBB28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EEBEC 001EBB2C 38 80 00 00 */ li r4, 0 -/* 801EEBF0 001EBB30 4B E4 3E 6D */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EEBF0 001EBB30 4B E4 3E 6D */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EEBF4 001EBB34 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEBF8 001EBB38 28 00 00 04 */ cmplwi r0, 4 /* 801EEBFC 001EBB3C 40 82 00 18 */ bne lbl_801EEC14 @@ -6334,7 +6334,7 @@ lbl_801EEC30: /* 801EEC30 001EBB70 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EEC34 001EBB74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EEC38 001EBB78 38 80 00 01 */ li r4, 1 -/* 801EEC3C 001EBB7C 4B E4 3E 21 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EEC3C 001EBB7C 4B E4 3E 21 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EEC40 001EBB80 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEC44 001EBB84 28 00 00 04 */ cmplwi r0, 4 /* 801EEC48 001EBB88 40 82 00 18 */ bne lbl_801EEC60 @@ -6391,7 +6391,7 @@ dMenu_Ring_c_NS_isMixItemOff: /* 801EECF8 001EBC38 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EECFC 001EBC3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EED00 001EBC40 38 80 00 00 */ li r4, 0 -/* 801EED04 001EBC44 4B E4 3D 59 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EED04 001EBC44 4B E4 3D 59 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EED08 001EBC48 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801EED0C 001EBC4C 7C 9F 02 14 */ add r4, r31, r0 /* 801EED10 001EBC50 88 84 06 90 */ lbz r4, 0x690(r4) @@ -6409,7 +6409,7 @@ lbl_801EED28: /* 801EED3C 001EBC7C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801EED40 001EBC80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801EED44 001EBC84 38 80 00 01 */ li r4, 1 -/* 801EED48 001EBC88 4B E4 3D 15 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 801EED48 001EBC88 4B E4 3D 15 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 801EED4C 001EBC8C 88 1F 06 A8 */ lbz r0, 0x6a8(r31) /* 801EED50 001EBC90 7C 9F 02 14 */ add r4, r31, r0 /* 801EED54 001EBC94 88 84 06 90 */ lbz r4, 0x690(r4) diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 05259313cac..b2e3addd537 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -2688,7 +2688,7 @@ lbl_801F1D40: /* 801F1D58 001EEC98 7C 08 02 A6 */ mflr r0 /* 801F1D5C 001EEC9C 90 01 00 24 */ stw r0, 0x24(r1) /* 801F1D60 001EECA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1D64 001EECA4 48 17 04 79 */ bl func_803621DC +/* 801F1D64 001EECA4 48 17 04 79 */ bl _savegpr_29 /* 801F1D68 001EECA8 7C 7D 1B 78 */ mr r29, r3 /* 801F1D6C 001EECAC 48 00 34 25 */ bl dMenu_save_c_NS_errorTxtChangeAnm /* 801F1D70 001EECB0 7C 7E 1B 78 */ mr r30, r3 @@ -2712,7 +2712,7 @@ lbl_801F1D40: /* 801F1DB8 001EECF8 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F1DBC: /* 801F1DBC 001EECFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1DC0 001EED00 48 17 04 69 */ bl func_80362228 +/* 801F1DC0 001EED00 48 17 04 69 */ bl _restgpr_29 /* 801F1DC4 001EED04 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F1DC8 001EED08 7C 08 03 A6 */ mtlr r0 /* 801F1DCC 001EED0C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2756,7 +2756,7 @@ lbl_801F1E44: /* 801F1E5C 001EED9C 7C 08 02 A6 */ mflr r0 /* 801F1E60 001EEDA0 90 01 00 24 */ stw r0, 0x24(r1) /* 801F1E64 001EEDA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1E68 001EEDA8 48 17 03 75 */ bl func_803621DC +/* 801F1E68 001EEDA8 48 17 03 75 */ bl _savegpr_29 /* 801F1E6C 001EEDAC 7C 7D 1B 78 */ mr r29, r3 /* 801F1E70 001EEDB0 48 00 33 21 */ bl dMenu_save_c_NS_errorTxtChangeAnm /* 801F1E74 001EEDB4 7C 7E 1B 78 */ mr r30, r3 @@ -2782,7 +2782,7 @@ lbl_801F1E44: /* 801F1EC4 001EEE04 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F1EC8: /* 801F1EC8 001EEE08 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1ECC 001EEE0C 48 17 03 5D */ bl func_80362228 +/* 801F1ECC 001EEE0C 48 17 03 5D */ bl _restgpr_29 /* 801F1ED0 001EEE10 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F1ED4 001EEE14 7C 08 03 A6 */ mtlr r0 /* 801F1ED8 001EEE18 38 21 00 20 */ addi r1, r1, 0x20 @@ -2914,7 +2914,7 @@ lbl_801F2098: /* 801F20B0 001EEFF0 7C 08 02 A6 */ mflr r0 /* 801F20B4 001EEFF4 90 01 00 24 */ stw r0, 0x24(r1) /* 801F20B8 001EEFF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F20BC 001EEFFC 48 17 01 21 */ bl func_803621DC +/* 801F20BC 001EEFFC 48 17 01 21 */ bl _savegpr_29 /* 801F20C0 001EF000 7C 7D 1B 78 */ mr r29, r3 /* 801F20C4 001EF004 48 00 30 CD */ bl dMenu_save_c_NS_errorTxtChangeAnm /* 801F20C8 001EF008 7C 7E 1B 78 */ mr r30, r3 @@ -2940,7 +2940,7 @@ lbl_801F2098: /* 801F2118 001EF058 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F211C: /* 801F211C 001EF05C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2120 001EF060 48 17 01 09 */ bl func_80362228 +/* 801F2120 001EF060 48 17 01 09 */ bl _restgpr_29 /* 801F2124 001EF064 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F2128 001EF068 7C 08 03 A6 */ mtlr r0 /* 801F212C 001EF06C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3136,7 +3136,7 @@ lbl_801F2390: /* 801F2400 001EF340 7C 08 02 A6 */ mflr r0 /* 801F2404 001EF344 90 01 00 24 */ stw r0, 0x24(r1) /* 801F2408 001EF348 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F240C 001EF34C 48 16 FD D1 */ bl func_803621DC +/* 801F240C 001EF34C 48 16 FD D1 */ bl _savegpr_29 /* 801F2410 001EF350 7C 7D 1B 78 */ mr r29, r3 /* 801F2414 001EF354 48 00 2D 7D */ bl dMenu_save_c_NS_errorTxtChangeAnm /* 801F2418 001EF358 7C 7E 1B 78 */ mr r30, r3 @@ -3160,7 +3160,7 @@ lbl_801F2390: /* 801F2460 001EF3A0 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F2464: /* 801F2464 001EF3A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2468 001EF3A8 48 16 FD C1 */ bl func_80362228 +/* 801F2468 001EF3A8 48 16 FD C1 */ bl _restgpr_29 /* 801F246C 001EF3AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F2470 001EF3B0 7C 08 03 A6 */ mtlr r0 /* 801F2474 001EF3B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -3209,7 +3209,7 @@ lbl_801F2500: /* 801F2518 001EF458 7C 08 02 A6 */ mflr r0 /* 801F251C 001EF45C 90 01 00 24 */ stw r0, 0x24(r1) /* 801F2520 001EF460 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2524 001EF464 48 16 FC B9 */ bl func_803621DC +/* 801F2524 001EF464 48 16 FC B9 */ bl _savegpr_29 /* 801F2528 001EF468 7C 7D 1B 78 */ mr r29, r3 /* 801F252C 001EF46C 48 00 2C 65 */ bl dMenu_save_c_NS_errorTxtChangeAnm /* 801F2530 001EF470 7C 7E 1B 78 */ mr r30, r3 @@ -3239,7 +3239,7 @@ lbl_801F2500: /* 801F2590 001EF4D0 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F2594: /* 801F2594 001EF4D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2598 001EF4D8 48 16 FC 91 */ bl func_80362228 +/* 801F2598 001EF4D8 48 16 FC 91 */ bl _restgpr_29 /* 801F259C 001EF4DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F25A0 001EF4E0 7C 08 03 A6 */ mtlr r0 /* 801F25A4 001EF4E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -3341,7 +3341,7 @@ lbl_801F26F4: /* 801F270C 001EF64C 7C 08 02 A6 */ mflr r0 /* 801F2710 001EF650 90 01 00 24 */ stw r0, 0x24(r1) /* 801F2714 001EF654 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2718 001EF658 48 16 FA C5 */ bl func_803621DC +/* 801F2718 001EF658 48 16 FA C5 */ bl _savegpr_29 /* 801F271C 001EF65C 7C 7F 1B 78 */ mr r31, r3 /* 801F2720 001EF660 48 00 22 09 */ bl dMenu_save_c_NS_headerTxtChangeAnm /* 801F2724 001EF664 7C 7D 1B 78 */ mr r29, r3 @@ -3382,7 +3382,7 @@ lbl_801F26F4: /* 801F27B0 001EF6F0 98 1F 01 BF */ stb r0, 0x1bf(r31) lbl_801F27B4: /* 801F27B4 001EF6F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F27B8 001EF6F8 48 16 FA 71 */ bl func_80362228 +/* 801F27B8 001EF6F8 48 16 FA 71 */ bl _restgpr_29 /* 801F27BC 001EF6FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F27C0 001EF700 7C 08 03 A6 */ mtlr r0 /* 801F27C4 001EF704 38 21 00 20 */ addi r1, r1, 0x20 @@ -3425,7 +3425,7 @@ dMenu_save_c_NS_dataWrite: /* 801F2844 001EF784 7C 08 02 A6 */ mflr r0 /* 801F2848 001EF788 90 01 00 24 */ stw r0, 0x24(r1) /* 801F284C 001EF78C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2850 001EF790 48 16 F9 8D */ bl func_803621DC +/* 801F2850 001EF790 48 16 F9 8D */ bl _savegpr_29 /* 801F2854 001EF794 7C 7D 1B 78 */ mr r29, r3 /* 801F2858 001EF798 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801F285C 001EF79C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3458,7 +3458,7 @@ lbl_801F28AC: /* 801F28C4 001EF804 7F A3 EB 78 */ mr r3, r29 /* 801F28C8 001EF808 48 00 3E F1 */ bl dMenu_save_c_NS_dataSave /* 801F28CC 001EF80C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F28D0 001EF810 48 16 F9 59 */ bl func_80362228 +/* 801F28D0 001EF810 48 16 F9 59 */ bl _restgpr_29 /* 801F28D4 001EF814 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F28D8 001EF818 7C 08 03 A6 */ mtlr r0 /* 801F28DC 001EF81C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3633,7 +3633,7 @@ lbl_801F2B48: /* 801F2B60 001EFAA0 7C 08 02 A6 */ mflr r0 /* 801F2B64 001EFAA4 90 01 00 24 */ stw r0, 0x24(r1) /* 801F2B68 001EFAA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2B6C 001EFAAC 48 16 F6 71 */ bl func_803621DC +/* 801F2B6C 001EFAAC 48 16 F6 71 */ bl _savegpr_29 /* 801F2B70 001EFAB0 7C 7D 1B 78 */ mr r29, r3 /* 801F2B74 001EFAB4 48 00 1D B5 */ bl dMenu_save_c_NS_headerTxtChangeAnm /* 801F2B78 001EFAB8 7C 7E 1B 78 */ mr r30, r3 @@ -3664,7 +3664,7 @@ lbl_801F2B48: /* 801F2BDC 001EFB1C 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F2BE0: /* 801F2BE0 001EFB20 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2BE4 001EFB24 48 16 F6 45 */ bl func_80362228 +/* 801F2BE4 001EFB24 48 16 F6 45 */ bl _restgpr_29 /* 801F2BE8 001EFB28 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F2BEC 001EFB2C 7C 08 03 A6 */ mtlr r0 /* 801F2BF0 001EFB30 38 21 00 20 */ addi r1, r1, 0x20 @@ -4289,7 +4289,7 @@ dMenu_save_c_NS_msgTxtSet: /* 801F34C0 001F0400 7C 08 02 A6 */ mflr r0 /* 801F34C4 001F0404 90 01 00 24 */ stw r0, 0x24(r1) /* 801F34C8 001F0408 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F34CC 001F040C 48 16 ED 11 */ bl func_803621DC +/* 801F34CC 001F040C 48 16 ED 11 */ bl _savegpr_29 /* 801F34D0 001F0410 7C 7D 1B 78 */ mr r29, r3 /* 801F34D4 001F0414 7C 9E 23 78 */ mr r30, r4 /* 801F34D8 001F0418 7C BF 2B 78 */ mr r31, r5 @@ -4335,7 +4335,7 @@ lbl_801F3568: /* 801F3568 001F04A8 38 00 00 00 */ li r0, 0 /* 801F356C 001F04AC 98 1D 01 B9 */ stb r0, 0x1b9(r29) /* 801F3570 001F04B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3574 001F04B4 48 16 EC B5 */ bl func_80362228 +/* 801F3574 001F04B4 48 16 EC B5 */ bl _restgpr_29 /* 801F3578 001F04B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F357C 001F04BC 7C 08 03 A6 */ mtlr r0 /* 801F3580 001F04C0 38 21 00 20 */ addi r1, r1, 0x20 @@ -4686,7 +4686,7 @@ dMenu_save_c_NS_saveSelectStart: /* 801F3A98 001F09D8 7C 08 02 A6 */ mflr r0 /* 801F3A9C 001F09DC 90 01 00 24 */ stw r0, 0x24(r1) /* 801F3AA0 001F09E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3AA4 001F09E4 48 16 E7 39 */ bl func_803621DC +/* 801F3AA4 001F09E4 48 16 E7 39 */ bl _savegpr_29 /* 801F3AA8 001F09E8 7C 7D 1B 78 */ mr r29, r3 /* 801F3AAC 001F09EC 38 00 00 6D */ li r0, 0x6d /* 801F3AB0 001F09F0 90 01 00 08 */ stw r0, 8(r1) @@ -4763,7 +4763,7 @@ lbl_801F3BA0: /* 801F3BC4 001F0B04 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F3BC8: /* 801F3BC8 001F0B08 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3BCC 001F0B0C 48 16 E6 5D */ bl func_80362228 +/* 801F3BCC 001F0B0C 48 16 E6 5D */ bl _restgpr_29 /* 801F3BD0 001F0B10 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F3BD4 001F0B14 7C 08 03 A6 */ mtlr r0 /* 801F3BD8 001F0B18 38 21 00 20 */ addi r1, r1, 0x20 @@ -5572,7 +5572,7 @@ dMenu_save_c_NS_yesnoCancelAnmSet: /* 801F47E0 001F1720 7C 08 02 A6 */ mflr r0 /* 801F47E4 001F1724 90 01 00 24 */ stw r0, 0x24(r1) /* 801F47E8 001F1728 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F47EC 001F172C 48 16 D9 F1 */ bl func_803621DC +/* 801F47EC 001F172C 48 16 D9 F1 */ bl _savegpr_29 /* 801F47F0 001F1730 7C 7D 1B 78 */ mr r29, r3 /* 801F47F4 001F1734 48 00 01 35 */ bl dMenu_save_c_NS_headerTxtChangeAnm /* 801F47F8 001F1738 7C 7E 1B 78 */ mr r30, r3 @@ -5596,7 +5596,7 @@ dMenu_save_c_NS_yesnoCancelAnmSet: /* 801F4840 001F1780 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F4844: /* 801F4844 001F1784 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4848 001F1788 48 16 D9 E1 */ bl func_80362228 +/* 801F4848 001F1788 48 16 D9 E1 */ bl _restgpr_29 /* 801F484C 001F178C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F4850 001F1790 7C 08 03 A6 */ mtlr r0 /* 801F4854 001F1794 38 21 00 20 */ addi r1, r1, 0x20 @@ -5936,7 +5936,7 @@ lbl_801F4CF8: /* 801F4D14 001F1C54 7C 08 02 A6 */ mflr r0 /* 801F4D18 001F1C58 90 01 00 24 */ stw r0, 0x24(r1) /* 801F4D1C 001F1C5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4D20 001F1C60 48 16 D4 BD */ bl func_803621DC +/* 801F4D20 001F1C60 48 16 D4 BD */ bl _savegpr_29 /* 801F4D24 001F1C64 7C 7D 1B 78 */ mr r29, r3 /* 801F4D28 001F1C68 48 00 12 5D */ bl dMenu_save_c_NS_errorMoveAnm /* 801F4D2C 001F1C6C 7C 7F 1B 78 */ mr r31, r3 @@ -5969,7 +5969,7 @@ lbl_801F4D8C: /* 801F4D90 001F1CD0 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F4D94: /* 801F4D94 001F1CD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4D98 001F1CD8 48 16 D4 91 */ bl func_80362228 +/* 801F4D98 001F1CD8 48 16 D4 91 */ bl _restgpr_29 /* 801F4D9C 001F1CDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F4DA0 001F1CE0 7C 08 03 A6 */ mtlr r0 /* 801F4DA4 001F1CE4 38 21 00 20 */ addi r1, r1, 0x20 @@ -6374,7 +6374,7 @@ dMenu_save_c_NS_selectDataBaseMoveAnmInitSet: /* 801F5340 001F2280 7C 08 02 A6 */ mflr r0 /* 801F5344 001F2284 90 01 00 24 */ stw r0, 0x24(r1) /* 801F5348 001F2288 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F534C 001F228C 48 16 CE 91 */ bl func_803621DC +/* 801F534C 001F228C 48 16 CE 91 */ bl _savegpr_29 /* 801F5350 001F2290 7C 7D 1B 78 */ mr r29, r3 /* 801F5354 001F2294 7C 9E 23 78 */ mr r30, r4 /* 801F5358 001F2298 7C BF 2B 78 */ mr r31, r5 @@ -6403,7 +6403,7 @@ dMenu_save_c_NS_selectDataBaseMoveAnmInitSet: /* 801F53B4 001F22F4 38 00 00 01 */ li r0, 1 /* 801F53B8 001F22F8 98 1D 00 65 */ stb r0, 0x65(r29) /* 801F53BC 001F22FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F53C0 001F2300 48 16 CE 69 */ bl func_80362228 +/* 801F53C0 001F2300 48 16 CE 69 */ bl _restgpr_29 /* 801F53C4 001F2304 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F53C8 001F2308 7C 08 03 A6 */ mtlr r0 /* 801F53CC 001F230C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6505,7 +6505,7 @@ dMenu_save_c_NS_selectDataMoveAnmInitSet: /* 801F550C 001F244C 7C 08 02 A6 */ mflr r0 /* 801F5510 001F2450 90 01 00 24 */ stw r0, 0x24(r1) /* 801F5514 001F2454 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5518 001F2458 48 16 CC C5 */ bl func_803621DC +/* 801F5518 001F2458 48 16 CC C5 */ bl _savegpr_29 /* 801F551C 001F245C 7C 7F 1B 78 */ mr r31, r3 /* 801F5520 001F2460 7C 9D 23 78 */ mr r29, r4 /* 801F5524 001F2464 7C BE 2B 78 */ mr r30, r5 @@ -6558,7 +6558,7 @@ dMenu_save_c_NS_selectDataMoveAnmInitSet: /* 801F55E0 001F2520 80 63 00 04 */ lwz r3, 4(r3) /* 801F55E4 001F2524 48 10 29 E9 */ bl J2DPane_NS_animationTransform /* 801F55E8 001F2528 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F55EC 001F252C 48 16 CC 3D */ bl func_80362228 +/* 801F55EC 001F252C 48 16 CC 3D */ bl _restgpr_29 /* 801F55F0 001F2530 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F55F4 001F2534 7C 08 03 A6 */ mtlr r0 /* 801F55F8 001F2538 38 21 00 20 */ addi r1, r1, 0x20 @@ -6570,7 +6570,7 @@ dMenu_save_c_NS_selectDataMoveAnm: /* 801F5604 001F2544 7C 08 02 A6 */ mflr r0 /* 801F5608 001F2548 90 01 00 24 */ stw r0, 0x24(r1) /* 801F560C 001F254C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5610 001F2550 48 16 CB CD */ bl func_803621DC +/* 801F5610 001F2550 48 16 CB CD */ bl _savegpr_29 /* 801F5614 001F2554 7C 7F 1B 78 */ mr r31, r3 /* 801F5618 001F2558 88 03 00 54 */ lbz r0, 0x54(r3) /* 801F561C 001F255C 54 00 10 3A */ slwi r0, r0, 2 @@ -6648,7 +6648,7 @@ lbl_801F56F8: /* 801F5728 001F2668 38 60 00 01 */ li r3, 1 lbl_801F572C: /* 801F572C 001F266C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5730 001F2670 48 16 CA F9 */ bl func_80362228 +/* 801F5730 001F2670 48 16 CA F9 */ bl _restgpr_29 /* 801F5734 001F2674 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F5738 001F2678 7C 08 03 A6 */ mtlr r0 /* 801F573C 001F267C 38 21 00 20 */ addi r1, r1, 0x20 @@ -6660,7 +6660,7 @@ dMenu_save_c_NS_yesnoMenuMoveAnmInitSet: /* 801F5748 001F2688 7C 08 02 A6 */ mflr r0 /* 801F574C 001F268C 90 01 00 34 */ stw r0, 0x34(r1) /* 801F5750 001F2690 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F5754 001F2694 48 16 CA 89 */ bl func_803621DC +/* 801F5754 001F2694 48 16 CA 89 */ bl _savegpr_29 /* 801F5758 001F2698 7C 7D 1B 78 */ mr r29, r3 /* 801F575C 001F269C 7C 9E 23 78 */ mr r30, r4 /* 801F5760 001F26A0 7C BF 2B 78 */ mr r31, r5 @@ -6750,7 +6750,7 @@ lbl_801F581C: /* 801F58A8 001F27E8 38 00 00 01 */ li r0, 1 /* 801F58AC 001F27EC 98 1D 00 9D */ stb r0, 0x9d(r29) /* 801F58B0 001F27F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F58B4 001F27F4 48 16 C9 75 */ bl func_80362228 +/* 801F58B4 001F27F4 48 16 C9 75 */ bl _restgpr_29 /* 801F58B8 001F27F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F58BC 001F27FC 7C 08 03 A6 */ mtlr r0 /* 801F58C0 001F2800 38 21 00 30 */ addi r1, r1, 0x30 @@ -7183,7 +7183,7 @@ dMenu_save_c_NS_errorMoveAnmInitSet: /* 801F5EF8 001F2E38 7C 08 02 A6 */ mflr r0 /* 801F5EFC 001F2E3C 90 01 00 24 */ stw r0, 0x24(r1) /* 801F5F00 001F2E40 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5F04 001F2E44 48 16 C2 D9 */ bl func_803621DC +/* 801F5F04 001F2E44 48 16 C2 D9 */ bl _savegpr_29 /* 801F5F08 001F2E48 7C 7D 1B 78 */ mr r29, r3 /* 801F5F0C 001F2E4C 7C 9E 23 78 */ mr r30, r4 /* 801F5F10 001F2E50 7C BF 2B 78 */ mr r31, r5 @@ -7210,7 +7210,7 @@ dMenu_save_c_NS_errorMoveAnmInitSet: /* 801F5F64 001F2EA4 38 00 00 01 */ li r0, 1 /* 801F5F68 001F2EA8 98 1D 00 D3 */ stb r0, 0xd3(r29) /* 801F5F6C 001F2EAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5F70 001F2EB0 48 16 C2 B9 */ bl func_80362228 +/* 801F5F70 001F2EB0 48 16 C2 B9 */ bl _restgpr_29 /* 801F5F74 001F2EB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F5F78 001F2EB8 7C 08 03 A6 */ mtlr r0 /* 801F5F7C 001F2EBC 38 21 00 20 */ addi r1, r1, 0x20 @@ -7340,7 +7340,7 @@ dMenu_save_c_NS_modoruTxtDispAnm: /* 801F6124 001F3064 7C 08 02 A6 */ mflr r0 /* 801F6128 001F3068 90 01 00 24 */ stw r0, 0x24(r1) /* 801F612C 001F306C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6130 001F3070 48 16 C0 AD */ bl func_803621DC +/* 801F6130 001F3070 48 16 C0 AD */ bl _savegpr_29 /* 801F6134 001F3074 7C 7D 1B 78 */ mr r29, r3 /* 801F6138 001F3078 88 03 01 A8 */ lbz r0, 0x1a8(r3) /* 801F613C 001F307C 28 00 00 00 */ cmplwi r0, 0 @@ -7390,7 +7390,7 @@ lbl_801F61E0: /* 801F61E0 001F3120 38 60 00 00 */ li r3, 0 lbl_801F61E4: /* 801F61E4 001F3124 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F61E8 001F3128 48 16 C0 41 */ bl func_80362228 +/* 801F61E8 001F3128 48 16 C0 41 */ bl _restgpr_29 /* 801F61EC 001F312C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F61F0 001F3130 7C 08 03 A6 */ mtlr r0 /* 801F61F4 001F3134 38 21 00 20 */ addi r1, r1, 0x20 @@ -7439,7 +7439,7 @@ dMenu_save_c_NS_ketteiTxtDispAnm: /* 801F627C 001F31BC 7C 08 02 A6 */ mflr r0 /* 801F6280 001F31C0 90 01 00 24 */ stw r0, 0x24(r1) /* 801F6284 001F31C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6288 001F31C8 48 16 BF 55 */ bl func_803621DC +/* 801F6288 001F31C8 48 16 BF 55 */ bl _savegpr_29 /* 801F628C 001F31CC 7C 7D 1B 78 */ mr r29, r3 /* 801F6290 001F31D0 88 03 01 A9 */ lbz r0, 0x1a9(r3) /* 801F6294 001F31D4 28 00 00 00 */ cmplwi r0, 0 @@ -7489,7 +7489,7 @@ lbl_801F6338: /* 801F6338 001F3278 38 60 00 00 */ li r3, 0 lbl_801F633C: /* 801F633C 001F327C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6340 001F3280 48 16 BE E9 */ bl func_80362228 +/* 801F6340 001F3280 48 16 BE E9 */ bl _restgpr_29 /* 801F6344 001F3284 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F6348 001F3288 7C 08 03 A6 */ mtlr r0 /* 801F634C 001F328C 38 21 00 20 */ addi r1, r1, 0x20 @@ -7918,7 +7918,7 @@ dMenu_save_c_NS_setInitSaveData: /* 801F6958 001F3898 7C 08 02 A6 */ mflr r0 /* 801F695C 001F389C 90 01 00 24 */ stw r0, 0x24(r1) /* 801F6960 001F38A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6964 001F38A4 48 16 B8 79 */ bl func_803621DC +/* 801F6964 001F38A4 48 16 B8 79 */ bl _savegpr_29 /* 801F6968 001F38A8 7C 7D 1B 78 */ mr r29, r3 /* 801F696C 001F38AC 3B C0 00 00 */ li r30, 0 /* 801F6970 001F38B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -7935,7 +7935,7 @@ lbl_801F6978: /* 801F6998 001F38D8 2C 1E 00 03 */ cmpwi r30, 3 /* 801F699C 001F38DC 41 80 FF DC */ blt lbl_801F6978 /* 801F69A0 001F38E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F69A4 001F38E4 48 16 B8 85 */ bl func_80362228 +/* 801F69A4 001F38E4 48 16 B8 85 */ bl _restgpr_29 /* 801F69A8 001F38E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F69AC 001F38EC 7C 08 03 A6 */ mtlr r0 /* 801F69B0 001F38F0 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 99b24848f57..9d8027b74ac 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -362,7 +362,7 @@ dMenu_Skill_c_NS__move: /* 801F771C 001F465C 7C 08 02 A6 */ mflr r0 /* 801F7720 001F4660 90 01 00 24 */ stw r0, 0x24(r1) /* 801F7724 001F4664 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F7728 001F4668 48 16 AA B5 */ bl func_803621DC +/* 801F7728 001F4668 48 16 AA B5 */ bl _savegpr_29 /* 801F772C 001F466C 7C 7D 1B 78 */ mr r29, r3 /* 801F7730 001F4670 80 63 00 04 */ lwz r3, 4(r3) /* 801F7734 001F4674 4B E1 7A 99 */ bl mDoExt_setCurrentHeap @@ -392,7 +392,7 @@ lbl_801F7784: /* 801F7790 001F46D0 7F C3 F3 78 */ mr r3, r30 /* 801F7794 001F46D4 4B E1 7A 39 */ bl mDoExt_setCurrentHeap /* 801F7798 001F46D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F779C 001F46DC 48 16 AA 8D */ bl func_80362228 +/* 801F779C 001F46DC 48 16 AA 8D */ bl _restgpr_29 /* 801F77A0 001F46E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F77A4 001F46E4 7C 08 03 A6 */ mtlr r0 /* 801F77A8 001F46E8 38 21 00 20 */ addi r1, r1, 0x20 @@ -404,7 +404,7 @@ dMenu_Skill_c_NS__draw: /* 801F77B4 001F46F4 7C 08 02 A6 */ mflr r0 /* 801F77B8 001F46F8 90 01 00 24 */ stw r0, 0x24(r1) /* 801F77BC 001F46FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F77C0 001F4700 48 16 AA 1D */ bl func_803621DC +/* 801F77C0 001F4700 48 16 AA 1D */ bl _savegpr_29 /* 801F77C4 001F4704 7C 7D 1B 78 */ mr r29, r3 /* 801F77C8 001F4708 80 03 00 08 */ lwz r0, 8(r3) /* 801F77CC 001F470C 28 00 00 00 */ cmplwi r0, 0 @@ -502,7 +502,7 @@ lbl_801F7924: /* 801F7934 001F4874 48 10 15 A1 */ bl J2DScreen_NS_draw lbl_801F7938: /* 801F7938 001F4878 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F793C 001F487C 48 16 A8 ED */ bl func_80362228 +/* 801F793C 001F487C 48 16 A8 ED */ bl _restgpr_29 /* 801F7940 001F4880 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F7944 001F4884 7C 08 03 A6 */ mtlr r0 /* 801F7948 001F4888 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 335de9b04b6..72f27d9fd48 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -732,7 +732,7 @@ lbl_801FA524: /* 801FAA4C 001F798C 7C 08 02 A6 */ mflr r0 /* 801FAA50 001F7990 90 01 00 24 */ stw r0, 0x24(r1) /* 801FAA54 001F7994 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FAA58 001F7998 48 16 77 85 */ bl func_803621DC +/* 801FAA58 001F7998 48 16 77 85 */ bl _savegpr_29 /* 801FAA5C 001F799C 7C 7D 1B 78 */ mr r29, r3 /* 801FAA60 001F79A0 88 03 01 4B */ lbz r0, 0x14b(r3) /* 801FAA64 001F79A4 28 00 00 00 */ cmplwi r0, 0 @@ -1110,7 +1110,7 @@ lbl_801FAFAC: /* 801FAFC0 001F7F00 4B E3 31 21 */ bl dComIfGp_setHeapLockFlag lbl_801FAFC4: /* 801FAFC4 001F7F04 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FAFC8 001F7F08 48 16 72 61 */ bl func_80362228 +/* 801FAFC8 001F7F08 48 16 72 61 */ bl _restgpr_29 /* 801FAFCC 001F7F0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801FAFD0 001F7F10 7C 08 03 A6 */ mtlr r0 /* 801FAFD4 001F7F14 38 21 00 20 */ addi r1, r1, 0x20 @@ -3646,7 +3646,7 @@ dMw_c_NS__execute: /* 801FD2DC 001FA21C 7C 08 02 A6 */ mflr r0 /* 801FD2E0 001FA220 90 01 00 24 */ stw r0, 0x24(r1) /* 801FD2E4 001FA224 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD2E8 001FA228 48 16 4E F5 */ bl func_803621DC +/* 801FD2E8 001FA228 48 16 4E F5 */ bl _savegpr_29 /* 801FD2EC 001FA22C 7C 7E 1B 78 */ mr r30, r3 /* 801FD2F0 001FA230 88 63 01 51 */ lbz r3, 0x151(r3) /* 801FD2F4 001FA234 28 03 00 00 */ cmplwi r3, 0 @@ -3739,7 +3739,7 @@ lbl_801FD42C: /* 801FD430 001FA370 4B E1 1D 9D */ bl mDoExt_setCurrentHeap /* 801FD434 001FA374 38 60 00 01 */ li r3, 1 /* 801FD438 001FA378 39 61 00 20 */ addi r11, r1, 0x20 -/* 801FD43C 001FA37C 48 16 4D ED */ bl func_80362228 +/* 801FD43C 001FA37C 48 16 4D ED */ bl _restgpr_29 /* 801FD440 001FA380 80 01 00 24 */ lwz r0, 0x24(r1) /* 801FD444 001FA384 7C 08 03 A6 */ mtlr r0 /* 801FD448 001FA388 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 a969dd2716c..1129f19826e 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -284,7 +284,7 @@ lbl_801C0C38: /* 801C0C4C 001BDB8C 7C 08 02 A6 */ mflr r0 /* 801C0C50 001BDB90 90 01 00 24 */ stw r0, 0x24(r1) /* 801C0C54 001BDB94 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C0C58 001BDB98 48 1A 15 85 */ bl func_803621DC +/* 801C0C58 001BDB98 48 1A 15 85 */ bl _savegpr_29 /* 801C0C5C 001BDB9C 7C 9D 23 78 */ mr r29, r4 /* 801C0C60 001BDBA0 3C 80 80 39 */ lis r4, lbl_80395860@ha /* 801C0C64 001BDBA4 3B E4 58 60 */ addi r31, r4, lbl_80395860@l @@ -305,7 +305,7 @@ lbl_801C0C98: /* 801C0C98 001BDBD8 57 A0 10 3A */ slwi r0, r29, 2 /* 801C0C9C 001BDBDC 7C 7E 02 14 */ add r3, r30, r0 /* 801C0CA0 001BDBE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801C0CA4 001BDBE4 48 1A 15 85 */ bl func_80362228 +/* 801C0CA4 001BDBE4 48 1A 15 85 */ bl _restgpr_29 /* 801C0CA8 001BDBE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C0CAC 001BDBEC 7C 08 03 A6 */ mtlr r0 /* 801C0CB0 001BDBF0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/fmap/d_menu_fmap_map.s b/asm/d/menu/fmap/d_menu_fmap_map.s index 6f7c70f26aa..0ece135363b 100644 --- a/asm/d/menu/fmap/d_menu_fmap_map.s +++ b/asm/d/menu/fmap/d_menu_fmap_map.s @@ -38,7 +38,7 @@ twoColorLineInterporation: /* 801CE0D4 001CB014 90 01 00 24 */ stw r0, 0x24(r1) /* 801CE0D8 001CB018 DB E1 00 18 */ stfd f31, 0x18(r1) /* 801CE0DC 001CB01C 39 61 00 18 */ addi r11, r1, 0x18 -/* 801CE0E0 001CB020 48 19 40 FD */ bl func_803621DC +/* 801CE0E0 001CB020 48 19 40 FD */ bl _savegpr_29 /* 801CE0E4 001CB024 7C 7D 1B 78 */ mr r29, r3 /* 801CE0E8 001CB028 7C 9E 23 78 */ mr r30, r4 /* 801CE0EC 001CB02C FF E0 08 90 */ fmr f31, f1 @@ -64,7 +64,7 @@ twoColorLineInterporation: /* 801CE13C 001CB07C 98 7F 00 03 */ stb r3, 3(r31) /* 801CE140 001CB080 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801CE144 001CB084 39 61 00 18 */ addi r11, r1, 0x18 -/* 801CE148 001CB088 48 19 40 E1 */ bl func_80362228 +/* 801CE148 001CB088 48 19 40 E1 */ bl _restgpr_29 /* 801CE14C 001CB08C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CE150 001CB090 7C 08 03 A6 */ mtlr r0 /* 801CE154 001CB094 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/menu/map/d_menu_map_common.s b/asm/d/menu/map/d_menu_map_common.s index 458752bbd95..81a44f9d978 100644 --- a/asm/d/menu/map/d_menu_map_common.s +++ b/asm/d/menu/map/d_menu_map_common.s @@ -138,7 +138,7 @@ dMenuMapCommon_c_NS_initiate: /* 801C28DC 001BF81C 7C 08 02 A6 */ mflr r0 /* 801C28E0 001BF820 90 01 00 44 */ stw r0, 0x44(r1) /* 801C28E4 001BF824 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C28E8 001BF828 48 19 F8 F5 */ bl func_803621DC +/* 801C28E8 001BF828 48 19 F8 F5 */ bl _savegpr_29 /* 801C28EC 001BF82C 7C 7F 1B 78 */ mr r31, r3 /* 801C28F0 001BF830 7C 9E 23 78 */ mr r30, r4 /* 801C28F4 001BF834 7F C3 F3 78 */ mr r3, r30 @@ -1181,7 +1181,7 @@ lbl_801C38C8: /* 801C38C8 001C0808 90 1F 00 68 */ stw r0, 0x68(r31) lbl_801C38CC: /* 801C38CC 001C080C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C38D0 001C0810 48 19 E9 59 */ bl func_80362228 +/* 801C38D0 001C0810 48 19 E9 59 */ bl _restgpr_29 /* 801C38D4 001C0814 80 01 00 44 */ lwz r0, 0x44(r1) /* 801C38D8 001C0818 7C 08 03 A6 */ mtlr r0 /* 801C38DC 001C081C 38 21 00 40 */ addi r1, r1, 0x40 @@ -1603,7 +1603,7 @@ dMenuMapCommon_c_NS_iconScale: /* 801C3EE8 001C0E28 DB 81 00 80 */ stfd f28, 0x80(r1) /* 801C3EEC 001C0E2C F3 81 00 88 */ psq_st f28, 136(r1), 0, qr0 /* 801C3EF0 001C0E30 39 61 00 80 */ addi r11, r1, 0x80 -/* 801C3EF4 001C0E34 48 19 E2 E9 */ bl func_803621DC +/* 801C3EF4 001C0E34 48 19 E2 E9 */ bl _savegpr_29 /* 801C3EF8 001C0E38 7C 7D 1B 78 */ mr r29, r3 /* 801C3EFC 001C0E3C FF C0 10 90 */ fmr f30, f2 /* 801C3F00 001C0E40 FF E0 18 90 */ fmr f31, f3 @@ -1902,7 +1902,7 @@ lbl_801C41BC: /* 801C4388 001C12C8 E3 81 00 88 */ psq_l f28, 136(r1), 0, qr0 /* 801C438C 001C12CC CB 81 00 80 */ lfd f28, 0x80(r1) /* 801C4390 001C12D0 39 61 00 80 */ addi r11, r1, 0x80 -/* 801C4394 001C12D4 48 19 DE 95 */ bl func_80362228 +/* 801C4394 001C12D4 48 19 DE 95 */ bl _restgpr_29 /* 801C4398 001C12D8 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801C439C 001C12DC 7C 08 03 A6 */ mtlr r0 /* 801C43A0 001C12E0 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/d/meter/d_meter_HIO.s b/asm/d/meter/d_meter_HIO.s index 6ff96164e73..db94e331348 100644 --- a/asm/d/meter/d_meter_HIO.s +++ b/asm/d/meter/d_meter_HIO.s @@ -2691,7 +2691,7 @@ dMeter_fmapHIO_c_NS_dtor: /* 80200BD0 001FDB10 7C 08 02 A6 */ mflr r0 /* 80200BD4 001FDB14 90 01 00 24 */ stw r0, 0x24(r1) /* 80200BD8 001FDB18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80200BDC 001FDB1C 48 16 16 01 */ bl func_803621DC +/* 80200BDC 001FDB1C 48 16 16 01 */ bl _savegpr_29 /* 80200BE0 001FDB20 7C 7D 1B 79 */ or. r29, r3, r3 /* 80200BE4 001FDB24 7C 9E 23 78 */ mr r30, r4 /* 80200BE8 001FDB28 41 82 00 D0 */ beq lbl_80200CB8 @@ -2754,7 +2754,7 @@ lbl_80200C90: lbl_80200CB8: /* 80200CB8 001FDBF8 7F A3 EB 78 */ mr r3, r29 /* 80200CBC 001FDBFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80200CC0 001FDC00 48 16 15 69 */ bl func_80362228 +/* 80200CC0 001FDC00 48 16 15 69 */ bl _restgpr_29 /* 80200CC4 001FDC04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80200CC8 001FDC08 7C 08 03 A6 */ mtlr r0 /* 80200CCC 001FDC0C 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 abc2e07ad8f..321ae073e70 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -2215,7 +2215,7 @@ dMeterButton_c_NS_alphaAnimeButtonA: /* 802032C8 00200208 7C 08 02 A6 */ mflr r0 /* 802032CC 0020020C 90 01 00 24 */ stw r0, 0x24(r1) /* 802032D0 00200210 39 61 00 20 */ addi r11, r1, 0x20 -/* 802032D4 00200214 48 15 EF 09 */ bl func_803621DC +/* 802032D4 00200214 48 15 EF 09 */ bl _savegpr_29 /* 802032D8 00200218 7C 7F 1B 78 */ mr r31, r3 /* 802032DC 0020021C 7C 9D 23 78 */ mr r29, r4 /* 802032E0 00200220 7C BE 2B 78 */ mr r30, r5 @@ -2264,7 +2264,7 @@ lbl_80203380: /* 80203380 002002C0 38 60 00 00 */ li r3, 0 lbl_80203384: /* 80203384 002002C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203388 002002C8 48 15 EE A1 */ bl func_80362228 +/* 80203388 002002C8 48 15 EE A1 */ bl _restgpr_29 /* 8020338C 002002CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80203390 002002D0 7C 08 03 A6 */ mtlr r0 /* 80203394 002002D4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2276,7 +2276,7 @@ dMeterButton_c_NS_alphaAnimeButtonB: /* 802033A0 002002E0 7C 08 02 A6 */ mflr r0 /* 802033A4 002002E4 90 01 00 24 */ stw r0, 0x24(r1) /* 802033A8 002002E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802033AC 002002EC 48 15 EE 31 */ bl func_803621DC +/* 802033AC 002002EC 48 15 EE 31 */ bl _savegpr_29 /* 802033B0 002002F0 7C 7E 1B 78 */ mr r30, r3 /* 802033B4 002002F4 7C 9F 23 78 */ mr r31, r4 /* 802033B8 002002F8 7C BD 2B 78 */ mr r29, r5 @@ -2341,7 +2341,7 @@ lbl_8020348C: /* 8020348C 002003CC 38 60 00 00 */ li r3, 0 lbl_80203490: /* 80203490 002003D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203494 002003D4 48 15 ED 95 */ bl func_80362228 +/* 80203494 002003D4 48 15 ED 95 */ bl _restgpr_29 /* 80203498 002003D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020349C 002003DC 7C 08 03 A6 */ mtlr r0 /* 802034A0 002003E0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2353,7 +2353,7 @@ dMeterButton_c_NS_alphaAnimeButtonR: /* 802034AC 002003EC 7C 08 02 A6 */ mflr r0 /* 802034B0 002003F0 90 01 00 24 */ stw r0, 0x24(r1) /* 802034B4 002003F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802034B8 002003F8 48 15 ED 25 */ bl func_803621DC +/* 802034B8 002003F8 48 15 ED 25 */ bl _savegpr_29 /* 802034BC 002003FC 7C 7E 1B 78 */ mr r30, r3 /* 802034C0 00200400 7C 9F 23 78 */ mr r31, r4 /* 802034C4 00200404 7C BD 2B 78 */ mr r29, r5 @@ -2416,7 +2416,7 @@ lbl_80203590: /* 80203590 002004D0 38 60 00 00 */ li r3, 0 lbl_80203594: /* 80203594 002004D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203598 002004D8 48 15 EC 91 */ bl func_80362228 +/* 80203598 002004D8 48 15 EC 91 */ bl _restgpr_29 /* 8020359C 002004DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802035A0 002004E0 7C 08 03 A6 */ mtlr r0 /* 802035A4 002004E4 38 21 00 20 */ addi r1, r1, 0x20 @@ -2428,7 +2428,7 @@ dMeterButton_c_NS_alphaAnimeButtonZ: /* 802035B0 002004F0 7C 08 02 A6 */ mflr r0 /* 802035B4 002004F4 90 01 00 24 */ stw r0, 0x24(r1) /* 802035B8 002004F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802035BC 002004FC 48 15 EC 21 */ bl func_803621DC +/* 802035BC 002004FC 48 15 EC 21 */ bl _savegpr_29 /* 802035C0 00200500 7C 7E 1B 78 */ mr r30, r3 /* 802035C4 00200504 7C 9F 23 78 */ mr r31, r4 /* 802035C8 00200508 7C BD 2B 78 */ mr r29, r5 @@ -2495,7 +2495,7 @@ lbl_802036A4: /* 802036A4 002005E4 38 60 00 00 */ li r3, 0 lbl_802036A8: /* 802036A8 002005E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802036AC 002005EC 48 15 EB 7D */ bl func_80362228 +/* 802036AC 002005EC 48 15 EB 7D */ bl _restgpr_29 /* 802036B0 002005F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802036B4 002005F4 7C 08 03 A6 */ mtlr r0 /* 802036B8 002005F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -2507,7 +2507,7 @@ dMeterButton_c_NS_alphaAnimeButton3D: /* 802036C4 00200604 7C 08 02 A6 */ mflr r0 /* 802036C8 00200608 90 01 00 24 */ stw r0, 0x24(r1) /* 802036CC 0020060C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802036D0 00200610 48 15 EB 0D */ bl func_803621DC +/* 802036D0 00200610 48 15 EB 0D */ bl _savegpr_29 /* 802036D4 00200614 7C 7F 1B 78 */ mr r31, r3 /* 802036D8 00200618 7C 9D 23 78 */ mr r29, r4 /* 802036DC 0020061C 7C BE 2B 78 */ mr r30, r5 @@ -2566,7 +2566,7 @@ lbl_8020379C: /* 8020379C 002006DC 38 60 00 00 */ li r3, 0 lbl_802037A0: /* 802037A0 002006E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802037A4 002006E4 48 15 EA 85 */ bl func_80362228 +/* 802037A4 002006E4 48 15 EA 85 */ bl _restgpr_29 /* 802037A8 002006E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802037AC 002006EC 7C 08 03 A6 */ mtlr r0 /* 802037B0 002006F0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2578,7 +2578,7 @@ dMeterButton_c_NS_alphaAnimeButtonC: /* 802037BC 002006FC 7C 08 02 A6 */ mflr r0 /* 802037C0 00200700 90 01 00 24 */ stw r0, 0x24(r1) /* 802037C4 00200704 39 61 00 20 */ addi r11, r1, 0x20 -/* 802037C8 00200708 48 15 EA 15 */ bl func_803621DC +/* 802037C8 00200708 48 15 EA 15 */ bl _savegpr_29 /* 802037CC 0020070C 7C 7D 1B 78 */ mr r29, r3 /* 802037D0 00200710 7C 9E 23 78 */ mr r30, r4 /* 802037D4 00200714 7C BF 2B 78 */ mr r31, r5 @@ -2621,7 +2621,7 @@ lbl_8020385C: /* 8020385C 0020079C 38 60 00 00 */ li r3, 0 lbl_80203860: /* 80203860 002007A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203864 002007A4 48 15 E9 C5 */ bl func_80362228 +/* 80203864 002007A4 48 15 E9 C5 */ bl _restgpr_29 /* 80203868 002007A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020386C 002007AC 7C 08 03 A6 */ mtlr r0 /* 80203870 002007B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -2671,7 +2671,7 @@ dMeterButton_c_NS_alphaAnimeButtonX: /* 802038F8 00200838 7C 08 02 A6 */ mflr r0 /* 802038FC 0020083C 90 01 00 24 */ stw r0, 0x24(r1) /* 80203900 00200840 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203904 00200844 48 15 E8 D9 */ bl func_803621DC +/* 80203904 00200844 48 15 E8 D9 */ bl _savegpr_29 /* 80203908 00200848 7C 7E 1B 78 */ mr r30, r3 /* 8020390C 0020084C 7C 9F 23 78 */ mr r31, r4 /* 80203910 00200850 7C BD 2B 78 */ mr r29, r5 @@ -2738,7 +2738,7 @@ lbl_802039EC: /* 802039EC 0020092C 38 60 00 00 */ li r3, 0 lbl_802039F0: /* 802039F0 00200930 39 61 00 20 */ addi r11, r1, 0x20 -/* 802039F4 00200934 48 15 E8 35 */ bl func_80362228 +/* 802039F4 00200934 48 15 E8 35 */ bl _restgpr_29 /* 802039F8 00200938 80 01 00 24 */ lwz r0, 0x24(r1) /* 802039FC 0020093C 7C 08 03 A6 */ mtlr r0 /* 80203A00 00200940 38 21 00 20 */ addi r1, r1, 0x20 @@ -2750,7 +2750,7 @@ dMeterButton_c_NS_alphaAnimeButtonY: /* 80203A0C 0020094C 7C 08 02 A6 */ mflr r0 /* 80203A10 00200950 90 01 00 24 */ stw r0, 0x24(r1) /* 80203A14 00200954 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203A18 00200958 48 15 E7 C5 */ bl func_803621DC +/* 80203A18 00200958 48 15 E7 C5 */ bl _savegpr_29 /* 80203A1C 0020095C 7C 7E 1B 78 */ mr r30, r3 /* 80203A20 00200960 7C 9F 23 78 */ mr r31, r4 /* 80203A24 00200964 7C BD 2B 78 */ mr r29, r5 @@ -2817,7 +2817,7 @@ lbl_80203B00: /* 80203B00 00200A40 38 60 00 00 */ li r3, 0 lbl_80203B04: /* 80203B04 00200A44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203B08 00200A48 48 15 E7 21 */ bl func_80362228 +/* 80203B08 00200A48 48 15 E7 21 */ bl _restgpr_29 /* 80203B0C 00200A4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80203B10 00200A50 7C 08 03 A6 */ mtlr r0 /* 80203B14 00200A54 38 21 00 20 */ addi r1, r1, 0x20 @@ -2829,7 +2829,7 @@ dMeterButton_c_NS_alphaAnimeButtonNun: /* 80203B20 00200A60 7C 08 02 A6 */ mflr r0 /* 80203B24 00200A64 90 01 00 24 */ stw r0, 0x24(r1) /* 80203B28 00200A68 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203B2C 00200A6C 48 15 E6 B1 */ bl func_803621DC +/* 80203B2C 00200A6C 48 15 E6 B1 */ bl _savegpr_29 /* 80203B30 00200A70 7C 7E 1B 78 */ mr r30, r3 /* 80203B34 00200A74 7C 9F 23 78 */ mr r31, r4 /* 80203B38 00200A78 7C BD 2B 78 */ mr r29, r5 @@ -2896,7 +2896,7 @@ lbl_80203C14: /* 80203C14 00200B54 38 60 00 00 */ li r3, 0 lbl_80203C18: /* 80203C18 00200B58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203C1C 00200B5C 48 15 E6 0D */ bl func_80362228 +/* 80203C1C 00200B5C 48 15 E6 0D */ bl _restgpr_29 /* 80203C20 00200B60 80 01 00 24 */ lwz r0, 0x24(r1) /* 80203C24 00200B64 7C 08 03 A6 */ mtlr r0 /* 80203C28 00200B68 38 21 00 20 */ addi r1, r1, 0x20 @@ -2908,7 +2908,7 @@ dMeterButton_c_NS_alphaAnimeButtonRemo: /* 80203C34 00200B74 7C 08 02 A6 */ mflr r0 /* 80203C38 00200B78 90 01 00 24 */ stw r0, 0x24(r1) /* 80203C3C 00200B7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203C40 00200B80 48 15 E5 9D */ bl func_803621DC +/* 80203C40 00200B80 48 15 E5 9D */ bl _savegpr_29 /* 80203C44 00200B84 7C 7E 1B 78 */ mr r30, r3 /* 80203C48 00200B88 7C 9F 23 78 */ mr r31, r4 /* 80203C4C 00200B8C 7C BD 2B 78 */ mr r29, r5 @@ -2975,7 +2975,7 @@ lbl_80203D28: /* 80203D28 00200C68 38 60 00 00 */ li r3, 0 lbl_80203D2C: /* 80203D2C 00200C6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203D30 00200C70 48 15 E4 F9 */ bl func_80362228 +/* 80203D30 00200C70 48 15 E4 F9 */ bl _restgpr_29 /* 80203D34 00200C74 80 01 00 24 */ lwz r0, 0x24(r1) /* 80203D38 00200C78 7C 08 03 A6 */ mtlr r0 /* 80203D3C 00200C7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2987,7 +2987,7 @@ dMeterButton_c_NS_alphaAnimeButtonRemo2: /* 80203D48 00200C88 7C 08 02 A6 */ mflr r0 /* 80203D4C 00200C8C 90 01 00 24 */ stw r0, 0x24(r1) /* 80203D50 00200C90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203D54 00200C94 48 15 E4 89 */ bl func_803621DC +/* 80203D54 00200C94 48 15 E4 89 */ bl _savegpr_29 /* 80203D58 00200C98 7C 7E 1B 78 */ mr r30, r3 /* 80203D5C 00200C9C 7C 9F 23 78 */ mr r31, r4 /* 80203D60 00200CA0 7C BD 2B 78 */ mr r29, r5 @@ -3054,7 +3054,7 @@ lbl_80203E3C: /* 80203E3C 00200D7C 38 60 00 00 */ li r3, 0 lbl_80203E40: /* 80203E40 00200D80 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203E44 00200D84 48 15 E3 E5 */ bl func_80362228 +/* 80203E44 00200D84 48 15 E3 E5 */ bl _restgpr_29 /* 80203E48 00200D88 80 01 00 24 */ lwz r0, 0x24(r1) /* 80203E4C 00200D8C 7C 08 03 A6 */ mtlr r0 /* 80203E50 00200D90 38 21 00 20 */ addi r1, r1, 0x20 @@ -3066,7 +3066,7 @@ dMeterButton_c_NS_alphaAnimeButtonAR: /* 80203E5C 00200D9C 7C 08 02 A6 */ mflr r0 /* 80203E60 00200DA0 90 01 00 24 */ stw r0, 0x24(r1) /* 80203E64 00200DA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203E68 00200DA8 48 15 E3 75 */ bl func_803621DC +/* 80203E68 00200DA8 48 15 E3 75 */ bl _savegpr_29 /* 80203E6C 00200DAC 7C 7E 1B 78 */ mr r30, r3 /* 80203E70 00200DB0 7C 9F 23 78 */ mr r31, r4 /* 80203E74 00200DB4 7C BD 2B 78 */ mr r29, r5 @@ -3130,7 +3130,7 @@ lbl_80203F44: /* 80203F44 00200E84 38 60 00 00 */ li r3, 0 lbl_80203F48: /* 80203F48 00200E88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203F4C 00200E8C 48 15 E2 DD */ bl func_80362228 +/* 80203F4C 00200E8C 48 15 E2 DD */ bl _restgpr_29 /* 80203F50 00200E90 80 01 00 24 */ lwz r0, 0x24(r1) /* 80203F54 00200E94 7C 08 03 A6 */ mtlr r0 /* 80203F58 00200E98 38 21 00 20 */ addi r1, r1, 0x20 @@ -3142,7 +3142,7 @@ dMeterButton_c_NS_alphaAnimeButton3DB: /* 80203F64 00200EA4 7C 08 02 A6 */ mflr r0 /* 80203F68 00200EA8 90 01 00 24 */ stw r0, 0x24(r1) /* 80203F6C 00200EAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80203F70 00200EB0 48 15 E2 6D */ bl func_803621DC +/* 80203F70 00200EB0 48 15 E2 6D */ bl _savegpr_29 /* 80203F74 00200EB4 7C 7E 1B 78 */ mr r30, r3 /* 80203F78 00200EB8 7C 9F 23 78 */ mr r31, r4 /* 80203F7C 00200EBC 7C BD 2B 78 */ mr r29, r5 @@ -3206,7 +3206,7 @@ lbl_8020404C: /* 8020404C 00200F8C 38 60 00 00 */ li r3, 0 lbl_80204050: /* 80204050 00200F90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204054 00200F94 48 15 E1 D5 */ bl func_80362228 +/* 80204054 00200F94 48 15 E1 D5 */ bl _restgpr_29 /* 80204058 00200F98 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020405C 00200F9C 7C 08 03 A6 */ mtlr r0 /* 80204060 00200FA0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3218,7 +3218,7 @@ dMeterButton_c_NS_alphaAnimeButtonNURE: /* 8020406C 00200FAC 7C 08 02 A6 */ mflr r0 /* 80204070 00200FB0 90 01 00 24 */ stw r0, 0x24(r1) /* 80204074 00200FB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204078 00200FB8 48 15 E1 65 */ bl func_803621DC +/* 80204078 00200FB8 48 15 E1 65 */ bl _savegpr_29 /* 8020407C 00200FBC 7C 7E 1B 78 */ mr r30, r3 /* 80204080 00200FC0 7C 9F 23 78 */ mr r31, r4 /* 80204084 00200FC4 7C BD 2B 78 */ mr r29, r5 @@ -3282,7 +3282,7 @@ lbl_80204154: /* 80204154 00201094 38 60 00 00 */ li r3, 0 lbl_80204158: /* 80204158 00201098 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020415C 0020109C 48 15 E0 CD */ bl func_80362228 +/* 8020415C 0020109C 48 15 E0 CD */ bl _restgpr_29 /* 80204160 002010A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80204164 002010A4 7C 08 03 A6 */ mtlr r0 /* 80204168 002010A8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3294,7 +3294,7 @@ dMeterButton_c_NS_alphaAnimeButtonReel: /* 80204174 002010B4 7C 08 02 A6 */ mflr r0 /* 80204178 002010B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8020417C 002010BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204180 002010C0 48 15 E0 5D */ bl func_803621DC +/* 80204180 002010C0 48 15 E0 5D */ bl _savegpr_29 /* 80204184 002010C4 7C 7E 1B 78 */ mr r30, r3 /* 80204188 002010C8 7C 9F 23 78 */ mr r31, r4 /* 8020418C 002010CC 7C BD 2B 78 */ mr r29, r5 @@ -3358,7 +3358,7 @@ lbl_8020425C: /* 8020425C 0020119C 38 60 00 00 */ li r3, 0 lbl_80204260: /* 80204260 002011A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204264 002011A4 48 15 DF C5 */ bl func_80362228 +/* 80204264 002011A4 48 15 DF C5 */ bl _restgpr_29 /* 80204268 002011A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020426C 002011AC 7C 08 03 A6 */ mtlr r0 /* 80204270 002011B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3370,7 +3370,7 @@ dMeterButton_c_NS_alphaAnimeButtonReel2: /* 8020427C 002011BC 7C 08 02 A6 */ mflr r0 /* 80204280 002011C0 90 01 00 24 */ stw r0, 0x24(r1) /* 80204284 002011C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204288 002011C8 48 15 DF 55 */ bl func_803621DC +/* 80204288 002011C8 48 15 DF 55 */ bl _savegpr_29 /* 8020428C 002011CC 7C 7E 1B 78 */ mr r30, r3 /* 80204290 002011D0 7C 9F 23 78 */ mr r31, r4 /* 80204294 002011D4 7C BD 2B 78 */ mr r29, r5 @@ -3428,7 +3428,7 @@ lbl_8020434C: /* 8020434C 0020128C 38 60 00 00 */ li r3, 0 lbl_80204350: /* 80204350 00201290 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204354 00201294 48 15 DE D5 */ bl func_80362228 +/* 80204354 00201294 48 15 DE D5 */ bl _restgpr_29 /* 80204358 00201298 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020435C 0020129C 7C 08 03 A6 */ mtlr r0 /* 80204360 002012A0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3440,7 +3440,7 @@ dMeterButton_c_NS_alphaAnimeButtonAB: /* 8020436C 002012AC 7C 08 02 A6 */ mflr r0 /* 80204370 002012B0 90 01 00 24 */ stw r0, 0x24(r1) /* 80204374 002012B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204378 002012B8 48 15 DE 65 */ bl func_803621DC +/* 80204378 002012B8 48 15 DE 65 */ bl _savegpr_29 /* 8020437C 002012BC 7C 7E 1B 78 */ mr r30, r3 /* 80204380 002012C0 7C 9F 23 78 */ mr r31, r4 /* 80204384 002012C4 7C BD 2B 78 */ mr r29, r5 @@ -3498,7 +3498,7 @@ lbl_8020443C: /* 8020443C 0020137C 38 60 00 00 */ li r3, 0 lbl_80204440: /* 80204440 00201380 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204444 00201384 48 15 DD E5 */ bl func_80362228 +/* 80204444 00201384 48 15 DD E5 */ bl _restgpr_29 /* 80204448 00201388 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020444C 0020138C 7C 08 03 A6 */ mtlr r0 /* 80204450 00201390 38 21 00 20 */ addi r1, r1, 0x20 @@ -3510,7 +3510,7 @@ dMeterButton_c_NS_alphaAnimeButtonTate: /* 8020445C 0020139C 7C 08 02 A6 */ mflr r0 /* 80204460 002013A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80204464 002013A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204468 002013A8 48 15 DD 75 */ bl func_803621DC +/* 80204468 002013A8 48 15 DD 75 */ bl _savegpr_29 /* 8020446C 002013AC 7C 7E 1B 78 */ mr r30, r3 /* 80204470 002013B0 7C 9F 23 78 */ mr r31, r4 /* 80204474 002013B4 7C BD 2B 78 */ mr r29, r5 @@ -3568,7 +3568,7 @@ lbl_8020452C: /* 8020452C 0020146C 38 60 00 00 */ li r3, 0 lbl_80204530: /* 80204530 00201470 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204534 00201474 48 15 DC F5 */ bl func_80362228 +/* 80204534 00201474 48 15 DC F5 */ bl _restgpr_29 /* 80204538 00201478 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020453C 0020147C 7C 08 03 A6 */ mtlr r0 /* 80204540 00201480 38 21 00 20 */ addi r1, r1, 0x20 @@ -3580,7 +3580,7 @@ dMeterButton_c_NS_alphaAnimeButtonNunZ: /* 8020454C 0020148C 7C 08 02 A6 */ mflr r0 /* 80204550 00201490 90 01 00 24 */ stw r0, 0x24(r1) /* 80204554 00201494 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204558 00201498 48 15 DC 85 */ bl func_803621DC +/* 80204558 00201498 48 15 DC 85 */ bl _savegpr_29 /* 8020455C 0020149C 7C 7E 1B 78 */ mr r30, r3 /* 80204560 002014A0 7C 9F 23 78 */ mr r31, r4 /* 80204564 002014A4 7C BD 2B 78 */ mr r29, r5 @@ -3632,7 +3632,7 @@ lbl_80204604: /* 80204604 00201544 38 60 00 00 */ li r3, 0 lbl_80204608: /* 80204608 00201548 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020460C 0020154C 48 15 DC 1D */ bl func_80362228 +/* 8020460C 0020154C 48 15 DC 1D */ bl _restgpr_29 /* 80204610 00201550 80 01 00 24 */ lwz r0, 0x24(r1) /* 80204614 00201554 7C 08 03 A6 */ mtlr r0 /* 80204618 00201558 38 21 00 20 */ addi r1, r1, 0x20 @@ -3644,7 +3644,7 @@ dMeterButton_c_NS_alphaAnimeButtonNunC: /* 80204624 00201564 7C 08 02 A6 */ mflr r0 /* 80204628 00201568 90 01 00 24 */ stw r0, 0x24(r1) /* 8020462C 0020156C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204630 00201570 48 15 DB AD */ bl func_803621DC +/* 80204630 00201570 48 15 DB AD */ bl _savegpr_29 /* 80204634 00201574 7C 7E 1B 78 */ mr r30, r3 /* 80204638 00201578 7C 9F 23 78 */ mr r31, r4 /* 8020463C 0020157C 7C BD 2B 78 */ mr r29, r5 @@ -3696,7 +3696,7 @@ lbl_802046DC: /* 802046DC 0020161C 38 60 00 00 */ li r3, 0 lbl_802046E0: /* 802046E0 00201620 39 61 00 20 */ addi r11, r1, 0x20 -/* 802046E4 00201624 48 15 DB 45 */ bl func_80362228 +/* 802046E4 00201624 48 15 DB 45 */ bl _restgpr_29 /* 802046E8 00201628 80 01 00 24 */ lwz r0, 0x24(r1) /* 802046EC 0020162C 7C 08 03 A6 */ mtlr r0 /* 802046F0 00201630 38 21 00 20 */ addi r1, r1, 0x20 @@ -3708,7 +3708,7 @@ dMeterButton_c_NS_alphaAnimeButtonBin: /* 802046FC 0020163C 7C 08 02 A6 */ mflr r0 /* 80204700 00201640 90 01 00 24 */ stw r0, 0x24(r1) /* 80204704 00201644 39 61 00 20 */ addi r11, r1, 0x20 -/* 80204708 00201648 48 15 DA D5 */ bl func_803621DC +/* 80204708 00201648 48 15 DA D5 */ bl _savegpr_29 /* 8020470C 0020164C 7C 7E 1B 78 */ mr r30, r3 /* 80204710 00201650 7C 9F 23 78 */ mr r31, r4 /* 80204714 00201654 7C BD 2B 78 */ mr r29, r5 @@ -3766,7 +3766,7 @@ lbl_802047CC: /* 802047CC 0020170C 38 60 00 00 */ li r3, 0 lbl_802047D0: /* 802047D0 00201710 39 61 00 20 */ addi r11, r1, 0x20 -/* 802047D4 00201714 48 15 DA 55 */ bl func_80362228 +/* 802047D4 00201714 48 15 DA 55 */ bl _restgpr_29 /* 802047D8 00201718 80 01 00 24 */ lwz r0, 0x24(r1) /* 802047DC 0020171C 7C 08 03 A6 */ mtlr r0 /* 802047E0 00201720 38 21 00 20 */ addi r1, r1, 0x20 @@ -7090,7 +7090,7 @@ dMeterButton_c_NS_setAlphaButtonCAnimeMax: /* 802077F8 00204738 DB E1 00 30 */ stfd f31, 0x30(r1) /* 802077FC 0020473C F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80207800 00204740 39 61 00 30 */ addi r11, r1, 0x30 -/* 80207804 00204744 48 15 A9 D9 */ bl func_803621DC +/* 80207804 00204744 48 15 A9 D9 */ bl _savegpr_29 /* 80207808 00204748 7C 7F 1B 78 */ mr r31, r3 /* 8020780C 0020474C 80 63 00 30 */ lwz r3, 0x30(r3) /* 80207810 00204750 48 04 E0 19 */ bl CPaneMgrAlpha_NS_getAlphaRate @@ -7233,7 +7233,7 @@ lbl_802079F8: /* 80207A08 00204948 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80207A0C 0020494C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80207A10 00204950 39 61 00 30 */ addi r11, r1, 0x30 -/* 80207A14 00204954 48 15 A8 15 */ bl func_80362228 +/* 80207A14 00204954 48 15 A8 15 */ bl _restgpr_29 /* 80207A18 00204958 80 01 00 44 */ lwz r0, 0x44(r1) /* 80207A1C 0020495C 7C 08 03 A6 */ mtlr r0 /* 80207A20 00204960 38 21 00 40 */ addi r1, r1, 0x40 @@ -8967,7 +8967,7 @@ dMeterButton_c_NS_setAlphaButtonOAnimeMin: /* 80209250 00206190 7C 08 02 A6 */ mflr r0 /* 80209254 00206194 90 01 00 24 */ stw r0, 0x24(r1) /* 80209258 00206198 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020925C 0020619C 48 15 8F 81 */ bl func_803621DC +/* 8020925C 0020619C 48 15 8F 81 */ bl _savegpr_29 /* 80209260 002061A0 7C 7D 1B 78 */ mr r29, r3 /* 80209264 002061A4 7C 9E 23 78 */ mr r30, r4 /* 80209268 002061A8 54 80 10 3A */ slwi r0, r4, 2 @@ -8988,7 +8988,7 @@ dMeterButton_c_NS_setAlphaButtonOAnimeMin: /* 802092A4 002061E4 B0 03 00 16 */ sth r0, 0x16(r3) lbl_802092A8: /* 802092A8 002061E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802092AC 002061EC 48 15 8F 7D */ bl func_80362228 +/* 802092AC 002061EC 48 15 8F 7D */ bl _restgpr_29 /* 802092B0 002061F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802092B4 002061F4 7C 08 03 A6 */ mtlr r0 /* 802092B8 002061F8 38 21 00 20 */ addi r1, r1, 0x20 @@ -9000,7 +9000,7 @@ dMeterButton_c_NS_setAlphaButtonOAnimeMax: /* 802092C4 00206204 7C 08 02 A6 */ mflr r0 /* 802092C8 00206208 90 01 00 24 */ stw r0, 0x24(r1) /* 802092CC 0020620C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802092D0 00206210 48 15 8F 0D */ bl func_803621DC +/* 802092D0 00206210 48 15 8F 0D */ bl _savegpr_29 /* 802092D4 00206214 7C 7D 1B 78 */ mr r29, r3 /* 802092D8 00206218 7C 9E 23 78 */ mr r30, r4 /* 802092DC 0020621C 54 80 10 3A */ slwi r0, r4, 2 @@ -9035,7 +9035,7 @@ lbl_80209328: /* 8020934C 0020628C 48 01 17 59 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax lbl_80209350: /* 80209350 00206290 39 61 00 20 */ addi r11, r1, 0x20 -/* 80209354 00206294 48 15 8E D5 */ bl func_80362228 +/* 80209354 00206294 48 15 8E D5 */ bl _restgpr_29 /* 80209358 00206298 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020935C 0020629C 7C 08 03 A6 */ mtlr r0 /* 80209360 002062A0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/meter/d_meter_haihai.s b/asm/d/meter/d_meter_haihai.s index f93088cb0c8..ef5b7701893 100644 --- a/asm/d/meter/d_meter_haihai.s +++ b/asm/d/meter/d_meter_haihai.s @@ -186,7 +186,7 @@ lbl_8020AFF8: /* 8020B144 00208084 7C 08 02 A6 */ mflr r0 /* 8020B148 00208088 90 01 00 34 */ stw r0, 0x34(r1) /* 8020B14C 0020808C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8020B150 00208090 48 15 70 8D */ bl func_803621DC +/* 8020B150 00208090 48 15 70 8D */ bl _savegpr_29 /* 8020B154 00208094 7C 7D 1B 78 */ mr r29, r3 /* 8020B158 00208098 80 63 00 24 */ lwz r3, 0x24(r3) /* 8020B15C 0020809C 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c @@ -437,7 +437,7 @@ lbl_8020B474: /* 8020B4FC 0020843C 48 0E D9 D9 */ bl J2DScreen_NS_draw lbl_8020B500: /* 8020B500 00208440 39 61 00 30 */ addi r11, r1, 0x30 -/* 8020B504 00208444 48 15 6D 25 */ bl func_80362228 +/* 8020B504 00208444 48 15 6D 25 */ bl _restgpr_29 /* 8020B508 00208448 80 01 00 34 */ lwz r0, 0x34(r1) /* 8020B50C 0020844C 7C 08 03 A6 */ mtlr r0 /* 8020B510 00208450 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index 06739909441..dfd5dbc25c9 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -49,7 +49,7 @@ dMeterMap_c_NS_getMapDispSizeTypeNo: /* 8020D52C 0020A46C 7C 08 02 A6 */ mflr r0 /* 8020D530 0020A470 90 01 00 24 */ stw r0, 0x24(r1) /* 8020D534 0020A474 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020D538 0020A478 48 15 4C A5 */ bl func_803621DC +/* 8020D538 0020A478 48 15 4C A5 */ bl _savegpr_29 /* 8020D53C 0020A47C 3B A0 00 07 */ li r29, 7 /* 8020D540 0020A480 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8020D544 0020A484 7C 84 07 74 */ extsb r4, r4 @@ -124,7 +124,7 @@ lbl_8020D634: /* 8020D634 0020A574 38 60 00 03 */ li r3, 3 lbl_8020D638: /* 8020D638 0020A578 39 61 00 20 */ addi r11, r1, 0x20 -/* 8020D63C 0020A57C 48 15 4B ED */ bl func_80362228 +/* 8020D63C 0020A57C 48 15 4B ED */ bl _restgpr_29 /* 8020D640 0020A580 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020D644 0020A584 7C 08 03 A6 */ mtlr r0 /* 8020D648 0020A588 38 21 00 20 */ addi r1, r1, 0x20 @@ -866,7 +866,7 @@ dMeterMap_c_NS_ctrlShowMap: /* 8020E074 0020AFB4 7C 08 02 A6 */ mflr r0 /* 8020E078 0020AFB8 90 01 00 34 */ stw r0, 0x34(r1) /* 8020E07C 0020AFBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8020E080 0020AFC0 48 15 41 5D */ bl func_803621DC +/* 8020E080 0020AFC0 48 15 41 5D */ bl _savegpr_29 /* 8020E084 0020AFC4 7C 7D 1B 78 */ mr r29, r3 /* 8020E088 0020AFC8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020E08C 0020AFCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -1122,7 +1122,7 @@ lbl_8020E434: /* 8020E440 0020B380 90 7D 00 10 */ stw r3, 0x10(r29) lbl_8020E444: /* 8020E444 0020B384 39 61 00 30 */ addi r11, r1, 0x30 -/* 8020E448 0020B388 48 15 3D E1 */ bl func_80362228 +/* 8020E448 0020B388 48 15 3D E1 */ bl _restgpr_29 /* 8020E44C 0020B38C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8020E450 0020B390 7C 08 03 A6 */ mtlr r0 /* 8020E454 0020B394 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index ccada5c7fb5..d3fb2171667 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -11750,7 +11750,7 @@ dMeter2Draw_c_NS_changeTextureItemB: /* 8021A46C 002173AC 7C 08 02 A6 */ mflr r0 /* 8021A470 002173B0 90 01 00 54 */ stw r0, 0x54(r1) /* 8021A474 002173B4 39 61 00 50 */ addi r11, r1, 0x50 -/* 8021A478 002173B8 48 14 7D 65 */ bl func_803621DC +/* 8021A478 002173B8 48 14 7D 65 */ bl _savegpr_29 /* 8021A47C 002173BC 7C 7D 1B 78 */ mr r29, r3 /* 8021A480 002173C0 7C 9E 23 78 */ mr r30, r4 /* 8021A484 002173C4 3B E0 00 00 */ li r31, 0 @@ -11923,7 +11923,7 @@ lbl_8021A5D0: /* 8021A6FC 0021763C 7D 89 03 A6 */ mtctr r12 /* 8021A700 00217640 4E 80 04 21 */ bctrl /* 8021A704 00217644 39 61 00 50 */ addi r11, r1, 0x50 -/* 8021A708 00217648 48 14 7B 21 */ bl func_80362228 +/* 8021A708 00217648 48 14 7B 21 */ bl _restgpr_29 /* 8021A70C 0021764C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8021A710 00217650 7C 08 03 A6 */ mtlr r0 /* 8021A714 00217654 38 21 00 50 */ addi r1, r1, 0x50 @@ -12512,7 +12512,7 @@ dMeter2Draw_c_NS_drawKanteraMeter: /* 8021AF84 00217EC4 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8021AF88 00217EC8 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8021AF8C 00217ECC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021AF90 00217ED0 48 14 72 4D */ bl func_803621DC +/* 8021AF90 00217ED0 48 14 72 4D */ bl _savegpr_29 /* 8021AF94 00217ED4 7C 7D 1B 78 */ mr r29, r3 /* 8021AF98 00217ED8 FF E0 08 90 */ fmr f31, f1 /* 8021AF9C 00217EDC 54 9E 15 BA */ rlwinm r30, r4, 2, 0x16, 0x1d @@ -12586,7 +12586,7 @@ lbl_8021AFE0: /* 8021B0A8 00217FE8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8021B0AC 00217FEC CB E1 00 60 */ lfd f31, 0x60(r1) /* 8021B0B0 00217FF0 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021B0B4 00217FF4 48 14 71 75 */ bl func_80362228 +/* 8021B0B4 00217FF4 48 14 71 75 */ bl _restgpr_29 /* 8021B0B8 00217FF8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8021B0BC 00217FFC 7C 08 03 A6 */ mtlr r0 /* 8021B0C0 00218000 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index fd882c283a4..f63f0c934bd 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -650,7 +650,7 @@ dMeter2Info_c_NS_getStringLength: /* 8021C6C8 00219608 DB 81 00 30 */ stfd f28, 0x30(r1) /* 8021C6CC 0021960C F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 8021C6D0 00219610 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021C6D4 00219614 48 14 5B 09 */ bl func_803621DC +/* 8021C6D4 00219614 48 14 5B 09 */ bl _savegpr_29 /* 8021C6D8 00219618 7C 9F 23 78 */ mr r31, r4 /* 8021C6DC 0021961C 7C BD 2B 78 */ mr r29, r5 /* 8021C6E0 00219620 C3 A2 AF 98 */ lfs f29, lbl_80454998-_SDA2_BASE_(r2) @@ -723,7 +723,7 @@ lbl_8021C7B8: /* 8021C7D4 00219714 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 8021C7D8 00219718 CB 81 00 30 */ lfd f28, 0x30(r1) /* 8021C7DC 0021971C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021C7E0 00219720 48 14 5A 49 */ bl func_80362228 +/* 8021C7E0 00219720 48 14 5A 49 */ bl _restgpr_29 /* 8021C7E4 00219724 80 01 00 74 */ lwz r0, 0x74(r1) /* 8021C7E8 00219728 7C 08 03 A6 */ mtlr r0 /* 8021C7EC 0021972C 38 21 00 70 */ addi r1, r1, 0x70 @@ -745,7 +745,7 @@ dMeter2Info_c_NS_getStringLength_X1_: /* 8021C820 00219760 DB 81 00 30 */ stfd f28, 0x30(r1) /* 8021C824 00219764 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 8021C828 00219768 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021C82C 0021976C 48 14 59 B1 */ bl func_803621DC +/* 8021C82C 0021976C 48 14 59 B1 */ bl _savegpr_29 /* 8021C830 00219770 7C 9D 23 78 */ mr r29, r4 /* 8021C834 00219774 FF 80 08 90 */ fmr f28, f1 /* 8021C838 00219778 FF A0 10 90 */ fmr f29, f2 @@ -812,7 +812,7 @@ lbl_8021C8F8: /* 8021C914 00219854 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 8021C918 00219858 CB 81 00 30 */ lfd f28, 0x30(r1) /* 8021C91C 0021985C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021C920 00219860 48 14 59 09 */ bl func_80362228 +/* 8021C920 00219860 48 14 59 09 */ bl _restgpr_29 /* 8021C924 00219864 80 01 00 74 */ lwz r0, 0x74(r1) /* 8021C928 00219868 7C 08 03 A6 */ mtlr r0 /* 8021C92C 0021986C 38 21 00 70 */ addi r1, r1, 0x70 @@ -1716,7 +1716,7 @@ dMeter2Info_c_NS_set1stColor: /* 8021D528 0021A468 7C 08 02 A6 */ mflr r0 /* 8021D52C 0021A46C 90 01 00 34 */ stw r0, 0x34(r1) /* 8021D530 0021A470 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021D534 0021A474 48 14 4C A9 */ bl func_803621DC +/* 8021D534 0021A474 48 14 4C A9 */ bl _savegpr_29 /* 8021D538 0021A478 7C BF 2B 78 */ mr r31, r5 /* 8021D53C 0021A47C 3C 60 80 3A */ lis r3, lbl_80398A78@ha /* 8021D540 0021A480 3B C3 8A 78 */ addi r30, r3, lbl_80398A78@l @@ -1779,7 +1779,7 @@ dMeter2Info_c_NS_set1stColor: /* 8021D624 0021A564 88 01 00 0B */ lbz r0, 0xb(r1) /* 8021D628 0021A568 98 1F 01 47 */ stb r0, 0x147(r31) /* 8021D62C 0021A56C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021D630 0021A570 48 14 4B F9 */ bl func_80362228 +/* 8021D630 0021A570 48 14 4B F9 */ bl _restgpr_29 /* 8021D634 0021A574 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021D638 0021A578 7C 08 03 A6 */ mtlr r0 /* 8021D63C 0021A57C 38 21 00 30 */ addi r1, r1, 0x30 @@ -1791,7 +1791,7 @@ dMeter2Info_c_NS_set2ndColor: /* 8021D648 0021A588 7C 08 02 A6 */ mflr r0 /* 8021D64C 0021A58C 90 01 00 34 */ stw r0, 0x34(r1) /* 8021D650 0021A590 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021D654 0021A594 48 14 4B 89 */ bl func_803621DC +/* 8021D654 0021A594 48 14 4B 89 */ bl _savegpr_29 /* 8021D658 0021A598 7C BF 2B 78 */ mr r31, r5 /* 8021D65C 0021A59C 3C 60 80 3A */ lis r3, lbl_80398A78@ha /* 8021D660 0021A5A0 3B C3 8A 78 */ addi r30, r3, lbl_80398A78@l @@ -1854,7 +1854,7 @@ dMeter2Info_c_NS_set2ndColor: /* 8021D744 0021A684 88 01 00 0B */ lbz r0, 0xb(r1) /* 8021D748 0021A688 98 1F 01 47 */ stb r0, 0x147(r31) /* 8021D74C 0021A68C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021D750 0021A690 48 14 4A D9 */ bl func_80362228 +/* 8021D750 0021A690 48 14 4A D9 */ bl _restgpr_29 /* 8021D754 0021A694 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021D758 0021A698 7C 08 03 A6 */ mtlr r0 /* 8021D75C 0021A69C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2230,7 +2230,7 @@ dMeter2Info_c_NS_decHotSpringTimer: /* 8021DCE4 0021AC24 7C 08 02 A6 */ mflr r0 /* 8021DCE8 0021AC28 90 01 00 24 */ stw r0, 0x24(r1) /* 8021DCEC 0021AC2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DCF0 0021AC30 48 14 44 ED */ bl func_803621DC +/* 8021DCF0 0021AC30 48 14 44 ED */ bl _savegpr_29 /* 8021DCF4 0021AC34 7C 7D 1B 78 */ mr r29, r3 /* 8021DCF8 0021AC38 3B C0 00 00 */ li r30, 0 /* 8021DCFC 0021AC3C 3B E0 00 00 */ li r31, 0 @@ -2254,7 +2254,7 @@ lbl_8021DD34: /* 8021DD3C 0021AC7C 3B FF 00 02 */ addi r31, r31, 2 /* 8021DD40 0021AC80 41 80 FF C0 */ blt lbl_8021DD00 /* 8021DD44 0021AC84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021DD48 0021AC88 48 14 44 E1 */ bl func_80362228 +/* 8021DD48 0021AC88 48 14 44 E1 */ bl _restgpr_29 /* 8021DD4C 0021AC8C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021DD50 0021AC90 7C 08 03 A6 */ mtlr r0 /* 8021DD54 0021AC94 38 21 00 20 */ addi r1, r1, 0x20 @@ -2295,7 +2295,7 @@ dMeter2Info_c_NS_changeWater: lbl_8021DDD4: /* 8021DDD4 0021AD14 7F C3 F3 78 */ mr r3, r30 /* 8021DDD8 0021AD18 7F A4 EB 78 */ mr r4, r29 -/* 8021DDDC 0021AD1C 4B E1 4C 81 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8021DDDC 0021AD1C 4B E1 4C 81 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8021DDE0 0021AD20 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8021DDE4 0021AD24 7C 1F 00 40 */ cmplw r31, r0 /* 8021DDE8 0021AD28 40 82 00 0C */ bne lbl_8021DDF4 @@ -2369,7 +2369,7 @@ lbl_8021DEC4: /* 8021DED0 0021AE10 98 7E 00 C8 */ stb r3, 0xc8(r30) /* 8021DED4 0021AE14 7F 63 DB 78 */ mr r3, r27 /* 8021DED8 0021AE18 7F E4 FB 78 */ mr r4, r31 -/* 8021DEDC 0021AE1C 4B E1 4B 81 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8021DEDC 0021AE1C 4B E1 4B 81 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8021DEE0 0021AE20 98 7E 00 C4 */ stb r3, 0xc4(r30) /* 8021DEE4 0021AE24 3B FF 00 01 */ addi r31, r31, 1 /* 8021DEE8 0021AE28 2C 1F 00 02 */ cmpwi r31, 2 @@ -2520,7 +2520,7 @@ lbl_8021E100: /* 8021E10C 0021B04C 98 7C 00 D4 */ stb r3, 0xd4(r28) /* 8021E110 0021B050 7F A3 EB 78 */ mr r3, r29 /* 8021E114 0021B054 7F 64 DB 78 */ mr r4, r27 -/* 8021E118 0021B058 4B E1 49 45 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8021E118 0021B058 4B E1 49 45 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8021E11C 0021B05C 98 7C 00 D0 */ stb r3, 0xd0(r28) /* 8021E120 0021B060 3B 7B 00 01 */ addi r27, r27, 1 /* 8021E124 0021B064 2C 1B 00 02 */ cmpwi r27, 2 @@ -2671,7 +2671,7 @@ dMeter2Info_getPixel: /* 8021E32C 0021B26C DB 81 00 30 */ stfd f28, 0x30(r1) /* 8021E330 0021B270 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0 /* 8021E334 0021B274 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021E338 0021B278 48 14 3E A5 */ bl func_803621DC +/* 8021E338 0021B278 48 14 3E A5 */ bl _savegpr_29 /* 8021E33C 0021B27C FF 80 28 90 */ fmr f28, f5 /* 8021E340 0021B280 FF A0 30 90 */ fmr f29, f6 /* 8021E344 0021B284 7C 7F 1B 78 */ mr r31, r3 @@ -2764,7 +2764,7 @@ lbl_8021E478: /* 8021E490 0021B3D0 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0 /* 8021E494 0021B3D4 CB 81 00 30 */ lfd f28, 0x30(r1) /* 8021E498 0021B3D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021E49C 0021B3DC 48 14 3D 8D */ bl func_80362228 +/* 8021E49C 0021B3DC 48 14 3D 8D */ bl _restgpr_29 /* 8021E4A0 0021B3E0 80 01 00 74 */ lwz r0, 0x74(r1) /* 8021E4A4 0021B3E4 7C 08 03 A6 */ mtlr r0 /* 8021E4A8 0021B3E8 38 21 00 70 */ addi r1, r1, 0x70 @@ -2948,7 +2948,7 @@ dMeter2Info_getRecieveLetterNum: /* 8021E6E8 0021B628 7C 08 02 A6 */ mflr r0 /* 8021E6EC 0021B62C 90 01 00 24 */ stw r0, 0x24(r1) /* 8021E6F0 0021B630 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E6F4 0021B634 48 14 3A E9 */ bl func_803621DC +/* 8021E6F4 0021B634 48 14 3A E9 */ bl _savegpr_29 /* 8021E6F8 0021B638 3B C0 00 00 */ li r30, 0 /* 8021E6FC 0021B63C 3B A0 00 00 */ li r29, 0 /* 8021E700 0021B640 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -2969,7 +2969,7 @@ lbl_8021E72C: /* 8021E734 0021B674 41 80 FF D8 */ blt lbl_8021E70C /* 8021E738 0021B678 7F C3 F3 78 */ mr r3, r30 /* 8021E73C 0021B67C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8021E740 0021B680 48 14 3A E9 */ bl func_80362228 +/* 8021E740 0021B680 48 14 3A E9 */ bl _restgpr_29 /* 8021E744 0021B684 80 01 00 24 */ lwz r0, 0x24(r1) /* 8021E748 0021B688 7C 08 03 A6 */ mtlr r0 /* 8021E74C 0021B68C 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 c838686d200..f901b1fa5e3 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -2106,7 +2106,7 @@ lbl_8022A248: /* 8022A26C 002271AC 7C 08 02 A6 */ mflr r0 /* 8022A270 002271B0 90 01 01 E4 */ stw r0, 0x1e4(r1) /* 8022A274 002271B4 39 61 01 E0 */ addi r11, r1, 0x1e0 -/* 8022A278 002271B8 48 13 7F 65 */ bl func_803621DC +/* 8022A278 002271B8 48 13 7F 65 */ bl _savegpr_29 /* 8022A27C 002271BC 7C 7F 1B 78 */ mr r31, r3 /* 8022A280 002271C0 7C BD 2B 78 */ mr r29, r5 /* 8022A284 002271C4 83 C3 00 04 */ lwz r30, 4(r3) @@ -3061,7 +3061,7 @@ lbl_8022B094: /* 8022B094 00227FD4 38 60 00 00 */ li r3, 0 lbl_8022B098: /* 8022B098 00227FD8 39 61 01 E0 */ addi r11, r1, 0x1e0 -/* 8022B09C 00227FDC 48 13 71 8D */ bl func_80362228 +/* 8022B09C 00227FDC 48 13 71 8D */ bl _restgpr_29 /* 8022B0A0 00227FE0 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 8022B0A4 00227FE4 7C 08 03 A6 */ mtlr r0 /* 8022B0A8 00227FE8 38 21 01 E0 */ addi r1, r1, 0x1e0 @@ -3378,7 +3378,7 @@ jmessage_tMeasureProcessor_NS_push_word: /* 8022B4E4 00228424 7C 08 02 A6 */ mflr r0 /* 8022B4E8 00228428 90 01 00 24 */ stw r0, 0x24(r1) /* 8022B4EC 0022842C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022B4F0 00228430 48 13 6C ED */ bl func_803621DC +/* 8022B4F0 00228430 48 13 6C ED */ bl _savegpr_29 /* 8022B4F4 00228434 7C 7D 1B 78 */ mr r29, r3 /* 8022B4F8 00228438 7C 9E 23 78 */ mr r30, r4 /* 8022B4FC 0022843C 83 E3 00 04 */ lwz r31, 4(r3) @@ -3399,7 +3399,7 @@ jmessage_tMeasureProcessor_NS_push_word: /* 8022B538 00228478 38 03 00 01 */ addi r0, r3, 1 /* 8022B53C 0022847C 98 1D 00 4B */ stb r0, 0x4b(r29) /* 8022B540 00228480 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022B544 00228484 48 13 6C E5 */ bl func_80362228 +/* 8022B544 00228484 48 13 6C E5 */ bl _restgpr_29 /* 8022B548 00228488 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022B54C 0022848C 7C 08 03 A6 */ mtlr r0 /* 8022B550 00228490 38 21 00 20 */ addi r1, r1, 0x20 @@ -4149,7 +4149,7 @@ lbl_8022BFC8: /* 8022BFE4 00228F24 7C 08 02 A6 */ mflr r0 /* 8022BFE8 00228F28 90 01 00 34 */ stw r0, 0x34(r1) /* 8022BFEC 00228F2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022BFF0 00228F30 48 13 61 ED */ bl func_803621DC +/* 8022BFF0 00228F30 48 13 61 ED */ bl _savegpr_29 /* 8022BFF4 00228F34 7C 7D 1B 78 */ mr r29, r3 /* 8022BFF8 00228F38 7C 9E 23 78 */ mr r30, r4 /* 8022BFFC 00228F3C 83 E3 00 04 */ lwz r31, 4(r3) @@ -4265,7 +4265,7 @@ lbl_8022C178: /* 8022C184 002290C4 98 1D 00 B1 */ stb r0, 0xb1(r29) lbl_8022C188: /* 8022C188 002290C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022C18C 002290CC 48 13 60 9D */ bl func_80362228 +/* 8022C18C 002290CC 48 13 60 9D */ bl _restgpr_29 /* 8022C190 002290D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8022C194 002290D4 7C 08 03 A6 */ mtlr r0 /* 8022C198 002290D8 38 21 00 30 */ addi r1, r1, 0x30 @@ -4938,7 +4938,7 @@ jmessage_tSequenceProcessor_NS_messageSePlay: /* 8022CB14 00229A54 7C 08 02 A6 */ mflr r0 /* 8022CB18 00229A58 90 01 00 24 */ stw r0, 0x24(r1) /* 8022CB1C 00229A5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022CB20 00229A60 48 13 56 BD */ bl func_803621DC +/* 8022CB20 00229A60 48 13 56 BD */ bl _savegpr_29 /* 8022CB24 00229A64 7C 9D 23 78 */ mr r29, r4 /* 8022CB28 00229A68 7C BE 2B 78 */ mr r30, r5 /* 8022CB2C 00229A6C 7C DF 33 79 */ or. r31, r6, r6 @@ -4986,7 +4986,7 @@ lbl_8022CBB4: /* 8022CBC8 00229B08 48 09 FE 51 */ bl Z2SpeechMgr2_NS_playOneShotVoice lbl_8022CBCC: /* 8022CBCC 00229B0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022CBD0 00229B10 48 13 56 59 */ bl func_80362228 +/* 8022CBD0 00229B10 48 13 56 59 */ bl _restgpr_29 /* 8022CBD4 00229B14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022CBD8 00229B18 7C 08 03 A6 */ mtlr r0 /* 8022CBDC 00229B1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5263,7 +5263,7 @@ lbl_8022CFC0: /* 8022CFDC 00229F1C 7C 08 02 A6 */ mflr r0 /* 8022CFE0 00229F20 90 01 00 E4 */ stw r0, 0xe4(r1) /* 8022CFE4 00229F24 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8022CFE8 00229F28 48 13 51 F5 */ bl func_803621DC +/* 8022CFE8 00229F28 48 13 51 F5 */ bl _savegpr_29 /* 8022CFEC 00229F2C 83 C3 00 04 */ lwz r30, 4(r3) /* 8022CFF0 00229F30 48 00 B5 85 */ bl dMsgObject_c_NS_getSelectWordFlag /* 8022CFF4 00229F34 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -5310,7 +5310,7 @@ lbl_8022D074: /* 8022D084 00229FC4 98 1E 12 76 */ stb r0, 0x1276(r30) lbl_8022D088: /* 8022D088 00229FC8 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8022D08C 00229FCC 48 13 51 9D */ bl func_80362228 +/* 8022D08C 00229FCC 48 13 51 9D */ bl _restgpr_29 /* 8022D090 00229FD0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8022D094 00229FD4 7C 08 03 A6 */ mtlr r0 /* 8022D098 00229FD8 38 21 00 E0 */ addi r1, r1, 0xe0 @@ -6571,7 +6571,7 @@ jmessage_tRenderingProcessor_NS_do_heightcenter: /* 8022E334 0022B274 DB A1 00 30 */ stfd f29, 0x30(r1) /* 8022E338 0022B278 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 8022E33C 0022B27C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022E340 0022B280 48 13 3E 9D */ bl func_803621DC +/* 8022E340 0022B280 48 13 3E 9D */ bl _savegpr_29 /* 8022E344 0022B284 7C 7E 1B 78 */ mr r30, r3 /* 8022E348 0022B288 83 E3 00 04 */ lwz r31, 4(r3) /* 8022E34C 0022B28C C0 02 B0 60 */ lfs f0, lbl_80454A60-_SDA2_BASE_(r2) @@ -6868,7 +6868,7 @@ lbl_8022E79C: /* 8022E7AC 0022B6EC E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 8022E7B0 0022B6F0 CB A1 00 30 */ lfd f29, 0x30(r1) /* 8022E7B4 0022B6F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022E7B8 0022B6F8 48 13 3A 71 */ bl func_80362228 +/* 8022E7B8 0022B6F8 48 13 3A 71 */ bl _restgpr_29 /* 8022E7BC 0022B6FC 80 01 00 64 */ lwz r0, 0x64(r1) /* 8022E7C0 0022B700 7C 08 03 A6 */ mtlr r0 /* 8022E7C4 0022B704 38 21 00 60 */ addi r1, r1, 0x60 @@ -6880,7 +6880,7 @@ jmessage_tRenderingProcessor_NS_do_color: /* 8022E7D0 0022B710 7C 08 02 A6 */ mflr r0 /* 8022E7D4 0022B714 90 01 00 44 */ stw r0, 0x44(r1) /* 8022E7D8 0022B718 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022E7DC 0022B71C 48 13 3A 01 */ bl func_803621DC +/* 8022E7DC 0022B71C 48 13 3A 01 */ bl _savegpr_29 /* 8022E7E0 0022B720 7C 7D 1B 78 */ mr r29, r3 /* 8022E7E4 0022B724 7C 9E 23 78 */ mr r30, r4 /* 8022E7E8 0022B728 83 E3 00 04 */ lwz r31, 4(r3) @@ -6908,7 +6908,7 @@ jmessage_tRenderingProcessor_NS_do_color: /* 8022E840 0022B780 38 E0 00 00 */ li r7, 0 /* 8022E844 0022B784 48 00 06 BD */ bl jmessage_tRenderingProcessor_NS_do_strcat /* 8022E848 0022B788 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022E84C 0022B78C 48 13 39 DD */ bl func_80362228 +/* 8022E84C 0022B78C 48 13 39 DD */ bl _restgpr_29 /* 8022E850 0022B790 80 01 00 44 */ lwz r0, 0x44(r1) /* 8022E854 0022B794 7C 08 03 A6 */ mtlr r0 /* 8022E858 0022B798 38 21 00 40 */ addi r1, r1, 0x40 @@ -7015,7 +7015,7 @@ jmessage_tRenderingProcessor_NS_do_transY: /* 8022E9C4 0022B904 7C 08 02 A6 */ mflr r0 /* 8022E9C8 0022B908 90 01 00 44 */ stw r0, 0x44(r1) /* 8022E9CC 0022B90C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022E9D0 0022B910 48 13 38 0D */ bl func_803621DC +/* 8022E9D0 0022B910 48 13 38 0D */ bl _savegpr_29 /* 8022E9D4 0022B914 7C 7F 1B 78 */ mr r31, r3 /* 8022E9D8 0022B918 7C 9D 23 78 */ mr r29, r4 /* 8022E9DC 0022B91C 7F A0 07 35 */ extsh. r0, r29 @@ -7082,7 +7082,7 @@ lbl_8022EA6C: /* 8022EAC8 0022BA08 48 00 08 BD */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat lbl_8022EACC: /* 8022EACC 0022BA0C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022EAD0 0022BA10 48 13 37 59 */ bl func_80362228 +/* 8022EAD0 0022BA10 48 13 37 59 */ bl _restgpr_29 /* 8022EAD4 0022BA14 80 01 00 44 */ lwz r0, 0x44(r1) /* 8022EAD8 0022BA18 7C 08 03 A6 */ mtlr r0 /* 8022EADC 0022BA1C 38 21 00 40 */ addi r1, r1, 0x40 @@ -7242,7 +7242,7 @@ jmessage_tRenderingProcessor_NS_do_arrow2: /* 8022ED1C 0022BC5C DB E1 00 40 */ stfd f31, 0x40(r1) /* 8022ED20 0022BC60 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8022ED24 0022BC64 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022ED28 0022BC68 48 13 34 B5 */ bl func_803621DC +/* 8022ED28 0022BC68 48 13 34 B5 */ bl _savegpr_29 /* 8022ED2C 0022BC6C 7C 7F 1B 78 */ mr r31, r3 /* 8022ED30 0022BC70 83 A3 00 04 */ lwz r29, 4(r3) /* 8022ED34 0022BC74 83 DD 05 C8 */ lwz r30, 0x5c8(r29) @@ -7343,7 +7343,7 @@ lbl_8022EE1C: /* 8022EEAC 0022BDEC E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8022EEB0 0022BDF0 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8022EEB4 0022BDF4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8022EEB8 0022BDF8 48 13 33 71 */ bl func_80362228 +/* 8022EEB8 0022BDF8 48 13 33 71 */ bl _restgpr_29 /* 8022EEBC 0022BDFC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8022EEC0 0022BE00 7C 08 03 A6 */ mtlr r0 /* 8022EEC4 0022BE04 38 21 00 50 */ addi r1, r1, 0x50 @@ -7803,7 +7803,7 @@ jmessage_tRenderingProcessor_NS_do_numset: /* 8022F544 0022C484 7C 08 02 A6 */ mflr r0 /* 8022F548 0022C488 90 01 00 24 */ stw r0, 0x24(r1) /* 8022F54C 0022C48C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022F550 0022C490 48 13 2C 8D */ bl func_803621DC +/* 8022F550 0022C490 48 13 2C 8D */ bl _savegpr_29 /* 8022F554 0022C494 7C 7D 1B 78 */ mr r29, r3 /* 8022F558 0022C498 7C 9E 23 78 */ mr r30, r4 /* 8022F55C 0022C49C 7F C0 07 34 */ extsh r0, r30 @@ -7929,7 +7929,7 @@ lbl_8022F6F4: /* 8022F718 0022C658 4B FF F3 CD */ bl jmessage_tRenderingProcessor_NS_do_outfont lbl_8022F71C: /* 8022F71C 0022C65C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8022F720 0022C660 48 13 2B 09 */ bl func_80362228 +/* 8022F720 0022C660 48 13 2B 09 */ bl _restgpr_29 /* 8022F724 0022C664 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022F728 0022C668 7C 08 03 A6 */ mtlr r0 /* 8022F72C 0022C66C 38 21 00 20 */ addi r1, r1, 0x20 @@ -8316,7 +8316,7 @@ jmessage_string_tMeasureProcessor: /* 8022FC3C 0022CB7C DB C1 00 30 */ stfd f30, 0x30(r1) /* 8022FC40 0022CB80 F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 8022FC44 0022CB84 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022FC48 0022CB88 48 13 25 95 */ bl func_803621DC +/* 8022FC48 0022CB88 48 13 25 95 */ bl _savegpr_29 /* 8022FC4C 0022CB8C 7C 7F 1B 78 */ mr r31, r3 /* 8022FC50 0022CB90 7C 9D 23 78 */ mr r29, r4 /* 8022FC54 0022CB94 80 63 00 38 */ lwz r3, 0x38(r3) @@ -8426,7 +8426,7 @@ lbl_8022FDC8: /* 8022FDD0 0022CD10 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 8022FDD4 0022CD14 CB C1 00 30 */ lfd f30, 0x30(r1) /* 8022FDD8 0022CD18 39 61 00 30 */ addi r11, r1, 0x30 -/* 8022FDDC 0022CD1C 48 13 24 4D */ bl func_80362228 +/* 8022FDDC 0022CD1C 48 13 24 4D */ bl _restgpr_29 /* 8022FDE0 0022CD20 80 01 00 54 */ lwz r0, 0x54(r1) /* 8022FDE4 0022CD24 7C 08 03 A6 */ mtlr r0 /* 8022FDE8 0022CD28 38 21 00 50 */ addi r1, r1, 0x50 @@ -9295,7 +9295,7 @@ lbl_80230AA0: /* 80230AC4 0022DA04 7C 08 02 A6 */ mflr r0 /* 80230AC8 0022DA08 90 01 00 24 */ stw r0, 0x24(r1) /* 80230ACC 0022DA0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80230AD0 0022DA10 48 13 17 0D */ bl func_803621DC +/* 80230AD0 0022DA10 48 13 17 0D */ bl _savegpr_29 /* 80230AD4 0022DA14 7C 7D 1B 78 */ mr r29, r3 /* 80230AD8 0022DA18 7C 9E 23 78 */ mr r30, r4 /* 80230ADC 0022DA1C 7C BF 2B 78 */ mr r31, r5 @@ -9335,7 +9335,7 @@ lbl_80230AA0: /* 80230B5C 0022DA9C 38 80 00 00 */ li r4, 0 /* 80230B60 0022DAA0 48 07 7F C1 */ bl JMessage_NS_TRenderingProcessor_NS_process /* 80230B64 0022DAA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80230B68 0022DAA8 48 13 16 C1 */ bl func_80362228 +/* 80230B68 0022DAA8 48 13 16 C1 */ bl _restgpr_29 /* 80230B6C 0022DAAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80230B70 0022DAB0 7C 08 03 A6 */ mtlr r0 /* 80230B74 0022DAB4 38 21 00 20 */ addi r1, r1, 0x20 @@ -9475,7 +9475,7 @@ lbl_80230D34: /* 80230D5C 0022DC9C DB C1 00 40 */ stfd f30, 0x40(r1) /* 80230D60 0022DCA0 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 80230D64 0022DCA4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80230D68 0022DCA8 48 13 14 75 */ bl func_803621DC +/* 80230D68 0022DCA8 48 13 14 75 */ bl _savegpr_29 /* 80230D6C 0022DCAC 7C 7F 1B 78 */ mr r31, r3 /* 80230D70 0022DCB0 7C 9D 23 78 */ mr r29, r4 /* 80230D74 0022DCB4 80 63 00 38 */ lwz r3, 0x38(r3) @@ -9722,7 +9722,7 @@ lbl_802310E8: /* 802310F0 0022E030 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 802310F4 0022E034 CB C1 00 40 */ lfd f30, 0x40(r1) /* 802310F8 0022E038 39 61 00 40 */ addi r11, r1, 0x40 -/* 802310FC 0022E03C 48 13 11 2D */ bl func_80362228 +/* 802310FC 0022E03C 48 13 11 2D */ bl _restgpr_29 /* 80231100 0022E040 80 01 00 64 */ lwz r0, 0x64(r1) /* 80231104 0022E044 7C 08 03 A6 */ mtlr r0 /* 80231108 0022E048 38 21 00 60 */ addi r1, r1, 0x60 @@ -10935,7 +10935,7 @@ jmessage_string_tRenderingProcessor_NS_do_outfont: /* 80232308 0022F248 DB 21 00 40 */ stfd f25, 0x40(r1) /* 8023230C 0022F24C F3 21 00 48 */ psq_st f25, 72(r1), 0, qr0 /* 80232310 0022F250 39 61 00 40 */ addi r11, r1, 0x40 -/* 80232314 0022F254 48 12 FE C9 */ bl func_803621DC +/* 80232314 0022F254 48 12 FE C9 */ bl _savegpr_29 /* 80232318 0022F258 7C 7E 1B 78 */ mr r30, r3 /* 8023231C 0022F25C 7C 9F 23 78 */ mr r31, r4 /* 80232320 0022F260 80 83 00 38 */ lwz r4, 0x38(r3) @@ -11086,7 +11086,7 @@ lbl_8023251C: /* 8023254C 0022F48C E3 21 00 48 */ psq_l f25, 72(r1), 0, qr0 /* 80232550 0022F490 CB 21 00 40 */ lfd f25, 0x40(r1) /* 80232554 0022F494 39 61 00 40 */ addi r11, r1, 0x40 -/* 80232558 0022F498 48 12 FC D1 */ bl func_80362228 +/* 80232558 0022F498 48 12 FC D1 */ bl _restgpr_29 /* 8023255C 0022F49C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80232560 0022F4A0 7C 08 03 A6 */ mtlr r0 /* 80232564 0022F4A4 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -11098,7 +11098,7 @@ jmessage_string_tRenderingProcessor_NS_do_color: /* 80232570 0022F4B0 7C 08 02 A6 */ mflr r0 /* 80232574 0022F4B4 90 01 00 44 */ stw r0, 0x44(r1) /* 80232578 0022F4B8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8023257C 0022F4BC 48 12 FC 61 */ bl func_803621DC +/* 8023257C 0022F4BC 48 12 FC 61 */ bl _savegpr_29 /* 80232580 0022F4C0 7C 7D 1B 78 */ mr r29, r3 /* 80232584 0022F4C4 7C 9E 23 78 */ mr r30, r4 /* 80232588 0022F4C8 54 80 06 3F */ clrlwi. r0, r4, 0x18 @@ -11128,7 +11128,7 @@ lbl_802325C0: /* 802325E0 0022F520 38 81 00 08 */ addi r4, r1, 8 /* 802325E4 0022F524 4B FF FA 61 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat /* 802325E8 0022F528 39 61 00 40 */ addi r11, r1, 0x40 -/* 802325EC 0022F52C 48 12 FC 3D */ bl func_80362228 +/* 802325EC 0022F52C 48 12 FC 3D */ bl _restgpr_29 /* 802325F0 0022F530 80 01 00 44 */ lwz r0, 0x44(r1) /* 802325F4 0022F534 7C 08 03 A6 */ mtlr r0 /* 802325F8 0022F538 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index f01d0098690..21dfe39c123 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -532,7 +532,7 @@ dMsgFlow_c_NS_setInitValueGroupChange: /* 8024A61C 0024755C 7C 08 02 A6 */ mflr r0 /* 8024A620 00247560 90 01 00 24 */ stw r0, 0x24(r1) /* 8024A624 00247564 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A628 00247568 48 11 7B B5 */ bl func_803621DC +/* 8024A628 00247568 48 11 7B B5 */ bl _savegpr_29 /* 8024A62C 0024756C 7C 7D 1B 78 */ mr r29, r3 /* 8024A630 00247570 7C 9E 23 78 */ mr r30, r4 /* 8024A634 00247574 7C BF 2B 78 */ mr r31, r5 @@ -576,7 +576,7 @@ dMsgFlow_c_NS_setInitValueGroupChange: /* 8024A6CC 0024760C 7F E5 FB 78 */ mr r5, r31 /* 8024A6D0 00247610 48 00 00 FD */ bl dMsgFlow_c_NS_setNodeIndex /* 8024A6D4 00247614 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024A6D8 00247618 48 11 7B 51 */ bl func_80362228 +/* 8024A6D8 00247618 48 11 7B 51 */ bl _restgpr_29 /* 8024A6DC 0024761C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024A6E0 00247620 7C 08 03 A6 */ mtlr r0 /* 8024A6E4 00247624 38 21 00 20 */ addi r1, r1, 0x20 @@ -841,7 +841,7 @@ dMsgFlow_c_NS_setNormalMsg: /* 8024AA54 00247994 7C 08 02 A6 */ mflr r0 /* 8024AA58 00247998 90 01 00 24 */ stw r0, 0x24(r1) /* 8024AA5C 0024799C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AA60 002479A0 48 11 77 7D */ bl func_803621DC +/* 8024AA60 002479A0 48 11 77 7D */ bl _savegpr_29 /* 8024AA64 002479A4 7C 7F 1B 78 */ mr r31, r3 /* 8024AA68 002479A8 7C 9E 23 78 */ mr r30, r4 /* 8024AA6C 002479AC 7C BD 2B 78 */ mr r29, r5 @@ -892,7 +892,7 @@ lbl_8024AB08: /* 8024AB14 00247A54 38 60 00 01 */ li r3, 1 lbl_8024AB18: /* 8024AB18 00247A58 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AB1C 00247A5C 48 11 77 0D */ bl func_80362228 +/* 8024AB1C 00247A5C 48 11 77 0D */ bl _restgpr_29 /* 8024AB20 00247A60 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024AB24 00247A64 7C 08 03 A6 */ mtlr r0 /* 8024AB28 00247A68 38 21 00 20 */ addi r1, r1, 0x20 @@ -1057,7 +1057,7 @@ dMsgFlow_c_NS_branchNodeProc: /* 8024AD58 00247C98 7C 08 02 A6 */ mflr r0 /* 8024AD5C 00247C9C 90 01 00 24 */ stw r0, 0x24(r1) /* 8024AD60 00247CA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AD64 00247CA4 48 11 74 79 */ bl func_803621DC +/* 8024AD64 00247CA4 48 11 74 79 */ bl _savegpr_29 /* 8024AD68 00247CA8 7C 7D 1B 78 */ mr r29, r3 /* 8024AD6C 00247CAC 7C 86 23 78 */ mr r6, r4 /* 8024AD70 00247CB0 7C BE 2B 78 */ mr r30, r5 @@ -1086,7 +1086,7 @@ dMsgFlow_c_NS_branchNodeProc: /* 8024ADCC 00247D0C 4B FF FA 01 */ bl dMsgFlow_c_NS_setNodeIndex /* 8024ADD0 00247D10 38 60 00 01 */ li r3, 1 /* 8024ADD4 00247D14 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024ADD8 00247D18 48 11 74 51 */ bl func_80362228 +/* 8024ADD8 00247D18 48 11 74 51 */ bl _restgpr_29 /* 8024ADDC 00247D1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024ADE0 00247D20 7C 08 03 A6 */ mtlr r0 /* 8024ADE4 00247D24 38 21 00 20 */ addi r1, r1, 0x20 @@ -1098,7 +1098,7 @@ dMsgFlow_c_NS_eventNodeProc: /* 8024ADF0 00247D30 7C 08 02 A6 */ mflr r0 /* 8024ADF4 00247D34 90 01 00 24 */ stw r0, 0x24(r1) /* 8024ADF8 00247D38 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024ADFC 00247D3C 48 11 73 E1 */ bl func_803621DC +/* 8024ADFC 00247D3C 48 11 73 E1 */ bl _savegpr_29 /* 8024AE00 00247D40 7C 7E 1B 78 */ mr r30, r3 /* 8024AE04 00247D44 7C 86 23 78 */ mr r6, r4 /* 8024AE08 00247D48 7C BF 2B 78 */ mr r31, r5 @@ -1230,7 +1230,7 @@ lbl_8024AFDC: /* 8024AFDC 00247F1C 38 60 00 01 */ li r3, 1 lbl_8024AFE0: /* 8024AFE0 00247F20 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024AFE4 00247F24 48 11 72 45 */ bl func_80362228 +/* 8024AFE4 00247F24 48 11 72 45 */ bl _restgpr_29 /* 8024AFE8 00247F28 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024AFEC 00247F2C 7C 08 03 A6 */ mtlr r0 /* 8024AFF0 00247F30 38 21 00 20 */ addi r1, r1, 0x20 @@ -1242,7 +1242,7 @@ dMsgFlow_c_NS_nodeProc: /* 8024AFFC 00247F3C 7C 08 02 A6 */ mflr r0 /* 8024B000 00247F40 90 01 00 24 */ stw r0, 0x24(r1) /* 8024B004 00247F44 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024B008 00247F48 48 11 71 D5 */ bl func_803621DC +/* 8024B008 00247F48 48 11 71 D5 */ bl _savegpr_29 /* 8024B00C 00247F4C 7C 7D 1B 78 */ mr r29, r3 /* 8024B010 00247F50 7C BE 2B 78 */ mr r30, r5 /* 8024B014 00247F54 7C 9F 23 78 */ mr r31, r4 @@ -1303,7 +1303,7 @@ lbl_8024B0C0: lbl_8024B0D4: /* 8024B0D4 00248014 38 60 00 00 */ li r3, 0 /* 8024B0D8 00248018 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024B0DC 0024801C 48 11 71 4D */ bl func_80362228 +/* 8024B0DC 0024801C 48 11 71 4D */ bl _restgpr_29 /* 8024B0E0 00248020 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024B0E4 00248024 7C 08 03 A6 */ mtlr r0 /* 8024B0E8 00248028 38 21 00 20 */ addi r1, r1, 0x20 @@ -1418,7 +1418,7 @@ lbl_8024B1F4: /* 8024B264 002481A4 40 82 00 30 */ bne lbl_8024B294 /* 8024B268 002481A8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024B26C 002481AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l -/* 8024B270 002481B0 4B DE 78 39 */ bl dSv_player_status_a_c_NS_getRupeeMax +/* 8024B270 002481B0 4B DE 78 39 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 8024B274 002481B4 3C 80 80 40 */ lis r4, lbl_804061C0@ha /* 8024B278 002481B8 38 84 61 C0 */ addi r4, r4, lbl_804061C0@l /* 8024B27C 002481BC A0 84 00 04 */ lhz r4, 4(r4) @@ -1753,7 +1753,7 @@ lbl_8024B758: /* 8024B778 002486B8 7C 08 02 A6 */ mflr r0 /* 8024B77C 002486BC 90 01 00 24 */ stw r0, 0x24(r1) /* 8024B780 002486C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024B784 002486C4 48 11 6A 59 */ bl func_803621DC +/* 8024B784 002486C4 48 11 6A 59 */ bl _savegpr_29 /* 8024B788 002486C8 A0 04 00 04 */ lhz r0, 4(r4) /* 8024B78C 002486CC 54 1F 06 3E */ clrlwi r31, r0, 0x18 /* 8024B790 002486D0 3B C0 00 00 */ li r30, 0 @@ -1803,7 +1803,7 @@ lbl_8024B828: /* 8024B828 00248768 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024B82C 0024876C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024B830 00248770 38 80 00 00 */ li r4, 0 -/* 8024B834 00248774 4B DE 72 29 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8024B834 00248774 4B DE 72 29 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B838 00248778 7C 60 1B 78 */ mr r0, r3 /* 8024B83C 0024877C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024B840 00248780 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -1818,7 +1818,7 @@ lbl_8024B828: /* 8024B864 002487A4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024B868 002487A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024B86C 002487AC 38 80 00 01 */ li r4, 1 -/* 8024B870 002487B0 4B DE 71 ED */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8024B870 002487B0 4B DE 71 ED */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B874 002487B4 7C 60 1B 78 */ mr r0, r3 /* 8024B878 002487B8 7F A3 EB 78 */ mr r3, r29 /* 8024B87C 002487BC 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -1830,7 +1830,7 @@ lbl_8024B828: /* 8024B894 002487D4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024B898 002487D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8024B89C 002487DC 38 80 00 02 */ li r4, 2 -/* 8024B8A0 002487E0 4B DE 71 BD */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8024B8A0 002487E0 4B DE 71 BD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024B8A4 002487E4 7C 60 1B 78 */ mr r0, r3 /* 8024B8A8 002487E8 7F A3 EB 78 */ mr r3, r29 /* 8024B8AC 002487EC 54 04 06 3E */ clrlwi r4, r0, 0x18 @@ -1844,7 +1844,7 @@ lbl_8024B8C4: lbl_8024B8C8: /* 8024B8C8 00248808 7F C3 F3 78 */ mr r3, r30 /* 8024B8CC 0024880C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024B8D0 00248810 48 11 69 59 */ bl func_80362228 +/* 8024B8D0 00248810 48 11 69 59 */ bl _restgpr_29 /* 8024B8D4 00248814 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024B8D8 00248818 7C 08 03 A6 */ mtlr r0 /* 8024B8DC 0024881C 38 21 00 20 */ addi r1, r1, 0x20 @@ -3427,7 +3427,7 @@ lbl_8024CFF0: /* 8024D008 00249F48 7C 08 02 A6 */ mflr r0 /* 8024D00C 00249F4C 90 01 00 24 */ stw r0, 0x24(r1) /* 8024D010 00249F50 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024D014 00249F54 48 11 51 C9 */ bl func_803621DC +/* 8024D014 00249F54 48 11 51 C9 */ bl _savegpr_29 /* 8024D018 00249F58 7C 7E 1B 78 */ mr r30, r3 /* 8024D01C 00249F5C 7C 9D 23 78 */ mr r29, r4 /* 8024D020 00249F60 38 81 00 0C */ addi r4, r1, 0xc @@ -3668,7 +3668,7 @@ lbl_8024D268: lbl_8024D3A8: /* 8024D3A8 0024A2E8 38 60 00 01 */ li r3, 1 /* 8024D3AC 0024A2EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8024D3B0 0024A2F0 48 11 4E 79 */ bl func_80362228 +/* 8024D3B0 0024A2F0 48 11 4E 79 */ bl _restgpr_29 /* 8024D3B4 0024A2F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024D3B8 0024A2F8 7C 08 03 A6 */ mtlr r0 /* 8024D3BC 0024A2FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3725,7 +3725,7 @@ lbl_8024D478: lbl_8024D484: /* 8024D484 0024A3C4 7F E3 FB 78 */ mr r3, r31 /* 8024D488 0024A3C8 7F 64 DB 78 */ mr r4, r27 -/* 8024D48C 0024A3CC 4B DE 55 D1 */ bl dSv_player_status_a_c_NS_getSelectItemIndex +/* 8024D48C 0024A3CC 4B DE 55 D1 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8024D490 0024A3D0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024D494 0024A3D4 7C 1C 00 00 */ cmpw r28, r0 /* 8024D498 0024A3D8 40 82 00 30 */ bne lbl_8024D4C8 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index caa19aeb2d3..d4c34920b94 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -1137,7 +1137,7 @@ dMsgObject_c_NS__delete: /* 80233AEC 00230A2C 7C 08 02 A6 */ mflr r0 /* 80233AF0 00230A30 90 01 00 34 */ stw r0, 0x34(r1) /* 80233AF4 00230A34 39 61 00 30 */ addi r11, r1, 0x30 -/* 80233AF8 00230A38 48 12 E6 E5 */ bl func_803621DC +/* 80233AF8 00230A38 48 12 E6 E5 */ bl _savegpr_29 /* 80233AFC 00230A3C 7C 7F 1B 78 */ mr r31, r3 /* 80233B00 00230A40 83 C3 01 10 */ lwz r30, 0x110(r3) /* 80233B04 00230A44 48 00 00 44 */ b lbl_80233B48 @@ -1276,7 +1276,7 @@ lbl_80233CD8: /* 80233CE4 00230C24 90 03 5D BC */ stw r0, 0x5dbc(r3) /* 80233CE8 00230C28 38 60 00 01 */ li r3, 1 /* 80233CEC 00230C2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80233CF0 00230C30 48 12 E5 39 */ bl func_80362228 +/* 80233CF0 00230C30 48 12 E5 39 */ bl _restgpr_29 /* 80233CF4 00230C34 80 01 00 34 */ lwz r0, 0x34(r1) /* 80233CF8 00230C38 7C 08 03 A6 */ mtlr r0 /* 80233CFC 00230C3C 38 21 00 30 */ addi r1, r1, 0x30 @@ -1731,7 +1731,7 @@ dMsgObject_c_NS_openProc: /* 80234324 00231264 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80234328 00231268 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8023432C 0023126C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80234330 00231270 48 12 DE AD */ bl func_803621DC +/* 80234330 00231270 48 12 DE AD */ bl _savegpr_29 /* 80234334 00231274 7C 7E 1B 78 */ mr r30, r3 /* 80234338 00231278 48 00 2D C5 */ bl dMsgObject_c_NS_isMidonaMessage /* 8023433C 0023127C 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -2172,7 +2172,7 @@ lbl_802349B8: /* 802349B8 002318F8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802349BC 002318FC CB E1 00 30 */ lfd f31, 0x30(r1) /* 802349C0 00231900 39 61 00 30 */ addi r11, r1, 0x30 -/* 802349C4 00231904 48 12 D8 65 */ bl func_80362228 +/* 802349C4 00231904 48 12 D8 65 */ bl _restgpr_29 /* 802349C8 00231908 80 01 00 44 */ lwz r0, 0x44(r1) /* 802349CC 0023190C 7C 08 03 A6 */ mtlr r0 /* 802349D0 00231910 38 21 00 40 */ addi r1, r1, 0x40 @@ -4669,7 +4669,7 @@ dMsgObject_c_NS_changeGroupLocal: /* 80236D10 00233C50 7C 08 02 A6 */ mflr r0 /* 80236D14 00233C54 90 01 00 24 */ stw r0, 0x24(r1) /* 80236D18 00233C58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80236D1C 00233C5C 48 12 B4 C1 */ bl func_803621DC +/* 80236D1C 00233C5C 48 12 B4 C1 */ bl _savegpr_29 /* 80236D20 00233C60 7C 7E 1B 78 */ mr r30, r3 /* 80236D24 00233C64 7C 9F 23 78 */ mr r31, r4 /* 80236D28 00233C68 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4720,7 +4720,7 @@ lbl_80236DC4: /* 80236DC4 00233D04 7F A3 EB 78 */ mr r3, r29 /* 80236DC8 00233D08 4B DD 84 05 */ bl mDoExt_setCurrentHeap /* 80236DCC 00233D0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80236DD0 00233D10 48 12 B4 59 */ bl func_80362228 +/* 80236DD0 00233D10 48 12 B4 59 */ bl _restgpr_29 /* 80236DD4 00233D14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80236DD8 00233D18 7C 08 03 A6 */ mtlr r0 /* 80236DDC 00233D1C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5114,7 +5114,7 @@ dMsgObject_c_NS_getSmellName: /* 802372D0 00234210 7C 08 02 A6 */ mflr r0 /* 802372D4 00234214 90 01 00 24 */ stw r0, 0x24(r1) /* 802372D8 00234218 39 61 00 20 */ addi r11, r1, 0x20 -/* 802372DC 0023421C 48 12 AF 01 */ bl func_803621DC +/* 802372DC 0023421C 48 12 AF 01 */ bl _savegpr_29 /* 802372E0 00234220 7C 7D 1B 78 */ mr r29, r3 /* 802372E4 00234224 80 63 01 28 */ lwz r3, 0x128(r3) /* 802372E8 00234228 3B E3 00 20 */ addi r31, r3, 0x20 @@ -5131,7 +5131,7 @@ dMsgObject_c_NS_getSmellName: /* 80237314 00234254 38 63 00 08 */ addi r3, r3, 8 /* 80237318 00234258 7C 7E 1A 14 */ add r3, r30, r3 /* 8023731C 0023425C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80237320 00234260 48 12 AF 09 */ bl func_80362228 +/* 80237320 00234260 48 12 AF 09 */ bl _restgpr_29 /* 80237324 00234264 80 01 00 24 */ lwz r0, 0x24(r1) /* 80237328 00234268 7C 08 03 A6 */ mtlr r0 /* 8023732C 0023426C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5168,7 +5168,7 @@ dMsgObject_c_NS_getBombName: /* 80237390 002342D0 7C 08 02 A6 */ mflr r0 /* 80237394 002342D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80237398 002342D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023739C 002342DC 48 12 AE 41 */ bl func_803621DC +/* 8023739C 002342DC 48 12 AE 41 */ bl _savegpr_29 /* 802373A0 002342E0 7C 7D 1B 78 */ mr r29, r3 /* 802373A4 002342E4 48 00 10 9D */ bl dMsgObject_c_NS_getSelectCursorPos /* 802373A8 002342E8 88 1D 01 93 */ lbz r0, 0x193(r29) @@ -5197,7 +5197,7 @@ lbl_802373C8: /* 802373FC 0023433C 38 63 00 08 */ addi r3, r3, 8 /* 80237400 00234340 7C 7E 1A 14 */ add r3, r30, r3 /* 80237404 00234344 39 61 00 20 */ addi r11, r1, 0x20 -/* 80237408 00234348 48 12 AE 21 */ bl func_80362228 +/* 80237408 00234348 48 12 AE 21 */ bl _restgpr_29 /* 8023740C 0023434C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80237410 00234350 7C 08 03 A6 */ mtlr r0 /* 80237414 00234354 38 21 00 20 */ addi r1, r1, 0x20 @@ -6095,7 +6095,7 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237F84 00234EC4 7C 08 02 A6 */ mflr r0 /* 80237F88 00234EC8 90 01 00 24 */ stw r0, 0x24(r1) /* 80237F8C 00234ECC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80237F90 00234ED0 48 12 A2 4D */ bl func_803621DC +/* 80237F90 00234ED0 48 12 A2 4D */ bl _savegpr_29 /* 80237F94 00234ED4 7C 7E 1B 78 */ mr r30, r3 /* 80237F98 00234ED8 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80237F9C 00234EDC 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -6121,7 +6121,7 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237FEC 00234F2C 4B DD 71 E1 */ bl mDoExt_setCurrentHeap /* 80237FF0 00234F30 7F C3 F3 78 */ mr r3, r30 /* 80237FF4 00234F34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80237FF8 00234F38 48 12 A2 31 */ bl func_80362228 +/* 80237FF8 00234F38 48 12 A2 31 */ bl _restgpr_29 /* 80237FFC 00234F3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80238000 00234F40 7C 08 03 A6 */ mtlr r0 /* 80238004 00234F44 38 21 00 20 */ addi r1, r1, 0x20 @@ -6708,7 +6708,7 @@ dMsgObject_getTotalPrice: /* 80238734 00235674 7C 08 02 A6 */ mflr r0 /* 80238738 00235678 90 01 00 24 */ stw r0, 0x24(r1) /* 8023873C 0023567C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238740 00235680 48 12 9A 9D */ bl func_803621DC +/* 80238740 00235680 48 12 9A 9D */ bl _savegpr_29 /* 80238744 00235684 7C 7D 1B 78 */ mr r29, r3 /* 80238748 00235688 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8023874C 0023568C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -6737,7 +6737,7 @@ lbl_80238774: /* 802387A4 002356E4 57 E5 06 3E */ clrlwi r5, r31, 0x18 /* 802387A8 002356E8 4B DF C2 39 */ bl dSv_event_c_NS_setEventReg /* 802387AC 002356EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802387B0 002356F0 48 12 9A 79 */ bl func_80362228 +/* 802387B0 002356F0 48 12 9A 79 */ bl _restgpr_29 /* 802387B4 002356F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802387B8 002356F8 7C 08 03 A6 */ mtlr r0 /* 802387BC 002356FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -6804,7 +6804,7 @@ dMsgObject_addTotalPayment: /* 80238898 002357D8 7C 08 02 A6 */ mflr r0 /* 8023889C 002357DC 90 01 00 24 */ stw r0, 0x24(r1) /* 802388A0 002357E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802388A4 002357E4 48 12 99 39 */ bl func_803621DC +/* 802388A4 002357E4 48 12 99 39 */ bl _savegpr_29 /* 802388A8 002357E8 7C 7D 1B 78 */ mr r29, r3 /* 802388AC 002357EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 802388B0 002357F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -6833,7 +6833,7 @@ lbl_802388D8: /* 80238908 00235848 57 E5 06 3E */ clrlwi r5, r31, 0x18 /* 8023890C 0023584C 4B DF C0 D5 */ bl dSv_event_c_NS_setEventReg /* 80238910 00235850 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238914 00235854 48 12 99 15 */ bl func_80362228 +/* 80238914 00235854 48 12 99 15 */ bl _restgpr_29 /* 80238918 00235858 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023891C 0023585C 7C 08 03 A6 */ mtlr r0 /* 80238920 00235860 38 21 00 20 */ addi r1, r1, 0x20 @@ -6903,7 +6903,7 @@ dMsgObject_addFundRaising: /* 802389FC 0023593C 7C 08 02 A6 */ mflr r0 /* 80238A00 00235940 90 01 00 24 */ stw r0, 0x24(r1) /* 80238A04 00235944 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238A08 00235948 48 12 97 D5 */ bl func_803621DC +/* 80238A08 00235948 48 12 97 D5 */ bl _savegpr_29 /* 80238A0C 0023594C 7C 7D 1B 78 */ mr r29, r3 /* 80238A10 00235950 4B FF FF 19 */ bl dMsgObject_getFundRaising /* 80238A14 00235954 7C 1D 1A 14 */ add r0, r29, r3 @@ -6926,7 +6926,7 @@ lbl_80238A24: /* 80238A54 00235994 57 E5 06 3E */ clrlwi r5, r31, 0x18 /* 80238A58 00235998 4B DF BF 89 */ bl dSv_event_c_NS_setEventReg /* 80238A5C 0023599C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80238A60 002359A0 48 12 97 C9 */ bl func_80362228 +/* 80238A60 002359A0 48 12 97 C9 */ bl _restgpr_29 /* 80238A64 002359A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80238A68 002359A8 7C 08 03 A6 */ mtlr r0 /* 80238A6C 002359AC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/msg/out/d_msg_out_font.s b/asm/d/msg/out/d_msg_out_font.s index b4410b6c4c2..69b7e20390e 100644 --- a/asm/d/msg/out/d_msg_out_font.s +++ b/asm/d/msg/out/d_msg_out_font.s @@ -74,7 +74,7 @@ COutFont_c: /* 80225C98 00222BD8 7C 08 02 A6 */ mflr r0 /* 80225C9C 00222BDC 90 01 00 24 */ stw r0, 0x24(r1) /* 80225CA0 00222BE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80225CA4 00222BE4 48 13 C5 39 */ bl func_803621DC +/* 80225CA4 00222BE4 48 13 C5 39 */ bl _savegpr_29 /* 80225CA8 00222BE8 7C 7D 1B 78 */ mr r29, r3 /* 80225CAC 00222BEC 3C 60 80 3C */ lis r3, lbl_803BFDC4@ha /* 80225CB0 00222BF0 38 03 FD C4 */ addi r0, r3, lbl_803BFDC4@l @@ -119,7 +119,7 @@ lbl_80225D08: /* 80225D40 00222C80 98 1D 02 41 */ stb r0, 0x241(r29) /* 80225D44 00222C84 7F A3 EB 78 */ mr r3, r29 /* 80225D48 00222C88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80225D4C 00222C8C 48 13 C4 DD */ bl func_80362228 +/* 80225D4C 00222C8C 48 13 C4 DD */ bl _restgpr_29 /* 80225D50 00222C90 80 01 00 24 */ lwz r0, 0x24(r1) /* 80225D54 00222C94 7C 08 03 A6 */ mtlr r0 /* 80225D58 00222C98 38 21 00 20 */ addi r1, r1, 0x20 @@ -1144,7 +1144,7 @@ COutFont_c_NS_initialize: /* 80226CFC 00223C3C 7C 08 02 A6 */ mflr r0 /* 80226D00 00223C40 90 01 00 24 */ stw r0, 0x24(r1) /* 80226D04 00223C44 39 61 00 20 */ addi r11, r1, 0x20 -/* 80226D08 00223C48 48 13 B4 D5 */ bl func_803621DC +/* 80226D08 00223C48 48 13 B4 D5 */ bl _savegpr_29 /* 80226D0C 00223C4C 7C 7D 1B 78 */ mr r29, r3 /* 80226D10 00223C50 3B C0 00 00 */ li r30, 0 /* 80226D14 00223C54 3B E0 00 00 */ li r31, 0 @@ -1157,7 +1157,7 @@ lbl_80226D18: /* 80226D2C 00223C6C 3B FF 00 04 */ addi r31, r31, 4 /* 80226D30 00223C70 41 80 FF E8 */ blt lbl_80226D18 /* 80226D34 00223C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80226D38 00223C78 48 13 B4 F1 */ bl func_80362228 +/* 80226D38 00223C78 48 13 B4 F1 */ bl _restgpr_29 /* 80226D3C 00223C7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80226D40 00223C80 7C 08 03 A6 */ mtlr r0 /* 80226D44 00223C84 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index a082d49a40e..8ccaeb205de 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -2747,7 +2747,7 @@ dMsgScrn3Select_c_NS_selectAnimeTransform: /* 8023B874 002387B4 7C 08 02 A6 */ mflr r0 /* 8023B878 002387B8 90 01 00 24 */ stw r0, 0x24(r1) /* 8023B87C 002387BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B880 002387C0 48 12 69 5D */ bl func_803621DC +/* 8023B880 002387C0 48 12 69 5D */ bl _savegpr_29 /* 8023B884 002387C4 7C 7D 1B 78 */ mr r29, r3 /* 8023B888 002387C8 7C 9E 23 78 */ mr r30, r4 /* 8023B88C 002387CC C0 03 00 F0 */ lfs f0, 0xf0(r3) @@ -2779,7 +2779,7 @@ dMsgScrn3Select_c_NS_selectAnimeTransform: /* 8023B8F4 00238834 7C 60 03 78 */ or r0, r3, r0 /* 8023B8F8 00238838 98 1D 01 14 */ stb r0, 0x114(r29) /* 8023B8FC 0023883C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023B900 00238840 48 12 69 29 */ bl func_80362228 +/* 8023B900 00238840 48 12 69 29 */ bl _restgpr_29 /* 8023B904 00238844 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023B908 00238848 7C 08 03 A6 */ mtlr r0 /* 8023B90C 0023884C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/msg/scrn/d_msg_scrn_boss.s b/asm/d/msg/scrn/d_msg_scrn_boss.s index 07bafa38613..b7a4e5532f2 100644 --- a/asm/d/msg/scrn/d_msg_scrn_boss.s +++ b/asm/d/msg/scrn/d_msg_scrn_boss.s @@ -420,7 +420,7 @@ lbl_8023CB84: /* 8023CBFC 00239B3C DB E1 00 20 */ stfd f31, 0x20(r1) /* 8023CC00 00239B40 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8023CC04 00239B44 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023CC08 00239B48 48 12 55 D5 */ bl func_803621DC +/* 8023CC08 00239B48 48 12 55 D5 */ bl _savegpr_29 /* 8023CC0C 00239B4C 7C 7D 1B 78 */ mr r29, r3 /* 8023CC10 00239B50 FF E0 08 90 */ fmr f31, f1 /* 8023CC14 00239B54 80 63 00 08 */ lwz r3, 8(r3) @@ -445,7 +445,7 @@ lbl_8023CC3C: /* 8023CC5C 00239B9C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8023CC60 00239BA0 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8023CC64 00239BA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023CC68 00239BA8 48 12 55 C1 */ bl func_80362228 +/* 8023CC68 00239BA8 48 12 55 C1 */ bl _restgpr_29 /* 8023CC6C 00239BAC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023CC70 00239BB0 7C 08 03 A6 */ mtlr r0 /* 8023CC74 00239BB4 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index b3ff82a51e1..fc1f4be2ab4 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -1060,7 +1060,7 @@ lbl_8023DBCC: /* 8023DBE8 0023AB28 7C 08 02 A6 */ mflr r0 /* 8023DBEC 0023AB2C 90 01 00 24 */ stw r0, 0x24(r1) /* 8023DBF0 0023AB30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023DBF4 0023AB34 48 12 45 E9 */ bl func_803621DC +/* 8023DBF4 0023AB34 48 12 45 E9 */ bl _savegpr_29 /* 8023DBF8 0023AB38 7C 7D 1B 78 */ mr r29, r3 /* 8023DBFC 0023AB3C 3B E0 00 00 */ li r31, 0 /* 8023DC00 0023AB40 B3 E3 00 5A */ sth r31, 0x5a(r3) @@ -1090,7 +1090,7 @@ lbl_8023DC10: /* 8023DC5C 0023AB9C 39 00 00 00 */ li r8, 0 /* 8023DC60 0023ABA0 48 06 DD 25 */ bl Z2SeMgr_NS_seStart /* 8023DC64 0023ABA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023DC68 0023ABA8 48 12 45 C1 */ bl func_80362228 +/* 8023DC68 0023ABA8 48 12 45 C1 */ bl _restgpr_29 /* 8023DC6C 0023ABAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023DC70 0023ABB0 7C 08 03 A6 */ mtlr r0 /* 8023DC74 0023ABB4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1101,7 +1101,7 @@ lbl_8023DC10: /* 8023DC88 0023ABC8 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8023DC8C 0023ABCC F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8023DC90 0023ABD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023DC94 0023ABD4 48 12 45 49 */ bl func_803621DC +/* 8023DC94 0023ABD4 48 12 45 49 */ bl _savegpr_29 /* 8023DC98 0023ABD8 7C 7D 1B 78 */ mr r29, r3 /* 8023DC9C 0023ABDC A8 63 00 5A */ lha r3, 0x5a(r3) /* 8023DCA0 0023ABE0 38 03 00 01 */ addi r0, r3, 1 @@ -1164,7 +1164,7 @@ lbl_8023DD70: /* 8023DD70 0023ACB0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8023DD74 0023ACB4 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8023DD78 0023ACB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023DD7C 0023ACBC 48 12 44 AD */ bl func_80362228 +/* 8023DD7C 0023ACBC 48 12 44 AD */ bl _restgpr_29 /* 8023DD80 0023ACC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023DD84 0023ACC4 7C 08 03 A6 */ mtlr r0 /* 8023DD88 0023ACC8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1627,7 +1627,7 @@ lbl_8023E428: /* 8023E454 0023B394 DB E1 00 20 */ stfd f31, 0x20(r1) /* 8023E458 0023B398 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8023E45C 0023B39C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023E460 0023B3A0 48 12 3D 7D */ bl func_803621DC +/* 8023E460 0023B3A0 48 12 3D 7D */ bl _savegpr_29 /* 8023E464 0023B3A4 7C 7D 1B 78 */ mr r29, r3 /* 8023E468 0023B3A8 80 63 00 38 */ lwz r3, 0x38(r3) /* 8023E46C 0023B3AC 28 03 00 00 */ cmplwi r3, 0 @@ -1689,7 +1689,7 @@ lbl_8023E538: /* 8023E538 0023B478 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8023E53C 0023B47C CB E1 00 20 */ lfd f31, 0x20(r1) /* 8023E540 0023B480 39 61 00 20 */ addi r11, r1, 0x20 -/* 8023E544 0023B484 48 12 3C E5 */ bl func_80362228 +/* 8023E544 0023B484 48 12 3C E5 */ bl _restgpr_29 /* 8023E548 0023B488 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023E54C 0023B48C 7C 08 03 A6 */ mtlr r0 /* 8023E550 0023B490 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index d0ba5e1bf75..258d253227d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -2985,7 +2985,7 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802435D0 00240510 DB C1 00 70 */ stfd f30, 0x70(r1) /* 802435D4 00240514 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 802435D8 00240518 39 61 00 70 */ addi r11, r1, 0x70 -/* 802435DC 0024051C 48 11 EC 01 */ bl func_803621DC +/* 802435DC 0024051C 48 11 EC 01 */ bl _savegpr_29 /* 802435E0 00240520 7C 7F 1B 78 */ mr r31, r3 /* 802435E4 00240524 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 802435E8 00240528 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -3131,7 +3131,7 @@ dMsgScrnHowl_c_NS_drawEffect: /* 80243818 00240758 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 8024381C 0024075C CB C1 00 70 */ lfd f30, 0x70(r1) /* 80243820 00240760 39 61 00 70 */ addi r11, r1, 0x70 -/* 80243824 00240764 48 11 EA 05 */ bl func_80362228 +/* 80243824 00240764 48 11 EA 05 */ bl _restgpr_29 /* 80243828 00240768 80 01 00 94 */ lwz r0, 0x94(r1) /* 8024382C 0024076C 7C 08 03 A6 */ mtlr r0 /* 80243830 00240770 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 3c941548a88..33ab2a8cefe 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -1782,7 +1782,7 @@ lbl_80240144: /* 80240190 0023D0D0 DB A1 00 80 */ stfd f29, 0x80(r1) /* 80240194 0023D0D4 F3 A1 00 88 */ psq_st f29, 136(r1), 0, qr0 /* 80240198 0023D0D8 39 61 00 80 */ addi r11, r1, 0x80 -/* 8024019C 0023D0DC 48 12 20 41 */ bl func_803621DC +/* 8024019C 0023D0DC 48 12 20 41 */ bl _savegpr_29 /* 802401A0 0023D0E0 7C 7F 1B 78 */ mr r31, r3 /* 802401A4 0023D0E4 7C 9D 23 78 */ mr r29, r4 /* 802401A8 0023D0E8 4B FF 7F F5 */ bl dMsgObject_c_NS_getActor @@ -2159,7 +2159,7 @@ lbl_8024071C: /* 8024072C 0023D66C E3 A1 00 88 */ psq_l f29, 136(r1), 0, qr0 /* 80240730 0023D670 CB A1 00 80 */ lfd f29, 0x80(r1) /* 80240734 0023D674 39 61 00 80 */ addi r11, r1, 0x80 -/* 80240738 0023D678 48 12 1A F1 */ bl func_80362228 +/* 80240738 0023D678 48 12 1A F1 */ bl _restgpr_29 /* 8024073C 0023D67C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80240740 0023D680 7C 08 03 A6 */ mtlr r0 /* 80240744 0023D684 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/d/msg/scrn/d_msg_scrn_place.s b/asm/d/msg/scrn/d_msg_scrn_place.s index 4020e21dba4..cabe34cc3b8 100644 --- a/asm/d/msg/scrn/d_msg_scrn_place.s +++ b/asm/d/msg/scrn/d_msg_scrn_place.s @@ -464,7 +464,7 @@ lbl_80246A30: /* 80246AA8 002439E8 DB E1 00 20 */ stfd f31, 0x20(r1) /* 80246AAC 002439EC F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80246AB0 002439F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246AB4 002439F4 48 11 B7 29 */ bl func_803621DC +/* 80246AB4 002439F4 48 11 B7 29 */ bl _savegpr_29 /* 80246AB8 002439F8 7C 7D 1B 78 */ mr r29, r3 /* 80246ABC 002439FC FF E0 08 90 */ fmr f31, f1 /* 80246AC0 00243A00 80 63 00 08 */ lwz r3, 8(r3) @@ -489,7 +489,7 @@ lbl_80246AE8: /* 80246B08 00243A48 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80246B0C 00243A4C CB E1 00 20 */ lfd f31, 0x20(r1) /* 80246B10 00243A50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80246B14 00243A54 48 11 B7 15 */ bl func_80362228 +/* 80246B14 00243A54 48 11 B7 15 */ bl _restgpr_29 /* 80246B18 00243A58 80 01 00 34 */ lwz r0, 0x34(r1) /* 80246B1C 00243A5C 7C 08 03 A6 */ mtlr r0 /* 80246B20 00243A60 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 d950fc62e0c..3a3af83c011 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -1349,7 +1349,7 @@ lbl_8024832C: /* 80248378 002452B8 DB A1 00 80 */ stfd f29, 0x80(r1) /* 8024837C 002452BC F3 A1 00 88 */ psq_st f29, 136(r1), 0, qr0 /* 80248380 002452C0 39 61 00 80 */ addi r11, r1, 0x80 -/* 80248384 002452C4 48 11 9E 59 */ bl func_803621DC +/* 80248384 002452C4 48 11 9E 59 */ bl _savegpr_29 /* 80248388 002452C8 7C 7F 1B 78 */ mr r31, r3 /* 8024838C 002452CC 7C 9D 23 78 */ mr r29, r4 /* 80248390 002452D0 4B FE FE 0D */ bl dMsgObject_c_NS_getActor @@ -1736,7 +1736,7 @@ lbl_80248924: /* 80248934 00245874 E3 A1 00 88 */ psq_l f29, 136(r1), 0, qr0 /* 80248938 00245878 CB A1 00 80 */ lfd f29, 0x80(r1) /* 8024893C 0024587C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80248940 00245880 48 11 98 E9 */ bl func_80362228 +/* 80248940 00245880 48 11 98 E9 */ bl _restgpr_29 /* 80248944 00245884 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80248948 00245888 7C 08 03 A6 */ mtlr r0 /* 8024894C 0024588C 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 0984f570de9..040d7de41d6 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -485,7 +485,7 @@ dMsgStringBase_c_NS_getMessageLocal: /* 80249A74 002469B4 7C 08 02 A6 */ mflr r0 /* 80249A78 002469B8 90 01 00 24 */ stw r0, 0x24(r1) /* 80249A7C 002469BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80249A80 002469C0 48 11 87 5D */ bl func_803621DC +/* 80249A80 002469C0 48 11 87 5D */ bl _savegpr_29 /* 80249A84 002469C4 7C 7D 1B 78 */ mr r29, r3 /* 80249A88 002469C8 7C 9E 23 78 */ mr r30, r4 /* 80249A8C 002469CC 7C BF 2B 78 */ mr r31, r5 @@ -559,7 +559,7 @@ lbl_80249B78: /* 80249B8C 00246ACC 48 11 EF A1 */ bl func_80368B2C /* 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 func_80362228 +/* 80249B98 00246AD8 48 11 86 91 */ bl _restgpr_29 /* 80249B9C 00246ADC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80249BA0 00246AE0 7C 08 03 A6 */ mtlr r0 /* 80249BA4 00246AE4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/pane/class/d_pane_class_alpha.s b/asm/d/pane/class/d_pane_class_alpha.s index 06440c43d63..532f72aae55 100644 --- a/asm/d/pane/class/d_pane_class_alpha.s +++ b/asm/d/pane/class/d_pane_class_alpha.s @@ -16,7 +16,7 @@ CPaneMgrAlpha_X1_: /* 80255400 00252340 7C 08 02 A6 */ mflr r0 /* 80255404 00252344 90 01 00 24 */ stw r0, 0x24(r1) /* 80255408 00252348 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025540C 0025234C 48 10 CD D1 */ bl func_803621DC +/* 8025540C 0025234C 48 10 CD D1 */ bl _savegpr_29 /* 80255410 00252350 7C 7D 1B 78 */ mr r29, r3 /* 80255414 00252354 7C FE 3B 78 */ mr r30, r7 /* 80255418 00252358 7D 1F 43 78 */ mr r31, r8 @@ -35,7 +35,7 @@ CPaneMgrAlpha_X1_: /* 8025544C 0025238C 48 00 00 95 */ bl CPaneMgrAlpha_NS_initiateAlpha /* 80255450 00252390 7F A3 EB 78 */ mr r3, r29 /* 80255454 00252394 39 61 00 20 */ addi r11, r1, 0x20 -/* 80255458 00252398 48 10 CD D1 */ bl func_80362228 +/* 80255458 00252398 48 10 CD D1 */ bl _restgpr_29 /* 8025545C 0025239C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80255460 002523A0 7C 08 03 A6 */ mtlr r0 /* 80255464 002523A4 38 21 00 20 */ addi r1, r1, 0x20 @@ -346,7 +346,7 @@ CPaneMgrAlpha_NS_alphaAnime: /* 8025587C 002527BC 7C 08 02 A6 */ mflr r0 /* 80255880 002527C0 90 01 00 34 */ stw r0, 0x34(r1) /* 80255884 002527C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255888 002527C8 48 10 C9 55 */ bl func_803621DC +/* 80255888 002527C8 48 10 C9 55 */ bl _savegpr_29 /* 8025588C 002527CC 7C 7D 1B 78 */ mr r29, r3 /* 80255890 002527D0 7C BE 2B 78 */ mr r30, r5 /* 80255894 002527D4 7C DF 33 78 */ mr r31, r6 @@ -399,7 +399,7 @@ lbl_80255948: /* 80255948 00252888 38 60 00 00 */ li r3, 0 lbl_8025594C: /* 8025594C 0025288C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255950 00252890 48 10 C8 D9 */ bl func_80362228 +/* 80255950 00252890 48 10 C8 D9 */ bl _restgpr_29 /* 80255954 00252894 80 01 00 34 */ lwz r0, 0x34(r1) /* 80255958 00252898 7C 08 03 A6 */ mtlr r0 /* 8025595C 0025289C 38 21 00 30 */ addi r1, r1, 0x30 @@ -549,7 +549,7 @@ CPaneMgrAlpha_NS_childPaneSetAlpha: /* 80255B60 00252AA0 7C 08 02 A6 */ mflr r0 /* 80255B64 00252AA4 90 01 00 44 */ stw r0, 0x44(r1) /* 80255B68 00252AA8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80255B6C 00252AAC 48 10 C6 71 */ bl func_803621DC +/* 80255B6C 00252AAC 48 10 C6 71 */ bl _savegpr_29 /* 80255B70 00252AB0 7C 7D 1B 78 */ mr r29, r3 /* 80255B74 00252AB4 7C 9E 23 79 */ or. r30, r4, r4 /* 80255B78 00252AB8 7C BF 2B 78 */ mr r31, r5 @@ -611,7 +611,7 @@ lbl_80255C14: /* 80255C4C 00252B8C 4B FF FF 11 */ bl CPaneMgrAlpha_NS_childPaneSetAlpha lbl_80255C50: /* 80255C50 00252B90 39 61 00 40 */ addi r11, r1, 0x40 -/* 80255C54 00252B94 48 10 C5 D5 */ bl func_80362228 +/* 80255C54 00252B94 48 10 C5 D5 */ bl _restgpr_29 /* 80255C58 00252B98 80 01 00 44 */ lwz r0, 0x44(r1) /* 80255C5C 00252B9C 7C 08 03 A6 */ mtlr r0 /* 80255C60 00252BA0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index 3293b0f4808..05cd97e8d79 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -1561,7 +1561,7 @@ CPaneMgr_NS_getBounds: /* 80254FC4 00251F04 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80254FC8 00251F08 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80254FCC 00251F0C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80254FD0 00251F10 48 10 D2 0D */ bl func_803621DC +/* 80254FD0 00251F10 48 10 D2 0D */ bl _savegpr_29 /* 80254FD4 00251F14 7C 7D 1B 78 */ mr r29, r3 /* 80254FD8 00251F18 7C 9E 23 78 */ mr r30, r4 /* 80254FDC 00251F1C 7F C3 F3 78 */ mr r3, r30 @@ -1627,7 +1627,7 @@ lbl_80255064: /* 802550C8 00252008 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802550CC 0025200C CB E1 00 30 */ lfd f31, 0x30(r1) /* 802550D0 00252010 39 61 00 30 */ addi r11, r1, 0x30 -/* 802550D4 00252014 48 10 D1 55 */ bl func_80362228 +/* 802550D4 00252014 48 10 D1 55 */ bl _restgpr_29 /* 802550D8 00252018 80 01 00 44 */ lwz r0, 0x44(r1) /* 802550DC 0025201C 7C 08 03 A6 */ mtlr r0 /* 802550E0 00252020 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index 4ec5922cd0a..c97745008c3 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -142,7 +142,7 @@ dPaPo_c_NS_setEffect: /* 80050E80 0004DDC0 7C 08 02 A6 */ mflr r0 /* 80050E84 0004DDC4 90 01 00 44 */ stw r0, 0x44(r1) /* 80050E88 0004DDC8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80050E8C 0004DDCC 48 31 13 51 */ bl func_803621DC +/* 80050E8C 0004DDCC 48 31 13 51 */ bl _savegpr_29 /* 80050E90 0004DDD0 7C CC 33 78 */ mr r12, r6 /* 80050E94 0004DDD4 7D 1E 43 78 */ mr r30, r8 /* 80050E98 0004DDD8 7D 2B 4B 78 */ mr r11, r9 @@ -242,7 +242,7 @@ lbl_80050FE0: /* 80050FEC 0004DF2C 41 80 FF DC */ blt lbl_80050FC8 lbl_80050FF0: /* 80050FF0 0004DF30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80050FF4 0004DF34 48 31 12 35 */ bl func_80362228 +/* 80050FF4 0004DF34 48 31 12 35 */ bl _restgpr_29 /* 80050FF8 0004DF38 80 01 00 44 */ lwz r0, 0x44(r1) /* 80050FFC 0004DF3C 7C 08 03 A6 */ mtlr r0 /* 80051000 0004DF40 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/s/d_s_logo.s b/asm/d/s/d_s_logo.s index 86af741cc3b..0043853b253 100644 --- a/asm/d/s/d_s_logo.s +++ b/asm/d/s/d_s_logo.s @@ -1909,7 +1909,7 @@ dScnLogo_c_NS_logoInitGC: /* 80257C68 00254BA8 7C 08 02 A6 */ mflr r0 /* 80257C6C 00254BAC 90 01 00 34 */ stw r0, 0x34(r1) /* 80257C70 00254BB0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80257C74 00254BB4 48 10 A5 69 */ bl func_803621DC +/* 80257C74 00254BB4 48 10 A5 69 */ bl _savegpr_29 /* 80257C78 00254BB8 7C 7F 1B 78 */ mr r31, r3 /* 80257C7C 00254BBC 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80257C80 00254BC0 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l @@ -2134,7 +2134,7 @@ lbl_80257F2C: lbl_80257FD0: /* 80257FD0 00254F10 90 1F 01 F8 */ stw r0, 0x1f8(r31) /* 80257FD4 00254F14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80257FD8 00254F18 48 10 A2 51 */ bl func_80362228 +/* 80257FD8 00254F18 48 10 A2 51 */ bl _restgpr_29 /* 80257FDC 00254F1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80257FE0 00254F20 7C 08 03 A6 */ mtlr r0 /* 80257FE4 00254F24 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 6fbd080d92c..4c34a890848 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -674,7 +674,7 @@ lbl_80259D64: /* 80259D88 00256CC8 7C 08 02 A6 */ mflr r0 /* 80259D8C 00256CCC 90 01 00 24 */ stw r0, 0x24(r1) /* 80259D90 00256CD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80259D94 00256CD4 48 10 84 49 */ bl func_803621DC +/* 80259D94 00256CD4 48 10 84 49 */ bl _savegpr_29 /* 80259D98 00256CD8 28 03 00 00 */ cmplwi r3, 0 /* 80259D9C 00256CDC 41 82 00 0C */ beq lbl_80259DA8 /* 80259DA0 00256CE0 80 03 00 04 */ lwz r0, 4(r3) @@ -1121,7 +1121,7 @@ lbl_8025A394: lbl_8025A41C: /* 8025A41C 0025735C 38 60 00 02 */ li r3, 2 /* 8025A420 00257360 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025A424 00257364 48 10 7E 05 */ bl func_80362228 +/* 8025A424 00257364 48 10 7E 05 */ bl _restgpr_29 /* 8025A428 00257368 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025A42C 0025736C 7C 08 03 A6 */ mtlr r0 /* 8025A430 00257370 38 21 00 20 */ addi r1, r1, 0x20 @@ -1180,7 +1180,7 @@ lbl_8025A4E4: /* 8025A4FC 0025743C 7C 08 02 A6 */ mflr r0 /* 8025A500 00257440 90 01 00 24 */ stw r0, 0x24(r1) /* 8025A504 00257444 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025A508 00257448 48 10 7C D5 */ bl func_803621DC +/* 8025A508 00257448 48 10 7C D5 */ bl _savegpr_29 /* 8025A50C 0025744C 7C 7D 1B 78 */ mr r29, r3 /* 8025A510 00257450 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8025A514 00257454 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -1229,7 +1229,7 @@ lbl_8025A59C: /* 8025A5B8 002574F8 38 60 00 02 */ li r3, 2 lbl_8025A5BC: /* 8025A5BC 002574FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025A5C0 00257500 48 10 7C 69 */ bl func_80362228 +/* 8025A5C0 00257500 48 10 7C 69 */ bl _restgpr_29 /* 8025A5C4 00257504 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025A5C8 00257508 7C 08 03 A6 */ mtlr r0 /* 8025A5CC 0025750C 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 54861f0f209..896b6fe60c0 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -288,7 +288,7 @@ loadDemoArchive: /* 8025B1D4 00258114 7C 08 02 A6 */ mflr r0 /* 8025B1D8 00258118 90 01 00 24 */ stw r0, 0x24(r1) /* 8025B1DC 0025811C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B1E0 00258120 48 10 6F FD */ bl func_803621DC +/* 8025B1E0 00258120 48 10 6F FD */ bl _savegpr_29 /* 8025B1E4 00258124 7C 7D 1B 78 */ mr r29, r3 /* 8025B1E8 00258128 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 8025B1EC 0025812C 88 03 61 94 */ lbz r0, lbl_80406194@l(r3) @@ -353,7 +353,7 @@ lbl_8025B2D0: /* 8025B2D0 00258210 38 60 00 00 */ li r3, 0 lbl_8025B2D4: /* 8025B2D4 00258214 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B2D8 00258218 48 10 6F 51 */ bl func_80362228 +/* 8025B2D8 00258218 48 10 6F 51 */ bl _restgpr_29 /* 8025B2DC 0025821C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025B2E0 00258220 7C 08 03 A6 */ mtlr r0 /* 8025B2E4 00258224 38 21 00 20 */ addi r1, r1, 0x20 @@ -365,7 +365,7 @@ objectSetCheck: /* 8025B2F0 00258230 7C 08 02 A6 */ mflr r0 /* 8025B2F4 00258234 90 01 00 24 */ stw r0, 0x24(r1) /* 8025B2F8 00258238 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B2FC 0025823C 48 10 6E E1 */ bl func_803621DC +/* 8025B2FC 0025823C 48 10 6E E1 */ bl _savegpr_29 /* 8025B300 00258240 7C 7D 1B 78 */ mr r29, r3 /* 8025B304 00258244 83 C3 00 B0 */ lwz r30, 0xb0(r3) /* 8025B308 00258248 3C 60 80 3F */ lis r3, lbl_803F6094@ha @@ -532,7 +532,7 @@ lbl_8025B548: /* 8025B548 00258488 38 60 00 01 */ li r3, 1 lbl_8025B54C: /* 8025B54C 0025848C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B550 00258490 48 10 6C D9 */ bl func_80362228 +/* 8025B550 00258490 48 10 6C D9 */ bl _restgpr_29 /* 8025B554 00258494 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025B558 00258498 7C 08 03 A6 */ mtlr r0 /* 8025B55C 0025849C 38 21 00 20 */ addi r1, r1, 0x20 @@ -768,7 +768,7 @@ lbl_8025B888: /* 8025B8A8 002587E8 7C 08 02 A6 */ mflr r0 /* 8025B8AC 002587EC 90 01 00 24 */ stw r0, 0x24(r1) /* 8025B8B0 002587F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B8B4 002587F4 48 10 69 29 */ bl func_803621DC +/* 8025B8B4 002587F4 48 10 69 29 */ bl _savegpr_29 /* 8025B8B8 002587F8 38 00 00 01 */ li r0, 1 /* 8025B8BC 002587FC 98 03 01 D8 */ stb r0, 0x1d8(r3) /* 8025B8C0 00258800 83 A3 00 B0 */ lwz r29, 0xb0(r3) @@ -818,7 +818,7 @@ lbl_8025B964: /* 8025B964 002588A4 38 60 00 02 */ li r3, 2 lbl_8025B968: /* 8025B968 002588A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025B96C 002588AC 48 10 68 BD */ bl func_80362228 +/* 8025B96C 002588AC 48 10 68 BD */ bl _restgpr_29 /* 8025B970 002588B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025B974 002588B4 7C 08 03 A6 */ mtlr r0 /* 8025B978 002588B8 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 bd26202e940..e78eae3a198 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -26,7 +26,7 @@ dSvBit_childSwPerfectionHIO_c_NS_init: /* 8025BBB0 00258AF0 7C 08 02 A6 */ mflr r0 /* 8025BBB4 00258AF4 90 01 00 24 */ stw r0, 0x24(r1) /* 8025BBB8 00258AF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BBBC 00258AFC 48 10 66 21 */ bl func_803621DC +/* 8025BBBC 00258AFC 48 10 66 21 */ bl _savegpr_29 /* 8025BBC0 00258B00 7C 7D 1B 78 */ mr r29, r3 /* 8025BBC4 00258B04 3B C0 00 00 */ li r30, 0 /* 8025BBC8 00258B08 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -44,7 +44,7 @@ lbl_8025BBD4: /* 8025BBF4 00258B34 2C 1E 00 80 */ cmpwi r30, 0x80 /* 8025BBF8 00258B38 41 80 FF DC */ blt lbl_8025BBD4 /* 8025BBFC 00258B3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC00 00258B40 48 10 66 29 */ bl func_80362228 +/* 8025BC00 00258B40 48 10 66 29 */ bl _restgpr_29 /* 8025BC04 00258B44 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025BC08 00258B48 7C 08 03 A6 */ mtlr r0 /* 8025BC0C 00258B4C 38 21 00 20 */ addi r1, r1, 0x20 @@ -73,7 +73,7 @@ dSvBit_childSwDungeonHIO_c_NS_init: /* 8025BC4C 00258B8C 7C 08 02 A6 */ mflr r0 /* 8025BC50 00258B90 90 01 00 24 */ stw r0, 0x24(r1) /* 8025BC54 00258B94 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC58 00258B98 48 10 65 85 */ bl func_803621DC +/* 8025BC58 00258B98 48 10 65 85 */ bl _savegpr_29 /* 8025BC5C 00258B9C 7C 7D 1B 78 */ mr r29, r3 /* 8025BC60 00258BA0 3B C0 00 00 */ li r30, 0 /* 8025BC64 00258BA4 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -91,7 +91,7 @@ lbl_8025BC70: /* 8025BC90 00258BD0 2C 1E 00 40 */ cmpwi r30, 0x40 /* 8025BC94 00258BD4 41 80 FF DC */ blt lbl_8025BC70 /* 8025BC98 00258BD8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BC9C 00258BDC 48 10 65 8D */ bl func_80362228 +/* 8025BC9C 00258BDC 48 10 65 8D */ bl _restgpr_29 /* 8025BCA0 00258BE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025BCA4 00258BE4 7C 08 03 A6 */ mtlr r0 /* 8025BCA8 00258BE8 38 21 00 20 */ addi r1, r1, 0x20 @@ -184,7 +184,7 @@ dSvBit_childItPerfectionHIO_c_NS_init: /* 8025BDA8 00258CE8 7C 08 02 A6 */ mflr r0 /* 8025BDAC 00258CEC 90 01 00 24 */ stw r0, 0x24(r1) /* 8025BDB0 00258CF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BDB4 00258CF4 48 10 64 29 */ bl func_803621DC +/* 8025BDB4 00258CF4 48 10 64 29 */ bl _savegpr_29 /* 8025BDB8 00258CF8 7C 7D 1B 78 */ mr r29, r3 /* 8025BDBC 00258CFC 3B C0 00 00 */ li r30, 0 /* 8025BDC0 00258D00 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -202,7 +202,7 @@ lbl_8025BDCC: /* 8025BDEC 00258D2C 2C 1E 00 20 */ cmpwi r30, 0x20 /* 8025BDF0 00258D30 41 80 FF DC */ blt lbl_8025BDCC /* 8025BDF4 00258D34 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BDF8 00258D38 48 10 64 31 */ bl func_80362228 +/* 8025BDF8 00258D38 48 10 64 31 */ bl _restgpr_29 /* 8025BDFC 00258D3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025BE00 00258D40 7C 08 03 A6 */ mtlr r0 /* 8025BE04 00258D44 38 21 00 20 */ addi r1, r1, 0x20 @@ -231,7 +231,7 @@ dSvBit_childItDungeonHIO_c_NS_init: /* 8025BE44 00258D84 7C 08 02 A6 */ mflr r0 /* 8025BE48 00258D88 90 01 00 24 */ stw r0, 0x24(r1) /* 8025BE4C 00258D8C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BE50 00258D90 48 10 63 8D */ bl func_803621DC +/* 8025BE50 00258D90 48 10 63 8D */ bl _savegpr_29 /* 8025BE54 00258D94 7C 7D 1B 78 */ mr r29, r3 /* 8025BE58 00258D98 3B C0 00 00 */ li r30, 0 /* 8025BE5C 00258D9C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -249,7 +249,7 @@ lbl_8025BE68: /* 8025BE88 00258DC8 2C 1E 00 80 */ cmpwi r30, 0x80 /* 8025BE8C 00258DCC 41 80 FF DC */ blt lbl_8025BE68 /* 8025BE90 00258DD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BE94 00258DD4 48 10 63 95 */ bl func_80362228 +/* 8025BE94 00258DD4 48 10 63 95 */ bl _restgpr_29 /* 8025BE98 00258DD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025BE9C 00258DDC 7C 08 03 A6 */ mtlr r0 /* 8025BEA0 00258DE0 38 21 00 20 */ addi r1, r1, 0x20 @@ -342,7 +342,7 @@ dSvBit_childTbPerfectionHIO_c_NS_init: /* 8025BFA0 00258EE0 7C 08 02 A6 */ mflr r0 /* 8025BFA4 00258EE4 90 01 00 24 */ stw r0, 0x24(r1) /* 8025BFA8 00258EE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BFAC 00258EEC 48 10 62 31 */ bl func_803621DC +/* 8025BFAC 00258EEC 48 10 62 31 */ bl _savegpr_29 /* 8025BFB0 00258EF0 7C 7D 1B 78 */ mr r29, r3 /* 8025BFB4 00258EF4 3B C0 00 00 */ li r30, 0 /* 8025BFB8 00258EF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -360,7 +360,7 @@ lbl_8025BFC4: /* 8025BFE4 00258F24 2C 1E 00 40 */ cmpwi r30, 0x40 /* 8025BFE8 00258F28 41 80 FF DC */ blt lbl_8025BFC4 /* 8025BFEC 00258F2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025BFF0 00258F30 48 10 62 39 */ bl func_80362228 +/* 8025BFF0 00258F30 48 10 62 39 */ bl _restgpr_29 /* 8025BFF4 00258F34 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025BFF8 00258F38 7C 08 03 A6 */ mtlr r0 /* 8025BFFC 00258F3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -389,7 +389,7 @@ dSvBit_childDarknessHIO_c_NS_init: /* 8025C03C 00258F7C 7C 08 02 A6 */ mflr r0 /* 8025C040 00258F80 90 01 00 24 */ stw r0, 0x24(r1) /* 8025C044 00258F84 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C048 00258F88 48 10 61 95 */ bl func_803621DC +/* 8025C048 00258F88 48 10 61 95 */ bl _savegpr_29 /* 8025C04C 00258F8C 7C 7D 1B 78 */ mr r29, r3 /* 8025C050 00258F90 3B C0 00 00 */ li r30, 0 /* 8025C054 00258F94 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -407,7 +407,7 @@ lbl_8025C060: /* 8025C080 00258FC0 2C 1E 00 06 */ cmpwi r30, 6 /* 8025C084 00258FC4 41 80 FF DC */ blt lbl_8025C060 /* 8025C088 00258FC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C08C 00258FCC 48 10 61 9D */ bl func_80362228 +/* 8025C08C 00258FCC 48 10 61 9D */ bl _restgpr_29 /* 8025C090 00258FD0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025C094 00258FD4 7C 08 03 A6 */ mtlr r0 /* 8025C098 00258FD8 38 21 00 20 */ addi r1, r1, 0x20 @@ -436,7 +436,7 @@ dSvBit_childTransformHIO_c_NS_init: /* 8025C0D8 00259018 7C 08 02 A6 */ mflr r0 /* 8025C0DC 0025901C 90 01 00 24 */ stw r0, 0x24(r1) /* 8025C0E0 00259020 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C0E4 00259024 48 10 60 F9 */ bl func_803621DC +/* 8025C0E4 00259024 48 10 60 F9 */ bl _savegpr_29 /* 8025C0E8 00259028 7C 7D 1B 78 */ mr r29, r3 /* 8025C0EC 0025902C 3B C0 00 00 */ li r30, 0 /* 8025C0F0 00259030 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -454,7 +454,7 @@ lbl_8025C0FC: /* 8025C11C 0025905C 2C 1E 00 04 */ cmpwi r30, 4 /* 8025C120 00259060 41 80 FF DC */ blt lbl_8025C0FC /* 8025C124 00259064 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C128 00259068 48 10 61 01 */ bl func_80362228 +/* 8025C128 00259068 48 10 61 01 */ bl _restgpr_29 /* 8025C12C 0025906C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025C130 00259070 7C 08 03 A6 */ mtlr r0 /* 8025C134 00259074 38 21 00 20 */ addi r1, r1, 0x20 @@ -485,7 +485,7 @@ dSvBit_childOtherHIO_c_NS_init: /* 8025C17C 002590BC 7C 08 02 A6 */ mflr r0 /* 8025C180 002590C0 90 01 00 24 */ stw r0, 0x24(r1) /* 8025C184 002590C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C188 002590C8 48 10 60 55 */ bl func_803621DC +/* 8025C188 002590C8 48 10 60 55 */ bl _savegpr_29 /* 8025C18C 002590CC 7C 7D 1B 78 */ mr r29, r3 /* 8025C190 002590D0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8025C194 002590D4 38 83 61 C0 */ addi r4, r3, lbl_804061C0@l @@ -509,7 +509,7 @@ lbl_8025C1B8: /* 8025C1D8 00259118 2C 1E 00 04 */ cmpwi r30, 4 /* 8025C1DC 0025911C 41 80 FF DC */ blt lbl_8025C1B8 /* 8025C1E0 00259120 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025C1E4 00259124 48 10 60 45 */ bl func_80362228 +/* 8025C1E4 00259124 48 10 60 45 */ bl _restgpr_29 /* 8025C1E8 00259128 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025C1EC 0025912C 7C 08 03 A6 */ mtlr r0 /* 8025C1F0 00259130 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index dda464a8e83..1ac88dc4bb6 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -771,7 +771,7 @@ dSelect_cursor_c_NS_update: /* 80194CCC 00191C0C DB E1 00 40 */ stfd f31, 0x40(r1) /* 80194CD0 00191C10 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80194CD4 00191C14 39 61 00 40 */ addi r11, r1, 0x40 -/* 80194CD8 00191C18 48 1C D5 05 */ bl func_803621DC +/* 80194CD8 00191C18 48 1C D5 05 */ bl _savegpr_29 /* 80194CDC 00191C1C 7C 7F 1B 78 */ mr r31, r3 /* 80194CE0 00191C20 C3 E2 A0 48 */ lfs f31, lbl_80453A48-_SDA2_BASE_(r2) /* 80194CE4 00191C24 88 03 00 B6 */ lbz r0, 0xb6(r3) @@ -1053,7 +1053,7 @@ lbl_801950C4: /* 801950D4 00192014 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 801950D8 00192018 CB E1 00 40 */ lfd f31, 0x40(r1) /* 801950DC 0019201C 39 61 00 40 */ addi r11, r1, 0x40 -/* 801950E0 00192020 48 1C D1 49 */ bl func_80362228 +/* 801950E0 00192020 48 1C D1 49 */ bl _restgpr_29 /* 801950E4 00192024 80 01 00 54 */ lwz r0, 0x54(r1) /* 801950E8 00192028 7C 08 03 A6 */ mtlr r0 /* 801950EC 0019202C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index 733af7a77b9..daf50505e0c 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -541,7 +541,7 @@ dShopSystem_c_NS_chooseItem3: /* 8019780C 0019474C 7C 08 02 A6 */ mflr r0 /* 80197810 00194750 90 01 00 44 */ stw r0, 0x44(r1) /* 80197814 00194754 39 61 00 40 */ addi r11, r1, 0x40 -/* 80197818 00194758 48 1C A9 C5 */ bl func_803621DC +/* 80197818 00194758 48 1C A9 C5 */ bl _savegpr_29 /* 8019781C 0019475C 7C 7D 1B 78 */ mr r29, r3 /* 80197820 00194760 7C 9E 23 78 */ mr r30, r4 /* 80197824 00194764 8B E3 0F 6F */ lbz r31, 0xf6f(r3) @@ -927,7 +927,7 @@ lbl_80197DB4: /* 80197DB4 00194CF4 38 60 00 00 */ li r3, 0 lbl_80197DB8: /* 80197DB8 00194CF8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80197DBC 00194CFC 48 1C A4 6D */ bl func_80362228 +/* 80197DBC 00194CFC 48 1C A4 6D */ bl _restgpr_29 /* 80197DC0 00194D00 80 01 00 44 */ lwz r0, 0x44(r1) /* 80197DC4 00194D04 7C 08 03 A6 */ mtlr r0 /* 80197DC8 00194D08 38 21 00 40 */ addi r1, r1, 0x40 @@ -939,7 +939,7 @@ dShopSystem_c_NS_chooseItem5: /* 80197DD4 00194D14 7C 08 02 A6 */ mflr r0 /* 80197DD8 00194D18 90 01 00 34 */ stw r0, 0x34(r1) /* 80197DDC 00194D1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80197DE0 00194D20 48 1C A3 FD */ bl func_803621DC +/* 80197DE0 00194D20 48 1C A3 FD */ bl _savegpr_29 /* 80197DE4 00194D24 7C 7D 1B 78 */ mr r29, r3 /* 80197DE8 00194D28 7C 9E 23 78 */ mr r30, r4 /* 80197DEC 00194D2C 8B E3 0F 6F */ lbz r31, 0xf6f(r3) @@ -1242,7 +1242,7 @@ lbl_80198234: /* 80198234 00195174 38 60 00 00 */ li r3, 0 lbl_80198238: /* 80198238 00195178 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019823C 0019517C 48 1C 9F ED */ bl func_80362228 +/* 8019823C 0019517C 48 1C 9F ED */ bl _restgpr_29 /* 80198240 00195180 80 01 00 34 */ lwz r0, 0x34(r1) /* 80198244 00195184 7C 08 03 A6 */ mtlr r0 /* 80198248 00195188 38 21 00 30 */ addi r1, r1, 0x30 @@ -1254,7 +1254,7 @@ dShopSystem_c_NS_chooseItem4: /* 80198254 00195194 7C 08 02 A6 */ mflr r0 /* 80198258 00195198 90 01 00 24 */ stw r0, 0x24(r1) /* 8019825C 0019519C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198260 001951A0 48 1C 9F 7D */ bl func_803621DC +/* 80198260 001951A0 48 1C 9F 7D */ bl _savegpr_29 /* 80198264 001951A4 7C 7F 1B 78 */ mr r31, r3 /* 80198268 001951A8 7C 9D 23 78 */ mr r29, r4 /* 8019826C 001951AC 8B C3 0F 6F */ lbz r30, 0xf6f(r3) @@ -1378,7 +1378,7 @@ lbl_80198428: /* 80198428 00195368 38 60 00 00 */ li r3, 0 lbl_8019842C: /* 8019842C 0019536C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198430 00195370 48 1C 9D F9 */ bl func_80362228 +/* 80198430 00195370 48 1C 9D F9 */ bl _restgpr_29 /* 80198434 00195374 80 01 00 24 */ lwz r0, 0x24(r1) /* 80198438 00195378 7C 08 03 A6 */ mtlr r0 /* 8019843C 0019537C 38 21 00 20 */ addi r1, r1, 0x20 @@ -1412,7 +1412,7 @@ dShopSystem_c_NS_moveCursor0: /* 8019848C 001953CC 7C 08 02 A6 */ mflr r0 /* 80198490 001953D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80198494 001953D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198498 001953D8 48 1C 9D 45 */ bl func_803621DC +/* 80198498 001953D8 48 1C 9D 45 */ bl _savegpr_29 /* 8019849C 001953DC 7C 7D 1B 78 */ mr r29, r3 /* 801984A0 001953E0 7C 9E 23 78 */ mr r30, r4 /* 801984A4 001953E4 7C BF 2B 78 */ mr r31, r5 @@ -1578,7 +1578,7 @@ lbl_801986EC: /* 801986EC 0019562C 38 60 00 00 */ li r3, 0 lbl_801986F0: /* 801986F0 00195630 39 61 00 20 */ addi r11, r1, 0x20 -/* 801986F4 00195634 48 1C 9B 35 */ bl func_80362228 +/* 801986F4 00195634 48 1C 9B 35 */ bl _restgpr_29 /* 801986F8 00195638 80 01 00 24 */ lwz r0, 0x24(r1) /* 801986FC 0019563C 7C 08 03 A6 */ mtlr r0 /* 80198700 00195640 38 21 00 20 */ addi r1, r1, 0x20 @@ -1590,7 +1590,7 @@ dShopSystem_c_NS_moveCursor1: /* 8019870C 0019564C 7C 08 02 A6 */ mflr r0 /* 80198710 00195650 90 01 00 24 */ stw r0, 0x24(r1) /* 80198714 00195654 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198718 00195658 48 1C 9A C5 */ bl func_803621DC +/* 80198718 00195658 48 1C 9A C5 */ bl _savegpr_29 /* 8019871C 0019565C 7C 7F 1B 78 */ mr r31, r3 /* 80198720 00195660 7C 9D 23 78 */ mr r29, r4 /* 80198724 00195664 7C BE 2B 78 */ mr r30, r5 @@ -1683,7 +1683,7 @@ lbl_8019885C: /* 8019885C 0019579C 38 60 00 00 */ li r3, 0 lbl_80198860: /* 80198860 001957A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80198864 001957A4 48 1C 99 C5 */ bl func_80362228 +/* 80198864 001957A4 48 1C 99 C5 */ bl _restgpr_29 /* 80198868 001957A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019886C 001957AC 7C 08 03 A6 */ mtlr r0 /* 80198870 001957B0 38 21 00 20 */ addi r1, r1, 0x20 @@ -3177,7 +3177,7 @@ lbl_80199E0C: /* 80199E2C 00196D6C 7C 08 02 A6 */ mflr r0 /* 80199E30 00196D70 90 01 00 24 */ stw r0, 0x24(r1) /* 80199E34 00196D74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199E38 00196D78 48 1C 83 A5 */ bl func_803621DC +/* 80199E38 00196D78 48 1C 83 A5 */ bl _savegpr_29 /* 80199E3C 00196D7C 7C 7D 1B 78 */ mr r29, r3 /* 80199E40 00196D80 7C 9E 23 78 */ mr r30, r4 /* 80199E44 00196D84 7C BF 2B 78 */ mr r31, r5 @@ -3271,7 +3271,7 @@ lbl_80199F88: /* 80199F88 00196EC8 38 60 00 00 */ li r3, 0 lbl_80199F8C: /* 80199F8C 00196ECC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199F90 00196ED0 48 1C 82 99 */ bl func_80362228 +/* 80199F90 00196ED0 48 1C 82 99 */ bl _restgpr_29 /* 80199F94 00196ED4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80199F98 00196ED8 7C 08 03 A6 */ mtlr r0 /* 80199F9C 00196EDC 38 21 00 20 */ addi r1, r1, 0x20 @@ -3280,7 +3280,7 @@ lbl_80199F8C: /* 80199FA8 00196EE8 7C 08 02 A6 */ mflr r0 /* 80199FAC 00196EEC 90 01 00 24 */ stw r0, 0x24(r1) /* 80199FB0 00196EF0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80199FB4 00196EF4 48 1C 82 29 */ bl func_803621DC +/* 80199FB4 00196EF4 48 1C 82 29 */ bl _savegpr_29 /* 80199FB8 00196EF8 7C 7D 1B 78 */ mr r29, r3 /* 80199FBC 00196EFC 7C 9E 23 78 */ mr r30, r4 /* 80199FC0 00196F00 7C BF 2B 78 */ mr r31, r5 @@ -3303,7 +3303,7 @@ lbl_80199F8C: lbl_8019A004: /* 8019A004 00196F44 38 60 00 00 */ li r3, 0 /* 8019A008 00196F48 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A00C 00196F4C 48 1C 82 1D */ bl func_80362228 +/* 8019A00C 00196F4C 48 1C 82 1D */ bl _restgpr_29 /* 8019A010 00196F50 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019A014 00196F54 7C 08 03 A6 */ mtlr r0 /* 8019A018 00196F58 38 21 00 20 */ addi r1, r1, 0x20 @@ -3312,7 +3312,7 @@ lbl_8019A004: /* 8019A024 00196F64 7C 08 02 A6 */ mflr r0 /* 8019A028 00196F68 90 01 00 24 */ stw r0, 0x24(r1) /* 8019A02C 00196F6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A030 00196F70 48 1C 81 AD */ bl func_803621DC +/* 8019A030 00196F70 48 1C 81 AD */ bl _savegpr_29 /* 8019A034 00196F74 7C 7D 1B 78 */ mr r29, r3 /* 8019A038 00196F78 7C 9E 23 78 */ mr r30, r4 /* 8019A03C 00196F7C 7C BF 2B 78 */ mr r31, r5 @@ -3346,7 +3346,7 @@ lbl_8019A0A4: /* 8019A0A4 00196FE4 38 60 00 00 */ li r3, 0 lbl_8019A0A8: /* 8019A0A8 00196FE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A0AC 00196FEC 48 1C 81 7D */ bl func_80362228 +/* 8019A0AC 00196FEC 48 1C 81 7D */ bl _restgpr_29 /* 8019A0B0 00196FF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019A0B4 00196FF4 7C 08 03 A6 */ mtlr r0 /* 8019A0B8 00196FF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -3545,7 +3545,7 @@ dShopSystem_c_NS_setSoldOut: /* 8019A368 001972A8 7C 08 02 A6 */ mflr r0 /* 8019A36C 001972AC 90 01 00 24 */ stw r0, 0x24(r1) /* 8019A370 001972B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A374 001972B4 48 1C 7E 69 */ bl func_803621DC +/* 8019A374 001972B4 48 1C 7E 69 */ bl _savegpr_29 /* 8019A378 001972B8 7C 7E 1B 78 */ mr r30, r3 /* 8019A37C 001972BC 88 63 0F 73 */ lbz r3, 0xf73(r3) /* 8019A380 001972C0 28 03 00 FF */ cmplwi r3, 0xff @@ -3643,7 +3643,7 @@ lbl_8019A4C4: /* 8019A4D8 00197418 4B FF D0 E9 */ bl dShopSystem_c_NS_onFlag lbl_8019A4DC: /* 8019A4DC 0019741C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8019A4E0 00197420 48 1C 7D 49 */ bl func_80362228 +/* 8019A4E0 00197420 48 1C 7D 49 */ bl _restgpr_29 /* 8019A4E4 00197424 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019A4E8 00197428 7C 08 03 A6 */ mtlr r0 /* 8019A4EC 0019742C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index b7908d74d01..18e34956045 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -36,7 +36,7 @@ dSmplMdl_draw_c: /* 80048CB8 00045BF8 7C 08 02 A6 */ mflr r0 /* 80048CBC 00045BFC 90 01 00 24 */ stw r0, 0x24(r1) /* 80048CC0 00045C00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048CC4 00045C04 48 31 95 19 */ bl func_803621DC +/* 80048CC4 00045C04 48 31 95 19 */ bl _savegpr_29 /* 80048CC8 00045C08 7C 7D 1B 78 */ mr r29, r3 /* 80048CCC 00045C0C 3C 60 80 3B */ lis r3, lbl_803A82F8@ha /* 80048CD0 00045C10 38 03 82 F8 */ addi r0, r3, lbl_803A82F8@l @@ -74,7 +74,7 @@ lbl_80048D28: /* 80048D40 00045C80 90 1D 00 A4 */ stw r0, 0xa4(r29) /* 80048D44 00045C84 7F A3 EB 78 */ mr r3, r29 /* 80048D48 00045C88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048D4C 00045C8C 48 31 94 DD */ bl func_80362228 +/* 80048D4C 00045C8C 48 31 94 DD */ bl _restgpr_29 /* 80048D50 00045C90 80 01 00 24 */ lwz r0, 0x24(r1) /* 80048D54 00045C94 7C 08 03 A6 */ mtlr r0 /* 80048D58 00045C98 38 21 00 20 */ addi r1, r1, 0x20 @@ -134,7 +134,7 @@ dSmplMdl_draw_c_NS_draw: /* 80048E10 00045D50 7C 08 02 A6 */ mflr r0 /* 80048E14 00045D54 90 01 00 24 */ stw r0, 0x24(r1) /* 80048E18 00045D58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048E1C 00045D5C 48 31 93 C1 */ bl func_803621DC +/* 80048E1C 00045D5C 48 31 93 C1 */ bl _savegpr_29 /* 80048E20 00045D60 7C 7D 1B 78 */ mr r29, r3 /* 80048E24 00045D64 3B C0 00 00 */ li r30, 0 /* 80048E28 00045D68 3B E0 00 00 */ li r31, 0 @@ -173,7 +173,7 @@ lbl_80048E84: /* 80048E9C 00045DDC 3B FF 00 14 */ addi r31, r31, 0x14 /* 80048EA0 00045DE0 41 80 FF E4 */ blt lbl_80048E84 /* 80048EA4 00045DE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048EA8 00045DE8 48 31 93 81 */ bl func_80362228 +/* 80048EA8 00045DE8 48 31 93 81 */ bl _restgpr_29 /* 80048EAC 00045DEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80048EB0 00045DF0 7C 08 03 A6 */ mtlr r0 /* 80048EB4 00045DF4 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 9baddea9516..1eed6a2a8c1 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -351,7 +351,7 @@ fopAcM_create: /* 80019D1C 00016C5C 7C 08 02 A6 */ mflr r0 /* 80019D20 00016C60 90 01 00 24 */ stw r0, 0x24(r1) /* 80019D24 00016C64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019D28 00016C68 48 34 84 B5 */ bl func_803621DC +/* 80019D28 00016C68 48 34 84 B5 */ bl _savegpr_29 /* 80019D2C 00016C6C 7C 7D 1B 78 */ mr r29, r3 /* 80019D30 00016C70 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80019D34 00016C74 7C 83 23 78 */ mr r3, r4 @@ -376,7 +376,7 @@ lbl_80019D68: /* 80019D7C 00016CBC 48 00 A0 19 */ bl fpcSCtRq_Request lbl_80019D80: /* 80019D80 00016CC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019D84 00016CC4 48 34 84 A5 */ bl func_80362228 +/* 80019D84 00016CC4 48 34 84 A5 */ bl _restgpr_29 /* 80019D88 00016CC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80019D8C 00016CCC 7C 08 03 A6 */ mtlr r0 /* 80019D90 00016CD0 38 21 00 20 */ addi r1, r1, 0x20 @@ -388,7 +388,7 @@ fopAcM_create_X1_: /* 80019D9C 00016CDC 7C 08 02 A6 */ mflr r0 /* 80019DA0 00016CE0 90 01 00 24 */ stw r0, 0x24(r1) /* 80019DA4 00016CE4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019DA8 00016CE8 48 34 84 35 */ bl func_803621DC +/* 80019DA8 00016CE8 48 34 84 35 */ bl _savegpr_29 /* 80019DAC 00016CEC 7C 9D 23 78 */ mr r29, r4 /* 80019DB0 00016CF0 7C BE 2B 78 */ mr r30, r5 /* 80019DB4 00016CF4 7C DF 33 78 */ mr r31, r6 @@ -406,7 +406,7 @@ fopAcM_create_X1_: /* 80019DE4 00016D24 7D 69 5B 78 */ mr r9, r11 /* 80019DE8 00016D28 4B FF FF 31 */ bl fopAcM_create /* 80019DEC 00016D2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019DF0 00016D30 48 34 84 39 */ bl func_80362228 +/* 80019DF0 00016D30 48 34 84 39 */ bl _restgpr_29 /* 80019DF4 00016D34 80 01 00 24 */ lwz r0, 0x24(r1) /* 80019DF8 00016D38 7C 08 03 A6 */ mtlr r0 /* 80019DFC 00016D3C 38 21 00 20 */ addi r1, r1, 0x20 @@ -418,7 +418,7 @@ fopAcM_fastCreate: /* 80019E08 00016D48 7C 08 02 A6 */ mflr r0 /* 80019E0C 00016D4C 90 01 00 24 */ stw r0, 0x24(r1) /* 80019E10 00016D50 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019E14 00016D54 48 34 83 C9 */ bl func_803621DC +/* 80019E14 00016D54 48 34 83 C9 */ bl _savegpr_29 /* 80019E18 00016D58 7C 7D 1B 78 */ mr r29, r3 /* 80019E1C 00016D5C 7D 5E 53 78 */ mr r30, r10 /* 80019E20 00016D60 83 E1 00 28 */ lwz r31, 0x28(r1) @@ -437,7 +437,7 @@ lbl_80019E44: /* 80019E50 00016D90 48 00 84 A5 */ bl fpcM_FastCreate lbl_80019E54: /* 80019E54 00016D94 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019E58 00016D98 48 34 83 D1 */ bl func_80362228 +/* 80019E58 00016D98 48 34 83 D1 */ bl _restgpr_29 /* 80019E5C 00016D9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80019E60 00016DA0 7C 08 03 A6 */ mtlr r0 /* 80019E64 00016DA4 38 21 00 20 */ addi r1, r1, 0x20 @@ -487,7 +487,7 @@ fopAcM_createChild: /* 80019EF4 00016E34 7C 08 02 A6 */ mflr r0 /* 80019EF8 00016E38 90 01 00 24 */ stw r0, 0x24(r1) /* 80019EFC 00016E3C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019F00 00016E40 48 34 82 DD */ bl func_803621DC +/* 80019F00 00016E40 48 34 82 DD */ bl _savegpr_29 /* 80019F04 00016E44 7C 7D 1B 78 */ mr r29, r3 /* 80019F08 00016E48 7C 80 23 78 */ mr r0, r4 /* 80019F0C 00016E4C 83 C1 00 28 */ lwz r30, 0x28(r1) @@ -514,7 +514,7 @@ lbl_80019F48: /* 80019F5C 00016E9C 48 00 9E 39 */ bl fpcSCtRq_Request lbl_80019F60: /* 80019F60 00016EA0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80019F64 00016EA4 48 34 82 C5 */ bl func_80362228 +/* 80019F64 00016EA4 48 34 82 C5 */ bl _restgpr_29 /* 80019F68 00016EA8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80019F6C 00016EAC 7C 08 03 A6 */ mtlr r0 /* 80019F70 00016EB0 38 21 00 20 */ addi r1, r1, 0x20 @@ -670,7 +670,7 @@ fopAcM_callCallback: /* 8001A18C 000170CC 7C 08 02 A6 */ mflr r0 /* 8001A190 000170D0 90 01 00 24 */ stw r0, 0x24(r1) /* 8001A194 000170D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001A198 000170D8 48 34 80 45 */ bl func_803621DC +/* 8001A198 000170D8 48 34 80 45 */ bl _savegpr_29 /* 8001A19C 000170DC 7C 7D 1B 78 */ mr r29, r3 /* 8001A1A0 000170E0 7C 9E 23 78 */ mr r30, r4 /* 8001A1A4 000170E4 7C A3 2B 78 */ mr r3, r5 @@ -685,7 +685,7 @@ fopAcM_callCallback: /* 8001A1C8 00017108 4B FF 50 05 */ bl mDoExt_setCurrentHeap /* 8001A1CC 0001710C 7F C3 F3 78 */ mr r3, r30 /* 8001A1D0 00017110 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001A1D4 00017114 48 34 80 55 */ bl func_80362228 +/* 8001A1D4 00017114 48 34 80 55 */ bl _restgpr_29 /* 8001A1D8 00017118 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001A1DC 0001711C 7C 08 03 A6 */ mtlr r0 /* 8001A1E0 00017120 38 21 00 20 */ addi r1, r1, 0x20 @@ -1477,7 +1477,7 @@ fopAcM_cullingCheck: /* 8001ACF0 00017C30 7C 08 02 A6 */ mflr r0 /* 8001ACF4 00017C34 90 01 00 A4 */ stw r0, 0xa4(r1) /* 8001ACF8 00017C38 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8001ACFC 00017C3C 48 34 74 E1 */ bl func_803621DC +/* 8001ACFC 00017C3C 48 34 74 E1 */ bl _savegpr_29 /* 8001AD00 00017C40 7C 7E 1B 78 */ mr r30, r3 /* 8001AD04 00017C44 80 83 05 04 */ lwz r4, 0x504(r3) /* 8001AD08 00017C48 28 04 00 00 */ cmplwi r4, 0 @@ -1701,7 +1701,7 @@ lbl_8001B010: /* 8001B03C 00017F7C 48 25 88 C1 */ bl J3DUClipper_NS_clip lbl_8001B040: /* 8001B040 00017F80 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8001B044 00017F84 48 34 71 E5 */ bl func_80362228 +/* 8001B044 00017F84 48 34 71 E5 */ bl _restgpr_29 /* 8001B048 00017F88 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8001B04C 00017F8C 7C 08 03 A6 */ mtlr r0 /* 8001B050 00017F90 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -2556,7 +2556,7 @@ fopAcM_getEventPartner: /* 8001BB78 00018AB8 7C 08 02 A6 */ mflr r0 /* 8001BB7C 00018ABC 90 01 00 24 */ stw r0, 0x24(r1) /* 8001BB80 00018AC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001BB84 00018AC4 48 34 66 59 */ bl func_803621DC +/* 8001BB84 00018AC4 48 34 66 59 */ bl _savegpr_29 /* 8001BB88 00018AC8 7C 7D 1B 78 */ mr r29, r3 /* 8001BB8C 00018ACC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8001BB90 00018AD0 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l @@ -2578,7 +2578,7 @@ lbl_8001BBBC: /* 8001BBCC 00018B0C 48 02 77 21 */ bl dEvt_control_c_NS_convPId lbl_8001BBD0: /* 8001BBD0 00018B10 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001BBD4 00018B14 48 34 66 55 */ bl func_80362228 +/* 8001BBD4 00018B14 48 34 66 55 */ bl _restgpr_29 /* 8001BBD8 00018B18 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001BBDC 00018B1C 7C 08 03 A6 */ mtlr r0 /* 8001BBE0 00018B20 38 21 00 20 */ addi r1, r1, 0x20 @@ -4799,7 +4799,7 @@ fopAcM_getPolygonAngle: /* 8001DAE8 0001AA28 7C 08 02 A6 */ mflr r0 /* 8001DAEC 0001AA2C 90 01 00 34 */ stw r0, 0x34(r1) /* 8001DAF0 0001AA30 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001DAF4 0001AA34 48 34 46 E9 */ bl func_803621DC +/* 8001DAF4 0001AA34 48 34 46 E9 */ bl _savegpr_29 /* 8001DAF8 0001AA38 7C 7D 1B 78 */ mr r29, r3 /* 8001DAFC 0001AA3C 7C 9E 23 78 */ mr r30, r4 /* 8001DB00 0001AA40 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -4836,7 +4836,7 @@ lbl_8001DB60: /* 8001DB74 0001AAB4 90 01 00 18 */ stw r0, 0x18(r1) lbl_8001DB78: /* 8001DB78 0001AAB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001DB7C 0001AABC 48 34 46 AD */ bl func_80362228 +/* 8001DB7C 0001AABC 48 34 46 AD */ bl _restgpr_29 /* 8001DB80 0001AAC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001DB84 0001AAC4 7C 08 03 A6 */ mtlr r0 /* 8001DB88 0001AAC8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/f/op/camera/f_op_camera_mng.s b/asm/f/op/camera/f_op_camera_mng.s index c1d9d813434..51c4c522c43 100644 --- a/asm/f/op/camera/f_op_camera_mng.s +++ b/asm/f/op/camera/f_op_camera_mng.s @@ -14,7 +14,7 @@ fopCamM_Create: /* 8001E314 0001B254 7C 08 02 A6 */ mflr r0 /* 8001E318 0001B258 90 01 00 24 */ stw r0, 0x24(r1) /* 8001E31C 0001B25C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001E320 0001B260 48 34 3E BD */ bl func_803621DC +/* 8001E320 0001B260 48 34 3E BD */ bl _savegpr_29 /* 8001E324 0001B264 7C 7D 1B 78 */ mr r29, r3 /* 8001E328 0001B268 7C 9E 23 78 */ mr r30, r4 /* 8001E32C 0001B26C 7C BF 2B 78 */ mr r31, r5 @@ -30,7 +30,7 @@ fopCamM_Create: /* 8001E354 0001B294 7C 64 01 2E */ stwx r3, r4, r0 /* 8001E358 0001B298 7C 64 00 2E */ lwzx r3, r4, r0 /* 8001E35C 0001B29C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001E360 0001B2A0 48 34 3E C9 */ bl func_80362228 +/* 8001E360 0001B2A0 48 34 3E C9 */ bl _restgpr_29 /* 8001E364 0001B2A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001E368 0001B2A8 7C 08 03 A6 */ mtlr r0 /* 8001E36C 0001B2AC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/op/f_op_actor.s b/asm/f/op/f_op_actor.s index fda1049e03a..1e90b11e8f9 100644 --- a/asm/f/op/f_op_actor.s +++ b/asm/f/op/f_op_actor.s @@ -675,7 +675,7 @@ lbl_80019518: /* 80019524 00016464 7C 08 02 A6 */ mflr r0 /* 80019528 00016468 90 01 00 44 */ stw r0, 0x44(r1) /* 8001952C 0001646C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80019530 00016470 48 34 8C AD */ bl func_803621DC +/* 80019530 00016470 48 34 8C AD */ bl _savegpr_29 /* 80019534 00016474 7C 7E 1B 78 */ mr r30, r3 /* 80019538 00016478 7C 9F 23 78 */ mr r31, r4 /* 8001953C 0001647C 80 03 05 80 */ lwz r0, 0x580(r3) @@ -764,7 +764,7 @@ lbl_800195A4: /* 80019684 000165C4 90 7E 05 98 */ stw r3, 0x598(r30) lbl_80019688: /* 80019688 000165C8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001968C 000165CC 48 34 8B 9D */ bl func_80362228 +/* 8001968C 000165CC 48 34 8B 9D */ bl _restgpr_29 /* 80019690 000165D0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80019694 000165D4 7C 08 03 A6 */ mtlr r0 /* 80019698 000165D8 38 21 00 40 */ addi r1, r1, 0x40 @@ -773,7 +773,7 @@ lbl_80019688: /* 800196A4 000165E4 7C 08 02 A6 */ mflr r0 /* 800196A8 000165E8 90 01 00 24 */ stw r0, 0x24(r1) /* 800196AC 000165EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800196B0 000165F0 48 34 8B 2D */ bl func_803621DC +/* 800196B0 000165F0 48 34 8B 2D */ bl _savegpr_29 /* 800196B4 000165F4 7C 7D 1B 78 */ mr r29, r3 /* 800196B8 000165F8 7C 9E 23 78 */ mr r30, r4 /* 800196BC 000165FC 80 83 05 80 */ lwz r4, 0x580(r3) @@ -838,7 +838,7 @@ lbl_800196E4: /* 800197A0 000166E0 4B FF 45 25 */ bl mDoExt_modelUpdateDL lbl_800197A4: /* 800197A4 000166E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800197A8 000166E8 48 34 8A 81 */ bl func_80362228 +/* 800197A8 000166E8 48 34 8A 81 */ bl _restgpr_29 /* 800197AC 000166EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800197B0 000166F0 7C 08 03 A6 */ mtlr r0 /* 800197B4 000166F4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/op/kankyo/f_op_kankyo_mng.s b/asm/f/op/kankyo/f_op_kankyo_mng.s index ec47de49872..9d292ab0e9c 100644 --- a/asm/f/op/kankyo/f_op_kankyo_mng.s +++ b/asm/f/op/kankyo/f_op_kankyo_mng.s @@ -35,7 +35,7 @@ createAppend_X1_: /* 8001F6BC 0001C5FC 7C 08 02 A6 */ mflr r0 /* 8001F6C0 0001C600 90 01 00 24 */ stw r0, 0x24(r1) /* 8001F6C4 0001C604 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001F6C8 0001C608 48 34 2B 15 */ bl func_803621DC +/* 8001F6C8 0001C608 48 34 2B 15 */ bl _savegpr_29 /* 8001F6CC 0001C60C 7C 7D 1B 78 */ mr r29, r3 /* 8001F6D0 0001C610 7C 9E 23 78 */ mr r30, r4 /* 8001F6D4 0001C614 7C BF 2B 78 */ mr r31, r5 @@ -66,7 +66,7 @@ lbl_8001F72C: /* 8001F72C 0001C66C 93 A3 00 18 */ stw r29, 0x18(r3) lbl_8001F730: /* 8001F730 0001C670 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001F734 0001C674 48 34 2A F5 */ bl func_80362228 +/* 8001F734 0001C674 48 34 2A F5 */ bl _restgpr_29 /* 8001F738 0001C678 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001F73C 0001C67C 7C 08 03 A6 */ mtlr r0 /* 8001F740 0001C680 38 21 00 20 */ addi r1, r1, 0x20 @@ -89,7 +89,7 @@ fopKyM_Create: /* 8001F76C 0001C6AC 7C 08 02 A6 */ mflr r0 /* 8001F770 0001C6B0 90 01 00 24 */ stw r0, 0x24(r1) /* 8001F774 0001C6B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001F778 0001C6B8 48 34 2A 65 */ bl func_803621DC +/* 8001F778 0001C6B8 48 34 2A 65 */ bl _savegpr_29 /* 8001F77C 0001C6BC 7C 7D 1B 78 */ mr r29, r3 /* 8001F780 0001C6C0 7C 9E 23 78 */ mr r30, r4 /* 8001F784 0001C6C4 7C BF 2B 78 */ mr r31, r5 @@ -100,7 +100,7 @@ fopKyM_Create: /* 8001F798 0001C6D8 7F E7 FB 78 */ mr r7, r31 /* 8001F79C 0001C6DC 48 00 45 F9 */ bl fpcSCtRq_Request /* 8001F7A0 0001C6E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001F7A4 0001C6E4 48 34 2A 85 */ bl func_80362228 +/* 8001F7A4 0001C6E4 48 34 2A 85 */ bl _restgpr_29 /* 8001F7A8 0001C6E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001F7AC 0001C6EC 7C 08 03 A6 */ mtlr r0 /* 8001F7B0 0001C6F0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/op/msg/f_op_msg_mng.s b/asm/f/op/msg/f_op_msg_mng.s index 3d4ff0e093c..510240fea4b 100644 --- a/asm/f/op/msg/f_op_msg_mng.s +++ b/asm/f/op/msg/f_op_msg_mng.s @@ -204,7 +204,7 @@ fopMsgM_create: /* 8001FC50 0001CB90 7C 08 02 A6 */ mflr r0 /* 8001FC54 0001CB94 90 01 00 24 */ stw r0, 0x24(r1) /* 8001FC58 0001CB98 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001FC5C 0001CB9C 48 34 25 81 */ bl func_803621DC +/* 8001FC5C 0001CB9C 48 34 25 81 */ bl _savegpr_29 /* 8001FC60 0001CBA0 7C 7D 1B 78 */ mr r29, r3 /* 8001FC64 0001CBA4 7D 1E 43 78 */ mr r30, r8 /* 8001FC68 0001CBA8 7C 83 23 78 */ mr r3, r4 @@ -226,7 +226,7 @@ lbl_8001FC90: /* 8001FCA4 0001CBE4 48 00 40 F1 */ bl fpcSCtRq_Request lbl_8001FCA8: /* 8001FCA8 0001CBE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001FCAC 0001CBEC 48 34 25 7D */ bl func_80362228 +/* 8001FCAC 0001CBEC 48 34 25 7D */ bl _restgpr_29 /* 8001FCB0 0001CBF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001FCB4 0001CBF4 7C 08 03 A6 */ mtlr r0 /* 8001FCB8 0001CBF8 38 21 00 20 */ addi r1, r1, 0x20 @@ -238,7 +238,7 @@ fop_Timer_create: /* 8001FCC4 0001CC04 7C 08 02 A6 */ mflr r0 /* 8001FCC8 0001CC08 90 01 00 24 */ stw r0, 0x24(r1) /* 8001FCCC 0001CC0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001FCD0 0001CC10 48 34 25 0D */ bl func_803621DC +/* 8001FCD0 0001CC10 48 34 25 0D */ bl _savegpr_29 /* 8001FCD4 0001CC14 7C 7D 1B 78 */ mr r29, r3 /* 8001FCD8 0001CC18 7D 1E 43 78 */ mr r30, r8 /* 8001FCDC 0001CC1C 54 83 06 3E */ clrlwi r3, r4, 0x18 @@ -260,7 +260,7 @@ lbl_8001FD04: /* 8001FD18 0001CC58 48 00 40 7D */ bl fpcSCtRq_Request lbl_8001FD1C: /* 8001FD1C 0001CC5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001FD20 0001CC60 48 34 25 09 */ bl func_80362228 +/* 8001FD20 0001CC60 48 34 25 09 */ bl _restgpr_29 /* 8001FD24 0001CC64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001FD28 0001CC68 7C 08 03 A6 */ mtlr r0 /* 8001FD2C 0001CC6C 38 21 00 20 */ addi r1, r1, 0x20 @@ -366,7 +366,7 @@ fopMsgM_messageSet_X1_: /* 8001FE88 0001CDC8 7C 08 02 A6 */ mflr r0 /* 8001FE8C 0001CDCC 90 01 00 34 */ stw r0, 0x34(r1) /* 8001FE90 0001CDD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001FE94 0001CDD4 48 34 23 49 */ bl func_803621DC +/* 8001FE94 0001CDD4 48 34 23 49 */ bl _savegpr_29 /* 8001FE98 0001CDD8 7C 7D 1B 78 */ mr r29, r3 /* 8001FE9C 0001CDDC 7C 9E 23 78 */ mr r30, r4 /* 8001FEA0 0001CDE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -442,7 +442,7 @@ lbl_8001FFA8: /* 8001FFA8 0001CEE8 38 60 00 00 */ li r3, 0 lbl_8001FFAC: /* 8001FFAC 0001CEEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001FFB0 0001CEF0 48 34 22 79 */ bl func_80362228 +/* 8001FFB0 0001CEF0 48 34 22 79 */ bl _restgpr_29 /* 8001FFB4 0001CEF4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001FFB8 0001CEF8 7C 08 03 A6 */ mtlr r0 /* 8001FFBC 0001CEFC 38 21 00 30 */ addi r1, r1, 0x30 @@ -548,7 +548,7 @@ fopMsgM_Create: /* 8002010C 0001D04C 7C 08 02 A6 */ mflr r0 /* 80020110 0001D050 90 01 00 24 */ stw r0, 0x24(r1) /* 80020114 0001D054 39 61 00 20 */ addi r11, r1, 0x20 -/* 80020118 0001D058 48 34 20 C5 */ bl func_803621DC +/* 80020118 0001D058 48 34 20 C5 */ bl _savegpr_29 /* 8002011C 0001D05C 7C 7D 1B 78 */ mr r29, r3 /* 80020120 0001D060 7C 9E 23 78 */ mr r30, r4 /* 80020124 0001D064 7C BF 2B 78 */ mr r31, r5 @@ -559,7 +559,7 @@ fopMsgM_Create: /* 80020138 0001D078 7F E7 FB 78 */ mr r7, r31 /* 8002013C 0001D07C 48 00 3C 59 */ bl fpcSCtRq_Request /* 80020140 0001D080 39 61 00 20 */ addi r11, r1, 0x20 -/* 80020144 0001D084 48 34 20 E5 */ bl func_80362228 +/* 80020144 0001D084 48 34 20 E5 */ bl _restgpr_29 /* 80020148 0001D088 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002014C 0001D08C 7C 08 03 A6 */ mtlr r0 /* 80020150 0001D090 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/op/overlap/f_op_overlap_req.s b/asm/f/op/overlap/f_op_overlap_req.s index af65eabd75d..25708c481c8 100644 --- a/asm/f/op/overlap/f_op_overlap_req.s +++ b/asm/f/op/overlap/f_op_overlap_req.s @@ -178,7 +178,7 @@ fopOvlpReq_Request: /* 8001E958 0001B898 7C 08 02 A6 */ mflr r0 /* 8001E95C 0001B89C 90 01 00 24 */ stw r0, 0x24(r1) /* 8001E960 0001B8A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001E964 0001B8A4 48 34 38 79 */ bl func_803621DC +/* 8001E964 0001B8A4 48 34 38 79 */ bl _savegpr_29 /* 8001E968 0001B8A8 7C 7D 1B 78 */ mr r29, r3 /* 8001E96C 0001B8AC 7C 9E 23 78 */ mr r30, r4 /* 8001E970 0001B8B0 7C BF 2B 78 */ mr r31, r5 @@ -210,7 +210,7 @@ lbl_8001E988: /* 8001E9D4 0001B914 7F A3 EB 78 */ mr r3, r29 lbl_8001E9D8: /* 8001E9D8 0001B918 39 61 00 20 */ addi r11, r1, 0x20 -/* 8001E9DC 0001B91C 48 34 38 4D */ bl func_80362228 +/* 8001E9DC 0001B91C 48 34 38 4D */ bl _restgpr_29 /* 8001E9E0 0001B920 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001E9E4 0001B924 7C 08 03 A6 */ mtlr r0 /* 8001E9E8 0001B928 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/create/f_pc_create_req.s b/asm/f/pc/create/f_pc_create_req.s index 313fd8206ee..59d6a5bb207 100644 --- a/asm/f/pc/create/f_pc_create_req.s +++ b/asm/f/pc/create/f_pc_create_req.s @@ -239,7 +239,7 @@ fpcCtRq_Create: /* 80020DB4 0001DCF4 7C 08 02 A6 */ mflr r0 /* 80020DB8 0001DCF8 90 01 00 24 */ stw r0, 0x24(r1) /* 80020DBC 0001DCFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80020DC0 0001DD00 48 34 14 1D */ bl func_803621DC +/* 80020DC0 0001DD00 48 34 14 1D */ bl _savegpr_29 /* 80020DC4 0001DD04 7C 7D 1B 78 */ mr r29, r3 /* 80020DC8 0001DD08 7C BE 2B 78 */ mr r30, r5 /* 80020DCC 0001DD0C 38 60 FF FC */ li r3, -4 @@ -265,7 +265,7 @@ fpcCtRq_Create: lbl_80020E1C: /* 80020E1C 0001DD5C 7F E3 FB 78 */ mr r3, r31 /* 80020E20 0001DD60 39 61 00 20 */ addi r11, r1, 0x20 -/* 80020E24 0001DD64 48 34 14 05 */ bl func_80362228 +/* 80020E24 0001DD64 48 34 14 05 */ bl _restgpr_29 /* 80020E28 0001DD68 80 01 00 24 */ lwz r0, 0x24(r1) /* 80020E2C 0001DD6C 7C 08 03 A6 */ mtlr r0 /* 80020E30 0001DD70 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/f_pc_deletor.s b/asm/f/pc/f_pc_deletor.s index 994738c921d..f3b9b10df1f 100644 --- a/asm/f/pc/f_pc_deletor.s +++ b/asm/f/pc/f_pc_deletor.s @@ -19,7 +19,7 @@ fpcDt_deleteMethod: /* 80021064 0001DFA4 7C 08 02 A6 */ mflr r0 /* 80021068 0001DFA8 90 01 00 24 */ stw r0, 0x24(r1) /* 8002106C 0001DFAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80021070 0001DFB0 48 34 11 6D */ bl func_803621DC +/* 80021070 0001DFB0 48 34 11 6D */ bl _savegpr_29 /* 80021074 0001DFB4 7C 7D 1B 78 */ mr r29, r3 /* 80021078 0001DFB8 83 E3 00 60 */ lwz r31, 0x60(r3) /* 8002107C 0001DFBC AB C3 00 0E */ lha r30, 0xe(r3) @@ -41,7 +41,7 @@ lbl_800210B8: /* 800210B8 0001DFF8 38 60 00 00 */ li r3, 0 lbl_800210BC: /* 800210BC 0001DFFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800210C0 0001E000 48 34 11 69 */ bl func_80362228 +/* 800210C0 0001E000 48 34 11 69 */ bl _restgpr_29 /* 800210C4 0001E004 80 01 00 24 */ lwz r0, 0x24(r1) /* 800210C8 0001E008 7C 08 03 A6 */ mtlr r0 /* 800210CC 0001E00C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/f_pc_draw.s b/asm/f/pc/f_pc_draw.s index 322909b1961..d30a906c3c5 100644 --- a/asm/f/pc/f_pc_draw.s +++ b/asm/f/pc/f_pc_draw.s @@ -9,7 +9,7 @@ fpcDw_Execute: /* 80023958 00020898 7C 08 02 A6 */ mflr r0 /* 8002395C 0002089C 90 01 00 24 */ stw r0, 0x24(r1) /* 80023960 000208A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023964 000208A4 48 33 E8 79 */ bl func_803621DC +/* 80023964 000208A4 48 33 E8 79 */ bl _savegpr_29 /* 80023968 000208A8 7C 7D 1B 78 */ mr r29, r3 /* 8002396C 000208AC 38 80 00 02 */ li r4, 2 /* 80023970 000208B0 4B FF FE D5 */ bl fpcPause_IsEnable @@ -44,7 +44,7 @@ lbl_800239D8: /* 800239D8 00020918 38 60 00 00 */ li r3, 0 lbl_800239DC: /* 800239DC 0002091C 39 61 00 20 */ addi r11, r1, 0x20 -/* 800239E0 00020920 48 33 E8 49 */ bl func_80362228 +/* 800239E0 00020920 48 33 E8 49 */ bl _restgpr_29 /* 800239E4 00020924 80 01 00 24 */ lwz r0, 0x24(r1) /* 800239E8 00020928 7C 08 03 A6 */ mtlr r0 /* 800239EC 0002092C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/f_pc_node.s b/asm/f/pc/f_pc_node.s index c30be3ca8fb..5fa2629d380 100644 --- a/asm/f/pc/f_pc_node.s +++ b/asm/f/pc/f_pc_node.s @@ -18,7 +18,7 @@ fpcNd_DrawMethod: /* 80022518 0001F458 7C 08 02 A6 */ mflr r0 /* 8002251C 0001F45C 90 01 00 24 */ stw r0, 0x24(r1) /* 80022520 0001F460 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022524 0001F464 48 33 FC B9 */ bl func_803621DC +/* 80022524 0001F464 48 33 FC B9 */ bl _savegpr_29 /* 80022528 0001F468 7C 7D 1B 78 */ mr r29, r3 /* 8002252C 0001F46C 3B E0 00 00 */ li r31, 0 /* 80022530 0001F470 88 03 01 A8 */ lbz r0, 0x1a8(r3) @@ -37,7 +37,7 @@ fpcNd_DrawMethod: lbl_80022564: /* 80022564 0001F4A4 7F E3 FB 78 */ mr r3, r31 /* 80022568 0001F4A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8002256C 0001F4AC 48 33 FC BD */ bl func_80362228 +/* 8002256C 0001F4AC 48 33 FC BD */ bl _restgpr_29 /* 80022570 0001F4B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80022574 0001F4B4 7C 08 03 A6 */ mtlr r0 /* 80022578 0001F4B8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/f/pc/method/f_pc_method_tag.s b/asm/f/pc/method/f_pc_method_tag.s index 6ab6da14814..c15a2d9b808 100644 --- a/asm/f/pc/method/f_pc_method_tag.s +++ b/asm/f/pc/method/f_pc_method_tag.s @@ -46,7 +46,7 @@ fpcMtdTg_Init: /* 800237FC 0002073C 7C 08 02 A6 */ mflr r0 /* 80023800 00020740 90 01 00 24 */ stw r0, 0x24(r1) /* 80023804 00020744 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023808 00020748 48 33 E9 D5 */ bl func_803621DC +/* 80023808 00020748 48 33 E9 D5 */ bl _savegpr_29 /* 8002380C 0002074C 7C 7D 1B 78 */ mr r29, r3 /* 80023810 00020750 7C 9E 23 78 */ mr r30, r4 /* 80023814 00020754 7C BF 2B 78 */ mr r31, r5 @@ -56,7 +56,7 @@ fpcMtdTg_Init: /* 80023824 00020764 93 FD 00 18 */ stw r31, 0x18(r29) /* 80023828 00020768 38 60 00 01 */ li r3, 1 /* 8002382C 0002076C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023830 00020770 48 33 E9 F9 */ bl func_80362228 +/* 80023830 00020770 48 33 E9 F9 */ bl _restgpr_29 /* 80023834 00020774 80 01 00 24 */ lwz r0, 0x24(r1) /* 80023838 00020778 7C 08 03 A6 */ mtlr r0 /* 8002383C 0002077C 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 77f93456fb0..b366f3fe172 100644 --- a/asm/f/pc/node/f_pc_node_req.s +++ b/asm/f/pc/node/f_pc_node_req.s @@ -616,7 +616,7 @@ fpcNdRq_Request: /* 80022FEC 0001FF2C 7C 08 02 A6 */ mflr r0 /* 80022FF0 0001FF30 90 01 00 24 */ stw r0, 0x24(r1) /* 80022FF4 0001FF34 39 61 00 20 */ addi r11, r1, 0x20 -/* 80022FF8 0001FF38 48 33 F1 E5 */ bl func_803621DC +/* 80022FF8 0001FF38 48 33 F1 E5 */ bl _savegpr_29 /* 80022FFC 0001FF3C 7C 9D 23 78 */ mr r29, r4 /* 80023000 0001FF40 7D 1E 43 78 */ mr r30, r8 /* 80023004 0001FF44 2C 1D 00 02 */ cmpwi r29, 2 @@ -657,7 +657,7 @@ lbl_80023064: lbl_8002307C: /* 8002307C 0001FFBC 7F E3 FB 78 */ mr r3, r31 /* 80023080 0001FFC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80023084 0001FFC4 48 33 F1 A5 */ bl func_80362228 +/* 80023084 0001FFC4 48 33 F1 A5 */ bl _restgpr_29 /* 80023088 0001FFC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002308C 0001FFCC 7C 08 03 A6 */ mtlr r0 /* 80023090 0001FFD0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/controller/m_Do_controller_pad.s b/asm/m/Do/controller/m_Do_controller_pad.s index 3e36bde933c..65e4c304322 100644 --- a/asm/m/Do/controller/m_Do_controller_pad.s +++ b/asm/m/Do/controller/m_Do_controller_pad.s @@ -102,7 +102,7 @@ mDoCPd_c_NS_read: /* 80007A98 000049D8 7C 08 02 A6 */ mflr r0 /* 80007A9C 000049DC 90 01 00 24 */ stw r0, 0x24(r1) /* 80007AA0 000049E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80007AA4 000049E4 48 35 A7 39 */ bl func_803621DC +/* 80007AA4 000049E4 48 35 A7 39 */ bl _savegpr_29 /* 80007AA8 000049E8 48 2D 8E 3D */ bl JUTGamePad_NS_read /* 80007AAC 000049EC 80 6D 86 F8 */ lwz r3, lbl_80450C78-_SDA_BASE_(r13) /* 80007AB0 000049F0 80 03 00 00 */ lwz r0, 0(r3) @@ -156,7 +156,7 @@ lbl_80007B50: /* 80007B5C 00004A9C 3B DE 00 40 */ addi r30, r30, 0x40 /* 80007B60 00004AA0 41 80 FF C0 */ blt lbl_80007B20 /* 80007B64 00004AA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80007B68 00004AA8 48 35 A6 C1 */ bl func_80362228 +/* 80007B68 00004AA8 48 35 A6 C1 */ bl _restgpr_29 /* 80007B6C 00004AAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80007B70 00004AB0 7C 08 03 A6 */ mtlr r0 /* 80007B74 00004AB4 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/dvd/m_Do_dvd_thread.s b/asm/m/Do/dvd/m_Do_dvd_thread.s index 8ebcd540036..8d6c42e17ad 100644 --- a/asm/m/Do/dvd/m_Do_dvd_thread.s +++ b/asm/m/Do/dvd/m_Do_dvd_thread.s @@ -323,7 +323,7 @@ mDoDvdThd_callback_c: /* 80015C1C 00012B5C 7C 08 02 A6 */ mflr r0 /* 80015C20 00012B60 90 01 00 24 */ stw r0, 0x24(r1) /* 80015C24 00012B64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015C28 00012B68 48 34 C5 B5 */ bl func_803621DC +/* 80015C28 00012B68 48 34 C5 B5 */ bl _savegpr_29 /* 80015C2C 00012B6C 7C 7D 1B 78 */ mr r29, r3 /* 80015C30 00012B70 7C 9E 23 78 */ mr r30, r4 /* 80015C34 00012B74 7C BF 2B 78 */ mr r31, r5 @@ -337,7 +337,7 @@ mDoDvdThd_callback_c: /* 80015C54 00012B94 90 1D 00 1C */ stw r0, 0x1c(r29) /* 80015C58 00012B98 7F A3 EB 78 */ mr r3, r29 /* 80015C5C 00012B9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015C60 00012BA0 48 34 C5 C9 */ bl func_80362228 +/* 80015C60 00012BA0 48 34 C5 C9 */ bl _restgpr_29 /* 80015C64 00012BA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80015C68 00012BA8 7C 08 03 A6 */ mtlr r0 /* 80015C6C 00012BAC 38 21 00 20 */ addi r1, r1, 0x20 @@ -349,7 +349,7 @@ mDoDvdThd_callback_c_NS_create: /* 80015C78 00012BB8 7C 08 02 A6 */ mflr r0 /* 80015C7C 00012BBC 90 01 00 24 */ stw r0, 0x24(r1) /* 80015C80 00012BC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015C84 00012BC4 48 34 C5 59 */ bl func_803621DC +/* 80015C84 00012BC4 48 34 C5 59 */ bl _savegpr_29 /* 80015C88 00012BC8 7C 7D 1B 78 */ mr r29, r3 /* 80015C8C 00012BCC 7C 9E 23 78 */ mr r30, r4 /* 80015C90 00012BD0 4B FF 91 21 */ bl mDoExt_getCommandHeap @@ -373,7 +373,7 @@ lbl_80015CBC: lbl_80015CD4: /* 80015CD4 00012C14 7F E3 FB 78 */ mr r3, r31 /* 80015CD8 00012C18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80015CDC 00012C1C 48 34 C5 4D */ bl func_80362228 +/* 80015CDC 00012C1C 48 34 C5 4D */ bl _restgpr_29 /* 80015CE0 00012C20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80015CE4 00012C24 7C 08 03 A6 */ mtlr r0 /* 80015CE8 00012C28 38 21 00 20 */ addi r1, r1, 0x20 @@ -702,7 +702,7 @@ mDoDvdThd_mountXArchive_c: /* 8001616C 000130AC 7C 08 02 A6 */ mflr r0 /* 80016170 000130B0 90 01 00 24 */ stw r0, 0x24(r1) /* 80016174 000130B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016178 000130B8 48 34 C0 65 */ bl func_803621DC +/* 80016178 000130B8 48 34 C0 65 */ bl _savegpr_29 /* 8001617C 000130BC 7C 7D 1B 78 */ mr r29, r3 /* 80016180 000130C0 7C 9E 23 78 */ mr r30, r4 /* 80016184 000130C4 7C BF 2B 78 */ mr r31, r5 @@ -724,7 +724,7 @@ mDoDvdThd_mountXArchive_c: lbl_800161C4: /* 800161C4 00013104 7F A3 EB 78 */ mr r3, r29 /* 800161C8 00013108 39 61 00 20 */ addi r11, r1, 0x20 -/* 800161CC 0001310C 48 34 C0 5D */ bl func_80362228 +/* 800161CC 0001310C 48 34 C0 5D */ bl _restgpr_29 /* 800161D0 00013110 80 01 00 24 */ lwz r0, 0x24(r1) /* 800161D4 00013114 7C 08 03 A6 */ mtlr r0 /* 800161D8 00013118 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_DVDError.s b/asm/m/Do/m_Do_DVDError.s index 35ac4bcab1c..f9c02cb8438 100644 --- a/asm/m/Do/m_Do_DVDError.s +++ b/asm/m/Do/m_Do_DVDError.s @@ -9,7 +9,7 @@ mDoDvdErr_ThdInit: /* 800165A0 000134E0 7C 08 02 A6 */ mflr r0 /* 800165A4 000134E4 90 01 00 24 */ stw r0, 0x24(r1) /* 800165A8 000134E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800165AC 000134EC 48 34 BC 31 */ bl func_803621DC +/* 800165AC 000134EC 48 34 BC 31 */ bl _savegpr_29 /* 800165B0 000134F0 3C 60 80 3E */ lis r3, lbl_803DECC0@ha /* 800165B4 000134F4 3B E3 EC C0 */ addi r31, r3, lbl_803DECC0@l /* 800165B8 000134F8 88 0D 87 08 */ lbz r0, lbl_80450C88-_SDA_BASE_(r13) @@ -53,7 +53,7 @@ mDoDvdErr_ThdInit: /* 80016640 00013580 98 0D 87 08 */ stb r0, lbl_80450C88-_SDA_BASE_(r13) lbl_80016644: /* 80016644 00013584 39 61 00 20 */ addi r11, r1, 0x20 -/* 80016648 00013588 48 34 BB E1 */ bl func_80362228 +/* 80016648 00013588 48 34 BB E1 */ bl _restgpr_29 /* 8001664C 0001358C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80016650 00013590 7C 08 03 A6 */ mtlr r0 /* 80016654 00013594 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_audio.s b/asm/m/Do/m_Do_audio.s index c556486215c..07811eb3baf 100644 --- a/asm/m/Do/m_Do_audio.s +++ b/asm/m/Do/m_Do_audio.s @@ -315,7 +315,7 @@ Z2AudioMgr_NS_dtor: /* 800073CC 0000430C 7C 08 02 A6 */ mflr r0 /* 800073D0 00004310 90 01 00 24 */ stw r0, 0x24(r1) /* 800073D4 00004314 39 61 00 20 */ addi r11, r1, 0x20 -/* 800073D8 00004318 48 35 AE 05 */ bl func_803621DC +/* 800073D8 00004318 48 35 AE 05 */ bl _savegpr_29 /* 800073DC 0000431C 7C 7E 1B 79 */ or. r30, r3, r3 /* 800073E0 00004320 7C 9F 23 78 */ mr r31, r4 /* 800073E4 00004324 41 82 04 38 */ beq lbl_8000781C @@ -629,7 +629,7 @@ lbl_8000780C: lbl_8000781C: /* 8000781C 0000475C 7F C3 F3 78 */ mr r3, r30 /* 80007820 00004760 39 61 00 20 */ addi r11, r1, 0x20 -/* 80007824 00004764 48 35 AA 05 */ bl func_80362228 +/* 80007824 00004764 48 35 AA 05 */ bl _restgpr_29 /* 80007828 00004768 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000782C 0000476C 7C 08 03 A6 */ mtlr r0 /* 80007830 00004770 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index 8c67fc49def..73c613b65e9 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -9,7 +9,7 @@ mDoMtx_stack_c_NS_dtor_X1_: /* 8000D0B0 00009FF0 7C 08 02 A6 */ mflr r0 /* 8000D0B4 00009FF4 90 01 00 24 */ stw r0, 0x24(r1) /* 8000D0B8 00009FF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000D0BC 00009FFC 48 35 51 21 */ bl func_803621DC +/* 8000D0BC 00009FFC 48 35 51 21 */ bl _savegpr_29 /* 8000D0C0 0000A000 7C 66 1B 78 */ mr r6, r3 /* 8000D0C4 0000A004 7C 9E 23 78 */ mr r30, r4 /* 8000D0C8 0000A008 7C BF 2B 78 */ mr r31, r5 @@ -161,7 +161,7 @@ lbl_8000D2B4: /* 8000D300 0000A240 C0 1E 00 08 */ lfs f0, 8(r30) /* 8000D304 0000A244 D0 03 00 08 */ stfs f0, 8(r3) /* 8000D308 0000A248 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000D30C 0000A24C 48 35 4F 1D */ bl func_80362228 +/* 8000D30C 0000A24C 48 35 4F 1D */ bl _restgpr_29 /* 8000D310 0000A250 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000D314 0000A254 7C 08 03 A6 */ mtlr r0 /* 8000D318 0000A258 38 21 00 20 */ addi r1, r1, 0x20 @@ -175,7 +175,7 @@ mDoExt_baseAnm_NS_initPlay: /* 8000D32C 0000A26C DB E1 00 20 */ stfd f31, 0x20(r1) /* 8000D330 0000A270 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8000D334 0000A274 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000D338 0000A278 48 35 4E A5 */ bl func_803621DC +/* 8000D338 0000A278 48 35 4E A5 */ bl _savegpr_29 /* 8000D33C 0000A27C 7C 7D 1B 78 */ mr r29, r3 /* 8000D340 0000A280 7C BE 2B 78 */ mr r30, r5 /* 8000D344 0000A284 FF E0 08 90 */ fmr f31, f1 @@ -234,7 +234,7 @@ lbl_8000D3F0: /* 8000D408 0000A348 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8000D40C 0000A34C CB E1 00 20 */ lfd f31, 0x20(r1) /* 8000D410 0000A350 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000D414 0000A354 48 35 4E 15 */ bl func_80362228 +/* 8000D414 0000A354 48 35 4E 15 */ bl _restgpr_29 /* 8000D418 0000A358 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000D41C 0000A35C 7C 08 03 A6 */ mtlr r0 /* 8000D420 0000A360 38 21 00 30 */ addi r1, r1, 0x30 @@ -2281,7 +2281,7 @@ mDoExt_createSolidHeapFromGameToCurrent: /* 8000EFF8 0000BF38 7C 08 02 A6 */ mflr r0 /* 8000EFFC 0000BF3C 90 01 00 24 */ stw r0, 0x24(r1) /* 8000F000 0000BF40 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000F004 0000BF44 48 35 31 D9 */ bl func_803621DC +/* 8000F004 0000BF44 48 35 31 D9 */ bl _savegpr_29 /* 8000F008 0000BF48 7C 7D 1B 78 */ mr r29, r3 /* 8000F00C 0000BF4C 7C 9E 23 78 */ mr r30, r4 /* 8000F010 0000BF50 7C BF 2B 78 */ mr r31, r5 @@ -2292,7 +2292,7 @@ mDoExt_createSolidHeapFromGameToCurrent: /* 8000F024 0000BF64 7F E6 FB 78 */ mr r6, r31 /* 8000F028 0000BF68 4B FF FF 41 */ bl mDoExt_createSolidHeapToCurrent /* 8000F02C 0000BF6C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000F030 0000BF70 48 35 31 F9 */ bl func_80362228 +/* 8000F030 0000BF70 48 35 31 F9 */ bl _restgpr_29 /* 8000F034 0000BF74 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000F038 0000BF78 7C 08 03 A6 */ mtlr r0 /* 8000F03C 0000BF7C 38 21 00 20 */ addi r1, r1, 0x20 @@ -2862,7 +2862,7 @@ mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf: /* 8000F84C 0000C78C 7C 08 02 A6 */ mflr r0 /* 8000F850 0000C790 90 01 00 24 */ stw r0, 0x24(r1) /* 8000F854 0000C794 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000F858 0000C798 48 35 29 85 */ bl func_803621DC +/* 8000F858 0000C798 48 35 29 85 */ bl _savegpr_29 /* 8000F85C 0000C79C 7C 7D 1B 78 */ mr r29, r3 /* 8000F860 0000C7A0 7C 9E 23 78 */ mr r30, r4 /* 8000F864 0000C7A4 7C BF 2B 78 */ mr r31, r5 @@ -2888,7 +2888,7 @@ lbl_8000F8AC: /* 8000F8AC 0000C7EC B3 DD 00 18 */ sth r30, 0x18(r29) /* 8000F8B0 0000C7F0 B3 FD 00 1A */ sth r31, 0x1a(r29) /* 8000F8B4 0000C7F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000F8B8 0000C7F8 48 35 29 71 */ bl func_80362228 +/* 8000F8B8 0000C7F8 48 35 29 71 */ bl _restgpr_29 /* 8000F8BC 0000C7FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000F8C0 0000C800 7C 08 03 A6 */ mtlr r0 /* 8000F8C4 0000C804 38 21 00 20 */ addi r1, r1, 0x20 @@ -3898,7 +3898,7 @@ mDoExt_McaMorf_NS_getTransform: /* 80010714 0000D654 7C 08 02 A6 */ mflr r0 /* 80010718 0000D658 90 01 00 24 */ stw r0, 0x24(r1) /* 8001071C 0000D65C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80010720 0000D660 48 35 1A BD */ bl func_803621DC +/* 80010720 0000D660 48 35 1A BD */ bl _savegpr_29 /* 80010724 0000D664 7C 7D 1B 78 */ mr r29, r3 /* 80010728 0000D668 7C 9E 23 78 */ mr r30, r4 /* 8001072C 0000D66C 7C BF 2B 78 */ mr r31, r5 @@ -3939,7 +3939,7 @@ lbl_8001078C: /* 800107B4 0000D6F4 D0 1F 00 1C */ stfs f0, 0x1c(r31) lbl_800107B8: /* 800107B8 0000D6F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800107BC 0000D6FC 48 35 1A 6D */ bl func_80362228 +/* 800107BC 0000D6FC 48 35 1A 6D */ bl _restgpr_29 /* 800107C0 0000D700 80 01 00 24 */ lwz r0, 0x24(r1) /* 800107C4 0000D704 7C 08 03 A6 */ mtlr r0 /* 800107C8 0000D708 38 21 00 20 */ addi r1, r1, 0x20 @@ -4415,7 +4415,7 @@ mDoExt_McaMorfSO_NS_setAnm: /* 80010E8C 0000DDCC DB A1 00 30 */ stfd f29, 0x30(r1) /* 80010E90 0000DDD0 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 80010E94 0000DDD4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80010E98 0000DDD8 48 35 13 45 */ bl func_803621DC +/* 80010E98 0000DDD8 48 35 13 45 */ bl _savegpr_29 /* 80010E9C 0000DDDC 7C 7E 1B 78 */ mr r30, r3 /* 80010EA0 0000DDE0 7C 9F 23 78 */ mr r31, r4 /* 80010EA4 0000DDE4 7C BD 2B 78 */ mr r29, r5 @@ -4553,7 +4553,7 @@ lbl_80011080: /* 80011090 0000DFD0 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 80011094 0000DFD4 CB A1 00 30 */ lfd f29, 0x30(r1) /* 80011098 0000DFD8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001109C 0000DFDC 48 35 11 8D */ bl func_80362228 +/* 8001109C 0000DFDC 48 35 11 8D */ bl _restgpr_29 /* 800110A0 0000DFE0 80 01 00 64 */ lwz r0, 0x64(r1) /* 800110A4 0000DFE4 7C 08 03 A6 */ mtlr r0 /* 800110A8 0000DFE8 38 21 00 60 */ addi r1, r1, 0x60 @@ -4565,7 +4565,7 @@ mDoExt_McaMorfSO_NS_play: /* 800110B4 0000DFF4 7C 08 02 A6 */ mflr r0 /* 800110B8 0000DFF8 90 01 00 24 */ stw r0, 0x24(r1) /* 800110BC 0000DFFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800110C0 0000E000 48 35 11 1D */ bl func_803621DC +/* 800110C0 0000E000 48 35 11 1D */ bl _savegpr_29 /* 800110C4 0000E004 7C 7D 1B 78 */ mr r29, r3 /* 800110C8 0000E008 7C 9E 23 78 */ mr r30, r4 /* 800110CC 0000E00C 7C BF 2B 78 */ mr r31, r5 @@ -4599,7 +4599,7 @@ lbl_80011114: lbl_80011138: /* 80011138 0000E078 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8001113C 0000E07C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80011140 0000E080 48 35 10 E9 */ bl func_80362228 +/* 80011140 0000E080 48 35 10 E9 */ bl _restgpr_29 /* 80011144 0000E084 80 01 00 24 */ lwz r0, 0x24(r1) /* 80011148 0000E088 7C 08 03 A6 */ mtlr r0 /* 8001114C 0000E08C 38 21 00 20 */ addi r1, r1, 0x20 @@ -4685,7 +4685,7 @@ mDoExt_McaMorfSO_NS_getTransform: /* 80011254 0000E194 7C 08 02 A6 */ mflr r0 /* 80011258 0000E198 90 01 00 24 */ stw r0, 0x24(r1) /* 8001125C 0000E19C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80011260 0000E1A0 48 35 0F 7D */ bl func_803621DC +/* 80011260 0000E1A0 48 35 0F 7D */ bl _savegpr_29 /* 80011264 0000E1A4 7C 7D 1B 78 */ mr r29, r3 /* 80011268 0000E1A8 7C 9E 23 78 */ mr r30, r4 /* 8001126C 0000E1AC 7C BF 2B 78 */ mr r31, r5 @@ -4726,7 +4726,7 @@ lbl_800112CC: /* 800112F4 0000E234 D0 1F 00 1C */ stfs f0, 0x1c(r31) lbl_800112F8: /* 800112F8 0000E238 39 61 00 20 */ addi r11, r1, 0x20 -/* 800112FC 0000E23C 48 35 0F 2D */ bl func_80362228 +/* 800112FC 0000E23C 48 35 0F 2D */ bl _restgpr_29 /* 80011300 0000E240 80 01 00 24 */ lwz r0, 0x24(r1) /* 80011304 0000E244 7C 08 03 A6 */ mtlr r0 /* 80011308 0000E248 38 21 00 20 */ addi r1, r1, 0x20 @@ -5658,7 +5658,7 @@ lbl_80012090: /* 800120A4 0000EFE4 7C 08 02 A6 */ mflr r0 /* 800120A8 0000EFE8 90 01 00 24 */ stw r0, 0x24(r1) /* 800120AC 0000EFEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800120B0 0000EFF0 48 35 01 2D */ bl func_803621DC +/* 800120B0 0000EFF0 48 35 01 2D */ bl _savegpr_29 /* 800120B4 0000EFF4 7C 7D 1B 78 */ mr r29, r3 /* 800120B8 0000EFF8 7C 9E 23 78 */ mr r30, r4 /* 800120BC 0000EFFC 7C BF 2B 78 */ mr r31, r5 @@ -5692,7 +5692,7 @@ lbl_80012104: lbl_80012128: /* 80012128 0000F068 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8001212C 0000F06C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80012130 0000F070 48 35 00 F9 */ bl func_80362228 +/* 80012130 0000F070 48 35 00 F9 */ bl _restgpr_29 /* 80012134 0000F074 80 01 00 24 */ lwz r0, 0x24(r1) /* 80012138 0000F078 7C 08 03 A6 */ mtlr r0 /* 8001213C 0000F07C 38 21 00 20 */ addi r1, r1, 0x20 @@ -5764,7 +5764,7 @@ lbl_80012210: /* 80012224 0000F164 7C 08 02 A6 */ mflr r0 /* 80012228 0000F168 90 01 00 24 */ stw r0, 0x24(r1) /* 8001222C 0000F16C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80012230 0000F170 48 34 FF AD */ bl func_803621DC +/* 80012230 0000F170 48 34 FF AD */ bl _savegpr_29 /* 80012234 0000F174 7C 7F 1B 78 */ mr r31, r3 /* 80012238 0000F178 38 00 00 00 */ li r0, 0 /* 8001223C 0000F17C 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) @@ -5873,7 +5873,7 @@ lbl_80012390: /* 800123B0 0000F2F0 39 20 00 01 */ li r9, 1 /* 800123B4 0000F2F4 48 2B BC 51 */ bl GFSetBlendModeEtc /* 800123B8 0000F2F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800123BC 0000F2FC 48 34 FE 6D */ bl func_80362228 +/* 800123BC 0000F2FC 48 34 FE 6D */ bl _restgpr_29 /* 800123C0 0000F300 80 01 00 24 */ lwz r0, 0x24(r1) /* 800123C4 0000F304 7C 08 03 A6 */ mtlr r0 /* 800123C8 0000F308 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_lib.s b/asm/m/Do/m_Do_lib.s index fe75411a608..e2ccd678bc8 100644 --- a/asm/m/Do/m_Do_lib.s +++ b/asm/m/Do/m_Do_lib.s @@ -9,7 +9,7 @@ mDoLib_setResTimgObj: /* 80015140 00012080 7C 08 02 A6 */ mflr r0 /* 80015144 00012084 90 01 00 44 */ stw r0, 0x44(r1) /* 80015148 00012088 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001514C 0001208C 48 34 D0 91 */ bl func_803621DC +/* 8001514C 0001208C 48 34 D0 91 */ bl _savegpr_29 /* 80015150 00012090 7C 7F 1B 78 */ mr r31, r3 /* 80015154 00012094 7C 9D 23 78 */ mr r29, r4 /* 80015158 00012098 7C BE 2B 78 */ mr r30, r5 @@ -86,7 +86,7 @@ lbl_800151E8: /* 8001526C 000121AC 48 34 8E 69 */ bl GXInitTexObjLOD /* 80015270 000121B0 88 7F 00 08 */ lbz r3, 8(r31) /* 80015274 000121B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80015278 000121B8 48 34 CF B1 */ bl func_80362228 +/* 80015278 000121B8 48 34 CF B1 */ bl _restgpr_29 /* 8001527C 000121BC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80015280 000121C0 7C 08 03 A6 */ mtlr r0 /* 80015284 000121C4 38 21 00 40 */ addi r1, r1, 0x40 @@ -134,7 +134,7 @@ mDoLib_project: /* 80015314 00012254 7C 08 02 A6 */ mflr r0 /* 80015318 00012258 90 01 00 34 */ stw r0, 0x34(r1) /* 8001531C 0001225C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80015320 00012260 48 34 CE BD */ bl func_803621DC +/* 80015320 00012260 48 34 CE BD */ bl _savegpr_29 /* 80015324 00012264 7C 7D 1B 78 */ mr r29, r3 /* 80015328 00012268 7C 9E 23 78 */ mr r30, r4 /* 8001532C 0001226C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -255,7 +255,7 @@ lbl_8001549C: /* 800154D0 00012410 D0 1E 00 04 */ stfs f0, 4(r30) lbl_800154D4: /* 800154D4 00012414 39 61 00 30 */ addi r11, r1, 0x30 -/* 800154D8 00012418 48 34 CD 51 */ bl func_80362228 +/* 800154D8 00012418 48 34 CD 51 */ bl _restgpr_29 /* 800154DC 0001241C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800154E0 00012420 7C 08 03 A6 */ mtlr r0 /* 800154E4 00012424 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/m/Do/m_Do_mtx.s b/asm/m/Do/m_Do_mtx.s index 875963c69b0..3df3c4f3c3f 100644 --- a/asm/m/Do/m_Do_mtx.s +++ b/asm/m/Do/m_Do_mtx.s @@ -9,7 +9,7 @@ mDoMtx_XYZrotS: /* 8000C0D0 00009010 7C 08 02 A6 */ mflr r0 /* 8000C0D4 00009014 90 01 00 54 */ stw r0, 0x54(r1) /* 8000C0D8 00009018 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C0DC 0000901C 48 35 61 01 */ bl func_803621DC +/* 8000C0DC 0000901C 48 35 61 01 */ bl _savegpr_29 /* 8000C0E0 00009020 7C 7D 1B 78 */ mr r29, r3 /* 8000C0E4 00009024 7C 9E 23 78 */ mr r30, r4 /* 8000C0E8 00009028 7C BF 2B 78 */ mr r31, r5 @@ -42,7 +42,7 @@ lbl_8000C128: /* 8000C148 00009088 48 33 A3 9D */ bl PSMTXConcat lbl_8000C14C: /* 8000C14C 0000908C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C150 00009090 48 35 60 D9 */ bl func_80362228 +/* 8000C150 00009090 48 35 60 D9 */ bl _restgpr_29 /* 8000C154 00009094 80 01 00 54 */ lwz r0, 0x54(r1) /* 8000C158 00009098 7C 08 03 A6 */ mtlr r0 /* 8000C15C 0000909C 38 21 00 50 */ addi r1, r1, 0x50 @@ -54,7 +54,7 @@ mDoMtx_XYZrotM: /* 8000C168 000090A8 7C 08 02 A6 */ mflr r0 /* 8000C16C 000090AC 90 01 00 54 */ stw r0, 0x54(r1) /* 8000C170 000090B0 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C174 000090B4 48 35 60 69 */ bl func_803621DC +/* 8000C174 000090B4 48 35 60 69 */ bl _savegpr_29 /* 8000C178 000090B8 7C 7D 1B 78 */ mr r29, r3 /* 8000C17C 000090BC 7C 9E 23 78 */ mr r30, r4 /* 8000C180 000090C0 7C BF 2B 78 */ mr r31, r5 @@ -89,7 +89,7 @@ lbl_8000C1CC: /* 8000C1EC 0000912C 48 33 A2 F9 */ bl PSMTXConcat lbl_8000C1F0: /* 8000C1F0 00009130 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C1F4 00009134 48 35 60 35 */ bl func_80362228 +/* 8000C1F4 00009134 48 35 60 35 */ bl _restgpr_29 /* 8000C1F8 00009138 80 01 00 54 */ lwz r0, 0x54(r1) /* 8000C1FC 0000913C 7C 08 03 A6 */ mtlr r0 /* 8000C200 00009140 38 21 00 50 */ addi r1, r1, 0x50 @@ -101,7 +101,7 @@ mDoMtx_ZXYrotS: /* 8000C20C 0000914C 7C 08 02 A6 */ mflr r0 /* 8000C210 00009150 90 01 00 54 */ stw r0, 0x54(r1) /* 8000C214 00009154 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C218 00009158 48 35 5F C5 */ bl func_803621DC +/* 8000C218 00009158 48 35 5F C5 */ bl _savegpr_29 /* 8000C21C 0000915C 7C 7D 1B 78 */ mr r29, r3 /* 8000C220 00009160 7C 9E 23 78 */ mr r30, r4 /* 8000C224 00009164 7C DF 33 78 */ mr r31, r6 @@ -134,7 +134,7 @@ lbl_8000C264: /* 8000C284 000091C4 48 33 A2 61 */ bl PSMTXConcat lbl_8000C288: /* 8000C288 000091C8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C28C 000091CC 48 35 5F 9D */ bl func_80362228 +/* 8000C28C 000091CC 48 35 5F 9D */ bl _restgpr_29 /* 8000C290 000091D0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8000C294 000091D4 7C 08 03 A6 */ mtlr r0 /* 8000C298 000091D8 38 21 00 50 */ addi r1, r1, 0x50 @@ -146,7 +146,7 @@ mDoMtx_ZXYrotM: /* 8000C2A4 000091E4 7C 08 02 A6 */ mflr r0 /* 8000C2A8 000091E8 90 01 00 54 */ stw r0, 0x54(r1) /* 8000C2AC 000091EC 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C2B0 000091F0 48 35 5F 2D */ bl func_803621DC +/* 8000C2B0 000091F0 48 35 5F 2D */ bl _savegpr_29 /* 8000C2B4 000091F4 7C 7D 1B 78 */ mr r29, r3 /* 8000C2B8 000091F8 7C 9E 23 78 */ mr r30, r4 /* 8000C2BC 000091FC 7C DF 33 78 */ mr r31, r6 @@ -181,7 +181,7 @@ lbl_8000C308: /* 8000C328 00009268 48 33 A1 BD */ bl PSMTXConcat lbl_8000C32C: /* 8000C32C 0000926C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8000C330 00009270 48 35 5E F9 */ bl func_80362228 +/* 8000C330 00009270 48 35 5E F9 */ bl _restgpr_29 /* 8000C334 00009274 80 01 00 54 */ lwz r0, 0x54(r1) /* 8000C338 00009278 7C 08 03 A6 */ mtlr r0 /* 8000C33C 0000927C 38 21 00 50 */ addi r1, r1, 0x50 @@ -576,7 +576,7 @@ mDoMtx_concatProjView: /* 8000C8D4 00009814 7C 08 02 A6 */ mflr r0 /* 8000C8D8 00009818 90 01 00 24 */ stw r0, 0x24(r1) /* 8000C8DC 0000981C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000C8E0 00009820 48 35 58 FD */ bl func_803621DC +/* 8000C8E0 00009820 48 35 58 FD */ bl _savegpr_29 /* 8000C8E4 00009824 7C 7D 1B 78 */ mr r29, r3 /* 8000C8E8 00009828 7C 9E 23 78 */ mr r30, r4 /* 8000C8EC 0000982C 7C BF 2B 78 */ mr r31, r5 @@ -623,7 +623,7 @@ mDoMtx_concatProjView: /* 8000C990 000098D0 EC 03 00 2A */ fadds f0, f3, f0 /* 8000C994 000098D4 D0 1F 00 3C */ stfs f0, 0x3c(r31) /* 8000C998 000098D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8000C99C 000098DC 48 35 58 8D */ bl func_80362228 +/* 8000C99C 000098DC 48 35 58 8D */ bl _restgpr_29 /* 8000C9A0 000098E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8000C9A4 000098E4 7C 08 03 A6 */ mtlr r0 /* 8000C9A8 000098E8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/m/Do/m_Do_printf.s b/asm/m/Do/m_Do_printf.s index ae9ad464d03..cb4adac1887 100644 --- a/asm/m/Do/m_Do_printf.s +++ b/asm/m/Do/m_Do_printf.s @@ -118,7 +118,7 @@ mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct: /* 800068E0 00003820 7C 08 02 A6 */ mflr r0 /* 800068E4 00003824 90 01 00 24 */ stw r0, 0x24(r1) /* 800068E8 00003828 39 61 00 20 */ addi r11, r1, 0x20 -/* 800068EC 0000382C 48 35 B8 F1 */ bl func_803621DC +/* 800068EC 0000382C 48 35 B8 F1 */ bl _savegpr_29 /* 800068F0 00003830 7C 7D 1B 78 */ mr r29, r3 /* 800068F4 00003834 7C 9E 23 78 */ mr r30, r4 /* 800068F8 00003838 48 33 6D FD */ bl __RAS_OSDisableInterrupts_begin @@ -144,7 +144,7 @@ lbl_80006944: /* 80006944 00003884 7F E3 FB 78 */ mr r3, r31 /* 80006948 00003888 48 33 6D D5 */ bl OSRestoreInterrupts /* 8000694C 0000388C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80006950 00003890 48 35 B8 D9 */ bl func_80362228 +/* 80006950 00003890 48 35 B8 D9 */ bl _restgpr_29 /* 80006954 00003894 80 01 00 24 */ lwz r0, 0x24(r1) /* 80006958 00003898 7C 08 03 A6 */ mtlr r0 /* 8000695C 0000389C 38 21 00 20 */ addi r1, r1, 0x20 @@ -167,7 +167,7 @@ mDoPrintf_vprintf__FPCcP16__va_list_struct: /* 80006988 000038C8 7C 08 02 A6 */ mflr r0 /* 8000698C 000038CC 90 01 00 24 */ stw r0, 0x24(r1) /* 80006990 000038D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80006994 000038D4 48 35 B8 49 */ bl func_803621DC +/* 80006994 000038D4 48 35 B8 49 */ bl _savegpr_29 /* 80006998 000038D8 7C 7D 1B 78 */ mr r29, r3 /* 8000699C 000038DC 7C 9E 23 78 */ mr r30, r4 /* 800069A0 000038E0 48 00 E3 C5 */ bl mDoExt_GetCurrentRunningThread @@ -197,7 +197,7 @@ lbl_800069EC: /* 800069F4 00003934 4B FF FF 71 */ bl mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct lbl_800069F8: /* 800069F8 00003938 39 61 00 20 */ addi r11, r1, 0x20 -/* 800069FC 0000393C 48 35 B8 2D */ bl func_80362228 +/* 800069FC 0000393C 48 35 B8 2D */ bl _restgpr_29 /* 80006A00 00003940 80 01 00 24 */ lwz r0, 0x24(r1) /* 80006A04 00003944 7C 08 03 A6 */ mtlr r0 /* 80006A08 00003948 38 21 00 20 */ addi r1, r1, 0x20 @@ -525,7 +525,7 @@ OSPanic: /* 80006E80 00003DC0 7C 08 02 A6 */ mflr r0 /* 80006E84 00003DC4 90 01 00 94 */ stw r0, 0x94(r1) /* 80006E88 00003DC8 39 61 00 90 */ addi r11, r1, 0x90 -/* 80006E8C 00003DCC 48 35 B3 51 */ bl func_803621DC +/* 80006E8C 00003DCC 48 35 B3 51 */ bl _savegpr_29 /* 80006E90 00003DD0 7C 7F 1B 78 */ mr r31, r3 /* 80006E94 00003DD4 7C 9E 23 78 */ mr r30, r4 /* 80006E98 00003DD8 7C BD 2B 78 */ mr r29, r5 @@ -598,7 +598,7 @@ lbl_80006F8C: /* 80006F94 00003ED4 90 03 45 67 */ stw r0, 0x4567(r3) /* 80006F98 00003ED8 48 33 2D 69 */ bl PPCHalt /* 80006F9C 00003EDC 39 61 00 90 */ addi r11, r1, 0x90 -/* 80006FA0 00003EE0 48 35 B2 89 */ bl func_80362228 +/* 80006FA0 00003EE0 48 35 B2 89 */ bl _restgpr_29 /* 80006FA4 00003EE4 80 01 00 94 */ lwz r0, 0x94(r1) /* 80006FA8 00003EE8 7C 08 03 A6 */ mtlr r0 /* 80006FAC 00003EEC 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/include/d_save.h b/include/d_save.h new file mode 100644 index 00000000000..ddbd66365ad --- /dev/null +++ b/include/d_save.h @@ -0,0 +1,130 @@ +#include "dolphin/types.h" + +enum Wallets { + WALLET, + BIG_WALLET, + GIANT_WALLET +}; + +enum ItemTable { + ORDON_SHIELD = 42, + WOODEN_SHIELD, + HYLIAN_SHIELD, + OOCCOOS_NOTE, + ORDON_CLOTHES, + HEROS_CLOTHES, + MAGIC_ARMOR, + ZORA_ARMOR, + HAWKEYE = 62, + WOODEN_SWORD, + GALE_BOOMERANG, + SPINNER, + BALL_AND_CHAIN, + HEROS_BOW, + CLAWSHOT, + IRON_BOOTS, + DOMINION_ROD, + DOUBLE_CLAWSHOTS, + LANTERN, + MASTER_SWORD, + FISHING_ROD, + SLINGSHOT, + DOMINION_ROD_2, // unused? + GIANT_BOMB_BAG = 79, + EMPTY_BOMBBAG, + BAG_AND_BOMBS, + UNUSED_BOMB_BAG, + FIRE_ARROW, // unused? + QUIVER, + BIG_QUIVER, + GIANT_QUIVER, + UNUSED_FISHING_ROD = 88, + HEROS_BOW_BOMBS, + HEROS_BOW_HAWKEYE, + ROD_BEE_LARVA, + ROD_CORAL_EARRING, + ROD_WORM, + ROD_CORAL_EARRING_BEE_LARVA, + ROD_CORAL_EARRING_WORM, + EMPTY_BOTTLE, + RED_POTION, + MAGIC_POTION, + BLUE_POTION, + MILK, + HALF_MILK, + LANTERN_OIL, + WATER, + LANTERN_OIL_2, // unused? + RED_POTION_2, // unused? + NASTY_SOUP, + HOT_SPRING_WATER, + FAIRY, + HOT_SPRING_WATER_2, // unused? + LANTERN_OIL_3, // unused? + LANTERN_OIL_4, // unused? + REGULAR_BOMBS, + WATER_BOMBS, + BOMBLINGS, + FAIRY_TEARS, + WORM, + FAIRY_TEARS_2, // unused? + BEE_LARVA, + RARE_CHU, + RED_CHU, + BLUE_CHU, + GREEN_CHU, + YELLOW_CHU, + PURPLE_CHU, + SIMPLE_SOUP, + GOOD_SOUP, + SUPERB_SOUP, + RENADOS_LETTER, + INVOICE, + WOODEN_STATUE, + ILIAS_CHARM, + HORSE_CALL, + AURUS_MEMO = 144, + ASHEIS_SKETCH, + LANTERN_2 = 156, // unused? + LANTERN_OIL_5, // unused? + BEE_LARVA_2, // unused? + BLACK_CHU_JELLY, // unused? + TEAR_OF_LIGHT, // unused? + VESSEL_OF_LIGHT, // unused? + VESSEL_OF_LIGHT_2, // unused? + ANCIENT_SKY_BOOK_EMPTY = 233, + ANCIENT_SKY_BOOK_PARTIAL, + ANCIENT_SKY_BOOK_FILLED, + NO_ITEM = 255 +}; + +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; + u16 getRupeeMax(void) const; + bool isMagicFlag(u8 unk_param) const; + + private: + u16 max_health; + u16 current_health; + u16 current_rupees; + u16 max_lantern_oil; + u16 current_lantern_oil; + u8 _unk1; + u8 select_item[3]; + u8 mix_item[3]; + u8 _unk2; + u8 _unk3; + u8 equipment[6]; + u8 current_wallet; + u8 _unk6; + u8 _unk7; + u8 magic_flag; + u8 _unk9; + u8 _unk10; + u8 _unk11[3]; +}; \ No newline at end of file diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DAnimation.cpp rename to libs/JSystem/J2DGraph/J2DAnimation.cpp diff --git a/src/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DAnmLoader.cpp rename to libs/JSystem/J2DGraph/J2DAnmLoader.cpp diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DGrafContext.cpp rename to libs/JSystem/J2DGraph/J2DGrafContext.cpp diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DManage.cpp rename to libs/JSystem/J2DGraph/J2DManage.cpp diff --git a/src/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DMatBlock.cpp rename to libs/JSystem/J2DGraph/J2DMatBlock.cpp diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DMaterial.cpp rename to libs/JSystem/J2DGraph/J2DMaterial.cpp diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DMaterialFactory.cpp rename to libs/JSystem/J2DGraph/J2DMaterialFactory.cpp diff --git a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DOrthoGraph.cpp rename to libs/JSystem/J2DGraph/J2DOrthoGraph.cpp diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPane.cpp rename to libs/JSystem/J2DGraph/J2DPane.cpp diff --git a/src/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPicture.cpp rename to libs/JSystem/J2DGraph/J2DPicture.cpp diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPictureEx.cpp rename to libs/JSystem/J2DGraph/J2DPictureEx.cpp diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPrint.cpp rename to libs/JSystem/J2DGraph/J2DPrint.cpp diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DScreen.cpp rename to libs/JSystem/J2DGraph/J2DScreen.cpp diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/J2DGraph/J2DTevs.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTevs.cpp rename to libs/JSystem/J2DGraph/J2DTevs.cpp diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTextBox.cpp rename to libs/JSystem/J2DGraph/J2DTextBox.cpp diff --git a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTextBoxEx.cpp rename to libs/JSystem/J2DGraph/J2DTextBoxEx.cpp diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DWindow.cpp rename to libs/JSystem/J2DGraph/J2DWindow.cpp diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DWindowEx.cpp rename to libs/JSystem/J2DGraph/J2DWindowEx.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DAnimation.cpp rename to libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DCluster.cpp rename to libs/JSystem/J3DGraphAnimator/J3DCluster.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DJoint.cpp rename to libs/JSystem/J3DGraphAnimator/J3DJoint.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DJointTree.cpp rename to libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp rename to libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp rename to libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DModel.cpp rename to libs/JSystem/J3DGraphAnimator/J3DModel.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DModelData.cpp rename to libs/JSystem/J3DGraphAnimator/J3DModelData.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp rename to libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp b/libs/JSystem/J3DGraphAnimator/J3DShapeTable.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp rename to libs/JSystem/J3DGraphAnimator/J3DShapeTable.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp rename to libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp rename to libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/libs/JSystem/J3DGraphBase/J3DGD.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DGD.cpp rename to libs/JSystem/J3DGraphBase/J3DGD.cpp diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DMatBlock.cpp rename to libs/JSystem/J3DGraphBase/J3DMatBlock.cpp diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DMaterial.cpp rename to libs/JSystem/J3DGraphBase/J3DMaterial.cpp diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DPacket.cpp rename to libs/JSystem/J3DGraphBase/J3DPacket.cpp diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/J3DGraphBase/J3DShape.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DShape.cpp rename to libs/JSystem/J3DGraphBase/J3DShape.cpp diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DShapeDraw.cpp rename to libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DShapeMtx.cpp rename to libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp diff --git a/src/JSystem/J3DGraphBase/J3DStruct.cpp b/libs/JSystem/J3DGraphBase/J3DStruct.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DStruct.cpp rename to libs/JSystem/J3DGraphBase/J3DStruct.cpp diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DSys.cpp rename to libs/JSystem/J3DGraphBase/J3DSys.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/J3DGraphBase/J3DTevs.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTevs.cpp rename to libs/JSystem/J3DGraphBase/J3DTevs.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTexture.cpp rename to libs/JSystem/J3DGraphBase/J3DTexture.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/libs/JSystem/J3DGraphBase/J3DTransform.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTransform.cpp rename to libs/JSystem/J3DGraphBase/J3DTransform.cpp diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DVertex.cpp rename to libs/JSystem/J3DGraphBase/J3DVertex.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp rename to libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp rename to libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DJointFactory.cpp rename to libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp rename to libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp rename to libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DModelLoader.cpp rename to libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp rename to libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp rename to libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/J3DU/J3DUClipper.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUClipper.cpp rename to libs/JSystem/J3DU/J3DUClipper.cpp diff --git a/src/JSystem/J3DU/J3DUDL.cpp b/libs/JSystem/J3DU/J3DUDL.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUDL.cpp rename to libs/JSystem/J3DU/J3DUDL.cpp diff --git a/src/JSystem/JAudio2/JAIAudible.cpp b/libs/JSystem/JAudio2/JAIAudible.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIAudible.cpp rename to libs/JSystem/JAudio2/JAIAudible.cpp diff --git a/src/JSystem/JAudio2/JAIAudience.cpp b/libs/JSystem/JAudio2/JAIAudience.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIAudience.cpp rename to libs/JSystem/JAudio2/JAIAudience.cpp diff --git a/src/JSystem/JAudio2/JAISe.cpp b/libs/JSystem/JAudio2/JAISe.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISe.cpp rename to libs/JSystem/JAudio2/JAISe.cpp diff --git a/src/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/JAudio2/JAISeMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeMgr.cpp rename to libs/JSystem/JAudio2/JAISeMgr.cpp diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/libs/JSystem/JAudio2/JAISeq.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeq.cpp rename to libs/JSystem/JAudio2/JAISeq.cpp diff --git a/src/JSystem/JAudio2/JAISeqDataMgr.cpp b/libs/JSystem/JAudio2/JAISeqDataMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeqDataMgr.cpp rename to libs/JSystem/JAudio2/JAISeqDataMgr.cpp diff --git a/src/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/JAudio2/JAISeqMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeqMgr.cpp rename to libs/JSystem/JAudio2/JAISeqMgr.cpp diff --git a/src/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISound.cpp rename to libs/JSystem/JAudio2/JAISound.cpp diff --git a/src/JSystem/JAudio2/JAISoundChild.cpp b/libs/JSystem/JAudio2/JAISoundChild.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundChild.cpp rename to libs/JSystem/JAudio2/JAISoundChild.cpp diff --git a/src/JSystem/JAudio2/JAISoundHandles.cpp b/libs/JSystem/JAudio2/JAISoundHandles.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundHandles.cpp rename to libs/JSystem/JAudio2/JAISoundHandles.cpp diff --git a/src/JSystem/JAudio2/JAISoundInfo.cpp b/libs/JSystem/JAudio2/JAISoundInfo.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundInfo.cpp rename to libs/JSystem/JAudio2/JAISoundInfo.cpp diff --git a/src/JSystem/JAudio2/JAISoundParams.cpp b/libs/JSystem/JAudio2/JAISoundParams.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundParams.cpp rename to libs/JSystem/JAudio2/JAISoundParams.cpp diff --git a/src/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/JAudio2/JAISoundStarter.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundStarter.cpp rename to libs/JSystem/JAudio2/JAISoundStarter.cpp diff --git a/src/JSystem/JAudio2/JAIStream.cpp b/libs/JSystem/JAudio2/JAIStream.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStream.cpp rename to libs/JSystem/JAudio2/JAIStream.cpp diff --git a/src/JSystem/JAudio2/JAIStreamDataMgr.cpp b/libs/JSystem/JAudio2/JAIStreamDataMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStreamDataMgr.cpp rename to libs/JSystem/JAudio2/JAIStreamDataMgr.cpp diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/JAudio2/JAIStreamMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStreamMgr.cpp rename to libs/JSystem/JAudio2/JAIStreamMgr.cpp diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/libs/JSystem/JAudio2/JASAiCtrl.cpp similarity index 100% rename from src/JSystem/JAudio2/JASAiCtrl.cpp rename to libs/JSystem/JAudio2/JASAiCtrl.cpp diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/libs/JSystem/JAudio2/JASAramStream.cpp similarity index 100% rename from src/JSystem/JAudio2/JASAramStream.cpp rename to libs/JSystem/JAudio2/JASAramStream.cpp diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/JAudio2/JASAudioReseter.cpp similarity index 100% rename from src/JSystem/JAudio2/JASAudioReseter.cpp rename to libs/JSystem/JAudio2/JASAudioReseter.cpp diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/JAudio2/JASAudioThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASAudioThread.cpp rename to libs/JSystem/JAudio2/JASAudioThread.cpp diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/libs/JSystem/JAudio2/JASBNKParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBNKParser.cpp rename to libs/JSystem/JAudio2/JASBNKParser.cpp diff --git a/src/JSystem/JAudio2/JASBank.cpp b/libs/JSystem/JAudio2/JASBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBank.cpp rename to libs/JSystem/JAudio2/JASBank.cpp diff --git a/src/JSystem/JAudio2/JASBasicBank.cpp b/libs/JSystem/JAudio2/JASBasicBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicBank.cpp rename to libs/JSystem/JAudio2/JASBasicBank.cpp diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/libs/JSystem/JAudio2/JASBasicInst.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicInst.cpp rename to libs/JSystem/JAudio2/JASBasicInst.cpp diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/libs/JSystem/JAudio2/JASBasicWaveBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicWaveBank.cpp rename to libs/JSystem/JAudio2/JASBasicWaveBank.cpp diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/JAudio2/JASCalc.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCalc.cpp rename to libs/JSystem/JAudio2/JASCalc.cpp diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/libs/JSystem/JAudio2/JASCallback.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCallback.cpp rename to libs/JSystem/JAudio2/JASCallback.cpp diff --git a/src/JSystem/JAudio2/JASChannel.cpp b/libs/JSystem/JAudio2/JASChannel.cpp similarity index 100% rename from src/JSystem/JAudio2/JASChannel.cpp rename to libs/JSystem/JAudio2/JASChannel.cpp diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/libs/JSystem/JAudio2/JASCmdStack.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCmdStack.cpp rename to libs/JSystem/JAudio2/JASCmdStack.cpp diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/libs/JSystem/JAudio2/JASDSPChannel.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDSPChannel.cpp rename to libs/JSystem/JAudio2/JASDSPChannel.cpp diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/libs/JSystem/JAudio2/JASDSPInterface.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDSPInterface.cpp rename to libs/JSystem/JAudio2/JASDSPInterface.cpp diff --git a/src/JSystem/JAudio2/JASDriverIF.cpp b/libs/JSystem/JAudio2/JASDriverIF.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDriverIF.cpp rename to libs/JSystem/JAudio2/JASDriverIF.cpp diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/libs/JSystem/JAudio2/JASDrumSet.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDrumSet.cpp rename to libs/JSystem/JAudio2/JASDrumSet.cpp diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/JAudio2/JASDvdThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDvdThread.cpp rename to libs/JSystem/JAudio2/JASDvdThread.cpp diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/JAudio2/JASHeapCtrl.cpp similarity index 100% rename from src/JSystem/JAudio2/JASHeapCtrl.cpp rename to libs/JSystem/JAudio2/JASHeapCtrl.cpp diff --git a/src/JSystem/JAudio2/JASLfo.cpp b/libs/JSystem/JAudio2/JASLfo.cpp similarity index 100% rename from src/JSystem/JAudio2/JASLfo.cpp rename to libs/JSystem/JAudio2/JASLfo.cpp diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/libs/JSystem/JAudio2/JASOscillator.cpp similarity index 100% rename from src/JSystem/JAudio2/JASOscillator.cpp rename to libs/JSystem/JAudio2/JASOscillator.cpp diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/libs/JSystem/JAudio2/JASProbe.cpp similarity index 100% rename from src/JSystem/JAudio2/JASProbe.cpp rename to libs/JSystem/JAudio2/JASProbe.cpp diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/libs/JSystem/JAudio2/JASRegisterParam.cpp similarity index 100% rename from src/JSystem/JAudio2/JASRegisterParam.cpp rename to libs/JSystem/JAudio2/JASRegisterParam.cpp diff --git a/src/JSystem/JAudio2/JASReport.cpp b/libs/JSystem/JAudio2/JASReport.cpp similarity index 100% rename from src/JSystem/JAudio2/JASReport.cpp rename to libs/JSystem/JAudio2/JASReport.cpp diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/JAudio2/JASResArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASResArcLoader.cpp rename to libs/JSystem/JAudio2/JASResArcLoader.cpp diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/libs/JSystem/JAudio2/JASSeqCtrl.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqCtrl.cpp rename to libs/JSystem/JAudio2/JASSeqCtrl.cpp diff --git a/src/JSystem/JAudio2/JASSeqParser.cpp b/libs/JSystem/JAudio2/JASSeqParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqParser.cpp rename to libs/JSystem/JAudio2/JASSeqParser.cpp diff --git a/src/JSystem/JAudio2/JASSeqReader.cpp b/libs/JSystem/JAudio2/JASSeqReader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqReader.cpp rename to libs/JSystem/JAudio2/JASSeqReader.cpp diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/libs/JSystem/JAudio2/JASSimpleWaveBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSimpleWaveBank.cpp rename to libs/JSystem/JAudio2/JASSimpleWaveBank.cpp diff --git a/src/JSystem/JAudio2/JASSoundParams.cpp b/libs/JSystem/JAudio2/JASSoundParams.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSoundParams.cpp rename to libs/JSystem/JAudio2/JASSoundParams.cpp diff --git a/src/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTaskThread.cpp rename to libs/JSystem/JAudio2/JASTaskThread.cpp diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTrack.cpp rename to libs/JSystem/JAudio2/JASTrack.cpp diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/libs/JSystem/JAudio2/JASTrackPort.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTrackPort.cpp rename to libs/JSystem/JAudio2/JASTrackPort.cpp diff --git a/src/JSystem/JAudio2/JASVoiceBank.cpp b/libs/JSystem/JAudio2/JASVoiceBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASVoiceBank.cpp rename to libs/JSystem/JAudio2/JASVoiceBank.cpp diff --git a/src/JSystem/JAudio2/JASWSParser.cpp b/libs/JSystem/JAudio2/JASWSParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASWSParser.cpp rename to libs/JSystem/JAudio2/JASWSParser.cpp diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASWaveArcLoader.cpp rename to libs/JSystem/JAudio2/JASWaveArcLoader.cpp diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/libs/JSystem/JAudio2/JAUAudioArcInterpreter.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp rename to libs/JSystem/JAudio2/JAUAudioArcInterpreter.cpp diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioArcLoader.cpp rename to libs/JSystem/JAudio2/JAUAudioArcLoader.cpp diff --git a/src/JSystem/JAudio2/JAUAudioMgr.cpp b/libs/JSystem/JAudio2/JAUAudioMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioMgr.cpp rename to libs/JSystem/JAudio2/JAUAudioMgr.cpp diff --git a/src/JSystem/JAudio2/JAUBankTable.cpp b/libs/JSystem/JAudio2/JAUBankTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUBankTable.cpp rename to libs/JSystem/JAudio2/JAUBankTable.cpp diff --git a/src/JSystem/JAudio2/JAUClusterSound.cpp b/libs/JSystem/JAudio2/JAUClusterSound.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUClusterSound.cpp rename to libs/JSystem/JAudio2/JAUClusterSound.cpp diff --git a/src/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/JAudio2/JAUInitializer.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUInitializer.cpp rename to libs/JSystem/JAudio2/JAUInitializer.cpp diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSectionHeap.cpp rename to libs/JSystem/JAudio2/JAUSectionHeap.cpp diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/libs/JSystem/JAudio2/JAUSeqCollection.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSeqCollection.cpp rename to libs/JSystem/JAudio2/JAUSeqCollection.cpp diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp rename to libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp diff --git a/src/JSystem/JAudio2/JAUSoundAnimator.cpp b/libs/JSystem/JAudio2/JAUSoundAnimator.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundAnimator.cpp rename to libs/JSystem/JAudio2/JAUSoundAnimator.cpp diff --git a/src/JSystem/JAudio2/JAUSoundTable.cpp b/libs/JSystem/JAudio2/JAUSoundTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundTable.cpp rename to libs/JSystem/JAudio2/JAUSoundTable.cpp diff --git a/src/JSystem/JAudio2/JAUStreamFileTable.cpp b/libs/JSystem/JAudio2/JAUStreamFileTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUStreamFileTable.cpp rename to libs/JSystem/JAudio2/JAUStreamFileTable.cpp diff --git a/src/JSystem/JAudio2/dspproc.cpp b/libs/JSystem/JAudio2/dspproc.cpp similarity index 100% rename from src/JSystem/JAudio2/dspproc.cpp rename to libs/JSystem/JAudio2/dspproc.cpp diff --git a/src/JSystem/JAudio2/dsptask.cpp b/libs/JSystem/JAudio2/dsptask.cpp similarity index 100% rename from src/JSystem/JAudio2/dsptask.cpp rename to libs/JSystem/JAudio2/dsptask.cpp diff --git a/src/JSystem/JAudio2/osdsp.cpp b/libs/JSystem/JAudio2/osdsp.cpp similarity index 100% rename from src/JSystem/JAudio2/osdsp.cpp rename to libs/JSystem/JAudio2/osdsp.cpp diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/libs/JSystem/JAudio2/osdsp_task.cpp similarity index 100% rename from src/JSystem/JAudio2/osdsp_task.cpp rename to libs/JSystem/JAudio2/osdsp_task.cpp diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp similarity index 100% rename from src/JSystem/JFramework/JFWDisplay.cpp rename to libs/JSystem/JFramework/JFWDisplay.cpp diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp similarity index 100% rename from src/JSystem/JFramework/JFWSystem.cpp rename to libs/JSystem/JFramework/JFWSystem.cpp diff --git a/src/JSystem/JGadget/binary.cpp b/libs/JSystem/JGadget/binary.cpp similarity index 100% rename from src/JSystem/JGadget/binary.cpp rename to libs/JSystem/JGadget/binary.cpp diff --git a/src/JSystem/JGadget/linklist.cpp b/libs/JSystem/JGadget/linklist.cpp similarity index 100% rename from src/JSystem/JGadget/linklist.cpp rename to libs/JSystem/JGadget/linklist.cpp diff --git a/src/JSystem/JGadget/std-vector.cpp b/libs/JSystem/JGadget/std-vector.cpp similarity index 100% rename from src/JSystem/JGadget/std-vector.cpp rename to libs/JSystem/JGadget/std-vector.cpp diff --git a/src/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAram.cpp rename to libs/JSystem/JKernel/JKRAram.cpp diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramArchive.cpp rename to libs/JSystem/JKernel/JKRAramArchive.cpp diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/libs/JSystem/JKernel/JKRAramBlock.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramBlock.cpp rename to libs/JSystem/JKernel/JKRAramBlock.cpp diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramHeap.cpp rename to libs/JSystem/JKernel/JKRAramHeap.cpp diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramPiece.cpp rename to libs/JSystem/JKernel/JKRAramPiece.cpp diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramStream.cpp rename to libs/JSystem/JKernel/JKRAramStream.cpp diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePri.cpp rename to libs/JSystem/JKernel/JKRArchivePri.cpp diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/libs/JSystem/JKernel/JKRArchivePub.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePub.cpp rename to libs/JSystem/JKernel/JKRArchivePub.cpp diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/libs/JSystem/JKernel/JKRAssertHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAssertHeap.cpp rename to libs/JSystem/JKernel/JKRAssertHeap.cpp diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRCompArchive.cpp rename to libs/JSystem/JKernel/JKRCompArchive.cpp diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/JKernel/JKRDecomp.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDecomp.cpp rename to libs/JSystem/JKernel/JKRDecomp.cpp diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/libs/JSystem/JKernel/JKRDisposer.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDisposer.cpp rename to libs/JSystem/JKernel/JKRDisposer.cpp diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdAramRipper.cpp rename to libs/JSystem/JKernel/JKRDvdAramRipper.cpp diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdArchive.cpp rename to libs/JSystem/JKernel/JKRDvdArchive.cpp diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdFile.cpp rename to libs/JSystem/JKernel/JKRDvdFile.cpp diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdRipper.cpp rename to libs/JSystem/JKernel/JKRDvdRipper.cpp diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRExpHeap.cpp rename to libs/JSystem/JKernel/JKRExpHeap.cpp diff --git a/src/JSystem/JKernel/JKRFile.cpp b/libs/JSystem/JKernel/JKRFile.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFile.cpp rename to libs/JSystem/JKernel/JKRFile.cpp diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileCache.cpp rename to libs/JSystem/JKernel/JKRFileCache.cpp diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/libs/JSystem/JKernel/JKRFileFinder.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileFinder.cpp rename to libs/JSystem/JKernel/JKRFileFinder.cpp diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileLoader.cpp rename to libs/JSystem/JKernel/JKRFileLoader.cpp diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRHeap.cpp rename to libs/JSystem/JKernel/JKRHeap.cpp diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRMemArchive.cpp rename to libs/JSystem/JKernel/JKRMemArchive.cpp diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRSolidHeap.cpp rename to libs/JSystem/JKernel/JKRSolidHeap.cpp diff --git a/src/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp similarity index 100% rename from src/JSystem/JKernel/JKRThread.cpp rename to libs/JSystem/JKernel/JKRThread.cpp diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp similarity index 100% rename from src/JSystem/JMath/JMATrigonometric.cpp rename to libs/JSystem/JMath/JMATrigonometric.cpp diff --git a/src/JSystem/JMath/JMath.cpp b/libs/JSystem/JMath/JMath.cpp similarity index 100% rename from src/JSystem/JMath/JMath.cpp rename to libs/JSystem/JMath/JMath.cpp diff --git a/src/JSystem/JMath/random.cpp b/libs/JSystem/JMath/random.cpp similarity index 100% rename from src/JSystem/JMath/random.cpp rename to libs/JSystem/JMath/random.cpp diff --git a/src/JSystem/JMessage/control.cpp b/libs/JSystem/JMessage/control.cpp similarity index 100% rename from src/JSystem/JMessage/control.cpp rename to libs/JSystem/JMessage/control.cpp diff --git a/src/JSystem/JMessage/data.cpp b/libs/JSystem/JMessage/data.cpp similarity index 100% rename from src/JSystem/JMessage/data.cpp rename to libs/JSystem/JMessage/data.cpp diff --git a/src/JSystem/JMessage/locale.cpp b/libs/JSystem/JMessage/locale.cpp similarity index 100% rename from src/JSystem/JMessage/locale.cpp rename to libs/JSystem/JMessage/locale.cpp diff --git a/src/JSystem/JMessage/processor.cpp b/libs/JSystem/JMessage/processor.cpp similarity index 100% rename from src/JSystem/JMessage/processor.cpp rename to libs/JSystem/JMessage/processor.cpp diff --git a/src/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp similarity index 100% rename from src/JSystem/JMessage/resource.cpp rename to libs/JSystem/JMessage/resource.cpp diff --git a/src/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/JParticle/JPABaseShape.cpp similarity index 100% rename from src/JSystem/JParticle/JPABaseShape.cpp rename to libs/JSystem/JParticle/JPABaseShape.cpp diff --git a/src/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp similarity index 100% rename from src/JSystem/JParticle/JPAChildShape.cpp rename to libs/JSystem/JParticle/JPAChildShape.cpp diff --git a/src/JSystem/JParticle/JPADynamicsBlock.cpp b/libs/JSystem/JParticle/JPADynamicsBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPADynamicsBlock.cpp rename to libs/JSystem/JParticle/JPADynamicsBlock.cpp diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/libs/JSystem/JParticle/JPAEmitter.cpp similarity index 100% rename from src/JSystem/JParticle/JPAEmitter.cpp rename to libs/JSystem/JParticle/JPAEmitter.cpp diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp similarity index 100% rename from src/JSystem/JParticle/JPAEmitterManager.cpp rename to libs/JSystem/JParticle/JPAEmitterManager.cpp diff --git a/src/JSystem/JParticle/JPAExTexShape.cpp b/libs/JSystem/JParticle/JPAExTexShape.cpp similarity index 100% rename from src/JSystem/JParticle/JPAExTexShape.cpp rename to libs/JSystem/JParticle/JPAExTexShape.cpp diff --git a/src/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/JParticle/JPAExtraShape.cpp similarity index 100% rename from src/JSystem/JParticle/JPAExtraShape.cpp rename to libs/JSystem/JParticle/JPAExtraShape.cpp diff --git a/src/JSystem/JParticle/JPAFieldBlock.cpp b/libs/JSystem/JParticle/JPAFieldBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPAFieldBlock.cpp rename to libs/JSystem/JParticle/JPAFieldBlock.cpp diff --git a/src/JSystem/JParticle/JPAKeyBlock.cpp b/libs/JSystem/JParticle/JPAKeyBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPAKeyBlock.cpp rename to libs/JSystem/JParticle/JPAKeyBlock.cpp diff --git a/src/JSystem/JParticle/JPAMath.cpp b/libs/JSystem/JParticle/JPAMath.cpp similarity index 100% rename from src/JSystem/JParticle/JPAMath.cpp rename to libs/JSystem/JParticle/JPAMath.cpp diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/libs/JSystem/JParticle/JPAParticle.cpp similarity index 100% rename from src/JSystem/JParticle/JPAParticle.cpp rename to libs/JSystem/JParticle/JPAParticle.cpp diff --git a/src/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResource.cpp rename to libs/JSystem/JParticle/JPAResource.cpp diff --git a/src/JSystem/JParticle/JPAResourceLoader.cpp b/libs/JSystem/JParticle/JPAResourceLoader.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResourceLoader.cpp rename to libs/JSystem/JParticle/JPAResourceLoader.cpp diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/JParticle/JPAResourceManager.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResourceManager.cpp rename to libs/JSystem/JParticle/JPAResourceManager.cpp diff --git a/src/JSystem/JParticle/JPATexture.cpp b/libs/JSystem/JParticle/JPATexture.cpp similarity index 100% rename from src/JSystem/JParticle/JPATexture.cpp rename to libs/JSystem/JParticle/JPATexture.cpp diff --git a/src/JSystem/JStage/JSGActor.cpp b/libs/JSystem/JStage/JSGActor.cpp similarity index 100% rename from src/JSystem/JStage/JSGActor.cpp rename to libs/JSystem/JStage/JSGActor.cpp diff --git a/src/JSystem/JStage/JSGAmbientLight.cpp b/libs/JSystem/JStage/JSGAmbientLight.cpp similarity index 100% rename from src/JSystem/JStage/JSGAmbientLight.cpp rename to libs/JSystem/JStage/JSGAmbientLight.cpp diff --git a/src/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/JStage/JSGCamera.cpp similarity index 100% rename from src/JSystem/JStage/JSGCamera.cpp rename to libs/JSystem/JStage/JSGCamera.cpp diff --git a/src/JSystem/JStage/JSGFog.cpp b/libs/JSystem/JStage/JSGFog.cpp similarity index 100% rename from src/JSystem/JStage/JSGFog.cpp rename to libs/JSystem/JStage/JSGFog.cpp diff --git a/src/JSystem/JStage/JSGLight.cpp b/libs/JSystem/JStage/JSGLight.cpp similarity index 100% rename from src/JSystem/JStage/JSGLight.cpp rename to libs/JSystem/JStage/JSGLight.cpp diff --git a/src/JSystem/JStage/JSGObject.cpp b/libs/JSystem/JStage/JSGObject.cpp similarity index 100% rename from src/JSystem/JStage/JSGObject.cpp rename to libs/JSystem/JStage/JSGObject.cpp diff --git a/src/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp similarity index 100% rename from src/JSystem/JStage/JSGSystem.cpp rename to libs/JSystem/JStage/JSGSystem.cpp diff --git a/src/JSystem/JStudio/ctb-data.cpp b/libs/JSystem/JStudio/ctb-data.cpp similarity index 100% rename from src/JSystem/JStudio/ctb-data.cpp rename to libs/JSystem/JStudio/ctb-data.cpp diff --git a/src/JSystem/JStudio/ctb.cpp b/libs/JSystem/JStudio/ctb.cpp similarity index 100% rename from src/JSystem/JStudio/ctb.cpp rename to libs/JSystem/JStudio/ctb.cpp diff --git a/src/JSystem/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/functionvalue.cpp similarity index 100% rename from src/JSystem/JStudio/functionvalue.cpp rename to libs/JSystem/JStudio/functionvalue.cpp diff --git a/src/JSystem/JStudio/fvb-data-parse.cpp b/libs/JSystem/JStudio/fvb-data-parse.cpp similarity index 100% rename from src/JSystem/JStudio/fvb-data-parse.cpp rename to libs/JSystem/JStudio/fvb-data-parse.cpp diff --git a/src/JSystem/JStudio/fvb-data.cpp b/libs/JSystem/JStudio/fvb-data.cpp similarity index 100% rename from src/JSystem/JStudio/fvb-data.cpp rename to libs/JSystem/JStudio/fvb-data.cpp diff --git a/src/JSystem/JStudio/fvb.cpp b/libs/JSystem/JStudio/fvb.cpp similarity index 100% rename from src/JSystem/JStudio/fvb.cpp rename to libs/JSystem/JStudio/fvb.cpp diff --git a/src/JSystem/JStudio/jstudio-control.cpp b/libs/JSystem/JStudio/jstudio-control.cpp similarity index 100% rename from src/JSystem/JStudio/jstudio-control.cpp rename to libs/JSystem/JStudio/jstudio-control.cpp diff --git a/src/JSystem/JStudio/jstudio-data.cpp b/libs/JSystem/JStudio/jstudio-data.cpp similarity index 100% rename from src/JSystem/JStudio/jstudio-data.cpp rename to libs/JSystem/JStudio/jstudio-data.cpp diff --git a/src/JSystem/JStudio/jstudio-math.cpp b/libs/JSystem/JStudio/jstudio-math.cpp similarity index 100% rename from src/JSystem/JStudio/jstudio-math.cpp rename to libs/JSystem/JStudio/jstudio-math.cpp diff --git a/src/JSystem/JStudio/jstudio-object.cpp b/libs/JSystem/JStudio/jstudio-object.cpp similarity index 100% rename from src/JSystem/JStudio/jstudio-object.cpp rename to libs/JSystem/JStudio/jstudio-object.cpp diff --git a/src/JSystem/JStudio/object-id.cpp b/libs/JSystem/JStudio/object-id.cpp similarity index 100% rename from src/JSystem/JStudio/object-id.cpp rename to libs/JSystem/JStudio/object-id.cpp diff --git a/src/JSystem/JStudio_JParticle/object-particle.cpp b/libs/JSystem/JStudio/object-particle.cpp similarity index 100% rename from src/JSystem/JStudio_JParticle/object-particle.cpp rename to libs/JSystem/JStudio/object-particle.cpp diff --git a/src/JSystem/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/object-sound.cpp similarity index 100% rename from src/JSystem/JStudio_JAudio2/object-sound.cpp rename to libs/JSystem/JStudio/object-sound.cpp diff --git a/src/JSystem/JStudio_JAudio2/control.cpp b/libs/JSystem/JStudio/stb-data-parse.cpp similarity index 100% rename from src/JSystem/JStudio_JAudio2/control.cpp rename to libs/JSystem/JStudio/stb-data-parse.cpp diff --git a/src/JSystem/JStudio_JParticle/control.cpp b/libs/JSystem/JStudio/stb-data.cpp similarity index 100% rename from src/JSystem/JStudio_JParticle/control.cpp rename to libs/JSystem/JStudio/stb-data.cpp diff --git a/src/JSystem/JStudio_JStage/control.cpp b/libs/JSystem/JStudio/stb.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/control.cpp rename to libs/JSystem/JStudio/stb.cpp diff --git a/src/JSystem/JStudio_JStage/object-actor.cpp b/libs/JSystem/JStudio_JAudio2/control.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/object-actor.cpp rename to libs/JSystem/JStudio_JAudio2/control.cpp diff --git a/src/JSystem/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/JStudio_JAudio2/object-sound.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/object-ambientlight.cpp rename to libs/JSystem/JStudio_JAudio2/object-sound.cpp diff --git a/src/JSystem/JStudio_JStage/object-camera.cpp b/libs/JSystem/JStudio_JParticle/control.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/object-camera.cpp rename to libs/JSystem/JStudio_JParticle/control.cpp diff --git a/src/JSystem/JStudio_JStage/object-fog.cpp b/libs/JSystem/JStudio_JParticle/object-particle.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/object-fog.cpp rename to libs/JSystem/JStudio_JParticle/object-particle.cpp diff --git a/src/JSystem/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio_JStage/control.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/object-light.cpp rename to libs/JSystem/JStudio_JStage/control.cpp diff --git a/src/JSystem/JStudio_JStage/object.cpp b/libs/JSystem/JStudio_JStage/object-actor.cpp similarity index 100% rename from src/JSystem/JStudio_JStage/object.cpp rename to libs/JSystem/JStudio_JStage/object-actor.cpp diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/libs/JSystem/JStudio_JStage/object-ambientlight.cpp similarity index 100% rename from src/JSystem/JSupport/JSUFileStream.cpp rename to libs/JSystem/JStudio_JStage/object-ambientlight.cpp diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/libs/JSystem/JStudio_JStage/object-camera.cpp similarity index 100% rename from src/JSystem/JSupport/JSUInputStream.cpp rename to libs/JSystem/JStudio_JStage/object-camera.cpp diff --git a/src/JSystem/JSupport/JSUList.cpp b/libs/JSystem/JStudio_JStage/object-fog.cpp similarity index 100% rename from src/JSystem/JSupport/JSUList.cpp rename to libs/JSystem/JStudio_JStage/object-fog.cpp diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JStudio_JStage/object-light.cpp similarity index 100% rename from src/JSystem/JSupport/JSUMemoryStream.cpp rename to libs/JSystem/JStudio_JStage/object-light.cpp diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/JStudio_JStage/object.cpp similarity index 100% rename from src/JSystem/JUtility/JUTAssert.cpp rename to libs/JSystem/JStudio_JStage/object.cpp diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JSupport/JSUFileStream.cpp similarity index 100% rename from src/JSystem/JUtility/JUTCacheFont.cpp rename to libs/JSystem/JSupport/JSUFileStream.cpp diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JSupport/JSUInputStream.cpp similarity index 100% rename from src/JSystem/JUtility/JUTConsole.cpp rename to libs/JSystem/JSupport/JSUInputStream.cpp diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JSupport/JSUList.cpp similarity index 100% rename from src/JSystem/JUtility/JUTDbPrint.cpp rename to libs/JSystem/JSupport/JSUList.cpp diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp similarity index 100% rename from src/JSystem/JUtility/JUTDirectFile.cpp rename to libs/JSystem/JSupport/JSUMemoryStream.cpp diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTAssert.cpp similarity index 100% rename from src/JSystem/JUtility/JUTDirectPrint.cpp rename to libs/JSystem/JUtility/JUTAssert.cpp diff --git a/src/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp similarity index 100% rename from src/JSystem/JUtility/JUTException.cpp rename to libs/JSystem/JUtility/JUTCacheFont.cpp diff --git a/src/JSystem/JUtility/JUTFader.cpp b/libs/JSystem/JUtility/JUTConsole.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFader.cpp rename to libs/JSystem/JUtility/JUTConsole.cpp diff --git a/src/JSystem/JUtility/JUTFont.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFont.cpp rename to libs/JSystem/JUtility/JUTDbPrint.cpp diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/libs/JSystem/JUtility/JUTDirectFile.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp rename to libs/JSystem/JUtility/JUTDirectFile.cpp diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGamePad.cpp rename to libs/JSystem/JUtility/JUTDirectPrint.cpp diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/libs/JSystem/JUtility/JUTException.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGraphFifo.cpp rename to libs/JSystem/JUtility/JUTException.cpp diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTFader.cpp similarity index 100% rename from src/JSystem/JUtility/JUTNameTab.cpp rename to libs/JSystem/JUtility/JUTFader.cpp diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/JUtility/JUTFont.cpp similarity index 100% rename from src/JSystem/JUtility/JUTPalette.cpp rename to libs/JSystem/JUtility/JUTFont.cpp diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp similarity index 100% rename from src/JSystem/JUtility/JUTProcBar.cpp rename to libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp similarity index 100% rename from src/JSystem/JUtility/JUTResFont.cpp rename to libs/JSystem/JUtility/JUTGamePad.cpp diff --git a/src/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/JUtility/JUTGraphFifo.cpp similarity index 100% rename from src/JSystem/JUtility/JUTResource.cpp rename to libs/JSystem/JUtility/JUTGraphFifo.cpp diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp similarity index 100% rename from src/JSystem/JUtility/JUTTexture.cpp rename to libs/JSystem/JUtility/JUTNameTab.cpp diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTPalette.cpp similarity index 100% rename from src/JSystem/JUtility/JUTVideo.cpp rename to libs/JSystem/JUtility/JUTPalette.cpp diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/JUtility/JUTProcBar.cpp similarity index 100% rename from src/JSystem/JUtility/JUTXfb.cpp rename to libs/JSystem/JUtility/JUTProcBar.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp b/libs/JSystem/JUtility/JUTResFont.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp rename to libs/JSystem/JUtility/JUTResFont.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/abort_exit.cpp b/libs/JSystem/JUtility/JUTResource.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/abort_exit.cpp rename to libs/JSystem/JUtility/JUTResource.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/alloc.cpp b/libs/JSystem/JUtility/JUTTexture.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/alloc.cpp rename to libs/JSystem/JUtility/JUTTexture.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/ansi_files.cpp b/libs/JSystem/JUtility/JUTVideo.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/ansi_files.cpp rename to libs/JSystem/JUtility/JUTVideo.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/arith.cpp b/libs/JSystem/JUtility/JUTXfb.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/arith.cpp rename to libs/JSystem/JUtility/JUTXfb.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/buffer_io.cpp b/libs/MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/buffer_io.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/FILE_POS.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/char_io.cpp b/libs/MSL/MSL_C/MSL_Common/Src/abort_exit.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/char_io.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/abort_exit.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/ctype.cpp b/libs/MSL/MSL_C/MSL_Common/Src/alloc.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/ctype.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/alloc.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/direct_io.cpp b/libs/MSL/MSL_C/MSL_Common/Src/ansi_files.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/direct_io.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/ansi_files.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/errno.cpp b/libs/MSL/MSL_C/MSL_Common/Src/arith.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/errno.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/arith.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/extras.cpp b/libs/MSL/MSL_C/MSL_Common/Src/buffer_io.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/extras.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/buffer_io.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/file_io.cpp b/libs/MSL/MSL_C/MSL_Common/Src/char_io.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/file_io.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/char_io.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/float.cpp b/libs/MSL/MSL_C/MSL_Common/Src/ctype.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/float.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/ctype.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/mbstring.cpp b/libs/MSL/MSL_C/MSL_Common/Src/direct_io.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/mbstring.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/direct_io.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/mem.cpp b/libs/MSL/MSL_C/MSL_Common/Src/errno.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/mem.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/errno.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp b/libs/MSL/MSL_C/MSL_Common/Src/extras.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/extras.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/misc_io.cpp b/libs/MSL/MSL_C/MSL_Common/Src/file_io.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/misc_io.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/file_io.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/printf.cpp b/libs/MSL/MSL_C/MSL_Common/Src/float.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/printf.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/float.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/scanf.cpp b/libs/MSL/MSL_C/MSL_Common/Src/mbstring.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/scanf.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/mbstring.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/signal.cpp b/libs/MSL/MSL_C/MSL_Common/Src/mem.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/signal.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/mem.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/string.cpp b/libs/MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/string.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/mem_funcs.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/strtoul.cpp b/libs/MSL/MSL_C/MSL_Common/Src/misc_io.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/strtoul.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/misc_io.cpp diff --git a/src/MSL/MSL_C/MSL_Common/Src/wchar_io.cpp b/libs/MSL/MSL_C/MSL_Common/Src/printf.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common/Src/wchar_io.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/printf.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.cpp b/libs/MSL/MSL_C/MSL_Common/Src/scanf.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/scanf.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.cpp b/libs/MSL/MSL_C/MSL_Common/Src/signal.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/signal.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.cpp b/libs/MSL/MSL_C/MSL_Common/Src/string.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/string.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.cpp b/libs/MSL/MSL_C/MSL_Common/Src/strtoul.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/strtoul.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.cpp b/libs/MSL/MSL_C/MSL_Common/Src/wchar_io.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.cpp rename to libs/MSL/MSL_C/MSL_Common/Src/wchar_io.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.cpp diff --git a/src/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.cpp similarity index 100% rename from src/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.cpp diff --git a/src/MSL/MSL_C/PPC_EABI/SRC/critical_regions.gamecube.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.cpp similarity index 100% rename from src/MSL/MSL_C/PPC_EABI/SRC/critical_regions.gamecube.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.cpp diff --git a/src/MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.cpp similarity index 100% rename from src/MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.cpp diff --git a/src/MSL/MSL_C/PPC_EABI/SRC/uart_console_io_gcn.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.cpp similarity index 100% rename from src/MSL/MSL_C/PPC_EABI/SRC/uart_console_io_gcn.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.cpp diff --git a/src/OdemuExi2/DebuggerDriver.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.cpp similarity index 100% rename from src/OdemuExi2/DebuggerDriver.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.cpp diff --git a/src/Runtime_PPCEABI_H/CPlusLibPPC.cpp b/libs/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/CPlusLibPPC.cpp rename to libs/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.cpp diff --git a/src/Runtime_PPCEABI_H/GCN_mem_alloc.cpp b/libs/MSL/MSL_C/PPC_EABI/SRC/critical_regions.gamecube.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/GCN_mem_alloc.cpp rename to libs/MSL/MSL_C/PPC_EABI/SRC/critical_regions.gamecube.cpp diff --git a/src/Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp b/libs/MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp rename to libs/MSL/MSL_C/PPC_EABI/SRC/math_ppc.cpp diff --git a/src/Runtime_PPCEABI_H/NMWException.cpp b/libs/MSL/MSL_C/PPC_EABI/SRC/uart_console_io_gcn.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/NMWException.cpp rename to libs/MSL/MSL_C/PPC_EABI/SRC/uart_console_io_gcn.cpp diff --git a/src/Runtime_PPCEABI_H/__init_cpp_exceptions.cpp b/libs/MSL/Runtime_PPCEABI_H/CPlusLibPPC.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/__init_cpp_exceptions.cpp rename to libs/MSL/Runtime_PPCEABI_H/CPlusLibPPC.cpp diff --git a/src/Runtime_PPCEABI_H/__va_arg.cpp b/libs/MSL/Runtime_PPCEABI_H/GCN_mem_alloc.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/__va_arg.cpp rename to libs/MSL/Runtime_PPCEABI_H/GCN_mem_alloc.cpp diff --git a/src/Runtime_PPCEABI_H/global_destructor_chain.cpp b/libs/MSL/Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/global_destructor_chain.cpp rename to libs/MSL/Runtime_PPCEABI_H/Gecko_ExceptionPPC.cpp diff --git a/src/Runtime_PPCEABI_H/ptmf.cpp b/libs/MSL/Runtime_PPCEABI_H/NMWException.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/ptmf.cpp rename to libs/MSL/Runtime_PPCEABI_H/NMWException.cpp diff --git a/src/Runtime_PPCEABI_H/runtime.cpp b/libs/MSL/Runtime_PPCEABI_H/__init_cpp_exceptions.cpp similarity index 100% rename from src/Runtime_PPCEABI_H/runtime.cpp rename to libs/MSL/Runtime_PPCEABI_H/__init_cpp_exceptions.cpp diff --git a/src/SComponent/c_API.cpp b/libs/MSL/Runtime_PPCEABI_H/__va_arg.cpp similarity index 100% rename from src/SComponent/c_API.cpp rename to libs/MSL/Runtime_PPCEABI_H/__va_arg.cpp diff --git a/src/SComponent/c_API_controller_pad.cpp b/libs/MSL/Runtime_PPCEABI_H/global_destructor_chain.cpp similarity index 100% rename from src/SComponent/c_API_controller_pad.cpp rename to libs/MSL/Runtime_PPCEABI_H/global_destructor_chain.cpp diff --git a/src/SComponent/c_API_graphic.cpp b/libs/MSL/Runtime_PPCEABI_H/ptmf.cpp similarity index 100% rename from src/SComponent/c_API_graphic.cpp rename to libs/MSL/Runtime_PPCEABI_H/ptmf.cpp diff --git a/src/SComponent/c_angle.cpp b/libs/MSL/Runtime_PPCEABI_H/runtime.cpp similarity index 100% rename from src/SComponent/c_angle.cpp rename to libs/MSL/Runtime_PPCEABI_H/runtime.cpp diff --git a/src/SComponent/c_bg_s_chk.cpp b/libs/SComponent/c_API.cpp similarity index 100% rename from src/SComponent/c_bg_s_chk.cpp rename to libs/SComponent/c_API.cpp diff --git a/src/SComponent/c_bg_s_gnd_chk.cpp b/libs/SComponent/c_API_controller_pad.cpp similarity index 100% rename from src/SComponent/c_bg_s_gnd_chk.cpp rename to libs/SComponent/c_API_controller_pad.cpp diff --git a/src/SComponent/c_bg_s_lin_chk.cpp b/libs/SComponent/c_API_graphic.cpp similarity index 100% rename from src/SComponent/c_bg_s_lin_chk.cpp rename to libs/SComponent/c_API_graphic.cpp diff --git a/src/SComponent/c_bg_s_poly_info.cpp b/libs/SComponent/c_angle.cpp similarity index 100% rename from src/SComponent/c_bg_s_poly_info.cpp rename to libs/SComponent/c_angle.cpp diff --git a/src/SComponent/c_bg_s_shdw_draw.cpp b/libs/SComponent/c_bg_s_chk.cpp similarity index 100% rename from src/SComponent/c_bg_s_shdw_draw.cpp rename to libs/SComponent/c_bg_s_chk.cpp diff --git a/src/SComponent/c_bg_w.cpp b/libs/SComponent/c_bg_s_gnd_chk.cpp similarity index 100% rename from src/SComponent/c_bg_w.cpp rename to libs/SComponent/c_bg_s_gnd_chk.cpp diff --git a/src/SComponent/c_cc_d.cpp b/libs/SComponent/c_bg_s_lin_chk.cpp similarity index 100% rename from src/SComponent/c_cc_d.cpp rename to libs/SComponent/c_bg_s_lin_chk.cpp diff --git a/src/SComponent/c_cc_s.cpp b/libs/SComponent/c_bg_s_poly_info.cpp similarity index 100% rename from src/SComponent/c_cc_s.cpp rename to libs/SComponent/c_bg_s_poly_info.cpp diff --git a/src/SComponent/c_counter.cpp b/libs/SComponent/c_bg_s_shdw_draw.cpp similarity index 100% rename from src/SComponent/c_counter.cpp rename to libs/SComponent/c_bg_s_shdw_draw.cpp diff --git a/src/SComponent/c_lib.cpp b/libs/SComponent/c_bg_w.cpp similarity index 100% rename from src/SComponent/c_lib.cpp rename to libs/SComponent/c_bg_w.cpp diff --git a/src/SComponent/c_list.cpp b/libs/SComponent/c_cc_d.cpp similarity index 100% rename from src/SComponent/c_list.cpp rename to libs/SComponent/c_cc_d.cpp diff --git a/src/SComponent/c_list_iter.cpp b/libs/SComponent/c_cc_s.cpp similarity index 100% rename from src/SComponent/c_list_iter.cpp rename to libs/SComponent/c_cc_s.cpp diff --git a/src/SComponent/c_m2d.cpp b/libs/SComponent/c_counter.cpp similarity index 100% rename from src/SComponent/c_m2d.cpp rename to libs/SComponent/c_counter.cpp diff --git a/src/SComponent/c_m3d.cpp b/libs/SComponent/c_lib.cpp similarity index 100% rename from src/SComponent/c_m3d.cpp rename to libs/SComponent/c_lib.cpp diff --git a/src/SComponent/c_m3d_g_aab.cpp b/libs/SComponent/c_list.cpp similarity index 100% rename from src/SComponent/c_m3d_g_aab.cpp rename to libs/SComponent/c_list.cpp diff --git a/src/SComponent/c_m3d_g_cir.cpp b/libs/SComponent/c_list_iter.cpp similarity index 100% rename from src/SComponent/c_m3d_g_cir.cpp rename to libs/SComponent/c_list_iter.cpp diff --git a/src/SComponent/c_m3d_g_cps.cpp b/libs/SComponent/c_m2d.cpp similarity index 100% rename from src/SComponent/c_m3d_g_cps.cpp rename to libs/SComponent/c_m2d.cpp diff --git a/src/SComponent/c_m3d_g_cyl.cpp b/libs/SComponent/c_m3d.cpp similarity index 100% rename from src/SComponent/c_m3d_g_cyl.cpp rename to libs/SComponent/c_m3d.cpp diff --git a/src/SComponent/c_m3d_g_lin.cpp b/libs/SComponent/c_m3d_g_aab.cpp similarity index 100% rename from src/SComponent/c_m3d_g_lin.cpp rename to libs/SComponent/c_m3d_g_aab.cpp diff --git a/src/SComponent/c_m3d_g_pla.cpp b/libs/SComponent/c_m3d_g_cir.cpp similarity index 100% rename from src/SComponent/c_m3d_g_pla.cpp rename to libs/SComponent/c_m3d_g_cir.cpp diff --git a/src/SComponent/c_m3d_g_sph.cpp b/libs/SComponent/c_m3d_g_cps.cpp similarity index 100% rename from src/SComponent/c_m3d_g_sph.cpp rename to libs/SComponent/c_m3d_g_cps.cpp diff --git a/src/SComponent/c_m3d_g_tri.cpp b/libs/SComponent/c_m3d_g_cyl.cpp similarity index 100% rename from src/SComponent/c_m3d_g_tri.cpp rename to libs/SComponent/c_m3d_g_cyl.cpp diff --git a/src/SComponent/c_malloc.cpp b/libs/SComponent/c_m3d_g_lin.cpp similarity index 100% rename from src/SComponent/c_malloc.cpp rename to libs/SComponent/c_m3d_g_lin.cpp diff --git a/src/SComponent/c_math.cpp b/libs/SComponent/c_m3d_g_pla.cpp similarity index 100% rename from src/SComponent/c_math.cpp rename to libs/SComponent/c_m3d_g_pla.cpp diff --git a/src/SComponent/c_node.cpp b/libs/SComponent/c_m3d_g_sph.cpp similarity index 100% rename from src/SComponent/c_node.cpp rename to libs/SComponent/c_m3d_g_sph.cpp diff --git a/src/SComponent/c_node_iter.cpp b/libs/SComponent/c_m3d_g_tri.cpp similarity index 100% rename from src/SComponent/c_node_iter.cpp rename to libs/SComponent/c_m3d_g_tri.cpp diff --git a/src/SComponent/c_phase.cpp b/libs/SComponent/c_malloc.cpp similarity index 100% rename from src/SComponent/c_phase.cpp rename to libs/SComponent/c_malloc.cpp diff --git a/libs/SComponent/c_math.cpp b/libs/SComponent/c_math.cpp new file mode 100644 index 00000000000..8f1a43be5fa --- /dev/null +++ b/libs/SComponent/c_math.cpp @@ -0,0 +1,14 @@ +// #include + +// s32 g_RNG0; +// s32 g_RNG1; +// s32 g_RNG2; + +// namespace SComponent { + +// void cM_initRnd(s32 RNG0, s32 RNG1, s32 RNG2) { +// g_RNG0 = RNG0; +// g_RNG1 = RNG1; +// g_RNG2 = RNG2; +// }; +// } \ No newline at end of file diff --git a/src/SComponent/c_request.cpp b/libs/SComponent/c_node.cpp similarity index 100% rename from src/SComponent/c_request.cpp rename to libs/SComponent/c_node.cpp diff --git a/src/SComponent/c_sxyz.cpp b/libs/SComponent/c_node_iter.cpp similarity index 100% rename from src/SComponent/c_sxyz.cpp rename to libs/SComponent/c_node_iter.cpp diff --git a/src/SComponent/c_tag.cpp b/libs/SComponent/c_phase.cpp similarity index 100% rename from src/SComponent/c_tag.cpp rename to libs/SComponent/c_phase.cpp diff --git a/src/SComponent/c_tag_iter.cpp b/libs/SComponent/c_request.cpp similarity index 100% rename from src/SComponent/c_tag_iter.cpp rename to libs/SComponent/c_request.cpp diff --git a/src/SComponent/c_tree.cpp b/libs/SComponent/c_sxyz.cpp similarity index 100% rename from src/SComponent/c_tree.cpp rename to libs/SComponent/c_sxyz.cpp diff --git a/src/SComponent/c_tree_iter.cpp b/libs/SComponent/c_tag.cpp similarity index 100% rename from src/SComponent/c_tree_iter.cpp rename to libs/SComponent/c_tag.cpp diff --git a/src/SComponent/c_xyz.cpp b/libs/SComponent/c_tag_iter.cpp similarity index 100% rename from src/SComponent/c_xyz.cpp rename to libs/SComponent/c_tag_iter.cpp diff --git a/src/SStandard/s_basic.cpp b/libs/SComponent/c_tree.cpp similarity index 100% rename from src/SStandard/s_basic.cpp rename to libs/SComponent/c_tree.cpp diff --git a/src/Z2AudioLib/Z2Audience.cpp b/libs/SComponent/c_tree_iter.cpp similarity index 100% rename from src/Z2AudioLib/Z2Audience.cpp rename to libs/SComponent/c_tree_iter.cpp diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/libs/SComponent/c_xyz.cpp similarity index 100% rename from src/Z2AudioLib/Z2AudioArcLoader.cpp rename to libs/SComponent/c_xyz.cpp diff --git a/src/Z2AudioLib/Z2AudioMgr.cpp b/libs/SStandard/s_basic.cpp similarity index 100% rename from src/Z2AudioLib/Z2AudioMgr.cpp rename to libs/SStandard/s_basic.cpp diff --git a/src/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Audience.cpp similarity index 100% rename from src/Z2AudioLib/Z2Calc.cpp rename to libs/Z2AudioLib/Z2Audience.cpp diff --git a/src/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2AudioArcLoader.cpp similarity index 100% rename from src/Z2AudioLib/Z2Creature.cpp rename to libs/Z2AudioLib/Z2AudioArcLoader.cpp diff --git a/src/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2EnvSeMgr.cpp rename to libs/Z2AudioLib/Z2AudioMgr.cpp diff --git a/src/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2Calc.cpp similarity index 100% rename from src/Z2AudioLib/Z2FxLineMgr.cpp rename to libs/Z2AudioLib/Z2Calc.cpp diff --git a/src/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2Creature.cpp similarity index 100% rename from src/Z2AudioLib/Z2LinkMgr.cpp rename to libs/Z2AudioLib/Z2Creature.cpp diff --git a/src/Z2AudioLib/Z2Param.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2Param.cpp rename to libs/Z2AudioLib/Z2EnvSeMgr.cpp diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SceneMgr.cpp rename to libs/Z2AudioLib/Z2FxLineMgr.cpp diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SeMgr.cpp rename to libs/Z2AudioLib/Z2LinkMgr.cpp diff --git a/src/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2Param.cpp similarity index 100% rename from src/Z2AudioLib/Z2SeqMgr.cpp rename to libs/Z2AudioLib/Z2Param.cpp diff --git a/src/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SoundHandles.cpp rename to libs/Z2AudioLib/Z2SceneMgr.cpp diff --git a/src/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SoundInfo.cpp rename to libs/Z2AudioLib/Z2SeMgr.cpp diff --git a/src/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SoundMgr.cpp rename to libs/Z2AudioLib/Z2SeqMgr.cpp diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp similarity index 100% rename from src/Z2AudioLib/Z2SoundObjMgr.cpp rename to libs/Z2AudioLib/Z2SoundHandles.cpp diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp similarity index 100% rename from src/Z2AudioLib/Z2SoundObject.cpp rename to libs/Z2AudioLib/Z2SoundInfo.cpp diff --git a/src/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SoundStarter.cpp rename to libs/Z2AudioLib/Z2SoundMgr.cpp diff --git a/src/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp similarity index 100% rename from src/Z2AudioLib/Z2SpeechMgr2.cpp rename to libs/Z2AudioLib/Z2SoundObjMgr.cpp diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp similarity index 100% rename from src/Z2AudioLib/Z2StatusMgr.cpp rename to libs/Z2AudioLib/Z2SoundObject.cpp diff --git a/src/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp similarity index 100% rename from src/Z2AudioLib/Z2WolfHowlMgr.cpp rename to libs/Z2AudioLib/Z2SoundStarter.cpp diff --git a/src/ai/ai.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp similarity index 100% rename from src/ai/ai.cpp rename to libs/Z2AudioLib/Z2SpeechMgr2.cpp diff --git a/src/amcstubs/AmcExi2Stubs.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp similarity index 100% rename from src/amcstubs/AmcExi2Stubs.cpp rename to libs/Z2AudioLib/Z2StatusMgr.cpp diff --git a/src/ar/ar.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp similarity index 100% rename from src/ar/ar.cpp rename to libs/Z2AudioLib/Z2WolfHowlMgr.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Export/mslsupp.cpp b/libs/debugger/MetroTRK/Export/mslsupp.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Export/mslsupp.cpp rename to libs/debugger/MetroTRK/Export/mslsupp.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.cpp b/libs/debugger/MetroTRK/Os/dolphin/UDP_Stubs.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.cpp rename to libs/debugger/MetroTRK/Os/dolphin/UDP_Stubs.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.cpp b/libs/debugger/MetroTRK/Os/dolphin/dolphin_trk.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.cpp rename to libs/debugger/MetroTRK/Os/dolphin/dolphin_trk.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.cpp b/libs/debugger/MetroTRK/Os/dolphin/dolphin_trk_glue.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.cpp rename to libs/debugger/MetroTRK/Os/dolphin/dolphin_trk_glue.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/targcont.cpp b/libs/debugger/MetroTRK/Os/dolphin/targcont.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/targcont.cpp rename to libs/debugger/MetroTRK/Os/dolphin/targcont.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/target_options.cpp b/libs/debugger/MetroTRK/Os/dolphin/target_options.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/target_options.cpp rename to libs/debugger/MetroTRK/Os/dolphin/target_options.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/usr_put.cpp b/libs/debugger/MetroTRK/Os/dolphin/usr_put.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Os/dolphin/usr_put.cpp rename to libs/debugger/MetroTRK/Os/dolphin/usr_put.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/dispatch.cpp b/libs/debugger/MetroTRK/Portable/dispatch.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/dispatch.cpp rename to libs/debugger/MetroTRK/Portable/dispatch.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/main_TRK.cpp b/libs/debugger/MetroTRK/Portable/main_TRK.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/main_TRK.cpp rename to libs/debugger/MetroTRK/Portable/main_TRK.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/mainloop.cpp b/libs/debugger/MetroTRK/Portable/mainloop.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/mainloop.cpp rename to libs/debugger/MetroTRK/Portable/mainloop.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/mem_TRK.cpp b/libs/debugger/MetroTRK/Portable/mem_TRK.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/mem_TRK.cpp rename to libs/debugger/MetroTRK/Portable/mem_TRK.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/msg.cpp b/libs/debugger/MetroTRK/Portable/msg.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/msg.cpp rename to libs/debugger/MetroTRK/Portable/msg.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/msgbuf.cpp b/libs/debugger/MetroTRK/Portable/msgbuf.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/msgbuf.cpp rename to libs/debugger/MetroTRK/Portable/msgbuf.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/msghndlr.cpp b/libs/debugger/MetroTRK/Portable/msghndlr.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/msghndlr.cpp rename to libs/debugger/MetroTRK/Portable/msghndlr.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/mutex_TRK.cpp b/libs/debugger/MetroTRK/Portable/mutex_TRK.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/mutex_TRK.cpp rename to libs/debugger/MetroTRK/Portable/mutex_TRK.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/notify.cpp b/libs/debugger/MetroTRK/Portable/notify.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/notify.cpp rename to libs/debugger/MetroTRK/Portable/notify.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/nubevent.cpp b/libs/debugger/MetroTRK/Portable/nubevent.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/nubevent.cpp rename to libs/debugger/MetroTRK/Portable/nubevent.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/nubinit.cpp b/libs/debugger/MetroTRK/Portable/nubinit.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/nubinit.cpp rename to libs/debugger/MetroTRK/Portable/nubinit.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/serpoll.cpp b/libs/debugger/MetroTRK/Portable/serpoll.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/serpoll.cpp rename to libs/debugger/MetroTRK/Portable/serpoll.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Portable/support.cpp b/libs/debugger/MetroTRK/Portable/support.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Portable/support.cpp rename to libs/debugger/MetroTRK/Portable/support.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.cpp b/libs/debugger/MetroTRK/Processor/ppc/Export/targsupp.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.cpp rename to libs/debugger/MetroTRK/Processor/ppc/Export/targsupp.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.cpp b/libs/debugger/MetroTRK/Processor/ppc/Generic/flush_cache.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.cpp rename to libs/debugger/MetroTRK/Processor/ppc/Generic/flush_cache.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.cpp b/libs/debugger/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.cpp rename to libs/debugger/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.cpp diff --git a/src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.cpp b/libs/debugger/MetroTRK/Processor/ppc/Generic/targimpl.cpp similarity index 100% rename from src/runtime_libs/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.cpp rename to libs/debugger/MetroTRK/Processor/ppc/Generic/targimpl.cpp diff --git a/src/runtime_libs/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.cpp b/libs/debugger/MetroTRK/cc/exi2/GCN/EXI2_DDH_GCN/main.cpp similarity index 100% rename from src/runtime_libs/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.cpp rename to libs/debugger/MetroTRK/cc/exi2/GCN/EXI2_DDH_GCN/main.cpp diff --git a/src/runtime_libs/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.cpp b/libs/debugger/MetroTRK/cc/exi2/GCN/EXI2_GDEV_GCN/main.cpp similarity index 100% rename from src/runtime_libs/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.cpp rename to libs/debugger/MetroTRK/cc/exi2/GCN/EXI2_GDEV_GCN/main.cpp diff --git a/src/runtime_libs/gamedev/cust_connection/utils/common/CircleBuffer.cpp b/libs/debugger/MetroTRK/utils/common/CircleBuffer.cpp similarity index 100% rename from src/runtime_libs/gamedev/cust_connection/utils/common/CircleBuffer.cpp rename to libs/debugger/MetroTRK/utils/common/CircleBuffer.cpp diff --git a/src/runtime_libs/gamedev/cust_connection/utils/common/MWTrace.cpp b/libs/debugger/MetroTRK/utils/common/MWTrace.cpp similarity index 100% rename from src/runtime_libs/gamedev/cust_connection/utils/common/MWTrace.cpp rename to libs/debugger/MetroTRK/utils/common/MWTrace.cpp diff --git a/src/runtime_libs/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp b/libs/debugger/MetroTRK/utils/gc/MWCriticalSection_gc.cpp similarity index 100% rename from src/runtime_libs/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp rename to libs/debugger/MetroTRK/utils/gc/MWCriticalSection_gc.cpp diff --git a/src/ar/arq.cpp b/libs/dolphin/OdemuExi2/DebuggerDriver.cpp similarity index 100% rename from src/ar/arq.cpp rename to libs/dolphin/OdemuExi2/DebuggerDriver.cpp diff --git a/src/base/PPCArch.cpp b/libs/dolphin/ai/ai.cpp similarity index 100% rename from src/base/PPCArch.cpp rename to libs/dolphin/ai/ai.cpp diff --git a/src/card/CARDBios.cpp b/libs/dolphin/amcstubs/AmcExi2Stubs.cpp similarity index 100% rename from src/card/CARDBios.cpp rename to libs/dolphin/amcstubs/AmcExi2Stubs.cpp diff --git a/src/card/CARDBlock.cpp b/libs/dolphin/ar/ar.cpp similarity index 100% rename from src/card/CARDBlock.cpp rename to libs/dolphin/ar/ar.cpp diff --git a/src/card/CARDCheck.cpp b/libs/dolphin/ar/arq.cpp similarity index 100% rename from src/card/CARDCheck.cpp rename to libs/dolphin/ar/arq.cpp diff --git a/src/card/CARDCreate.cpp b/libs/dolphin/base/PPCArch.cpp similarity index 100% rename from src/card/CARDCreate.cpp rename to libs/dolphin/base/PPCArch.cpp diff --git a/src/card/CARDDir.cpp b/libs/dolphin/card/CARDBios.cpp similarity index 100% rename from src/card/CARDDir.cpp rename to libs/dolphin/card/CARDBios.cpp diff --git a/src/card/CARDFormat.cpp b/libs/dolphin/card/CARDBlock.cpp similarity index 100% rename from src/card/CARDFormat.cpp rename to libs/dolphin/card/CARDBlock.cpp diff --git a/src/card/CARDMount.cpp b/libs/dolphin/card/CARDCheck.cpp similarity index 100% rename from src/card/CARDMount.cpp rename to libs/dolphin/card/CARDCheck.cpp diff --git a/src/card/CARDNet.cpp b/libs/dolphin/card/CARDCreate.cpp similarity index 100% rename from src/card/CARDNet.cpp rename to libs/dolphin/card/CARDCreate.cpp diff --git a/src/card/CARDOpen.cpp b/libs/dolphin/card/CARDDir.cpp similarity index 100% rename from src/card/CARDOpen.cpp rename to libs/dolphin/card/CARDDir.cpp diff --git a/src/card/CARDRdwr.cpp b/libs/dolphin/card/CARDFormat.cpp similarity index 100% rename from src/card/CARDRdwr.cpp rename to libs/dolphin/card/CARDFormat.cpp diff --git a/src/card/CARDRead.cpp b/libs/dolphin/card/CARDMount.cpp similarity index 100% rename from src/card/CARDRead.cpp rename to libs/dolphin/card/CARDMount.cpp diff --git a/src/card/CARDStat.cpp b/libs/dolphin/card/CARDNet.cpp similarity index 100% rename from src/card/CARDStat.cpp rename to libs/dolphin/card/CARDNet.cpp diff --git a/src/card/CARDUnlock.cpp b/libs/dolphin/card/CARDOpen.cpp similarity index 100% rename from src/card/CARDUnlock.cpp rename to libs/dolphin/card/CARDOpen.cpp diff --git a/src/card/CARDWrite.cpp b/libs/dolphin/card/CARDRdwr.cpp similarity index 100% rename from src/card/CARDWrite.cpp rename to libs/dolphin/card/CARDRdwr.cpp diff --git a/src/db/db.cpp b/libs/dolphin/card/CARDRead.cpp similarity index 100% rename from src/db/db.cpp rename to libs/dolphin/card/CARDRead.cpp diff --git a/src/dsp/dsp.cpp b/libs/dolphin/card/CARDStat.cpp similarity index 100% rename from src/dsp/dsp.cpp rename to libs/dolphin/card/CARDStat.cpp diff --git a/src/dsp/dsp_debug.cpp b/libs/dolphin/card/CARDUnlock.cpp similarity index 100% rename from src/dsp/dsp_debug.cpp rename to libs/dolphin/card/CARDUnlock.cpp diff --git a/src/dsp/dsp_task.cpp b/libs/dolphin/card/CARDWrite.cpp similarity index 100% rename from src/dsp/dsp_task.cpp rename to libs/dolphin/card/CARDWrite.cpp diff --git a/src/dvd/dvd.cpp b/libs/dolphin/db/db.cpp similarity index 100% rename from src/dvd/dvd.cpp rename to libs/dolphin/db/db.cpp diff --git a/src/dvd/dvdFatal.cpp b/libs/dolphin/dsp/dsp.cpp similarity index 100% rename from src/dvd/dvdFatal.cpp rename to libs/dolphin/dsp/dsp.cpp diff --git a/src/dvd/dvderror.cpp b/libs/dolphin/dsp/dsp_debug.cpp similarity index 100% rename from src/dvd/dvderror.cpp rename to libs/dolphin/dsp/dsp_debug.cpp diff --git a/src/dvd/dvdfs.cpp b/libs/dolphin/dsp/dsp_task.cpp similarity index 100% rename from src/dvd/dvdfs.cpp rename to libs/dolphin/dsp/dsp_task.cpp diff --git a/src/dvd/dvdidutils.cpp b/libs/dolphin/dvd/dvd.cpp similarity index 100% rename from src/dvd/dvdidutils.cpp rename to libs/dolphin/dvd/dvd.cpp diff --git a/src/dvd/dvdlow.cpp b/libs/dolphin/dvd/dvdFatal.cpp similarity index 100% rename from src/dvd/dvdlow.cpp rename to libs/dolphin/dvd/dvdFatal.cpp diff --git a/src/dvd/dvdqueue.cpp b/libs/dolphin/dvd/dvderror.cpp similarity index 100% rename from src/dvd/dvdqueue.cpp rename to libs/dolphin/dvd/dvderror.cpp diff --git a/src/dvd/fstload.cpp b/libs/dolphin/dvd/dvdfs.cpp similarity index 100% rename from src/dvd/fstload.cpp rename to libs/dolphin/dvd/dvdfs.cpp diff --git a/src/dynamic/DynamicLink.cpp b/libs/dolphin/dvd/dvdidutils.cpp similarity index 100% rename from src/dynamic/DynamicLink.cpp rename to libs/dolphin/dvd/dvdidutils.cpp diff --git a/src/exi/EXIBios.cpp b/libs/dolphin/dvd/dvdlow.cpp similarity index 100% rename from src/exi/EXIBios.cpp rename to libs/dolphin/dvd/dvdlow.cpp diff --git a/src/exi/EXIUart.cpp b/libs/dolphin/dvd/dvdqueue.cpp similarity index 100% rename from src/exi/EXIUart.cpp rename to libs/dolphin/dvd/dvdqueue.cpp diff --git a/src/gd/GDBase.cpp b/libs/dolphin/dvd/fstload.cpp similarity index 100% rename from src/gd/GDBase.cpp rename to libs/dolphin/dvd/fstload.cpp diff --git a/src/gd/GDGeometry.cpp b/libs/dolphin/exi/EXIBios.cpp similarity index 100% rename from src/gd/GDGeometry.cpp rename to libs/dolphin/exi/EXIBios.cpp diff --git a/src/gf/GFGeometry.cpp b/libs/dolphin/exi/EXIUart.cpp similarity index 100% rename from src/gf/GFGeometry.cpp rename to libs/dolphin/exi/EXIUart.cpp diff --git a/src/gf/GFLight.cpp b/libs/dolphin/gd/GDBase.cpp similarity index 100% rename from src/gf/GFLight.cpp rename to libs/dolphin/gd/GDBase.cpp diff --git a/src/gf/GFPixel.cpp b/libs/dolphin/gd/GDGeometry.cpp similarity index 100% rename from src/gf/GFPixel.cpp rename to libs/dolphin/gd/GDGeometry.cpp diff --git a/src/gf/GFTev.cpp b/libs/dolphin/gf/GFGeometry.cpp similarity index 100% rename from src/gf/GFTev.cpp rename to libs/dolphin/gf/GFGeometry.cpp diff --git a/src/gx/GXAttr.cpp b/libs/dolphin/gf/GFLight.cpp similarity index 100% rename from src/gx/GXAttr.cpp rename to libs/dolphin/gf/GFLight.cpp diff --git a/src/gx/GXBump.cpp b/libs/dolphin/gf/GFPixel.cpp similarity index 100% rename from src/gx/GXBump.cpp rename to libs/dolphin/gf/GFPixel.cpp diff --git a/src/gx/GXDisplayList.cpp b/libs/dolphin/gf/GFTev.cpp similarity index 100% rename from src/gx/GXDisplayList.cpp rename to libs/dolphin/gf/GFTev.cpp diff --git a/src/gx/GXFifo.cpp b/libs/dolphin/gx/GXAttr.cpp similarity index 100% rename from src/gx/GXFifo.cpp rename to libs/dolphin/gx/GXAttr.cpp diff --git a/src/gx/GXFrameBuf.cpp b/libs/dolphin/gx/GXBump.cpp similarity index 100% rename from src/gx/GXFrameBuf.cpp rename to libs/dolphin/gx/GXBump.cpp diff --git a/src/gx/GXGeometry.cpp b/libs/dolphin/gx/GXDisplayList.cpp similarity index 100% rename from src/gx/GXGeometry.cpp rename to libs/dolphin/gx/GXDisplayList.cpp diff --git a/src/gx/GXInit.cpp b/libs/dolphin/gx/GXFifo.cpp similarity index 100% rename from src/gx/GXInit.cpp rename to libs/dolphin/gx/GXFifo.cpp diff --git a/src/gx/GXLight.cpp b/libs/dolphin/gx/GXFrameBuf.cpp similarity index 100% rename from src/gx/GXLight.cpp rename to libs/dolphin/gx/GXFrameBuf.cpp diff --git a/src/gx/GXMisc.cpp b/libs/dolphin/gx/GXGeometry.cpp similarity index 100% rename from src/gx/GXMisc.cpp rename to libs/dolphin/gx/GXGeometry.cpp diff --git a/src/gx/GXPerf.cpp b/libs/dolphin/gx/GXInit.cpp similarity index 100% rename from src/gx/GXPerf.cpp rename to libs/dolphin/gx/GXInit.cpp diff --git a/src/gx/GXPixel.cpp b/libs/dolphin/gx/GXLight.cpp similarity index 100% rename from src/gx/GXPixel.cpp rename to libs/dolphin/gx/GXLight.cpp diff --git a/src/gx/GXTev.cpp b/libs/dolphin/gx/GXMisc.cpp similarity index 100% rename from src/gx/GXTev.cpp rename to libs/dolphin/gx/GXMisc.cpp diff --git a/src/gx/GXTexture.cpp b/libs/dolphin/gx/GXPerf.cpp similarity index 100% rename from src/gx/GXTexture.cpp rename to libs/dolphin/gx/GXPerf.cpp diff --git a/src/gx/GXTransform.cpp b/libs/dolphin/gx/GXPixel.cpp similarity index 100% rename from src/gx/GXTransform.cpp rename to libs/dolphin/gx/GXPixel.cpp diff --git a/src/mtx/mtx.cpp b/libs/dolphin/gx/GXTev.cpp similarity index 100% rename from src/mtx/mtx.cpp rename to libs/dolphin/gx/GXTev.cpp diff --git a/src/mtx/mtx44.cpp b/libs/dolphin/gx/GXTexture.cpp similarity index 100% rename from src/mtx/mtx44.cpp rename to libs/dolphin/gx/GXTexture.cpp diff --git a/src/mtx/mtxvec.cpp b/libs/dolphin/gx/GXTransform.cpp similarity index 100% rename from src/mtx/mtxvec.cpp rename to libs/dolphin/gx/GXTransform.cpp diff --git a/src/mtx/quat.cpp b/libs/dolphin/mtx/mtx.cpp similarity index 100% rename from src/mtx/quat.cpp rename to libs/dolphin/mtx/mtx.cpp diff --git a/src/mtx/vec.cpp b/libs/dolphin/mtx/mtx44.cpp similarity index 100% rename from src/mtx/vec.cpp rename to libs/dolphin/mtx/mtx44.cpp diff --git a/src/object/object-id.cpp b/libs/dolphin/mtx/mtxvec.cpp similarity index 100% rename from src/object/object-id.cpp rename to libs/dolphin/mtx/mtxvec.cpp diff --git a/src/object/object-particle.cpp b/libs/dolphin/mtx/quat.cpp similarity index 100% rename from src/object/object-particle.cpp rename to libs/dolphin/mtx/quat.cpp diff --git a/src/object/object-sound.cpp b/libs/dolphin/mtx/vec.cpp similarity index 100% rename from src/object/object-sound.cpp rename to libs/dolphin/mtx/vec.cpp diff --git a/src/odenotstub/odenotstub.cpp b/libs/dolphin/odenotstub/odenotstub.cpp similarity index 100% rename from src/odenotstub/odenotstub.cpp rename to libs/dolphin/odenotstub/odenotstub.cpp diff --git a/src/os/OS.cpp b/libs/dolphin/os/OS.cpp similarity index 100% rename from src/os/OS.cpp rename to libs/dolphin/os/OS.cpp diff --git a/src/os/OSAlarm.cpp b/libs/dolphin/os/OSAlarm.cpp similarity index 100% rename from src/os/OSAlarm.cpp rename to libs/dolphin/os/OSAlarm.cpp diff --git a/src/os/OSAlloc.cpp b/libs/dolphin/os/OSAlloc.cpp similarity index 100% rename from src/os/OSAlloc.cpp rename to libs/dolphin/os/OSAlloc.cpp diff --git a/src/os/OSArena.cpp b/libs/dolphin/os/OSArena.cpp similarity index 100% rename from src/os/OSArena.cpp rename to libs/dolphin/os/OSArena.cpp diff --git a/src/os/OSAudioSystem.cpp b/libs/dolphin/os/OSAudioSystem.cpp similarity index 100% rename from src/os/OSAudioSystem.cpp rename to libs/dolphin/os/OSAudioSystem.cpp diff --git a/src/os/OSCache.cpp b/libs/dolphin/os/OSCache.cpp similarity index 100% rename from src/os/OSCache.cpp rename to libs/dolphin/os/OSCache.cpp diff --git a/src/os/OSContext.cpp b/libs/dolphin/os/OSContext.cpp similarity index 100% rename from src/os/OSContext.cpp rename to libs/dolphin/os/OSContext.cpp diff --git a/src/os/OSError.cpp b/libs/dolphin/os/OSError.cpp similarity index 100% rename from src/os/OSError.cpp rename to libs/dolphin/os/OSError.cpp diff --git a/src/os/OSExec.cpp b/libs/dolphin/os/OSExec.cpp similarity index 100% rename from src/os/OSExec.cpp rename to libs/dolphin/os/OSExec.cpp diff --git a/src/os/OSFont.cpp b/libs/dolphin/os/OSFont.cpp similarity index 100% rename from src/os/OSFont.cpp rename to libs/dolphin/os/OSFont.cpp diff --git a/src/os/OSInterrupt.cpp b/libs/dolphin/os/OSInterrupt.cpp similarity index 100% rename from src/os/OSInterrupt.cpp rename to libs/dolphin/os/OSInterrupt.cpp diff --git a/src/os/OSLink.cpp b/libs/dolphin/os/OSLink.cpp similarity index 100% rename from src/os/OSLink.cpp rename to libs/dolphin/os/OSLink.cpp diff --git a/src/os/OSMemory.cpp b/libs/dolphin/os/OSMemory.cpp similarity index 100% rename from src/os/OSMemory.cpp rename to libs/dolphin/os/OSMemory.cpp diff --git a/src/os/OSMessage.cpp b/libs/dolphin/os/OSMessage.cpp similarity index 100% rename from src/os/OSMessage.cpp rename to libs/dolphin/os/OSMessage.cpp diff --git a/src/os/OSMutex.cpp b/libs/dolphin/os/OSMutex.cpp similarity index 100% rename from src/os/OSMutex.cpp rename to libs/dolphin/os/OSMutex.cpp diff --git a/src/os/OSReboot.cpp b/libs/dolphin/os/OSReboot.cpp similarity index 100% rename from src/os/OSReboot.cpp rename to libs/dolphin/os/OSReboot.cpp diff --git a/src/os/OSReset.cpp b/libs/dolphin/os/OSReset.cpp similarity index 100% rename from src/os/OSReset.cpp rename to libs/dolphin/os/OSReset.cpp diff --git a/src/os/OSResetSW.cpp b/libs/dolphin/os/OSResetSW.cpp similarity index 100% rename from src/os/OSResetSW.cpp rename to libs/dolphin/os/OSResetSW.cpp diff --git a/src/os/OSRtc.cpp b/libs/dolphin/os/OSRtc.cpp similarity index 100% rename from src/os/OSRtc.cpp rename to libs/dolphin/os/OSRtc.cpp diff --git a/src/os/OSSync.cpp b/libs/dolphin/os/OSSync.cpp similarity index 100% rename from src/os/OSSync.cpp rename to libs/dolphin/os/OSSync.cpp diff --git a/src/os/OSThread.cpp b/libs/dolphin/os/OSThread.cpp similarity index 100% rename from src/os/OSThread.cpp rename to libs/dolphin/os/OSThread.cpp diff --git a/src/os/OSTime.cpp b/libs/dolphin/os/OSTime.cpp similarity index 100% rename from src/os/OSTime.cpp rename to libs/dolphin/os/OSTime.cpp diff --git a/src/os/__ppc_eabi_init.cpp b/libs/dolphin/os/__ppc_eabi_init.cpp similarity index 100% rename from src/os/__ppc_eabi_init.cpp rename to libs/dolphin/os/__ppc_eabi_init.cpp diff --git a/src/pad/Pad.cpp b/libs/dolphin/pad/Pad.cpp similarity index 100% rename from src/pad/Pad.cpp rename to libs/dolphin/pad/Pad.cpp diff --git a/src/pad/Padclamp.cpp b/libs/dolphin/pad/Padclamp.cpp similarity index 100% rename from src/pad/Padclamp.cpp rename to libs/dolphin/pad/Padclamp.cpp diff --git a/src/si/SIBios.cpp b/libs/dolphin/si/SIBios.cpp similarity index 100% rename from src/si/SIBios.cpp rename to libs/dolphin/si/SIBios.cpp diff --git a/src/si/SISamplingRate.cpp b/libs/dolphin/si/SISamplingRate.cpp similarity index 100% rename from src/si/SISamplingRate.cpp rename to libs/dolphin/si/SISamplingRate.cpp diff --git a/src/vi/vi.cpp b/libs/dolphin/vi/vi.cpp similarity index 100% rename from src/vi/vi.cpp rename to libs/dolphin/vi/vi.cpp diff --git a/obj_files.mk b/obj_files.mk index 79e8eb3b295..736c19d7064 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -86,6 +86,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/d/com/d_com_static.o \ $(BUILD_DIR)/asm/d/d_bomb.o \ $(BUILD_DIR)/asm/d/d_lib.o \ + $(BUILD_DIR)/src/d/d_save/d_save.o \ $(BUILD_DIR)/asm/d/d_save.o \ $(BUILD_DIR)/asm/d/save/d_save_init.o \ $(BUILD_DIR)/asm/d/jnt/d_jnt_col.o \ @@ -604,7 +605,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/gx/GXPerf.o \ $(BUILD_DIR)/asm/gd/GDBase.o \ $(BUILD_DIR)/asm/gd/GDGeometry.o \ - $(BUILD_DIR)/asm/clib.o + $(BUILD_DIR)/asm/clib.o CTORS_O_FILES := \ $(BUILD_DIR)/asm/ctors.o diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 4bf93c8658d..c66e00dcc8c 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -1 +1,102 @@ -// ok +#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 + +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; + + for (int i = 0; i < 4; i++) { + select_item[i] = NO_ITEM; + mix_item[i + 1] = NO_ITEM; + dComIfGp_setSelectItem(i); + } + + for (int i = 0; i < 6; i++) { + equipment[i] = 0; + } + + equipment[0] = ORDON_CLOTHES; + equipment[1] = NO_ITEM; + equipment[2] = NO_ITEM; + equipment[3] = NO_ITEM; + equipment[4] = NO_ITEM; + current_wallet = WALLET; + _unk6 = 0; + _unk7 = 0; + magic_flag = 0; + _unk9 = 0; + _unk10 = 0; + + for (int i = 0; i < 3; i++) { + _unk11[i] = 0; + } +} + +void dSv_player_status_a_c::setSelectItemIndex(signed int select_item_index, u8 item_index) { + if (select_item_index >= 4) { + return; + } + select_item[select_item_index] = item_index; +} + +u8 dSv_player_status_a_c::getSelectItemIndex(signed int select_item_index) const { + if (select_item_index < 4) { + return select_item[select_item_index]; + } + return 0; +} + +void dSv_player_status_a_c::setMixItemIndex(signed int mix_item_index, u8 item_index) { + if (mix_item_index >= 4) { + return; + } + mix_item[mix_item_index+1] = item_index; +} + +u8 dSv_player_status_a_c::getMixItemIndex(signed int mix_item_index) const { + if (mix_item_index < 4) { + return mix_item[mix_item_index+1]; + } + return 0; +} + +u16 dSv_player_status_a_c::getRupeeMax(void) const { + if(current_wallet < 3) { // if you make this a default, it wont match. Compiler, pls. + switch(current_wallet) { + case WALLET: return 300; + case BIG_WALLET: return 600; + case GIANT_WALLET: return 1000; + } + } + return 0; +} \ No newline at end of file diff --git a/src/d/d_save/d_save_HIO.cpp b/src/d/d_save/d_save_HIO.cpp index 4bf93c8658d..7d8d5e37b42 100644 --- a/src/d/d_save/d_save_HIO.cpp +++ b/src/d/d_save/d_save_HIO.cpp @@ -1 +1,2 @@ // ok +.include "asm/d/save/d_save_HIO.s" \ No newline at end of file diff --git a/src/stb/stb-data-parse.cpp b/src/d/dynamic/DynamicLink.cpp similarity index 100% rename from src/stb/stb-data-parse.cpp rename to src/d/dynamic/DynamicLink.cpp diff --git a/src/stb/stb-data.cpp b/src/stb/stb-data.cpp deleted file mode 100644 index 4bf93c8658d..00000000000 --- a/src/stb/stb-data.cpp +++ /dev/null @@ -1 +0,0 @@ -// ok diff --git a/src/stb/stb.cpp b/src/stb/stb.cpp deleted file mode 100644 index 4bf93c8658d..00000000000 --- a/src/stb/stb.cpp +++ /dev/null @@ -1 +0,0 @@ -// ok