From 458be4d8cb1dbbe06d748c4e759131e02e73b467 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 2 Jan 2021 17:47:43 -0500 Subject: [PATCH] more d_save funcs OK, initial map out of dcomifg_play_c and it's classes --- asm/J2DGraph/J2DMatBlock.s | 16 +- asm/J2DGraph/J2DPane.s | 2 +- asm/J2DGraph/J2DPicture.s | 2 +- asm/J2DGraph/J2DPictureEx.s | 4 +- asm/J2DGraph/J2DPrint.s | 4 +- asm/J2DGraph/J2DScreen.s | 4 +- asm/J2DGraph/J2DTextBox.s | 2 +- asm/J2DGraph/J2DTextBoxEx.s | 4 +- asm/J2DGraph/J2DWindow.s | 2 +- asm/J2DGraph/J2DWindowEx.s | 8 +- asm/J3DGraphAnimator/J3DAnimation.s | 2 +- asm/J3DGraphAnimator/J3DMaterialAttach.s | 4 +- asm/J3DGraphAnimator/J3DModel.s | 4 +- asm/J3DGraphAnimator/J3DMtxBuffer.s | 4 +- asm/J3DGraphAnimator/J3DShapeTable.s | 2 +- asm/J3DGraphAnimator/J3DSkinDeform.s | 16 +- asm/J3DGraphBase/J3DGD.s | 8 +- asm/J3DGraphBase/J3DMatBlock.s | 24 +- asm/J3DGraphBase/J3DMaterial.s | 4 +- asm/J3DGraphBase/J3DShapeMtx.s | 4 +- asm/J3DGraphBase/J3DSys.s | 2 +- asm/J3DGraphBase/J3DVertex.s | 4 +- asm/J3DGraphLoader/J3DMaterialFactory.s | 4 +- asm/J3DGraphLoader/J3DModelLoader.s | 6 +- asm/J3DGraphLoader/J3DModelLoaderCalcSize.s | 4 +- asm/JAudio2/JAISeMgr.s | 2 +- asm/JAudio2/JAISeq.s | 4 +- asm/JAudio2/JAISeqMgr.s | 2 +- asm/JAudio2/JAIStreamMgr.s | 2 +- asm/JAudio2/JASAiCtrl.s | 2 +- asm/JAudio2/JASAramStream.s | 2 +- asm/JAudio2/JASBank.s | 2 +- asm/JAudio2/JASBasicWaveBank.s | 2 +- asm/JAudio2/JASSeqParser.s | 4 +- asm/JAudio2/JAUSeqDataBlockMgr.s | 6 +- asm/JFramework/JFWDisplay.s | 4 +- asm/JKernel/JKRExpHeap.s | 6 +- asm/JParticle/JPABaseShape.s | 4 +- asm/JParticle/JPAEmitterManager.s | 4 +- asm/JParticle/JPAResource.s | 2 +- asm/JStudio/jstudio-object.s | 2 +- asm/JStudio/stb.s | 2 +- asm/JUtility/JUTDbPrint.s | 2 +- asm/JUtility/JUTDirectPrint.s | 4 +- asm/JUtility/JUTException.s | 8 +- asm/JUtility/JUTProcBar.s | 2 +- asm/SComponent/c/cc/c_cc_s.s | 6 +- asm/SComponent/c/m3d/g/c_m3d_g_cps.s | 4 +- asm/Z2AudioLib/Z2Audience.s | 2 +- asm/Z2AudioLib/Z2AudioMgr.s | 10 +- asm/Z2AudioLib/Z2Creature.s | 2 +- asm/Z2AudioLib/Z2LinkMgr.s | 4 +- asm/Z2AudioLib/Z2SoundMgr.s | 6 +- asm/clib.s | 12 +- asm/d/a/d_a_npc.s | 20 +- asm/d/a/d_a_obj.s | 2 +- asm/d/bg/d_bg_s.s | 10 +- asm/d/bg/d_bg_w.s | 10 +- asm/d/bg/s/d_bg_s_acch.s | 2 +- asm/d/bg/w/d_bg_w_kcol.s | 2 +- asm/d/cc/d_cc_s.s | 18 +- asm/d/cc/d_cc_uty.s | 2 +- asm/d/cc/mass/d_cc_mass_s.s | 4 +- asm/d/com/inf/d_com_inf_game.s | 10 +- asm/d/d_camera.s | 22 +- asm/d/d_drawlist.s | 12 +- asm/d/d_event.s | 2 +- asm/d/d_gameover.s | 4 +- asm/d/d_kankyo.s | 14 +- asm/d/d_meter2.s | 4 +- asm/d/d_name.s | 4 +- asm/d/d_particle.s | 8 +- asm/d/d_resorce.s | 10 +- asm/d/d_stage.s | 10 +- asm/d/d_timer.s | 4 +- asm/d/ev/d_ev_camera.s | 8 +- asm/d/event/d_event_data.s | 10 +- asm/d/event/d_event_manager.s | 10 +- asm/d/file/d_file_select.s | 34 +- asm/d/kankyo/d_kankyo_rain.s | 8 +- asm/d/kankyo/d_kankyo_wether.s | 6 +- asm/d/map/path/d_map_path_dmap.s | 6 +- asm/d/menu/d_menu_collect.s | 8 +- asm/d/menu/d_menu_dmap.s | 4 +- asm/d/menu/d_menu_fishing.s | 10 +- asm/d/menu/d_menu_fmap.s | 12 +- asm/d/menu/d_menu_fmap2D.s | 20 +- asm/d/menu/d_menu_insect.s | 4 +- asm/d/menu/d_menu_letter.s | 14 +- asm/d/menu/d_menu_option.s | 16 +- asm/d/menu/d_menu_ring.s | 4 +- asm/d/menu/d_menu_save.s | 4 +- asm/d/menu/d_menu_skill.s | 10 +- asm/d/menu/dmap/d_menu_dmap_map.s | 4 +- asm/d/meter/d_meter_button.s | 6 +- asm/d/meter/d_meter_hakusha.s | 4 +- asm/d/meter2/d_meter2_draw.s | 36 +- asm/d/msg/d_msg_class.s | 10 +- asm/d/msg/d_msg_flow.s | 2 +- asm/d/msg/out/d_msg_out_font.s | 4 +- asm/d/msg/scrn/d_msg_scrn_explain.s | 4 +- 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_jimaku.s | 4 +- asm/d/msg/string/d_msg_string_base.s | 2 +- asm/d/npc/d_npc_lib.s | 2 +- asm/d/pane/d_pane_class.s | 6 +- asm/d/particle/d_particle_copoly.s | 6 +- asm/d/s/d_s_room.s | 2 +- asm/d/simple/d_simple_model.s | 2 +- asm/data.s | 4 +- asm/f/op/actor/f_op_actor_mng.s | 30 +- asm/m/Do/dvd/m_Do_dvd_thread.s | 2 +- asm/m/Do/m_Do_ext.s | 6 +- asm/m/Do/m_Do_graphic.s | 4 +- asm/sbss.s | 4 +- diff.py | 2 +- .../JSystem/J2DGraph/J2DPicture/J2DPicture.h | 8 + .../JSystem/J2DGraph/J2DScreen/J2DScreen.h | 6 +- .../JSystem/J2DGraph/J2DTextBox/J2DTextBox.h | 8 + .../JSystem/J3DGraphAnimator/J3DAnimation.h | 19 + .../JKernel/JKRAram/asm/func_802D2830.s | 2 +- .../JKernel/JKRAramPiece/asm/func_802D3614.s | 2 +- .../JKernel/JKRAramStream/asm/func_802D3CE0.s | 4 +- .../JKRCompArchive/asm/func_802D89BC.s | 2 +- .../JKRDvdAramRipper/asm/func_802DA9C0.s | 4 +- .../JKRDvdAramRipper/asm/func_802DAA74.s | 2 +- .../JKRDvdAramRipper/asm/func_802DAFE8.s | 4 +- .../JKernel/JKRDvdArchive/asm/func_802D8474.s | 2 +- .../JKernel/JKRDvdRipper/asm/func_802DA1E4.s | 4 +- .../JKernel/JKRExpHeap/asm/func_802CF234.s | 2 +- .../JKernel/JKRExpHeap/asm/func_802D03B8.s | 2 +- .../JKernel/JKRExpHeap/asm/func_802D05CC.s | 2 +- .../JKernel/JKRThread/asm/func_802D1C74.s | 2 +- .../JUtility/JUTGamePad/asm/func_802E08E4.s | 4 +- .../JUtility/asm/JUTResFont__setBlock.s | 2 +- include/SComponent/c_angle/c_angle.h | 12 + include/SComponent/c_cc_d/c_cc_d.h | 42 ++ include/SComponent/c_cc_s/c_cc_s.h | 14 + include/SComponent/c_m3d/c_m3d.h | 39 ++ include/SComponent/c_xyz/c_xyz.h | 10 + include/d/d_a/d_a_alink/asm/func_800A093C.s | 4 +- include/d/d_a/d_a_alink/asm/func_800A29DC.s | 4 +- include/d/d_a/d_a_alink/asm/func_800A551C.s | 4 +- include/d/d_a/d_a_alink/asm/func_800A5CC8.s | 4 +- include/d/d_a/d_a_alink/asm/func_800AC610.s | 4 +- include/d/d_a/d_a_alink/asm/func_800AC754.s | 4 +- include/d/d_a/d_a_alink/asm/func_800AD170.s | 4 +- include/d/d_a/d_a_alink/asm/func_800AD3D8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B3500.s | 2 +- include/d/d_a/d_a_alink/asm/func_800C1F6C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CF380.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D1540.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D34D8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800DA180.s | 2 +- include/d/d_a/d_a_alink/asm/func_800DA82C.s | 4 +- include/d/d_a/d_a_alink/asm/func_800DC678.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E3F50.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EF95C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F81C0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F9474.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F95B8.s | 4 +- include/d/d_a/d_a_alink/asm/func_800FA070.s | 4 +- include/d/d_a/d_a_alink/asm/func_80109BDC.s | 2 +- include/d/d_a/d_a_alink/asm/func_8010BEF0.s | 4 +- include/d/d_a/d_a_alink/asm/func_80111A9C.s | 2 +- include/d/d_a/d_a_alink/asm/func_80112E7C.s | 4 +- include/d/d_a/d_a_alink/asm/func_80113D58.s | 4 +- include/d/d_a/d_a_alink/asm/func_801191C4.s | 2 +- include/d/d_a/d_a_alink/asm/func_801207BC.s | 4 +- include/d/d_a/d_a_alink/asm/func_8012277C.s | 4 +- include/d/d_a/d_a_alink/asm/func_801241E0.s | 4 +- include/d/d_a/d_a_alink/asm/func_80124EA8.s | 4 +- include/d/d_a/d_a_alink/asm/func_80126F3C.s | 2 +- include/d/d_a/d_a_alink/asm/func_80127F50.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012948C.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012A498.s | 2 +- include/d/d_a/d_a_alink/asm/func_80130BC4.s | 2 +- include/d/d_a/d_a_alink/asm/func_80136624.s | 2 +- include/d/d_a/d_a_alink/asm/func_801377F0.s | 4 +- include/d/d_a/d_a_alink/asm/func_80140FA0.s | 2 +- include/d/d_attention/asm/func_80070198.s | 4 +- include/d/d_attention/d_attention.h | 158 +++++ include/d/d_bg/d_bg_s/d_bg_s.h | 39 ++ .../d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h | 20 + include/d/d_cc/d_cc_mass_s/d_cc_mass_s.h | 34 ++ include/d/d_cc/d_cc_s/d_cc_s.h | 16 + .../d/d_com/d_com_inf_game/d_com_inf_game.h | 181 ++++-- include/d/d_event/d_event/d_event.h | 206 ++++++- include/d/d_event/d_event_data/d_event_data.h | 26 + .../d_event/d_event_manager/d_event_manager.h | 37 +- .../d/d_meter2/d_meter2_info/d_meter2_info.h | 17 +- include/d/d_save/d_save/asm/func_800332F8.s | 4 +- include/d/d_save/d_save/asm/func_80034644.s | 4 +- include/d/d_save/d_save/d_save.h | 540 +++++++++--------- include/d/d_stage/d_stage.h | 39 ++ include/d/d_vibration/d_vibration.h | 47 ++ include/functions.h | 30 +- include/m_Do/m_Do_ext/m_Do_ext.h | 48 ++ include/variables.h | 6 +- src/d/d_item/d_item.cpp | 52 +- src/d/d_save/d_save.cpp | 277 ++++++--- src/m_Do/m_Do_main.cpp | 3 +- 203 files changed, 1931 insertions(+), 941 deletions(-) create mode 100644 include/JSystem/J2DGraph/J2DPicture/J2DPicture.h create mode 100644 include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h create mode 100644 include/JSystem/J3DGraphAnimator/J3DAnimation.h create mode 100644 include/SComponent/c_angle/c_angle.h create mode 100644 include/SComponent/c_cc_d/c_cc_d.h create mode 100644 include/SComponent/c_cc_s/c_cc_s.h create mode 100644 include/SComponent/c_m3d/c_m3d.h create mode 100644 include/SComponent/c_xyz/c_xyz.h create mode 100644 include/d/d_attention/d_attention.h create mode 100644 include/d/d_bg/d_bg_s/d_bg_s.h create mode 100644 include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h create mode 100644 include/d/d_cc/d_cc_mass_s/d_cc_mass_s.h create mode 100644 include/d/d_cc/d_cc_s/d_cc_s.h create mode 100644 include/d/d_event/d_event_data/d_event_data.h create mode 100644 include/d/d_stage/d_stage.h create mode 100644 include/d/d_vibration/d_vibration.h create mode 100644 include/m_Do/m_Do_ext/m_Do_ext.h diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s index 88d86c1c25..eb491fc591 100644 --- a/asm/J2DGraph/J2DMatBlock.s +++ b/asm/J2DGraph/J2DMatBlock.s @@ -1650,7 +1650,7 @@ lbl_802ECAD0: /* 802ECAEC 002E9A2C 7C 08 02 A6 */ mflr r0 /* 802ECAF0 002E9A30 90 01 00 34 */ stw r0, 0x34(r1) /* 802ECAF4 002E9A34 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ECAF8 002E9A38 48 07 56 D5 */ bl func_803621CC +/* 802ECAF8 002E9A38 48 07 56 D5 */ bl _savegpr_25 /* 802ECAFC 002E9A3C 7C 7A 1B 78 */ mr r26, r3 /* 802ECB00 002E9A40 7C 9B 23 78 */ mr r27, r4 /* 802ECB04 002E9A44 7C BC 2B 78 */ mr r28, r5 @@ -1965,7 +1965,7 @@ lbl_802ECF30: /* 802ECF4C 002E9E8C 7C 08 02 A6 */ mflr r0 /* 802ECF50 002E9E90 90 01 00 34 */ stw r0, 0x34(r1) /* 802ECF54 002E9E94 39 61 00 30 */ addi r11, r1, 0x30 -/* 802ECF58 002E9E98 48 07 52 75 */ bl func_803621CC +/* 802ECF58 002E9E98 48 07 52 75 */ bl _savegpr_25 /* 802ECF5C 002E9E9C 7C 79 1B 78 */ mr r25, r3 /* 802ECF60 002E9EA0 7C 9A 23 78 */ mr r26, r4 /* 802ECF64 002E9EA4 7C BB 2B 78 */ mr r27, r5 @@ -2998,7 +2998,7 @@ lbl_802EDDEC: /* 802EDE08 002EAD48 7C 08 02 A6 */ mflr r0 /* 802EDE0C 002EAD4C 90 01 00 34 */ stw r0, 0x34(r1) /* 802EDE10 002EAD50 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EDE14 002EAD54 48 07 43 B9 */ bl func_803621CC +/* 802EDE14 002EAD54 48 07 43 B9 */ bl _savegpr_25 /* 802EDE18 002EAD58 7C 79 1B 78 */ mr r25, r3 /* 802EDE1C 002EAD5C 7C 9A 23 78 */ mr r26, r4 /* 802EDE20 002EAD60 7C BB 2B 78 */ mr r27, r5 @@ -3385,7 +3385,7 @@ lbl_802EE34C: /* 802EE368 002EB2A8 7C 08 02 A6 */ mflr r0 /* 802EE36C 002EB2AC 90 01 00 34 */ stw r0, 0x34(r1) /* 802EE370 002EB2B0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EE374 002EB2B4 48 07 3E 59 */ bl func_803621CC +/* 802EE374 002EB2B4 48 07 3E 59 */ bl _savegpr_25 /* 802EE378 002EB2B8 7C 79 1B 78 */ mr r25, r3 /* 802EE37C 002EB2BC 7C 9A 23 78 */ mr r26, r4 /* 802EE380 002EB2C0 7C BB 2B 78 */ mr r27, r5 @@ -4460,7 +4460,7 @@ lbl_802EF298: /* 802EF2B4 002EC1F4 7C 08 02 A6 */ mflr r0 /* 802EF2B8 002EC1F8 90 01 00 34 */ stw r0, 0x34(r1) /* 802EF2BC 002EC1FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EF2C0 002EC200 48 07 2F 0D */ bl func_803621CC +/* 802EF2C0 002EC200 48 07 2F 0D */ bl _savegpr_25 /* 802EF2C4 002EC204 7C 79 1B 78 */ mr r25, r3 /* 802EF2C8 002EC208 7C 9A 23 78 */ mr r26, r4 /* 802EF2CC 002EC20C 7C BB 2B 78 */ mr r27, r5 @@ -4846,7 +4846,7 @@ lbl_802EF7F4: /* 802EF810 002EC750 7C 08 02 A6 */ mflr r0 /* 802EF814 002EC754 90 01 00 34 */ stw r0, 0x34(r1) /* 802EF818 002EC758 39 61 00 30 */ addi r11, r1, 0x30 -/* 802EF81C 002EC75C 48 07 29 B1 */ bl func_803621CC +/* 802EF81C 002EC75C 48 07 29 B1 */ bl _savegpr_25 /* 802EF820 002EC760 7C 79 1B 78 */ mr r25, r3 /* 802EF824 002EC764 7C 9A 23 78 */ mr r26, r4 /* 802EF828 002EC768 7C BB 2B 78 */ mr r27, r5 @@ -5910,7 +5910,7 @@ lbl_802F0718: /* 802F0734 002ED674 7C 08 02 A6 */ mflr r0 /* 802F0738 002ED678 90 01 00 34 */ stw r0, 0x34(r1) /* 802F073C 002ED67C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F0740 002ED680 48 07 1A 8D */ bl func_803621CC +/* 802F0740 002ED680 48 07 1A 8D */ bl _savegpr_25 /* 802F0744 002ED684 7C 79 1B 78 */ mr r25, r3 /* 802F0748 002ED688 7C 9A 23 78 */ mr r26, r4 /* 802F074C 002ED68C 7C BB 2B 78 */ mr r27, r5 @@ -6296,7 +6296,7 @@ lbl_802F0C74: /* 802F0C90 002EDBD0 7C 08 02 A6 */ mflr r0 /* 802F0C94 002EDBD4 90 01 00 34 */ stw r0, 0x34(r1) /* 802F0C98 002EDBD8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F0C9C 002EDBDC 48 07 15 31 */ bl func_803621CC +/* 802F0C9C 002EDBDC 48 07 15 31 */ bl _savegpr_25 /* 802F0CA0 002EDBE0 7C 79 1B 78 */ mr r25, r3 /* 802F0CA4 002EDBE4 7C 9A 23 78 */ mr r26, r4 /* 802F0CA8 002EDBE8 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/J2DGraph/J2DPane.s b/asm/J2DGraph/J2DPane.s index ab14727974..bcf7dcec84 100644 --- a/asm/J2DGraph/J2DPane.s +++ b/asm/J2DGraph/J2DPane.s @@ -97,7 +97,7 @@ J2DPane_X1_: /* 802F5D44 002F2C84 7C 08 02 A6 */ mflr r0 /* 802F5D48 002F2C88 90 01 00 34 */ stw r0, 0x34(r1) /* 802F5D4C 002F2C8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F5D50 002F2C90 48 06 C4 7D */ bl func_803621CC +/* 802F5D50 002F2C90 48 06 C4 7D */ bl _savegpr_25 /* 802F5D54 002F2C94 7C 79 1B 78 */ mr r25, r3 /* 802F5D58 002F2C98 7C 9B 23 78 */ mr r27, r4 /* 802F5D5C 002F2C9C 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index 44f718e9e6..4c9b6acd00 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -121,7 +121,7 @@ J2DPicture_X2_: /* 802FC1D8 002F9118 7C 08 02 A6 */ mflr r0 /* 802FC1DC 002F911C 90 01 00 B4 */ stw r0, 0xb4(r1) /* 802FC1E0 002F9120 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 802FC1E4 002F9124 48 06 5F E9 */ bl func_803621CC +/* 802FC1E4 002F9124 48 06 5F E9 */ bl _savegpr_25 /* 802FC1E8 002F9128 7C 7F 1B 78 */ mr r31, r3 /* 802FC1EC 002F912C 7C 99 23 78 */ mr r25, r4 /* 802FC1F0 002F9130 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index 2edbddf8bc..d868d583df 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -726,7 +726,7 @@ J2DPictureEx_NS_insertCommon: /* 803040F0 00301030 DB E1 00 90 */ stfd f31, 0x90(r1) /* 803040F4 00301034 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 803040F8 00301038 39 61 00 90 */ addi r11, r1, 0x90 -/* 803040FC 0030103C 48 05 E0 D1 */ bl func_803621CC +/* 803040FC 0030103C 48 05 E0 D1 */ bl _savegpr_25 /* 80304100 00301040 7C 7A 1B 78 */ mr r26, r3 /* 80304104 00301044 7C 9B 23 78 */ mr r27, r4 /* 80304108 00301048 FF E0 08 90 */ fmr f31, f1 @@ -3311,7 +3311,7 @@ J2DPictureEx_NS_getBlackWhite: /* 80306668 003035A8 7C 08 02 A6 */ mflr r0 /* 8030666C 003035AC 90 01 00 44 */ stw r0, 0x44(r1) /* 80306670 003035B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80306674 003035B4 48 05 BB 59 */ bl func_803621CC +/* 80306674 003035B4 48 05 BB 59 */ bl _savegpr_25 /* 80306678 003035B8 7C 7D 1B 78 */ mr r29, r3 /* 8030667C 003035BC 7C 9E 23 78 */ mr r30, r4 /* 80306680 003035C0 7C BF 2B 78 */ mr r31, r5 diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index 623b7e8ca5..232d2053cd 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -120,7 +120,7 @@ J2DPrint_NS_private_initiate: /* 802F447C 002F13BC DB C1 00 40 */ stfd f30, 0x40(r1) /* 802F4480 002F13C0 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 802F4484 002F13C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802F4488 002F13C8 48 06 DD 45 */ bl func_803621CC +/* 802F4488 002F13C8 48 06 DD 45 */ bl _savegpr_25 /* 802F448C 002F13CC 7C 7C 1B 78 */ mr r28, r3 /* 802F4490 002F13D0 7C 99 23 78 */ mr r25, r4 /* 802F4494 002F13D4 FF C0 08 90 */ fmr f30, f1 @@ -393,7 +393,7 @@ J2DPrint_NS_printReturn: /* 802F485C 002F179C DB 41 02 50 */ stfd f26, 0x250(r1) /* 802F4860 002F17A0 F3 41 02 58 */ psq_st f26, 600(r1), 0, qr0 /* 802F4864 002F17A4 39 61 02 50 */ addi r11, r1, 0x250 -/* 802F4868 002F17A8 48 06 D9 65 */ bl func_803621CC +/* 802F4868 002F17A8 48 06 D9 65 */ bl _savegpr_25 /* 802F486C 002F17AC 7C 7A 1B 78 */ mr r26, r3 /* 802F4870 002F17B0 7C 9B 23 78 */ mr r27, r4 /* 802F4874 002F17B4 FF 80 08 90 */ fmr f28, f1 diff --git a/asm/J2DGraph/J2DScreen.s b/asm/J2DGraph/J2DScreen.s index b9b6af9f51..9de93a9060 100644 --- a/asm/J2DGraph/J2DScreen.s +++ b/asm/J2DGraph/J2DScreen.s @@ -369,7 +369,7 @@ J2DScreen_NS_makeHierarchyPanes: /* 802F8994 002F58D4 7C 08 02 A6 */ mflr r0 /* 802F8998 002F58D8 90 01 00 34 */ stw r0, 0x34(r1) /* 802F899C 002F58DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F89A0 002F58E0 48 06 98 2D */ bl func_803621CC +/* 802F89A0 002F58E0 48 06 98 2D */ bl _savegpr_25 /* 802F89A4 002F58E4 7C 79 1B 78 */ mr r25, r3 /* 802F89A8 002F58E8 7C 9A 23 78 */ mr r26, r4 /* 802F89AC 002F58EC 7C BB 2B 78 */ mr r27, r5 @@ -1068,7 +1068,7 @@ J2DScreen_NS_createMaterial: /* 802F9380 002F62C0 7C 08 02 A6 */ mflr r0 /* 802F9384 002F62C4 90 01 00 94 */ stw r0, 0x94(r1) /* 802F9388 002F62C8 39 61 00 90 */ addi r11, r1, 0x90 -/* 802F938C 002F62CC 48 06 8E 41 */ bl func_803621CC +/* 802F938C 002F62CC 48 06 8E 41 */ bl _savegpr_25 /* 802F9390 002F62D0 7C 7F 1B 78 */ mr r31, r3 /* 802F9394 002F62D4 7C 99 23 78 */ mr r25, r4 /* 802F9398 002F62D8 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s index c4a4365d24..0222a8f1d2 100644 --- a/asm/J2DGraph/J2DTextBox.s +++ b/asm/J2DGraph/J2DTextBox.s @@ -78,7 +78,7 @@ J2DTextBox_X2_: /* 802FF760 002FC6A0 7C 08 02 A6 */ mflr r0 /* 802FF764 002FC6A4 90 01 00 94 */ stw r0, 0x94(r1) /* 802FF768 002FC6A8 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FF76C 002FC6AC 48 06 2A 61 */ bl func_803621CC +/* 802FF76C 002FC6AC 48 06 2A 61 */ bl _savegpr_25 /* 802FF770 002FC6B0 7C 7B 1B 78 */ mr r27, r3 /* 802FF774 002FC6B4 7C 99 23 78 */ mr r25, r4 /* 802FF778 002FC6B8 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/J2DGraph/J2DTextBoxEx.s b/asm/J2DGraph/J2DTextBoxEx.s index e4af20e912..9866decbb4 100644 --- a/asm/J2DGraph/J2DTextBoxEx.s +++ b/asm/J2DGraph/J2DTextBoxEx.s @@ -9,7 +9,7 @@ J2DTextBoxEx: /* 803071E8 00304128 7C 08 02 A6 */ mflr r0 /* 803071EC 0030412C 90 01 00 84 */ stw r0, 0x84(r1) /* 803071F0 00304130 39 61 00 80 */ addi r11, r1, 0x80 -/* 803071F4 00304134 48 05 AF D9 */ bl func_803621CC +/* 803071F4 00304134 48 05 AF D9 */ bl _savegpr_25 /* 803071F8 00304138 7C 7B 1B 78 */ mr r27, r3 /* 803071FC 0030413C 7C 99 23 78 */ mr r25, r4 /* 80307200 00304140 7C BC 2B 78 */ mr r28, r5 @@ -1295,7 +1295,7 @@ J2DTextBoxEx_NS_getBlackWhite: /* 803084D0 00305410 7C 08 02 A6 */ mflr r0 /* 803084D4 00305414 90 01 00 44 */ stw r0, 0x44(r1) /* 803084D8 00305418 39 61 00 40 */ addi r11, r1, 0x40 -/* 803084DC 0030541C 48 05 9C F1 */ bl func_803621CC +/* 803084DC 0030541C 48 05 9C F1 */ bl _savegpr_25 /* 803084E0 00305420 7C 7D 1B 78 */ mr r29, r3 /* 803084E4 00305424 7C 9E 23 78 */ mr r30, r4 /* 803084E8 00305428 7C BF 2B 78 */ mr r31, r5 diff --git a/asm/J2DGraph/J2DWindow.s b/asm/J2DGraph/J2DWindow.s index 41b562da3f..fa68487588 100644 --- a/asm/J2DGraph/J2DWindow.s +++ b/asm/J2DGraph/J2DWindow.s @@ -455,7 +455,7 @@ J2DWindow_NS_private_readStream: /* 802FA134 002F7074 DB A1 00 90 */ stfd f29, 0x90(r1) /* 802FA138 002F7078 F3 A1 00 98 */ psq_st f29, 152(r1), 0, qr0 /* 802FA13C 002F707C 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FA140 002F7080 48 06 80 8D */ bl func_803621CC +/* 802FA140 002F7080 48 06 80 8D */ bl _savegpr_25 /* 802FA144 002F7084 7C 7B 1B 78 */ mr r27, r3 /* 802FA148 002F7088 7C 99 23 78 */ mr r25, r4 /* 802FA14C 002F708C 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index b53d931519..995d458dcf 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -434,7 +434,7 @@ J2DWindowEx_NS_draw_private: /* 80301300 002FE240 DB 41 00 D0 */ stfd f26, 0xd0(r1) /* 80301304 002FE244 F3 41 00 D8 */ psq_st f26, 216(r1), 0, qr0 /* 80301308 002FE248 39 61 00 D0 */ addi r11, r1, 0xd0 -/* 8030130C 002FE24C 48 06 0E C1 */ bl func_803621CC +/* 8030130C 002FE24C 48 06 0E C1 */ bl _savegpr_25 /* 80301310 002FE250 7C 7F 1B 78 */ mr r31, r3 /* 80301314 002FE254 7C 9D 23 78 */ mr r29, r4 /* 80301318 002FE258 7C B9 2B 78 */ mr r25, r5 @@ -1129,7 +1129,7 @@ J2DWindowEx_NS_drawFrameTexture: /* 80301D98 002FECD8 DB 81 00 40 */ stfd f28, 0x40(r1) /* 80301D9C 002FECDC F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 80301DA0 002FECE0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80301DA4 002FECE4 48 06 04 29 */ bl func_803621CC +/* 80301DA4 002FECE4 48 06 04 29 */ bl _savegpr_25 /* 80301DA8 002FECE8 7C 79 1B 78 */ mr r25, r3 /* 80301DAC 002FECEC FF 80 08 90 */ fmr f28, f1 /* 80301DB0 002FECF0 FF A0 10 90 */ fmr f29, f2 @@ -1461,7 +1461,7 @@ J2DWindowEx_NS_setTevOrder: /* 80302288 002FF1C8 7C 08 02 A6 */ mflr r0 /* 8030228C 002FF1CC 90 01 00 44 */ stw r0, 0x44(r1) /* 80302290 002FF1D0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302294 002FF1D4 48 05 FF 39 */ bl func_803621CC +/* 80302294 002FF1D4 48 05 FF 39 */ bl _savegpr_25 /* 80302298 002FF1D8 7C 7F 1B 78 */ mr r31, r3 /* 8030229C 002FF1DC 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 803022A0 002FF1E0 40 82 00 1C */ bne lbl_803022BC @@ -2001,7 +2001,7 @@ J2DWindowEx_NS_getBlackWhite: /* 80302A50 002FF990 7C 08 02 A6 */ mflr r0 /* 80302A54 002FF994 90 01 00 44 */ stw r0, 0x44(r1) /* 80302A58 002FF998 39 61 00 40 */ addi r11, r1, 0x40 -/* 80302A5C 002FF99C 48 05 F7 71 */ bl func_803621CC +/* 80302A5C 002FF99C 48 05 F7 71 */ bl _savegpr_25 /* 80302A60 002FF9A0 7C 7D 1B 78 */ mr r29, r3 /* 80302A64 002FF9A4 7C 9E 23 78 */ mr r30, r4 /* 80302A68 002FF9A8 7C BF 2B 78 */ mr r31, r5 diff --git a/asm/J3DGraphAnimator/J3DAnimation.s b/asm/J3DGraphAnimator/J3DAnimation.s index 0e7d77ef6e..d1511e985c 100644 --- a/asm/J3DGraphAnimator/J3DAnimation.s +++ b/asm/J3DGraphAnimator/J3DAnimation.s @@ -991,7 +991,7 @@ lbl_803291E8: /* 803291FC 0032613C DB E1 00 40 */ stfd f31, 0x40(r1) /* 80329200 00326140 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80329204 00326144 39 61 00 40 */ addi r11, r1, 0x40 -/* 80329208 00326148 48 03 8F C5 */ bl func_803621CC +/* 80329208 00326148 48 03 8F C5 */ bl _savegpr_25 /* 8032920C 0032614C 7C 79 1B 78 */ mr r25, r3 /* 80329210 00326150 7C BA 2B 78 */ mr r26, r5 /* 80329214 00326154 1C 04 00 03 */ mulli r0, r4, 3 diff --git a/asm/J3DGraphAnimator/J3DMaterialAttach.s b/asm/J3DGraphAnimator/J3DMaterialAttach.s index 2373a236d3..4a5d86789e 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAttach.s +++ b/asm/J3DGraphAnimator/J3DMaterialAttach.s @@ -323,7 +323,7 @@ J3DMaterialTable_NS_createTexMtxForAnimator: /* 8032F9C4 0032C904 7C 08 02 A6 */ mflr r0 /* 8032F9C8 0032C908 90 01 00 34 */ stw r0, 0x34(r1) /* 8032F9CC 0032C90C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032F9D0 0032C910 48 03 27 F9 */ bl func_803621C8 +/* 8032F9D0 0032C910 48 03 27 F9 */ bl _savegpr_24 /* 8032F9D4 0032C914 7C 7C 1B 78 */ mr r28, r3 /* 8032F9D8 0032C918 7C 9D 23 78 */ mr r29, r4 /* 8032F9DC 0032C91C 3B E0 00 00 */ li r31, 0 @@ -400,7 +400,7 @@ lbl_8032FACC: /* 8032FAD8 0032CA18 7F E3 FB 78 */ mr r3, r31 lbl_8032FADC: /* 8032FADC 0032CA1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032FAE0 0032CA20 48 03 27 35 */ bl func_80362214 +/* 8032FAE0 0032CA20 48 03 27 35 */ bl _restgpr_24 /* 8032FAE4 0032CA24 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032FAE8 0032CA28 7C 08 03 A6 */ mtlr r0 /* 8032FAEC 0032CA2C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index bbc7714069..5a0110e882 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -557,7 +557,7 @@ lbl_80327834: /* 8032785C 0032479C 7C 08 02 A6 */ mflr r0 /* 80327860 003247A0 90 01 00 34 */ stw r0, 0x34(r1) /* 80327864 003247A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80327868 003247A8 48 03 A9 65 */ bl func_803621CC +/* 80327868 003247A8 48 03 A9 65 */ bl _savegpr_25 /* 8032786C 003247AC 7C 7D 1B 78 */ mr r29, r3 /* 80327870 003247B0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80327874 003247B4 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -1222,7 +1222,7 @@ J3DModel_NS_calcBumpMtx: /* 803281B8 003250F8 7C 08 02 A6 */ mflr r0 /* 803281BC 003250FC 90 01 00 34 */ stw r0, 0x34(r1) /* 803281C0 00325100 39 61 00 30 */ addi r11, r1, 0x30 -/* 803281C4 00325104 48 03 A0 09 */ bl func_803621CC +/* 803281C4 00325104 48 03 A0 09 */ bl _savegpr_25 /* 803281C8 00325108 7C 7E 1B 78 */ mr r30, r3 /* 803281CC 0032510C 80 63 00 04 */ lwz r3, 4(r3) /* 803281D0 00325110 A0 03 00 0C */ lhz r0, 0xc(r3) diff --git a/asm/J3DGraphAnimator/J3DMtxBuffer.s b/asm/J3DGraphAnimator/J3DMtxBuffer.s index 7f79e7ccd1..65b798ff99 100644 --- a/asm/J3DGraphAnimator/J3DMtxBuffer.s +++ b/asm/J3DGraphAnimator/J3DMtxBuffer.s @@ -210,7 +210,7 @@ J3DMtxBuffer_NS_createDoubleDrawMtx: /* 803264BC 003233FC 7C 08 02 A6 */ mflr r0 /* 803264C0 00323400 90 01 00 34 */ stw r0, 0x34(r1) /* 803264C4 00323404 39 61 00 30 */ addi r11, r1, 0x30 -/* 803264C8 00323408 48 03 BD 01 */ bl func_803621C8 +/* 803264C8 00323408 48 03 BD 01 */ bl _savegpr_24 /* 803264CC 0032340C 7C 7D 1B 78 */ mr r29, r3 /* 803264D0 00323410 7C 9E 23 78 */ mr r30, r4 /* 803264D4 00323414 7C BF 2B 79 */ or. r31, r5, r5 @@ -324,7 +324,7 @@ lbl_80326638: /* 80326648 00323588 38 60 00 00 */ li r3, 0 lbl_8032664C: /* 8032664C 0032358C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80326650 00323590 48 03 BB C5 */ bl func_80362214 +/* 80326650 00323590 48 03 BB C5 */ bl _restgpr_24 /* 80326654 00323594 80 01 00 34 */ lwz r0, 0x34(r1) /* 80326658 00323598 7C 08 03 A6 */ mtlr r0 /* 8032665C 0032359C 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphAnimator/J3DShapeTable.s b/asm/J3DGraphAnimator/J3DShapeTable.s index ced6298372..f6143929c5 100644 --- a/asm/J3DGraphAnimator/J3DShapeTable.s +++ b/asm/J3DGraphAnimator/J3DShapeTable.s @@ -74,7 +74,7 @@ J3DShapeTable_NS_sortVcdVatCmd: /* 80325980 003228C0 7C 08 02 A6 */ mflr r0 /* 80325984 003228C4 90 01 00 34 */ stw r0, 0x34(r1) /* 80325988 003228C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032598C 003228CC 48 03 C8 41 */ bl func_803621CC +/* 8032598C 003228CC 48 03 C8 41 */ bl _savegpr_25 /* 80325990 003228D0 7C 79 1B 78 */ mr r25, r3 /* 80325994 003228D4 A3 83 00 04 */ lhz r28, 4(r3) /* 80325998 003228D8 3B 60 00 00 */ li r27, 0 diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index 1d54872529..a4b9667f01 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -112,7 +112,7 @@ J3DSkinNList_NS_calcSkin_VtxPosF32: /* 8032C860 003297A0 7C 08 02 A6 */ mflr r0 /* 8032C864 003297A4 90 01 00 34 */ stw r0, 0x34(r1) /* 8032C868 003297A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032C86C 003297AC 48 03 59 5D */ bl func_803621C8 +/* 8032C86C 003297AC 48 03 59 5D */ bl _savegpr_24 /* 8032C870 003297B0 7C 78 1B 78 */ mr r24, r3 /* 8032C874 003297B4 7C 99 23 78 */ mr r25, r4 /* 8032C878 003297B8 7C BA 2B 78 */ mr r26, r5 @@ -139,7 +139,7 @@ lbl_8032C8C4: /* 8032C8C4 00329804 7C 1C E8 00 */ cmpw r28, r29 /* 8032C8C8 00329808 41 80 FF CC */ blt lbl_8032C894 /* 8032C8CC 0032980C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032C8D0 00329810 48 03 59 45 */ bl func_80362214 +/* 8032C8D0 00329810 48 03 59 45 */ bl _restgpr_24 /* 8032C8D4 00329814 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032C8D8 00329818 7C 08 03 A6 */ mtlr r0 /* 8032C8DC 0032981C 38 21 00 30 */ addi r1, r1, 0x30 @@ -151,7 +151,7 @@ J3DSkinNList_NS_calcSkin_VtxNrmF32: /* 8032C8E8 00329828 7C 08 02 A6 */ mflr r0 /* 8032C8EC 0032982C 90 01 00 34 */ stw r0, 0x34(r1) /* 8032C8F0 00329830 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032C8F4 00329834 48 03 58 D5 */ bl func_803621C8 +/* 8032C8F4 00329834 48 03 58 D5 */ bl _savegpr_24 /* 8032C8F8 00329838 7C 78 1B 78 */ mr r24, r3 /* 8032C8FC 0032983C 7C 99 23 78 */ mr r25, r4 /* 8032C900 00329840 7C BA 2B 78 */ mr r26, r5 @@ -178,7 +178,7 @@ lbl_8032C94C: /* 8032C94C 0032988C 7C 1C E8 00 */ cmpw r28, r29 /* 8032C950 00329890 41 80 FF CC */ blt lbl_8032C91C /* 8032C954 00329894 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032C958 00329898 48 03 58 BD */ bl func_80362214 +/* 8032C958 00329898 48 03 58 BD */ bl _restgpr_24 /* 8032C95C 0032989C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032C960 003298A0 7C 08 03 A6 */ mtlr r0 /* 8032C964 003298A4 38 21 00 30 */ addi r1, r1, 0x30 @@ -1178,7 +1178,7 @@ J3DSkinDeform_NS_transformVtxPosNrm: /* 8032D73C 0032A67C 7C 08 02 A6 */ mflr r0 /* 8032D740 0032A680 90 01 00 94 */ stw r0, 0x94(r1) /* 8032D744 0032A684 39 61 00 90 */ addi r11, r1, 0x90 -/* 8032D748 0032A688 48 03 4A 81 */ bl func_803621C8 +/* 8032D748 0032A688 48 03 4A 81 */ bl _savegpr_24 /* 8032D74C 0032A68C 7C 7D 1B 78 */ mr r29, r3 /* 8032D750 0032A690 7C 9E 23 78 */ mr r30, r4 /* 8032D754 0032A694 A0 04 00 2E */ lhz r0, 0x2e(r4) @@ -1257,7 +1257,7 @@ lbl_8032D854: /* 8032D860 0032A7A0 98 1D 00 19 */ stb r0, 0x19(r29) lbl_8032D864: /* 8032D864 0032A7A4 39 61 00 90 */ addi r11, r1, 0x90 -/* 8032D868 0032A7A8 48 03 49 AD */ bl func_80362214 +/* 8032D868 0032A7A8 48 03 49 AD */ bl _restgpr_24 /* 8032D86C 0032A7AC 80 01 00 94 */ lwz r0, 0x94(r1) /* 8032D870 0032A7B0 7C 08 03 A6 */ mtlr r0 /* 8032D874 0032A7B4 38 21 00 90 */ addi r1, r1, 0x90 @@ -1305,7 +1305,7 @@ J3DSkinDeform_NS_deformFastVtxPos_F32: /* 8032D8F8 0032A838 7C 08 02 A6 */ mflr r0 /* 8032D8FC 0032A83C 90 01 00 34 */ stw r0, 0x34(r1) /* 8032D900 0032A840 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032D904 0032A844 48 03 48 C9 */ bl func_803621CC +/* 8032D904 0032A844 48 03 48 C9 */ bl _savegpr_25 /* 8032D908 0032A848 7C 9C 23 78 */ mr r28, r4 /* 8032D90C 0032A84C 7C BD 2B 78 */ mr r29, r5 /* 8032D910 0032A850 80 84 00 1C */ lwz r4, 0x1c(r4) @@ -1389,7 +1389,7 @@ J3DSkinDeform_NS_deformFastVtxNrm_F32: /* 8032DA20 0032A960 7C 08 02 A6 */ mflr r0 /* 8032DA24 0032A964 90 01 00 34 */ stw r0, 0x34(r1) /* 8032DA28 0032A968 39 61 00 30 */ addi r11, r1, 0x30 -/* 8032DA2C 0032A96C 48 03 47 A1 */ bl func_803621CC +/* 8032DA2C 0032A96C 48 03 47 A1 */ bl _savegpr_25 /* 8032DA30 0032A970 7C 9C 23 78 */ mr r28, r4 /* 8032DA34 0032A974 7C BD 2B 78 */ mr r29, r5 /* 8032DA38 0032A978 80 84 00 24 */ lwz r4, 0x24(r4) diff --git a/asm/J3DGraphBase/J3DGD.s b/asm/J3DGraphBase/J3DGD.s index 16d9e5fa32..bf1d303f5b 100644 --- a/asm/J3DGraphBase/J3DGD.s +++ b/asm/J3DGraphBase/J3DGD.s @@ -1180,7 +1180,7 @@ J3DGDSetTexCoordScale2: /* 8030E238 0030B178 7C 08 02 A6 */ mflr r0 /* 8030E23C 0030B17C 90 01 00 34 */ stw r0, 0x34(r1) /* 8030E240 0030B180 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030E244 0030B184 48 05 3F 89 */ bl func_803621CC +/* 8030E244 0030B184 48 05 3F 89 */ bl _savegpr_25 /* 8030E248 0030B188 7C 79 1B 78 */ mr r25, r3 /* 8030E24C 0030B18C 7C 9A 23 78 */ mr r26, r4 /* 8030E250 0030B190 7C BB 2B 78 */ mr r27, r5 @@ -1778,7 +1778,7 @@ J3DGDSetIndTexMtx: /* 8030EB34 0030BA74 7C 08 02 A6 */ mflr r0 /* 8030EB38 0030BA78 90 01 00 64 */ stw r0, 0x64(r1) /* 8030EB3C 0030BA7C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8030EB40 0030BA80 48 05 36 89 */ bl func_803621C8 +/* 8030EB40 0030BA80 48 05 36 89 */ bl _savegpr_24 /* 8030EB44 0030BA84 7C B8 2B 78 */ mr r24, r5 /* 8030EB48 0030BA88 2C 03 00 08 */ cmpwi r3, 8 /* 8030EB4C 0030BA8C 41 82 00 44 */ beq lbl_8030EB90 @@ -1960,7 +1960,7 @@ lbl_8030EC44: /* 8030EDF0 0030BD30 90 04 00 08 */ stw r0, 8(r4) /* 8030EDF4 0030BD34 98 C3 00 00 */ stb r6, 0(r3) /* 8030EDF8 0030BD38 39 61 00 60 */ addi r11, r1, 0x60 -/* 8030EDFC 0030BD3C 48 05 34 19 */ bl func_80362214 +/* 8030EDFC 0030BD3C 48 05 34 19 */ bl _restgpr_24 /* 8030EE00 0030BD40 80 01 00 64 */ lwz r0, 0x64(r1) /* 8030EE04 0030BD44 7C 08 03 A6 */ mtlr r0 /* 8030EE08 0030BD48 38 21 00 60 */ addi r1, r1, 0x60 @@ -2178,7 +2178,7 @@ J3DGDSetTevOrder: /* 8030F10C 0030C04C 7C 08 02 A6 */ mflr r0 /* 8030F110 0030C050 90 01 00 34 */ stw r0, 0x34(r1) /* 8030F114 0030C054 39 61 00 30 */ addi r11, r1, 0x30 -/* 8030F118 0030C058 48 05 30 B5 */ bl func_803621CC +/* 8030F118 0030C058 48 05 30 B5 */ bl _savegpr_25 /* 8030F11C 0030C05C 7C 79 1B 78 */ mr r25, r3 /* 8030F120 0030C060 7C BB 2B 78 */ mr r27, r5 /* 8030F124 0030C064 7C DC 33 78 */ mr r28, r6 diff --git a/asm/J3DGraphBase/J3DMatBlock.s b/asm/J3DGraphBase/J3DMatBlock.s index bc33b214c1..a125a8538f 100644 --- a/asm/J3DGraphBase/J3DMatBlock.s +++ b/asm/J3DGraphBase/J3DMatBlock.s @@ -4266,7 +4266,7 @@ lbl_8031B2F8: /* 8031B4C4 00318404 7C 08 02 A6 */ mflr r0 /* 8031B4C8 00318408 90 01 00 44 */ stw r0, 0x44(r1) /* 8031B4CC 0031840C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031B4D0 00318410 48 04 6C FD */ bl func_803621CC +/* 8031B4D0 00318410 48 04 6C FD */ bl _savegpr_25 /* 8031B4D4 00318414 7C 7F 1B 78 */ mr r31, r3 /* 8031B4D8 00318418 8B 83 00 20 */ lbz r28, 0x20(r3) /* 8031B4DC 0031841C 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) @@ -4612,7 +4612,7 @@ lbl_8031B83C: /* 8031BA08 00318948 7C 08 02 A6 */ mflr r0 /* 8031BA0C 0031894C 90 01 00 44 */ stw r0, 0x44(r1) /* 8031BA10 00318950 39 61 00 40 */ addi r11, r1, 0x40 -/* 8031BA14 00318954 48 04 67 B9 */ bl func_803621CC +/* 8031BA14 00318954 48 04 67 B9 */ bl _savegpr_25 /* 8031BA18 00318958 7C 7F 1B 78 */ mr r31, r3 /* 8031BA1C 0031895C 8B 83 00 58 */ lbz r28, 0x58(r3) /* 8031BA20 00318960 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) @@ -5051,7 +5051,7 @@ lbl_8031C058: /* 8031C0B0 00318FF0 7C 08 02 A6 */ mflr r0 /* 8031C0B4 00318FF4 90 01 00 34 */ stw r0, 0x34(r1) /* 8031C0B8 00318FF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C0BC 00318FFC 48 04 61 0D */ bl func_803621C8 +/* 8031C0BC 00318FFC 48 04 61 0D */ bl _savegpr_24 /* 8031C0C0 00319000 7C 7A 1B 78 */ mr r26, r3 /* 8031C0C4 00319004 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C0C8 00319008 80 64 00 00 */ lwz r3, 0(r4) @@ -5141,7 +5141,7 @@ lbl_8031C1F4: /* 8031C208 00319148 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C20C 0031914C 48 01 F3 D1 */ bl DCStoreRange /* 8031C210 00319150 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C214 00319154 48 04 60 01 */ bl func_80362214 +/* 8031C214 00319154 48 04 60 01 */ bl _restgpr_24 /* 8031C218 00319158 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031C21C 0031915C 7C 08 03 A6 */ mtlr r0 /* 8031C220 00319160 38 21 00 30 */ addi r1, r1, 0x30 @@ -5557,7 +5557,7 @@ lbl_8031C800: /* 8031C858 00319798 7C 08 02 A6 */ mflr r0 /* 8031C85C 0031979C 90 01 00 34 */ stw r0, 0x34(r1) /* 8031C860 003197A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C864 003197A4 48 04 59 65 */ bl func_803621C8 +/* 8031C864 003197A4 48 04 59 65 */ bl _savegpr_24 /* 8031C868 003197A8 7C 7A 1B 78 */ mr r26, r3 /* 8031C86C 003197AC 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031C870 003197B0 80 64 00 00 */ lwz r3, 0(r4) @@ -5647,7 +5647,7 @@ lbl_8031C99C: /* 8031C9B0 003198F0 7C 9E 00 50 */ subf r4, r30, r0 /* 8031C9B4 003198F4 48 01 EC 29 */ bl DCStoreRange /* 8031C9B8 003198F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031C9BC 003198FC 48 04 58 59 */ bl func_80362214 +/* 8031C9BC 003198FC 48 04 58 59 */ bl _restgpr_24 /* 8031C9C0 00319900 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031C9C4 00319904 7C 08 03 A6 */ mtlr r0 /* 8031C9C8 00319908 38 21 00 30 */ addi r1, r1, 0x30 @@ -5767,7 +5767,7 @@ lbl_8031CB28: /* 8031CB80 00319AC0 7C 08 02 A6 */ mflr r0 /* 8031CB84 00319AC4 90 01 00 34 */ stw r0, 0x34(r1) /* 8031CB88 00319AC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CB8C 00319ACC 48 04 56 3D */ bl func_803621C8 +/* 8031CB8C 00319ACC 48 04 56 3D */ bl _savegpr_24 /* 8031CB90 00319AD0 7C 7A 1B 78 */ mr r26, r3 /* 8031CB94 00319AD4 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031CB98 00319AD8 80 64 00 00 */ lwz r3, 0(r4) @@ -5857,7 +5857,7 @@ lbl_8031CCC4: /* 8031CCD8 00319C18 7C 9E 00 50 */ subf r4, r30, r0 /* 8031CCDC 00319C1C 48 01 E9 01 */ bl DCStoreRange /* 8031CCE0 00319C20 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031CCE4 00319C24 48 04 55 31 */ bl func_80362214 +/* 8031CCE4 00319C24 48 04 55 31 */ bl _restgpr_24 /* 8031CCE8 00319C28 80 01 00 34 */ lwz r0, 0x34(r1) /* 8031CCEC 00319C2C 7C 08 03 A6 */ mtlr r0 /* 8031CCF0 00319C30 38 21 00 30 */ addi r1, r1, 0x30 @@ -7043,7 +7043,7 @@ lbl_8031DEB0: /* 8031DED4 0031AE14 7C 08 02 A6 */ mflr r0 /* 8031DED8 0031AE18 90 01 00 34 */ stw r0, 0x34(r1) /* 8031DEDC 0031AE1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DEE0 0031AE20 48 04 42 ED */ bl func_803621CC +/* 8031DEE0 0031AE20 48 04 42 ED */ bl _savegpr_25 /* 8031DEE4 0031AE24 7C 7D 1B 78 */ mr r29, r3 /* 8031DEE8 0031AE28 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031DEEC 0031AE2C 80 64 00 00 */ lwz r3, 0(r4) @@ -7102,7 +7102,7 @@ lbl_8031DF78: /* 8031DFB8 0031AEF8 7C 08 02 A6 */ mflr r0 /* 8031DFBC 0031AEFC 90 01 00 34 */ stw r0, 0x34(r1) /* 8031DFC0 0031AF00 39 61 00 30 */ addi r11, r1, 0x30 -/* 8031DFC4 0031AF04 48 04 42 09 */ bl func_803621CC +/* 8031DFC4 0031AF04 48 04 42 09 */ bl _savegpr_25 /* 8031DFC8 0031AF08 7C 7D 1B 78 */ mr r29, r3 /* 8031DFCC 0031AF0C 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031DFD0 0031AF10 80 64 00 00 */ lwz r3, 0(r4) @@ -10536,7 +10536,7 @@ lbl_803213A8: /* 803213C4 0031E304 7C 08 02 A6 */ mflr r0 /* 803213C8 0031E308 90 01 00 64 */ stw r0, 0x64(r1) /* 803213CC 0031E30C 39 61 00 60 */ addi r11, r1, 0x60 -/* 803213D0 0031E310 48 04 0D FD */ bl func_803621CC +/* 803213D0 0031E310 48 04 0D FD */ bl _savegpr_25 /* 803213D4 0031E314 7C 7B 1B 78 */ mr r27, r3 /* 803213D8 0031E318 7C 9C 23 78 */ mr r28, r4 /* 803213DC 0031E31C 3B A0 00 00 */ li r29, 0 @@ -10657,7 +10657,7 @@ lbl_80321558: /* 80321588 0031E4C8 7C 08 02 A6 */ mflr r0 /* 8032158C 0031E4CC 90 01 00 64 */ stw r0, 0x64(r1) /* 80321590 0031E4D0 39 61 00 60 */ addi r11, r1, 0x60 -/* 80321594 0031E4D4 48 04 0C 39 */ bl func_803621CC +/* 80321594 0031E4D4 48 04 0C 39 */ bl _savegpr_25 /* 80321598 0031E4D8 7C 7B 1B 78 */ mr r27, r3 /* 8032159C 0031E4DC 7C 9C 23 78 */ mr r28, r4 /* 803215A0 0031E4E0 3B A0 00 00 */ li r29, 0 diff --git a/asm/J3DGraphBase/J3DMaterial.s b/asm/J3DGraphBase/J3DMaterial.s index 05bb819672..e0e49d9047 100644 --- a/asm/J3DGraphBase/J3DMaterial.s +++ b/asm/J3DGraphBase/J3DMaterial.s @@ -1396,7 +1396,7 @@ J3DMaterial_NS_calcCurrentMtx: /* 80316ACC 00313A0C 7C 08 02 A6 */ mflr r0 /* 80316AD0 00313A10 90 01 00 34 */ stw r0, 0x34(r1) /* 80316AD4 00313A14 39 61 00 30 */ addi r11, r1, 0x30 -/* 80316AD8 00313A18 48 04 B6 F1 */ bl func_803621C8 +/* 80316AD8 00313A18 48 04 B6 F1 */ bl _savegpr_24 /* 80316ADC 00313A1C 7C 7B 1B 78 */ mr r27, r3 /* 80316AE0 00313A20 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80316AE4 00313A24 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -1557,7 +1557,7 @@ lbl_80316C18: /* 80316D4C 00313C8C 90 1B 00 44 */ stw r0, 0x44(r27) lbl_80316D50: /* 80316D50 00313C90 39 61 00 30 */ addi r11, r1, 0x30 -/* 80316D54 00313C94 48 04 B4 C1 */ bl func_80362214 +/* 80316D54 00313C94 48 04 B4 C1 */ bl _restgpr_24 /* 80316D58 00313C98 80 01 00 34 */ lwz r0, 0x34(r1) /* 80316D5C 00313C9C 7C 08 03 A6 */ mtlr r0 /* 80316D60 00313CA0 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index 47ebc12e5f..4d18781059 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -109,7 +109,7 @@ J3DDifferedTexMtx_NS_loadExecute: /* 80313230 00310170 7C 08 02 A6 */ mflr r0 /* 80313234 00310174 90 01 00 E4 */ stw r0, 0xe4(r1) /* 80313238 00310178 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8031323C 0031017C 48 04 EF 91 */ bl func_803621CC +/* 8031323C 0031017C 48 04 EF 91 */ bl _savegpr_25 /* 80313240 00310180 7C 7C 1B 78 */ mr r28, r3 /* 80313244 00310184 83 6D 90 40 */ lwz r27, lbl_804515C0-_SDA_BASE_(r13) /* 80313248 00310188 83 ED 90 44 */ lwz r31, lbl_804515C4-_SDA_BASE_(r13) @@ -967,7 +967,7 @@ lbl_80313ECC: /* 80313EF0 00310E30 7C 08 02 A6 */ mflr r0 /* 80313EF4 00310E34 90 01 00 34 */ stw r0, 0x34(r1) /* 80313EF8 00310E38 39 61 00 30 */ addi r11, r1, 0x30 -/* 80313EFC 00310E3C 48 04 E2 D1 */ bl func_803621CC +/* 80313EFC 00310E3C 48 04 E2 D1 */ bl _savegpr_25 /* 80313F00 00310E40 7C 79 1B 78 */ mr r25, r3 /* 80313F04 00310E44 7C 9A 23 78 */ mr r26, r4 /* 80313F08 00310E48 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/J3DGraphBase/J3DSys.s b/asm/J3DGraphBase/J3DSys.s index 617024dcd8..59ab35036d 100644 --- a/asm/J3DGraphBase/J3DSys.s +++ b/asm/J3DGraphBase/J3DSys.s @@ -93,7 +93,7 @@ J3DSys_NS_setTexCacheRegion: /* 8030FF10 0030CE50 7C 08 02 A6 */ mflr r0 /* 8030FF14 0030CE54 90 01 00 54 */ stw r0, 0x54(r1) /* 8030FF18 0030CE58 39 61 00 50 */ addi r11, r1, 0x50 -/* 8030FF1C 0030CE5C 48 05 22 B1 */ bl func_803621CC +/* 8030FF1C 0030CE5C 48 05 22 B1 */ bl _savegpr_25 /* 8030FF20 0030CE60 7C 7C 1B 78 */ mr r28, r3 /* 8030FF24 0030CE64 7C 9D 23 78 */ mr r29, r4 /* 8030FF28 0030CE68 3C 60 80 3A */ lis r3, lbl_803A1DF8@ha diff --git a/asm/J3DGraphBase/J3DVertex.s b/asm/J3DGraphBase/J3DVertex.s index bc6d7a86f2..4d161a94eb 100644 --- a/asm/J3DGraphBase/J3DVertex.s +++ b/asm/J3DGraphBase/J3DVertex.s @@ -291,7 +291,7 @@ J3DVertexBuffer_NS_copyLocalVtxArray: /* 803112D4 0030E214 7C 08 02 A6 */ mflr r0 /* 803112D8 0030E218 90 01 00 44 */ stw r0, 0x44(r1) /* 803112DC 0030E21C 39 61 00 40 */ addi r11, r1, 0x40 -/* 803112E0 0030E220 48 05 0E E9 */ bl func_803621C8 +/* 803112E0 0030E220 48 05 0E E9 */ bl _savegpr_24 /* 803112E4 0030E224 7C 7E 1B 78 */ mr r30, r3 /* 803112E8 0030E228 7C 9F 23 78 */ mr r31, r4 /* 803112EC 0030E22C 38 60 00 00 */ li r3, 0 @@ -403,7 +403,7 @@ lbl_8031145C: /* 8031145C 0030E39C 38 60 00 00 */ li r3, 0 lbl_80311460: /* 80311460 0030E3A0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80311464 0030E3A4 48 05 0D B1 */ bl func_80362214 +/* 80311464 0030E3A4 48 05 0D B1 */ bl _restgpr_24 /* 80311468 0030E3A8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8031146C 0030E3AC 7C 08 03 A6 */ mtlr r0 /* 80311470 0030E3B0 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/J3DGraphLoader/J3DMaterialFactory.s b/asm/J3DGraphLoader/J3DMaterialFactory.s index 55d9a28328..072607fc65 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory.s @@ -1897,7 +1897,7 @@ J3DMaterialFactory_NS_calcSizeNormalMaterial: /* 80331B00 0032EA40 7C 08 02 A6 */ mflr r0 /* 80331B04 0032EA44 90 01 00 34 */ stw r0, 0x34(r1) /* 80331B08 0032EA48 39 61 00 30 */ addi r11, r1, 0x30 -/* 80331B0C 0032EA4C 48 03 06 BD */ bl func_803621C8 +/* 80331B0C 0032EA4C 48 03 06 BD */ bl _savegpr_24 /* 80331B10 0032EA50 7C 7C 1B 78 */ mr r28, r3 /* 80331B14 0032EA54 7C 9D 23 78 */ mr r29, r4 /* 80331B18 0032EA58 7C BE 2B 78 */ mr r30, r5 @@ -1971,7 +1971,7 @@ lbl_80331C0C: /* 80331C14 0032EB54 7F E3 FB 78 */ mr r3, r31 lbl_80331C18: /* 80331C18 0032EB58 39 61 00 30 */ addi r11, r1, 0x30 -/* 80331C1C 0032EB5C 48 03 05 F9 */ bl func_80362214 +/* 80331C1C 0032EB5C 48 03 05 F9 */ bl _restgpr_24 /* 80331C20 0032EB60 80 01 00 34 */ lwz r0, 0x34(r1) /* 80331C24 0032EB64 7C 08 03 A6 */ mtlr r0 /* 80331C28 0032EB68 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphLoader/J3DModelLoader.s b/asm/J3DGraphLoader/J3DModelLoader.s index e93c1d1242..07d32659e0 100644 --- a/asm/J3DGraphLoader/J3DModelLoader.s +++ b/asm/J3DGraphLoader/J3DModelLoader.s @@ -105,7 +105,7 @@ J3DModelLoader_NS_load: /* 803347E4 00331724 7C 08 02 A6 */ mflr r0 /* 803347E8 00331728 90 01 00 34 */ stw r0, 0x34(r1) /* 803347EC 0033172C 39 61 00 30 */ addi r11, r1, 0x30 -/* 803347F0 00331730 48 02 D9 DD */ bl func_803621CC +/* 803347F0 00331730 48 02 D9 DD */ bl _savegpr_25 /* 803347F4 00331734 7C 7B 1B 78 */ mr r27, r3 /* 803347F8 00331738 7C 99 23 78 */ mr r25, r4 /* 803347FC 0033173C 7C BA 2B 78 */ mr r26, r5 @@ -408,7 +408,7 @@ lbl_80334C04: /* 80334C24 00331B64 7C 08 02 A6 */ mflr r0 /* 80334C28 00331B68 90 01 00 34 */ stw r0, 0x34(r1) /* 80334C2C 00331B6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80334C30 00331B70 48 02 D5 99 */ bl func_803621C8 +/* 80334C30 00331B70 48 02 D5 99 */ bl _savegpr_24 /* 80334C34 00331B74 7C 78 1B 78 */ mr r24, r3 /* 80334C38 00331B78 7C 99 23 78 */ mr r25, r4 /* 80334C3C 00331B7C 7C BE 2B 78 */ mr r30, r5 @@ -593,7 +593,7 @@ lbl_80334E50: /* 80334EC0 00331E00 4B FF 10 09 */ bl J3DModelData_NS_indexToPtr /* 80334EC4 00331E04 80 78 00 04 */ lwz r3, 4(r24) /* 80334EC8 00331E08 39 61 00 30 */ addi r11, r1, 0x30 -/* 80334ECC 00331E0C 48 02 D3 49 */ bl func_80362214 +/* 80334ECC 00331E0C 48 02 D3 49 */ bl _restgpr_24 /* 80334ED0 00331E10 80 01 00 34 */ lwz r0, 0x34(r1) /* 80334ED4 00331E14 7C 08 03 A6 */ mtlr r0 /* 80334ED8 00331E18 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s index 40fca20374..345b9c1ad4 100644 --- a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s +++ b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s @@ -26,7 +26,7 @@ lbl_803367CC: /* 803367D8 00333718 7C 08 02 A6 */ mflr r0 /* 803367DC 0033371C 90 01 00 34 */ stw r0, 0x34(r1) /* 803367E0 00333720 39 61 00 30 */ addi r11, r1, 0x30 -/* 803367E4 00333724 48 02 B9 E9 */ bl func_803621CC +/* 803367E4 00333724 48 02 B9 E9 */ bl _savegpr_25 /* 803367E8 00333728 7C 7A 1B 78 */ mr r26, r3 /* 803367EC 0033372C 3B 84 00 20 */ addi r28, r4, 0x20 /* 803367F0 00333730 3B 60 00 00 */ li r27, 0 @@ -155,7 +155,7 @@ lbl_8033697C: /* 803369A4 003338E4 7C 08 02 A6 */ mflr r0 /* 803369A8 003338E8 90 01 00 34 */ stw r0, 0x34(r1) /* 803369AC 003338EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 803369B0 003338F0 48 02 B8 1D */ bl func_803621CC +/* 803369B0 003338F0 48 02 B8 1D */ bl _savegpr_25 /* 803369B4 003338F4 7C 79 1B 78 */ mr r25, r3 /* 803369B8 003338F8 3B 84 00 20 */ addi r28, r4, 0x20 /* 803369BC 003338FC 3B 60 00 00 */ li r27, 0 diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index 29b07c7ea2..a9ba542bc0 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -1125,7 +1125,7 @@ JAISeMgr_NS_startSound: /* 802A076C 0029D6AC 7C 08 02 A6 */ mflr r0 /* 802A0770 0029D6B0 90 01 00 44 */ stw r0, 0x44(r1) /* 802A0774 0029D6B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A0778 0029D6B8 48 0C 1A 55 */ bl func_803621CC +/* 802A0778 0029D6B8 48 0C 1A 55 */ bl _savegpr_25 /* 802A077C 0029D6BC 7C 7C 1B 78 */ mr r28, r3 /* 802A0780 0029D6C0 7C 9D 23 78 */ mr r29, r4 /* 802A0784 0029D6C4 7C BE 2B 79 */ or. r30, r5, r5 diff --git a/asm/JAudio2/JAISeq.s b/asm/JAudio2/JAISeq.s index 34a22b12d7..953baf9ddf 100644 --- a/asm/JAudio2/JAISeq.s +++ b/asm/JAudio2/JAISeq.s @@ -169,7 +169,7 @@ JAISeq_NS_reserveChildTracks_: /* 802A0CA8 0029DBE8 7C 08 02 A6 */ mflr r0 /* 802A0CAC 0029DBEC 90 01 00 34 */ stw r0, 0x34(r1) /* 802A0CB0 0029DBF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A0CB4 0029DBF4 48 0C 15 15 */ bl func_803621C8 +/* 802A0CB4 0029DBF4 48 0C 15 15 */ bl _savegpr_24 /* 802A0CB8 0029DBF8 7C 7D 1B 78 */ mr r29, r3 /* 802A0CBC 0029DBFC 7C 9C 23 78 */ mr r28, r4 /* 802A0CC0 0029DC00 3B C0 00 00 */ li r30, 0 @@ -277,7 +277,7 @@ lbl_802A0E20: /* 802A0E28 0029DD68 3B FF 00 10 */ addi r31, r31, 0x10 /* 802A0E2C 0029DD6C 41 80 FE A4 */ blt lbl_802A0CD0 /* 802A0E30 0029DD70 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A0E34 0029DD74 48 0C 13 E1 */ bl func_80362214 +/* 802A0E34 0029DD74 48 0C 13 E1 */ bl _restgpr_24 /* 802A0E38 0029DD78 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A0E3C 0029DD7C 7C 08 03 A6 */ mtlr r0 /* 802A0E40 0029DD80 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JAISeqMgr.s b/asm/JAudio2/JAISeqMgr.s index e24bf7a291..6d0aea394e 100644 --- a/asm/JAudio2/JAISeqMgr.s +++ b/asm/JAudio2/JAISeqMgr.s @@ -250,7 +250,7 @@ JAISeqMgr_NS_startSound: /* 802A1B4C 0029EA8C 7C 08 02 A6 */ mflr r0 /* 802A1B50 0029EA90 90 01 00 44 */ stw r0, 0x44(r1) /* 802A1B54 0029EA94 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A1B58 0029EA98 48 0C 06 75 */ bl func_803621CC +/* 802A1B58 0029EA98 48 0C 06 75 */ bl _savegpr_25 /* 802A1B5C 0029EA9C 7C 79 1B 78 */ mr r25, r3 /* 802A1B60 0029EAA0 7C 9A 23 78 */ mr r26, r4 /* 802A1B64 0029EAA4 7C BB 2B 79 */ or. r27, r5, r5 diff --git a/asm/JAudio2/JAIStreamMgr.s b/asm/JAudio2/JAIStreamMgr.s index 5feedbc578..70706565e0 100644 --- a/asm/JAudio2/JAIStreamMgr.s +++ b/asm/JAudio2/JAIStreamMgr.s @@ -66,7 +66,7 @@ JAIStreamMgr_NS_startSound: /* 802A3C40 002A0B80 7C 08 02 A6 */ mflr r0 /* 802A3C44 002A0B84 90 01 00 44 */ stw r0, 0x44(r1) /* 802A3C48 002A0B88 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A3C4C 002A0B8C 48 0B E5 81 */ bl func_803621CC +/* 802A3C4C 002A0B8C 48 0B E5 81 */ bl _savegpr_25 /* 802A3C50 002A0B90 7C 79 1B 78 */ mr r25, r3 /* 802A3C54 002A0B94 7C 9A 23 78 */ mr r26, r4 /* 802A3C58 002A0B98 7C BB 2B 79 */ or. r27, r5, r5 diff --git a/asm/JAudio2/JASAiCtrl.s b/asm/JAudio2/JASAiCtrl.s index db18604b8f..37bb6b5a85 100644 --- a/asm/JAudio2/JASAiCtrl.s +++ b/asm/JAudio2/JASAiCtrl.s @@ -9,7 +9,7 @@ JASDriver_NS_initAI: /* 8029C38C 002992CC 7C 08 02 A6 */ mflr r0 /* 8029C390 002992D0 90 01 00 34 */ stw r0, 0x34(r1) /* 8029C394 002992D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029C398 002992D8 48 0C 5E 35 */ bl func_803621CC +/* 8029C398 002992D8 48 0C 5E 35 */ bl _savegpr_25 /* 8029C39C 002992DC 7C 7F 1B 78 */ mr r31, r3 /* 8029C3A0 002992E0 38 60 00 00 */ li r3, 0 /* 8029C3A4 002992E4 48 00 01 81 */ bl JASDriver_NS_setOutputRate diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index ea685f0c33..ddbcab3d2c 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -832,7 +832,7 @@ JASAramStream_NS_updateChannel: /* 80296E30 00293D70 7C 08 02 A6 */ mflr r0 /* 80296E34 00293D74 90 01 00 54 */ stw r0, 0x54(r1) /* 80296E38 00293D78 39 61 00 50 */ addi r11, r1, 0x50 -/* 80296E3C 00293D7C 48 0C B3 91 */ bl func_803621CC +/* 80296E3C 00293D7C 48 0C B3 91 */ bl _savegpr_25 /* 80296E40 00293D80 7C 7B 1B 78 */ mr r27, r3 /* 80296E44 00293D84 7C 99 23 78 */ mr r25, r4 /* 80296E48 00293D88 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/JAudio2/JASBank.s b/asm/JAudio2/JASBank.s index 966c782822..1e05829ca4 100644 --- a/asm/JAudio2/JASBank.s +++ b/asm/JAudio2/JASBank.s @@ -225,7 +225,7 @@ JASBank_NS_noteOnOsc: /* 80297C44 00294B84 7C 08 02 A6 */ mflr r0 /* 80297C48 00294B88 90 01 00 34 */ stw r0, 0x34(r1) /* 80297C4C 00294B8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80297C50 00294B90 48 0C A5 7D */ bl func_803621CC +/* 80297C50 00294B90 48 0C A5 7D */ bl _savegpr_25 /* 80297C54 00294B94 7C 7A 1B 78 */ mr r26, r3 /* 80297C58 00294B98 7C 9B 23 78 */ mr r27, r4 /* 80297C5C 00294B9C 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/JAudio2/JASBasicWaveBank.s b/asm/JAudio2/JASBasicWaveBank.s index 4433e45e09..8b8f8733b3 100644 --- a/asm/JAudio2/JASBasicWaveBank.s +++ b/asm/JAudio2/JASBasicWaveBank.s @@ -261,7 +261,7 @@ JASBasicWaveBank_NS_decWaveTable: /* 80298840 00295780 7C 08 02 A6 */ mflr r0 /* 80298844 00295784 90 01 00 34 */ stw r0, 0x34(r1) /* 80298848 00295788 39 61 00 30 */ addi r11, r1, 0x30 -/* 8029884C 0029578C 48 0C 99 81 */ bl func_803621CC +/* 8029884C 0029578C 48 0C 99 81 */ bl _savegpr_25 /* 80298850 00295790 7C 79 1B 78 */ mr r25, r3 /* 80298854 00295794 7C 9A 23 78 */ mr r26, r4 /* 80298858 00295798 38 79 00 04 */ addi r3, r25, 4 diff --git a/asm/JAudio2/JASSeqParser.s b/asm/JAudio2/JASSeqParser.s index 94117a283f..056fac7b64 100644 --- a/asm/JAudio2/JASSeqParser.s +++ b/asm/JAudio2/JASSeqParser.s @@ -1439,7 +1439,7 @@ lbl_80295078: /* 80295270 002921B0 7C 08 02 A6 */ mflr r0 /* 80295274 002921B4 90 01 00 C4 */ stw r0, 0xc4(r1) /* 80295278 002921B8 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 8029527C 002921BC 48 0C CF 51 */ bl func_803621CC +/* 8029527C 002921BC 48 0C CF 51 */ bl _savegpr_25 /* 80295280 002921C0 7C 7D 1B 78 */ mr r29, r3 /* 80295284 002921C4 7C 9E 23 78 */ mr r30, r4 /* 80295288 002921C8 3B E0 00 00 */ li r31, 0 @@ -1747,7 +1747,7 @@ JASSeqParser_NS_parseCommand: /* 802956B4 002925F4 7C 08 02 A6 */ mflr r0 /* 802956B8 002925F8 90 01 00 64 */ stw r0, 0x64(r1) /* 802956BC 002925FC 39 61 00 60 */ addi r11, r1, 0x60 -/* 802956C0 00292600 48 0C CB 0D */ bl func_803621CC +/* 802956C0 00292600 48 0C CB 0D */ bl _savegpr_25 /* 802956C4 00292604 7C 7B 1B 78 */ mr r27, r3 /* 802956C8 00292608 7C 9C 23 78 */ mr r28, r4 /* 802956CC 0029260C 54 A3 06 3E */ clrlwi r3, r5, 0x18 diff --git a/asm/JAudio2/JAUSeqDataBlockMgr.s b/asm/JAudio2/JAUSeqDataBlockMgr.s index a626c23aed..dcd645bef1 100644 --- a/asm/JAudio2/JAUSeqDataBlockMgr.s +++ b/asm/JAudio2/JAUSeqDataBlockMgr.s @@ -260,7 +260,7 @@ JAUDynamicSeqDataBlocks_NS_loadDynamicSeq: /* 802A6C1C 002A3B5C 7C 08 02 A6 */ mflr r0 /* 802A6C20 002A3B60 90 01 00 34 */ stw r0, 0x34(r1) /* 802A6C24 002A3B64 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A6C28 002A3B68 48 0B B5 A5 */ bl func_803621CC +/* 802A6C28 002A3B68 48 0B B5 A5 */ bl _savegpr_25 /* 802A6C2C 002A3B6C 7C 7F 1B 78 */ mr r31, r3 /* 802A6C30 002A3B70 7C 99 23 78 */ mr r25, r4 /* 802A6C34 002A3B74 7C BA 2B 78 */ mr r26, r5 @@ -400,7 +400,7 @@ JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock_: /* 802A6E04 002A3D44 7C 08 02 A6 */ mflr r0 /* 802A6E08 002A3D48 90 01 00 34 */ stw r0, 0x34(r1) /* 802A6E0C 002A3D4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A6E10 002A3D50 48 0B B3 B9 */ bl func_803621C8 +/* 802A6E10 002A3D50 48 0B B3 B9 */ bl _savegpr_24 /* 802A6E14 002A3D54 7C 78 1B 78 */ mr r24, r3 /* 802A6E18 002A3D58 7C 99 23 78 */ mr r25, r4 /* 802A6E1C 002A3D5C 7C BA 2B 78 */ mr r26, r5 @@ -452,7 +452,7 @@ lbl_802A6EC0: /* 802A6EC0 002A3E00 38 60 00 00 */ li r3, 0 lbl_802A6EC4: /* 802A6EC4 002A3E04 39 61 00 30 */ addi r11, r1, 0x30 -/* 802A6EC8 002A3E08 48 0B B3 4D */ bl func_80362214 +/* 802A6EC8 002A3E08 48 0B B3 4D */ bl _restgpr_24 /* 802A6ECC 002A3E0C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A6ED0 002A3E10 7C 08 03 A6 */ mtlr r0 /* 802A6ED4 002A3E14 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JFramework/JFWDisplay.s b/asm/JFramework/JFWDisplay.s index 58fa070d4c..133446110b 100644 --- a/asm/JFramework/JFWDisplay.s +++ b/asm/JFramework/JFWDisplay.s @@ -1116,7 +1116,7 @@ JFWDisplay_NS_clearEfb_X2_: /* 80272FA0 0026FEE0 7C 08 02 A6 */ mflr r0 /* 80272FA4 0026FEE4 90 01 00 94 */ stw r0, 0x94(r1) /* 80272FA8 0026FEE8 39 61 00 90 */ addi r11, r1, 0x90 -/* 80272FAC 0026FEEC 48 0E F2 1D */ bl func_803621C8 +/* 80272FAC 0026FEEC 48 0E F2 1D */ bl _savegpr_24 /* 80272FB0 0026FEF0 7C 7A 1B 78 */ mr r26, r3 /* 80272FB4 0026FEF4 7C 9B 23 78 */ mr r27, r4 /* 80272FB8 0026FEF8 7C BC 2B 78 */ mr r28, r5 @@ -1333,7 +1333,7 @@ lbl_80273258: /* 80273300 00270240 48 0E CB 05 */ bl GXSetDstAlpha lbl_80273304: /* 80273304 00270244 39 61 00 90 */ addi r11, r1, 0x90 -/* 80273308 00270248 48 0E EF 0D */ bl func_80362214 +/* 80273308 00270248 48 0E EF 0D */ bl _restgpr_24 /* 8027330C 0027024C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80273310 00270250 7C 08 03 A6 */ mtlr r0 /* 80273314 00270254 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/JKernel/JKRExpHeap.s b/asm/JKernel/JKRExpHeap.s index f6e5437673..f56c582786 100644 --- a/asm/JKernel/JKRExpHeap.s +++ b/asm/JKernel/JKRExpHeap.s @@ -332,7 +332,7 @@ allocFromHead__10JKRExpHeapFUli: /* 802CF238 002CC178 7C 08 02 A6 */ mflr r0 /* 802CF23C 002CC17C 90 01 00 34 */ stw r0, 0x34(r1) /* 802CF240 002CC180 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CF244 002CC184 48 09 2F 89 */ bl func_803621CC +/* 802CF244 002CC184 48 09 2F 89 */ bl _savegpr_25 /* 802CF248 002CC188 7C 7D 1B 78 */ mr r29, r3 /* 802CF24C 002CC18C 38 04 00 03 */ addi r0, r4, 3 /* 802CF250 002CC190 54 1E 00 3A */ rlwinm r30, r0, 0, 0, 0x1d @@ -1596,7 +1596,7 @@ lbl_802D0394: /* 802D03BC 002CD2FC 7C 08 02 A6 */ mflr r0 /* 802D03C0 002CD300 90 01 00 44 */ stw r0, 0x44(r1) /* 802D03C4 002CD304 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D03C8 002CD308 48 09 1E 05 */ bl func_803621CC +/* 802D03C8 002CD308 48 09 1E 05 */ bl _savegpr_25 /* 802D03CC 002CD30C 7C 7A 1B 78 */ mr r26, r3 /* 802D03D0 002CD310 38 7A 00 18 */ addi r3, r26, 0x18 /* 802D03D4 002CD314 48 06 EC 6D */ bl OSLockMutex @@ -1738,7 +1738,7 @@ lbl_802D0548: /* 802D05D0 002CD510 7C 08 02 A6 */ mflr r0 /* 802D05D4 002CD514 90 01 00 44 */ stw r0, 0x44(r1) /* 802D05D8 002CD518 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D05DC 002CD51C 48 09 1B F1 */ bl func_803621CC +/* 802D05DC 002CD51C 48 09 1B F1 */ bl _savegpr_25 /* 802D05E0 002CD520 7C 79 1B 78 */ mr r25, r3 /* 802D05E4 002CD524 38 79 00 18 */ addi r3, r25, 0x18 /* 802D05E8 002CD528 48 06 EA 59 */ bl OSLockMutex diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index 31ac0dab06..5af68da8e8 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -2812,7 +2812,7 @@ JPADrawStripe: /* 802793F0 00276330 DA 21 00 90 */ stfd f17, 0x90(r1) /* 802793F4 00276334 F2 21 00 98 */ psq_st f17, 152(r1), 0, qr0 /* 802793F8 00276338 39 61 00 90 */ addi r11, r1, 0x90 -/* 802793FC 0027633C 48 0E 8D CD */ bl func_803621C8 +/* 802793FC 0027633C 48 0E 8D CD */ bl _savegpr_24 /* 80279400 00276340 7C 7D 1B 78 */ mr r29, r3 /* 80279404 00276344 80 63 00 04 */ lwz r3, 4(r3) /* 80279408 00276348 80 63 00 1C */ lwz r3, 0x1c(r3) @@ -3175,7 +3175,7 @@ lbl_802798DC: /* 8027994C 0027688C E2 21 00 98 */ psq_l f17, 152(r1), 0, qr0 /* 80279950 00276890 CA 21 00 90 */ lfd f17, 0x90(r1) /* 80279954 00276894 39 61 00 90 */ addi r11, r1, 0x90 -/* 80279958 00276898 48 0E 88 BD */ bl func_80362214 +/* 80279958 00276898 48 0E 88 BD */ bl _restgpr_24 /* 8027995C 0027689C 80 01 01 84 */ lwz r0, 0x184(r1) /* 80279960 002768A0 7C 08 03 A6 */ mtlr r0 /* 80279964 002768A4 38 21 01 80 */ addi r1, r1, 0x180 diff --git a/asm/JParticle/JPAEmitterManager.s b/asm/JParticle/JPAEmitterManager.s index f18b2b65d6..92c2f5870c 100644 --- a/asm/JParticle/JPAEmitterManager.s +++ b/asm/JParticle/JPAEmitterManager.s @@ -168,7 +168,7 @@ JPAEmitterManager_NS_createSimpleEmitterID: /* 8027DEC0 0027AE00 7C 08 02 A6 */ mflr r0 /* 8027DEC4 0027AE04 90 01 00 34 */ stw r0, 0x34(r1) /* 8027DEC8 0027AE08 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027DECC 0027AE0C 48 0E 42 FD */ bl func_803621C8 +/* 8027DECC 0027AE0C 48 0E 42 FD */ bl _savegpr_24 /* 8027DED0 0027AE10 7C 78 1B 78 */ mr r24, r3 /* 8027DED4 0027AE14 7C 99 23 78 */ mr r25, r4 /* 8027DED8 0027AE18 7C DA 33 78 */ mr r26, r6 @@ -218,7 +218,7 @@ lbl_8027DF84: /* 8027DF84 0027AEC4 38 60 00 00 */ li r3, 0 lbl_8027DF88: /* 8027DF88 0027AEC8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8027DF8C 0027AECC 48 0E 42 89 */ bl func_80362214 +/* 8027DF8C 0027AECC 48 0E 42 89 */ bl _restgpr_24 /* 8027DF90 0027AED0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8027DF94 0027AED4 7C 08 03 A6 */ mtlr r0 /* 8027DF98 0027AED8 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JParticle/JPAResource.s b/asm/JParticle/JPAResource.s index b7d4b7bbfd..5ee3487cad 100644 --- a/asm/JParticle/JPAResource.s +++ b/asm/JParticle/JPAResource.s @@ -2622,7 +2622,7 @@ JPAResource_NS_setPTev: /* 802761AC 002730EC 7C 08 02 A6 */ mflr r0 /* 802761B0 002730F0 90 01 00 34 */ stw r0, 0x34(r1) /* 802761B4 002730F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802761B8 002730F8 48 0E C0 15 */ bl func_803621CC +/* 802761B8 002730F8 48 0E C0 15 */ bl _savegpr_25 /* 802761BC 002730FC 7C 7B 1B 78 */ mr r27, r3 /* 802761C0 00273100 3B E0 00 01 */ li r31, 1 /* 802761C4 00273104 3B C0 00 01 */ li r30, 1 diff --git a/asm/JStudio/jstudio-object.s b/asm/JStudio/jstudio-object.s index 033e49d44d..54dd75999d 100644 --- a/asm/JStudio/jstudio-object.s +++ b/asm/JStudio/jstudio-object.s @@ -221,7 +221,7 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n: /* 802860D0 00283010 7C 08 02 A6 */ mflr r0 /* 802860D4 00283014 90 01 00 34 */ stw r0, 0x34(r1) /* 802860D8 00283018 39 61 00 30 */ addi r11, r1, 0x30 -/* 802860DC 0028301C 48 0D C0 F1 */ bl func_803621CC +/* 802860DC 0028301C 48 0D C0 F1 */ bl _savegpr_25 /* 802860E0 00283020 7C 79 1B 78 */ mr r25, r3 /* 802860E4 00283024 7C 9A 23 78 */ mr r26, r4 /* 802860E8 00283028 7D 1B 43 78 */ mr r27, r8 diff --git a/asm/JStudio/stb.s b/asm/JStudio/stb.s index 23c0538cdc..c6f4879561 100644 --- a/asm/JStudio/stb.s +++ b/asm/JStudio/stb.s @@ -768,7 +768,7 @@ JStudio_NS_stb_NS_TControl_NS_forward: /* 802894B8 002863F8 7C 08 02 A6 */ mflr r0 /* 802894BC 002863FC 90 01 00 64 */ stw r0, 0x64(r1) /* 802894C0 00286400 39 61 00 60 */ addi r11, r1, 0x60 -/* 802894C4 00286404 48 0D 8D 09 */ bl func_803621CC +/* 802894C4 00286404 48 0D 8D 09 */ bl _savegpr_25 /* 802894C8 00286408 7C 7B 1B 78 */ mr r27, r3 /* 802894CC 0028640C 7C 9C 23 78 */ mr r28, r4 /* 802894D0 00286410 80 03 00 40 */ lwz r0, 0x40(r3) diff --git a/asm/JUtility/JUTDbPrint.s b/asm/JUtility/JUTDbPrint.s index b227c605b8..5bece595fa 100644 --- a/asm/JUtility/JUTDbPrint.s +++ b/asm/JUtility/JUTDbPrint.s @@ -77,7 +77,7 @@ JUTDbPrint_NS_enter: /* 802E0220 002DD160 7C 08 02 A6 */ mflr r0 /* 802E0224 002DD164 90 01 00 34 */ stw r0, 0x34(r1) /* 802E0228 002DD168 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E022C 002DD16C 48 08 1F A1 */ bl func_803621CC +/* 802E022C 002DD16C 48 08 1F A1 */ bl _savegpr_25 /* 802E0230 002DD170 7C 79 1B 78 */ mr r25, r3 /* 802E0234 002DD174 7C 9A 23 78 */ mr r26, r4 /* 802E0238 002DD178 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/JUtility/JUTDirectPrint.s b/asm/JUtility/JUTDirectPrint.s index c277c4744c..0fb85d1831 100644 --- a/asm/JUtility/JUTDirectPrint.s +++ b/asm/JUtility/JUTDirectPrint.s @@ -296,7 +296,7 @@ printSub__14JUTDirectPrintFUsUsPCcP16__va_list_structb: /* 802E45A8 002E14E8 7C 08 02 A6 */ mflr r0 /* 802E45AC 002E14EC 90 01 01 34 */ stw r0, 0x134(r1) /* 802E45B0 002E14F0 39 61 01 30 */ addi r11, r1, 0x130 -/* 802E45B4 002E14F4 48 07 DC 15 */ bl func_803621C8 +/* 802E45B4 002E14F4 48 07 DC 15 */ bl _savegpr_24 /* 802E45B8 002E14F8 7C 79 1B 78 */ mr r25, r3 /* 802E45BC 002E14FC 7C 9A 23 78 */ mr r26, r4 /* 802E45C0 002E1500 7C BB 2B 78 */ mr r27, r5 @@ -373,7 +373,7 @@ lbl_802E46B4: /* 802E46BC 002E15FC 48 05 6F 21 */ bl DCStoreRange lbl_802E46C0: /* 802E46C0 002E1600 39 61 01 30 */ addi r11, r1, 0x130 -/* 802E46C4 002E1604 48 07 DB 51 */ bl func_80362214 +/* 802E46C4 002E1604 48 07 DB 51 */ bl _restgpr_24 /* 802E46C8 002E1608 80 01 01 34 */ lwz r0, 0x134(r1) /* 802E46CC 002E160C 7C 08 03 A6 */ mtlr r0 /* 802E46D0 002E1610 38 21 01 30 */ addi r1, r1, 0x130 diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index 7ca8a27492..ed3e2495d4 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -107,7 +107,7 @@ lbl_802E1E90: /* 802E1EAC 002DEDEC 7C 08 02 A6 */ mflr r0 /* 802E1EB0 002DEDF0 90 01 00 34 */ stw r0, 0x34(r1) /* 802E1EB4 002DEDF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E1EB8 002DEDF8 48 08 03 15 */ bl func_803621CC +/* 802E1EB8 002DEDF8 48 08 03 15 */ bl _savegpr_25 /* 802E1EBC 002DEDFC 7C 7F 1B 78 */ mr r31, r3 /* 802E1EC0 002DEE00 48 05 7E 01 */ bl PPCMfmsr /* 802E1EC4 002DEE04 38 00 F6 FF */ li r0, -2305 @@ -1119,7 +1119,7 @@ JUTException_NS_showGPRMap: /* 802E2CA4 002DFBE4 7C 08 02 A6 */ mflr r0 /* 802E2CA8 002DFBE8 90 01 00 34 */ stw r0, 0x34(r1) /* 802E2CAC 002DFBEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802E2CB0 002DFBF0 48 07 F5 1D */ bl func_803621CC +/* 802E2CB0 002DFBF0 48 07 F5 1D */ bl _savegpr_25 /* 802E2CB4 002DFBF4 7C 79 1B 78 */ mr r25, r3 /* 802E2CB8 002DFBF8 7C 9A 23 78 */ mr r26, r4 /* 802E2CBC 002DFBFC 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) @@ -2206,7 +2206,7 @@ JUTException_NS_queryMapAddress: /* 802E3BA4 002E0AE4 7C 08 02 A6 */ mflr r0 /* 802E3BA8 002E0AE8 90 01 00 84 */ stw r0, 0x84(r1) /* 802E3BAC 002E0AEC 39 61 00 80 */ addi r11, r1, 0x80 -/* 802E3BB0 002E0AF0 48 07 E6 19 */ bl func_803621C8 +/* 802E3BB0 002E0AF0 48 07 E6 19 */ bl _savegpr_24 /* 802E3BB4 002E0AF4 7C 60 1B 79 */ or. r0, r3, r3 /* 802E3BB8 002E0AF8 7C 98 23 78 */ mr r24, r4 /* 802E3BBC 002E0AFC 7C B9 2B 78 */ mr r25, r5 @@ -2260,7 +2260,7 @@ lbl_802E3C74: /* 802E3C74 002E0BB4 38 60 00 00 */ li r3, 0 lbl_802E3C78: /* 802E3C78 002E0BB8 39 61 00 80 */ addi r11, r1, 0x80 -/* 802E3C7C 002E0BBC 48 07 E5 99 */ bl func_80362214 +/* 802E3C7C 002E0BBC 48 07 E5 99 */ bl _restgpr_24 /* 802E3C80 002E0BC0 80 01 00 84 */ lwz r0, 0x84(r1) /* 802E3C84 002E0BC4 7C 08 03 A6 */ mtlr r0 /* 802E3C88 002E0BC8 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/JUtility/JUTProcBar.s b/asm/JUtility/JUTProcBar.s index 8d6a6bb3cd..6509b70d62 100644 --- a/asm/JUtility/JUTProcBar.s +++ b/asm/JUtility/JUTProcBar.s @@ -1575,7 +1575,7 @@ JUTProcBar_NS_drawHeapBar: /* 802E6FA4 002E3EE4 7C 08 02 A6 */ mflr r0 /* 802E6FA8 002E3EE8 90 01 00 F4 */ stw r0, 0xf4(r1) /* 802E6FAC 002E3EEC 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 802E6FB0 002E3EF0 48 07 B2 1D */ bl func_803621CC +/* 802E6FB0 002E3EF0 48 07 B2 1D */ bl _savegpr_25 /* 802E6FB4 002E3EF4 7C 79 1B 78 */ mr r25, r3 /* 802E6FB8 002E3EF8 88 03 01 30 */ lbz r0, 0x130(r3) /* 802E6FBC 002E3EFC 28 00 00 00 */ cmplwi r0, 0 diff --git a/asm/SComponent/c/cc/c_cc_s.s b/asm/SComponent/c/cc/c_cc_s.s index 2b64d8a2b1..cfa3d4f549 100644 --- a/asm/SComponent/c/cc/c_cc_s.s +++ b/asm/SComponent/c/cc/c_cc_s.s @@ -370,7 +370,7 @@ cCcS_NS_ChkAtTg: /* 80264F44 00261E84 7C 08 02 A6 */ mflr r0 /* 80264F48 00261E88 90 01 00 34 */ stw r0, 0x34(r1) /* 80264F4C 00261E8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80264F50 00261E90 48 0F D2 7D */ bl func_803621CC +/* 80264F50 00261E90 48 0F D2 7D */ bl _savegpr_25 /* 80264F54 00261E94 7C 7F 1B 78 */ mr r31, r3 /* 80264F58 00261E98 A0 03 28 02 */ lhz r0, 0x2802(r3) /* 80264F5C 00261E9C 54 04 10 3A */ slwi r4, r0, 2 @@ -579,7 +579,7 @@ cCcS_NS_ChkCo: /* 80265234 00262174 7C 08 02 A6 */ mflr r0 /* 80265238 00262178 90 01 00 34 */ stw r0, 0x34(r1) /* 8026523C 0026217C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80265240 00262180 48 0F CF 8D */ bl func_803621CC +/* 80265240 00262180 48 0F CF 8D */ bl _savegpr_25 /* 80265244 00262184 7C 7B 1B 78 */ mr r27, r3 /* 80265248 00262188 4B FF FA 15 */ bl cCcS_NS_ClrCoHitInf /* 8026524C 0026218C A0 1B 28 04 */ lhz r0, 0x2804(r27) @@ -934,7 +934,7 @@ lbl_8026569C: /* 8026576C 002626AC DB A1 00 50 */ stfd f29, 0x50(r1) /* 80265770 002626B0 F3 A1 00 58 */ psq_st f29, 88(r1), 0, qr0 /* 80265774 002626B4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80265778 002626B8 48 0F CA 55 */ bl func_803621CC +/* 80265778 002626B8 48 0F CA 55 */ bl _savegpr_25 /* 8026577C 002626BC 7C 7A 1B 78 */ mr r26, r3 /* 80265780 002626C0 7C 9B 23 78 */ mr r27, r4 /* 80265784 002626C4 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/SComponent/c/m3d/g/c_m3d_g_cps.s b/asm/SComponent/c/m3d/g/c_m3d_g_cps.s index 05d39d5541..82c88934fc 100644 --- a/asm/SComponent/c/m3d/g/c_m3d_g_cps.s +++ b/asm/SComponent/c/m3d/g/c_m3d_g_cps.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8026ef88 -.global cM3dGCps -cM3dGCps: +.global __ct__8cM3dGCpsFv +__ct__8cM3dGCpsFv: /* 8026EF88 0026BEC8 3C 80 80 3A */ lis r4, lbl_803A78F8@ha /* 8026EF8C 0026BECC 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l /* 8026EF90 0026BED0 90 03 00 18 */ stw r0, 0x18(r3) diff --git a/asm/Z2AudioLib/Z2Audience.s b/asm/Z2AudioLib/Z2Audience.s index 88e1f5f2d3..9b4f65c053 100644 --- a/asm/Z2AudioLib/Z2Audience.s +++ b/asm/Z2AudioLib/Z2Audience.s @@ -1783,7 +1783,7 @@ lbl_802BD59C: /* 802BD5BC 002BA4FC 7C 08 02 A6 */ mflr r0 /* 802BD5C0 002BA500 90 01 00 34 */ stw r0, 0x34(r1) /* 802BD5C4 002BA504 39 61 00 30 */ addi r11, r1, 0x30 -/* 802BD5C8 002BA508 48 0A 4C 05 */ bl func_803621CC +/* 802BD5C8 002BA508 48 0A 4C 05 */ bl _savegpr_25 /* 802BD5CC 002BA50C 7C 7C 1B 78 */ mr r28, r3 /* 802BD5D0 002BA510 7C 9F 23 78 */ mr r31, r4 /* 802BD5D4 002BA514 88 04 00 10 */ lbz r0, 0x10(r4) diff --git a/asm/Z2AudioLib/Z2AudioMgr.s b/asm/Z2AudioLib/Z2AudioMgr.s index e92043d7b2..0a725f66e3 100644 --- a/asm/Z2AudioLib/Z2AudioMgr.s +++ b/asm/Z2AudioLib/Z2AudioMgr.s @@ -78,7 +78,7 @@ Z2AudioMgr_NS_init: /* 802CD350 002CA290 7C 08 02 A6 */ mflr r0 /* 802CD354 002CA294 90 01 00 A4 */ stw r0, 0xa4(r1) /* 802CD358 002CA298 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 802CD35C 002CA29C 48 09 4E 6D */ bl func_803621C8 +/* 802CD35C 002CA29C 48 09 4E 6D */ bl _savegpr_24 /* 802CD360 002CA2A0 7C 7E 1B 78 */ mr r30, r3 /* 802CD364 002CA2A4 7C 9B 23 78 */ mr r27, r4 /* 802CD368 002CA2A8 7C B8 2B 78 */ mr r24, r5 @@ -387,7 +387,7 @@ lbl_802CD7A0: /* 802CD7D8 002CA718 38 80 00 00 */ li r4, 0 /* 802CD7DC 002CA71C 4B FD 6A 85 */ bl JAUAudioArcInterpreter_NS_dtor /* 802CD7E0 002CA720 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 802CD7E4 002CA724 48 09 4A 31 */ bl func_80362214 +/* 802CD7E4 002CA724 48 09 4A 31 */ bl _restgpr_24 /* 802CD7E8 002CA728 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802CD7EC 002CA72C 7C 08 03 A6 */ mtlr r0 /* 802CD7F0 002CA730 38 21 00 A0 */ addi r1, r1, 0xa0 @@ -692,7 +692,7 @@ lbl_802CDBEC: /* 802CDC0C 002CAB4C 7C 08 02 A6 */ mflr r0 /* 802CDC10 002CAB50 90 01 00 34 */ stw r0, 0x34(r1) /* 802CDC14 002CAB54 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CDC18 002CAB58 48 09 45 B1 */ bl func_803621C8 +/* 802CDC18 002CAB58 48 09 45 B1 */ bl _savegpr_24 /* 802CDC1C 002CAB5C 7C 7F 1B 78 */ mr r31, r3 /* 802CDC20 002CAB60 7C 98 23 78 */ mr r24, r4 /* 802CDC24 002CAB64 3B 20 00 00 */ li r25, 0 @@ -746,7 +746,7 @@ lbl_802CDCC4: /* 802CDCD0 002CAC10 38 60 00 00 */ li r3, 0 lbl_802CDCD4: /* 802CDCD4 002CAC14 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CDCD8 002CAC18 48 09 45 3D */ bl func_80362214 +/* 802CDCD8 002CAC18 48 09 45 3D */ bl _restgpr_24 /* 802CDCDC 002CAC1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CDCE0 002CAC20 7C 08 03 A6 */ mtlr r0 /* 802CDCE4 002CAC24 38 21 00 30 */ addi r1, r1, 0x30 @@ -755,7 +755,7 @@ lbl_802CDCD4: /* 802CDCF0 002CAC30 7C 08 02 A6 */ mflr r0 /* 802CDCF4 002CAC34 90 01 00 34 */ stw r0, 0x34(r1) /* 802CDCF8 002CAC38 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CDCFC 002CAC3C 48 09 44 D1 */ bl func_803621CC +/* 802CDCFC 002CAC3C 48 09 44 D1 */ bl _savegpr_25 /* 802CDD00 002CAC40 7C 7E 1B 78 */ mr r30, r3 /* 802CDD04 002CAC44 7C 9F 23 78 */ mr r31, r4 /* 802CDD08 002CAC48 3B 20 00 00 */ li r25, 0 diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s index c7bc9a95da..f92f28d21a 100644 --- a/asm/Z2AudioLib/Z2Creature.s +++ b/asm/Z2AudioLib/Z2Creature.s @@ -2637,7 +2637,7 @@ lbl_802C284C: /* 802C29E8 002BF928 DB C1 00 50 */ stfd f30, 0x50(r1) /* 802C29EC 002BF92C F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 802C29F0 002BF930 39 61 00 50 */ addi r11, r1, 0x50 -/* 802C29F4 002BF934 48 09 F7 D9 */ bl func_803621CC +/* 802C29F4 002BF934 48 09 F7 D9 */ bl _savegpr_25 /* 802C29F8 002BF938 7C 79 1B 78 */ mr r25, r3 /* 802C29FC 002BF93C 7C 9A 23 78 */ mr r26, r4 /* 802C2A00 002BF940 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/Z2AudioLib/Z2LinkMgr.s b/asm/Z2AudioLib/Z2LinkMgr.s index a5b649ae30..da7da7b291 100644 --- a/asm/Z2AudioLib/Z2LinkMgr.s +++ b/asm/Z2AudioLib/Z2LinkMgr.s @@ -34,7 +34,7 @@ Z2LinkSoundStarter: /* 802C4954 002C1894 DB 61 00 80 */ stfd f27, 0x80(r1) /* 802C4958 002C1898 F3 61 00 88 */ psq_st f27, 136(r1), 0, qr0 /* 802C495C 002C189C 39 61 00 80 */ addi r11, r1, 0x80 -/* 802C4960 002C18A0 48 09 D8 69 */ bl func_803621C8 +/* 802C4960 002C18A0 48 09 D8 69 */ bl _savegpr_24 /* 802C4964 002C18A4 7C 78 1B 78 */ mr r24, r3 /* 802C4968 002C18A8 7C 99 23 78 */ mr r25, r4 /* 802C496C 002C18AC 7C BA 2B 78 */ mr r26, r5 @@ -487,7 +487,7 @@ lbl_802C4FB8: /* 802C4FDC 002C1F1C E3 61 00 88 */ psq_l f27, 136(r1), 0, qr0 /* 802C4FE0 002C1F20 CB 61 00 80 */ lfd f27, 0x80(r1) /* 802C4FE4 002C1F24 39 61 00 80 */ addi r11, r1, 0x80 -/* 802C4FE8 002C1F28 48 09 D2 2D */ bl func_80362214 +/* 802C4FE8 002C1F28 48 09 D2 2D */ bl _restgpr_24 /* 802C4FEC 002C1F2C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 802C4FF0 002C1F30 7C 08 03 A6 */ mtlr r0 /* 802C4FF4 002C1F34 38 21 00 D0 */ addi r1, r1, 0xd0 diff --git a/asm/Z2AudioLib/Z2SoundMgr.s b/asm/Z2AudioLib/Z2SoundMgr.s index 6eb8b76389..de087a81d2 100644 --- a/asm/Z2AudioLib/Z2SoundMgr.s +++ b/asm/Z2AudioLib/Z2SoundMgr.s @@ -482,7 +482,7 @@ Z2SoundMgr_NS_setIIR: /* 802AA274 002A71B4 7C 08 02 A6 */ mflr r0 /* 802AA278 002A71B8 90 01 00 34 */ stw r0, 0x34(r1) /* 802AA27C 002A71BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AA280 002A71C0 48 0B 7F 4D */ bl func_803621CC +/* 802AA280 002A71C0 48 0B 7F 4D */ bl _savegpr_25 /* 802AA284 002A71C4 7C B9 2B 78 */ mr r25, r5 /* 802AA288 002A71C8 28 04 00 00 */ cmplwi r4, 0 /* 802AA28C 002A71CC 41 82 00 98 */ beq lbl_802AA324 @@ -541,7 +541,7 @@ Z2SoundMgr_NS_setFilterOff: /* 802AA340 002A7280 7C 08 02 A6 */ mflr r0 /* 802AA344 002A7284 90 01 00 34 */ stw r0, 0x34(r1) /* 802AA348 002A7288 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AA34C 002A728C 48 0B 7E 7D */ bl func_803621C8 +/* 802AA34C 002A728C 48 0B 7E 7D */ bl _savegpr_24 /* 802AA350 002A7290 28 04 00 00 */ cmplwi r4, 0 /* 802AA354 002A7294 41 82 00 C4 */ beq lbl_802AA418 /* 802AA358 002A7298 7C 83 23 78 */ mr r3, r4 @@ -598,7 +598,7 @@ lbl_802AA408: /* 802AA414 002A7354 41 80 FF 64 */ blt lbl_802AA378 lbl_802AA418: /* 802AA418 002A7358 39 61 00 30 */ addi r11, r1, 0x30 -/* 802AA41C 002A735C 48 0B 7D F9 */ bl func_80362214 +/* 802AA41C 002A735C 48 0B 7D F9 */ bl _restgpr_24 /* 802AA420 002A7360 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AA424 002A7364 7C 08 03 A6 */ mtlr r0 /* 802AA428 002A7368 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/clib.s b/asm/clib.s index cb0a255e59..c0f6e2e9fe 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -553,12 +553,12 @@ func_803621C0: func_803621C4: /* 803621C4 0035F104 92 EB FF DC */ stw r23, -0x24(r11) -.global func_803621C8 -func_803621C8: +.global _savegpr_24 +_savegpr_24: /* 803621C8 0035F108 93 0B FF E0 */ stw r24, -0x20(r11) -.global func_803621CC -func_803621CC: +.global _savegpr_25 +_savegpr_25: /* 803621CC 0035F10C 93 2B FF E4 */ stw r25, -0x1c(r11) .global _savegpr_26 @@ -620,8 +620,8 @@ func_8036220C: func_80362210: /* 80362210 0035F150 82 EB FF DC */ lwz r23, -0x24(r11) -.global func_80362214 -func_80362214: +.global _restgpr_24 +_restgpr_24: /* 80362214 0035F154 83 0B FF E0 */ lwz r24, -0x20(r11) .global _restgpr_25 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index ff0f6bef83..ada0e96d8f 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -2285,7 +2285,7 @@ daNpcT_JntAnm_c_NS_calc: /* 8014785C 0014479C 7C 08 02 A6 */ mflr r0 /* 80147860 001447A0 90 01 00 74 */ stw r0, 0x74(r1) /* 80147864 001447A4 39 61 00 70 */ addi r11, r1, 0x70 -/* 80147868 001447A8 48 21 A9 65 */ bl func_803621CC +/* 80147868 001447A8 48 21 A9 65 */ bl _savegpr_25 /* 8014786C 001447AC 7C 7F 1B 78 */ mr r31, r3 /* 80147870 001447B0 C0 03 00 24 */ lfs f0, 0x24(r3) /* 80147874 001447B4 D0 01 00 20 */ stfs f0, 0x20(r1) @@ -2688,7 +2688,7 @@ lbl_80147E24: /* 80147E48 00144D88 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80147E4C 00144D8C F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 80147E50 00144D90 39 61 00 50 */ addi r11, r1, 0x50 -/* 80147E54 00144D94 48 21 A3 79 */ bl func_803621CC +/* 80147E54 00144D94 48 21 A3 79 */ bl _savegpr_25 /* 80147E58 00144D98 7C 7E 1B 78 */ mr r30, r3 /* 80147E5C 00144D9C 7C 9F 23 78 */ mr r31, r4 /* 80147E60 00144DA0 3C 60 80 3E */ lis r3, lbl_803DD470@ha @@ -4867,7 +4867,7 @@ lbl_80149D68: /* 80149D90 00146CD0 DB C1 00 70 */ stfd f30, 0x70(r1) /* 80149D94 00146CD4 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 80149D98 00146CD8 39 61 00 70 */ addi r11, r1, 0x70 -/* 80149D9C 00146CDC 48 21 84 31 */ bl func_803621CC +/* 80149D9C 00146CDC 48 21 84 31 */ bl _savegpr_25 /* 80149DA0 00146CE0 7C 7A 1B 78 */ mr r26, r3 /* 80149DA4 00146CE4 7C 9B 23 78 */ mr r27, r4 /* 80149DA8 00146CE8 FF C0 08 90 */ fmr f30, f1 @@ -7589,7 +7589,7 @@ lbl_8014C4C8: /* 8014C504 00149444 7C 08 02 A6 */ mflr r0 /* 8014C508 00149448 90 01 00 34 */ stw r0, 0x34(r1) /* 8014C50C 0014944C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8014C510 00149450 48 21 5C BD */ bl func_803621CC +/* 8014C510 00149450 48 21 5C BD */ bl _savegpr_25 /* 8014C514 00149454 7C 79 1B 78 */ mr r25, r3 /* 8014C518 00149458 7C BA 2B 78 */ mr r26, r5 /* 8014C51C 0014945C 7C DB 33 78 */ mr r27, r6 @@ -8824,7 +8824,7 @@ daNpcBase_BBasis: /* 8014D690 0014A5D0 DB C1 00 50 */ stfd f30, 0x50(r1) /* 8014D694 0014A5D4 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 8014D698 0014A5D8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8014D69C 0014A5DC 48 21 4B 31 */ bl func_803621CC +/* 8014D69C 0014A5DC 48 21 4B 31 */ bl _savegpr_25 /* 8014D6A0 0014A5E0 7C 7B 1B 79 */ or. r27, r3, r3 /* 8014D6A4 0014A5E4 7C 9C 23 78 */ mr r28, r4 /* 8014D6A8 0014A5E8 7C BD 2B 78 */ mr r29, r5 @@ -13639,7 +13639,7 @@ daNpcF_Lookat_c_NS_calcMoveDisAngle: /* 80151B6C 0014EAAC 7C 08 02 A6 */ mflr r0 /* 80151B70 0014EAB0 90 01 00 94 */ stw r0, 0x94(r1) /* 80151B74 0014EAB4 39 61 00 90 */ addi r11, r1, 0x90 -/* 80151B78 0014EAB8 48 21 06 51 */ bl func_803621C8 +/* 80151B78 0014EAB8 48 21 06 51 */ bl _savegpr_24 /* 80151B7C 0014EABC 7C 79 1B 78 */ mr r25, r3 /* 80151B80 0014EAC0 7C 9A 23 78 */ mr r26, r4 /* 80151B84 0014EAC4 7C B8 2B 78 */ mr r24, r5 @@ -13905,7 +13905,7 @@ lbl_80151F1C: /* 80151F38 0014EE78 98 1E 00 94 */ stb r0, 0x94(r30) lbl_80151F3C: /* 80151F3C 0014EE7C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80151F40 0014EE80 48 21 02 D5 */ bl func_80362214 +/* 80151F40 0014EE80 48 21 02 D5 */ bl _restgpr_24 /* 80151F44 0014EE84 80 01 00 94 */ lwz r0, 0x94(r1) /* 80151F48 0014EE88 7C 08 03 A6 */ mtlr r0 /* 80151F4C 0014EE8C 38 21 00 90 */ addi r1, r1, 0x90 @@ -14148,7 +14148,7 @@ lbl_80152290: /* 801522B8 0014F1F8 DB E1 00 40 */ stfd f31, 0x40(r1) /* 801522BC 0014F1FC F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 801522C0 0014F200 39 61 00 40 */ addi r11, r1, 0x40 -/* 801522C4 0014F204 48 20 FF 05 */ bl func_803621C8 +/* 801522C4 0014F204 48 20 FF 05 */ bl _savegpr_24 /* 801522C8 0014F208 7C 7A 1B 78 */ mr r26, r3 /* 801522CC 0014F20C 7C 9B 23 78 */ mr r27, r4 /* 801522D0 0014F210 7C BC 2B 78 */ mr r28, r5 @@ -14375,7 +14375,7 @@ lbl_801525F0: /* 801525F4 0014F534 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 801525F8 0014F538 CB E1 00 40 */ lfd f31, 0x40(r1) /* 801525FC 0014F53C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80152600 0014F540 48 20 FC 15 */ bl func_80362214 +/* 80152600 0014F540 48 20 FC 15 */ bl _restgpr_24 /* 80152604 0014F544 80 01 00 54 */ lwz r0, 0x54(r1) /* 80152608 0014F548 7C 08 03 A6 */ mtlr r0 /* 8015260C 0014F54C 38 21 00 50 */ addi r1, r1, 0x50 @@ -17786,7 +17786,7 @@ daNpcF_getPlayerInfoFromPlayerList: /* 80155778 001526B8 7C 08 02 A6 */ mflr r0 /* 8015577C 001526BC 90 01 00 34 */ stw r0, 0x34(r1) /* 80155780 001526C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80155784 001526C4 48 20 CA 49 */ bl func_803621CC +/* 80155784 001526C4 48 20 CA 49 */ bl _savegpr_25 /* 80155788 001526C8 7C 79 1B 78 */ mr r25, r3 /* 8015578C 001526CC 7C BA 2B 78 */ mr r26, r5 /* 80155790 001526D0 7C DB 33 78 */ mr r27, r6 diff --git a/asm/d/a/d_a_obj.s b/asm/d/a/d_a_obj.s index ba0a1ab9bb..c377c79246 100644 --- a/asm/d/a/d_a_obj.s +++ b/asm/d/a/d_a_obj.s @@ -594,7 +594,7 @@ lbl_800378D8: /* 80037904 00034844 7C 08 02 A6 */ mflr r0 /* 80037908 00034848 90 01 00 34 */ stw r0, 0x34(r1) /* 8003790C 0003484C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80037910 00034850 48 32 A8 BD */ bl func_803621CC +/* 80037910 00034850 48 32 A8 BD */ bl _savegpr_25 /* 80037914 00034854 7C 7D 1B 78 */ mr r29, r3 /* 80037918 00034858 7C 9E 23 78 */ mr r30, r4 /* 8003791C 0003485C 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index bfe3d079f0..23df41c91f 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -1774,7 +1774,7 @@ dBgS_NS_MoveBgTransPos: /* 80075884 000727C4 7C 08 02 A6 */ mflr r0 /* 80075888 000727C8 90 01 00 34 */ stw r0, 0x34(r1) /* 8007588C 000727CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075890 000727D0 48 2E C9 39 */ bl func_803621C8 +/* 80075890 000727D0 48 2E C9 39 */ bl _savegpr_24 /* 80075894 000727D4 7C 78 1B 78 */ mr r24, r3 /* 80075898 000727D8 7C 99 23 78 */ mr r25, r4 /* 8007589C 000727DC 7C BA 2B 78 */ mr r26, r5 @@ -1822,7 +1822,7 @@ lbl_800758C8: /* 80075940 00072880 4E 80 04 21 */ bctrl lbl_80075944: /* 80075944 00072884 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075948 00072888 48 2E C8 CD */ bl func_80362214 +/* 80075948 00072888 48 2E C8 CD */ bl _restgpr_24 /* 8007594C 0007288C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80075950 00072890 7C 08 03 A6 */ mtlr r0 /* 80075954 00072894 38 21 00 30 */ addi r1, r1, 0x30 @@ -1834,7 +1834,7 @@ dBgS_NS_MoveBgMatrixCrrPos: /* 80075960 000728A0 7C 08 02 A6 */ mflr r0 /* 80075964 000728A4 90 01 00 34 */ stw r0, 0x34(r1) /* 80075968 000728A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007596C 000728AC 48 2E C8 5D */ bl func_803621C8 +/* 8007596C 000728AC 48 2E C8 5D */ bl _savegpr_24 /* 80075970 000728B0 7C 78 1B 78 */ mr r24, r3 /* 80075974 000728B4 7C 99 23 78 */ mr r25, r4 /* 80075978 000728B8 7C BA 2B 78 */ mr r26, r5 @@ -1877,7 +1877,7 @@ lbl_800759A4: /* 80075A08 00072948 4E 80 04 21 */ bctrl lbl_80075A0C: /* 80075A0C 0007294C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075A10 00072950 48 2E C8 05 */ bl func_80362214 +/* 80075A10 00072950 48 2E C8 05 */ bl _restgpr_24 /* 80075A14 00072954 80 01 00 34 */ lwz r0, 0x34(r1) /* 80075A18 00072958 7C 08 03 A6 */ mtlr r0 /* 80075A1C 0007295C 38 21 00 30 */ addi r1, r1, 0x30 @@ -1939,7 +1939,7 @@ lbl_80075AC0: /* 80075ADC 00072A1C 7C 08 02 A6 */ mflr r0 /* 80075AE0 00072A20 90 01 00 34 */ stw r0, 0x34(r1) /* 80075AE4 00072A24 39 61 00 30 */ addi r11, r1, 0x30 -/* 80075AE8 00072A28 48 2E C6 E5 */ bl func_803621CC +/* 80075AE8 00072A28 48 2E C6 E5 */ bl _savegpr_25 /* 80075AEC 00072A2C 7C 79 1B 78 */ mr r25, r3 /* 80075AF0 00072A30 7C 9A 23 78 */ mr r26, r4 /* 80075AF4 00072A34 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index 571cedc538..5b8b9e4ab9 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -460,7 +460,7 @@ lbl_8007979C: /* 800797D0 00076710 DB C1 00 40 */ stfd f30, 0x40(r1) /* 800797D4 00076714 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 800797D8 00076718 39 61 00 40 */ addi r11, r1, 0x40 -/* 800797DC 0007671C 48 2E 89 ED */ bl func_803621C8 +/* 800797DC 0007671C 48 2E 89 ED */ bl _savegpr_24 /* 800797E0 00076720 7C 7C 1B 78 */ mr r28, r3 /* 800797E4 00076724 80 03 00 9C */ lwz r0, 0x9c(r3) /* 800797E8 00076728 28 00 00 00 */ cmplwi r0, 0 @@ -574,7 +574,7 @@ lbl_80079964: /* 8007996C 000768AC E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 /* 80079970 000768B0 CB C1 00 40 */ lfd f30, 0x40(r1) /* 80079974 000768B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80079978 000768B8 48 2E 88 9D */ bl func_80362214 +/* 80079978 000768B8 48 2E 88 9D */ bl _restgpr_24 /* 8007997C 000768BC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80079980 000768C0 7C 08 03 A6 */ mtlr r0 /* 80079984 000768C4 38 21 00 60 */ addi r1, r1, 0x60 @@ -1695,7 +1695,7 @@ cBgW_NS_GroundCrossRp: /* 8007A8F8 00077838 7C 08 02 A6 */ mflr r0 /* 8007A8FC 0007783C 90 01 00 34 */ stw r0, 0x34(r1) /* 8007A900 00077840 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007A904 00077844 48 2E 78 C5 */ bl func_803621C8 +/* 8007A904 00077844 48 2E 78 C5 */ bl _savegpr_24 /* 8007A908 00077848 7C 7C 1B 78 */ mr r28, r3 /* 8007A90C 0007784C 7C 9D 23 78 */ mr r29, r4 /* 8007A910 00077850 3B E0 00 00 */ li r31, 0 @@ -1779,7 +1779,7 @@ lbl_8007AA24: /* 8007AA34 00077974 7F E3 FB 78 */ mr r3, r31 lbl_8007AA38: /* 8007AA38 00077978 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007AA3C 0007797C 48 2E 77 D9 */ bl func_80362214 +/* 8007AA3C 0007797C 48 2E 77 D9 */ bl _restgpr_24 /* 8007AA40 00077980 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007AA44 00077984 7C 08 03 A6 */ mtlr r0 /* 8007AA48 00077988 38 21 00 30 */ addi r1, r1, 0x30 @@ -5269,7 +5269,7 @@ dBgW_NS_SphChkRp: /* 8007DC74 0007ABB4 7C 08 02 A6 */ mflr r0 /* 8007DC78 0007ABB8 90 01 00 34 */ stw r0, 0x34(r1) /* 8007DC7C 0007ABBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8007DC80 0007ABC0 48 2E 45 4D */ bl func_803621CC +/* 8007DC80 0007ABC0 48 2E 45 4D */ bl _savegpr_25 /* 8007DC84 0007ABC4 7C 7B 1B 78 */ mr r27, r3 /* 8007DC88 0007ABC8 7C 9C 23 78 */ mr r28, r4 /* 8007DC8C 0007ABCC 7C BD 2B 78 */ mr r29, r5 diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index 8149f711aa..5b478e4af6 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -553,7 +553,7 @@ dBgS_Acch_NS_LineCheck: /* 80076638 00073578 DB C1 01 70 */ stfd f30, 0x170(r1) /* 8007663C 0007357C F3 C1 01 78 */ psq_st f30, 376(r1), 0, qr0 /* 80076640 00073580 39 61 01 70 */ addi r11, r1, 0x170 -/* 80076644 00073584 48 2E BB 89 */ bl func_803621CC +/* 80076644 00073584 48 2E BB 89 */ bl _savegpr_25 /* 80076648 00073588 7C 7A 1B 78 */ mr r26, r3 /* 8007664C 0007358C 7C 9B 23 78 */ mr r27, r4 /* 80076650 00073590 38 61 00 FC */ addi r3, r1, 0xfc diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index b1276dd72f..5212c9c7f9 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -208,7 +208,7 @@ dBgWKCol_NS_GetTriPnt_X2_: /* 8007E9D8 0007B918 7C 08 02 A6 */ mflr r0 /* 8007E9DC 0007B91C 90 01 00 44 */ stw r0, 0x44(r1) /* 8007E9E0 0007B920 39 61 00 40 */ addi r11, r1, 0x40 -/* 8007E9E4 0007B924 48 2E 37 E9 */ bl func_803621CC +/* 8007E9E4 0007B924 48 2E 37 E9 */ bl _savegpr_25 /* 8007E9E8 0007B928 7C 9C 23 78 */ mr r28, r4 /* 8007E9EC 0007B92C 7C BD 2B 78 */ mr r29, r5 /* 8007E9F0 0007B930 7C DE 33 78 */ mr r30, r6 diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index bd8c92dc09..0878d6cfd5 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -36,7 +36,7 @@ dCcS_NS_ChkShieldFrontRange: /* 80085F2C 00082E6C 7C 08 02 A6 */ mflr r0 /* 80085F30 00082E70 90 01 00 54 */ stw r0, 0x54(r1) /* 80085F34 00082E74 39 61 00 50 */ addi r11, r1, 0x50 -/* 80085F38 00082E78 48 2D C2 91 */ bl func_803621C8 +/* 80085F38 00082E78 48 2D C2 91 */ bl _savegpr_24 /* 80085F3C 00082E7C 7C 78 1B 78 */ mr r24, r3 /* 80085F40 00082E80 7C 99 23 78 */ mr r25, r4 /* 80085F44 00082E84 7C BA 2B 78 */ mr r26, r5 @@ -153,7 +153,7 @@ lbl_800860DC: /* 800860DC 0008301C 38 60 00 01 */ li r3, 1 lbl_800860E0: /* 800860E0 00083020 39 61 00 50 */ addi r11, r1, 0x50 -/* 800860E4 00083024 48 2D C1 31 */ bl func_80362214 +/* 800860E4 00083024 48 2D C1 31 */ bl _restgpr_24 /* 800860E8 00083028 80 01 00 54 */ lwz r0, 0x54(r1) /* 800860EC 0008302C 7C 08 03 A6 */ mtlr r0 /* 800860F0 00083030 38 21 00 50 */ addi r1, r1, 0x50 @@ -254,7 +254,7 @@ lbl_80086238: /* 80086244 00083184 7C 08 02 A6 */ mflr r0 /* 80086248 00083188 90 01 00 34 */ stw r0, 0x34(r1) /* 8008624C 0008318C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80086250 00083190 48 2D BF 7D */ bl func_803621CC +/* 80086250 00083190 48 2D BF 7D */ bl _savegpr_25 /* 80086254 00083194 7C 9C 23 78 */ mr r28, r4 /* 80086258 00083198 7C BD 2B 78 */ mr r29, r5 /* 8008625C 0008319C 7D 19 43 78 */ mr r25, r8 @@ -391,7 +391,7 @@ lbl_800863F4: /* 80086428 00083368 DB A1 00 60 */ stfd f29, 0x60(r1) /* 8008642C 0008336C F3 A1 00 68 */ psq_st f29, 104(r1), 0, qr0 /* 80086430 00083370 39 61 00 60 */ addi r11, r1, 0x60 -/* 80086434 00083374 48 2D BD 99 */ bl func_803621CC +/* 80086434 00083374 48 2D BD 99 */ bl _savegpr_25 /* 80086438 00083378 7C 7A 1B 78 */ mr r26, r3 /* 8008643C 0008337C 7C 9B 23 78 */ mr r27, r4 /* 80086440 00083380 7C BC 2B 78 */ mr r28, r5 @@ -681,7 +681,7 @@ dCcS_NS_ProcAtTgHitmark: /* 80086860 000837A0 7C 08 02 A6 */ mflr r0 /* 80086864 000837A4 90 01 00 44 */ stw r0, 0x44(r1) /* 80086868 000837A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8008686C 000837AC 48 2D B9 5D */ bl func_803621C8 +/* 8008686C 000837AC 48 2D B9 5D */ bl _savegpr_24 /* 80086870 000837B0 7C 78 1B 78 */ mr r24, r3 /* 80086874 000837B4 7D 19 43 78 */ mr r25, r8 /* 80086878 000837B8 7D 3A 4B 78 */ mr r26, r9 @@ -839,7 +839,7 @@ lbl_80086A44: /* 80086AA4 000839E4 4B FC 57 75 */ bl dPa_control_c_NS_setHitMark lbl_80086AA8: /* 80086AA8 000839E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80086AAC 000839EC 48 2D B7 69 */ bl func_80362214 +/* 80086AAC 000839EC 48 2D B7 69 */ bl _restgpr_24 /* 80086AB0 000839F0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80086AB4 000839F4 7C 08 03 A6 */ mtlr r0 /* 80086AB8 000839F8 38 21 00 40 */ addi r1, r1, 0x40 @@ -1067,7 +1067,7 @@ lbl_80086DD4: /* 80086DF0 00083D30 38 03 72 18 */ addi r0, r3, lbl_803A7218@l /* 80086DF4 00083D34 90 01 00 34 */ stw r0, 0x34(r1) /* 80086DF8 00083D38 38 61 00 3C */ addi r3, r1, 0x3c -/* 80086DFC 00083D3C 48 1E 81 8D */ bl cM3dGCps +/* 80086DFC 00083D3C 48 1E 81 8D */ bl __ct__8cM3dGCpsFv /* 80086E00 00083D40 3C 60 80 3C */ lis r3, lbl_803C3608@ha /* 80086E04 00083D44 38 63 36 08 */ addi r3, r3, lbl_803C3608@l /* 80086E08 00083D48 90 61 00 38 */ stw r3, 0x38(r1) @@ -1191,7 +1191,7 @@ dCcS_NS_chkCameraPoint: /* 80086FC0 00083F00 7C 08 02 A6 */ mflr r0 /* 80086FC4 00083F04 90 01 00 84 */ stw r0, 0x84(r1) /* 80086FC8 00083F08 39 61 00 80 */ addi r11, r1, 0x80 -/* 80086FCC 00083F0C 48 2D B1 FD */ bl func_803621C8 +/* 80086FCC 00083F0C 48 2D B1 FD */ bl _savegpr_24 /* 80086FD0 00083F10 7C 7C 1B 78 */ mr r28, r3 /* 80086FD4 00083F14 7C B9 2B 78 */ mr r25, r5 /* 80086FD8 00083F18 7C DA 33 78 */ mr r26, r6 @@ -1342,7 +1342,7 @@ lbl_800871E8: /* 80087200 00084140 38 60 00 00 */ li r3, 0 lbl_80087204: /* 80087204 00084144 39 61 00 80 */ addi r11, r1, 0x80 -/* 80087208 00084148 48 2D B0 0D */ bl func_80362214 +/* 80087208 00084148 48 2D B0 0D */ bl _restgpr_24 /* 8008720C 0008414C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80087210 00084150 7C 08 03 A6 */ mtlr r0 /* 80087214 00084154 38 21 00 80 */ addi r1, r1, 0x80 diff --git a/asm/d/cc/d_cc_uty.s b/asm/d/cc/d_cc_uty.s index 638ff61567..df4f085e0a 100644 --- a/asm/d/cc/d_cc_uty.s +++ b/asm/d/cc/d_cc_uty.s @@ -657,7 +657,7 @@ lbl_80087BF0: /* 80087C18 00084B58 DB C1 00 40 */ stfd f30, 0x40(r1) /* 80087C1C 00084B5C F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 80087C20 00084B60 39 61 00 40 */ addi r11, r1, 0x40 -/* 80087C24 00084B64 48 2D A5 A9 */ bl func_803621CC +/* 80087C24 00084B64 48 2D A5 A9 */ bl _savegpr_25 /* 80087C28 00084B68 7C 7B 1B 78 */ mr r27, r3 /* 80087C2C 00084B6C 7C 9C 23 78 */ mr r28, r4 /* 80087C30 00084B70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/asm/d/cc/mass/d_cc_mass_s.s b/asm/d/cc/mass/d_cc_mass_s.s index 538bb707c9..cddebb0af3 100644 --- a/asm/d/cc/mass/d_cc_mass_s.s +++ b/asm/d/cc/mass/d_cc_mass_s.s @@ -97,7 +97,7 @@ dCcMassS_Mng: /* 80085400 00082340 90 BF 02 40 */ stw r5, 0x240(r31) /* 80085404 00082344 90 9F 02 3C */ stw r4, 0x23c(r31) /* 80085408 00082348 38 7F 02 44 */ addi r3, r31, 0x244 -/* 8008540C 0008234C 48 1E 9B 7D */ bl cM3dGCps +/* 8008540C 0008234C 48 1E 9B 7D */ bl __ct__8cM3dGCpsFv /* 80085410 00082350 3C 60 80 3C */ lis r3, lbl_803C3608@ha /* 80085414 00082354 38 63 36 08 */ addi r3, r3, lbl_803C3608@l /* 80085418 00082358 90 7F 02 40 */ stw r3, 0x240(r31) @@ -766,7 +766,7 @@ dCcMassS_Mng_NS_Set: /* 80085DA4 00082CE4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80085DA8 00082CE8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80085DAC 00082CEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80085DB0 00082CF0 48 2D C4 1D */ bl func_803621CC +/* 80085DB0 00082CF0 48 2D C4 1D */ bl _savegpr_25 /* 80085DB4 00082CF4 7C 79 1B 78 */ mr r25, r3 /* 80085DB8 00082CF8 7C 9A 23 78 */ mr r26, r4 /* 80085DBC 00082CFC 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index 209bdda00f..e3ea29b61d 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -77,8 +77,8 @@ dComIfG_play_c_NS_setNowVibration: /* 8002B3A8 000282E8 98 83 4F 5A */ stb r4, 0x4f5a(r3) /* 8002B3AC 000282EC 4E 80 00 20 */ blr -.global dComIfG_play_c_NS_getNowVibration -dComIfG_play_c_NS_getNowVibration: +.global getNowVibration__14dComIfG_play_cFv +getNowVibration__14dComIfG_play_cFv: /* 8002B3B0 000282F0 88 63 4F 5A */ lbz r3, 0x4f5a(r3) /* 8002B3B4 000282F4 4E 80 00 20 */ blr @@ -3620,7 +3620,7 @@ dComIfGs_checkGetInsectNum: /* 8002E42C 0002B36C 7C 08 02 A6 */ mflr r0 /* 8002E430 0002B370 90 01 00 34 */ stw r0, 0x34(r1) /* 8002E434 0002B374 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002E438 0002B378 48 33 3D 95 */ bl func_803621CC +/* 8002E438 0002B378 48 33 3D 95 */ bl _savegpr_25 /* 8002E43C 0002B37C 3B 60 00 00 */ li r27, 0 /* 8002E440 0002B380 3C 60 80 3A */ lis r3, lbl_803A71D0@ha /* 8002E444 0002B384 38 03 71 D0 */ addi r0, r3, lbl_803A71D0@l @@ -4048,7 +4048,7 @@ dComIfGp_calcNowRegion: /* 8002EA00 0002B940 7C 08 02 A6 */ mflr r0 /* 8002EA04 0002B944 90 0C 00 04 */ stw r0, 4(r12) /* 8002EA08 0002B948 7D 8B 63 78 */ mr r11, r12 -/* 8002EA0C 0002B94C 48 33 37 C1 */ bl func_803621CC +/* 8002EA0C 0002B94C 48 33 37 C1 */ bl _savegpr_25 /* 8002EA10 0002B950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002EA14 0002B954 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8002EA18 0002B958 80 7F 5C 68 */ lwz r3, 0x5c68(r31) @@ -4217,7 +4217,7 @@ dComIfG_getNowCalcRegion: /* 8002EC64 0002BBA4 7C 08 02 A6 */ mflr r0 /* 8002EC68 0002BBA8 90 0C 00 04 */ stw r0, 4(r12) /* 8002EC6C 0002BBAC 7D 8B 63 78 */ mr r11, r12 -/* 8002EC70 0002BBB0 48 33 35 5D */ bl func_803621CC +/* 8002EC70 0002BBB0 48 33 35 5D */ bl _savegpr_25 /* 8002EC74 0002BBB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002EC78 0002BBB8 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8002EC7C 0002BBBC 80 7E 5C 68 */ lwz r3, 0x5c68(r30) diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index a5f05fd4c6..6b2e9e9b9b 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -336,7 +336,7 @@ dCamMapToolData_NS_Set: /* 8015FEBC 0015CDFC 7C 08 02 A6 */ mflr r0 /* 8015FEC0 0015CE00 90 01 00 34 */ stw r0, 0x34(r1) /* 8015FEC4 0015CE04 39 61 00 30 */ addi r11, r1, 0x30 -/* 8015FEC8 0015CE08 48 20 23 01 */ bl func_803621C8 +/* 8015FEC8 0015CE08 48 20 23 01 */ bl _savegpr_24 /* 8015FECC 0015CE0C 7C 7B 1B 78 */ mr r27, r3 /* 8015FED0 0015CE10 7C 98 23 78 */ mr r24, r4 /* 8015FED4 0015CE14 7C DC 33 78 */ mr r28, r6 @@ -451,7 +451,7 @@ lbl_80160070: /* 80160070 0015CFB0 38 60 00 00 */ li r3, 0 lbl_80160074: /* 80160074 0015CFB4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80160078 0015CFB8 48 20 21 9D */ bl func_80362214 +/* 80160078 0015CFB8 48 20 21 9D */ bl _restgpr_24 /* 8016007C 0015CFBC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80160080 0015CFC0 7C 08 03 A6 */ mtlr r0 /* 80160084 0015CFC4 38 21 00 30 */ addi r1, r1, 0x30 @@ -2806,7 +2806,7 @@ dCamera_c_NS_Run: /* 801622C0 0015F200 DB E1 00 90 */ stfd f31, 0x90(r1) /* 801622C4 0015F204 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 801622C8 0015F208 39 61 00 90 */ addi r11, r1, 0x90 -/* 801622CC 0015F20C 48 1F FF 01 */ bl func_803621CC +/* 801622CC 0015F20C 48 1F FF 01 */ bl _savegpr_25 /* 801622D0 0015F210 7C 7F 1B 78 */ mr r31, r3 /* 801622D4 0015F214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801622D8 0015F218 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l @@ -4157,7 +4157,7 @@ dCamera_c_NS_nextMode: /* 801635E8 00160528 7C 08 02 A6 */ mflr r0 /* 801635EC 0016052C 90 01 00 44 */ stw r0, 0x44(r1) /* 801635F0 00160530 39 61 00 40 */ addi r11, r1, 0x40 -/* 801635F4 00160534 48 1F EB D9 */ bl func_803621CC +/* 801635F4 00160534 48 1F EB D9 */ bl _savegpr_25 /* 801635F8 00160538 7C 7A 1B 78 */ mr r26, r3 /* 801635FC 0016053C 7C 9B 23 78 */ mr r27, r4 /* 80163600 00160540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -5540,7 +5540,7 @@ dCamera_c_NS_GetCameraTypeFromMapToolID: /* 80164948 00161888 7C 08 02 A6 */ mflr r0 /* 8016494C 0016188C 90 01 00 34 */ stw r0, 0x34(r1) /* 80164950 00161890 39 61 00 30 */ addi r11, r1, 0x30 -/* 80164954 00161894 48 1F D8 79 */ bl func_803621CC +/* 80164954 00161894 48 1F D8 79 */ bl _savegpr_25 /* 80164958 00161898 7C 7C 1B 78 */ mr r28, r3 /* 8016495C 0016189C 7C 9D 23 78 */ mr r29, r4 /* 80164960 001618A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -6842,7 +6842,7 @@ lbl_80165BAC: /* 80165BB4 00162AF4 63 DE 00 04 */ ori r30, r30, 4 lbl_80165BB8: /* 80165BB8 00162AF8 38 61 00 08 */ addi r3, r1, 8 -/* 80165BBC 00162AFC 48 10 93 CD */ bl cM3dGCps +/* 80165BBC 00162AFC 48 10 93 CD */ bl __ct__8cM3dGCpsFv /* 80165BC0 00162B00 38 61 00 08 */ addi r3, r1, 8 /* 80165BC4 00162B04 7F 84 E3 78 */ mr r4, r28 /* 80165BC8 00162B08 7F A5 EB 78 */ mr r5, r29 @@ -6927,7 +6927,7 @@ dCamera_c_NS_compWallMargin: /* 80165CEC 00162C2C DB E1 00 B0 */ stfd f31, 0xb0(r1) /* 80165CF0 00162C30 F3 E1 00 B8 */ psq_st f31, 184(r1), 0, qr0 /* 80165CF4 00162C34 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80165CF8 00162C38 48 1F C4 D1 */ bl func_803621C8 +/* 80165CF8 00162C38 48 1F C4 D1 */ bl _savegpr_24 /* 80165CFC 00162C3C 7C 7F 1B 78 */ mr r31, r3 /* 80165D00 00162C40 7C BD 2B 78 */ mr r29, r5 /* 80165D04 00162C44 7C D8 33 78 */ mr r24, r6 @@ -7021,7 +7021,7 @@ lbl_80165E14: /* 80165E54 00162D94 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 /* 80165E58 00162D98 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 80165E5C 00162D9C 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80165E60 00162DA0 48 1F C3 B5 */ bl func_80362214 +/* 80165E60 00162DA0 48 1F C3 B5 */ bl _restgpr_24 /* 80165E64 00162DA4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80165E68 00162DA8 7C 08 03 A6 */ mtlr r0 /* 80165E6C 00162DAC 38 21 00 C0 */ addi r1, r1, 0xc0 @@ -27481,7 +27481,7 @@ lbl_80178DA8: /* 80178E74 00175DB4 DB 81 02 20 */ stfd f28, 0x220(r1) /* 80178E78 00175DB8 F3 81 02 28 */ psq_st f28, 552(r1), 0, qr0 /* 80178E7C 00175DBC 39 61 02 20 */ addi r11, r1, 0x220 -/* 80178E80 00175DC0 48 1E 93 4D */ bl func_803621CC +/* 80178E80 00175DC0 48 1E 93 4D */ bl _savegpr_25 /* 80178E84 00175DC4 7C 7A 1B 78 */ mr r26, r3 /* 80178E88 00175DC8 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 80178E8C 00175DCC 1F C4 00 78 */ mulli r30, r4, 0x78 @@ -27988,7 +27988,7 @@ lbl_80179558: /* 80179604 00176544 DA 41 02 D0 */ stfd f18, 0x2d0(r1) /* 80179608 00176548 F2 41 02 D8 */ psq_st f18, 728(r1), 0, qr0 /* 8017960C 0017654C 39 61 02 D0 */ addi r11, r1, 0x2d0 -/* 80179610 00176550 48 1E 8B B9 */ bl func_803621C8 +/* 80179610 00176550 48 1E 8B B9 */ bl _savegpr_24 /* 80179614 00176554 7C 7C 1B 78 */ mr r28, r3 /* 80179618 00176558 80 03 0A F4 */ lwz r0, 0xaf4(r3) /* 8017961C 0017655C 1F C4 00 78 */ mulli r30, r4, 0x78 @@ -28827,7 +28827,7 @@ lbl_8017A218: /* 8017A280 001771C0 E2 41 02 D8 */ psq_l f18, 728(r1), 0, qr0 /* 8017A284 001771C4 CA 41 02 D0 */ lfd f18, 0x2d0(r1) /* 8017A288 001771C8 39 61 02 D0 */ addi r11, r1, 0x2d0 -/* 8017A28C 001771CC 48 1E 7F 89 */ bl func_80362214 +/* 8017A28C 001771CC 48 1E 7F 89 */ bl _restgpr_24 /* 8017A290 001771D0 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 8017A294 001771D4 7C 08 03 A6 */ mtlr r0 /* 8017A298 001771D8 38 21 03 B0 */ addi r1, r1, 0x3b0 diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index eb0b980f9b..7b70ea17c0 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -2069,7 +2069,7 @@ dDlst_2D_c: /* 80053A04 00050944 7C 08 02 A6 */ mflr r0 /* 80053A08 00050948 90 01 00 34 */ stw r0, 0x34(r1) /* 80053A0C 0005094C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80053A10 00050950 48 30 E7 BD */ bl func_803621CC +/* 80053A10 00050950 48 30 E7 BD */ bl _savegpr_25 /* 80053A14 00050954 7C 79 1B 78 */ mr r25, r3 /* 80053A18 00050958 7C 9A 23 78 */ mr r26, r4 /* 80053A1C 0005095C 7C BB 2B 78 */ mr r27, r5 @@ -2640,7 +2640,7 @@ dDlst_shadowPoly_c_NS_set: /* 8005428C 000511CC 7C 08 02 A6 */ mflr r0 /* 80054290 000511D0 90 01 00 44 */ stw r0, 0x44(r1) /* 80054294 000511D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80054298 000511D8 48 30 DF 35 */ bl func_803621CC +/* 80054298 000511D8 48 30 DF 35 */ bl _savegpr_25 /* 8005429C 000511DC 7C 7F 1B 78 */ mr r31, r3 /* 800542A0 000511E0 7C 99 23 78 */ mr r25, r4 /* 800542A4 000511E4 7C BA 2B 78 */ mr r26, r5 @@ -2818,7 +2818,7 @@ dDlst_shadowReal_c_NS_imageDraw: /* 80054504 00051444 7C 08 02 A6 */ mflr r0 /* 80054508 00051448 90 01 00 34 */ stw r0, 0x34(r1) /* 8005450C 0005144C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80054510 00051450 48 30 DC B9 */ bl func_803621C8 +/* 80054510 00051450 48 30 DC B9 */ bl _savegpr_24 /* 80054514 00051454 7C 7B 1B 78 */ mr r27, r3 /* 80054518 00051458 7C 9C 23 78 */ mr r28, r4 /* 8005451C 0005145C 38 7B 00 38 */ addi r3, r27, 0x38 @@ -2867,7 +2867,7 @@ lbl_800545AC: /* 800545B4 000514F4 7C 03 00 40 */ cmplw r3, r0 /* 800545B8 000514F8 41 80 FF 80 */ blt lbl_80054538 /* 800545BC 000514FC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800545C0 00051500 48 30 DC 55 */ bl func_80362214 +/* 800545C0 00051500 48 30 DC 55 */ bl _restgpr_24 /* 800545C4 00051504 80 01 00 34 */ lwz r0, 0x34(r1) /* 800545C8 00051508 7C 08 03 A6 */ mtlr r0 /* 800545CC 0005150C 38 21 00 30 */ addi r1, r1, 0x30 @@ -4041,7 +4041,7 @@ dDlst_shadowControl_c_NS_init: /* 80055688 000525C8 7C 08 02 A6 */ mflr r0 /* 8005568C 000525CC 90 01 00 34 */ stw r0, 0x34(r1) /* 80055690 000525D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80055694 000525D4 48 30 CB 39 */ bl func_803621CC +/* 80055694 000525D4 48 30 CB 39 */ bl _savegpr_25 /* 80055698 000525D8 7C 79 1B 78 */ mr r25, r3 /* 8005569C 000525DC 3B 60 00 00 */ li r27, 0 /* 800556A0 000525E0 3B E0 00 00 */ li r31, 0 @@ -4455,7 +4455,7 @@ dDlst_shadowControl_c_NS_setReal: /* 80055C98 00052BD8 DB 81 00 40 */ stfd f28, 0x40(r1) /* 80055C9C 00052BDC F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 80055CA0 00052BE0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80055CA4 00052BE4 48 30 C5 29 */ bl func_803621CC +/* 80055CA4 00052BE4 48 30 C5 29 */ bl _savegpr_25 /* 80055CA8 00052BE8 7C 79 1B 78 */ mr r25, r3 /* 80055CAC 00052BEC 7C BD 2B 78 */ mr r29, r5 /* 80055CB0 00052BF0 7C DA 33 78 */ mr r26, r6 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index 25d94dddb7..3303c70578 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -110,7 +110,7 @@ dEvt_control_c_NS_orderOld: /* 800415DC 0003E51C 7C 08 02 A6 */ mflr r0 /* 800415E0 0003E520 90 01 00 34 */ stw r0, 0x34(r1) /* 800415E4 0003E524 39 61 00 30 */ addi r11, r1, 0x30 -/* 800415E8 0003E528 48 32 0B E5 */ bl func_803621CC +/* 800415E8 0003E528 48 32 0B E5 */ bl _savegpr_25 /* 800415EC 0003E52C 7C 79 1B 78 */ mr r25, r3 /* 800415F0 0003E530 7C 9A 23 78 */ mr r26, r4 /* 800415F4 0003E534 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index 51b13c4ca2..1145239fd0 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -1101,7 +1101,7 @@ dDlst_GameOverScrnDraw_c_NS_setBackAlpha: /* 8019BD00 00198C40 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8019BD04 00198C44 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8019BD08 00198C48 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019BD0C 00198C4C 48 1C 64 BD */ bl func_803621C8 +/* 8019BD0C 00198C4C 48 1C 64 BD */ bl _savegpr_24 /* 8019BD10 00198C50 7C 7E 1B 78 */ mr r30, r3 /* 8019BD14 00198C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8019BD18 00198C58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1241,7 +1241,7 @@ lbl_8019BF08: /* 8019BF1C 00198E5C E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8019BF20 00198E60 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8019BF24 00198E64 39 61 00 60 */ addi r11, r1, 0x60 -/* 8019BF28 00198E68 48 1C 62 ED */ bl func_80362214 +/* 8019BF28 00198E68 48 1C 62 ED */ bl _restgpr_24 /* 8019BF2C 00198E6C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8019BF30 00198E70 7C 08 03 A6 */ mtlr r0 /* 8019BF34 00198E74 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index 7f2d86b600..5804625c57 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -2921,7 +2921,7 @@ envcolor_init: /* 8019ECA4 0019BBE4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8019ECA8 0019BBE8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8019ECAC 0019BBEC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019ECB0 0019BBF0 48 1C 35 1D */ bl func_803621CC +/* 8019ECB0 0019BBF0 48 1C 35 1D */ bl _savegpr_25 /* 8019ECB4 0019BBF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8019ECB8 0019BBF8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8019ECBC 0019BBFC 3B 3F 4E 20 */ addi r25, r31, 0x4e20 @@ -8147,7 +8147,7 @@ dScnKy_env_light_c_NS_settingTevStruct: /* 801A37D0 001A0710 DB E1 01 00 */ stfd f31, 0x100(r1) /* 801A37D4 001A0714 F3 E1 01 08 */ psq_st f31, 264(r1), 0, qr0 /* 801A37D8 001A0718 39 61 01 00 */ addi r11, r1, 0x100 -/* 801A37DC 001A071C 48 1B E9 F1 */ bl func_803621CC +/* 801A37DC 001A071C 48 1B E9 F1 */ bl _savegpr_25 /* 801A37E0 001A0720 7C 7A 1B 78 */ mr r26, r3 /* 801A37E4 001A0724 7C 9B 23 78 */ mr r27, r4 /* 801A37E8 001A0728 7C BD 2B 78 */ mr r29, r5 @@ -9530,7 +9530,7 @@ dKy_cloudshadow_scroll: /* 801A4C14 001A1B54 7C 08 02 A6 */ mflr r0 /* 801A4C18 001A1B58 90 01 00 34 */ stw r0, 0x34(r1) /* 801A4C1C 001A1B5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A4C20 001A1B60 48 1B D5 AD */ bl func_803621CC +/* 801A4C20 001A1B60 48 1B D5 AD */ bl _savegpr_25 /* 801A4C24 001A1B64 7C 79 1B 78 */ mr r25, r3 /* 801A4C28 001A1B68 7C 9A 23 78 */ mr r26, r4 /* 801A4C2C 001A1B6C 7C BB 2B 78 */ mr r27, r5 @@ -9996,7 +9996,7 @@ dScnKy_env_light_c_NS_exeKankyo: /* 801A528C 001A21CC 7C 08 02 A6 */ mflr r0 /* 801A5290 001A21D0 90 01 00 34 */ stw r0, 0x34(r1) /* 801A5294 001A21D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A5298 001A21D8 48 1B CF 35 */ bl func_803621CC +/* 801A5298 001A21D8 48 1B CF 35 */ bl _savegpr_25 /* 801A529C 001A21DC 7C 7F 1B 78 */ mr r31, r3 /* 801A52A0 001A21E0 3B 60 00 00 */ li r27, 0 /* 801A52A4 001A21E4 3B C0 00 00 */ li r30, 0 @@ -10983,7 +10983,7 @@ dKy_GlobalLight_set: /* 801A60EC 001A302C DB E1 00 80 */ stfd f31, 0x80(r1) /* 801A60F0 001A3030 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 801A60F4 001A3034 39 61 00 80 */ addi r11, r1, 0x80 -/* 801A60F8 001A3038 48 1B C0 D5 */ bl func_803621CC +/* 801A60F8 001A3038 48 1B C0 D5 */ bl _savegpr_25 /* 801A60FC 001A303C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 801A6100 001A3040 38 03 4A C8 */ addi r0, r3, lbl_80434AC8@l /* 801A6104 001A3044 7C 1B 03 78 */ mr r27, r0 @@ -13287,7 +13287,7 @@ dKy_Sound_set: /* 801A81CC 001A510C DB E1 00 30 */ stfd f31, 0x30(r1) /* 801A81D0 001A5110 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 801A81D4 001A5114 39 61 00 30 */ addi r11, r1, 0x30 -/* 801A81D8 001A5118 48 1B 9F F5 */ bl func_803621CC +/* 801A81D8 001A5118 48 1B 9F F5 */ bl _savegpr_25 /* 801A81DC 001A511C 7C 79 1B 78 */ mr r25, r3 /* 801A81E0 001A5120 7C 9A 23 78 */ mr r26, r4 /* 801A81E4 001A5124 7C BB 2B 78 */ mr r27, r5 @@ -18221,7 +18221,7 @@ dKy_darkworld_stage_check: /* 801AC710 001A9650 7C 08 02 A6 */ mflr r0 /* 801AC714 001A9654 90 01 00 34 */ stw r0, 0x34(r1) /* 801AC718 001A9658 39 61 00 30 */ addi r11, r1, 0x30 -/* 801AC71C 001A965C 48 1B 5A B1 */ bl func_803621CC +/* 801AC71C 001A965C 48 1B 5A B1 */ bl _savegpr_25 /* 801AC720 001A9660 7C 79 1B 78 */ mr r25, r3 /* 801AC724 001A9664 7C 9A 23 78 */ mr r26, r4 /* 801AC728 001A9668 4B EA A3 49 */ bl dKyd_darkworld_tbl_getp diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 74d5b6bcc5..b5b8f66e4a 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -9,7 +9,7 @@ dMeter2_c_NS__create: /* 8021EA18 0021B958 7C 08 02 A6 */ mflr r0 /* 8021EA1C 0021B95C 90 01 00 34 */ stw r0, 0x34(r1) /* 8021EA20 0021B960 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021EA24 0021B964 48 14 37 A9 */ bl func_803621CC +/* 8021EA24 0021B964 48 14 37 A9 */ bl _savegpr_25 /* 8021EA28 0021B968 7C 7F 1B 78 */ mr r31, r3 /* 8021EA2C 0021B96C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021EA30 0021B970 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l @@ -4155,7 +4155,7 @@ dMeter2_c_NS_moveButtonXY: /* 8022251C 0021F45C 7C 08 02 A6 */ mflr r0 /* 80222520 0021F460 90 01 00 34 */ stw r0, 0x34(r1) /* 80222524 0021F464 39 61 00 30 */ addi r11, r1, 0x30 -/* 80222528 0021F468 48 13 FC A5 */ bl func_803621CC +/* 80222528 0021F468 48 13 FC A5 */ bl _savegpr_25 /* 8022252C 0021F46C 7C 7C 1B 78 */ mr r28, r3 /* 80222530 0021F470 38 A0 00 00 */ li r5, 0 /* 80222534 0021F474 38 81 00 0C */ addi r4, r1, 0xc diff --git a/asm/d/d_name.s b/asm/d/d_name.s index bd22e938b7..8fb20f1745 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -2855,7 +2855,7 @@ dName_c_NS_displayInit: /* 80250CF0 0024DC30 7C 08 02 A6 */ mflr r0 /* 80250CF4 0024DC34 90 01 00 44 */ stw r0, 0x44(r1) /* 80250CF8 0024DC38 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250CFC 0024DC3C 48 11 14 CD */ bl func_803621C8 +/* 80250CFC 0024DC3C 48 11 14 CD */ bl _savegpr_24 /* 80250D00 0024DC40 7C 7F 1B 78 */ mr r31, r3 /* 80250D04 0024DC44 80 63 00 20 */ lwz r3, 0x20(r3) /* 80250D08 0024DC48 C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) @@ -2940,7 +2940,7 @@ lbl_80250DFC: /* 80250E34 0024DD74 38 00 00 00 */ li r0, 0 /* 80250E38 0024DD78 98 1F 02 B4 */ stb r0, 0x2b4(r31) /* 80250E3C 0024DD7C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80250E40 0024DD80 48 11 13 D5 */ bl func_80362214 +/* 80250E40 0024DD80 48 11 13 D5 */ bl _restgpr_24 /* 80250E44 0024DD84 80 01 00 44 */ lwz r0, 0x44(r1) /* 80250E48 0024DD88 7C 08 03 A6 */ mtlr r0 /* 80250E4C 0024DD8C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index 276856d702..626b4f3ed6 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -1668,7 +1668,7 @@ dPa_modelEcallBack_NS_setModel: /* 8004AC04 00047B44 7C 08 02 A6 */ mflr r0 /* 8004AC08 00047B48 90 01 00 34 */ stw r0, 0x34(r1) /* 8004AC0C 00047B4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004AC10 00047B50 48 31 75 BD */ bl func_803621CC +/* 8004AC10 00047B50 48 31 75 BD */ bl _savegpr_25 /* 8004AC14 00047B54 7C 79 1B 78 */ mr r25, r3 /* 8004AC18 00047B58 7C 9A 23 78 */ mr r26, r4 /* 8004AC1C 00047B5C 7C BB 2B 78 */ mr r27, r5 @@ -1834,7 +1834,7 @@ dPa_simpleEcallBack: /* 8004AE28 00047D68 DB E1 00 40 */ stfd f31, 0x40(r1) /* 8004AE2C 00047D6C F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8004AE30 00047D70 39 61 00 40 */ addi r11, r1, 0x40 -/* 8004AE34 00047D74 48 31 73 99 */ bl func_803621CC +/* 8004AE34 00047D74 48 31 73 99 */ bl _savegpr_25 /* 8004AE38 00047D78 7C 7C 1B 78 */ mr r28, r3 /* 8004AE3C 00047D7C 7C 9D 23 78 */ mr r29, r4 /* 8004AE40 00047D80 7F A3 EB 78 */ mr r3, r29 @@ -2075,7 +2075,7 @@ dPa_simpleEcallBack_NS_set: /* 8004B174 000480B4 DB E1 00 60 */ stfd f31, 0x60(r1) /* 8004B178 000480B8 F3 E1 00 68 */ psq_st f31, 104(r1), 0, qr0 /* 8004B17C 000480BC 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004B180 000480C0 48 31 70 49 */ bl func_803621C8 +/* 8004B180 000480C0 48 31 70 49 */ bl _savegpr_24 /* 8004B184 000480C4 7C 78 1B 78 */ mr r24, r3 /* 8004B188 000480C8 7C 99 23 78 */ mr r25, r4 /* 8004B18C 000480CC 7C BA 2B 79 */ or. r26, r5, r5 @@ -2300,7 +2300,7 @@ lbl_8004B4C0: /* 8004B4C0 00048400 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8004B4C4 00048404 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8004B4C8 00048408 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004B4CC 0004840C 48 31 6D 49 */ bl func_80362214 +/* 8004B4CC 0004840C 48 31 6D 49 */ bl _restgpr_24 /* 8004B4D0 00048410 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004B4D4 00048414 7C 08 03 A6 */ mtlr r0 /* 8004B4D8 00048418 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index db6f62e070..9653523704 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -1685,7 +1685,7 @@ dRes_info_c_NS_deleteArchiveRes: /* 8003B99C 000388DC 7C 08 02 A6 */ mflr r0 /* 8003B9A0 000388E0 90 01 00 44 */ stw r0, 0x44(r1) /* 8003B9A4 000388E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003B9A8 000388E8 48 32 68 21 */ bl func_803621C8 +/* 8003B9A8 000388E8 48 32 68 21 */ bl _savegpr_24 /* 8003B9AC 000388EC 7C 7D 1B 78 */ mr r29, r3 /* 8003B9B0 000388F0 80 63 00 14 */ lwz r3, 0x14(r3) /* 8003B9B4 000388F4 83 E3 00 48 */ lwz r31, 0x48(r3) @@ -1747,7 +1747,7 @@ lbl_8003BA70: /* 8003BA7C 000389BC 7C 1E 00 00 */ cmpw r30, r0 /* 8003BA80 000389C0 41 80 FF 50 */ blt lbl_8003B9D0 /* 8003BA84 000389C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BA88 000389C8 48 32 67 8D */ bl func_80362214 +/* 8003BA88 000389C8 48 32 67 8D */ bl _restgpr_24 /* 8003BA8C 000389CC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8003BA90 000389D0 7C 08 03 A6 */ mtlr r0 /* 8003BA94 000389D4 38 21 00 40 */ addi r1, r1, 0x40 @@ -1952,7 +1952,7 @@ dRes_info_c_NS_dump_long: /* 8003BD30 00038C70 7C 08 02 A6 */ mflr r0 /* 8003BD34 00038C74 90 01 00 44 */ stw r0, 0x44(r1) /* 8003BD38 00038C78 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BD3C 00038C7C 48 32 64 91 */ bl func_803621CC +/* 8003BD3C 00038C7C 48 32 64 91 */ bl _savegpr_25 /* 8003BD40 00038C80 7C 7E 1B 78 */ mr r30, r3 /* 8003BD44 00038C84 7C 9F 23 78 */ mr r31, r4 /* 8003BD48 00038C88 3C 60 80 38 */ lis r3, lbl_803798B8@ha @@ -2027,7 +2027,7 @@ dRes_info_c_NS_dump: /* 8003BE3C 00038D7C 7C 08 02 A6 */ mflr r0 /* 8003BE40 00038D80 90 01 00 44 */ stw r0, 0x44(r1) /* 8003BE44 00038D84 39 61 00 40 */ addi r11, r1, 0x40 -/* 8003BE48 00038D88 48 32 63 85 */ bl func_803621CC +/* 8003BE48 00038D88 48 32 63 85 */ bl _savegpr_25 /* 8003BE4C 00038D8C 7C 7C 1B 78 */ mr r28, r3 /* 8003BE50 00038D90 7C 9D 23 78 */ mr r29, r4 /* 8003BE54 00038D94 3C 60 80 38 */ lis r3, lbl_803798B8@ha @@ -2183,7 +2183,7 @@ dRes_control_c_NS_setRes: /* 8003C07C 00038FBC 7C 08 02 A6 */ mflr r0 /* 8003C080 00038FC0 90 01 00 34 */ stw r0, 0x34(r1) /* 8003C084 00038FC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8003C088 00038FC8 48 32 61 45 */ bl func_803621CC +/* 8003C088 00038FC8 48 32 61 45 */ bl _savegpr_25 /* 8003C08C 00038FCC 7C 79 1B 78 */ mr r25, r3 /* 8003C090 00038FD0 7C 9A 23 78 */ mr r26, r4 /* 8003C094 00038FD4 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index ea821c7a13..a5a853f7d3 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -536,7 +536,7 @@ dStage_roomControl_c_NS_loadRoom: /* 80024520 00021460 7C 08 02 A6 */ mflr r0 /* 80024524 00021464 90 01 00 34 */ stw r0, 0x34(r1) /* 80024528 00021468 39 61 00 30 */ addi r11, r1, 0x30 -/* 8002452C 0002146C 48 33 DC 9D */ bl func_803621C8 +/* 8002452C 0002146C 48 33 DC 9D */ bl _savegpr_24 /* 80024530 00021470 7C 9A 23 78 */ mr r26, r4 /* 80024534 00021474 7C BB 2B 78 */ mr r27, r5 /* 80024538 00021478 7C DC 33 78 */ mr r28, r6 @@ -671,7 +671,7 @@ lbl_800246F8: /* 80024700 00021640 38 60 00 01 */ li r3, 1 lbl_80024704: /* 80024704 00021644 39 61 00 30 */ addi r11, r1, 0x30 -/* 80024708 00021648 48 33 DB 0D */ bl func_80362214 +/* 80024708 00021648 48 33 DB 0D */ bl _restgpr_24 /* 8002470C 0002164C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80024710 00021650 7C 08 03 A6 */ mtlr r0 /* 80024714 00021654 38 21 00 30 */ addi r1, r1, 0x30 @@ -3658,7 +3658,7 @@ dStage_changeScene: /* 8002717C 000240BC DB E1 00 40 */ stfd f31, 0x40(r1) /* 80027180 000240C0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80027184 000240C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80027188 000240C8 48 33 B0 45 */ bl func_803621CC +/* 80027188 000240C8 48 33 B0 45 */ bl _savegpr_25 /* 8002718C 000240CC 7C 79 1B 78 */ mr r25, r3 /* 80027190 000240D0 FF E0 08 90 */ fmr f31, f1 /* 80027194 000240D4 7C 9D 23 78 */ mr r29, r4 @@ -3764,7 +3764,7 @@ dStage_changeScene4Event: /* 800272FC 0002423C DB E1 00 40 */ stfd f31, 0x40(r1) /* 80027300 00024240 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 80027304 00024244 39 61 00 40 */ addi r11, r1, 0x40 -/* 80027308 00024248 48 33 AE C1 */ bl func_803621C8 +/* 80027308 00024248 48 33 AE C1 */ bl _savegpr_24 /* 8002730C 0002424C 7C 78 1B 78 */ mr r24, r3 /* 80027310 00024250 7C BD 2B 78 */ mr r29, r5 /* 80027314 00024254 7C D9 33 78 */ mr r25, r6 @@ -3876,7 +3876,7 @@ lbl_80027490: /* 80027490 000243D0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 80027494 000243D4 CB E1 00 40 */ lfd f31, 0x40(r1) /* 80027498 000243D8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8002749C 000243DC 48 33 AD 79 */ bl func_80362214 +/* 8002749C 000243DC 48 33 AD 79 */ bl _restgpr_24 /* 800274A0 000243E0 80 01 00 54 */ lwz r0, 0x54(r1) /* 800274A4 000243E4 7C 08 03 A6 */ mtlr r0 /* 800274A8 000243E8 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 7d3e9ecddf..3022402aaa 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -2777,7 +2777,7 @@ dDlst_TimerScrnDraw_c_NS_setCounter: /* 8025F184 0025C0C4 7C 08 02 A6 */ mflr r0 /* 8025F188 0025C0C8 90 01 00 C4 */ stw r0, 0xc4(r1) /* 8025F18C 0025C0CC 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 8025F190 0025C0D0 48 10 30 39 */ bl func_803621C8 +/* 8025F190 0025C0D0 48 10 30 39 */ bl _savegpr_24 /* 8025F194 0025C0D4 7C 79 1B 78 */ mr r25, r3 /* 8025F198 0025C0D8 7C BA 2B 78 */ mr r26, r5 /* 8025F19C 0025C0DC 3B C0 00 00 */ li r30, 0 @@ -3339,7 +3339,7 @@ lbl_8025F954: /* 8025F9E4 0025C924 B0 03 00 16 */ sth r0, 0x16(r3) lbl_8025F9E8: /* 8025F9E8 0025C928 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 8025F9EC 0025C92C 48 10 28 29 */ bl func_80362214 +/* 8025F9EC 0025C92C 48 10 28 29 */ bl _restgpr_24 /* 8025F9F0 0025C930 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8025F9F4 0025C934 7C 08 03 A6 */ mtlr r0 /* 8025F9F8 0025C938 38 21 00 C0 */ addi r1, r1, 0xc0 diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 48def057a2..33e3c64bdc 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -6561,7 +6561,7 @@ cXyz_NS___apl: /* 8008E944 0008B884 DB E1 03 80 */ stfd f31, 0x380(r1) /* 8008E948 0008B888 F3 E1 03 88 */ psq_st f31, 904(r1), 0, qr0 /* 8008E94C 0008B88C 39 61 03 80 */ addi r11, r1, 0x380 -/* 8008E950 0008B890 48 2D 38 7D */ bl func_803621CC +/* 8008E950 0008B890 48 2D 38 7D */ bl _savegpr_25 /* 8008E954 0008B894 7C 7B 1B 78 */ mr r27, r3 /* 8008E958 0008B898 88 0D 8A 09 */ lbz r0, lbl_80450F89-_SDA_BASE_(r13) /* 8008E95C 0008B89C 7C 00 07 75 */ extsb. r0, r0 @@ -11825,7 +11825,7 @@ lbl_80093774: /* 800937C0 00090700 DB C1 02 C0 */ stfd f30, 0x2c0(r1) /* 800937C4 00090704 F3 C1 02 C8 */ psq_st f30, 712(r1), 0, qr0 /* 800937C8 00090708 39 61 02 C0 */ addi r11, r1, 0x2c0 -/* 800937CC 0009070C 48 2C EA 01 */ bl func_803621CC +/* 800937CC 0009070C 48 2C EA 01 */ bl _savegpr_25 /* 800937D0 00090710 7C 7D 1B 78 */ mr r29, r3 /* 800937D4 00090714 80 03 01 74 */ lwz r0, 0x174(r3) /* 800937D8 00090718 28 00 00 00 */ cmplwi r0, 0 @@ -14904,7 +14904,7 @@ lbl_80096588: /* 800965C0 00093500 DB C1 02 10 */ stfd f30, 0x210(r1) /* 800965C4 00093504 F3 C1 02 18 */ psq_st f30, 536(r1), 0, qr0 /* 800965C8 00093508 39 61 02 10 */ addi r11, r1, 0x210 -/* 800965CC 0009350C 48 2C BB FD */ bl func_803621C8 +/* 800965CC 0009350C 48 2C BB FD */ bl _savegpr_24 /* 800965D0 00093510 7C 79 1B 78 */ mr r25, r3 /* 800965D4 00093514 83 C3 01 80 */ lwz r30, 0x180(r3) /* 800965D8 00093518 80 03 01 74 */ lwz r0, 0x174(r3) @@ -15506,7 +15506,7 @@ lbl_80096EB4: /* 80096EBC 00093DFC E3 C1 02 18 */ psq_l f30, 536(r1), 0, qr0 /* 80096EC0 00093E00 CB C1 02 10 */ lfd f30, 0x210(r1) /* 80096EC4 00093E04 39 61 02 10 */ addi r11, r1, 0x210 -/* 80096EC8 00093E08 48 2C B3 4D */ bl func_80362214 +/* 80096EC8 00093E08 48 2C B3 4D */ bl _restgpr_24 /* 80096ECC 00093E0C 80 01 02 34 */ lwz r0, 0x234(r1) /* 80096ED0 00093E10 7C 08 03 A6 */ mtlr r0 /* 80096ED4 00093E14 38 21 02 30 */ addi r1, r1, 0x230 diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index 993e392ab5..6c3f516e16 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -1721,7 +1721,7 @@ dEvDtStaff_c_NS_specialProcDirector: /* 80044EE8 00041E28 7C 08 02 A6 */ mflr r0 /* 80044EEC 00041E2C 90 01 00 44 */ stw r0, 0x44(r1) /* 80044EF0 00041E30 39 61 00 40 */ addi r11, r1, 0x40 -/* 80044EF4 00041E34 48 31 D2 D5 */ bl func_803621C8 +/* 80044EF4 00041E34 48 31 D2 D5 */ bl _savegpr_24 /* 80044EF8 00041E38 7C 7D 1B 78 */ mr r29, r3 /* 80044EFC 00041E3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80044F00 00041E40 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l @@ -2376,7 +2376,7 @@ lbl_80045854: /* 8004585C 0004279C 48 00 29 21 */ bl dEvent_manager_c_NS_cutEnd lbl_80045860: /* 80045860 000427A0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80045864 000427A4 48 31 C9 B1 */ bl func_80362214 +/* 80045864 000427A4 48 31 C9 B1 */ bl _restgpr_24 /* 80045868 000427A8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8004586C 000427AC 7C 08 03 A6 */ mtlr r0 /* 80045870 000427B0 38 21 00 40 */ addi r1, r1, 0x40 @@ -2390,7 +2390,7 @@ dEvDtStaff_c_NS_specialProcPackage: /* 80045884 000427C4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80045888 000427C8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8004588C 000427CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80045890 000427D0 48 31 C9 3D */ bl func_803621CC +/* 80045890 000427D0 48 31 C9 3D */ bl _savegpr_25 /* 80045894 000427D4 7C 7B 1B 78 */ mr r27, r3 /* 80045898 000427D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8004589C 000427DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -2655,7 +2655,7 @@ dEvDtStaff_c_NS_specialProcEffect: /* 80045C48 00042B88 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80045C4C 00042B8C F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 80045C50 00042B90 39 61 00 50 */ addi r11, r1, 0x50 -/* 80045C54 00042B94 48 31 C5 75 */ bl func_803621C8 +/* 80045C54 00042B94 48 31 C5 75 */ bl _savegpr_24 /* 80045C58 00042B98 7C 7B 1B 78 */ mr r27, r3 /* 80045C5C 00042B9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80045C60 00042BA0 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l @@ -2961,7 +2961,7 @@ lbl_80046080: /* 80046088 00042FC8 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 /* 8004608C 00042FCC CB C1 00 50 */ lfd f30, 0x50(r1) /* 80046090 00042FD0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80046094 00042FD4 48 31 C1 81 */ bl func_80362214 +/* 80046094 00042FD4 48 31 C1 81 */ bl _restgpr_24 /* 80046098 00042FD8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004609C 00042FDC 7C 08 03 A6 */ mtlr r0 /* 800460A0 00042FE0 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index 913aebe8b6..a8ba4cc87c 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -792,7 +792,7 @@ dEvent_manager_c_NS_Sequencer: /* 80046E68 00043DA8 7C 08 02 A6 */ mflr r0 /* 80046E6C 00043DAC 90 01 00 74 */ stw r0, 0x74(r1) /* 80046E70 00043DB0 39 61 00 70 */ addi r11, r1, 0x70 -/* 80046E74 00043DB4 48 31 B3 55 */ bl func_803621C8 +/* 80046E74 00043DB4 48 31 B3 55 */ bl _savegpr_24 /* 80046E78 00043DB8 7C 7E 1B 78 */ mr r30, r3 /* 80046E7C 00043DBC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80046E80 00043DC0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -1185,7 +1185,7 @@ lbl_800473C8: /* 800473E0 00044320 48 26 EE 09 */ bl setDemoName__11Z2StatusMgrFPc lbl_800473E4: /* 800473E4 00044324 39 61 00 70 */ addi r11, r1, 0x70 -/* 800473E8 00044328 48 31 AE 2D */ bl func_80362214 +/* 800473E8 00044328 48 31 AE 2D */ bl _restgpr_24 /* 800473EC 0004432C 80 01 00 74 */ lwz r0, 0x74(r1) /* 800473F0 00044330 7C 08 03 A6 */ mtlr r0 /* 800473F4 00044334 38 21 00 70 */ addi r1, r1, 0x70 @@ -1286,7 +1286,7 @@ dEvent_manager_c_NS_getEventIdx: /* 80047518 00044458 7C 08 02 A6 */ mflr r0 /* 8004751C 0004445C 90 01 00 34 */ stw r0, 0x34(r1) /* 80047520 00044460 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047524 00044464 48 31 AC A5 */ bl func_803621C8 +/* 80047524 00044464 48 31 AC A5 */ bl _savegpr_24 /* 80047528 00044468 7C 7D 1B 78 */ mr r29, r3 /* 8004752C 0004446C 7C 9E 23 78 */ mr r30, r4 /* 80047530 00044470 7C B8 2B 78 */ mr r24, r5 @@ -1385,7 +1385,7 @@ lbl_8004766C: /* 8004767C 000445BC 38 60 FF FF */ li r3, -1 lbl_80047680: /* 80047680 000445C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047684 000445C4 48 31 AB 91 */ bl func_80362214 +/* 80047684 000445C4 48 31 AB 91 */ bl _restgpr_24 /* 80047688 000445C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004768C 000445CC 7C 08 03 A6 */ mtlr r0 /* 80047690 000445D0 38 21 00 30 */ addi r1, r1, 0x30 @@ -1956,7 +1956,7 @@ dEvent_manager_c_NS_getMyActIdx: /* 80047E14 00044D54 7C 08 02 A6 */ mflr r0 /* 80047E18 00044D58 90 01 00 34 */ stw r0, 0x34(r1) /* 80047E1C 00044D5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047E20 00044D60 48 31 A3 AD */ bl func_803621CC +/* 80047E20 00044D60 48 31 A3 AD */ bl _savegpr_25 /* 80047E24 00044D64 7C BD 2B 78 */ mr r29, r5 /* 80047E28 00044D68 7C DE 33 78 */ mr r30, r6 /* 80047E2C 00044D6C 7D 1F 43 78 */ mr r31, r8 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index c2d6082308..fa6e0d913e 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -1859,7 +1859,7 @@ lbl_80184FB4: /* 80185044 00181F84 7C 08 02 A6 */ mflr r0 /* 80185048 00181F88 90 01 00 34 */ stw r0, 0x34(r1) /* 8018504C 00181F8C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80185050 00181F90 48 1D D1 7D */ bl func_803621CC +/* 80185050 00181F90 48 1D D1 7D */ bl _savegpr_25 /* 80185054 00181F94 7C 7F 1B 78 */ mr r31, r3 /* 80185058 00181F98 48 00 82 05 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 8018505C 00181F9C 7C 7D 1B 78 */ mr r29, r3 @@ -4922,7 +4922,7 @@ dFile_select_c_NS_setSaveDataForCopySel: /* 80187DBC 00184CFC 7C 08 02 A6 */ mflr r0 /* 80187DC0 00184D00 90 01 00 34 */ stw r0, 0x34(r1) /* 80187DC4 00184D04 39 61 00 30 */ addi r11, r1, 0x30 -/* 80187DC8 00184D08 48 1D A4 01 */ bl func_803621C8 +/* 80187DC8 00184D08 48 1D A4 01 */ bl _savegpr_24 /* 80187DCC 00184D0C 7C 7D 1B 78 */ mr r29, r3 /* 80187DD0 00184D10 3B FD 03 B8 */ addi r31, r29, 0x3b8 /* 80187DD4 00184D14 3B 80 00 00 */ li r28, 0 @@ -4990,7 +4990,7 @@ lbl_80187EAC: /* 80187EB4 00184DF4 3B 5A 00 04 */ addi r26, r26, 4 /* 80187EB8 00184DF8 41 80 FF 2C */ blt lbl_80187DE4 /* 80187EBC 00184DFC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80187EC0 00184E00 48 1D A3 55 */ bl func_80362214 +/* 80187EC0 00184E00 48 1D A3 55 */ bl _restgpr_24 /* 80187EC4 00184E04 80 01 00 34 */ lwz r0, 0x34(r1) /* 80187EC8 00184E08 7C 08 03 A6 */ mtlr r0 /* 80187ECC 00184E0C 38 21 00 30 */ addi r1, r1, 0x30 @@ -6985,7 +6985,7 @@ lbl_80189BFC: /* 80189C18 00186B58 7C 08 02 A6 */ mflr r0 /* 80189C1C 00186B5C 90 01 00 34 */ stw r0, 0x34(r1) /* 80189C20 00186B60 39 61 00 30 */ addi r11, r1, 0x30 -/* 80189C24 00186B64 48 1D 85 A5 */ bl func_803621C8 +/* 80189C24 00186B64 48 1D 85 A5 */ bl _savegpr_24 /* 80189C28 00186B68 7C 7E 1B 78 */ mr r30, r3 /* 80189C2C 00186B6C 48 00 36 31 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 80189C30 00186B70 54 7F 06 3E */ clrlwi r31, r3, 0x18 @@ -7117,7 +7117,7 @@ lbl_80189D94: /* 80189E0C 00186D4C 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_80189E10: /* 80189E10 00186D50 39 61 00 30 */ addi r11, r1, 0x30 -/* 80189E14 00186D54 48 1D 84 01 */ bl func_80362214 +/* 80189E14 00186D54 48 1D 84 01 */ bl _restgpr_24 /* 80189E18 00186D58 80 01 00 34 */ lwz r0, 0x34(r1) /* 80189E1C 00186D5C 7C 08 03 A6 */ mtlr r0 /* 80189E20 00186D60 38 21 00 30 */ addi r1, r1, 0x30 @@ -7963,7 +7963,7 @@ lbl_8018AAAC: /* 8018AAC8 00187A08 7C 08 02 A6 */ mflr r0 /* 8018AACC 00187A0C 90 01 00 34 */ stw r0, 0x34(r1) /* 8018AAD0 00187A10 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018AAD4 00187A14 48 1D 76 F9 */ bl func_803621CC +/* 8018AAD4 00187A14 48 1D 76 F9 */ bl _savegpr_25 /* 8018AAD8 00187A18 7C 7F 1B 78 */ mr r31, r3 /* 8018AADC 00187A1C 48 00 27 81 */ bl dFile_select_c_NS_headerTxtChangeAnm /* 8018AAE0 00187A20 54 7E 06 3E */ clrlwi r30, r3, 0x18 @@ -9312,7 +9312,7 @@ dFile_select_c_NS_screenSetCopySel: /* 8018BF30 00188E70 7C 08 02 A6 */ mflr r0 /* 8018BF34 00188E74 90 01 00 44 */ stw r0, 0x44(r1) /* 8018BF38 00188E78 39 61 00 40 */ addi r11, r1, 0x40 -/* 8018BF3C 00188E7C 48 1D 62 91 */ bl func_803621CC +/* 8018BF3C 00188E7C 48 1D 62 91 */ bl _savegpr_25 /* 8018BF40 00188E80 7C 7F 1B 78 */ mr r31, r3 /* 8018BF44 00188E84 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018BF48 00188E88 3B 83 A8 48 */ addi r28, r3, lbl_803BA848@l @@ -9707,7 +9707,7 @@ dFile_select_c_NS_screenSetYesNo: /* 8018C528 00189468 7C 08 02 A6 */ mflr r0 /* 8018C52C 0018946C 90 01 00 44 */ stw r0, 0x44(r1) /* 8018C530 00189470 39 61 00 40 */ addi r11, r1, 0x40 -/* 8018C534 00189474 48 1D 5C 95 */ bl func_803621C8 +/* 8018C534 00189474 48 1D 5C 95 */ bl _savegpr_24 /* 8018C538 00189478 7C 7F 1B 78 */ mr r31, r3 /* 8018C53C 0018947C 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018C540 00189480 3B C3 A8 48 */ addi r30, r3, lbl_803BA848@l @@ -9950,7 +9950,7 @@ lbl_8018C838: /* 8018C8D4 00189814 3B 5A 00 08 */ addi r26, r26, 8 /* 8018C8D8 00189818 41 80 FE B8 */ blt lbl_8018C790 /* 8018C8DC 0018981C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8018C8E0 00189820 48 1D 59 35 */ bl func_80362214 +/* 8018C8E0 00189820 48 1D 59 35 */ bl _restgpr_24 /* 8018C8E4 00189824 80 01 00 44 */ lwz r0, 0x44(r1) /* 8018C8E8 00189828 7C 08 03 A6 */ mtlr r0 /* 8018C8EC 0018982C 38 21 00 40 */ addi r1, r1, 0x40 @@ -9962,7 +9962,7 @@ dFile_select_c_NS_screenSet3Menu: /* 8018C8F8 00189838 7C 08 02 A6 */ mflr r0 /* 8018C8FC 0018983C 90 01 00 54 */ stw r0, 0x54(r1) /* 8018C900 00189840 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018C904 00189844 48 1D 58 C5 */ bl func_803621C8 +/* 8018C904 00189844 48 1D 58 C5 */ bl _savegpr_24 /* 8018C908 00189848 7C 7F 1B 78 */ mr r31, r3 /* 8018C90C 0018984C 3C 60 80 3C */ lis r3, lbl_803BA848@ha /* 8018C910 00189850 3B 83 A8 48 */ addi r28, r3, lbl_803BA848@l @@ -10207,7 +10207,7 @@ lbl_8018CC14: /* 8018CCB0 00189BF0 3B DE 00 08 */ addi r30, r30, 8 /* 8018CCB4 00189BF4 41 80 FD D8 */ blt lbl_8018CA8C /* 8018CCB8 00189BF8 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018CCBC 00189BFC 48 1D 55 59 */ bl func_80362214 +/* 8018CCBC 00189BFC 48 1D 55 59 */ bl _restgpr_24 /* 8018CCC0 00189C00 80 01 00 54 */ lwz r0, 0x54(r1) /* 8018CCC4 00189C04 7C 08 03 A6 */ mtlr r0 /* 8018CCC8 00189C08 38 21 00 50 */ addi r1, r1, 0x50 @@ -11065,7 +11065,7 @@ dFile_select_c_NS_menuWakuAlpahAnm: /* 8018D8CC 0018A80C 7C 08 02 A6 */ mflr r0 /* 8018D8D0 0018A810 90 01 00 54 */ stw r0, 0x54(r1) /* 8018D8D4 0018A814 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018D8D8 0018A818 48 1D 48 F5 */ bl func_803621CC +/* 8018D8D8 0018A818 48 1D 48 F5 */ bl _savegpr_25 /* 8018D8DC 0018A81C 7C 79 1B 78 */ mr r25, r3 /* 8018D8E0 0018A820 3B E0 00 00 */ li r31, 0 /* 8018D8E4 0018A824 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -11269,7 +11269,7 @@ dFile_select_c_NS_yesnoWakuAlpahAnm: /* 8018DBD0 0018AB10 7C 08 02 A6 */ mflr r0 /* 8018DBD4 0018AB14 90 01 00 54 */ stw r0, 0x54(r1) /* 8018DBD8 0018AB18 39 61 00 50 */ addi r11, r1, 0x50 -/* 8018DBDC 0018AB1C 48 1D 45 F1 */ bl func_803621CC +/* 8018DBDC 0018AB1C 48 1D 45 F1 */ bl _savegpr_25 /* 8018DBE0 0018AB20 7C 79 1B 78 */ mr r25, r3 /* 8018DBE4 0018AB24 3B A0 00 00 */ li r29, 0 /* 8018DBE8 0018AB28 3B 80 00 01 */ li r28, 1 @@ -13106,7 +13106,7 @@ lbl_8018F6C8: /* 8018F6E0 0018C620 7C 08 02 A6 */ mflr r0 /* 8018F6E4 0018C624 90 01 00 34 */ stw r0, 0x34(r1) /* 8018F6E8 0018C628 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018F6EC 0018C62C 48 1D 2A DD */ bl func_803621C8 +/* 8018F6EC 0018C62C 48 1D 2A DD */ bl _savegpr_24 /* 8018F6F0 0018C630 7C 7A 1B 78 */ mr r26, r3 /* 8018F6F4 0018C634 88 03 02 1E */ lbz r0, 0x21e(r3) /* 8018F6F8 0018C638 28 00 00 00 */ cmplwi r0, 0 @@ -13239,7 +13239,7 @@ lbl_8018F8B0: /* 8018F8BC 0018C7FC 98 1A 02 71 */ stb r0, 0x271(r26) lbl_8018F8C0: /* 8018F8C0 0018C800 39 61 00 30 */ addi r11, r1, 0x30 -/* 8018F8C4 0018C804 48 1D 29 51 */ bl func_80362214 +/* 8018F8C4 0018C804 48 1D 29 51 */ bl _restgpr_24 /* 8018F8C8 0018C808 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018F8CC 0018C80C 7C 08 03 A6 */ mtlr r0 /* 8018F8D0 0018C810 38 21 00 30 */ addi r1, r1, 0x30 @@ -14215,7 +14215,7 @@ dFile_select3D_c_NS_setJ3D: /* 80190660 0018D5A0 7C 08 02 A6 */ mflr r0 /* 80190664 0018D5A4 90 01 00 34 */ stw r0, 0x34(r1) /* 80190668 0018D5A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8019066C 0018D5AC 48 1D 1B 5D */ bl func_803621C8 +/* 8019066C 0018D5AC 48 1D 1B 5D */ bl _savegpr_24 /* 80190670 0018D5B0 7C 7E 1B 78 */ mr r30, r3 /* 80190674 0018D5B4 7C 80 23 78 */ mr r0, r4 /* 80190678 0018D5B8 7C BC 2B 78 */ mr r28, r5 @@ -14426,7 +14426,7 @@ lbl_80190910: /* 80190940 0018D880 2C 03 00 00 */ cmpwi r3, 0 lbl_80190944: /* 80190944 0018D884 39 61 00 30 */ addi r11, r1, 0x30 -/* 80190948 0018D888 48 1D 18 CD */ bl func_80362214 +/* 80190948 0018D888 48 1D 18 CD */ bl _restgpr_24 /* 8019094C 0018D88C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80190950 0018D890 7C 08 03 A6 */ mtlr r0 /* 80190954 0018D894 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/kankyo/d_kankyo_rain.s b/asm/d/kankyo/d_kankyo_rain.s index da0e380e63..b0b633eb38 100644 --- a/asm/d/kankyo/d_kankyo_rain.s +++ b/asm/d/kankyo/d_kankyo_rain.s @@ -8234,7 +8234,7 @@ dKyr_draw_rev_moon: /* 80062BA0 0005FAE0 DA C1 01 70 */ stfd f22, 0x170(r1) /* 80062BA4 0005FAE4 F2 C1 01 78 */ psq_st f22, 376(r1), 0, qr0 /* 80062BA8 0005FAE8 39 61 01 70 */ addi r11, r1, 0x170 -/* 80062BAC 0005FAEC 48 2F F6 21 */ bl func_803621CC +/* 80062BAC 0005FAEC 48 2F F6 21 */ bl _savegpr_25 /* 80062BB0 0005FAF0 7C 7A 1B 78 */ mr r26, r3 /* 80062BB4 0005FAF4 7C 9B 23 78 */ mr r27, r4 /* 80062BB8 0005FAF8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -18053,7 +18053,7 @@ dKyr_odour_draw: /* 8006BE20 00068D60 DB C1 01 C0 */ stfd f30, 0x1c0(r1) /* 8006BE24 00068D64 F3 C1 01 C8 */ psq_st f30, 456(r1), 0, qr0 /* 8006BE28 00068D68 39 61 01 C0 */ addi r11, r1, 0x1c0 -/* 8006BE2C 00068D6C 48 2F 63 A1 */ bl func_803621CC +/* 8006BE2C 00068D6C 48 2F 63 A1 */ bl _savegpr_25 /* 8006BE30 00068D70 7C 7B 1B 78 */ mr r27, r3 /* 8006BE34 00068D74 7C 9C 23 78 */ mr r28, r4 /* 8006BE38 00068D78 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -18752,7 +18752,7 @@ dKyr_mud_move: /* 8006C880 000697C0 DB 81 00 E0 */ stfd f28, 0xe0(r1) /* 8006C884 000697C4 F3 81 00 E8 */ psq_st f28, 232(r1), 0, qr0 /* 8006C888 000697C8 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8006C88C 000697CC 48 2F 59 41 */ bl func_803621CC +/* 8006C88C 000697CC 48 2F 59 41 */ bl _savegpr_25 /* 8006C890 000697D0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006C894 000697D4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006C898 000697D8 83 C3 10 4C */ lwz r30, 0x104c(r3) @@ -19302,7 +19302,7 @@ dKyr_mud_draw: /* 8006D060 00069FA0 DB 01 01 70 */ stfd f24, 0x170(r1) /* 8006D064 00069FA4 F3 01 01 78 */ psq_st f24, 376(r1), 0, qr0 /* 8006D068 00069FA8 39 61 01 70 */ addi r11, r1, 0x170 -/* 8006D06C 00069FAC 48 2F 51 61 */ bl func_803621CC +/* 8006D06C 00069FAC 48 2F 51 61 */ bl _savegpr_25 /* 8006D070 00069FB0 7C 7A 1B 78 */ mr r26, r3 /* 8006D074 00069FB4 7C 9B 23 78 */ mr r27, r4 /* 8006D078 00069FB8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha diff --git a/asm/d/kankyo/d_kankyo_wether.s b/asm/d/kankyo/d_kankyo_wether.s index 8db3214293..91e9f266b2 100644 --- a/asm/d/kankyo/d_kankyo_wether.s +++ b/asm/d/kankyo/d_kankyo_wether.s @@ -4242,7 +4242,7 @@ dKyw_wind_set: /* 8005A5CC 0005750C DB E1 00 50 */ stfd f31, 0x50(r1) /* 8005A5D0 00057510 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8005A5D4 00057514 39 61 00 50 */ addi r11, r1, 0x50 -/* 8005A5D8 00057518 48 30 7B F5 */ bl func_803621CC +/* 8005A5D8 00057518 48 30 7B F5 */ bl _savegpr_25 /* 8005A5DC 0005751C 3B 80 00 00 */ li r28, 0 /* 8005A5E0 00057520 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A5E4 00057524 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -4878,7 +4878,7 @@ pntwind_get_info: /* 8005AE94 00057DD4 7C 08 02 A6 */ mflr r0 /* 8005AE98 00057DD8 90 01 00 44 */ stw r0, 0x44(r1) /* 8005AE9C 00057DDC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8005AEA0 00057DE0 48 30 73 29 */ bl func_803621C8 +/* 8005AEA0 00057DE0 48 30 73 29 */ bl _savegpr_24 /* 8005AEA4 00057DE4 7C 79 1B 78 */ mr r25, r3 /* 8005AEA8 00057DE8 7C 9A 23 78 */ mr r26, r4 /* 8005AEAC 00057DEC 7C BB 2B 78 */ mr r27, r5 @@ -5130,7 +5130,7 @@ lbl_8005B214: /* 8005B220 00058160 41 80 FC B8 */ blt lbl_8005AED8 lbl_8005B224: /* 8005B224 00058164 39 61 00 40 */ addi r11, r1, 0x40 -/* 8005B228 00058168 48 30 6F ED */ bl func_80362214 +/* 8005B228 00058168 48 30 6F ED */ bl _restgpr_24 /* 8005B22C 0005816C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8005B230 00058170 7C 08 03 A6 */ mtlr r0 /* 8005B234 00058174 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index 1c87150ab0..fe1617d313 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -1855,7 +1855,7 @@ renderingPlusDoor_c_NS_drawDoorCommon: /* 80040600 0003D540 7C 08 02 A6 */ mflr r0 /* 80040604 0003D544 90 01 00 34 */ stw r0, 0x34(r1) /* 80040608 0003D548 39 61 00 30 */ addi r11, r1, 0x30 -/* 8004060C 0003D54C 48 32 1B C1 */ bl func_803621CC +/* 8004060C 0003D54C 48 32 1B C1 */ bl _savegpr_25 /* 80040610 0003D550 7C 79 1B 78 */ mr r25, r3 /* 80040614 0003D554 7C 9A 23 78 */ mr r26, r4 /* 80040618 0003D558 7C BB 2B 78 */ mr r27, r5 @@ -2124,7 +2124,7 @@ lbl_80040990: /* 800409E4 0003D924 7C 08 02 A6 */ mflr r0 /* 800409E8 0003D928 90 01 00 34 */ stw r0, 0x34(r1) /* 800409EC 0003D92C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800409F0 0003D930 48 32 17 D9 */ bl func_803621C8 +/* 800409F0 0003D930 48 32 17 D9 */ bl _savegpr_24 /* 800409F4 0003D934 7C 78 1B 78 */ mr r24, r3 /* 800409F8 0003D938 7C 99 23 78 */ mr r25, r4 /* 800409FC 0003D93C 7C BA 2B 78 */ mr r26, r5 @@ -2161,7 +2161,7 @@ lbl_80040A58: /* 80040A74 0003D9B4 7D 89 03 A6 */ mtctr r12 /* 80040A78 0003D9B8 4E 80 04 21 */ bctrl /* 80040A7C 0003D9BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80040A80 0003D9C0 48 32 17 95 */ bl func_80362214 +/* 80040A80 0003D9C0 48 32 17 95 */ bl _restgpr_24 /* 80040A84 0003D9C4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80040A88 0003D9C8 7C 08 03 A6 */ mtlr r0 /* 80040A8C 0003D9CC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index 30273dc738..c453688993 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -263,7 +263,7 @@ dMenu_Collect2D_c_NS__delete: /* 801B0104 001AD044 7C 08 02 A6 */ mflr r0 /* 801B0108 001AD048 90 01 00 34 */ stw r0, 0x34(r1) /* 801B010C 001AD04C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B0110 001AD050 48 1B 20 B9 */ bl func_803621C8 +/* 801B0110 001AD050 48 1B 20 B9 */ bl _savegpr_24 /* 801B0114 001AD054 7C 7F 1B 78 */ mr r31, r3 /* 801B0118 001AD058 80 63 00 04 */ lwz r3, 4(r3) /* 801B011C 001AD05C 48 11 E6 69 */ bl getTotalFreeSize__7JKRHeapFv @@ -570,7 +570,7 @@ lbl_801B0534: /* 801B0550 001AD490 7D 89 03 A6 */ mtctr r12 /* 801B0554 001AD494 4E 80 04 21 */ bctrl /* 801B0558 001AD498 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B055C 001AD49C 48 1B 1C B9 */ bl func_80362214 +/* 801B055C 001AD49C 48 1B 1C B9 */ bl _restgpr_24 /* 801B0560 001AD4A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B0564 001AD4A4 7C 08 03 A6 */ mtlr r0 /* 801B0568 001AD4A8 38 21 00 30 */ addi r1, r1, 0x30 @@ -7514,7 +7514,7 @@ dMenu_Collect3D_c_NS_setJ3D: /* 801B6A34 001B3974 7C 08 02 A6 */ mflr r0 /* 801B6A38 001B3978 90 01 00 34 */ stw r0, 0x34(r1) /* 801B6A3C 001B397C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B6A40 001B3980 48 1A B7 89 */ bl func_803621C8 +/* 801B6A40 001B3980 48 1A B7 89 */ bl _savegpr_24 /* 801B6A44 001B3984 7C 7E 1B 78 */ mr r30, r3 /* 801B6A48 001B3988 7C 80 23 78 */ mr r0, r4 /* 801B6A4C 001B398C 7C BC 2B 78 */ mr r28, r5 @@ -7725,7 +7725,7 @@ lbl_801B6CE4: /* 801B6D14 001B3C54 2C 03 00 00 */ cmpwi r3, 0 lbl_801B6D18: /* 801B6D18 001B3C58 39 61 00 30 */ addi r11, r1, 0x30 -/* 801B6D1C 001B3C5C 48 1A B4 F9 */ bl func_80362214 +/* 801B6D1C 001B3C5C 48 1A B4 F9 */ bl _restgpr_24 /* 801B6D20 001B3C60 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B6D24 001B3C64 7C 08 03 A6 */ mtlr r0 /* 801B6D28 001B3C68 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index b2bd621ee7..acecf007d4 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -3746,7 +3746,7 @@ dMenu_Dmap_c_NS_screenInit: /* 801BB648 001B8588 DB C1 00 70 */ stfd f30, 0x70(r1) /* 801BB64C 001B858C F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 801BB650 001B8590 39 61 00 70 */ addi r11, r1, 0x70 -/* 801BB654 001B8594 48 1A 6B 75 */ bl func_803621C8 +/* 801BB654 001B8594 48 1A 6B 75 */ bl _savegpr_24 /* 801BB658 001B8598 7C 7F 1B 78 */ mr r31, r3 /* 801BB65C 001B859C 3C 60 80 39 */ lis r3, lbl_80395518@ha /* 801BB660 001B85A0 3B C3 55 18 */ addi r30, r3, lbl_80395518@l @@ -4894,7 +4894,7 @@ lbl_801BC754: /* 801BC768 001B96A8 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 801BC76C 001B96AC CB C1 00 70 */ lfd f30, 0x70(r1) /* 801BC770 001B96B0 39 61 00 70 */ addi r11, r1, 0x70 -/* 801BC774 001B96B4 48 1A 5A A1 */ bl func_80362214 +/* 801BC774 001B96B4 48 1A 5A A1 */ bl _restgpr_24 /* 801BC778 001B96B8 80 01 00 94 */ lwz r0, 0x94(r1) /* 801BC77C 001B96BC 7C 08 03 A6 */ mtlr r0 /* 801BC780 001B96C0 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index 0d7f300f34..e52c77da7d 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -1102,7 +1102,7 @@ dMenu_Fishing_c_NS_screenSetDoIcon: /* 801C5D40 001C2C80 7C 08 02 A6 */ mflr r0 /* 801C5D44 001C2C84 90 01 00 34 */ stw r0, 0x34(r1) /* 801C5D48 001C2C88 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C5D4C 001C2C8C 48 19 C4 7D */ bl func_803621C8 +/* 801C5D4C 001C2C8C 48 19 C4 7D */ bl _savegpr_24 /* 801C5D50 001C2C90 7C 7F 1B 78 */ mr r31, r3 /* 801C5D54 001C2C94 38 60 01 18 */ li r3, 0x118 /* 801C5D58 001C2C98 48 10 8E F5 */ bl __nw__FUl @@ -1191,7 +1191,7 @@ lbl_801C5DE0: /* 801C5E98 001C2DD8 3B BD 00 08 */ addi r29, r29, 8 /* 801C5E9C 001C2DDC 41 80 FF 44 */ blt lbl_801C5DE0 /* 801C5EA0 001C2DE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C5EA4 001C2DE4 48 19 C3 71 */ bl func_80362214 +/* 801C5EA4 001C2DE4 48 19 C3 71 */ bl _restgpr_24 /* 801C5EA8 001C2DE8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C5EAC 001C2DEC 7C 08 03 A6 */ mtlr r0 /* 801C5EB0 001C2DF0 38 21 00 30 */ addi r1, r1, 0x30 @@ -1328,7 +1328,7 @@ dMenu_Fishing_c_NS_setFishParam: /* 801C6060 001C2FA0 7C 08 02 A6 */ mflr r0 /* 801C6064 001C2FA4 90 01 00 74 */ stw r0, 0x74(r1) /* 801C6068 001C2FA8 39 61 00 70 */ addi r11, r1, 0x70 -/* 801C606C 001C2FAC 48 19 C1 5D */ bl func_803621C8 +/* 801C606C 001C2FAC 48 19 C1 5D */ bl _savegpr_24 /* 801C6070 001C2FB0 7C 7D 1B 78 */ mr r29, r3 /* 801C6074 001C2FB4 7C 9A 23 78 */ mr r26, r4 /* 801C6078 001C2FB8 7C BC 2B 78 */ mr r28, r5 @@ -1432,7 +1432,7 @@ lbl_801C61C0: /* 801C61F0 001C3130 38 81 00 08 */ addi r4, r1, 8 /* 801C61F4 001C3134 48 1A 29 39 */ bl strcpy /* 801C61F8 001C3138 39 61 00 70 */ addi r11, r1, 0x70 -/* 801C61FC 001C313C 48 19 C0 19 */ bl func_80362214 +/* 801C61FC 001C313C 48 19 C0 19 */ bl _restgpr_24 /* 801C6200 001C3140 80 01 00 74 */ lwz r0, 0x74(r1) /* 801C6204 001C3144 7C 08 03 A6 */ mtlr r0 /* 801C6208 001C3148 38 21 00 70 */ addi r1, r1, 0x70 @@ -1444,7 +1444,7 @@ dMenu_Fishing_c_NS_setHIO: /* 801C6214 001C3154 7C 08 02 A6 */ mflr r0 /* 801C6218 001C3158 90 01 00 34 */ stw r0, 0x34(r1) /* 801C621C 001C315C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6220 001C3160 48 19 BF AD */ bl func_803621CC +/* 801C6220 001C3160 48 19 BF AD */ bl _savegpr_25 /* 801C6224 001C3164 7C 7F 1B 78 */ mr r31, r3 /* 801C6228 001C3168 7C 9A 23 78 */ mr r26, r4 /* 801C622C 001C316C 54 80 06 3F */ clrlwi. r0, r4, 0x18 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 98a3d584fb..41ed809b7c 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -83,7 +83,7 @@ dMenu_Fmap_c: /* 801C66F8 001C3638 DB C1 00 30 */ stfd f30, 0x30(r1) /* 801C66FC 001C363C F3 C1 00 38 */ psq_st f30, 56(r1), 0, qr0 /* 801C6700 001C3640 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6704 001C3644 48 19 BA C5 */ bl func_803621C8 +/* 801C6704 001C3644 48 19 BA C5 */ bl _savegpr_24 /* 801C6708 001C3648 7C 7D 1B 78 */ mr r29, r3 /* 801C670C 001C364C 7C 98 23 78 */ mr r24, r4 /* 801C6710 001C3650 7C B9 2B 78 */ mr r25, r5 @@ -336,7 +336,7 @@ lbl_801C6A70: /* 801C6AA8 001C39E8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 /* 801C6AAC 001C39EC CB C1 00 30 */ lfd f30, 0x30(r1) /* 801C6AB0 001C39F0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C6AB4 001C39F4 48 19 B7 61 */ bl func_80362214 +/* 801C6AB4 001C39F4 48 19 B7 61 */ bl _restgpr_24 /* 801C6AB8 001C39F8 80 01 00 54 */ lwz r0, 0x54(r1) /* 801C6ABC 001C39FC 7C 08 03 A6 */ mtlr r0 /* 801C6AC0 001C3A00 38 21 00 50 */ addi r1, r1, 0x50 @@ -6116,7 +6116,7 @@ dMenu_Fmap_c_NS_readRoomData: /* 801CBF08 001C8E48 7C 08 02 A6 */ mflr r0 /* 801CBF0C 001C8E4C 90 01 00 64 */ stw r0, 0x64(r1) /* 801CBF10 001C8E50 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CBF14 001C8E54 48 19 62 B5 */ bl func_803621C8 +/* 801CBF14 001C8E54 48 19 62 B5 */ bl _savegpr_24 /* 801CBF18 001C8E58 7C 7A 1B 78 */ mr r26, r3 /* 801CBF1C 001C8E5C 7C 9B 23 78 */ mr r27, r4 /* 801CBF20 001C8E60 7C BC 2B 78 */ mr r28, r5 @@ -6215,7 +6215,7 @@ lbl_801CC06C: /* 801CC074 001C8FB4 41 80 FF 1C */ blt lbl_801CBF90 /* 801CC078 001C8FB8 38 60 00 01 */ li r3, 1 /* 801CC07C 001C8FBC 39 61 00 60 */ addi r11, r1, 0x60 -/* 801CC080 001C8FC0 48 19 61 95 */ bl func_80362214 +/* 801CC080 001C8FC0 48 19 61 95 */ bl _restgpr_24 /* 801CC084 001C8FC4 80 01 00 64 */ lwz r0, 0x64(r1) /* 801CC088 001C8FC8 7C 08 03 A6 */ mtlr r0 /* 801CC08C 001C8FCC 38 21 00 60 */ addi r1, r1, 0x60 @@ -6227,7 +6227,7 @@ dMenu_Fmap_c_NS_readFieldMapData: /* 801CC098 001C8FD8 7C 08 02 A6 */ mflr r0 /* 801CC09C 001C8FDC 90 01 00 34 */ stw r0, 0x34(r1) /* 801CC0A0 001C8FE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801CC0A4 001C8FE4 48 19 61 29 */ bl func_803621CC +/* 801CC0A4 001C8FE4 48 19 61 29 */ bl _savegpr_25 /* 801CC0A8 001C8FE8 7C 7E 1B 78 */ mr r30, r3 /* 801CC0AC 001C8FEC 7C 9F 23 78 */ mr r31, r4 /* 801CC0B0 001C8FF0 7C B9 2B 78 */ mr r25, r5 @@ -6835,7 +6835,7 @@ dMenu_Fmap_c_NS_portalWarpMapMove: /* 801CC8F0 001C9830 DB C1 00 40 */ stfd f30, 0x40(r1) /* 801CC8F4 001C9834 F3 C1 00 48 */ psq_st f30, 72(r1), 0, qr0 /* 801CC8F8 001C9838 39 61 00 40 */ addi r11, r1, 0x40 -/* 801CC8FC 001C983C 48 19 58 D1 */ bl func_803621CC +/* 801CC8FC 001C983C 48 19 58 D1 */ bl _savegpr_25 /* 801CC900 001C9840 7C 7B 1B 78 */ mr r27, r3 /* 801CC904 001C9844 80 63 00 14 */ lwz r3, 0x14(r3) /* 801CC908 001C9848 48 00 82 25 */ bl dMenu_Fmap2DBack_c_NS_regionMapMove diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index e6d8b42b71..5b4f07a990 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -669,7 +669,7 @@ lbl_801CFF18: /* 801CFF50 001CCE90 DB A1 01 10 */ stfd f29, 0x110(r1) /* 801CFF54 001CCE94 F3 A1 01 18 */ psq_st f29, 280(r1), 0, qr0 /* 801CFF58 001CCE98 39 61 01 10 */ addi r11, r1, 0x110 -/* 801CFF5C 001CCE9C 48 19 22 71 */ bl func_803621CC +/* 801CFF5C 001CCE9C 48 19 22 71 */ bl _savegpr_25 /* 801CFF60 001CCEA0 7C 7D 1B 78 */ mr r29, r3 /* 801CFF64 001CCEA4 48 00 3D 55 */ bl dMenu_Fmap2DBack_c_NS_calcBlink /* 801CFF68 001CCEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1439,7 +1439,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos: /* 801D0ACC 001CDA0C 7C 08 02 A6 */ mflr r0 /* 801D0AD0 001CDA10 90 01 00 44 */ stw r0, 0x44(r1) /* 801D0AD4 001CDA14 39 61 00 40 */ addi r11, r1, 0x40 -/* 801D0AD8 001CDA18 48 19 16 F5 */ bl func_803621CC +/* 801D0AD8 001CDA18 48 19 16 F5 */ bl _savegpr_25 /* 801D0ADC 001CDA1C 7C 79 1B 78 */ mr r25, r3 /* 801D0AE0 001CDA20 3B 60 00 00 */ li r27, 0 /* 801D0AE4 001CDA24 48 00 01 15 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapScaleRate @@ -3885,7 +3885,7 @@ dMenu_Fmap2DBack_c_NS_regionTextureDraw: /* 801D2DBC 001CFCFC DB C1 00 60 */ stfd f30, 0x60(r1) /* 801D2DC0 001CFD00 F3 C1 00 68 */ psq_st f30, 104(r1), 0, qr0 /* 801D2DC4 001CFD04 39 61 00 60 */ addi r11, r1, 0x60 -/* 801D2DC8 001CFD08 48 18 F4 05 */ bl func_803621CC +/* 801D2DC8 001CFD08 48 18 F4 05 */ bl _savegpr_25 /* 801D2DCC 001CFD0C 7C 7E 1B 78 */ mr r30, r3 /* 801D2DD0 001CFD10 4B FF FB 01 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY /* 801D2DD4 001CFD14 FF C0 08 90 */ fmr f30, f1 @@ -6627,7 +6627,7 @@ dMenu_Fmap2DBack_c_NS_drawDebugRegionArea: /* 801D5668 001D25A8 DB A1 00 80 */ stfd f29, 0x80(r1) /* 801D566C 001D25AC F3 A1 00 88 */ psq_st f29, 136(r1), 0, qr0 /* 801D5670 001D25B0 39 61 00 80 */ addi r11, r1, 0x80 -/* 801D5674 001D25B4 48 18 CB 55 */ bl func_803621C8 +/* 801D5674 001D25B4 48 18 CB 55 */ bl _savegpr_24 /* 801D5678 001D25B8 7C 7C 1B 78 */ mr r28, r3 /* 801D567C 001D25BC 4B FF D4 E1 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate /* 801D5680 001D25C0 38 A0 00 FF */ li r5, 0xff @@ -6790,7 +6790,7 @@ lbl_801D58A4: /* 801D58D8 001D2818 E3 A1 00 88 */ psq_l f29, 136(r1), 0, qr0 /* 801D58DC 001D281C CB A1 00 80 */ lfd f29, 0x80(r1) /* 801D58E0 001D2820 39 61 00 80 */ addi r11, r1, 0x80 -/* 801D58E4 001D2824 48 18 C9 31 */ bl func_80362214 +/* 801D58E4 001D2824 48 18 C9 31 */ bl _restgpr_24 /* 801D58E8 001D2828 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801D58EC 001D282C 7C 08 03 A6 */ mtlr r0 /* 801D58F0 001D2830 38 21 00 B0 */ addi r1, r1, 0xb0 @@ -7010,7 +7010,7 @@ dMenu_Fmap2DTop_c: /* 801D5BD4 001D2B14 7C 08 02 A6 */ mflr r0 /* 801D5BD8 001D2B18 90 01 00 34 */ stw r0, 0x34(r1) /* 801D5BDC 001D2B1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D5BE0 001D2B20 48 18 C5 E9 */ bl func_803621C8 +/* 801D5BE0 001D2B20 48 18 C5 E9 */ bl _savegpr_24 /* 801D5BE4 001D2B24 7C 7F 1B 78 */ mr r31, r3 /* 801D5BE8 001D2B28 3C A0 80 39 */ lis r5, lbl_80396248@ha /* 801D5BEC 001D2B2C 3B C5 62 48 */ addi r30, r5, lbl_80396248@l @@ -7744,7 +7744,7 @@ lbl_801D6628: /* 801D66E0 001D3620 48 00 14 ED */ bl dMenu_Fmap2DTop_c_NS_setHIO /* 801D66E4 001D3624 7F E3 FB 78 */ mr r3, r31 /* 801D66E8 001D3628 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D66EC 001D362C 48 18 BB 29 */ bl func_80362214 +/* 801D66EC 001D362C 48 18 BB 29 */ bl _restgpr_24 /* 801D66F0 001D3630 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D66F4 001D3634 7C 08 03 A6 */ mtlr r0 /* 801D66F8 001D3638 38 21 00 30 */ addi r1, r1, 0x30 @@ -8463,7 +8463,7 @@ dMenu_Fmap2DTop_c_NS_setZButtonString: /* 801D70EC 001D402C 7C 08 02 A6 */ mflr r0 /* 801D70F0 001D4030 90 01 00 34 */ stw r0, 0x34(r1) /* 801D70F4 001D4034 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D70F8 001D4038 48 18 B0 D5 */ bl func_803621CC +/* 801D70F8 001D4038 48 18 B0 D5 */ bl _savegpr_25 /* 801D70FC 001D403C 7C 7D 1B 78 */ mr r29, r3 /* 801D7100 001D4040 7C 9E 23 78 */ mr r30, r4 /* 801D7104 001D4044 7C BF 2B 78 */ mr r31, r5 @@ -8548,7 +8548,7 @@ dMenu_Fmap2DTop_c_NS_setBButtonString: /* 801D7214 001D4154 7C 08 02 A6 */ mflr r0 /* 801D7218 001D4158 90 01 00 34 */ stw r0, 0x34(r1) /* 801D721C 001D415C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D7220 001D4160 48 18 AF AD */ bl func_803621CC +/* 801D7220 001D4160 48 18 AF AD */ bl _savegpr_25 /* 801D7224 001D4164 7C 79 1B 78 */ mr r25, r3 /* 801D7228 001D4168 7C 9A 23 79 */ or. r26, r4, r4 /* 801D722C 001D416C 7C BB 2B 78 */ mr r27, r5 @@ -8604,7 +8604,7 @@ dMenu_Fmap2DTop_c_NS_setAButtonString: /* 801D72D8 001D4218 7C 08 02 A6 */ mflr r0 /* 801D72DC 001D421C 90 01 00 34 */ stw r0, 0x34(r1) /* 801D72E0 001D4220 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D72E4 001D4224 48 18 AE E9 */ bl func_803621CC +/* 801D72E4 001D4224 48 18 AE E9 */ bl _savegpr_25 /* 801D72E8 001D4228 7C 79 1B 78 */ mr r25, r3 /* 801D72EC 001D422C 7C 9A 23 79 */ or. r26, r4, r4 /* 801D72F0 001D4230 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 953f74ffda..3d9a632001 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -1831,7 +1831,7 @@ dMenu_Insect_c_NS_screenSetDoIcon: /* 801D9BD4 001D6B14 7C 08 02 A6 */ mflr r0 /* 801D9BD8 001D6B18 90 01 00 34 */ stw r0, 0x34(r1) /* 801D9BDC 001D6B1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D9BE0 001D6B20 48 18 85 E9 */ bl func_803621C8 +/* 801D9BE0 001D6B20 48 18 85 E9 */ bl _savegpr_24 /* 801D9BE4 001D6B24 7C 7F 1B 78 */ mr r31, r3 /* 801D9BE8 001D6B28 38 60 01 18 */ li r3, 0x118 /* 801D9BEC 001D6B2C 48 0F 50 61 */ bl __nw__FUl @@ -1920,7 +1920,7 @@ lbl_801D9C74: /* 801D9D2C 001D6C6C 3B BD 00 08 */ addi r29, r29, 8 /* 801D9D30 001D6C70 41 80 FF 44 */ blt lbl_801D9C74 /* 801D9D34 001D6C74 39 61 00 30 */ addi r11, r1, 0x30 -/* 801D9D38 001D6C78 48 18 84 DD */ bl func_80362214 +/* 801D9D38 001D6C78 48 18 84 DD */ bl _restgpr_24 /* 801D9D3C 001D6C7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D9D40 001D6C80 7C 08 03 A6 */ mtlr r0 /* 801D9D44 001D6C84 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index 9f99358f6c..04afbc7976 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -3042,7 +3042,7 @@ dMenu_Letter_c_NS_screenSetBase: /* 801DFA74 001DC9B4 DB A1 00 30 */ stfd f29, 0x30(r1) /* 801DFA78 001DC9B8 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 801DFA7C 001DC9BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 801DFA80 001DC9C0 48 18 27 49 */ bl func_803621C8 +/* 801DFA80 001DC9C0 48 18 27 49 */ bl _savegpr_24 /* 801DFA84 001DC9C4 7C 7F 1B 78 */ mr r31, r3 /* 801DFA88 001DC9C8 3C 60 80 39 */ lis r3, lbl_803969C8@ha /* 801DFA8C 001DC9CC 3B C3 69 C8 */ addi r30, r3, lbl_803969C8@l @@ -3602,7 +3602,7 @@ lbl_801E0300: /* 801E0310 001DD250 E3 A1 00 38 */ psq_l f29, 56(r1), 0, qr0 /* 801E0314 001DD254 CB A1 00 30 */ lfd f29, 0x30(r1) /* 801E0318 001DD258 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E031C 001DD25C 48 18 1E F9 */ bl func_80362214 +/* 801E031C 001DD25C 48 18 1E F9 */ bl _restgpr_24 /* 801E0320 001DD260 80 01 00 64 */ lwz r0, 0x64(r1) /* 801E0324 001DD264 7C 08 03 A6 */ mtlr r0 /* 801E0328 001DD268 38 21 00 60 */ addi r1, r1, 0x60 @@ -4051,7 +4051,7 @@ dMenu_Letter_c_NS_screenSetDoIcon: /* 801E09AC 001DD8EC 7C 08 02 A6 */ mflr r0 /* 801E09B0 001DD8F0 90 01 00 34 */ stw r0, 0x34(r1) /* 801E09B4 001DD8F4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E09B8 001DD8F8 48 18 18 11 */ bl func_803621C8 +/* 801E09B8 001DD8F8 48 18 18 11 */ bl _savegpr_24 /* 801E09BC 001DD8FC 7C 7F 1B 78 */ mr r31, r3 /* 801E09C0 001DD900 38 60 01 18 */ li r3, 0x118 /* 801E09C4 001DD904 48 0E E2 89 */ bl __nw__FUl @@ -4140,7 +4140,7 @@ lbl_801E0A4C: /* 801E0B04 001DDA44 3B BD 00 08 */ addi r29, r29, 8 /* 801E0B08 001DDA48 41 80 FF 44 */ blt lbl_801E0A4C /* 801E0B0C 001DDA4C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E0B10 001DDA50 48 18 17 05 */ bl func_80362214 +/* 801E0B10 001DDA50 48 18 17 05 */ bl _restgpr_24 /* 801E0B14 001DDA54 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E0B18 001DDA58 7C 08 03 A6 */ mtlr r0 /* 801E0B1C 001DDA5C 38 21 00 30 */ addi r1, r1, 0x30 @@ -4383,7 +4383,7 @@ dMenu_Letter_c_NS_setPageText: /* 801E0E88 001DDDC8 7C 08 02 A6 */ mflr r0 /* 801E0E8C 001DDDCC 90 01 00 34 */ stw r0, 0x34(r1) /* 801E0E90 001DDDD0 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E0E94 001DDDD4 48 18 13 39 */ bl func_803621CC +/* 801E0E94 001DDDD4 48 18 13 39 */ bl _savegpr_25 /* 801E0E98 001DDDD8 7C 7C 1B 78 */ mr r28, r3 /* 801E0E9C 001DDDDC 88 03 03 6F */ lbz r0, 0x36f(r3) /* 801E0EA0 001DDDE0 1C 00 00 06 */ mulli r0, r0, 6 @@ -4501,7 +4501,7 @@ dMenu_Letter_c_NS_setDMYPageText: /* 801E103C 001DDF7C 7C 08 02 A6 */ mflr r0 /* 801E1040 001DDF80 90 01 00 34 */ stw r0, 0x34(r1) /* 801E1044 001DDF84 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E1048 001DDF88 48 18 11 85 */ bl func_803621CC +/* 801E1048 001DDF88 48 18 11 85 */ bl _savegpr_25 /* 801E104C 001DDF8C 7C 7C 1B 78 */ mr r28, r3 /* 801E1050 001DDF90 88 03 03 72 */ lbz r0, 0x372(r3) /* 801E1054 001DDF94 1C 00 00 06 */ mulli r0, r0, 6 @@ -4998,7 +4998,7 @@ dMenu_Letter_c_NS_setHIO: /* 801E174C 001DE68C 7C 08 02 A6 */ mflr r0 /* 801E1750 001DE690 90 01 00 64 */ stw r0, 0x64(r1) /* 801E1754 001DE694 39 61 00 60 */ addi r11, r1, 0x60 -/* 801E1758 001DE698 48 18 0A 75 */ bl func_803621CC +/* 801E1758 001DE698 48 18 0A 75 */ bl _savegpr_25 /* 801E175C 001DE69C 7C 7D 1B 78 */ mr r29, r3 /* 801E1760 001DE6A0 7C 9E 23 78 */ mr r30, r4 /* 801E1764 001DE6A4 54 80 06 3F */ clrlwi. r0, r4, 0x18 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index 837e663cf4..3c9bbecb42 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -104,7 +104,7 @@ dMenu_Option_c_NS__create: /* 801E2060 001DEFA0 7C 08 02 A6 */ mflr r0 /* 801E2064 001DEFA4 90 01 00 64 */ stw r0, 0x64(r1) /* 801E2068 001DEFA8 39 61 00 60 */ addi r11, r1, 0x60 -/* 801E206C 001DEFAC 48 18 01 5D */ bl func_803621C8 +/* 801E206C 001DEFAC 48 18 01 5D */ bl _savegpr_24 /* 801E2070 001DEFB0 7C 7F 1B 78 */ mr r31, r3 /* 801E2074 001DEFB4 3C 60 80 39 */ lis r3, lbl_80396EA8@ha /* 801E2078 001DEFB8 3B C3 6E A8 */ addi r30, r3, lbl_80396EA8@l @@ -872,7 +872,7 @@ lbl_801E2BB8: /* 801E2BFC 001DFB3C 38 80 00 01 */ li r4, 1 /* 801E2C00 001DFB40 48 00 4C B9 */ bl dMenu_Option_c_NS_setHIO /* 801E2C04 001DFB44 39 61 00 60 */ addi r11, r1, 0x60 -/* 801E2C08 001DFB48 48 17 F6 0D */ bl func_80362214 +/* 801E2C08 001DFB48 48 17 F6 0D */ bl _restgpr_24 /* 801E2C0C 001DFB4C 80 01 00 64 */ lwz r0, 0x64(r1) /* 801E2C10 001DFB50 7C 08 03 A6 */ mtlr r0 /* 801E2C14 001DFB54 38 21 00 60 */ addi r1, r1, 0x60 @@ -884,7 +884,7 @@ dMenu_Option_c_NS__delete: /* 801E2C20 001DFB60 7C 08 02 A6 */ mflr r0 /* 801E2C24 001DFB64 90 01 00 34 */ stw r0, 0x34(r1) /* 801E2C28 001DFB68 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E2C2C 001DFB6C 48 17 F5 9D */ bl func_803621C8 +/* 801E2C2C 001DFB6C 48 17 F5 9D */ bl _savegpr_24 /* 801E2C30 001DFB70 7C 7F 1B 78 */ mr r31, r3 /* 801E2C34 001DFB74 80 63 00 48 */ lwz r3, 0x48(r3) /* 801E2C38 001DFB78 38 80 00 01 */ li r4, 1 @@ -1444,7 +1444,7 @@ lbl_801E33E0: /* 801E33E8 001E0328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E33EC 001E032C 90 03 5C C4 */ stw r0, 0x5cc4(r3) /* 801E33F0 001E0330 39 61 00 30 */ addi r11, r1, 0x30 -/* 801E33F4 001E0334 48 17 EE 21 */ bl func_80362214 +/* 801E33F4 001E0334 48 17 EE 21 */ bl _restgpr_24 /* 801E33F8 001E0338 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E33FC 001E033C 7C 08 03 A6 */ mtlr r0 /* 801E3400 001E0340 38 21 00 30 */ addi r1, r1, 0x30 @@ -5804,7 +5804,7 @@ dMenu_Option_c_NS_setSelectColor: /* 801E73DC 001E431C 7C 08 02 A6 */ mflr r0 /* 801E73E0 001E4320 90 01 00 64 */ stw r0, 0x64(r1) /* 801E73E4 001E4324 39 61 00 60 */ addi r11, r1, 0x60 -/* 801E73E8 001E4328 48 17 AD E5 */ bl func_803621CC +/* 801E73E8 001E4328 48 17 AD E5 */ bl _savegpr_25 /* 801E73EC 001E432C 7C 7C 1B 78 */ mr r28, r3 /* 801E73F0 001E4330 7C BD 2B 78 */ mr r29, r5 /* 801E73F4 001E4334 3B C0 00 00 */ li r30, 0 @@ -6695,7 +6695,7 @@ lbl_801E8088: .global dMenu_Option_c_NS_isRumbleSupported dMenu_Option_c_NS_isRumbleSupported: -/* 801E80A0 001E4FE0 80 0D 8F 60 */ lwz r0, lbl_804514E0-_SDA_BASE_(r13) +/* 801E80A0 001E4FE0 80 0D 8F 60 */ lwz r0, _sRumbleSupported-_SDA_BASE_(r13) /* 801E80A4 001E4FE4 54 03 0F FE */ srwi r3, r0, 0x1f /* 801E80A8 001E4FE8 4E 80 00 20 */ blr @@ -6822,7 +6822,7 @@ dMenu_Option_c_NS_initialize: /* 801E826C 001E51AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801E8270 001E51B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E8274 001E51B4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 801E8278 001E51B8 4B E4 31 39 */ bl dComIfG_play_c_NS_getNowVibration +/* 801E8278 001E51B8 4B E4 31 39 */ bl getNowVibration__14dComIfG_play_cFv /* 801E827C 001E51BC 98 7F 03 EA */ stb r3, 0x3ea(r31) /* 801E8280 001E51C0 48 00 00 0C */ b lbl_801E828C lbl_801E8284: @@ -7558,7 +7558,7 @@ dMenu_Option_c_NS_yesnoWakuAlpahAnm: /* 801E8D00 001E5C40 7C 08 02 A6 */ mflr r0 /* 801E8D04 001E5C44 90 01 00 54 */ stw r0, 0x54(r1) /* 801E8D08 001E5C48 39 61 00 50 */ addi r11, r1, 0x50 -/* 801E8D0C 001E5C4C 48 17 94 C1 */ bl func_803621CC +/* 801E8D0C 001E5C4C 48 17 94 C1 */ bl _savegpr_25 /* 801E8D10 001E5C50 7C 79 1B 78 */ mr r25, r3 /* 801E8D14 001E5C54 3B A0 00 00 */ li r29, 0 /* 801E8D18 001E5C58 54 80 06 3E */ clrlwi r0, r4, 0x18 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index adf07b8813..c2f7a47e22 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -2904,7 +2904,7 @@ dMenu_Ring_c_NS_setItem: /* 801EBB14 001E8A54 7C 08 02 A6 */ mflr r0 /* 801EBB18 001E8A58 90 01 00 34 */ stw r0, 0x34(r1) /* 801EBB1C 001E8A5C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EBB20 001E8A60 48 17 66 A9 */ bl func_803621C8 +/* 801EBB20 001E8A60 48 17 66 A9 */ bl _savegpr_24 /* 801EBB24 001E8A64 7C 7E 1B 78 */ mr r30, r3 /* 801EBB28 001E8A68 88 03 06 AA */ lbz r0, 0x6aa(r3) /* 801EBB2C 001E8A6C 28 00 00 FF */ cmplwi r0, 0xff @@ -3128,7 +3128,7 @@ lbl_801EBE0C: /* 801EBE38 001E8D78 38 80 00 01 */ li r4, 1 /* 801EBE3C 001E8D7C 48 00 00 1D */ bl dMenu_Ring_c_NS_setJumpItem /* 801EBE40 001E8D80 39 61 00 30 */ addi r11, r1, 0x30 -/* 801EBE44 001E8D84 48 17 63 D1 */ bl func_80362214 +/* 801EBE44 001E8D84 48 17 63 D1 */ bl _restgpr_24 /* 801EBE48 001E8D88 80 01 00 34 */ lwz r0, 0x34(r1) /* 801EBE4C 001E8D8C 7C 08 03 A6 */ mtlr r0 /* 801EBE50 001E8D90 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 4f2cdb0b31..9b998cf067 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -7706,7 +7706,7 @@ dMenu_save_c_NS_yesnoWakuAlpahAnm: /* 801F6658 001F3598 7C 08 02 A6 */ mflr r0 /* 801F665C 001F359C 90 01 00 54 */ stw r0, 0x54(r1) /* 801F6660 001F35A0 39 61 00 50 */ addi r11, r1, 0x50 -/* 801F6664 001F35A4 48 16 BB 69 */ bl func_803621CC +/* 801F6664 001F35A4 48 16 BB 69 */ bl _savegpr_25 /* 801F6668 001F35A8 7C 79 1B 78 */ mr r25, r3 /* 801F666C 001F35AC 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 801F6670 001F35B0 28 00 00 FF */ cmplwi r0, 0xff @@ -7818,7 +7818,7 @@ dMenu_save_c_NS_setSaveData: /* 801F67F4 001F3734 7C 08 02 A6 */ mflr r0 /* 801F67F8 001F3738 90 01 00 34 */ stw r0, 0x34(r1) /* 801F67FC 001F373C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F6800 001F3740 48 16 B9 CD */ bl func_803621CC +/* 801F6800 001F3740 48 16 B9 CD */ bl _savegpr_25 /* 801F6804 001F3744 7C 7B 1B 78 */ mr r27, r3 /* 801F6808 001F3748 3B BB 01 D0 */ addi r29, r27, 0x1d0 /* 801F680C 001F374C 3B 80 00 00 */ li r28, 0 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index a7a09b5f2e..6abc61b032 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -1642,7 +1642,7 @@ dMenu_Skill_c_NS_screenSetLetter: /* 801F8A1C 001F595C 7C 08 02 A6 */ mflr r0 /* 801F8A20 001F5960 90 01 00 44 */ stw r0, 0x44(r1) /* 801F8A24 001F5964 39 61 00 40 */ addi r11, r1, 0x40 -/* 801F8A28 001F5968 48 16 97 A1 */ bl func_803621C8 +/* 801F8A28 001F5968 48 16 97 A1 */ bl _savegpr_24 /* 801F8A2C 001F596C 7C 7F 1B 78 */ mr r31, r3 /* 801F8A30 001F5970 38 60 01 18 */ li r3, 0x118 /* 801F8A34 001F5974 48 0D 62 19 */ bl __nw__FUl @@ -1833,7 +1833,7 @@ lbl_801F8C98: /* 801F8D00 001F5C40 7D 89 03 A6 */ mtctr r12 /* 801F8D04 001F5C44 4E 80 04 21 */ bctrl /* 801F8D08 001F5C48 39 61 00 40 */ addi r11, r1, 0x40 -/* 801F8D0C 001F5C4C 48 16 95 09 */ bl func_80362214 +/* 801F8D0C 001F5C4C 48 16 95 09 */ bl _restgpr_24 /* 801F8D10 001F5C50 80 01 00 44 */ lwz r0, 0x44(r1) /* 801F8D14 001F5C54 7C 08 03 A6 */ mtlr r0 /* 801F8D18 001F5C58 38 21 00 40 */ addi r1, r1, 0x40 @@ -1845,7 +1845,7 @@ dMenu_Skill_c_NS_screenSetDoIcon: /* 801F8D24 001F5C64 7C 08 02 A6 */ mflr r0 /* 801F8D28 001F5C68 90 01 00 34 */ stw r0, 0x34(r1) /* 801F8D2C 001F5C6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F8D30 001F5C70 48 16 94 99 */ bl func_803621C8 +/* 801F8D30 001F5C70 48 16 94 99 */ bl _savegpr_24 /* 801F8D34 001F5C74 7C 7F 1B 78 */ mr r31, r3 /* 801F8D38 001F5C78 38 60 01 18 */ li r3, 0x118 /* 801F8D3C 001F5C7C 48 0D 5F 11 */ bl __nw__FUl @@ -1934,7 +1934,7 @@ lbl_801F8DC4: /* 801F8E7C 001F5DBC 3B BD 00 08 */ addi r29, r29, 8 /* 801F8E80 001F5DC0 41 80 FF 44 */ blt lbl_801F8DC4 /* 801F8E84 001F5DC4 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F8E88 001F5DC8 48 16 93 8D */ bl func_80362214 +/* 801F8E88 001F5DC8 48 16 93 8D */ bl _restgpr_24 /* 801F8E8C 001F5DCC 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F8E90 001F5DD0 7C 08 03 A6 */ mtlr r0 /* 801F8E94 001F5DD4 38 21 00 30 */ addi r1, r1, 0x30 @@ -2125,7 +2125,7 @@ dMenu_Skill_c_NS_setPageText: /* 801F9148 001F6088 7C 08 02 A6 */ mflr r0 /* 801F914C 001F608C 90 01 00 34 */ stw r0, 0x34(r1) /* 801F9150 001F6090 39 61 00 30 */ addi r11, r1, 0x30 -/* 801F9154 001F6094 48 16 90 79 */ bl func_803621CC +/* 801F9154 001F6094 48 16 90 79 */ bl _savegpr_25 /* 801F9158 001F6098 7C 79 1B 78 */ mr r25, r3 /* 801F915C 001F609C 3B 40 00 00 */ li r26, 0 /* 801F9160 001F60A0 3B E0 00 00 */ li r31, 0 diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index 12ba8ff006..94dbf07dc3 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -15,7 +15,7 @@ /* 801C0870 001BD7B0 7C 08 02 A6 */ mflr r0 /* 801C0874 001BD7B4 90 01 00 34 */ stw r0, 0x34(r1) /* 801C0878 001BD7B8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801C087C 001BD7BC 48 1A 19 51 */ bl func_803621CC +/* 801C087C 001BD7BC 48 1A 19 51 */ bl _savegpr_25 /* 801C0880 001BD7C0 7C 9D 23 78 */ mr r29, r4 /* 801C0884 001BD7C4 7C BE 2B 78 */ mr r30, r5 /* 801C0888 001BD7C8 7C D9 33 78 */ mr r25, r6 @@ -561,7 +561,7 @@ dMenu_StageMapCtrl_c_NS_getTreasureList: /* 801C0FFC 001BDF3C 7C 08 02 A6 */ mflr r0 /* 801C1000 001BDF40 90 01 00 44 */ stw r0, 0x44(r1) /* 801C1004 001BDF44 39 61 00 40 */ addi r11, r1, 0x40 -/* 801C1008 001BDF48 48 1A 11 C5 */ bl func_803621CC +/* 801C1008 001BDF48 48 1A 11 C5 */ bl _savegpr_25 /* 801C100C 001BDF4C 7C 7A 1B 78 */ mr r26, r3 /* 801C1010 001BDF50 7C 9B 23 78 */ mr r27, r4 /* 801C1014 001BDF54 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index f6b493f597..3338979c81 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -3780,7 +3780,7 @@ dMeterButton_c_NS_screenInitButton: /* 802047F4 00201734 DB E1 02 00 */ stfd f31, 0x200(r1) /* 802047F8 00201738 F3 E1 02 08 */ psq_st f31, 520(r1), 0, qr0 /* 802047FC 0020173C 39 61 02 00 */ addi r11, r1, 0x200 -/* 80204800 00201740 48 15 D9 C9 */ bl func_803621C8 +/* 80204800 00201740 48 15 D9 C9 */ bl _savegpr_24 /* 80204804 00201744 7C 7F 1B 78 */ mr r31, r3 /* 80204808 00201748 38 60 01 18 */ li r3, 0x118 /* 8020480C 0020174C 48 0C A4 41 */ bl __nw__FUl @@ -4843,7 +4843,7 @@ lbl_802057F4: /* 80205814 00202754 E3 E1 02 08 */ psq_l f31, 520(r1), 0, qr0 /* 80205818 00202758 CB E1 02 00 */ lfd f31, 0x200(r1) /* 8020581C 0020275C 39 61 02 00 */ addi r11, r1, 0x200 -/* 80205820 00202760 48 15 C9 F5 */ bl func_80362214 +/* 80205820 00202760 48 15 C9 F5 */ bl _restgpr_24 /* 80205824 00202764 80 01 02 14 */ lwz r0, 0x214(r1) /* 80205828 00202768 7C 08 03 A6 */ mtlr r0 /* 8020582C 0020276C 38 21 02 10 */ addi r1, r1, 0x210 @@ -9212,7 +9212,7 @@ dMeterButton_c_NS_setString: /* 802095C4 00206504 7C 08 02 A6 */ mflr r0 /* 802095C8 00206508 90 01 00 34 */ stw r0, 0x34(r1) /* 802095CC 0020650C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802095D0 00206510 48 15 8B FD */ bl func_803621CC +/* 802095D0 00206510 48 15 8B FD */ bl _savegpr_25 /* 802095D4 00206514 7C 79 1B 78 */ mr r25, r3 /* 802095D8 00206518 7C 9A 23 78 */ mr r26, r4 /* 802095DC 0020651C 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/d/meter/d_meter_hakusha.s b/asm/d/meter/d_meter_hakusha.s index 3284da08bf..6985f4c5e0 100644 --- a/asm/d/meter/d_meter_hakusha.s +++ b/asm/d/meter/d_meter_hakusha.s @@ -354,7 +354,7 @@ lbl_8020C720: /* 8020C854 00209794 7C 08 02 A6 */ mflr r0 /* 8020C858 00209798 90 01 00 64 */ stw r0, 0x64(r1) /* 8020C85C 0020979C 39 61 00 60 */ addi r11, r1, 0x60 -/* 8020C860 002097A0 48 15 59 69 */ bl func_803621C8 +/* 8020C860 002097A0 48 15 59 69 */ bl _savegpr_24 /* 8020C864 002097A4 7C 7A 1B 78 */ mr r26, r3 /* 8020C868 002097A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8020C86C 002097AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -508,7 +508,7 @@ lbl_8020CA94: /* 8020CA9C 002099DC 7C 1B 18 00 */ cmpw r27, r3 /* 8020CAA0 002099E0 41 80 FE 44 */ blt lbl_8020C8E4 /* 8020CAA4 002099E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8020CAA8 002099E8 48 15 57 6D */ bl func_80362214 +/* 8020CAA8 002099E8 48 15 57 6D */ bl _restgpr_24 /* 8020CAAC 002099EC 80 01 00 64 */ lwz r0, 0x64(r1) /* 8020CAB0 002099F0 7C 08 03 A6 */ mtlr r0 /* 8020CAB4 002099F4 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index 465801244c..b897a3c9d2 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -2307,7 +2307,7 @@ dMeter2Draw_c_NS_initLife: /* 80211BF0 0020EB30 7C 08 02 A6 */ mflr r0 /* 80211BF4 0020EB34 90 01 00 34 */ stw r0, 0x34(r1) /* 80211BF8 0020EB38 39 61 00 30 */ addi r11, r1, 0x30 -/* 80211BFC 0020EB3C 48 15 05 D1 */ bl func_803621CC +/* 80211BFC 0020EB3C 48 15 05 D1 */ bl _savegpr_25 /* 80211C00 0020EB40 7C 7C 1B 78 */ mr r28, r3 /* 80211C04 0020EB44 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 80211C08 0020EB48 3B C3 82 58 */ addi r30, r3, lbl_80398258@l @@ -2691,7 +2691,7 @@ dMeter2Draw_c_NS_initLightDrop: /* 80212194 0020F0D4 7C 08 02 A6 */ mflr r0 /* 80212198 0020F0D8 90 01 00 34 */ stw r0, 0x34(r1) /* 8021219C 0020F0DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 802121A0 0020F0E0 48 15 00 2D */ bl func_803621CC +/* 802121A0 0020F0E0 48 15 00 2D */ bl _savegpr_25 /* 802121A4 0020F0E4 7C 7E 1B 78 */ mr r30, r3 /* 802121A8 0020F0E8 3C 60 80 3A */ lis r3, lbl_80398258@ha /* 802121AC 0020F0EC 3B 63 82 58 */ addi r27, r3, lbl_80398258@l @@ -4738,7 +4738,7 @@ dMeter2Draw_c_NS_drawPikari: /* 80214004 00210F44 DB C1 00 50 */ stfd f30, 0x50(r1) /* 80214008 00210F48 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 8021400C 00210F4C 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214010 00210F50 48 14 E1 BD */ bl func_803621CC +/* 80214010 00210F50 48 14 E1 BD */ bl _savegpr_25 /* 80214014 00210F54 7C 79 1B 78 */ mr r25, r3 /* 80214018 00210F58 7C BA 2B 78 */ mr r26, r5 /* 8021401C 00210F5C FF C0 08 90 */ fmr f30, f1 @@ -4806,7 +4806,7 @@ dMeter2Draw_c_NS_drawPikari_X1_: /* 80214108 00211048 DB 61 00 50 */ stfd f27, 0x50(r1) /* 8021410C 0021104C F3 61 00 58 */ psq_st f27, 88(r1), 0, qr0 /* 80214110 00211050 39 61 00 50 */ addi r11, r1, 0x50 -/* 80214114 00211054 48 14 E0 B9 */ bl func_803621CC +/* 80214114 00211054 48 14 E0 B9 */ bl _savegpr_25 /* 80214118 00211058 7C 79 1B 78 */ mr r25, r3 /* 8021411C 0021105C FF 60 08 90 */ fmr f27, f1 /* 80214120 00211060 FF 80 10 90 */ fmr f28, f2 @@ -5561,7 +5561,7 @@ dMeter2Draw_c_NS_setAlphaLifeChange: /* 80214C24 00211B64 7C 08 02 A6 */ mflr r0 /* 80214C28 00211B68 90 01 00 34 */ stw r0, 0x34(r1) /* 80214C2C 00211B6C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80214C30 00211B70 48 14 D5 9D */ bl func_803621CC +/* 80214C30 00211B70 48 14 D5 9D */ bl _savegpr_25 /* 80214C34 00211B74 7C 7A 1B 78 */ mr r26, r3 /* 80214C38 00211B78 7C 9B 23 78 */ mr r27, r4 /* 80214C3C 00211B7C 3B E0 00 00 */ li r31, 0 @@ -6639,7 +6639,7 @@ dMeter2Draw_c_NS_drawLightDrop: /* 80215B3C 00212A7C DB 81 00 40 */ stfd f28, 0x40(r1) /* 80215B40 00212A80 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 80215B44 00212A84 39 61 00 40 */ addi r11, r1, 0x40 -/* 80215B48 00212A88 48 14 C6 85 */ bl func_803621CC +/* 80215B48 00212A88 48 14 C6 85 */ bl _savegpr_25 /* 80215B4C 00212A8C 7C 7A 1B 78 */ mr r26, r3 /* 80215B50 00212A90 FF C0 08 90 */ fmr f30, f1 /* 80215B54 00212A94 FF E0 10 90 */ fmr f31, f2 @@ -6944,7 +6944,7 @@ dMeter2Draw_c_NS_setAlphaLightDropAnimeMax: /* 80215F94 00212ED4 DB E1 00 50 */ stfd f31, 0x50(r1) /* 80215F98 00212ED8 F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 80215F9C 00212EDC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80215FA0 00212EE0 48 14 C2 2D */ bl func_803621CC +/* 80215FA0 00212EE0 48 14 C2 2D */ bl _savegpr_25 /* 80215FA4 00212EE4 7C 7D 1B 78 */ mr r29, r3 /* 80215FA8 00212EE8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80215FAC 00212EEC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -7192,7 +7192,7 @@ dMeter2Draw_c_NS_drawRupee: /* 80216330 00213270 7C 08 02 A6 */ mflr r0 /* 80216334 00213274 90 01 00 34 */ stw r0, 0x34(r1) /* 80216338 00213278 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021633C 0021327C 48 14 BE 8D */ bl func_803621C8 +/* 8021633C 0021327C 48 14 BE 8D */ bl _savegpr_24 /* 80216340 00213280 7C 7F 1B 78 */ mr r31, r3 /* 80216344 00213284 7C 98 23 78 */ mr r24, r4 /* 80216348 00213288 80 63 02 D8 */ lwz r3, 0x2d8(r3) @@ -7401,7 +7401,7 @@ lbl_80216614: /* 80216664 002135A4 3B DE 00 08 */ addi r30, r30, 8 /* 80216668 002135A8 41 80 FF A0 */ blt lbl_80216608 /* 8021666C 002135AC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216670 002135B0 48 14 BB A5 */ bl func_80362214 +/* 80216670 002135B0 48 14 BB A5 */ bl _restgpr_24 /* 80216674 002135B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80216678 002135B8 7C 08 03 A6 */ mtlr r0 /* 8021667C 002135BC 38 21 00 30 */ addi r1, r1, 0x30 @@ -7413,7 +7413,7 @@ dMeter2Draw_c_NS_setAlphaRupeeChange: /* 80216688 002135C8 7C 08 02 A6 */ mflr r0 /* 8021668C 002135CC 90 01 00 34 */ stw r0, 0x34(r1) /* 80216690 002135D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80216694 002135D4 48 14 BB 39 */ bl func_803621CC +/* 80216694 002135D4 48 14 BB 39 */ bl _savegpr_25 /* 80216698 002135D8 7C 79 1B 78 */ mr r25, r3 /* 8021669C 002135DC 7C 9A 23 78 */ mr r26, r4 /* 802166A0 002135E0 3B E0 00 00 */ li r31, 0 @@ -8175,7 +8175,7 @@ dMeter2Draw_c_NS_drawButtonB: /* 80217120 00214060 DB 21 00 30 */ stfd f25, 0x30(r1) /* 80217124 00214064 F3 21 00 38 */ psq_st f25, 56(r1), 0, qr0 /* 80217128 00214068 39 61 00 30 */ addi r11, r1, 0x30 -/* 8021712C 0021406C 48 14 B0 A1 */ bl func_803621CC +/* 8021712C 0021406C 48 14 B0 A1 */ bl _savegpr_25 /* 80217130 00214070 7C 7A 1B 78 */ mr r26, r3 /* 80217134 00214074 7C 9B 23 78 */ mr r27, r4 /* 80217138 00214078 7C BC 2B 78 */ mr r28, r5 @@ -8846,7 +8846,7 @@ dMeter2Draw_c_NS_drawButtonXY: /* 80217AC0 00214A00 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80217AC4 00214A04 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80217AC8 00214A08 39 61 00 30 */ addi r11, r1, 0x30 -/* 80217ACC 00214A0C 48 14 A7 01 */ bl func_803621CC +/* 80217ACC 00214A0C 48 14 A7 01 */ bl _savegpr_25 /* 80217AD0 00214A10 7C 7F 1B 78 */ mr r31, r3 /* 80217AD4 00214A14 7C 9B 23 78 */ mr r27, r4 /* 80217AD8 00214A18 7C B9 2B 78 */ mr r25, r5 @@ -10869,7 +10869,7 @@ dMeter2Draw_c_NS_setButtonIconBAlpha: /* 8021979C 002166DC DB C1 00 60 */ stfd f30, 0x60(r1) /* 802197A0 002166E0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, qr0 /* 802197A4 002166E4 39 61 00 60 */ addi r11, r1, 0x60 -/* 802197A8 002166E8 48 14 8A 25 */ bl func_803621CC +/* 802197A8 002166E8 48 14 8A 25 */ bl _savegpr_25 /* 802197AC 002166EC 7C 7D 1B 78 */ mr r29, r3 /* 802197B0 002166F0 7C DE 33 78 */ mr r30, r6 /* 802197B4 002166F4 80 63 03 28 */ lwz r3, 0x328(r3) @@ -11350,7 +11350,7 @@ dMeter2Draw_c_NS_setButtonIconAlpha: /* 80219EAC 00216DEC DB C1 00 60 */ stfd f30, 0x60(r1) /* 80219EB0 00216DF0 F3 C1 00 68 */ psq_st f30, 104(r1), 0, qr0 /* 80219EB4 00216DF4 39 61 00 60 */ addi r11, r1, 0x60 -/* 80219EB8 00216DF8 48 14 83 11 */ bl func_803621C8 +/* 80219EB8 00216DF8 48 14 83 11 */ bl _savegpr_24 /* 80219EBC 00216DFC 7C 78 1B 78 */ mr r24, r3 /* 80219EC0 00216E00 7C 99 23 78 */ mr r25, r4 /* 80219EC4 00216E04 54 9F 10 3A */ slwi r31, r4, 2 @@ -11610,7 +11610,7 @@ lbl_8021A274: /* 8021A27C 002171BC E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 /* 8021A280 002171C0 CB C1 00 60 */ lfd f30, 0x60(r1) /* 8021A284 002171C4 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A288 002171C8 48 14 7F 8D */ bl func_80362214 +/* 8021A288 002171C8 48 14 7F 8D */ bl _restgpr_24 /* 8021A28C 002171CC 80 01 00 84 */ lwz r0, 0x84(r1) /* 8021A290 002171D0 7C 08 03 A6 */ mtlr r0 /* 8021A294 002171D4 38 21 00 80 */ addi r1, r1, 0x80 @@ -11935,7 +11935,7 @@ dMeter2Draw_c_NS_changeTextureItemXY: /* 8021A720 00217660 7C 08 02 A6 */ mflr r0 /* 8021A724 00217664 90 01 00 64 */ stw r0, 0x64(r1) /* 8021A728 00217668 39 61 00 60 */ addi r11, r1, 0x60 -/* 8021A72C 0021766C 48 14 7A A1 */ bl func_803621CC +/* 8021A72C 0021766C 48 14 7A A1 */ bl _savegpr_25 /* 8021A730 00217670 7C 79 1B 78 */ mr r25, r3 /* 8021A734 00217674 7C 9A 23 78 */ mr r26, r4 /* 8021A738 00217678 7C BB 2B 78 */ mr r27, r5 @@ -12242,7 +12242,7 @@ dMeter2Draw_c_NS_setItemNum: /* 8021AB88 00217AC8 7C 08 02 A6 */ mflr r0 /* 8021AB8C 00217ACC 90 01 00 44 */ stw r0, 0x44(r1) /* 8021AB90 00217AD0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021AB94 00217AD4 48 14 76 35 */ bl func_803621C8 +/* 8021AB94 00217AD4 48 14 76 35 */ bl _savegpr_24 /* 8021AB98 00217AD8 7C 7F 1B 78 */ mr r31, r3 /* 8021AB9C 00217ADC 7C BC 2B 78 */ mr r28, r5 /* 8021ABA0 00217AE0 54 A3 06 3E */ clrlwi r3, r5, 0x18 @@ -12449,7 +12449,7 @@ lbl_8021AD90: /* 8021AEAC 00217DEC 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_8021AEB0: /* 8021AEB0 00217DF0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8021AEB4 00217DF4 48 14 73 61 */ bl func_80362214 +/* 8021AEB4 00217DF4 48 14 73 61 */ bl _restgpr_24 /* 8021AEB8 00217DF8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021AEBC 00217DFC 7C 08 03 A6 */ mtlr r0 /* 8021AEC0 00217E00 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 9d0644a774..f24eaf7082 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -1591,7 +1591,7 @@ jmessage_tMeasureProcessor: /* 80229AD0 00226A10 DB E1 00 30 */ stfd f31, 0x30(r1) /* 80229AD4 00226A14 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80229AD8 00226A18 39 61 00 30 */ addi r11, r1, 0x30 -/* 80229ADC 00226A1C 48 13 86 ED */ bl func_803621C8 +/* 80229ADC 00226A1C 48 13 86 ED */ bl _savegpr_24 /* 80229AE0 00226A20 7C 79 1B 78 */ mr r25, r3 /* 80229AE4 00226A24 7C 9A 23 78 */ mr r26, r4 /* 80229AE8 00226A28 83 83 00 04 */ lwz r28, 4(r3) @@ -1712,7 +1712,7 @@ lbl_80229C94: /* 80229C94 00226BD4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80229C98 00226BD8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80229C9C 00226BDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80229CA0 00226BE0 48 13 85 75 */ bl func_80362214 +/* 80229CA0 00226BE0 48 13 85 75 */ bl _restgpr_24 /* 80229CA4 00226BE4 80 01 00 44 */ lwz r0, 0x44(r1) /* 80229CA8 00226BE8 7C 08 03 A6 */ mtlr r0 /* 80229CAC 00226BEC 38 21 00 40 */ addi r1, r1, 0x40 @@ -7535,7 +7535,7 @@ jmessage_tRenderingProcessor_NS_do_rubyset: /* 8022F15C 0022C09C DB C1 00 50 */ stfd f30, 0x50(r1) /* 8022F160 0022C0A0 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 8022F164 0022C0A4 39 61 00 50 */ addi r11, r1, 0x50 -/* 8022F168 0022C0A8 48 13 30 65 */ bl func_803621CC +/* 8022F168 0022C0A8 48 13 30 65 */ bl _savegpr_25 /* 8022F16C 0022C0AC 7C 7A 1B 78 */ mr r26, r3 /* 8022F170 0022C0B0 7C 9B 23 78 */ mr r27, r4 /* 8022F174 0022C0B4 83 C3 00 04 */ lwz r30, 4(r3) @@ -10782,7 +10782,7 @@ jmessage_string_tRenderingProcessor_NS_do_rubyset: /* 802320CC 0022F00C DB A1 00 40 */ stfd f29, 0x40(r1) /* 802320D0 0022F010 F3 A1 00 48 */ psq_st f29, 72(r1), 0, qr0 /* 802320D4 0022F014 39 61 00 40 */ addi r11, r1, 0x40 -/* 802320D8 0022F018 48 13 00 F1 */ bl func_803621C8 +/* 802320D8 0022F018 48 13 00 F1 */ bl _savegpr_24 /* 802320DC 0022F01C 7C 7B 1B 78 */ mr r27, r3 /* 802320E0 0022F020 7C 9C 23 78 */ mr r28, r4 /* 802320E4 0022F024 7C B8 2B 78 */ mr r24, r5 @@ -10878,7 +10878,7 @@ lbl_80232230: /* 80232240 0022F180 E3 A1 00 48 */ psq_l f29, 72(r1), 0, qr0 /* 80232244 0022F184 CB A1 00 40 */ lfd f29, 0x40(r1) /* 80232248 0022F188 39 61 00 40 */ addi r11, r1, 0x40 -/* 8023224C 0022F18C 48 12 FF C9 */ bl func_80362214 +/* 8023224C 0022F18C 48 12 FF C9 */ bl _restgpr_24 /* 80232250 0022F190 80 01 00 74 */ lwz r0, 0x74(r1) /* 80232254 0022F194 7C 08 03 A6 */ mtlr r0 /* 80232258 0022F198 38 21 00 70 */ addi r1, r1, 0x70 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index d5b10c5fc4..84e1bf95b2 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -166,7 +166,7 @@ lbl_8024A124: /* 8024A140 00247080 7C 08 02 A6 */ mflr r0 /* 8024A144 00247084 90 01 00 34 */ stw r0, 0x34(r1) /* 8024A148 00247088 39 61 00 30 */ addi r11, r1, 0x30 -/* 8024A14C 0024708C 48 11 80 81 */ bl func_803621CC +/* 8024A14C 0024708C 48 11 80 81 */ bl _savegpr_25 /* 8024A150 00247090 7C 7A 1B 78 */ mr r26, r3 /* 8024A154 00247094 7C 9B 23 78 */ mr r27, r4 /* 8024A158 00247098 7C BC 2B 78 */ mr r28, r5 diff --git a/asm/d/msg/out/d_msg_out_font.s b/asm/d/msg/out/d_msg_out_font.s index 12b7481f6b..0ba6493cbf 100644 --- a/asm/d/msg/out/d_msg_out_font.s +++ b/asm/d/msg/out/d_msg_out_font.s @@ -1210,7 +1210,7 @@ lbl_80226D98: /* 80226DF4 00223D34 DB 01 02 30 */ stfd f24, 0x230(r1) /* 80226DF8 00223D38 F3 01 02 38 */ psq_st f24, 568(r1), 0, qr0 /* 80226DFC 00223D3C 39 61 02 30 */ addi r11, r1, 0x230 -/* 80226E00 00223D40 48 13 B3 C9 */ bl func_803621C8 +/* 80226E00 00223D40 48 13 B3 C9 */ bl _savegpr_24 /* 80226E04 00223D44 7C 7A 1B 78 */ mr r26, r3 /* 80226E08 00223D48 7C 9B 23 78 */ mr r27, r4 /* 80226E0C 00223D4C FF 20 08 90 */ fmr f25, f1 @@ -2668,7 +2668,7 @@ lbl_802283E0: /* 80228428 00225368 E3 01 02 38 */ psq_l f24, 568(r1), 0, qr0 /* 8022842C 0022536C CB 01 02 30 */ lfd f24, 0x230(r1) /* 80228430 00225370 39 61 02 30 */ addi r11, r1, 0x230 -/* 80228434 00225374 48 13 9D E1 */ bl func_80362214 +/* 80228434 00225374 48 13 9D E1 */ bl _restgpr_24 /* 80228438 00225378 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 8022843C 0022537C 7C 08 03 A6 */ mtlr r0 /* 80228440 00225380 38 21 02 B0 */ addi r1, r1, 0x2b0 diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index 000d81dade..c7ade4e79f 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -13,7 +13,7 @@ dMsgScrnExplain_c: /* 8023CC9C 00239BDC DB C1 00 70 */ stfd f30, 0x70(r1) /* 8023CCA0 00239BE0 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 8023CCA4 00239BE4 39 61 00 70 */ addi r11, r1, 0x70 -/* 8023CCA8 00239BE8 48 12 55 21 */ bl func_803621C8 +/* 8023CCA8 00239BE8 48 12 55 21 */ bl _savegpr_24 /* 8023CCAC 00239BEC 7C 7F 1B 78 */ mr r31, r3 /* 8023CCB0 00239BF0 7C 9E 23 78 */ mr r30, r4 /* 8023CCB4 00239BF4 7C BB 2B 78 */ mr r27, r5 @@ -583,7 +583,7 @@ lbl_8023D46C: /* 8023D518 0023A458 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 /* 8023D51C 0023A45C CB C1 00 70 */ lfd f30, 0x70(r1) /* 8023D520 0023A460 39 61 00 70 */ addi r11, r1, 0x70 -/* 8023D524 0023A464 48 12 4C F1 */ bl func_80362214 +/* 8023D524 0023A464 48 12 4C F1 */ bl _restgpr_24 /* 8023D528 0023A468 80 01 00 94 */ lwz r0, 0x94(r1) /* 8023D52C 0023A46C 7C 08 03 A6 */ mtlr r0 /* 8023D530 0023A470 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index d54e5526db..8f046249e4 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -2604,7 +2604,7 @@ dMsgScrnHowl_c_NS_drawGuide2: /* 80243020 0023FF60 DB 21 00 A0 */ stfd f25, 0xa0(r1) /* 80243024 0023FF64 F3 21 00 A8 */ psq_st f25, 168(r1), 0, qr0 /* 80243028 0023FF68 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 8024302C 0023FF6C 48 11 F1 9D */ bl func_803621C8 +/* 8024302C 0023FF6C 48 11 F1 9D */ bl _savegpr_24 /* 80243030 0023FF70 7C 7A 1B 78 */ mr r26, r3 /* 80243034 0023FF74 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80243038 0023FF78 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -2969,7 +2969,7 @@ lbl_8024355C: /* 8024359C 002404DC E3 21 00 A8 */ psq_l f25, 168(r1), 0, qr0 /* 802435A0 002404E0 CB 21 00 A0 */ lfd f25, 0xa0(r1) /* 802435A4 002404E4 39 61 00 A0 */ addi r11, r1, 0xa0 -/* 802435A8 002404E8 48 11 EC 6D */ bl func_80362214 +/* 802435A8 002404E8 48 11 EC 6D */ bl _restgpr_24 /* 802435AC 002404EC 80 01 01 14 */ lwz r0, 0x114(r1) /* 802435B0 002404F0 7C 08 03 A6 */ mtlr r0 /* 802435B4 002404F4 38 21 01 10 */ addi r1, r1, 0x110 diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index f0ac004ee6..85b9688145 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -11,7 +11,7 @@ dMsgScrnItem_c: /* 8023E7A8 0023B6E8 DB E1 00 50 */ stfd f31, 0x50(r1) /* 8023E7AC 0023B6EC F3 E1 00 58 */ psq_st f31, 88(r1), 0, qr0 /* 8023E7B0 0023B6F0 39 61 00 50 */ addi r11, r1, 0x50 -/* 8023E7B4 0023B6F4 48 12 3A 19 */ bl func_803621CC +/* 8023E7B4 0023B6F4 48 12 3A 19 */ bl _savegpr_25 /* 8023E7B8 0023B6F8 7C 7F 1B 78 */ mr r31, r3 /* 8023E7BC 0023B6FC 7C 9C 23 78 */ mr r28, r4 /* 8023E7C0 0023B700 7C BD 2B 78 */ mr r29, r5 @@ -1353,7 +1353,7 @@ lbl_8023FA64: /* 8023FB30 0023CA70 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8023FB34 0023CA74 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8023FB38 0023CA78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8023FB3C 0023CA7C 48 12 26 91 */ bl func_803621CC +/* 8023FB3C 0023CA7C 48 12 26 91 */ bl _savegpr_25 /* 8023FB40 0023CA80 7C 7B 1B 78 */ mr r27, r3 /* 8023FB44 0023CA84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023FB48 0023CA88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index a0c43fc642..bb8f52016b 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -468,7 +468,7 @@ lbl_80244C10: /* 80244C30 00241B70 7C 08 02 A6 */ mflr r0 /* 80244C34 00241B74 90 01 00 44 */ stw r0, 0x44(r1) /* 80244C38 00241B78 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244C3C 00241B7C 48 11 D5 8D */ bl func_803621C8 +/* 80244C3C 00241B7C 48 11 D5 8D */ bl _savegpr_24 /* 80244C40 00241B80 7C 7F 1B 78 */ mr r31, r3 /* 80244C44 00241B84 4B FF 79 31 */ bl dMsgScrnBase_c_NS_isTalkNow /* 80244C48 00241B88 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -528,7 +528,7 @@ lbl_80244D08: /* 80244D14 00241C54 3B BD 00 28 */ addi r29, r29, 0x28 /* 80244D18 00241C58 41 80 FF 94 */ blt lbl_80244CAC /* 80244D1C 00241C5C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80244D20 00241C60 48 11 D4 F5 */ bl func_80362214 +/* 80244D20 00241C60 48 11 D4 F5 */ bl _restgpr_24 /* 80244D24 00241C64 80 01 00 44 */ lwz r0, 0x44(r1) /* 80244D28 00241C68 7C 08 03 A6 */ mtlr r0 /* 80244D2C 00241C6C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index d0e401c29b..ab1e9d3ca0 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -275,7 +275,7 @@ dMsgStringBase_c_NS_getStringLocal: /* 80249770 002466B0 90 01 00 44 */ stw r0, 0x44(r1) /* 80249774 002466B4 DB E1 00 38 */ stfd f31, 0x38(r1) /* 80249778 002466B8 39 61 00 38 */ addi r11, r1, 0x38 -/* 8024977C 002466BC 48 11 8A 51 */ bl func_803621CC +/* 8024977C 002466BC 48 11 8A 51 */ bl _savegpr_25 /* 80249780 002466C0 7C 7E 1B 78 */ mr r30, r3 /* 80249784 002466C4 7C 9F 23 78 */ mr r31, r4 /* 80249788 002466C8 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/d/npc/d_npc_lib.s b/asm/d/npc/d_npc_lib.s index de9845d6a7..27ebc5fff2 100644 --- a/asm/d/npc/d_npc_lib.s +++ b/asm/d/npc/d_npc_lib.s @@ -598,7 +598,7 @@ dNpcLib_lookat_c_NS_setPrm: /* 80251B80 0024EAC0 DB A1 00 80 */ stfd f29, 0x80(r1) /* 80251B84 0024EAC4 F3 A1 00 88 */ psq_st f29, 136(r1), 0, qr0 /* 80251B88 0024EAC8 39 61 00 80 */ addi r11, r1, 0x80 -/* 80251B8C 0024EACC 48 11 06 41 */ bl func_803621CC +/* 80251B8C 0024EACC 48 11 06 41 */ bl _savegpr_25 /* 80251B90 0024EAD0 7C 7C 1B 78 */ mr r28, r3 /* 80251B94 0024EAD4 38 E0 00 00 */ li r7, 0 /* 80251B98 0024EAD8 38 60 00 00 */ li r3, 0 diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index 3d0ef22f06..0999edc1fb 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -1343,7 +1343,7 @@ CPaneMgr_NS_getGlobalVtx: /* 80254C94 00251BD4 7C 08 02 A6 */ mflr r0 /* 80254C98 00251BD8 90 01 01 64 */ stw r0, 0x164(r1) /* 80254C9C 00251BDC 39 61 01 60 */ addi r11, r1, 0x160 -/* 80254CA0 00251BE0 48 10 D5 29 */ bl func_803621C8 +/* 80254CA0 00251BE0 48 10 D5 29 */ bl _savegpr_24 /* 80254CA4 00251BE4 7C 7F 1B 78 */ mr r31, r3 /* 80254CA8 00251BE8 7C 98 23 78 */ mr r24, r4 /* 80254CAC 00251BEC 7C B9 2B 78 */ mr r25, r5 @@ -1481,7 +1481,7 @@ lbl_80254E14: /* 80254EA0 00251DE0 90 01 00 60 */ stw r0, 0x60(r1) lbl_80254EA4: /* 80254EA4 00251DE4 39 61 01 60 */ addi r11, r1, 0x160 -/* 80254EA8 00251DE8 48 10 D3 6D */ bl func_80362214 +/* 80254EA8 00251DE8 48 10 D3 6D */ bl _restgpr_24 /* 80254EAC 00251DEC 80 01 01 64 */ lwz r0, 0x164(r1) /* 80254EB0 00251DF0 7C 08 03 A6 */ mtlr r0 /* 80254EB4 00251DF4 38 21 01 60 */ addi r1, r1, 0x160 @@ -1687,7 +1687,7 @@ dPaneClass_setPriority: /* 80255188 002520C8 7C 08 02 A6 */ mflr r0 /* 8025518C 002520CC 90 01 00 44 */ stw r0, 0x44(r1) /* 80255190 002520D0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80255194 002520D4 48 10 D0 39 */ bl func_803621CC +/* 80255194 002520D4 48 10 D0 39 */ bl _savegpr_25 /* 80255198 002520D8 7C 79 1B 78 */ mr r25, r3 /* 8025519C 002520DC 7C 9A 23 78 */ mr r26, r4 /* 802551A0 002520E0 7C BD 2B 78 */ mr r29, r5 diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index 30dd434eab..a5c8d0deee 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -28,7 +28,7 @@ dPaPo_c_NS_checkWaterIn: /* 80050CE0 0004DC20 DB A1 00 30 */ stfd f29, 0x30(r1) /* 80050CE4 0004DC24 F3 A1 00 38 */ psq_st f29, 56(r1), 0, qr0 /* 80050CE8 0004DC28 39 61 00 30 */ addi r11, r1, 0x30 -/* 80050CEC 0004DC2C 48 31 14 E1 */ bl func_803621CC +/* 80050CEC 0004DC2C 48 31 14 E1 */ bl _savegpr_25 /* 80050CF0 0004DC30 7C 7A 1B 78 */ mr r26, r3 /* 80050CF4 0004DC34 7C 9B 23 78 */ mr r27, r4 /* 80050CF8 0004DC38 7C BC 2B 78 */ mr r28, r5 @@ -254,7 +254,7 @@ dPaPo_c_NS_setEffectCenter: /* 8005100C 0004DF4C 7C 08 02 A6 */ mflr r0 /* 80051010 0004DF50 90 01 00 54 */ stw r0, 0x54(r1) /* 80051014 0004DF54 39 61 00 50 */ addi r11, r1, 0x50 -/* 80051018 0004DF58 48 31 11 B1 */ bl func_803621C8 +/* 80051018 0004DF58 48 31 11 B1 */ bl _savegpr_24 /* 8005101C 0004DF5C 7C 7F 1B 78 */ mr r31, r3 /* 80051020 0004DF60 7C 98 23 78 */ mr r24, r4 /* 80051024 0004DF64 7C D9 33 78 */ mr r25, r6 @@ -325,7 +325,7 @@ lbl_800510E4: /* 80051120 0004E060 7F C3 F3 78 */ mr r3, r30 lbl_80051124: /* 80051124 0004E064 39 61 00 50 */ addi r11, r1, 0x50 -/* 80051128 0004E068 48 31 10 ED */ bl func_80362214 +/* 80051128 0004E068 48 31 10 ED */ bl _restgpr_24 /* 8005112C 0004E06C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80051130 0004E070 7C 08 03 A6 */ mtlr r0 /* 80051134 0004E074 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index 1dae7ab88f..8c79e118ae 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -12,7 +12,7 @@ getResetArchiveBank: /* 8025AE28 00257D68 7C 08 02 A6 */ mflr r0 /* 8025AE2C 00257D6C 90 01 00 34 */ stw r0, 0x34(r1) /* 8025AE30 00257D70 39 61 00 30 */ addi r11, r1, 0x30 -/* 8025AE34 00257D74 48 10 73 99 */ bl func_803621CC +/* 8025AE34 00257D74 48 10 73 99 */ bl _savegpr_25 /* 8025AE38 00257D78 7C 79 1B 78 */ mr r25, r3 /* 8025AE3C 00257D7C 7C 9A 23 78 */ mr r26, r4 /* 8025AE40 00257D80 83 CD 87 EC */ lwz r30, lbl_80450D6C-_SDA_BASE_(r13) diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index a1fc4d78b9..31e926531a 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -237,7 +237,7 @@ dSmplMdl_draw_c_NS_addModel: /* 80048F74 00045EB4 7C 08 02 A6 */ mflr r0 /* 80048F78 00045EB8 90 01 00 34 */ stw r0, 0x34(r1) /* 80048F7C 00045EBC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80048F80 00045EC0 48 31 92 4D */ bl func_803621CC +/* 80048F80 00045EC0 48 31 92 4D */ bl _savegpr_25 /* 80048F84 00045EC4 7C 79 1B 78 */ mr r25, r3 /* 80048F88 00045EC8 7C 9A 23 78 */ mr r26, r4 /* 80048F8C 00045ECC 7C BB 2B 78 */ mr r27, r5 diff --git a/asm/data.s b/asm/data.s index 68a62eac31..4c5a9d7692 100644 --- a/asm/data.s +++ b/asm/data.s @@ -296,8 +296,8 @@ lbl_803A7250: .global lbl_803A7260 lbl_803A7260: .incbin "baserom.dol", 0x3A4260, 0x10 -.global lbl_803A7270 -lbl_803A7270: +.global i_item_lst +i_item_lst: .incbin "baserom.dol", 0x3A4270, 0x18 .global lbl_803A7288 lbl_803A7288: diff --git a/asm/f/op/actor/f_op_actor_mng.s b/asm/f/op/actor/f_op_actor_mng.s index 9ba8415029..212bf20e85 100644 --- a/asm/f/op/actor/f_op_actor_mng.s +++ b/asm/f/op/actor/f_op_actor_mng.s @@ -200,7 +200,7 @@ createAppend: /* 80019B20 00016A60 7C 08 02 A6 */ mflr r0 /* 80019B24 00016A64 90 01 00 44 */ stw r0, 0x44(r1) /* 80019B28 00016A68 39 61 00 40 */ addi r11, r1, 0x40 -/* 80019B2C 00016A6C 48 34 86 9D */ bl func_803621C8 +/* 80019B2C 00016A6C 48 34 86 9D */ bl _savegpr_24 /* 80019B30 00016A70 7C 78 1B 78 */ mr r24, r3 /* 80019B34 00016A74 7C 9D 23 78 */ mr r29, r4 /* 80019B38 00016A78 7C B9 2B 78 */ mr r25, r5 @@ -286,7 +286,7 @@ lbl_80019C54: /* 80019C5C 00016B9C 9B C3 00 20 */ stb r30, 0x20(r3) lbl_80019C60: /* 80019C60 00016BA0 39 61 00 40 */ addi r11, r1, 0x40 -/* 80019C64 00016BA4 48 34 85 B1 */ bl func_80362214 +/* 80019C64 00016BA4 48 34 85 B1 */ bl _restgpr_24 /* 80019C68 00016BA8 80 01 00 44 */ lwz r0, 0x44(r1) /* 80019C6C 00016BAC 7C 08 03 A6 */ mtlr r0 /* 80019C70 00016BB0 38 21 00 40 */ addi r1, r1, 0x40 @@ -449,7 +449,7 @@ fopAcM_fastCreate_X1_: /* 80019E70 00016DB0 7C 08 02 A6 */ mflr r0 /* 80019E74 00016DB4 90 01 00 34 */ stw r0, 0x34(r1) /* 80019E78 00016DB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80019E7C 00016DBC 48 34 83 51 */ bl func_803621CC +/* 80019E7C 00016DBC 48 34 83 51 */ bl _savegpr_25 /* 80019E80 00016DC0 7C 99 23 78 */ mr r25, r4 /* 80019E84 00016DC4 7C BA 2B 78 */ mr r26, r5 /* 80019E88 00016DC8 7C DB 33 78 */ mr r27, r6 @@ -697,7 +697,7 @@ fopAcM_entrySolidHeap_: /* 8001A1EC 0001712C 7C 08 02 A6 */ mflr r0 /* 8001A1F0 00017130 90 01 00 34 */ stw r0, 0x34(r1) /* 8001A1F4 00017134 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001A1F8 00017138 48 34 7F D1 */ bl func_803621C8 +/* 8001A1F8 00017138 48 34 7F D1 */ bl _savegpr_24 /* 8001A1FC 0001713C 7C 7B 1B 78 */ mr r27, r3 /* 8001A200 00017140 7C 9C 23 78 */ mr r28, r4 /* 8001A204 00017144 7C BD 2B 78 */ mr r29, r5 @@ -880,7 +880,7 @@ lbl_8001A47C: /* 8001A494 000173D4 38 60 00 00 */ li r3, 0 lbl_8001A498: /* 8001A498 000173D8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001A49C 000173DC 48 34 7D 79 */ bl func_80362214 +/* 8001A49C 000173DC 48 34 7D 79 */ bl _restgpr_24 /* 8001A4A0 000173E0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001A4A4 000173E4 7C 08 03 A6 */ mtlr r0 /* 8001A4A8 000173E8 38 21 00 30 */ addi r1, r1, 0x30 @@ -1983,7 +1983,7 @@ fopAcM_orderOtherEvent: /* 8001B3D0 00018310 7C 08 02 A6 */ mflr r0 /* 8001B3D4 00018314 90 01 00 34 */ stw r0, 0x34(r1) /* 8001B3D8 00018318 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B3DC 0001831C 48 34 6D F1 */ bl func_803621CC +/* 8001B3DC 0001831C 48 34 6D F1 */ bl _savegpr_25 /* 8001B3E0 00018320 7C 7C 1B 78 */ mr r28, r3 /* 8001B3E4 00018324 7C 88 23 78 */ mr r8, r4 /* 8001B3E8 00018328 7C BD 2B 78 */ mr r29, r5 @@ -2063,7 +2063,7 @@ fopAcM_orderOtherEvent_X1_: /* 8001B4E4 00018424 7C 08 02 A6 */ mflr r0 /* 8001B4E8 00018428 90 01 00 34 */ stw r0, 0x34(r1) /* 8001B4EC 0001842C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B4F0 00018430 48 34 6C D9 */ bl func_803621C8 +/* 8001B4F0 00018430 48 34 6C D9 */ bl _savegpr_24 /* 8001B4F4 00018434 7C 7A 1B 78 */ mr r26, r3 /* 8001B4F8 00018438 7C 9B 23 78 */ mr r27, r4 /* 8001B4FC 0001843C 7C DC 33 78 */ mr r28, r6 @@ -2127,7 +2127,7 @@ lbl_8001B5A4: /* 8001B5C8 00018508 48 02 60 A1 */ bl dEvt_control_c_NS_order lbl_8001B5CC: /* 8001B5CC 0001850C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B5D0 00018510 48 34 6C 45 */ bl func_80362214 +/* 8001B5D0 00018510 48 34 6C 45 */ bl _restgpr_24 /* 8001B5D4 00018514 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001B5D8 00018518 7C 08 03 A6 */ mtlr r0 /* 8001B5DC 0001851C 38 21 00 30 */ addi r1, r1, 0x30 @@ -2181,7 +2181,7 @@ fopAcM_orderOtherEventId: /* 8001B680 000185C0 7C 08 02 A6 */ mflr r0 /* 8001B684 000185C4 90 01 00 34 */ stw r0, 0x34(r1) /* 8001B688 000185C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B68C 000185CC 48 34 6B 3D */ bl func_803621C8 +/* 8001B68C 000185CC 48 34 6B 3D */ bl _savegpr_24 /* 8001B690 000185D0 7C 7A 1B 78 */ mr r26, r3 /* 8001B694 000185D4 7C 9B 23 78 */ mr r27, r4 /* 8001B698 000185D8 7C BC 2B 78 */ mr r28, r5 @@ -2259,7 +2259,7 @@ lbl_8001B76C: /* 8001B798 000186D8 48 02 5E D1 */ bl dEvt_control_c_NS_order lbl_8001B79C: /* 8001B79C 000186DC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001B7A0 000186E0 48 34 6A 75 */ bl func_80362214 +/* 8001B7A0 000186E0 48 34 6A 75 */ bl _restgpr_24 /* 8001B7A4 000186E4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001B7A8 000186E8 7C 08 03 A6 */ mtlr r0 /* 8001B7AC 000186EC 38 21 00 30 */ addi r1, r1, 0x30 @@ -2590,7 +2590,7 @@ fopAcM_createItemForPresentDemo: /* 8001BBEC 00018B2C 7C 08 02 A6 */ mflr r0 /* 8001BBF0 00018B30 90 01 00 34 */ stw r0, 0x34(r1) /* 8001BBF4 00018B34 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001BBF8 00018B38 48 34 65 D5 */ bl func_803621CC +/* 8001BBF8 00018B38 48 34 65 D5 */ bl _savegpr_25 /* 8001BBFC 00018B3C 7C 79 1B 78 */ mr r25, r3 /* 8001BC00 00018B40 7C 9A 23 78 */ mr r26, r4 /* 8001BC04 00018B44 7C BB 2B 78 */ mr r27, r5 @@ -3049,7 +3049,7 @@ fopAcM_createItem: /* 8001C244 00019184 7C 08 02 A6 */ mflr r0 /* 8001C248 00019188 90 01 00 44 */ stw r0, 0x44(r1) /* 8001C24C 0001918C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C250 00019190 48 34 5F 7D */ bl func_803621CC +/* 8001C250 00019190 48 34 5F 7D */ bl _savegpr_25 /* 8001C254 00019194 7C 7B 1B 78 */ mr r27, r3 /* 8001C258 00019198 7C 9C 23 78 */ mr r28, r4 /* 8001C25C 0001919C 7C B9 2B 78 */ mr r25, r5 @@ -3166,7 +3166,7 @@ fopAcM_fastCreateItem2: /* 8001C3E4 00019324 7C 08 02 A6 */ mflr r0 /* 8001C3E8 00019328 90 01 00 44 */ stw r0, 0x44(r1) /* 8001C3EC 0001932C 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C3F0 00019330 48 34 5D DD */ bl func_803621CC +/* 8001C3F0 00019330 48 34 5D DD */ bl _savegpr_25 /* 8001C3F4 00019334 7C 7B 1B 78 */ mr r27, r3 /* 8001C3F8 00019338 7C 9C 23 78 */ mr r28, r4 /* 8001C3FC 0001933C 7C B9 2B 78 */ mr r25, r5 @@ -3487,7 +3487,7 @@ lbl_8001C858: /* 8001C874 000197B4 7C 08 02 A6 */ mflr r0 /* 8001C878 000197B8 90 01 00 44 */ stw r0, 0x44(r1) /* 8001C87C 000197BC 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C880 000197C0 48 34 59 49 */ bl func_803621C8 +/* 8001C880 000197C0 48 34 59 49 */ bl _savegpr_24 /* 8001C884 000197C4 7C 7E 1B 78 */ mr r30, r3 /* 8001C888 000197C8 7C 9F 23 78 */ mr r31, r4 /* 8001C88C 000197CC 7C B8 2B 78 */ mr r24, r5 @@ -3538,7 +3538,7 @@ lbl_8001C8F8: /* 8001C93C 0001987C 39 40 FF FF */ li r10, -1 /* 8001C940 00019880 4B FF D3 D9 */ bl fopAcM_create /* 8001C944 00019884 39 61 00 40 */ addi r11, r1, 0x40 -/* 8001C948 00019888 48 34 58 CD */ bl func_80362214 +/* 8001C948 00019888 48 34 58 CD */ bl _restgpr_24 /* 8001C94C 0001988C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001C950 00019890 7C 08 03 A6 */ mtlr r0 /* 8001C954 00019894 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/asm/m/Do/dvd/m_Do_dvd_thread.s b/asm/m/Do/dvd/m_Do_dvd_thread.s index f4f192f053..4d62607c3d 100644 --- a/asm/m/Do/dvd/m_Do_dvd_thread.s +++ b/asm/m/Do/dvd/m_Do_dvd_thread.s @@ -517,7 +517,7 @@ lbl_80015EC0: /* 80015EE0 00012E20 7C 08 02 A6 */ mflr r0 /* 80015EE4 00012E24 90 01 00 34 */ stw r0, 0x34(r1) /* 80015EE8 00012E28 39 61 00 30 */ addi r11, r1, 0x30 -/* 80015EEC 00012E2C 48 34 C2 E1 */ bl func_803621CC +/* 80015EEC 00012E2C 48 34 C2 E1 */ bl _savegpr_25 /* 80015EF0 00012E30 7C 7A 1B 78 */ mr r26, r3 /* 80015EF4 00012E34 3B C0 00 00 */ li r30, 0 /* 80015EF8 00012E38 3B A0 00 00 */ li r29, 0 diff --git a/asm/m/Do/m_Do_ext.s b/asm/m/Do/m_Do_ext.s index 8eb5f862aa..a8d4bc07ff 100644 --- a/asm/m/Do/m_Do_ext.s +++ b/asm/m/Do/m_Do_ext.s @@ -1598,7 +1598,7 @@ mDoExt_invisibleModel_NS_entryJoint: /* 8000E6CC 0000B60C 7C 08 02 A6 */ mflr r0 /* 8000E6D0 0000B610 90 01 00 44 */ stw r0, 0x44(r1) /* 8000E6D4 0000B614 39 61 00 40 */ addi r11, r1, 0x40 -/* 8000E6D8 0000B618 48 35 3A F5 */ bl func_803621CC +/* 8000E6D8 0000B618 48 35 3A F5 */ bl _savegpr_25 /* 8000E6DC 0000B61C 7C 79 1B 78 */ mr r25, r3 /* 8000E6E0 0000B620 7C 9A 23 79 */ or. r26, r4, r4 /* 8000E6E4 0000B624 80 63 00 00 */ lwz r3, 0(r3) @@ -5011,7 +5011,7 @@ lbl_800116DC: /* 80011708 0000E648 DB C1 01 40 */ stfd f30, 0x140(r1) /* 8001170C 0000E64C F3 C1 01 48 */ psq_st f30, 328(r1), 0, qr0 /* 80011710 0000E650 39 61 01 40 */ addi r11, r1, 0x140 -/* 80011714 0000E654 48 35 0A B9 */ bl func_803621CC +/* 80011714 0000E654 48 35 0A B9 */ bl _savegpr_25 /* 80011718 0000E658 7C 7C 1B 78 */ mr r28, r3 /* 8001171C 0000E65C 80 03 00 04 */ lwz r0, 4(r3) /* 80011720 0000E660 28 00 00 00 */ cmplwi r0, 0 @@ -6929,7 +6929,7 @@ lbl_80013334: /* 80013364 000102A4 7C 08 02 A6 */ mflr r0 /* 80013368 000102A8 90 01 00 44 */ stw r0, 0x44(r1) /* 8001336C 000102AC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80013370 000102B0 48 34 EE 5D */ bl func_803621CC +/* 80013370 000102B0 48 34 EE 5D */ bl _savegpr_25 /* 80013374 000102B4 7C 7E 1B 78 */ mr r30, r3 /* 80013378 000102B8 7C 9C 23 78 */ mr r28, r4 /* 8001337C 000102BC 7C B9 2B 78 */ mr r25, r5 diff --git a/asm/m/Do/m_Do_graphic.s b/asm/m/Do/m_Do_graphic.s index 41fcee8ff9..be0efe6b28 100644 --- a/asm/m/Do/m_Do_graphic.s +++ b/asm/m/Do/m_Do_graphic.s @@ -1697,7 +1697,7 @@ mDoGph_gInf_c_NS_bloom_c_NS_draw: /* 8000966C 000065AC DB A1 00 E0 */ stfd f29, 0xe0(r1) /* 80009670 000065B0 F3 A1 00 E8 */ psq_st f29, 232(r1), 0, qr0 /* 80009674 000065B4 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 80009678 000065B8 48 35 8B 51 */ bl func_803621C8 +/* 80009678 000065B8 48 35 8B 51 */ bl _savegpr_24 /* 8000967C 000065BC 7C 7F 1B 78 */ mr r31, r3 /* 80009680 000065C0 3B 80 00 00 */ li r28, 0 /* 80009684 000065C4 88 03 00 08 */ lbz r0, 8(r3) @@ -2397,7 +2397,7 @@ lbl_8000A130: /* 8000A140 00007080 E3 A1 00 E8 */ psq_l f29, 232(r1), 0, qr0 /* 8000A144 00007084 CB A1 00 E0 */ lfd f29, 0xe0(r1) /* 8000A148 00007088 39 61 00 E0 */ addi r11, r1, 0xe0 -/* 8000A14C 0000708C 48 35 80 C9 */ bl func_80362214 +/* 8000A14C 0000708C 48 35 80 C9 */ bl _restgpr_24 /* 8000A150 00007090 80 01 01 14 */ lwz r0, 0x114(r1) /* 8000A154 00007094 7C 08 03 A6 */ mtlr r0 /* 8000A158 00007098 38 21 01 10 */ addi r1, r1, 0x110 diff --git a/asm/sbss.s b/asm/sbss.s index 1af2f87906..01f88f4d9e 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -1748,8 +1748,8 @@ lbl_804514D8: .global lbl_804514DC lbl_804514DC: .skip 0x4 -.global lbl_804514E0 -lbl_804514E0: +.global _sRumbleSupported +_sRumbleSupported: .skip 0x4 .global lbl_804514E4 lbl_804514E4: diff --git a/diff.py b/diff.py index 5c20423176..8f5daeada2 100644 --- a/diff.py +++ b/diff.py @@ -541,7 +541,7 @@ def dump_objfile() -> Tuple[str, ObjdumpCommand, ObjdumpCommand]: if not os.path.isfile(objfile): fail(f"Not able to find .o file for function: {objfile} is not a file.") - refobjfile = objfile + refobjfile = "expected/" + objfile if not os.path.isfile(refobjfile): fail(f'Please ensure an OK .o file exists at "{refobjfile}".') diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h new file mode 100644 index 0000000000..35d90e7b20 --- /dev/null +++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h @@ -0,0 +1,8 @@ +#ifndef __J2DPICTURE_H_ +#define __J2DPICTURE_H_ + +#include "global.h" + +class J2DPicture{}; + +#endif \ No newline at end of file diff --git a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h index 52cffc57a2..c917c070f3 100644 --- a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h @@ -1,5 +1,7 @@ -#ifndef J2DSCREEN_H_ -#define J2DSCREEN_H_ +#ifndef __J2DSCREEN_H_ +#define __J2DSCREEN_H_ + +#include "global.h" class J2DScreen {}; diff --git a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h new file mode 100644 index 0000000000..15d6edf34c --- /dev/null +++ b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h @@ -0,0 +1,8 @@ +#ifndef __J2DTEXTBOX_H_ +#define __J2DTEXTBOX_H_ + +#include "global.h" + +class J2DTextBox{}; + +#endif \ No newline at end of file diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h new file mode 100644 index 0000000000..bebf803743 --- /dev/null +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -0,0 +1,19 @@ +#ifndef __J3DANIMATION_H_ +#define __J3DANIMATION_H_ + +#include "global.h" + +class J3DFrameCtrl { +public: +private: + void* vtable; + u8 field_0x4; + u8 field_0x5; + u16 field_0x6; + s16 field_0x8; + u16 field_0xa; + float field_0xc; + float field_0x10; +}; + +#endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s index cf2f3592a3..84e5d17878 100644 --- a/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s +++ b/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s @@ -4,7 +4,7 @@ /* 802D2834 002CF774 7C 08 02 A6 */ mflr r0 /* 802D2838 002CF778 90 01 00 34 */ stw r0, 0x34(r1) /* 802D283C 002CF77C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D2840 002CF780 48 08 F9 8D */ bl func_803621CC +/* 802D2840 002CF780 48 08 F9 8D */ bl _savegpr_25 /* 802D2844 002CF784 7C 7A 1B 78 */ mr r26, r3 /* 802D2848 002CF788 7C 9B 23 78 */ mr r27, r4 /* 802D284C 002CF78C 7C BC 2B 78 */ mr r28, r5 diff --git a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s index aa79dd2ac0..18cac1905e 100644 --- a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s +++ b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s @@ -4,7 +4,7 @@ /* 802D3618 002D0558 7C 08 02 A6 */ mflr r0 /* 802D361C 002D055C 90 01 00 34 */ stw r0, 0x34(r1) /* 802D3620 002D0560 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D3624 002D0564 48 08 EB A9 */ bl func_803621CC +/* 802D3624 002D0564 48 08 EB A9 */ bl _savegpr_25 /* 802D3628 002D0568 7C 7A 1B 78 */ mr r26, r3 /* 802D362C 002D056C 7C 9B 23 78 */ mr r27, r4 /* 802D3630 002D0570 7C BC 2B 78 */ mr r28, r5 diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s index c5aa5f9a6b..11970ccc3e 100644 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s +++ b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s @@ -4,7 +4,7 @@ /* 802D3CE4 002D0C24 7C 08 02 A6 */ mflr r0 /* 802D3CE8 002D0C28 90 01 00 34 */ stw r0, 0x34(r1) /* 802D3CEC 002D0C2C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D3CF0 002D0C30 48 08 E4 D9 */ bl func_803621C8 +/* 802D3CF0 002D0C30 48 08 E4 D9 */ bl _savegpr_24 /* 802D3CF4 002D0C34 7C 78 1B 78 */ mr r24, r3 /* 802D3CF8 002D0C38 83 C3 00 08 */ lwz r30, 8(r3) /* 802D3CFC 002D0C3C 83 A3 00 14 */ lwz r29, 0x14(r3) @@ -134,7 +134,7 @@ lbl_802D3EA4: /* 802D3EB0 002D0DF0 48 06 AB 45 */ bl OSSendMessage /* 802D3EB4 002D0DF4 7F 83 E3 78 */ mr r3, r28 /* 802D3EB8 002D0DF8 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D3EBC 002D0DFC 48 08 E3 59 */ bl func_80362214 +/* 802D3EBC 002D0DFC 48 08 E3 59 */ bl _restgpr_24 /* 802D3EC0 002D0E00 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D3EC4 002D0E04 7C 08 03 A6 */ mtlr r0 /* 802D3EC8 002D0E08 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s index 94e7d9f6e0..ad0584f715 100644 --- a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s +++ b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s @@ -4,7 +4,7 @@ /* 802D89C0 002D5900 7C 08 02 A6 */ mflr r0 /* 802D89C4 002D5904 90 01 00 34 */ stw r0, 0x34(r1) /* 802D89C8 002D5908 39 61 00 30 */ addi r11, r1, 0x30 -/* 802D89CC 002D590C 48 08 98 01 */ bl func_803621CC +/* 802D89CC 002D590C 48 08 98 01 */ bl _savegpr_25 /* 802D89D0 002D5910 7C 7F 1B 78 */ mr r31, r3 /* 802D89D4 002D5914 7C 9A 23 78 */ mr r26, r4 /* 802D89D8 002D5918 38 00 00 00 */ li r0, 0 diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s index 107159f6b1..227d7f6f41 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s @@ -4,7 +4,7 @@ /* 802DA9C4 002D7904 7C 08 02 A6 */ mflr r0 /* 802DA9C8 002D7908 90 01 00 34 */ stw r0, 0x34(r1) /* 802DA9CC 002D790C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DA9D0 002D7910 48 08 77 F9 */ bl func_803621C8 +/* 802DA9D0 002D7910 48 08 77 F9 */ bl _savegpr_24 /* 802DA9D4 002D7914 7C 78 1B 78 */ mr r24, r3 /* 802DA9D8 002D7918 7C 99 23 78 */ mr r25, r4 /* 802DA9DC 002D791C 7C BA 2B 78 */ mr r26, r5 @@ -43,7 +43,7 @@ lbl_802DAA58: /* 802DAA58 002D7998 7F E3 FB 78 */ mr r3, r31 lbl_802DAA5C: /* 802DAA5C 002D799C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DAA60 002D79A0 48 08 77 B5 */ bl func_80362214 +/* 802DAA60 002D79A0 48 08 77 B5 */ bl _restgpr_24 /* 802DAA64 002D79A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DAA68 002D79A8 7C 08 03 A6 */ mtlr r0 /* 802DAA6C 002D79AC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s index d2a7845114..5d13010788 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s @@ -4,7 +4,7 @@ /* 802DAA78 002D79B8 7C 08 02 A6 */ mflr r0 /* 802DAA7C 002D79BC 90 01 00 74 */ stw r0, 0x74(r1) /* 802DAA80 002D79C0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802DAA84 002D79C4 48 08 77 49 */ bl func_803621CC +/* 802DAA84 002D79C4 48 08 77 49 */ bl _savegpr_25 /* 802DAA88 002D79C8 7C 7D 1B 78 */ mr r29, r3 /* 802DAA8C 002D79CC 3B E0 00 01 */ li r31, 1 /* 802DAA90 002D79D0 83 C3 00 28 */ lwz r30, 0x28(r3) diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s index 8f0bab04f7..88c813916d 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s @@ -4,7 +4,7 @@ /* 802DAFEC 002D7F2C 7C 08 02 A6 */ mflr r0 /* 802DAFF0 002D7F30 90 01 00 34 */ stw r0, 0x34(r1) /* 802DAFF4 002D7F34 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DAFF8 002D7F38 48 08 71 D1 */ bl func_803621C8 +/* 802DAFF8 002D7F38 48 08 71 D1 */ bl _savegpr_24 /* 802DAFFC 002D7F3C 7C 79 1B 78 */ mr r25, r3 /* 802DB000 002D7F40 7C 9A 23 78 */ mr r26, r4 /* 802DB004 002D7F44 7C BB 2B 78 */ mr r27, r5 @@ -94,7 +94,7 @@ lbl_802DB114: /* 802DB140 002D8080 48 06 3F DD */ bl OSUnlockMutex /* 802DB144 002D8084 7F 23 CB 78 */ mr r3, r25 /* 802DB148 002D8088 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DB14C 002D808C 48 08 70 C9 */ bl func_80362214 +/* 802DB14C 002D808C 48 08 70 C9 */ bl _restgpr_24 /* 802DB150 002D8090 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DB154 002D8094 7C 08 03 A6 */ mtlr r0 /* 802DB158 002D8098 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s index 4b504daf08..9620f15949 100644 --- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s +++ b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s @@ -4,7 +4,7 @@ /* 802D8478 002D53B8 7C 08 02 A6 */ mflr r0 /* 802D847C 002D53BC 90 01 00 74 */ stw r0, 0x74(r1) /* 802D8480 002D53C0 39 61 00 70 */ addi r11, r1, 0x70 -/* 802D8484 002D53C4 48 08 9D 49 */ bl func_803621CC +/* 802D8484 002D53C4 48 08 9D 49 */ bl _savegpr_25 /* 802D8488 002D53C8 7C 7D 1B 78 */ mr r29, r3 /* 802D848C 002D53CC 7C 9E 23 78 */ mr r30, r4 /* 802D8490 002D53D0 7C B9 2B 78 */ mr r25, r5 diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s index 96ddefc380..7afadde3ee 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s @@ -4,7 +4,7 @@ /* 802DA1E8 002D7128 7C 08 02 A6 */ mflr r0 /* 802DA1EC 002D712C 90 01 00 34 */ stw r0, 0x34(r1) /* 802DA1F0 002D7130 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DA1F4 002D7134 48 08 7F D5 */ bl func_803621C8 +/* 802DA1F4 002D7134 48 08 7F D5 */ bl _savegpr_24 /* 802DA1F8 002D7138 7C 79 1B 78 */ mr r25, r3 /* 802DA1FC 002D713C 7C 9A 23 78 */ mr r26, r4 /* 802DA200 002D7140 7C BB 2B 78 */ mr r27, r5 @@ -97,7 +97,7 @@ lbl_802DA324: /* 802DA33C 002D727C 48 06 4D E1 */ bl OSUnlockMutex /* 802DA340 002D7280 7F 03 C3 78 */ mr r3, r24 /* 802DA344 002D7284 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DA348 002D7288 48 08 7E CD */ bl func_80362214 +/* 802DA348 002D7288 48 08 7E CD */ bl _restgpr_24 /* 802DA34C 002D728C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DA350 002D7290 7C 08 03 A6 */ mtlr r0 /* 802DA354 002D7294 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s index 5a11a1f51e..556672dc51 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s @@ -4,7 +4,7 @@ /* 802CF238 002CC178 7C 08 02 A6 */ mflr r0 /* 802CF23C 002CC17C 90 01 00 34 */ stw r0, 0x34(r1) /* 802CF240 002CC180 39 61 00 30 */ addi r11, r1, 0x30 -/* 802CF244 002CC184 48 09 2F 89 */ bl func_803621CC +/* 802CF244 002CC184 48 09 2F 89 */ bl _savegpr_25 /* 802CF248 002CC188 7C 7D 1B 78 */ mr r29, r3 /* 802CF24C 002CC18C 38 04 00 03 */ addi r0, r4, 3 /* 802CF250 002CC190 54 1E 00 3A */ rlwinm r30, r0, 0, 0, 0x1d diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s index 5bc3540b37..2a610361c4 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s @@ -4,7 +4,7 @@ /* 802D03BC 002CD2FC 7C 08 02 A6 */ mflr r0 /* 802D03C0 002CD300 90 01 00 44 */ stw r0, 0x44(r1) /* 802D03C4 002CD304 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D03C8 002CD308 48 09 1E 05 */ bl func_803621CC +/* 802D03C8 002CD308 48 09 1E 05 */ bl _savegpr_25 /* 802D03CC 002CD30C 7C 7A 1B 78 */ mr r26, r3 /* 802D03D0 002CD310 38 7A 00 18 */ addi r3, r26, 0x18 /* 802D03D4 002CD314 48 06 EC 6D */ bl OSLockMutex diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s index 3110df3f26..e7af7e2b81 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s @@ -4,7 +4,7 @@ /* 802D05D0 002CD510 7C 08 02 A6 */ mflr r0 /* 802D05D4 002CD514 90 01 00 44 */ stw r0, 0x44(r1) /* 802D05D8 002CD518 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D05DC 002CD51C 48 09 1B F1 */ bl func_803621CC +/* 802D05DC 002CD51C 48 09 1B F1 */ bl _savegpr_25 /* 802D05E0 002CD520 7C 79 1B 78 */ mr r25, r3 /* 802D05E4 002CD524 38 79 00 18 */ addi r3, r25, 0x18 /* 802D05E8 002CD528 48 06 EA 59 */ bl OSLockMutex diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s index 3d501ed482..d5b4811bc5 100644 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s +++ b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s @@ -4,7 +4,7 @@ /* 802D1C80 002CEBC0 DB E1 00 40 */ stfd f31, 0x40(r1) /* 802D1C84 002CEBC4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* 802D1C88 002CEBC8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802D1C8C 002CEBCC 48 09 05 41 */ bl func_803621CC +/* 802D1C8C 002CEBCC 48 09 05 41 */ bl _savegpr_25 /* 802D1C90 002CEBD0 7C 7A 1B 78 */ mr r26, r3 /* 802D1C94 002CEBD4 7C 9B 23 78 */ mr r27, r4 /* 802D1C98 002CEBD8 7C BC 2B 79 */ or. r28, r5, r5 diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s index f527c02d56..946c19c7ff 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s @@ -7,7 +7,7 @@ /* 802E08FC 002DD83C 3B E3 43 D8 */ addi r31, r3, lbl_804343D8@l /* 802E0900 002DD840 38 7F 00 18 */ addi r3, r31, 0x18 /* 802E0904 002DD844 48 06 E5 9D */ bl PADRead -/* 802E0908 002DD848 90 6D 8F 60 */ stw r3, lbl_804514E0-_SDA_BASE_(r13) +/* 802E0908 002DD848 90 6D 8F 60 */ stw r3, _sRumbleSupported-_SDA_BASE_(r13) /* 802E090C 002DD84C 80 0D 83 5C */ lwz r0, lbl_804508DC-_SDA_BASE_(r13) /* 802E0910 002DD850 2C 00 00 02 */ cmpwi r0, 2 /* 802E0914 002DD854 41 82 00 20 */ beq lbl_802E0934 @@ -187,7 +187,7 @@ lbl_802E0B84: /* 802E0B98 002DDAD8 48 06 DF 95 */ bl PADReset lbl_802E0B9C: /* 802E0B9C 002DDADC 48 00 04 09 */ bl checkResetSwitch__10JUTGamePadFv -/* 802E0BA0 002DDAE0 80 6D 8F 60 */ lwz r3, lbl_804514E0-_SDA_BASE_(r13) +/* 802E0BA0 002DDAE0 80 6D 8F 60 */ lwz r3, _sRumbleSupported-_SDA_BASE_(r13) /* 802E0BA4 002DDAE4 39 61 00 40 */ addi r11, r1, 0x40 /* 802E0BA8 002DDAE8 48 08 16 65 */ bl func_8036220C /* 802E0BAC 002DDAEC 80 01 00 44 */ lwz r0, 0x44(r1) diff --git a/include/JSystem/JUtility/asm/JUTResFont__setBlock.s b/include/JSystem/JUtility/asm/JUTResFont__setBlock.s index 445bbb3003..94a17a9da3 100644 --- a/include/JSystem/JUtility/asm/JUTResFont__setBlock.s +++ b/include/JSystem/JUtility/asm/JUTResFont__setBlock.s @@ -2,7 +2,7 @@ /* 802DF348 002DC288 7C 08 02 A6 */ mflr r0 /* 802DF34C 002DC28C 90 01 00 34 */ stw r0, 0x34(r1) /* 802DF350 002DC290 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DF354 002DC294 48 08 2E 79 */ bl func_803621CC +/* 802DF354 002DC294 48 08 2E 79 */ bl _savegpr_25 /* 802DF358 002DC298 7C 7C 1B 78 */ mr r28, r3 /* 802DF35C 002DC29C 3B 60 00 00 */ li r27, 0 /* 802DF360 002DC2A0 3B 40 00 00 */ li r26, 0 diff --git a/include/SComponent/c_angle/c_angle.h b/include/SComponent/c_angle/c_angle.h new file mode 100644 index 0000000000..03ae0e541a --- /dev/null +++ b/include/SComponent/c_angle/c_angle.h @@ -0,0 +1,12 @@ +#ifndef __C_ANGLE_H_ +#define __C_ANGLE_H_ + +#include "global.h" + +class cSAngle { +public: +private: + s16 value; +}; + +#endif \ No newline at end of file diff --git a/include/SComponent/c_cc_d/c_cc_d.h b/include/SComponent/c_cc_d/c_cc_d.h new file mode 100644 index 0000000000..593c9e2c02 --- /dev/null +++ b/include/SComponent/c_cc_d/c_cc_d.h @@ -0,0 +1,42 @@ +#ifndef __C_CC_D_H_ +#define __C_CC_D_H_ + +#include "SComponent/c_m3d/c_m3d.h" +#include "global.h" + +class cCcD_ShapeAttr { +public: +private: + cM3dGAab cm3dgaab; + void* vtable; +}; + +class cCcD_CpsAttr { +public: +private: + cCcD_ShapeAttr cccd_shapeattr; + cM3dGCps cm3dgcps; +}; + +class cCcD_CylAttr { +public: +private: + cCcD_ShapeAttr cccd_shapeattr; + cM3dGCyl cm3dgcyl; +}; + +class cCcD_DivideInfo { +public: +private: + u8 field_0x0[12]; + void* vtable; +}; + +class cCcD_DivideArea { +public: +private: + cM3dGAab cM3dGAab; + void* vtable; +}; + +#endif \ No newline at end of file diff --git a/include/SComponent/c_cc_s/c_cc_s.h b/include/SComponent/c_cc_s/c_cc_s.h new file mode 100644 index 0000000000..06ce04692a --- /dev/null +++ b/include/SComponent/c_cc_s/c_cc_s.h @@ -0,0 +1,14 @@ +#ifndef __C_CC_S_H_ +#define __C_CC_S_H_ + +#include "global.h" +#include "SComponent/c_cc_d/c_cc_d.h" + +class cCcS { +public: +private: + u8 field_0x0[10260]; + cCcD_DivideArea cccd_dividearea; +}; + +#endif \ No newline at end of file diff --git a/include/SComponent/c_m3d/c_m3d.h b/include/SComponent/c_m3d/c_m3d.h new file mode 100644 index 0000000000..c448bb5e43 --- /dev/null +++ b/include/SComponent/c_m3d/c_m3d.h @@ -0,0 +1,39 @@ +#ifndef __C_M3D_H_ +#define __C_M3D_H_ + +#include "SComponent/c_xyz/c_xyz.h" +#include "global.h" + +class cM3dGLin_members { +public: +private: + cXyz start; + cXyz end; +}; + +class cM3dGCps { +public: +private: + cM3dGLin_members base; + void* vtable; + float field_0x1c; +}; + +class cM3dGCyl { /* Cylinder class */ +public: +private: + cXyz center; + float radius; + float height; + void* vtable; +}; + +class cM3dGAab { /* Axis-aligned bounding box */ +public: +private: + cXyz min; + cXyz max; + void* vtable; +}; + +#endif \ No newline at end of file diff --git a/include/SComponent/c_xyz/c_xyz.h b/include/SComponent/c_xyz/c_xyz.h new file mode 100644 index 0000000000..c70f940b4e --- /dev/null +++ b/include/SComponent/c_xyz/c_xyz.h @@ -0,0 +1,10 @@ +#ifndef __C_XYZ_H_ +#define __C_XYZ_H_ +#include "global.h" + +class cXyz { +public: + float x, y, z; +}; + +#endif \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_800A093C.s b/include/d/d_a/d_a_alink/asm/func_800A093C.s index 482ce4f3cf..962e99b80d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A093C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A093C.s @@ -2,7 +2,7 @@ /* 800A0940 0009D880 7C 08 02 A6 */ mflr r0 /* 800A0944 0009D884 90 01 00 64 */ stw r0, 0x64(r1) /* 800A0948 0009D888 39 61 00 60 */ addi r11, r1, 0x60 -/* 800A094C 0009D88C 48 2C 18 7D */ bl func_803621C8 +/* 800A094C 0009D88C 48 2C 18 7D */ bl _savegpr_24 /* 800A0950 0009D890 7C 7F 1B 78 */ mr r31, r3 /* 800A0954 0009D894 7C 9B 23 78 */ mr r27, r4 /* 800A0958 0009D898 7C BC 2B 78 */ mr r28, r5 @@ -762,7 +762,7 @@ lbl_800A1410: /* 800A1410 0009E350 38 60 00 00 */ li r3, 0 lbl_800A1414: /* 800A1414 0009E354 39 61 00 60 */ addi r11, r1, 0x60 -/* 800A1418 0009E358 48 2C 0D FD */ bl func_80362214 +/* 800A1418 0009E358 48 2C 0D FD */ bl _restgpr_24 /* 800A141C 0009E35C 80 01 00 64 */ lwz r0, 0x64(r1) /* 800A1420 0009E360 7C 08 03 A6 */ mtlr r0 /* 800A1424 0009E364 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_a/d_a_alink/asm/func_800A29DC.s b/include/d/d_a/d_a_alink/asm/func_800A29DC.s index c8a7e015a9..d3ab771f48 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A29DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A29DC.s @@ -2,7 +2,7 @@ /* 800A29E0 0009F920 7C 08 02 A6 */ mflr r0 /* 800A29E4 0009F924 90 01 00 44 */ stw r0, 0x44(r1) /* 800A29E8 0009F928 39 61 00 40 */ addi r11, r1, 0x40 -/* 800A29EC 0009F92C 48 2B F7 DD */ bl func_803621C8 +/* 800A29EC 0009F92C 48 2B F7 DD */ bl _savegpr_24 /* 800A29F0 0009F930 7C 79 1B 78 */ mr r25, r3 /* 800A29F4 0009F934 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 800A29F8 0009F938 3B A3 D6 58 */ addi r29, r3, lbl_8038D658@l @@ -147,7 +147,7 @@ lbl_800A2C08: /* 800A2C08 0009FB48 38 60 00 01 */ li r3, 1 lbl_800A2C0C: /* 800A2C0C 0009FB4C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800A2C10 0009FB50 48 2B F6 05 */ bl func_80362214 +/* 800A2C10 0009FB50 48 2B F6 05 */ bl _restgpr_24 /* 800A2C14 0009FB54 80 01 00 44 */ lwz r0, 0x44(r1) /* 800A2C18 0009FB58 7C 08 03 A6 */ mtlr r0 /* 800A2C1C 0009FB5C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_800A551C.s b/include/d/d_a/d_a_alink/asm/func_800A551C.s index e193ff2581..cf66576fea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A551C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A551C.s @@ -2,7 +2,7 @@ /* 800A5520 000A2460 7C 08 02 A6 */ mflr r0 /* 800A5524 000A2464 90 01 00 34 */ stw r0, 0x34(r1) /* 800A5528 000A2468 39 61 00 30 */ addi r11, r1, 0x30 -/* 800A552C 000A246C 48 2B CC 9D */ bl func_803621C8 +/* 800A552C 000A246C 48 2B CC 9D */ bl _savegpr_24 /* 800A5530 000A2470 7C 78 1B 78 */ mr r24, r3 /* 800A5534 000A2474 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800A5538 000A2478 3B A4 D6 58 */ addi r29, r4, lbl_8038D658@l @@ -540,7 +540,7 @@ lbl_800A5CA4: lbl_800A5CAC: /* 800A5CAC 000A2BEC 7F 43 D3 78 */ mr r3, r26 /* 800A5CB0 000A2BF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 800A5CB4 000A2BF4 48 2B C5 61 */ bl func_80362214 +/* 800A5CB4 000A2BF4 48 2B C5 61 */ bl _restgpr_24 /* 800A5CB8 000A2BF8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800A5CBC 000A2BFC 7C 08 03 A6 */ mtlr r0 /* 800A5CC0 000A2C00 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s index bde7009aa6..a95e65359b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s @@ -2,7 +2,7 @@ /* 800A5CCC 000A2C0C 7C 08 02 A6 */ mflr r0 /* 800A5CD0 000A2C10 90 01 00 54 */ stw r0, 0x54(r1) /* 800A5CD4 000A2C14 39 61 00 50 */ addi r11, r1, 0x50 -/* 800A5CD8 000A2C18 48 2B C4 F1 */ bl func_803621C8 +/* 800A5CD8 000A2C18 48 2B C4 F1 */ bl _savegpr_24 /* 800A5CDC 000A2C1C 7C 7F 1B 78 */ mr r31, r3 /* 800A5CE0 000A2C20 80 03 04 A0 */ lwz r0, 0x4a0(r3) /* 800A5CE4 000A2C24 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -646,7 +646,7 @@ lbl_800A65F0: /* 800A65F0 000A3530 38 60 00 04 */ li r3, 4 lbl_800A65F4: /* 800A65F4 000A3534 39 61 00 50 */ addi r11, r1, 0x50 -/* 800A65F8 000A3538 48 2B BC 1D */ bl func_80362214 +/* 800A65F8 000A3538 48 2B BC 1D */ bl _restgpr_24 /* 800A65FC 000A353C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800A6600 000A3540 7C 08 03 A6 */ mtlr r0 /* 800A6604 000A3544 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC610.s b/include/d/d_a/d_a_alink/asm/func_800AC610.s index 8240f89e8f..fde3f06c7d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC610.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC610.s @@ -2,7 +2,7 @@ /* 800AC614 000A9554 7C 08 02 A6 */ mflr r0 /* 800AC618 000A9558 90 01 00 34 */ stw r0, 0x34(r1) /* 800AC61C 000A955C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AC620 000A9560 48 2B 5B A9 */ bl func_803621C8 +/* 800AC620 000A9560 48 2B 5B A9 */ bl _savegpr_24 /* 800AC624 000A9564 7C 7C 1B 78 */ mr r28, r3 /* 800AC628 000A9568 7C BF 2B 78 */ mr r31, r5 /* 800AC62C 000A956C 7C DD 33 78 */ mr r29, r6 @@ -74,7 +74,7 @@ lbl_800AC708: lbl_800AC71C: /* 800AC71C 000A965C 7F E3 FB 78 */ mr r3, r31 /* 800AC720 000A9660 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AC724 000A9664 48 2B 5A F1 */ bl func_80362214 +/* 800AC724 000A9664 48 2B 5A F1 */ bl _restgpr_24 /* 800AC728 000A9668 80 01 00 34 */ lwz r0, 0x34(r1) /* 800AC72C 000A966C 7C 08 03 A6 */ mtlr r0 /* 800AC730 000A9670 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC754.s b/include/d/d_a/d_a_alink/asm/func_800AC754.s index 624a99cdcc..1e0b381ed2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC754.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC754.s @@ -14,7 +14,7 @@ /* 800AC788 000A96C8 DB 41 00 50 */ stfd f26, 0x50(r1) /* 800AC78C 000A96CC F3 41 00 58 */ psq_st f26, 88(r1), 0, 0 /* 800AC790 000A96D0 39 61 00 50 */ addi r11, r1, 0x50 -/* 800AC794 000A96D4 48 2B 5A 35 */ bl func_803621C8 +/* 800AC794 000A96D4 48 2B 5A 35 */ bl _savegpr_24 /* 800AC798 000A96D8 7C 78 1B 78 */ mr r24, r3 /* 800AC79C 000A96DC 7C 99 23 78 */ mr r25, r4 /* 800AC7A0 000A96E0 7C BA 2B 78 */ mr r26, r5 @@ -178,7 +178,7 @@ lbl_800AC9C8: /* 800AC9F4 000A9934 E3 41 00 58 */ psq_l f26, 88(r1), 0, 0 /* 800AC9F8 000A9938 CB 41 00 50 */ lfd f26, 0x50(r1) /* 800AC9FC 000A993C 39 61 00 50 */ addi r11, r1, 0x50 -/* 800ACA00 000A9940 48 2B 58 15 */ bl func_80362214 +/* 800ACA00 000A9940 48 2B 58 15 */ bl _restgpr_24 /* 800ACA04 000A9944 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800ACA08 000A9948 7C 08 03 A6 */ mtlr r0 /* 800ACA0C 000A994C 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD170.s b/include/d/d_a/d_a_alink/asm/func_800AD170.s index 0e4b3fccca..92249a59ab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD170.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD170.s @@ -2,7 +2,7 @@ /* 800AD174 000AA0B4 7C 08 02 A6 */ mflr r0 /* 800AD178 000AA0B8 90 01 00 34 */ stw r0, 0x34(r1) /* 800AD17C 000AA0BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AD180 000AA0C0 48 2B 50 49 */ bl func_803621C8 +/* 800AD180 000AA0C0 48 2B 50 49 */ bl _savegpr_24 /* 800AD184 000AA0C4 7C 7F 1B 78 */ mr r31, r3 /* 800AD188 000AA0C8 83 83 1F 2C */ lwz r28, 0x1f2c(r3) /* 800AD18C 000AA0CC 83 63 1F 34 */ lwz r27, 0x1f34(r3) @@ -93,7 +93,7 @@ lbl_800AD2B0: /* 800AD2B8 000AA1F8 80 7F 06 F8 */ lwz r3, 0x6f8(r31) /* 800AD2BC 000AA1FC 4B FF BF 8D */ bl daAlink_c_NS_simpleAnmPlay /* 800AD2C0 000AA200 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AD2C4 000AA204 48 2B 4F 51 */ bl func_80362214 +/* 800AD2C4 000AA204 48 2B 4F 51 */ bl _restgpr_24 /* 800AD2C8 000AA208 80 01 00 34 */ lwz r0, 0x34(r1) /* 800AD2CC 000AA20C 7C 08 03 A6 */ mtlr r0 /* 800AD2D0 000AA210 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD3D8.s b/include/d/d_a/d_a_alink/asm/func_800AD3D8.s index 402864709e..3253365c2f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD3D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD3D8.s @@ -10,7 +10,7 @@ /* 800AD3FC 000AA33C DB 81 00 30 */ stfd f28, 0x30(r1) /* 800AD400 000AA340 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* 800AD404 000AA344 39 61 00 30 */ addi r11, r1, 0x30 -/* 800AD408 000AA348 48 2B 4D C5 */ bl func_803621CC +/* 800AD408 000AA348 48 2B 4D C5 */ bl _savegpr_25 /* 800AD40C 000AA34C 7C 7A 1B 78 */ mr r26, r3 /* 800AD410 000AA350 7C 9B 23 78 */ mr r27, r4 /* 800AD414 000AA354 7C BC 2B 78 */ mr r28, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3500.s b/include/d/d_a/d_a_alink/asm/func_800B3500.s index 7e0bad0be6..3818855066 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3500.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3500.s @@ -2,7 +2,7 @@ /* 800B3504 000B0444 7C 08 02 A6 */ mflr r0 /* 800B3508 000B0448 90 01 00 34 */ stw r0, 0x34(r1) /* 800B350C 000B044C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800B3510 000B0450 48 2A EC BD */ bl func_803621CC +/* 800B3510 000B0450 48 2A EC BD */ bl _savegpr_25 /* 800B3514 000B0454 7C 7D 1B 78 */ mr r29, r3 /* 800B3518 000B0458 3B E0 00 01 */ li r31, 1 /* 800B351C 000B045C 7F FE FB 78 */ mr r30, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800C1F6C.s b/include/d/d_a/d_a_alink/asm/func_800C1F6C.s index 57281d2404..7014d012a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1F6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1F6C.s @@ -2,7 +2,7 @@ /* 800C1F70 000BEEB0 7C 08 02 A6 */ mflr r0 /* 800C1F74 000BEEB4 90 01 00 34 */ stw r0, 0x34(r1) /* 800C1F78 000BEEB8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800C1F7C 000BEEBC 48 2A 02 51 */ bl func_803621CC +/* 800C1F7C 000BEEBC 48 2A 02 51 */ bl _savegpr_25 /* 800C1F80 000BEEC0 7C 79 1B 78 */ mr r25, r3 /* 800C1F84 000BEEC4 7C 9A 23 78 */ mr r26, r4 /* 800C1F88 000BEEC8 A0 A3 2F E8 */ lhz r5, 0x2fe8(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800CF380.s b/include/d/d_a/d_a_alink/asm/func_800CF380.s index 1290aa6cf2..450111caca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF380.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF380.s @@ -144,7 +144,7 @@ /* 800CF584 000CC4C4 38 03 72 18 */ addi r0, r3, lbl_803A7218@l /* 800CF588 000CC4C8 90 1A 01 1C */ stw r0, 0x11c(r26) /* 800CF58C 000CC4CC 38 7A 01 24 */ addi r3, r26, 0x124 -/* 800CF590 000CC4D0 48 19 F9 F9 */ bl cM3dGCps +/* 800CF590 000CC4D0 48 19 F9 F9 */ bl __ct__8cM3dGCpsFv /* 800CF594 000CC4D4 3C 60 80 3C */ lis r3, lbl_803C3608@ha /* 800CF598 000CC4D8 38 63 36 08 */ addi r3, r3, lbl_803C3608@l /* 800CF59C 000CC4DC 90 7A 01 20 */ stw r3, 0x120(r26) diff --git a/include/d/d_a/d_a_alink/asm/func_800D1540.s b/include/d/d_a/d_a_alink/asm/func_800D1540.s index fe35748d29..6556ff71a4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1540.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1540.s @@ -3,7 +3,7 @@ /* 800D1548 000CE488 90 01 00 34 */ stw r0, 0x34(r1) /* 800D154C 000CE48C DB E1 00 28 */ stfd f31, 0x28(r1) /* 800D1550 000CE490 39 61 00 28 */ addi r11, r1, 0x28 -/* 800D1554 000CE494 48 29 0C 79 */ bl func_803621CC +/* 800D1554 000CE494 48 29 0C 79 */ bl _savegpr_25 /* 800D1558 000CE498 7C 7A 1B 78 */ mr r26, r3 /* 800D155C 000CE49C 7C 9B 23 78 */ mr r27, r4 /* 800D1560 000CE4A0 7C BC 2B 78 */ mr r28, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_800D34D8.s b/include/d/d_a/d_a_alink/asm/func_800D34D8.s index 9ab5273de1..eb5de770b8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D34D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D34D8.s @@ -4,7 +4,7 @@ /* 800D34E4 000D0424 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800D34E8 000D0428 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 800D34EC 000D042C 39 61 00 30 */ addi r11, r1, 0x30 -/* 800D34F0 000D0430 48 28 EC DD */ bl func_803621CC +/* 800D34F0 000D0430 48 28 EC DD */ bl _savegpr_25 /* 800D34F4 000D0434 7C 7C 1B 78 */ mr r28, r3 /* 800D34F8 000D0438 7C 9D 23 78 */ mr r29, r4 /* 800D34FC 000D043C 3C 80 80 39 */ lis r4, lbl_8038D658@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800DA180.s b/include/d/d_a/d_a_alink/asm/func_800DA180.s index 9eaa3c5145..1be6a0c707 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA180.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA180.s @@ -2,7 +2,7 @@ /* 800DA184 000D70C4 7C 08 02 A6 */ mflr r0 /* 800DA188 000D70C8 90 01 00 44 */ stw r0, 0x44(r1) /* 800DA18C 000D70CC 39 61 00 40 */ addi r11, r1, 0x40 -/* 800DA190 000D70D0 48 28 80 3D */ bl func_803621CC +/* 800DA190 000D70D0 48 28 80 3D */ bl _savegpr_25 /* 800DA194 000D70D4 7C 7A 1B 78 */ mr r26, r3 /* 800DA198 000D70D8 7C 9B 23 78 */ mr r27, r4 /* 800DA19C 000D70DC 7C BC 2B 78 */ mr r28, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_800DA82C.s b/include/d/d_a/d_a_alink/asm/func_800DA82C.s index 64c89a305b..94f534c548 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA82C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA82C.s @@ -2,7 +2,7 @@ /* 800DA830 000D7770 7C 08 02 A6 */ mflr r0 /* 800DA834 000D7774 90 01 00 64 */ stw r0, 0x64(r1) /* 800DA838 000D7778 39 61 00 60 */ addi r11, r1, 0x60 -/* 800DA83C 000D777C 48 28 79 8D */ bl func_803621C8 +/* 800DA83C 000D777C 48 28 79 8D */ bl _savegpr_24 /* 800DA840 000D7780 7C 78 1B 78 */ mr r24, r3 /* 800DA844 000D7784 7C 99 23 78 */ mr r25, r4 /* 800DA848 000D7788 7C BA 2B 78 */ mr r26, r5 @@ -272,7 +272,7 @@ lbl_800DABB8: /* 800DAC0C 000D7B4C 38 60 00 01 */ li r3, 1 lbl_800DAC10: /* 800DAC10 000D7B50 39 61 00 60 */ addi r11, r1, 0x60 -/* 800DAC14 000D7B54 48 28 76 01 */ bl func_80362214 +/* 800DAC14 000D7B54 48 28 76 01 */ bl _restgpr_24 /* 800DAC18 000D7B58 80 01 00 64 */ lwz r0, 0x64(r1) /* 800DAC1C 000D7B5C 7C 08 03 A6 */ mtlr r0 /* 800DAC20 000D7B60 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC678.s b/include/d/d_a/d_a_alink/asm/func_800DC678.s index 5693162250..66c7ac3d52 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC678.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC678.s @@ -2,7 +2,7 @@ /* 800DC67C 000D95BC 7C 08 02 A6 */ mflr r0 /* 800DC680 000D95C0 90 01 00 34 */ stw r0, 0x34(r1) /* 800DC684 000D95C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800DC688 000D95C8 48 28 5B 45 */ bl func_803621CC +/* 800DC688 000D95C8 48 28 5B 45 */ bl _savegpr_25 /* 800DC68C 000D95CC 7C 7E 1B 78 */ mr r30, r3 /* 800DC690 000D95D0 3B E0 00 00 */ li r31, 0 /* 800DC694 000D95D4 7F FC FB 78 */ mr r28, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800E3F50.s b/include/d/d_a/d_a_alink/asm/func_800E3F50.s index a24ef68c07..bfcda997d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3F50.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3F50.s @@ -4,7 +4,7 @@ /* 800E3F5C 000E0E9C DB E1 01 80 */ stfd f31, 0x180(r1) /* 800E3F60 000E0EA0 F3 E1 01 88 */ psq_st f31, 392(r1), 0, 0 /* 800E3F64 000E0EA4 39 61 01 80 */ addi r11, r1, 0x180 -/* 800E3F68 000E0EA8 48 27 E2 65 */ bl func_803621CC +/* 800E3F68 000E0EA8 48 27 E2 65 */ bl _savegpr_25 /* 800E3F6C 000E0EAC 7C 7F 1B 78 */ mr r31, r3 /* 800E3F70 000E0EB0 3C 60 80 42 */ lis r3, lbl_80425508@ha /* 800E3F74 000E0EB4 3B 83 55 08 */ addi r28, r3, lbl_80425508@l diff --git a/include/d/d_a/d_a_alink/asm/func_800EF95C.s b/include/d/d_a/d_a_alink/asm/func_800EF95C.s index c4a86541d7..702985e366 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF95C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF95C.s @@ -6,7 +6,7 @@ /* 800EF970 000EC8B0 DB C1 00 60 */ stfd f30, 0x60(r1) /* 800EF974 000EC8B4 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* 800EF978 000EC8B8 39 61 00 60 */ addi r11, r1, 0x60 -/* 800EF97C 000EC8BC 48 27 28 51 */ bl func_803621CC +/* 800EF97C 000EC8BC 48 27 28 51 */ bl _savegpr_25 /* 800EF980 000EC8C0 7C 7A 1B 78 */ mr r26, r3 /* 800EF984 000EC8C4 3C 60 80 42 */ lis r3, lbl_80425508@ha /* 800EF988 000EC8C8 3B 63 55 08 */ addi r27, r3, lbl_80425508@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F81C0.s b/include/d/d_a/d_a_alink/asm/func_800F81C0.s index 8948e0a914..b84d4ebfe0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F81C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F81C0.s @@ -2,7 +2,7 @@ /* 800F81C4 000F5104 7C 08 02 A6 */ mflr r0 /* 800F81C8 000F5108 90 01 00 94 */ stw r0, 0x94(r1) /* 800F81CC 000F510C 39 61 00 90 */ addi r11, r1, 0x90 -/* 800F81D0 000F5110 48 26 9F FD */ bl func_803621CC +/* 800F81D0 000F5110 48 26 9F FD */ bl _savegpr_25 /* 800F81D4 000F5114 7C 79 1B 78 */ mr r25, r3 /* 800F81D8 000F5118 7C BD 2B 78 */ mr r29, r5 /* 800F81DC 000F511C 7C DA 33 78 */ mr r26, r6 diff --git a/include/d/d_a/d_a_alink/asm/func_800F9474.s b/include/d/d_a/d_a_alink/asm/func_800F9474.s index 0a59f10b30..7f8d8300d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9474.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9474.s @@ -4,7 +4,7 @@ /* 800F9480 000F63C0 DB E1 00 30 */ stfd f31, 0x30(r1) /* 800F9484 000F63C4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 800F9488 000F63C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 800F948C 000F63CC 48 26 8D 41 */ bl func_803621CC +/* 800F948C 000F63CC 48 26 8D 41 */ bl _savegpr_25 /* 800F9490 000F63D0 7C 7B 1B 78 */ mr r27, r3 /* 800F9494 000F63D4 7C 9C 23 78 */ mr r28, r4 /* 800F9498 000F63D8 7C BD 2B 78 */ mr r29, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_800F95B8.s b/include/d/d_a/d_a_alink/asm/func_800F95B8.s index 253cf4df10..efd3754496 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F95B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F95B8.s @@ -4,7 +4,7 @@ /* 800F95C4 000F6504 DB E1 00 90 */ stfd f31, 0x90(r1) /* 800F95C8 000F6508 F3 E1 00 98 */ psq_st f31, 152(r1), 0, 0 /* 800F95CC 000F650C 39 61 00 90 */ addi r11, r1, 0x90 -/* 800F95D0 000F6510 48 26 8B F9 */ bl func_803621C8 +/* 800F95D0 000F6510 48 26 8B F9 */ bl _savegpr_24 /* 800F95D4 000F6514 7C 79 1B 78 */ mr r25, r3 /* 800F95D8 000F6518 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800F95DC 000F651C 3B 84 D6 58 */ addi r28, r4, lbl_8038D658@l @@ -287,7 +287,7 @@ lbl_800F99DC: /* 800F99DC 000F691C E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* 800F99E0 000F6920 CB E1 00 90 */ lfd f31, 0x90(r1) /* 800F99E4 000F6924 39 61 00 90 */ addi r11, r1, 0x90 -/* 800F99E8 000F6928 48 26 88 2D */ bl func_80362214 +/* 800F99E8 000F6928 48 26 88 2D */ bl _restgpr_24 /* 800F99EC 000F692C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800F99F0 000F6930 7C 08 03 A6 */ mtlr r0 /* 800F99F4 000F6934 38 21 00 A0 */ addi r1, r1, 0xa0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FA070.s b/include/d/d_a/d_a_alink/asm/func_800FA070.s index 1c95f1c83b..3d047551e6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA070.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA070.s @@ -6,7 +6,7 @@ /* 800FA084 000F6FC4 DB C1 00 90 */ stfd f30, 0x90(r1) /* 800FA088 000F6FC8 F3 C1 00 98 */ psq_st f30, 152(r1), 0, 0 /* 800FA08C 000F6FCC 39 61 00 90 */ addi r11, r1, 0x90 -/* 800FA090 000F6FD0 48 26 81 39 */ bl func_803621C8 +/* 800FA090 000F6FD0 48 26 81 39 */ bl _savegpr_24 /* 800FA094 000F6FD4 7C 7D 1B 78 */ mr r29, r3 /* 800FA098 000F6FD8 7C BE 2B 78 */ mr r30, r5 /* 800FA09C 000F6FDC 3B E0 00 00 */ li r31, 0 @@ -179,7 +179,7 @@ lbl_800FA310: /* 800FA318 000F7258 E3 C1 00 98 */ psq_l f30, 152(r1), 0, 0 /* 800FA31C 000F725C CB C1 00 90 */ lfd f30, 0x90(r1) /* 800FA320 000F7260 39 61 00 90 */ addi r11, r1, 0x90 -/* 800FA324 000F7264 48 26 7E F1 */ bl func_80362214 +/* 800FA324 000F7264 48 26 7E F1 */ bl _restgpr_24 /* 800FA328 000F7268 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800FA32C 000F726C 7C 08 03 A6 */ mtlr r0 /* 800FA330 000F7270 38 21 00 B0 */ addi r1, r1, 0xb0 diff --git a/include/d/d_a/d_a_alink/asm/func_80109BDC.s b/include/d/d_a/d_a_alink/asm/func_80109BDC.s index 3b91f45f2b..3303937219 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109BDC.s +++ b/include/d/d_a/d_a_alink/asm/func_80109BDC.s @@ -8,7 +8,7 @@ /* 80109BF8 00106B38 DB A1 02 10 */ stfd f29, 0x210(r1) /* 80109BFC 00106B3C F3 A1 02 18 */ psq_st f29, 536(r1), 0, 0 /* 80109C00 00106B40 39 61 02 10 */ addi r11, r1, 0x210 -/* 80109C04 00106B44 48 25 85 C9 */ bl func_803621CC +/* 80109C04 00106B44 48 25 85 C9 */ bl _savegpr_25 /* 80109C08 00106B48 7C 7F 1B 78 */ mr r31, r3 /* 80109C0C 00106B4C 80 63 06 50 */ lwz r3, 0x650(r3) /* 80109C10 00106B50 80 63 00 84 */ lwz r3, 0x84(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s index c5b0d0d6d7..0e3e4d15e4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s @@ -6,7 +6,7 @@ /* 8010BF04 00108E44 DB C1 00 F0 */ stfd f30, 0xf0(r1) /* 8010BF08 00108E48 F3 C1 00 F8 */ psq_st f30, 248(r1), 0, 0 /* 8010BF0C 00108E4C 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8010BF10 00108E50 48 25 62 B9 */ bl func_803621C8 +/* 8010BF10 00108E50 48 25 62 B9 */ bl _savegpr_24 /* 8010BF14 00108E54 7C 79 1B 78 */ mr r25, r3 /* 8010BF18 00108E58 83 E3 28 50 */ lwz r31, 0x2850(r3) /* 8010BF1C 00108E5C 28 1F 00 00 */ cmplwi r31, 0 @@ -634,7 +634,7 @@ lbl_8010C808: /* 8010C810 00109750 E3 C1 00 F8 */ psq_l f30, 248(r1), 0, 0 /* 8010C814 00109754 CB C1 00 F0 */ lfd f30, 0xf0(r1) /* 8010C818 00109758 39 61 00 F0 */ addi r11, r1, 0xf0 -/* 8010C81C 0010975C 48 25 59 F9 */ bl func_80362214 +/* 8010C81C 0010975C 48 25 59 F9 */ bl _restgpr_24 /* 8010C820 00109760 80 01 01 14 */ lwz r0, 0x114(r1) /* 8010C824 00109764 7C 08 03 A6 */ mtlr r0 /* 8010C828 00109768 38 21 01 10 */ addi r1, r1, 0x110 diff --git a/include/d/d_a/d_a_alink/asm/func_80111A9C.s b/include/d/d_a/d_a_alink/asm/func_80111A9C.s index 63d94f14e5..624cff3e32 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_80111A9C.s @@ -2,7 +2,7 @@ /* 80111AA0 0010E9E0 7C 08 02 A6 */ mflr r0 /* 80111AA4 0010E9E4 90 01 00 34 */ stw r0, 0x34(r1) /* 80111AA8 0010E9E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80111AAC 0010E9EC 48 25 07 21 */ bl func_803621CC +/* 80111AAC 0010E9EC 48 25 07 21 */ bl _savegpr_25 /* 80111AB0 0010E9F0 7C 79 1B 78 */ mr r25, r3 /* 80111AB4 0010E9F4 7C 9A 23 78 */ mr r26, r4 /* 80111AB8 0010E9F8 7C BB 2B 78 */ mr r27, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_80112E7C.s b/include/d/d_a/d_a_alink/asm/func_80112E7C.s index eca6fb9943..b6a02aaf1e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112E7C.s +++ b/include/d/d_a/d_a_alink/asm/func_80112E7C.s @@ -8,7 +8,7 @@ /* 80112E98 0010FDD8 DB A1 02 C0 */ stfd f29, 0x2c0(r1) /* 80112E9C 0010FDDC F3 A1 02 C8 */ psq_st f29, 712(r1), 0, 0 /* 80112EA0 0010FDE0 39 61 02 C0 */ addi r11, r1, 0x2c0 -/* 80112EA4 0010FDE4 48 24 F3 25 */ bl func_803621C8 +/* 80112EA4 0010FDE4 48 24 F3 25 */ bl _savegpr_24 /* 80112EA8 0010FDE8 7C 7F 1B 78 */ mr r31, r3 /* 80112EAC 0010FDEC 80 83 38 40 */ lwz r4, 0x3840(r3) /* 80112EB0 0010FDF0 A8 03 30 1A */ lha r0, 0x301a(r3) @@ -952,7 +952,7 @@ lbl_80113C70: /* 80113C80 00110BC0 E3 A1 02 C8 */ psq_l f29, 712(r1), 0, 0 /* 80113C84 00110BC4 CB A1 02 C0 */ lfd f29, 0x2c0(r1) /* 80113C88 00110BC8 39 61 02 C0 */ addi r11, r1, 0x2c0 -/* 80113C8C 00110BCC 48 24 E5 89 */ bl func_80362214 +/* 80113C8C 00110BCC 48 24 E5 89 */ bl _restgpr_24 /* 80113C90 00110BD0 80 01 02 F4 */ lwz r0, 0x2f4(r1) /* 80113C94 00110BD4 7C 08 03 A6 */ mtlr r0 /* 80113C98 00110BD8 38 21 02 F0 */ addi r1, r1, 0x2f0 diff --git a/include/d/d_a/d_a_alink/asm/func_80113D58.s b/include/d/d_a/d_a_alink/asm/func_80113D58.s index 5a5a35f170..218ab5e3cb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80113D58.s +++ b/include/d/d_a/d_a_alink/asm/func_80113D58.s @@ -8,7 +8,7 @@ /* 80113D74 00110CB4 DB A1 01 80 */ stfd f29, 0x180(r1) /* 80113D78 00110CB8 F3 A1 01 88 */ psq_st f29, 392(r1), 0, 0 /* 80113D7C 00110CBC 39 61 01 80 */ addi r11, r1, 0x180 -/* 80113D80 00110CC0 48 24 E4 49 */ bl func_803621C8 +/* 80113D80 00110CC0 48 24 E4 49 */ bl _savegpr_24 /* 80113D84 00110CC4 7C 7F 1B 78 */ mr r31, r3 /* 80113D88 00110CC8 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80113D8C 00110CCC 3B C3 D6 58 */ addi r30, r3, lbl_8038D658@l @@ -1331,7 +1331,7 @@ lbl_801150A0: /* 801150C4 00112004 E3 A1 01 88 */ psq_l f29, 392(r1), 0, 0 /* 801150C8 00112008 CB A1 01 80 */ lfd f29, 0x180(r1) /* 801150CC 0011200C 39 61 01 80 */ addi r11, r1, 0x180 -/* 801150D0 00112010 48 24 D1 45 */ bl func_80362214 +/* 801150D0 00112010 48 24 D1 45 */ bl _restgpr_24 /* 801150D4 00112014 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 801150D8 00112018 7C 08 03 A6 */ mtlr r0 /* 801150DC 0011201C 38 21 01 B0 */ addi r1, r1, 0x1b0 diff --git a/include/d/d_a/d_a_alink/asm/func_801191C4.s b/include/d/d_a/d_a_alink/asm/func_801191C4.s index 600119ed64..4ffdc72144 100644 --- a/include/d/d_a/d_a_alink/asm/func_801191C4.s +++ b/include/d/d_a/d_a_alink/asm/func_801191C4.s @@ -4,7 +4,7 @@ /* 801191D0 00116110 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801191D4 00116114 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 801191D8 00116118 39 61 00 30 */ addi r11, r1, 0x30 -/* 801191DC 0011611C 48 24 8F F1 */ bl func_803621CC +/* 801191DC 0011611C 48 24 8F F1 */ bl _savegpr_25 /* 801191E0 00116120 7C 79 1B 78 */ mr r25, r3 /* 801191E4 00116124 7C 9F 23 78 */ mr r31, r4 /* 801191E8 00116128 7C BA 2B 78 */ mr r26, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_801207BC.s b/include/d/d_a/d_a_alink/asm/func_801207BC.s index 20448fc9d4..ef158ed019 100644 --- a/include/d/d_a/d_a_alink/asm/func_801207BC.s +++ b/include/d/d_a/d_a_alink/asm/func_801207BC.s @@ -4,7 +4,7 @@ /* 801207C8 0011D708 DB E1 00 30 */ stfd f31, 0x30(r1) /* 801207CC 0011D70C F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 801207D0 0011D710 39 61 00 30 */ addi r11, r1, 0x30 -/* 801207D4 0011D714 48 24 19 F5 */ bl func_803621C8 +/* 801207D4 0011D714 48 24 19 F5 */ bl _savegpr_24 /* 801207D8 0011D718 7C 78 1B 78 */ mr r24, r3 /* 801207DC 0011D71C 3B 20 00 00 */ li r25, 0 /* 801207E0 0011D720 3B E0 00 00 */ li r31, 0 @@ -45,7 +45,7 @@ lbl_80120844: /* 80120860 0011D7A0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80120864 0011D7A4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80120868 0011D7A8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8012086C 0011D7AC 48 24 19 A9 */ bl func_80362214 +/* 8012086C 0011D7AC 48 24 19 A9 */ bl _restgpr_24 /* 80120870 0011D7B0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80120874 0011D7B4 7C 08 03 A6 */ mtlr r0 /* 80120878 0011D7B8 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_8012277C.s b/include/d/d_a/d_a_alink/asm/func_8012277C.s index 5b59034c88..3e083ab180 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012277C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012277C.s @@ -4,7 +4,7 @@ /* 80122788 0011F6C8 DB E1 00 50 */ stfd f31, 0x50(r1) /* 8012278C 0011F6CC F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* 80122790 0011F6D0 39 61 00 50 */ addi r11, r1, 0x50 -/* 80122794 0011F6D4 48 23 FA 35 */ bl func_803621C8 +/* 80122794 0011F6D4 48 23 FA 35 */ bl _savegpr_24 /* 80122798 0011F6D8 7C 7B 1B 78 */ mr r27, r3 /* 8012279C 0011F6DC 3B C0 00 00 */ li r30, 0 /* 801227A0 0011F6E0 3B 40 00 00 */ li r26, 0 @@ -95,7 +95,7 @@ lbl_801228C0: /* 801228D4 0011F814 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 801228D8 0011F818 CB E1 00 50 */ lfd f31, 0x50(r1) /* 801228DC 0011F81C 39 61 00 50 */ addi r11, r1, 0x50 -/* 801228E0 0011F820 48 23 F9 35 */ bl func_80362214 +/* 801228E0 0011F820 48 23 F9 35 */ bl _restgpr_24 /* 801228E4 0011F824 80 01 00 64 */ lwz r0, 0x64(r1) /* 801228E8 0011F828 7C 08 03 A6 */ mtlr r0 /* 801228EC 0011F82C 38 21 00 60 */ addi r1, r1, 0x60 diff --git a/include/d/d_a/d_a_alink/asm/func_801241E0.s b/include/d/d_a/d_a_alink/asm/func_801241E0.s index 8a300ad8c2..7b87d0e28c 100644 --- a/include/d/d_a/d_a_alink/asm/func_801241E0.s +++ b/include/d/d_a/d_a_alink/asm/func_801241E0.s @@ -2,7 +2,7 @@ /* 801241E4 00121124 7C 08 02 A6 */ mflr r0 /* 801241E8 00121128 90 01 00 54 */ stw r0, 0x54(r1) /* 801241EC 0012112C 39 61 00 50 */ addi r11, r1, 0x50 -/* 801241F0 00121130 48 23 DF D9 */ bl func_803621C8 +/* 801241F0 00121130 48 23 DF D9 */ bl _savegpr_24 /* 801241F4 00121134 7C 7B 1B 78 */ mr r27, r3 /* 801241F8 00121138 80 83 05 8C */ lwz r4, 0x58c(r3) /* 801241FC 0012113C 3C 60 00 02 */ lis r3, 0x00021800@ha @@ -206,7 +206,7 @@ lbl_801244A0: /* 801244C4 00121404 3B 9C 00 02 */ addi r28, r28, 2 /* 801244C8 00121408 41 80 FE 74 */ blt lbl_8012433C /* 801244CC 0012140C 39 61 00 50 */ addi r11, r1, 0x50 -/* 801244D0 00121410 48 23 DD 45 */ bl func_80362214 +/* 801244D0 00121410 48 23 DD 45 */ bl _restgpr_24 /* 801244D4 00121414 80 01 00 54 */ lwz r0, 0x54(r1) /* 801244D8 00121418 7C 08 03 A6 */ mtlr r0 /* 801244DC 0012141C 38 21 00 50 */ addi r1, r1, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_80124EA8.s b/include/d/d_a/d_a_alink/asm/func_80124EA8.s index 826623e912..75f8b5c445 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124EA8.s +++ b/include/d/d_a/d_a_alink/asm/func_80124EA8.s @@ -2,7 +2,7 @@ /* 80124EAC 00121DEC 7C 08 02 A6 */ mflr r0 /* 80124EB0 00121DF0 90 01 00 34 */ stw r0, 0x34(r1) /* 80124EB4 00121DF4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80124EB8 00121DF8 48 23 D3 11 */ bl func_803621C8 +/* 80124EB8 00121DF8 48 23 D3 11 */ bl _savegpr_24 /* 80124EBC 00121DFC 7C 7B 1B 78 */ mr r27, r3 /* 80124EC0 00121E00 3B BB 32 D8 */ addi r29, r27, 0x32d8 /* 80124EC4 00121E04 80 03 05 74 */ lwz r0, 0x574(r3) @@ -57,7 +57,7 @@ lbl_80124F00: /* 80124F84 00121EC4 3B BD 00 30 */ addi r29, r29, 0x30 /* 80124F88 00121EC8 41 80 FF 78 */ blt lbl_80124F00 /* 80124F8C 00121ECC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80124F90 00121ED0 48 23 D2 85 */ bl func_80362214 +/* 80124F90 00121ED0 48 23 D2 85 */ bl _restgpr_24 /* 80124F94 00121ED4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80124F98 00121ED8 7C 08 03 A6 */ mtlr r0 /* 80124F9C 00121EDC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_80126F3C.s b/include/d/d_a/d_a_alink/asm/func_80126F3C.s index dd46343acd..74276911fa 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126F3C.s +++ b/include/d/d_a/d_a_alink/asm/func_80126F3C.s @@ -2,7 +2,7 @@ /* 80126F40 00123E80 7C 08 02 A6 */ mflr r0 /* 80126F44 00123E84 90 01 00 44 */ stw r0, 0x44(r1) /* 80126F48 00123E88 39 61 00 40 */ addi r11, r1, 0x40 -/* 80126F4C 00123E8C 48 23 B2 81 */ bl func_803621CC +/* 80126F4C 00123E8C 48 23 B2 81 */ bl _savegpr_25 /* 80126F50 00123E90 7C 7F 1B 78 */ mr r31, r3 /* 80126F54 00123E94 7C 9D 23 78 */ mr r29, r4 /* 80126F58 00123E98 3C 60 80 39 */ lis r3, lbl_8038D658@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80127F50.s b/include/d/d_a/d_a_alink/asm/func_80127F50.s index 984fef5cdf..20bfc27bfb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127F50.s +++ b/include/d/d_a/d_a_alink/asm/func_80127F50.s @@ -14,7 +14,7 @@ /* 80127F84 00124EC4 DB 41 00 50 */ stfd f26, 0x50(r1) /* 80127F88 00124EC8 F3 41 00 58 */ psq_st f26, 88(r1), 0, 0 /* 80127F8C 00124ECC 39 61 00 50 */ addi r11, r1, 0x50 -/* 80127F90 00124ED0 48 23 A2 3D */ bl func_803621CC +/* 80127F90 00124ED0 48 23 A2 3D */ bl _savegpr_25 /* 80127F94 00124ED4 7C 79 1B 78 */ mr r25, r3 /* 80127F98 00124ED8 C3 E2 92 C0 */ lfs f31, lbl_80452CC0-_SDA2_BASE_(r2) /* 80127F9C 00124EDC 80 03 05 74 */ lwz r0, 0x574(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8012948C.s b/include/d/d_a/d_a_alink/asm/func_8012948C.s index daabce75d4..786024c53b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012948C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012948C.s @@ -10,7 +10,7 @@ /* 801294B0 001263F0 DB 81 00 30 */ stfd f28, 0x30(r1) /* 801294B4 001263F4 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* 801294B8 001263F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 801294BC 001263FC 48 23 8D 11 */ bl func_803621CC +/* 801294BC 001263FC 48 23 8D 11 */ bl _savegpr_25 /* 801294C0 00126400 7C 7B 1B 78 */ mr r27, r3 /* 801294C4 00126404 FF 80 08 90 */ fmr f28, f1 /* 801294C8 00126408 FF A0 10 90 */ fmr f29, f2 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A498.s b/include/d/d_a/d_a_alink/asm/func_8012A498.s index 6fb6d66e47..9b717b60fe 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A498.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A498.s @@ -12,7 +12,7 @@ /* 8012A4C4 00127404 DB 61 00 90 */ stfd f27, 0x90(r1) /* 8012A4C8 00127408 F3 61 00 98 */ psq_st f27, 152(r1), 0, 0 /* 8012A4CC 0012740C 39 61 00 90 */ addi r11, r1, 0x90 -/* 8012A4D0 00127410 48 23 7C FD */ bl func_803621CC +/* 8012A4D0 00127410 48 23 7C FD */ bl _savegpr_25 /* 8012A4D4 00127414 7C 7A 1B 78 */ mr r26, r3 /* 8012A4D8 00127418 80 83 05 7C */ lwz r4, 0x57c(r3) /* 8012A4DC 0012741C 3C 60 FF 80 */ lis r3, 0xFF7FFBFF@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80130BC4.s b/include/d/d_a/d_a_alink/asm/func_80130BC4.s index 246ba3cb5b..e84bfd7736 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130BC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80130BC4.s @@ -4,7 +4,7 @@ /* 80130BD0 0012DB10 DB E1 00 40 */ stfd f31, 0x40(r1) /* 80130BD4 0012DB14 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* 80130BD8 0012DB18 39 61 00 40 */ addi r11, r1, 0x40 -/* 80130BDC 0012DB1C 48 23 15 F1 */ bl func_803621CC +/* 80130BDC 0012DB1C 48 23 15 F1 */ bl _savegpr_25 /* 80130BE0 0012DB20 7C 7F 1B 78 */ mr r31, r3 /* 80130BE4 0012DB24 3B BF 1F D0 */ addi r29, r31, 0x1fd0 /* 80130BE8 0012DB28 83 83 28 10 */ lwz r28, 0x2810(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80136624.s b/include/d/d_a/d_a_alink/asm/func_80136624.s index ef2909dbfc..6fdac20a4c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136624.s +++ b/include/d/d_a/d_a_alink/asm/func_80136624.s @@ -2,7 +2,7 @@ /* 80136628 00133568 7C 08 02 A6 */ mflr r0 /* 8013662C 0013356C 90 01 00 44 */ stw r0, 0x44(r1) /* 80136630 00133570 39 61 00 40 */ addi r11, r1, 0x40 -/* 80136634 00133574 48 22 BB 99 */ bl func_803621CC +/* 80136634 00133574 48 22 BB 99 */ bl _savegpr_25 /* 80136638 00133578 7C 7C 1B 78 */ mr r28, r3 /* 8013663C 0013357C 7C 9D 23 78 */ mr r29, r4 /* 80136640 00133580 7C B9 2B 78 */ mr r25, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_801377F0.s b/include/d/d_a/d_a_alink/asm/func_801377F0.s index 0b3352e99d..64bb80a896 100644 --- a/include/d/d_a/d_a_alink/asm/func_801377F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801377F0.s @@ -4,7 +4,7 @@ /* 801377FC 0013473C DB E1 00 80 */ stfd f31, 0x80(r1) /* 80137800 00134740 F3 E1 00 88 */ psq_st f31, 136(r1), 0, 0 /* 80137804 00134744 39 61 00 80 */ addi r11, r1, 0x80 -/* 80137808 00134748 48 22 A9 C1 */ bl func_803621C8 +/* 80137808 00134748 48 22 A9 C1 */ bl _savegpr_24 /* 8013780C 0013474C 7C 79 1B 78 */ mr r25, r3 /* 80137810 00134750 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80137814 00134754 3B 84 D6 58 */ addi r28, r4, lbl_8038D658@l @@ -318,7 +318,7 @@ lbl_80137C70: /* 80137C70 00134BB0 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 80137C74 00134BB4 CB E1 00 80 */ lfd f31, 0x80(r1) /* 80137C78 00134BB8 39 61 00 80 */ addi r11, r1, 0x80 -/* 80137C7C 00134BBC 48 22 A5 99 */ bl func_80362214 +/* 80137C7C 00134BBC 48 22 A5 99 */ bl _restgpr_24 /* 80137C80 00134BC0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80137C84 00134BC4 7C 08 03 A6 */ mtlr r0 /* 80137C88 00134BC8 38 21 00 90 */ addi r1, r1, 0x90 diff --git a/include/d/d_a/d_a_alink/asm/func_80140FA0.s b/include/d/d_a/d_a_alink/asm/func_80140FA0.s index 37ec6f6418..5ad93fe176 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140FA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80140FA0.s @@ -11,7 +11,7 @@ /* 80140FC8 0013DF08 38 03 72 18 */ addi r0, r3, lbl_803A7218@l /* 80140FCC 0013DF0C 90 1F 01 1C */ stw r0, 0x11c(r31) /* 80140FD0 0013DF10 38 7F 01 24 */ addi r3, r31, 0x124 -/* 80140FD4 0013DF14 48 12 DF B5 */ bl cM3dGCps +/* 80140FD4 0013DF14 48 12 DF B5 */ bl __ct__8cM3dGCpsFv /* 80140FD8 0013DF18 3C 60 80 3C */ lis r3, lbl_803C3608@ha /* 80140FDC 0013DF1C 38 63 36 08 */ addi r3, r3, lbl_803C3608@l /* 80140FE0 0013DF20 90 7F 01 20 */ stw r3, 0x120(r31) diff --git a/include/d/d_attention/asm/func_80070198.s b/include/d/d_attention/asm/func_80070198.s index 76ef2f520e..e833de9fbd 100644 --- a/include/d/d_attention/asm/func_80070198.s +++ b/include/d/d_attention/asm/func_80070198.s @@ -2,7 +2,7 @@ /* 8007019C 0006D0DC 7C 08 02 A6 */ mflr r0 /* 800701A0 0006D0E0 90 01 00 34 */ stw r0, 0x34(r1) /* 800701A4 0006D0E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 800701A8 0006D0E8 48 2F 20 21 */ bl func_803621C8 +/* 800701A8 0006D0E8 48 2F 20 21 */ bl _savegpr_24 /* 800701AC 0006D0EC 7C 7F 1B 78 */ mr r31, r3 /* 800701B0 0006D0F0 7C 99 23 78 */ mr r25, r4 /* 800701B4 0006D0F4 7C B8 2B 78 */ mr r24, r5 @@ -387,7 +387,7 @@ lbl_80070748: /* 80070754 0006D694 98 03 00 04 */ stb r0, 4(r3) /* 80070758 0006D698 7F E3 FB 78 */ mr r3, r31 /* 8007075C 0006D69C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80070760 0006D6A0 48 2F 1A B5 */ bl func_80362214 +/* 80070760 0006D6A0 48 2F 1A B5 */ bl _restgpr_24 /* 80070764 0006D6A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80070768 0006D6A8 7C 08 03 A6 */ mtlr r0 /* 8007076C 0006D6AC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/include/d/d_attention/d_attention.h b/include/d/d_attention/d_attention.h new file mode 100644 index 0000000000..166f0bcb21 --- /dev/null +++ b/include/d/d_attention/d_attention.h @@ -0,0 +1,158 @@ +#ifndef __D_ATTENTION_H_ +#define __D_ATTENTION_H_ + +#include "SComponent/c_angle/c_angle.h" +#include "SComponent/c_xyz/c_xyz.h" +#include "global.h" +#include "m_Do/m_Do_ext/m_Do_ext.h" + +class dAttHint_c { +public: +private: + u32 field_0x0; + u32 field_0x4; + u32 field_0x8; +}; + +class dAttCatch_c { +public: +private: + void* field_0x0; + u32 field_0x4; + float field_0x8; + u8 field_0xc; + u8 field_0xd; + u8 field_0xe; + u8 field_0xf; + void* field_0x10; +}; + +class dAttParam_c { +public: +private: + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + u8 field_0x4; + u8 field_0x5; + u8 field_0x6; + u8 field_0x7; + u8 field_0x8; + u8 field_0x9; + u8 field_0xa; + u8 field_0xb; + u8 field_0xc; + u8 field_0xd; + u8 field_0xe; + u8 field_0xf; + u8 field_0x10; + u8 field_0x11; + u8 field_0x12; +}; + +class dAttLook_c { +public: +private: + u32 field_0x0; + u32 field_0x4; + float field_0x8; +}; + +class dAttList_c { +public: +private: + u8 field_0x0[8]; + cSAngle angle; + u8 field_0xa[10]; +}; + +class dAttDraw_c { + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + u8 field_0x4; + u8 field_0x5; + u8 field_0x6; + u8 field_0x7; + mDoExt_bckAnm bckAnm; + u8 field_0x24[28]; + mDoExt_bpkAnm bpkAnm; + u8 field_0x58[24]; + mDoExt_brkAnm brkAnm; + u8 field_0x88[24]; + mDoExt_brkAnm brkAnm2; + u8 field_0xb8[24]; + mDoExt_btkAnm btkAnm; + u8 field_0xe8[24]; + mDoExt_bckAnm bckAnm2; + mDoExt_bpkAnm bpkAnm2; + mDoExt_brkAnm brkAnm3; + mDoExt_btkAnm btkAnm2; +}; + +class dAttDraw_CallBack_c { + mDoExt_McaMorfCallBack1_c mDoExt_McaMorfCallback; +}; + +class dAttention_c { +public: +private: + u8 field_0x0[4]; + u32 field_0x4; + dAttDraw_CallBack_c dattdraw_callback; + u8 field_0xc[4]; + u32 field_0x10; + u8 field_0x14[8]; + cXyz field_0x1c; + dAttDraw_c attention_draw; + u8 field_0x18c[396]; + int field_0x318; + cXyz field_0x31c; + u8 field_0x328[12]; + u32 field_0x334; + dAttList_c attention_list1; + u8 field_0x34c[140]; + int* field_0x3d8; + int* field_0x3dc; + dAttList_c attention_list2; + u8 field_0x3f4[60]; + int* field_0x430; + int field_0x434; + dAttList_c attention_list3; + u8 field_0x44c[60]; + int* field_0x488; + int field_0x48c; + dAttHint_c attention_hint; + dAttCatch_c attention_catch; + u8 field_0x4b0[4]; + dAttLook_c attention_look; + u8 field_0x4c0; + u8 field_0x4c1; + u8 field_0x4c2; + u8 field_0x4c3; + int* field_0x4c4; + u8 field_0x4c8; + u8 field_0x4c9; + u8 field_0x4ca; + u8 field_0x4cb; + u8 field_0x4cc; + u8 field_0x4cd; + u8 field_0x4ce; + u8 field_0x4cf; + dAttParam_c attention_param; + u8 field_0x4e3; + u8 field_0x4e4; + u8 field_0x4e5; + int* field_0x4e6; + u8 field_0x4ea; + u8 field_0x4eb; + u8 field_0x4ec; + u8 field_0x4ed; + u8 field_0x4ee; + u8 field_0x4ef; + u8 field_0x4f0; +}; + +#endif \ No newline at end of file diff --git a/include/d/d_bg/d_bg_s/d_bg_s.h b/include/d/d_bg/d_bg_s/d_bg_s.h new file mode 100644 index 0000000000..d6adcc0176 --- /dev/null +++ b/include/d/d_bg/d_bg_s/d_bg_s.h @@ -0,0 +1,39 @@ +#ifndef __D_BG_S_H_ +#define __D_BG_S_H_ + +#include "d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h" +#include "global.h" + +class cBgS_ChkElm { + /* 0x00 */ dBgW_Base* bgw_base_pointer; + /* 0x04 */ u8 used; + /* 0x05 */ u8 padding[3]; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ void* actor_pointer; + /* 0x10 */ u32 field_0x10; +}; + +class cBgS { + /* 0x0000 */ cBgS_ChkElm cbgs_elements[256]; +}; + +class dBgS_HIO { + /* 0x00 */ u8 vtable[4]; + /* 0x04 */ u8 field_0x4[2]; + /* 0x06 */ u16 field_0x6; + /* 0x08 */ u16 field_0x8; + /* 0x0A */ u8 field_0xa[2]; + /* 0x0C */ cXyz field_0xc; + /* 0x18 */ cXyz field_0x18; + /* 0x24 */ cXyz field_0x24; + /* 0x30 */ u8 field_0x30[4]; +}; + +class dBgS { +public: +private: + /* 0x0000 */ cBgS cbgs; + /* 0x1400 */ u8 vtable[8]; + /* 0x1408 */ dBgS_HIO dbgs_hio; +}; +#endif \ No newline at end of file diff --git a/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h b/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h new file mode 100644 index 0000000000..200633a60b --- /dev/null +++ b/include/d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h @@ -0,0 +1,20 @@ +#ifndef __D_BG_W_BASE_H_ +#define __D_BG_W_BASE_H_ + +#include "global.h" + +class dBgW_Base { +public: +private: + u16 field_0x0; + u8 field_0x2[2]; + void* field_0x4; + u8 field_0x8; + u8 field_0x9; + u8 field_0xa; + u8 field_0xb; + s16 field_0xc; + s16 field_0xe; +}; + +#endif \ No newline at end of file diff --git a/include/d/d_cc/d_cc_mass_s/d_cc_mass_s.h b/include/d/d_cc/d_cc_mass_s/d_cc_mass_s.h new file mode 100644 index 0000000000..bcb11c8e36 --- /dev/null +++ b/include/d/d_cc/d_cc_mass_s/d_cc_mass_s.h @@ -0,0 +1,34 @@ +#include "SComponent/c_cc_d/c_cc_d.h" +#include "global.h" + +class dCcMassS_Obj { +public: +private: + u8 field_0x0[12]; + cCcD_DivideInfo cccd_divideinfo; + void* vtable; +}; + +class dCcMassS_Mng { +public: +private: + cCcD_DivideArea cccd_dividearea; + u8 field_0x20[36]; + dCcMassS_Obj dccmasss_obj; + u8 field_0x64[292]; + dCcMassS_Obj dccmasss_obj2; + u8 field_0x1a8[32]; + cCcD_CylAttr cccd_cylattr; + u8 field_0x200[2]; + u8 field_0x202; + u8 field_0x203; + float field_0x204; + float field_0x208; + float field_0x20c; + float field_0x210; + float field_0x214; + float field_0x218; + u8 field_0x21c[8]; + cCcD_CpsAttr cccd_cpsattr; + cCcD_DivideInfo cccd_divideinfo; +}; \ No newline at end of file diff --git a/include/d/d_cc/d_cc_s/d_cc_s.h b/include/d/d_cc/d_cc_s/d_cc_s.h new file mode 100644 index 0000000000..f64125be22 --- /dev/null +++ b/include/d/d_cc/d_cc_s/d_cc_s.h @@ -0,0 +1,16 @@ +#ifndef __D_CC_S_H_ +#define __D_CC_S_H_ + +#include "global.h" +#include "SComponent/c_cc_s/c_cc_s.h" +#include "d/d_cc/d_cc_mass_s/d_cc_mass_s.h" + +class dCcS { +public: +private: + cCcS cccs; + u8 field_0x2834[36]; + dCcMassS_Mng dccmass_mng; +}; + +#endif \ No newline at end of file diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index 89f1f6dc4b..4f216a36ad 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -1,42 +1,17 @@ #ifndef __D_COM_INF_GAME_H_ #define __D_COM_INF_GAME_H_ +#include "d/d_attention/d_attention.h" +#include "d/d_bg/d_bg_s/d_bg_s.h" +#include "d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h" +#include "d/d_cc/d_cc_s/d_cc_s.h" #include "d/d_drawlist/d_drawlist.h" #include "d/d_event/d_event/d_event.h" #include "d/d_event/d_event_manager/d_event_manager.h" #include "d/d_resource/d_resource.h" #include "d/d_save/d_save/d_save.h" - -class dComIfG_play_c { -public: - void ct(void); - void init(void); - u8 unk[0x100]; -}; - -class dCcMassS_Mng { -public: - u8 unk[0x274]; -}; - -class dAttDraw_c { -public: - u8 unk[0x178]; -}; - -class dAttList_c { - u8 unk[0x14]; -}; - -class dDlst_window_c { - u8 unk[0x2C]; -}; - -class dComIfG_camera_info_class { - u8 unk[0x38]; -}; - -struct mDoExt_bckAnm {}; +#include "d/d_stage/d_stage.h" +#include "d/d_vibration/d_vibration.h" struct item_func { float hearts; // bf80 @@ -59,38 +34,95 @@ struct item_func { s16 seeds; // bfb6 }; -// 16 bytes too big, figure out later +class dComIfG_camera_info_class { +public: +private: + u8 field_0x0[12]; + cXyz field_0xc; + cXyz field_0x18; +}; + +class dDlst_window_c { +public: +private: + float view_port1; + float view_port2; + float view_port3; + float view_port4; + float view_port5; + float view_port6; + float scissor1; + float scissor2; + float scissor3; + float scissor4; + int camera_id; +}; + +class dComIfG_play_c { +public: + void ct(void); + void init(void); + u32 getNowVibration(); + dStage_roomControl_c& getRoomControl() { return room_control; } + item_func& getGiveItem() { return give_item; } + u8& getUnkHeart() { return unk_heart; } +private: + /* 0x00000 */ dBgS dbgs; + /* 0x0143C */ dCcS dccs; + /* 0x03F08 */ u8 field_0x3f08[0x16]; + /* 0x03F1E */ dStage_nextStage_c next_stage; + /* 0x03F2F */ u8 padding; + /* 0x03F30 */ dStage_stageDt_c stage_data; + /* 0x03F34 */ dStage_roomControl_c room_control; + /* 0x03FD8 */ dEvt_control_c event_control; + /* 0x0409C */ u8 field_0x409c[0x24]; + /* 0x040C0 */ dEvent_manager_c event_manager; + /* 0x0475B */ u8 field_0x475B[0x2D]; + /* 0x04788 */ void* vtable; + /* 0x0478C */ u8 field_0x478c[0x1C]; + /* 0x047A8 */ dAttDraw_c attention_draw; + /* 0x0490C */ u8 field_0x490c[0x1AC]; + /* 0x04AB8 */ dAttList_c attention_list1; + /* 0x04ACC */ u8 field_0x4acc[0x94]; + /* 0x04B60 */ dAttList_c attention_list2; + /* 0x04B74 */ u8 field_0x4b74[0x44]; + /* 0x04BB8 */ dAttList_c attention_list3; + /* 0x04BCC */ u8 field_0x4bcc[0xBC]; + /* 0x04c88 */ void* vtable2; + /* 0x04C8C */ u8 field_0x4c8c[0x55]; + /* 0x04CE1 */ u8 field_0x4ce1[0x37]; + /* 0x04D18 */ dVibration_c vibration; + /* 0x04DA8 */ u8 field_0x4da8[0x5C]; + /* 0x04E04 */ u32 field_0x4e04; + /* 0x04E08 */ u8 field_0x4e08[0x4]; + /* 0x04E0C */ u8 field_0x4e0c[0x4]; + /* 0x04E10 */ dDlst_window_c draw_list_window; + /* 0x04ED4 */ dComIfG_camera_info_class camera_info; + /* 0x04E60 */ u8 field_0x4e60[0x28]; + /* 0x04E88 */ item_func give_item; + /* 0x04EC0 */ u8 field_0x4ec0[0xBE]; + /* 0x04F7E */ u8 unk_heart; + /* 0x04F7F */ u8 field_0x4f7f[0x79]; + /* 0x04FF8 */ u32 field_0x4ff8; + /* 0x04FFC */ u32 field_0x4ffc; + /* 0x05000 */ u32 field_0x5000; + /* 0x05004 */ u32 field_0x5004; + /* 0x05008 */ u8 field_0x5008[0x1C]; + /* 0x05024 */ u8 field_0x5024[8]; +}; + class dComIfG_inf_c { public: + item_func& getPlayGiveItem() { return play.getGiveItem(); } + u8& getPlayUnkHeart() { return play.getUnkHeart(); } /* 0x00000 */ dSv_info_c info; - /* 0x00EEC */ u8 unk2[0x4C]; + /* 0x00EEC */ u8 field_0xeec[0x3C]; + /* 0x00F28 */ u32 saveTotalTime; + /* 0x00F2C */ u32 saveStartTime; + /* 0x00F30 */ u32 field_0xf30; + /* 0x00F34 */ u32 field_0xf34; /* 0x00F38 */ dComIfG_play_c play; - /* 0x01038 */ u8 unk3[0x3B50]; - /* 0x04B88 */ dCcMassS_Mng mass_mng; - /* 0x04DFC */ u8 unk4[0xCC]; // might be part of dCcMassS_Mng - /* 0x04EC8 */ dEvt_control_c event_control; - /* 0x04FF8 */ dEvent_manager_c event_manager; // 0x6C8 - /* 0x056C0 */ u8 unk5[0x20]; // vtables? - /* 0x056E0 */ dAttDraw_c att_draw; - /* 0x05858 */ u8 unk6[0x198]; - /* 0x059F0 */ dAttList_c att_list1; - /* 0x05A04 */ u8 unk8[0x94]; - /* 0x05A98 */ dAttList_c att_list2; - /* 0x05AAC */ u8 unk9[0x44]; - /* 0x05AF0 */ dAttList_c att_list3; - /* 0x05B04 */ u8 unk10[0x244]; - /* 0x05D48 */ dDlst_window_c draw_list_window; - /* 0x05D74 */ dComIfG_camera_info_class camera_info_class; - /* 0x05DAC */ u8 unk11[0x14]; - /* 0x05DC0 */ item_func give_item; - /* 0x05DF8 */ u8 unk35[0x144]; - /* 0x05F3C */ u32 unk12; - /* 0x05F30 */ u32 unk13; - /* 0x05F34 */ u32 unk14; - /* 0x05F38 */ u32 unk15; - /* 0x05F3C */ u32 unk16; - /* 0x05F40 */ u8 unk17[0x24]; - /* 0x05F64 */ dDlst_list_c draw_list_list; + /* 0x05FD8 */ u8 unk35[0x1612C]; /* 0x1C104 */ u8 unk18[0x1F4]; // might be part of dDlst_list_c /* 0x1C2F8 */ dRes_info_c resource_info1; /* 0x1C31C */ u8 unk19[0x11DC]; @@ -114,4 +146,35 @@ public: extern dComIfG_inf_c g_dComIfG_gameInfo; +// int dComIfGp_roomControl_getZoneNo(int zone_no) { +// return g_dComIfG_gameInfo.play.getRoomControl().getZoneNo(zone_no); +// } + +// BOOL dComIfGs_isEventBit(u16 event_no) { +// return g_dComIfG_gameInfo.info.getSaveFile().getEventFlags().isEventBit(event_no); +// } + +// void dComIfGs_offEventBit(u16 event_no) { +// g_dComIfG_gameInfo.info.getSaveFile().getEventFlags().offEventBit(event_no); +// } + +// BOOL dComIfGs_isItemFirstBit(u8 i_no) { +// return g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(i_no); +// } + +// void dComIfGs_setItem(int item_slot, u8 item_id) { +// g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(item_slot, item_id); +// } + +// u16 dComIfGs_getOil(void) { +// return g_dComIfG_gameInfo.info.getSaveFile() +// .getPlayer() +// .getPlayerStatusA() +// .getCurrentLanternOil(); +// } + +// void dComIfGs_setOil(u16 oil_value) { +// g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().setLanternOil(oil_value); +// } + #endif \ No newline at end of file diff --git a/include/d/d_event/d_event/d_event.h b/include/d/d_event/d_event/d_event.h index 2a4eed8c5c..049b2c9a47 100644 --- a/include/d/d_event/d_event/d_event.h +++ b/include/d/d_event/d_event/d_event.h @@ -1,12 +1,212 @@ -#ifndef D_EVENT_H_ -#define D_EVENT_H_ +#ifndef __D_EVENT_H_ +#define __D_EVENT_H_ #include "dolphin/types.h" +class dEvt_order_c { +public: +private: + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + u8 field_0x4; + u8 field_0x5; + u8 field_0x6; + u8 field_0x7; + u8 field_0x8; + u8 field_0x9; + u8 field_0xa; + u8 field_0xb; + u8 field_0xc; + u8 field_0xd; + u8 field_0xe; + u8 field_0xf; + u8 field_0x10; + u8 field_0x11; + u8 field_0x12; + u8 field_0x13; + u8 field_0x14; + u8 field_0x15; + u8 field_0x16; + u8 field_0x17; + u8 field_0x18; + u8 field_0x19; + u8 field_0x1a; + u8 field_0x1b; + u8 field_0x1c; + u8 field_0x1d; + u8 field_0x1e; + u8 field_0x1f; + u8 field_0x20; + u8 field_0x21; + u8 field_0x22; + u8 field_0x23; + u8 field_0x24; + u8 field_0x25; + u8 field_0x26; + u8 field_0x27; + u8 field_0x28; + u8 field_0x29; + u8 field_0x2a; + u8 field_0x2b; + u8 field_0x2c; + u8 field_0x2d; + u8 field_0x2e; + u8 field_0x2f; + u8 field_0x30; + u8 field_0x31; + u8 field_0x32; + u8 field_0x33; + u8 field_0x34; + u8 field_0x35; + u8 field_0x36; + u8 field_0x37; + u8 field_0x38; + u8 field_0x39; + u8 field_0x3a; + u8 field_0x3b; + u8 field_0x3c; + u8 field_0x3d; + u8 field_0x3e; + u8 field_0x3f; + u8 field_0x40; + u8 field_0x41; + u8 field_0x42; + u8 field_0x43; + u8 field_0x44; + u8 field_0x45; + u8 field_0x46; + u8 field_0x47; + u8 field_0x48; + u8 field_0x49; + u8 field_0x4a; + u8 field_0x4b; + u8 field_0x4c; + u8 field_0x4d; + u8 field_0x4e; + u8 field_0x4f; + u8 field_0x50; + u8 field_0x51; + u8 field_0x52; + u8 field_0x53; + u8 field_0x54; + u8 field_0x55; + u8 field_0x56; + u8 field_0x57; + u8 field_0x58; + u8 field_0x59; + u8 field_0x5a; + u8 field_0x5b; + u8 field_0x5c; + u8 field_0x5d; + u8 field_0x5e; + u8 field_0x5f; + u8 field_0x60; + u8 field_0x61; + u8 field_0x62; + u8 field_0x63; + u8 field_0x64; + u8 field_0x65; + u8 field_0x66; + u8 field_0x67; + u8 field_0x68; + u8 field_0x69; + u8 field_0x6a; + u8 field_0x6b; + u8 field_0x6c; + u8 field_0x6d; + u8 field_0x6e; + u8 field_0x6f; + u8 field_0x70; + u8 field_0x71; + u8 field_0x72; + u8 field_0x73; + u8 field_0x74; + u8 field_0x75; + u8 field_0x76; + u8 field_0x77; + u8 field_0x78; + u8 field_0x79; + u8 field_0x7a; + u8 field_0x7b; + u8 field_0x7c; + u8 field_0x7d; + u8 field_0x7e; + u8 field_0x7f; + u8 field_0x80; + u8 field_0x81; + u8 field_0x82; + u8 field_0x83; + u8 field_0x84; + u8 field_0x85; + u8 field_0x86; + u8 field_0x87; + u8 field_0x88; + u8 field_0x89; + u8 field_0x8a; + u8 field_0x8b; + u8 field_0x8c; + u8 field_0x8d; + u8 field_0x8e; + u8 field_0x8f; + u8 field_0x90; + u8 field_0x91; + u8 field_0x92; + u8 field_0x93; + u8 field_0x94; + u8 field_0x95; + u8 field_0x96; + u8 field_0x97; + u8 field_0x98; + u8 field_0x99; + u8 field_0x9a; + u8 field_0x9b; + u8 field_0x9c; + u8 field_0x9d; + u8 field_0x9e; + u8 field_0x9f; + u8 field_0xa0; + u8 field_0xa1; + u8 field_0xa2; + u8 field_0xa3; + u8 field_0xa4; + u8 field_0xa5; + u8 field_0xa6; + u8 field_0xa7; + u8 field_0xa8; + u8 field_0xa9; + u8 field_0xaa; + u8 field_0xab; + u8 field_0xac; + u8 field_0xad; + u8 field_0xae; + u8 field_0xaf; + u8 field_0xb0; + u8 field_0xb1; + u8 field_0xb2; + u8 field_0xb3; + u8 field_0xb4; + u8 field_0xb5; + u8 field_0xb6; + u8 field_0xb7; + u8 field_0xb8; + u8 field_0xb9; + u8 field_0xba; + u8 field_0xbb; + u8 field_0xbc; + u8 field_0xbd; + u8 field_0xbe; +}; + class dEvt_control_c { public: void searchMapEventData(u8 param_1); - u8 unk[0x130]; + +private: + u8 field_0x0[4]; + dEvt_order_c event_order; + u8 field_0xc3; }; #endif \ No newline at end of file diff --git a/include/d/d_event/d_event_data/d_event_data.h b/include/d/d_event/d_event_data/d_event_data.h new file mode 100644 index 0000000000..6b487948db --- /dev/null +++ b/include/d/d_event/d_event_data/d_event_data.h @@ -0,0 +1,26 @@ +#ifndef __D_EVENT_DATA_H_ +#define __D_EVENT_DATA_H_ + +#include "global.h" + +class dEvDtFlag_c { +public: +private: + u8 field_0x0[320]; +}; + +class dEvDtBase_c { +public: +private: + u32 field_0x0; + u32 field_0x4; + u32 field_0x8; + u32 field_0xc; + u32 field_0x10; + u32 field_0x14; + u32 field_0x18; + u32 field_0x1c; + u32 field_0x20; +}; + +#endif \ No newline at end of file diff --git a/include/d/d_event/d_event_manager/d_event_manager.h b/include/d/d_event/d_event_manager/d_event_manager.h index 3f06e27ed3..d1c91ae401 100644 --- a/include/d/d_event/d_event_manager/d_event_manager.h +++ b/include/d/d_event/d_event_manager/d_event_manager.h @@ -1,11 +1,40 @@ -#ifndef D_EVENT_MANAGER_H_ -#define D_EVENT_MANAGER_H_ +#ifndef __D_EVENT_MANAGER_H_ +#define __D_EVENT_MANAGER_H_ #include "dolphin/types.h" +#include "d/d_event/d_event_data/d_event_data.h" -class dEvent_manager_c { +class dEvent_exception_c { public: - u8 unk[0x6C8]; +private: + u32 field_0x0; + u8 field_0x4; + u8 field_0x5; + u8 field_0x6; + u8 field_0x7; + u32 field_0x8; }; +#pragma pack(push, 1) +struct dEvent_manager_c { + /* 0x0000 */ dEvDtBase_c event_data_base; + /* 0x0024 */ u8 field_0x24[0x64]; + /* 0x0088 */ u8 field_0x88[0x104]; + /* 0x018C */ u32 field_0x18c; + /* 0x0190 */ u32 field_0x190; + /* 0x0194 */ u8 field_0x194[0x8]; + /* 0x019C */ u8 goal; + /* 0x019D */ u8 field_0x19d[0xD]; + /* 0x01AA */ u16 field_0x1aa; + /* 0x01AC */ u8 field_0x1ac[0x8]; + /* 0x01B4 */ dEvent_exception_c event_exception; + /* 0x01C0 */ cXyz position; + /* 0x01CC */ u8 field_0x1cc[0x14]; + /* 0x01E0 */ dEvDtFlag_c event_data_flag; + /* 0x0320 */ u8 field_0x320[0x35C]; + /* 0x067C */ void* vtable; + /* 0x0680 */ u8 field_0x680[0x1B]; +}; +#pragma pack(pop) + #endif \ No newline at end of file diff --git a/include/d/d_meter2/d_meter2_info/d_meter2_info.h b/include/d/d_meter2/d_meter2_info/d_meter2_info.h index 4e641ab284..8fdbdf61a0 100644 --- a/include/d/d_meter2/d_meter2_info/d_meter2_info.h +++ b/include/d/d_meter2/d_meter2_info/d_meter2_info.h @@ -1,4 +1,12 @@ +#ifndef __D_METER2_INFO_H_ +#define __D_METER2_INFO_H_ + +#include "JSystem/JMessage/control/control.h" #include "dolphin/types.h" +#include "JSystem/J2DGraph/J2DPicture/J2DPicture.h" +#include "JSystem/J2DGraph/J2DScreen/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox/J2DTextBox.h" +#include "JSystem/JUtility/JUTFont/JUTFont.h" struct dMeter2Info_c_vtable { u32* addr1; @@ -8,8 +16,8 @@ struct dMeter2Info_c_vtable { class dMeter2Info_c { public: - dMeter2Info_c::dMeter2Info_c(); - dMeter2Info_c::~dMeter2Info_c(); + // dMeter2Info_c::dMeter2Info_c(); + // dMeter2Info_c::~dMeter2Info_c(); void init(void); void setFloatingMessage(u16, s16, bool); void setFloatingFlow(u16, s16, bool); @@ -48,6 +56,7 @@ public: void resetMiniGameItem(bool); void setMiniGameCount(s8); void setSaveStageName(const char*); + u8& getDirectUseItem() { return mDirectUseItem; } private: dMeter2Info_c_vtable* vtable; @@ -142,4 +151,6 @@ private: u8 unk243[5]; }; -extern dMeter2Info_c g_meter2_info; \ No newline at end of file +extern dMeter2Info_c g_meter2_info; + +#endif \ No newline at end of file diff --git a/include/d/d_save/d_save/asm/func_800332F8.s b/include/d/d_save/d_save/asm/func_800332F8.s index db8413f8fd..8a4d5ea66a 100644 --- a/include/d/d_save/d_save/asm/func_800332F8.s +++ b/include/d/d_save/d_save/asm/func_800332F8.s @@ -8,8 +8,8 @@ lbl_8003330C: /* 80033310 00030250 7C 83 01 AE */ stbx r4, r3, r0 /* 80033314 00030254 38 C6 00 01 */ addi r6, r6, 1 /* 80033318 00030258 42 00 FF F4 */ bdnz lbl_8003330C -/* 8003331C 0003025C 3C 80 80 3A */ lis r4, lbl_803A7270@ha -/* 80033320 00030260 38 84 72 70 */ addi r4, r4, lbl_803A7270@l +/* 8003331C 0003025C 3C 80 80 3A */ lis r4, i_item_lst@ha +/* 80033320 00030260 38 84 72 70 */ addi r4, r4, i_item_lst@l /* 80033324 00030264 38 00 00 17 */ li r0, 0x17 /* 80033328 00030268 7C 09 03 A6 */ mtctr r0 lbl_8003332C: diff --git a/include/d/d_save/d_save/asm/func_80034644.s b/include/d/d_save/d_save/asm/func_80034644.s index 69b644fa95..5551a6e269 100644 --- a/include/d/d_save/d_save/asm/func_80034644.s +++ b/include/d/d_save/d_save/asm/func_80034644.s @@ -1,13 +1,13 @@ /* 80034644 00031584 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80034648 00031588 7C 08 02 A6 */ mflr r0 /* 8003464C 0003158C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80034650 00031590 80 0D 8F 60 */ lwz r0, lbl_804514E0-_SDA_BASE_(r13) +/* 80034650 00031590 80 0D 8F 60 */ lwz r0, _sRumbleSupported-_SDA_BASE_(r13) /* 80034654 00031594 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 /* 80034658 00031598 41 82 00 18 */ beq lbl_80034670 /* 8003465C 0003159C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80034664 000315A4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80034668 000315A8 4B FF 6D 49 */ bl dComIfG_play_c_NS_getNowVibration +/* 80034668 000315A8 4B FF 6D 49 */ bl getNowVibration__14dComIfG_play_cFv /* 8003466C 000315AC 48 00 00 08 */ b lbl_80034674 lbl_80034670: /* 80034670 000315B0 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index 0263a3863e..e8bd84933e 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -1,6 +1,8 @@ #ifndef __D_SAVE_H_ #define __D_SAVE_H_ +#include "SComponent/c_xyz/c_xyz.h" +#include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "dolphin/types.h" #include "global.h" @@ -44,262 +46,262 @@ enum ItemSlots { }; enum ItemTable { - AIR_LETTER = 234, - ANCIENT_DOCUMENT = 233, - ANCIENT_DOCUMENT2 = 235, - ARMOR = 48, - ARROW_1 = 17, - ARROW_10 = 14, - ARROW_20 = 15, - ARROW_30 = 16, - ARROW_LV1 = 84, - ARROW_LV2 = 85, - ARROW_LV3 = 86, - ASHS_SCRIBBLING = 145, - BEE_CHILD = 118, - BEE_ROD = 91, - BILL = 129, - BLUE_BOTTLE = 99, - BLUE_RUPEE = 2, - BOMB_10 = 11, - BOMB_20 = 12, - BOMB_30 = 13, - BOMB_5 = 10, - BOMB_ARROW = 89, - BOMB_BAG_LV1 = 80, - BOMB_BAG_LV2 = 79, - BOMB_INSECT_10 = 27, - BOMB_INSECT_20 = 28, - BOMB_INSECT_30 = 29, - BOMB_INSECT_5 = 26, - BOMB_IN_BAG = 81, - BOOMERANG = 64, - BOSSRIDER_KEY = 243, - BOSS_KEY = 38, - BOW = 67, - CHUCHU_BLACK = 159, - CHUCHU_BLUE = 121, - CHUCHU_GREEN = 122, - CHUCHU_PURPLE = 124, - CHUCHU_RARE = 119, - CHUCHU_RED = 120, - CHUCHU_YELLOW = 123, - CHUCHU_YELLOW2 = 156, - COMPUS = 36, - COPY_ROD = 70, - COPY_ROD_2 = 76, - DROP_BOTTLE = 117, - DROP_CONTAINER = 161, - DROP_CONTAINER02 = 162, - DROP_CONTAINER03 = 163, - DUNGEON_BACK = 39, - DUNGEON_EXIT = 37, - DUNGEON_EXIT_2 = 51, - EMPTY_BOTTLE = 96, - FAIRY = 108, - FAIRY_DROP = 115, - FILLED_CONTAINER = 164, - FISHING_ROD_1 = 74, - F_ANT = 213, - F_BEETLE = 193, - F_BUTTERFLY = 195, - F_DANGOMUSHI = 203, - F_DRAGONFLY = 211, - F_GRASSHOPPER = 199, - F_LADYBUG = 207, - F_MANTIS = 205, - F_MAYFLY = 215, - F_NANAFUSHI = 201, - F_SNAIL = 209, - F_STAG_BEETLE = 197, - GREEN_BOTTLE = 98, - GREEN_RUPEE = 1, - HALF_MILK_BOTTLE = 101, - HAWK_ARROW = 90, - HAWK_EYE = 62, - HEART = 0, - HOOKSHOT = 68, - HORSE_FLUTE = 132, - HOT_SPRING = 107, - HOT_SPRING_2 = 109, - HVY_BOOTS = 69, - HYLIA_SHIELD = 44, - IRIAS_PENDANT = 131, - IRONBALL = 66, - JEWEL_BEE_ROD = 94, - JEWEL_ROD = 92, - JEWEL_WORM_ROD = 95, - KAKERA_HEART = 33, - KANTERA = 72, - KANTERA2 = 248, - KEY_OF_CARAVAN = 252, - KEY_OF_FILONE = 254, - L2_KEY_PIECES1 = 249, - L2_KEY_PIECES2 = 250, - L2_KEY_PIECES3 = 251, - LETTER = 128, - LIGHT_ARROW = 83, - LIGHT_DROP = 160, - LIGHT_SWORD = 73, - LINKS_SAVINGS = 237, - LURE_ROD = 88, - LV1_SOUP = 125, - LV2_BOSS_KEY = 253, - LV2_SOUP = 126, - LV3_SOUP = 127, - LV5_BOSS_KEY = 246, - LV7_DUNGEON_EXIT = 236, - L_MAGIC = 9, - MAGIC_LV1 = 50, - MAP = 35, - MASTER_SWORD = 41, - MILK_BOTTLE = 100, - MIRROR_PIECE_2 = 165, - MIRROR_PIECE_3 = 166, - MIRROR_PIECE_4 = 167, - M_ANT = 212, - M_BEETLE = 192, - M_BUTTERFLY = 194, - M_DANGOMUSHI = 202, - M_DRAGONFLY = 210, - M_GRASSHOPPER = 198, - M_LADYBUG = 206, - M_MANTIS = 204, - M_MAYFLY = 214, - M_NANAFUSHI = 200, - M_SNAIL = 208, - M_STAG_BEETLE = 196, - NORMAL_BOMB = 112, - NO_ITEM = 255, - OIL = 111, - OIL2 = 110, - OIL_BOTTLE = 102, - OIL_BOTTLE3 = 157, - OIL_BOTTLE_2 = 104, - ORANGE_RUPEE = 6, - PACHINKO = 75, - PACHINKO_SHOT = 18, - POKE_BOMB = 114, - POU_FIRE1 = 239, - POU_FIRE2 = 240, - POU_FIRE3 = 241, - POU_FIRE4 = 242, - POU_SPIRIT = 224, - PURPLE_RUPEE = 5, - RAFRELS_MEMO = 144, - RECOVERY_FAILY = 30, - RED_BOTTLE = 97, - RED_BOTTLE_2 = 105, - RED_RUPEE = 4, - SHIELD = 43, - SHOP_BEE_CHILD = 158, - SILVER_RUPEE = 7, - SMALL_KEY = 32, - SMALL_KEY2 = 238, - SMELL_CHILDREN = 180, - SMELL_FISH = 179, - SMELL_MEDICINE = 181, - SMELL_POH = 178, - SMELL_PUMPKIN = 177, - SMELL_YELIA_POUCH = 176, - SPINNER = 65, - SURFBOARD = 247, - SWORD = 40, - S_MAGIC = 8, - TASTE = 245, - TKS_LETTER = 45, - TOMATO_PUREE = 244, - TRIPLE_HEART = 31, - UGLY_SOUP = 106, - UTAWA_HEART = 34, - WALLET_LV1 = 52, - WALLET_LV2 = 53, - WALLET_LV3 = 54, - WATER_BOMB = 113, - WATER_BOMB_10 = 23, - WATER_BOMB_20 = 24, - WATER_BOMB_30 = 25, - WATER_BOMB_5 = 22, - WATER_BOTTLE = 103, - WEARS_CASUAL = 46, - WEAR_KOKIRI = 47, - WEAR_ZORA = 49, - WOOD_SHIELD = 42, - WOOD_STATUE = 130, - WOOD_STICK = 63, - WORM = 116, - WORM_ROD = 93, - W_HOOKSHOT = 71, - YELLOW_RUPEE = 3, - ZORAS_JEWEL = 61, - noentry1 = 19, - noentry10 = 77, - noentry11 = 78, - noentry12 = 82, - noentry13 = 87, - noentry14 = 133, - noentry15 = 134, - noentry16 = 135, - noentry17 = 136, - noentry18 = 137, - noentry19 = 138, - noentry2 = 20, - noentry20 = 139, - noentry21 = 140, - noentry22 = 141, - noentry23 = 142, - noentry24 = 143, - noentry25 = 146, - noentry26 = 147, - noentry27 = 148, - noentry28 = 149, - noentry29 = 150, - noentry3 = 21, - noentry30 = 151, - noentry31 = 152, - noentry32 = 153, - noentry33 = 154, - noentry34 = 155, - noentry35 = 168, - noentry36 = 169, - noentry37 = 170, - noentry38 = 171, - noentry39 = 172, - noentry4 = 55, - noentry40 = 173, - noentry41 = 174, - noentry42 = 175, - noentry43 = 182, - noentry44 = 183, - noentry45 = 184, - noentry46 = 185, - noentry47 = 186, - noentry48 = 187, - noentry49 = 188, - noentry5 = 56, - noentry50 = 189, - noentry51 = 190, - noentry52 = 191, - noentry53 = 216, - noentry54 = 217, - noentry55 = 218, - noentry56 = 219, - noentry57 = 220, - noentry58 = 221, - noentry59 = 222, - noentry6 = 57, - noentry60 = 223, - noentry61 = 225, - noentry62 = 226, - noentry63 = 227, - noentry64 = 228, - noentry65 = 229, - noentry66 = 230, - noentry67 = 231, - noentry68 = 232, - noentry7 = 58, - noentry8 = 59, - noentry9 = 60 + HEART, + GREEN_RUPEE, + BLUE_RUPEE, + YELLOW_RUPEE, + RED_RUPEE, + PURPLE_RUPEE, + ORANGE_RUPEE, + SILVER_RUPEE, + S_MAGIC, + L_MAGIC, + BOMB_5, + BOMB_10, + BOMB_20, + BOMB_30, + ARROW_10, + ARROW_20, + ARROW_30, + ARROW_1, + PACHINKO_SHOT, + noentry1, + noentry2, + noentry3, + WATER_BOMB_5, + WATER_BOMB_10, + WATER_BOMB_20, + WATER_BOMB_30, + BOMB_INSECT_5, + BOMB_INSECT_10, + BOMB_INSECT_20, + BOMB_INSECT_30, + RECOVERY_FAILY, + TRIPLE_HEART, + SMALL_KEY, + KAKERA_HEART, + UTAWA_HEART, + MAP, + COMPUS, + DUNGEON_EXIT, + BOSS_KEY, + DUNGEON_BACK, + SWORD, + MASTER_SWORD, + WOOD_SHIELD, + SHIELD, + HYLIA_SHIELD, + TKS_LETTER, + WEARS_CASUAL, + WEAR_KOKIRI, + ARMOR, + WEAR_ZORA, + MAGIC_LV1, + DUNGEON_EXIT_2, + WALLET_LV1, + WALLET_LV2, + WALLET_LV3, + noentry4, + noentry5, + noentry6, + noentry7, + noentry8, + noentry9, + ZORAS_JEWEL, + HAWK_EYE, + WOOD_STICK, + BOOMERANG, + SPINNER, + IRONBALL, + BOW, + HOOKSHOT, + HVY_BOOTS, + COPY_ROD, + W_HOOKSHOT, + KANTERA, + LIGHT_SWORD, + FISHING_ROD_1, + PACHINKO, + COPY_ROD_2, + noentry10, + noentry11, + BOMB_BAG_LV2, + BOMB_BAG_LV1, + BOMB_IN_BAG, + noentry12, + LIGHT_ARROW, + ARROW_LV1, + ARROW_LV2, + ARROW_LV3, + noentry13, + LURE_ROD, + BOMB_ARROW, + HAWK_ARROW, + BEE_ROD, + JEWEL_ROD, + WORM_ROD, + JEWEL_BEE_ROD, + JEWEL_WORM_ROD, + EMPTY_BOTTLE, + RED_BOTTLE, + GREEN_BOTTLE, + BLUE_BOTTLE, + MILK_BOTTLE, + HALF_MILK_BOTTLE, + OIL_BOTTLE, + WATER_BOTTLE, + OIL_BOTTLE_2, + RED_BOTTLE_2, + UGLY_SOUP, + HOT_SPRING, + FAIRY, + HOT_SPRING_2, + OIL2, + OIL, + NORMAL_BOMB, + WATER_BOMB, + POKE_BOMB, + FAIRY_DROP, + WORM, + DROP_BOTTLE, + BEE_CHILD, + CHUCHU_RARE, + CHUCHU_RED, + CHUCHU_BLUE, + CHUCHU_GREEN, + CHUCHU_YELLOW, + CHUCHU_PURPLE, + LV1_SOUP, + LV2_SOUP, + LV3_SOUP, + LETTER, + BILL, + WOOD_STATUE, + IRIAS_PENDANT, + HORSE_FLUTE, + noentry14, + noentry15, + noentry16, + noentry17, + noentry18, + noentry19, + noentry20, + noentry21, + noentry22, + noentry23, + noentry24, + RAFRELS_MEMO, + ASHS_SCRIBBLING, + noentry25, + noentry26, + noentry27, + noentry28, + noentry29, + noentry30, + noentry31, + noentry32, + noentry33, + noentry34, + CHUCHU_YELLOW2, + OIL_BOTTLE3, + SHOP_BEE_CHILD, + CHUCHU_BLACK, + LIGHT_DROP, + DROP_CONTAINER, + DROP_CONTAINER02, + DROP_CONTAINER03, + FILLED_CONTAINER, + MIRROR_PIECE_2, + MIRROR_PIECE_3, + MIRROR_PIECE_4, + noentry35, + noentry36, + noentry37, + noentry38, + noentry39, + noentry40, + noentry41, + noentry42, + SMELL_YELIA_POUCH, + SMELL_PUMPKIN, + SMELL_POH, + SMELL_FISH, + SMELL_CHILDREN, + SMELL_MEDICINE, + noentry43, + noentry44, + noentry45, + noentry46, + noentry47, + noentry48, + noentry49, + noentry50, + noentry51, + noentry52, + M_BEETLE, + F_BEETLE, + M_BUTTERFLY, + F_BUTTERFLY, + M_STAG_BEETLE, + F_STAG_BEETLE, + M_GRASSHOPPER, + F_GRASSHOPPER, + M_NANAFUSHI, + F_NANAFUSHI, + M_DANGOMUSHI, + F_DANGOMUSHI, + M_MANTIS, + F_MANTIS, + M_LADYBUG, + F_LADYBUG, + M_SNAIL, + F_SNAIL, + M_DRAGONFLY, + F_DRAGONFLY, + M_ANT, + F_ANT, + M_MAYFLY, + F_MAYFLY, + noentry53, + noentry54, + noentry55, + noentry56, + noentry57, + noentry58, + noentry59, + noentry60, + POU_SPIRIT, + noentry61, + noentry62, + noentry63, + noentry64, + noentry65, + noentry66, + noentry67, + noentry68, + ANCIENT_DOCUMENT, + AIR_LETTER, + ANCIENT_DOCUMENT2, + LV7_DUNGEON_EXIT, + LINKS_SAVINGS, + SMALL_KEY2, + POU_FIRE1, + POU_FIRE2, + POU_FIRE3, + POU_FIRE4, + BOSSRIDER_KEY, + TOMATO_PUREE, + TASTE, + LV5_BOSS_KEY, + SURFBOARD, + KANTERA2, + L2_KEY_PIECES1, + L2_KEY_PIECES2, + L2_KEY_PIECES3, + KEY_OF_CARAVAN, + LV2_BOSS_KEY, + KEY_OF_FILONE, + NO_ITEM }; enum EquipmentBits { CLOTHING_BITFIELD, SWORD_BITFIELD, SHIELD_BITFIELD }; @@ -325,6 +327,7 @@ public: int isMagicFlag(u8) const; u16& getCurrentHealth() { return mCurrentHealth; } + u16& getCurrentLanternOil() { return mCurrentLanternOil; } u8& getScent() { return mEquipment[3]; } void setWalletLV(u8 lv) { mCurrentWallet = lv; } void setLanternOil(u16 amount) { @@ -376,10 +379,6 @@ private: }; // move to SComponent later -class cXyz { -public: - float x, y, z; -}; class dSv_horse_place_c { public: @@ -454,7 +453,7 @@ public: void setEquipBottleItemIn(u8, u8); void setEquipBottleItemEmpty(u8); u8 checkBottle(u8); - u8 checkInsectBottle(void); + int checkInsectBottle(void); u8 checkEmptyBottle(void); void setBombBagItemIn(u8, u8, bool); void setBombBagItemIn(u8, u8, u8, bool); @@ -891,15 +890,20 @@ public: dSv_save_c& getSaveFile() { return save_file; } dSv_memory_c& getMemory() { return memory; } + dSv_zone_c* getZones() { return zones; } private: - dSv_save_c save_file; - dSv_memory_c memory; - dSv_danBit_c dungeon_bit; - dSv_zone_c zones[32]; - dSv_restart_c restart; - dSv_event_c events; - dSv_turnRestart_c turn_restart; + /* 0x000 */ dSv_save_c save_file; + /* 0x958 */ dSv_memory_c memory; + /* 0x978 */ dSv_danBit_c dungeon_bit; + /* 0x9B4 */ dSv_zone_c zones[32]; + /* 0xDB4 */ dSv_restart_c restart; + /* 0xDD8 */ dSv_event_c events; + /* 0xED8 */ dSv_turnRestart_c turn_restart; }; +// u8 dMeter2Info_getOilGaugeBackUp() { +// return g_meter2_info.getDirectUseItem(); +// } + #endif \ No newline at end of file diff --git a/include/d/d_stage/d_stage.h b/include/d/d_stage/d_stage.h new file mode 100644 index 0000000000..2c27b137cc --- /dev/null +++ b/include/d/d_stage/d_stage.h @@ -0,0 +1,39 @@ +#ifndef __D_STAGE_H_ +#define __D_STAGE_H_ +#include "global.h" + +class dStage_roomControl_c { +public: +private: + u8 field_0x0[164]; +}; + +class dStage_stageDt_c { +public: +private: + void* vtable; +}; + +class dStage_nextStage_c { +public: +private: + u8 field_0x0; + u8 field_0x1; + u8 field_0x2; + u8 field_0x3; + u8 field_0x4; + u8 field_0x5; + u8 field_0x6; + u8 field_0x7; + u8 field_0x8; + u8 field_0x9; + u8 field_0xa; + u8 field_0xb; + u8 field_0xc; + u8 field_0xd; + u8 enabled; + u8 wipe; + u8 wipe_speed; +}; + +#endif \ No newline at end of file diff --git a/include/d/d_vibration/d_vibration.h b/include/d/d_vibration/d_vibration.h new file mode 100644 index 0000000000..99ab56a990 --- /dev/null +++ b/include/d/d_vibration/d_vibration.h @@ -0,0 +1,47 @@ +#ifndef __D_VIBRATION_H_ +#define __D_VIBRATION_H_ + +#include "global.h" + +class dVibration_c { +public: +private: + u32 field_0x0; + u32 field_0x4; + u32 field_0x8; + u32 field_0xc; + u32 field_0x10; + u32 field_0x14; + float field_0x18; + float field_0x1c; + float field_0x20; + u32 field_0x24; + u32 field_0x28; + u32 field_0x2c; + u32 field_0x30; + u32 field_0x34; + u32 field_0x38; + u32 field_0x3c; + float field_0x40; + float field_0x44; + float field_0x48; + u32 field_0x4c; + u32 field_0x50; + u32 field_0x54; + u32 field_0x58; + u32 field_0x5c; + u32 field_0x60; + u32 field_0x64; + u32 field_0x68; + u32 field_0x6c; + u32 field_0x70; + u32 field_0x74; + u32 field_0x78; + u32 field_0x7c; + u32 field_0x80; + u32 field_0x84; + u32 field_0x88; + u32 field_0x8c; +}; + +#endif \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 28adc9ba63..faa95e35ec 100644 --- a/include/functions.h +++ b/include/functions.h @@ -41,18 +41,20 @@ void init__20dSv_player_collect_cFv(void); void dComIfGp_setSelectItem(int); void getUsedCount__9HeapCheckCFv(void); void isEventBit__11dSv_event_cCFUs(void); -void dComIfGs_setMixItemIndex(void); -void dComIfGs_setSelectItemIndex(void); -void dComIfGs_getMixItemIndex(void); +void dComIfGs_setMixItemIndex(int,u8); +void dComIfGs_setSelectItemIndex(int,u8); +void dComIfGs_getMixItemIndex(int); char* strcpy(char*, const char*); int strcmp(char*, char*); void setBombNum__21dSv_player_item_max_cFUcUc(void); void func_80362224(void); void func_803621D8(void); -void func_803621CC(void); +void _savegpr_25(void); void func_80362218(void); void _restgpr_26(void); void _savegpr_26(void); +void _savegpr_25(void); +void _restgpr_25(void); void func_8036221C(void); void func_803621D0(void); void func_803620AC(void); @@ -90,7 +92,7 @@ void setItem__17dSv_player_item_cFiUc(void); void dMeter2Info_c_NS_getString(void); void Z2AudioMgr_NS_setOutputMode(void*, unsigned long); u32 Z2AudioMgr_NS_hasReset(void*); -void dComIfG_play_c_NS_getNowVibration(void); +void getNowVibration__14dComIfG_play_cFv(void); void setInitEventBit(void); void daObjCarry_c_NS_clrSaveFlag(void); void daObjCarry_c_NS_setSaveFlag(void); @@ -103,7 +105,7 @@ void init__10dSv_info_cFvZone(void); void init__10dSv_zone_cFi(void); void onOneSwitch__13dSv_zoneBit_cFi(void); void onSwitch__13dSv_zoneBit_cFi(void); -int dStage_roomControl_c_NS_getZoneNo(int, int); +int dStage_roomControl_c_NS_getZoneNo(int,int); void onSwitch__12dSv_danBit_cFi(void); void onSwitch__12dSv_memBit_cFi(void); void revOneSwitch__13dSv_zoneBit_cFi(void); @@ -195,7 +197,7 @@ void JUTReportConsole_f(void); void JUTWarningConsole(void); void JUTWarningConsole_f(void); -void func_803621CC(void); +void _savegpr_25(void); void func_80361C24(void); void _restgpr_26(void); @@ -217,7 +219,7 @@ void _restgpr_29(void); void _savegpr_29(void); void func_80361C24(void); -void func_803621CC(void); +void _savegpr_25(void); void func_80362218(void); // void JKRAramArchive(void); @@ -235,7 +237,7 @@ void func_80365470(void); void DCInvalidateRange(void); void JKRDvdRipper_NS_loadToMainRAM_X1_(void); void func_80003458(void); -void func_803621CC(void); +void _savegpr_25(void); void func_80362218(void); void func_803650D0(void); @@ -255,10 +257,10 @@ void func_80003540(void); void func_80361C24(void); void func_803621B0(void); void func_803621C4(void); -void func_803621C8(void); +void _savegpr_24(void); void func_803621FC(void); void func_80362210(void); -void func_80362214(void); +void _restgpr_24(void); void ARQPostRequest(void); void DCStoreRange(void); @@ -1034,7 +1036,7 @@ void dAttention_c_NS_ActionTarget(void); void cSAngle_NS___mi_X2_(void); void dAttention_c_NS_GetLockonList(void); void dAttHint_c_NS_init(void); -void dAttention_c(void); +//void dAttention_c(void); void PSMTXTrans(void); void dAttention_c_NS_makeList(void); void mDoExt_bpkAnm_NS_entry(void); @@ -1058,7 +1060,7 @@ void dAttDraw_c_NS_alphaAnm(void); void dAttention_c_NS_LockonReleaseDistanse(void); void dAttention_c_NS_runDebugDisp(void); void func_803621BC(void); -void dAttParam_c(void); +//void dAttParam_c(void); void dAttention_c_NS_judgementStatus4Hold(void); void dAttention_c_NS_calcWeight(void); void dAttHint_c_NS_getPId(void); @@ -3464,7 +3466,7 @@ void func_800E7E50(void); void func_8014168C(void); void func_800D0370(void); void func_800E6E0C(void); -void cM3dGCps(void); +void __ct__8cM3dGCpsFv(void); void daAlink_c_NS_setHorseSwordUpAnime(void); void daAlink_c_NS_checkNotHeavyBootsStage(void); void func_80141868(void); diff --git a/include/m_Do/m_Do_ext/m_Do_ext.h b/include/m_Do/m_Do_ext/m_Do_ext.h new file mode 100644 index 0000000000..6207c98c67 --- /dev/null +++ b/include/m_Do/m_Do_ext/m_Do_ext.h @@ -0,0 +1,48 @@ +#ifndef __M_DO_EXT_H_ +#define __M_DO_EXT_H_ + +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" +#include "global.h" + +class mDoExt_baseAnm { +public: +private: + J3DFrameCtrl frame_control; +}; + +class mDoExt_btkAnm { +public: +private: + mDoExt_baseAnm base_anm; + u32 field_0x14; +}; + +class mDoExt_brkAnm { +public: +private: + mDoExt_baseAnm mDoExt_baseAnm; + u32 field_0x14; +}; + +class mDoExt_bpkAnm { +public: +private: + mDoExt_baseAnm mDoExt_baseAnm; + u32 field_0x14; +}; + +class mDoExt_bckAnm { +public: +private: + mDoExt_baseAnm base_anm; + u8 field_0x14[4]; + u32 field_0x18; +}; + +class mDoExt_McaMorfCallBack1_c { +public: +private: + void* vtable; +}; + +#endif \ No newline at end of file diff --git a/include/variables.h b/include/variables.h index ec9b960eba..0bd3457ba9 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,14 +1,14 @@ #include "JSystem/JSupport/JSUList/JSUList.h" extern float lbl_80451D5C; -extern u8 lbl_80379234[0x64]; extern float lbl_80451D58; -extern u8 lbl_803A7270[24]; +extern u8 i_item_lst[24]; extern u8 lbl_80430188[16]; extern u8 lbl_80379235[16]; +extern u8 lbl_80379234[0x62]; extern char lbl_803739A0[0x310]; extern void* lbl_80451368; -extern u32 lbl_804514E0; +extern u32 _sRumbleSupported; extern u8 lbl_803C3384; struct m_cpadInfo; extern m_cpadInfo lbl_803DD2E8; diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp index 154aef414a..55376b0772 100644 --- a/src/d/d_item/d_item.cpp +++ b/src/d/d_item/d_item.cpp @@ -16,44 +16,44 @@ int checkItemGet(u8 item_id, int param_2) { } void item_func_HEART(void) { - g_dComIfG_gameInfo.give_item.hearts += lbl_80452BD8; - g_dComIfG_gameInfo.unk35[0xBE] = 0; + g_dComIfG_gameInfo.getPlayGiveItem().hearts += lbl_80452BD8; + g_dComIfG_gameInfo.getPlayUnkHeart() = 0; } void item_func_GREEN_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 1; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 1; } void item_func_BLUE_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 5; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 5; } void item_func_YELLOW_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 10; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 10; } void item_func_RED_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 20; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 20; } void item_func_PURPLE_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 50; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 50; } void item_func_ORANGE_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 100; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 100; } void item_func_SILVER_RUPEE(void) { - g_dComIfG_gameInfo.give_item.rupees += 200; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 200; } void item_func_S_MAGIC(void) { - g_dComIfG_gameInfo.give_item.magic += 4; + g_dComIfG_gameInfo.getPlayGiveItem().magic += 4; } void item_func_L_MAGIC(void) { - g_dComIfG_gameInfo.give_item.magic += 8; + g_dComIfG_gameInfo.getPlayGiveItem().magic += 8; } void item_func_BOMB_5(void) { @@ -73,23 +73,23 @@ void item_func_BOMB_30(void) { } void item_func_ARROW_10(void) { - g_dComIfG_gameInfo.give_item.arrows += 10; + g_dComIfG_gameInfo.getPlayGiveItem().arrows += 10; } void item_func_ARROW_20(void) { - g_dComIfG_gameInfo.give_item.arrows += 20; + g_dComIfG_gameInfo.getPlayGiveItem().arrows += 20; } void item_func_ARROW_30(void) { - g_dComIfG_gameInfo.give_item.arrows += 30; + g_dComIfG_gameInfo.getPlayGiveItem().arrows += 30; } void item_func_ARROW_1(void) { - g_dComIfG_gameInfo.give_item.arrows += 1; + g_dComIfG_gameInfo.getPlayGiveItem().arrows += 1; } void item_func_PACHINKO_SHOT(void) { - g_dComIfG_gameInfo.give_item.seeds += 50; + g_dComIfG_gameInfo.getPlayGiveItem().seeds += 50; } void item_func_WATER_BOMB_5(void) { @@ -125,8 +125,8 @@ void item_func_BOMB_INSECT_30(void) { } void item_func_RECOVER_FAILY(void) { - g_dComIfG_gameInfo.give_item.hearts += lbl_80452BDC; - g_dComIfG_gameInfo.unk35[0xBE] = 0; + g_dComIfG_gameInfo.getPlayGiveItem().hearts += lbl_80452BDC; + g_dComIfG_gameInfo.getPlayUnkHeart() = 0; } void item_func_TRIPLE_HEART(void) { @@ -134,11 +134,11 @@ void item_func_TRIPLE_HEART(void) { } void item_func_SMALL_KEY(void) { - g_dComIfG_gameInfo.give_item.small_keys += 1; + g_dComIfG_gameInfo.getPlayGiveItem().small_keys += 1; } void item_func_KAKERA_HEART(void) { - g_dComIfG_gameInfo.give_item.kakera_heart += 1; + g_dComIfG_gameInfo.getPlayGiveItem().kakera_heart += 1; } asm void item_func_UTUWA_HEART(void) { @@ -218,8 +218,8 @@ void item_func_WEAR_ZORA(void) { } void item_func_MAGIC_LV1(void) { - g_dComIfG_gameInfo.give_item.magic += 16; - g_dComIfG_gameInfo.give_item.magic_lv += 16; + g_dComIfG_gameInfo.getPlayGiveItem().magic += 16; + g_dComIfG_gameInfo.getPlayGiveItem().magic_lv += 16; } void item_func_DUNGEON_EXIT_2(void) { @@ -329,7 +329,7 @@ void item_func_FISHING_ROD_1(void) { } void item_func_PACHINKO(void) { - g_dComIfG_gameInfo.give_item.seeds += 50; + g_dComIfG_gameInfo.getPlayGiveItem().seeds += 50; g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(SLOT_23, PACHINKO); } @@ -811,11 +811,11 @@ void item_func_LV7_DUNGEON_EXIT(void) { } void item_func_LINKS_SAVINGS(void) { - g_dComIfG_gameInfo.give_item.rupees += 50; + g_dComIfG_gameInfo.getPlayGiveItem().rupees += 50; } void item_func_SMALL_KEY2(void) { - g_dComIfG_gameInfo.give_item.small_keys += 1; + g_dComIfG_gameInfo.getPlayGiveItem().small_keys += 1; } void item_func_POU_FIRE1(void) { @@ -879,7 +879,7 @@ void item_func_LV2_BOSS_KEY(void) { } void item_func_KEY_OF_FILONE(void) { - g_dComIfG_gameInfo.give_item.small_keys += 1; + g_dComIfG_gameInfo.getPlayGiveItem().small_keys += 1; } void item_func_noentry(void) { diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 79db598944..146a8d9411 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -248,16 +248,16 @@ void dSv_player_item_c::init(void) { } } -void dSv_player_item_c::setItem(int current_items_index, u8 new_items_index) { - if (current_items_index < MAX_ITEM_SLOTS) { - this->mItems[current_items_index] = new_items_index; +void dSv_player_item_c::setItem(int item_slot, u8 item_id) { + if (item_slot < MAX_ITEM_SLOTS) { + this->mItems[item_slot] = item_id; this->setLineUpItem(); } int select_item_index = DEFAULT_SELECT_ITEM_INDEX; do { - if (current_items_index == + if (item_slot == g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex( select_item_index)) { dComIfGp_setSelectItem(select_item_index); @@ -271,62 +271,69 @@ u8 dSv_player_item_c::getItem(int param_1, bool param_2) const { int IVar1; int IVar2; u8 current_select_item_index; + int select_item_index; if (param_1 < 0x18) { - if (param_2 != false) { - for (int select_item_index = 0; select_item_index < 2; select_item_index++) { - current_select_item_index = getSelectItemIndex(select_item_index); - if (((param_1 == (current_select_item_index)) || - (current_select_item_index = dComIfGs_getMixItemIndex(select_item_index), - param_1 == (current_select_item_index))) && - (current_select_item_index = dComIfGs_getMixItemIndex(select_item_index), - (current_select_item_index) != NO_ITEM)) { - current_select_item_index = getSelectItemIndex(select_item_index); - IVar1 = items[current_select_item_index]; - current_select_item_index = dComIfGs_getMixItemIndex(select_item_index); - IVar2 = items[current_select_item_index]; - if (((IVar1 == BOW) && (IVar2 == NORMAL_BOMB)) || - ((IVar2 == BOW && (IVar1 == NORMAL_BOMB)))) { - return 0x59; - } - if (((IVar1 == BOW) && (IVar2 == WATER_BOMB)) || - ((IVar2 == BOW && (IVar1 == WATER_BOMB)))) { - return 0x59; - } - if (((IVar1 == BOW) && (IVar2 == POKE_BOMB)) || - ((IVar2 == BOW && (IVar1 == POKE_BOMB)))) { - return 0x59; - } - if (((IVar1 == BOW) && (IVar2 == HAWK_EYE)) || - ((IVar2 == BOW && (IVar1 == HAWK_EYE)))) { - return 0x5a; - } - if (((IVar1 == FISHING_ROD_1) && (IVar2 == BEE_CHILD)) || - ((IVar2 == FISHING_ROD_1 && (IVar1 == BEE_CHILD)))) { - return 0x5b; - } - if (((IVar1 == FISHING_ROD_1) && (IVar2 == ZORAS_JEWEL)) || - ((IVar2 == FISHING_ROD_1 && (IVar1 == ZORAS_JEWEL)))) { - return 0x5c; - } - if (((IVar1 == FISHING_ROD_1) && (IVar2 == WORM)) || - ((IVar2 == FISHING_ROD_1 && (IVar1 == WORM)))) { - return 0x5d; - } - if (((select_item_index == 0x3) && - (current_select_item_index = getSelectItemIndex(0x3), - (current_select_item_index & 0xff) == 0x0)) && - (current_select_item_index = dComIfGs_getMixItemIndex(0x3), - (current_select_item_index & 0xff) == 0x0)) { - dComIfGs_setSelectItemIndex(0x3, -0x1); - dComIfGs_setMixItemIndex(0x3, -0x1); - return 0xff; - } - OSReport_Error(lbl_8037923d, (unsigned int)IVar1, (unsigned int)IVar2); + if (!param_2) { + select_item_index = 0; + do { + current_select_item_index = + g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex( + select_item_index) + }; + if (((param_1 == (current_select_item_index)) || + (dComIfGs_getMixItemIndex(select_item_index), + param_1 == (current_select_item_index))) && + (dComIfGs_getMixItemIndex(select_item_index), + (current_select_item_index) != NO_ITEM)) { + current_select_item_index = + g_dComIfG_gameInfo.info.getSaveFile().getPlayerStatusA().getSelectItemIndex( + select_item_index); + IVar1 = mItems[current_select_item_index]; + dComIfGs_getMixItemIndex(select_item_index); + IVar2 = mItems[current_select_item_index]; + if (((IVar1 == BOW) && (IVar2 == NORMAL_BOMB)) || + ((IVar2 == BOW && (IVar1 == NORMAL_BOMB)))) { + return 0x59; } + if (((IVar1 == BOW) && (IVar2 == WATER_BOMB)) || + ((IVar2 == BOW && (IVar1 == WATER_BOMB)))) { + return 0x59; + } + if (((IVar1 == BOW) && (IVar2 == POKE_BOMB)) || + ((IVar2 == BOW && (IVar1 == POKE_BOMB)))) { + return 0x59; + } + if (((IVar1 == BOW) && (IVar2 == HAWK_EYE)) || + ((IVar2 == BOW && (IVar1 == HAWK_EYE)))) { + return 0x5a; + } + if (((IVar1 == FISHING_ROD_1) && (IVar2 == BEE_CHILD)) || + ((IVar2 == FISHING_ROD_1 && (IVar1 == BEE_CHILD)))) { + return 0x5b; + } + if (((IVar1 == FISHING_ROD_1) && (IVar2 == ZORAS_JEWEL)) || + ((IVar2 == FISHING_ROD_1 && (IVar1 == ZORAS_JEWEL)))) { + return 0x5c; + } + if (((IVar1 == FISHING_ROD_1) && (IVar2 == WORM)) || + ((IVar2 == FISHING_ROD_1 && (IVar1 == WORM)))) { + return 0x5d; + } + if (((select_item_index == 0x3) && + (current_select_item_index = g_dComIfG_gameInfo.info.getSaveFile() + .getPlayerStatusA() + .getSelectItemIndex(0x3), + (current_select_item_index & 0xff) == 0x0)) && + (dComIfGs_getMixItemIndex(0x3), (current_select_item_index & 0xff) == 0x0)) { + dComIfGs_setSelectItemIndex(0x3, -0x1); + dComIfGs_setMixItemIndex(0x3, -0x1); + return 0xff; + } + OSReport_Error((char*)lbl_80379234 + 9, (unsigned int)IVar1, (unsigned int)IVar2); } } - current_select_item_index = (unsigned int)items[param_1]; + current_select_item_index = (unsigned int)mItems[param_1]; } else { current_select_item_index = NO_ITEM; } @@ -342,19 +349,16 @@ asm u8 dSv_player_item_c::getItem(int param_1, bool param_2) const { // this is close #ifdef NONMATCHING void dSv_player_item_c::setLineUpItem(void) { - u8* i_item_lst; - for (int i = 0; i < 24; i++) { - item_slots[i] = 0xFF; + this->mItemSlots[i] = NO_ITEM; } - i_item_lst = lbl_803A7270; - for (int i = 0; i < 23; i++) { - if (items[*i_item_lst] != 0xFF) { - item_slots[i] = *i_item_lst; + for (int j = 0; j < 24; j++) { + if (this->mItems[i_item_lst[j]] != NO_ITEM) { + this->mItemSlots[i] = i_item_lst[j]; + } } - i_item_lst++; } } #else @@ -406,8 +410,8 @@ asm void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2) { // this is 1 instruction off #ifdef NONMATCHING void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id) { - u8 item_id = (dSv_item_rename(i_item_id)); - setBottleItemIn(96, item_id); + this->setBottleItemIn(EMPTY_BOTTLE, dSv_item_rename(i_item_id)); + return; } #else asm void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id) { @@ -416,15 +420,42 @@ asm void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id) { } #endif +// r30 and r31 registers swapped +#ifdef NONMATCHING +void dSv_player_item_c::setEmptyBottle(void) { + for (int i = 0; i < 4; i++) { + if (g_dComIfG_gameInfo.info.getSaveFile().getPlayerItem().getItem((u8)(i + 11), true) == + NO_ITEM) { + g_dComIfG_gameInfo.info.getSaveFile().getPlayerItem().setItem((u8)(i + 11), + EMPTY_BOTTLE); + return; + } + } +} +#else asm void dSv_player_item_c::setEmptyBottle(void) { nofralloc #include "d/d_save/d_save/asm/func_80033494.s" } +#endif -asm void dSv_player_item_c::setEmptyBottle(u8) { +// same issue as the one above this +#ifdef NONMATCHING +void dSv_player_item_c::setEmptyBottle(u8 item_id) { + for (int i = 0; i < 4; i++) { + if (g_dComIfG_gameInfo.info.getSaveFile().getPlayerItem().getItem((u8)(i + 11), true) == + NO_ITEM) { + g_dComIfG_gameInfo.info.getSaveFile().getPlayerItem().setItem((u8)(i + 11), item_id); + return; + } + } +} +#else +asm void dSv_player_item_c::setEmptyBottle(u8 item_id) { nofralloc #include "d/d_save/d_save/asm/func_80033514.s" } +#endif asm void dSv_player_item_c::setEquipBottleItemIn(u8, u8) { nofralloc @@ -447,10 +478,28 @@ u8 dSv_player_item_c::checkBottle(u8 i_item_id) { } return num_bottles; } +extern u16 lbl_803a7288[0x336]; -asm u8 dSv_player_item_c::checkInsectBottle(void){nofralloc +// close, registers swapped +#ifdef NONMATCHING +int dSv_player_item_c::checkInsectBottle(void) { + int j = 0; + for (int i = 0; i < 0x18; i++) { + if (!g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(192 + i) || + g_dComIfG_gameInfo.info.getSaveFile().getEventFlags().isEventBit( + lbl_803a7288[0x191 + j])) { + return 1; + } + j += 1; + } + return 0; +} +#else +asm int dSv_player_item_c::checkInsectBottle(void) { + nofralloc #include "d/d_save/d_save/asm/func_80033754.s" } +#endif u8 dSv_player_item_c::checkEmptyBottle(void) { u8 num = 0; @@ -550,19 +599,24 @@ void dSv_player_item_c::setRodTypeLevelUp(void) { } // this is a few instructions off -#ifdef NONMATCHING void dSv_player_item_c::setBaitItem(u8 param_1) { switch (param_1) { case BEE_CHILD: { - isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_BEE_ROD : this->mItems[SLOT_20] = BEE_ROD; + g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(ZORAS_JEWEL) ? + this->mItems[SLOT_20] = JEWEL_BEE_ROD : + this->mItems[SLOT_20] = BEE_ROD; break; } case WORM: { - isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_WORM_ROD : this->mItems[SLOT_20] = WORM_ROD; + g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(ZORAS_JEWEL) ? + this->mItems[SLOT_20] = JEWEL_WORM_ROD : + this->mItems[SLOT_20] = WORM_ROD; break; } case NO_ITEM: { - isFirstBit(61) ? this->mItems[SLOT_20] = JEWEL_ROD : this->mItems[SLOT_20] = FISHING_ROD_1; + g_dComIfG_gameInfo.info.getSaveFile().getPlayerGetItem().isFirstBit(ZORAS_JEWEL) ? + this->mItems[SLOT_20] = JEWEL_ROD : + this->mItems[SLOT_20] = FISHING_ROD_1; break; } } @@ -571,12 +625,6 @@ void dSv_player_item_c::setBaitItem(u8 param_1) { dComIfGp_setSelectItem(i); } } -#else -asm void dSv_player_item_c::setBaitItem(u8 param_1) { - nofralloc -#include "d/d_save/d_save/asm/func_80033D40.s" -} -#endif void dSv_player_get_item_c::init(void) { for (int i = 0; i < 8; i++) { @@ -587,8 +635,10 @@ void dSv_player_get_item_c::init(void) { // this is a few instructions off #ifdef NONMATCHING void dSv_player_get_item_c::onFirstBit(u8 i_itemno) { - int uVar1 = ((int)i_itemno & 0xe0) >> 0x3; - this->mPauseMenuBitFields[uVar1] |= (u32)(1 << (i_itemno & 0x1F)); + int tmp = (int)i_itemno; + int tmp2 = (i_itemno >> 3) & 0xE0; + // int uVar1 = ; + this->mPauseMenuBitFields[tmp2] |= 1 << (tmp & 0x1F); } #else asm void dSv_player_get_item_c::onFirstBit(u8) { @@ -886,17 +936,9 @@ void dSv_player_config_c::init(void) { this->unk11 = 1; } -// a few instructions off -#ifdef NONMATCHING u32 dSv_player_config_c::checkVibration(void) const { - return _sRumbleSupported & 0x80000000 ? getNowVibration() : 0; + return _sRumbleSupported & 0x80000000 ? g_dComIfG_gameInfo.play.getNowVibration() : 0; } -#else -asm u32 dSv_player_config_c::checkVibration(void) const { - nofralloc -#include "d/d_save/d_save/asm/func_80034644.s" -} -#endif u8 dSv_player_config_c::getSound(void) { return this->mSoundMode; @@ -1016,7 +1058,6 @@ void dSv_event_c::offEventBit(u16 i_no) { this->events[(i_no >> 8)] &= ~(u8)i_no; } -// (u8) cast doesn't work here, thank u metrowerks BOOL dSv_event_c::isEventBit(u16 i_no) const { return this->events[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE; } @@ -1410,15 +1451,73 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) { this->zones[zoneNo].getZoneActor().off(i_id); } +// somewhat close +#ifdef NONMATCHING +BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { + if (i_id == -1 || i_id == dSv_zoneActor_c::ACTOR_MAX || i_roomNo == -1) { + return FALSE; + } + + int ActorZoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_id); + return this->zones[ActorZoneNo].getZoneActor().is(i_id); +} +#else asm BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { nofralloc #include "d/d_save/d_save/asm/func_80035724.s" } +#endif +#ifdef NONMATCHING +extern u8 lbl_803F6094[0x10100]; +void dSv_info_c::memory_to_card(char* param_1, int param_2) { + BOOL bVar1 = FALSE; + int uVar12 = 0; + BOOL bVar6 = dComIfGs_isEventBit(0x1B08); + if (!tmp) { + BOOL bVar7 = dComIfGs_isEventBit(0x1B20); + BOOL tmp = bVar7; + bVar7 = dComIfGs_isEventBit(0x1B10); + BOOL tmp2 = bVar7; + dComIfGs_offEventBit(0x1B20); + dComIfGs_offEventBit(0x1B10); + } + + BOOL iVar4 = dComIfGs_isItemFirstBit(KANTERA); + + if (iVar4) { + dComIfGs_setItem(SLOT_1, KANTERA); + u16 current_lantern_oil = dComIfGs_getOil(); + u8 oil_gauge_backup = dMeter2Info_getOilGaugeBackUp(); + dComIfGs_setOil(oil_gauge_backup & 0xFFFF); + bVar1 = TRUE; + } + + int uVar3 = g_dComIfG_gameInfo + 0xF2C; + int iVar2 = g_dComIfG_gameInfo + 0xF28; + + u32* ptr = lbl_803F6094 + 0x9f6c; + OSTime time = OSGetTime(); + + OSTime newTime = time >> 0x20; + int newTime2 = newTime - uVar3; + + int newTime3 = newTime2 + g_dComIfG_gameInfo + + 0xF30 + + int newTime4 = g_dComIfG_gameInfo + 0xF78 + + s64 sVar13 = __div2i((int)((ulonglong)uVar8 >> 0x20), (int)uVar8, + 0x0, _DAT_800000f8 >> 0x2); + + BOOL bVar7 = +} +#else asm void dSv_info_c::memory_to_card(char*, int) { nofralloc #include "d/d_save/d_save/asm/func_80035798.s" } +#endif asm void dSv_info_c::card_to_memory(char*, int) { nofralloc diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 0966b178ca..e89d656541 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -65,7 +65,8 @@ asm void CheckHeap(u32 param_1) { } #endif -asm int countUsed(JKRExpHeap* heap){nofralloc +asm int countUsed(JKRExpHeap* heap) { + nofralloc #include "m_Do/m_Do_main/asm/func_80005848.s" }