diff --git a/asm/d/event/d_event/Step__14dEvt_control_cFv.s b/asm/d/event/d_event/Step__14dEvt_control_cFv.s deleted file mode 100644 index 960dcca14f5..00000000000 --- a/asm/d/event/d_event/Step__14dEvt_control_cFv.s +++ /dev/null @@ -1,278 +0,0 @@ -lbl_80042BBC: -/* 80042BBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80042BC0 7C 08 02 A6 */ mflr r0 -/* 80042BC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80042BC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042BCC 48 31 F6 0D */ bl _savegpr_28 -/* 80042BD0 7C 7D 1B 78 */ mr r29, r3 -/* 80042BD4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042BD8 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042BDC 3B DF 4F F8 */ addi r30, r31, 0x4ff8 -/* 80042BE0 38 00 00 00 */ li r0, 0 -/* 80042BE4 98 03 00 E7 */ stb r0, 0xe7(r3) -/* 80042BE8 88 03 00 E2 */ lbz r0, 0xe2(r3) -/* 80042BEC 98 03 00 E8 */ stb r0, 0xe8(r3) -/* 80042BF0 4B FF FD E5 */ bl skipper__14dEvt_control_cFv -/* 80042BF4 A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042BF8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80042BFC 41 82 00 54 */ beq lbl_80042C50 -/* 80042C00 88 1D 00 E5 */ lbz r0, 0xe5(r29) -/* 80042C04 28 00 00 01 */ cmplwi r0, 1 -/* 80042C08 40 82 00 24 */ bne lbl_80042C2C -/* 80042C0C 38 00 00 05 */ li r0, 5 -/* 80042C10 98 1D 00 E5 */ stb r0, 0xe5(r29) -/* 80042C14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042C18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042C1C 80 03 5D BC */ lwz r0, 0x5dbc(r3) -/* 80042C20 28 00 00 00 */ cmplwi r0, 0 -/* 80042C24 41 82 00 08 */ beq lbl_80042C2C -/* 80042C28 48 1F 54 71 */ bl endFlowGroup__12dMsgObject_cFv -lbl_80042C2C: -/* 80042C2C 7F C3 F3 78 */ mr r3, r30 -/* 80042C30 A8 9D 00 DE */ lha r4, 0xde(r29) -/* 80042C34 48 00 48 89 */ bl getEventData__16dEvent_manager_cFs -/* 80042C38 28 03 00 00 */ cmplwi r3, 0 -/* 80042C3C 41 82 00 08 */ beq lbl_80042C44 -/* 80042C40 48 00 12 BD */ bl forceFinish__12dEvDtEvent_cFv -lbl_80042C44: -/* 80042C44 A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042C48 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b -/* 80042C4C B0 1D 00 D8 */ sth r0, 0xd8(r29) -lbl_80042C50: -/* 80042C50 88 1D 00 E5 */ lbz r0, 0xe5(r29) -/* 80042C54 28 00 00 00 */ cmplwi r0, 0 -/* 80042C58 41 82 00 0C */ beq lbl_80042C64 -/* 80042C5C 7F C3 F3 78 */ mr r3, r30 -/* 80042C60 48 00 42 05 */ bl Sequencer__16dEvent_manager_cFv -lbl_80042C64: -/* 80042C64 A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042C68 54 00 06 2A */ rlwinm r0, r0, 0, 0x18, 0x15 -/* 80042C6C B0 1D 00 D8 */ sth r0, 0xd8(r29) -/* 80042C70 88 1D 00 E5 */ lbz r0, 0xe5(r29) -/* 80042C74 28 00 00 02 */ cmplwi r0, 2 -/* 80042C78 40 82 00 38 */ bne lbl_80042CB0 -/* 80042C7C 7F C3 F3 78 */ mr r3, r30 -/* 80042C80 3C 80 80 38 */ lis r4, d_event_d_event__stringBase0@ha /* 0x80379D80@ha */ -/* 80042C84 38 84 9D 80 */ addi r4, r4, d_event_d_event__stringBase0@l /* 0x80379D80@l */ -/* 80042C88 38 84 00 07 */ addi r4, r4, 7 -/* 80042C8C 48 00 56 BD */ bl cancelStaff__16dEvent_manager_cFPCc -/* 80042C90 38 60 00 00 */ li r3, 0 -/* 80042C94 90 7E 01 8C */ stw r3, 0x18c(r30) -/* 80042C98 B0 7D 00 D8 */ sth r3, 0xd8(r29) -/* 80042C9C A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042CA0 60 00 02 00 */ ori r0, r0, 0x200 -/* 80042CA4 B0 1D 00 D8 */ sth r0, 0xd8(r29) -/* 80042CA8 98 7D 00 E5 */ stb r3, 0xe5(r29) -/* 80042CAC 48 00 00 14 */ b lbl_80042CC0 -lbl_80042CB0: -/* 80042CB0 28 00 00 00 */ cmplwi r0, 0 -/* 80042CB4 40 82 00 0C */ bne lbl_80042CC0 -/* 80042CB8 38 00 00 00 */ li r0, 0 -/* 80042CBC B0 1D 00 D8 */ sth r0, 0xd8(r29) -lbl_80042CC0: -/* 80042CC0 88 9D 00 E5 */ lbz r4, 0xe5(r29) -/* 80042CC4 28 04 00 05 */ cmplwi r4, 5 -/* 80042CC8 40 82 00 88 */ bne lbl_80042D50 -/* 80042CCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042CD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042CD4 88 03 4E 1C */ lbz r0, 0x4e1c(r3) -/* 80042CD8 7C 00 07 75 */ extsb. r0, r0 -/* 80042CDC 40 82 00 74 */ bne lbl_80042D50 -/* 80042CE0 A0 1D 00 DA */ lhz r0, 0xda(r29) -/* 80042CE4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80042CE8 40 82 00 10 */ bne lbl_80042CF8 -/* 80042CEC 80 1D 01 08 */ lwz r0, 0x108(r29) -/* 80042CF0 2C 00 00 00 */ cmpwi r0, 0 -/* 80042CF4 40 80 00 28 */ bge lbl_80042D1C -lbl_80042CF8: -/* 80042CF8 80 1D 01 10 */ lwz r0, 0x110(r29) -/* 80042CFC 2C 00 00 00 */ cmpwi r0, 0 -/* 80042D00 41 82 00 0C */ beq lbl_80042D0C -/* 80042D04 C0 22 84 C8 */ lfs f1, lit_5013(r2) -/* 80042D08 4B FC 53 C9 */ bl fadeOut__13mDoGph_gInf_cFf -lbl_80042D0C: -/* 80042D0C A0 1D 00 DA */ lhz r0, 0xda(r29) -/* 80042D10 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80042D14 B0 1D 00 DA */ sth r0, 0xda(r29) -/* 80042D18 4B FF E7 71 */ bl func_80041488 -lbl_80042D1C: -/* 80042D1C 7F A3 EB 78 */ mr r3, r29 -/* 80042D20 4B FF F4 A1 */ bl endProc__14dEvt_control_cFv -/* 80042D24 A0 1D 00 DA */ lhz r0, 0xda(r29) -/* 80042D28 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 80042D2C 40 82 00 18 */ bne lbl_80042D44 -/* 80042D30 38 00 00 00 */ li r0, 0 -/* 80042D34 90 1D 01 10 */ stw r0, 0x110(r29) -/* 80042D38 7F C3 F3 78 */ mr r3, r30 -/* 80042D3C 38 80 00 00 */ li r4, 0 -/* 80042D40 48 00 3A C1 */ bl setObjectArchive__16dEvent_manager_cFPc -lbl_80042D44: -/* 80042D44 38 00 00 02 */ li r0, 2 -/* 80042D48 98 1D 00 E5 */ stb r0, 0xe5(r29) -/* 80042D4C 48 00 00 28 */ b lbl_80042D74 -lbl_80042D50: -/* 80042D50 28 04 00 05 */ cmplwi r4, 5 -/* 80042D54 40 82 00 20 */ bne lbl_80042D74 -/* 80042D58 A0 1D 00 DA */ lhz r0, 0xda(r29) -/* 80042D5C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80042D60 40 82 00 10 */ bne lbl_80042D70 -/* 80042D64 80 1D 01 08 */ lwz r0, 0x108(r29) -/* 80042D68 2C 00 00 00 */ cmpwi r0, 0 -/* 80042D6C 40 80 00 08 */ bge lbl_80042D74 -lbl_80042D70: -/* 80042D70 4B FF E7 19 */ bl func_80041488 -lbl_80042D74: -/* 80042D74 7F A3 EB 78 */ mr r3, r29 -/* 80042D78 4B FF F4 DD */ bl change__14dEvt_control_cFv -/* 80042D7C 2C 03 FF FF */ cmpwi r3, -1 -/* 80042D80 41 82 00 50 */ beq lbl_80042DD0 -/* 80042D84 7F C3 F3 78 */ mr r3, r30 -/* 80042D88 3C 80 80 38 */ lis r4, d_event_d_event__stringBase0@ha /* 0x80379D80@ha */ -/* 80042D8C 38 84 9D 80 */ addi r4, r4, d_event_d_event__stringBase0@l /* 0x80379D80@l */ -/* 80042D90 38 84 00 07 */ addi r4, r4, 7 -/* 80042D94 48 00 55 B5 */ bl cancelStaff__16dEvent_manager_cFPCc -/* 80042D98 38 60 00 00 */ li r3, 0 -/* 80042D9C 90 7E 01 8C */ stw r3, 0x18c(r30) -/* 80042DA0 A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042DA4 60 00 02 00 */ ori r0, r0, 0x200 -/* 80042DA8 B0 1D 00 D8 */ sth r0, 0xd8(r29) -/* 80042DAC 98 7D 00 E5 */ stb r3, 0xe5(r29) -/* 80042DB0 A0 7D 00 DA */ lhz r3, 0xda(r29) -/* 80042DB4 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 80042DB8 41 82 00 18 */ beq lbl_80042DD0 -/* 80042DBC 54 60 04 3C */ rlwinm r0, r3, 0, 0x10, 0x1e -/* 80042DC0 B0 1D 00 DA */ sth r0, 0xda(r29) -/* 80042DC4 A0 1D 00 DA */ lhz r0, 0xda(r29) -/* 80042DC8 60 00 00 02 */ ori r0, r0, 2 -/* 80042DCC B0 1D 00 DA */ sth r0, 0xda(r29) -lbl_80042DD0: -/* 80042DD0 38 60 00 00 */ li r3, 0 -/* 80042DD4 98 7D 01 28 */ stb r3, 0x128(r29) -/* 80042DD8 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) -/* 80042DDC 7C 84 07 74 */ extsb r4, r4 -/* 80042DE0 80 1D 01 2C */ lwz r0, 0x12c(r29) -/* 80042DE4 7C 00 20 00 */ cmpw r0, r4 -/* 80042DE8 41 82 00 0C */ beq lbl_80042DF4 -/* 80042DEC 98 7D 01 29 */ stb r3, 0x129(r29) -/* 80042DF0 90 9D 01 2C */ stw r4, 0x12c(r29) -lbl_80042DF4: -/* 80042DF4 88 1D 00 E5 */ lbz r0, 0xe5(r29) -/* 80042DF8 28 00 00 00 */ cmplwi r0, 0 -/* 80042DFC 40 82 00 F8 */ bne lbl_80042EF4 -/* 80042E00 7F A3 EB 78 */ mr r3, r29 -/* 80042E04 4B FF F4 BD */ bl entry__14dEvt_control_cFv -/* 80042E08 2C 03 00 00 */ cmpwi r3, 0 -/* 80042E0C 41 82 00 E8 */ beq lbl_80042EF4 -/* 80042E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042E14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042E18 80 03 5D BC */ lwz r0, 0x5dbc(r3) -/* 80042E1C 28 00 00 00 */ cmplwi r0, 0 -/* 80042E20 41 82 00 08 */ beq lbl_80042E28 -/* 80042E24 48 1F 4B 89 */ bl setKillMessageFlag__12dMsgObject_cFv -lbl_80042E28: -/* 80042E28 A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042E2C 60 00 01 00 */ ori r0, r0, 0x100 -/* 80042E30 B0 1D 00 D8 */ sth r0, 0xd8(r29) -/* 80042E34 38 7F 5B D4 */ addi r3, r31, 0x5bd4 -/* 80042E38 38 80 00 1F */ li r4, 0x1f -/* 80042E3C 48 02 CF 59 */ bl StopQuake__12dVibration_cFi -/* 80042E40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042E44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042E48 83 83 5D B4 */ lwz r28, 0x5db4(r3) -/* 80042E4C 48 13 E7 F5 */ bl dCam_getBody__Fv -/* 80042E50 80 03 00 24 */ lwz r0, 0x24(r3) -/* 80042E54 2C 00 00 00 */ cmpwi r0, 0 -/* 80042E58 41 82 00 8C */ beq lbl_80042EE4 -/* 80042E5C 38 80 00 01 */ li r4, 1 -/* 80042E60 38 60 00 00 */ li r3, 0 -/* 80042E64 A0 FC 2F E8 */ lhz r7, 0x2fe8(r28) -/* 80042E68 28 07 00 A2 */ cmplwi r7, 0xa2 -/* 80042E6C 40 82 00 38 */ bne lbl_80042EA4 -/* 80042E70 7C 65 1B 78 */ mr r5, r3 -/* 80042E74 80 DC 28 28 */ lwz r6, 0x2828(r28) -/* 80042E78 28 06 00 00 */ cmplwi r6, 0 -/* 80042E7C 41 82 00 1C */ beq lbl_80042E98 -/* 80042E80 A0 06 00 F8 */ lhz r0, 0xf8(r6) -/* 80042E84 20 00 00 02 */ subfic r0, r0, 2 -/* 80042E88 7C 00 00 34 */ cntlzw r0, r0 -/* 80042E8C 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 80042E90 41 82 00 08 */ beq lbl_80042E98 -/* 80042E94 7C 85 23 78 */ mr r5, r4 -lbl_80042E98: -/* 80042E98 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80042E9C 40 82 00 08 */ bne lbl_80042EA4 -/* 80042EA0 38 60 00 01 */ li r3, 1 -lbl_80042EA4: -/* 80042EA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80042EA8 40 82 00 2C */ bne lbl_80042ED4 -/* 80042EAC 38 60 00 00 */ li r3, 0 -/* 80042EB0 28 07 00 A2 */ cmplwi r7, 0xa2 -/* 80042EB4 41 82 00 14 */ beq lbl_80042EC8 -/* 80042EB8 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 80042EBC 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 80042EC0 41 82 00 08 */ beq lbl_80042EC8 -/* 80042EC4 38 60 00 01 */ li r3, 1 -lbl_80042EC8: -/* 80042EC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80042ECC 40 82 00 08 */ bne lbl_80042ED4 -/* 80042ED0 38 80 00 00 */ li r4, 0 -lbl_80042ED4: -/* 80042ED4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80042ED8 41 82 00 0C */ beq lbl_80042EE4 -/* 80042EDC 48 13 E7 65 */ bl dCam_getBody__Fv -/* 80042EE0 48 11 E5 E5 */ bl QuickStart__9dCamera_cFv -lbl_80042EE4: -/* 80042EE4 38 00 00 01 */ li r0, 1 -/* 80042EE8 98 1D 00 E5 */ stb r0, 0xe5(r29) -/* 80042EEC 7F A3 EB 78 */ mr r3, r29 -/* 80042EF0 4B FF F6 C5 */ bl clearSkipSystem__14dEvt_control_cFv -lbl_80042EF4: -/* 80042EF4 38 00 00 00 */ li r0, 0 -/* 80042EF8 98 1D 00 E2 */ stb r0, 0xe2(r29) -/* 80042EFC 90 1D 00 F8 */ stw r0, 0xf8(r29) -/* 80042F00 A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042F04 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 -/* 80042F08 41 82 00 14 */ beq lbl_80042F1C -/* 80042F0C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80042F10 38 63 04 C4 */ addi r3, r3, 0x4c4 -/* 80042F14 38 80 00 00 */ li r4, 0 -/* 80042F18 48 27 32 D1 */ bl setDemoName__11Z2StatusMgrFPc -lbl_80042F1C: -/* 80042F1C 88 1D 00 E5 */ lbz r0, 0xe5(r29) -/* 80042F20 28 00 00 00 */ cmplwi r0, 0 -/* 80042F24 41 82 00 14 */ beq lbl_80042F38 -/* 80042F28 7F C3 F3 78 */ mr r3, r30 -/* 80042F2C 48 00 44 D1 */ bl Experts__16dEvent_manager_cFv -/* 80042F30 38 60 00 01 */ li r3, 1 -/* 80042F34 48 00 00 5C */ b lbl_80042F90 -lbl_80042F38: -/* 80042F38 88 1D 01 29 */ lbz r0, 0x129(r29) -/* 80042F3C 28 00 00 00 */ cmplwi r0, 0 -/* 80042F40 40 82 00 44 */ bne lbl_80042F84 -/* 80042F44 38 61 00 08 */ addi r3, r1, 8 -/* 80042F48 38 9F 4E 00 */ addi r4, r31, 0x4e00 -/* 80042F4C 38 A0 00 07 */ li r5, 7 -/* 80042F50 48 32 5B 99 */ bl strncpy -/* 80042F54 38 00 00 00 */ li r0, 0 -/* 80042F58 98 01 00 0F */ stb r0, 0xf(r1) -/* 80042F5C 38 7F 5F 5C */ addi r3, r31, 0x5f5c -/* 80042F60 38 81 00 08 */ addi r4, r1, 8 -/* 80042F64 38 A0 00 07 */ li r5, 7 -/* 80042F68 48 32 5B 81 */ bl strncpy -/* 80042F6C 38 00 00 00 */ li r0, 0 -/* 80042F70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042F74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042F78 98 03 5F 63 */ stb r0, 0x5f63(r3) -/* 80042F7C 80 7D 01 2C */ lwz r3, 0x12c(r29) -/* 80042F80 4B FE CC 01 */ bl dComIfGs_onVisitedRoom__Fi -lbl_80042F84: -/* 80042F84 38 00 00 01 */ li r0, 1 -/* 80042F88 98 1D 01 29 */ stb r0, 0x129(r29) -/* 80042F8C 38 60 00 00 */ li r3, 0 -lbl_80042F90: -/* 80042F90 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042F94 48 31 F2 91 */ bl _restgpr_28 -/* 80042F98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80042F9C 7C 08 03 A6 */ mtlr r0 -/* 80042FA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80042FA4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/catchCheck__14dEvt_control_cFP12dEvt_order_c.s b/asm/d/event/d_event/catchCheck__14dEvt_control_cFP12dEvt_order_c.s deleted file mode 100644 index 63b7245f17f..00000000000 --- a/asm/d/event/d_event/catchCheck__14dEvt_control_cFP12dEvt_order_c.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80041C90: -/* 80041C90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80041C94 7C 08 02 A6 */ mflr r0 -/* 80041C98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80041C9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80041CA0 7C 7F 1B 78 */ mr r31, r3 -/* 80041CA4 80 64 00 0C */ lwz r3, 0xc(r4) -/* 80041CA8 80 A4 00 08 */ lwz r5, 8(r4) -/* 80041CAC 28 05 00 00 */ cmplwi r5, 0 -/* 80041CB0 41 82 00 1C */ beq lbl_80041CCC -/* 80041CB4 28 03 00 00 */ cmplwi r3, 0 -/* 80041CB8 41 82 00 1C */ beq lbl_80041CD4 -/* 80041CBC A0 03 00 FA */ lhz r0, 0xfa(r3) -/* 80041CC0 54 00 06 72 */ rlwinm r0, r0, 0, 0x19, 0x19 -/* 80041CC4 2C 00 00 40 */ cmpwi r0, 0x40 -/* 80041CC8 41 82 00 0C */ beq lbl_80041CD4 -lbl_80041CCC: -/* 80041CCC 38 60 00 00 */ li r3, 0 -/* 80041CD0 48 00 00 50 */ b lbl_80041D20 -lbl_80041CD4: -/* 80041CD4 38 00 00 06 */ li r0, 6 -/* 80041CD8 B0 05 00 F8 */ sth r0, 0xf8(r5) -/* 80041CDC 28 03 00 00 */ cmplwi r3, 0 -/* 80041CE0 41 82 00 08 */ beq lbl_80041CE8 -/* 80041CE4 B0 03 00 F8 */ sth r0, 0xf8(r3) -lbl_80041CE8: -/* 80041CE8 7F E3 FB 78 */ mr r3, r31 -/* 80041CEC 4B FF FB 19 */ bl setParam__14dEvt_control_cFP12dEvt_order_c -/* 80041CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041CF8 88 03 5B 68 */ lbz r0, 0x5b68(r3) -/* 80041CFC 98 1F 00 EE */ stb r0, 0xee(r31) -/* 80041D00 38 00 00 02 */ li r0, 2 -/* 80041D04 98 1F 00 E4 */ stb r0, 0xe4(r31) -/* 80041D08 A8 9F 00 DE */ lha r4, 0xde(r31) -/* 80041D0C 2C 04 FF FF */ cmpwi r4, -1 -/* 80041D10 41 82 00 0C */ beq lbl_80041D1C -/* 80041D14 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041D18 48 00 5C 6D */ bl order__16dEvent_manager_cFs -lbl_80041D1C: -/* 80041D1C 38 60 00 01 */ li r3, 1 -lbl_80041D20: -/* 80041D20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80041D24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80041D28 7C 08 03 A6 */ mtlr r0 -/* 80041D2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80041D30 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/change__14dEvt_control_cFv.s b/asm/d/event/d_event/change__14dEvt_control_cFv.s deleted file mode 100644 index 31a508819f0..00000000000 --- a/asm/d/event/d_event/change__14dEvt_control_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80042254: -/* 80042254 88 03 00 E2 */ lbz r0, 0xe2(r3) -/* 80042258 7C 00 07 75 */ extsb. r0, r0 -/* 8004225C 41 82 00 5C */ beq lbl_800422B8 -/* 80042260 88 E3 00 E3 */ lbz r7, 0xe3(r3) -lbl_80042264: -/* 80042264 7C E5 07 74 */ extsb r5, r7 -/* 80042268 1C 85 00 18 */ mulli r4, r5, 0x18 -/* 8004226C 38 C4 00 04 */ addi r6, r4, 4 -/* 80042270 7C C3 32 14 */ add r6, r3, r6 -/* 80042274 A0 06 00 02 */ lhz r0, 2(r6) -/* 80042278 54 00 05 2D */ rlwinm. r0, r0, 0, 0x14, 0x16 -/* 8004227C 41 82 00 30 */ beq lbl_800422AC -/* 80042280 80 86 00 08 */ lwz r4, 8(r6) -/* 80042284 80 03 00 F8 */ lwz r0, 0xf8(r3) -/* 80042288 7C 04 00 40 */ cmplw r4, r0 -/* 8004228C 40 82 00 20 */ bne lbl_800422AC -/* 80042290 98 E3 00 E3 */ stb r7, 0xe3(r3) -/* 80042294 38 00 00 01 */ li r0, 1 -/* 80042298 98 03 00 E2 */ stb r0, 0xe2(r3) -/* 8004229C 38 00 FF FF */ li r0, -1 -/* 800422A0 98 06 00 14 */ stb r0, 0x14(r6) -/* 800422A4 7C A3 2B 78 */ mr r3, r5 -/* 800422A8 4E 80 00 20 */ blr -lbl_800422AC: -/* 800422AC 88 E6 00 14 */ lbz r7, 0x14(r6) -/* 800422B0 7C E0 07 75 */ extsb. r0, r7 -/* 800422B4 40 80 FF B0 */ bge lbl_80042264 -lbl_800422B8: -/* 800422B8 38 60 FF FF */ li r3, -1 -/* 800422BC 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs.s b/asm/d/event/d_event/commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs.s deleted file mode 100644 index 296e3770391..00000000000 --- a/asm/d/event/d_event/commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800419A8: -/* 800419A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800419AC 7C 08 02 A6 */ mflr r0 -/* 800419B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800419B4 80 E4 00 08 */ lwz r7, 8(r4) -/* 800419B8 81 04 00 0C */ lwz r8, 0xc(r4) -/* 800419BC 28 07 00 00 */ cmplwi r7, 0 -/* 800419C0 41 82 00 4C */ beq lbl_80041A0C -/* 800419C4 54 A5 04 3E */ clrlwi r5, r5, 0x10 -/* 800419C8 A0 07 00 FA */ lhz r0, 0xfa(r7) -/* 800419CC 7C A0 00 38 */ and r0, r5, r0 -/* 800419D0 7C 05 00 50 */ subf r0, r5, r0 -/* 800419D4 7C 00 00 34 */ cntlzw r0, r0 -/* 800419D8 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f -/* 800419DC 41 82 00 30 */ beq lbl_80041A0C -/* 800419E0 28 08 00 00 */ cmplwi r8, 0 -/* 800419E4 41 82 00 28 */ beq lbl_80041A0C -/* 800419E8 A0 08 00 FA */ lhz r0, 0xfa(r8) -/* 800419EC 7C A0 00 38 */ and r0, r5, r0 -/* 800419F0 7C 05 00 00 */ cmpw r5, r0 -/* 800419F4 40 82 00 18 */ bne lbl_80041A0C -/* 800419F8 B0 C7 00 F8 */ sth r6, 0xf8(r7) -/* 800419FC B0 C8 00 F8 */ sth r6, 0xf8(r8) -/* 80041A00 4B FF FE 05 */ bl setParam__14dEvt_control_cFP12dEvt_order_c -/* 80041A04 38 60 00 01 */ li r3, 1 -/* 80041A08 48 00 00 08 */ b lbl_80041A10 -lbl_80041A0C: -/* 80041A0C 38 60 00 00 */ li r3, 0 -lbl_80041A10: -/* 80041A10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80041A14 7C 08 03 A6 */ mtlr r0 -/* 80041A18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80041A1C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/convPId__14dEvt_control_cFUi.s b/asm/d/event/d_event/convPId__14dEvt_control_cFUi.s deleted file mode 100644 index 7aa41bd9d89..00000000000 --- a/asm/d/event/d_event/convPId__14dEvt_control_cFUi.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800432EC: -/* 800432EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800432F0 7C 08 02 A6 */ mflr r0 -/* 800432F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800432F8 90 81 00 08 */ stw r4, 8(r1) -/* 800432FC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80043300 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80043304 38 81 00 08 */ addi r4, r1, 8 -/* 80043308 4B FD 64 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8004330C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80043310 7C 08 03 A6 */ mtlr r0 -/* 80043314 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043318 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/demoCheck__14dEvt_control_cFP12dEvt_order_c.s b/asm/d/event/d_event/demoCheck__14dEvt_control_cFP12dEvt_order_c.s deleted file mode 100644 index 7496e03543d..00000000000 --- a/asm/d/event/d_event/demoCheck__14dEvt_control_cFP12dEvt_order_c.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80041DDC: -/* 80041DDC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80041DE0 7C 08 02 A6 */ mflr r0 -/* 80041DE4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80041DE8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041DEC 48 32 03 E9 */ bl _savegpr_27 -/* 80041DF0 7C 7B 1B 78 */ mr r27, r3 -/* 80041DF4 7C 9C 23 78 */ mr r28, r4 -/* 80041DF8 83 E4 00 08 */ lwz r31, 8(r4) -/* 80041DFC 83 C4 00 0C */ lwz r30, 0xc(r4) -/* 80041E00 AB A4 00 10 */ lha r29, 0x10(r4) -/* 80041E04 28 1E 00 00 */ cmplwi r30, 0 -/* 80041E08 40 82 00 0C */ bne lbl_80041E14 -/* 80041E0C 38 60 00 00 */ li r3, 0 -/* 80041E10 48 00 00 F0 */ b lbl_80041F00 -lbl_80041E14: -/* 80041E14 A0 1C 00 02 */ lhz r0, 2(r28) -/* 80041E18 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80041E1C 40 82 00 44 */ bne lbl_80041E60 -/* 80041E20 28 1F 00 00 */ cmplwi r31, 0 -/* 80041E24 41 82 00 1C */ beq lbl_80041E40 -/* 80041E28 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80041E2C 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 80041E30 2C 00 00 02 */ cmpwi r0, 2 -/* 80041E34 41 82 00 0C */ beq lbl_80041E40 -/* 80041E38 38 60 00 00 */ li r3, 0 -/* 80041E3C 48 00 00 C4 */ b lbl_80041F00 -lbl_80041E40: -/* 80041E40 28 1E 00 00 */ cmplwi r30, 0 -/* 80041E44 41 82 00 1C */ beq lbl_80041E60 -/* 80041E48 A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 80041E4C 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 80041E50 2C 00 00 02 */ cmpwi r0, 2 -/* 80041E54 41 82 00 0C */ beq lbl_80041E60 -/* 80041E58 38 60 00 00 */ li r3, 0 -/* 80041E5C 48 00 00 A4 */ b lbl_80041F00 -lbl_80041E60: -/* 80041E60 7F 63 DB 78 */ mr r3, r27 -/* 80041E64 7F 84 E3 78 */ mr r4, r28 -/* 80041E68 4B FF FA CD */ bl beforeFlagProc__14dEvt_control_cFP12dEvt_order_c -/* 80041E6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80041E70 40 82 00 0C */ bne lbl_80041E7C -/* 80041E74 38 60 00 00 */ li r3, 0 -/* 80041E78 48 00 00 88 */ b lbl_80041F00 -lbl_80041E7C: -/* 80041E7C 28 1F 00 00 */ cmplwi r31, 0 -/* 80041E80 41 82 00 18 */ beq lbl_80041E98 -/* 80041E84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041E8C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041E90 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 80041E94 48 00 49 6D */ bl setObjectArchive__16dEvent_manager_cFPc -lbl_80041E98: -/* 80041E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041EA0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041EA4 7F A4 EB 78 */ mr r4, r29 -/* 80041EA8 48 00 5A DD */ bl order__16dEvent_manager_cFs -/* 80041EAC 2C 03 00 00 */ cmpwi r3, 0 -/* 80041EB0 40 82 00 0C */ bne lbl_80041EBC -/* 80041EB4 38 60 00 00 */ li r3, 0 -/* 80041EB8 48 00 00 48 */ b lbl_80041F00 -lbl_80041EBC: -/* 80041EBC 28 1F 00 00 */ cmplwi r31, 0 -/* 80041EC0 41 82 00 0C */ beq lbl_80041ECC -/* 80041EC4 38 00 00 02 */ li r0, 2 -/* 80041EC8 B0 1F 00 F8 */ sth r0, 0xf8(r31) -lbl_80041ECC: -/* 80041ECC 28 1E 00 00 */ cmplwi r30, 0 -/* 80041ED0 41 82 00 0C */ beq lbl_80041EDC -/* 80041ED4 38 00 00 02 */ li r0, 2 -/* 80041ED8 B0 1E 00 F8 */ sth r0, 0xf8(r30) -lbl_80041EDC: -/* 80041EDC 38 00 00 02 */ li r0, 2 -/* 80041EE0 98 1B 00 E4 */ stb r0, 0xe4(r27) -/* 80041EE4 7F 63 DB 78 */ mr r3, r27 -/* 80041EE8 7F 84 E3 78 */ mr r4, r28 -/* 80041EEC 4B FF F9 19 */ bl setParam__14dEvt_control_cFP12dEvt_order_c -/* 80041EF0 7F 63 DB 78 */ mr r3, r27 -/* 80041EF4 7F 84 E3 78 */ mr r4, r28 -/* 80041EF8 4B FF FA 6D */ bl afterFlagProc__14dEvt_control_cFP12dEvt_order_c -/* 80041EFC 38 60 00 01 */ li r3, 1 -lbl_80041F00: -/* 80041F00 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041F04 48 32 03 1D */ bl _restgpr_27 -/* 80041F08 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80041F0C 7C 08 03 A6 */ mtlr r0 -/* 80041F10 38 21 00 20 */ addi r1, r1, 0x20 -/* 80041F14 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/demoEnd__14dEvt_control_cFv.s b/asm/d/event/d_event/demoEnd__14dEvt_control_cFv.s deleted file mode 100644 index 1467d142a04..00000000000 --- a/asm/d/event/d_event/demoEnd__14dEvt_control_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80041F18: -/* 80041F18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80041F1C 7C 08 02 A6 */ mflr r0 -/* 80041F20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80041F24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80041F28 7C 7F 1B 78 */ mr r31, r3 -/* 80041F2C 80 83 00 C4 */ lwz r4, 0xc4(r3) -/* 80041F30 48 00 13 BD */ bl convPId__14dEvt_control_cFUi -/* 80041F34 28 03 00 00 */ cmplwi r3, 0 -/* 80041F38 41 82 00 0C */ beq lbl_80041F44 -/* 80041F3C 38 00 00 00 */ li r0, 0 -/* 80041F40 B0 03 00 F8 */ sth r0, 0xf8(r3) -lbl_80041F44: -/* 80041F44 7F E3 FB 78 */ mr r3, r31 -/* 80041F48 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80041F4C 48 00 13 A1 */ bl convPId__14dEvt_control_cFUi -/* 80041F50 28 03 00 00 */ cmplwi r3, 0 -/* 80041F54 41 82 00 0C */ beq lbl_80041F60 -/* 80041F58 38 00 00 00 */ li r0, 0 -/* 80041F5C B0 03 00 F8 */ sth r0, 0xf8(r3) -lbl_80041F60: -/* 80041F60 A8 9F 00 DE */ lha r4, 0xde(r31) -/* 80041F64 2C 04 FF FF */ cmpwi r4, -1 -/* 80041F68 41 82 00 20 */ beq lbl_80041F88 -/* 80041F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041F74 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041F78 38 A0 00 01 */ li r5, 1 -/* 80041F7C 48 00 4E 31 */ bl endProc__16dEvent_manager_cFsi -/* 80041F80 38 00 FF FF */ li r0, -1 -/* 80041F84 B0 1F 00 DE */ sth r0, 0xde(r31) -lbl_80041F88: -/* 80041F88 38 60 00 01 */ li r3, 1 -/* 80041F8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80041F90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80041F94 7C 08 03 A6 */ mtlr r0 -/* 80041F98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80041F9C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/doorCheck__14dEvt_control_cFP12dEvt_order_c.s b/asm/d/event/d_event/doorCheck__14dEvt_control_cFP12dEvt_order_c.s deleted file mode 100644 index 216bfebb962..00000000000 --- a/asm/d/event/d_event/doorCheck__14dEvt_control_cFP12dEvt_order_c.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_80042014: -/* 80042014 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80042018 7C 08 02 A6 */ mflr r0 -/* 8004201C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80042020 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042024 48 32 01 B9 */ bl _savegpr_29 -/* 80042028 7C 7D 1B 78 */ mr r29, r3 -/* 8004202C 7C 9E 23 78 */ mr r30, r4 -/* 80042030 38 A0 00 04 */ li r5, 4 -/* 80042034 38 C0 00 03 */ li r6, 3 -/* 80042038 4B FF F9 71 */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs -/* 8004203C 2C 03 00 00 */ cmpwi r3, 0 -/* 80042040 41 82 00 D0 */ beq lbl_80042110 -/* 80042044 38 00 00 02 */ li r0, 2 -/* 80042048 98 1D 00 E4 */ stb r0, 0xe4(r29) -/* 8004204C 7F A3 EB 78 */ mr r3, r29 -/* 80042050 80 9D 00 C8 */ lwz r4, 0xc8(r29) -/* 80042054 48 00 12 99 */ bl convPId__14dEvt_control_cFUi -/* 80042058 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8004205C 41 82 00 18 */ beq lbl_80042074 -/* 80042060 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80042064 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042068 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8004206C 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 80042070 48 00 47 91 */ bl setObjectArchive__16dEvent_manager_cFPc -lbl_80042074: -/* 80042074 A8 1D 00 DE */ lha r0, 0xde(r29) -/* 80042078 2C 00 FF FF */ cmpwi r0, -1 -/* 8004207C 40 82 00 1C */ bne lbl_80042098 -/* 80042080 28 1F 00 00 */ cmplwi r31, 0 -/* 80042084 41 82 00 14 */ beq lbl_80042098 -/* 80042088 A8 1F 00 FC */ lha r0, 0xfc(r31) -/* 8004208C 2C 00 FF FF */ cmpwi r0, -1 -/* 80042090 41 82 00 08 */ beq lbl_80042098 -/* 80042094 B0 1D 00 DE */ sth r0, 0xde(r29) -lbl_80042098: -/* 80042098 A8 9D 00 DE */ lha r4, 0xde(r29) -/* 8004209C 2C 04 FF FF */ cmpwi r4, -1 -/* 800420A0 41 82 00 30 */ beq lbl_800420D0 -/* 800420A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800420A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800420AC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 -/* 800420B0 7F E3 FB 78 */ mr r3, r31 -/* 800420B4 48 00 54 09 */ bl getEventData__16dEvent_manager_cFs -/* 800420B8 28 03 00 00 */ cmplwi r3, 0 -/* 800420BC 41 82 00 14 */ beq lbl_800420D0 -/* 800420C0 7F E3 FB 78 */ mr r3, r31 -/* 800420C4 A8 9D 00 DE */ lha r4, 0xde(r29) -/* 800420C8 48 00 58 BD */ bl order__16dEvent_manager_cFs -/* 800420CC 48 00 00 14 */ b lbl_800420E0 -lbl_800420D0: -/* 800420D0 38 00 FF FF */ li r0, -1 -/* 800420D4 B0 1D 00 DE */ sth r0, 0xde(r29) -/* 800420D8 7F A3 EB 78 */ mr r3, r29 -/* 800420DC 48 00 03 8D */ bl reset__14dEvt_control_cFv -lbl_800420E0: -/* 800420E0 A0 1E 00 00 */ lhz r0, 0(r30) -/* 800420E4 28 00 00 0B */ cmplwi r0, 0xb -/* 800420E8 40 82 00 14 */ bne lbl_800420FC -/* 800420EC A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 800420F0 60 00 00 04 */ ori r0, r0, 4 -/* 800420F4 B0 1D 00 D8 */ sth r0, 0xd8(r29) -/* 800420F8 48 00 00 10 */ b lbl_80042108 -lbl_800420FC: -/* 800420FC A0 1D 00 D8 */ lhz r0, 0xd8(r29) -/* 80042100 60 00 00 40 */ ori r0, r0, 0x40 -/* 80042104 B0 1D 00 D8 */ sth r0, 0xd8(r29) -lbl_80042108: -/* 80042108 38 60 00 01 */ li r3, 1 -/* 8004210C 48 00 00 08 */ b lbl_80042114 -lbl_80042110: -/* 80042110 38 60 00 00 */ li r3, 0 -lbl_80042114: -/* 80042114 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042118 48 32 01 11 */ bl _restgpr_29 -/* 8004211C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80042120 7C 08 03 A6 */ mtlr r0 -/* 80042124 38 21 00 20 */ addi r1, r1, 0x20 -/* 80042128 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/endProc__14dEvt_control_cFv.s b/asm/d/event/d_event/endProc__14dEvt_control_cFv.s deleted file mode 100644 index 8fa5dd9268f..00000000000 --- a/asm/d/event/d_event/endProc__14dEvt_control_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800421C0: -/* 800421C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800421C4 7C 08 02 A6 */ mflr r0 -/* 800421C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800421CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800421D0 7C 7F 1B 78 */ mr r31, r3 -/* 800421D4 88 03 00 E4 */ lbz r0, 0xe4(r3) -/* 800421D8 2C 00 00 02 */ cmpwi r0, 2 -/* 800421DC 41 82 00 20 */ beq lbl_800421FC -/* 800421E0 40 80 00 20 */ bge lbl_80042200 -/* 800421E4 2C 00 00 01 */ cmpwi r0, 1 -/* 800421E8 40 80 00 0C */ bge lbl_800421F4 -/* 800421EC 48 00 00 14 */ b lbl_80042200 -/* 800421F0 48 00 00 10 */ b lbl_80042200 -lbl_800421F4: -/* 800421F4 4B FF FB 41 */ bl talkEnd__14dEvt_control_cFv -/* 800421F8 48 00 00 08 */ b lbl_80042200 -lbl_800421FC: -/* 800421FC 4B FF FD 1D */ bl demoEnd__14dEvt_control_cFv -lbl_80042200: -/* 80042200 38 60 00 00 */ li r3, 0 -/* 80042204 98 7F 00 E4 */ stb r3, 0xe4(r31) -/* 80042208 38 00 00 FF */ li r0, 0xff -/* 8004220C 98 1F 00 EA */ stb r0, 0xea(r31) -/* 80042210 98 1F 00 EB */ stb r0, 0xeb(r31) -/* 80042214 90 7F 00 F4 */ stw r3, 0xf4(r31) -/* 80042218 98 1F 00 EC */ stb r0, 0xec(r31) -/* 8004221C 98 7F 00 ED */ stb r3, 0xed(r31) -/* 80042220 B0 1F 00 E0 */ sth r0, 0xe0(r31) -/* 80042224 98 1F 00 EE */ stb r0, 0xee(r31) -/* 80042228 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8004222C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80042230 38 63 51 88 */ addi r3, r3, 0x5188 -/* 80042234 38 80 FF FE */ li r4, -2 -/* 80042238 48 00 41 B9 */ bl setStartDemo__18dEvent_exception_cFi -/* 8004223C 38 60 00 01 */ li r3, 1 -/* 80042240 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80042244 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80042248 7C 08 03 A6 */ mtlr r0 -/* 8004224C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80042250 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/getStbDemoData__14dEvt_control_cFPc.s b/asm/d/event/d_event/getStbDemoData__14dEvt_control_cFPc.s deleted file mode 100644 index 3e5a4e0802e..00000000000 --- a/asm/d/event/d_event/getStbDemoData__14dEvt_control_cFPc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8004331C: -/* 8004331C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80043320 7C 08 02 A6 */ mflr r0 -/* 80043324 90 01 00 14 */ stw r0, 0x14(r1) -/* 80043328 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8004332C 93 C1 00 08 */ stw r30, 8(r1) -/* 80043330 7C 9E 23 78 */ mr r30, r4 -/* 80043334 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 80043338 8C 03 61 94 */ lbzu r0, mDemoArcName__20dStage_roomControl_c@l(r3) /* 0x80406194@l */ -/* 8004333C 7C 00 07 75 */ extsb. r0, r0 -/* 80043340 41 82 00 38 */ beq lbl_80043378 -/* 80043344 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80043348 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8004334C 3C A5 00 02 */ addis r5, r5, 2 -/* 80043350 38 C0 00 80 */ li r6, 0x80 -/* 80043354 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80043358 4B FF 90 25 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 8004335C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80043360 41 82 00 10 */ beq lbl_80043370 -/* 80043364 4B FF E1 1D */ bl func_80041480 -/* 80043368 7F E3 FB 78 */ mr r3, r31 -/* 8004336C 48 00 00 6C */ b lbl_800433D8 -lbl_80043370: -/* 80043370 4B FF E1 11 */ bl func_80041480 -/* 80043374 48 00 00 08 */ b lbl_8004337C -lbl_80043378: -/* 80043378 4B FF E1 09 */ bl func_80041480 -lbl_8004337C: -/* 8004337C 88 6D 87 E4 */ lbz r3, struct_80450D64+0x0(r13) -/* 80043380 7C 63 07 74 */ extsb r3, r3 -/* 80043384 4B FE C1 39 */ bl dComIfG_getRoomArcName__Fi -/* 80043388 7F C4 F3 78 */ mr r4, r30 -/* 8004338C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80043390 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80043394 3C A5 00 02 */ addis r5, r5, 2 -/* 80043398 38 A5 D4 F8 */ addi r5, r5, -11016 -/* 8004339C 38 C0 00 40 */ li r6, 0x40 -/* 800433A0 4B FF 8F DD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 800433A4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800433A8 41 82 00 10 */ beq lbl_800433B8 -/* 800433AC 4B FF E0 D5 */ bl func_80041480 -/* 800433B0 7F E3 FB 78 */ mr r3, r31 -/* 800433B4 48 00 00 24 */ b lbl_800433D8 -lbl_800433B8: -/* 800433B8 7F C3 F3 78 */ mr r3, r30 -/* 800433BC 4B FE C0 79 */ bl dComIfG_getStageRes__FPCc -/* 800433C0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800433C4 41 82 00 10 */ beq lbl_800433D4 -/* 800433C8 4B FF E0 B9 */ bl func_80041480 -/* 800433CC 7F E3 FB 78 */ mr r3, r31 -/* 800433D0 48 00 00 08 */ b lbl_800433D8 -lbl_800433D4: -/* 800433D4 38 60 00 00 */ li r3, 0 -lbl_800433D8: -/* 800433D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800433DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800433E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800433E4 7C 08 03 A6 */ mtlr r0 -/* 800433E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800433EC 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/moveApproval__14dEvt_control_cFPv.s b/asm/d/event/d_event/moveApproval__14dEvt_control_cFPv.s deleted file mode 100644 index 96740cc53c3..00000000000 --- a/asm/d/event/d_event/moveApproval__14dEvt_control_cFPv.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_80042FA8: -/* 80042FA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80042FAC 7C 08 02 A6 */ mflr r0 -/* 80042FB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80042FB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80042FB8 93 C1 00 08 */ stw r30, 8(r1) -/* 80042FBC 7C 7E 1B 78 */ mr r30, r3 -/* 80042FC0 7C 9F 23 78 */ mr r31, r4 -/* 80042FC4 80 04 04 9C */ lwz r0, 0x49c(r4) -/* 80042FC8 54 00 03 9D */ rlwinm. r0, r0, 0, 0xe, 0xe -/* 80042FCC 41 82 00 0C */ beq lbl_80042FD8 -/* 80042FD0 38 60 00 02 */ li r3, 2 -/* 80042FD4 48 00 01 80 */ b lbl_80043154 -lbl_80042FD8: -/* 80042FD8 88 1E 00 E5 */ lbz r0, 0xe5(r30) -/* 80042FDC 28 00 00 00 */ cmplwi r0, 0 -/* 80042FE0 40 82 00 0C */ bne lbl_80042FEC -/* 80042FE4 38 60 00 01 */ li r3, 1 -/* 80042FE8 48 00 01 6C */ b lbl_80043154 -lbl_80042FEC: -/* 80042FEC 88 1E 00 E4 */ lbz r0, 0xe4(r30) -/* 80042FF0 2C 00 00 02 */ cmpwi r0, 2 -/* 80042FF4 41 82 00 4C */ beq lbl_80043040 -/* 80042FF8 40 80 00 10 */ bge lbl_80043008 -/* 80042FFC 2C 00 00 01 */ cmpwi r0, 1 -/* 80043000 40 80 00 14 */ bge lbl_80043014 -/* 80043004 48 00 00 94 */ b lbl_80043098 -lbl_80043008: -/* 80043008 2C 00 00 04 */ cmpwi r0, 4 -/* 8004300C 40 80 00 8C */ bge lbl_80043098 -/* 80043010 48 00 00 70 */ b lbl_80043080 -lbl_80043014: -/* 80043014 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80043018 48 00 02 D5 */ bl convPId__14dEvt_control_cFUi -/* 8004301C 7C 03 F8 40 */ cmplw r3, r31 -/* 80043020 41 82 00 18 */ beq lbl_80043038 -/* 80043024 7F C3 F3 78 */ mr r3, r30 -/* 80043028 80 9E 00 C8 */ lwz r4, 0xc8(r30) -/* 8004302C 48 00 02 C1 */ bl convPId__14dEvt_control_cFUi -/* 80043030 7C 03 F8 40 */ cmplw r3, r31 -/* 80043034 40 82 00 64 */ bne lbl_80043098 -lbl_80043038: -/* 80043038 38 60 00 02 */ li r3, 2 -/* 8004303C 48 00 01 18 */ b lbl_80043154 -lbl_80043040: -/* 80043040 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80043044 48 00 02 A9 */ bl convPId__14dEvt_control_cFUi -/* 80043048 7C 03 F8 40 */ cmplw r3, r31 -/* 8004304C 41 82 00 18 */ beq lbl_80043064 -/* 80043050 7F C3 F3 78 */ mr r3, r30 -/* 80043054 80 9E 00 C8 */ lwz r4, 0xc8(r30) -/* 80043058 48 00 02 95 */ bl convPId__14dEvt_control_cFUi -/* 8004305C 7C 03 F8 40 */ cmplw r3, r31 -/* 80043060 40 82 00 0C */ bne lbl_8004306C -lbl_80043064: -/* 80043064 38 60 00 02 */ li r3, 2 -/* 80043068 48 00 00 EC */ b lbl_80043154 -lbl_8004306C: -/* 8004306C 88 1F 04 98 */ lbz r0, 0x498(r31) -/* 80043070 28 00 00 00 */ cmplwi r0, 0 -/* 80043074 41 82 00 24 */ beq lbl_80043098 -/* 80043078 38 60 00 02 */ li r3, 2 -/* 8004307C 48 00 00 D8 */ b lbl_80043154 -lbl_80043080: -/* 80043080 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80043084 48 00 02 69 */ bl convPId__14dEvt_control_cFUi -/* 80043088 7C 03 F8 40 */ cmplw r3, r31 -/* 8004308C 40 82 00 0C */ bne lbl_80043098 -/* 80043090 38 60 00 02 */ li r3, 2 -/* 80043094 48 00 00 C0 */ b lbl_80043154 -lbl_80043098: -/* 80043098 80 BF 04 9C */ lwz r5, 0x49c(r31) -/* 8004309C 54 A0 04 21 */ rlwinm. r0, r5, 0, 0x10, 0x10 -/* 800430A0 41 82 00 0C */ beq lbl_800430AC -/* 800430A4 38 60 00 02 */ li r3, 2 -/* 800430A8 48 00 00 AC */ b lbl_80043154 -lbl_800430AC: -/* 800430AC 54 A0 05 29 */ rlwinm. r0, r5, 0, 0x14, 0x14 -/* 800430B0 41 82 00 0C */ beq lbl_800430BC -/* 800430B4 38 60 00 01 */ li r3, 1 -/* 800430B8 48 00 00 9C */ b lbl_80043154 -lbl_800430BC: -/* 800430BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800430C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800430C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800430C8 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 -/* 800430CC 40 82 00 18 */ bne lbl_800430E4 -/* 800430D0 80 83 5F 1C */ lwz r4, 0x5f1c(r3) -/* 800430D4 3C 60 04 00 */ lis r3, 0x0400 /* 0x04002000@ha */ -/* 800430D8 38 03 20 00 */ addi r0, r3, 0x2000 /* 0x04002000@l */ -/* 800430DC 7C 80 00 39 */ and. r0, r4, r0 -/* 800430E0 41 82 00 0C */ beq lbl_800430EC -lbl_800430E4: -/* 800430E4 38 60 00 00 */ li r3, 0 -/* 800430E8 48 00 00 6C */ b lbl_80043154 -lbl_800430EC: -/* 800430EC 88 7E 00 E4 */ lbz r3, 0xe4(r30) -/* 800430F0 28 03 00 01 */ cmplwi r3, 1 -/* 800430F4 40 82 00 14 */ bne lbl_80043108 -/* 800430F8 54 A0 06 73 */ rlwinm. r0, r5, 0, 0x19, 0x19 -/* 800430FC 41 82 00 0C */ beq lbl_80043108 -/* 80043100 38 60 00 01 */ li r3, 1 -/* 80043104 48 00 00 50 */ b lbl_80043154 -lbl_80043108: -/* 80043108 80 0D 88 B8 */ lwz r0, m_mode__7dDemo_c(r13) -/* 8004310C 2C 00 00 01 */ cmpwi r0, 1 -/* 80043110 40 82 00 0C */ bne lbl_8004311C -/* 80043114 38 60 00 01 */ li r3, 1 -/* 80043118 48 00 00 3C */ b lbl_80043154 -lbl_8004311C: -/* 8004311C 28 03 00 03 */ cmplwi r3, 3 -/* 80043120 41 82 00 10 */ beq lbl_80043130 -/* 80043124 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80043128 28 00 00 01 */ cmplwi r0, 1 -/* 8004312C 40 82 00 14 */ bne lbl_80043140 -lbl_80043130: -/* 80043130 54 A0 01 4B */ rlwinm. r0, r5, 0, 5, 5 -/* 80043134 41 82 00 0C */ beq lbl_80043140 -/* 80043138 38 60 00 00 */ li r3, 0 -/* 8004313C 48 00 00 18 */ b lbl_80043154 -lbl_80043140: -/* 80043140 54 A0 04 63 */ rlwinm. r0, r5, 0, 0x11, 0x11 -/* 80043144 41 82 00 0C */ beq lbl_80043150 -/* 80043148 38 60 00 01 */ li r3, 1 -/* 8004314C 48 00 00 08 */ b lbl_80043154 -lbl_80043150: -/* 80043150 54 A3 9F FE */ rlwinm r3, r5, 0x13, 0x1f, 0x1f -lbl_80043154: -/* 80043154 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80043158 83 C1 00 08 */ lwz r30, 8(r1) -/* 8004315C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80043160 7C 08 03 A6 */ mtlr r0 -/* 80043164 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043168 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/order__14dEvt_control_cFUsUsUsUsPvPvsUc.s b/asm/d/event/d_event/order__14dEvt_control_cFUsUsUsUsPvPvsUc.s deleted file mode 100644 index 54801fcee82..00000000000 --- a/asm/d/event/d_event/order__14dEvt_control_cFUsUsUsUsPvPvsUc.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_80041668: -/* 80041668 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8004166C 7C 08 02 A6 */ mflr r0 -/* 80041670 90 01 00 34 */ stw r0, 0x34(r1) -/* 80041674 39 61 00 30 */ addi r11, r1, 0x30 -/* 80041678 48 32 0B 49 */ bl _savegpr_22 -/* 8004167C 7C 78 1B 78 */ mr r24, r3 -/* 80041680 7C 99 23 78 */ mr r25, r4 -/* 80041684 7C BA 2B 78 */ mr r26, r5 -/* 80041688 7C DB 33 78 */ mr r27, r6 -/* 8004168C 7C FC 3B 78 */ mr r28, r7 -/* 80041690 7D 1D 43 78 */ mr r29, r8 -/* 80041694 7D 3E 4B 78 */ mr r30, r9 -/* 80041698 7D 5F 53 78 */ mr r31, r10 -/* 8004169C 8A C1 00 3B */ lbz r22, 0x3b(r1) -/* 800416A0 54 C0 05 6B */ rlwinm. r0, r6, 0, 0x15, 0x15 -/* 800416A4 40 82 00 54 */ bne lbl_800416F8 -/* 800416A8 28 16 00 FF */ cmplwi r22, 0xff -/* 800416AC 41 82 00 4C */ beq lbl_800416F8 -/* 800416B0 8A ED 87 E4 */ lbz r23, struct_80450D64+0x0(r13) -/* 800416B4 7E F7 07 74 */ extsb r23, r23 -/* 800416B8 7E C3 B3 78 */ mr r3, r22 -/* 800416BC 7E E4 BB 78 */ mr r4, r23 -/* 800416C0 48 00 1E 41 */ bl searchMapEventData__14dEvt_control_cFUcl -/* 800416C4 28 03 00 00 */ cmplwi r3, 0 -/* 800416C8 41 82 00 30 */ beq lbl_800416F8 -/* 800416CC 88 83 00 1B */ lbz r4, 0x1b(r3) -/* 800416D0 28 04 00 FF */ cmplwi r4, 0xff -/* 800416D4 41 82 00 24 */ beq lbl_800416F8 -/* 800416D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800416DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800416E0 7E E5 BB 78 */ mr r5, r23 -/* 800416E4 4B FF 3C 7D */ bl isSwitch__10dSv_info_cCFii -/* 800416E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800416EC 41 82 00 0C */ beq lbl_800416F8 -/* 800416F0 38 60 00 00 */ li r3, 0 -/* 800416F4 48 00 00 F8 */ b lbl_800417EC -lbl_800416F8: -/* 800416F8 88 18 00 E2 */ lbz r0, 0xe2(r24) -/* 800416FC 7C 00 07 74 */ extsb r0, r0 -/* 80041700 2C 00 00 08 */ cmpwi r0, 8 -/* 80041704 41 80 00 0C */ blt lbl_80041710 -/* 80041708 38 60 00 00 */ li r3, 0 -/* 8004170C 48 00 00 E0 */ b lbl_800417EC -lbl_80041710: -/* 80041710 1C 60 00 18 */ mulli r3, r0, 0x18 -/* 80041714 38 C3 00 04 */ addi r6, r3, 4 -/* 80041718 7C D8 32 14 */ add r6, r24, r6 -/* 8004171C B3 26 00 00 */ sth r25, 0(r6) -/* 80041720 B3 46 00 12 */ sth r26, 0x12(r6) -/* 80041724 B3 66 00 02 */ sth r27, 2(r6) -/* 80041728 93 A6 00 08 */ stw r29, 8(r6) -/* 8004172C 93 C6 00 0C */ stw r30, 0xc(r6) -/* 80041730 B3 E6 00 10 */ sth r31, 0x10(r6) -/* 80041734 B3 86 00 04 */ sth r28, 4(r6) -/* 80041738 9A C6 00 15 */ stb r22, 0x15(r6) -/* 8004173C A0 06 00 12 */ lhz r0, 0x12(r6) -/* 80041740 28 00 00 00 */ cmplwi r0, 0 -/* 80041744 40 82 00 0C */ bne lbl_80041750 -/* 80041748 38 00 00 01 */ li r0, 1 -/* 8004174C B0 06 00 12 */ sth r0, 0x12(r6) -lbl_80041750: -/* 80041750 88 98 00 E2 */ lbz r4, 0xe2(r24) -/* 80041754 7C 80 07 75 */ extsb. r0, r4 -/* 80041758 40 82 00 18 */ bne lbl_80041770 -/* 8004175C 38 00 00 00 */ li r0, 0 -/* 80041760 98 18 00 E3 */ stb r0, 0xe3(r24) -/* 80041764 38 00 FF FF */ li r0, -1 -/* 80041768 98 06 00 14 */ stb r0, 0x14(r6) -/* 8004176C 48 00 00 70 */ b lbl_800417DC -lbl_80041770: -/* 80041770 89 18 00 E3 */ lbz r8, 0xe3(r24) -/* 80041774 7D 08 07 74 */ extsb r8, r8 -/* 80041778 1C 68 00 18 */ mulli r3, r8, 0x18 -/* 8004177C 38 E3 00 04 */ addi r7, r3, 4 -/* 80041780 7C F8 3A 14 */ add r7, r24, r7 -/* 80041784 A0 A6 00 12 */ lhz r5, 0x12(r6) -/* 80041788 A0 07 00 12 */ lhz r0, 0x12(r7) -/* 8004178C 7C 05 00 40 */ cmplw r5, r0 -/* 80041790 40 80 00 34 */ bge lbl_800417C4 -/* 80041794 98 98 00 E3 */ stb r4, 0xe3(r24) -/* 80041798 99 06 00 14 */ stb r8, 0x14(r6) -/* 8004179C 48 00 00 40 */ b lbl_800417DC -/* 800417A0 48 00 00 24 */ b lbl_800417C4 -lbl_800417A4: -/* 800417A4 7C 80 07 74 */ extsb r0, r4 -/* 800417A8 1C 60 00 18 */ mulli r3, r0, 0x18 -/* 800417AC 38 03 00 16 */ addi r0, r3, 0x16 -/* 800417B0 7C 18 02 2E */ lhzx r0, r24, r0 -/* 800417B4 7C 05 00 40 */ cmplw r5, r0 -/* 800417B8 41 80 00 18 */ blt lbl_800417D0 -/* 800417BC 38 E3 00 04 */ addi r7, r3, 4 -/* 800417C0 7C F8 3A 14 */ add r7, r24, r7 -lbl_800417C4: -/* 800417C4 88 87 00 14 */ lbz r4, 0x14(r7) -/* 800417C8 7C 80 07 75 */ extsb. r0, r4 -/* 800417CC 40 80 FF D8 */ bge lbl_800417A4 -lbl_800417D0: -/* 800417D0 98 86 00 14 */ stb r4, 0x14(r6) -/* 800417D4 88 18 00 E2 */ lbz r0, 0xe2(r24) -/* 800417D8 98 07 00 14 */ stb r0, 0x14(r7) -lbl_800417DC: -/* 800417DC 88 78 00 E2 */ lbz r3, 0xe2(r24) -/* 800417E0 38 03 00 01 */ addi r0, r3, 1 -/* 800417E4 98 18 00 E2 */ stb r0, 0xe2(r24) -/* 800417E8 38 60 00 01 */ li r3, 1 -lbl_800417EC: -/* 800417EC 39 61 00 30 */ addi r11, r1, 0x30 -/* 800417F0 48 32 0A 1D */ bl _restgpr_22 -/* 800417F4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800417F8 7C 08 03 A6 */ mtlr r0 -/* 800417FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80041800 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/talkEnd__14dEvt_control_cFv.s b/asm/d/event/d_event/talkEnd__14dEvt_control_cFv.s deleted file mode 100644 index 5867234370a..00000000000 --- a/asm/d/event/d_event/talkEnd__14dEvt_control_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80041D34: -/* 80041D34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80041D38 7C 08 02 A6 */ mflr r0 -/* 80041D3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80041D40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80041D44 7C 7F 1B 78 */ mr r31, r3 -/* 80041D48 80 83 00 C4 */ lwz r4, 0xc4(r3) -/* 80041D4C 48 00 15 A1 */ bl convPId__14dEvt_control_cFUi -/* 80041D50 28 03 00 00 */ cmplwi r3, 0 -/* 80041D54 41 82 00 0C */ beq lbl_80041D60 -/* 80041D58 38 00 00 00 */ li r0, 0 -/* 80041D5C B0 03 00 F8 */ sth r0, 0xf8(r3) -lbl_80041D60: -/* 80041D60 7F E3 FB 78 */ mr r3, r31 -/* 80041D64 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80041D68 48 00 15 85 */ bl convPId__14dEvt_control_cFUi -/* 80041D6C 28 03 00 00 */ cmplwi r3, 0 -/* 80041D70 41 82 00 0C */ beq lbl_80041D7C -/* 80041D74 38 00 00 00 */ li r0, 0 -/* 80041D78 B0 03 00 F8 */ sth r0, 0xf8(r3) -lbl_80041D7C: -/* 80041D7C A8 9F 00 DE */ lha r4, 0xde(r31) -/* 80041D80 2C 04 FF FF */ cmpwi r4, -1 -/* 80041D84 41 82 00 20 */ beq lbl_80041DA4 -/* 80041D88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041D8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041D90 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041D94 38 A0 00 01 */ li r5, 1 -/* 80041D98 48 00 50 15 */ bl endProc__16dEvent_manager_cFsi -/* 80041D9C 38 00 FF FF */ li r0, -1 -/* 80041DA0 B0 1F 00 DE */ sth r0, 0xde(r31) -lbl_80041DA4: -/* 80041DA4 38 60 00 00 */ li r3, 0 -/* 80041DA8 4B FD 9D 9D */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c -/* 80041DAC 28 03 00 00 */ cmplwi r3, 0 -/* 80041DB0 41 82 00 14 */ beq lbl_80041DC4 -/* 80041DB4 A8 03 00 08 */ lha r0, 8(r3) -/* 80041DB8 2C 00 02 18 */ cmpwi r0, 0x218 -/* 80041DBC 40 82 00 08 */ bne lbl_80041DC4 -/* 80041DC0 4B FF 5D 25 */ bl dead__12daItemBase_cFv -lbl_80041DC4: -/* 80041DC4 38 60 00 01 */ li r3, 1 -/* 80041DC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80041DCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80041DD0 7C 08 03 A6 */ mtlr r0 -/* 80041DD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80041DD8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/talkXyCheck__14dEvt_control_cFP12dEvt_order_c.s b/asm/d/event/d_event/talkXyCheck__14dEvt_control_cFP12dEvt_order_c.s deleted file mode 100644 index 9394b7c3fde..00000000000 --- a/asm/d/event/d_event/talkXyCheck__14dEvt_control_cFP12dEvt_order_c.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_80041B58: -/* 80041B58 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80041B5C 7C 08 02 A6 */ mflr r0 -/* 80041B60 90 01 00 24 */ stw r0, 0x24(r1) -/* 80041B64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041B68 48 32 06 6D */ bl _savegpr_27 -/* 80041B6C 7C 7B 1B 78 */ mr r27, r3 -/* 80041B70 7C 9C 23 78 */ mr r28, r4 -/* 80041B74 3C 60 80 38 */ lis r3, d_event_d_event__stringBase0@ha /* 0x80379D80@ha */ -/* 80041B78 38 63 9D 80 */ addi r3, r3, d_event_d_event__stringBase0@l /* 0x80379D80@l */ -/* 80041B7C 3B C3 00 23 */ addi r30, r3, 0x23 -/* 80041B80 83 E4 00 0C */ lwz r31, 0xc(r4) -/* 80041B84 A0 04 00 00 */ lhz r0, 0(r4) -/* 80041B88 2C 00 00 07 */ cmpwi r0, 7 -/* 80041B8C 41 82 00 24 */ beq lbl_80041BB0 -/* 80041B90 40 80 00 30 */ bge lbl_80041BC0 -/* 80041B94 2C 00 00 06 */ cmpwi r0, 6 -/* 80041B98 40 80 00 08 */ bge lbl_80041BA0 -/* 80041B9C 48 00 00 24 */ b lbl_80041BC0 -lbl_80041BA0: -/* 80041BA0 3B A0 00 00 */ li r29, 0 -/* 80041BA4 38 00 00 01 */ li r0, 1 -/* 80041BA8 98 1B 00 ED */ stb r0, 0xed(r27) -/* 80041BAC 48 00 00 24 */ b lbl_80041BD0 -lbl_80041BB0: -/* 80041BB0 38 00 00 02 */ li r0, 2 -/* 80041BB4 98 1B 00 ED */ stb r0, 0xed(r27) -/* 80041BB8 3B A0 00 01 */ li r29, 1 -/* 80041BBC 48 00 00 14 */ b lbl_80041BD0 -lbl_80041BC0: -/* 80041BC0 38 00 00 00 */ li r0, 0 -/* 80041BC4 98 1B 00 ED */ stb r0, 0xed(r27) -/* 80041BC8 38 60 00 00 */ li r3, 0 -/* 80041BCC 48 00 00 AC */ b lbl_80041C78 -lbl_80041BD0: -/* 80041BD0 7F A3 EB 78 */ mr r3, r29 -/* 80041BD4 4B FE C3 49 */ bl dComIfGp_getSelectItem__Fi -/* 80041BD8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80041BDC 28 00 00 FF */ cmplwi r0, 0xff -/* 80041BE0 40 82 00 0C */ bne lbl_80041BEC -/* 80041BE4 38 60 00 00 */ li r3, 0 -/* 80041BE8 48 00 00 90 */ b lbl_80041C78 -lbl_80041BEC: -/* 80041BEC 28 1F 00 00 */ cmplwi r31, 0 -/* 80041BF0 41 82 00 14 */ beq lbl_80041C04 -/* 80041BF4 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 80041BF8 54 00 06 B4 */ rlwinm r0, r0, 0, 0x1a, 0x1a -/* 80041BFC 2C 00 00 20 */ cmpwi r0, 0x20 -/* 80041C00 41 82 00 0C */ beq lbl_80041C0C -lbl_80041C04: -/* 80041C04 38 60 00 00 */ li r3, 0 -/* 80041C08 48 00 00 70 */ b lbl_80041C78 -lbl_80041C0C: -/* 80041C0C 7F 63 DB 78 */ mr r3, r27 -/* 80041C10 7F 84 E3 78 */ mr r4, r28 -/* 80041C14 38 A0 00 01 */ li r5, 1 -/* 80041C18 38 C0 00 01 */ li r6, 1 -/* 80041C1C 4B FF FD 8D */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs -/* 80041C20 2C 03 00 00 */ cmpwi r3, 0 -/* 80041C24 41 82 00 50 */ beq lbl_80041C74 -/* 80041C28 38 00 00 01 */ li r0, 1 -/* 80041C2C 98 1B 00 E4 */ stb r0, 0xe4(r27) -/* 80041C30 7F A3 EB 78 */ mr r3, r29 -/* 80041C34 4B FE C2 E9 */ bl dComIfGp_getSelectItem__Fi -/* 80041C38 98 7B 00 EE */ stb r3, 0xee(r27) -/* 80041C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80041C40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80041C44 3B E3 4F F8 */ addi r31, r3, 0x4ff8 -/* 80041C48 7F E3 FB 78 */ mr r3, r31 -/* 80041C4C 7F C4 F3 78 */ mr r4, r30 -/* 80041C50 38 A0 00 FF */ li r5, 0xff -/* 80041C54 38 C0 FF FF */ li r6, -1 -/* 80041C58 48 00 58 BD */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80041C5C B0 7B 00 DE */ sth r3, 0xde(r27) -/* 80041C60 7F E3 FB 78 */ mr r3, r31 -/* 80041C64 A8 9B 00 DE */ lha r4, 0xde(r27) -/* 80041C68 48 00 5D 1D */ bl order__16dEvent_manager_cFs -/* 80041C6C 38 60 00 01 */ li r3, 1 -/* 80041C70 48 00 00 08 */ b lbl_80041C78 -lbl_80041C74: -/* 80041C74 38 60 00 00 */ li r3, 0 -lbl_80041C78: -/* 80041C78 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041C7C 48 32 05 A5 */ bl _restgpr_27 -/* 80041C80 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80041C84 7C 08 03 A6 */ mtlr r0 -/* 80041C88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80041C8C 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_scene/fopScn_Delete__FPv.s b/asm/f_op/f_op_scene/fopScn_Delete__FPv.s deleted file mode 100644 index 190fb7e8ba5..00000000000 --- a/asm/f_op/f_op_scene/fopScn_Delete__FPv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8001EBAC: -/* 8001EBAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001EBB0 7C 08 02 A6 */ mflr r0 -/* 8001EBB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001EBB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001EBBC 93 C1 00 08 */ stw r30, 8(r1) -/* 8001EBC0 7C 7F 1B 78 */ mr r31, r3 -/* 8001EBC4 80 63 01 AC */ lwz r3, 0x1ac(r3) -/* 8001EBC8 7F E4 FB 78 */ mr r4, r31 -/* 8001EBCC 48 00 38 DD */ bl fpcMtd_Delete__FP20process_method_classPv -/* 8001EBD0 7C 7E 1B 78 */ mr r30, r3 -/* 8001EBD4 2C 1E 00 01 */ cmpwi r30, 1 -/* 8001EBD8 40 82 00 0C */ bne lbl_8001EBE4 -/* 8001EBDC 38 7F 01 B0 */ addi r3, r31, 0x1b0 -/* 8001EBE0 48 00 05 5D */ bl fopScnTg_QueueTo__FP15scene_tag_class -lbl_8001EBE4: -/* 8001EBE4 7F C3 F3 78 */ mr r3, r30 -/* 8001EBE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001EBEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8001EBF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001EBF4 7C 08 03 A6 */ mtlr r0 -/* 8001EBF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001EBFC 4E 80 00 20 */ blr diff --git a/asm/f_pc/f_pc_pause/fpcPause_IsEnable__FPvUc.s b/asm/f_pc/f_pc_pause/fpcPause_IsEnable__FPvUc.s deleted file mode 100644 index 97bad89270c..00000000000 --- a/asm/f_pc/f_pc_pause/fpcPause_IsEnable__FPvUc.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80023844: -/* 80023844 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80023848 88 03 00 0B */ lbz r0, 0xb(r3) -/* 8002384C 7C 80 00 38 */ and r0, r4, r0 -/* 80023850 7C 64 00 50 */ subf r3, r4, r0 -/* 80023854 30 03 FF FF */ addic r0, r3, -1 -/* 80023858 7C 00 19 10 */ subfe r0, r0, r3 -/* 8002385C 7C 00 00 34 */ cntlzw r0, r0 -/* 80023860 54 03 D9 7E */ srwi r3, r0, 5 -/* 80023864 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_mtx/push__14mDoMtx_stack_cFv.s b/asm/m_Do/m_Do_mtx/push__14mDoMtx_stack_cFv.s deleted file mode 100644 index 8698ee70c76..00000000000 --- a/asm/m_Do/m_Do_mtx/push__14mDoMtx_stack_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8000CCC8: -/* 8000CCC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000CCCC 7C 08 02 A6 */ mflr r0 -/* 8000CCD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8000CCD4 80 8D 80 28 */ lwz r4, next__14mDoMtx_stack_c(r13) -/* 8000CCD8 80 0D 80 2C */ lwz r0, end__14mDoMtx_stack_c(r13) -/* 8000CCDC 7C 04 00 40 */ cmplw r4, r0 -/* 8000CCE0 41 80 00 0C */ blt lbl_8000CCEC -/* 8000CCE4 38 60 00 00 */ li r3, 0 -/* 8000CCE8 48 00 00 1C */ b lbl_8000CD04 -lbl_8000CCEC: -/* 8000CCEC 38 04 00 30 */ addi r0, r4, 0x30 -/* 8000CCF0 90 0D 80 28 */ stw r0, next__14mDoMtx_stack_c(r13) -/* 8000CCF4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8000CCF8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8000CCFC 48 33 97 B5 */ bl PSMTXCopy -/* 8000CD00 38 60 00 01 */ li r3, 1 -lbl_8000CD04: -/* 8000CD04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8000CD08 7C 08 03 A6 */ mtlr r0 -/* 8000CD0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000CD10 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 955cb4d0608..b7bc9b5bd69 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -2572,11 +2572,12 @@ public: BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } bool checkFishingCastMode() const { + bool var_r5; bool var_r4 = 1; bool var_r3 = 0; if (mProcID == PROC_FISHING_CAST) { - bool var_r5 = 0; + var_r5 = 0; if (mItemActor.getActor() != NULL && mItemActor.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) { var_r5 = 1; @@ -4633,7 +4634,7 @@ public: FORCE_PANIC = 8, }; - enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000 }; + enum daMidna_FLG0 { NPC_NEAR = 0x100000, NPC_FAR = 0x40000, NO_DRAW = 0x2000 }; enum daMidna_FLG1 { FORCE_NORMAL_COLOR = 8, FORCE_TIRED_COLOR = 4 }; @@ -4699,6 +4700,7 @@ public: void changeDemoMode(u32 mode) { mDemoMode = mode; } BOOL checkNpcNear() { return checkStateFlg0(NPC_NEAR); } BOOL checkNpcFar() { return checkStateFlg0(NPC_FAR); } + BOOL checkNoDraw() const { return checkStateFlg0(NO_DRAW); } inline bool checkMidnaRealBody(); diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 7f70be553af..9043847a0fa 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -157,6 +157,8 @@ private: }; // Size: 0x24 class daMidna_c; +class daPy_py_c; +inline daPy_py_c* dComIfGp_getLinkPlayer(); class daPy_py_c : public fopAc_ac_c { public: @@ -351,7 +353,7 @@ public: /* 80182A10 */ void checkGoronSideMove() const; /* 80182AAC */ void getRightFootPosP(); /* 80182AB4 */ void getLeftFootPosP(); - /* 80182ABC */ u32 getMidnaActor(); + /* 80182ABC */ //u32 getMidnaActor(); /* 80182AC4 */ void checkCopyRodThrowAfter() const; /* 80182AD8 */ void checkRide() const; /* 80182B9C */ void getRightHandPos() const; @@ -589,6 +591,9 @@ public: inline BOOL i_checkSwordGet(); inline bool i_checkShieldGet() const; inline static BOOL checkNowWolf(); + inline static BOOL i_checkNowWolf() { + return dComIfGp_getLinkPlayer()->i_checkWolf(); + } inline bool checkZoraWearFlg() const; inline bool checkMagicArmorWearFlg() const; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 9207fa790d9..4165f2dd6a4 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1514,6 +1514,10 @@ inline dAttention_c& dComIfGp_getAttention() { return g_dComIfG_gameInfo.play.getAttention(); } +inline u8 dComIfGp_att_getCatchChgItem() { + return dComIfGp_getAttention().getCatchChgItem(); +} + inline J2DGrafContext* dComIfGp_getCurrentGrafPort() { return g_dComIfG_gameInfo.play.getCurrentGrafPort(); } diff --git a/include/d/d_attention.h b/include/d/d_attention.h index d288f00c3ce..12b995f6ea3 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -31,6 +31,7 @@ public: void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); s32 getCatghTarget() { return convPId(field_0x10); } + u8 getChangeItem() { return mChangeItem; } private: void* field_0x0; @@ -203,6 +204,7 @@ public: /* 8014B010 */ void getDistTable(int); dAttCatch_c& getCatghTarget() { return mCatghTarget; } + u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); } BOOL chkFlag(u32 flag) { return mFlags & flag; } s8 Lockon() { /* s32 chk = true; diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 7557d3cb3fe..c8b7cc9c1d3 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -32,8 +32,8 @@ class dEvt_control_c { public: dEvt_control_c(); s32 orderOld(u16, u16, u16, u16, void*, void*, void const*); - s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, - void* param_5, s16 eventID, u8 infoIdx); + s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5, + s16 eventID, u8 infoIdx); void setParam(dEvt_order_c*); s32 beforeFlagProc(dEvt_order_c*); void afterFlagProc(dEvt_order_c*); @@ -41,9 +41,9 @@ public: int talkCheck(dEvt_order_c*); int talkXyCheck(dEvt_order_c*); int catchCheck(dEvt_order_c*); - void talkEnd(); + int talkEnd(); int demoCheck(dEvt_order_c*); - void demoEnd(); + int demoEnd(); int potentialCheck(dEvt_order_c*); int doorCheck(dEvt_order_c*); int itemCheck(dEvt_order_c*); diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 47b238619f6..44d06dd0968 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -31,7 +31,7 @@ public: s16 getEventId() { return mEventId; } s16 getIdx() { return mIndex; } char* getArchiveName() { return mArchiveName; } - BOOL chkCondition(u16 condition) { return mCondition & condition; } + BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; } void i_onCondition(u16 cond) { mCondition |= cond; } void i_offCondition(u16 cond) { mCondition &= ~cond; } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 17f3f3fda3a..e928cad6472 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -112,7 +112,7 @@ inline u32 fopAcM_GetID(const void* pActor) { return fpcM_GetID(pActor); } -inline s16 fopAcM_GetName(fopAc_ac_c* pActor) { +inline s16 fopAcM_GetName(void* pActor) { return fpcM_GetName(pActor); } diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index 16bda2d5799..c8afbbb68dd 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -18,9 +18,8 @@ public: /* 0x0C8 */ u32 field_0xc8; /* 0x0CC */ u8 field_0xcc[0xE0]; /* 0x1AC */ process_method_class* mpProcessMtd; - /* 0x1B0 */ scene_tag_class* field_0x1b0; - /* 0x1B4 */ u8 field_0x1b4[0x10]; + /* 0x1B0 */ scene_tag_class field_0x1b0; /* 0x1C4 */ request_of_phase_process_class field_0x1c4; }; -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_scene_tag.h b/include/f_op/f_op_scene_tag.h index afb233a9775..b12dd2db8ce 100644 --- a/include/f_op/f_op_scene_tag.h +++ b/include/f_op/f_op_scene_tag.h @@ -4,7 +4,9 @@ #include "dolphin/types.h" #include "f_pc/f_pc_node.h" -class scene_tag_class; +class scene_tag_class { + u8 _0[0x14]; +}; void fopScnTg_QueueTo(scene_tag_class* pSceneTag); void fopScnTg_ToQueue(scene_tag_class* pSceneTag); @@ -12,4 +14,4 @@ void fopScnTg_Init(scene_tag_class* pSceneTag, void* pData); extern node_list_class g_fopScnTg_SceneList; -#endif \ No newline at end of file +#endif diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index e742c9f73cd..0375602fe51 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -26,8 +26,8 @@ inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { class mDoMtx_stack_c { public: - /* 8000CCC8 */ bool push(); - /* 8000CD14 */ bool pop(); + /* 8000CCC8 */ static bool push(); + /* 8000CD14 */ static bool pop(); /* 8000CD64 */ static void transS(cXyz const&); /* 8000CDD4 */ static void transM(cXyz const&); /* 8000CD9C */ static void transM(f32, f32, f32); diff --git a/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h b/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h index 150b469c878..6c29b4e0bc4 100644 --- a/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h +++ b/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h @@ -3,4 +3,15 @@ #include "dolphin/types.h" +struct daTagMhint_c { + /* 805A56B8 */ void create(); + /* 805A58E8 */ ~daTagMhint_c(); + /* 805A5974 */ void eventOrder(); + /* 805A5AE4 */ void execute(); + bool checkNoAttention() const { return _0x56d == 0xFF; } + + u8 _0[0x56d]; + u8 _0x56d; +}; + #endif /* D_A_TAG_MHINT_H */ diff --git a/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h b/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h index 9a60efb219c..fec2a88d470 100644 --- a/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h +++ b/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h @@ -3,4 +3,15 @@ #include "dolphin/types.h" +struct daTagMstop_c { + /* 805A6138 */ void create(); + /* 805A6338 */ ~daTagMstop_c(); + /* 805A63C4 */ void eventOrder(); + /* 805A63F8 */ void execute(); + bool checkNoAttention() const { return _0x56b == 0xFF; } + + u8 _0[0x56b]; + u8 _0x56b; +}; + #endif /* D_A_TAG_MSTOP_H */ diff --git a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp index 286f32e7341..15e808fac3c 100644 --- a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp @@ -16,13 +16,6 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daTagMhint_c { - /* 805A56B8 */ void create(); - /* 805A58E8 */ ~daTagMhint_c(); - /* 805A5974 */ void eventOrder(); - /* 805A5AE4 */ void execute(); -}; - struct daPy_py_c { static u8 m_midnaActor[4]; }; diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index 16b93c07c59..dd4d6db2105 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -16,13 +16,6 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daTagMstop_c { - /* 805A6138 */ void create(); - /* 805A6338 */ ~daTagMstop_c(); - /* 805A63C4 */ void eventOrder(); - /* 805A63F8 */ void execute(); -}; - struct daPy_py_c { static u8 m_midnaActor[4]; }; diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 2876d72aabf..61a4c41c76b 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -35974,7 +35974,8 @@ BOOL daPy_py_c::checkEquipHeavyBoots() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopAcM_GetName(void* param_0) { +// asm void fopAcM_GetName(void* param_0) { +extern "C" asm void fopAcM_GetName__FPv() { nofralloc #include "asm/d/a/d_a_alink/fopAcM_GetName__FPv.s" } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index ee7b2daa049..9223b2c0f37 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -5,13 +5,16 @@ #include "d/event/d_event.h" #include "d/com/d_com_inf_game.h" +#include "d/d_camera.h" +#include "d/d_demo.h" +#include "d/d_stage.h" +#include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_iter.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_demo.h" -#include "d/d_camera.h" -#include "d/msg/d_msg_object.h" +#include "rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h" +#include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h" // // Forward References: @@ -175,15 +178,14 @@ dEvt_order_c::dEvt_order_c() { /* 800415D8-80041668 03BF18 0090+00 1/1 0/0 0/0 .text orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */ s32 dEvt_control_c::orderOld(u16 param_0, u16 param_1, u16 param_2, u16 param_3, void* param_4, - void* param_5, void const* param_6) { + void* param_5, void const* param_6) { int eventIdx = i_dComIfGp_getEventManager().getEventIdx((char*)param_6, -1, -1); return order(param_0, param_1, param_2, param_3, param_4, param_5, eventIdx, -1); } /* 80041668-80041804 03BFA8 019C+00 3/3 13/13 0/0 .text order__14dEvt_control_cFUsUsUsUsPvPvsUc */ -#ifdef NONMATCHING s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, - void* param_5, s16 eventID, u8 infoIdx) { + void* param_5, s16 eventID, u8 infoIdx) { if (!(flag & 0x400) && infoIdx != 0xFF) { int roomNo = dComIfGp_roomControl_getStayNo(); dStage_MapEvent_dt_c* data = searchMapEventData(infoIdx, roomNo); @@ -217,46 +219,37 @@ s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 param_3, vo field_0xe3 = 0; order->mNextOrderIdx = -1; } else { - s8 tmp_e3 = field_0xe3; - dEvt_order_c* order2 = &mOrder[tmp_e3]; + dEvt_order_c* order2; + int tmp_e3 = field_0xe3; + order2 = &mOrder[tmp_e3]; if (order->mPriority < order2->mPriority) { field_0xe3 = mNum; order->mNextOrderIdx = tmp_e3; } else { - while (order2->mNextOrderIdx >= 0) { - if (order->mPriority >= mOrder[order2->mNextOrderIdx].mPriority) { - order2++; + if (order->mPriority < mOrder[order2->mNextOrderIdx].mPriority) { + break; } + int nextOrderIdx = order2->mNextOrderIdx; + order2 = &mOrder[nextOrderIdx]; } order->mNextOrderIdx = order2->mNextOrderIdx; order2->mNextOrderIdx = mNum; } - mNum++; } + mNum++; return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, - void* param_5, s16 eventID, u8 infoIdx) { - nofralloc -#include "asm/d/event/d_event/order__14dEvt_control_cFUsUsUsUsPvPvsUc.s" -} -#pragma pop -#endif /* 80041804-80041934 03C144 0130+00 5/5 0/0 0/0 .text setParam__14dEvt_control_cFP12dEvt_order_c */ void dEvt_control_c::setParam(dEvt_order_c* p_order) { setPt1(p_order->mActor1); setPt2(p_order->mActor2); - + mSpecifiedEvent = p_order->mEventId; mHindFlag = p_order->field_0x04; @@ -325,13 +318,12 @@ void dEvt_control_c::afterFlagProc(dEvt_order_c* p_order) { /* 800419A8-80041A20 03C2E8 0078+00 4/4 0/0 0/0 .text * commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs */ -#ifdef NONMATCHING int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 param_1, u16 param_2) { fopAc_ac_c* actor1 = p_order->mActor1; fopAc_ac_c* actor2 = p_order->mActor2; - if ((actor1 != NULL && actor1->mEvtInfo.chkCondition(param_1) == param_1) && - (actor2 != NULL && actor2->mEvtInfo.chkCondition(param_1) == param_1)) { + if ((actor1 != NULL && actor1->mEvtInfo.chkCondition(param_1)) && + (actor2 != NULL && actor2->mEvtInfo.chkCondition(param_1))) { actor1->mEvtInfo.setCommand(param_2); actor2->mEvtInfo.setCommand(param_2); setParam(p_order); @@ -340,16 +332,6 @@ int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 param_1, u16 param_2) return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::commonCheck(dEvt_order_c* param_0, u16 param_1, u16 param_2) { - nofralloc -#include "asm/d/event/d_event/commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -361,6 +343,35 @@ SECTION_DEAD static char const* const stringBase_80379D98 = "MHINT_TALK"; /* 80041A20-80041B58 03C360 0138+00 1/1 0/0 0/0 .text talkCheck__14dEvt_control_cFP12dEvt_order_c */ +#ifdef NONMATCHING +// regswap, this pointer in r31 is weird +int dEvt_control_c::talkCheck(dEvt_order_c* p_order) { + char* event = "DEFAULT_TALK"; + fopAc_ac_c* actor = p_order->mActor2; + if ((fopAcM_GetName(actor) == 0x2C1 && ((daTagMhint_c*)actor)->checkNoAttention()) || + (fopAcM_GetName(actor) == 0x2C4 && ((daTagMstop_c*)actor)->checkNoAttention()) || + fopAcM_GetName(actor) == 0xFF) { + daMidna_c* midna = daPy_py_c::getMidnaActor(); + if (!daPy_py_c::i_checkNowWolf() || midna->checkNoDraw()) { + event = "MHINT_TALK"; + } + } + if (commonCheck(p_order, 1, 1)) { + mMode = 1; + if (mSpecifiedEvent == -1) { + if (actor != NULL && actor->mEvtInfo.getEventName() != NULL) { + mSpecifiedEvent = actor->mEvtInfo.getEventId(); + } else { + mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, UINT32_MAX); + } + } + i_dComIfGp_getEventManager().order(mSpecifiedEvent); + return 1; + } else { + return 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -369,6 +380,7 @@ asm int dEvt_control_c::talkCheck(dEvt_order_c* param_0) { #include "asm/d/event/d_event/talkCheck__14dEvt_control_cFP12dEvt_order_c.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -379,84 +391,181 @@ SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY"; /* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text * talkXyCheck__14dEvt_control_cFP12dEvt_order_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::talkXyCheck(dEvt_order_c* param_0) { - nofralloc -#include "asm/d/event/d_event/talkXyCheck__14dEvt_control_cFP12dEvt_order_c.s" +int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { + const char* event = "DEFAULT_TALK_XY"; + fopAc_ac_c* pActor2 = p_order->mActor2; + int iVar5; + switch (p_order->mEventType) { + case 6: + iVar5 = 0; + field_0xed = 1; + break; + case 7: + field_0xed = 2; + iVar5 = 1; + break; + default: + field_0xed = 0; + return 0; + } + if (dComIfGp_getSelectItem(iVar5) == 0xFF) { + return 0; + } + if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(0x20)) { + return 0; + } + if (commonCheck(p_order, 1, 1)) { + mMode = 1; + mPreItemNo = dComIfGp_getSelectItem(iVar5); + mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, UINT32_MAX); + i_dComIfGp_getEventManager().order(mSpecifiedEvent); + return 1; + } else { + return 0; + } } -#pragma pop /* 80041C90-80041D34 03C5D0 00A4+00 1/1 0/0 0/0 .text catchCheck__14dEvt_control_cFP12dEvt_order_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::catchCheck(dEvt_order_c* param_0) { - nofralloc -#include "asm/d/event/d_event/catchCheck__14dEvt_control_cFP12dEvt_order_c.s" +int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { + fopAc_ac_c* actor2 = p_order->mActor2; + fopAc_ac_c* actor1 = p_order->mActor1; + + if (actor1 == NULL || (actor2 != NULL && !actor2->mEvtInfo.chkCondition(0x40))) { + return 0; + } + actor1->mEvtInfo.setCommand(6); + if (actor2 != NULL) { + actor2->mEvtInfo.setCommand(6); + } + setParam(p_order); + mPreItemNo = dComIfGp_att_getCatchChgItem(); + mMode = 2; + if (mSpecifiedEvent != -1) { + i_dComIfGp_getEventManager().order(mSpecifiedEvent); + } + return 1; } -#pragma pop /* 80041D34-80041DDC 03C674 00A8+00 1/1 0/0 0/0 .text talkEnd__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::talkEnd() { - nofralloc -#include "asm/d/event/d_event/talkEnd__14dEvt_control_cFv.s" +int dEvt_control_c::talkEnd() { + fopAc_ac_c* actor = (fopAc_ac_c*)getPt1(); + if (actor != NULL) { + actor->mEvtInfo.setCommand(0); + } + actor = (fopAc_ac_c*)getPt2(); + if (actor != NULL) { + actor->mEvtInfo.setCommand(0); + } + if (mSpecifiedEvent != -1) { + i_dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); + mSpecifiedEvent = -1; + } + daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(NULL); + if (item != NULL && fopAcM_GetName(item) == 0x218) { + item->dead(); + } + return 1; } -#pragma pop /* 80041DDC-80041F18 03C71C 013C+00 1/1 0/0 0/0 .text demoCheck__14dEvt_control_cFP12dEvt_order_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::demoCheck(dEvt_order_c* param_0) { - nofralloc -#include "asm/d/event/d_event/demoCheck__14dEvt_control_cFP12dEvt_order_c.s" +int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { + fopAc_ac_c* actor1 = p_order->mActor1; + fopAc_ac_c* actor2 = p_order->mActor2; + int eventId = p_order->mEventId; + if (actor2 == NULL) { + return 0; + } + if (!(p_order->mFlag & 0x10)) { + if (actor1 != NULL && !actor1->mEvtInfo.chkCondition(2)) { + return 0; + } + if (actor2 != NULL && !actor2->mEvtInfo.chkCondition(2)) { + return 0; + } + } + if (!beforeFlagProc(p_order)) { + return 0; + } + if (actor1 != NULL) { + i_dComIfGp_getEventManager().setObjectArchive(actor1->mEvtInfo.getArchiveName()); + } + if (!i_dComIfGp_getEventManager().order(eventId)) { + return 0; + } + if (actor1 != NULL) { + actor1->mEvtInfo.setCommand(2); + } + if (actor2 != NULL) { + actor2->mEvtInfo.setCommand(2); + } + mMode = 2; + setParam(p_order); + afterFlagProc(p_order); + return 1; } -#pragma pop /* 80041F18-80041FA0 03C858 0088+00 1/1 0/0 0/0 .text demoEnd__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::demoEnd() { - nofralloc -#include "asm/d/event/d_event/demoEnd__14dEvt_control_cFv.s" +int dEvt_control_c::demoEnd() { + fopAc_ac_c* actor = (fopAc_ac_c*)getPt1(); + if (actor != NULL) { + actor->mEvtInfo.setCommand(0); + } + actor = (fopAc_ac_c*)getPt2(); + if (actor != NULL) { + actor->mEvtInfo.setCommand(0); + } + if (mSpecifiedEvent != -1) { + i_dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); + mSpecifiedEvent = -1; + } + return 1; } -#pragma pop -int dEvt_control_c::potentialCheck(dEvt_order_c* param_0) { - fopAc_ac_c* actor = param_0->mActor1; - s32 ret; - s32 tmp = beforeFlagProc(param_0); +int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) { + fopAc_ac_c* actor = p_order->mActor1; - if (!tmp) { - ret = 0; + if (!beforeFlagProc(p_order)) { + return 0; } else { actor->mEvtInfo.setCommand(2); mMode = 2; - setParam(param_0); - afterFlagProc(param_0); - ret = 1; + setParam(p_order); + afterFlagProc(p_order); + return 1; } - return ret; } /* 80042014-8004212C 03C954 0118+00 1/1 0/0 0/0 .text doorCheck__14dEvt_control_cFP12dEvt_order_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::doorCheck(dEvt_order_c* param_0) { - nofralloc -#include "asm/d/event/d_event/doorCheck__14dEvt_control_cFP12dEvt_order_c.s" +int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { + if (commonCheck(p_order, 4, 3)) { + mMode = 2; + fopAc_ac_c* actor2 = (fopAc_ac_c*)getPt2(); + if (actor2 != NULL) { + i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName()); + } + if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->mEvtInfo.getEventId() != -1) { + mSpecifiedEvent = actor2->mEvtInfo.getEventId(); + } + if (mSpecifiedEvent != -1 && + i_dComIfGp_getEventManager().getEventData(mSpecifiedEvent) != NULL) { + i_dComIfGp_getEventManager().order(mSpecifiedEvent); + } else { + mSpecifiedEvent = -1; + reset(); + } + if (p_order->mEventType == 0xB) { + onEventFlag(4); + } else { + onEventFlag(0x40); + } + return 1; + } else { + return 0; + } } -#pragma pop /* 8004212C-800421C0 03CA6C 0094+00 1/1 0/0 0/0 .text itemCheck__14dEvt_control_cFP12dEvt_order_c */ @@ -475,7 +584,6 @@ int dEvt_control_c::itemCheck(dEvt_order_c* p_order) { /* 800421C0-80042254 03CB00 0094+00 1/1 0/0 0/0 .text endProc__14dEvt_control_cFv */ // missing extra branch -#ifdef NONMATCHING int dEvt_control_c::endProc() { switch (mMode) { case 1: @@ -484,6 +592,8 @@ int dEvt_control_c::endProc() { case 2: demoEnd(); break; + case 3: + break; } mMode = 0; @@ -497,26 +607,16 @@ int dEvt_control_c::endProc() { i_dComIfGp_getEventManager().setStartDemo(-2); return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::endProc() { - nofralloc -#include "asm/d/event/d_event/endProc__14dEvt_control_cFv.s" -} -#pragma pop -#endif /* 80042254-800422C0 03CB94 006C+00 1/1 0/0 0/0 .text change__14dEvt_control_cFv */ -// reg swap -#ifdef NONMATCHING int dEvt_control_c::change() { + dEvt_order_c* order; + s8 var_r7; if (mNum != 0) { - s8 var_r7 = field_0xe3; + var_r7 = field_0xe3; do { - dEvt_order_c* order = &mOrder[var_r7]; + order = &mOrder[var_r7]; if (order->mFlag & 0xE00 && order->mActor1 == mChangeOK) { field_0xe3 = var_r7; @@ -531,16 +631,6 @@ int dEvt_control_c::change() { return -1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::change() { - nofralloc -#include "asm/d/event/d_event/change__14dEvt_control_cFv.s" -} -#pragma pop -#endif /* 800422C0-80042468 03CC00 01A8+00 2/1 0/0 0/0 .text entry__14dEvt_control_cFv */ int dEvt_control_c::entry() { @@ -599,7 +689,7 @@ int dEvt_control_c::entry() { } } while (orderIdx >= 0); } - + return 0; } @@ -678,7 +768,8 @@ int dEv_defaultSkipZev(void* param_0, int param_1) { if (eventID != -1) { evControl->reset(param_0); - fopAcM_orderOtherEventId((fopAc_ac_c*)param_0, eventID, evControl->getMapToolId(), -1, 3, 0x400); + fopAcM_orderOtherEventId((fopAc_ac_c*)param_0, eventID, evControl->getMapToolId(), -1, 3, + 0x400); return 2; } else if (var_r27) { evControl->reset(param_0); @@ -721,7 +812,8 @@ int dEv_defaultSkipStb(void* param_0, int param_1) { if (eventID != -1) { evControl->reset(param_0); dDemo_c::end(); - fopAcM_orderOtherEventId((fopAc_ac_c*)param_0, eventID, evControl->getMapToolId(), -1, 3, 0x400); + fopAcM_orderOtherEventId((fopAc_ac_c*)param_0, eventID, evControl->getMapToolId(), -1, 3, + 0x400); return 2; } else if (var_r27) { evControl->reset(param_0); @@ -848,15 +940,13 @@ bool dEvt_control_c::skipper() { SECTION_SDATA2 static f32 lit_5013 = -1.0f / 20.0f; /* 80042BBC-80042FA8 03D4FC 03EC+00 0/0 1/1 0/0 .text Step__14dEvt_control_cFv */ -// small regalloc in checkFishingCastMode -#ifdef NONMATCHING int dEvt_control_c::Step() { dEvent_manager_c* evtMng = &i_dComIfGp_getEventManager(); - + field_0xe7 = 0; field_0xe8 = mNum; skipper(); - + if (chkEventFlag(8)) { if (mEventStatus == 1) { mEventStatus = 5; @@ -961,40 +1051,73 @@ int dEvt_control_c::Step() { dComIfGp_setLastPlayStageName(lastStageName); dComIfGs_onVisitedRoom(mRoomNo); } - field_0x129 = 1; + field_0x129 = 1; } return 0; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::Step() { - nofralloc -#include "asm/d/event/d_event/Step__14dEvt_control_cFv.s" -} -#pragma pop -#endif /* 80042FA8-8004316C 03D8E8 01C4+00 0/0 2/2 0/0 .text moveApproval__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvt_control_c::moveApproval(void* param_0) { - nofralloc -#include "asm/d/event/d_event/moveApproval__14dEvt_control_cFPv.s" +int dEvt_control_c::moveApproval(void* param_0) { + fopAc_ac_c* actor = (fopAc_ac_c*)param_0; + if (fopAcM_checkStatus(actor, 0x20000)) { + return 2; + } + if (!runCheck()) { + return 1; + } + switch (mMode) { + case 1: + if (getPt1() == actor || getPt2() == actor) { + return 2; + } + break; + case 2: + if (getPt1() == actor || getPt2() == actor) { + return 2; + } + if (actor->mDemoActorId != 0) { + return 2; + } + break; + case 3: + if (getPt1() == actor) { + return 2; + } + break; + } + if (fopAcM_checkStatus(actor, 0x8000)) { + return 2; + } + if (fopAcM_checkStatus(actor, 0x800)) { + return 1; + } + if (i_dComIfGp_checkPlayerStatus0(0, 0x20000000) || + i_dComIfGp_checkPlayerStatus1(0, 0x4002000)) { + return 0; + } + if (mMode == 1 && fopAcM_checkStatus(actor, 0x40)) { + return 1; + } + if (dDemo_c::getMode() == 1) { + return 1; + } + if ((getMode() == 3 || getMode() == 1) && fopAcM_checkStatus(actor, 0x4000000)) { + return 0; + } + if (fopAcM_checkStatus(actor, 0x4000)) { + return 1; + } + if (fopAcM_checkStatus(actor, 0x2000)) { + return 1; + } + return 0; } -#pragma pop /* 8004316C-800431E8 03DAAC 007C+00 0/0 28/28 0/0 .text compulsory__14dEvt_control_cFPvPCcUs */ BOOL dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 param_2) { - bool check = false; - u8 temp_r4 = mEventStatus; - if (temp_r4 == 0 || temp_r4 == 2) { - check = true; - } + bool check = (mEventStatus == 0 || mEventStatus == 2); if (!check || mCompulsory) { return 0; @@ -1047,31 +1170,39 @@ u32 dEvt_control_c::getPId(void* actor) { } /* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text convPId__14dEvt_control_cFUi */ -#ifdef NONMATCHING void* dEvt_control_c::convPId(unsigned int param_0) { - return fopAcIt_Judge(fpcSch_JudgeByID, (void*)param_0); + return fopAcIt_Judge(fpcSch_JudgeByID, (void*)¶m_0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* dEvt_control_c::convPId(unsigned int param_0) { - nofralloc -#include "asm/d/event/d_event/convPId__14dEvt_control_cFUi.s" -} -#pragma pop -#endif /* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text getStbDemoData__14dEvt_control_cFPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void* dEvt_control_c::getStbDemoData(char* param_0) { - nofralloc -#include "asm/d/event/d_event/getStbDemoData__14dEvt_control_cFPc.s" +void* dEvt_control_c::getStbDemoData(char* param_0) { + char* demoArcName = dStage_roomControl_c::getDemoArcName(); + if (*demoArcName != 0) { + void* res = dComIfG_getObjectRes(demoArcName, param_0); + if (res != NULL) { + func_80041480(); + return res; + } + func_80041480(); + } else { + func_80041480(); + } + char* roomArcName = dComIfG_getRoomArcName(dComIfGp_roomControl_getStayNo()); + void* res2 = dComIfG_getStageRes(roomArcName, param_0); + if (res2 != NULL) { + func_80041480(); + return res2; + } else { + res2 = dComIfG_getStageRes(param_0); + if (res2 != NULL) { + func_80041480(); + return res2; + } else { + return NULL; + } + } } -#pragma pop dEvt_info_c::dEvt_info_c() { setCommand(0); diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 480c0e3de55..15dd2ed7623 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -51,25 +51,14 @@ static s32 fopScn_IsDelete(void* param_1) { } /* 8001EBAC-8001EC00 0194EC 0054+00 1/0 0/0 0/0 .text fopScn_Delete__FPv */ -#ifdef NON_MATCHING static s32 fopScn_Delete(void* param_1) { scene_class* pScene = (scene_class*)param_1; - s32 ret = fpcMtd_Delete(pScene->mpProcessMtd, param_1); + s32 ret = fpcMtd_Delete(pScene->mpProcessMtd, pScene); if (ret == 1) { - fopScnTg_QueueTo(pScene->field_0x1b0); + fopScnTg_QueueTo(&pScene->field_0x1b0); } return ret; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 fopScn_Delete(void* param_0) { - nofralloc -#include "asm/f_op/f_op_scene/fopScn_Delete__FPv.s" -} -#pragma pop -#endif /* 8001EC00-8001EC74 019540 0074+00 1/0 0/0 0/0 .text fopScn_Create__FPv */ #pragma push diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index f3c6345f624..b73a4367755 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -13,22 +13,14 @@ // /* 80023844-80023868 0024+00 s=0 e=3 z=0 None .text fpcPause_IsEnable__FPvUc */ -#ifdef NON_MATCHING s32 fpcPause_IsEnable(void* pProcess, u8 flag) { base_process_class* pProc = (base_process_class*)pProcess; - // extra addic/subfe? - return (pProc->mPauseFlag & flag) == flag; + if ((pProc->mPauseFlag & flag) == flag) { + return 1; + } else { + return 0; + } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 fpcPause_IsEnable(void* param_0, u8 param_1) { - nofralloc -#include "asm/f_pc/f_pc_pause/fpcPause_IsEnable__FPvUc.s" -} -#pragma pop -#endif /* 80023868-800238D4 006C+00 s=0 e=1 z=0 None .text fpcPause_Enable__FPvUc */ s32 fpcPause_Enable(void* pProcess, u8 flag) { diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 57fd2f39220..02afd4b5871 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -310,26 +310,14 @@ SECTION_SDATA Mtx* mDoMtx_stack_c::next = (Mtx*)&mDoMtx_stack_c::buffer; SECTION_SDATA Mtx* mDoMtx_stack_c::end = (Mtx*)&lit_4048; /* 8000CCC8-8000CD14 007608 004C+00 0/0 0/0 24/24 .text push__14mDoMtx_stack_cFv */ -// regalloc -#ifdef NONMATCHING bool mDoMtx_stack_c::push() { if (next >= end) { return false; } - next++; - PSMTXCopy(now, *next); + Mtx* old = next++; + PSMTXCopy(now, *old); return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool mDoMtx_stack_c::push() { - nofralloc -#include "asm/m_Do/m_Do_mtx/push__14mDoMtx_stack_cFv.s" -} -#pragma pop -#endif /* 8000CD14-8000CD64 007654 0050+00 0/0 0/0 24/24 .text pop__14mDoMtx_stack_cFv */ bool mDoMtx_stack_c::pop() {