From 6a16bef70ea98b2b8ed553ddd37439bdb6513b04 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Tue, 29 Dec 2020 15:39:36 -0700 Subject: [PATCH] d_lib split and partially matched (#30) * d_lib split and partially matched * clang-format * modify some extern labels * clang-format Co-authored-by: Pheenoh --- asm/d/d_camera.s | 2 +- asm/d/d_event.s | 4 +- asm/d/d_lib.s | 654 ------------------ asm/d/d_name.s | 20 +- asm/d/d_stage.s | 2 +- asm/d/d_timer.s | 16 +- asm/d/ev/d_ev_camera.s | 2 +- asm/d/event/d_event_data.s | 2 +- asm/d/file/d_file_select.s | 32 +- asm/d/menu/d_menu_collect.s | 10 +- asm/d/menu/d_menu_dmap.s | 18 +- asm/d/menu/d_menu_fmap.s | 10 +- asm/d/menu/d_menu_insect.s | 16 +- asm/d/menu/d_menu_letter.s | 4 +- asm/d/menu/d_menu_option.s | 16 +- asm/d/menu/d_menu_save.s | 20 +- asm/d/menu/d_menu_skill.s | 4 +- asm/d/menu/d_menu_window.s | 10 +- asm/d/menu/item/d_menu_item_explain.s | 6 +- asm/d/msg/d_msg_class.s | 24 +- asm/d/msg/scrn/d_msg_scrn_explain.s | 6 +- asm/d/pane/d_pane_class.s | 2 +- asm/d/shop/d_shop_system.s | 18 +- asm/f/pc/f_pc_manager.s | 4 +- include/d/d_a/d_a_alink/d_a_alink.h | 7 +- include/d/d_event/d_event/d_event.h | 1 + .../d/d_lib/asm/CSTControl_NS_getAngleStick.s | 4 + .../d/d_lib/asm/CSTControl_NS_getValueStick.s | 4 + include/d/d_lib/asm/STControl.s | 17 + include/d/d_lib/asm/STControl_NS_Xinit.s | 12 + include/d/d_lib/asm/STControl_NS_Yinit.s | 12 + .../d_lib/asm/STControl_NS_checkDownTrigger.s | 34 + .../d_lib/asm/STControl_NS_checkLeftTrigger.s | 34 + .../asm/STControl_NS_checkRightTrigger.s | 34 + .../d/d_lib/asm/STControl_NS_checkTrigger.s | 184 +++++ .../d/d_lib/asm/STControl_NS_checkUpTrigger.s | 34 + include/d/d_lib/asm/STControl_NS_init.s | 20 + .../d/d_lib/asm/STControl_NS_setWaitParm.s | 9 + .../d/d_lib/asm/dLib_checkActorInRectangle.s | 59 ++ include/d/d_lib/asm/dLib_getEventSwitchNo.s | 16 + .../asm/dLib_getExpandSizeFromAramArchive.s | 53 ++ include/d/d_lib/asm/dLib_time_c_NS_getTime.s | 33 + .../d/d_lib/asm/dLib_time_c_NS_startTime.s | 24 + include/d/d_lib/asm/dLib_time_c_NS_stopTime.s | 16 + include/d/d_lib/asm/getAngleStick.s | 4 + include/d/d_lib/asm/getValueStick.s | 4 + include/d/d_lib/d_lib.h | 86 +++ include/functions.h | 8 +- include/variables.h | 23 +- ldscript.lcf | 7 + obj_files.mk | 2 +- src/d/d_lib.cpp | 193 +++++- 52 files changed, 1047 insertions(+), 789 deletions(-) delete mode 100644 asm/d/d_lib.s create mode 100644 include/d/d_lib/asm/CSTControl_NS_getAngleStick.s create mode 100644 include/d/d_lib/asm/CSTControl_NS_getValueStick.s create mode 100644 include/d/d_lib/asm/STControl.s create mode 100644 include/d/d_lib/asm/STControl_NS_Xinit.s create mode 100644 include/d/d_lib/asm/STControl_NS_Yinit.s create mode 100644 include/d/d_lib/asm/STControl_NS_checkDownTrigger.s create mode 100644 include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s create mode 100644 include/d/d_lib/asm/STControl_NS_checkRightTrigger.s create mode 100644 include/d/d_lib/asm/STControl_NS_checkTrigger.s create mode 100644 include/d/d_lib/asm/STControl_NS_checkUpTrigger.s create mode 100644 include/d/d_lib/asm/STControl_NS_init.s create mode 100644 include/d/d_lib/asm/STControl_NS_setWaitParm.s create mode 100644 include/d/d_lib/asm/dLib_checkActorInRectangle.s create mode 100644 include/d/d_lib/asm/dLib_getEventSwitchNo.s create mode 100644 include/d/d_lib/asm/dLib_getExpandSizeFromAramArchive.s create mode 100644 include/d/d_lib/asm/dLib_time_c_NS_getTime.s create mode 100644 include/d/d_lib/asm/dLib_time_c_NS_startTime.s create mode 100644 include/d/d_lib/asm/dLib_time_c_NS_stopTime.s create mode 100644 include/d/d_lib/asm/getAngleStick.s create mode 100644 include/d/d_lib/asm/getValueStick.s create mode 100644 include/d/d_lib/d_lib.h diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index 440b946e6d9..a5f05fd4c66 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -35014,7 +35014,7 @@ lbl_8017FE34: /* 8017FE78 0017CDB8 2C 00 FF FF */ cmpwi r0, -1 /* 8017FE7C 0017CDBC 41 82 00 10 */ beq lbl_8017FE8C /* 8017FE80 0017CDC0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8017FE84 0017CDC4 4B EC 36 55 */ bl dEvt_control_c_NS_searchMapEventData +/* 8017FE84 0017CDC4 4B EC 36 55 */ bl searchMapEventData__14dEvt_control_cFUc /* 8017FE88 0017CDC8 90 7D 05 D4 */ stw r3, 0x5d4(r29) lbl_8017FE8C: /* 8017FE8C 0017CDCC 80 7D 05 D4 */ lwz r3, 0x5d4(r29) diff --git a/asm/d/d_event.s b/asm/d/d_event.s index 45979a4836f..25d94dddb73 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -2391,8 +2391,8 @@ dEvt_info_c_NS_beforeProc: /* 800434D0 00040410 B0 03 00 06 */ sth r0, 6(r3) /* 800434D4 00040414 4E 80 00 20 */ blr -.global dEvt_control_c_NS_searchMapEventData -dEvt_control_c_NS_searchMapEventData: +.global searchMapEventData__14dEvt_control_cFUc +searchMapEventData__14dEvt_control_cFUc: /* 800434D8 00040418 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800434DC 0004041C 7C 08 02 A6 */ mflr r0 /* 800434E0 00040420 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/d/d_lib.s b/asm/d/d_lib.s deleted file mode 100644 index f7cc96e0ccc..00000000000 --- a/asm/d/d_lib.s +++ /dev/null @@ -1,654 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 80032044 - - -.global STControl -STControl: -/* 80032044 0002EF84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032048 0002EF88 7C 08 02 A6 */ mflr r0 -/* 8003204C 0002EF8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032050 0002EF90 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80032054 0002EF94 7C 7F 1B 78 */ mr r31, r3 -/* 80032058 0002EF98 3D 40 80 3A */ lis r10, lbl_803A7260@ha -/* 8003205C 0002EF9C 38 0A 72 60 */ addi r0, r10, lbl_803A7260@l -/* 80032060 0002EFA0 90 03 00 00 */ stw r0, 0(r3) -/* 80032064 0002EFA4 48 00 00 25 */ bl STControl_NS_setWaitParm -/* 80032068 0002EFA8 7F E3 FB 78 */ mr r3, r31 -/* 8003206C 0002EFAC 48 00 00 41 */ bl STControl_NS_init -/* 80032070 0002EFB0 7F E3 FB 78 */ mr r3, r31 -/* 80032074 0002EFB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80032078 0002EFB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003207C 0002EFBC 7C 08 03 A6 */ mtlr r0 -/* 80032080 0002EFC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032084 0002EFC4 4E 80 00 20 */ blr - -.global STControl_NS_setWaitParm -STControl_NS_setWaitParm: -/* 80032088 0002EFC8 B0 83 00 12 */ sth r4, 0x12(r3) -/* 8003208C 0002EFCC B0 A3 00 14 */ sth r5, 0x14(r3) -/* 80032090 0002EFD0 B0 C3 00 16 */ sth r6, 0x16(r3) -/* 80032094 0002EFD4 B0 E3 00 1C */ sth r7, 0x1c(r3) -/* 80032098 0002EFD8 D0 23 00 04 */ stfs f1, 4(r3) -/* 8003209C 0002EFDC D0 43 00 08 */ stfs f2, 8(r3) -/* 800320A0 0002EFE0 B1 03 00 24 */ sth r8, 0x24(r3) -/* 800320A4 0002EFE4 B1 23 00 26 */ sth r9, 0x26(r3) -/* 800320A8 0002EFE8 4E 80 00 20 */ blr - -.global STControl_NS_init -STControl_NS_init: -/* 800320AC 0002EFEC 38 80 00 00 */ li r4, 0 -/* 800320B0 0002EFF0 B0 83 00 0E */ sth r4, 0xe(r3) -/* 800320B4 0002EFF4 B0 83 00 10 */ sth r4, 0x10(r3) -/* 800320B8 0002EFF8 98 83 00 0D */ stb r4, 0xd(r3) -/* 800320BC 0002EFFC 98 83 00 0C */ stb r4, 0xc(r3) -/* 800320C0 0002F000 B0 83 00 22 */ sth r4, 0x22(r3) -/* 800320C4 0002F004 A8 03 00 12 */ lha r0, 0x12(r3) -/* 800320C8 0002F008 B0 03 00 18 */ sth r0, 0x18(r3) -/* 800320CC 0002F00C A8 03 00 12 */ lha r0, 0x12(r3) -/* 800320D0 0002F010 B0 03 00 1A */ sth r0, 0x1a(r3) -/* 800320D4 0002F014 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 800320D8 0002F018 B0 03 00 1E */ sth r0, 0x1e(r3) -/* 800320DC 0002F01C A8 03 00 1C */ lha r0, 0x1c(r3) -/* 800320E0 0002F020 B0 03 00 20 */ sth r0, 0x20(r3) -/* 800320E4 0002F024 B0 83 00 28 */ sth r4, 0x28(r3) -/* 800320E8 0002F028 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800320EC 0002F02C B0 03 00 2A */ sth r0, 0x2a(r3) -/* 800320F0 0002F030 A8 03 00 28 */ lha r0, 0x28(r3) -/* 800320F4 0002F034 B0 03 00 2C */ sth r0, 0x2c(r3) -/* 800320F8 0002F038 4E 80 00 20 */ blr - -.global STControl_NS_Xinit -STControl_NS_Xinit: -/* 800320FC 0002F03C 38 00 00 00 */ li r0, 0 -/* 80032100 0002F040 B0 03 00 0E */ sth r0, 0xe(r3) -/* 80032104 0002F044 88 03 00 0C */ lbz r0, 0xc(r3) -/* 80032108 0002F048 54 00 06 3A */ rlwinm r0, r0, 0, 0x18, 0x1d -/* 8003210C 0002F04C 98 03 00 0C */ stb r0, 0xc(r3) -/* 80032110 0002F050 A8 03 00 12 */ lha r0, 0x12(r3) -/* 80032114 0002F054 B0 03 00 18 */ sth r0, 0x18(r3) -/* 80032118 0002F058 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 8003211C 0002F05C B0 03 00 1E */ sth r0, 0x1e(r3) -/* 80032120 0002F060 A8 03 00 28 */ lha r0, 0x28(r3) -/* 80032124 0002F064 B0 03 00 2A */ sth r0, 0x2a(r3) -/* 80032128 0002F068 4E 80 00 20 */ blr - -.global STControl_NS_Yinit -STControl_NS_Yinit: -/* 8003212C 0002F06C 38 00 00 00 */ li r0, 0 -/* 80032130 0002F070 B0 03 00 10 */ sth r0, 0x10(r3) -/* 80032134 0002F074 88 03 00 0C */ lbz r0, 0xc(r3) -/* 80032138 0002F078 54 00 07 B6 */ rlwinm r0, r0, 0, 0x1e, 0x1b -/* 8003213C 0002F07C 98 03 00 0C */ stb r0, 0xc(r3) -/* 80032140 0002F080 A8 03 00 12 */ lha r0, 0x12(r3) -/* 80032144 0002F084 B0 03 00 1A */ sth r0, 0x1a(r3) -/* 80032148 0002F088 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 8003214C 0002F08C B0 03 00 20 */ sth r0, 0x20(r3) -/* 80032150 0002F090 A8 03 00 28 */ lha r0, 0x28(r3) -/* 80032154 0002F094 B0 03 00 2C */ sth r0, 0x2c(r3) -/* 80032158 0002F098 4E 80 00 20 */ blr -/* 8003215C 0002F09C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha -/* 80032160 0002F0A0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l -/* 80032164 0002F0A4 C0 23 00 08 */ lfs f1, 8(r3) -/* 80032168 0002F0A8 4E 80 00 20 */ blr -/* 8003216C 0002F0AC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha -/* 80032170 0002F0B0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l -/* 80032174 0002F0B4 A8 63 00 0C */ lha r3, 0xc(r3) -/* 80032178 0002F0B8 4E 80 00 20 */ blr -/* 8003217C 0002F0BC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha -/* 80032180 0002F0C0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l -/* 80032184 0002F0C4 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 80032188 0002F0C8 4E 80 00 20 */ blr -/* 8003218C 0002F0CC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha -/* 80032190 0002F0D0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l -/* 80032194 0002F0D4 A8 63 00 1C */ lha r3, 0x1c(r3) -/* 80032198 0002F0D8 4E 80 00 20 */ blr - -.global STControl_NS_checkTrigger -STControl_NS_checkTrigger: -/* 8003219C 0002F0DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800321A0 0002F0E0 7C 08 02 A6 */ mflr r0 -/* 800321A4 0002F0E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800321A8 0002F0E8 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800321AC 0002F0EC F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 -/* 800321B0 0002F0F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800321B4 0002F0F4 7C 7F 1B 78 */ mr r31, r3 -/* 800321B8 0002F0F8 88 03 00 0C */ lbz r0, 0xc(r3) -/* 800321BC 0002F0FC 98 03 00 0D */ stb r0, 0xd(r3) -/* 800321C0 0002F100 81 83 00 00 */ lwz r12, 0(r3) -/* 800321C4 0002F104 81 8C 00 08 */ lwz r12, 8(r12) -/* 800321C8 0002F108 7D 89 03 A6 */ mtctr r12 -/* 800321CC 0002F10C 4E 80 04 21 */ bctrl -/* 800321D0 0002F110 FF E0 08 90 */ fmr f31, f1 -/* 800321D4 0002F114 7F E3 FB 78 */ mr r3, r31 -/* 800321D8 0002F118 81 9F 00 00 */ lwz r12, 0(r31) -/* 800321DC 0002F11C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 800321E0 0002F120 7D 89 03 A6 */ mtctr r12 -/* 800321E4 0002F124 4E 80 04 21 */ bctrl -/* 800321E8 0002F128 38 C0 00 00 */ li r6, 0 -/* 800321EC 0002F12C A8 1F 00 26 */ lha r0, 0x26(r31) -/* 800321F0 0002F130 20 00 20 00 */ subfic r0, r0, 0x2000 -/* 800321F4 0002F134 7C 00 0E 70 */ srawi r0, r0, 1 -/* 800321F8 0002F138 7C 07 07 34 */ extsh r7, r0 -/* 800321FC 0002F13C FC 00 FA 10 */ fabs f0, f31 -/* 80032200 0002F140 FC 20 00 18 */ frsp f1, f0 -/* 80032204 0002F144 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 80032208 0002F148 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8003220C 0002F14C 41 80 01 98 */ blt lbl_800323A4 -/* 80032210 0002F150 7C 65 07 34 */ extsh r5, r3 -/* 80032214 0002F154 A8 9F 00 22 */ lha r4, 0x22(r31) -/* 80032218 0002F158 7C 64 3A 14 */ add r3, r4, r7 -/* 8003221C 0002F15C 38 03 90 00 */ addi r0, r3, -28672 -/* 80032220 0002F160 7C 05 00 00 */ cmpw r5, r0 -/* 80032224 0002F164 40 80 00 10 */ bge lbl_80032234 -/* 80032228 0002F168 60 C0 00 04 */ ori r0, r6, 4 -/* 8003222C 0002F16C 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80032230 0002F170 48 00 00 C4 */ b lbl_800322F4 -lbl_80032234: -/* 80032234 0002F174 38 04 B0 00 */ addi r0, r4, -20480 -/* 80032238 0002F178 7C 07 00 50 */ subf r0, r7, r0 -/* 8003223C 0002F17C 7C 05 00 00 */ cmpw r5, r0 -/* 80032240 0002F180 40 80 00 10 */ bge lbl_80032250 -/* 80032244 0002F184 60 C0 00 05 */ ori r0, r6, 5 -/* 80032248 0002F188 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 8003224C 0002F18C 48 00 00 A8 */ b lbl_800322F4 -lbl_80032250: -/* 80032250 0002F190 38 03 D0 00 */ addi r0, r3, -12288 -/* 80032254 0002F194 7C 05 00 00 */ cmpw r5, r0 -/* 80032258 0002F198 40 80 00 10 */ bge lbl_80032268 -/* 8003225C 0002F19C 60 C0 00 01 */ ori r0, r6, 1 -/* 80032260 0002F1A0 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80032264 0002F1A4 48 00 00 90 */ b lbl_800322F4 -lbl_80032268: -/* 80032268 0002F1A8 38 04 F0 00 */ addi r0, r4, -4096 -/* 8003226C 0002F1AC 7C 07 00 50 */ subf r0, r7, r0 -/* 80032270 0002F1B0 7C 05 00 00 */ cmpw r5, r0 -/* 80032274 0002F1B4 40 80 00 10 */ bge lbl_80032284 -/* 80032278 0002F1B8 60 C0 00 09 */ ori r0, r6, 9 -/* 8003227C 0002F1BC 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80032280 0002F1C0 48 00 00 74 */ b lbl_800322F4 -lbl_80032284: -/* 80032284 0002F1C4 38 03 10 00 */ addi r0, r3, 0x1000 -/* 80032288 0002F1C8 7C 05 00 00 */ cmpw r5, r0 -/* 8003228C 0002F1CC 40 80 00 10 */ bge lbl_8003229C -/* 80032290 0002F1D0 60 C0 00 08 */ ori r0, r6, 8 -/* 80032294 0002F1D4 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80032298 0002F1D8 48 00 00 5C */ b lbl_800322F4 -lbl_8003229C: -/* 8003229C 0002F1DC 38 04 30 00 */ addi r0, r4, 0x3000 -/* 800322A0 0002F1E0 7C 07 00 50 */ subf r0, r7, r0 -/* 800322A4 0002F1E4 7C 05 00 00 */ cmpw r5, r0 -/* 800322A8 0002F1E8 40 80 00 10 */ bge lbl_800322B8 -/* 800322AC 0002F1EC 60 C0 00 0A */ ori r0, r6, 0xa -/* 800322B0 0002F1F0 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 800322B4 0002F1F4 48 00 00 40 */ b lbl_800322F4 -lbl_800322B8: -/* 800322B8 0002F1F8 38 03 50 00 */ addi r0, r3, 0x5000 -/* 800322BC 0002F1FC 7C 05 00 00 */ cmpw r5, r0 -/* 800322C0 0002F200 40 80 00 10 */ bge lbl_800322D0 -/* 800322C4 0002F204 60 C0 00 02 */ ori r0, r6, 2 -/* 800322C8 0002F208 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 800322CC 0002F20C 48 00 00 28 */ b lbl_800322F4 -lbl_800322D0: -/* 800322D0 0002F210 38 04 70 00 */ addi r0, r4, 0x7000 -/* 800322D4 0002F214 7C 07 00 50 */ subf r0, r7, r0 -/* 800322D8 0002F218 7C 05 00 00 */ cmpw r5, r0 -/* 800322DC 0002F21C 40 80 00 10 */ bge lbl_800322EC -/* 800322E0 0002F220 60 C0 00 06 */ ori r0, r6, 6 -/* 800322E4 0002F224 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 800322E8 0002F228 48 00 00 0C */ b lbl_800322F4 -lbl_800322EC: -/* 800322EC 0002F22C 60 C0 00 04 */ ori r0, r6, 4 -/* 800322F0 0002F230 54 06 06 3E */ clrlwi r6, r0, 0x18 -lbl_800322F4: -/* 800322F4 0002F234 C0 1F 00 04 */ lfs f0, 4(r31) -/* 800322F8 0002F238 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 800322FC 0002F23C 4C 41 13 82 */ cror 2, 1, 2 -/* 80032300 0002F240 40 82 00 0C */ bne lbl_8003230C -/* 80032304 0002F244 98 DF 00 0C */ stb r6, 0xc(r31) -/* 80032308 0002F248 48 00 00 28 */ b lbl_80032330 -lbl_8003230C: -/* 8003230C 0002F24C C0 1F 00 08 */ lfs f0, 8(r31) -/* 80032310 0002F250 FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80032314 0002F254 40 80 00 10 */ bge lbl_80032324 -/* 80032318 0002F258 38 00 00 00 */ li r0, 0 -/* 8003231C 0002F25C 98 1F 00 0C */ stb r0, 0xc(r31) -/* 80032320 0002F260 48 00 00 10 */ b lbl_80032330 -lbl_80032324: -/* 80032324 0002F264 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 80032328 0002F268 7C 00 30 78 */ andc r0, r0, r6 -/* 8003232C 0002F26C 98 1F 00 0C */ stb r0, 0xc(r31) -lbl_80032330: -/* 80032330 0002F270 88 7F 00 0C */ lbz r3, 0xc(r31) -/* 80032334 0002F274 88 1F 00 0D */ lbz r0, 0xd(r31) -/* 80032338 0002F278 7C 03 00 40 */ cmplw r3, r0 -/* 8003233C 0002F27C 41 82 00 3C */ beq lbl_80032378 -/* 80032340 0002F280 28 03 00 00 */ cmplwi r3, 0 -/* 80032344 0002F284 40 82 00 10 */ bne lbl_80032354 -/* 80032348 0002F288 38 00 00 00 */ li r0, 0 -/* 8003234C 0002F28C B0 1F 00 22 */ sth r0, 0x22(r31) -/* 80032350 0002F290 48 00 00 28 */ b lbl_80032378 -lbl_80032354: -/* 80032354 0002F294 54 A0 04 FE */ clrlwi r0, r5, 0x13 -/* 80032358 0002F298 2C 00 10 00 */ cmpwi r0, 0x1000 -/* 8003235C 0002F29C 40 81 00 10 */ ble lbl_8003236C -/* 80032360 0002F2A0 A8 1F 00 24 */ lha r0, 0x24(r31) -/* 80032364 0002F2A4 B0 1F 00 22 */ sth r0, 0x22(r31) -/* 80032368 0002F2A8 48 00 00 10 */ b lbl_80032378 -lbl_8003236C: -/* 8003236C 0002F2AC A8 1F 00 24 */ lha r0, 0x24(r31) -/* 80032370 0002F2B0 7C 00 00 D0 */ neg r0, r0 -/* 80032374 0002F2B4 B0 1F 00 22 */ sth r0, 0x22(r31) -lbl_80032378: -/* 80032378 0002F2B8 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 8003237C 0002F2BC 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80032380 0002F2C0 40 82 00 0C */ bne lbl_8003238C -/* 80032384 0002F2C4 7F E3 FB 78 */ mr r3, r31 -/* 80032388 0002F2C8 4B FF FD 75 */ bl STControl_NS_Xinit -lbl_8003238C: -/* 8003238C 0002F2CC 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 80032390 0002F2D0 54 00 07 3B */ rlwinm. r0, r0, 0, 0x1c, 0x1d -/* 80032394 0002F2D4 40 82 00 28 */ bne lbl_800323BC -/* 80032398 0002F2D8 7F E3 FB 78 */ mr r3, r31 -/* 8003239C 0002F2DC 4B FF FD 91 */ bl STControl_NS_Yinit -/* 800323A0 0002F2E0 48 00 00 1C */ b lbl_800323BC -lbl_800323A4: -/* 800323A4 0002F2E4 38 00 00 00 */ li r0, 0 -/* 800323A8 0002F2E8 98 1F 00 0C */ stb r0, 0xc(r31) -/* 800323AC 0002F2EC 7F E3 FB 78 */ mr r3, r31 -/* 800323B0 0002F2F0 4B FF FD 4D */ bl STControl_NS_Xinit -/* 800323B4 0002F2F4 7F E3 FB 78 */ mr r3, r31 -/* 800323B8 0002F2F8 4B FF FD 75 */ bl STControl_NS_Yinit -lbl_800323BC: -/* 800323BC 0002F2FC 88 7F 00 0D */ lbz r3, 0xd(r31) -/* 800323C0 0002F300 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 800323C4 0002F304 7C 60 00 38 */ and r0, r3, r0 -/* 800323C8 0002F308 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 800323CC 0002F30C 41 82 00 18 */ beq lbl_800323E4 -/* 800323D0 0002F310 A8 7F 00 0E */ lha r3, 0xe(r31) -/* 800323D4 0002F314 2C 03 00 00 */ cmpwi r3, 0 -/* 800323D8 0002F318 40 81 00 0C */ ble lbl_800323E4 -/* 800323DC 0002F31C 38 03 FF FF */ addi r0, r3, -1 -/* 800323E0 0002F320 B0 1F 00 0E */ sth r0, 0xe(r31) -lbl_800323E4: -/* 800323E4 0002F324 88 7F 00 0D */ lbz r3, 0xd(r31) -/* 800323E8 0002F328 88 1F 00 0C */ lbz r0, 0xc(r31) -/* 800323EC 0002F32C 7C 60 00 38 */ and r0, r3, r0 -/* 800323F0 0002F330 54 00 07 3B */ rlwinm. r0, r0, 0, 0x1c, 0x1d -/* 800323F4 0002F334 41 82 00 18 */ beq lbl_8003240C -/* 800323F8 0002F338 A8 7F 00 10 */ lha r3, 0x10(r31) -/* 800323FC 0002F33C 2C 03 00 00 */ cmpwi r3, 0 -/* 80032400 0002F340 40 81 00 0C */ ble lbl_8003240C -/* 80032404 0002F344 38 03 FF FF */ addi r0, r3, -1 -/* 80032408 0002F348 B0 1F 00 10 */ sth r0, 0x10(r31) -lbl_8003240C: -/* 8003240C 0002F34C 88 7F 00 0C */ lbz r3, 0xc(r31) -/* 80032410 0002F350 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 -/* 80032414 0002F354 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80032418 0002F358 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003241C 0002F35C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80032420 0002F360 7C 08 03 A6 */ mtlr r0 -/* 80032424 0002F364 38 21 00 20 */ addi r1, r1, 0x20 -/* 80032428 0002F368 4E 80 00 20 */ blr - -.global STControl_NS_checkLeftTrigger -STControl_NS_checkLeftTrigger: -/* 8003242C 0002F36C A8 03 00 0E */ lha r0, 0xe(r3) -/* 80032430 0002F370 2C 00 00 00 */ cmpwi r0, 0 -/* 80032434 0002F374 40 82 00 6C */ bne lbl_800324A0 -/* 80032438 0002F378 88 03 00 0C */ lbz r0, 0xc(r3) -/* 8003243C 0002F37C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80032440 0002F380 41 82 00 60 */ beq lbl_800324A0 -/* 80032444 0002F384 A8 83 00 18 */ lha r4, 0x18(r3) -/* 80032448 0002F388 A8 03 00 2A */ lha r0, 0x2a(r3) -/* 8003244C 0002F38C 7C 04 02 14 */ add r0, r4, r0 -/* 80032450 0002F390 B0 03 00 0E */ sth r0, 0xe(r3) -/* 80032454 0002F394 38 00 00 00 */ li r0, 0 -/* 80032458 0002F398 B0 03 00 2A */ sth r0, 0x2a(r3) -/* 8003245C 0002F39C A8 83 00 1E */ lha r4, 0x1e(r3) -/* 80032460 0002F3A0 2C 04 00 00 */ cmpwi r4, 0 -/* 80032464 0002F3A4 40 82 00 2C */ bne lbl_80032490 -/* 80032468 0002F3A8 A8 83 00 16 */ lha r4, 0x16(r3) -/* 8003246C 0002F3AC A8 03 00 18 */ lha r0, 0x18(r3) -/* 80032470 0002F3B0 7C 04 00 50 */ subf r0, r4, r0 -/* 80032474 0002F3B4 B0 03 00 18 */ sth r0, 0x18(r3) -/* 80032478 0002F3B8 A8 03 00 18 */ lha r0, 0x18(r3) -/* 8003247C 0002F3BC A8 83 00 14 */ lha r4, 0x14(r3) -/* 80032480 0002F3C0 7C 00 20 00 */ cmpw r0, r4 -/* 80032484 0002F3C4 40 80 00 14 */ bge lbl_80032498 -/* 80032488 0002F3C8 B0 83 00 18 */ sth r4, 0x18(r3) -/* 8003248C 0002F3CC 48 00 00 0C */ b lbl_80032498 -lbl_80032490: -/* 80032490 0002F3D0 38 04 FF FF */ addi r0, r4, -1 -/* 80032494 0002F3D4 B0 03 00 1E */ sth r0, 0x1e(r3) -lbl_80032498: -/* 80032498 0002F3D8 38 60 00 01 */ li r3, 1 -/* 8003249C 0002F3DC 4E 80 00 20 */ blr -lbl_800324A0: -/* 800324A0 0002F3E0 38 60 00 00 */ li r3, 0 -/* 800324A4 0002F3E4 4E 80 00 20 */ blr - -.global STControl_NS_checkRightTrigger -STControl_NS_checkRightTrigger: -/* 800324A8 0002F3E8 A8 03 00 0E */ lha r0, 0xe(r3) -/* 800324AC 0002F3EC 2C 00 00 00 */ cmpwi r0, 0 -/* 800324B0 0002F3F0 40 82 00 6C */ bne lbl_8003251C -/* 800324B4 0002F3F4 88 03 00 0C */ lbz r0, 0xc(r3) -/* 800324B8 0002F3F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800324BC 0002F3FC 41 82 00 60 */ beq lbl_8003251C -/* 800324C0 0002F400 A8 83 00 18 */ lha r4, 0x18(r3) -/* 800324C4 0002F404 A8 03 00 2A */ lha r0, 0x2a(r3) -/* 800324C8 0002F408 7C 04 02 14 */ add r0, r4, r0 -/* 800324CC 0002F40C B0 03 00 0E */ sth r0, 0xe(r3) -/* 800324D0 0002F410 38 00 00 00 */ li r0, 0 -/* 800324D4 0002F414 B0 03 00 2A */ sth r0, 0x2a(r3) -/* 800324D8 0002F418 A8 83 00 1E */ lha r4, 0x1e(r3) -/* 800324DC 0002F41C 2C 04 00 00 */ cmpwi r4, 0 -/* 800324E0 0002F420 40 82 00 2C */ bne lbl_8003250C -/* 800324E4 0002F424 A8 83 00 16 */ lha r4, 0x16(r3) -/* 800324E8 0002F428 A8 03 00 18 */ lha r0, 0x18(r3) -/* 800324EC 0002F42C 7C 04 00 50 */ subf r0, r4, r0 -/* 800324F0 0002F430 B0 03 00 18 */ sth r0, 0x18(r3) -/* 800324F4 0002F434 A8 03 00 18 */ lha r0, 0x18(r3) -/* 800324F8 0002F438 A8 83 00 14 */ lha r4, 0x14(r3) -/* 800324FC 0002F43C 7C 00 20 00 */ cmpw r0, r4 -/* 80032500 0002F440 40 80 00 14 */ bge lbl_80032514 -/* 80032504 0002F444 B0 83 00 18 */ sth r4, 0x18(r3) -/* 80032508 0002F448 48 00 00 0C */ b lbl_80032514 -lbl_8003250C: -/* 8003250C 0002F44C 38 04 FF FF */ addi r0, r4, -1 -/* 80032510 0002F450 B0 03 00 1E */ sth r0, 0x1e(r3) -lbl_80032514: -/* 80032514 0002F454 38 60 00 01 */ li r3, 1 -/* 80032518 0002F458 4E 80 00 20 */ blr -lbl_8003251C: -/* 8003251C 0002F45C 38 60 00 00 */ li r3, 0 -/* 80032520 0002F460 4E 80 00 20 */ blr - -.global STControl_NS_checkUpTrigger -STControl_NS_checkUpTrigger: -/* 80032524 0002F464 A8 03 00 10 */ lha r0, 0x10(r3) -/* 80032528 0002F468 2C 00 00 00 */ cmpwi r0, 0 -/* 8003252C 0002F46C 40 82 00 6C */ bne lbl_80032598 -/* 80032530 0002F470 88 03 00 0C */ lbz r0, 0xc(r3) -/* 80032534 0002F474 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 80032538 0002F478 41 82 00 60 */ beq lbl_80032598 -/* 8003253C 0002F47C A8 83 00 1A */ lha r4, 0x1a(r3) -/* 80032540 0002F480 A8 03 00 2C */ lha r0, 0x2c(r3) -/* 80032544 0002F484 7C 04 02 14 */ add r0, r4, r0 -/* 80032548 0002F488 B0 03 00 10 */ sth r0, 0x10(r3) -/* 8003254C 0002F48C 38 00 00 00 */ li r0, 0 -/* 80032550 0002F490 B0 03 00 2C */ sth r0, 0x2c(r3) -/* 80032554 0002F494 A8 83 00 20 */ lha r4, 0x20(r3) -/* 80032558 0002F498 2C 04 00 00 */ cmpwi r4, 0 -/* 8003255C 0002F49C 40 82 00 2C */ bne lbl_80032588 -/* 80032560 0002F4A0 A8 83 00 16 */ lha r4, 0x16(r3) -/* 80032564 0002F4A4 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 80032568 0002F4A8 7C 04 00 50 */ subf r0, r4, r0 -/* 8003256C 0002F4AC B0 03 00 1A */ sth r0, 0x1a(r3) -/* 80032570 0002F4B0 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 80032574 0002F4B4 A8 83 00 14 */ lha r4, 0x14(r3) -/* 80032578 0002F4B8 7C 00 20 00 */ cmpw r0, r4 -/* 8003257C 0002F4BC 40 80 00 14 */ bge lbl_80032590 -/* 80032580 0002F4C0 B0 83 00 1A */ sth r4, 0x1a(r3) -/* 80032584 0002F4C4 48 00 00 0C */ b lbl_80032590 -lbl_80032588: -/* 80032588 0002F4C8 38 04 FF FF */ addi r0, r4, -1 -/* 8003258C 0002F4CC B0 03 00 20 */ sth r0, 0x20(r3) -lbl_80032590: -/* 80032590 0002F4D0 38 60 00 01 */ li r3, 1 -/* 80032594 0002F4D4 4E 80 00 20 */ blr -lbl_80032598: -/* 80032598 0002F4D8 38 60 00 00 */ li r3, 0 -/* 8003259C 0002F4DC 4E 80 00 20 */ blr - -.global STControl_NS_checkDownTrigger -STControl_NS_checkDownTrigger: -/* 800325A0 0002F4E0 A8 03 00 10 */ lha r0, 0x10(r3) -/* 800325A4 0002F4E4 2C 00 00 00 */ cmpwi r0, 0 -/* 800325A8 0002F4E8 40 82 00 6C */ bne lbl_80032614 -/* 800325AC 0002F4EC 88 03 00 0C */ lbz r0, 0xc(r3) -/* 800325B0 0002F4F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 800325B4 0002F4F4 41 82 00 60 */ beq lbl_80032614 -/* 800325B8 0002F4F8 A8 83 00 1A */ lha r4, 0x1a(r3) -/* 800325BC 0002F4FC A8 03 00 2C */ lha r0, 0x2c(r3) -/* 800325C0 0002F500 7C 04 02 14 */ add r0, r4, r0 -/* 800325C4 0002F504 B0 03 00 10 */ sth r0, 0x10(r3) -/* 800325C8 0002F508 38 00 00 00 */ li r0, 0 -/* 800325CC 0002F50C B0 03 00 2C */ sth r0, 0x2c(r3) -/* 800325D0 0002F510 A8 83 00 20 */ lha r4, 0x20(r3) -/* 800325D4 0002F514 2C 04 00 00 */ cmpwi r4, 0 -/* 800325D8 0002F518 40 82 00 2C */ bne lbl_80032604 -/* 800325DC 0002F51C A8 83 00 16 */ lha r4, 0x16(r3) -/* 800325E0 0002F520 A8 03 00 1A */ lha r0, 0x1a(r3) -/* 800325E4 0002F524 7C 04 00 50 */ subf r0, r4, r0 -/* 800325E8 0002F528 B0 03 00 1A */ sth r0, 0x1a(r3) -/* 800325EC 0002F52C A8 03 00 1A */ lha r0, 0x1a(r3) -/* 800325F0 0002F530 A8 83 00 14 */ lha r4, 0x14(r3) -/* 800325F4 0002F534 7C 00 20 00 */ cmpw r0, r4 -/* 800325F8 0002F538 40 80 00 14 */ bge lbl_8003260C -/* 800325FC 0002F53C B0 83 00 1A */ sth r4, 0x1a(r3) -/* 80032600 0002F540 48 00 00 0C */ b lbl_8003260C -lbl_80032604: -/* 80032604 0002F544 38 04 FF FF */ addi r0, r4, -1 -/* 80032608 0002F548 B0 03 00 20 */ sth r0, 0x20(r3) -lbl_8003260C: -/* 8003260C 0002F54C 38 60 00 01 */ li r3, 1 -/* 80032610 0002F550 4E 80 00 20 */ blr -lbl_80032614: -/* 80032614 0002F554 38 60 00 00 */ li r3, 0 -/* 80032618 0002F558 4E 80 00 20 */ blr -/* 8003261C 0002F55C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032620 0002F560 7C 08 02 A6 */ mflr r0 -/* 80032624 0002F564 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032628 0002F568 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8003262C 0002F56C 48 01 0E AD */ bl dEvt_control_c_NS_searchMapEventData -/* 80032630 0002F570 28 03 00 00 */ cmplwi r3, 0 -/* 80032634 0002F574 41 82 00 0C */ beq lbl_80032640 -/* 80032638 0002F578 88 63 00 1B */ lbz r3, 0x1b(r3) -/* 8003263C 0002F57C 48 00 00 08 */ b lbl_80032644 -lbl_80032640: -/* 80032640 0002F580 38 60 00 FF */ li r3, 0xff -lbl_80032644: -/* 80032644 0002F584 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032648 0002F588 7C 08 03 A6 */ mtlr r0 -/* 8003264C 0002F58C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032650 0002F590 4E 80 00 20 */ blr -/* 80032654 0002F594 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80032658 0002F598 7C 08 02 A6 */ mflr r0 -/* 8003265C 0002F59C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80032660 0002F5A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80032664 0002F5A4 48 32 FB 79 */ bl _savegpr_29 -/* 80032668 0002F5A8 7C 67 1B 78 */ mr r7, r3 -/* 8003266C 0002F5AC 7C 9D 23 78 */ mr r29, r4 -/* 80032670 0002F5B0 7C BE 2B 78 */ mr r30, r5 -/* 80032674 0002F5B4 7C DF 33 78 */ mr r31, r6 -/* 80032678 0002F5B8 38 61 00 08 */ addi r3, r1, 8 -/* 8003267C 0002F5BC 38 87 04 D0 */ addi r4, r7, 0x4d0 -/* 80032680 0002F5C0 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80032684 0002F5C4 48 23 44 B1 */ bl cXyz_NS___mi -/* 80032688 0002F5C8 C0 01 00 08 */ lfs f0, 8(r1) -/* 8003268C 0002F5CC D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80032690 0002F5D0 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80032694 0002F5D4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80032698 0002F5D8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8003269C 0002F5DC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800326A0 0002F5E0 3C 60 80 3E */ lis r3, lbl_803DD470@ha -/* 800326A4 0002F5E4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 800326A8 0002F5E8 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 800326AC 0002F5EC 7C 00 00 D0 */ neg r0, r0 -/* 800326B0 0002F5F0 7C 04 07 34 */ extsh r4, r0 -/* 800326B4 0002F5F4 4B FD 9D 29 */ bl mDoMtx_YrotS -/* 800326B8 0002F5F8 3C 60 80 3E */ lis r3, lbl_803DD470@ha -/* 800326BC 0002F5FC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 800326C0 0002F600 38 81 00 14 */ addi r4, r1, 0x14 -/* 800326C4 0002F604 7C 85 23 78 */ mr r5, r4 -/* 800326C8 0002F608 48 31 46 A5 */ bl PSMTXMultVec -/* 800326CC 0002F60C C0 1E 00 00 */ lfs f0, 0(r30) -/* 800326D0 0002F610 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 800326D4 0002F614 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 800326D8 0002F618 4C 40 13 82 */ cror 2, 0, 2 -/* 800326DC 0002F61C 40 82 00 40 */ bne lbl_8003271C -/* 800326E0 0002F620 C0 1F 00 00 */ lfs f0, 0(r31) -/* 800326E4 0002F624 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800326E8 0002F628 4C 40 13 82 */ cror 2, 0, 2 -/* 800326EC 0002F62C 40 82 00 30 */ bne lbl_8003271C -/* 800326F0 0002F630 C0 1E 00 08 */ lfs f0, 8(r30) -/* 800326F4 0002F634 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 800326F8 0002F638 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 800326FC 0002F63C 4C 40 13 82 */ cror 2, 0, 2 -/* 80032700 0002F640 40 82 00 1C */ bne lbl_8003271C -/* 80032704 0002F644 C0 1F 00 08 */ lfs f0, 8(r31) -/* 80032708 0002F648 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8003270C 0002F64C 4C 40 13 82 */ cror 2, 0, 2 -/* 80032710 0002F650 40 82 00 0C */ bne lbl_8003271C -/* 80032714 0002F654 38 60 00 01 */ li r3, 1 -/* 80032718 0002F658 48 00 00 08 */ b lbl_80032720 -lbl_8003271C: -/* 8003271C 0002F65C 38 60 00 00 */ li r3, 0 -lbl_80032720: -/* 80032720 0002F660 39 61 00 30 */ addi r11, r1, 0x30 -/* 80032724 0002F664 48 32 FB 05 */ bl _restgpr_29 -/* 80032728 0002F668 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8003272C 0002F66C 7C 08 03 A6 */ mtlr r0 -/* 80032730 0002F670 38 21 00 30 */ addi r1, r1, 0x30 -/* 80032734 0002F674 4E 80 00 20 */ blr - -.global dLib_getExpandSizeFromAramArchive -dLib_getExpandSizeFromAramArchive: -/* 80032738 0002F678 54 2B 06 FE */ clrlwi r11, r1, 0x1b -/* 8003273C 0002F67C 21 6B FF A0 */ subfic r11, r11, -96 -/* 80032740 0002F680 7C 2C 0B 78 */ mr r12, r1 -/* 80032744 0002F684 7C 21 59 6E */ stwux r1, r1, r11 -/* 80032748 0002F688 7C 08 02 A6 */ mflr r0 -/* 8003274C 0002F68C 90 0C 00 04 */ stw r0, 4(r12) -/* 80032750 0002F690 93 EC FF FC */ stw r31, -4(r12) -/* 80032754 0002F694 93 CC FF F8 */ stw r30, -8(r12) -/* 80032758 0002F698 7C 7E 1B 78 */ mr r30, r3 -/* 8003275C 0002F69C 7C 9F 23 78 */ mr r31, r4 -/* 80032760 0002F6A0 48 2A 50 BD */ bl getAramAddress__14JKRAramArchiveFPCc -/* 80032764 0002F6A4 28 03 00 00 */ cmplwi r3, 0 -/* 80032768 0002F6A8 40 82 00 0C */ bne lbl_80032774 -/* 8003276C 0002F6AC 38 60 00 00 */ li r3, 0 -/* 80032770 0002F6B0 48 00 00 78 */ b lbl_800327E8 -lbl_80032774: -/* 80032774 0002F6B4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80032778 0002F6B8 38 A0 00 20 */ li r5, 0x20 -/* 8003277C 0002F6BC 38 C0 00 00 */ li r6, 0 -/* 80032780 0002F6C0 38 E0 00 00 */ li r7, 0 -/* 80032784 0002F6C4 39 00 00 00 */ li r8, 0 -/* 80032788 0002F6C8 39 20 FF FF */ li r9, -1 -/* 8003278C 0002F6CC 39 40 00 00 */ li r10, 0 -/* 80032790 0002F6D0 48 29 FE 25 */ bl aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl -/* 80032794 0002F6D4 7F C3 F3 78 */ mr r3, r30 -/* 80032798 0002F6D8 7F E4 FB 78 */ mr r4, r31 -/* 8003279C 0002F6DC 38 A0 00 00 */ li r5, 0 -/* 800327A0 0002F6E0 48 2A 3E 05 */ bl findFsResource__10JKRArchiveCFPCcUl -/* 800327A4 0002F6E4 88 C1 00 27 */ lbz r6, 0x27(r1) -/* 800327A8 0002F6E8 88 A1 00 26 */ lbz r5, 0x26(r1) -/* 800327AC 0002F6EC 88 81 00 24 */ lbz r4, 0x24(r1) -/* 800327B0 0002F6F0 88 01 00 25 */ lbz r0, 0x25(r1) -/* 800327B4 0002F6F4 54 00 80 1E */ slwi r0, r0, 0x10 -/* 800327B8 0002F6F8 50 80 C0 0E */ rlwimi r0, r4, 0x18, 0, 7 -/* 800327BC 0002F6FC 50 A0 44 2E */ rlwimi r0, r5, 8, 0x10, 0x17 -/* 800327C0 0002F700 7C C4 03 78 */ or r4, r6, r0 -/* 800327C4 0002F704 38 04 00 1F */ addi r0, r4, 0x1f -/* 800327C8 0002F708 54 04 00 34 */ rlwinm r4, r0, 0, 0, 0x1a -/* 800327CC 0002F70C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800327D0 0002F710 38 03 00 1F */ addi r0, r3, 0x1f -/* 800327D4 0002F714 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a -/* 800327D8 0002F718 7C 04 00 40 */ cmplw r4, r0 -/* 800327DC 0002F71C 7C 03 03 78 */ mr r3, r0 -/* 800327E0 0002F720 40 81 00 08 */ ble lbl_800327E8 -/* 800327E4 0002F724 7C 83 23 78 */ mr r3, r4 -lbl_800327E8: -/* 800327E8 0002F728 81 41 00 00 */ lwz r10, 0(r1) -/* 800327EC 0002F72C 83 EA FF FC */ lwz r31, -4(r10) -/* 800327F0 0002F730 83 CA FF F8 */ lwz r30, -8(r10) -/* 800327F4 0002F734 80 0A 00 04 */ lwz r0, 4(r10) -/* 800327F8 0002F738 7C 08 03 A6 */ mtlr r0 -/* 800327FC 0002F73C 7D 41 53 78 */ mr r1, r10 -/* 80032800 0002F740 4E 80 00 20 */ blr - -.global dLib_time_c_NS_getTime -dLib_time_c_NS_getTime: -/* 80032804 0002F744 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032808 0002F748 7C 08 02 A6 */ mflr r0 -/* 8003280C 0002F74C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80032810 0002F750 88 0D 88 68 */ lbz r0, lbl_80450DE8-_SDA_BASE_(r13) -/* 80032814 0002F754 28 00 00 00 */ cmplwi r0, 0 -/* 80032818 0002F758 40 82 00 1C */ bne lbl_80032834 -/* 8003281C 0002F75C 48 30 FE E1 */ bl OSGetTime -/* 80032820 0002F760 80 0D 88 58 */ lwz r0, lbl_80450DD8-_SDA_BASE_(r13) -/* 80032824 0002F764 80 AD 88 5C */ lwz r5, lbl_80450DDC-_SDA_BASE_(r13) -/* 80032828 0002F768 7C 85 20 10 */ subfc r4, r5, r4 -/* 8003282C 0002F76C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80032830 0002F770 48 00 00 40 */ b lbl_80032870 -lbl_80032834: -/* 80032834 0002F774 48 30 FE C9 */ bl OSGetTime -/* 80032838 0002F778 80 CD 88 58 */ lwz r6, lbl_80450DD8-_SDA_BASE_(r13) -/* 8003283C 0002F77C 80 ED 88 5C */ lwz r7, lbl_80450DDC-_SDA_BASE_(r13) -/* 80032840 0002F780 80 0D 88 60 */ lwz r0, lbl_80450DE0-_SDA_BASE_(r13) -/* 80032844 0002F784 80 AD 88 64 */ lwz r5, lbl_80450DE4-_SDA_BASE_(r13) -/* 80032848 0002F788 7C A5 20 10 */ subfc r5, r5, r4 -/* 8003284C 0002F78C 7C 00 19 10 */ subfe r0, r0, r3 -/* 80032850 0002F790 7C A7 28 14 */ addc r5, r7, r5 -/* 80032854 0002F794 7C 06 01 14 */ adde r0, r6, r0 -/* 80032858 0002F798 90 AD 88 5C */ stw r5, lbl_80450DDC-_SDA_BASE_(r13) -/* 8003285C 0002F79C 90 0D 88 58 */ stw r0, lbl_80450DD8-_SDA_BASE_(r13) -/* 80032860 0002F7A0 90 8D 88 64 */ stw r4, lbl_80450DE4-_SDA_BASE_(r13) -/* 80032864 0002F7A4 90 6D 88 60 */ stw r3, lbl_80450DE0-_SDA_BASE_(r13) -/* 80032868 0002F7A8 7C 85 20 10 */ subfc r4, r5, r4 -/* 8003286C 0002F7AC 7C 60 19 10 */ subfe r3, r0, r3 -lbl_80032870: -/* 80032870 0002F7B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80032874 0002F7B4 7C 08 03 A6 */ mtlr r0 -/* 80032878 0002F7B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003287C 0002F7BC 4E 80 00 20 */ blr - -.global dLib_time_c_NS_stopTime -dLib_time_c_NS_stopTime: -/* 80032880 0002F7C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80032884 0002F7C4 7C 08 02 A6 */ mflr r0 -/* 80032888 0002F7C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003288C 0002F7CC 88 0D 88 68 */ lbz r0, lbl_80450DE8-_SDA_BASE_(r13) -/* 80032890 0002F7D0 28 00 00 00 */ cmplwi r0, 0 -/* 80032894 0002F7D4 40 82 00 18 */ bne lbl_800328AC -/* 80032898 0002F7D8 48 30 FE 65 */ bl OSGetTime -/* 8003289C 0002F7DC 90 8D 88 64 */ stw r4, lbl_80450DE4-_SDA_BASE_(r13) -/* 800328A0 0002F7E0 90 6D 88 60 */ stw r3, lbl_80450DE0-_SDA_BASE_(r13) -/* 800328A4 0002F7E4 38 00 00 01 */ li r0, 1 -/* 800328A8 0002F7E8 98 0D 88 68 */ stb r0, lbl_80450DE8-_SDA_BASE_(r13) -lbl_800328AC: -/* 800328AC 0002F7EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800328B0 0002F7F0 7C 08 03 A6 */ mtlr r0 -/* 800328B4 0002F7F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800328B8 0002F7F8 4E 80 00 20 */ blr - -.global dLib_time_c_NS_startTime -dLib_time_c_NS_startTime: -/* 800328BC 0002F7FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800328C0 0002F800 7C 08 02 A6 */ mflr r0 -/* 800328C4 0002F804 90 01 00 14 */ stw r0, 0x14(r1) -/* 800328C8 0002F808 88 0D 88 68 */ lbz r0, lbl_80450DE8-_SDA_BASE_(r13) -/* 800328CC 0002F80C 28 00 00 00 */ cmplwi r0, 0 -/* 800328D0 0002F810 41 82 00 38 */ beq lbl_80032908 -/* 800328D4 0002F814 48 30 FE 29 */ bl OSGetTime -/* 800328D8 0002F818 80 0D 88 60 */ lwz r0, lbl_80450DE0-_SDA_BASE_(r13) -/* 800328DC 0002F81C 80 AD 88 64 */ lwz r5, lbl_80450DE4-_SDA_BASE_(r13) -/* 800328E0 0002F820 7C A5 20 10 */ subfc r5, r5, r4 -/* 800328E4 0002F824 7C 80 19 10 */ subfe r4, r0, r3 -/* 800328E8 0002F828 80 0D 88 58 */ lwz r0, lbl_80450DD8-_SDA_BASE_(r13) -/* 800328EC 0002F82C 80 6D 88 5C */ lwz r3, lbl_80450DDC-_SDA_BASE_(r13) -/* 800328F0 0002F830 7C 63 28 14 */ addc r3, r3, r5 -/* 800328F4 0002F834 7C 00 21 14 */ adde r0, r0, r4 -/* 800328F8 0002F838 90 6D 88 5C */ stw r3, lbl_80450DDC-_SDA_BASE_(r13) -/* 800328FC 0002F83C 90 0D 88 58 */ stw r0, lbl_80450DD8-_SDA_BASE_(r13) -/* 80032900 0002F840 38 00 00 00 */ li r0, 0 -/* 80032904 0002F844 98 0D 88 68 */ stb r0, lbl_80450DE8-_SDA_BASE_(r13) -lbl_80032908: -/* 80032908 0002F848 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003290C 0002F84C 7C 08 03 A6 */ mtlr r0 -/* 80032910 0002F850 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032914 0002F854 4E 80 00 20 */ blr - diff --git a/asm/d/d_name.s b/asm/d/d_name.s index 60b0947ffc4..bd22e938b74 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -187,7 +187,7 @@ dName_c_NS__create: /* 8024E664 0024B5A4 C0 42 B3 BC */ lfs f2, lbl_80454DBC-_SDA2_BASE_(r2) /* 8024E668 0024B5A8 39 00 00 00 */ li r8, 0 /* 8024E66C 0024B5AC 39 20 08 00 */ li r9, 0x800 -/* 8024E670 0024B5B0 4B DE 39 D5 */ bl STControl +/* 8024E670 0024B5B0 4B DE 39 D5 */ bl __ct__9STControlFssssffss /* 8024E674 0024B5B4 7C 60 1B 78 */ mr r0, r3 lbl_8024E678: /* 8024E678 0024B5B8 90 1F 00 04 */ stw r0, 4(r31) @@ -415,7 +415,7 @@ dName_c_NS__move: /* 8024E9AC 0024B8EC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8024E9B0 0024B8F0 7C 7F 1B 78 */ mr r31, r3 /* 8024E9B4 0024B8F4 80 63 00 04 */ lwz r3, 4(r3) -/* 8024E9B8 0024B8F8 4B DE 37 E5 */ bl STControl_NS_checkTrigger +/* 8024E9B8 0024B8F8 4B DE 37 E5 */ bl checkTrigger__9STControlFv /* 8024E9BC 0024B8FC 7F E3 FB 78 */ mr r3, r31 /* 8024E9C0 0024B900 88 1F 02 AB */ lbz r0, 0x2ab(r31) /* 8024E9C4 0024B904 1C A0 00 0C */ mulli r5, r0, 0xc @@ -682,7 +682,7 @@ lbl_8024ED08: /* 8024ED78 0024BCB8 48 00 02 A8 */ b lbl_8024F020 lbl_8024ED7C: /* 8024ED7C 0024BCBC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024ED80 0024BCC0 4B DE 37 29 */ bl STControl_NS_checkRightTrigger +/* 8024ED80 0024BCC0 4B DE 37 29 */ bl checkRightTrigger__9STControlFv /* 8024ED84 0024BCC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024ED88 0024BCC8 41 82 00 7C */ beq lbl_8024EE04 /* 8024ED8C 0024BCCC 38 00 00 B0 */ li r0, 0xb0 @@ -718,7 +718,7 @@ lbl_8024EDF0: /* 8024EE00 0024BD40 48 00 02 20 */ b lbl_8024F020 lbl_8024EE04: /* 8024EE04 0024BD44 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024EE08 0024BD48 4B DE 36 25 */ bl STControl_NS_checkLeftTrigger +/* 8024EE08 0024BD48 4B DE 36 25 */ bl checkLeftTrigger__9STControlFv /* 8024EE0C 0024BD4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024EE10 0024BD50 41 82 00 7C */ beq lbl_8024EE8C /* 8024EE14 0024BD54 38 00 00 B0 */ li r0, 0xb0 @@ -755,7 +755,7 @@ lbl_8024EE78: /* 8024EE88 0024BDC8 48 00 01 98 */ b lbl_8024F020 lbl_8024EE8C: /* 8024EE8C 0024BDCC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024EE90 0024BDD0 4B DE 36 95 */ bl STControl_NS_checkUpTrigger +/* 8024EE90 0024BDD0 4B DE 36 95 */ bl checkUpTrigger__9STControlFv /* 8024EE94 0024BDD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024EE98 0024BDD8 41 82 00 BC */ beq lbl_8024EF54 /* 8024EE9C 0024BDDC 88 1F 02 A5 */ lbz r0, 0x2a5(r31) @@ -807,7 +807,7 @@ lbl_8024EF08: /* 8024EF50 0024BE90 48 00 00 D0 */ b lbl_8024F020 lbl_8024EF54: /* 8024EF54 0024BE94 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024EF58 0024BE98 4B DE 36 49 */ bl STControl_NS_checkDownTrigger +/* 8024EF58 0024BE98 4B DE 36 49 */ bl checkDownTrigger__9STControlFv /* 8024EF5C 0024BE9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024EF60 0024BEA0 41 82 00 C0 */ beq lbl_8024F020 /* 8024EF64 0024BEA4 88 1F 02 A5 */ lbz r0, 0x2a5(r31) @@ -1633,15 +1633,15 @@ dName_c_NS_menuCursorPosSet: /* 8024FB14 0024CA54 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8024FB18 0024CA58 7C 7F 1B 78 */ mr r31, r3 /* 8024FB1C 0024CA5C 80 63 00 04 */ lwz r3, 4(r3) -/* 8024FB20 0024CA60 4B DE 29 89 */ bl STControl_NS_checkRightTrigger +/* 8024FB20 0024CA60 4B DE 29 89 */ bl checkRightTrigger__9STControlFv /* 8024FB24 0024CA64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024FB28 0024CA68 40 82 02 64 */ bne lbl_8024FD8C /* 8024FB2C 0024CA6C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024FB30 0024CA70 4B DE 28 FD */ bl STControl_NS_checkLeftTrigger +/* 8024FB30 0024CA70 4B DE 28 FD */ bl checkLeftTrigger__9STControlFv /* 8024FB34 0024CA74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024FB38 0024CA78 40 82 02 54 */ bne lbl_8024FD8C /* 8024FB3C 0024CA7C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024FB40 0024CA80 4B DE 29 E5 */ bl STControl_NS_checkUpTrigger +/* 8024FB40 0024CA80 4B DE 29 E5 */ bl checkUpTrigger__9STControlFv /* 8024FB44 0024CA84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024FB48 0024CA88 41 82 00 60 */ beq lbl_8024FBA8 /* 8024FB4C 0024CA8C 38 00 00 B0 */ li r0, 0xb0 @@ -1669,7 +1669,7 @@ dName_c_NS_menuCursorPosSet: /* 8024FBA4 0024CAE4 48 00 01 E8 */ b lbl_8024FD8C lbl_8024FBA8: /* 8024FBA8 0024CAE8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024FBAC 0024CAEC 4B DE 29 F5 */ bl STControl_NS_checkDownTrigger +/* 8024FBAC 0024CAEC 4B DE 29 F5 */ bl checkDownTrigger__9STControlFv /* 8024FBB0 0024CAF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024FBB4 0024CAF4 41 82 00 60 */ beq lbl_8024FC14 /* 8024FBB8 0024CAF8 38 00 00 B0 */ li r0, 0xb0 diff --git a/asm/d/d_stage.s b/asm/d/d_stage.s index 7dbdb8ff78f..ea821c7a130 100644 --- a/asm/d/d_stage.s +++ b/asm/d/d_stage.s @@ -1018,7 +1018,7 @@ lbl_80024B70: /* 80024BB0 00021AF0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80024BB4 00021AF4 80 7F 5C 68 */ lwz r3, 0x5c68(r31) /* 80024BB8 00021AF8 38 81 00 08 */ addi r4, r1, 8 -/* 80024BBC 00021AFC 48 00 DB 7D */ bl dLib_getExpandSizeFromAramArchive +/* 80024BBC 00021AFC 48 00 DB 7D */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc /* 80024BC0 00021B00 7C 7C 1B 78 */ mr r28, r3 /* 80024BC4 00021B04 4B FE A2 29 */ bl mDoExt_getArchiveHeap /* 80024BC8 00021B08 7F 84 E3 78 */ mr r4, r28 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index 954118cd48c..7d3e9ecddfe 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -112,7 +112,7 @@ lbl_8025CB2C: /* 8025CB94 00259AD4 7C 63 02 14 */ add r3, r3, r0 /* 8025CB98 00259AD8 90 DF 01 44 */ stw r6, 0x144(r31) /* 8025CB9C 00259ADC 90 7F 01 40 */ stw r3, 0x140(r31) -/* 8025CBA0 00259AE0 4B DD 5C 65 */ bl dLib_time_c_NS_getTime +/* 8025CBA0 00259AE0 4B DD 5C 65 */ bl getTime__11dLib_time_cFv /* 8025CBA4 00259AE4 90 9F 01 14 */ stw r4, 0x114(r31) /* 8025CBA8 00259AE8 90 7F 01 10 */ stw r3, 0x110(r31) /* 8025CBAC 00259AEC 90 9F 01 1C */ stw r4, 0x11c(r31) @@ -445,7 +445,7 @@ lbl_8025D040: /* 8025D060 00259FA0 98 1F 01 6C */ stb r0, 0x16c(r31) /* 8025D064 00259FA4 48 00 01 C0 */ b lbl_8025D224 lbl_8025D068: -/* 8025D068 00259FA8 4B DD 57 9D */ bl dLib_time_c_NS_getTime +/* 8025D068 00259FA8 4B DD 57 9D */ bl getTime__11dLib_time_cFv /* 8025D06C 00259FAC 90 9F 01 1C */ stw r4, 0x11c(r31) /* 8025D070 00259FB0 90 7F 01 18 */ stw r3, 0x118(r31) /* 8025D074 00259FB4 7F E3 FB 78 */ mr r3, r31 @@ -804,7 +804,7 @@ dTimer_c_NS_start: lbl_8025D568: /* 8025D568 0025A4A8 38 00 00 04 */ li r0, 4 /* 8025D56C 0025A4AC 98 1E 01 6C */ stb r0, 0x16c(r30) -/* 8025D570 0025A4B0 4B DD 52 95 */ bl dLib_time_c_NS_getTime +/* 8025D570 0025A4B0 4B DD 52 95 */ bl getTime__11dLib_time_cFv /* 8025D574 0025A4B4 90 9E 01 14 */ stw r4, 0x114(r30) /* 8025D578 0025A4B8 90 7E 01 10 */ stw r3, 0x110(r30) /* 8025D57C 0025A4BC 90 9E 01 1C */ stw r4, 0x11c(r30) @@ -881,7 +881,7 @@ lbl_8025D660: /* 8025D66C 0025A5AC B0 1F 01 68 */ sth r0, 0x168(r31) /* 8025D670 0025A5B0 38 00 00 04 */ li r0, 4 /* 8025D674 0025A5B4 98 1F 01 6C */ stb r0, 0x16c(r31) -/* 8025D678 0025A5B8 4B DD 51 8D */ bl dLib_time_c_NS_getTime +/* 8025D678 0025A5B8 4B DD 51 8D */ bl getTime__11dLib_time_cFv /* 8025D67C 0025A5BC 90 9F 01 14 */ stw r4, 0x114(r31) /* 8025D680 0025A5C0 90 7F 01 10 */ stw r3, 0x110(r31) /* 8025D684 0025A5C4 90 9F 01 1C */ stw r4, 0x11c(r31) @@ -936,7 +936,7 @@ dTimer_c_NS_stock_start: /* 8025D724 0025A664 40 82 00 84 */ bne lbl_8025D7A8 /* 8025D728 0025A668 38 00 00 04 */ li r0, 4 /* 8025D72C 0025A66C 98 1F 01 6C */ stb r0, 0x16c(r31) -/* 8025D730 0025A670 4B DD 50 D5 */ bl dLib_time_c_NS_getTime +/* 8025D730 0025A670 4B DD 50 D5 */ bl getTime__11dLib_time_cFv /* 8025D734 0025A674 90 9F 01 14 */ stw r4, 0x114(r31) /* 8025D738 0025A678 90 7F 01 10 */ stw r3, 0x110(r31) /* 8025D73C 0025A67C 90 9F 01 1C */ stw r4, 0x11c(r31) @@ -1014,7 +1014,7 @@ lbl_8025D824: /* 8025D830 0025A770 38 60 00 00 */ li r3, 0 /* 8025D834 0025A774 48 00 00 20 */ b lbl_8025D854 lbl_8025D838: -/* 8025D838 0025A778 4B DD 4F CD */ bl dLib_time_c_NS_getTime +/* 8025D838 0025A778 4B DD 4F CD */ bl getTime__11dLib_time_cFv /* 8025D83C 0025A77C 90 9E 01 34 */ stw r4, 0x134(r30) /* 8025D840 0025A780 90 7E 01 30 */ stw r3, 0x130(r30) /* 8025D844 0025A784 38 00 00 01 */ li r0, 1 @@ -1055,7 +1055,7 @@ lbl_8025D8A4: /* 8025D8B8 0025A7F8 38 60 00 00 */ li r3, 0 /* 8025D8BC 0025A7FC 48 00 00 50 */ b lbl_8025D90C lbl_8025D8C0: -/* 8025D8C0 0025A800 4B DD 4F 45 */ bl dLib_time_c_NS_getTime +/* 8025D8C0 0025A800 4B DD 4F 45 */ bl getTime__11dLib_time_cFv /* 8025D8C4 0025A804 90 9F 01 1C */ stw r4, 0x11c(r31) /* 8025D8C8 0025A808 90 7F 01 18 */ stw r3, 0x118(r31) /* 8025D8CC 0025A80C 80 DF 01 38 */ lwz r6, 0x138(r31) @@ -1096,7 +1096,7 @@ dTimer_c_NS_end: /* 8025D948 0025A888 38 60 00 00 */ li r3, 0 /* 8025D94C 0025A88C 48 00 00 7C */ b lbl_8025D9C8 lbl_8025D950: -/* 8025D950 0025A890 4B DD 4E B5 */ bl dLib_time_c_NS_getTime +/* 8025D950 0025A890 4B DD 4E B5 */ bl getTime__11dLib_time_cFv /* 8025D954 0025A894 90 9E 01 24 */ stw r4, 0x124(r30) /* 8025D958 0025A898 90 7E 01 20 */ stw r3, 0x120(r30) /* 8025D95C 0025A89C 38 00 00 06 */ li r0, 6 diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index d465cd63624..48def057a26 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -8269,7 +8269,7 @@ lbl_800901F0: /* 80090280 0008D1C0 90 1E 01 74 */ stw r0, 0x174(r30) /* 80090284 0008D1C4 80 01 00 08 */ lwz r0, 8(r1) /* 80090288 0008D1C8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8009028C 0008D1CC 4B FB 32 4D */ bl dEvt_control_c_NS_searchMapEventData +/* 8009028C 0008D1CC 4B FB 32 4D */ bl searchMapEventData__14dEvt_control_cFUc /* 80090290 0008D1D0 90 7E 05 D4 */ stw r3, 0x5d4(r30) /* 80090294 0008D1D4 38 C0 00 FF */ li r6, 0xff /* 80090298 0008D1D8 80 7E 05 D4 */ lwz r3, 0x5d4(r30) diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index d76ea4d8817..993e392ab57 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -2126,7 +2126,7 @@ lbl_800454AC: /* 800454C8 00042408 B0 1D 00 42 */ sth r0, 0x42(r29) /* 800454CC 0004240C A8 1D 00 42 */ lha r0, 0x42(r29) /* 800454D0 00042410 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800454D4 00042414 4B FF E0 05 */ bl dEvt_control_c_NS_searchMapEventData +/* 800454D4 00042414 4B FF E0 05 */ bl searchMapEventData__14dEvt_control_cFUc /* 800454D8 00042418 28 03 00 00 */ cmplwi r3, 0 /* 800454DC 0004241C 41 82 00 28 */ beq lbl_80045504 /* 800454E0 00042420 88 03 00 00 */ lbz r0, 0(r3) diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index 25ef83b0182..c2d6082308c 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -1018,7 +1018,7 @@ dFile_select_c_NS__create: /* 80184434 00181374 C0 42 9F 30 */ lfs f2, lbl_80453930-_SDA2_BASE_(r2) /* 80184438 00181378 39 00 00 00 */ li r8, 0 /* 8018443C 0018137C 39 20 20 00 */ li r9, 0x2000 -/* 80184440 00181380 4B EA DC 05 */ bl STControl +/* 80184440 00181380 4B EA DC 05 */ bl __ct__9STControlFssssffss /* 80184444 00181384 7C 60 1B 78 */ mr r0, r3 lbl_80184448: /* 80184448 00181388 90 1F 02 54 */ stw r0, 0x254(r31) @@ -2100,7 +2100,7 @@ lbl_801853AC: /* 801853D0 00182310 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801853D4 00182314 7C 7F 1B 78 */ mr r31, r3 /* 801853D8 00182318 80 63 02 54 */ lwz r3, 0x254(r3) -/* 801853DC 0018231C 4B EA CD C1 */ bl STControl_NS_checkTrigger +/* 801853DC 0018231C 4B EA CD C1 */ bl checkTrigger__9STControlFv /* 801853E0 00182320 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801853E4 00182324 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801853E8 00182328 80 63 00 34 */ lwz r3, 0x34(r3) @@ -2114,7 +2114,7 @@ lbl_801853FC: /* 80185404 00182344 48 00 00 F0 */ b lbl_801854F4 lbl_80185408: /* 80185408 00182348 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 8018540C 0018234C 4B EA D1 19 */ bl STControl_NS_checkUpTrigger +/* 8018540C 0018234C 4B EA D1 19 */ bl checkUpTrigger__9STControlFv /* 80185410 00182350 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80185414 00182354 41 82 00 6C */ beq lbl_80185480 /* 80185418 00182358 88 1F 02 65 */ lbz r0, 0x265(r31) @@ -2145,7 +2145,7 @@ lbl_80185408: /* 8018547C 001823BC 48 00 00 78 */ b lbl_801854F4 lbl_80185480: /* 80185480 001823C0 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 80185484 001823C4 4B EA D1 1D */ bl STControl_NS_checkDownTrigger +/* 80185484 001823C4 4B EA D1 1D */ bl checkDownTrigger__9STControlFv /* 80185488 001823C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018548C 001823CC 41 82 00 68 */ beq lbl_801854F4 /* 80185490 001823D0 88 1F 02 65 */ lbz r0, 0x265(r31) @@ -3427,7 +3427,7 @@ lbl_8018675C: /* 80186780 001836C0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80186784 001836C4 7C 7F 1B 78 */ mr r31, r3 /* 80186788 001836C8 80 63 02 54 */ lwz r3, 0x254(r3) -/* 8018678C 001836CC 4B EA BA 11 */ bl STControl_NS_checkTrigger +/* 8018678C 001836CC 4B EA BA 11 */ bl checkTrigger__9STControlFv /* 80186790 001836D0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 80186794 001836D4 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 80186798 001836D8 80 63 00 34 */ lwz r3, 0x34(r3) @@ -3444,7 +3444,7 @@ lbl_801867B0: /* 801867C0 00183700 48 00 01 18 */ b lbl_801868D8 lbl_801867C4: /* 801867C4 00183704 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 801867C8 00183708 4B EA BC E1 */ bl STControl_NS_checkRightTrigger +/* 801867C8 00183708 4B EA BC E1 */ bl checkRightTrigger__9STControlFv /* 801867CC 0018370C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801867D0 00183710 41 82 00 80 */ beq lbl_80186850 /* 801867D4 00183714 88 1F 02 65 */ lbz r0, 0x265(r31) @@ -3480,7 +3480,7 @@ lbl_801867C4: /* 8018684C 0018378C 48 00 00 8C */ b lbl_801868D8 lbl_80186850: /* 80186850 00183790 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 80186854 00183794 4B EA BB D9 */ bl STControl_NS_checkLeftTrigger +/* 80186854 00183794 4B EA BB D9 */ bl checkLeftTrigger__9STControlFv /* 80186858 00183798 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018685C 0018379C 41 82 00 7C */ beq lbl_801868D8 /* 80186860 001837A0 88 1F 02 65 */ lbz r0, 0x265(r31) @@ -5001,7 +5001,7 @@ lbl_80187EAC: /* 80187EE0 00184E20 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80187EE4 00184E24 7C 7F 1B 78 */ mr r31, r3 /* 80187EE8 00184E28 80 63 02 54 */ lwz r3, 0x254(r3) -/* 80187EEC 00184E2C 4B EA A2 B1 */ bl STControl_NS_checkTrigger +/* 80187EEC 00184E2C 4B EA A2 B1 */ bl checkTrigger__9STControlFv /* 80187EF0 00184E30 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 80187EF4 00184E34 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 80187EF8 00184E38 80 63 00 34 */ lwz r3, 0x34(r3) @@ -5018,7 +5018,7 @@ lbl_80187F10: /* 80187F20 00184E60 48 00 00 E8 */ b lbl_80188008 lbl_80187F24: /* 80187F24 00184E64 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 80187F28 00184E68 4B EA A5 FD */ bl STControl_NS_checkUpTrigger +/* 80187F28 00184E68 4B EA A5 FD */ bl checkUpTrigger__9STControlFv /* 80187F2C 00184E6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80187F30 00184E70 41 82 00 68 */ beq lbl_80187F98 /* 80187F34 00184E74 88 1F 02 6B */ lbz r0, 0x26b(r31) @@ -5048,7 +5048,7 @@ lbl_80187F24: /* 80187F94 00184ED4 48 00 00 74 */ b lbl_80188008 lbl_80187F98: /* 80187F98 00184ED8 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 80187F9C 00184EDC 4B EA A6 05 */ bl STControl_NS_checkDownTrigger +/* 80187F9C 00184EDC 4B EA A6 05 */ bl checkDownTrigger__9STControlFv /* 80187FA0 00184EE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80187FA4 00184EE4 41 82 00 64 */ beq lbl_80188008 /* 80187FA8 00184EE8 88 1F 02 6B */ lbz r0, 0x26b(r31) @@ -6342,7 +6342,7 @@ lbl_80189288: /* 801892A8 001861E8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801892AC 001861EC 7C 7F 1B 78 */ mr r31, r3 /* 801892B0 001861F0 80 63 02 54 */ lwz r3, 0x254(r3) -/* 801892B4 001861F4 4B EA 8E E9 */ bl STControl_NS_checkTrigger +/* 801892B4 001861F4 4B EA 8E E9 */ bl checkTrigger__9STControlFv /* 801892B8 001861F8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801892BC 001861FC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801892C0 00186200 80 63 00 34 */ lwz r3, 0x34(r3) @@ -6359,7 +6359,7 @@ lbl_801892D8: /* 801892E8 00186228 48 00 00 E8 */ b lbl_801893D0 lbl_801892EC: /* 801892EC 0018622C 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 801892F0 00186230 4B EA 91 B9 */ bl STControl_NS_checkRightTrigger +/* 801892F0 00186230 4B EA 91 B9 */ bl checkRightTrigger__9STControlFv /* 801892F4 00186234 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801892F8 00186238 41 82 00 68 */ beq lbl_80189360 /* 801892FC 0018623C 88 1F 02 68 */ lbz r0, 0x268(r31) @@ -6389,7 +6389,7 @@ lbl_801892EC: /* 8018935C 0018629C 48 00 00 74 */ b lbl_801893D0 lbl_80189360: /* 80189360 001862A0 80 7F 02 54 */ lwz r3, 0x254(r31) -/* 80189364 001862A4 4B EA 90 C9 */ bl STControl_NS_checkLeftTrigger +/* 80189364 001862A4 4B EA 90 C9 */ bl checkLeftTrigger__9STControlFv /* 80189368 001862A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018936C 001862AC 41 82 00 64 */ beq lbl_801893D0 /* 80189370 001862B0 88 1F 02 68 */ lbz r0, 0x268(r31) @@ -13346,7 +13346,7 @@ dFile_select_c_NS_errYesNoSelect: /* 8018FA40 0018C980 7C 7E 1B 78 */ mr r30, r3 /* 8018FA44 0018C984 3B E0 00 00 */ li r31, 0 /* 8018FA48 0018C988 80 63 02 54 */ lwz r3, 0x254(r3) -/* 8018FA4C 0018C98C 4B EA 27 51 */ bl STControl_NS_checkTrigger +/* 8018FA4C 0018C98C 4B EA 27 51 */ bl checkTrigger__9STControlFv /* 8018FA50 0018C990 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 8018FA54 0018C994 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 8018FA58 0018C998 80 03 00 34 */ lwz r0, 0x34(r3) @@ -13391,7 +13391,7 @@ lbl_8018FADC: /* 8018FAEC 0018CA2C 48 00 00 78 */ b lbl_8018FB64 lbl_8018FAF0: /* 8018FAF0 0018CA30 80 7E 02 54 */ lwz r3, 0x254(r30) -/* 8018FAF4 0018CA34 4B EA 29 B5 */ bl STControl_NS_checkRightTrigger +/* 8018FAF4 0018CA34 4B EA 29 B5 */ bl checkRightTrigger__9STControlFv /* 8018FAF8 0018CA38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018FAFC 0018CA3C 41 82 00 30 */ beq lbl_8018FB2C /* 8018FB00 0018CA40 88 1E 02 68 */ lbz r0, 0x268(r30) @@ -13407,7 +13407,7 @@ lbl_8018FAF0: /* 8018FB28 0018CA68 48 00 00 3C */ b lbl_8018FB64 lbl_8018FB2C: /* 8018FB2C 0018CA6C 80 7E 02 54 */ lwz r3, 0x254(r30) -/* 8018FB30 0018CA70 4B EA 28 FD */ bl STControl_NS_checkLeftTrigger +/* 8018FB30 0018CA70 4B EA 28 FD */ bl checkLeftTrigger__9STControlFv /* 8018FB34 0018CA74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018FB38 0018CA78 41 82 00 2C */ beq lbl_8018FB64 /* 8018FB3C 0018CA7C 88 1E 02 68 */ lbz r0, 0x268(r30) diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index dca8f189236..30273dc7389 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -2368,9 +2368,9 @@ dMenu_Collect2D_c_NS_cursorMove: /* 801B1FC4 001AEF04 8B E3 02 57 */ lbz r31, 0x257(r3) /* 801B1FC8 001AEF08 8B C3 02 58 */ lbz r30, 0x258(r3) /* 801B1FCC 001AEF0C 80 63 00 10 */ lwz r3, 0x10(r3) -/* 801B1FD0 001AEF10 4B E8 01 CD */ bl STControl_NS_checkTrigger +/* 801B1FD0 001AEF10 4B E8 01 CD */ bl checkTrigger__9STControlFv /* 801B1FD4 001AEF14 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 801B1FD8 001AEF18 4B E8 04 D1 */ bl STControl_NS_checkRightTrigger +/* 801B1FD8 001AEF18 4B E8 04 D1 */ bl checkRightTrigger__9STControlFv /* 801B1FDC 001AEF1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B1FE0 001AEF20 41 82 01 2C */ beq lbl_801B210C /* 801B1FE4 001AEF24 88 1D 02 57 */ lbz r0, 0x257(r29) @@ -2453,7 +2453,7 @@ lbl_801B20D0: /* 801B2108 001AF048 48 00 00 D8 */ b lbl_801B21E0 lbl_801B210C: /* 801B210C 001AF04C 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 801B2110 001AF050 4B E8 03 1D */ bl STControl_NS_checkLeftTrigger +/* 801B2110 001AF050 4B E8 03 1D */ bl checkLeftTrigger__9STControlFv /* 801B2114 001AF054 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B2118 001AF058 41 82 00 C8 */ beq lbl_801B21E0 /* 801B211C 001AF05C 88 1D 02 57 */ lbz r0, 0x257(r29) @@ -2510,7 +2510,7 @@ lbl_801B21A0: /* 801B21DC 001AF11C 9B FD 02 57 */ stb r31, 0x257(r29) lbl_801B21E0: /* 801B21E0 001AF120 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 801B21E4 001AF124 4B E8 03 41 */ bl STControl_NS_checkUpTrigger +/* 801B21E4 001AF124 4B E8 03 41 */ bl checkUpTrigger__9STControlFv /* 801B21E8 001AF128 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B21EC 001AF12C 41 82 02 28 */ beq lbl_801B2414 /* 801B21F0 001AF130 88 1D 02 58 */ lbz r0, 0x258(r29) @@ -2668,7 +2668,7 @@ lbl_801B23D8: /* 801B2410 001AF350 48 00 01 3C */ b lbl_801B254C lbl_801B2414: /* 801B2414 001AF354 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 801B2418 001AF358 4B E8 01 89 */ bl STControl_NS_checkDownTrigger +/* 801B2418 001AF358 4B E8 01 89 */ bl checkDownTrigger__9STControlFv /* 801B241C 001AF35C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B2420 001AF360 41 82 01 2C */ beq lbl_801B254C /* 801B2424 001AF364 88 1D 02 58 */ lbz r0, 0x258(r29) diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index 634481601e1..b2bd621ee70 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -6165,7 +6165,7 @@ lbl_801BD94C: /* 801BD970 001BA8B0 C0 42 A6 0C */ lfs f2, lbl_8045400C-_SDA2_BASE_(r2) /* 801BD974 001BA8B4 39 00 00 00 */ li r8, 0 /* 801BD978 001BA8B8 39 20 08 00 */ li r9, 0x800 -/* 801BD97C 001BA8BC 4B E7 46 C9 */ bl STControl +/* 801BD97C 001BA8BC 4B E7 46 C9 */ bl __ct__9STControlFssssffss /* 801BD980 001BA8C0 7C 60 1B 78 */ mr r0, r3 lbl_801BD984: /* 801BD984 001BA8C4 90 1F 00 F0 */ stw r0, 0xf0(r31) @@ -7398,7 +7398,7 @@ lbl_801BEACC: /* 801BEB74 001BBAB4 28 00 00 FF */ cmplwi r0, 0xff /* 801BEB78 001BBAB8 40 82 00 0C */ bne lbl_801BEB84 /* 801BEB7C 001BBABC 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BEB80 001BBAC0 4B E7 36 1D */ bl STControl_NS_checkTrigger +/* 801BEB80 001BBAC0 4B E7 36 1D */ bl checkTrigger__9STControlFv lbl_801BEB84: /* 801BEB84 001BBAC4 88 1F 01 77 */ lbz r0, 0x177(r31) /* 801BEB88 001BBAC8 7C 7F 02 14 */ add r3, r31, r0 @@ -7418,7 +7418,7 @@ lbl_801BEBB4: /* 801BEBB8 001BBAF8 38 80 03 F9 */ li r4, 0x3f9 /* 801BEBBC 001BBAFC 4B FF A3 01 */ bl dMenu_DmapBg_c_NS_setBButtonString /* 801BEBC0 001BBB00 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BEBC4 001BBB04 4B E7 39 61 */ bl STControl_NS_checkUpTrigger +/* 801BEBC4 001BBB04 4B E7 39 61 */ bl checkUpTrigger__9STControlFv /* 801BEBC8 001BBB08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BEBCC 001BBB0C 41 82 00 74 */ beq lbl_801BEC40 /* 801BEBD0 001BBB10 7F E3 FB 78 */ mr r3, r31 @@ -7451,7 +7451,7 @@ lbl_801BEBB4: /* 801BEC3C 001BBB7C 48 00 02 D4 */ b lbl_801BEF10 lbl_801BEC40: /* 801BEC40 001BBB80 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BEC44 001BBB84 4B E7 39 5D */ bl STControl_NS_checkDownTrigger +/* 801BEC44 001BBB84 4B E7 39 5D */ bl checkDownTrigger__9STControlFv /* 801BEC48 001BBB88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BEC4C 001BBB8C 41 82 00 74 */ beq lbl_801BECC0 /* 801BEC50 001BBB90 7F E3 FB 78 */ mr r3, r31 @@ -7484,7 +7484,7 @@ lbl_801BEC40: /* 801BECBC 001BBBFC 48 00 02 54 */ b lbl_801BEF10 lbl_801BECC0: /* 801BECC0 001BBC00 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BECC4 001BBC04 4B E7 37 E5 */ bl STControl_NS_checkRightTrigger +/* 801BECC4 001BBC04 4B E7 37 E5 */ bl checkRightTrigger__9STControlFv /* 801BECC8 001BBC08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BECCC 001BBC0C 41 82 00 90 */ beq lbl_801BED5C /* 801BECD0 001BBC10 38 00 00 4E */ li r0, 0x4e @@ -8391,7 +8391,7 @@ lbl_801BF9C0: /* 801BFA14 001BC954 28 00 00 FF */ cmplwi r0, 0xff /* 801BFA18 001BC958 40 82 00 0C */ bne lbl_801BFA24 /* 801BFA1C 001BC95C 80 7E 00 F0 */ lwz r3, 0xf0(r30) -/* 801BFA20 001BC960 4B E7 27 7D */ bl STControl_NS_checkTrigger +/* 801BFA20 001BC960 4B E7 27 7D */ bl checkTrigger__9STControlFv lbl_801BFA24: /* 801BFA24 001BC964 7F C3 F3 78 */ mr r3, r30 /* 801BFA28 001BC968 88 1E 01 7D */ lbz r0, 0x17d(r30) @@ -8434,7 +8434,7 @@ lbl_801BFA6C: /* 801BFAB8 001BC9F8 48 00 01 AC */ b lbl_801BFC64 lbl_801BFABC: /* 801BFABC 001BC9FC 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BFAC0 001BCA00 4B E7 2A 65 */ bl STControl_NS_checkUpTrigger +/* 801BFAC0 001BCA00 4B E7 2A 65 */ bl checkUpTrigger__9STControlFv /* 801BFAC4 001BCA04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BFAC8 001BCA08 41 82 00 94 */ beq lbl_801BFB5C /* 801BFACC 001BCA0C 88 1F 01 6C */ lbz r0, 0x16c(r31) @@ -8475,7 +8475,7 @@ lbl_801BFABC: /* 801BFB58 001BCA98 48 00 01 0C */ b lbl_801BFC64 lbl_801BFB5C: /* 801BFB5C 001BCA9C 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BFB60 001BCAA0 4B E7 2A 41 */ bl STControl_NS_checkDownTrigger +/* 801BFB60 001BCAA0 4B E7 2A 41 */ bl checkDownTrigger__9STControlFv /* 801BFB64 001BCAA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BFB68 001BCAA8 41 82 00 94 */ beq lbl_801BFBFC /* 801BFB6C 001BCAAC 88 1F 01 6C */ lbz r0, 0x16c(r31) @@ -8516,7 +8516,7 @@ lbl_801BFB5C: /* 801BFBF8 001BCB38 48 00 00 6C */ b lbl_801BFC64 lbl_801BFBFC: /* 801BFBFC 001BCB3C 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 801BFC00 001BCB40 4B E7 28 2D */ bl STControl_NS_checkLeftTrigger +/* 801BFC00 001BCB40 4B E7 28 2D */ bl checkLeftTrigger__9STControlFv /* 801BFC04 001BCB44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BFC08 001BCB48 41 82 00 5C */ beq lbl_801BFC64 /* 801BFC0C 001BCB4C 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index aa312d198db..98a3d584fba 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -1550,7 +1550,7 @@ lbl_801C7BB4: /* 801C7C3C 001C4B7C 48 19 A5 A1 */ bl _savegpr_29 /* 801C7C40 001C4B80 7C 7E 1B 78 */ mr r30, r3 /* 801C7C44 001C4B84 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801C7C48 001C4B88 4B E6 A5 55 */ bl STControl_NS_checkTrigger +/* 801C7C48 001C4B88 4B E6 A5 55 */ bl checkTrigger__9STControlFv /* 801C7C4C 001C4B8C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C7C50 001C4B90 8B E3 12 26 */ lbz r31, 0x1226(r3) /* 801C7C54 001C4B94 3B A0 00 00 */ li r29, 0 @@ -2619,7 +2619,7 @@ lbl_801C8B9C: /* 801C8C1C 001C5B5C 93 C1 00 18 */ stw r30, 0x18(r1) /* 801C8C20 001C5B60 7C 7E 1B 78 */ mr r30, r3 /* 801C8C24 001C5B64 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801C8C28 001C5B68 4B E6 95 75 */ bl STControl_NS_checkTrigger +/* 801C8C28 001C5B68 4B E6 95 75 */ bl checkTrigger__9STControlFv /* 801C8C2C 001C5B6C 48 03 14 25 */ bl dMw_B_TRIGGER /* 801C8C30 001C5B70 2C 03 00 00 */ cmpwi r3, 0 /* 801C8C34 001C5B74 41 82 00 50 */ beq lbl_801C8C84 @@ -3936,7 +3936,7 @@ lbl_801C9F54: /* 801C9FCC 001C6F0C 93 C1 00 18 */ stw r30, 0x18(r1) /* 801C9FD0 001C6F10 7C 7F 1B 78 */ mr r31, r3 /* 801C9FD4 001C6F14 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801C9FD8 001C6F18 4B E6 81 C5 */ bl STControl_NS_checkTrigger +/* 801C9FD8 001C6F18 4B E6 81 C5 */ bl checkTrigger__9STControlFv /* 801C9FDC 001C6F1C 48 03 00 75 */ bl dMw_B_TRIGGER /* 801C9FE0 001C6F20 2C 03 00 00 */ cmpwi r3, 0 /* 801C9FE4 001C6F24 40 82 00 60 */ bne lbl_801CA044 @@ -6298,7 +6298,7 @@ lbl_801CC168: /* 801CC1AC 001C90EC 48 00 00 C0 */ b lbl_801CC26C lbl_801CC1B0: /* 801CC1B0 001C90F0 7F 24 CB 78 */ mr r4, r25 -/* 801CC1B4 001C90F4 4B E6 65 85 */ bl dLib_getExpandSizeFromAramArchive +/* 801CC1B4 001C90F4 4B E6 65 85 */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc /* 801CC1B8 001C90F8 7C 7C 1B 78 */ mr r28, r3 lbl_801CC1BC: /* 801CC1BC 001C90FC 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -6577,7 +6577,7 @@ dMenu_Fmap_c_NS_readRoomDzsData: /* 801CC5A0 001C94E0 48 00 00 10 */ b lbl_801CC5B0 lbl_801CC5A4: /* 801CC5A4 001C94E4 7F C4 F3 78 */ mr r4, r30 -/* 801CC5A8 001C94E8 4B E6 61 91 */ bl dLib_getExpandSizeFromAramArchive +/* 801CC5A8 001C94E8 4B E6 61 91 */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc /* 801CC5AC 001C94EC 7C 7D 1B 78 */ mr r29, r3 lbl_801CC5B0: /* 801CC5B0 001C94F0 80 7B 00 04 */ lwz r3, 4(r27) diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 9bd8c75ed8a..953f74ffda3 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -1224,7 +1224,7 @@ lbl_801D9284: /* 801D92E8 001D6228 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801D92EC 001D622C 7C 7F 1B 78 */ mr r31, r3 /* 801D92F0 001D6230 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801D92F4 001D6234 4B E5 8E A9 */ bl STControl_NS_checkTrigger +/* 801D92F4 001D6234 4B E5 8E A9 */ bl checkTrigger__9STControlFv /* 801D92F8 001D6238 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801D92FC 001D623C 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801D9300 001D6240 80 63 00 34 */ lwz r3, 0x34(r3) @@ -1293,7 +1293,7 @@ lbl_801D93E8: /* 801D93F0 001D6330 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D93F4 001D6334 41 82 00 60 */ beq lbl_801D9454 /* 801D93F8 001D6338 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801D93FC 001D633C 4B E5 91 29 */ bl STControl_NS_checkUpTrigger +/* 801D93FC 001D633C 4B E5 91 29 */ bl checkUpTrigger__9STControlFv /* 801D9400 001D6340 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9404 001D6344 41 82 00 50 */ beq lbl_801D9454 /* 801D9408 001D6348 88 1F 00 F7 */ lbz r0, 0xf7(r31) @@ -1321,7 +1321,7 @@ lbl_801D9454: /* 801D945C 001D639C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9460 001D63A0 41 82 00 5C */ beq lbl_801D94BC /* 801D9464 001D63A4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801D9468 001D63A8 4B E5 91 39 */ bl STControl_NS_checkDownTrigger +/* 801D9468 001D63A8 4B E5 91 39 */ bl checkDownTrigger__9STControlFv /* 801D946C 001D63AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9470 001D63B0 41 82 00 4C */ beq lbl_801D94BC /* 801D9474 001D63B4 88 1F 00 F7 */ lbz r0, 0xf7(r31) @@ -2111,9 +2111,9 @@ dMenu_Insect_c_NS_cursorMove: /* 801D9FA8 001D6EE8 8B C3 00 F5 */ lbz r30, 0xf5(r3) /* 801D9FAC 001D6EEC 3B A0 00 00 */ li r29, 0 /* 801D9FB0 001D6EF0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 801D9FB4 001D6EF4 4B E5 81 E9 */ bl STControl_NS_checkTrigger +/* 801D9FB4 001D6EF4 4B E5 81 E9 */ bl checkTrigger__9STControlFv /* 801D9FB8 001D6EF8 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 801D9FBC 001D6EFC 4B E5 84 ED */ bl STControl_NS_checkRightTrigger +/* 801D9FBC 001D6EFC 4B E5 84 ED */ bl checkRightTrigger__9STControlFv /* 801D9FC0 001D6F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9FC4 001D6F04 41 82 00 1C */ beq lbl_801D9FE0 /* 801D9FC8 001D6F08 88 7C 00 F4 */ lbz r3, 0xf4(r28) @@ -2124,7 +2124,7 @@ dMenu_Insect_c_NS_cursorMove: /* 801D9FDC 001D6F1C 48 00 00 28 */ b lbl_801DA004 lbl_801D9FE0: /* 801D9FE0 001D6F20 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 801D9FE4 001D6F24 4B E5 84 49 */ bl STControl_NS_checkLeftTrigger +/* 801D9FE4 001D6F24 4B E5 84 49 */ bl checkLeftTrigger__9STControlFv /* 801D9FE8 001D6F28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9FEC 001D6F2C 41 82 00 18 */ beq lbl_801DA004 /* 801D9FF0 001D6F30 88 7C 00 F4 */ lbz r3, 0xf4(r28) @@ -2134,7 +2134,7 @@ lbl_801D9FE0: /* 801DA000 001D6F40 98 1C 00 F4 */ stb r0, 0xf4(r28) lbl_801DA004: /* 801DA004 001D6F44 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 801DA008 001D6F48 4B E5 85 1D */ bl STControl_NS_checkUpTrigger +/* 801DA008 001D6F48 4B E5 85 1D */ bl checkUpTrigger__9STControlFv /* 801DA00C 001D6F4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DA010 001D6F50 41 82 00 1C */ beq lbl_801DA02C /* 801DA014 001D6F54 88 7C 00 F5 */ lbz r3, 0xf5(r28) @@ -2145,7 +2145,7 @@ lbl_801DA004: /* 801DA028 001D6F68 48 00 00 28 */ b lbl_801DA050 lbl_801DA02C: /* 801DA02C 001D6F6C 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 801DA030 001D6F70 4B E5 85 71 */ bl STControl_NS_checkDownTrigger +/* 801DA030 001D6F70 4B E5 85 71 */ bl checkDownTrigger__9STControlFv /* 801DA034 001D6F74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DA038 001D6F78 41 82 00 18 */ beq lbl_801DA050 /* 801DA03C 001D6F7C 88 7C 00 F5 */ lbz r3, 0xf5(r28) diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index a27571acc34..9f99358f6c3 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -1207,7 +1207,7 @@ lbl_801DDEB0: /* 801DDEF8 001DAE38 48 00 01 94 */ b lbl_801DE08C lbl_801DDEFC: /* 801DDEFC 001DAE3C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801DDF00 001DAE40 4B E5 46 25 */ bl STControl_NS_checkUpTrigger +/* 801DDF00 001DAE40 4B E5 46 25 */ bl checkUpTrigger__9STControlFv /* 801DDF04 001DAE44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DDF08 001DAE48 41 82 00 50 */ beq lbl_801DDF58 /* 801DDF0C 001DAE4C 88 7E 03 6E */ lbz r3, 0x36e(r30) @@ -1231,7 +1231,7 @@ lbl_801DDEFC: /* 801DDF54 001DAE94 48 00 01 38 */ b lbl_801DE08C lbl_801DDF58: /* 801DDF58 001DAE98 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801DDF5C 001DAE9C 4B E5 46 45 */ bl STControl_NS_checkDownTrigger +/* 801DDF5C 001DAE9C 4B E5 46 45 */ bl checkDownTrigger__9STControlFv /* 801DDF60 001DAEA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DDF64 001DAEA4 41 82 00 58 */ beq lbl_801DDFBC /* 801DDF68 001DAEA8 88 9E 03 6E */ lbz r4, 0x36e(r30) diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index 37b1872364e..e6d839c0e41 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -1459,7 +1459,7 @@ dMenu_Option_c_NS__move: /* 801E3418 001E0358 93 C1 00 08 */ stw r30, 8(r1) /* 801E341C 001E035C 7C 7F 1B 78 */ mr r31, r3 /* 801E3420 001E0360 80 63 00 58 */ lwz r3, 0x58(r3) -/* 801E3424 001E0364 4B E4 ED 79 */ bl STControl_NS_checkTrigger +/* 801E3424 001E0364 4B E4 ED 79 */ bl checkTrigger__9STControlFv /* 801E3428 001E0368 88 1F 03 EA */ lbz r0, 0x3ea(r31) /* 801E342C 001E036C 28 00 00 00 */ cmplwi r0, 0 /* 801E3430 001E0370 41 82 00 1C */ beq lbl_801E344C @@ -1904,7 +1904,7 @@ dMenu_Option_c_NS_checkLeftTrigger: /* 801E3AA8 001E09E8 7C 08 02 A6 */ mflr r0 /* 801E3AAC 001E09EC 90 01 00 14 */ stw r0, 0x14(r1) /* 801E3AB0 001E09F0 80 63 00 58 */ lwz r3, 0x58(r3) -/* 801E3AB4 001E09F4 4B E4 E9 79 */ bl STControl_NS_checkLeftTrigger +/* 801E3AB4 001E09F4 4B E4 E9 79 */ bl checkLeftTrigger__9STControlFv /* 801E3AB8 001E09F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E3ABC 001E09FC 7C 08 03 A6 */ mtlr r0 /* 801E3AC0 001E0A00 38 21 00 10 */ addi r1, r1, 0x10 @@ -1916,7 +1916,7 @@ dMenu_Option_c_NS_checkRightTrigger: /* 801E3ACC 001E0A0C 7C 08 02 A6 */ mflr r0 /* 801E3AD0 001E0A10 90 01 00 14 */ stw r0, 0x14(r1) /* 801E3AD4 001E0A14 80 63 00 58 */ lwz r3, 0x58(r3) -/* 801E3AD8 001E0A18 4B E4 E9 D1 */ bl STControl_NS_checkRightTrigger +/* 801E3AD8 001E0A18 4B E4 E9 D1 */ bl checkRightTrigger__9STControlFv /* 801E3ADC 001E0A1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E3AE0 001E0A20 7C 08 03 A6 */ mtlr r0 /* 801E3AE4 001E0A24 38 21 00 10 */ addi r1, r1, 0x10 @@ -2264,7 +2264,7 @@ dMenu_Option_c_NS_atten_init: /* 801E3FD4 001E0F14 48 17 E2 09 */ bl _savegpr_29 /* 801E3FD8 001E0F18 7C 7F 1B 78 */ mr r31, r3 /* 801E3FDC 001E0F1C 80 63 00 58 */ lwz r3, 0x58(r3) -/* 801E3FE0 001E0F20 4B E4 E5 C1 */ bl STControl_NS_checkDownTrigger +/* 801E3FE0 001E0F20 4B E4 E5 C1 */ bl checkDownTrigger__9STControlFv /* 801E3FE4 001E0F24 7C 7D 1B 78 */ mr r29, r3 /* 801E3FE8 001E0F28 7F E3 FB 78 */ mr r3, r31 /* 801E3FEC 001E0F2C 4B FF FA B9 */ bl dMenu_Option_c_NS_checkLeftTrigger @@ -2414,10 +2414,10 @@ lbl_801E4188: /* 801E4208 001E1148 48 17 DF D1 */ bl _savegpr_28 /* 801E420C 001E114C 7C 7F 1B 78 */ mr r31, r3 /* 801E4210 001E1150 80 63 00 58 */ lwz r3, 0x58(r3) -/* 801E4214 001E1154 4B E4 E3 11 */ bl STControl_NS_checkUpTrigger +/* 801E4214 001E1154 4B E4 E3 11 */ bl checkUpTrigger__9STControlFv /* 801E4218 001E1158 7C 7C 1B 78 */ mr r28, r3 /* 801E421C 001E115C 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801E4220 001E1160 4B E4 E3 81 */ bl STControl_NS_checkDownTrigger +/* 801E4220 001E1160 4B E4 E3 81 */ bl checkDownTrigger__9STControlFv /* 801E4224 001E1164 7C 7D 1B 78 */ mr r29, r3 /* 801E4228 001E1168 7F E3 FB 78 */ mr r3, r31 /* 801E422C 001E116C 4B FF F8 79 */ bl dMenu_Option_c_NS_checkLeftTrigger @@ -2610,10 +2610,10 @@ lbl_801E4470: /* 801E44F0 001E1430 48 17 DC ED */ bl _savegpr_29 /* 801E44F4 001E1434 7C 7F 1B 78 */ mr r31, r3 /* 801E44F8 001E1438 80 63 00 58 */ lwz r3, 0x58(r3) -/* 801E44FC 001E143C 4B E4 E0 29 */ bl STControl_NS_checkUpTrigger +/* 801E44FC 001E143C 4B E4 E0 29 */ bl checkUpTrigger__9STControlFv /* 801E4500 001E1440 7C 7D 1B 78 */ mr r29, r3 /* 801E4504 001E1444 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801E4508 001E1448 4B E4 E0 99 */ bl STControl_NS_checkDownTrigger +/* 801E4508 001E1448 4B E4 E0 99 */ bl checkDownTrigger__9STControlFv /* 801E450C 001E144C 7F E3 FB 78 */ mr r3, r31 /* 801E4510 001E1450 4B FF F5 95 */ bl dMenu_Option_c_NS_checkLeftTrigger /* 801E4514 001E1454 7C 7E 1B 78 */ mr r30, r3 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 3c44a6dfa8c..4f2cdb0b318 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -117,7 +117,7 @@ dMenu_save_c_NS__create: /* 801EF7E8 001EC728 C0 42 AA 3C */ lfs f2, lbl_8045443C-_SDA2_BASE_(r2) /* 801EF7EC 001EC72C 39 00 00 00 */ li r8, 0 /* 801EF7F0 001EC730 39 20 20 00 */ li r9, 0x2000 -/* 801EF7F4 001EC734 4B E4 28 51 */ bl STControl +/* 801EF7F4 001EC734 4B E4 28 51 */ bl __ct__9STControlFssssffss /* 801EF7F8 001EC738 7C 60 1B 78 */ mr r0, r3 lbl_801EF7FC: /* 801EF7FC 001EC73C 90 1E 00 0C */ stw r0, 0xc(r30) @@ -4597,7 +4597,7 @@ lbl_801F391C: /* 801F3950 001F0890 2C 00 00 00 */ cmpwi r0, 0 /* 801F3954 001F0894 40 82 01 2C */ bne lbl_801F3A80 /* 801F3958 001F0898 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F395C 001F089C 4B E3 E8 41 */ bl STControl_NS_checkTrigger +/* 801F395C 001F089C 4B E3 E8 41 */ bl checkTrigger__9STControlFv /* 801F3960 001F08A0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801F3964 001F08A4 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801F3968 001F08A8 80 63 00 34 */ lwz r3, 0x34(r3) @@ -4614,7 +4614,7 @@ lbl_801F3980: /* 801F3990 001F08D0 48 00 00 F0 */ b lbl_801F3A80 lbl_801F3994: /* 801F3994 001F08D4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F3998 001F08D8 4B E3 EB 8D */ bl STControl_NS_checkUpTrigger +/* 801F3998 001F08D8 4B E3 EB 8D */ bl checkUpTrigger__9STControlFv /* 801F399C 001F08DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F39A0 001F08E0 41 82 00 6C */ beq lbl_801F3A0C /* 801F39A4 001F08E4 88 1F 00 54 */ lbz r0, 0x54(r31) @@ -4645,7 +4645,7 @@ lbl_801F3994: /* 801F3A08 001F0948 48 00 00 78 */ b lbl_801F3A80 lbl_801F3A0C: /* 801F3A0C 001F094C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F3A10 001F0950 4B E3 EB 91 */ bl STControl_NS_checkDownTrigger +/* 801F3A10 001F0950 4B E3 EB 91 */ bl checkDownTrigger__9STControlFv /* 801F3A14 001F0954 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F3A18 001F0958 41 82 00 68 */ beq lbl_801F3A80 /* 801F3A1C 001F095C 88 1F 00 54 */ lbz r0, 0x54(r31) @@ -5109,7 +5109,7 @@ lbl_801F40C0: /* 801F40F4 001F1034 2C 00 00 00 */ cmpwi r0, 0 /* 801F40F8 001F1038 40 82 01 2C */ bne lbl_801F4224 /* 801F40FC 001F103C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F4100 001F1040 4B E3 E0 9D */ bl STControl_NS_checkTrigger +/* 801F4100 001F1040 4B E3 E0 9D */ bl checkTrigger__9STControlFv /* 801F4104 001F1044 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801F4108 001F1048 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801F410C 001F104C 80 63 00 34 */ lwz r3, 0x34(r3) @@ -5126,7 +5126,7 @@ lbl_801F4124: /* 801F4134 001F1074 48 00 00 F0 */ b lbl_801F4224 lbl_801F4138: /* 801F4138 001F1078 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F413C 001F107C 4B E3 E3 6D */ bl STControl_NS_checkRightTrigger +/* 801F413C 001F107C 4B E3 E3 6D */ bl checkRightTrigger__9STControlFv /* 801F4140 001F1080 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F4144 001F1084 41 82 00 6C */ beq lbl_801F41B0 /* 801F4148 001F1088 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -5157,7 +5157,7 @@ lbl_801F4138: /* 801F41AC 001F10EC 48 00 00 78 */ b lbl_801F4224 lbl_801F41B0: /* 801F41B0 001F10F0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F41B4 001F10F4 4B E3 E2 79 */ bl STControl_NS_checkLeftTrigger +/* 801F41B4 001F10F4 4B E3 E2 79 */ bl checkLeftTrigger__9STControlFv /* 801F41B8 001F10F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F41BC 001F10FC 41 82 00 68 */ beq lbl_801F4224 /* 801F41C0 001F1100 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -6036,7 +6036,7 @@ dMenu_save_c_NS_errYesNoSelect: /* 801F4E80 001F1DC0 48 00 01 1C */ b lbl_801F4F9C lbl_801F4E84: /* 801F4E84 001F1DC4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F4E88 001F1DC8 4B E3 D3 15 */ bl STControl_NS_checkTrigger +/* 801F4E88 001F1DC8 4B E3 D3 15 */ bl checkTrigger__9STControlFv /* 801F4E8C 001F1DCC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801F4E90 001F1DD0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801F4E94 001F1DD4 80 03 00 34 */ lwz r0, 0x34(r3) @@ -6085,7 +6085,7 @@ lbl_801F4F28: /* 801F4F38 001F1E78 48 00 00 60 */ b lbl_801F4F98 lbl_801F4F3C: /* 801F4F3C 001F1E7C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F4F40 001F1E80 4B E3 D5 69 */ bl STControl_NS_checkRightTrigger +/* 801F4F40 001F1E80 4B E3 D5 69 */ bl checkRightTrigger__9STControlFv /* 801F4F44 001F1E84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F4F48 001F1E88 41 82 00 24 */ beq lbl_801F4F6C /* 801F4F4C 001F1E8C 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -6098,7 +6098,7 @@ lbl_801F4F3C: /* 801F4F68 001F1EA8 48 00 00 30 */ b lbl_801F4F98 lbl_801F4F6C: /* 801F4F6C 001F1EAC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801F4F70 001F1EB0 4B E3 D4 BD */ bl STControl_NS_checkLeftTrigger +/* 801F4F70 001F1EB0 4B E3 D4 BD */ bl checkLeftTrigger__9STControlFv /* 801F4F74 001F1EB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F4F78 001F1EB8 41 82 00 20 */ beq lbl_801F4F98 /* 801F4F7C 001F1EBC 88 1F 01 B6 */ lbz r0, 0x1b6(r31) diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index 640fbf13f3e..a7a09b5f2e9 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -853,7 +853,7 @@ lbl_801F7DF0: /* 801F7E38 001F4D78 48 00 00 C0 */ b lbl_801F7EF8 lbl_801F7E3C: /* 801F7E3C 001F4D7C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801F7E40 001F4D80 4B E3 A6 E5 */ bl STControl_NS_checkUpTrigger +/* 801F7E40 001F4D80 4B E3 A6 E5 */ bl checkUpTrigger__9STControlFv /* 801F7E44 001F4D84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F7E48 001F4D88 41 82 00 50 */ beq lbl_801F7E98 /* 801F7E4C 001F4D8C 88 7E 02 06 */ lbz r3, 0x206(r30) @@ -877,7 +877,7 @@ lbl_801F7E3C: /* 801F7E94 001F4DD4 48 00 00 64 */ b lbl_801F7EF8 lbl_801F7E98: /* 801F7E98 001F4DD8 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 801F7E9C 001F4DDC 4B E3 A7 05 */ bl STControl_NS_checkDownTrigger +/* 801F7E9C 001F4DDC 4B E3 A7 05 */ bl checkDownTrigger__9STControlFv /* 801F7EA0 001F4DE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F7EA4 001F4DE4 41 82 00 54 */ beq lbl_801F7EF8 /* 801F7EA8 001F4DE8 88 9E 02 06 */ lbz r4, 0x206(r30) diff --git a/asm/d/menu/d_menu_window.s b/asm/d/menu/d_menu_window.s index b4b4bd39e94..03642315257 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -3557,7 +3557,7 @@ dMw_c_NS__create: /* 801FD18C 001FA0CC C0 42 AA D8 */ lfs f2, lbl_804544D8-_SDA2_BASE_(r2) /* 801FD190 001FA0D0 39 00 00 00 */ li r8, 0 /* 801FD194 001FA0D4 39 20 08 00 */ li r9, 0x800 -/* 801FD198 001FA0D8 4B E3 4E AD */ bl STControl +/* 801FD198 001FA0D8 4B E3 4E AD */ bl __ct__9STControlFssssffss /* 801FD19C 001FA0DC 7C 60 1B 78 */ mr r0, r3 lbl_801FD1A0: /* 801FD1A0 001FA0E0 90 1E 01 04 */ stw r0, 0x104(r30) @@ -3576,7 +3576,7 @@ lbl_801FD1A0: /* 801FD1D4 001FA114 C0 42 AA D8 */ lfs f2, lbl_804544D8-_SDA2_BASE_(r2) /* 801FD1D8 001FA118 39 00 00 00 */ li r8, 0 /* 801FD1DC 001FA11C 39 20 20 00 */ li r9, 0x2000 -/* 801FD1E0 001FA120 4B E3 4E 65 */ bl STControl +/* 801FD1E0 001FA120 4B E3 4E 65 */ bl __ct__9STControlFssssffss /* 801FD1E4 001FA124 3C 60 80 3A */ lis r3, lbl_803A7250@ha /* 801FD1E8 001FA128 38 03 72 50 */ addi r0, r3, lbl_803A7250@l /* 801FD1EC 001FA12C 90 1F 00 00 */ stw r0, 0(r31) @@ -3591,7 +3591,7 @@ lbl_801FD1F0: /* 801FD20C 001FA14C C0 42 AA D8 */ lfs f2, lbl_804544D8-_SDA2_BASE_(r2) /* 801FD210 001FA150 39 00 00 00 */ li r8, 0 /* 801FD214 001FA154 39 20 20 00 */ li r9, 0x2000 -/* 801FD218 001FA158 4B E3 4E 71 */ bl STControl_NS_setWaitParm +/* 801FD218 001FA158 4B E3 4E 71 */ bl setWaitParm__9STControlFssssffss /* 801FD21C 001FA15C 38 80 00 00 */ li r4, 0 /* 801FD220 001FA160 98 9E 01 45 */ stb r4, 0x145(r30) /* 801FD224 001FA164 98 9E 01 46 */ stb r4, 0x146(r30) @@ -3659,12 +3659,12 @@ lbl_801FD304: /* 801FD30C 001FA24C 7C 7F 1B 78 */ mr r31, r3 /* 801FD310 001FA250 8B BE 01 46 */ lbz r29, 0x146(r30) /* 801FD314 001FA254 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 801FD318 001FA258 4B E3 4E 85 */ bl STControl_NS_checkTrigger +/* 801FD318 001FA258 4B E3 4E 85 */ bl checkTrigger__9STControlFv /* 801FD31C 001FA25C 4B FF CD F9 */ bl dMw_isMenuRing /* 801FD320 001FA260 2C 03 00 00 */ cmpwi r3, 0 /* 801FD324 001FA264 41 82 00 14 */ beq lbl_801FD338 /* 801FD328 001FA268 80 7E 01 08 */ lwz r3, 0x108(r30) -/* 801FD32C 001FA26C 4B E3 4E 71 */ bl STControl_NS_checkTrigger +/* 801FD32C 001FA26C 4B E3 4E 71 */ bl checkTrigger__9STControlFv /* 801FD330 001FA270 7F C3 F3 78 */ mr r3, r30 /* 801FD334 001FA274 4B FF FB B5 */ bl dMw_c_NS_checkCStickTrigger lbl_801FD338: diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 5480bcef5bc..06158322b43 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -1661,7 +1661,7 @@ lbl_801DBF18: /* 801DBF50 001D8E90 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801DBF54 001D8E94 7C 7F 1B 78 */ mr r31, r3 /* 801DBF58 001D8E98 80 63 00 B8 */ lwz r3, 0xb8(r3) -/* 801DBF5C 001D8E9C 4B E5 62 41 */ bl STControl_NS_checkTrigger +/* 801DBF5C 001D8E9C 4B E5 62 41 */ bl checkTrigger__9STControlFv /* 801DBF60 001D8EA0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha /* 801DBF64 001D8EA4 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l /* 801DBF68 001D8EA8 80 63 00 34 */ lwz r3, 0x34(r3) @@ -1763,7 +1763,7 @@ lbl_801DC0C4: /* 801DC0CC 001D900C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC0D0 001D9010 41 82 00 60 */ beq lbl_801DC130 /* 801DC0D4 001D9014 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801DC0D8 001D9018 4B E5 64 4D */ bl STControl_NS_checkUpTrigger +/* 801DC0D8 001D9018 4B E5 64 4D */ bl checkUpTrigger__9STControlFv /* 801DC0DC 001D901C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC0E0 001D9020 41 82 00 50 */ beq lbl_801DC130 /* 801DC0E4 001D9024 88 1F 00 E2 */ lbz r0, 0xe2(r31) @@ -1791,7 +1791,7 @@ lbl_801DC130: /* 801DC138 001D9078 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC13C 001D907C 41 82 00 5C */ beq lbl_801DC198 /* 801DC140 001D9080 80 7F 00 B8 */ lwz r3, 0xb8(r31) -/* 801DC144 001D9084 4B E5 64 5D */ bl STControl_NS_checkDownTrigger +/* 801DC144 001D9084 4B E5 64 5D */ bl checkDownTrigger__9STControlFv /* 801DC148 001D9088 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC14C 001D908C 41 82 00 4C */ beq lbl_801DC198 /* 801DC150 001D9090 88 1F 00 E2 */ lbz r0, 0xe2(r31) diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 5a1228320c3..9d0644a774c 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -440,7 +440,7 @@ jmessage_tReference: /* 80228B5C 00225A9C C0 42 B0 5C */ lfs f2, lbl_80454A5C-_SDA2_BASE_(r2) /* 80228B60 00225AA0 39 00 00 00 */ li r8, 0 /* 80228B64 00225AA4 39 20 20 00 */ li r9, 0x2000 -/* 80228B68 00225AA8 4B E0 94 DD */ bl STControl +/* 80228B68 00225AA8 4B E0 94 DD */ bl __ct__9STControlFssssffss /* 80228B6C 00225AAC 7C 60 1B 78 */ mr r0, r3 lbl_80228B70: /* 80228B70 00225AB0 90 1F 00 08 */ stw r0, 8(r31) @@ -453,7 +453,7 @@ lbl_80228B70: /* 80228B8C 00225ACC C0 42 B0 5C */ lfs f2, lbl_80454A5C-_SDA2_BASE_(r2) /* 80228B90 00225AD0 39 00 00 00 */ li r8, 0 /* 80228B94 00225AD4 39 20 08 00 */ li r9, 0x800 -/* 80228B98 00225AD8 4B E0 94 F1 */ bl STControl_NS_setWaitParm +/* 80228B98 00225AD8 4B E0 94 F1 */ bl setWaitParm__9STControlFssssffss /* 80228B9C 00225ADC C0 22 B0 60 */ lfs f1, lbl_80454A60-_SDA2_BASE_(r2) /* 80228BA0 00225AE0 D0 3F 04 14 */ stfs f1, 0x414(r31) /* 80228BA4 00225AE4 D0 3F 04 18 */ stfs f1, 0x418(r31) @@ -903,12 +903,12 @@ jmessage_tReference_NS_selectMessage: /* 80229180 002260C0 28 00 00 00 */ cmplwi r0, 0 /* 80229184 002260C4 41 82 03 10 */ beq lbl_80229494 /* 80229188 002260C8 80 7F 00 08 */ lwz r3, 8(r31) -/* 8022918C 002260CC 4B E0 90 11 */ bl STControl_NS_checkTrigger +/* 8022918C 002260CC 4B E0 90 11 */ bl checkTrigger__9STControlFv /* 80229190 002260D0 88 1F 12 43 */ lbz r0, 0x1243(r31) /* 80229194 002260D4 28 00 00 00 */ cmplwi r0, 0 /* 80229198 002260D8 40 82 01 7C */ bne lbl_80229314 /* 8022919C 002260DC 80 7F 00 08 */ lwz r3, 8(r31) -/* 802291A0 002260E0 4B E0 93 85 */ bl STControl_NS_checkUpTrigger +/* 802291A0 002260E0 4B E0 93 85 */ bl checkUpTrigger__9STControlFv /* 802291A4 002260E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802291A8 002260E8 41 82 00 B0 */ beq lbl_80229258 /* 802291AC 002260EC 88 1F 12 42 */ lbz r0, 0x1242(r31) @@ -957,7 +957,7 @@ lbl_80229204: /* 80229254 00226194 48 00 02 40 */ b lbl_80229494 lbl_80229258: /* 80229258 00226198 80 7F 00 08 */ lwz r3, 8(r31) -/* 8022925C 0022619C 4B E0 93 45 */ bl STControl_NS_checkDownTrigger +/* 8022925C 0022619C 4B E0 93 45 */ bl checkDownTrigger__9STControlFv /* 80229260 002261A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229264 002261A4 41 82 02 30 */ beq lbl_80229494 /* 80229268 002261A8 88 1F 12 42 */ lbz r0, 0x1242(r31) @@ -1006,7 +1006,7 @@ lbl_802292C0: /* 80229310 00226250 48 00 01 84 */ b lbl_80229494 lbl_80229314: /* 80229314 00226254 80 7F 00 08 */ lwz r3, 8(r31) -/* 80229318 00226258 4B E0 91 15 */ bl STControl_NS_checkLeftTrigger +/* 80229318 00226258 4B E0 91 15 */ bl checkLeftTrigger__9STControlFv /* 8022931C 0022625C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229320 00226260 41 82 00 B0 */ beq lbl_802293D0 /* 80229324 00226264 88 1F 12 44 */ lbz r0, 0x1244(r31) @@ -1055,7 +1055,7 @@ lbl_8022937C: /* 802293CC 0022630C 48 00 00 C8 */ b lbl_80229494 lbl_802293D0: /* 802293D0 00226310 80 7F 00 08 */ lwz r3, 8(r31) -/* 802293D4 00226314 4B E0 90 D5 */ bl STControl_NS_checkRightTrigger +/* 802293D4 00226314 4B E0 90 D5 */ bl checkRightTrigger__9STControlFv /* 802293D8 00226318 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802293DC 0022631C 41 82 00 B8 */ beq lbl_80229494 /* 802293E0 00226320 88 1F 12 44 */ lbz r0, 0x1244(r31) @@ -1120,7 +1120,7 @@ jmessage_tReference_NS_inputNumber: /* 802294B8 002263F8 48 13 8D 1D */ bl _savegpr_27 /* 802294BC 002263FC 7C 7C 1B 78 */ mr r28, r3 /* 802294C0 00226400 80 63 00 08 */ lwz r3, 8(r3) -/* 802294C4 00226404 4B E0 8C D9 */ bl STControl_NS_checkTrigger +/* 802294C4 00226404 4B E0 8C D9 */ bl checkTrigger__9STControlFv /* 802294C8 00226408 80 7C 05 C0 */ lwz r3, 0x5c0(r28) /* 802294CC 0022640C AB C3 01 74 */ lha r30, 0x174(r3) /* 802294D0 00226410 7F DD F3 78 */ mr r29, r30 @@ -1143,7 +1143,7 @@ lbl_80229504: /* 8022950C 0022644C 3B 60 00 01 */ li r27, 1 lbl_80229510: /* 80229510 00226450 80 7C 00 08 */ lwz r3, 8(r28) -/* 80229514 00226454 4B E0 90 11 */ bl STControl_NS_checkUpTrigger +/* 80229514 00226454 4B E0 90 11 */ bl checkUpTrigger__9STControlFv /* 80229518 00226458 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022951C 0022645C 41 82 00 60 */ beq lbl_8022957C /* 80229520 00226460 88 1C 12 4F */ lbz r0, 0x124f(r28) @@ -1176,7 +1176,7 @@ lbl_80229570: /* 80229578 002264B8 48 00 01 28 */ b lbl_802296A0 lbl_8022957C: /* 8022957C 002264BC 80 7C 00 08 */ lwz r3, 8(r28) -/* 80229580 002264C0 4B E0 90 21 */ bl STControl_NS_checkDownTrigger +/* 80229580 002264C0 4B E0 90 21 */ bl checkDownTrigger__9STControlFv /* 80229584 002264C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229588 002264C8 41 82 00 60 */ beq lbl_802295E8 /* 8022958C 002264CC 88 1C 12 4F */ lbz r0, 0x124f(r28) @@ -1209,7 +1209,7 @@ lbl_802295DC: /* 802295E4 00226524 48 00 00 BC */ b lbl_802296A0 lbl_802295E8: /* 802295E8 00226528 80 7C 00 08 */ lwz r3, 8(r28) -/* 802295EC 0022652C 4B E0 8E 41 */ bl STControl_NS_checkLeftTrigger +/* 802295EC 0022652C 4B E0 8E 41 */ bl checkLeftTrigger__9STControlFv /* 802295F0 00226530 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802295F4 00226534 41 82 00 54 */ beq lbl_80229648 /* 802295F8 00226538 88 7C 12 4F */ lbz r3, 0x124f(r28) @@ -1234,7 +1234,7 @@ lbl_802295E8: /* 80229644 00226584 48 00 00 5C */ b lbl_802296A0 lbl_80229648: /* 80229648 00226588 80 7C 00 08 */ lwz r3, 8(r28) -/* 8022964C 0022658C 4B E0 8E 5D */ bl STControl_NS_checkRightTrigger +/* 8022964C 0022658C 4B E0 8E 5D */ bl checkRightTrigger__9STControlFv /* 80229650 00226590 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229654 00226594 41 82 00 4C */ beq lbl_802296A0 /* 80229658 00226598 88 7C 12 4F */ lbz r3, 0x124f(r28) diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index c89ecf08023..000d81dadeb 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -1407,7 +1407,7 @@ lbl_8023DFE4: /* 8023E11C 0023B05C 48 00 02 D8 */ b lbl_8023E3F4 lbl_8023E120: /* 8023E120 0023B060 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 8023E124 0023B064 4B DF 40 79 */ bl STControl_NS_checkTrigger +/* 8023E124 0023B064 4B DF 40 79 */ bl checkTrigger__9STControlFv /* 8023E128 0023B068 7F E3 FB 78 */ mr r3, r31 /* 8023E12C 0023B06C 48 00 05 15 */ bl dMsgScrnExplain_c_NS_checkTriggerA /* 8023E130 0023B070 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -1548,7 +1548,7 @@ lbl_8023E320: /* 8023E328 0023B268 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E32C 0023B26C 41 82 00 60 */ beq lbl_8023E38C /* 8023E330 0023B270 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 8023E334 0023B274 4B DF 41 F1 */ bl STControl_NS_checkUpTrigger +/* 8023E334 0023B274 4B DF 41 F1 */ bl checkUpTrigger__9STControlFv /* 8023E338 0023B278 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E33C 0023B27C 41 82 00 50 */ beq lbl_8023E38C /* 8023E340 0023B280 88 1F 00 61 */ lbz r0, 0x61(r31) @@ -1576,7 +1576,7 @@ lbl_8023E38C: /* 8023E394 0023B2D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E398 0023B2D8 41 82 00 5C */ beq lbl_8023E3F4 /* 8023E39C 0023B2DC 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 8023E3A0 0023B2E0 4B DF 42 01 */ bl STControl_NS_checkDownTrigger +/* 8023E3A0 0023B2E0 4B DF 42 01 */ bl checkDownTrigger__9STControlFv /* 8023E3A4 0023B2E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E3A8 0023B2E8 41 82 00 4C */ beq lbl_8023E3F4 /* 8023E3AC 0023B2EC 88 1F 00 61 */ lbz r0, 0x61(r31) diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index 2afa56608a2..3d0ef22f067 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -1700,7 +1700,7 @@ dPaneClass_setPriority: lbl_802551BC: /* 802551BC 002520FC 7F E3 FB 78 */ mr r3, r31 /* 802551C0 00252100 7F 64 DB 78 */ mr r4, r27 -/* 802551C4 00252104 4B DD D5 75 */ bl dLib_getExpandSizeFromAramArchive +/* 802551C4 00252104 4B DD D5 75 */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc /* 802551C8 00252108 7C 7C 1B 79 */ or. r28, r3, r3 /* 802551CC 0025210C 40 82 00 0C */ bne lbl_802551D8 /* 802551D0 00252110 38 60 00 00 */ li r3, 0 diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index ca4f1391c53..38912d5c6e3 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -237,9 +237,9 @@ lbl_801973A8: /* 801973F8 00194338 C0 42 A1 04 */ lfs f2, lbl_80453B04-_SDA2_BASE_(r2) /* 801973FC 0019433C 39 00 00 00 */ li r8, 0 /* 80197400 00194340 39 20 20 00 */ li r9, 0x2000 -/* 80197404 00194344 4B E9 AC 85 */ bl STControl_NS_setWaitParm +/* 80197404 00194344 4B E9 AC 85 */ bl setWaitParm__9STControlFssssffss /* 80197408 00194348 7F C3 F3 78 */ mr r3, r30 -/* 8019740C 0019434C 4B E9 AC A1 */ bl STControl_NS_init +/* 8019740C 0019434C 4B E9 AC A1 */ bl init__9STControlFv lbl_80197410: /* 80197410 00194350 93 DF 0E 40 */ stw r30, 0xe40(r31) lbl_80197414: @@ -446,7 +446,7 @@ lbl_801976C0: /* 801976C4 00194604 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801976C8 00194608 40 82 00 0C */ bne lbl_801976D4 /* 801976CC 0019460C 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 801976D0 00194610 4B E9 AA CD */ bl STControl_NS_checkTrigger +/* 801976D0 00194610 4B E9 AA CD */ bl checkTrigger__9STControlFv lbl_801976D4: /* 801976D4 00194614 88 0D 8A D8 */ lbz r0, lbl_80451058-_SDA_BASE_(r13) /* 801976D8 00194618 28 00 00 04 */ cmplwi r0, 4 @@ -807,7 +807,7 @@ lbl_80197BEC: /* 80197BF0 00194B30 28 00 00 06 */ cmplwi r0, 6 /* 80197BF4 00194B34 41 80 01 C0 */ blt lbl_80197DB4 /* 80197BF8 00194B38 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80197BFC 00194B3C 4B E9 A9 29 */ bl STControl_NS_checkUpTrigger +/* 80197BFC 00194B3C 4B E9 A9 29 */ bl checkUpTrigger__9STControlFv /* 80197C00 00194B40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80197C04 00194B44 41 82 00 D4 */ beq lbl_80197CD8 /* 80197C08 00194B48 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -867,7 +867,7 @@ lbl_80197CD0: /* 80197CD4 00194C14 48 00 00 E4 */ b lbl_80197DB8 lbl_80197CD8: /* 80197CD8 00194C18 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80197CDC 00194C1C 4B E9 A8 C5 */ bl STControl_NS_checkDownTrigger +/* 80197CDC 00194C1C 4B E9 A8 C5 */ bl checkDownTrigger__9STControlFv /* 80197CE0 00194C20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80197CE4 00194C24 41 82 00 D0 */ beq lbl_80197DB4 /* 80197CE8 00194C28 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -1100,7 +1100,7 @@ lbl_80198030: /* 80198034 00194F74 48 00 02 04 */ b lbl_80198238 lbl_80198038: /* 80198038 00194F78 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 8019803C 00194F7C 4B E9 A4 E9 */ bl STControl_NS_checkUpTrigger +/* 8019803C 00194F7C 4B E9 A4 E9 */ bl checkUpTrigger__9STControlFv /* 80198040 00194F80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80198044 00194F84 41 82 00 F8 */ beq lbl_8019813C /* 80198048 00194F88 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -1172,7 +1172,7 @@ lbl_80198134: /* 80198138 00195078 48 00 01 00 */ b lbl_80198238 lbl_8019813C: /* 8019813C 0019507C 80 7D 0E 40 */ lwz r3, 0xe40(r29) -/* 80198140 00195080 4B E9 A4 61 */ bl STControl_NS_checkDownTrigger +/* 80198140 00195080 4B E9 A4 61 */ bl checkDownTrigger__9STControlFv /* 80198144 00195084 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80198148 00195088 41 82 00 EC */ beq lbl_80198234 /* 8019814C 0019508C 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -4119,7 +4119,7 @@ dShopSystem_c_NS_checkLeftTrigger: /* 8019AB64 00197AA4 7C 08 02 A6 */ mflr r0 /* 8019AB68 00197AA8 90 01 00 14 */ stw r0, 0x14(r1) /* 8019AB6C 00197AAC 7C 83 23 78 */ mr r3, r4 -/* 8019AB70 00197AB0 4B E9 78 BD */ bl STControl_NS_checkLeftTrigger +/* 8019AB70 00197AB0 4B E9 78 BD */ bl checkLeftTrigger__9STControlFv /* 8019AB74 00197AB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019AB78 00197AB8 7C 08 03 A6 */ mtlr r0 /* 8019AB7C 00197ABC 38 21 00 10 */ addi r1, r1, 0x10 @@ -4131,7 +4131,7 @@ dShopSystem_c_NS_checkRightTrigger: /* 8019AB88 00197AC8 7C 08 02 A6 */ mflr r0 /* 8019AB8C 00197ACC 90 01 00 14 */ stw r0, 0x14(r1) /* 8019AB90 00197AD0 7C 83 23 78 */ mr r3, r4 -/* 8019AB94 00197AD4 4B E9 79 15 */ bl STControl_NS_checkRightTrigger +/* 8019AB94 00197AD4 4B E9 79 15 */ bl checkRightTrigger__9STControlFv /* 8019AB98 00197AD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019AB9C 00197ADC 7C 08 03 A6 */ mtlr r0 /* 8019ABA0 00197AE0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/f/pc/f_pc_manager.s b/asm/f/pc/f_pc_manager.s index 5fda9e7ed7f..ac17e087ed1 100644 --- a/asm/f/pc/f_pc_manager.s +++ b/asm/f/pc/f_pc_manager.s @@ -94,7 +94,7 @@ lbl_800221B4: /* 800221C0 0001F100 88 0D 87 B8 */ lbz r0, lbl_80450D38-_SDA_BASE_(r13) /* 800221C4 0001F104 28 00 00 00 */ cmplwi r0, 0 /* 800221C8 0001F108 41 82 00 1C */ beq lbl_800221E4 -/* 800221CC 0001F10C 48 01 06 F1 */ bl dLib_time_c_NS_startTime +/* 800221CC 0001F10C 48 01 06 F1 */ bl startTime__11dLib_time_cFv /* 800221D0 0001F110 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 800221D4 0001F114 38 80 00 00 */ li r4, 0 /* 800221D8 0001F118 48 28 84 D9 */ bl Z2SoundMgr_NS_pauseAllGameSound @@ -146,7 +146,7 @@ lbl_80022268: /* 80022268 0001F1A8 88 0D 87 B8 */ lbz r0, lbl_80450D38-_SDA_BASE_(r13) /* 8002226C 0001F1AC 28 00 00 00 */ cmplwi r0, 0 /* 80022270 0001F1B0 40 82 00 30 */ bne lbl_800222A0 -/* 80022274 0001F1B4 48 01 06 0D */ bl dLib_time_c_NS_stopTime +/* 80022274 0001F1B4 48 01 06 0D */ bl stopTime__11dLib_time_cFv /* 80022278 0001F1B8 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 8002227C 0001F1BC 38 80 00 01 */ li r4, 1 /* 80022280 0001F1C0 48 28 84 31 */ bl Z2SoundMgr_NS_pauseAllGameSound diff --git a/include/d/d_a/d_a_alink/d_a_alink.h b/include/d/d_a/d_a_alink/d_a_alink.h index 3196958c6d1..984abbcfa35 100644 --- a/include/d/d_a/d_a_alink/d_a_alink.h +++ b/include/d/d_a/d_a_alink/d_a_alink.h @@ -295,17 +295,12 @@ extern double lbl_80452CB0; extern float lbl_80452CB8; // daalink setmatrixworldaxisrot -struct now { // m_Do_mtx::mDoMtx_stack_c::now - float unk0[4]; - float unk10[4]; - float unk20[4]; -}; struct mCurrentMtx { // J3DGraphBase::J3DSys::mCurrentMtx float unk0[4]; float unk10[4]; float unk20[4]; }; -extern now lbl_803DD470; +// extern now lbl_803DD470; extern mCurrentMtx lbl_80434BE4; // daalink modelcallback diff --git a/include/d/d_event/d_event/d_event.h b/include/d/d_event/d_event/d_event.h index ebe5e42bbbc..2a4eed8c5cb 100644 --- a/include/d/d_event/d_event/d_event.h +++ b/include/d/d_event/d_event/d_event.h @@ -5,6 +5,7 @@ class dEvt_control_c { public: + void searchMapEventData(u8 param_1); u8 unk[0x130]; }; diff --git a/include/d/d_lib/asm/CSTControl_NS_getAngleStick.s b/include/d/d_lib/asm/CSTControl_NS_getAngleStick.s new file mode 100644 index 00000000000..5c23cbcdb12 --- /dev/null +++ b/include/d/d_lib/asm/CSTControl_NS_getAngleStick.s @@ -0,0 +1,4 @@ +/* 8003218C 0002F0CC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha +/* 80032190 0002F0D0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l +/* 80032194 0002F0D4 A8 63 00 1C */ lha r3, 0x1c(r3) +/* 80032198 0002F0D8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/CSTControl_NS_getValueStick.s b/include/d/d_lib/asm/CSTControl_NS_getValueStick.s new file mode 100644 index 00000000000..29cc3cf3807 --- /dev/null +++ b/include/d/d_lib/asm/CSTControl_NS_getValueStick.s @@ -0,0 +1,4 @@ +/* 8003217C 0002F0BC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha +/* 80032180 0002F0C0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l +/* 80032184 0002F0C4 C0 23 00 18 */ lfs f1, 0x18(r3) +/* 80032188 0002F0C8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl.s b/include/d/d_lib/asm/STControl.s new file mode 100644 index 00000000000..da4ddb20706 --- /dev/null +++ b/include/d/d_lib/asm/STControl.s @@ -0,0 +1,17 @@ +/* 80032044 0002EF84 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80032048 0002EF88 7C 08 02 A6 */ mflr r0 +/* 8003204C 0002EF8C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80032050 0002EF90 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80032054 0002EF94 7C 7F 1B 78 */ mr r31, r3 +/* 80032058 0002EF98 3D 40 80 3A */ lis r10, lbl_803A7260@ha +/* 8003205C 0002EF9C 38 0A 72 60 */ addi r0, r10, lbl_803A7260@l +/* 80032060 0002EFA0 90 03 00 00 */ stw r0, 0(r3) +/* 80032064 0002EFA4 48 00 00 25 */ bl setWaitParm__9STControlFssssffss +/* 80032068 0002EFA8 7F E3 FB 78 */ mr r3, r31 +/* 8003206C 0002EFAC 48 00 00 41 */ bl init__9STControlFv +/* 80032070 0002EFB0 7F E3 FB 78 */ mr r3, r31 +/* 80032074 0002EFB4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 80032078 0002EFB8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8003207C 0002EFBC 7C 08 03 A6 */ mtlr r0 +/* 80032080 0002EFC0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80032084 0002EFC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_Xinit.s b/include/d/d_lib/asm/STControl_NS_Xinit.s new file mode 100644 index 00000000000..e3ad6d6a0d7 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_Xinit.s @@ -0,0 +1,12 @@ +/* 800320FC 0002F03C 38 00 00 00 */ li r0, 0 +/* 80032100 0002F040 B0 03 00 0E */ sth r0, 0xe(r3) +/* 80032104 0002F044 88 03 00 0C */ lbz r0, 0xc(r3) +/* 80032108 0002F048 54 00 06 3A */ rlwinm r0, r0, 0, 0x18, 0x1d +/* 8003210C 0002F04C 98 03 00 0C */ stb r0, 0xc(r3) +/* 80032110 0002F050 A8 03 00 12 */ lha r0, 0x12(r3) +/* 80032114 0002F054 B0 03 00 18 */ sth r0, 0x18(r3) +/* 80032118 0002F058 A8 03 00 1C */ lha r0, 0x1c(r3) +/* 8003211C 0002F05C B0 03 00 1E */ sth r0, 0x1e(r3) +/* 80032120 0002F060 A8 03 00 28 */ lha r0, 0x28(r3) +/* 80032124 0002F064 B0 03 00 2A */ sth r0, 0x2a(r3) +/* 80032128 0002F068 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_Yinit.s b/include/d/d_lib/asm/STControl_NS_Yinit.s new file mode 100644 index 00000000000..0722968ce61 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_Yinit.s @@ -0,0 +1,12 @@ +/* 8003212C 0002F06C 38 00 00 00 */ li r0, 0 +/* 80032130 0002F070 B0 03 00 10 */ sth r0, 0x10(r3) +/* 80032134 0002F074 88 03 00 0C */ lbz r0, 0xc(r3) +/* 80032138 0002F078 54 00 07 B6 */ rlwinm r0, r0, 0, 0x1e, 0x1b +/* 8003213C 0002F07C 98 03 00 0C */ stb r0, 0xc(r3) +/* 80032140 0002F080 A8 03 00 12 */ lha r0, 0x12(r3) +/* 80032144 0002F084 B0 03 00 1A */ sth r0, 0x1a(r3) +/* 80032148 0002F088 A8 03 00 1C */ lha r0, 0x1c(r3) +/* 8003214C 0002F08C B0 03 00 20 */ sth r0, 0x20(r3) +/* 80032150 0002F090 A8 03 00 28 */ lha r0, 0x28(r3) +/* 80032154 0002F094 B0 03 00 2C */ sth r0, 0x2c(r3) +/* 80032158 0002F098 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkDownTrigger.s b/include/d/d_lib/asm/STControl_NS_checkDownTrigger.s new file mode 100644 index 00000000000..110f1ecc0b8 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_checkDownTrigger.s @@ -0,0 +1,34 @@ +/* 800325A0 0002F4E0 A8 03 00 10 */ lha r0, 0x10(r3) +/* 800325A4 0002F4E4 2C 00 00 00 */ cmpwi r0, 0 +/* 800325A8 0002F4E8 40 82 00 6C */ bne lbl_80032614 +/* 800325AC 0002F4EC 88 03 00 0C */ lbz r0, 0xc(r3) +/* 800325B0 0002F4F0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c +/* 800325B4 0002F4F4 41 82 00 60 */ beq lbl_80032614 +/* 800325B8 0002F4F8 A8 83 00 1A */ lha r4, 0x1a(r3) +/* 800325BC 0002F4FC A8 03 00 2C */ lha r0, 0x2c(r3) +/* 800325C0 0002F500 7C 04 02 14 */ add r0, r4, r0 +/* 800325C4 0002F504 B0 03 00 10 */ sth r0, 0x10(r3) +/* 800325C8 0002F508 38 00 00 00 */ li r0, 0 +/* 800325CC 0002F50C B0 03 00 2C */ sth r0, 0x2c(r3) +/* 800325D0 0002F510 A8 83 00 20 */ lha r4, 0x20(r3) +/* 800325D4 0002F514 2C 04 00 00 */ cmpwi r4, 0 +/* 800325D8 0002F518 40 82 00 2C */ bne lbl_80032604 +/* 800325DC 0002F51C A8 83 00 16 */ lha r4, 0x16(r3) +/* 800325E0 0002F520 A8 03 00 1A */ lha r0, 0x1a(r3) +/* 800325E4 0002F524 7C 04 00 50 */ subf r0, r4, r0 +/* 800325E8 0002F528 B0 03 00 1A */ sth r0, 0x1a(r3) +/* 800325EC 0002F52C A8 03 00 1A */ lha r0, 0x1a(r3) +/* 800325F0 0002F530 A8 83 00 14 */ lha r4, 0x14(r3) +/* 800325F4 0002F534 7C 00 20 00 */ cmpw r0, r4 +/* 800325F8 0002F538 40 80 00 14 */ bge lbl_8003260C +/* 800325FC 0002F53C B0 83 00 1A */ sth r4, 0x1a(r3) +/* 80032600 0002F540 48 00 00 0C */ b lbl_8003260C +lbl_80032604: +/* 80032604 0002F544 38 04 FF FF */ addi r0, r4, -1 +/* 80032608 0002F548 B0 03 00 20 */ sth r0, 0x20(r3) +lbl_8003260C: +/* 8003260C 0002F54C 38 60 00 01 */ li r3, 1 +/* 80032610 0002F550 4E 80 00 20 */ blr +lbl_80032614: +/* 80032614 0002F554 38 60 00 00 */ li r3, 0 +/* 80032618 0002F558 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s b/include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s new file mode 100644 index 00000000000..01d2b61a628 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_checkLeftTrigger.s @@ -0,0 +1,34 @@ +/* 8003242C 0002F36C A8 03 00 0E */ lha r0, 0xe(r3) +/* 80032430 0002F370 2C 00 00 00 */ cmpwi r0, 0 +/* 80032434 0002F374 40 82 00 6C */ bne lbl_800324A0 +/* 80032438 0002F378 88 03 00 0C */ lbz r0, 0xc(r3) +/* 8003243C 0002F37C 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 80032440 0002F380 41 82 00 60 */ beq lbl_800324A0 +/* 80032444 0002F384 A8 83 00 18 */ lha r4, 0x18(r3) +/* 80032448 0002F388 A8 03 00 2A */ lha r0, 0x2a(r3) +/* 8003244C 0002F38C 7C 04 02 14 */ add r0, r4, r0 +/* 80032450 0002F390 B0 03 00 0E */ sth r0, 0xe(r3) +/* 80032454 0002F394 38 00 00 00 */ li r0, 0 +/* 80032458 0002F398 B0 03 00 2A */ sth r0, 0x2a(r3) +/* 8003245C 0002F39C A8 83 00 1E */ lha r4, 0x1e(r3) +/* 80032460 0002F3A0 2C 04 00 00 */ cmpwi r4, 0 +/* 80032464 0002F3A4 40 82 00 2C */ bne lbl_80032490 +/* 80032468 0002F3A8 A8 83 00 16 */ lha r4, 0x16(r3) +/* 8003246C 0002F3AC A8 03 00 18 */ lha r0, 0x18(r3) +/* 80032470 0002F3B0 7C 04 00 50 */ subf r0, r4, r0 +/* 80032474 0002F3B4 B0 03 00 18 */ sth r0, 0x18(r3) +/* 80032478 0002F3B8 A8 03 00 18 */ lha r0, 0x18(r3) +/* 8003247C 0002F3BC A8 83 00 14 */ lha r4, 0x14(r3) +/* 80032480 0002F3C0 7C 00 20 00 */ cmpw r0, r4 +/* 80032484 0002F3C4 40 80 00 14 */ bge lbl_80032498 +/* 80032488 0002F3C8 B0 83 00 18 */ sth r4, 0x18(r3) +/* 8003248C 0002F3CC 48 00 00 0C */ b lbl_80032498 +lbl_80032490: +/* 80032490 0002F3D0 38 04 FF FF */ addi r0, r4, -1 +/* 80032494 0002F3D4 B0 03 00 1E */ sth r0, 0x1e(r3) +lbl_80032498: +/* 80032498 0002F3D8 38 60 00 01 */ li r3, 1 +/* 8003249C 0002F3DC 4E 80 00 20 */ blr +lbl_800324A0: +/* 800324A0 0002F3E0 38 60 00 00 */ li r3, 0 +/* 800324A4 0002F3E4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkRightTrigger.s b/include/d/d_lib/asm/STControl_NS_checkRightTrigger.s new file mode 100644 index 00000000000..6858638e721 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_checkRightTrigger.s @@ -0,0 +1,34 @@ +/* 800324A8 0002F3E8 A8 03 00 0E */ lha r0, 0xe(r3) +/* 800324AC 0002F3EC 2C 00 00 00 */ cmpwi r0, 0 +/* 800324B0 0002F3F0 40 82 00 6C */ bne lbl_8003251C +/* 800324B4 0002F3F4 88 03 00 0C */ lbz r0, 0xc(r3) +/* 800324B8 0002F3F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e +/* 800324BC 0002F3FC 41 82 00 60 */ beq lbl_8003251C +/* 800324C0 0002F400 A8 83 00 18 */ lha r4, 0x18(r3) +/* 800324C4 0002F404 A8 03 00 2A */ lha r0, 0x2a(r3) +/* 800324C8 0002F408 7C 04 02 14 */ add r0, r4, r0 +/* 800324CC 0002F40C B0 03 00 0E */ sth r0, 0xe(r3) +/* 800324D0 0002F410 38 00 00 00 */ li r0, 0 +/* 800324D4 0002F414 B0 03 00 2A */ sth r0, 0x2a(r3) +/* 800324D8 0002F418 A8 83 00 1E */ lha r4, 0x1e(r3) +/* 800324DC 0002F41C 2C 04 00 00 */ cmpwi r4, 0 +/* 800324E0 0002F420 40 82 00 2C */ bne lbl_8003250C +/* 800324E4 0002F424 A8 83 00 16 */ lha r4, 0x16(r3) +/* 800324E8 0002F428 A8 03 00 18 */ lha r0, 0x18(r3) +/* 800324EC 0002F42C 7C 04 00 50 */ subf r0, r4, r0 +/* 800324F0 0002F430 B0 03 00 18 */ sth r0, 0x18(r3) +/* 800324F4 0002F434 A8 03 00 18 */ lha r0, 0x18(r3) +/* 800324F8 0002F438 A8 83 00 14 */ lha r4, 0x14(r3) +/* 800324FC 0002F43C 7C 00 20 00 */ cmpw r0, r4 +/* 80032500 0002F440 40 80 00 14 */ bge lbl_80032514 +/* 80032504 0002F444 B0 83 00 18 */ sth r4, 0x18(r3) +/* 80032508 0002F448 48 00 00 0C */ b lbl_80032514 +lbl_8003250C: +/* 8003250C 0002F44C 38 04 FF FF */ addi r0, r4, -1 +/* 80032510 0002F450 B0 03 00 1E */ sth r0, 0x1e(r3) +lbl_80032514: +/* 80032514 0002F454 38 60 00 01 */ li r3, 1 +/* 80032518 0002F458 4E 80 00 20 */ blr +lbl_8003251C: +/* 8003251C 0002F45C 38 60 00 00 */ li r3, 0 +/* 80032520 0002F460 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_checkTrigger.s b/include/d/d_lib/asm/STControl_NS_checkTrigger.s new file mode 100644 index 00000000000..8d556b991a0 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_checkTrigger.s @@ -0,0 +1,184 @@ +/* 8003219C 0002F0DC 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 800321A0 0002F0E0 7C 08 02 A6 */ mflr r0 +/* 800321A4 0002F0E4 90 01 00 24 */ stw r0, 0x24(r1) +/* 800321A8 0002F0E8 DB E1 00 10 */ stfd f31, 0x10(r1) +/* 800321AC 0002F0EC F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 +/* 800321B0 0002F0F0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 800321B4 0002F0F4 7C 7F 1B 78 */ mr r31, r3 +/* 800321B8 0002F0F8 88 03 00 0C */ lbz r0, 0xc(r3) +/* 800321BC 0002F0FC 98 03 00 0D */ stb r0, 0xd(r3) +/* 800321C0 0002F100 81 83 00 00 */ lwz r12, 0(r3) +/* 800321C4 0002F104 81 8C 00 08 */ lwz r12, 8(r12) +/* 800321C8 0002F108 7D 89 03 A6 */ mtctr r12 +/* 800321CC 0002F10C 4E 80 04 21 */ bctrl +/* 800321D0 0002F110 FF E0 08 90 */ fmr f31, f1 +/* 800321D4 0002F114 7F E3 FB 78 */ mr r3, r31 +/* 800321D8 0002F118 81 9F 00 00 */ lwz r12, 0(r31) +/* 800321DC 0002F11C 81 8C 00 0C */ lwz r12, 0xc(r12) +/* 800321E0 0002F120 7D 89 03 A6 */ mtctr r12 +/* 800321E4 0002F124 4E 80 04 21 */ bctrl +/* 800321E8 0002F128 38 C0 00 00 */ li r6, 0 +/* 800321EC 0002F12C A8 1F 00 26 */ lha r0, 0x26(r31) +/* 800321F0 0002F130 20 00 20 00 */ subfic r0, r0, 0x2000 +/* 800321F4 0002F134 7C 00 0E 70 */ srawi r0, r0, 1 +/* 800321F8 0002F138 7C 07 07 34 */ extsh r7, r0 +/* 800321FC 0002F13C FC 00 FA 10 */ fabs f0, f31 +/* 80032200 0002F140 FC 20 00 18 */ frsp f1, f0 +/* 80032204 0002F144 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) +/* 80032208 0002F148 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8003220C 0002F14C 41 80 01 98 */ blt lbl_800323A4 +/* 80032210 0002F150 7C 65 07 34 */ extsh r5, r3 +/* 80032214 0002F154 A8 9F 00 22 */ lha r4, 0x22(r31) +/* 80032218 0002F158 7C 64 3A 14 */ add r3, r4, r7 +/* 8003221C 0002F15C 38 03 90 00 */ addi r0, r3, -28672 +/* 80032220 0002F160 7C 05 00 00 */ cmpw r5, r0 +/* 80032224 0002F164 40 80 00 10 */ bge lbl_80032234 +/* 80032228 0002F168 60 C0 00 04 */ ori r0, r6, 4 +/* 8003222C 0002F16C 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 80032230 0002F170 48 00 00 C4 */ b lbl_800322F4 +lbl_80032234: +/* 80032234 0002F174 38 04 B0 00 */ addi r0, r4, -20480 +/* 80032238 0002F178 7C 07 00 50 */ subf r0, r7, r0 +/* 8003223C 0002F17C 7C 05 00 00 */ cmpw r5, r0 +/* 80032240 0002F180 40 80 00 10 */ bge lbl_80032250 +/* 80032244 0002F184 60 C0 00 05 */ ori r0, r6, 5 +/* 80032248 0002F188 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 8003224C 0002F18C 48 00 00 A8 */ b lbl_800322F4 +lbl_80032250: +/* 80032250 0002F190 38 03 D0 00 */ addi r0, r3, -12288 +/* 80032254 0002F194 7C 05 00 00 */ cmpw r5, r0 +/* 80032258 0002F198 40 80 00 10 */ bge lbl_80032268 +/* 8003225C 0002F19C 60 C0 00 01 */ ori r0, r6, 1 +/* 80032260 0002F1A0 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 80032264 0002F1A4 48 00 00 90 */ b lbl_800322F4 +lbl_80032268: +/* 80032268 0002F1A8 38 04 F0 00 */ addi r0, r4, -4096 +/* 8003226C 0002F1AC 7C 07 00 50 */ subf r0, r7, r0 +/* 80032270 0002F1B0 7C 05 00 00 */ cmpw r5, r0 +/* 80032274 0002F1B4 40 80 00 10 */ bge lbl_80032284 +/* 80032278 0002F1B8 60 C0 00 09 */ ori r0, r6, 9 +/* 8003227C 0002F1BC 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 80032280 0002F1C0 48 00 00 74 */ b lbl_800322F4 +lbl_80032284: +/* 80032284 0002F1C4 38 03 10 00 */ addi r0, r3, 0x1000 +/* 80032288 0002F1C8 7C 05 00 00 */ cmpw r5, r0 +/* 8003228C 0002F1CC 40 80 00 10 */ bge lbl_8003229C +/* 80032290 0002F1D0 60 C0 00 08 */ ori r0, r6, 8 +/* 80032294 0002F1D4 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 80032298 0002F1D8 48 00 00 5C */ b lbl_800322F4 +lbl_8003229C: +/* 8003229C 0002F1DC 38 04 30 00 */ addi r0, r4, 0x3000 +/* 800322A0 0002F1E0 7C 07 00 50 */ subf r0, r7, r0 +/* 800322A4 0002F1E4 7C 05 00 00 */ cmpw r5, r0 +/* 800322A8 0002F1E8 40 80 00 10 */ bge lbl_800322B8 +/* 800322AC 0002F1EC 60 C0 00 0A */ ori r0, r6, 0xa +/* 800322B0 0002F1F0 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 800322B4 0002F1F4 48 00 00 40 */ b lbl_800322F4 +lbl_800322B8: +/* 800322B8 0002F1F8 38 03 50 00 */ addi r0, r3, 0x5000 +/* 800322BC 0002F1FC 7C 05 00 00 */ cmpw r5, r0 +/* 800322C0 0002F200 40 80 00 10 */ bge lbl_800322D0 +/* 800322C4 0002F204 60 C0 00 02 */ ori r0, r6, 2 +/* 800322C8 0002F208 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 800322CC 0002F20C 48 00 00 28 */ b lbl_800322F4 +lbl_800322D0: +/* 800322D0 0002F210 38 04 70 00 */ addi r0, r4, 0x7000 +/* 800322D4 0002F214 7C 07 00 50 */ subf r0, r7, r0 +/* 800322D8 0002F218 7C 05 00 00 */ cmpw r5, r0 +/* 800322DC 0002F21C 40 80 00 10 */ bge lbl_800322EC +/* 800322E0 0002F220 60 C0 00 06 */ ori r0, r6, 6 +/* 800322E4 0002F224 54 06 06 3E */ clrlwi r6, r0, 0x18 +/* 800322E8 0002F228 48 00 00 0C */ b lbl_800322F4 +lbl_800322EC: +/* 800322EC 0002F22C 60 C0 00 04 */ ori r0, r6, 4 +/* 800322F0 0002F230 54 06 06 3E */ clrlwi r6, r0, 0x18 +lbl_800322F4: +/* 800322F4 0002F234 C0 1F 00 04 */ lfs f0, 4(r31) +/* 800322F8 0002F238 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 800322FC 0002F23C 4C 41 13 82 */ cror 2, 1, 2 +/* 80032300 0002F240 40 82 00 0C */ bne lbl_8003230C +/* 80032304 0002F244 98 DF 00 0C */ stb r6, 0xc(r31) +/* 80032308 0002F248 48 00 00 28 */ b lbl_80032330 +lbl_8003230C: +/* 8003230C 0002F24C C0 1F 00 08 */ lfs f0, 8(r31) +/* 80032310 0002F250 FC 1F 00 40 */ fcmpo cr0, f31, f0 +/* 80032314 0002F254 40 80 00 10 */ bge lbl_80032324 +/* 80032318 0002F258 38 00 00 00 */ li r0, 0 +/* 8003231C 0002F25C 98 1F 00 0C */ stb r0, 0xc(r31) +/* 80032320 0002F260 48 00 00 10 */ b lbl_80032330 +lbl_80032324: +/* 80032324 0002F264 88 1F 00 0C */ lbz r0, 0xc(r31) +/* 80032328 0002F268 7C 00 30 78 */ andc r0, r0, r6 +/* 8003232C 0002F26C 98 1F 00 0C */ stb r0, 0xc(r31) +lbl_80032330: +/* 80032330 0002F270 88 7F 00 0C */ lbz r3, 0xc(r31) +/* 80032334 0002F274 88 1F 00 0D */ lbz r0, 0xd(r31) +/* 80032338 0002F278 7C 03 00 40 */ cmplw r3, r0 +/* 8003233C 0002F27C 41 82 00 3C */ beq lbl_80032378 +/* 80032340 0002F280 28 03 00 00 */ cmplwi r3, 0 +/* 80032344 0002F284 40 82 00 10 */ bne lbl_80032354 +/* 80032348 0002F288 38 00 00 00 */ li r0, 0 +/* 8003234C 0002F28C B0 1F 00 22 */ sth r0, 0x22(r31) +/* 80032350 0002F290 48 00 00 28 */ b lbl_80032378 +lbl_80032354: +/* 80032354 0002F294 54 A0 04 FE */ clrlwi r0, r5, 0x13 +/* 80032358 0002F298 2C 00 10 00 */ cmpwi r0, 0x1000 +/* 8003235C 0002F29C 40 81 00 10 */ ble lbl_8003236C +/* 80032360 0002F2A0 A8 1F 00 24 */ lha r0, 0x24(r31) +/* 80032364 0002F2A4 B0 1F 00 22 */ sth r0, 0x22(r31) +/* 80032368 0002F2A8 48 00 00 10 */ b lbl_80032378 +lbl_8003236C: +/* 8003236C 0002F2AC A8 1F 00 24 */ lha r0, 0x24(r31) +/* 80032370 0002F2B0 7C 00 00 D0 */ neg r0, r0 +/* 80032374 0002F2B4 B0 1F 00 22 */ sth r0, 0x22(r31) +lbl_80032378: +/* 80032378 0002F2B8 88 1F 00 0C */ lbz r0, 0xc(r31) +/* 8003237C 0002F2BC 54 00 07 BF */ clrlwi. r0, r0, 0x1e +/* 80032380 0002F2C0 40 82 00 0C */ bne lbl_8003238C +/* 80032384 0002F2C4 7F E3 FB 78 */ mr r3, r31 +/* 80032388 0002F2C8 4B FF FD 75 */ bl Xinit__9STControlFv +lbl_8003238C: +/* 8003238C 0002F2CC 88 1F 00 0C */ lbz r0, 0xc(r31) +/* 80032390 0002F2D0 54 00 07 3B */ rlwinm. r0, r0, 0, 0x1c, 0x1d +/* 80032394 0002F2D4 40 82 00 28 */ bne lbl_800323BC +/* 80032398 0002F2D8 7F E3 FB 78 */ mr r3, r31 +/* 8003239C 0002F2DC 4B FF FD 91 */ bl Yinit__9STControlFv +/* 800323A0 0002F2E0 48 00 00 1C */ b lbl_800323BC +lbl_800323A4: +/* 800323A4 0002F2E4 38 00 00 00 */ li r0, 0 +/* 800323A8 0002F2E8 98 1F 00 0C */ stb r0, 0xc(r31) +/* 800323AC 0002F2EC 7F E3 FB 78 */ mr r3, r31 +/* 800323B0 0002F2F0 4B FF FD 4D */ bl Xinit__9STControlFv +/* 800323B4 0002F2F4 7F E3 FB 78 */ mr r3, r31 +/* 800323B8 0002F2F8 4B FF FD 75 */ bl Yinit__9STControlFv +lbl_800323BC: +/* 800323BC 0002F2FC 88 7F 00 0D */ lbz r3, 0xd(r31) +/* 800323C0 0002F300 88 1F 00 0C */ lbz r0, 0xc(r31) +/* 800323C4 0002F304 7C 60 00 38 */ and r0, r3, r0 +/* 800323C8 0002F308 54 00 07 BF */ clrlwi. r0, r0, 0x1e +/* 800323CC 0002F30C 41 82 00 18 */ beq lbl_800323E4 +/* 800323D0 0002F310 A8 7F 00 0E */ lha r3, 0xe(r31) +/* 800323D4 0002F314 2C 03 00 00 */ cmpwi r3, 0 +/* 800323D8 0002F318 40 81 00 0C */ ble lbl_800323E4 +/* 800323DC 0002F31C 38 03 FF FF */ addi r0, r3, -1 +/* 800323E0 0002F320 B0 1F 00 0E */ sth r0, 0xe(r31) +lbl_800323E4: +/* 800323E4 0002F324 88 7F 00 0D */ lbz r3, 0xd(r31) +/* 800323E8 0002F328 88 1F 00 0C */ lbz r0, 0xc(r31) +/* 800323EC 0002F32C 7C 60 00 38 */ and r0, r3, r0 +/* 800323F0 0002F330 54 00 07 3B */ rlwinm. r0, r0, 0, 0x1c, 0x1d +/* 800323F4 0002F334 41 82 00 18 */ beq lbl_8003240C +/* 800323F8 0002F338 A8 7F 00 10 */ lha r3, 0x10(r31) +/* 800323FC 0002F33C 2C 03 00 00 */ cmpwi r3, 0 +/* 80032400 0002F340 40 81 00 0C */ ble lbl_8003240C +/* 80032404 0002F344 38 03 FF FF */ addi r0, r3, -1 +/* 80032408 0002F348 B0 1F 00 10 */ sth r0, 0x10(r31) +lbl_8003240C: +/* 8003240C 0002F34C 88 7F 00 0C */ lbz r3, 0xc(r31) +/* 80032410 0002F350 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 +/* 80032414 0002F354 CB E1 00 10 */ lfd f31, 0x10(r1) +/* 80032418 0002F358 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8003241C 0002F35C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80032420 0002F360 7C 08 03 A6 */ mtlr r0 +/* 80032424 0002F364 38 21 00 20 */ addi r1, r1, 0x20 +/* 80032428 0002F368 4E 80 00 20 */ blr diff --git a/include/d/d_lib/asm/STControl_NS_checkUpTrigger.s b/include/d/d_lib/asm/STControl_NS_checkUpTrigger.s new file mode 100644 index 00000000000..a2e54e44b61 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_checkUpTrigger.s @@ -0,0 +1,34 @@ +/* 80032524 0002F464 A8 03 00 10 */ lha r0, 0x10(r3) +/* 80032528 0002F468 2C 00 00 00 */ cmpwi r0, 0 +/* 8003252C 0002F46C 40 82 00 6C */ bne lbl_80032598 +/* 80032530 0002F470 88 03 00 0C */ lbz r0, 0xc(r3) +/* 80032534 0002F474 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d +/* 80032538 0002F478 41 82 00 60 */ beq lbl_80032598 +/* 8003253C 0002F47C A8 83 00 1A */ lha r4, 0x1a(r3) +/* 80032540 0002F480 A8 03 00 2C */ lha r0, 0x2c(r3) +/* 80032544 0002F484 7C 04 02 14 */ add r0, r4, r0 +/* 80032548 0002F488 B0 03 00 10 */ sth r0, 0x10(r3) +/* 8003254C 0002F48C 38 00 00 00 */ li r0, 0 +/* 80032550 0002F490 B0 03 00 2C */ sth r0, 0x2c(r3) +/* 80032554 0002F494 A8 83 00 20 */ lha r4, 0x20(r3) +/* 80032558 0002F498 2C 04 00 00 */ cmpwi r4, 0 +/* 8003255C 0002F49C 40 82 00 2C */ bne lbl_80032588 +/* 80032560 0002F4A0 A8 83 00 16 */ lha r4, 0x16(r3) +/* 80032564 0002F4A4 A8 03 00 1A */ lha r0, 0x1a(r3) +/* 80032568 0002F4A8 7C 04 00 50 */ subf r0, r4, r0 +/* 8003256C 0002F4AC B0 03 00 1A */ sth r0, 0x1a(r3) +/* 80032570 0002F4B0 A8 03 00 1A */ lha r0, 0x1a(r3) +/* 80032574 0002F4B4 A8 83 00 14 */ lha r4, 0x14(r3) +/* 80032578 0002F4B8 7C 00 20 00 */ cmpw r0, r4 +/* 8003257C 0002F4BC 40 80 00 14 */ bge lbl_80032590 +/* 80032580 0002F4C0 B0 83 00 1A */ sth r4, 0x1a(r3) +/* 80032584 0002F4C4 48 00 00 0C */ b lbl_80032590 +lbl_80032588: +/* 80032588 0002F4C8 38 04 FF FF */ addi r0, r4, -1 +/* 8003258C 0002F4CC B0 03 00 20 */ sth r0, 0x20(r3) +lbl_80032590: +/* 80032590 0002F4D0 38 60 00 01 */ li r3, 1 +/* 80032594 0002F4D4 4E 80 00 20 */ blr +lbl_80032598: +/* 80032598 0002F4D8 38 60 00 00 */ li r3, 0 +/* 8003259C 0002F4DC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_init.s b/include/d/d_lib/asm/STControl_NS_init.s new file mode 100644 index 00000000000..641a7e20089 --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_init.s @@ -0,0 +1,20 @@ +/* 800320AC 0002EFEC 38 80 00 00 */ li r4, 0 +/* 800320B0 0002EFF0 B0 83 00 0E */ sth r4, 0xe(r3) +/* 800320B4 0002EFF4 B0 83 00 10 */ sth r4, 0x10(r3) +/* 800320B8 0002EFF8 98 83 00 0D */ stb r4, 0xd(r3) +/* 800320BC 0002EFFC 98 83 00 0C */ stb r4, 0xc(r3) +/* 800320C0 0002F000 B0 83 00 22 */ sth r4, 0x22(r3) +/* 800320C4 0002F004 A8 03 00 12 */ lha r0, 0x12(r3) +/* 800320C8 0002F008 B0 03 00 18 */ sth r0, 0x18(r3) +/* 800320CC 0002F00C A8 03 00 12 */ lha r0, 0x12(r3) +/* 800320D0 0002F010 B0 03 00 1A */ sth r0, 0x1a(r3) +/* 800320D4 0002F014 A8 03 00 1C */ lha r0, 0x1c(r3) +/* 800320D8 0002F018 B0 03 00 1E */ sth r0, 0x1e(r3) +/* 800320DC 0002F01C A8 03 00 1C */ lha r0, 0x1c(r3) +/* 800320E0 0002F020 B0 03 00 20 */ sth r0, 0x20(r3) +/* 800320E4 0002F024 B0 83 00 28 */ sth r4, 0x28(r3) +/* 800320E8 0002F028 A8 03 00 28 */ lha r0, 0x28(r3) +/* 800320EC 0002F02C B0 03 00 2A */ sth r0, 0x2a(r3) +/* 800320F0 0002F030 A8 03 00 28 */ lha r0, 0x28(r3) +/* 800320F4 0002F034 B0 03 00 2C */ sth r0, 0x2c(r3) +/* 800320F8 0002F038 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/STControl_NS_setWaitParm.s b/include/d/d_lib/asm/STControl_NS_setWaitParm.s new file mode 100644 index 00000000000..c006236ce0f --- /dev/null +++ b/include/d/d_lib/asm/STControl_NS_setWaitParm.s @@ -0,0 +1,9 @@ +/* 80032088 0002EFC8 B0 83 00 12 */ sth r4, 0x12(r3) +/* 8003208C 0002EFCC B0 A3 00 14 */ sth r5, 0x14(r3) +/* 80032090 0002EFD0 B0 C3 00 16 */ sth r6, 0x16(r3) +/* 80032094 0002EFD4 B0 E3 00 1C */ sth r7, 0x1c(r3) +/* 80032098 0002EFD8 D0 23 00 04 */ stfs f1, 4(r3) +/* 8003209C 0002EFDC D0 43 00 08 */ stfs f2, 8(r3) +/* 800320A0 0002EFE0 B1 03 00 24 */ sth r8, 0x24(r3) +/* 800320A4 0002EFE4 B1 23 00 26 */ sth r9, 0x26(r3) +/* 800320A8 0002EFE8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/dLib_checkActorInRectangle.s b/include/d/d_lib/asm/dLib_checkActorInRectangle.s new file mode 100644 index 00000000000..f9019a0f388 --- /dev/null +++ b/include/d/d_lib/asm/dLib_checkActorInRectangle.s @@ -0,0 +1,59 @@ +/* 80032654 0002F594 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 80032658 0002F598 7C 08 02 A6 */ mflr r0 +/* 8003265C 0002F59C 90 01 00 34 */ stw r0, 0x34(r1) +/* 80032660 0002F5A0 39 61 00 30 */ addi r11, r1, 0x30 +/* 80032664 0002F5A4 48 32 FB 79 */ bl _savegpr_29 +/* 80032668 0002F5A8 7C 67 1B 78 */ mr r7, r3 +/* 8003266C 0002F5AC 7C 9D 23 78 */ mr r29, r4 +/* 80032670 0002F5B0 7C BE 2B 78 */ mr r30, r5 +/* 80032674 0002F5B4 7C DF 33 78 */ mr r31, r6 +/* 80032678 0002F5B8 38 61 00 08 */ addi r3, r1, 8 +/* 8003267C 0002F5BC 38 87 04 D0 */ addi r4, r7, 0x4d0 +/* 80032680 0002F5C0 38 BD 04 D0 */ addi r5, r29, 0x4d0 +/* 80032684 0002F5C4 48 23 44 B1 */ bl cXyz_NS___mi +/* 80032688 0002F5C8 C0 01 00 08 */ lfs f0, 8(r1) +/* 8003268C 0002F5CC D0 01 00 14 */ stfs f0, 0x14(r1) +/* 80032690 0002F5D0 C0 01 00 0C */ lfs f0, 0xc(r1) +/* 80032694 0002F5D4 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 80032698 0002F5D8 C0 01 00 10 */ lfs f0, 0x10(r1) +/* 8003269C 0002F5DC D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 800326A0 0002F5E0 3C 60 80 3E */ lis r3, lbl_803DD470@ha +/* 800326A4 0002F5E4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l +/* 800326A8 0002F5E8 A8 1D 04 DE */ lha r0, 0x4de(r29) +/* 800326AC 0002F5EC 7C 00 00 D0 */ neg r0, r0 +/* 800326B0 0002F5F0 7C 04 07 34 */ extsh r4, r0 +/* 800326B4 0002F5F4 4B FD 9D 29 */ bl mDoMtx_YrotS +/* 800326B8 0002F5F8 3C 60 80 3E */ lis r3, lbl_803DD470@ha +/* 800326BC 0002F5FC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l +/* 800326C0 0002F600 38 81 00 14 */ addi r4, r1, 0x14 +/* 800326C4 0002F604 7C 85 23 78 */ mr r5, r4 +/* 800326C8 0002F608 48 31 46 A5 */ bl PSMTXMultVec +/* 800326CC 0002F60C C0 1E 00 00 */ lfs f0, 0(r30) +/* 800326D0 0002F610 C0 21 00 14 */ lfs f1, 0x14(r1) +/* 800326D4 0002F614 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 800326D8 0002F618 4C 40 13 82 */ cror 2, 0, 2 +/* 800326DC 0002F61C 40 82 00 40 */ bne lbl_8003271C +/* 800326E0 0002F620 C0 1F 00 00 */ lfs f0, 0(r31) +/* 800326E4 0002F624 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 800326E8 0002F628 4C 40 13 82 */ cror 2, 0, 2 +/* 800326EC 0002F62C 40 82 00 30 */ bne lbl_8003271C +/* 800326F0 0002F630 C0 1E 00 08 */ lfs f0, 8(r30) +/* 800326F4 0002F634 C0 21 00 1C */ lfs f1, 0x1c(r1) +/* 800326F8 0002F638 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 800326FC 0002F63C 4C 40 13 82 */ cror 2, 0, 2 +/* 80032700 0002F640 40 82 00 1C */ bne lbl_8003271C +/* 80032704 0002F644 C0 1F 00 08 */ lfs f0, 8(r31) +/* 80032708 0002F648 FC 01 00 40 */ fcmpo cr0, f1, f0 +/* 8003270C 0002F64C 4C 40 13 82 */ cror 2, 0, 2 +/* 80032710 0002F650 40 82 00 0C */ bne lbl_8003271C +/* 80032714 0002F654 38 60 00 01 */ li r3, 1 +/* 80032718 0002F658 48 00 00 08 */ b lbl_80032720 +lbl_8003271C: +/* 8003271C 0002F65C 38 60 00 00 */ li r3, 0 +lbl_80032720: +/* 80032720 0002F660 39 61 00 30 */ addi r11, r1, 0x30 +/* 80032724 0002F664 48 32 FB 05 */ bl _restgpr_29 +/* 80032728 0002F668 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8003272C 0002F66C 7C 08 03 A6 */ mtlr r0 +/* 80032730 0002F670 38 21 00 30 */ addi r1, r1, 0x30 +/* 80032734 0002F674 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/dLib_getEventSwitchNo.s b/include/d/d_lib/asm/dLib_getEventSwitchNo.s new file mode 100644 index 00000000000..e9921b140d9 --- /dev/null +++ b/include/d/d_lib/asm/dLib_getEventSwitchNo.s @@ -0,0 +1,16 @@ +/* 8003261C 0002F55C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80032620 0002F560 7C 08 02 A6 */ mflr r0 +/* 80032624 0002F564 90 01 00 14 */ stw r0, 0x14(r1) +/* 80032628 0002F568 54 63 06 3E */ clrlwi r3, r3, 0x18 +/* 8003262C 0002F56C 48 01 0E AD */ bl searchMapEventData__14dEvt_control_cFUc +/* 80032630 0002F570 28 03 00 00 */ cmplwi r3, 0 +/* 80032634 0002F574 41 82 00 0C */ beq lbl_80032640 +/* 80032638 0002F578 88 63 00 1B */ lbz r3, 0x1b(r3) +/* 8003263C 0002F57C 48 00 00 08 */ b lbl_80032644 +lbl_80032640: +/* 80032640 0002F580 38 60 00 FF */ li r3, 0xff +lbl_80032644: +/* 80032644 0002F584 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80032648 0002F588 7C 08 03 A6 */ mtlr r0 +/* 8003264C 0002F58C 38 21 00 10 */ addi r1, r1, 0x10 +/* 80032650 0002F590 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/dLib_getExpandSizeFromAramArchive.s b/include/d/d_lib/asm/dLib_getExpandSizeFromAramArchive.s new file mode 100644 index 00000000000..efeea89dfb0 --- /dev/null +++ b/include/d/d_lib/asm/dLib_getExpandSizeFromAramArchive.s @@ -0,0 +1,53 @@ +/* 80032738 0002F678 54 2B 06 FE */ clrlwi r11, r1, 0x1b +/* 8003273C 0002F67C 21 6B FF A0 */ subfic r11, r11, -96 +/* 80032740 0002F680 7C 2C 0B 78 */ mr r12, r1 +/* 80032744 0002F684 7C 21 59 6E */ stwux r1, r1, r11 +/* 80032748 0002F688 7C 08 02 A6 */ mflr r0 +/* 8003274C 0002F68C 90 0C 00 04 */ stw r0, 4(r12) +/* 80032750 0002F690 93 EC FF FC */ stw r31, -4(r12) +/* 80032754 0002F694 93 CC FF F8 */ stw r30, -8(r12) +/* 80032758 0002F698 7C 7E 1B 78 */ mr r30, r3 +/* 8003275C 0002F69C 7C 9F 23 78 */ mr r31, r4 +/* 80032760 0002F6A0 48 2A 50 BD */ bl getAramAddress__14JKRAramArchiveFPCc +/* 80032764 0002F6A4 28 03 00 00 */ cmplwi r3, 0 +/* 80032768 0002F6A8 40 82 00 0C */ bne lbl_80032774 +/* 8003276C 0002F6AC 38 60 00 00 */ li r3, 0 +/* 80032770 0002F6B0 48 00 00 78 */ b lbl_800327E8 +lbl_80032774: +/* 80032774 0002F6B4 38 81 00 20 */ addi r4, r1, 0x20 +/* 80032778 0002F6B8 38 A0 00 20 */ li r5, 0x20 +/* 8003277C 0002F6BC 38 C0 00 00 */ li r6, 0 +/* 80032780 0002F6C0 38 E0 00 00 */ li r7, 0 +/* 80032784 0002F6C4 39 00 00 00 */ li r8, 0 +/* 80032788 0002F6C8 39 20 FF FF */ li r9, -1 +/* 8003278C 0002F6CC 39 40 00 00 */ li r10, 0 +/* 80032790 0002F6D0 48 29 FE 25 */ bl aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl +/* 80032794 0002F6D4 7F C3 F3 78 */ mr r3, r30 +/* 80032798 0002F6D8 7F E4 FB 78 */ mr r4, r31 +/* 8003279C 0002F6DC 38 A0 00 00 */ li r5, 0 +/* 800327A0 0002F6E0 48 2A 3E 05 */ bl findFsResource__10JKRArchiveCFPCcUl +/* 800327A4 0002F6E4 88 C1 00 27 */ lbz r6, 0x27(r1) +/* 800327A8 0002F6E8 88 A1 00 26 */ lbz r5, 0x26(r1) +/* 800327AC 0002F6EC 88 81 00 24 */ lbz r4, 0x24(r1) +/* 800327B0 0002F6F0 88 01 00 25 */ lbz r0, 0x25(r1) +/* 800327B4 0002F6F4 54 00 80 1E */ slwi r0, r0, 0x10 +/* 800327B8 0002F6F8 50 80 C0 0E */ rlwimi r0, r4, 0x18, 0, 7 +/* 800327BC 0002F6FC 50 A0 44 2E */ rlwimi r0, r5, 8, 0x10, 0x17 +/* 800327C0 0002F700 7C C4 03 78 */ or r4, r6, r0 +/* 800327C4 0002F704 38 04 00 1F */ addi r0, r4, 0x1f +/* 800327C8 0002F708 54 04 00 34 */ rlwinm r4, r0, 0, 0, 0x1a +/* 800327CC 0002F70C 80 63 00 0C */ lwz r3, 0xc(r3) +/* 800327D0 0002F710 38 03 00 1F */ addi r0, r3, 0x1f +/* 800327D4 0002F714 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a +/* 800327D8 0002F718 7C 04 00 40 */ cmplw r4, r0 +/* 800327DC 0002F71C 7C 03 03 78 */ mr r3, r0 +/* 800327E0 0002F720 40 81 00 08 */ ble lbl_800327E8 +/* 800327E4 0002F724 7C 83 23 78 */ mr r3, r4 +lbl_800327E8: +/* 800327E8 0002F728 81 41 00 00 */ lwz r10, 0(r1) +/* 800327EC 0002F72C 83 EA FF FC */ lwz r31, -4(r10) +/* 800327F0 0002F730 83 CA FF F8 */ lwz r30, -8(r10) +/* 800327F4 0002F734 80 0A 00 04 */ lwz r0, 4(r10) +/* 800327F8 0002F738 7C 08 03 A6 */ mtlr r0 +/* 800327FC 0002F73C 7D 41 53 78 */ mr r1, r10 +/* 80032800 0002F740 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/dLib_time_c_NS_getTime.s b/include/d/d_lib/asm/dLib_time_c_NS_getTime.s new file mode 100644 index 00000000000..613a1b4fe16 --- /dev/null +++ b/include/d/d_lib/asm/dLib_time_c_NS_getTime.s @@ -0,0 +1,33 @@ +/* 80032804 0002F744 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80032808 0002F748 7C 08 02 A6 */ mflr r0 +/* 8003280C 0002F74C 90 01 00 14 */ stw r0, 0x14(r1) +/* 80032810 0002F750 88 0D 88 68 */ lbz r0, lbl_80450DE8-_SDA_BASE_(r13) +/* 80032814 0002F754 28 00 00 00 */ cmplwi r0, 0 +/* 80032818 0002F758 40 82 00 1C */ bne lbl_80032834 +/* 8003281C 0002F75C 48 30 FE E1 */ bl OSGetTime +/* 80032820 0002F760 80 0D 88 58 */ lwz r0, lbl_80450DD8-_SDA_BASE_(r13) +/* 80032824 0002F764 80 AD 88 5C */ lwz r5, lbl_80450DDC-_SDA_BASE_(r13) +/* 80032828 0002F768 7C 85 20 10 */ subfc r4, r5, r4 +/* 8003282C 0002F76C 7C 60 19 10 */ subfe r3, r0, r3 +/* 80032830 0002F770 48 00 00 40 */ b lbl_80032870 +lbl_80032834: +/* 80032834 0002F774 48 30 FE C9 */ bl OSGetTime +/* 80032838 0002F778 80 CD 88 58 */ lwz r6, lbl_80450DD8-_SDA_BASE_(r13) +/* 8003283C 0002F77C 80 ED 88 5C */ lwz r7, lbl_80450DDC-_SDA_BASE_(r13) +/* 80032840 0002F780 80 0D 88 60 */ lwz r0, lbl_80450DE0-_SDA_BASE_(r13) +/* 80032844 0002F784 80 AD 88 64 */ lwz r5, lbl_80450DE4-_SDA_BASE_(r13) +/* 80032848 0002F788 7C A5 20 10 */ subfc r5, r5, r4 +/* 8003284C 0002F78C 7C 00 19 10 */ subfe r0, r0, r3 +/* 80032850 0002F790 7C A7 28 14 */ addc r5, r7, r5 +/* 80032854 0002F794 7C 06 01 14 */ adde r0, r6, r0 +/* 80032858 0002F798 90 AD 88 5C */ stw r5, lbl_80450DDC-_SDA_BASE_(r13) +/* 8003285C 0002F79C 90 0D 88 58 */ stw r0, lbl_80450DD8-_SDA_BASE_(r13) +/* 80032860 0002F7A0 90 8D 88 64 */ stw r4, lbl_80450DE4-_SDA_BASE_(r13) +/* 80032864 0002F7A4 90 6D 88 60 */ stw r3, lbl_80450DE0-_SDA_BASE_(r13) +/* 80032868 0002F7A8 7C 85 20 10 */ subfc r4, r5, r4 +/* 8003286C 0002F7AC 7C 60 19 10 */ subfe r3, r0, r3 +lbl_80032870: +/* 80032870 0002F7B0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 80032874 0002F7B4 7C 08 03 A6 */ mtlr r0 +/* 80032878 0002F7B8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8003287C 0002F7BC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/dLib_time_c_NS_startTime.s b/include/d/d_lib/asm/dLib_time_c_NS_startTime.s new file mode 100644 index 00000000000..366f2c2510a --- /dev/null +++ b/include/d/d_lib/asm/dLib_time_c_NS_startTime.s @@ -0,0 +1,24 @@ +/* 800328BC 0002F7FC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800328C0 0002F800 7C 08 02 A6 */ mflr r0 +/* 800328C4 0002F804 90 01 00 14 */ stw r0, 0x14(r1) +/* 800328C8 0002F808 88 0D 88 68 */ lbz r0, lbl_80450DE8-_SDA_BASE_(r13) +/* 800328CC 0002F80C 28 00 00 00 */ cmplwi r0, 0 +/* 800328D0 0002F810 41 82 00 38 */ beq lbl_80032908 +/* 800328D4 0002F814 48 30 FE 29 */ bl OSGetTime +/* 800328D8 0002F818 80 0D 88 60 */ lwz r0, lbl_80450DE0-_SDA_BASE_(r13) +/* 800328DC 0002F81C 80 AD 88 64 */ lwz r5, lbl_80450DE4-_SDA_BASE_(r13) +/* 800328E0 0002F820 7C A5 20 10 */ subfc r5, r5, r4 +/* 800328E4 0002F824 7C 80 19 10 */ subfe r4, r0, r3 +/* 800328E8 0002F828 80 0D 88 58 */ lwz r0, lbl_80450DD8-_SDA_BASE_(r13) +/* 800328EC 0002F82C 80 6D 88 5C */ lwz r3, lbl_80450DDC-_SDA_BASE_(r13) +/* 800328F0 0002F830 7C 63 28 14 */ addc r3, r3, r5 +/* 800328F4 0002F834 7C 00 21 14 */ adde r0, r0, r4 +/* 800328F8 0002F838 90 6D 88 5C */ stw r3, lbl_80450DDC-_SDA_BASE_(r13) +/* 800328FC 0002F83C 90 0D 88 58 */ stw r0, lbl_80450DD8-_SDA_BASE_(r13) +/* 80032900 0002F840 38 00 00 00 */ li r0, 0 +/* 80032904 0002F844 98 0D 88 68 */ stb r0, lbl_80450DE8-_SDA_BASE_(r13) +lbl_80032908: +/* 80032908 0002F848 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8003290C 0002F84C 7C 08 03 A6 */ mtlr r0 +/* 80032910 0002F850 38 21 00 10 */ addi r1, r1, 0x10 +/* 80032914 0002F854 4E 80 00 20 */ blr diff --git a/include/d/d_lib/asm/dLib_time_c_NS_stopTime.s b/include/d/d_lib/asm/dLib_time_c_NS_stopTime.s new file mode 100644 index 00000000000..46f0b181cf6 --- /dev/null +++ b/include/d/d_lib/asm/dLib_time_c_NS_stopTime.s @@ -0,0 +1,16 @@ +/* 80032880 0002F7C0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80032884 0002F7C4 7C 08 02 A6 */ mflr r0 +/* 80032888 0002F7C8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8003288C 0002F7CC 88 0D 88 68 */ lbz r0, lbl_80450DE8-_SDA_BASE_(r13) +/* 80032890 0002F7D0 28 00 00 00 */ cmplwi r0, 0 +/* 80032894 0002F7D4 40 82 00 18 */ bne lbl_800328AC +/* 80032898 0002F7D8 48 30 FE 65 */ bl OSGetTime +/* 8003289C 0002F7DC 90 8D 88 64 */ stw r4, lbl_80450DE4-_SDA_BASE_(r13) +/* 800328A0 0002F7E0 90 6D 88 60 */ stw r3, lbl_80450DE0-_SDA_BASE_(r13) +/* 800328A4 0002F7E4 38 00 00 01 */ li r0, 1 +/* 800328A8 0002F7E8 98 0D 88 68 */ stb r0, lbl_80450DE8-_SDA_BASE_(r13) +lbl_800328AC: +/* 800328AC 0002F7EC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 800328B0 0002F7F0 7C 08 03 A6 */ mtlr r0 +/* 800328B4 0002F7F4 38 21 00 10 */ addi r1, r1, 0x10 +/* 800328B8 0002F7F8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/getAngleStick.s b/include/d/d_lib/asm/getAngleStick.s new file mode 100644 index 00000000000..9dbeb5956cf --- /dev/null +++ b/include/d/d_lib/asm/getAngleStick.s @@ -0,0 +1,4 @@ +/* 8003216C 0002F0AC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha +/* 80032170 0002F0B0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l +/* 80032174 0002F0B4 A8 63 00 0C */ lha r3, 0xc(r3) +/* 80032178 0002F0B8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/asm/getValueStick.s b/include/d/d_lib/asm/getValueStick.s new file mode 100644 index 00000000000..34ce1f701be --- /dev/null +++ b/include/d/d_lib/asm/getValueStick.s @@ -0,0 +1,4 @@ +/* 8003215C 0002F09C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha +/* 80032160 0002F0A0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l +/* 80032164 0002F0A4 C0 23 00 08 */ lfs f1, 8(r3) +/* 80032168 0002F0A8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_lib/d_lib.h b/include/d/d_lib/d_lib.h new file mode 100644 index 00000000000..4394e4725f0 --- /dev/null +++ b/include/d/d_lib/d_lib.h @@ -0,0 +1,86 @@ +#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h" +#include "global.h" + +struct STControl_vtable { + void* addr_1; + void* addr_2; + void* addr_3; + void* addr_4; +}; + +struct STControl { + STControl(s16 param_1, s16 param_2, s16 param_3, s16 param_4, f32 param_5, f32 param_6, + s16 param_7, s16 param_8); + void setWaitParm(s16 param_1, s16 param_2, s16 param_3, s16 param_4, f32 param_5, f32 param_6, + s16 param_7, s16 param_8); + STControl* init(void); + void Xinit(void); + void Yinit(void); + double getValueStick(); + s16 getAngleStick(); + u32 checkTrigger(); + bool checkLeftTrigger(); + bool checkRightTrigger(); + bool checkUpTrigger(); + bool checkDownTrigger(); + + STControl_vtable* __vt; + + f32 field_0x4; + f32 field_0x8; + u8 field_0xc; + u8 field_0xd; + s16 field_0xe; + s16 field_0x10; + s16 field_0x12; + s16 field_0x14; + s16 field_0x16; + s16 field_0x18; + s16 field_0x1a; + s16 field_0x1c; + s16 field_0x1e; + s16 field_0x20; + s16 field_0x22; + s16 field_0x24; + s16 field_0x26; + s16 field_0x28; + s16 field_0x2a; + s16 field_0x2c; +}; + +struct CSTControl { + double getValueStick(); + s16 getAngleStick(); +}; + +struct m_cpadInfo { + u8 p1[0x8]; + f32 stickValue; + s16 stickAngle; + u8 p2[0x8]; + f32 CstickValue; + s16 CstickAngle; + u8 p3[0xE2]; +}; + +u32 dLib_getEventSwitchNo(int param_1); + +struct fopAc_ac_c; + +struct cXyz { + f32 x; + f32 y; + f32 z; +}; + +bool dLib_checkActorInRectangle(fopAc_ac_c* param_1, fopAc_ac_c* param_2, cXyz const* param_3, + cXyz const* param_4); + +u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* param_1, char const* param_2); + +class dLib_time_c { +public: + s64 getTime(void); + void stopTime(void); + void startTime(void); +}; \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 7afa937ab8c..9b26f6ba7c5 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1,6 +1,12 @@ #include "os/OS.h" extern "C" { +void searchMapEventData__14dEvt_control_cFUc(void); +void PSMTXMultVec(void); +void mDoMtx_YrotS(void); +void cXyz_NS___mi(void); +void Yinit__9STControlFv(void); +void Xinit__9STControlFv(void); void J2DScreen_NS_draw(void); void PSMTXCopy(void); void PSMTXConcat(void); @@ -196,7 +202,7 @@ void func_80361C24(void); void func_803621CC(void); void func_80362218(void); -void JKRAramArchive(void); +// void JKRAramArchive(void); void JKRArchive_NS_findDirectory(void); void JKRArchive_NS_findFsResource(void); void JKRArchive_NS_findIdResource(void); diff --git a/include/variables.h b/include/variables.h index ba6adecc849..3a30de2643c 100644 --- a/include/variables.h +++ b/include/variables.h @@ -10,7 +10,8 @@ extern char lbl_803739A0[0x310]; extern void* lbl_80451368; extern u32 lbl_804514E0; extern u8 lbl_803C3384; -extern u8 lbl_803DD2E8; +struct m_cpadInfo; +extern m_cpadInfo lbl_803DD2E8; extern u8 lbl_803A2EF4; extern u8 lbl_803A2EE0; extern u8 lbl_80450B19; @@ -374,6 +375,24 @@ extern u8 lbl_804342E8; // JKernel::decompMutex (static?) extern u8 lbl_804508B8; // JKRAram::sSZSBufferSize extern u8 lbl_803CC128; // JKRAram::sMessageBuffer +extern double lbl_803DD2F0; +extern f32 lbl_80451180; + +struct now { // m_Do_mtx::mDoMtx_stack_c::now + float unk0[4]; + float unk10[4]; + float unk20[4]; +}; + +extern now lbl_803DD470; // CHANGE TYPE LATER + +extern s64 lbl_80450DE8; +extern u32 lbl_80450DD8; +extern u32 lbl_80450DDC; +class dLib_time_c; +extern dLib_time_c* lbl_80450DE0; +extern u32 lbl_80450DE4; + // m_Do_Reset // func_80015614 #include "JSystem/JUtility/JUTXfb/JUTXfb.h" @@ -382,6 +401,7 @@ extern u8 lbl_80450BB8; extern char lbl_80374198[16]; // func_8001574C extern bool lbl_80451501; + extern void* lbl_804514EC; // JUTGamePad::C3ButtonReset::sCallback extern u32 lbl_804514F0; // JUTGamePad::C3ButtonReset::sCallbackArg extern u32 lbl_803ECF00; @@ -753,7 +773,6 @@ extern u8 lbl_8042552C; extern u8 lbl_80391E48; extern u8 lbl_80391D44; extern u8 lbl_804255A4; -extern u8 lbl_80451180; extern u8 lbl_804532AC; extern u8 lbl_80452F04; extern u8 lbl_80391A2C; diff --git a/ldscript.lcf b/ldscript.lcf index e3127d7c68b..603360375e5 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -758,6 +758,13 @@ SECTIONS { "__dt__7JKRFileFv" = 0x802D7B90; } FORCEACTIVE { + dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz + getValueStick__10CSTControlFv + getAngleStick__10CSTControlFv + dLib_getEventSwitchNo__Fi + getValueStick__9STControlFv + getAngleStick__9STControlFv + init__9STControlFv checkStateCarry__7dBomb_cFv checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c checkWaterBomb__7dBomb_cFP10fopAc_ac_c diff --git a/obj_files.mk b/obj_files.mk index b5f45631eb5..148337c8309 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -88,7 +88,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/d/com/inf/d_com_inf_game.o \ $(BUILD_DIR)/asm/d/com/d_com_static.o \ $(BUILD_DIR)/src/d/d_bomb.o \ - $(BUILD_DIR)/asm/d/d_lib.o \ + $(BUILD_DIR)/src/d/d_lib.o \ $(BUILD_DIR)/src/d/d_save/d_save.o \ $(BUILD_DIR)/asm/d/save/d_save_init.o \ $(BUILD_DIR)/asm/d/jnt/d_jnt_col.o \ diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 4bf93c8658d..3cb22138e86 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -1 +1,192 @@ -// ok +#include "d/d_lib/d_lib.h" +#include "d/d_event/d_event/d_event.h" +#include "os/OS.h" + +STControl::STControl(s16 param_1, s16 param_2, s16 param_3, s16 param_4, f32 param_5, f32 param_6, + s16 param_7, s16 param_8) { + __vt = (STControl_vtable*)0x803a7260; + setWaitParm(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8); + init(); +} + +void STControl::setWaitParm(s16 param_1, s16 param_2, s16 param_3, s16 param_4, f32 param_5, + f32 param_6, s16 param_7, s16 param_8) { + field_0x12 = param_1; + field_0x14 = param_2; + field_0x16 = param_3; + field_0x1c = param_4; + field_0x4 = param_5; + field_0x8 = param_6; + field_0x24 = param_7; + field_0x26 = param_8; +} + +STControl* STControl::init(void) { + field_0xe = 0; + field_0x10 = 0; + field_0xd = 0; + field_0xc = 0; + field_0x22 = 0; + field_0x18 = field_0x12; + field_0x1a = field_0x12; + field_0x1e = field_0x1c; + field_0x20 = field_0x1c; + field_0x28 = 0; + field_0x2a = field_0x28; + field_0x2c = field_0x28; + return this; +} + +void STControl::Xinit(void) { + field_0xe = 0; + field_0xc = field_0xc & 0xfc; + field_0x18 = field_0x12; + field_0x1e = field_0x1c; + field_0x2a = field_0x28; +} + +#ifdef NONMATCHING +void STControl::Yinit(void) { // produces andi. instead of rlwinm + field_0x10 = 0; + field_0xc = field_0xc & 0xf3; + field_0x1a = field_0x12; + field_0x20 = field_0x1c; + field_0x2c = field_0x28; +} +#else +asm void STControl::Yinit(void) { + nofralloc +#include "d/d_lib/asm/STControl_NS_Yinit.s" +} +#endif + +double STControl::getValueStick() { + return lbl_803DD2E8.stickValue; +} + +s16 STControl::getAngleStick() { + return lbl_803DD2E8.stickAngle; +} + +double CSTControl::getValueStick() { + return lbl_803DD2E8.CstickValue; +} + +s16 CSTControl::getAngleStick() { + return lbl_803DD2E8.CstickAngle; +} + +asm u32 STControl::checkTrigger() { + nofralloc +#include "d/d_lib/asm/STControl_NS_checkTrigger.s" +} + +bool STControl::checkLeftTrigger() { + if ((field_0xe == 0) && ((field_0xc & 1) != 0)) { + field_0xe = field_0x18 + field_0x2a; + field_0x2a = 0; + if ((int)field_0x1e == 0) { + field_0x18 = field_0x18 - field_0x16; + if (field_0x18 < field_0x14) { + field_0x18 = field_0x14; + } + } else { + field_0x1e = field_0x1e + -1; + } + return true; + } + return false; +} + +bool STControl::checkRightTrigger() { + if ((field_0xe == 0) && ((field_0xc & 2) != 0)) { + field_0xe = field_0x18 + field_0x2a; + field_0x2a = 0; + if ((int)field_0x1e == 0) { + field_0x18 = field_0x18 - field_0x16; + if (field_0x18 < field_0x14) { + field_0x18 = field_0x14; + } + } else { + field_0x1e = field_0x1e + -1; + } + return true; + } + return false; +} + +bool STControl::checkUpTrigger() { + if ((field_0x10 == 0) && ((field_0xc & 4) != 0)) { + field_0x10 = field_0x1a + field_0x2c; + field_0x2c = 0; + if ((int)field_0x20 == 0) { + field_0x1a = field_0x1a - field_0x16; + if (field_0x1a < field_0x14) { + field_0x1a = field_0x14; + } + } else { + field_0x20 = field_0x20 + -1; + } + return true; + } + return false; +} + +bool STControl::checkDownTrigger() { + if ((field_0x10 == 0) && ((field_0xc & 8) != 0)) { + field_0x10 = field_0x1a + field_0x2c; + field_0x2c = 0; + if ((int)field_0x20 == 0) { + field_0x1a = field_0x1a - field_0x16; + if (field_0x1a < field_0x14) { + field_0x1a = field_0x14; + } + } else { + field_0x20 = field_0x20 + -1; + } + return true; + } + return false; +} + +asm u32 dLib_getEventSwitchNo(int param_1) { + nofralloc +#include "d/d_lib/asm/dLib_getEventSwitchNo.s" +} + +asm bool dLib_checkActorInRectangle(fopAc_ac_c* param_1, fopAc_ac_c* param_2, cXyz const* param_3, + cXyz const* param_4) { + nofralloc +#include "d/d_lib/asm/dLib_checkActorInRectangle.s" +} + +asm u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* param_1, char const* param_2) { + nofralloc +#include "d/d_lib/asm/dLib_getExpandSizeFromAramArchive.s" +} + +asm s64 dLib_time_c::getTime(void) { + nofralloc +#include "d/d_lib/asm/dLib_time_c_NS_getTime.s" +} + +#ifdef NONMATCHING +void dLib_time_c::stopTime(void) { // way off + if (lbl_80450DE8 == 0) { + OSTime time = OSGetTime(); + lbl_80450DE4 = time >> 0x20; + lbl_80450DE8 = 1; + lbl_80450DE0 = this; + } +} +#else +asm void dLib_time_c::stopTime(void) { + nofralloc +#include "d/d_lib/asm/dLib_time_c_NS_stopTime.s" +} +#endif + +asm void dLib_time_c::startTime(void) { + nofralloc +#include "d/d_lib/asm/dLib_time_c_NS_startTime.s" +} \ No newline at end of file