diff options
| author | lepelog <lepelog@users.noreply.github.com> | 2021-01-07 02:04:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 20:04:53 -0500 |
| commit | 0cf65151b3a1a85a5d3ad74a367045e596aee1aa (patch) | |
| tree | 9ac4f66b24945629766d587a9514ad513b11241c /asm/d/msg | |
| parent | 792509e0a15687b76bee216440ccd3d90554f37e (diff) | |
Split SComponent (#45)
* split c_math
* split c_angle
* split c_API_controller_pad
* split c_API_graphic
* split c_bg_s_chk
* c_bg_s_gnd_chk split
* more c_bg split
* split c_cc_d
* delete asm
* split c_cc_s
* split c_lib
* split c_m2d and c_m3d_g_aab
* split c_m3d_g_cir
* split c_m3d_g_cps
* split rest of c_m3d_g
* split c_m3d
* split c_malloc
* split c_request
* split c_sxyz
* split and partly decompile c_xyz
* format
* c_angle.h
* begin c_angle decomp
* c_angle
* progress adding stub classes for SComponent
* more c_m3d
* remove some asm and format
* more m3d headers
* more c_angle decomp
* c_lib headers
* add public to classes
* fix csXyz member names
* c_sxyz partly OK
* move Zero csXyz to c_sxyz header
* c_API_graphic
* delete some unused asm
* move math extern data, decompile some functions
* delete unused asm
* fix duplicated c_angle.h
* fix an inlined function name, add more inlined functions for c_angle.h (currently unused)
* format
Co-authored-by: Pheenoh <pheenoh@gmail.com>
Diffstat (limited to 'asm/d/msg')
| -rw-r--r-- | asm/d/msg/d_msg_class.s | 2 | ||||
| -rw-r--r-- | asm/d/msg/d_msg_flow.s | 8 | ||||
| -rw-r--r-- | asm/d/msg/d_msg_object.s | 2 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_howl.s | 4 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_item.s | 2 | ||||
| -rw-r--r-- | asm/d/msg/scrn/d_msg_scrn_talk.s | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 69c9d95b12..836a6832e7 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -582,7 +582,7 @@ lbl_80228D70: /* 80228D7C 00225CBC 38 61 00 14 */ addi r3, r1, 0x14 /* 80228D80 00225CC0 38 9F 04 14 */ addi r4, r31, 0x414 /* 80228D84 00225CC4 38 A5 05 50 */ addi r5, r5, 0x550 -/* 80228D88 00225CC8 48 03 DD AD */ bl cXyz_NS___mi +/* 80228D88 00225CC8 48 03 DD AD */ bl __mi__4cXyzCFRC3Vec /* 80228D8C 00225CCC C0 01 00 14 */ lfs f0, 0x14(r1) /* 80228D90 00225CD0 D0 01 00 08 */ stfs f0, 8(r1) /* 80228D94 00225CD4 C0 02 B0 60 */ lfs f0, lbl_80454A60-_SDA2_BASE_(r2) diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index bb8182b952..b070316684 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -1402,7 +1402,7 @@ lbl_8024B1F4: /* 8024B224 00248164 90 01 00 08 */ stw r0, 8(r1) /* 8024B228 00248168 C8 01 00 08 */ lfd f0, 8(r1) /* 8024B22C 0024816C EC 20 08 28 */ fsubs f1, f0, f1 -/* 8024B230 00248170 48 01 C7 25 */ bl cM_rndF +/* 8024B230 00248170 48 01 C7 25 */ bl cM_rndF__Ff /* 8024B234 00248174 FC 00 08 1E */ fctiwz f0, f1 /* 8024B238 00248178 D8 01 00 10 */ stfd f0, 0x10(r1) /* 8024B23C 0024817C 80 61 00 14 */ lwz r3, 0x14(r1) @@ -1495,15 +1495,15 @@ dMsgFlow_c_NS_query005: /* 8024B384 002482C4 38 61 00 14 */ addi r3, r1, 0x14 /* 8024B388 002482C8 38 9F 05 50 */ addi r4, r31, 0x550 /* 8024B38C 002482CC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8024B390 002482D0 48 01 B7 A5 */ bl cXyz_NS___mi +/* 8024B390 002482D0 48 01 B7 A5 */ bl __mi__4cXyzCFRC3Vec /* 8024B394 002482D4 38 61 00 0C */ addi r3, r1, 0xc /* 8024B398 002482D8 38 81 00 14 */ addi r4, r1, 0x14 -/* 8024B39C 002482DC 48 02 64 E5 */ bl cSGlobe_X4_ +/* 8024B39C 002482DC 48 02 64 E5 */ bl __ct__7cSGlobeFRC4cXyz /* 8024B3A0 002482E0 80 BD 5D AC */ lwz r5, 0x5dac(r29) /* 8024B3A4 002482E4 38 61 00 08 */ addi r3, r1, 8 /* 8024B3A8 002482E8 38 81 00 12 */ addi r4, r1, 0x12 /* 8024B3AC 002482EC A8 A5 04 E6 */ lha r5, 0x4e6(r5) -/* 8024B3B0 002482F0 48 02 5E 79 */ bl cSAngle_NS___mi_X2_ +/* 8024B3B0 002482F0 48 02 5E 79 */ bl __mi__7cSAngleCFs /* 8024B3B4 002482F4 AB 81 00 08 */ lha r28, 8(r1) /* 8024B3B8 002482F8 88 7F 05 47 */ lbz r3, 0x547(r31) /* 8024B3BC 002482FC 7C 7B 1B 78 */ mr r27, r3 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 86cf7d224c..3b94b5a8ce 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -4260,7 +4260,7 @@ lbl_8023677C: /* 802367AC 002336EC 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802367B0 002336F0 38 63 00 E0 */ addi r3, r3, 0xe0 /* 802367B4 002336F4 38 81 00 08 */ addi r4, r1, 8 -/* 802367B8 002336F8 48 03 08 75 */ bl cXyz_NS___eq +/* 802367B8 002336F8 48 03 08 75 */ bl __eq__4cXyzCFRC3Vec /* 802367BC 002336FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802367C0 00233700 41 82 00 0C */ beq lbl_802367CC /* 802367C4 00233704 C0 41 00 18 */ lfs f2, 0x18(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index b655193de6..43af24786c 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -1203,7 +1203,7 @@ lbl_80241B44: /* 80241B54 0023EA94 FC 20 F0 90 */ fmr f1, f30 /* 80241B58 0023EA98 C0 42 B2 74 */ lfs f2, lbl_80454C74-_SDA2_BASE_(r2) /* 80241B5C 0023EA9C C0 62 B2 60 */ lfs f3, lbl_80454C60-_SDA2_BASE_(r2) -/* 80241B60 0023EAA0 48 02 DE DD */ bl cLib_addCalc2 +/* 80241B60 0023EAA0 48 02 DE DD */ bl cLib_addCalc2__FPffff /* 80241B64 0023EAA4 C0 1F 19 94 */ lfs f0, 0x1994(r31) /* 80241B68 0023EAA8 EC 00 F0 28 */ fsubs f0, f0, f30 /* 80241B6C 0023EAAC FC 00 02 10 */ fabs f0, f0 @@ -1220,7 +1220,7 @@ lbl_80241B84: /* 80241B94 0023EAD4 FC 20 E8 90 */ fmr f1, f29 /* 80241B98 0023EAD8 C0 42 B2 74 */ lfs f2, lbl_80454C74-_SDA2_BASE_(r2) /* 80241B9C 0023EADC C0 62 B2 60 */ lfs f3, lbl_80454C60-_SDA2_BASE_(r2) -/* 80241BA0 0023EAE0 48 02 DE 9D */ bl cLib_addCalc2 +/* 80241BA0 0023EAE0 48 02 DE 9D */ bl cLib_addCalc2__FPffff /* 80241BA4 0023EAE4 C0 1F 19 98 */ lfs f0, 0x1998(r31) /* 80241BA8 0023EAE8 EC 00 E8 28 */ fsubs f0, f0, f29 /* 80241BAC 0023EAEC FC 00 02 10 */ fabs f0, f0 diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index 21597311b1..beac052060 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -1813,7 +1813,7 @@ lbl_802401D8: /* 80240208 0023D148 D0 01 00 28 */ stfs f0, 0x28(r1) /* 8024020C 0023D14C 38 7E 00 E0 */ addi r3, r30, 0xe0 /* 80240210 0023D150 38 81 00 20 */ addi r4, r1, 0x20 -/* 80240214 0023D154 48 02 6E 19 */ bl cXyz_NS___eq +/* 80240214 0023D154 48 02 6E 19 */ bl __eq__4cXyzCFRC3Vec /* 80240218 0023D158 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024021C 0023D15C 41 82 00 0C */ beq lbl_80240228 /* 80240220 0023D160 C0 61 00 48 */ lfs f3, 0x48(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index 9b901e7a7d..599cdbcef8 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -1380,7 +1380,7 @@ lbl_802483C0: /* 802483F0 00245330 D0 01 00 28 */ stfs f0, 0x28(r1) /* 802483F4 00245334 38 7E 00 E0 */ addi r3, r30, 0xe0 /* 802483F8 00245338 38 81 00 20 */ addi r4, r1, 0x20 -/* 802483FC 0024533C 48 01 EC 31 */ bl cXyz_NS___eq +/* 802483FC 0024533C 48 01 EC 31 */ bl __eq__4cXyzCFRC3Vec /* 80248400 00245340 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80248404 00245344 41 82 00 0C */ beq lbl_80248410 /* 80248408 00245348 C0 61 00 48 */ lfs f3, 0x48(r1) |