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

Migrate many functions from d_save.s

Browse Source
This commit is contained in:
unknown
2020-09-13 02:51:05 -04:00
parent a545ed5837
commit 6359c5f82b
256 changed files with 4307 additions and 3864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/event/d_event_data.s
+18 -18
View File
@@ -543,7 +543,7 @@ dEvDtEvent_c_NS_finishCheck:
/* 80043E7C 00040DBC 7C 08 02 A6 */ mflr r0
/* 80043E80 00040DC0 90 01 00 24 */ stw r0, 0x24(r1)
/* 80043E84 00040DC4 39 61 00 20 */ addi r11, r1, 0x20
/* 80043E88 00040DC8 48 31 E3 51 */ bl func_803621D8
/* 80043E88 00040DC8 48 31 E3 51 */ bl _savegpr_28
/* 80043E8C 00040DCC 7C 7C 1B 78 */ mr r28, r3
/* 80043E90 00040DD0 3B A0 00 00 */ li r29, 0
/* 80043E94 00040DD4 3B E0 00 00 */ li r31, 0
@@ -571,7 +571,7 @@ lbl_80043ED0:
/* 80043EE0 00040E20 38 60 00 01 */ li r3, 1
lbl_80043EE4:
/* 80043EE4 00040E24 39 61 00 20 */ addi r11, r1, 0x20
/* 80043EE8 00040E28 48 31 E3 3D */ bl func_80362224
/* 80043EE8 00040E28 48 31 E3 3D */ bl _restgpr_28
/* 80043EEC 00040E2C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80043EF0 00040E30 7C 08 03 A6 */ mtlr r0
/* 80043EF4 00040E34 38 21 00 20 */ addi r1, r1, 0x20
@@ -583,7 +583,7 @@ dEvDtEvent_c_NS_forceFinish:
/* 80043F00 00040E40 7C 08 02 A6 */ mflr r0
/* 80043F04 00040E44 90 01 00 24 */ stw r0, 0x24(r1)
/* 80043F08 00040E48 39 61 00 20 */ addi r11, r1, 0x20
/* 80043F0C 00040E4C 48 31 E2 CD */ bl func_803621D8
/* 80043F0C 00040E4C 48 31 E2 CD */ bl _savegpr_28
/* 80043F10 00040E50 7C 7C 1B 78 */ mr r28, r3
/* 80043F14 00040E54 3B A0 00 00 */ li r29, 0
/* 80043F18 00040E58 3B E0 00 00 */ li r31, 0
@@ -606,7 +606,7 @@ lbl_80043F3C:
/* 80043F54 00040E94 38 60 00 01 */ li r3, 1
lbl_80043F58:
/* 80043F58 00040E98 39 61 00 20 */ addi r11, r1, 0x20
/* 80043F5C 00040E9C 48 31 E2 C9 */ bl func_80362224
/* 80043F5C 00040E9C 48 31 E2 C9 */ bl _restgpr_28
/* 80043F60 00040EA0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80043F64 00040EA4 7C 08 03 A6 */ mtlr r0
/* 80043F68 00040EA8 38 21 00 20 */ addi r1, r1, 0x20
@@ -618,7 +618,7 @@ dEvDtEvent_c_NS_specialStaffProc:
/* 80043F74 00040EB4 7C 08 02 A6 */ mflr r0
/* 80043F78 00040EB8 90 01 00 24 */ stw r0, 0x24(r1)
/* 80043F7C 00040EBC 39 61 00 20 */ addi r11, r1, 0x20
/* 80043F80 00040EC0 48 31 E2 59 */ bl func_803621D8
/* 80043F80 00040EC0 48 31 E2 59 */ bl _savegpr_28
/* 80043F84 00040EC4 7C 7C 1B 78 */ mr r28, r3
/* 80043F88 00040EC8 7C 9D 23 78 */ mr r29, r4
/* 80043F8C 00040ECC 3B C0 00 00 */ li r30, 0
@@ -637,7 +637,7 @@ lbl_80043FB4:
/* 80043FB8 00040EF8 7C 1E 00 00 */ cmpw r30, r0
/* 80043FBC 00040EFC 41 80 FF DC */ blt lbl_80043F98
/* 80043FC0 00040F00 39 61 00 20 */ addi r11, r1, 0x20
/* 80043FC4 00040F04 48 31 E2 61 */ bl func_80362224
/* 80043FC4 00040F04 48 31 E2 61 */ bl _restgpr_28
/* 80043FC8 00040F08 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80043FCC 00040F0C 7C 08 03 A6 */ mtlr r0
/* 80043FD0 00040F10 38 21 00 20 */ addi r1, r1, 0x20
@@ -1402,7 +1402,7 @@ dEvDtStaff_c_NS_specialProcSound:
/* 80044A5C 0004199C 7C 08 02 A6 */ mflr r0
/* 80044A60 000419A0 90 01 00 24 */ stw r0, 0x24(r1)
/* 80044A64 000419A4 39 61 00 20 */ addi r11, r1, 0x20
/* 80044A68 000419A8 48 31 D7 71 */ bl func_803621D8
/* 80044A68 000419A8 48 31 D7 71 */ bl _savegpr_28
/* 80044A6C 000419AC 7C 7C 1B 78 */ mr r28, r3
/* 80044A70 000419B0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80044A74 000419B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -1557,7 +1557,7 @@ lbl_80044C94:
/* 80044C9C 00041BDC 48 00 34 E1 */ bl dEvent_manager_c_NS_cutEnd
lbl_80044CA0:
/* 80044CA0 00041BE0 39 61 00 20 */ addi r11, r1, 0x20
/* 80044CA4 00041BE4 48 31 D5 81 */ bl func_80362224
/* 80044CA4 00041BE4 48 31 D5 81 */ bl _restgpr_28
/* 80044CA8 00041BE8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80044CAC 00041BEC 7C 08 03 A6 */ mtlr r0
/* 80044CB0 00041BF0 38 21 00 20 */ addi r1, r1, 0x20
@@ -1569,7 +1569,7 @@ dEvDtStaff_c_NS_specialProcCreate:
/* 80044CBC 00041BFC 7C 08 02 A6 */ mflr r0
/* 80044CC0 00041C00 90 01 00 44 */ stw r0, 0x44(r1)
/* 80044CC4 00041C04 39 61 00 40 */ addi r11, r1, 0x40
/* 80044CC8 00041C08 48 31 D5 11 */ bl func_803621D8
/* 80044CC8 00041C08 48 31 D5 11 */ bl _savegpr_28
/* 80044CCC 00041C0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80044CD0 00041C10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80044CD4 00041C14 3B C3 4F F8 */ addi r30, r3, 0x4ff8
@@ -1709,7 +1709,7 @@ lbl_80044EA8:
/* 80044EC8 00041E08 4B FD 4E D1 */ bl fopAcM_create_X1_
lbl_80044ECC:
/* 80044ECC 00041E0C 39 61 00 40 */ addi r11, r1, 0x40
/* 80044ED0 00041E10 48 31 D3 55 */ bl func_80362224
/* 80044ED0 00041E10 48 31 D3 55 */ bl _restgpr_28
/* 80044ED4 00041E14 80 01 00 44 */ lwz r0, 0x44(r1)
/* 80044ED8 00041E18 7C 08 03 A6 */ mtlr r0
/* 80044EDC 00041E1C 38 21 00 40 */ addi r1, r1, 0x40
@@ -2564,7 +2564,7 @@ dEvDtStaff_c_NS_specialProcTimekeeper:
/* 80045B00 00042A40 7C 08 02 A6 */ mflr r0
/* 80045B04 00042A44 90 01 00 24 */ stw r0, 0x24(r1)
/* 80045B08 00042A48 39 61 00 20 */ addi r11, r1, 0x20
/* 80045B0C 00042A4C 48 31 C6 CD */ bl func_803621D8
/* 80045B0C 00042A4C 48 31 C6 CD */ bl _savegpr_28
/* 80045B10 00042A50 7C 7E 1B 78 */ mr r30, r3
/* 80045B14 00042A54 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80045B18 00042A58 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -2639,7 +2639,7 @@ lbl_80045C10:
/* 80045C18 00042B58 48 00 25 65 */ bl dEvent_manager_c_NS_cutEnd
lbl_80045C1C:
/* 80045C1C 00042B5C 39 61 00 20 */ addi r11, r1, 0x20
/* 80045C20 00042B60 48 31 C6 05 */ bl func_80362224
/* 80045C20 00042B60 48 31 C6 05 */ bl _restgpr_28
/* 80045C24 00042B64 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80045C28 00042B68 7C 08 03 A6 */ mtlr r0
/* 80045C2C 00042B6C 38 21 00 20 */ addi r1, r1, 0x20
@@ -2973,7 +2973,7 @@ dEvDtCut_c_NS_startCheck:
/* 800460AC 00042FEC 7C 08 02 A6 */ mflr r0
/* 800460B0 00042FF0 90 01 00 24 */ stw r0, 0x24(r1)
/* 800460B4 00042FF4 39 61 00 20 */ addi r11, r1, 0x20
/* 800460B8 00042FF8 48 31 C1 21 */ bl func_803621D8
/* 800460B8 00042FF8 48 31 C1 21 */ bl _savegpr_28
/* 800460BC 00042FFC 7C 7C 1B 78 */ mr r28, r3
/* 800460C0 00043000 3B A0 00 00 */ li r29, 0
/* 800460C4 00043004 3B E0 00 00 */ li r31, 0
@@ -3004,7 +3004,7 @@ lbl_8004610C:
/* 8004611C 0004305C 38 60 00 01 */ li r3, 1
lbl_80046120:
/* 80046120 00043060 39 61 00 20 */ addi r11, r1, 0x20
/* 80046124 00043064 48 31 C1 01 */ bl func_80362224
/* 80046124 00043064 48 31 C1 01 */ bl _restgpr_28
/* 80046128 00043068 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8004612C 0004306C 7C 08 03 A6 */ mtlr r0
/* 80046130 00043070 38 21 00 20 */ addi r1, r1, 0x20
@@ -3116,7 +3116,7 @@ dEvDtBase_c_NS_advanceCut:
/* 80046290 000431D0 7C 08 02 A6 */ mflr r0
/* 80046294 000431D4 90 01 00 24 */ stw r0, 0x24(r1)
/* 80046298 000431D8 39 61 00 20 */ addi r11, r1, 0x20
/* 8004629C 000431DC 48 31 BF 3D */ bl func_803621D8
/* 8004629C 000431DC 48 31 BF 3D */ bl _savegpr_28
/* 800462A0 000431E0 7C 7C 1B 78 */ mr r28, r3
/* 800462A4 000431E4 7C 9D 23 78 */ mr r29, r4
/* 800462A8 000431E8 3B C0 00 00 */ li r30, 0
@@ -3137,7 +3137,7 @@ lbl_800462D8:
/* 800462DC 0004321C 7C 1E 00 00 */ cmpw r30, r0
/* 800462E0 00043220 41 80 FF D4 */ blt lbl_800462B4
/* 800462E4 00043224 39 61 00 20 */ addi r11, r1, 0x20
/* 800462E8 00043228 48 31 BF 3D */ bl func_80362224
/* 800462E8 00043228 48 31 BF 3D */ bl _restgpr_28
/* 800462EC 0004322C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800462F0 00043230 7C 08 03 A6 */ mtlr r0
/* 800462F4 00043234 38 21 00 20 */ addi r1, r1, 0x20
@@ -3149,7 +3149,7 @@ dEvDtBase_c_NS_advanceCutLocal:
/* 80046300 00043240 7C 08 02 A6 */ mflr r0
/* 80046304 00043244 90 01 00 24 */ stw r0, 0x24(r1)
/* 80046308 00043248 39 61 00 20 */ addi r11, r1, 0x20
/* 8004630C 0004324C 48 31 BE CD */ bl func_803621D8
/* 8004630C 0004324C 48 31 BE CD */ bl _savegpr_28
/* 80046310 00043250 7C 7C 1B 78 */ mr r28, r3
/* 80046314 00043254 7C 9D 23 78 */ mr r29, r4
/* 80046318 00043258 80 63 00 0C */ lwz r3, 0xc(r3)
@@ -3201,7 +3201,7 @@ lbl_800463B8:
/* 800463C0 00043300 38 60 00 00 */ li r3, 0
lbl_800463C4:
/* 800463C4 00043304 39 61 00 20 */ addi r11, r1, 0x20
/* 800463C8 00043308 48 31 BE 5D */ bl func_80362224
/* 800463C8 00043308 48 31 BE 5D */ bl _restgpr_28
/* 800463CC 0004330C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800463D0 00043310 7C 08 03 A6 */ mtlr r0
/* 800463D4 00043314 38 21 00 20 */ addi r1, r1, 0x20
asm/d/event/d_event_manager.s
+12 -12
View File
@@ -407,7 +407,7 @@ lbl_80046930:
/* 80046934 00043874 4B FE 8B 89 */ bl dComIfG_getRoomArcName
/* 80046938 00043878 7C 64 1B 78 */ mr r4, r3
/* 8004693C 0004387C 38 61 00 08 */ addi r3, r1, 8
/* 80046940 00043880 48 32 21 ED */ bl func_80368B2C
/* 80046940 00043880 48 32 21 ED */ bl strcpy
/* 80046944 00043884 38 61 00 08 */ addi r3, r1, 8
/* 80046948 00043888 3C 80 80 38 */ lis r4, lbl_80379F50@ha
/* 8004694C 0004388C 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l
@@ -462,7 +462,7 @@ dEvent_manager_c_NS_roomFinish:
/* 800469F0 00043930 7C 08 02 A6 */ mflr r0
/* 800469F4 00043934 90 01 00 24 */ stw r0, 0x24(r1)
/* 800469F8 00043938 39 61 00 20 */ addi r11, r1, 0x20
/* 800469FC 0004393C 48 31 B7 DD */ bl func_803621D8
/* 800469FC 0004393C 48 31 B7 DD */ bl _savegpr_28
/* 80046A00 00043940 7C 7C 1B 78 */ mr r28, r3
/* 80046A04 00043944 7C 9D 23 78 */ mr r29, r4
/* 80046A08 00043948 3B C0 00 04 */ li r30, 4
@@ -482,7 +482,7 @@ lbl_80046A30:
/* 80046A38 00043978 3B FF 00 24 */ addi r31, r31, 0x24
/* 80046A3C 0004397C 40 81 FF D4 */ ble lbl_80046A10
/* 80046A40 00043980 39 61 00 20 */ addi r11, r1, 0x20
/* 80046A44 00043984 48 31 B7 E1 */ bl func_80362224
/* 80046A44 00043984 48 31 B7 E1 */ bl _restgpr_28
/* 80046A48 00043988 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80046A4C 0004398C 7C 08 03 A6 */ mtlr r0
/* 80046A50 00043990 38 21 00 20 */ addi r1, r1, 0x20
@@ -667,7 +667,7 @@ dEvent_manager_c_NS_startProc:
/* 80046CBC 00043BFC 7C 08 02 A6 */ mflr r0
/* 80046CC0 00043C00 90 01 00 24 */ stw r0, 0x24(r1)
/* 80046CC4 00043C04 39 61 00 20 */ addi r11, r1, 0x20
/* 80046CC8 00043C08 48 31 B5 0D */ bl func_803621D4
/* 80046CC8 00043C08 48 31 B5 0D */ bl _savegpr_27
/* 80046CCC 00043C0C 7C 7D 1B 78 */ mr r29, r3
/* 80046CD0 00043C10 7C 9E 23 78 */ mr r30, r4
/* 80046CD4 00043C14 3B E0 00 00 */ li r31, 0
@@ -721,7 +721,7 @@ lbl_80046D6C:
/* 80046D80 00043CC0 38 7D 01 BC */ addi r3, r29, 0x1bc
/* 80046D84 00043CC4 4B FF D0 D5 */ bl dEvDtFlag_c_NS_init
/* 80046D88 00043CC8 39 61 00 20 */ addi r11, r1, 0x20
/* 80046D8C 00043CCC 48 31 B4 95 */ bl func_80362220
/* 80046D8C 00043CCC 48 31 B4 95 */ bl _restgpr_27
/* 80046D90 00043CD0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80046D94 00043CD4 7C 08 03 A6 */ mtlr r0
/* 80046D98 00043CD8 38 21 00 20 */ addi r1, r1, 0x20
@@ -1791,7 +1791,7 @@ lbl_80047BD4:
/* 80047BFC 00044B3C 41 82 01 24 */ beq lbl_80047D20
/* 80047C00 00044B40 38 61 00 08 */ addi r3, r1, 8
/* 80047C04 00044B44 7F 84 E3 78 */ mr r4, r28
/* 80047C08 00044B48 48 32 0F 25 */ bl func_80368B2C
/* 80047C08 00044B48 48 32 0F 25 */ bl strcpy
/* 80047C0C 00044B4C 3B 00 00 00 */ li r24, 0
/* 80047C10 00044B50 57 20 06 3F */ clrlwi. r0, r25, 0x18
/* 80047C14 00044B54 40 82 00 28 */ bne lbl_80047C3C
@@ -2251,7 +2251,7 @@ dEvent_manager_c_NS_getEventPrio:
/* 800481F8 00045138 7C 08 02 A6 */ mflr r0
/* 800481FC 0004513C 90 01 00 44 */ stw r0, 0x44(r1)
/* 80048200 00045140 39 61 00 40 */ addi r11, r1, 0x40
/* 80048204 00045144 48 31 9F D5 */ bl func_803621D8
/* 80048204 00045144 48 31 9F D5 */ bl _savegpr_28
/* 80048208 00045148 7C 7C 1B 78 */ mr r28, r3
/* 8004820C 0004514C 7C 9D 23 78 */ mr r29, r4
/* 80048210 00045150 7C BE 2B 78 */ mr r30, r5
@@ -2300,7 +2300,7 @@ lbl_800482B0:
/* 800482B0 000451F0 80 7F 00 28 */ lwz r3, 0x28(r31)
lbl_800482B4:
/* 800482B4 000451F4 39 61 00 40 */ addi r11, r1, 0x40
/* 800482B8 000451F8 48 31 9F 6D */ bl func_80362224
/* 800482B8 000451F8 48 31 9F 6D */ bl _restgpr_28
/* 800482BC 000451FC 80 01 00 44 */ lwz r0, 0x44(r1)
/* 800482C0 00045200 7C 08 03 A6 */ mtlr r0
/* 800482C4 00045204 38 21 00 40 */ addi r1, r1, 0x40
@@ -2330,7 +2330,7 @@ dEvent_manager_c_NS_issueStaff:
lbl_80048310:
/* 80048310 00045250 38 61 00 08 */ addi r3, r1, 8
/* 80048314 00045254 7F E4 FB 78 */ mr r4, r31
/* 80048318 00045258 48 32 08 15 */ bl func_80368B2C
/* 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
@@ -2368,7 +2368,7 @@ dEvent_manager_c_NS_cancelStaff:
lbl_8004838C:
/* 8004838C 000452CC 38 61 00 08 */ addi r3, r1, 8
/* 80048390 000452D0 7F E4 FB 78 */ mr r4, r31
/* 80048394 000452D4 48 32 07 99 */ bl func_80368B2C
/* 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
@@ -2649,7 +2649,7 @@ dEv_talkman_get_action:
/* 8004874C 0004568C 7C 08 02 A6 */ mflr r0
/* 80048750 00045690 90 01 00 24 */ stw r0, 0x24(r1)
/* 80048754 00045694 39 61 00 20 */ addi r11, r1, 0x20
/* 80048758 00045698 48 31 9A 81 */ bl func_803621D8
/* 80048758 00045698 48 31 9A 81 */ bl _savegpr_28
/* 8004875C 0004569C 7C 7C 1B 78 */ mr r28, r3
/* 80048760 000456A0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80048764 000456A4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -2685,7 +2685,7 @@ lbl_800487D4:
/* 800487D4 00045714 7F A3 EB 78 */ mr r3, r29
lbl_800487D8:
/* 800487D8 00045718 39 61 00 20 */ addi r11, r1, 0x20
/* 800487DC 0004571C 48 31 9A 49 */ bl func_80362224
/* 800487DC 0004571C 48 31 9A 49 */ bl _restgpr_28
/* 800487E0 00045720 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800487E4 00045724 7C 08 03 A6 */ mtlr r0
/* 800487E8 00045728 38 21 00 20 */ addi r1, r1, 0x20