encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Split SComponent (#45)

Browse Source 
* 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>
This commit is contained in:
lepelog
2021-01-06 20:04:53 -05:00
committed by GitHub
co-authored by Pheenoh
parent 792509e0a1
commit 0cf65151b3
921 changed files with 22374 additions and 59192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/a/d_a_npc.s
+171 -171
View File
File diff suppressed because it is too large Load Diff
asm/d/a/d_a_obj.s
+7 -7
View File
@@ -263,7 +263,7 @@ daObj_NS__unnamed_d_a_obj_cpp__NS_posMoveF_resist_acc:
/* 80037418 00034358 FF E0 10 90 */ fmr f31, f2
/* 8003741C 0003435C 38 61 00 08 */ addi r3, r1, 8
/* 80037420 00034360 38 84 04 F8 */ addi r4, r4, 0x4f8
/* 80037424 00034364 48 22 F7 11 */ bl cXyz_NS___mi
/* 80037424 00034364 48 22 F7 11 */ bl __mi__4cXyzCFRC3Vec
/* 80037428 00034368 C0 C1 00 08 */ lfs f6, 8(r1)
/* 8003742C 0003436C D0 C1 00 20 */ stfs f6, 0x20(r1)
/* 80037430 00034370 C0 A1 00 0C */ lfs f5, 0xc(r1)
@@ -367,7 +367,7 @@ lbl_80037580:
/* 800375A8 000344E8 7F E3 FB 78 */ mr r3, r31
/* 800375AC 000344EC 38 81 00 2C */ addi r4, r1, 0x2c
/* 800375B0 000344F0 38 A1 00 20 */ addi r5, r1, 0x20
/* 800375B4 000344F4 48 23 76 09 */ bl cM3d_CrawVec
/* 800375B4 000344F4 48 23 76 09 */ bl cM3d_CrawVec__FRC3VecRC3VecP3Vec
/* 800375B8 000344F8 7F A3 EB 78 */ mr r3, r29
/* 800375BC 000344FC 38 81 00 20 */ addi r4, r1, 0x20
/* 800375C0 00034500 7F A5 EB 78 */ mr r5, r29
@@ -376,11 +376,11 @@ lbl_800375C8:
/* 800375C8 00034508 7F E3 FB 78 */ mr r3, r31
/* 800375CC 0003450C 38 9E 04 F8 */ addi r4, r30, 0x4f8
/* 800375D0 00034510 38 A1 00 14 */ addi r5, r1, 0x14
/* 800375D4 00034514 48 23 75 E9 */ bl cM3d_CrawVec
/* 800375D4 00034514 48 23 75 E9 */ bl cM3d_CrawVec__FRC3VecRC3VecP3Vec
/* 800375D8 00034518 38 61 00 08 */ addi r3, r1, 8
/* 800375DC 0003451C 38 81 00 14 */ addi r4, r1, 0x14
/* 800375E0 00034520 FC 20 F0 90 */ fmr f1, f30
/* 800375E4 00034524 48 22 F5 A1 */ bl cXyz_NS___ml
/* 800375E4 00034524 48 22 F5 A1 */ bl __ml__4cXyzCFf
/* 800375E8 00034528 7F A3 EB 78 */ mr r3, r29
/* 800375EC 0003452C 38 81 00 08 */ addi r4, r1, 8
/* 800375F0 00034530 7F A5 EB 78 */ mr r5, r29
@@ -477,7 +477,7 @@ lbl_8003771C:
/* 80037744 00034684 EC 60 00 F2 */ fmuls f3, f0, f3
lbl_80037748:
/* 80037748 00034688 D0 7C 05 2C */ stfs f3, 0x52c(r28)
/* 8003774C 0003468C 48 22 FF 29 */ bl cM_atan2s
/* 8003774C 0003468C 48 22 FF 29 */ bl cM_atan2s__Fff
/* 80037750 00034690 B0 7C 04 DE */ sth r3, 0x4de(r28)
/* 80037754 00034694 7F 83 E3 78 */ mr r3, r28
/* 80037758 00034698 7F A4 EB 78 */ mr r4, r29
@@ -513,7 +513,7 @@ lbl_80037748:
/* 800377D0 00034710 3C 80 80 43 */ lis r4, lbl_80430D24@ha
/* 800377D4 00034714 38 84 0D 24 */ addi r4, r4, lbl_80430D24@l
/* 800377D8 00034718 7F E5 FB 78 */ mr r5, r31
/* 800377DC 0003471C 48 22 F4 E1 */ bl cXyz_NS_outprod
/* 800377DC 0003471C 48 22 F4 E1 */ bl outprod__4cXyzCFRC3Vec
/* 800377E0 00034720 C0 01 00 14 */ lfs f0, 0x14(r1)
/* 800377E4 00034724 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 800377E8 00034728 C0 01 00 18 */ lfs f0, 0x18(r1)
@@ -529,7 +529,7 @@ lbl_80037748:
/* 80037810 00034750 38 61 00 08 */ addi r3, r1, 8
/* 80037814 00034754 7F E4 FB 78 */ mr r4, r31
/* 80037818 00034758 FC 20 F8 90 */ fmr f1, f31
/* 8003781C 0003475C 48 22 F3 FD */ bl cXyz_NS___dv
/* 8003781C 0003475C 48 22 F3 FD */ bl __dv__4cXyzCFf
/* 80037820 00034760 C0 01 00 08 */ lfs f0, 8(r1)
/* 80037824 00034764 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 80037828 00034768 C0 01 00 0C */ lfs f0, 0xc(r1)
asm/d/a/d_a_player.s
+5 -5
View File
@@ -94,17 +94,17 @@ daPy_boomerangMove_c_NS_initOffset:
/* 8015E5F0 0015B530 48 00 00 44 */ b lbl_8015E634
lbl_8015E5F4:
/* 8015E5F4 0015B534 C0 22 9C 14 */ lfs f1, lbl_80453614-_SDA2_BASE_(r2)
/* 8015E5F8 0015B538 48 10 93 5D */ bl cM_rndF
/* 8015E5F8 0015B538 48 10 93 5D */ bl cM_rndF__Ff
/* 8015E5FC 0015B53C C0 02 9C 10 */ lfs f0, lbl_80453610-_SDA2_BASE_(r2)
/* 8015E600 0015B540 EC 00 08 2A */ fadds f0, f0, f1
/* 8015E604 0015B544 D0 1D 00 04 */ stfs f0, 4(r29)
/* 8015E608 0015B548 C0 22 9C 18 */ lfs f1, lbl_80453618-_SDA2_BASE_(r2)
/* 8015E60C 0015B54C 48 10 93 49 */ bl cM_rndF
/* 8015E60C 0015B54C 48 10 93 49 */ bl cM_rndF__Ff
/* 8015E610 0015B550 C0 02 9C 18 */ lfs f0, lbl_80453618-_SDA2_BASE_(r2)
/* 8015E614 0015B554 EC 00 08 2A */ fadds f0, f0, f1
/* 8015E618 0015B558 D0 1D 00 08 */ stfs f0, 8(r29)
/* 8015E61C 0015B55C C0 22 9C 1C */ lfs f1, lbl_8045361C-_SDA2_BASE_(r2)
/* 8015E620 0015B560 48 10 93 35 */ bl cM_rndF
/* 8015E620 0015B560 48 10 93 35 */ bl cM_rndF__Ff
/* 8015E624 0015B564 FC 00 08 1E */ fctiwz f0, f1
/* 8015E628 0015B568 D8 01 00 08 */ stfd f0, 8(r1)
/* 8015E62C 0015B56C 80 01 00 0C */ lwz r0, 0xc(r1)
@@ -227,7 +227,7 @@ lbl_8015E7BC:
/* 8015E7D0 0015B710 41 82 00 90 */ beq lbl_8015E860
lbl_8015E7D4:
/* 8015E7D4 0015B714 C0 22 9C 28 */ lfs f1, lbl_80453628-_SDA2_BASE_(r2)
/* 8015E7D8 0015B718 48 10 91 7D */ bl cM_rndF
/* 8015E7D8 0015B718 48 10 91 7D */ bl cM_rndF__Ff
/* 8015E7DC 0015B71C A8 6D 8A 9C */ lha r3, lbl_8045101C-_SDA_BASE_(r13)
/* 8015E7E0 0015B720 A8 1D 04 E6 */ lha r0, 0x4e6(r29)
/* 8015E7E4 0015B724 7C 03 02 14 */ add r0, r3, r0
@@ -374,7 +374,7 @@ lbl_8015E9D0:
/* 8015E9E0 0015B920 C0 5E 00 08 */ lfs f2, 8(r30)
/* 8015E9E4 0015B924 C0 1F 04 D8 */ lfs f0, 0x4d8(r31)
/* 8015E9E8 0015B928 EC 42 00 28 */ fsubs f2, f2, f0
/* 8015E9EC 0015B92C 48 10 8C 89 */ bl cM_atan2s
/* 8015E9EC 0015B92C 48 10 8C 89 */ bl cM_atan2s__Fff
/* 8015E9F0 0015B930 B0 7D 00 02 */ sth r3, 2(r29)
lbl_8015E9F4:
/* 8015E9F4 0015B934 39 61 00 40 */ addi r11, r1, 0x40
asm/d/a/npc/d_a_npc_cd2.s
+5 -5
View File
@@ -1658,7 +1658,7 @@ lbl_801594A4:
/* 801594CC 0015640C D8 01 00 48 */ stfd f0, 0x48(r1)
/* 801594D0 00156410 80 81 00 4C */ lwz r4, 0x4c(r1)
/* 801594D4 00156414 38 61 00 08 */ addi r3, r1, 8
/* 801594D8 00156418 48 10 DF 1D */ bl csXyz_X1_
/* 801594D8 00156418 48 10 DF 1D */ bl __ct__5csXyzFsss
/* 801594DC 0015641C 80 7E 00 84 */ lwz r3, 0x84(r30)
/* 801594E0 00156420 80 03 00 0C */ lwz r0, 0xc(r3)
/* 801594E4 00156424 1F FF 00 30 */ mulli r31, r31, 0x30
@@ -1823,7 +1823,7 @@ s_sub1:
/* 80159744 00156684 4B EC 0F CD */ bl fopAcM_searchActorAngleY
/* 80159748 00156688 7C 64 1B 78 */ mr r4, r3
/* 8015974C 0015668C A8 6D 8A 8C */ lha r3, lbl_8045100C-_SDA_BASE_(r13)
/* 80159750 00156690 48 11 76 D5 */ bl cLib_distanceAngleS
/* 80159750 00156690 48 11 76 D5 */ bl cLib_distanceAngleS__Fss
/* 80159754 00156694 80 0D 8A 84 */ lwz r0, lbl_80451004-_SDA_BASE_(r13)
/* 80159758 00156698 28 00 00 00 */ cmplwi r0, 0
/* 8015975C 0015669C 40 82 00 20 */ bne lbl_8015977C
@@ -2374,7 +2374,7 @@ PathTrace_c_NS_setAvoidPoint:
/* 80159EEC 00156E2C 80 7F 00 04 */ lwz r3, 4(r31)
/* 80159EF0 00156E30 38 83 04 D0 */ addi r4, r3, 0x4d0
/* 80159EF4 00156E34 7F A3 EB 78 */ mr r3, r29
/* 80159EF8 00156E38 48 11 6D 0D */ bl cLib_targetAngleY
/* 80159EF8 00156E38 48 11 6D 0D */ bl cLib_targetAngleY__FPC3VecPC3Vec
/* 80159EFC 00156E3C 7C 7E 1B 78 */ mr r30, r3
/* 80159F00 00156E40 80 7F 00 08 */ lwz r3, 8(r31)
/* 80159F04 00156E44 80 9F 00 20 */ lwz r4, 0x20(r31)
@@ -2382,7 +2382,7 @@ PathTrace_c_NS_setAvoidPoint:
/* 80159F0C 00156E4C 7C 64 1B 78 */ mr r4, r3
/* 80159F10 00156E50 7F A3 EB 78 */ mr r3, r29
/* 80159F14 00156E54 38 84 00 04 */ addi r4, r4, 4
/* 80159F18 00156E58 48 11 6C ED */ bl cLib_targetAngleY
/* 80159F18 00156E58 48 11 6C ED */ bl cLib_targetAngleY__FPC3VecPC3Vec
/* 80159F1C 00156E5C 7F C4 07 34 */ extsh r4, r30
/* 80159F20 00156E60 7C 03 20 50 */ subf r0, r3, r4
/* 80159F24 00156E64 7C 00 07 35 */ extsh. r0, r0
@@ -2778,7 +2778,7 @@ lbl_8015A468:
/* 8015A480 001573C0 38 61 00 08 */ addi r3, r1, 8
/* 8015A484 001573C4 38 81 00 0C */ addi r4, r1, 0xc
/* 8015A488 001573C8 38 A1 00 10 */ addi r5, r1, 0x10
/* 8015A48C 001573CC 48 10 E1 A1 */ bl cM3d_Len2dSqPntAndSegLine
/* 8015A48C 001573CC 48 10 E1 A1 */ bl cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf
/* 8015A490 001573D0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015A494 001573D4 41 82 00 24 */ beq lbl_8015A4B8
/* 8015A498 001573D8 C8 22 9B 48 */ lfd f1, lbl_80453548-_SDA2_BASE_(r2)
asm/d/a/obj/d_a_obj_item.s
+25 -25
View File
@@ -109,11 +109,11 @@ lbl_8015AF28:
/* 8015AF38 00157E78 38 61 00 34 */ addi r3, r1, 0x34
/* 8015AF3C 00157E7C 38 81 00 40 */ addi r4, r1, 0x40
/* 8015AF40 00157E80 FC 20 F0 90 */ fmr f1, f30
/* 8015AF44 00157E84 48 10 BC 41 */ bl cXyz_NS___ml
/* 8015AF44 00157E84 48 10 BC 41 */ bl __ml__4cXyzCFf
/* 8015AF48 00157E88 38 61 00 28 */ addi r3, r1, 0x28
/* 8015AF4C 00157E8C 38 81 00 34 */ addi r4, r1, 0x34
/* 8015AF50 00157E90 FC 20 F8 90 */ fmr f1, f31
/* 8015AF54 00157E94 48 10 BC 31 */ bl cXyz_NS___ml
/* 8015AF54 00157E94 48 10 BC 31 */ bl __ml__4cXyzCFf
/* 8015AF58 00157E98 C0 01 00 28 */ lfs f0, 0x28(r1)
/* 8015AF5C 00157E9C D0 1F 00 00 */ stfs f0, 0(r31)
/* 8015AF60 00157EA0 C0 01 00 2C */ lfs f0, 0x2c(r1)
@@ -525,10 +525,10 @@ daItem_c_NS_CreateInit:
/* 8015B4F4 00158434 EC 21 00 B2 */ fmuls f1, f1, f2
lbl_8015B4F8:
/* 8015B4F8 00158438 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015B4FC 0015843C 48 11 3D 05 */ bl cM3dGCyl_NS_SetR
/* 8015B4FC 0015843C 48 11 3D 05 */ bl SetR__8cM3dGCylFf
/* 8015B500 00158440 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015B504 00158444 FC 20 F8 90 */ fmr f1, f31
/* 8015B508 00158448 48 11 3C F1 */ bl cM3dGCyl_NS_SetH
/* 8015B508 00158448 48 11 3C F1 */ bl SetH__8cM3dGCylFf
/* 8015B50C 0015844C 7F E3 FB 78 */ mr r3, r31
/* 8015B510 00158450 48 00 02 AD */ bl daItem_c_NS_setCullInfo
/* 8015B514 00158454 7F E3 FB 78 */ mr r3, r31
@@ -1213,7 +1213,7 @@ daItem_c_NS_procInitNormal:
/* 8015BED0 00158E10 48 00 0B E9 */ bl daItem_c_NS_move_proc_call
/* 8015BED4 00158E14 38 7F 04 EC */ addi r3, r31, 0x4ec
/* 8015BED8 00158E18 38 9F 09 30 */ addi r4, r31, 0x930
/* 8015BEDC 00158E1C 48 10 B1 91 */ bl cXyz_NS___ne
/* 8015BEDC 00158E1C 48 10 B1 91 */ bl __ne__4cXyzCFRC3Vec
/* 8015BEE0 00158E20 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015BEE4 00158E24 41 82 00 70 */ beq lbl_8015BF54
/* 8015BEE8 00158E28 7F E3 FB 78 */ mr r3, r31
@@ -1234,15 +1234,15 @@ daItem_c_NS_procInitNormal:
/* 8015BF24 00158E64 38 7F 04 EC */ addi r3, r31, 0x4ec
/* 8015BF28 00158E68 C0 3F 09 30 */ lfs f1, 0x930(r31)
/* 8015BF2C 00158E6C FC 40 F8 90 */ fmr f2, f31
/* 8015BF30 00158E70 48 11 48 11 */ bl cLib_chaseF
/* 8015BF30 00158E70 48 11 48 11 */ bl cLib_chaseF__FPfff
/* 8015BF34 00158E74 38 7F 04 F0 */ addi r3, r31, 0x4f0
/* 8015BF38 00158E78 C0 3F 09 34 */ lfs f1, 0x934(r31)
/* 8015BF3C 00158E7C FC 40 F0 90 */ fmr f2, f30
/* 8015BF40 00158E80 48 11 48 01 */ bl cLib_chaseF
/* 8015BF40 00158E80 48 11 48 01 */ bl cLib_chaseF__FPfff
/* 8015BF44 00158E84 38 7F 04 F4 */ addi r3, r31, 0x4f4
/* 8015BF48 00158E88 C0 3F 09 38 */ lfs f1, 0x938(r31)
/* 8015BF4C 00158E8C FC 40 E8 90 */ fmr f2, f29
/* 8015BF50 00158E90 48 11 47 F1 */ bl cLib_chaseF
/* 8015BF50 00158E90 48 11 47 F1 */ bl cLib_chaseF__FPfff
lbl_8015BF54:
/* 8015BF54 00158E94 A8 1F 09 42 */ lha r0, 0x942(r31)
/* 8015BF58 00158E98 2C 00 00 00 */ cmpwi r0, 0
@@ -1266,12 +1266,12 @@ lbl_8015BF74:
lbl_8015BF9C:
/* 8015BF9C 00158EDC 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015BFA0 00158EE0 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015BFA4 00158EE4 48 11 32 39 */ bl cM3dGCyl_NS_SetC
/* 8015BFA4 00158EE4 48 11 32 39 */ bl SetC__8cM3dGCylFRC4cXyz
/* 8015BFA8 00158EE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015BFAC 00158EEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015BFB0 00158EF0 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015BFB4 00158EF4 38 9F 07 E0 */ addi r4, r31, 0x7e0
/* 8015BFB8 00158EF8 48 10 8B F1 */ bl cCcS_NS_Set
/* 8015BFB8 00158EF8 48 10 8B F1 */ bl Set__4cCcSFP8cCcD_Obj
/* 8015BFBC 00158EFC E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0
/* 8015BFC0 00158F00 CB E1 00 30 */ lfd f31, 0x30(r1)
/* 8015BFC4 00158F04 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0
@@ -1611,7 +1611,7 @@ daItem_c_NS_procInitBoomerangCarry:
/* 8015C498 001593D8 C8 01 00 08 */ lfd f0, 8(r1)
/* 8015C49C 001593DC EC 00 08 28 */ fsubs f0, f0, f1
/* 8015C4A0 001593E0 EC 22 00 32 */ fmuls f1, f2, f0
/* 8015C4A4 001593E4 48 11 2D 5D */ bl cM3dGCyl_NS_SetR
/* 8015C4A4 001593E4 48 11 2D 5D */ bl SetR__8cM3dGCylFf
/* 8015C4A8 001593E8 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015C4AC 001593EC C0 42 9B 9C */ lfs f2, lbl_8045359C-_SDA2_BASE_(r2)
/* 8015C4B0 001593F0 57 C0 06 3E */ clrlwi r0, r30, 0x18
@@ -1622,7 +1622,7 @@ daItem_c_NS_procInitBoomerangCarry:
/* 8015C4C4 00159404 C8 01 00 10 */ lfd f0, 0x10(r1)
/* 8015C4C8 00159408 EC 00 08 28 */ fsubs f0, f0, f1
/* 8015C4CC 0015940C EC 22 00 32 */ fmuls f1, f2, f0
/* 8015C4D0 00159410 48 11 2D 29 */ bl cM3dGCyl_NS_SetH
/* 8015C4D0 00159410 48 11 2D 29 */ bl SetH__8cM3dGCylFf
/* 8015C4D4 00159414 80 1F 08 0C */ lwz r0, 0x80c(r31)
/* 8015C4D8 00159418 60 00 00 01 */ ori r0, r0, 1
/* 8015C4DC 0015941C 90 1F 08 0C */ stw r0, 0x80c(r31)
@@ -1685,12 +1685,12 @@ lbl_8015C59C:
/* 8015C5B8 001594F8 48 00 22 C5 */ bl daPy_boomerangMove_c_NS_bgCheckAfterOffset
/* 8015C5BC 001594FC 38 7D 09 04 */ addi r3, r29, 0x904
/* 8015C5C0 00159500 38 9D 04 D0 */ addi r4, r29, 0x4d0
/* 8015C5C4 00159504 48 11 2C 19 */ bl cM3dGCyl_NS_SetC
/* 8015C5C4 00159504 48 11 2C 19 */ bl SetC__8cM3dGCylFRC4cXyz
/* 8015C5C8 00159508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015C5CC 0015950C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015C5D0 00159510 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015C5D4 00159514 38 9D 07 E0 */ addi r4, r29, 0x7e0
/* 8015C5D8 00159518 48 10 85 D1 */ bl cCcS_NS_Set
/* 8015C5D8 00159518 48 10 85 D1 */ bl Set__4cCcSFP8cCcD_Obj
/* 8015C5DC 0015951C 39 61 00 20 */ addi r11, r1, 0x20
/* 8015C5E0 00159520 48 20 5C 49 */ bl _restgpr_29
/* 8015C5E4 00159524 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -1867,7 +1867,7 @@ lbl_8015C818:
/* 8015C84C 0015978C 38 61 00 18 */ addi r3, r1, 0x18
/* 8015C850 00159790 38 81 00 24 */ addi r4, r1, 0x24
/* 8015C854 00159794 38 BF 04 D0 */ addi r5, r31, 0x4d0
/* 8015C858 00159798 48 10 A2 DD */ bl cXyz_NS___mi
/* 8015C858 00159798 48 10 A2 DD */ bl __mi__4cXyzCFRC3Vec
/* 8015C85C 0015979C C0 01 00 18 */ lfs f0, 0x18(r1)
/* 8015C860 001597A0 D0 01 00 3C */ stfs f0, 0x3c(r1)
/* 8015C864 001597A4 C0 01 00 1C */ lfs f0, 0x1c(r1)
@@ -1962,7 +1962,7 @@ lbl_8015C960:
/* 8015C9A4 001598E4 38 61 00 0C */ addi r3, r1, 0xc
/* 8015C9A8 001598E8 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 8015C9AC 001598EC 38 A1 00 30 */ addi r5, r1, 0x30
/* 8015C9B0 001598F0 48 10 A1 35 */ bl cXyz_NS___pl
/* 8015C9B0 001598F0 48 10 A1 35 */ bl __pl__4cXyzCFRC3Vec
/* 8015C9B4 001598F4 C0 01 00 0C */ lfs f0, 0xc(r1)
/* 8015C9B8 001598F8 D0 1F 04 D0 */ stfs f0, 0x4d0(r31)
/* 8015C9BC 001598FC C0 01 00 10 */ lfs f0, 0x10(r1)
@@ -1970,7 +1970,7 @@ lbl_8015C960:
/* 8015C9C4 00159904 C0 01 00 14 */ lfs f0, 0x14(r1)
/* 8015C9C8 00159908 D0 1F 04 D8 */ stfs f0, 0x4d8(r31)
/* 8015C9CC 0015990C C0 22 9B A8 */ lfs f1, lbl_804535A8-_SDA2_BASE_(r2)
/* 8015C9D0 00159910 48 10 AF BD */ bl cM_rndFX
/* 8015C9D0 00159910 48 10 AF BD */ bl cM_rndFX__Ff
/* 8015C9D4 00159914 A8 1E 04 E6 */ lha r0, 0x4e6(r30)
/* 8015C9D8 00159918 C8 42 9B B0 */ lfd f2, lbl_804535B0-_SDA2_BASE_(r2)
/* 8015C9DC 0015991C 6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -2021,12 +2021,12 @@ lbl_8015C960:
lbl_8015CA80:
/* 8015CA80 001599C0 38 7F 09 04 */ addi r3, r31, 0x904
/* 8015CA84 001599C4 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015CA88 001599C8 48 11 27 55 */ bl cM3dGCyl_NS_SetC
/* 8015CA88 001599C8 48 11 27 55 */ bl SetC__8cM3dGCylFRC4cXyz
/* 8015CA8C 001599CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 8015CA90 001599D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015CA94 001599D4 38 63 23 3C */ addi r3, r3, 0x233c
/* 8015CA98 001599D8 38 9F 07 E0 */ addi r4, r31, 0x7e0
/* 8015CA9C 001599DC 48 10 81 0D */ bl cCcS_NS_Set
/* 8015CA9C 001599DC 48 10 81 0D */ bl Set__4cCcSFP8cCcD_Obj
/* 8015CAA0 001599E0 83 E1 00 5C */ lwz r31, 0x5c(r1)
/* 8015CAA4 001599E4 83 C1 00 58 */ lwz r30, 0x58(r1)
/* 8015CAA8 001599E8 80 01 00 64 */ lwz r0, 0x64(r1)
@@ -2094,7 +2094,7 @@ lbl_8015CB44:
/* 8015CB8C 00159ACC 40 82 00 40 */ bne lbl_8015CBCC
/* 8015CB90 00159AD0 38 7E 09 6C */ addi r3, r30, 0x96c
/* 8015CB94 00159AD4 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 8015CB98 00159AD8 48 10 A4 95 */ bl cXyz_NS___eq
/* 8015CB98 00159AD8 48 10 A4 95 */ bl __eq__4cXyzCFRC3Vec
/* 8015CB9C 00159ADC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015CBA0 00159AE0 41 82 00 2C */ beq lbl_8015CBCC
/* 8015CBA4 00159AE4 80 1E 05 B8 */ lwz r0, 0x5b8(r30)
@@ -2954,7 +2954,7 @@ daItem_c_NS_bg_check:
lbl_8015D774:
/* 8015D774 0015A6B4 C0 3F 04 F8 */ lfs f1, 0x4f8(r31)
/* 8015D778 0015A6B8 C0 5F 05 00 */ lfs f2, 0x500(r31)
/* 8015D77C 0015A6BC 48 10 9E F9 */ bl cM_atan2s
/* 8015D77C 0015A6BC 48 10 9E F9 */ bl cM_atan2s__Fff
/* 8015D780 0015A6C0 B0 7F 04 DE */ sth r3, 0x4de(r31)
lbl_8015D784:
/* 8015D784 0015A6C4 80 1F 05 B8 */ lwz r0, 0x5b8(r31)
@@ -3152,7 +3152,7 @@ daItem_c_NS_initAction:
/* 8015DA2C 0015A96C 2C 03 00 00 */ cmpwi r3, 0
/* 8015DA30 0015A970 41 82 00 5C */ beq lbl_8015DA8C
/* 8015DA34 0015A974 C0 22 9B C4 */ lfs f1, lbl_804535C4-_SDA2_BASE_(r2)
/* 8015DA38 0015A978 48 10 9F 1D */ bl cM_rndF
/* 8015DA38 0015A978 48 10 9F 1D */ bl cM_rndF__Ff
/* 8015DA3C 0015A97C C0 02 9B CC */ lfs f0, lbl_804535CC-_SDA2_BASE_(r2)
/* 8015DA40 0015A980 EC 20 08 2A */ fadds f1, f0, f1
/* 8015DA44 0015A984 C0 02 9B 98 */ lfs f0, lbl_80453598-_SDA2_BASE_(r2)
@@ -3168,7 +3168,7 @@ daItem_c_NS_initAction:
/* 8015DA6C 0015A9AC 90 01 00 08 */ stw r0, 8(r1)
/* 8015DA70 0015A9B0 C8 01 00 08 */ lfd f0, 8(r1)
/* 8015DA74 0015A9B4 EC 20 08 28 */ fsubs f1, f0, f1
/* 8015DA78 0015A9B8 48 10 9F 15 */ bl cM_rndFX
/* 8015DA78 0015A9B8 48 10 9F 15 */ bl cM_rndFX__Ff
/* 8015DA7C 0015A9BC FC 00 08 1E */ fctiwz f0, f1
/* 8015DA80 0015A9C0 D8 01 00 10 */ stfd f0, 0x10(r1)
/* 8015DA84 0015A9C4 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -3310,7 +3310,7 @@ daItem_c_NS_initSpeed:
/* 8015DC70 0015ABB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 8015DC74 0015ABB4 83 E3 5D AC */ lwz r31, 0x5dac(r3)
/* 8015DC78 0015ABB8 C0 22 9B C4 */ lfs f1, lbl_804535C4-_SDA2_BASE_(r2)
/* 8015DC7C 0015ABBC 48 10 9D 11 */ bl cM_rndFX
/* 8015DC7C 0015ABBC 48 10 9D 11 */ bl cM_rndFX__Ff
/* 8015DC80 0015ABC0 FF E0 08 90 */ fmr f31, f1
/* 8015DC84 0015ABC4 7F A3 EB 78 */ mr r3, r29
/* 8015DC88 0015ABC8 4B FF D4 31 */ bl daItemBase_c_NS_getData
@@ -3361,7 +3361,7 @@ lbl_8015DD04:
/* 8015DD2C 0015AC6C C0 02 9B D0 */ lfs f0, lbl_804535D0-_SDA2_BASE_(r2)
/* 8015DD30 0015AC70 EF C0 00 72 */ fmuls f30, f0, f1
/* 8015DD34 0015AC74 C0 22 9B A8 */ lfs f1, lbl_804535A8-_SDA2_BASE_(r2)
/* 8015DD38 0015AC78 48 10 9C 55 */ bl cM_rndFX
/* 8015DD38 0015AC78 48 10 9C 55 */ bl cM_rndFX__Ff
/* 8015DD3C 0015AC7C A8 1F 04 E6 */ lha r0, 0x4e6(r31)
/* 8015DD40 0015AC80 C8 42 9B B0 */ lfd f2, lbl_804535B0-_SDA2_BASE_(r2)
/* 8015DD44 0015AC84 6C 00 80 00 */ xoris r0, r0, 0x8000
asm/d/bg/d_bg_s.s
+24 -24
View File
@@ -223,12 +223,12 @@ cBgS_NS_LineCross:
/* 800743C8 00071308 7C 7E 1B 78 */ mr r30, r3
/* 800743CC 0007130C 7C 9D 23 78 */ mr r29, r4
/* 800743D0 00071310 38 7D 00 14 */ addi r3, r29, 0x14
/* 800743D4 00071314 48 1F 3D 4D */ bl cBgS_PolyInfo_NS_ClearPi
/* 800743D4 00071314 48 1F 3D 4D */ bl ClearPi__13cBgS_PolyInfoFv
/* 800743D8 00071318 80 1D 00 4C */ lwz r0, 0x4c(r29)
/* 800743DC 0007131C 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a
/* 800743E0 00071320 90 1D 00 4C */ stw r0, 0x4c(r29)
/* 800743E4 00071324 7F A3 EB 78 */ mr r3, r29
/* 800743E8 00071328 48 1F 3B 59 */ bl cBgS_LinChk_NS_PreCalc
/* 800743E8 00071328 48 1F 3B 59 */ bl PreCalc__11cBgS_LinChkFv
/* 800743EC 0007132C 7F DF F3 78 */ mr r31, r30
/* 800743F0 00071330 3B C0 00 00 */ li r30, 0
lbl_800743F4:
@@ -244,7 +244,7 @@ lbl_800743F4:
/* 80074418 00071358 40 82 00 58 */ bne lbl_80074470
/* 8007441C 0007135C 7F A3 EB 78 */ mr r3, r29
/* 80074420 00071360 80 9F 00 08 */ lwz r4, 8(r31)
/* 80074424 00071364 48 1F 37 B9 */ bl cBgS_Chk_NS_ChkSameActorPid
/* 80074424 00071364 48 1F 37 B9 */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 80074428 00071368 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007442C 0007136C 40 82 00 44 */ bne lbl_80074470
/* 80074430 00071370 80 7F 00 00 */ lwz r3, 0(r31)
@@ -259,7 +259,7 @@ lbl_800743F4:
/* 80074454 00071394 7F C4 F3 78 */ mr r4, r30
/* 80074458 00071398 80 BF 00 00 */ lwz r5, 0(r31)
/* 8007445C 0007139C 80 DF 00 08 */ lwz r6, 8(r31)
/* 80074460 000713A0 48 1F 3D 0D */ bl cBgS_PolyInfo_NS_SetActorInfo
/* 80074460 000713A0 48 1F 3D 0D */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi
/* 80074464 000713A4 80 1D 00 4C */ lwz r0, 0x4c(r29)
/* 80074468 000713A8 60 00 00 10 */ ori r0, r0, 0x10
/* 8007446C 000713AC 90 1D 00 4C */ stw r0, 0x4c(r29)
@@ -289,9 +289,9 @@ cBgS_NS_GroundCross:
/* 800744BC 000713FC C0 02 8C B8 */ lfs f0, lbl_804526B8-_SDA2_BASE_(r2)
/* 800744C0 00071400 D0 04 00 34 */ stfs f0, 0x34(r4)
/* 800744C4 00071404 38 7D 00 14 */ addi r3, r29, 0x14
/* 800744C8 00071408 48 1F 3C 59 */ bl cBgS_PolyInfo_NS_ClearPi
/* 800744C8 00071408 48 1F 3C 59 */ bl ClearPi__13cBgS_PolyInfoFv
/* 800744CC 0007140C 7F A3 EB 78 */ mr r3, r29
/* 800744D0 00071410 48 1F 38 75 */ bl cBgS_GndChk_NS_PreCheck
/* 800744D0 00071410 48 1F 38 75 */ bl PreCheck__11cBgS_GndChkFv
/* 800744D4 00071414 7F DF F3 78 */ mr r31, r30
/* 800744D8 00071418 3B C0 00 00 */ li r30, 0
lbl_800744DC:
@@ -307,7 +307,7 @@ lbl_800744DC:
/* 80074500 00071440 40 82 00 4C */ bne lbl_8007454C
/* 80074504 00071444 7F A3 EB 78 */ mr r3, r29
/* 80074508 00071448 80 9F 00 08 */ lwz r4, 8(r31)
/* 8007450C 0007144C 48 1F 36 D1 */ bl cBgS_Chk_NS_ChkSameActorPid
/* 8007450C 0007144C 48 1F 36 D1 */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 80074510 00071450 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80074514 00071454 40 82 00 38 */ bne lbl_8007454C
/* 80074518 00071458 80 7F 00 00 */ lwz r3, 0(r31)
@@ -322,7 +322,7 @@ lbl_800744DC:
/* 8007453C 0007147C 7F C4 F3 78 */ mr r4, r30
/* 80074540 00071480 80 BF 00 00 */ lwz r5, 0(r31)
/* 80074544 00071484 80 DF 00 08 */ lwz r6, 8(r31)
/* 80074548 00071488 48 1F 3C 25 */ bl cBgS_PolyInfo_NS_SetActorInfo
/* 80074548 00071488 48 1F 3C 25 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi
lbl_8007454C:
/* 8007454C 0007148C 3B DE 00 01 */ addi r30, r30, 1
/* 80074550 00071490 2C 1E 01 00 */ cmpwi r30, 0x100
@@ -419,7 +419,7 @@ cBgS_NS_ChkPolySafe:
/* 80074674 000715B4 7C 7E 1B 78 */ mr r30, r3
/* 80074678 000715B8 7C 9F 23 78 */ mr r31, r4
/* 8007467C 000715BC 7F E3 FB 78 */ mr r3, r31
/* 80074680 000715C0 48 1F 3A 79 */ bl cBgS_PolyInfo_NS_ChkSetInfo
/* 80074680 000715C0 48 1F 3A 79 */ bl ChkSetInfo__13cBgS_PolyInfoCFv
/* 80074684 000715C4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80074688 000715C8 40 82 00 0C */ bne lbl_80074694
/* 8007468C 000715CC 38 60 00 00 */ li r3, 0
@@ -442,7 +442,7 @@ lbl_800746B0:
/* 800746C4 00071604 7F E3 FB 78 */ mr r3, r31
/* 800746C8 00071608 7C 9E 20 2E */ lwzx r4, r30, r4
/* 800746CC 0007160C 80 A5 00 08 */ lwz r5, 8(r5)
/* 800746D0 00071610 48 1F 3A AD */ bl cBgS_PolyInfo_NS_ChkSafe
/* 800746D0 00071610 48 1F 3A AD */ bl ChkSafe__13cBgS_PolyInfoCFPCvUi
/* 800746D4 00071614 48 00 00 08 */ b lbl_800746DC
lbl_800746D8:
/* 800746D8 00071618 38 60 00 00 */ li r3, 0
@@ -841,7 +841,7 @@ dBgS_NS_GetPolyColor:
/* 80074BFC 00071B3C 7C 7E 1B 78 */ mr r30, r3
/* 80074C00 00071B40 7C 9F 23 78 */ mr r31, r4
/* 80074C04 00071B44 7F E3 FB 78 */ mr r3, r31
/* 80074C08 00071B48 48 1F 34 F1 */ bl cBgS_PolyInfo_NS_ChkSetInfo
/* 80074C08 00071B48 48 1F 34 F1 */ bl ChkSetInfo__13cBgS_PolyInfoCFv
/* 80074C0C 00071B4C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80074C10 00071B50 40 82 00 0C */ bne lbl_80074C1C
/* 80074C14 00071B54 38 60 00 FF */ li r3, 0xff
@@ -1243,7 +1243,7 @@ dBgS_NS_GetRoomId:
/* 80075114 00072054 7C 7D 1B 78 */ mr r29, r3
/* 80075118 00072058 7C 9E 23 78 */ mr r30, r4
/* 8007511C 0007205C 7F C3 F3 78 */ mr r3, r30
/* 80075120 00072060 48 1F 2F D9 */ bl cBgS_PolyInfo_NS_ChkSetInfo
/* 80075120 00072060 48 1F 2F D9 */ bl ChkSetInfo__13cBgS_PolyInfoCFv
/* 80075124 00072064 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80075128 00072068 40 82 00 0C */ bne lbl_80075134
/* 8007512C 0007206C 38 60 FF FF */ li r3, -1
@@ -1366,7 +1366,7 @@ lbl_80075284:
/* 800752B8 000721F8 40 82 00 88 */ bne lbl_80075340
/* 800752BC 000721FC 7F 63 DB 78 */ mr r3, r27
/* 800752C0 00072200 80 9E 00 08 */ lwz r4, 8(r30)
/* 800752C4 00072204 48 1F 29 19 */ bl cBgS_Chk_NS_ChkSameActorPid
/* 800752C4 00072204 48 1F 29 19 */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 800752C8 00072208 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800752CC 0007220C 40 82 00 74 */ bne lbl_80075340
/* 800752D0 00072210 80 1B 00 2C */ lwz r0, 0x2c(r27)
@@ -1447,7 +1447,7 @@ lbl_800753AC:
/* 800753E0 00072320 40 82 00 88 */ bne lbl_80075468
/* 800753E4 00072324 7F 63 DB 78 */ mr r3, r27
/* 800753E8 00072328 80 9E 00 08 */ lwz r4, 8(r30)
/* 800753EC 0007232C 48 1F 27 F1 */ bl cBgS_Chk_NS_ChkSameActorPid
/* 800753EC 0007232C 48 1F 27 F1 */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 800753F0 00072330 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800753F4 00072334 40 82 00 74 */ bne lbl_80075468
/* 800753F8 00072338 80 1B 00 2C */ lwz r0, 0x2c(r27)
@@ -1520,7 +1520,7 @@ lbl_800754C8:
/* 800754EC 0007242C 40 82 00 4C */ bne lbl_80075538
/* 800754F0 00072430 38 7D 00 10 */ addi r3, r29, 0x10
/* 800754F4 00072434 80 9F 00 08 */ lwz r4, 8(r31)
/* 800754F8 00072438 48 1F 26 E5 */ bl cBgS_Chk_NS_ChkSameActorPid
/* 800754F8 00072438 48 1F 26 E5 */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 800754FC 0007243C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80075500 00072440 40 82 00 38 */ bne lbl_80075538
/* 80075504 00072444 80 7F 00 00 */ lwz r3, 0(r31)
@@ -1535,7 +1535,7 @@ lbl_800754C8:
/* 80075528 00072468 7F C4 F3 78 */ mr r4, r30
/* 8007552C 0007246C 80 BF 00 00 */ lwz r5, 0(r31)
/* 80075530 00072470 80 DF 00 08 */ lwz r6, 8(r31)
/* 80075534 00072474 48 1F 2C 39 */ bl cBgS_PolyInfo_NS_SetActorInfo
/* 80075534 00072474 48 1F 2C 39 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi
lbl_80075538:
/* 80075538 00072478 3B DE 00 01 */ addi r30, r30, 1
/* 8007553C 0007247C 2C 1E 01 00 */ cmpwi r30, 0x100
@@ -1576,7 +1576,7 @@ lbl_80075594:
/* 800755B8 000724F8 40 82 00 A4 */ bne lbl_8007565C
/* 800755BC 000724FC 38 7B 00 10 */ addi r3, r27, 0x10
/* 800755C0 00072500 80 9E 00 08 */ lwz r4, 8(r30)
/* 800755C4 00072504 48 1F 26 19 */ bl cBgS_Chk_NS_ChkSameActorPid
/* 800755C4 00072504 48 1F 26 19 */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 800755C8 00072508 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800755CC 0007250C 40 82 00 90 */ bne lbl_8007565C
/* 800755D0 00072510 83 9E 00 00 */ lwz r28, 0(r30)
@@ -1611,7 +1611,7 @@ lbl_80075618:
/* 80075640 00072580 7F A4 EB 78 */ mr r4, r29
/* 80075644 00072584 80 BE 00 00 */ lwz r5, 0(r30)
/* 80075648 00072588 80 DE 00 08 */ lwz r6, 8(r30)
/* 8007564C 0007258C 48 1F 2B 21 */ bl cBgS_PolyInfo_NS_SetActorInfo
/* 8007564C 0007258C 48 1F 2B 21 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi
/* 80075650 00072590 80 1B 00 50 */ lwz r0, 0x50(r27)
/* 80075654 00072594 60 00 00 01 */ ori r0, r0, 1
/* 80075658 00072598 90 1B 00 50 */ stw r0, 0x50(r27)
@@ -1646,7 +1646,7 @@ dBgS_NS_SphChk:
lbl_800756BC:
/* 800756BC 000725FC 3B E0 00 00 */ li r31, 0
/* 800756C0 00072600 38 7B 00 14 */ addi r3, r27, 0x14
/* 800756C4 00072604 48 1F 2A 5D */ bl cBgS_PolyInfo_NS_ClearPi
/* 800756C4 00072604 48 1F 2A 5D */ bl ClearPi__13cBgS_PolyInfoFv
/* 800756C8 00072608 7F BE EB 78 */ mr r30, r29
/* 800756CC 0007260C 3B A0 00 00 */ li r29, 0
lbl_800756D0:
@@ -1662,7 +1662,7 @@ lbl_800756D0:
/* 800756F4 00072634 40 82 00 54 */ bne lbl_80075748
/* 800756F8 00072638 38 7B 00 24 */ addi r3, r27, 0x24
/* 800756FC 0007263C 80 9E 00 08 */ lwz r4, 8(r30)
/* 80075700 00072640 48 1F 24 DD */ bl cBgS_Chk_NS_ChkSameActorPid
/* 80075700 00072640 48 1F 24 DD */ bl ChkSameActorPid__8cBgS_ChkCFUi
/* 80075704 00072644 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80075708 00072648 40 82 00 40 */ bne lbl_80075748
/* 8007570C 0007264C 80 7E 00 00 */ lwz r3, 0(r30)
@@ -1678,7 +1678,7 @@ lbl_800756D0:
/* 80075734 00072674 7F A4 EB 78 */ mr r4, r29
/* 80075738 00072678 80 BE 00 00 */ lwz r5, 0(r30)
/* 8007573C 0007267C 80 DE 00 08 */ lwz r6, 8(r30)
/* 80075740 00072680 48 1F 2A 2D */ bl cBgS_PolyInfo_NS_SetActorInfo
/* 80075740 00072680 48 1F 2A 2D */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi
/* 80075744 00072684 3B E0 00 01 */ li r31, 1
lbl_80075748:
/* 80075748 00072688 3B BD 00 01 */ addi r29, r29, 1
@@ -1712,7 +1712,7 @@ dBgS_NS_MoveBgCrrPos:
/* 800757A8 000726E8 54 A0 06 3F */ clrlwi. r0, r5, 0x18
/* 800757AC 000726EC 41 82 00 BC */ beq lbl_80075868
/* 800757B0 000726F0 7F 63 DB 78 */ mr r3, r27
/* 800757B4 000726F4 48 1F 29 F9 */ bl cBgS_PolyInfo_NS_ChkBgIndex
/* 800757B4 000726F4 48 1F 29 F9 */ bl ChkBgIndex__13cBgS_PolyInfoCFv
/* 800757B8 000726F8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800757BC 000726FC 40 82 00 08 */ bne lbl_800757C4
/* 800757C0 00072700 48 00 00 A8 */ b lbl_80075868
@@ -1784,7 +1784,7 @@ dBgS_NS_MoveBgTransPos:
/* 800758AC 000727EC 54 A0 06 3F */ clrlwi. r0, r5, 0x18
/* 800758B0 000727F0 41 82 00 94 */ beq lbl_80075944
/* 800758B4 000727F4 7F 23 CB 78 */ mr r3, r25
/* 800758B8 000727F8 48 1F 28 F5 */ bl cBgS_PolyInfo_NS_ChkBgIndex
/* 800758B8 000727F8 48 1F 28 F5 */ bl ChkBgIndex__13cBgS_PolyInfoCFv
/* 800758BC 000727FC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800758C0 00072800 40 82 00 08 */ bne lbl_800758C8
/* 800758C4 00072804 48 00 00 80 */ b lbl_80075944
@@ -1844,7 +1844,7 @@ dBgS_NS_MoveBgMatrixCrrPos:
/* 80075988 000728C8 54 A0 06 3F */ clrlwi. r0, r5, 0x18
/* 8007598C 000728CC 41 82 00 80 */ beq lbl_80075A0C
/* 80075990 000728D0 7F 23 CB 78 */ mr r3, r25
/* 80075994 000728D4 48 1F 28 19 */ bl cBgS_PolyInfo_NS_ChkBgIndex
/* 80075994 000728D4 48 1F 28 19 */ bl ChkBgIndex__13cBgS_PolyInfoCFv
/* 80075998 000728D8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8007599C 000728DC 40 82 00 08 */ bne lbl_800759A4
/* 800759A0 000728E0 48 00 00 6C */ b lbl_80075A0C
asm/d/bg/d_bg_w.s
+71 -71
View File
File diff suppressed because it is too large Load Diff
asm/d/bg/s/d_bg_s_acch.s
+27 -27
View File
@@ -10,12 +10,12 @@ dBgS_AcchCir:
/* 80075EB4 00072DF4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80075EB8 00072DF8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80075EBC 00072DFC 7C 7F 1B 78 */ mr r31, r3
/* 80075EC0 00072E00 48 1F 21 B5 */ bl cBgS_PolyInfo_NS_ctor
/* 80075EC0 00072E00 48 1F 21 B5 */ bl __ct__13cBgS_PolyInfoFv
/* 80075EC4 00072E04 3C 60 80 3B */ lis r3, lbl_803AB664@ha
/* 80075EC8 00072E08 38 03 B6 64 */ addi r0, r3, lbl_803AB664@l
/* 80075ECC 00072E0C 90 1F 00 0C */ stw r0, 0xc(r31)
/* 80075ED0 00072E10 38 7F 00 14 */ addi r3, r31, 0x14
/* 80075ED4 00072E14 48 1F 8F E1 */ bl cM3dGCir
/* 80075ED4 00072E14 48 1F 8F E1 */ bl __ct__8cM3dGCirFv
/* 80075ED8 00072E18 38 00 00 00 */ li r0, 0
/* 80075EDC 00072E1C 90 1F 00 10 */ stw r0, 0x10(r31)
/* 80075EE0 00072E20 C0 02 8C C0 */ lfs f0, lbl_804526C0-_SDA2_BASE_(r2)
@@ -40,7 +40,7 @@ dBgS_AcchCir_NS_ClrWallHit:
/* 80075F20 00072E60 80 03 00 10 */ lwz r0, 0x10(r3)
/* 80075F24 00072E64 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d
/* 80075F28 00072E68 90 03 00 10 */ stw r0, 0x10(r3)
/* 80075F2C 00072E6C 48 1F 21 F5 */ bl cBgS_PolyInfo_NS_ClearPi
/* 80075F2C 00072E6C 48 1F 21 F5 */ bl ClearPi__13cBgS_PolyInfoFv
/* 80075F30 00072E70 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80075F34 00072E74 7C 08 03 A6 */ mtlr r0
/* 80075F38 00072E78 38 21 00 10 */ addi r1, r1, 0x10
@@ -140,7 +140,7 @@ lbl_8007605C:
/* 80076064 00072FA4 48 00 14 85 */ bl dBgS_Chk_NS_dtor
/* 80076068 00072FA8 7F C3 F3 78 */ mr r3, r30
/* 8007606C 00072FAC 38 80 00 00 */ li r4, 0
/* 80076070 00072FB0 48 1F 1B 01 */ bl cBgS_Chk_NS_dtor
/* 80076070 00072FB0 48 1F 1B 01 */ bl __dt__8cBgS_ChkFv
/* 80076074 00072FB4 7F E0 07 35 */ extsh. r0, r31
/* 80076078 00072FB8 40 81 00 0C */ ble lbl_80076084
/* 8007607C 00072FBC 7F C3 F3 78 */ mr r3, r30
@@ -161,7 +161,7 @@ dBgS_Acch:
/* 800760A8 00072FE8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800760AC 00072FEC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 800760B0 00072FF0 7C 7F 1B 78 */ mr r31, r3
/* 800760B4 00072FF4 48 1F 1A 99 */ bl cBgS_Chk
/* 800760B4 00072FF4 48 1F 1A 99 */ bl __ct__8cBgS_ChkFv
/* 800760B8 00072FF8 38 7F 00 14 */ addi r3, r31, 0x14
/* 800760BC 00072FFC 48 00 13 E1 */ bl dBgS_Chk
/* 800760C0 00073000 3C 60 80 3B */ lis r3, lbl_803AB640@ha
@@ -328,7 +328,7 @@ dBgS_Acch_NS_GroundCheckInit:
/* 800762FC 0007323C D0 1F 00 98 */ stfs f0, 0x98(r31)
/* 80076300 00073240 38 7F 00 DC */ addi r3, r31, 0xdc
/* 80076304 00073244 7F E4 FB 78 */ mr r4, r31
/* 80076308 00073248 48 1F 18 B1 */ bl cBgS_Chk_NS_SetExtChk
/* 80076308 00073248 48 1F 18 B1 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk
/* 8007630C 0007324C 80 1F 00 2C */ lwz r0, 0x2c(r31)
/* 80076310 00073250 54 00 DF FE */ rlwinm r0, r0, 0x1b, 0x1f, 0x1f
/* 80076314 00073254 98 1F 00 B4 */ stb r0, 0xb4(r31)
@@ -413,7 +413,7 @@ lbl_80076434:
/* 80076438 00073378 D0 1E 00 94 */ stfs f0, 0x94(r30)
/* 8007643C 0007337C 38 7E 00 DC */ addi r3, r30, 0xdc
/* 80076440 00073380 38 81 00 08 */ addi r4, r1, 8
/* 80076444 00073384 48 1F 18 E5 */ bl cBgS_GndChk_NS_SetPos_X1_
/* 80076444 00073384 48 1F 18 E5 */ bl SetPos__11cBgS_GndChkFPC4cXyz
/* 80076448 00073388 7F E3 FB 78 */ mr r3, r31
/* 8007644C 0007338C 38 9E 00 DC */ addi r4, r30, 0xdc
/* 80076450 00073390 4B FF E0 51 */ bl cBgS_NS_GroundCross
@@ -517,7 +517,7 @@ lbl_8007659C:
/* 800765B8 000734F8 40 82 00 54 */ bne lbl_8007660C
/* 800765BC 000734FC 38 7E 01 40 */ addi r3, r30, 0x140
/* 800765C0 00073500 7F C4 F3 78 */ mr r4, r30
/* 800765C4 00073504 48 1F 15 F5 */ bl cBgS_Chk_NS_SetExtChk
/* 800765C4 00073504 48 1F 15 F5 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk
/* 800765C8 00073508 80 1E 00 2C */ lwz r0, 0x2c(r30)
/* 800765CC 0007350C 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15
/* 800765D0 00073510 90 1E 00 2C */ stw r0, 0x2c(r30)
@@ -582,7 +582,7 @@ dBgS_Acch_NS_LineCheck:
/* 800766AC 000735EC 48 00 02 88 */ b lbl_80076934
lbl_800766B0:
/* 800766B0 000735F0 38 61 00 A4 */ addi r3, r1, 0xa4
/* 800766B4 000735F4 48 1F 16 A9 */ bl cBgS_LinChk
/* 800766B4 000735F4 48 1F 16 A9 */ bl __ct__11cBgS_LinChkFv
/* 800766B8 000735F8 80 7A 00 34 */ lwz r3, 0x34(r26)
/* 800766BC 000735FC C0 03 00 00 */ lfs f0, 0(r3)
/* 800766C0 00073600 D0 01 00 2C */ stfs f0, 0x2c(r1)
@@ -608,7 +608,7 @@ lbl_800766B0:
/* 80076710 00073650 41 82 00 14 */ beq lbl_80076724
/* 80076714 00073654 38 61 00 A4 */ addi r3, r1, 0xa4
/* 80076718 00073658 38 80 FF FF */ li r4, -1
/* 8007671C 0007365C 48 1F 16 A1 */ bl cBgS_LinChk_NS_dtor
/* 8007671C 0007365C 48 1F 16 A1 */ bl __dt__11cBgS_LinChkFv
/* 80076720 00073660 48 00 02 0C */ b lbl_8007692C
lbl_80076724:
/* 80076724 00073664 EC 3F 08 28 */ fsubs f1, f31, f1
@@ -656,10 +656,10 @@ lbl_800767BC:
/* 800767C0 00073700 38 81 00 2C */ addi r4, r1, 0x2c
/* 800767C4 00073704 38 A1 00 20 */ addi r5, r1, 0x20
/* 800767C8 00073708 80 DA 00 08 */ lwz r6, 8(r26)
/* 800767CC 0007370C 48 1F 17 05 */ bl cBgS_LinChk_NS_Set2
/* 800767CC 0007370C 48 1F 17 05 */ bl Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi
/* 800767D0 00073710 38 61 00 A4 */ addi r3, r1, 0xa4
/* 800767D4 00073714 7F 44 D3 78 */ mr r4, r26
/* 800767D8 00073718 48 1F 13 E1 */ bl cBgS_Chk_NS_SetExtChk
/* 800767D8 00073718 48 1F 13 E1 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk
/* 800767DC 0007371C 7F 63 DB 78 */ mr r3, r27
/* 800767E0 00073720 38 81 00 A4 */ addi r4, r1, 0xa4
/* 800767E4 00073724 4B FF DB D1 */ bl cBgS_NS_LineCross
@@ -749,7 +749,7 @@ lbl_80076914:
lbl_80076920:
/* 80076920 00073860 38 61 00 A4 */ addi r3, r1, 0xa4
/* 80076924 00073864 38 80 FF FF */ li r4, -1
/* 80076928 00073868 48 1F 14 95 */ bl cBgS_LinChk_NS_dtor
/* 80076928 00073868 48 1F 14 95 */ bl __dt__11cBgS_LinChkFv
lbl_8007692C:
/* 8007692C 0007386C 3B 9C 00 01 */ addi r28, r28, 1
/* 80076930 00073870 3B 39 00 40 */ addi r25, r25, 0x40
@@ -777,7 +777,7 @@ lbl_80076934:
/* 80076984 000738C4 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80076988 000738C8 41 80 00 F0 */ blt lbl_80076A78
/* 8007698C 000738CC 38 61 00 4C */ addi r3, r1, 0x4c
/* 80076990 000738D0 48 1F 13 CD */ bl cBgS_LinChk
/* 80076990 000738D0 48 1F 13 CD */ bl __ct__11cBgS_LinChkFv
/* 80076994 000738D4 80 7A 00 30 */ lwz r3, 0x30(r26)
/* 80076998 000738D8 C0 43 00 00 */ lfs f2, 0(r3)
/* 8007699C 000738DC D0 41 00 14 */ stfs f2, 0x14(r1)
@@ -794,10 +794,10 @@ lbl_80076934:
/* 800769C8 00073908 38 81 00 14 */ addi r4, r1, 0x14
/* 800769CC 0007390C 38 A1 00 08 */ addi r5, r1, 8
/* 800769D0 00073910 80 DA 00 08 */ lwz r6, 8(r26)
/* 800769D4 00073914 48 1F 14 FD */ bl cBgS_LinChk_NS_Set2
/* 800769D4 00073914 48 1F 14 FD */ bl Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi
/* 800769D8 00073918 38 61 00 4C */ addi r3, r1, 0x4c
/* 800769DC 0007391C 7F 44 D3 78 */ mr r4, r26
/* 800769E0 00073920 48 1F 11 D9 */ bl cBgS_Chk_NS_SetExtChk
/* 800769E0 00073920 48 1F 11 D9 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk
/* 800769E4 00073924 7F 63 DB 78 */ mr r3, r27
/* 800769E8 00073928 38 81 00 4C */ addi r4, r1, 0x4c
/* 800769EC 0007392C 4B FF D9 C9 */ bl cBgS_NS_LineCross
@@ -836,7 +836,7 @@ lbl_80076A4C:
lbl_80076A6C:
/* 80076A6C 000739AC 38 61 00 4C */ addi r3, r1, 0x4c
/* 80076A70 000739B0 38 80 FF FF */ li r4, -1
/* 80076A74 000739B4 48 1F 13 49 */ bl cBgS_LinChk_NS_dtor
/* 80076A74 000739B4 48 1F 13 49 */ bl __dt__11cBgS_LinChkFv
lbl_80076A78:
/* 80076A78 000739B8 38 61 00 FC */ addi r3, r1, 0xfc
/* 80076A7C 000739BC 38 80 FF FF */ li r4, -1
@@ -1029,7 +1029,7 @@ lbl_80076D28:
/* 80076D38 00073C78 40 82 00 90 */ bne lbl_80076DC8
/* 80076D3C 00073C7C 38 7E 01 40 */ addi r3, r30, 0x140
/* 80076D40 00073C80 7F C4 F3 78 */ mr r4, r30
/* 80076D44 00073C84 48 1F 0E 75 */ bl cBgS_Chk_NS_SetExtChk
/* 80076D44 00073C84 48 1F 0E 75 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk
/* 80076D48 00073C88 80 1E 00 2C */ lwz r0, 0x2c(r30)
/* 80076D4C 00073C8C 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15
/* 80076D50 00073C90 90 1E 00 2C */ stw r0, 0x2c(r30)
@@ -1225,7 +1225,7 @@ lbl_80076FE4:
/* 80077000 00073F40 C0 04 00 30 */ lfs f0, 0x30(r4)
/* 80077004 00073F44 EC 63 00 2A */ fadds f3, f3, f0
/* 80077008 00073F48 C0 84 00 34 */ lfs f4, 0x34(r4)
/* 8007700C 00073F4C 48 1F 7F 69 */ bl cM3dGCir_NS_Set
/* 8007700C 00073F4C 48 1F 7F 69 */ bl Set__8cM3dGCirFffff
/* 80077010 00073F50 3B DE 00 01 */ addi r30, r30, 1
/* 80077014 00073F54 3B FF 00 40 */ addi r31, r31, 0x40
lbl_80077018:
@@ -1253,7 +1253,7 @@ dBgS_Acch_NS_CalcWallBmdCyl:
/* 80077060 00073FA0 80 9F 00 30 */ lwz r4, 0x30(r31)
/* 80077064 00073FA4 C0 22 8C C0 */ lfs f1, lbl_804526C0-_SDA2_BASE_(r2)
/* 80077068 00073FA8 FC 40 08 90 */ fmr f2, f1
/* 8007706C 00073FAC 48 1F 81 15 */ bl cM3dGCyl_NS_Set_X1_
/* 8007706C 00073FAC 48 1F 81 15 */ bl Set__8cM3dGCylFRC4cXyzff
/* 80077070 00073FB0 48 00 00 90 */ b lbl_80077100
lbl_80077074:
/* 80077074 00073FB4 4B FF FF 11 */ bl dBgS_Acch_NS_GetWallAllR
@@ -1294,7 +1294,7 @@ lbl_800770CC:
/* 800770F0 00074030 38 7F 00 60 */ addi r3, r31, 0x60
/* 800770F4 00074034 38 81 00 08 */ addi r4, r1, 8
/* 800770F8 00074038 EC 44 18 28 */ fsubs f2, f4, f3
/* 800770FC 0007403C 48 1F 80 85 */ bl cM3dGCyl_NS_Set_X1_
/* 800770FC 0007403C 48 1F 80 85 */ bl Set__8cM3dGCylFRC4cXyzff
lbl_80077100:
/* 80077100 00074040 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80077104 00074044 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -1396,7 +1396,7 @@ lbl_80077228:
lbl_80077230:
/* 80077230 00074170 38 63 00 A0 */ addi r3, r3, 0xa0
/* 80077234 00074174 38 A1 00 08 */ addi r5, r1, 8
/* 80077238 00074178 48 1F 83 9D */ bl cM3dGPla_NS_getCrossYLessD
/* 80077238 00074178 48 1F 83 9D */ bl getCrossYLessD__8cM3dGPlaCFRC3VecPf
/* 8007723C 0007417C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80077240 00074180 41 82 00 24 */ beq lbl_80077264
/* 80077244 00074184 C0 21 00 08 */ lfs f1, 8(r1)
@@ -1438,11 +1438,11 @@ dBgS_Acch_NS_SetWallPolyIndex:
/* 800772B0 000741F0 80 9D 00 78 */ lwz r4, 0x78(r29)
/* 800772B4 000741F4 80 BD 00 7C */ lwz r5, 0x7c(r29)
/* 800772B8 000741F8 80 DD 00 80 */ lwz r6, 0x80(r29)
/* 800772BC 000741FC 48 1F 0E B1 */ bl cBgS_PolyInfo_NS_SetActorInfo
/* 800772BC 000741FC 48 1F 0E B1 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi
/* 800772C0 00074200 80 1D 00 8C */ lwz r0, 0x8c(r29)
/* 800772C4 00074204 7C 60 FA 14 */ add r3, r0, r31
/* 800772C8 00074208 7F C4 F3 78 */ mr r4, r30
/* 800772CC 0007420C 48 1F 0E D9 */ bl cBgS_PolyInfo_NS_SetPolyIndex
/* 800772CC 0007420C 48 1F 0E D9 */ bl SetPolyIndex__13cBgS_PolyInfoFi
/* 800772D0 00074210 39 61 00 20 */ addi r11, r1, 0x20
/* 800772D4 00074214 48 2E AF 55 */ bl _restgpr_29
/* 800772D8 00074218 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -1461,7 +1461,7 @@ dBgS_Acch_NS_CalcMovePosWork:
/* 80077300 00074240 38 7F 00 44 */ addi r3, r31, 0x44
/* 80077304 00074244 80 9F 00 34 */ lwz r4, 0x34(r31)
/* 80077308 00074248 80 BF 00 30 */ lwz r5, 0x30(r31)
/* 8007730C 0007424C 48 1F 7F DD */ bl cM3dGLin_NS_SetStartEnd
/* 8007730C 0007424C 48 1F 7F DD */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz
/* 80077310 00074250 7F E3 FB 78 */ mr r3, r31
/* 80077314 00074254 4B FF FD 29 */ bl dBgS_Acch_NS_CalcWallBmdCyl
/* 80077318 00074258 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -1571,10 +1571,10 @@ dBgS_AcchCir_NS_dtor:
/* 8007743C 0007437C 90 1E 00 0C */ stw r0, 0xc(r30)
/* 80077440 00074380 38 7E 00 14 */ addi r3, r30, 0x14
/* 80077444 00074384 38 80 FF FF */ li r4, -1
/* 80077448 00074388 48 1F 7A D1 */ bl cM3dGCir_NS_dtor
/* 80077448 00074388 48 1F 7A D1 */ bl __dt__8cM3dGCirFv
/* 8007744C 0007438C 7F C3 F3 78 */ mr r3, r30
/* 80077450 00074390 38 80 00 00 */ li r4, 0
/* 80077454 00074394 48 1F 0C 5D */ bl cBgS_PolyInfo_NS_dtor
/* 80077454 00074394 48 1F 0C 5D */ bl __dt__13cBgS_PolyInfoFv
/* 80077458 00074398 7F E0 07 35 */ extsh. r0, r31
/* 8007745C 0007439C 40 81 00 0C */ ble lbl_80077468
/* 80077460 000743A0 7F C3 F3 78 */ mr r3, r30
asm/d/bg/s/gnd/d_bg_s_gnd_chk.s
+2 -2
View File
@@ -10,7 +10,7 @@ dBgS_GndChk:
/* 80077584 000744C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80077588 000744C8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8007758C 000744CC 7C 7F 1B 78 */ mr r31, r3
/* 80077590 000744D0 48 1F 06 8D */ bl cBgS_GndChk
/* 80077590 000744D0 48 1F 06 8D */ bl __ct__11cBgS_GndChkFv
/* 80077594 000744D4 38 7F 00 3C */ addi r3, r31, 0x3c
/* 80077598 000744D8 4B FF FF 05 */ bl dBgS_Chk
/* 8007759C 000744DC 3C 60 80 3B */ lis r3, lbl_803AB778@ha
@@ -59,7 +59,7 @@ dBgS_GndChk_NS_dtor:
/* 8007763C 0007457C 4B FF FE AD */ bl dBgS_Chk_NS_dtor
/* 80077640 00074580 7F C3 F3 78 */ mr r3, r30
/* 80077644 00074584 38 80 00 00 */ li r4, 0
/* 80077648 00074588 48 1F 06 4D */ bl cBgS_GndChk_NS_dtor
/* 80077648 00074588 48 1F 06 4D */ bl __dt__11cBgS_GndChkFv
/* 8007764C 0007458C 7F E0 07 35 */ extsh. r0, r31
/* 80077650 00074590 40 81 00 0C */ ble lbl_8007765C
/* 80077654 00074594 7F C3 F3 78 */ mr r3, r30
asm/d/bg/s/lin/d_bg_s_lin_chk.s
+3 -3
View File
@@ -10,7 +10,7 @@ dBgS_LinChk:
/* 80077C70 00074BB0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80077C74 00074BB4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80077C78 00074BB8 7C 7F 1B 78 */ mr r31, r3
/* 80077C7C 00074BBC 48 1F 00 E1 */ bl cBgS_LinChk
/* 80077C7C 00074BBC 48 1F 00 E1 */ bl __ct__11cBgS_LinChkFv
/* 80077C80 00074BC0 38 7F 00 58 */ addi r3, r31, 0x58
/* 80077C84 00074BC4 4B FF F8 19 */ bl dBgS_Chk
/* 80077C88 00074BC8 3C 60 80 3B */ lis r3, lbl_803AB970@ha
@@ -59,7 +59,7 @@ dBgS_LinChk_NS_dtor:
/* 80077D28 00074C68 4B FF F7 C1 */ bl dBgS_Chk_NS_dtor
/* 80077D2C 00074C6C 7F C3 F3 78 */ mr r3, r30
/* 80077D30 00074C70 38 80 00 00 */ li r4, 0
/* 80077D34 00074C74 48 1F 00 89 */ bl cBgS_LinChk_NS_dtor
/* 80077D34 00074C74 48 1F 00 89 */ bl __dt__11cBgS_LinChkFv
/* 80077D38 00074C78 7F E0 07 35 */ extsh. r0, r31
/* 80077D3C 00074C7C 40 81 00 0C */ ble lbl_80077D48
/* 80077D40 00074C80 7F C3 F3 78 */ mr r3, r30
@@ -89,7 +89,7 @@ lbl_80077D84:
lbl_80077D8C:
/* 80077D8C 00074CCC 38 C0 FF FF */ li r6, -1
lbl_80077D90:
/* 80077D90 00074CD0 48 1F 01 41 */ bl cBgS_LinChk_NS_Set2
/* 80077D90 00074CD0 48 1F 01 41 */ bl Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi
/* 80077D94 00074CD4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80077D98 00074CD8 7C 08 03 A6 */ mtlr r0
/* 80077D9C 00074CDC 38 21 00 10 */ addi r1, r1, 0x10
asm/d/bg/s/roof/d_bg_s_roof_chk.s
+5 -5
View File
@@ -10,9 +10,9 @@ dBgS_RoofChk:
/* 80078FFC 00075F3C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80079000 00075F40 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80079004 00075F44 7C 7F 1B 78 */ mr r31, r3
/* 80079008 00075F48 48 1E F0 6D */ bl cBgS_PolyInfo_NS_ctor
/* 80079008 00075F48 48 1E F0 6D */ bl __ct__13cBgS_PolyInfoFv
/* 8007900C 00075F4C 38 7F 00 10 */ addi r3, r31, 0x10
/* 80079010 00075F50 48 1E EB 3D */ bl cBgS_Chk
/* 80079010 00075F50 48 1E EB 3D */ bl __ct__8cBgS_ChkFv
/* 80079014 00075F54 38 7F 00 24 */ addi r3, r31, 0x24
/* 80079018 00075F58 4B FF E4 85 */ bl dBgS_Chk
/* 8007901C 00075F5C 3C 60 80 3B */ lis r3, lbl_803ABA50@ha
@@ -69,10 +69,10 @@ dBgS_RoofChk_NS_dtor:
/* 800790DC 0007601C 4B FF E4 0D */ bl dBgS_Chk_NS_dtor
/* 800790E0 00076020 38 7E 00 10 */ addi r3, r30, 0x10
/* 800790E4 00076024 38 80 00 00 */ li r4, 0
/* 800790E8 00076028 48 1E EA 89 */ bl cBgS_Chk_NS_dtor
/* 800790E8 00076028 48 1E EA 89 */ bl __dt__8cBgS_ChkFv
/* 800790EC 0007602C 7F C3 F3 78 */ mr r3, r30
/* 800790F0 00076030 38 80 00 00 */ li r4, 0
/* 800790F4 00076034 48 1E EF BD */ bl cBgS_PolyInfo_NS_dtor
/* 800790F4 00076034 48 1E EF BD */ bl __dt__13cBgS_PolyInfoFv
/* 800790F8 00076038 7F E0 07 35 */ extsh. r0, r31
/* 800790FC 0007603C 40 81 00 0C */ ble lbl_80079108
/* 80079100 00076040 7F C3 F3 78 */ mr r3, r30
@@ -93,7 +93,7 @@ dBgS_RoofChk_NS_Init:
/* 8007912C 0007606C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80079130 00076070 C0 02 8C F4 */ lfs f0, lbl_804526F4-_SDA2_BASE_(r2)
/* 80079134 00076074 D0 03 00 4C */ stfs f0, 0x4c(r3)
/* 80079138 00076078 48 1E EF E9 */ bl cBgS_PolyInfo_NS_ClearPi
/* 80079138 00076078 48 1E EF E9 */ bl ClearPi__13cBgS_PolyInfoFv
/* 8007913C 0007607C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80079140 00076080 7C 08 03 A6 */ mtlr r0
/* 80079144 00076084 38 21 00 10 */ addi r1, r1, 0x10
asm/d/bg/s/sph/d_bg_s_sph_chk.s
+5 -5
View File
@@ -14,9 +14,9 @@ dBgS_SphChk:
/* 80078A2C 0007596C 38 03 79 04 */ addi r0, r3, lbl_803A7904@l
/* 80078A30 00075970 90 1F 00 10 */ stw r0, 0x10(r31)
/* 80078A34 00075974 38 7F 00 14 */ addi r3, r31, 0x14
/* 80078A38 00075978 48 1E F6 3D */ bl cBgS_PolyInfo_NS_ctor
/* 80078A38 00075978 48 1E F6 3D */ bl __ct__13cBgS_PolyInfoFv
/* 80078A3C 0007597C 38 7F 00 24 */ addi r3, r31, 0x24
/* 80078A40 00075980 48 1E F1 0D */ bl cBgS_Chk
/* 80078A40 00075980 48 1E F1 0D */ bl __ct__8cBgS_ChkFv
/* 80078A44 00075984 38 7F 00 38 */ addi r3, r31, 0x38
/* 80078A48 00075988 4B FF EA 55 */ bl dBgS_Chk
/* 80078A4C 0007598C 3C 60 80 3B */ lis r3, lbl_803AB9C8@ha
@@ -39,7 +39,7 @@ dBgS_SphChk:
/* 80078A90 000759D0 38 00 FF FF */ li r0, -1
/* 80078A94 000759D4 90 1F 00 2C */ stw r0, 0x2c(r31)
/* 80078A98 000759D8 38 7F 00 14 */ addi r3, r31, 0x14
/* 80078A9C 000759DC 48 1E F6 85 */ bl cBgS_PolyInfo_NS_ClearPi
/* 80078A9C 000759DC 48 1E F6 85 */ bl ClearPi__13cBgS_PolyInfoFv
/* 80078AA0 000759E0 38 00 00 00 */ li r0, 0
/* 80078AA4 000759E4 90 1F 00 50 */ stw r0, 0x50(r31)
/* 80078AA8 000759E8 7F E3 FB 78 */ mr r3, r31
@@ -75,10 +75,10 @@ dBgS_SphChk_NS_dtor:
/* 80078B14 00075A54 4B FF E9 D5 */ bl dBgS_Chk_NS_dtor
/* 80078B18 00075A58 38 7E 00 24 */ addi r3, r30, 0x24
/* 80078B1C 00075A5C 38 80 00 00 */ li r4, 0
/* 80078B20 00075A60 48 1E F0 51 */ bl cBgS_Chk_NS_dtor
/* 80078B20 00075A60 48 1E F0 51 */ bl __dt__8cBgS_ChkFv
/* 80078B24 00075A64 38 7E 00 14 */ addi r3, r30, 0x14
/* 80078B28 00075A68 38 80 00 00 */ li r4, 0
/* 80078B2C 00075A6C 48 1E F5 85 */ bl cBgS_PolyInfo_NS_dtor
/* 80078B2C 00075A6C 48 1E F5 85 */ bl __dt__13cBgS_PolyInfoFv
/* 80078B30 00075A70 28 1E 00 00 */ cmplwi r30, 0
/* 80078B34 00075A74 41 82 00 10 */ beq lbl_80078B44
/* 80078B38 00075A78 3C 60 80 3A */ lis r3, lbl_803A7904@ha
asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s
+5 -5
View File
@@ -21,9 +21,9 @@ dBgS_SplGrpChk:
/* 80078BB8 00075AF8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80078BBC 00075AFC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80078BC0 00075B00 7C 7F 1B 78 */ mr r31, r3
/* 80078BC4 00075B04 48 1E F4 B1 */ bl cBgS_PolyInfo_NS_ctor
/* 80078BC4 00075B04 48 1E F4 B1 */ bl __ct__13cBgS_PolyInfoFv
/* 80078BC8 00075B08 38 7F 00 10 */ addi r3, r31, 0x10
/* 80078BCC 00075B0C 48 1E EF 81 */ bl cBgS_Chk
/* 80078BCC 00075B0C 48 1E EF 81 */ bl __ct__8cBgS_ChkFv
/* 80078BD0 00075B10 38 7F 00 24 */ addi r3, r31, 0x24
/* 80078BD4 00075B14 4B FF E8 C9 */ bl dBgS_Chk
/* 80078BD8 00075B18 3C 60 80 3B */ lis r3, lbl_803ABA08@ha
@@ -91,10 +91,10 @@ dBgS_SplGrpChk_NS_dtor:
/* 80078CC4 00075C04 4B FF E8 25 */ bl dBgS_Chk_NS_dtor
/* 80078CC8 00075C08 38 7E 00 10 */ addi r3, r30, 0x10
/* 80078CCC 00075C0C 38 80 00 00 */ li r4, 0
/* 80078CD0 00075C10 48 1E EE A1 */ bl cBgS_Chk_NS_dtor
/* 80078CD0 00075C10 48 1E EE A1 */ bl __dt__8cBgS_ChkFv
/* 80078CD4 00075C14 7F C3 F3 78 */ mr r3, r30
/* 80078CD8 00075C18 38 80 00 00 */ li r4, 0
/* 80078CDC 00075C1C 48 1E F3 D5 */ bl cBgS_PolyInfo_NS_dtor
/* 80078CDC 00075C1C 48 1E F3 D5 */ bl __dt__13cBgS_PolyInfoFv
/* 80078CE0 00075C20 7F E0 07 35 */ extsh. r0, r31
/* 80078CE4 00075C24 40 81 00 0C */ ble lbl_80078CF0
/* 80078CE8 00075C28 7F C3 F3 78 */ mr r3, r30
@@ -121,7 +121,7 @@ dBgS_SplGrpChk_NS_Init:
/* 80078D2C 00075C6C 90 03 00 50 */ stw r0, 0x50(r3)
/* 80078D30 00075C70 C0 03 00 40 */ lfs f0, 0x40(r3)
/* 80078D34 00075C74 D0 03 00 4C */ stfs f0, 0x4c(r3)
/* 80078D38 00075C78 48 1E F3 E9 */ bl cBgS_PolyInfo_NS_ClearPi
/* 80078D38 00075C78 48 1E F3 E9 */ bl ClearPi__13cBgS_PolyInfoFv
/* 80078D3C 00075C7C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80078D40 00075C80 7C 08 03 A6 */ mtlr r0
/* 80078D44 00075C84 38 21 00 10 */ addi r1, r1, 0x10
asm/d/bg/w/d_bg_w_kcol.s
+27 -27
View File
@@ -158,7 +158,7 @@ dBgWKCol_NS_GetTriPla_X1_:
/* 8007E928 0007B868 38 61 00 0C */ addi r3, r1, 0xc
/* 8007E92C 0007B86C 80 81 00 08 */ lwz r4, 8(r1)
/* 8007E930 0007B870 7F E5 FB 78 */ mr r5, r31
/* 8007E934 0007B874 48 1F 0B F9 */ bl cM3dGPla_NS_SetupNP
/* 8007E934 0007B874 48 1F 0B F9 */ bl SetupNP__8cM3dGPlaFRC3VecRC3Vec
/* 8007E938 0007B878 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 8007E93C 0007B87C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
/* 8007E940 0007B880 90 1D 00 10 */ stw r0, 0x10(r29)
@@ -1007,7 +1007,7 @@ lbl_8007F4D0:
/* 8007F55C 0007C49C D0 01 00 88 */ stfs f0, 0x88(r1)
/* 8007F560 0007C4A0 38 70 00 14 */ addi r3, r16, 0x14
/* 8007F564 0007C4A4 A0 92 00 00 */ lhz r4, 0(r18)
/* 8007F568 0007C4A8 48 1E 8C 3D */ bl cBgS_PolyInfo_NS_SetPolyIndex
/* 8007F568 0007C4A8 48 1E 8C 3D */ bl SetPolyIndex__13cBgS_PolyInfoFi
lbl_8007F56C:
/* 8007F56C 0007C4AC A4 12 00 02 */ lhzu r0, 2(r18)
/* 8007F570 0007C4B0 28 00 00 00 */ cmplwi r0, 0
@@ -1265,7 +1265,7 @@ lbl_8007F7DC:
/* 8007F924 0007C864 40 81 00 2C */ ble lbl_8007F950
/* 8007F928 0007C868 38 7F 00 14 */ addi r3, r31, 0x14
/* 8007F92C 0007C86C A0 95 00 00 */ lhz r4, 0(r21)
/* 8007F930 0007C870 48 1E 88 75 */ bl cBgS_PolyInfo_NS_SetPolyIndex
/* 8007F930 0007C870 48 1E 88 75 */ bl SetPolyIndex__13cBgS_PolyInfoFi
/* 8007F934 0007C874 D3 DF 00 34 */ stfs f30, 0x34(r31)
/* 8007F938 0007C878 3B 00 00 01 */ li r24, 1
/* 8007F93C 0007C87C 80 7E 00 18 */ lwz r3, 0x18(r30)
@@ -1981,7 +1981,7 @@ lbl_80080310:
/* 8008039C 0007D2DC 38 7F 00 60 */ addi r3, r31, 0x60
/* 800803A0 0007D2E0 38 81 00 88 */ addi r4, r1, 0x88
/* 800803A4 0007D2E4 38 A1 00 7C */ addi r5, r1, 0x7c
/* 800803A8 0007D2E8 48 1E EE A5 */ bl cM3dGCyl_NS_calcMinMax
/* 800803A8 0007D2E8 48 1E EE A5 */ bl calcMinMax__8cM3dGCylFP4cXyzP4cXyz
/* 800803AC 0007D2EC C0 01 00 88 */ lfs f0, 0x88(r1)
/* 800803B0 0007D2F0 C0 22 8D 20 */ lfs f1, lbl_80452720-_SDA2_BASE_(r2)
/* 800803B4 0007D2F4 EC 00 08 28 */ fsubs f0, f0, f1
@@ -2646,7 +2646,7 @@ lbl_80080D0C:
/* 80080D40 0007DC80 38 61 00 20 */ addi r3, r1, 0x20
/* 80080D44 0007DC84 38 81 00 1C */ addi r4, r1, 0x1c
/* 80080D48 0007DC88 38 A1 00 24 */ addi r5, r1, 0x24
/* 80080D4C 0007DC8C 48 1E 78 E1 */ bl cM3d_Len2dSqPntAndSegLine
/* 80080D4C 0007DC8C 48 1E 78 E1 */ bl cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf
/* 80080D50 0007DC90 C0 01 00 20 */ lfs f0, 0x20(r1)
/* 80080D54 0007DC94 80 9F 00 30 */ lwz r4, 0x30(r31)
/* 80080D58 0007DC98 C0 64 00 00 */ lfs f3, 0(r4)
@@ -2773,7 +2773,7 @@ lbl_80080EBC:
/* 80080F14 0007DE54 4B FF 63 75 */ bl dBgS_Acch_NS_SetWallPolyIndex
/* 80080F18 0007DE58 C0 30 00 00 */ lfs f1, 0(r16)
/* 80080F1C 0007DE5C C0 50 00 08 */ lfs f2, 8(r16)
/* 80080F20 0007DE60 48 1E 67 55 */ bl cM_atan2s
/* 80080F20 0007DE60 48 1E 67 55 */ bl cM_atan2s__Fff
/* 80080F24 0007DE64 80 9F 00 8C */ lwz r4, 0x8c(r31)
/* 80080F28 0007DE68 38 12 00 3C */ addi r0, r18, 0x3c
/* 80080F2C 0007DE6C 7C 64 03 2E */ sthx r3, r4, r0
@@ -2787,14 +2787,14 @@ lbl_80080F3C:
/* 80080F48 0007DE88 EF 18 28 28 */ fsubs f24, f24, f5
/* 80080F4C 0007DE8C FC 20 D8 90 */ fmr f1, f27
/* 80080F50 0007DE90 FC 40 D0 90 */ fmr f2, f26
/* 80080F54 0007DE94 48 1E 76 C1 */ bl cM3d_Len2dSq
/* 80080F54 0007DE94 48 1E 76 C1 */ bl cM3d_Len2dSq__Fffff
/* 80080F58 0007DE98 FE E0 08 90 */ fmr f23, f1
/* 80080F5C 0007DE9C 80 7F 00 30 */ lwz r3, 0x30(r31)
/* 80080F60 0007DEA0 FC 20 C8 90 */ fmr f1, f25
/* 80080F64 0007DEA4 FC 40 C0 90 */ fmr f2, f24
/* 80080F68 0007DEA8 C0 63 00 00 */ lfs f3, 0(r3)
/* 80080F6C 0007DEAC C0 83 00 08 */ lfs f4, 8(r3)
/* 80080F70 0007DEB0 48 1E 76 A5 */ bl cM3d_Len2dSq
/* 80080F70 0007DEB0 48 1E 76 A5 */ bl cM3d_Len2dSq__Fffff
/* 80080F74 0007DEB4 C0 10 00 00 */ lfs f0, 0(r16)
/* 80080F78 0007DEB8 FC 60 00 50 */ fneg f3, f0
/* 80080F7C 0007DEBC C0 10 00 08 */ lfs f0, 8(r16)
@@ -2816,7 +2816,7 @@ lbl_80080F3C:
/* 80080FBC 0007DEFC FC 40 D0 90 */ fmr f2, f26
/* 80080FC0 0007DF00 38 81 00 18 */ addi r4, r1, 0x18
/* 80080FC4 0007DF04 38 A1 00 14 */ addi r5, r1, 0x14
/* 80080FC8 0007DF08 48 1E 72 99 */ bl cM2d_CrossCirLin
/* 80080FC8 0007DF08 48 1E 72 99 */ bl cM2d_CrossCirLin__FR8cM2dGCirffffPfPf
/* 80080FCC 0007DF0C 80 7F 00 30 */ lwz r3, 0x30(r31)
/* 80080FD0 0007DF10 C0 23 00 00 */ lfs f1, 0(r3)
/* 80080FD4 0007DF14 C0 01 00 18 */ lfs f0, 0x18(r1)
@@ -2842,7 +2842,7 @@ lbl_80080F3C:
/* 80081024 0007DF64 4B FF 62 65 */ bl dBgS_Acch_NS_SetWallPolyIndex
/* 80081028 0007DF68 C0 30 00 00 */ lfs f1, 0(r16)
/* 8008102C 0007DF6C C0 50 00 08 */ lfs f2, 8(r16)
/* 80081030 0007DF70 48 1E 66 45 */ bl cM_atan2s
/* 80081030 0007DF70 48 1E 66 45 */ bl cM_atan2s__Fff
/* 80081034 0007DF74 80 9F 00 8C */ lwz r4, 0x8c(r31)
/* 80081038 0007DF78 38 12 00 3C */ addi r0, r18, 0x3c
/* 8008103C 0007DF7C 7C 64 03 2E */ sthx r3, r4, r0
@@ -2868,7 +2868,7 @@ lbl_80081058:
/* 80081088 0007DFC8 FC 40 C0 90 */ fmr f2, f24
/* 8008108C 0007DFCC 38 81 00 10 */ addi r4, r1, 0x10
/* 80081090 0007DFD0 38 A1 00 0C */ addi r5, r1, 0xc
/* 80081094 0007DFD4 48 1E 71 CD */ bl cM2d_CrossCirLin
/* 80081094 0007DFD4 48 1E 71 CD */ bl cM2d_CrossCirLin__FR8cM2dGCirffffPfPf
/* 80081098 0007DFD8 80 7F 00 30 */ lwz r3, 0x30(r31)
/* 8008109C 0007DFDC C0 23 00 00 */ lfs f1, 0(r3)
/* 800810A0 0007DFE0 C0 01 00 10 */ lfs f0, 0x10(r1)
@@ -2894,7 +2894,7 @@ lbl_80081058:
/* 800810F0 0007E030 4B FF 61 99 */ bl dBgS_Acch_NS_SetWallPolyIndex
/* 800810F4 0007E034 C0 30 00 00 */ lfs f1, 0(r16)
/* 800810F8 0007E038 C0 50 00 08 */ lfs f2, 8(r16)
/* 800810FC 0007E03C 48 1E 65 79 */ bl cM_atan2s
/* 800810FC 0007E03C 48 1E 65 79 */ bl cM_atan2s__Fff
/* 80081100 0007E040 80 9F 00 8C */ lwz r4, 0x8c(r31)
/* 80081104 0007E044 38 12 00 3C */ addi r0, r18, 0x3c
/* 80081108 0007E048 7C 64 03 2E */ sthx r3, r4, r0
@@ -2968,7 +2968,7 @@ lbl_80081140:
/* 80081204 0007E144 38 70 00 60 */ addi r3, r16, 0x60
/* 80081208 0007E148 38 81 00 7C */ addi r4, r1, 0x7c
/* 8008120C 0007E14C 38 A1 00 70 */ addi r5, r1, 0x70
/* 80081210 0007E150 48 1E E0 3D */ bl cM3dGCyl_NS_calcMinMax
/* 80081210 0007E150 48 1E E0 3D */ bl calcMinMax__8cM3dGCylFP4cXyzP4cXyz
/* 80081214 0007E154 C0 01 00 7C */ lfs f0, 0x7c(r1)
/* 80081218 0007E158 C0 22 8D 20 */ lfs f1, lbl_80452720-_SDA2_BASE_(r2)
/* 8008121C 0007E15C EC 00 08 28 */ fsubs f0, f0, f1
@@ -3485,7 +3485,7 @@ lbl_80081948:
/* 8008197C 0007E8BC 38 61 00 20 */ addi r3, r1, 0x20
/* 80081980 0007E8C0 38 81 00 1C */ addi r4, r1, 0x1c
/* 80081984 0007E8C4 38 A1 00 24 */ addi r5, r1, 0x24
/* 80081988 0007E8C8 48 1E 6C A5 */ bl cM3d_Len2dSqPntAndSegLine
/* 80081988 0007E8C8 48 1E 6C A5 */ bl cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf
/* 8008198C 0007E8CC C0 01 00 20 */ lfs f0, 0x20(r1)
/* 80081990 0007E8D0 80 90 00 30 */ lwz r4, 0x30(r16)
/* 80081994 0007E8D4 C0 64 00 00 */ lfs f3, 0(r4)
@@ -3612,7 +3612,7 @@ lbl_80081AF8:
/* 80081B50 0007EA90 4B FF 57 39 */ bl dBgS_Acch_NS_SetWallPolyIndex
/* 80081B54 0007EA94 C0 32 00 00 */ lfs f1, 0(r18)
/* 80081B58 0007EA98 C0 52 00 08 */ lfs f2, 8(r18)
/* 80081B5C 0007EA9C 48 1E 5B 19 */ bl cM_atan2s
/* 80081B5C 0007EA9C 48 1E 5B 19 */ bl cM_atan2s__Fff
/* 80081B60 0007EAA0 80 90 00 8C */ lwz r4, 0x8c(r16)
/* 80081B64 0007EAA4 38 1F 00 3C */ addi r0, r31, 0x3c
/* 80081B68 0007EAA8 7C 64 03 2E */ sthx r3, r4, r0
@@ -3626,14 +3626,14 @@ lbl_80081B78:
/* 80081B84 0007EAC4 EF 39 28 28 */ fsubs f25, f25, f5
/* 80081B88 0007EAC8 FC 20 E0 90 */ fmr f1, f28
/* 80081B8C 0007EACC FC 40 D8 90 */ fmr f2, f27
/* 80081B90 0007EAD0 48 1E 6A 85 */ bl cM3d_Len2dSq
/* 80081B90 0007EAD0 48 1E 6A 85 */ bl cM3d_Len2dSq__Fffff
/* 80081B94 0007EAD4 FF 00 08 90 */ fmr f24, f1
/* 80081B98 0007EAD8 80 70 00 30 */ lwz r3, 0x30(r16)
/* 80081B9C 0007EADC FC 20 D0 90 */ fmr f1, f26
/* 80081BA0 0007EAE0 FC 40 C8 90 */ fmr f2, f25
/* 80081BA4 0007EAE4 C0 63 00 00 */ lfs f3, 0(r3)
/* 80081BA8 0007EAE8 C0 83 00 08 */ lfs f4, 8(r3)
/* 80081BAC 0007EAEC 48 1E 6A 69 */ bl cM3d_Len2dSq
/* 80081BAC 0007EAEC 48 1E 6A 69 */ bl cM3d_Len2dSq__Fffff
/* 80081BB0 0007EAF0 C0 12 00 00 */ lfs f0, 0(r18)
/* 80081BB4 0007EAF4 FC 60 00 50 */ fneg f3, f0
/* 80081BB8 0007EAF8 C0 12 00 08 */ lfs f0, 8(r18)
@@ -3655,7 +3655,7 @@ lbl_80081B78:
/* 80081BF8 0007EB38 FC 40 D8 90 */ fmr f2, f27
/* 80081BFC 0007EB3C 38 81 00 18 */ addi r4, r1, 0x18
/* 80081C00 0007EB40 38 A1 00 14 */ addi r5, r1, 0x14
/* 80081C04 0007EB44 48 1E 66 5D */ bl cM2d_CrossCirLin
/* 80081C04 0007EB44 48 1E 66 5D */ bl cM2d_CrossCirLin__FR8cM2dGCirffffPfPf
/* 80081C08 0007EB48 80 70 00 30 */ lwz r3, 0x30(r16)
/* 80081C0C 0007EB4C C0 23 00 00 */ lfs f1, 0(r3)
/* 80081C10 0007EB50 C0 01 00 18 */ lfs f0, 0x18(r1)
@@ -3681,7 +3681,7 @@ lbl_80081B78:
/* 80081C60 0007EBA0 4B FF 56 29 */ bl dBgS_Acch_NS_SetWallPolyIndex
/* 80081C64 0007EBA4 C0 32 00 00 */ lfs f1, 0(r18)
/* 80081C68 0007EBA8 C0 52 00 08 */ lfs f2, 8(r18)
/* 80081C6C 0007EBAC 48 1E 5A 09 */ bl cM_atan2s
/* 80081C6C 0007EBAC 48 1E 5A 09 */ bl cM_atan2s__Fff
/* 80081C70 0007EBB0 80 90 00 8C */ lwz r4, 0x8c(r16)
/* 80081C74 0007EBB4 38 1F 00 3C */ addi r0, r31, 0x3c
/* 80081C78 0007EBB8 7C 64 03 2E */ sthx r3, r4, r0
@@ -3707,7 +3707,7 @@ lbl_80081C94:
/* 80081CC4 0007EC04 FC 40 C8 90 */ fmr f2, f25
/* 80081CC8 0007EC08 38 81 00 10 */ addi r4, r1, 0x10
/* 80081CCC 0007EC0C 38 A1 00 0C */ addi r5, r1, 0xc
/* 80081CD0 0007EC10 48 1E 65 91 */ bl cM2d_CrossCirLin
/* 80081CD0 0007EC10 48 1E 65 91 */ bl cM2d_CrossCirLin__FR8cM2dGCirffffPfPf
/* 80081CD4 0007EC14 80 70 00 30 */ lwz r3, 0x30(r16)
/* 80081CD8 0007EC18 C0 23 00 00 */ lfs f1, 0(r3)
/* 80081CDC 0007EC1C C0 01 00 10 */ lfs f0, 0x10(r1)
@@ -3733,7 +3733,7 @@ lbl_80081C94:
/* 80081D2C 0007EC6C 4B FF 55 5D */ bl dBgS_Acch_NS_SetWallPolyIndex
/* 80081D30 0007EC70 C0 32 00 00 */ lfs f1, 0(r18)
/* 80081D34 0007EC74 C0 52 00 08 */ lfs f2, 8(r18)
/* 80081D38 0007EC78 48 1E 59 3D */ bl cM_atan2s
/* 80081D38 0007EC78 48 1E 59 3D */ bl cM_atan2s__Fff
/* 80081D3C 0007EC7C 80 90 00 8C */ lwz r4, 0x8c(r16)
/* 80081D40 0007EC80 38 1F 00 3C */ addi r0, r31, 0x3c
/* 80081D44 0007EC84 7C 64 03 2E */ sthx r3, r4, r0
@@ -3995,7 +3995,7 @@ lbl_80081F64:
/* 80082108 0007F048 40 80 00 2C */ bge lbl_80082134
/* 8008210C 0007F04C 7F E3 FB 78 */ mr r3, r31
/* 80082110 0007F050 A0 95 00 00 */ lhz r4, 0(r21)
/* 80082114 0007F054 48 1E 60 91 */ bl cBgS_PolyInfo_NS_SetPolyIndex
/* 80082114 0007F054 48 1E 60 91 */ bl SetPolyIndex__13cBgS_PolyInfoFi
/* 80082118 0007F058 D3 FF 00 4C */ stfs f31, 0x4c(r31)
/* 8008211C 0007F05C 3B 00 00 01 */ li r24, 1
/* 80082120 0007F060 80 7E 00 18 */ lwz r3, 0x18(r30)
@@ -4233,7 +4233,7 @@ lbl_800822F0:
/* 8008248C 0007F3CC D0 3F 00 4C */ stfs f1, 0x4c(r31)
/* 80082490 0007F3D0 7F E3 FB 78 */ mr r3, r31
/* 80082494 0007F3D4 A0 95 00 00 */ lhz r4, 0(r21)
/* 80082498 0007F3D8 48 1E 5D 0D */ bl cBgS_PolyInfo_NS_SetPolyIndex
/* 80082498 0007F3D8 48 1E 5D 0D */ bl SetPolyIndex__13cBgS_PolyInfoFi
/* 8008249C 0007F3DC 3A E0 00 01 */ li r23, 1
lbl_800824A0:
/* 800824A0 0007F3E0 A4 15 00 02 */ lhzu r0, 2(r21)
@@ -4267,7 +4267,7 @@ lbl_800824CC:
/* 8008250C 0007F44C 7E 03 83 78 */ mr r3, r16
/* 80082510 0007F450 38 81 00 48 */ addi r4, r1, 0x48
/* 80082514 0007F454 38 A1 00 3C */ addi r5, r1, 0x3c
/* 80082518 0007F458 48 1E D2 55 */ bl cM3dGSph_NS_GetMinMaxCube
/* 80082518 0007F458 48 1E D2 55 */ bl GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz
/* 8008251C 0007F45C 38 61 00 48 */ addi r3, r1, 0x48
/* 80082520 0007F460 80 8F 00 18 */ lwz r4, 0x18(r15)
/* 80082524 0007F464 38 84 00 14 */ addi r4, r4, 0x14
@@ -4498,11 +4498,11 @@ lbl_80082854:
/* 8008285C 0007F79C 38 A1 00 18 */ addi r5, r1, 0x18
/* 80082860 0007F7A0 38 C1 00 0C */ addi r6, r1, 0xc
/* 80082864 0007F7A4 7E 27 8B 78 */ mr r7, r17
/* 80082868 0007F7A8 48 1E D0 61 */ bl cM3dGTri_NS_set
/* 80082868 0007F7A8 48 1E D0 61 */ bl set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec
/* 8008286C 0007F7AC 7E 03 83 78 */ mr r3, r16
/* 80082870 0007F7B0 38 81 00 7C */ addi r4, r1, 0x7c
/* 80082874 0007F7B4 38 A0 00 00 */ li r5, 0
/* 80082878 0007F7B8 48 1E 96 8D */ bl cM3d_Cross_SphTri
/* 80082878 0007F7B8 48 1E 96 8D */ bl cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec
/* 8008287C 0007F7BC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80082880 0007F7C0 41 82 00 C0 */ beq lbl_80082940
/* 80082884 0007F7C4 C0 01 00 24 */ lfs f0, 0x24(r1)
@@ -4547,7 +4547,7 @@ lbl_80082854:
/* 80082920 0007F860 4E 80 04 21 */ bctrl
/* 80082924 0007F864 38 70 00 14 */ addi r3, r16, 0x14
/* 80082928 0007F868 A0 92 00 00 */ lhz r4, 0(r18)
/* 8008292C 0007F86C 48 1E 58 79 */ bl cBgS_PolyInfo_NS_SetPolyIndex
/* 8008292C 0007F86C 48 1E 58 79 */ bl SetPolyIndex__13cBgS_PolyInfoFi
/* 80082930 0007F870 3A C0 00 01 */ li r22, 1
/* 80082934 0007F874 3C 60 80 3A */ lis r3, lbl_803A37C0@ha
/* 80082938 0007F878 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l
asm/d/cam/d_cam_param.s
+4 -4
View File
@@ -105,14 +105,14 @@ dCamMath_NS_zoomFovy:
/* 80088294 000851D4 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0
/* 80088298 000851D8 FF E0 10 90 */ fmr f31, f2
/* 8008829C 000851DC 38 61 00 08 */ addi r3, r1, 8
/* 800882A0 000851E0 48 1E 90 AD */ bl cDegree
/* 800882A0 000851E0 48 1E 90 AD */ bl __ct__7cDegreeFf
/* 800882A4 000851E4 38 61 00 08 */ addi r3, r1, 8
/* 800882A8 000851E8 48 1E 91 71 */ bl cDegree_NS_Cos
/* 800882A8 000851E8 48 1E 91 71 */ bl Cos__7cDegreeCFv
/* 800882AC 000851EC EF FF 00 72 */ fmuls f31, f31, f1
/* 800882B0 000851F0 38 61 00 08 */ addi r3, r1, 8
/* 800882B4 000851F4 48 1E 91 3D */ bl cDegree_NS_Sin
/* 800882B4 000851F4 48 1E 91 3D */ bl Sin__7cDegreeCFv
/* 800882B8 000851F8 FC 40 F8 90 */ fmr f2, f31
/* 800882BC 000851FC 48 1D F5 59 */ bl cM_atan2f
/* 800882BC 000851FC 48 1D F5 59 */ bl cM_atan2f__Fff
/* 800882C0 00085200 C0 02 8E 14 */ lfs f0, lbl_80452814-_SDA2_BASE_(r2)
/* 800882C4 00085204 EC 20 00 72 */ fmuls f1, f0, f1
/* 800882C8 00085208 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0
asm/d/cc/d_cc_d.s
+26 -26
View File
@@ -194,7 +194,7 @@ lbl_8008388C:
lbl_80083894:
/* 80083894 000807D4 38 E0 FF FF */ li r7, -1
lbl_80083898:
/* 80083898 000807D8 48 1E 00 0D */ bl cCcD_Stts_NS_Init
/* 80083898 000807D8 48 1E 00 0D */ bl Init__9cCcD_SttsFiiPvUi
/* 8008389C 000807DC 28 1F 00 00 */ cmplwi r31, 0
/* 800838A0 000807E0 41 82 00 14 */ beq lbl_800838B4
/* 800838A4 000807E4 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
@@ -226,7 +226,7 @@ lbl_800838DC:
/* 800838FC 0008083C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80083900 00080840 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80083904 00080844 7C 7F 1B 78 */ mr r31, r3
/* 80083908 00080848 48 1D FF FD */ bl cCcD_Stts_NS_Ct
/* 80083908 00080848 48 1D FF FD */ bl Ct__9cCcD_SttsFv
/* 8008390C 0008084C 38 7F 00 1C */ addi r3, r31, 0x1c
/* 80083910 00080850 4B FF FE E9 */ bl dCcD_GStts_NS_Ct
/* 80083914 00080854 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -322,7 +322,7 @@ dCcD_GObjInf_NS_ctor:
/* 80083A58 00080998 3C 80 80 3B */ lis r4, lbl_803AC2CC@ha
/* 80083A5C 0008099C 38 04 C2 CC */ addi r0, r4, lbl_803AC2CC@l
/* 80083A60 000809A0 90 1D 00 0C */ stw r0, 0xc(r29)
/* 80083A64 000809A4 48 1D FF 4D */ bl cCcD_ObjCommonBase_NS_ct
/* 80083A64 000809A4 48 1D FF 4D */ bl ct__18cCcD_ObjCommonBaseFv
/* 80083A68 000809A8 3C 60 80 3B */ lis r3, lbl_803AC2C0@ha
/* 80083A6C 000809AC 38 03 C2 C0 */ addi r0, r3, lbl_803AC2C0@l
/* 80083A70 000809B0 90 1E 00 0C */ stw r0, 0xc(r30)
@@ -333,18 +333,18 @@ dCcD_GObjInf_NS_ctor:
/* 80083A84 000809C4 38 03 C2 CC */ addi r0, r3, lbl_803AC2CC@l
/* 80083A88 000809C8 90 1D 00 24 */ stw r0, 0x24(r29)
/* 80083A8C 000809CC 7F C3 F3 78 */ mr r3, r30
/* 80083A90 000809D0 48 1D FF 21 */ bl cCcD_ObjCommonBase_NS_ct
/* 80083A90 000809D0 48 1D FF 21 */ bl ct__18cCcD_ObjCommonBaseFv
/* 80083A94 000809D4 3C 60 80 3B */ lis r3, lbl_803AC2B4@ha
/* 80083A98 000809D8 38 03 C2 B4 */ addi r0, r3, lbl_803AC2B4@l
/* 80083A9C 000809DC 90 1E 00 0C */ stw r0, 0xc(r30)
/* 80083AA0 000809E0 7F C3 F3 78 */ mr r3, r30
/* 80083AA4 000809E4 48 1D FF 0D */ bl cCcD_ObjCommonBase_NS_ct
/* 80083AA4 000809E4 48 1D FF 0D */ bl ct__18cCcD_ObjCommonBaseFv
/* 80083AA8 000809E8 3B BD 00 2C */ addi r29, r29, 0x2c
/* 80083AAC 000809EC 3C 60 80 3B */ lis r3, lbl_803AC2CC@ha
/* 80083AB0 000809F0 38 03 C2 CC */ addi r0, r3, lbl_803AC2CC@l
/* 80083AB4 000809F4 90 1D 00 0C */ stw r0, 0xc(r29)
/* 80083AB8 000809F8 7F A3 EB 78 */ mr r3, r29
/* 80083ABC 000809FC 48 1D FE F5 */ bl cCcD_ObjCommonBase_NS_ct
/* 80083ABC 000809FC 48 1D FE F5 */ bl ct__18cCcD_ObjCommonBaseFv
/* 80083AC0 00080A00 3C 60 80 3B */ lis r3, lbl_803AC2A8@ha
/* 80083AC4 00080A04 38 03 C2 A8 */ addi r0, r3, lbl_803AC2A8@l
/* 80083AC8 00080A08 90 1D 00 0C */ stw r0, 0xc(r29)
@@ -355,7 +355,7 @@ dCcD_GObjInf_NS_ctor:
/* 80083ADC 00080A1C 38 03 72 24 */ addi r0, r3, lbl_803A7224@l
/* 80083AE0 00080A20 90 1F 00 54 */ stw r0, 0x54(r31)
/* 80083AE4 00080A24 7F E3 FB 78 */ mr r3, r31
/* 80083AE8 00080A28 48 1D FF 29 */ bl cCcD_Obj_NS_ct
/* 80083AE8 00080A28 48 1D FF 29 */ bl ct__8cCcD_ObjFv
/* 80083AEC 00080A2C 3C 60 80 3B */ lis r3, lbl_803AC25C@ha
/* 80083AF0 00080A30 38 03 C2 5C */ addi r0, r3, lbl_803AC25C@l
/* 80083AF4 00080A34 90 1F 00 3C */ stw r0, 0x3c(r31)
@@ -880,7 +880,7 @@ lbl_80084250:
/* 80084274 000811B4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80084278 000811B8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8008427C 000811BC 7C 7F 1B 78 */ mr r31, r3
/* 80084280 000811C0 48 1E 05 E9 */ bl cCcD_ObjAt_NS_ClrHit
/* 80084280 000811C0 48 1E 05 E9 */ bl ClrHit__10cCcD_ObjAtFv
/* 80084284 000811C4 38 7F 00 58 */ addi r3, r31, 0x58
/* 80084288 000811C8 4B FF F3 C5 */ bl dCcD_GAtTgCoCommonBase_NS_ClrActorInfo
/* 8008428C 000811CC 80 1F 00 5C */ lwz r0, 0x5c(r31)
@@ -1003,7 +1003,7 @@ dCcD_GObjInf_NS_ChkAtNoGuard:
/* 80084408 00081348 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8008440C 0008134C 7C 7F 1B 78 */ mr r31, r3
/* 80084410 00081350 38 7F 00 18 */ addi r3, r31, 0x18
/* 80084414 00081354 48 1E 04 9D */ bl cCcD_ObjTg_NS_ClrHit
/* 80084414 00081354 48 1E 04 9D */ bl ClrHit__10cCcD_ObjTgFv
/* 80084418 00081358 38 7F 00 9C */ addi r3, r31, 0x9c
/* 8008441C 0008135C 4B FF F2 31 */ bl dCcD_GAtTgCoCommonBase_NS_ClrActorInfo
/* 80084420 00081360 80 1F 00 A0 */ lwz r0, 0xa0(r31)
@@ -1165,7 +1165,7 @@ lbl_800845F8:
/* 80084618 00081558 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8008461C 0008155C 7C 7F 1B 78 */ mr r31, r3
/* 80084620 00081560 38 7F 00 2C */ addi r3, r31, 0x2c
/* 80084624 00081564 48 1E 02 C5 */ bl cCcD_ObjCo_NS_ClrHit
/* 80084624 00081564 48 1E 02 C5 */ bl ClrHit__10cCcD_ObjCoFv
/* 80084628 00081568 38 7F 00 E8 */ addi r3, r31, 0xe8
/* 8008462C 0008156C 4B FF F0 21 */ bl dCcD_GAtTgCoCommonBase_NS_ClrActorInfo
/* 80084630 00081570 80 1F 00 EC */ lwz r0, 0xec(r31)
@@ -1257,7 +1257,7 @@ dCcD_GObjInf_NS_Set:
/* 80084750 00081690 93 C1 00 08 */ stw r30, 8(r1)
/* 80084754 00081694 7C 7E 1B 78 */ mr r30, r3
/* 80084758 00081698 7C 9F 23 78 */ mr r31, r4
/* 8008475C 0008169C 48 1D F2 C1 */ bl cCcD_Obj_NS_Set
/* 8008475C 0008169C 48 1D F2 C1 */ bl Set__8cCcD_ObjFRC11cCcD_SrcObj
/* 80084760 000816A0 38 7E 00 58 */ addi r3, r30, 0x58
/* 80084764 000816A4 38 9F 00 1C */ addi r4, r31, 0x1c
/* 80084768 000816A8 4B FF F1 DD */ bl dCcD_GObjAt_NS_Set
@@ -1302,7 +1302,7 @@ dCcD_Cps_NS_Set:
/* 800847EC 0008172C 4B FF FF 55 */ bl dCcD_GObjInf_NS_Set
/* 800847F0 00081730 38 7E 01 24 */ addi r3, r30, 0x124
/* 800847F4 00081734 38 9F 00 30 */ addi r4, r31, 0x30
/* 800847F8 00081738 48 1E A8 45 */ bl cM3dGCps_NS_Set_X1_
/* 800847F8 00081738 48 1E A8 45 */ bl Set__8cM3dGCpsFRC9cM3dGCpsS
/* 800847FC 0008173C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80084800 00081740 83 C1 00 08 */ lwz r30, 8(r1)
/* 80084804 00081744 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -1362,7 +1362,7 @@ dCcD_Cyl_NS_Set:
/* 800848D0 00081810 4B FF FE 71 */ bl dCcD_GObjInf_NS_Set
/* 800848D4 00081814 38 7E 01 24 */ addi r3, r30, 0x124
/* 800848D8 00081818 38 9F 00 30 */ addi r4, r31, 0x30
/* 800848DC 0008181C 48 1E A8 39 */ bl cM3dGCyl_NS_Set
/* 800848DC 0008181C 48 1E A8 39 */ bl Set__8cM3dGCylFRC9cM3dGCylS
/* 800848E0 00081820 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800848E4 00081824 83 C1 00 08 */ lwz r30, 8(r1)
/* 800848E8 00081828 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -1390,7 +1390,7 @@ dCcD_Cyl_NS_StartCAt:
/* 80084934 00081874 D0 23 00 88 */ stfs f1, 0x88(r3)
/* 80084938 00081878 D0 03 00 8C */ stfs f0, 0x8c(r3)
/* 8008493C 0008187C 38 63 01 24 */ addi r3, r3, 0x124
/* 80084940 00081880 48 1E A8 9D */ bl cM3dGCyl_NS_SetC
/* 80084940 00081880 48 1E A8 9D */ bl SetC__8cM3dGCylFRC4cXyz
/* 80084944 00081884 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80084948 00081888 7C 08 03 A6 */ mtlr r0
/* 8008494C 0008188C 38 21 00 20 */ addi r1, r1, 0x20
@@ -1407,7 +1407,7 @@ dCcD_Cyl_NS_MoveCAt:
/* 8008496C 000818AC 7C 9F 23 78 */ mr r31, r4
/* 80084970 000818B0 38 BE 01 24 */ addi r5, r30, 0x124
/* 80084974 000818B4 38 61 00 08 */ addi r3, r1, 8
/* 80084978 000818B8 48 1E 21 BD */ bl cXyz_NS___mi
/* 80084978 000818B8 48 1E 21 BD */ bl __mi__4cXyzCFRC3Vec
/* 8008497C 000818BC C0 41 00 08 */ lfs f2, 8(r1)
/* 80084980 000818C0 D0 41 00 14 */ stfs f2, 0x14(r1)
/* 80084984 000818C4 C0 21 00 0C */ lfs f1, 0xc(r1)
@@ -1419,7 +1419,7 @@ dCcD_Cyl_NS_MoveCAt:
/* 8008499C 000818DC D0 1E 00 8C */ stfs f0, 0x8c(r30)
/* 800849A0 000818E0 38 7E 01 24 */ addi r3, r30, 0x124
/* 800849A4 000818E4 7F E4 FB 78 */ mr r4, r31
/* 800849A8 000818E8 48 1E A8 35 */ bl cM3dGCyl_NS_SetC
/* 800849A8 000818E8 48 1E A8 35 */ bl SetC__8cM3dGCylFRC4cXyz
/* 800849AC 000818EC 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 800849B0 000818F0 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 800849B4 000818F4 80 01 00 34 */ lwz r0, 0x34(r1)
@@ -1435,7 +1435,7 @@ dCcD_Cyl_NS_MoveCAt:
/* 800849DC 0008191C 7C 9F 23 78 */ mr r31, r4
/* 800849E0 00081920 38 BE 01 24 */ addi r5, r30, 0x124
/* 800849E4 00081924 38 61 00 08 */ addi r3, r1, 8
/* 800849E8 00081928 48 1E 21 4D */ bl cXyz_NS___mi
/* 800849E8 00081928 48 1E 21 4D */ bl __mi__4cXyzCFRC3Vec
/* 800849EC 0008192C C0 41 00 08 */ lfs f2, 8(r1)
/* 800849F0 00081930 D0 41 00 14 */ stfs f2, 0x14(r1)
/* 800849F4 00081934 C0 21 00 0C */ lfs f1, 0xc(r1)
@@ -1447,7 +1447,7 @@ dCcD_Cyl_NS_MoveCAt:
/* 80084A0C 0008194C D0 1E 00 C4 */ stfs f0, 0xc4(r30)
/* 80084A10 00081950 38 7E 01 24 */ addi r3, r30, 0x124
/* 80084A14 00081954 7F E4 FB 78 */ mr r4, r31
/* 80084A18 00081958 48 1E A7 C5 */ bl cM3dGCyl_NS_SetC
/* 80084A18 00081958 48 1E A7 C5 */ bl SetC__8cM3dGCylFRC4cXyz
/* 80084A1C 0008195C 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 80084A20 00081960 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 80084A24 00081964 80 01 00 34 */ lwz r0, 0x34(r1)
@@ -1467,7 +1467,7 @@ dCcD_Sph_NS_Set:
/* 80084A50 00081990 4B FF FC F1 */ bl dCcD_GObjInf_NS_Set
/* 80084A54 00081994 38 7E 01 24 */ addi r3, r30, 0x124
/* 80084A58 00081998 38 9F 00 30 */ addi r4, r31, 0x30
/* 80084A5C 0008199C 48 1E AC 4D */ bl cM3dGSph_NS_Set_X1_
/* 80084A5C 0008199C 48 1E AC 4D */ bl Set__8cM3dGSphFRC9cM3dGSphS
/* 80084A60 000819A0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80084A64 000819A4 83 C1 00 08 */ lwz r30, 8(r1)
/* 80084A68 000819A8 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -1491,7 +1491,7 @@ dCcD_Sph_NS_StartCAt:
/* 80084AA4 000819E4 D0 23 00 88 */ stfs f1, 0x88(r3)
/* 80084AA8 000819E8 D0 03 00 8C */ stfs f0, 0x8c(r3)
/* 80084AAC 000819EC 38 63 01 24 */ addi r3, r3, 0x124
/* 80084AB0 000819F0 48 1E AB 99 */ bl cM3dGSph_NS_SetC
/* 80084AB0 000819F0 48 1E AB 99 */ bl SetC__8cM3dGSphFRC4cXyz
/* 80084AB4 000819F4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80084AB8 000819F8 7C 08 03 A6 */ mtlr r0
/* 80084ABC 000819FC 38 21 00 20 */ addi r1, r1, 0x20
@@ -1508,7 +1508,7 @@ dCcD_Sph_NS_MoveCAt:
/* 80084ADC 00081A1C 7C 9F 23 78 */ mr r31, r4
/* 80084AE0 00081A20 38 BE 01 24 */ addi r5, r30, 0x124
/* 80084AE4 00081A24 38 61 00 08 */ addi r3, r1, 8
/* 80084AE8 00081A28 48 1E 20 4D */ bl cXyz_NS___mi
/* 80084AE8 00081A28 48 1E 20 4D */ bl __mi__4cXyzCFRC3Vec
/* 80084AEC 00081A2C C0 41 00 08 */ lfs f2, 8(r1)
/* 80084AF0 00081A30 D0 41 00 14 */ stfs f2, 0x14(r1)
/* 80084AF4 00081A34 C0 21 00 0C */ lfs f1, 0xc(r1)
@@ -1520,7 +1520,7 @@ dCcD_Sph_NS_MoveCAt:
/* 80084B0C 00081A4C D0 1E 00 8C */ stfs f0, 0x8c(r30)
/* 80084B10 00081A50 38 7E 01 24 */ addi r3, r30, 0x124
/* 80084B14 00081A54 7F E4 FB 78 */ mr r4, r31
/* 80084B18 00081A58 48 1E AB 31 */ bl cM3dGSph_NS_SetC
/* 80084B18 00081A58 48 1E AB 31 */ bl SetC__8cM3dGSphFRC4cXyz
/* 80084B1C 00081A5C 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 80084B20 00081A60 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 80084B24 00081A64 80 01 00 34 */ lwz r0, 0x34(r1)
@@ -1902,7 +1902,7 @@ dCcD_Cps_NS_dtor:
/* 800850C0 00082000 90 1E 01 3C */ stw r0, 0x13c(r30)
/* 800850C4 00082004 38 7E 01 24 */ addi r3, r30, 0x124
/* 800850C8 00082008 38 80 00 00 */ li r4, 0
/* 800850CC 0008200C 48 1E 9E D9 */ bl cM3dGCps_NS_dtor
/* 800850CC 0008200C 48 1E 9E D9 */ bl __dt__8cM3dGCpsFv
/* 800850D0 00082010 34 1E 01 04 */ addic. r0, r30, 0x104
/* 800850D4 00082014 41 82 00 24 */ beq lbl_800850F8
/* 800850D8 00082018 3C 60 80 3C */ lis r3, lbl_803C36D0@ha
@@ -1934,7 +1934,7 @@ lbl_80085114:
/* 80085138 00082078 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8008513C 0008207C 7C 08 02 A6 */ mflr r0
/* 80085140 00082080 90 01 00 14 */ stw r0, 0x14(r1)
/* 80085144 00082084 48 1D F7 25 */ bl cCcD_ObjAt_NS_ClrHit
/* 80085144 00082084 48 1D F7 25 */ bl ClrHit__10cCcD_ObjAtFv
/* 80085148 00082088 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8008514C 0008208C 7C 08 03 A6 */ mtlr r0
/* 80085150 00082090 38 21 00 10 */ addi r1, r1, 0x10
@@ -1943,7 +1943,7 @@ lbl_80085114:
/* 8008515C 0008209C 7C 08 02 A6 */ mflr r0
/* 80085160 000820A0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80085164 000820A4 38 63 00 18 */ addi r3, r3, 0x18
/* 80085168 000820A8 48 1D F7 49 */ bl cCcD_ObjTg_NS_ClrHit
/* 80085168 000820A8 48 1D F7 49 */ bl ClrHit__10cCcD_ObjTgFv
/* 8008516C 000820AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80085170 000820B0 7C 08 03 A6 */ mtlr r0
/* 80085174 000820B4 38 21 00 10 */ addi r1, r1, 0x10
@@ -1952,7 +1952,7 @@ lbl_80085114:
/* 80085180 000820C0 7C 08 02 A6 */ mflr r0
/* 80085184 000820C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80085188 000820C8 38 63 00 2C */ addi r3, r3, 0x2c
/* 8008518C 000820CC 48 1D F7 5D */ bl cCcD_ObjCo_NS_ClrHit
/* 8008518C 000820CC 48 1D F7 5D */ bl ClrHit__10cCcD_ObjCoFv
/* 80085190 000820D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80085194 000820D4 7C 08 03 A6 */ mtlr r0
/* 80085198 000820D8 38 21 00 10 */ addi r1, r1, 0x10
asm/d/cc/d_cc_s.s
+37 -37
View File
@@ -10,7 +10,7 @@ dCcS_NS_Ct:
/* 80085EDC 00082E1C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80085EE0 00082E20 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80085EE4 00082E24 7C 7F 1B 78 */ mr r31, r3
/* 80085EE8 00082E28 48 1D EB AD */ bl cCcS_NS_Ct
/* 80085EE8 00082E28 48 1D EB AD */ bl Ct__4cCcSFv
/* 80085EEC 00082E2C 38 7F 28 4C */ addi r3, r31, 0x284c
/* 80085EF0 00082E30 4B FF F6 F5 */ bl dCcMassS_Mng_NS_Ct
/* 80085EF4 00082E34 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -24,7 +24,7 @@ dCcS_NS_Dt:
/* 80085F08 00082E48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80085F0C 00082E4C 7C 08 02 A6 */ mflr r0
/* 80085F10 00082E50 90 01 00 14 */ stw r0, 0x14(r1)
/* 80085F14 00082E54 48 1D EC 4D */ bl cCcS_NS_Dt
/* 80085F14 00082E54 48 1D EC 4D */ bl Dt__4cCcSFv
/* 80085F18 00082E58 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80085F1C 00082E5C 7C 08 03 A6 */ mtlr r0
/* 80085F20 00082E60 38 21 00 10 */ addi r1, r1, 0x10
@@ -62,7 +62,7 @@ lbl_80085F74:
/* 80085F90 00082ED0 38 60 00 00 */ li r3, 0
/* 80085F94 00082ED4 48 00 01 4C */ b lbl_800860E0
lbl_80085F98:
/* 80085F98 00082ED8 48 1D DA B1 */ bl cCcD_Obj_NS_GetAc
/* 80085F98 00082ED8 48 1D DA B1 */ bl GetAc__8cCcD_ObjFv
/* 80085F9C 00082EDC 7C 7F 1B 79 */ or. r31, r3, r3
/* 80085FA0 00082EE0 40 82 00 0C */ bne lbl_80085FAC
/* 80085FA4 00082EE4 38 60 00 00 */ li r3, 0
@@ -143,7 +143,7 @@ lbl_800860B4:
/* 800860B8 00082FF8 3C 63 00 01 */ addis r3, r3, 1
/* 800860BC 00082FFC 38 03 80 00 */ addi r0, r3, -32768
/* 800860C0 00083000 7C 03 07 34 */ extsh r3, r0
/* 800860C4 00083004 48 1E AD 61 */ bl cLib_distanceAngleS
/* 800860C4 00083004 48 1E AD 61 */ bl cLib_distanceAngleS__Fss
/* 800860C8 00083008 7F A0 07 34 */ extsh r0, r29
/* 800860CC 0008300C 7C 03 00 00 */ cmpw r3, r0
/* 800860D0 00083010 40 81 00 0C */ ble lbl_800860DC
@@ -292,10 +292,10 @@ lbl_800862C8:
/* 800862D4 00083214 28 1B 00 00 */ cmplwi r27, 0
/* 800862D8 00083218 41 82 00 30 */ beq lbl_80086308
/* 800862DC 0008321C 7F C3 F3 78 */ mr r3, r30
/* 800862E0 00083220 48 1D D7 69 */ bl cCcD_Obj_NS_GetAc
/* 800862E0 00083220 48 1D D7 69 */ bl GetAc__8cCcD_ObjFv
/* 800862E4 00083224 7C 7C 1B 78 */ mr r28, r3
/* 800862E8 00083228 7F E3 FB 78 */ mr r3, r31
/* 800862EC 0008322C 48 1D D7 5D */ bl cCcD_Obj_NS_GetAc
/* 800862EC 0008322C 48 1D D7 5D */ bl GetAc__8cCcD_ObjFv
/* 800862F0 00083230 7F E4 FB 78 */ mr r4, r31
/* 800862F4 00083234 7F 85 E3 78 */ mr r5, r28
/* 800862F8 00083238 7F C6 F3 78 */ mr r6, r30
@@ -309,10 +309,10 @@ lbl_80086308:
/* 80086314 00083254 28 1B 00 00 */ cmplwi r27, 0
/* 80086318 00083258 41 82 00 30 */ beq lbl_80086348
/* 8008631C 0008325C 7F E3 FB 78 */ mr r3, r31
/* 80086320 00083260 48 1D D7 29 */ bl cCcD_Obj_NS_GetAc
/* 80086320 00083260 48 1D D7 29 */ bl GetAc__8cCcD_ObjFv
/* 80086324 00083264 7C 7C 1B 78 */ mr r28, r3
/* 80086328 00083268 7F C3 F3 78 */ mr r3, r30
/* 8008632C 0008326C 48 1D D7 1D */ bl cCcD_Obj_NS_GetAc
/* 8008632C 0008326C 48 1D D7 1D */ bl GetAc__8cCcD_ObjFv
/* 80086330 00083270 7F C4 F3 78 */ mr r4, r30
/* 80086334 00083274 7F 85 E3 78 */ mr r5, r28
/* 80086338 00083278 7F E6 FB 78 */ mr r6, r31
@@ -576,12 +576,12 @@ lbl_800866DC:
/* 800866E0 00083620 C0 21 00 20 */ lfs f1, 0x20(r1)
/* 800866E4 00083624 C0 41 00 24 */ lfs f2, 0x24(r1)
/* 800866E8 00083628 C0 61 00 28 */ lfs f3, 0x28(r1)
/* 800866EC 0008362C 48 1D D2 49 */ bl cCcD_Stts_NS_PlusCcMove
/* 800866EC 0008362C 48 1D D2 49 */ bl PlusCcMove__9cCcD_SttsFfff
/* 800866F0 00083630 80 7D 00 44 */ lwz r3, 0x44(r29)
/* 800866F4 00083634 C0 21 00 14 */ lfs f1, 0x14(r1)
/* 800866F8 00083638 C0 41 00 18 */ lfs f2, 0x18(r1)
/* 800866FC 0008363C C0 61 00 1C */ lfs f3, 0x1c(r1)
/* 80086700 00083640 48 1D D2 35 */ bl cCcD_Stts_NS_PlusCcMove
/* 80086700 00083640 48 1D D2 35 */ bl PlusCcMove__9cCcD_SttsFfff
/* 80086704 00083644 7F 83 E3 78 */ mr r3, r28
/* 80086708 00083648 38 81 00 20 */ addi r4, r1, 0x20
/* 8008670C 0008364C 7F 85 E3 78 */ mr r5, r28
@@ -667,7 +667,7 @@ lbl_8008682C:
lbl_80086838:
/* 80086838 00083778 38 61 00 08 */ addi r3, r1, 8
/* 8008683C 0008377C 7F E4 FB 78 */ mr r4, r31
/* 80086840 00083780 48 1E 7D 31 */ bl cM3d_CalcVecZAngle
/* 80086840 00083780 48 1E 7D 31 */ bl cM3d_CalcVecZAngle__FRC3VecP5csXyz
/* 80086844 00083784 39 61 00 30 */ addi r11, r1, 0x30
/* 80086848 00083788 48 2D B9 E1 */ bl _restgpr_29
/* 8008684C 0008378C 80 01 00 34 */ lwz r0, 0x34(r1)
@@ -701,11 +701,11 @@ dCcS_NS_ProcAtTgHitmark:
/* 800868B0 000837F0 28 00 00 00 */ cmplwi r0, 0
/* 800868B4 000837F4 40 82 00 28 */ bne lbl_800868DC
/* 800868B8 000837F8 7F 43 D3 78 */ mr r3, r26
/* 800868BC 000837FC 48 1D D1 8D */ bl cCcD_Obj_NS_GetAc
/* 800868BC 000837FC 48 1D D1 8D */ bl GetAc__8cCcD_ObjFv
/* 800868C0 00083800 28 03 00 00 */ cmplwi r3, 0
/* 800868C4 00083804 41 82 00 18 */ beq lbl_800868DC
/* 800868C8 00083808 7F 43 D3 78 */ mr r3, r26
/* 800868CC 0008380C 48 1D D1 7D */ bl cCcD_Obj_NS_GetAc
/* 800868CC 0008380C 48 1D D1 7D */ bl GetAc__8cCcD_ObjFv
/* 800868D0 00083810 80 03 04 9C */ lwz r0, 0x49c(r3)
/* 800868D4 00083814 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3
/* 800868D8 00083818 41 82 01 D0 */ beq lbl_80086AA8
@@ -767,7 +767,7 @@ lbl_80086968:
lbl_800869A0:
/* 800869A0 000838E0 83 19 00 10 */ lwz r24, 0x10(r25)
/* 800869A4 000838E4 7F 43 D3 78 */ mr r3, r26
/* 800869A8 000838E8 48 1D D0 A1 */ bl cCcD_Obj_NS_GetAc
/* 800869A8 000838E8 48 1D D0 A1 */ bl GetAc__8cCcD_ObjFv
/* 800869AC 000838EC 7C 65 1B 78 */ mr r5, r3
/* 800869B0 000838F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 800869B4 000838F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -799,7 +799,7 @@ lbl_80086A00:
lbl_80086A0C:
/* 80086A0C 0008394C 83 19 00 10 */ lwz r24, 0x10(r25)
/* 80086A10 00083950 7F 43 D3 78 */ mr r3, r26
/* 80086A14 00083954 48 1D D0 35 */ bl cCcD_Obj_NS_GetAc
/* 80086A14 00083954 48 1D D0 35 */ bl GetAc__8cCcD_ObjFv
/* 80086A18 00083958 7C 65 1B 78 */ mr r5, r3
/* 80086A1C 0008395C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80086A20 00083960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -826,7 +826,7 @@ lbl_80086A44:
/* 80086A70 000839B0 4E 80 04 21 */ bctrl
/* 80086A74 000839B4 83 19 00 10 */ lwz r24, 0x10(r25)
/* 80086A78 000839B8 7F 43 D3 78 */ mr r3, r26
/* 80086A7C 000839BC 48 1D CF CD */ bl cCcD_Obj_NS_GetAc
/* 80086A7C 000839BC 48 1D CF CD */ bl GetAc__8cCcD_ObjFv
/* 80086A80 000839C0 7C 65 1B 78 */ mr r5, r3
/* 80086A84 000839C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80086A88 000839C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -969,10 +969,10 @@ lbl_80086C7C:
/* 80086C88 00083BC8 28 11 00 00 */ cmplwi r17, 0
/* 80086C8C 00083BCC 41 82 00 30 */ beq lbl_80086CBC
/* 80086C90 00083BD0 7E 63 9B 78 */ mr r3, r19
/* 80086C94 00083BD4 48 1D CD B5 */ bl cCcD_Obj_NS_GetAc
/* 80086C94 00083BD4 48 1D CD B5 */ bl GetAc__8cCcD_ObjFv
/* 80086C98 00083BD8 7C 72 1B 78 */ mr r18, r3
/* 80086C9C 00083BDC 7E 83 A3 78 */ mr r3, r20
/* 80086CA0 00083BE0 48 1D CD A9 */ bl cCcD_Obj_NS_GetAc
/* 80086CA0 00083BE0 48 1D CD A9 */ bl GetAc__8cCcD_ObjFv
/* 80086CA4 00083BE4 7E 84 A3 78 */ mr r4, r20
/* 80086CA8 00083BE8 7E 45 93 78 */ mr r5, r18
/* 80086CAC 00083BEC 7E 66 9B 78 */ mr r6, r19
@@ -986,10 +986,10 @@ lbl_80086CBC:
/* 80086CC8 00083C08 28 11 00 00 */ cmplwi r17, 0
/* 80086CCC 00083C0C 41 82 00 30 */ beq lbl_80086CFC
/* 80086CD0 00083C10 7E 83 A3 78 */ mr r3, r20
/* 80086CD4 00083C14 48 1D CD 75 */ bl cCcD_Obj_NS_GetAc
/* 80086CD4 00083C14 48 1D CD 75 */ bl GetAc__8cCcD_ObjFv
/* 80086CD8 00083C18 7C 72 1B 78 */ mr r18, r3
/* 80086CDC 00083C1C 7E 63 9B 78 */ mr r3, r19
/* 80086CE0 00083C20 48 1D CD 69 */ bl cCcD_Obj_NS_GetAc
/* 80086CE0 00083C20 48 1D CD 69 */ bl GetAc__8cCcD_ObjFv
/* 80086CE4 00083C24 7E 64 9B 78 */ mr r4, r19
/* 80086CE8 00083C28 7E 45 93 78 */ mr r5, r18
/* 80086CEC 00083C2C 7E 86 A3 78 */ mr r6, r20
@@ -1078,16 +1078,16 @@ lbl_80086DD4:
/* 80086E1C 00083D5C 7E E4 BB 78 */ mr r4, r23
/* 80086E20 00083D60 7F 05 C3 78 */ mr r5, r24
/* 80086E24 00083D64 FC 20 F8 90 */ fmr f1, f31
/* 80086E28 00083D68 48 1E 81 D9 */ bl cM3dGCps_NS_Set
/* 80086E28 00083D68 48 1E 81 D9 */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf
/* 80086E2C 00083D6C 38 61 00 1C */ addi r3, r1, 0x1c
/* 80086E30 00083D70 48 1D D1 95 */ bl cCcD_CpsAttr_NS_CalcAabBox
/* 80086E30 00083D70 48 1D D1 95 */ bl CalcAabBox__12cCcD_CpsAttrFv
/* 80086E34 00083D74 3C 60 80 3A */ lis r3, lbl_803A7224@ha
/* 80086E38 00083D78 38 03 72 24 */ addi r0, r3, lbl_803A7224@l
/* 80086E3C 00083D7C 90 01 00 18 */ stw r0, 0x18(r1)
/* 80086E40 00083D80 38 79 28 08 */ addi r3, r25, 0x2808
/* 80086E44 00083D84 38 81 00 0C */ addi r4, r1, 0xc
/* 80086E48 00083D88 38 A1 00 1C */ addi r5, r1, 0x1c
/* 80086E4C 00083D8C 48 1D C8 55 */ bl cCcD_DivideArea_NS_CalcDivideInfoOverArea
/* 80086E4C 00083D8C 48 1D C8 55 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab
/* 80086E50 00083D90 3B 39 10 00 */ addi r25, r25, 0x1000
/* 80086E54 00083D94 48 00 01 00 */ b lbl_80086F54
lbl_80086E58:
@@ -1095,21 +1095,21 @@ lbl_80086E58:
/* 80086E5C 00083D9C 80 03 00 2C */ lwz r0, 0x2c(r3)
/* 80086E60 00083DA0 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 80086E64 00083DA4 41 82 00 EC */ beq lbl_80086F50
/* 80086E68 00083DA8 48 1D CB E1 */ bl cCcD_Obj_NS_GetAc
/* 80086E68 00083DA8 48 1D CB E1 */ bl GetAc__8cCcD_ObjFv
/* 80086E6C 00083DAC 7C 03 D0 40 */ cmplw r3, r26
/* 80086E70 00083DB0 41 82 00 E0 */ beq lbl_80086F50
/* 80086E74 00083DB4 80 79 00 00 */ lwz r3, 0(r25)
/* 80086E78 00083DB8 48 1D CB D1 */ bl cCcD_Obj_NS_GetAc
/* 80086E78 00083DB8 48 1D CB D1 */ bl GetAc__8cCcD_ObjFv
/* 80086E7C 00083DBC 7C 03 D8 40 */ cmplw r3, r27
/* 80086E80 00083DC0 41 82 00 D0 */ beq lbl_80086F50
/* 80086E84 00083DC4 80 79 00 00 */ lwz r3, 0(r25)
/* 80086E88 00083DC8 48 1D CB C1 */ bl cCcD_Obj_NS_GetAc
/* 80086E88 00083DC8 48 1D CB C1 */ bl GetAc__8cCcD_ObjFv
/* 80086E8C 00083DCC 7C 03 E0 40 */ cmplw r3, r28
/* 80086E90 00083DD0 41 82 00 C0 */ beq lbl_80086F50
/* 80086E94 00083DD4 80 79 00 00 */ lwz r3, 0(r25)
/* 80086E98 00083DD8 38 63 00 48 */ addi r3, r3, 0x48
/* 80086E9C 00083DDC 38 81 00 0C */ addi r4, r1, 0xc
/* 80086EA0 00083DE0 48 1D C4 C9 */ bl cCcD_DivideInfo_NS_Chk
/* 80086EA0 00083DE0 48 1D C4 C9 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo
/* 80086EA4 00083DE4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80086EA8 00083DE8 41 82 00 A8 */ beq lbl_80086F50
/* 80086EAC 00083DEC 80 79 00 00 */ lwz r3, 0(r25)
@@ -1145,7 +1145,7 @@ lbl_80086ED4:
/* 80086F20 00083E60 93 E1 00 54 */ stw r31, 0x54(r1)
/* 80086F24 00083E64 7F C3 F3 78 */ mr r3, r30
/* 80086F28 00083E68 38 80 00 00 */ li r4, 0
/* 80086F2C 00083E6C 48 1E 80 79 */ bl cM3dGCps_NS_dtor
/* 80086F2C 00083E6C 48 1E 80 79 */ bl __dt__8cM3dGCpsFv
/* 80086F30 00083E70 3C 60 80 3C */ lis r3, lbl_803C36D0@ha
/* 80086F34 00083E74 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l
/* 80086F38 00083E78 90 01 00 38 */ stw r0, 0x38(r1)
@@ -1168,7 +1168,7 @@ lbl_80086F54:
/* 80086F74 00083EB4 93 E1 00 54 */ stw r31, 0x54(r1)
/* 80086F78 00083EB8 7F C3 F3 78 */ mr r3, r30
/* 80086F7C 00083EBC 38 80 00 00 */ li r4, 0
/* 80086F80 00083EC0 48 1E 80 25 */ bl cM3dGCps_NS_dtor
/* 80086F80 00083EC0 48 1E 80 25 */ bl __dt__8cM3dGCpsFv
/* 80086F84 00083EC4 3C 60 80 3C */ lis r3, lbl_803C36D0@ha
/* 80086F88 00083EC8 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l
/* 80086F8C 00083ECC 90 01 00 38 */ stw r0, 0x38(r1)
@@ -1230,16 +1230,16 @@ lbl_80086FF4:
/* 80087058 00083F98 D0 01 00 28 */ stfs f0, 0x28(r1)
/* 8008705C 00083F9C 7F E3 FB 78 */ mr r3, r31
/* 80087060 00083FA0 38 81 00 1C */ addi r4, r1, 0x1c
/* 80087064 00083FA4 48 1E 86 45 */ bl cM3dGSph_NS_Set_X1_
/* 80087064 00083FA4 48 1E 86 45 */ bl Set__8cM3dGSphFRC9cM3dGSphS
/* 80087068 00083FA8 38 61 00 2C */ addi r3, r1, 0x2c
/* 8008706C 00083FAC 48 1D D6 75 */ bl cCcD_SphAttr_NS_CalcAabBox
/* 8008706C 00083FAC 48 1D D6 75 */ bl CalcAabBox__12cCcD_SphAttrFv
/* 80087070 00083FB0 3C 60 80 3A */ lis r3, lbl_803A7224@ha
/* 80087074 00083FB4 38 03 72 24 */ addi r0, r3, lbl_803A7224@l
/* 80087078 00083FB8 90 01 00 18 */ stw r0, 0x18(r1)
/* 8008707C 00083FBC 38 7C 28 08 */ addi r3, r28, 0x2808
/* 80087080 00083FC0 38 81 00 0C */ addi r4, r1, 0xc
/* 80087084 00083FC4 38 A1 00 2C */ addi r5, r1, 0x2c
/* 80087088 00083FC8 48 1D C6 19 */ bl cCcD_DivideArea_NS_CalcDivideInfoOverArea
/* 80087088 00083FC8 48 1D C6 19 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab
/* 8008708C 00083FCC 3B 9C 10 00 */ addi r28, r28, 0x1000
/* 80087090 00083FD0 48 00 01 20 */ b lbl_800871B0
lbl_80087094:
@@ -1247,17 +1247,17 @@ lbl_80087094:
/* 80087098 00083FD8 80 03 00 2C */ lwz r0, 0x2c(r3)
/* 8008709C 00083FDC 54 00 07 FF */ clrlwi. r0, r0, 0x1f
/* 800870A0 00083FE0 41 82 01 0C */ beq lbl_800871AC
/* 800870A4 00083FE4 48 1D C9 A5 */ bl cCcD_Obj_NS_GetAc
/* 800870A4 00083FE4 48 1D C9 A5 */ bl GetAc__8cCcD_ObjFv
/* 800870A8 00083FE8 7C 03 D0 40 */ cmplw r3, r26
/* 800870AC 00083FEC 41 82 01 00 */ beq lbl_800871AC
/* 800870B0 00083FF0 80 7C 00 00 */ lwz r3, 0(r28)
/* 800870B4 00083FF4 48 1D C9 95 */ bl cCcD_Obj_NS_GetAc
/* 800870B4 00083FF4 48 1D C9 95 */ bl GetAc__8cCcD_ObjFv
/* 800870B8 00083FF8 7C 03 D8 40 */ cmplw r3, r27
/* 800870BC 00083FFC 41 82 00 F0 */ beq lbl_800871AC
/* 800870C0 00084000 80 7C 00 00 */ lwz r3, 0(r28)
/* 800870C4 00084004 38 63 00 48 */ addi r3, r3, 0x48
/* 800870C8 00084008 38 81 00 0C */ addi r4, r1, 0xc
/* 800870CC 0008400C 48 1D C2 9D */ bl cCcD_DivideInfo_NS_Chk
/* 800870CC 0008400C 48 1D C2 9D */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo
/* 800870D0 00084010 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800870D4 00084014 41 82 00 D8 */ beq lbl_800871AC
/* 800870D8 00084018 80 7C 00 00 */ lwz r3, 0(r28)
@@ -1398,7 +1398,7 @@ dCcS_NS_Move:
/* 800872B0 000841F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800872B4 000841F4 7C 08 02 A6 */ mflr r0
/* 800872B8 000841F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 800872BC 000841FC 48 1D EA 11 */ bl cCcS_NS_Move
/* 800872BC 000841FC 48 1D EA 11 */ bl Move__4cCcSFv
/* 800872C0 00084200 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800872C4 00084204 7C 08 03 A6 */ mtlr r0
/* 800872C8 00084208 38 21 00 10 */ addi r1, r1, 0x10
@@ -1413,7 +1413,7 @@ dCcS_NS_Draw:
/* 800872E0 00084220 7C 7F 1B 78 */ mr r31, r3
/* 800872E4 00084224 4B FF FF C9 */ bl dCcS_NS_DrawAfter
/* 800872E8 00084228 7F E3 FB 78 */ mr r3, r31
/* 800872EC 0008422C 48 1D EA 45 */ bl cCcS_NS_DrawClear
/* 800872EC 0008422C 48 1D EA 45 */ bl DrawClear__4cCcSFv
/* 800872F0 00084230 38 7F 28 4C */ addi r3, r31, 0x284c
/* 800872F4 00084234 4B FF E9 FD */ bl dCcMassS_Mng_NS_Clear
/* 800872F8 00084238 83 E1 00 0C */ lwz r31, 0xc(r1)
asm/d/cc/d_cc_uty.s
+6 -6
View File
@@ -538,7 +538,7 @@ at_power_check:
/* 80087A78 000849B8 38 60 00 00 */ li r3, 0
/* 80087A7C 000849BC 48 00 01 74 */ b lbl_80087BF0
lbl_80087A80:
/* 80087A80 000849C0 48 1D BF C9 */ bl cCcD_Obj_NS_GetAc
/* 80087A80 000849C0 48 1D BF C9 */ bl GetAc__8cCcD_ObjFv
/* 80087A84 000849C4 90 7F 00 04 */ stw r3, 4(r31)
/* 80087A88 000849C8 38 00 00 0C */ li r0, 0xc
/* 80087A8C 000849CC 98 1F 00 20 */ stb r0, 0x20(r31)
@@ -752,13 +752,13 @@ lbl_80087D60:
/* 80087D70 00084CB0 C3 C3 04 F8 */ lfs f30, 0x4f8(r3)
/* 80087D74 00084CB4 C3 E3 05 00 */ lfs f31, 0x500(r3)
/* 80087D78 00084CB8 C0 22 8D BC */ lfs f1, lbl_804527BC-_SDA2_BASE_(r2)
/* 80087D7C 00084CBC 48 1D FC 11 */ bl cM_rndFX
/* 80087D7C 00084CBC 48 1D FC 11 */ bl cM_rndFX__Ff
/* 80087D80 00084CC0 FC 00 08 1E */ fctiwz f0, f1
/* 80087D84 00084CC4 D8 01 00 18 */ stfd f0, 0x18(r1)
/* 80087D88 00084CC8 83 41 00 1C */ lwz r26, 0x1c(r1)
/* 80087D8C 00084CCC FC 20 F0 50 */ fneg f1, f30
/* 80087D90 00084CD0 FC 40 F8 50 */ fneg f2, f31
/* 80087D94 00084CD4 48 1D F8 E1 */ bl cM_atan2s
/* 80087D94 00084CD4 48 1D F8 E1 */ bl cM_atan2s__Fff
/* 80087D98 00084CD8 7C 03 D2 14 */ add r0, r3, r26
/* 80087D9C 00084CDC B0 1C 00 0E */ sth r0, 0xe(r28)
/* 80087DA0 00084CE0 48 00 00 80 */ b lbl_80087E20
@@ -774,13 +774,13 @@ lbl_80087DA4:
/* 80087DC4 00084D04 C0 1E 04 D8 */ lfs f0, 0x4d8(r30)
/* 80087DC8 00084D08 EF C1 00 28 */ fsubs f30, f1, f0
/* 80087DCC 00084D0C C0 22 8D C0 */ lfs f1, lbl_804527C0-_SDA2_BASE_(r2)
/* 80087DD0 00084D10 48 1D FB BD */ bl cM_rndFX
/* 80087DD0 00084D10 48 1D FB BD */ bl cM_rndFX__Ff
/* 80087DD4 00084D14 FC 00 08 1E */ fctiwz f0, f1
/* 80087DD8 00084D18 D8 01 00 18 */ stfd f0, 0x18(r1)
/* 80087DDC 00084D1C 83 41 00 1C */ lwz r26, 0x1c(r1)
/* 80087DE0 00084D20 FC 20 F8 50 */ fneg f1, f31
/* 80087DE4 00084D24 FC 40 F0 50 */ fneg f2, f30
/* 80087DE8 00084D28 48 1D F8 8D */ bl cM_atan2s
/* 80087DE8 00084D28 48 1D F8 8D */ bl cM_atan2s__Fff
/* 80087DEC 00084D2C 7C 03 D2 14 */ add r0, r3, r26
/* 80087DF0 00084D30 B0 1C 00 0E */ sth r0, 0xe(r28)
/* 80087DF4 00084D34 48 00 00 2C */ b lbl_80087E20
@@ -793,7 +793,7 @@ lbl_80087DF8:
/* 80087E0C 00084D4C EC 01 00 28 */ fsubs f0, f1, f0
/* 80087E10 00084D50 FC 20 10 50 */ fneg f1, f2
/* 80087E14 00084D54 FC 40 00 50 */ fneg f2, f0
/* 80087E18 00084D58 48 1D F8 5D */ bl cM_atan2s
/* 80087E18 00084D58 48 1D F8 5D */ bl cM_atan2s__Fff
/* 80087E1C 00084D5C B0 7C 00 0E */ sth r3, 0xe(r28)
lbl_80087E20:
/* 80087E20 00084D60 88 1C 00 20 */ lbz r0, 0x20(r28)
asm/d/cc/mass/d_cc_mass_s.s
+22 -22
View File
@@ -24,7 +24,7 @@ dCcMassS_Obj_NS_Clear:
/* 80085314 00082254 38 A0 00 00 */ li r5, 0
/* 80085318 00082258 38 C0 00 00 */ li r6, 0
/* 8008531C 0008225C 38 63 00 0C */ addi r3, r3, 0xc
/* 80085320 00082260 48 1D E0 39 */ bl cCcD_DivideInfo_NS_Set
/* 80085320 00082260 48 1D E0 39 */ bl Set__15cCcD_DivideInfoFUlUlUl
/* 80085324 00082264 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80085328 00082268 7C 08 03 A6 */ mtlr r0
/* 8008532C 0008226C 38 21 00 10 */ addi r1, r1, 0x10
@@ -131,7 +131,7 @@ cCcD_CpsAttr_NS_dtor:
/* 80085480 000823C0 90 1E 00 38 */ stw r0, 0x38(r30)
/* 80085484 000823C4 38 7E 00 20 */ addi r3, r30, 0x20
/* 80085488 000823C8 38 80 00 00 */ li r4, 0
/* 8008548C 000823CC 48 1E 9B 19 */ bl cM3dGCps_NS_dtor
/* 8008548C 000823CC 48 1E 9B 19 */ bl __dt__8cM3dGCpsFv
/* 80085490 000823D0 28 1E 00 00 */ cmplwi r30, 0
/* 80085494 000823D4 41 82 00 20 */ beq lbl_800854B4
/* 80085498 000823D8 3C 60 80 3C */ lis r3, lbl_803C36D0@ha
@@ -261,10 +261,10 @@ dCcMassS_Mng_NS_Ct:
/* 80085650 00082590 7C 9E 23 78 */ mr r30, r4
/* 80085654 00082594 7C BF 2B 78 */ mr r31, r5
/* 80085658 00082598 38 7D 01 E8 */ addi r3, r29, 0x1e8
/* 8008565C 0008259C 48 1E 9B A5 */ bl cM3dGCyl_NS_SetR
/* 8008565C 0008259C 48 1E 9B A5 */ bl SetR__8cM3dGCylFf
/* 80085660 000825A0 38 7D 01 E8 */ addi r3, r29, 0x1e8
/* 80085664 000825A4 FC 20 F8 90 */ fmr f1, f31
/* 80085668 000825A8 48 1E 9B 91 */ bl cM3dGCyl_NS_SetH
/* 80085668 000825A8 48 1E 9B 91 */ bl SetH__8cM3dGCylFf
/* 8008566C 000825AC 9B DD 02 00 */ stb r30, 0x200(r29)
/* 80085670 000825B0 9B FD 02 01 */ stb r31, 0x201(r29)
/* 80085674 000825B4 CB E1 00 18 */ lfd f31, 0x18(r1)
@@ -287,7 +287,7 @@ dCcMassS_Mng_NS_Prepare:
/* 800856AC 000825EC 38 03 72 18 */ addi r0, r3, lbl_803A7218@l
/* 800856B0 000825F0 90 01 00 20 */ stw r0, 0x20(r1)
/* 800856B4 000825F4 38 61 00 08 */ addi r3, r1, 8
/* 800856B8 000825F8 48 1E 96 41 */ bl cM3dGAab_NS_ClearForMinMax
/* 800856B8 000825F8 48 1E 96 41 */ bl ClearForMinMax__8cM3dGAabFv
/* 800856BC 000825FC 3B DF 00 44 */ addi r30, r31, 0x44
/* 800856C0 00082600 48 00 00 3C */ b lbl_800856FC
lbl_800856C4:
@@ -303,7 +303,7 @@ lbl_800856C4:
/* 800856E8 00082628 4E 80 04 21 */ bctrl
/* 800856EC 0008262C 38 61 00 08 */ addi r3, r1, 8
/* 800856F0 00082630 7F A4 EB 78 */ mr r4, r29
/* 800856F4 00082634 48 1E 96 6D */ bl cM3dGAab_NS_SetMinMax_X1_
/* 800856F4 00082634 48 1E 96 6D */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab
/* 800856F8 00082638 3B DE 00 20 */ addi r30, r30, 0x20
lbl_800856FC:
/* 800856FC 0008263C 80 1F 00 40 */ lwz r0, 0x40(r31)
@@ -327,7 +327,7 @@ lbl_8008571C:
/* 80085740 00082680 4E 80 04 21 */ bctrl
/* 80085744 00082684 38 61 00 08 */ addi r3, r1, 8
/* 80085748 00082688 7F C4 F3 78 */ mr r4, r30
/* 8008574C 0008268C 48 1E 96 15 */ bl cM3dGAab_NS_SetMinMax_X1_
/* 8008574C 0008268C 48 1E 96 15 */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab
/* 80085750 00082690 3B BD 00 20 */ addi r29, r29, 0x20
lbl_80085754:
/* 80085754 00082694 80 1F 01 84 */ lwz r0, 0x184(r31)
@@ -346,11 +346,11 @@ lbl_80085754:
/* 80085788 000826C8 4E 80 04 21 */ bctrl
/* 8008578C 000826CC 38 61 00 08 */ addi r3, r1, 8
/* 80085790 000826D0 38 9F 02 24 */ addi r4, r31, 0x224
/* 80085794 000826D4 48 1E 95 CD */ bl cM3dGAab_NS_SetMinMax_X1_
/* 80085794 000826D4 48 1E 95 CD */ bl SetMinMax__8cM3dGAabFRC8cM3dGAab
lbl_80085798:
/* 80085798 000826D8 7F E3 FB 78 */ mr r3, r31
/* 8008579C 000826DC 38 81 00 08 */ addi r4, r1, 8
/* 800857A0 000826E0 48 1D DC 09 */ bl cCcD_DivideArea_NS_SetArea
/* 800857A0 000826E0 48 1D DC 09 */ bl SetArea__15cCcD_DivideAreaFRC8cM3dGAab
/* 800857A4 000826E4 3B BF 00 44 */ addi r29, r31, 0x44
/* 800857A8 000826E8 48 00 00 30 */ b lbl_800857D8
lbl_800857AC:
@@ -363,7 +363,7 @@ lbl_800857AC:
/* 800857C4 00082704 38 9D 00 0C */ addi r4, r29, 0xc
/* 800857C8 00082708 7F E3 FB 78 */ mr r3, r31
/* 800857CC 0008270C 38 C0 00 00 */ li r6, 0
/* 800857D0 00082710 48 1D DD 05 */ bl cCcD_DivideArea_NS_CalcDivideInfo
/* 800857D0 00082710 48 1D DD 05 */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl
/* 800857D4 00082714 3B BD 00 20 */ addi r29, r29, 0x20
lbl_800857D8:
/* 800857D8 00082718 80 1F 00 40 */ lwz r0, 0x40(r31)
@@ -384,7 +384,7 @@ lbl_800857F8:
/* 80085810 00082750 38 9D 00 0C */ addi r4, r29, 0xc
/* 80085814 00082754 7F E3 FB 78 */ mr r3, r31
/* 80085818 00082758 38 C0 00 00 */ li r6, 0
/* 8008581C 0008275C 48 1D DC B9 */ bl cCcD_DivideArea_NS_CalcDivideInfo
/* 8008581C 0008275C 48 1D DC B9 */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl
/* 80085820 00082760 3B BD 00 20 */ addi r29, r29, 0x20
lbl_80085824:
/* 80085824 00082764 80 1F 01 84 */ lwz r0, 0x184(r31)
@@ -400,7 +400,7 @@ lbl_80085824:
/* 8008584C 0008278C 38 9F 02 64 */ addi r4, r31, 0x264
/* 80085850 00082790 38 BF 02 24 */ addi r5, r31, 0x224
/* 80085854 00082794 38 C0 00 00 */ li r6, 0
/* 80085858 00082798 48 1D DC 7D */ bl cCcD_DivideArea_NS_CalcDivideInfo
/* 80085858 00082798 48 1D DC 7D */ bl CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl
lbl_8008585C:
/* 8008585C 0008279C C0 42 8D 60 */ lfs f2, lbl_80452760-_SDA2_BASE_(r2)
/* 80085860 000827A0 D0 5F 02 04 */ stfs f2, 0x204(r31)
@@ -440,7 +440,7 @@ lbl_8008585C:
/* 800858E8 00082828 38 00 00 00 */ li r0, 0
/* 800858EC 0008282C 90 05 00 00 */ stw r0, 0(r5)
/* 800858F0 00082830 38 78 01 E8 */ addi r3, r24, 0x1e8
/* 800858F4 00082834 48 1E 98 E9 */ bl cM3dGCyl_NS_SetC
/* 800858F4 00082834 48 1E 98 E9 */ bl SetC__8cM3dGCylFRC4cXyz
/* 800858F8 00082838 38 78 01 C8 */ addi r3, r24, 0x1c8
/* 800858FC 0008283C 81 98 01 E4 */ lwz r12, 0x1e4(r24)
/* 80085900 00082840 81 8C 00 4C */ lwz r12, 0x4c(r12)
@@ -449,7 +449,7 @@ lbl_8008585C:
/* 8008590C 0008284C 7F 03 C3 78 */ mr r3, r24
/* 80085910 00082850 38 81 00 38 */ addi r4, r1, 0x38
/* 80085914 00082854 38 B8 01 C8 */ addi r5, r24, 0x1c8
/* 80085918 00082858 48 1D DD 89 */ bl cCcD_DivideArea_NS_CalcDivideInfoOverArea
/* 80085918 00082858 48 1D DD 89 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab
/* 8008591C 0008285C 7F 63 DB 78 */ mr r3, r27
/* 80085920 00082860 4B FF FA 15 */ bl dCcMassS_HitInf_NS_ClearPointer
/* 80085924 00082864 88 18 02 00 */ lbz r0, 0x200(r24)
@@ -460,7 +460,7 @@ lbl_8008585C:
lbl_80085938:
/* 80085938 00082878 38 7F 00 0C */ addi r3, r31, 0xc
/* 8008593C 0008287C 38 81 00 38 */ addi r4, r1, 0x38
/* 80085940 00082880 48 1D DA 29 */ bl cCcD_DivideInfo_NS_Chk
/* 80085940 00082880 48 1D DA 29 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo
/* 80085944 00082884 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80085948 00082888 41 82 00 8C */ beq lbl_800859D4
/* 8008594C 0008288C 82 FF 00 00 */ lwz r23, 0(r31)
@@ -513,7 +513,7 @@ lbl_800859F0:
lbl_800859F8:
/* 800859F8 00082938 38 7D 00 0C */ addi r3, r29, 0xc
/* 800859FC 0008293C 38 81 00 38 */ addi r4, r1, 0x38
/* 80085A00 00082940 48 1D D9 69 */ bl cCcD_DivideInfo_NS_Chk
/* 80085A00 00082940 48 1D D9 69 */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo
/* 80085A04 00082944 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80085A08 00082948 41 82 01 74 */ beq lbl_80085B7C
/* 80085A0C 0008294C 83 FD 00 00 */ lwz r31, 0(r29)
@@ -605,7 +605,7 @@ lbl_80085B54:
/* 80085B58 00082A98 C0 21 00 20 */ lfs f1, 0x20(r1)
/* 80085B5C 00082A9C C0 41 00 24 */ lfs f2, 0x24(r1)
/* 80085B60 00082AA0 C0 61 00 28 */ lfs f3, 0x28(r1)
/* 80085B64 00082AA4 48 1D DD D1 */ bl cCcD_Stts_NS_PlusCcMove
/* 80085B64 00082AA4 48 1D DD D1 */ bl PlusCcMove__9cCcD_SttsFfff
lbl_80085B68:
/* 80085B68 00082AA8 28 1B 00 00 */ cmplwi r27, 0
/* 80085B6C 00082AAC 41 82 00 10 */ beq lbl_80085B7C
@@ -626,7 +626,7 @@ lbl_80085B80:
/* 80085BA0 00082AE0 41 82 01 20 */ beq lbl_80085CC0
/* 80085BA4 00082AE4 38 78 02 64 */ addi r3, r24, 0x264
/* 80085BA8 00082AE8 38 81 00 38 */ addi r4, r1, 0x38
/* 80085BAC 00082AEC 48 1D D7 BD */ bl cCcD_DivideInfo_NS_Chk
/* 80085BAC 00082AEC 48 1D D7 BD */ bl Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo
/* 80085BB0 00082AF0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80085BB4 00082AF4 41 82 01 0C */ beq lbl_80085CC0
/* 80085BB8 00082AF8 38 78 01 C8 */ addi r3, r24, 0x1c8
@@ -743,10 +743,10 @@ lbl_80085D3C:
/* 80085D54 00082C94 41 80 FF E8 */ blt lbl_80085D3C
/* 80085D58 00082C98 38 7D 01 E8 */ addi r3, r29, 0x1e8
/* 80085D5C 00082C9C C0 22 8D 60 */ lfs f1, lbl_80452760-_SDA2_BASE_(r2)
/* 80085D60 00082CA0 48 1E 94 A1 */ bl cM3dGCyl_NS_SetR
/* 80085D60 00082CA0 48 1E 94 A1 */ bl SetR__8cM3dGCylFf
/* 80085D64 00082CA4 38 7D 01 E8 */ addi r3, r29, 0x1e8
/* 80085D68 00082CA8 C0 22 8D 60 */ lfs f1, lbl_80452760-_SDA2_BASE_(r2)
/* 80085D6C 00082CAC 48 1E 94 8D */ bl cM3dGCyl_NS_SetH
/* 80085D6C 00082CAC 48 1E 94 8D */ bl SetH__8cM3dGCylFf
/* 80085D70 00082CB0 38 00 00 00 */ li r0, 0
/* 80085D74 00082CB4 98 1D 02 00 */ stb r0, 0x200(r29)
/* 80085D78 00082CB8 38 00 00 04 */ li r0, 4
@@ -784,7 +784,7 @@ lbl_80085DDC:
/* 80085DE8 00082D28 41 81 00 18 */ bgt lbl_80085E00
/* 80085DEC 00082D2C 40 82 00 2C */ bne lbl_80085E18
/* 80085DF0 00082D30 C0 22 8D 6C */ lfs f1, lbl_8045276C-_SDA2_BASE_(r2)
/* 80085DF4 00082D34 48 1E 1B 61 */ bl cM_rndF
/* 80085DF4 00082D34 48 1E 1B 61 */ bl cM_rndF__Ff
/* 80085DF8 00082D38 FC 01 F8 40 */ fcmpo cr0, f1, f31
/* 80085DFC 00082D3C 40 80 00 1C */ bge lbl_80085E18
lbl_80085E00:
@@ -827,7 +827,7 @@ dCcMassS_Mng_NS_SetCam:
/* 80085E78 00082DB8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80085E7C 00082DBC 7C 7F 1B 78 */ mr r31, r3
/* 80085E80 00082DC0 38 7F 02 44 */ addi r3, r31, 0x244
/* 80085E84 00082DC4 48 1E 91 FD */ bl cM3dGCps_NS_SetCps
/* 80085E84 00082DC4 48 1E 91 FD */ bl SetCps__8cM3dGCpsFRC8cM3dGCps
/* 80085E88 00082DC8 88 1F 02 02 */ lbz r0, 0x202(r31)
/* 80085E8C 00082DCC 60 00 00 01 */ ori r0, r0, 1
/* 80085E90 00082DD0 98 1F 02 02 */ stb r0, 0x202(r31)
asm/d/com/inf/d_com_inf_game.s
+4 -4
View File
@@ -2178,7 +2178,7 @@ dComIfGd_setSimpleShadow:
/* 8002D0F4 0002A034 FF E0 18 90 */ fmr f31, f3
/* 8002D0F8 0002A038 7C DF 33 78 */ mr r31, r6
/* 8002D0FC 0002A03C 7F A3 EB 78 */ mr r3, r29
/* 8002D100 0002A040 48 23 AF F9 */ bl cBgS_PolyInfo_NS_ChkSetInfo
/* 8002D100 0002A040 48 23 AF F9 */ bl ChkSetInfo__13cBgS_PolyInfoCFv
/* 8002D104 0002A044 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8002D108 0002A048 41 82 00 70 */ beq lbl_8002D178
/* 8002D10C 0002A04C C0 02 83 00 */ lfs f0, lbl_80451D00-_SDA2_BASE_(r2)
@@ -5656,7 +5656,7 @@ lbl_8002FF94:
/* 8002FFAC 0002CEEC 90 1E 2A A8 */ stw r0, 0x2aa8(r30)
/* 8002FFB0 0002CEF0 38 7E 2A 90 */ addi r3, r30, 0x2a90
/* 8002FFB4 0002CEF4 38 80 00 00 */ li r4, 0
/* 8002FFB8 0002CEF8 48 23 EF ED */ bl cM3dGCps_NS_dtor
/* 8002FFB8 0002CEF8 48 23 EF ED */ bl __dt__8cM3dGCpsFv
/* 8002FFBC 0002CEFC 28 1D 00 00 */ cmplwi r29, 0
/* 8002FFC0 0002CF00 41 82 00 20 */ beq lbl_8002FFE0
/* 8002FFC4 0002CF04 3C 60 80 3C */ lis r3, lbl_803C36D0@ha
@@ -5903,7 +5903,7 @@ dComIfG_inf_c:
/* 800302FC 0002D23C 90 1D 14 00 */ stw r0, 0x1400(r29)
/* 80030300 0002D240 3B BE 14 04 */ addi r29, r30, 0x1404
/* 80030304 0002D244 7F A3 EB 78 */ mr r3, r29
/* 80030308 0002D248 48 23 47 65 */ bl cCcS
/* 80030308 0002D248 48 23 47 65 */ bl __ct__4cCcSFv
/* 8003030C 0002D24C 3C 60 80 3B */ lis r3, lbl_803AC3E4@ha
/* 80030310 0002D250 38 03 C3 E4 */ addi r0, r3, lbl_803AC3E4@l
/* 80030314 0002D254 90 1D 28 48 */ stw r0, 0x2848(r29)
@@ -6508,7 +6508,7 @@ lbl_80030AB4:
/* 80030ACC 0002DA0C 90 1E 02 5C */ stw r0, 0x25c(r30)
/* 80030AD0 0002DA10 38 7E 02 44 */ addi r3, r30, 0x244
/* 80030AD4 0002DA14 38 80 00 00 */ li r4, 0
/* 80030AD8 0002DA18 48 23 E4 CD */ bl cM3dGCps_NS_dtor
/* 80030AD8 0002DA18 48 23 E4 CD */ bl __dt__8cM3dGCpsFv
/* 80030ADC 0002DA1C 34 1E 02 24 */ addic. r0, r30, 0x224
/* 80030AE0 0002DA20 41 82 00 24 */ beq lbl_80030B04
/* 80030AE4 0002DA24 3C 60 80 3C */ lis r3, lbl_803C36D0@ha

Some files were not shown because too many files have changed in this diff Show More