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

Fix symbol names (#118)

Browse Source 
* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-15 02:12:44 -04:00
committed by GitHub
co-authored by Pheenoh
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f/f_ap_game/asm/func_80018B28.s
+2 -2
View File
@@ -4,8 +4,8 @@
/* 80018B34 00015A74 3C 60 80 3F */ lis r3, g_HIO@ha
/* 80018B38 00015A78 38 63 1B BC */ addi r3, r3, g_HIO@l
/* 80018B3C 00015A7C 4B FF FE 09 */ bl __ct__11fapGm_HIO_cFv
/* 80018B40 00015A80 3C 80 80 02 */ lis r4, fapGm_HIO_c_NS_dtor@ha
/* 80018B44 00015A84 38 84 8A E0 */ addi r4, r4, fapGm_HIO_c_NS_dtor@l
/* 80018B40 00015A80 3C 80 80 02 */ lis r4, __dt__11fapGm_HIO_cFv@ha
/* 80018B44 00015A84 38 84 8A E0 */ addi r4, r4, __dt__11fapGm_HIO_cFv@l
/* 80018B48 00015A88 3C A0 80 3F */ lis r5, lbl_803F1BB0@ha
/* 80018B4C 00015A8C 38 A5 1B B0 */ addi r5, r5, lbl_803F1BB0@l
/* 80018B50 00015A90 48 34 90 D5 */ bl func_80361C24
include/f/f_op/f_op_actor_mng.h
+3 -3
View File
@@ -269,9 +269,9 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
void fopAcM_riverStream__FP4cXyzPsPff(void);
void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
void fopAcM_searchFromName4Event__FPCcs(void);
void fopAcM_GetName(void); // mostly inlined
void fopAcM_GetID(void); // mostly inlined
void fopAcM_GetParam(void); // mostly inlined
void fopAcM_GetName__FPv(void); // mostly inlined
void fopAcM_GetID__FPCv(void); // mostly inlined
void fopAcM_GetParam__FPCv(void); // mostly inlined
}
#endif
include/f/f_op/f_op_actor_mng/asm/func_800198C4.s
+1 -1
View File
@@ -9,7 +9,7 @@
/* 800198E4 00016824 7C 7F 1B 78 */ mr r31, r3
/* 800198E8 00016828 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
/* 800198EC 0001682C 80 9F 00 B4 */ lwz r4, 0xb4(r31)
/* 800198F0 00016830 48 00 6D 5D */ bl fpcBs_Is_JustOfType
/* 800198F0 00016830 48 00 6D 5D */ bl fpcBs_Is_JustOfType__Fii
/* 800198F4 00016834 2C 03 00 00 */ cmpwi r3, 0
/* 800198F8 00016838 41 82 00 0C */ beq lbl_80019904
/* 800198FC 0001683C 80 9F 00 C8 */ lwz r4, 0xc8(r31)
include/f/f_op/f_op_actor_mng/asm/func_80019934.s
+1 -1
View File
@@ -15,7 +15,7 @@
/* 8001996C 000168AC 7C 7F 1B 78 */ mr r31, r3
/* 80019970 000168B0 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
/* 80019974 000168B4 80 9F 00 B4 */ lwz r4, 0xb4(r31)
/* 80019978 000168B8 48 00 6C D5 */ bl fpcBs_Is_JustOfType
/* 80019978 000168B8 48 00 6C D5 */ bl fpcBs_Is_JustOfType__Fii
/* 8001997C 000168BC 2C 03 00 00 */ cmpwi r3, 0
/* 80019980 000168C0 41 82 00 0C */ beq lbl_8001998C
/* 80019984 000168C4 80 9F 00 C8 */ lwz r4, 0xc8(r31)
include/f/f_op/f_op_actor_mng/asm/func_80019CB8.s
+1 -1
View File
@@ -16,7 +16,7 @@
/* 80019CEC 00016C2C 38 84 88 C8 */ addi r4, r4, lbl_803788C8@l
/* 80019CF0 00016C30 4B FF FF 89 */ bl fopAcM_Log__FPC10fopAc_ac_cPCc
/* 80019CF4 00016C34 7F E3 FB 78 */ mr r3, r31
/* 80019CF8 00016C38 48 00 84 21 */ bl fpcM_Delete
/* 80019CF8 00016C38 48 00 84 21 */ bl fpcM_Delete__FPv
/* 80019CFC 00016C3C 48 00 00 08 */ b lbl_80019D04
lbl_80019D00:
/* 80019D00 00016C40 38 60 00 01 */ li r3, 1
include/f/f_op/f_op_actor_mng/asm/func_8001ACEC.s
+16 -16
View File
@@ -53,19 +53,19 @@ lbl_8001AD7C:
/* 8001ADA4 00017CE4 3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l
/* 8001ADA8 00017CE8 D0 1D 00 58 */ stfs f0, 0x58(r29)
/* 8001ADAC 00017CEC 7F A3 EB 78 */ mr r3, r29
/* 8001ADB0 00017CF0 48 25 89 DD */ bl J3DUClipper_NS_calcViewFrustum
/* 8001ADB0 00017CF0 48 25 89 DD */ bl calcViewFrustum__11J3DUClipperFv
/* 8001ADB4 00017CF4 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
/* 8001ADB8 00017CF8 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001ADBC 00017CFC 7F E4 FB 78 */ mr r4, r31
/* 8001ADC0 00017D00 38 BE 05 14 */ addi r5, r30, 0x514
/* 8001ADC4 00017D04 38 DE 05 08 */ addi r6, r30, 0x508
/* 8001ADC8 00017D08 48 25 8C 7D */ bl J3DUClipper_NS_clip_X1_
/* 8001ADC8 00017D08 48 25 8C 7D */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
/* 8001ADCC 00017D0C 7C 7E 1B 78 */ mr r30, r3
/* 8001ADD0 00017D10 C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
/* 8001ADD4 00017D14 D0 1D 00 58 */ stfs f0, 0x58(r29)
/* 8001ADD8 00017D18 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
/* 8001ADDC 00017D1C 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001ADE0 00017D20 48 25 89 AD */ bl J3DUClipper_NS_calcViewFrustum
/* 8001ADE0 00017D20 48 25 89 AD */ bl calcViewFrustum__11J3DUClipperFv
/* 8001ADE4 00017D24 7F C3 F3 78 */ mr r3, r30
/* 8001ADE8 00017D28 48 00 02 58 */ b lbl_8001B040
lbl_8001ADEC:
@@ -74,7 +74,7 @@ lbl_8001ADEC:
/* 8001ADF4 00017D34 7F E4 FB 78 */ mr r4, r31
/* 8001ADF8 00017D38 38 BE 05 14 */ addi r5, r30, 0x514
/* 8001ADFC 00017D3C 38 DE 05 08 */ addi r6, r30, 0x508
/* 8001AE00 00017D40 48 25 8C 45 */ bl J3DUClipper_NS_clip_X1_
/* 8001AE00 00017D40 48 25 8C 45 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
/* 8001AE04 00017D44 48 00 02 3C */ b lbl_8001B040
lbl_8001AE08:
/* 8001AE08 00017D48 1C 83 00 18 */ mulli r4, r3, 0x18
@@ -90,19 +90,19 @@ lbl_8001AE08:
/* 8001AE30 00017D70 3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l
/* 8001AE34 00017D74 D0 1D 00 58 */ stfs f0, 0x58(r29)
/* 8001AE38 00017D78 7F A3 EB 78 */ mr r3, r29
/* 8001AE3C 00017D7C 48 25 89 51 */ bl J3DUClipper_NS_calcViewFrustum
/* 8001AE3C 00017D7C 48 25 89 51 */ bl calcViewFrustum__11J3DUClipperFv
/* 8001AE40 00017D80 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
/* 8001AE44 00017D84 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001AE48 00017D88 7F E4 FB 78 */ mr r4, r31
/* 8001AE4C 00017D8C 38 BE 00 0C */ addi r5, r30, 0xc
/* 8001AE50 00017D90 7F C6 F3 78 */ mr r6, r30
/* 8001AE54 00017D94 48 25 8B F1 */ bl J3DUClipper_NS_clip_X1_
/* 8001AE54 00017D94 48 25 8B F1 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
/* 8001AE58 00017D98 7C 7E 1B 78 */ mr r30, r3
/* 8001AE5C 00017D9C C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
/* 8001AE60 00017DA0 D0 1D 00 58 */ stfs f0, 0x58(r29)
/* 8001AE64 00017DA4 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
/* 8001AE68 00017DA8 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001AE6C 00017DAC 48 25 89 21 */ bl J3DUClipper_NS_calcViewFrustum
/* 8001AE6C 00017DAC 48 25 89 21 */ bl calcViewFrustum__11J3DUClipperFv
/* 8001AE70 00017DB0 7F C3 F3 78 */ mr r3, r30
/* 8001AE74 00017DB4 48 00 01 CC */ b lbl_8001B040
lbl_8001AE78:
@@ -111,7 +111,7 @@ lbl_8001AE78:
/* 8001AE80 00017DC0 7F E4 FB 78 */ mr r4, r31
/* 8001AE84 00017DC4 38 BE 00 0C */ addi r5, r30, 0xc
/* 8001AE88 00017DC8 7F C6 F3 78 */ mr r6, r30
/* 8001AE8C 00017DCC 48 25 8B B9 */ bl J3DUClipper_NS_clip_X1_
/* 8001AE8C 00017DCC 48 25 8B B9 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
/* 8001AE90 00017DD0 48 00 01 B0 */ b lbl_8001B040
lbl_8001AE94:
/* 8001AE94 00017DD4 2C 03 00 17 */ cmpwi r3, 0x17
@@ -125,7 +125,7 @@ lbl_8001AE94:
/* 8001AEB4 00017DF4 3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l
/* 8001AEB8 00017DF8 D0 1D 00 58 */ stfs f0, 0x58(r29)
/* 8001AEBC 00017DFC 7F A3 EB 78 */ mr r3, r29
/* 8001AEC0 00017E00 48 25 88 CD */ bl J3DUClipper_NS_calcViewFrustum
/* 8001AEC0 00017E00 48 25 88 CD */ bl calcViewFrustum__11J3DUClipperFv
/* 8001AEC4 00017E04 C0 3E 05 14 */ lfs f1, 0x514(r30)
/* 8001AEC8 00017E08 C0 1E 05 08 */ lfs f0, 0x508(r30)
/* 8001AECC 00017E0C D0 01 00 38 */ stfs f0, 0x38(r1)
@@ -143,13 +143,13 @@ lbl_8001AE94:
/* 8001AEFC 00017E3C 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001AF00 00017E40 7F E4 FB 78 */ mr r4, r31
/* 8001AF04 00017E44 38 A1 00 44 */ addi r5, r1, 0x44
/* 8001AF08 00017E48 48 25 89 F5 */ bl J3DUClipper_NS_clip
/* 8001AF08 00017E48 48 25 89 F5 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
/* 8001AF0C 00017E4C 7C 7E 1B 78 */ mr r30, r3
/* 8001AF10 00017E50 C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
/* 8001AF14 00017E54 D0 1D 00 58 */ stfs f0, 0x58(r29)
/* 8001AF18 00017E58 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
/* 8001AF1C 00017E5C 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001AF20 00017E60 48 25 88 6D */ bl J3DUClipper_NS_calcViewFrustum
/* 8001AF20 00017E60 48 25 88 6D */ bl calcViewFrustum__11J3DUClipperFv
/* 8001AF24 00017E64 7F C3 F3 78 */ mr r3, r30
/* 8001AF28 00017E68 48 00 01 18 */ b lbl_8001B040
lbl_8001AF2C:
@@ -170,7 +170,7 @@ lbl_8001AF2C:
/* 8001AF64 00017EA4 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001AF68 00017EA8 7F E4 FB 78 */ mr r4, r31
/* 8001AF6C 00017EAC 38 A1 00 2C */ addi r5, r1, 0x2c
/* 8001AF70 00017EB0 48 25 89 8D */ bl J3DUClipper_NS_clip
/* 8001AF70 00017EB0 48 25 89 8D */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
/* 8001AF74 00017EB4 48 00 00 CC */ b lbl_8001B040
lbl_8001AF78:
/* 8001AF78 00017EB8 38 03 FF F1 */ addi r0, r3, -15
@@ -187,7 +187,7 @@ lbl_8001AF78:
/* 8001AFA4 00017EE4 3B C3 D8 E4 */ addi r30, r3, lbl_803DD8E4@l
/* 8001AFA8 00017EE8 D0 1E 00 58 */ stfs f0, 0x58(r30)
/* 8001AFAC 00017EEC 7F C3 F3 78 */ mr r3, r30
/* 8001AFB0 00017EF0 48 25 87 DD */ bl J3DUClipper_NS_calcViewFrustum
/* 8001AFB0 00017EF0 48 25 87 DD */ bl calcViewFrustum__11J3DUClipperFv
/* 8001AFB4 00017EF4 C0 3D 00 0C */ lfs f1, 0xc(r29)
/* 8001AFB8 00017EF8 80 9D 00 00 */ lwz r4, 0(r29)
/* 8001AFBC 00017EFC 80 7D 00 04 */ lwz r3, 4(r29)
@@ -202,13 +202,13 @@ lbl_8001AF78:
/* 8001AFE0 00017F20 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001AFE4 00017F24 7F E4 FB 78 */ mr r4, r31
/* 8001AFE8 00017F28 38 A1 00 20 */ addi r5, r1, 0x20
/* 8001AFEC 00017F2C 48 25 89 11 */ bl J3DUClipper_NS_clip
/* 8001AFEC 00017F2C 48 25 89 11 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
/* 8001AFF0 00017F30 7C 7D 1B 78 */ mr r29, r3
/* 8001AFF4 00017F34 C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
/* 8001AFF8 00017F38 D0 1E 00 58 */ stfs f0, 0x58(r30)
/* 8001AFFC 00017F3C 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
/* 8001B000 00017F40 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001B004 00017F44 48 25 87 89 */ bl J3DUClipper_NS_calcViewFrustum
/* 8001B004 00017F44 48 25 87 89 */ bl calcViewFrustum__11J3DUClipperFv
/* 8001B008 00017F48 7F A3 EB 78 */ mr r3, r29
/* 8001B00C 00017F4C 48 00 00 34 */ b lbl_8001B040
lbl_8001B010:
@@ -223,7 +223,7 @@ lbl_8001B010:
/* 8001B030 00017F70 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
/* 8001B034 00017F74 7F E4 FB 78 */ mr r4, r31
/* 8001B038 00017F78 38 A1 00 14 */ addi r5, r1, 0x14
/* 8001B03C 00017F7C 48 25 88 C1 */ bl J3DUClipper_NS_clip
/* 8001B03C 00017F7C 48 25 88 C1 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
lbl_8001B040:
/* 8001B040 00017F80 39 61 00 A0 */ addi r11, r1, 0xa0
/* 8001B044 00017F84 48 34 71 E5 */ bl _restgpr_29
include/f/f_op/f_op_actor_mng/asm/func_8001B068.s
+1 -1
View File
@@ -35,7 +35,7 @@ lbl_8001B0D4:
/* 8001B0DC 0001801C 38 80 00 00 */ li r4, 0
/* 8001B0E0 00018020 38 E0 01 4F */ li r7, 0x14f
/* 8001B0E4 00018024 39 40 FF FF */ li r10, -1
/* 8001B0E8 00018028 48 02 65 81 */ bl dEvt_control_c_NS_order
/* 8001B0E8 00018028 48 02 65 81 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B0EC:
/* 8001B0EC 0001802C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001B0F0 00018030 7C 08 03 A6 */ mtlr r0
include/f/f_op/f_op_actor_mng/asm/func_8001B0FC.s
+1 -1
View File
@@ -38,7 +38,7 @@ lbl_8001B16C:
/* 8001B17C 000180BC 7C E6 3B 78 */ mr r6, r7
/* 8001B180 000180C0 38 E0 01 4F */ li r7, 0x14f
/* 8001B184 000180C4 39 40 FF FF */ li r10, -1
/* 8001B188 000180C8 48 02 64 E1 */ bl dEvt_control_c_NS_order
/* 8001B188 000180C8 48 02 64 E1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B18C:
/* 8001B18C 000180CC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001B190 000180D0 7C 08 03 A6 */ mtlr r0
include/f/f_op/f_op_actor_mng/asm/func_8001B19C.s
+1 -1
View File
@@ -40,7 +40,7 @@ lbl_8001B20C:
/* 8001B224 00018164 39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l
/* 8001B228 00018168 81 08 5D AC */ lwz r8, 0x5dac(r8)
/* 8001B22C 0001816C 39 40 FF FF */ li r10, -1
/* 8001B230 00018170 48 02 64 39 */ bl dEvt_control_c_NS_order
/* 8001B230 00018170 48 02 64 39 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B234:
/* 8001B234 00018174 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001B238 00018178 7C 08 03 A6 */ mtlr r0
include/f/f_op/f_op_actor_mng/asm/func_8001B244.s
+2 -2
View File
@@ -45,7 +45,7 @@ lbl_8001B2C0:
/* 8001B2E0 00018220 7F C4 F3 78 */ mr r4, r30
/* 8001B2E4 00018224 38 A0 00 00 */ li r5, 0
/* 8001B2E8 00018228 7F A6 EB 78 */ mr r6, r29
/* 8001B2EC 0001822C 48 02 C4 6D */ bl dEvent_manager_c_NS_getEventIdx_X2_
/* 8001B2EC 0001822C 48 02 C4 6D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
/* 8001B2F0 00018230 7C 6A 1B 78 */ mr r10, r3
lbl_8001B2F4:
/* 8001B2F4 00018234 93 A1 00 08 */ stw r29, 8(r1)
@@ -57,7 +57,7 @@ lbl_8001B2F4:
/* 8001B30C 0001824C 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l
/* 8001B310 00018250 7F C8 F3 78 */ mr r8, r30
/* 8001B314 00018254 7F E9 FB 78 */ mr r9, r31
/* 8001B318 00018258 48 02 63 51 */ bl dEvt_control_c_NS_order
/* 8001B318 00018258 48 02 63 51 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B31C:
/* 8001B31C 0001825C 39 61 00 30 */ addi r11, r1, 0x30
/* 8001B320 00018260 48 34 6E FD */ bl _restgpr_26
include/f/f_op/f_op_actor_mng/asm/func_8001B334.s
+1 -1
View File
@@ -36,7 +36,7 @@ lbl_8001B3A0:
/* 8001B3AC 000182EC 3C E0 00 01 */ lis r7, 0x0000FFFF@ha
/* 8001B3B0 000182F0 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l
/* 8001B3B4 000182F4 39 40 FF FF */ li r10, -1
/* 8001B3B8 000182F8 48 02 62 B1 */ bl dEvt_control_c_NS_order
/* 8001B3B8 000182F8 48 02 62 B1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B3BC:
/* 8001B3BC 000182FC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001B3C0 00018300 7C 08 03 A6 */ mtlr r0
include/f/f_op/f_op_actor_mng/asm/func_8001B3CC.s
+3 -3
View File
@@ -36,7 +36,7 @@ lbl_8001B440:
/* 8001B448 00018388 7F 84 E3 78 */ mr r4, r28
/* 8001B44C 0001838C 7D 05 43 78 */ mr r5, r8
/* 8001B450 00018390 38 C0 00 FF */ li r6, 0xff
/* 8001B454 00018394 48 02 C3 05 */ bl dEvent_manager_c_NS_getEventIdx_X2_
/* 8001B454 00018394 48 02 C3 05 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
/* 8001B458 00018398 7C 79 1B 78 */ mr r25, r3
/* 8001B45C 0001839C 7F 20 07 35 */ extsh. r0, r25
/* 8001B460 000183A0 40 80 00 0C */ bge lbl_8001B46C
@@ -46,7 +46,7 @@ lbl_8001B46C:
/* 8001B46C 000183AC 7F 43 D3 78 */ mr r3, r26
/* 8001B470 000183B0 7F 84 E3 78 */ mr r4, r28
/* 8001B474 000183B4 7F 25 CB 78 */ mr r5, r25
/* 8001B478 000183B8 48 02 CD 7D */ bl dEvent_manager_c_NS_getEventPrio
/* 8001B478 000183B8 48 02 CD 7D */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
/* 8001B47C 000183BC 54 7A 04 3F */ clrlwi. r26, r3, 0x10
/* 8001B480 000183C0 40 82 00 08 */ bne lbl_8001B488
/* 8001B484 000183C4 3B 40 00 FF */ li r26, 0xff
@@ -67,7 +67,7 @@ lbl_8001B494:
/* 8001B4B8 000183F8 7F A7 EB 78 */ mr r7, r29
/* 8001B4BC 000183FC 7F 88 E3 78 */ mr r8, r28
/* 8001B4C0 00018400 7F 2A CB 78 */ mr r10, r25
/* 8001B4C4 00018404 48 02 61 A5 */ bl dEvt_control_c_NS_order
/* 8001B4C4 00018404 48 02 61 A5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B4C8:
/* 8001B4C8 00018408 39 61 00 30 */ addi r11, r1, 0x30
/* 8001B4CC 0001840C 48 34 6D 4D */ bl _restgpr_25
include/f/f_op/f_op_actor_mng/asm/func_8001B4E0.s
+3 -3
View File
@@ -35,7 +35,7 @@ lbl_8001B554:
/* 8001B558 00018498 7F 23 CB 78 */ mr r3, r25
/* 8001B55C 0001849C 7F 44 D3 78 */ mr r4, r26
/* 8001B560 000184A0 38 C0 00 FF */ li r6, 0xff
/* 8001B564 000184A4 48 02 C1 F5 */ bl dEvent_manager_c_NS_getEventIdx_X2_
/* 8001B564 000184A4 48 02 C1 F5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
/* 8001B568 000184A8 7C 78 1B 78 */ mr r24, r3
/* 8001B56C 000184AC 7F 00 07 35 */ extsh. r0, r24
/* 8001B570 000184B0 40 80 00 0C */ bge lbl_8001B57C
@@ -45,7 +45,7 @@ lbl_8001B57C:
/* 8001B57C 000184BC 7F 23 CB 78 */ mr r3, r25
/* 8001B580 000184C0 7F 44 D3 78 */ mr r4, r26
/* 8001B584 000184C4 7F 05 C3 78 */ mr r5, r24
/* 8001B588 000184C8 48 02 CC 6D */ bl dEvent_manager_c_NS_getEventPrio
/* 8001B588 000184C8 48 02 CC 6D */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
/* 8001B58C 000184CC 54 65 04 3F */ clrlwi. r5, r3, 0x10
/* 8001B590 000184D0 40 82 00 08 */ bne lbl_8001B598
/* 8001B594 000184D4 38 A0 00 FF */ li r5, 0xff
@@ -63,7 +63,7 @@ lbl_8001B5A4:
/* 8001B5BC 000184FC 7F 48 D3 78 */ mr r8, r26
/* 8001B5C0 00018500 7F 69 DB 78 */ mr r9, r27
/* 8001B5C4 00018504 7F 0A C3 78 */ mr r10, r24
/* 8001B5C8 00018508 48 02 60 A1 */ bl dEvt_control_c_NS_order
/* 8001B5C8 00018508 48 02 60 A1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B5CC:
/* 8001B5CC 0001850C 39 61 00 30 */ addi r11, r1, 0x30
/* 8001B5D0 00018510 48 34 6C 45 */ bl _restgpr_24
include/f/f_op/f_op_actor_mng/asm/func_8001B5E4.s
+2 -2
View File
@@ -12,7 +12,7 @@
/* 8001B610 00018550 38 7F 4F F8 */ addi r3, r31, 0x4ff8
/* 8001B614 00018554 7F 44 D3 78 */ mr r4, r26
/* 8001B618 00018558 7F 65 DB 78 */ mr r5, r27
/* 8001B61C 0001855C 48 02 CB D9 */ bl dEvent_manager_c_NS_getEventPrio
/* 8001B61C 0001855C 48 02 CB D9 */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
/* 8001B620 00018560 54 7E 04 3F */ clrlwi. r30, r3, 0x10
/* 8001B624 00018564 40 82 00 08 */ bne lbl_8001B62C
/* 8001B628 00018568 3B C0 00 FF */ li r30, 0xff
@@ -30,7 +30,7 @@ lbl_8001B62C:
/* 8001B654 00018594 7F A7 EB 78 */ mr r7, r29
/* 8001B658 00018598 7F 48 D3 78 */ mr r8, r26
/* 8001B65C 0001859C 7F 6A DB 78 */ mr r10, r27
/* 8001B660 000185A0 48 02 60 09 */ bl dEvt_control_c_NS_order
/* 8001B660 000185A0 48 02 60 09 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
/* 8001B664 000185A4 39 61 00 30 */ addi r11, r1, 0x30
/* 8001B668 000185A8 48 34 6B B5 */ bl _restgpr_26
/* 8001B66C 000185AC 80 01 00 34 */ lwz r0, 0x34(r1)
include/f/f_op/f_op_actor_mng/asm/func_8001B67C.s
+3 -3
View File
@@ -50,7 +50,7 @@ lbl_8001B720:
/* 8001B728 00018668 38 63 4F F8 */ addi r3, r3, 0x4ff8
/* 8001B72C 0001866C 7F 44 D3 78 */ mr r4, r26
/* 8001B730 00018670 7F 65 DB 78 */ mr r5, r27
/* 8001B734 00018674 48 02 CA C1 */ bl dEvent_manager_c_NS_getEventPrio
/* 8001B734 00018674 48 02 CA C1 */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
/* 8001B738 00018678 54 60 04 3F */ clrlwi. r0, r3, 0x10
/* 8001B73C 0001867C 41 82 00 0C */ beq lbl_8001B748
/* 8001B740 00018680 7C 19 03 78 */ mr r25, r0
@@ -61,7 +61,7 @@ lbl_8001B748:
/* 8001B750 00018690 41 82 00 1C */ beq lbl_8001B76C
/* 8001B754 00018694 7F 83 E3 78 */ mr r3, r28
/* 8001B758 00018698 7F 04 C3 78 */ mr r4, r24
/* 8001B75C 0001869C 48 02 7D A5 */ bl dEvt_control_c_NS_searchMapEventData_X1_
/* 8001B75C 0001869C 48 02 7D A5 */ bl searchMapEventData__14dEvt_control_cFUcl
/* 8001B760 000186A0 28 03 00 00 */ cmplwi r3, 0
/* 8001B764 000186A4 41 82 00 08 */ beq lbl_8001B76C
/* 8001B768 000186A8 8B 23 00 06 */ lbz r25, 6(r3)
@@ -77,7 +77,7 @@ lbl_8001B76C:
/* 8001B78C 000186CC 7F A7 EB 78 */ mr r7, r29
/* 8001B790 000186D0 7F 48 D3 78 */ mr r8, r26
/* 8001B794 000186D4 7F 6A DB 78 */ mr r10, r27
/* 8001B798 000186D8 48 02 5E D1 */ bl dEvt_control_c_NS_order
/* 8001B798 000186D8 48 02 5E D1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B79C:
/* 8001B79C 000186DC 39 61 00 30 */ addi r11, r1, 0x30
/* 8001B7A0 000186E0 48 34 6A 75 */ bl _restgpr_24
include/f/f_op/f_op_actor_mng/asm/func_8001B7B4.s
+3 -3
View File
@@ -42,7 +42,7 @@ lbl_8001B82C:
/* 8001B848 00018788 7C 04 03 78 */ mr r4, r0
lbl_8001B84C:
/* 8001B84C 0001878C 7F 23 CB 78 */ mr r3, r25
/* 8001B850 00018790 48 02 7C B1 */ bl dEvt_control_c_NS_searchMapEventData_X1_
/* 8001B850 00018790 48 02 7C B1 */ bl searchMapEventData__14dEvt_control_cFUcl
/* 8001B854 00018794 28 03 00 00 */ cmplwi r3, 0
/* 8001B858 00018798 41 82 00 28 */ beq lbl_8001B880
/* 8001B85C 0001879C 8B C3 00 06 */ lbz r30, 6(r3)
@@ -52,7 +52,7 @@ lbl_8001B84C:
/* 8001B86C 000187AC 38 77 4F F8 */ addi r3, r23, 0x4ff8
/* 8001B870 000187B0 7F 04 C3 78 */ mr r4, r24
/* 8001B874 000187B4 7F 25 CB 78 */ mr r5, r25
/* 8001B878 000187B8 48 02 BE 21 */ bl dEvent_manager_c_NS_getEventIdx_X1_
/* 8001B878 000187B8 48 02 BE 21 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc
/* 8001B87C 000187BC 7C 7A 1B 78 */ mr r26, r3
lbl_8001B880:
/* 8001B880 000187C0 57 80 05 EF */ rlwinm. r0, r28, 0, 0x17, 0x17
@@ -74,7 +74,7 @@ lbl_8001B898:
/* 8001B8B8 000187F8 7F 67 DB 78 */ mr r7, r27
/* 8001B8BC 000187FC 7F 08 C3 78 */ mr r8, r24
/* 8001B8C0 00018800 7F 4A D3 78 */ mr r10, r26
/* 8001B8C4 00018804 48 02 5D A5 */ bl dEvt_control_c_NS_order
/* 8001B8C4 00018804 48 02 5D A5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B8C8:
/* 8001B8C8 00018808 39 61 00 40 */ addi r11, r1, 0x40
/* 8001B8CC 0001880C 48 34 69 45 */ bl _restgpr_23
include/f/f_op/f_op_actor_mng/asm/func_8001B908.s
+1 -1
View File
@@ -46,7 +46,7 @@ lbl_8001B984:
/* 8001B9A8 000188E8 7F A7 EB 78 */ mr r7, r29
/* 8001B9AC 000188EC 7F 68 DB 78 */ mr r8, r27
/* 8001B9B0 000188F0 39 40 FF FF */ li r10, -1
/* 8001B9B4 000188F4 48 02 5C B5 */ bl dEvt_control_c_NS_order
/* 8001B9B4 000188F4 48 02 5C B5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001B9B8:
/* 8001B9B8 000188F8 39 61 00 30 */ addi r11, r1, 0x30
/* 8001B9BC 000188FC 48 34 68 65 */ bl _restgpr_27
include/f/f_op/f_op_actor_mng/asm/func_8001B9D0.s
+1 -1
View File
@@ -41,7 +41,7 @@ lbl_8001BA40:
/* 8001BA5C 0001899C 39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l
/* 8001BA60 000189A0 81 08 5D AC */ lwz r8, 0x5dac(r8)
/* 8001BA64 000189A4 39 40 FF FF */ li r10, -1
/* 8001BA68 000189A8 48 02 5C 01 */ bl dEvt_control_c_NS_order
/* 8001BA68 000189A8 48 02 5C 01 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001BA6C:
/* 8001BA6C 000189AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001BA70 000189B0 7C 08 03 A6 */ mtlr r0
include/f/f_op/f_op_actor_mng/asm/func_8001BA7C.s
+1 -1
View File
@@ -36,7 +36,7 @@ lbl_8001BAE8:
/* 8001BAF4 00018A34 3C E0 00 01 */ lis r7, 0x0000FFFF@ha
/* 8001BAF8 00018A38 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l
/* 8001BAFC 00018A3C 39 40 FF FF */ li r10, -1
/* 8001BB00 00018A40 48 02 5B 69 */ bl dEvt_control_c_NS_order
/* 8001BB00 00018A40 48 02 5B 69 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
lbl_8001BB04:
/* 8001BB04 00018A44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001BB08 00018A48 7C 08 03 A6 */ mtlr r0
include/f/f_op/f_op_actor_mng/asm/func_8001BB14.s
+1 -1
View File
@@ -5,7 +5,7 @@
/* 8001BB24 00018A64 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
/* 8001BB28 00018A68 38 64 4E C8 */ addi r3, r4, 0x4ec8
/* 8001BB2C 00018A6C 80 84 4F 94 */ lwz r4, 0x4f94(r4)
/* 8001BB30 00018A70 48 02 77 BD */ bl dEvt_control_c_NS_convPId
/* 8001BB30 00018A70 48 02 77 BD */ bl convPId__14dEvt_control_cFUi
/* 8001BB34 00018A74 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8001BB38 00018A78 7C 08 03 A6 */ mtlr r0
/* 8001BB3C 00018A7C 38 21 00 10 */ addi r1, r1, 0x10

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