Work on d_a_tag_river_back (#1918)

This commit is contained in:
hev7
2023-09-09 11:46:24 +01:00
committed by GitHub
parent efb7068d67
commit 82780082c7
11 changed files with 205 additions and 416 deletions
@@ -1,27 +0,0 @@
lbl_80D5F2F8:
/* 80D5F2F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F2FC 7C 08 02 A6 */ mflr r0
/* 80D5F300 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F304 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D5F308 7C 7F 1B 78 */ mr r31, r3
/* 80D5F30C 38 00 00 FF */ li r0, 0xff
/* 80D5F310 98 03 05 72 */ stb r0, 0x572(r3)
/* 80D5F314 3C 60 80 D6 */ lis r3, l_arcName@ha /* 0x80D5F9A0@ha */
/* 80D5F318 80 03 F9 A0 */ lwz r0, l_arcName@l(r3) /* 0x80D5F9A0@l */
/* 80D5F31C 90 1F 01 00 */ stw r0, 0x100(r31)
/* 80D5F320 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D5F324 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D5F328 38 63 4F F8 */ addi r3, r3, 0x4ff8
/* 80D5F32C 7F E4 FB 78 */ mr r4, r31
/* 80D5F330 3C A0 80 D6 */ lis r5, l_evName@ha /* 0x80D5F9A4@ha */
/* 80D5F334 38 A5 F9 A4 */ addi r5, r5, l_evName@l /* 0x80D5F9A4@l */
/* 80D5F338 80 A5 00 00 */ lwz r5, 0(r5)
/* 80D5F33C 38 C0 00 FF */ li r6, 0xff
/* 80D5F340 4B 2E 84 19 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
/* 80D5F344 B0 7F 05 74 */ sth r3, 0x574(r31)
/* 80D5F348 38 60 00 01 */ li r3, 1
/* 80D5F34C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D5F350 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F354 7C 08 03 A6 */ mtlr r0
/* 80D5F358 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F35C 4E 80 00 20 */ blr
@@ -1,14 +0,0 @@
lbl_80D5F88C:
/* 80D5F88C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F890 7C 08 02 A6 */ mflr r0
/* 80D5F894 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F898 3C 80 80 D6 */ lis r4, l_arcName@ha /* 0x80D5F9A0@ha */
/* 80D5F89C 38 84 F9 A0 */ addi r4, r4, l_arcName@l /* 0x80D5F9A0@l */
/* 80D5F8A0 80 84 00 00 */ lwz r4, 0(r4)
/* 80D5F8A4 38 63 05 68 */ addi r3, r3, 0x568
/* 80D5F8A8 4B 2C D7 61 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 80D5F8AC 38 60 00 01 */ li r3, 1
/* 80D5F8B0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F8B4 7C 08 03 A6 */ mtlr r0
/* 80D5F8B8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F8BC 4E 80 00 20 */ blr
@@ -1,43 +0,0 @@
lbl_80D5F66C:
/* 80D5F66C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80D5F670 7C 08 02 A6 */ mflr r0
/* 80D5F674 90 01 00 24 */ stw r0, 0x24(r1)
/* 80D5F678 39 61 00 20 */ addi r11, r1, 0x20
/* 80D5F67C 4B 60 2B 61 */ bl _savegpr_29
/* 80D5F680 7C 7D 1B 78 */ mr r29, r3
/* 80D5F684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D5F688 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D5F68C 83 DF 5D AC */ lwz r30, 0x5dac(r31)
/* 80D5F690 A8 7D 05 76 */ lha r3, 0x576(r29)
/* 80D5F694 38 03 00 01 */ addi r0, r3, 1
/* 80D5F698 B0 1D 05 76 */ sth r0, 0x576(r29)
/* 80D5F69C 38 7F 4F F8 */ addi r3, r31, 0x4ff8
/* 80D5F6A0 A8 9D 05 74 */ lha r4, 0x574(r29)
/* 80D5F6A4 4B 2E 83 D5 */ bl endCheck__16dEvent_manager_cFs
/* 80D5F6A8 2C 03 00 00 */ cmpwi r3, 0
/* 80D5F6AC 41 82 00 18 */ beq lbl_80D5F6C4
/* 80D5F6B0 38 00 00 03 */ li r0, 3
/* 80D5F6B4 98 1D 05 71 */ stb r0, 0x571(r29)
/* 80D5F6B8 38 7F 4E C8 */ addi r3, r31, 0x4ec8
/* 80D5F6BC 4B 2E 2D AD */ bl reset__14dEvt_control_cFv
/* 80D5F6C0 48 00 00 34 */ b lbl_80D5F6F4
lbl_80D5F6C4:
/* 80D5F6C4 7F A3 EB 78 */ mr r3, r29
/* 80D5F6C8 48 00 00 49 */ bl demoProc__16daTagRiverBack_cFv
/* 80D5F6CC A8 1D 05 76 */ lha r0, 0x576(r29)
/* 80D5F6D0 2C 00 00 1E */ cmpwi r0, 0x1e
/* 80D5F6D4 40 82 00 20 */ bne lbl_80D5F6F4
/* 80D5F6D8 7F C3 F3 78 */ mr r3, r30
/* 80D5F6DC 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010041@ha */
/* 80D5F6E0 38 84 00 41 */ addi r4, r4, 0x0041 /* 0x00010041@l */
/* 80D5F6E4 81 9E 06 28 */ lwz r12, 0x628(r30)
/* 80D5F6E8 81 8C 01 14 */ lwz r12, 0x114(r12)
/* 80D5F6EC 7D 89 03 A6 */ mtctr r12
/* 80D5F6F0 4E 80 04 21 */ bctrl
lbl_80D5F6F4:
/* 80D5F6F4 39 61 00 20 */ addi r11, r1, 0x20
/* 80D5F6F8 4B 60 2B 31 */ bl _restgpr_29
/* 80D5F6FC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80D5F700 7C 08 03 A6 */ mtlr r0
/* 80D5F704 38 21 00 20 */ addi r1, r1, 0x20
/* 80D5F708 4E 80 00 20 */ blr
@@ -1,47 +0,0 @@
lbl_80D5F5BC:
/* 80D5F5BC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F5C0 7C 08 02 A6 */ mflr r0
/* 80D5F5C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F5C8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D5F5CC 93 C1 00 08 */ stw r30, 8(r1)
/* 80D5F5D0 7C 7E 1B 78 */ mr r30, r3
/* 80D5F5D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D5F5D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D5F5DC 83 E4 5D AC */ lwz r31, 0x5dac(r4)
/* 80D5F5E0 A0 03 00 F8 */ lhz r0, 0xf8(r3)
/* 80D5F5E4 28 00 00 02 */ cmplwi r0, 2
/* 80D5F5E8 40 82 00 44 */ bne lbl_80D5F62C
/* 80D5F5EC 38 00 00 02 */ li r0, 2
/* 80D5F5F0 98 1E 05 71 */ stb r0, 0x571(r30)
/* 80D5F5F4 38 64 4F F8 */ addi r3, r4, 0x4ff8
/* 80D5F5F8 3C 80 80 D6 */ lis r4, l_staffName@ha /* 0x80D5F9A8@ha */
/* 80D5F5FC 38 84 F9 A8 */ addi r4, r4, l_staffName@l /* 0x80D5F9A8@l */
/* 80D5F600 80 84 00 00 */ lwz r4, 0(r4)
/* 80D5F604 38 A0 00 00 */ li r5, 0
/* 80D5F608 38 C0 00 00 */ li r6, 0
/* 80D5F60C 4B 2E 85 11 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci
/* 80D5F610 90 7E 05 78 */ stw r3, 0x578(r30)
/* 80D5F614 80 1F 05 70 */ lwz r0, 0x570(r31)
/* 80D5F618 64 00 00 01 */ oris r0, r0, 1
/* 80D5F61C 90 1F 05 70 */ stw r0, 0x570(r31)
/* 80D5F620 7F C3 F3 78 */ mr r3, r30
/* 80D5F624 48 00 00 ED */ bl demoProc__16daTagRiverBack_cFv
/* 80D5F628 48 00 00 2C */ b lbl_80D5F654
lbl_80D5F62C:
/* 80D5F62C A8 9E 05 74 */ lha r4, 0x574(r30)
/* 80D5F630 88 BE 05 72 */ lbz r5, 0x572(r30)
/* 80D5F634 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */
/* 80D5F638 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */
/* 80D5F63C 38 E0 00 00 */ li r7, 0
/* 80D5F640 39 00 00 01 */ li r8, 1
/* 80D5F644 4B 2B C0 39 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 80D5F648 A0 1E 00 FA */ lhz r0, 0xfa(r30)
/* 80D5F64C 60 00 00 02 */ ori r0, r0, 2
/* 80D5F650 B0 1E 00 FA */ sth r0, 0xfa(r30)
lbl_80D5F654:
/* 80D5F654 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D5F658 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D5F65C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F660 7C 08 03 A6 */ mtlr r0
/* 80D5F664 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F668 4E 80 00 20 */ blr
@@ -1,31 +0,0 @@
lbl_80D5F548:
/* 80D5F548 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F54C 7C 08 02 A6 */ mflr r0
/* 80D5F550 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F554 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D5F558 7C 7F 1B 78 */ mr r31, r3
/* 80D5F55C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D5F560 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D5F564 80 04 5F 18 */ lwz r0, 0x5f18(r4)
/* 80D5F568 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb
/* 80D5F56C 41 82 00 3C */ beq lbl_80D5F5A8
/* 80D5F570 38 00 00 00 */ li r0, 0
/* 80D5F574 B0 1F 05 76 */ sth r0, 0x576(r31)
/* 80D5F578 38 00 00 01 */ li r0, 1
/* 80D5F57C 98 1F 05 71 */ stb r0, 0x571(r31)
/* 80D5F580 A8 9F 05 74 */ lha r4, 0x574(r31)
/* 80D5F584 88 BF 05 72 */ lbz r5, 0x572(r31)
/* 80D5F588 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */
/* 80D5F58C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */
/* 80D5F590 38 E0 00 00 */ li r7, 0
/* 80D5F594 39 00 00 01 */ li r8, 1
/* 80D5F598 4B 2B C0 E5 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs
/* 80D5F59C A0 1F 00 FA */ lhz r0, 0xfa(r31)
/* 80D5F5A0 60 00 00 02 */ ori r0, r0, 2
/* 80D5F5A4 B0 1F 00 FA */ sth r0, 0xfa(r31)
lbl_80D5F5A8:
/* 80D5F5A8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D5F5AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F5B0 7C 08 03 A6 */ mtlr r0
/* 80D5F5B4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F5B8 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D5F900:
/* 80D5F900 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F904 7C 08 02 A6 */ mflr r0
/* 80D5F908 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F90C 4B FF FA 55 */ bl create__16daTagRiverBack_cFv
/* 80D5F910 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F914 7C 08 03 A6 */ mtlr r0
/* 80D5F918 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F91C 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D5F8E0:
/* 80D5F8E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F8E4 7C 08 02 A6 */ mflr r0
/* 80D5F8E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F8EC 4B FF FF A1 */ bl _delete__16daTagRiverBack_cFv
/* 80D5F8F0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F8F4 7C 08 03 A6 */ mtlr r0
/* 80D5F8F8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F8FC 4E 80 00 20 */ blr
@@ -1,9 +0,0 @@
lbl_80D5F8C0:
/* 80D5F8C0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F8C4 7C 08 02 A6 */ mflr r0
/* 80D5F8C8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F8CC 4B FF FB 25 */ bl execute__16daTagRiverBack_cFv
/* 80D5F8D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F8D4 7C 08 03 A6 */ mtlr r0
/* 80D5F8D8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F8DC 4E 80 00 20 */ blr
@@ -1,43 +0,0 @@
lbl_80D5F3F0:
/* 80D5F3F0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D5F3F4 7C 08 02 A6 */ mflr r0
/* 80D5F3F8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D5F3FC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D5F400 7C 7F 1B 78 */ mr r31, r3
/* 80D5F404 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80D5F408 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f
/* 80D5F40C 28 04 00 FF */ cmplwi r4, 0xff
/* 80D5F410 41 82 00 28 */ beq lbl_80D5F438
/* 80D5F414 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D5F418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D5F41C 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D5F420 7C 05 07 74 */ extsb r5, r0
/* 80D5F424 4B 2D 5F 3D */ bl isSwitch__10dSv_info_cCFii
/* 80D5F428 2C 03 00 00 */ cmpwi r3, 0
/* 80D5F42C 41 82 00 0C */ beq lbl_80D5F438
/* 80D5F430 38 60 00 01 */ li r3, 1
/* 80D5F434 48 00 00 44 */ b lbl_80D5F478
lbl_80D5F438:
/* 80D5F438 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D5F43C 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f
/* 80D5F440 28 04 00 FF */ cmplwi r4, 0xff
/* 80D5F444 41 82 00 28 */ beq lbl_80D5F46C
/* 80D5F448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D5F44C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D5F450 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D5F454 7C 05 07 74 */ extsb r5, r0
/* 80D5F458 4B 2D 5F 09 */ bl isSwitch__10dSv_info_cCFii
/* 80D5F45C 2C 03 00 00 */ cmpwi r3, 0
/* 80D5F460 40 82 00 0C */ bne lbl_80D5F46C
/* 80D5F464 38 60 00 01 */ li r3, 1
/* 80D5F468 48 00 00 10 */ b lbl_80D5F478
lbl_80D5F46C:
/* 80D5F46C 7F E3 FB 78 */ mr r3, r31
/* 80D5F470 48 00 00 1D */ bl event_proc_call__16daTagRiverBack_cFv
/* 80D5F474 38 60 00 01 */ li r3, 1
lbl_80D5F478:
/* 80D5F478 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D5F47C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D5F480 7C 08 03 A6 */ mtlr r0
/* 80D5F484 38 21 00 10 */ addi r1, r1, 0x10
/* 80D5F488 4E 80 00 20 */ blr