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

f_op_actor_mng split & started decomp (#112)

Browse Source 
* fop-actor-mng

* rodata

* more actor mng progress

* actor mng progress

* format

* cleanup

* fix Mtx function signatures

* PR suggestion

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-02-12 19:47:46 -05:00
committed by GitHub
co-authored by Pheenoh
parent 103e9a3865
commit aff4c171fc
295 changed files with 6350 additions and 5712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/c/c_damagereaction.s
+1 -1
View File
@@ -89,7 +89,7 @@ lbl_8001829C:
/* 800182C0 00015200 28 00 00 00 */ cmplwi r0, 0
/* 800182C4 00015204 41 82 00 50 */ beq lbl_80018314
/* 800182C8 00015208 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 800182CC 0001520C 48 00 38 49 */ bl fopAcM_getTalkEventPartner
/* 800182CC 0001520C 48 00 38 49 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c
/* 800182D0 00015210 28 03 00 00 */ cmplwi r3, 0
/* 800182D4 00015214 41 82 00 40 */ beq lbl_80018314
/* 800182D8 00015218 A8 03 00 08 */ lha r0, 8(r3)
asm/d/a/d_a_itembase.s
+1 -1
View File
@@ -409,7 +409,7 @@ daItemBase_c_NS_setListEnd:
/* 80144CF4 00141C34 80 7F 05 74 */ lwz r3, 0x574(r31)
/* 80144CF8 00141C38 80 83 00 04 */ lwz r4, 4(r3)
/* 80144CFC 00141C3C 7F E3 FB 78 */ mr r3, r31
/* 80144D00 00141C40 4B ED 87 2D */ bl fopAcM_setEffectMtx
/* 80144D00 00141C40 4B ED 87 2D */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData
lbl_80144D04:
/* 80144D04 00141C44 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80144D08 00141C48 80 01 00 14 */ lwz r0, 0x14(r1)
asm/d/a/d_a_npc.s
+33 -33
View File
@@ -36,7 +36,7 @@ daNpcT_ActorMngr_c_NS_getActorP:
/* 80145718 00142658 90 01 00 08 */ stw r0, 8(r1)
/* 8014571C 0014265C 80 63 00 00 */ lwz r3, 0(r3)
/* 80145720 00142660 38 81 00 08 */ addi r4, r1, 8
/* 80145724 00142664 4B ED 42 99 */ bl fopAcM_SearchByID
/* 80145724 00142664 4B ED 42 99 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
/* 80145728 00142668 2C 03 00 01 */ cmpwi r3, 1
/* 8014572C 0014266C 40 82 00 24 */ bne lbl_80145750
/* 80145730 00142670 80 61 00 08 */ lwz r3, 8(r1)
@@ -2670,7 +2670,7 @@ lbl_80147D8C:
/* 80147E04 00144D44 D0 1E 00 10 */ stfs f0, 0x10(r30)
/* 80147E08 00144D48 7C 83 23 78 */ mr r3, r4
/* 80147E0C 00144D4C 7C A4 2B 78 */ mr r4, r5
/* 80147E10 00144D50 4B ED 29 01 */ bl fopAcM_searchActorAngleY
/* 80147E10 00144D50 4B ED 29 01 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80147E14 00144D54 7C 1F 18 50 */ subf r0, r31, r3
/* 80147E18 00144D58 B0 1E 00 16 */ sth r0, 0x16(r30)
/* 80147E1C 00144D5C 38 00 40 00 */ li r0, 0x4000
@@ -3200,7 +3200,7 @@ lbl_80148584:
/* 80148594 001454D4 4E 80 04 21 */ bctrl
/* 80148598 001454D8 7F C3 F3 78 */ mr r3, r30
/* 8014859C 001454DC 38 9E 08 64 */ addi r4, r30, 0x864
/* 801485A0 001454E0 4B ED 21 2D */ bl fopAcM_posMoveF
/* 801485A0 001454E0 4B ED 21 2D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
/* 801485A4 001454E4 38 7E 06 8C */ addi r3, r30, 0x68c
/* 801485A8 001454E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801485AC 001454EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
@@ -3237,7 +3237,7 @@ lbl_80148584:
/* 80148628 00145568 90 1E 09 68 */ stw r0, 0x968(r30)
/* 8014862C 0014556C 38 7E 09 44 */ addi r3, r30, 0x944
/* 80148630 00145570 A8 9E 04 DE */ lha r4, 0x4de(r30)
/* 80148634 00145574 4B ED 54 B1 */ bl fopAcM_getPolygonAngle
/* 80148634 00145574 4B ED 54 B1 */ bl fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos
/* 80148638 00145578 B0 7E 0D CA */ sth r3, 0xdca(r30)
/* 8014863C 0014557C C0 1E 07 24 */ lfs f0, 0x724(r30)
/* 80148640 00145580 D0 1E 0D F4 */ stfs f0, 0xdf4(r30)
@@ -3535,7 +3535,7 @@ lbl_80148A74:
/* 80148A78 001459B8 41 82 00 10 */ beq lbl_80148A88
/* 80148A7C 001459BC 7E E3 BB 78 */ mr r3, r23
/* 80148A80 001459C0 7F C4 F3 78 */ mr r4, r30
/* 80148A84 001459C4 4B ED 49 A9 */ bl fopAcM_setEffectMtx
/* 80148A84 001459C4 4B ED 49 A9 */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData
lbl_80148A88:
/* 80148A88 001459C8 2C 1B 00 00 */ cmpwi r27, 0
/* 80148A8C 001459CC 41 82 00 1C */ beq lbl_80148AA8
@@ -4910,7 +4910,7 @@ lbl_80149D68:
/* 80149E3C 00146D7C D0 01 00 40 */ stfs f0, 0x40(r1)
/* 80149E40 00146D80 38 7A 0A F4 */ addi r3, r26, 0xaf4
/* 80149E44 00146D84 A8 9A 0D 7A */ lha r4, 0xd7a(r26)
/* 80149E48 00146D88 4B ED 3C 9D */ bl fopAcM_getPolygonAngle
/* 80149E48 00146D88 4B ED 3C 9D */ bl fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos
/* 80149E4C 00146D8C B0 7A 0D CE */ sth r3, 0xdce(r26)
/* 80149E50 00146D90 7F 23 CB 78 */ mr r3, r25
/* 80149E54 00146D94 38 9A 0A F4 */ addi r4, r26, 0xaf4
@@ -4947,7 +4947,7 @@ lbl_80149E6C:
/* 80149EC8 00146E08 D0 01 00 34 */ stfs f0, 0x34(r1)
/* 80149ECC 00146E0C 38 7A 0A F4 */ addi r3, r26, 0xaf4
/* 80149ED0 00146E10 A8 9A 0D 7A */ lha r4, 0xd7a(r26)
/* 80149ED4 00146E14 4B ED 3C 11 */ bl fopAcM_getPolygonAngle
/* 80149ED4 00146E14 4B ED 3C 11 */ bl fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos
/* 80149ED8 00146E18 B0 7A 0D D2 */ sth r3, 0xdd2(r26)
/* 80149EDC 00146E1C 7F 23 CB 78 */ mr r3, r25
/* 80149EE0 00146E20 38 9A 0A F4 */ addi r4, r26, 0xaf4
@@ -5131,7 +5131,7 @@ lbl_8014A144:
/* 8014A180 001470C0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 8014A184 001470C4 38 E0 00 28 */ li r7, 0x28
/* 8014A188 001470C8 39 00 00 01 */ li r8, 1
/* 8014A18C 001470CC 4B ED 14 F1 */ bl fopAcM_orderOtherEventId
/* 8014A18C 001470CC 4B ED 14 F1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 8014A190 001470D0 48 00 00 80 */ b lbl_8014A210
lbl_8014A194:
/* 8014A194 001470D4 88 1F 0A 89 */ lbz r0, 0xa89(r31)
@@ -5167,7 +5167,7 @@ lbl_8014A1F4:
/* 8014A200 00147140 7F E3 FB 78 */ mr r3, r31
/* 8014A204 00147144 38 80 00 00 */ li r4, 0
/* 8014A208 00147148 38 A0 00 00 */ li r5, 0
/* 8014A20C 0014714C 4B ED 0F 91 */ bl fopAcM_orderSpeakEvent
/* 8014A20C 0014714C 4B ED 0F 91 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs
lbl_8014A210:
/* 8014A210 00147150 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8014A214 00147154 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -5235,7 +5235,7 @@ lbl_8014A2BC:
/* 8014A2FC 0014723C 38 A0 00 01 */ li r5, 1
/* 8014A300 00147240 3C C0 00 01 */ lis r6, 0x0000FFFF@ha
/* 8014A304 00147244 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 8014A308 00147248 4B ED 12 DD */ bl fopAcM_orderChangeEventId
/* 8014A308 00147248 4B ED 12 DD */ bl fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs
lbl_8014A30C:
/* 8014A30C 0014724C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8014A310 00147250 83 C1 00 08 */ lwz r30, 8(r1)
@@ -6912,7 +6912,7 @@ lbl_8014BAE8:
/* 8014BB48 00148A88 C3 C3 00 00 */ lfs f30, 0(r3)
/* 8014BB4C 00148A8C 7F 83 E3 78 */ mr r3, r28
/* 8014BB50 00148A90 7F A4 EB 78 */ mr r4, r29
/* 8014BB54 00148A94 4B EC EE 11 */ bl fopAcM_searchActorDistanceXZ
/* 8014BB54 00148A94 4B EC EE 11 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8014BB58 00148A98 FC 01 F8 40 */ fcmpo cr0, f1, f31
/* 8014BB5C 00148A9C 40 80 00 0C */ bge lbl_8014BB68
/* 8014BB60 00148AA0 38 60 00 00 */ li r3, 0
@@ -6974,7 +6974,7 @@ daNpcT_c_NS_initTalk:
/* 8014BC24 00148B64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8014BC28 00148B68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8014BC2C 00148B6C 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 8014BC30 00148B70 4B EC EA E1 */ bl fopAcM_searchActorAngleY
/* 8014BC30 00148B70 4B EC EA E1 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8014BC34 00148B74 B0 7F 0D C8 */ sth r3, 0xdc8(r31)
/* 8014BC38 00148B78 A8 1F 0D D8 */ lha r0, 0xdd8(r31)
/* 8014BC3C 00148B7C 2C 00 00 01 */ cmpwi r0, 1
@@ -7140,12 +7140,12 @@ lbl_8014BE10:
lbl_8014BE84:
/* 8014BE84 00148DC4 7F 63 DB 78 */ mr r3, r27
/* 8014BE88 00148DC8 7C 9E F8 2E */ lwzx r4, r30, r31
/* 8014BE8C 00148DCC 4B EC E9 55 */ bl fopAcM_searchActorDistance
/* 8014BE8C 00148DCC 4B EC E9 55 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8014BE90 00148DD0 FC 01 F8 40 */ fcmpo cr0, f1, f31
/* 8014BE94 00148DD4 40 80 00 18 */ bge lbl_8014BEAC
/* 8014BE98 00148DD8 7F 63 DB 78 */ mr r3, r27
/* 8014BE9C 00148DDC 7C 9E F8 2E */ lwzx r4, r30, r31
/* 8014BEA0 00148DE0 4B EC E9 41 */ bl fopAcM_searchActorDistance
/* 8014BEA0 00148DE0 4B EC E9 41 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8014BEA4 00148DE4 FF E0 08 90 */ fmr f31, f1
/* 8014BEA8 00148DE8 7F BE F8 2E */ lwzx r29, r30, r31
lbl_8014BEAC:
@@ -8941,7 +8941,7 @@ lbl_8014D830:
/* 8014D848 0014A788 90 01 00 08 */ stw r0, 8(r1)
/* 8014D84C 0014A78C 80 63 00 04 */ lwz r3, 4(r3)
/* 8014D850 0014A790 38 81 00 08 */ addi r4, r1, 8
/* 8014D854 0014A794 4B EC C1 69 */ bl fopAcM_SearchByID
/* 8014D854 0014A794 4B EC C1 69 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
/* 8014D858 0014A798 2C 03 00 00 */ cmpwi r3, 0
/* 8014D85C 0014A79C 41 82 00 14 */ beq lbl_8014D870
/* 8014D860 0014A7A0 80 61 00 08 */ lwz r3, 8(r1)
@@ -10253,7 +10253,7 @@ lbl_8014EAB4:
/* 8014EB04 0014BA44 4E 80 04 21 */ bctrl
/* 8014EB08 0014BA48 7F E3 FB 78 */ mr r3, r31
/* 8014EB0C 0014BA4C 38 9F 08 9C */ addi r4, r31, 0x89c
/* 8014EB10 0014BA50 4B EC BB BD */ bl fopAcM_posMoveF
/* 8014EB10 0014BA50 4B EC BB BD */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
/* 8014EB14 0014BA54 38 7F 05 6C */ addi r3, r31, 0x56c
/* 8014EB18 0014BA58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8014EB1C 0014BA5C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
@@ -10602,7 +10602,7 @@ lbl_8014EFE8:
/* 8014F03C 0014BF7C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 8014F040 0014BF80 38 E0 00 00 */ li r7, 0
/* 8014F044 0014BF84 39 00 00 01 */ li r8, 1
/* 8014F048 0014BF88 4B EC C6 35 */ bl fopAcM_orderOtherEventId
/* 8014F048 0014BF88 4B EC C6 35 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 8014F04C 0014BF8C 48 00 00 3C */ b lbl_8014F088
lbl_8014F050:
/* 8014F050 0014BF90 80 1F 08 48 */ lwz r0, 0x848(r31)
@@ -10618,7 +10618,7 @@ lbl_8014F050:
/* 8014F078 0014BFB8 41 82 00 10 */ beq lbl_8014F088
/* 8014F07C 0014BFBC 38 80 00 00 */ li r4, 0
/* 8014F080 0014BFC0 38 A0 00 00 */ li r5, 0
/* 8014F084 0014BFC4 4B EC C1 19 */ bl fopAcM_orderSpeakEvent
/* 8014F084 0014BFC4 4B EC C1 19 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs
lbl_8014F088:
/* 8014F088 0014BFC8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8014F08C 0014BFCC 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -11050,7 +11050,7 @@ lbl_8014F5F8:
.global CheckCreateHeap_X1_
/* 8014F678 0014C5B8 38 84 F4 F8 */ addi r4, r4, CheckCreateHeap_X1_@l
/* 8014F67C 0014C5BC 7F E5 FB 78 */ mr r5, r31
/* 8014F680 0014C5C0 4B EC AE 31 */ bl fopAcM_entrySolidHeap
/* 8014F680 0014C5C0 4B EC AE 31 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 8014F684 0014C5C4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8014F688 0014C5C8 40 82 00 0C */ bne lbl_8014F694
/* 8014F68C 0014C5CC 38 60 00 05 */ li r3, 5
@@ -11907,7 +11907,7 @@ lbl_801502A0:
lbl_801502B4:
/* 801502B4 0014D1F4 38 61 00 08 */ addi r3, r1, 8
/* 801502B8 0014D1F8 7F C4 F3 78 */ mr r4, r30
/* 801502BC 0014D1FC 4B EC D9 1D */ bl fopAcM_getPolygonAngle_X1_
/* 801502BC 0014D1FC 4B EC D9 1D */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas
/* 801502C0 0014D200 3C 80 80 3A */ lis r4, lbl_803A37C0@ha
/* 801502C4 0014D204 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l
/* 801502C8 0014D208 90 01 00 18 */ stw r0, 0x18(r1)
@@ -12238,7 +12238,7 @@ daNpcF_ActorMngr_c_NS_getActorP:
/* 801506FC 0014D63C 90 01 00 08 */ stw r0, 8(r1)
/* 80150700 0014D640 80 63 00 00 */ lwz r3, 0(r3)
/* 80150704 0014D644 38 81 00 08 */ addi r4, r1, 8
/* 80150708 0014D648 4B EC 92 B5 */ bl fopAcM_SearchByID
/* 80150708 0014D648 4B EC 92 B5 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
/* 8015070C 0014D64C 2C 03 00 01 */ cmpwi r3, 1
/* 80150710 0014D650 40 82 00 14 */ bne lbl_80150724
/* 80150714 0014D654 80 61 00 08 */ lwz r3, 8(r1)
@@ -13989,7 +13989,7 @@ lbl_80151FF8:
/* 80152054 0014EF94 41 82 01 14 */ beq lbl_80152168
/* 80152058 0014EF98 7F E3 FB 78 */ mr r3, r31
/* 8015205C 0014EF9C 38 9F 07 A8 */ addi r4, r31, 0x7a8
/* 80152060 0014EFA0 4B EC 86 6D */ bl fopAcM_posMoveF
/* 80152060 0014EFA0 4B EC 86 6D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
/* 80152064 0014EFA4 38 7F 05 D0 */ addi r3, r31, 0x5d0
/* 80152068 0014EFA8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015206C 0014EFAC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
@@ -14302,7 +14302,7 @@ lbl_801524E8:
/* 801524EC 0014F42C 41 82 00 10 */ beq lbl_801524FC
/* 801524F0 0014F430 7F 43 D3 78 */ mr r3, r26
/* 801524F4 0014F434 7F C4 F3 78 */ mr r4, r30
/* 801524F8 0014F438 4B EC AF 35 */ bl fopAcM_setEffectMtx
/* 801524F8 0014F438 4B EC AF 35 */ bl fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData
lbl_801524FC:
/* 801524FC 0014F43C 88 1A 09 F4 */ lbz r0, 0x9f4(r26)
/* 80152500 0014F440 28 00 00 00 */ cmplwi r0, 0
@@ -15462,7 +15462,7 @@ lbl_80153560:
/* 801535D0 00150510 41 82 00 58 */ beq lbl_80153628
/* 801535D4 00150514 7F 63 DB 78 */ mr r3, r27
/* 801535D8 00150518 7F E4 FB 78 */ mr r4, r31
/* 801535DC 0015051C 4B EC 71 35 */ bl fopAcM_searchActorAngleY
/* 801535DC 0015051C 4B EC 71 35 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 801535E0 00150520 A8 1B 08 F2 */ lha r0, 0x8f2(r27)
/* 801535E4 00150524 7C 00 18 50 */ subf r0, r0, r3
/* 801535E8 00150528 B0 1B 09 90 */ sth r0, 0x990(r27)
@@ -15673,7 +15673,7 @@ lbl_80153860:
/* 801538D8 00150818 7F 86 E3 78 */ mr r6, r28
/* 801538DC 0015081C 7F A7 EB 78 */ mr r7, r29
/* 801538E0 00150820 7F E8 FB 78 */ mr r8, r31
/* 801538E4 00150824 4B EC 7D 99 */ bl fopAcM_orderOtherEventId
/* 801538E4 00150824 4B EC 7D 99 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 801538E8 00150828 48 00 00 54 */ b lbl_8015393C
lbl_801538EC:
/* 801538EC 0015082C 88 1A 09 F4 */ lbz r0, 0x9f4(r26)
@@ -15697,7 +15697,7 @@ lbl_80153918:
/* 8015392C 0015086C 7F 43 D3 78 */ mr r3, r26
/* 80153930 00150870 38 80 00 00 */ li r4, 0
/* 80153934 00150874 38 A0 00 00 */ li r5, 0
/* 80153938 00150878 4B EC 78 65 */ bl fopAcM_orderSpeakEvent
/* 80153938 00150878 4B EC 78 65 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs
lbl_8015393C:
/* 8015393C 0015087C 39 61 00 20 */ addi r11, r1, 0x20
/* 80153940 00150880 48 20 E8 DD */ bl _restgpr_26
@@ -15738,7 +15738,7 @@ lbl_80153998:
/* 801539C8 00150908 A8 9B 09 D4 */ lha r4, 0x9d4(r27)
/* 801539CC 0015090C 7F A5 EB 78 */ mr r5, r29
/* 801539D0 00150910 7F C6 F3 78 */ mr r6, r30
/* 801539D4 00150914 4B EC 7C 11 */ bl fopAcM_orderChangeEventId
/* 801539D4 00150914 4B EC 7C 11 */ bl fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs
/* 801539D8 00150918 39 61 00 20 */ addi r11, r1, 0x20
/* 801539DC 0015091C 48 20 E8 45 */ bl _restgpr_27
/* 801539E0 00150920 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -15753,7 +15753,7 @@ lbl_80153998:
/* 80153A04 00150944 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80153A08 00150948 FF E0 08 90 */ fmr f31, f1
/* 80153A0C 0015094C AB E3 09 04 */ lha r31, 0x904(r3)
/* 80153A10 00150950 4B EC 6D 01 */ bl fopAcM_searchActorAngleY
/* 80153A10 00150950 4B EC 6D 01 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80153A14 00150954 7C 1F 18 50 */ subf r0, r31, r3
/* 80153A18 00150958 7C 03 07 34 */ extsh r3, r0
/* 80153A1C 0015095C 48 21 16 B5 */ bl abs
@@ -16453,7 +16453,7 @@ lbl_80154354:
/* 80154460 001513A0 7D 89 03 A6 */ mtctr r12
/* 80154464 001513A4 4E 80 04 21 */ bctrl
/* 80154468 001513A8 38 81 00 08 */ addi r4, r1, 8
/* 8015446C 001513AC 4B EC 55 51 */ bl fopAcM_SearchByID
/* 8015446C 001513AC 4B EC 55 51 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
/* 80154470 001513B0 80 18 09 34 */ lwz r0, 0x934(r24)
/* 80154474 001513B4 54 03 18 38 */ slwi r3, r0, 3
/* 80154478 001513B8 38 63 08 2C */ addi r3, r3, 0x82c
@@ -16483,7 +16483,7 @@ lbl_801544B0:
/* 801544D0 00151410 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801544D4 00151414 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801544D8 00151418 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 801544DC 0015141C 4B EC 64 89 */ bl fopAcM_searchActorDistanceXZ
/* 801544DC 0015141C 4B EC 64 89 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 801544E0 00151420 FF 60 08 90 */ fmr f27, f1
lbl_801544E4:
/* 801544E4 00151424 38 00 00 00 */ li r0, 0
@@ -16547,7 +16547,7 @@ lbl_801545B8:
/* 801545BC 001514FC 40 82 00 24 */ bne lbl_801545E0
/* 801545C0 00151500 7F 03 C3 78 */ mr r3, r24
/* 801545C4 00151504 7C 96 D0 2E */ lwzx r4, r22, r26
/* 801545C8 00151508 4B EC 63 9D */ bl fopAcM_searchActorDistanceXZ
/* 801545C8 00151508 4B EC 63 9D */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 801545CC 0015150C FC 01 E0 40 */ fcmpo cr0, f1, f28
/* 801545D0 00151510 40 80 00 10 */ bge lbl_801545E0
/* 801545D4 00151514 7C 16 D0 2E */ lwzx r0, r22, r26
@@ -16573,7 +16573,7 @@ lbl_801545E8:
/* 8015461C 0015155C 7D 89 03 A6 */ mtctr r12
/* 80154620 00151560 4E 80 04 21 */ bctrl
/* 80154624 00151564 38 81 00 08 */ addi r4, r1, 8
/* 80154628 00151568 4B EC 53 95 */ bl fopAcM_SearchByID
/* 80154628 00151568 4B EC 53 95 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c
/* 8015462C 0015156C 3B 80 00 01 */ li r28, 1
lbl_80154630:
/* 80154630 00151570 80 81 00 08 */ lwz r4, 8(r1)
@@ -17679,7 +17679,7 @@ lbl_801555DC:
lbl_801555F0:
/* 801555F0 00152530 38 61 00 08 */ addi r3, r1, 8
/* 801555F4 00152534 7F C4 F3 78 */ mr r4, r30
/* 801555F8 00152538 4B EC 85 E1 */ bl fopAcM_getPolygonAngle_X1_
/* 801555F8 00152538 4B EC 85 E1 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas
/* 801555FC 0015253C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha
/* 80155600 00152540 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l
/* 80155604 00152544 90 01 00 18 */ stw r0, 0x18(r1)
asm/d/a/d_a_obj.s
+1 -1
View File
@@ -481,7 +481,7 @@ lbl_80037748:
/* 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
/* 8003775C 0003469C 4B FE 2F 05 */ bl fopAcM_posMove
/* 8003775C 0003469C 4B FE 2F 05 */ bl fopAcM_posMove__FP10fopAc_ac_cPC4cXyz
/* 80037760 000346A0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0
/* 80037764 000346A4 CB E1 00 40 */ lfd f31, 0x40(r1)
/* 80037768 000346A8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0
asm/d/a/d_a_player.s
+1 -1
View File
@@ -600,7 +600,7 @@ daPy_actorKeep_c_NS_setActor:
.global fpcSch_JudgeByID
/* 8015EC74 0015BBB4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8015EC78 0015BBB8 38 81 00 08 */ addi r4, r1, 8
/* 8015EC7C 0015BBBC 4B EB AB 7D */ bl fopAcIt_Judge
/* 8015EC7C 0015BBBC 4B EB AB 7D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8015EC80 0015BBC0 90 7F 00 04 */ stw r3, 4(r31)
/* 8015EC84 0015BBC4 80 1F 00 04 */ lwz r0, 4(r31)
/* 8015EC88 0015BBC8 28 00 00 00 */ cmplwi r0, 0
asm/d/a/no/chg/d_a_no_chg_room.s
+1 -1
View File
@@ -257,7 +257,7 @@ lbl_80145540:
/* 8014555C 0014249C 38 A1 00 08 */ addi r5, r1, 8
/* 80145560 001424A0 48 20 18 0D */ bl PSMTXMultVec
/* 80145564 001424A4 38 61 00 08 */ addi r3, r1, 8
/* 80145568 001424A8 4B ED 87 55 */ bl fopAcM_gc_c_NS_gndCheck
/* 80145568 001424A8 4B ED 87 55 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 8014556C 001424AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80145570 001424B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
/* 80145574 001424B4 38 63 0F 38 */ addi r3, r3, 0xf38
asm/d/a/npc/d_a_npc_cd2.s
+5 -5
View File
@@ -1820,7 +1820,7 @@ s_sub1:
/* 80159738 00156678 40 82 00 6C */ bne lbl_801597A4
/* 8015973C 0015667C 7F E3 FB 78 */ mr r3, r31
/* 80159740 00156680 7F C4 F3 78 */ mr r4, r30
/* 80159744 00156684 4B EC 0F CD */ bl fopAcM_searchActorAngleY
/* 80159744 00156684 4B EC 0F CD */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 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__Fss
@@ -1829,7 +1829,7 @@ s_sub1:
/* 8015975C 0015669C 40 82 00 20 */ bne lbl_8015977C
/* 80159760 001566A0 7F E3 FB 78 */ mr r3, r31
/* 80159764 001566A4 7F C4 F3 78 */ mr r4, r30
/* 80159768 001566A8 4B EC 13 2D */ bl fopAcM_searchActorDistanceXZ2
/* 80159768 001566A8 4B EC 13 2D */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8015976C 001566AC D0 2D 8A 88 */ stfs f1, lbl_80451008-_SDA_BASE_(r13)
/* 80159770 001566B0 93 CD 8A 84 */ stw r30, lbl_80451004-_SDA_BASE_(r13)
/* 80159774 001566B4 38 60 00 00 */ li r3, 0
@@ -1839,7 +1839,7 @@ lbl_8015977C:
/* 80159780 001566C0 40 81 00 24 */ ble lbl_801597A4
/* 80159784 001566C4 7F E3 FB 78 */ mr r3, r31
/* 80159788 001566C8 7F C4 F3 78 */ mr r4, r30
/* 8015978C 001566CC 4B EC 13 09 */ bl fopAcM_searchActorDistanceXZ2
/* 8015978C 001566CC 4B EC 13 09 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 80159790 001566D0 C0 0D 8A 88 */ lfs f0, lbl_80451008-_SDA_BASE_(r13)
/* 80159794 001566D4 FC 00 08 40 */ fcmpo cr0, f0, f1
/* 80159798 001566D8 40 81 00 0C */ ble lbl_801597A4
@@ -1864,7 +1864,7 @@ lbl_801597A8:
/* 801597DC 0015671C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 801597E0 00156720 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 801597E4 00156724 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 801597E8 00156728 4B EC 0F 29 */ bl fopAcM_searchActorAngleY
/* 801597E8 00156728 4B EC 0F 29 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 801597EC 0015672C B0 6D 8A 8C */ sth r3, lbl_8045100C-_SDA_BASE_(r13)
.global s_sub1
/* 801597F0 00156730 3C 60 80 16 */ lis r3, s_sub1@ha
@@ -1919,7 +1919,7 @@ lbl_80159894:
/* 801598A8 001567E8 FF E0 08 18 */ frsp f31, f1
/* 801598AC 001567EC 7F A3 EB 78 */ mr r3, r29
/* 801598B0 001567F0 80 9F 5D AC */ lwz r4, 0x5dac(r31)
/* 801598B4 001567F4 4B EC 11 E1 */ bl fopAcM_searchActorDistanceXZ2
/* 801598B4 001567F4 4B EC 11 E1 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 801598B8 001567F8 FC 01 F8 40 */ fcmpo cr0, f1, f31
/* 801598BC 001567FC 40 80 00 08 */ bge lbl_801598C4
/* 801598C0 00156800 3B C0 00 01 */ li r30, 1
asm/d/a/obj/d_a_obj_item.s
+15 -15
View File
@@ -871,7 +871,7 @@ lbl_8015B9B8:
/* 8015B9FC 0015893C 3C 80 80 03 */ lis r4, CheckFieldItemCreateHeap@ha
.global CheckFieldItemCreateHeap
/* 8015BA00 00158940 38 84 7B 78 */ addi r4, r4, CheckFieldItemCreateHeap@l
/* 8015BA04 00158944 4B EB EA AD */ bl fopAcM_entrySolidHeap
/* 8015BA04 00158944 4B EB EA AD */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 8015BA08 00158948 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015BA0C 0015894C 40 82 00 0C */ bne lbl_8015BA18
/* 8015BA10 00158950 38 60 00 05 */ li r3, 5
@@ -1004,7 +1004,7 @@ lbl_8015BBC4:
/* 8015BBE0 00158B20 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
/* 8015BBE4 00158B24 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
/* 8015BBE8 00158B28 80 84 5D AC */ lwz r4, 0x5dac(r4)
/* 8015BBEC 00158B2C 4B EB EB F5 */ bl fopAcM_searchActorDistance
/* 8015BBEC 00158B2C 4B EB EB F5 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8015BBF0 00158B30 C0 02 9B 90 */ lfs f0, lbl_80453590-_SDA2_BASE_(r2)
/* 8015BBF4 00158B34 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 8015BBF8 00158B38 40 80 00 0C */ bge lbl_8015BC04
@@ -1398,7 +1398,7 @@ daItem_c_NS_procMainSimpleGetDemo:
/* 8015C184 001590C4 D0 3F 04 D8 */ stfs f1, 0x4d8(r31)
/* 8015C188 001590C8 7F E3 FB 78 */ mr r3, r31
/* 8015C18C 001590CC 38 80 00 00 */ li r4, 0
/* 8015C190 001590D0 4B EB E5 3D */ bl fopAcM_posMoveF
/* 8015C190 001590D0 4B EB E5 3D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
/* 8015C194 001590D4 C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
/* 8015C198 001590D8 C0 21 00 18 */ lfs f1, 0x18(r1)
/* 8015C19C 001590DC FC 00 08 40 */ fcmpo cr0, f0, f1
@@ -1421,7 +1421,7 @@ lbl_8015C1A8:
/* 8015C1DC 0015911C 2C 00 00 00 */ cmpwi r0, 0
/* 8015C1E0 00159120 40 80 00 0C */ bge lbl_8015C1EC
/* 8015C1E4 00159124 7F E3 FB 78 */ mr r3, r31
/* 8015C1E8 00159128 4B EB DA 95 */ bl fopAcM_delete
/* 8015C1E8 00159128 4B EB DA 95 */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_8015C1EC:
/* 8015C1EC 0015912C 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 8015C1F0 00159130 80 01 00 34 */ lwz r0, 0x34(r1)
@@ -1454,7 +1454,7 @@ lbl_8015C240:
/* 8015C248 00159188 7F E3 FB 78 */ mr r3, r31
/* 8015C24C 0015918C 38 80 00 00 */ li r4, 0
/* 8015C250 00159190 38 A0 00 00 */ li r5, 0
/* 8015C254 00159194 4B EB F7 7D */ bl fopAcM_orderItemEvent
/* 8015C254 00159194 4B EB F7 7D */ bl fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs
/* 8015C258 00159198 A0 1F 00 FA */ lhz r0, 0xfa(r31)
/* 8015C25C 0015919C 60 00 00 08 */ ori r0, r0, 8
/* 8015C260 001591A0 B0 1F 00 FA */ sth r0, 0xfa(r31)
@@ -1465,7 +1465,7 @@ lbl_8015C240:
/* 8015C274 001591B4 7C 06 07 74 */ extsb r6, r0
/* 8015C278 001591B8 38 E0 00 00 */ li r7, 0
/* 8015C27C 001591BC 39 00 00 00 */ li r8, 0
/* 8015C280 001591C0 4B EB F9 F5 */ bl fopAcM_createItemForTrBoxDemo
/* 8015C280 001591C0 4B EB F9 F5 */ bl fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz
/* 8015C284 001591C4 90 7F 09 4C */ stw r3, 0x94c(r31)
/* 8015C288 001591C8 38 00 00 03 */ li r0, 3
/* 8015C28C 001591CC 98 1F 09 4A */ stb r0, 0x94a(r31)
@@ -1500,7 +1500,7 @@ lbl_8015C2F4:
/* 8015C2FC 0015923C 40 82 00 20 */ bne lbl_8015C31C
/* 8015C300 00159240 38 80 00 00 */ li r4, 0
/* 8015C304 00159244 38 A0 00 00 */ li r5, 0
/* 8015C308 00159248 4B EB F6 C9 */ bl fopAcM_orderItemEvent
/* 8015C308 00159248 4B EB F6 C9 */ bl fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs
/* 8015C30C 0015924C A0 1E 00 FA */ lhz r0, 0xfa(r30)
/* 8015C310 00159250 60 00 00 08 */ ori r0, r0, 8
/* 8015C314 00159254 B0 1E 00 FA */ sth r0, 0xfa(r30)
@@ -1517,7 +1517,7 @@ lbl_8015C31C:
/* 8015C33C 0015927C 41 82 00 4C */ beq lbl_8015C388
lbl_8015C340:
/* 8015C340 00159280 80 7E 09 4C */ lwz r3, 0x94c(r30)
/* 8015C344 00159284 4B EB D9 75 */ bl fopAcM_delete_X1_
/* 8015C344 00159284 4B EB D9 75 */ bl fopAcM_delete__FUi
/* 8015C348 00159288 88 7E 09 2A */ lbz r3, 0x92a(r30)
/* 8015C34C 0015928C 38 80 00 01 */ li r4, 1
/* 8015C350 00159290 4B F3 BB 91 */ bl checkItemGet__FUci
@@ -1538,7 +1538,7 @@ lbl_8015C388:
/* 8015C388 001592C8 7F C3 F3 78 */ mr r3, r30
/* 8015C38C 001592CC 38 80 00 00 */ li r4, 0
/* 8015C390 001592D0 38 A0 00 00 */ li r5, 0
/* 8015C394 001592D4 4B EB F6 3D */ bl fopAcM_orderItemEvent
/* 8015C394 001592D4 4B EB F6 3D */ bl fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs
/* 8015C398 001592D8 A0 1E 00 FA */ lhz r0, 0xfa(r30)
/* 8015C39C 001592DC 60 00 00 08 */ ori r0, r0, 8
/* 8015C3A0 001592E0 B0 1E 00 FA */ sth r0, 0xfa(r30)
@@ -1566,7 +1566,7 @@ lbl_8015C3A4:
/* 8015C3F4 00159334 38 7F 4E C8 */ addi r3, r31, 0x4ec8
/* 8015C3F8 00159338 4B EE 60 71 */ bl dEvt_control_c_NS_reset
/* 8015C3FC 0015933C 7F C3 F3 78 */ mr r3, r30
/* 8015C400 00159340 4B EB D8 7D */ bl fopAcM_delete
/* 8015C400 00159340 4B EB D8 7D */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_8015C404:
/* 8015C404 00159344 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8015C408 00159348 83 C1 00 08 */ lwz r30, 8(r1)
@@ -1658,14 +1658,14 @@ daItem_c_NS_procInitBoomerangCarry:
/* 8015C554 00159494 40 82 00 48 */ bne lbl_8015C59C
/* 8015C558 00159498 7F A3 EB 78 */ mr r3, r29
/* 8015C55C 0015949C 80 9F 5D AC */ lwz r4, 0x5dac(r31)
/* 8015C560 001594A0 4B EB E2 81 */ bl fopAcM_searchActorDistance
/* 8015C560 001594A0 4B EB E2 81 */ bl fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c
/* 8015C564 001594A4 C0 02 9B A0 */ lfs f0, lbl_804535A0-_SDA2_BASE_(r2)
/* 8015C568 001594A8 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 8015C56C 001594AC 40 80 00 28 */ bge lbl_8015C594
/* 8015C570 001594B0 38 7D 04 D0 */ addi r3, r29, 0x4d0
/* 8015C574 001594B4 38 9E 04 D0 */ addi r4, r30, 0x4d0
/* 8015C578 001594B8 7F A5 EB 78 */ mr r5, r29
/* 8015C57C 001594BC 4B EC 16 ED */ bl fopAcM_lc_c_NS_lineCheck
/* 8015C57C 001594BC 4B EC 16 ED */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c
/* 8015C580 001594C0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8015C584 001594C4 40 82 00 10 */ bne lbl_8015C594
/* 8015C588 001594C8 7F A3 EB 78 */ mr r3, r29
@@ -2128,7 +2128,7 @@ lbl_8015CC04:
/* 8015CC08 00159B48 41 82 00 10 */ beq lbl_8015CC18
/* 8015CC0C 00159B4C 7F C3 F3 78 */ mr r3, r30
/* 8015CC10 00159B50 38 9E 07 A4 */ addi r4, r30, 0x7a4
/* 8015CC14 00159B54 4B EB DA B9 */ bl fopAcM_posMoveF
/* 8015CC14 00159B54 4B EB DA B9 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
lbl_8015CC18:
/* 8015CC18 00159B58 7F C3 F3 78 */ mr r3, r30
/* 8015CC1C 00159B5C 88 1E 09 49 */ lbz r0, 0x949(r30)
@@ -2300,7 +2300,7 @@ lbl_8015CE5C:
/* 8015CE5C 00159D9C 38 7F 09 B8 */ addi r3, r31, 0x9b8
/* 8015CE60 00159DA0 38 9F 04 D0 */ addi r4, r31, 0x4d0
/* 8015CE64 00159DA4 C0 42 9B B8 */ lfs f2, lbl_804535B8-_SDA2_BASE_(r2)
/* 8015CE68 00159DA8 4B EC 02 A5 */ bl fopAcM_effHamonSet
/* 8015CE68 00159DA8 4B EC 02 A5 */ bl fopAcM_effHamonSet__FPUlPC4cXyzff
/* 8015CE6C 00159DAC 7F E3 FB 78 */ mr r3, r31
/* 8015CE70 00159DB0 81 9F 05 68 */ lwz r12, 0x568(r31)
/* 8015CE74 00159DB4 81 8C 00 20 */ lwz r12, 0x20(r12)
@@ -2744,7 +2744,7 @@ daItem_c_NS_deleteItem:
/* 8015D48C 0015A3CC 88 03 09 48 */ lbz r0, 0x948(r3)
/* 8015D490 0015A3D0 60 00 00 20 */ ori r0, r0, 0x20
/* 8015D494 0015A3D4 98 03 09 48 */ stb r0, 0x948(r3)
/* 8015D498 0015A3D8 4B EB C7 E5 */ bl fopAcM_delete
/* 8015D498 0015A3D8 4B EB C7 E5 */ bl fopAcM_delete__FP10fopAc_ac_c
/* 8015D49C 0015A3DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8015D4A0 0015A3E0 7C 08 03 A6 */ mtlr r0
/* 8015D4A4 0015A3E4 38 21 00 10 */ addi r1, r1, 0x10
asm/d/bg/s/movebg/d_bg_s_movebg_actor.s
+1 -1
View File
@@ -161,7 +161,7 @@ lbl_80078844:
.global CheckCreateHeap
/* 80078858 00075798 38 84 86 68 */ addi r4, r4, CheckCreateHeap@l
/* 8007885C 0007579C 7F C5 F3 78 */ mr r5, r30
/* 80078860 000757A0 4B FA 1C 51 */ bl fopAcM_entrySolidHeap
/* 80078860 000757A0 4B FA 1C 51 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 80078864 000757A4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80078868 000757A8 40 82 00 0C */ bne lbl_80078874
/* 8007886C 000757AC 38 60 00 05 */ li r3, 5
asm/d/cc/d_cc_d.s
+1 -1
View File
@@ -50,7 +50,7 @@ lbl_800836B4:
.global fpcSch_JudgeByID
/* 800836C8 00080608 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800836CC 0008060C 38 81 00 08 */ addi r4, r1, 8
/* 800836D0 00080610 4B F9 61 29 */ bl fopAcIt_Judge
/* 800836D0 00080610 4B F9 61 29 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800836D4 00080614 90 7F 00 10 */ stw r3, 0x10(r31)
/* 800836D8 00080618 80 1F 00 10 */ lwz r0, 0x10(r31)
/* 800836DC 0008061C 28 00 00 00 */ cmplwi r0, 0
asm/d/com/d_com_static.s
+2 -2
View File
@@ -710,7 +710,7 @@ daTagStream_c_NS_checkArea:
/* 800318C0 0002E800 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 800318C4 0002E804 7C 7F 1B 78 */ mr r31, r3
/* 800318C8 0002E808 38 A1 00 08 */ addi r5, r1, 8
/* 800318CC 0002E80C 4B FE C0 35 */ bl fpoAcM_relativePos
/* 800318CC 0002E80C 4B FE C0 35 */ bl fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz
/* 800318D0 0002E810 C0 21 00 0C */ lfs f1, 0xc(r1)
/* 800318D4 0002E814 C0 02 83 54 */ lfs f0, lbl_80451D54-_SDA2_BASE_(r2)
/* 800318D8 0002E818 FC 01 00 40 */ fcmpo cr0, f1, f0
@@ -775,7 +775,7 @@ lbl_80031980:
/* 800319A8 0002E8E8 38 60 00 00 */ li r3, 0
/* 800319AC 0002E8EC 48 00 00 0C */ b lbl_800319B8
lbl_800319B0:
/* 800319B0 0002E8F0 4B FE 82 CD */ bl fopAcM_delete
/* 800319B0 0002E8F0 4B FE 82 CD */ bl fopAcM_delete__FP10fopAc_ac_c
/* 800319B4 0002E8F4 38 60 00 01 */ li r3, 1
lbl_800319B8:
/* 800319B8 0002E8F8 80 01 00 14 */ lwz r0, 0x14(r1)
asm/d/d_demo.s
+4 -4
View File
@@ -245,7 +245,7 @@ dDemo_actor_c_NS_getActor:
.global fpcSch_JudgeByID
/* 80038140 00035080 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 80038144 00035084 38 81 00 08 */ addi r4, r1, 8
/* 80038148 00035088 4B FE 16 B1 */ bl fopAcIt_Judge
/* 80038148 00035088 4B FE 16 B1 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8003814C 0003508C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80038150 00035090 7C 08 03 A6 */ mtlr r0
/* 80038154 00035094 38 21 00 10 */ addi r1, r1, 0x10
@@ -1690,7 +1690,7 @@ lbl_80039570:
/* 80039570 000364B0 7F A3 EB 78 */ mr r3, r29
/* 80039574 000364B4 38 80 00 00 */ li r4, 0
/* 80039578 000364B8 38 A0 00 00 */ li r5, 0
/* 8003957C 000364BC 4B FE 41 1D */ bl fopAcM_searchFromName
/* 8003957C 000364BC 4B FE 41 1D */ bl fopAcM_searchFromName__FPCcUlUl
/* 80039580 000364C0 7C 7F 1B 79 */ or. r31, r3, r3
/* 80039584 000364C4 40 82 00 70 */ bne lbl_800395F4
/* 80039588 000364C8 2C 1E 00 02 */ cmpwi r30, 2
@@ -1711,13 +1711,13 @@ lbl_80039570:
/* 800395C4 00036504 39 00 00 00 */ li r8, 0
/* 800395C8 00036508 39 20 00 00 */ li r9, 0
/* 800395CC 0003650C 39 40 00 00 */ li r10, 0
/* 800395D0 00036510 4B FE 08 9D */ bl fopAcM_fastCreate_X1_
/* 800395D0 00036510 4B FE 08 9D */ bl fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv
/* 800395D4 00036514 7C 7F 1B 79 */ or. r31, r3, r3
/* 800395D8 00036518 40 82 00 0C */ bne lbl_800395E4
/* 800395DC 0003651C 38 60 00 01 */ li r3, 1
/* 800395E0 00036520 48 00 00 80 */ b lbl_80039660
lbl_800395E4:
/* 800395E4 00036524 4B FE 02 E1 */ bl fopAcM_setStageLayer
/* 800395E4 00036524 4B FE 02 E1 */ bl fopAcM_setStageLayer__FPv
/* 800395E8 00036528 48 00 00 0C */ b lbl_800395F4
lbl_800395EC:
/* 800395EC 0003652C 38 60 00 01 */ li r3, 1
asm/d/d_event.s
+4 -4
View File
@@ -677,7 +677,7 @@ lbl_80041D7C:
/* 80041DA0 0003ECE0 B0 1F 00 DE */ sth r0, 0xde(r31)
lbl_80041DA4:
/* 80041DA4 0003ECE4 38 60 00 00 */ li r3, 0
/* 80041DA8 0003ECE8 4B FD 9D 9D */ bl fopAcM_getItemEventPartner
/* 80041DA8 0003ECE8 4B FD 9D 9D */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c
/* 80041DAC 0003ECEC 28 03 00 00 */ cmplwi r3, 0
/* 80041DB0 0003ECF0 41 82 00 14 */ beq lbl_80041DC4
/* 80041DB4 0003ECF4 A8 03 00 08 */ lha r0, 8(r3)
@@ -1365,7 +1365,7 @@ lbl_800426F4:
/* 8004271C 0003F65C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80042720 0003F660 38 E0 00 03 */ li r7, 3
/* 80042724 0003F664 39 00 04 00 */ li r8, 0x400
/* 80042728 0003F668 4B FD 8F 55 */ bl fopAcM_orderOtherEventId
/* 80042728 0003F668 4B FD 8F 55 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 8004272C 0003F66C 38 60 00 02 */ li r3, 2
/* 80042730 0003F670 48 00 00 30 */ b lbl_80042760
lbl_80042734:
@@ -1463,7 +1463,7 @@ lbl_80042850:
/* 8004287C 0003F7BC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80042880 0003F7C0 38 E0 00 03 */ li r7, 3
/* 80042884 0003F7C4 39 00 04 00 */ li r8, 0x400
/* 80042888 0003F7C8 4B FD 8D F5 */ bl fopAcM_orderOtherEventId
/* 80042888 0003F7C8 4B FD 8D F5 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 8004288C 0003F7CC 38 60 00 02 */ li r3, 2
/* 80042890 0003F7D0 48 00 00 34 */ b lbl_800428C4
lbl_80042894:
@@ -2252,7 +2252,7 @@ dEvt_control_c_NS_convPId:
.global fpcSch_JudgeByID
/* 80043300 00040240 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 80043304 00040244 38 81 00 08 */ addi r4, r1, 8
/* 80043308 00040248 4B FD 64 F1 */ bl fopAcIt_Judge
/* 80043308 00040248 4B FD 64 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8004330C 0004024C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80043310 00040250 7C 08 03 A6 */ mtlr r0
/* 80043314 00040254 38 21 00 10 */ addi r1, r1, 0x10
asm/d/d_insect.s
+6 -6
View File
@@ -53,11 +53,11 @@ lbl_8015E0B8:
/* 8015E0C4 0015B004 80 1F 05 5C */ lwz r0, 0x55c(r31)
/* 8015E0C8 0015B008 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a
/* 8015E0CC 0015B00C 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 8015E0D0 0015B010 4B EB EA D1 */ bl fopAcM_cancelCarryNow
/* 8015E0D0 0015B010 4B EB EA D1 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c
/* 8015E0D4 0015B014 7F E3 FB 78 */ mr r3, r31
/* 8015E0D8 0015B018 38 80 00 00 */ li r4, 0
/* 8015E0DC 0015B01C 38 A0 00 00 */ li r5, 0
/* 8015E0E0 0015B020 4B EB D8 F1 */ bl fopAcM_orderItemEvent
/* 8015E0E0 0015B020 4B EB D8 F1 */ bl fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs
/* 8015E0E4 0015B024 A0 1F 00 FA */ lhz r0, 0xfa(r31)
/* 8015E0E8 0015B028 60 00 00 08 */ ori r0, r0, 8
/* 8015E0EC 0015B02C B0 1F 00 FA */ sth r0, 0xfa(r31)
@@ -68,7 +68,7 @@ lbl_8015E0B8:
/* 8015E100 0015B040 7C 06 07 74 */ extsb r6, r0
/* 8015E104 0015B044 38 E0 00 00 */ li r7, 0
/* 8015E108 0015B048 39 00 00 00 */ li r8, 0
/* 8015E10C 0015B04C 4B EB DB 69 */ bl fopAcM_createItemForTrBoxDemo
/* 8015E10C 0015B04C 4B EB DB 69 */ bl fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz
/* 8015E110 0015B050 90 7F 05 88 */ stw r3, 0x588(r31)
/* 8015E114 0015B054 38 00 00 01 */ li r0, 1
/* 8015E118 0015B058 90 1F 05 8C */ stw r0, 0x58c(r31)
@@ -105,7 +105,7 @@ lbl_8015E174:
lbl_8015E188:
/* 8015E188 0015B0C8 38 80 00 00 */ li r4, 0
/* 8015E18C 0015B0CC 38 A0 00 00 */ li r5, 0
/* 8015E190 0015B0D0 4B EB D8 41 */ bl fopAcM_orderItemEvent
/* 8015E190 0015B0D0 4B EB D8 41 */ bl fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs
/* 8015E194 0015B0D4 A0 1F 00 FA */ lhz r0, 0xfa(r31)
/* 8015E198 0015B0D8 60 00 00 08 */ ori r0, r0, 8
/* 8015E19C 0015B0DC B0 1F 00 FA */ sth r0, 0xfa(r31)
@@ -150,13 +150,13 @@ lbl_8015E204:
/* 8015E230 0015B170 38 E0 00 00 */ li r7, 0
/* 8015E234 0015B174 39 00 00 00 */ li r8, 0
/* 8015E238 0015B178 39 20 00 00 */ li r9, 0
/* 8015E23C 0015B17C 4B EB E0 05 */ bl fopAcM_createItem
/* 8015E23C 0015B17C 4B EB E0 05 */ bl fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi
/* 8015E240 0015B180 38 00 00 01 */ li r0, 1
/* 8015E244 0015B184 98 1F 05 84 */ stb r0, 0x584(r31)
/* 8015E248 0015B188 48 00 00 0C */ b lbl_8015E254
lbl_8015E24C:
/* 8015E24C 0015B18C 7F E3 FB 78 */ mr r3, r31
/* 8015E250 0015B190 4B EB BA 2D */ bl fopAcM_delete
/* 8015E250 0015B190 4B EB BA 2D */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_8015E254:
/* 8015E254 0015B194 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8015E258 0015B198 83 C1 00 08 */ lwz r30, 8(r1)
asm/d/d_particle.s
+1 -1
View File
@@ -5120,7 +5120,7 @@ lbl_8004DC10:
/* 8004DC4C 0004AB8C D0 21 00 0C */ stfs f1, 0xc(r1)
/* 8004DC50 0004AB90 D0 41 00 10 */ stfs f2, 0x10(r1)
/* 8004DC54 0004AB94 38 61 00 08 */ addi r3, r1, 8
/* 8004DC58 0004AB98 4B FD 01 2D */ bl fopAcM_wt_c_NS_waterCheck
/* 8004DC58 0004AB98 4B FD 01 2D */ bl waterCheck__11fopAcM_wt_cFPC4cXyz
/* 8004DC5C 0004AB9C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 8004DC60 0004ABA0 41 82 00 2C */ beq lbl_8004DC8C
/* 8004DC64 0004ABA4 C0 21 00 0C */ lfs f1, 0xc(r1)
asm/d/ev/d_ev_camera.s
+12 -12
View File
@@ -885,7 +885,7 @@ lbl_800895BC:
/* 800895D4 00086514 48 00 00 0C */ b lbl_800895E0
lbl_800895D8:
/* 800895D8 00086518 38 80 FF FF */ li r4, -1
/* 800895DC 0008651C 4B F9 41 C5 */ bl fopAcM_searchFromName4Event
/* 800895DC 0008651C 4B F9 41 C5 */ bl fopAcM_searchFromName4Event__FPCcs
lbl_800895E0:
/* 800895E0 00086520 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800895E4 00086524 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -976,7 +976,7 @@ lbl_800896F8:
/* 80089710 00086650 48 00 00 0C */ b lbl_8008971C
lbl_80089714:
/* 80089714 00086654 38 80 FF FF */ li r4, -1
/* 80089718 00086658 4B F9 40 89 */ bl fopAcM_searchFromName4Event
/* 80089718 00086658 4B F9 40 89 */ bl fopAcM_searchFromName4Event__FPCcs
lbl_8008971C:
/* 8008971C 0008665C 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80089720 00086660 80 01 00 24 */ lwz r0, 0x24(r1)
@@ -2069,7 +2069,7 @@ lbl_8008A6C8:
.global fpcSch_JudgeByID
/* 8008A6E0 00087620 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8008A6E4 00087624 38 81 00 30 */ addi r4, r1, 0x30
/* 8008A6E8 00087628 4B F8 F1 11 */ bl fopAcIt_Judge
/* 8008A6E8 00087628 4B F8 F1 11 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8008A6EC 0008762C 28 03 00 00 */ cmplwi r3, 0
/* 8008A6F0 00087630 40 82 00 0C */ bne lbl_8008A6FC
/* 8008A6F4 00087634 38 60 00 01 */ li r3, 1
@@ -2138,7 +2138,7 @@ lbl_8008A7CC:
.global fpcSch_JudgeByID
/* 8008A7E4 00087724 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8008A7E8 00087728 38 81 00 2C */ addi r4, r1, 0x2c
/* 8008A7EC 0008772C 4B F8 F0 0D */ bl fopAcIt_Judge
/* 8008A7EC 0008772C 4B F8 F0 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8008A7F0 00087730 28 03 00 00 */ cmplwi r3, 0
/* 8008A7F4 00087734 40 82 00 0C */ bne lbl_8008A800
/* 8008A7F8 00087738 38 60 00 01 */ li r3, 1
@@ -3546,7 +3546,7 @@ lbl_8008BC50:
.global fpcSch_JudgeByID
/* 8008BC5C 00088B9C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8008BC60 00088BA0 38 81 00 0C */ addi r4, r1, 0xc
/* 8008BC64 00088BA4 4B F8 DB 95 */ bl fopAcIt_Judge
/* 8008BC64 00088BA4 4B F8 DB 95 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8008BC68 00088BA8 28 03 00 00 */ cmplwi r3, 0
/* 8008BC6C 00088BAC 40 82 00 0C */ bne lbl_8008BC78
/* 8008BC70 00088BB0 38 60 00 01 */ li r3, 1
@@ -5091,7 +5091,7 @@ lbl_8008D35C:
.global fpcSch_JudgeByID
/* 8008D374 0008A2B4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8008D378 0008A2B8 38 81 00 CC */ addi r4, r1, 0xcc
/* 8008D37C 0008A2BC 4B F8 C4 7D */ bl fopAcIt_Judge
/* 8008D37C 0008A2BC 4B F8 C4 7D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8008D380 0008A2C0 28 03 00 00 */ cmplwi r3, 0
/* 8008D384 0008A2C4 40 82 00 3C */ bne lbl_8008D3C0
/* 8008D388 0008A2C8 38 61 08 60 */ addi r3, r1, 0x860
@@ -6737,7 +6737,7 @@ lbl_8008EBD0:
.global fpcSch_JudgeByID
/* 8008EBDC 0008BB1C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 8008EBE0 0008BB20 38 81 01 50 */ addi r4, r1, 0x150
/* 8008EBE4 0008BB24 4B F8 AC 15 */ bl fopAcIt_Judge
/* 8008EBE4 0008BB24 4B F8 AC 15 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8008EBE8 0008BB28 28 03 00 00 */ cmplwi r3, 0
/* 8008EBEC 0008BB2C 40 82 00 0C */ bne lbl_8008EBF8
/* 8008EBF0 0008BB30 38 60 00 01 */ li r3, 1
@@ -11585,7 +11585,7 @@ lbl_80093410:
.global fpcSch_JudgeForPName
/* 80093438 00090378 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName@l
/* 8009343C 0009037C 38 81 00 08 */ addi r4, r1, 8
/* 80093440 00090380 4B F8 63 B9 */ bl fopAcIt_Judge
/* 80093440 00090380 4B F8 63 B9 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80093444 00090384 7C 7A 1B 78 */ mr r26, r3
lbl_80093448:
/* 80093448 00090388 7F 83 E3 78 */ mr r3, r28
@@ -12949,7 +12949,7 @@ lbl_800948A0:
.global fpcSch_JudgeByID
/* 800948B8 000917F8 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800948BC 000917FC 38 81 00 40 */ addi r4, r1, 0x40
/* 800948C0 00091800 4B F8 4F 39 */ bl fopAcIt_Judge
/* 800948C0 00091800 4B F8 4F 39 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800948C4 00091804 28 03 00 00 */ cmplwi r3, 0
/* 800948C8 00091808 40 82 00 0C */ bne lbl_800948D4
/* 800948CC 0009180C 38 60 00 01 */ li r3, 1
@@ -14096,7 +14096,7 @@ lbl_80095974:
.global fpcSch_JudgeByID
/* 800959BC 000928FC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800959C0 00092900 38 81 00 78 */ addi r4, r1, 0x78
/* 800959C4 00092904 4B F8 3E 35 */ bl fopAcIt_Judge
/* 800959C4 00092904 4B F8 3E 35 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800959C8 00092908 28 03 00 00 */ cmplwi r3, 0
/* 800959CC 0009290C 40 82 00 0C */ bne lbl_800959D8
/* 800959D0 00092910 38 60 00 01 */ li r3, 1
@@ -14109,7 +14109,7 @@ lbl_800959D8:
.global fpcSch_JudgeByID
/* 800959E4 00092924 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 800959E8 00092928 38 81 00 74 */ addi r4, r1, 0x74
/* 800959EC 0009292C 4B F8 3E 0D */ bl fopAcIt_Judge
/* 800959EC 0009292C 4B F8 3E 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 800959F0 00092930 28 03 00 00 */ cmplwi r3, 0
/* 800959F4 00092934 40 82 00 0C */ bne lbl_80095A00
/* 800959F8 00092938 38 60 00 01 */ li r3, 1
@@ -15758,7 +15758,7 @@ lbl_80097258:
.global fpcSch_JudgeByID
/* 80097270 000941B0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l
/* 80097274 000941B4 38 81 00 28 */ addi r4, r1, 0x28
/* 80097278 000941B8 4B F8 25 81 */ bl fopAcIt_Judge
/* 80097278 000941B8 4B F8 25 81 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8009727C 000941BC 28 03 00 00 */ cmplwi r3, 0
/* 80097280 000941C0 40 82 00 0C */ bne lbl_8009728C
/* 80097284 000941C4 38 60 00 01 */ li r3, 1
asm/d/event/d_event_data.s
+5 -5
View File
@@ -1706,7 +1706,7 @@ lbl_80044EA8:
/* 80044EBC 00041DFC 38 E1 00 08 */ addi r7, r1, 8
/* 80044EC0 00041E00 39 01 00 10 */ addi r8, r1, 0x10
/* 80044EC4 00041E04 89 3D 00 0A */ lbz r9, 0xa(r29)
/* 80044EC8 00041E08 4B FD 4E D1 */ bl fopAcM_create_X1_
/* 80044EC8 00041E08 4B FD 4E D1 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc
lbl_80044ECC:
/* 80044ECC 00041E0C 39 61 00 40 */ addi r11, r1, 0x40
/* 80044ED0 00041E10 48 31 D3 55 */ bl _restgpr_28
@@ -2154,7 +2154,7 @@ lbl_80045510:
/* 8004552C 0004246C 28 03 00 00 */ cmplwi r3, 0
/* 80045530 00042470 41 82 00 1C */ beq lbl_8004554C
/* 80045534 00042474 38 80 FF FF */ li r4, -1
/* 80045538 00042478 4B FD 82 69 */ bl fopAcM_searchFromName4Event
/* 80045538 00042478 4B FD 82 69 */ bl fopAcM_searchFromName4Event__FPCcs
/* 8004553C 0004247C 7C 64 1B 79 */ or. r4, r3, r3
/* 80045540 00042480 41 82 00 0C */ beq lbl_8004554C
/* 80045544 00042484 7F 83 E3 78 */ mr r3, r28
@@ -2170,7 +2170,7 @@ lbl_8004554C:
/* 80045568 000424A8 28 03 00 00 */ cmplwi r3, 0
/* 8004556C 000424AC 41 82 00 1C */ beq lbl_80045588
/* 80045570 000424B0 38 80 FF FF */ li r4, -1
/* 80045574 000424B4 4B FD 82 2D */ bl fopAcM_searchFromName4Event
/* 80045574 000424B4 4B FD 82 2D */ bl fopAcM_searchFromName4Event__FPCcs
/* 80045578 000424B8 7C 64 1B 79 */ or. r4, r3, r3
/* 8004557C 000424BC 41 82 00 0C */ beq lbl_80045588
/* 80045580 000424C0 7F 83 E3 78 */ mr r3, r28
@@ -2186,7 +2186,7 @@ lbl_80045588:
/* 800455A4 000424E4 28 03 00 00 */ cmplwi r3, 0
/* 800455A8 000424E8 41 82 00 1C */ beq lbl_800455C4
/* 800455AC 000424EC 38 80 FF FF */ li r4, -1
/* 800455B0 000424F0 4B FD 81 F1 */ bl fopAcM_searchFromName4Event
/* 800455B0 000424F0 4B FD 81 F1 */ bl fopAcM_searchFromName4Event__FPCcs
/* 800455B4 000424F4 7C 64 1B 79 */ or. r4, r3, r3
/* 800455B8 000424F8 41 82 00 0C */ beq lbl_800455C4
/* 800455BC 000424FC 7F 83 E3 78 */ mr r3, r28
@@ -2202,7 +2202,7 @@ lbl_800455C4:
/* 800455E0 00042520 28 03 00 00 */ cmplwi r3, 0
/* 800455E4 00042524 41 82 00 C0 */ beq lbl_800456A4
/* 800455E8 00042528 38 80 FF FF */ li r4, -1
/* 800455EC 0004252C 4B FD 81 B5 */ bl fopAcM_searchFromName4Event
/* 800455EC 0004252C 4B FD 81 B5 */ bl fopAcM_searchFromName4Event__FPCcs
/* 800455F0 00042530 7C 64 1B 79 */ or. r4, r3, r3
/* 800455F4 00042534 41 82 00 B0 */ beq lbl_800456A4
/* 800455F8 00042538 7F 83 E3 78 */ mr r3, r28
asm/d/event/d_event_lib.s
+2 -2
View File
@@ -178,7 +178,7 @@ dEvLib_callback_c_NS_executeStart:
/* 80048AB0 000459F0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80048AB4 000459F4 A0 FF 00 0C */ lhz r7, 0xc(r31)
/* 80048AB8 000459F8 39 00 00 00 */ li r8, 0
/* 80048ABC 000459FC 4B FD 2C F9 */ bl fopAcM_orderMapToolEvent
/* 80048ABC 000459FC 4B FD 2C F9 */ bl fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs
/* 80048AC0 00045A00 48 00 00 24 */ b lbl_80048AE4
lbl_80048AC4:
/* 80048AC4 00045A04 A8 86 00 FC */ lha r4, 0xfc(r6)
@@ -188,7 +188,7 @@ lbl_80048AC4:
/* 80048AD4 00045A14 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80048AD8 00045A18 38 E0 00 00 */ li r7, 0
/* 80048ADC 00045A1C A1 1F 00 0C */ lhz r8, 0xc(r31)
/* 80048AE0 00045A20 4B FD 2B 9D */ bl fopAcM_orderOtherEventId
/* 80048AE0 00045A20 4B FD 2B 9D */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
lbl_80048AE4:
/* 80048AE4 00045A24 80 7F 00 04 */ lwz r3, 4(r31)
/* 80048AE8 00045A28 A0 03 00 FA */ lhz r0, 0xfa(r3)
asm/d/event/d_event_manager.s
+11 -11
View File
@@ -522,7 +522,7 @@ lbl_80046A88:
/* 80046AC8 00043A08 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80046ACC 00043A0C 38 E0 00 05 */ li r7, 5
/* 80046AD0 00043A10 39 00 00 01 */ li r8, 1
/* 80046AD4 00043A14 4B FD 4B A9 */ bl fopAcM_orderOtherEventId
/* 80046AD4 00043A14 4B FD 4B A9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 80046AD8 00043A18 48 00 00 D0 */ b lbl_80046BA8
lbl_80046ADC:
/* 80046ADC 00043A1C 2C 00 FF FF */ cmpwi r0, -1
@@ -543,7 +543,7 @@ lbl_80046ADC:
/* 80046B18 00043A58 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80046B1C 00043A5C 38 E0 00 01 */ li r7, 1
/* 80046B20 00043A60 39 00 00 05 */ li r8, 5
/* 80046B24 00043A64 4B FD 4D BD */ bl fopAcM_orderMapToolAutoNextEvent
/* 80046B24 00043A64 4B FD 4D BD */ bl fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs
/* 80046B28 00043A68 48 00 00 80 */ b lbl_80046BA8
lbl_80046B2C:
/* 80046B2C 00043A6C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
@@ -578,7 +578,7 @@ lbl_80046B78:
/* 80046B98 00043AD8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80046B9C 00043ADC 38 E0 00 05 */ li r7, 5
/* 80046BA0 00043AE0 39 00 00 01 */ li r8, 1
/* 80046BA4 00043AE4 4B FD 4A D9 */ bl fopAcM_orderOtherEventId
/* 80046BA4 00043AE4 4B FD 4A D9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
lbl_80046BA8:
/* 80046BA8 00043AE8 2C 03 00 00 */ cmpwi r3, 0
/* 80046BAC 00043AEC 40 82 00 44 */ bne lbl_80046BF0
@@ -597,7 +597,7 @@ lbl_80046BA8:
/* 80046BE0 00043B20 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l
/* 80046BE4 00043B24 38 E0 00 05 */ li r7, 5
/* 80046BE8 00043B28 39 00 00 01 */ li r8, 1
/* 80046BEC 00043B2C 4B FD 4A 91 */ bl fopAcM_orderOtherEventId
/* 80046BEC 00043B2C 4B FD 4A 91 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
lbl_80046BF0:
/* 80046BF0 00043B30 7F C3 07 34 */ extsh r3, r30
lbl_80046BF4:
@@ -693,7 +693,7 @@ lbl_80046CE0:
/* 80046D20 00043C60 40 82 00 10 */ bne lbl_80046D30
/* 80046D24 00043C64 7F 63 DB 78 */ mr r3, r27
/* 80046D28 00043C68 38 80 FF FF */ li r4, -1
/* 80046D2C 00043C6C 4B FD 6A 75 */ bl fopAcM_searchFromName4Event
/* 80046D2C 00043C6C 4B FD 6A 75 */ bl fopAcM_searchFromName4Event__FPCcs
lbl_80046D30:
/* 80046D30 00043C70 28 03 00 00 */ cmplwi r3, 0
/* 80046D34 00043C74 41 82 00 10 */ beq lbl_80046D44
@@ -761,7 +761,7 @@ lbl_80046DE8:
/* 80046E00 00043D40 3C 60 80 04 */ lis r3, allOffObjectCallBack@ha
.global allOffObjectCallBack
/* 80046E04 00043D44 38 63 6C 9C */ addi r3, r3, allOffObjectCallBack@l
/* 80046E08 00043D48 4B FD 29 F1 */ bl fopAcIt_Judge
/* 80046E08 00043D48 4B FD 29 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80046E0C 00043D4C 38 00 00 02 */ li r0, 2
/* 80046E10 00043D50 90 1D 01 8C */ stw r0, 0x18c(r29)
/* 80046E14 00043D54 38 00 00 00 */ li r0, 0
@@ -2325,7 +2325,7 @@ dEvent_manager_c_NS_issueStaff:
.global extraOnObjectCallBack
/* 80048300 00045240 38 63 6C 74 */ addi r3, r3, extraOnObjectCallBack@l
/* 80048304 00045244 38 80 00 00 */ li r4, 0
/* 80048308 00045248 4B FD 14 F1 */ bl fopAcIt_Judge
/* 80048308 00045248 4B FD 14 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 8004830C 0004524C 48 00 00 28 */ b lbl_80048334
lbl_80048310:
/* 80048310 00045250 38 61 00 08 */ addi r3, r1, 8
@@ -2333,7 +2333,7 @@ lbl_80048310:
/* 80048318 00045258 48 32 08 15 */ bl strcpy
/* 8004831C 0004525C 38 61 00 08 */ addi r3, r1, 8
/* 80048320 00045260 38 80 FF FF */ li r4, -1
/* 80048324 00045264 4B FD 54 7D */ bl fopAcM_searchFromName4Event
/* 80048324 00045264 4B FD 54 7D */ bl fopAcM_searchFromName4Event__FPCcs
/* 80048328 00045268 80 03 04 9C */ lwz r0, 0x49c(r3)
/* 8004832C 0004526C 60 00 08 00 */ ori r0, r0, 0x800
/* 80048330 00045270 90 03 04 9C */ stw r0, 0x49c(r3)
@@ -2363,7 +2363,7 @@ dEvent_manager_c_NS_cancelStaff:
.global extraOffObjectCallBack
/* 8004837C 000452BC 38 63 6C 88 */ addi r3, r3, extraOffObjectCallBack@l
/* 80048380 000452C0 38 80 00 00 */ li r4, 0
/* 80048384 000452C4 4B FD 14 75 */ bl fopAcIt_Judge
/* 80048384 000452C4 4B FD 14 75 */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80048388 000452C8 48 00 00 28 */ b lbl_800483B0
lbl_8004838C:
/* 8004838C 000452CC 38 61 00 08 */ addi r3, r1, 8
@@ -2371,7 +2371,7 @@ lbl_8004838C:
/* 80048394 000452D4 48 32 07 99 */ bl strcpy
/* 80048398 000452D8 38 61 00 08 */ addi r3, r1, 8
/* 8004839C 000452DC 38 80 FF FF */ li r4, -1
/* 800483A0 000452E0 4B FD 54 01 */ bl fopAcM_searchFromName4Event
/* 800483A0 000452E0 4B FD 54 01 */ bl fopAcM_searchFromName4Event__FPCcs
/* 800483A4 000452E4 80 03 04 9C */ lwz r0, 0x49c(r3)
/* 800483A8 000452E8 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13
/* 800483AC 000452EC 90 03 04 9C */ stw r0, 0x49c(r3)
@@ -2506,7 +2506,7 @@ dEvent_manager_c_NS_specialCast_Shutter:
.global findShutterCallBack
/* 80048554 00045494 38 63 84 6C */ addi r3, r3, findShutterCallBack@l
/* 80048558 00045498 38 81 00 08 */ addi r4, r1, 8
/* 8004855C 0004549C 4B FD 12 9D */ bl fopAcIt_Judge
/* 8004855C 0004549C 4B FD 12 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv
/* 80048560 000454A0 7C 7E 1B 79 */ or. r30, r3, r3
/* 80048564 000454A4 41 82 00 98 */ beq lbl_800485FC
/* 80048568 000454A8 2C 1D 00 00 */ cmpwi r29, 0
asm/d/k/d_k_wmark.s
+1 -1
View File
@@ -214,7 +214,7 @@ dkWmark_c_NS_setMatrix:
/* 802616FC 0025E63C D0 21 00 1C */ stfs f1, 0x1c(r1)
/* 80261700 0025E640 D0 41 00 20 */ stfs f2, 0x20(r1)
/* 80261704 0025E644 38 61 00 18 */ addi r3, r1, 0x18
/* 80261708 0025E648 4B DB C5 B5 */ bl fopAcM_gc_c_NS_gndCheck
/* 80261708 0025E648 4B DB C5 B5 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz
/* 8026170C 0025E64C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80261710 0025E650 41 82 02 28 */ beq lbl_80261938
/* 80261714 0025E654 C0 0D 87 50 */ lfs f0, lbl_80450CD0-_SDA_BASE_(r13)

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