diff --git a/asm/d/event/d_event_manager/ChkPresentEnd__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/ChkPresentEnd__16dEvent_manager_cFv.s deleted file mode 100644 index 08f6c5eb61c..00000000000 --- a/asm/d/event/d_event_manager/ChkPresentEnd__16dEvent_manager_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800487F0: -/* 800487F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800487F4 7C 08 02 A6 */ mflr r0 -/* 800487F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800487FC 38 60 00 00 */ li r3, 0 -/* 80048800 4B FF FF 49 */ bl dEv_talkman_get_action__Fi -/* 80048804 38 00 00 01 */ li r0, 1 -/* 80048808 7C 65 FE 70 */ srawi r5, r3, 0x1f -/* 8004880C 54 04 0F FE */ srwi r4, r0, 0x1f -/* 80048810 7C 00 18 10 */ subfc r0, r0, r3 -/* 80048814 7C 05 21 14 */ adde r0, r5, r4 -/* 80048818 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8004881C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80048820 7C 08 03 A6 */ mtlr r0 -/* 80048824 38 21 00 10 */ addi r1, r1, 0x10 -/* 80048828 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/Experts__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/Experts__16dEvent_manager_cFv.s deleted file mode 100644 index 96749c3b903..00000000000 --- a/asm/d/event/d_event_manager/Experts__16dEvent_manager_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800473FC: -/* 800473FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80047400 7C 08 02 A6 */ mflr r0 -/* 80047404 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047408 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8004740C 7C 7F 1B 78 */ mr r31, r3 -/* 80047410 A8 83 01 AA */ lha r4, 0x1aa(r3) -/* 80047414 48 00 00 A9 */ bl getEventData__16dEvent_manager_cFs -/* 80047418 28 03 00 00 */ cmplwi r3, 0 -/* 8004741C 41 82 00 24 */ beq lbl_80047440 -/* 80047420 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 80047424 2C 00 00 01 */ cmpwi r0, 1 -/* 80047428 40 82 00 18 */ bne lbl_80047440 -/* 8004742C 80 1F 01 B4 */ lwz r0, 0x1b4(r31) -/* 80047430 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80047434 7C 9F 02 14 */ add r4, r31, r0 -/* 80047438 80 84 00 08 */ lwz r4, 8(r4) -/* 8004743C 4B FF CB 35 */ bl specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c -lbl_80047440: -/* 80047440 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80047444 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80047448 7C 08 03 A6 */ mtlr r0 -/* 8004744C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80047450 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/Sequencer__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/Sequencer__16dEvent_manager_cFv.s deleted file mode 100644 index e919db4cb6d..00000000000 --- a/asm/d/event/d_event_manager/Sequencer__16dEvent_manager_cFv.s +++ /dev/null @@ -1,397 +0,0 @@ -lbl_80046E64: -/* 80046E64 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 80046E68 7C 08 02 A6 */ mflr r0 -/* 80046E6C 90 01 00 74 */ stw r0, 0x74(r1) -/* 80046E70 39 61 00 70 */ addi r11, r1, 0x70 -/* 80046E74 48 31 B3 55 */ bl _savegpr_24 -/* 80046E78 7C 7E 1B 78 */ mr r30, r3 -/* 80046E7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046E80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80046E84 3B E4 4E C8 */ addi r31, r4, 0x4ec8 -/* 80046E88 A8 83 01 AA */ lha r4, 0x1aa(r3) -/* 80046E8C 48 00 06 31 */ bl getEventData__16dEvent_manager_cFs -/* 80046E90 7C 7D 1B 78 */ mr r29, r3 -/* 80046E94 7F E3 FB 78 */ mr r3, r31 -/* 80046E98 4B FF C3 E1 */ bl getStageEventDt__14dEvt_control_cFv -/* 80046E9C 7C 7C 1B 78 */ mr r28, r3 -/* 80046EA0 28 1D 00 00 */ cmplwi r29, 0 -/* 80046EA4 41 82 05 24 */ beq lbl_800473C8 -/* 80046EA8 A0 1F 00 D8 */ lhz r0, 0xd8(r31) -/* 80046EAC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 80046EB0 41 82 01 14 */ beq lbl_80046FC4 -/* 80046EB4 3B 60 00 00 */ li r27, 0 -/* 80046EB8 28 1C 00 00 */ cmplwi r28, 0 -/* 80046EBC 41 82 00 F8 */ beq lbl_80046FB4 -/* 80046EC0 88 1C 00 00 */ lbz r0, 0(r28) -/* 80046EC4 2C 00 00 00 */ cmpwi r0, 0 -/* 80046EC8 41 82 00 14 */ beq lbl_80046EDC -/* 80046ECC 41 80 00 10 */ blt lbl_80046EDC -/* 80046ED0 2C 00 00 03 */ cmpwi r0, 3 -/* 80046ED4 40 80 00 08 */ bge lbl_80046EDC -/* 80046ED8 3B 7C 00 0D */ addi r27, r28, 0xd -lbl_80046EDC: -/* 80046EDC 88 7C 00 08 */ lbz r3, 8(r28) -/* 80046EE0 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 80046EE4 41 82 00 D0 */ beq lbl_80046FB4 -/* 80046EE8 A0 1F 00 DA */ lhz r0, 0xda(r31) -/* 80046EEC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80046EF0 40 82 00 C4 */ bne lbl_80046FB4 -/* 80046EF4 54 60 FF BE */ rlwinm r0, r3, 0x1f, 0x1e, 0x1f -/* 80046EF8 2C 00 00 02 */ cmpwi r0, 2 -/* 80046EFC 40 82 00 0C */ bne lbl_80046F08 -/* 80046F00 7F E3 FB 78 */ mr r3, r31 -/* 80046F04 4B FF BA A5 */ bl onSkipFade__14dEvt_control_cFv -lbl_80046F08: -/* 80046F08 7F E3 FB 78 */ mr r3, r31 -/* 80046F0C 80 9F 00 C4 */ lwz r4, 0xc4(r31) -/* 80046F10 4B FF C3 DD */ bl convPId__14dEvt_control_cFUi -/* 80046F14 7C 64 1B 78 */ mr r4, r3 -/* 80046F18 28 03 00 00 */ cmplwi r3, 0 -/* 80046F1C 40 82 00 14 */ bne lbl_80046F30 -/* 80046F20 7F E3 FB 78 */ mr r3, r31 -/* 80046F24 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80046F28 4B FF C3 C5 */ bl convPId__14dEvt_control_cFUi -/* 80046F2C 7C 64 1B 78 */ mr r4, r3 -lbl_80046F30: -/* 80046F30 28 04 00 00 */ cmplwi r4, 0 -/* 80046F34 40 82 00 10 */ bne lbl_80046F44 -/* 80046F38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046F3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80046F40 80 83 5D AC */ lwz r4, 0x5dac(r3) -lbl_80046F44: -/* 80046F44 28 04 00 00 */ cmplwi r4, 0 -/* 80046F48 41 82 00 6C */ beq lbl_80046FB4 -/* 80046F4C 88 1C 00 00 */ lbz r0, 0(r28) -/* 80046F50 2C 00 00 01 */ cmpwi r0, 1 -/* 80046F54 41 82 00 34 */ beq lbl_80046F88 -/* 80046F58 40 80 00 10 */ bge lbl_80046F68 -/* 80046F5C 2C 00 00 00 */ cmpwi r0, 0 -/* 80046F60 40 80 00 40 */ bge lbl_80046FA0 -/* 80046F64 48 00 00 50 */ b lbl_80046FB4 -lbl_80046F68: -/* 80046F68 2C 00 00 03 */ cmpwi r0, 3 -/* 80046F6C 40 80 00 48 */ bge lbl_80046FB4 -/* 80046F70 7F E3 FB 78 */ mr r3, r31 -/* 80046F74 3C A0 80 04 */ lis r5, dEv_defaultSkipStb__FPvi@ha /* 0x80042778@ha */ -/* 80046F78 38 A5 27 78 */ addi r5, r5, dEv_defaultSkipStb__FPvi@l /* 0x80042778@l */ -/* 80046F7C 38 C0 00 00 */ li r6, 0 -/* 80046F80 4B FF B9 95 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii -/* 80046F84 48 00 00 30 */ b lbl_80046FB4 -lbl_80046F88: -/* 80046F88 7F E3 FB 78 */ mr r3, r31 -/* 80046F8C 3C A0 80 04 */ lis r5, dEv_defaultSkipZev__FPvi@ha /* 0x8004261C@ha */ -/* 80046F90 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev__FPvi@l /* 0x8004261C@l */ -/* 80046F94 38 C0 00 00 */ li r6, 0 -/* 80046F98 4B FF B9 7D */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii -/* 80046F9C 48 00 00 18 */ b lbl_80046FB4 -lbl_80046FA0: -/* 80046FA0 7F E3 FB 78 */ mr r3, r31 -/* 80046FA4 3C A0 80 04 */ lis r5, dEv_defaultSkipProc__FPvi@ha /* 0x800425E8@ha */ -/* 80046FA8 38 A5 25 E8 */ addi r5, r5, dEv_defaultSkipProc__FPvi@l /* 0x800425E8@l */ -/* 80046FAC 38 C0 00 00 */ li r6, 0 -/* 80046FB0 4B FF B9 65 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii -lbl_80046FB4: -/* 80046FB4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80046FB8 38 63 04 C4 */ addi r3, r3, 0x4c4 -/* 80046FBC 7F 64 DB 78 */ mr r4, r27 -/* 80046FC0 48 26 F2 29 */ bl setDemoName__11Z2StatusMgrFPc -lbl_80046FC4: -/* 80046FC4 7F A3 EB 78 */ mr r3, r29 -/* 80046FC8 4B FF CE B1 */ bl finishCheck__12dEvDtEvent_cFv -/* 80046FCC 2C 03 00 00 */ cmpwi r3, 0 -/* 80046FD0 41 82 03 C0 */ beq lbl_80047390 -/* 80046FD4 3B 40 00 00 */ li r26, 0 -/* 80046FD8 A0 7F 00 DA */ lhz r3, 0xda(r31) -/* 80046FDC 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 80046FE0 41 82 00 08 */ beq lbl_80046FE8 -/* 80046FE4 3B 40 00 01 */ li r26, 1 -lbl_80046FE8: -/* 80046FE8 3B 20 FF FF */ li r25, -1 -/* 80046FEC 54 63 07 BC */ rlwinm r3, r3, 0, 0x1e, 0x1e -/* 80046FF0 30 03 FF FF */ addic r0, r3, -1 -/* 80046FF4 7F 00 19 10 */ subfe r24, r0, r3 -/* 80046FF8 28 1C 00 00 */ cmplwi r28, 0 -/* 80046FFC 41 82 03 60 */ beq lbl_8004735C -/* 80047000 88 1C 00 08 */ lbz r0, 8(r28) -/* 80047004 54 1B FF BE */ rlwinm r27, r0, 0x1f, 0x1e, 0x1f -/* 80047008 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 8004700C 41 82 01 CC */ beq lbl_800471D8 -/* 80047010 2C 1B 00 01 */ cmpwi r27, 1 -/* 80047014 41 82 01 C4 */ beq lbl_800471D8 -/* 80047018 3B 40 00 01 */ li r26, 1 -/* 8004701C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047020 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047024 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80047028 C0 03 05 50 */ lfs f0, 0x550(r3) -/* 8004702C D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80047030 C0 03 05 54 */ lfs f0, 0x554(r3) -/* 80047034 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80047038 C0 03 05 58 */ lfs f0, 0x558(r3) -/* 8004703C D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80047040 48 13 A6 01 */ bl dCam_getBody__Fv -/* 80047044 7C 64 1B 78 */ mr r4, r3 -/* 80047048 38 61 00 2C */ addi r3, r1, 0x2c -/* 8004704C 48 13 AE 4D */ bl Center__9dCamera_cFv -/* 80047050 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 80047054 D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80047058 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8004705C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80047060 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 80047064 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80047068 38 61 00 20 */ addi r3, r1, 0x20 -/* 8004706C 38 81 00 44 */ addi r4, r1, 0x44 -/* 80047070 38 A1 00 38 */ addi r5, r1, 0x38 -/* 80047074 48 21 FA C1 */ bl __mi__4cXyzCFRC3Vec -/* 80047078 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8004707C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80047080 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80047084 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80047088 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 8004708C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80047090 38 61 00 14 */ addi r3, r1, 0x14 -/* 80047094 48 30 00 A5 */ bl PSVECSquareMag -/* 80047098 C0 02 85 00 */ lfs f0, lit_4398(r2) -/* 8004709C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800470A0 40 81 00 58 */ ble lbl_800470F8 -/* 800470A4 FC 00 08 34 */ frsqrte f0, f1 -/* 800470A8 C8 82 85 08 */ lfd f4, lit_4399(r2) -/* 800470AC FC 44 00 32 */ fmul f2, f4, f0 -/* 800470B0 C8 62 85 10 */ lfd f3, lit_4400(r2) -/* 800470B4 FC 00 00 32 */ fmul f0, f0, f0 -/* 800470B8 FC 01 00 32 */ fmul f0, f1, f0 -/* 800470BC FC 03 00 28 */ fsub f0, f3, f0 -/* 800470C0 FC 02 00 32 */ fmul f0, f2, f0 -/* 800470C4 FC 44 00 32 */ fmul f2, f4, f0 -/* 800470C8 FC 00 00 32 */ fmul f0, f0, f0 -/* 800470CC FC 01 00 32 */ fmul f0, f1, f0 -/* 800470D0 FC 03 00 28 */ fsub f0, f3, f0 -/* 800470D4 FC 02 00 32 */ fmul f0, f2, f0 -/* 800470D8 FC 44 00 32 */ fmul f2, f4, f0 -/* 800470DC FC 00 00 32 */ fmul f0, f0, f0 -/* 800470E0 FC 01 00 32 */ fmul f0, f1, f0 -/* 800470E4 FC 03 00 28 */ fsub f0, f3, f0 -/* 800470E8 FC 02 00 32 */ fmul f0, f2, f0 -/* 800470EC FC 21 00 32 */ fmul f1, f1, f0 -/* 800470F0 FC 20 08 18 */ frsp f1, f1 -/* 800470F4 48 00 00 88 */ b lbl_8004717C -lbl_800470F8: -/* 800470F8 C8 02 85 18 */ lfd f0, lit_4401(r2) -/* 800470FC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80047100 40 80 00 10 */ bge lbl_80047110 -/* 80047104 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80047108 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8004710C 48 00 00 70 */ b lbl_8004717C -lbl_80047110: -/* 80047110 D0 21 00 08 */ stfs f1, 8(r1) -/* 80047114 80 81 00 08 */ lwz r4, 8(r1) -/* 80047118 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8004711C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80047120 7C 03 00 00 */ cmpw r3, r0 -/* 80047124 41 82 00 14 */ beq lbl_80047138 -/* 80047128 40 80 00 40 */ bge lbl_80047168 -/* 8004712C 2C 03 00 00 */ cmpwi r3, 0 -/* 80047130 41 82 00 20 */ beq lbl_80047150 -/* 80047134 48 00 00 34 */ b lbl_80047168 -lbl_80047138: -/* 80047138 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8004713C 41 82 00 0C */ beq lbl_80047148 -/* 80047140 38 00 00 01 */ li r0, 1 -/* 80047144 48 00 00 28 */ b lbl_8004716C -lbl_80047148: -/* 80047148 38 00 00 02 */ li r0, 2 -/* 8004714C 48 00 00 20 */ b lbl_8004716C -lbl_80047150: -/* 80047150 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80047154 41 82 00 0C */ beq lbl_80047160 -/* 80047158 38 00 00 05 */ li r0, 5 -/* 8004715C 48 00 00 10 */ b lbl_8004716C -lbl_80047160: -/* 80047160 38 00 00 03 */ li r0, 3 -/* 80047164 48 00 00 08 */ b lbl_8004716C -lbl_80047168: -/* 80047168 38 00 00 04 */ li r0, 4 -lbl_8004716C: -/* 8004716C 2C 00 00 01 */ cmpwi r0, 1 -/* 80047170 40 82 00 0C */ bne lbl_8004717C -/* 80047174 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80047178 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8004717C: -/* 8004717C 2C 1B 00 00 */ cmpwi r27, 0 -/* 80047180 40 82 00 1C */ bne lbl_8004719C -/* 80047184 C0 02 85 20 */ lfs f0, lit_4402(r2) -/* 80047188 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8004718C 40 81 00 4C */ ble lbl_800471D8 -/* 80047190 48 13 A4 B1 */ bl dCam_getBody__Fv -/* 80047194 48 13 98 AD */ bl EventRecoverNotime__9dCamera_cFv -/* 80047198 48 00 00 40 */ b lbl_800471D8 -lbl_8004719C: -/* 8004719C 88 1C 00 03 */ lbz r0, 3(r28) -/* 800471A0 2C 00 00 03 */ cmpwi r0, 3 -/* 800471A4 41 82 00 2C */ beq lbl_800471D0 -/* 800471A8 40 80 00 30 */ bge lbl_800471D8 -/* 800471AC 2C 00 00 01 */ cmpwi r0, 1 -/* 800471B0 40 80 00 08 */ bge lbl_800471B8 -/* 800471B4 48 00 00 24 */ b lbl_800471D8 -lbl_800471B8: -/* 800471B8 C0 02 85 20 */ lfs f0, lit_4402(r2) -/* 800471BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800471C0 40 81 00 18 */ ble lbl_800471D8 -/* 800471C4 48 13 A4 7D */ bl dCam_getBody__Fv -/* 800471C8 48 13 98 79 */ bl EventRecoverNotime__9dCamera_cFv -/* 800471CC 48 00 00 0C */ b lbl_800471D8 -lbl_800471D0: -/* 800471D0 48 13 A4 71 */ bl dCam_getBody__Fv -/* 800471D4 48 13 98 6D */ bl EventRecoverNotime__9dCamera_cFv -lbl_800471D8: -/* 800471D8 88 1C 00 00 */ lbz r0, 0(r28) -/* 800471DC 2C 00 00 01 */ cmpwi r0, 1 -/* 800471E0 41 82 01 38 */ beq lbl_80047318 -/* 800471E4 40 80 00 10 */ bge lbl_800471F4 -/* 800471E8 2C 00 00 00 */ cmpwi r0, 0 -/* 800471EC 40 80 00 14 */ bge lbl_80047200 -/* 800471F0 48 00 01 6C */ b lbl_8004735C -lbl_800471F4: -/* 800471F4 2C 00 00 03 */ cmpwi r0, 3 -/* 800471F8 40 80 01 64 */ bge lbl_8004735C -/* 800471FC 48 00 00 D4 */ b lbl_800472D0 -lbl_80047200: -/* 80047200 88 1C 00 18 */ lbz r0, 0x18(r28) -/* 80047204 2C 00 00 02 */ cmpwi r0, 2 -/* 80047208 41 82 00 4C */ beq lbl_80047254 -/* 8004720C 40 80 00 7C */ bge lbl_80047288 -/* 80047210 2C 00 00 01 */ cmpwi r0, 1 -/* 80047214 40 80 00 08 */ bge lbl_8004721C -/* 80047218 48 00 00 70 */ b lbl_80047288 -lbl_8004721C: -/* 8004721C 38 00 00 0C */ li r0, 0xc -/* 80047220 90 01 00 10 */ stw r0, 0x10(r1) -/* 80047224 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80047228 38 81 00 10 */ addi r4, r1, 0x10 -/* 8004722C 38 A0 00 00 */ li r5, 0 -/* 80047230 38 C0 00 00 */ li r6, 0 -/* 80047234 38 E0 00 00 */ li r7, 0 -/* 80047238 C0 22 85 24 */ lfs f1, lit_4403(r2) -/* 8004723C FC 40 08 90 */ fmr f2, f1 -/* 80047240 C0 62 85 28 */ lfs f3, lit_4404(r2) -/* 80047244 FC 80 18 90 */ fmr f4, f3 -/* 80047248 39 00 00 00 */ li r8, 0 -/* 8004724C 48 26 47 39 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80047250 48 00 00 38 */ b lbl_80047288 -lbl_80047254: -/* 80047254 38 00 00 0D */ li r0, 0xd -/* 80047258 90 01 00 0C */ stw r0, 0xc(r1) -/* 8004725C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 80047260 38 81 00 0C */ addi r4, r1, 0xc -/* 80047264 38 A0 00 00 */ li r5, 0 -/* 80047268 38 C0 00 00 */ li r6, 0 -/* 8004726C 38 E0 00 00 */ li r7, 0 -/* 80047270 C0 22 85 24 */ lfs f1, lit_4403(r2) -/* 80047274 FC 40 08 90 */ fmr f2, f1 -/* 80047278 C0 62 85 28 */ lfs f3, lit_4404(r2) -/* 8004727C FC 80 18 90 */ fmr f4, f3 -/* 80047280 39 00 00 00 */ li r8, 0 -/* 80047284 48 26 47 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80047288: -/* 80047288 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 8004728C 40 82 00 D0 */ bne lbl_8004735C -/* 80047290 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80047294 41 82 00 20 */ beq lbl_800472B4 -/* 80047298 88 9C 00 09 */ lbz r4, 9(r28) -/* 8004729C 28 04 00 FF */ cmplwi r4, 0xff -/* 800472A0 41 82 00 14 */ beq lbl_800472B4 -/* 800472A4 7C 99 23 78 */ mr r25, r4 -/* 800472A8 7F E3 FB 78 */ mr r3, r31 -/* 800472AC 4B FF BF D5 */ bl sceneChange__14dEvt_control_cFi -/* 800472B0 48 00 00 AC */ b lbl_8004735C -lbl_800472B4: -/* 800472B4 88 9C 00 17 */ lbz r4, 0x17(r28) -/* 800472B8 28 04 00 FF */ cmplwi r4, 0xff -/* 800472BC 41 82 00 A0 */ beq lbl_8004735C -/* 800472C0 7C 99 23 78 */ mr r25, r4 -/* 800472C4 7F E3 FB 78 */ mr r3, r31 -/* 800472C8 4B FF BF B9 */ bl sceneChange__14dEvt_control_cFi -/* 800472CC 48 00 00 90 */ b lbl_8004735C -lbl_800472D0: -/* 800472D0 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 800472D4 40 82 00 88 */ bne lbl_8004735C -/* 800472D8 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 800472DC 41 82 00 20 */ beq lbl_800472FC -/* 800472E0 88 9C 00 09 */ lbz r4, 9(r28) -/* 800472E4 28 04 00 FF */ cmplwi r4, 0xff -/* 800472E8 41 82 00 14 */ beq lbl_800472FC -/* 800472EC 7C 99 23 78 */ mr r25, r4 -/* 800472F0 7F E3 FB 78 */ mr r3, r31 -/* 800472F4 4B FF BF 8D */ bl sceneChange__14dEvt_control_cFi -/* 800472F8 48 00 00 64 */ b lbl_8004735C -lbl_800472FC: -/* 800472FC 88 9C 00 07 */ lbz r4, 7(r28) -/* 80047300 28 04 00 FF */ cmplwi r4, 0xff -/* 80047304 41 82 00 58 */ beq lbl_8004735C -/* 80047308 7C 99 23 78 */ mr r25, r4 -/* 8004730C 7F E3 FB 78 */ mr r3, r31 -/* 80047310 4B FF BF 71 */ bl sceneChange__14dEvt_control_cFi -/* 80047314 48 00 00 48 */ b lbl_8004735C -lbl_80047318: -/* 80047318 57 40 06 3F */ clrlwi. r0, r26, 0x18 -/* 8004731C 40 82 00 40 */ bne lbl_8004735C -/* 80047320 57 00 06 3F */ clrlwi. r0, r24, 0x18 -/* 80047324 41 82 00 20 */ beq lbl_80047344 -/* 80047328 88 9C 00 09 */ lbz r4, 9(r28) -/* 8004732C 28 04 00 FF */ cmplwi r4, 0xff -/* 80047330 41 82 00 14 */ beq lbl_80047344 -/* 80047334 7C 99 23 78 */ mr r25, r4 -/* 80047338 7F E3 FB 78 */ mr r3, r31 -/* 8004733C 4B FF BF 45 */ bl sceneChange__14dEvt_control_cFi -/* 80047340 48 00 00 1C */ b lbl_8004735C -lbl_80047344: -/* 80047344 88 9C 00 07 */ lbz r4, 7(r28) -/* 80047348 28 04 00 FF */ cmplwi r4, 0xff -/* 8004734C 41 82 00 10 */ beq lbl_8004735C -/* 80047350 7C 99 23 78 */ mr r25, r4 -/* 80047354 7F E3 FB 78 */ mr r3, r31 -/* 80047358 4B FF BF 29 */ bl sceneChange__14dEvt_control_cFi -lbl_8004735C: -/* 8004735C 2C 19 FF FF */ cmpwi r25, -1 -/* 80047360 40 82 00 50 */ bne lbl_800473B0 -/* 80047364 80 1E 01 B4 */ lwz r0, 0x1b4(r30) -/* 80047368 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 8004736C 7C 7E 02 14 */ add r3, r30, r0 -/* 80047370 7F A4 EB 78 */ mr r4, r29 -/* 80047374 4B FF EF 19 */ bl advanceCut__11dEvDtBase_cFP12dEvDtEvent_c -/* 80047378 7F C3 F3 78 */ mr r3, r30 -/* 8004737C 7F A4 EB 78 */ mr r4, r29 -/* 80047380 4B FF FA 21 */ bl closeProc__16dEvent_manager_cFP12dEvDtEvent_c -/* 80047384 7F E3 FB 78 */ mr r3, r31 -/* 80047388 4B FF B0 E1 */ bl reset__14dEvt_control_cFv -/* 8004738C 48 00 00 24 */ b lbl_800473B0 -lbl_80047390: -/* 80047390 80 1D 00 A4 */ lwz r0, 0xa4(r29) -/* 80047394 2C 00 00 01 */ cmpwi r0, 1 -/* 80047398 40 82 00 18 */ bne lbl_800473B0 -/* 8004739C 80 1E 01 B4 */ lwz r0, 0x1b4(r30) -/* 800473A0 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 800473A4 7C 7E 02 14 */ add r3, r30, r0 -/* 800473A8 7F A4 EB 78 */ mr r4, r29 -/* 800473AC 4B FF EE E1 */ bl advanceCut__11dEvDtBase_cFP12dEvDtEvent_c -lbl_800473B0: -/* 800473B0 80 7E 01 B8 */ lwz r3, 0x1b8(r30) -/* 800473B4 2C 03 00 00 */ cmpwi r3, 0 -/* 800473B8 41 82 00 2C */ beq lbl_800473E4 -/* 800473BC 38 03 FF FF */ addi r0, r3, -1 -/* 800473C0 90 1E 01 B8 */ stw r0, 0x1b8(r30) -/* 800473C4 48 00 00 20 */ b lbl_800473E4 -lbl_800473C8: -/* 800473C8 A0 1F 00 D8 */ lhz r0, 0xd8(r31) -/* 800473CC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 800473D0 41 82 00 14 */ beq lbl_800473E4 -/* 800473D4 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 800473D8 38 63 04 C4 */ addi r3, r3, 0x4c4 -/* 800473DC 38 80 00 00 */ li r4, 0 -/* 800473E0 48 26 EE 09 */ bl setDemoName__11Z2StatusMgrFPc -lbl_800473E4: -/* 800473E4 39 61 00 70 */ addi r11, r1, 0x70 -/* 800473E8 48 31 AE 2D */ bl _restgpr_24 -/* 800473EC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 800473F0 7C 08 03 A6 */ mtlr r0 -/* 800473F4 38 21 00 70 */ addi r1, r1, 0x70 -/* 800473F8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/cancelStaff__16dEvent_manager_cFPCc.s b/asm/d/event/d_event_manager/cancelStaff__16dEvent_manager_cFPCc.s deleted file mode 100644 index fdba76cf1df..00000000000 --- a/asm/d/event/d_event_manager/cancelStaff__16dEvent_manager_cFPCc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80048348: -/* 80048348 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8004834C 7C 08 02 A6 */ mflr r0 -/* 80048350 90 01 00 34 */ stw r0, 0x34(r1) -/* 80048354 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80048358 7C 9F 23 78 */ mr r31, r4 -/* 8004835C 7F E3 FB 78 */ mr r3, r31 -/* 80048360 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80048364 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80048368 38 84 01 4B */ addi r4, r4, 0x14b -/* 8004836C 48 32 06 29 */ bl strcmp -/* 80048370 2C 03 00 00 */ cmpwi r3, 0 -/* 80048374 40 82 00 18 */ bne lbl_8004838C -/* 80048378 3C 60 80 04 */ lis r3, extraOffObjectCallBack__FP10fopAc_ac_cPv@ha /* 0x80046C88@ha */ -/* 8004837C 38 63 6C 88 */ addi r3, r3, extraOffObjectCallBack__FP10fopAc_ac_cPv@l /* 0x80046C88@l */ -/* 80048380 38 80 00 00 */ li r4, 0 -/* 80048384 4B FD 14 75 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80048388 48 00 00 28 */ b lbl_800483B0 -lbl_8004838C: -/* 8004838C 38 61 00 08 */ addi r3, r1, 8 -/* 80048390 7F E4 FB 78 */ mr r4, r31 -/* 80048394 48 32 07 99 */ bl strcpy -/* 80048398 38 61 00 08 */ addi r3, r1, 8 -/* 8004839C 38 80 FF FF */ li r4, -1 -/* 800483A0 4B FD 54 01 */ bl fopAcM_searchFromName4Event__FPCcs -/* 800483A4 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 800483A8 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 -/* 800483AC 90 03 04 9C */ stw r0, 0x49c(r3) -lbl_800483B0: -/* 800483B0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 800483B4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800483B8 7C 08 03 A6 */ mtlr r0 -/* 800483BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800483C0 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/checkStartDemo__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/checkStartDemo__16dEvent_manager_cFv.s deleted file mode 100644 index 955b5f70d7b..00000000000 --- a/asm/d/event/d_event_manager/checkStartDemo__16dEvent_manager_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8004882C: -/* 8004882C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80048830 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80048834 88 04 4F AD */ lbz r0, 0x4fad(r4) -/* 80048838 28 00 00 00 */ cmplwi r0, 0 -/* 8004883C 40 82 00 0C */ bne lbl_80048848 -/* 80048840 38 60 00 00 */ li r3, 0 -/* 80048844 4E 80 00 20 */ blr -lbl_80048848: -/* 80048848 80 03 01 90 */ lwz r0, 0x190(r3) -/* 8004884C 2C 00 FF FF */ cmpwi r0, -1 -/* 80048850 40 82 00 0C */ bne lbl_8004885C -/* 80048854 38 60 00 00 */ li r3, 0 -/* 80048858 4E 80 00 20 */ blr -lbl_8004885C: -/* 8004885C 20 60 FF FE */ subfic r3, r0, -2 -/* 80048860 30 03 FF FF */ addic r0, r3, -1 -/* 80048864 7C 60 19 10 */ subfe r3, r0, r3 -/* 80048868 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/dEv_talkman_get_action__Fi.s b/asm/d/event/d_event_manager/dEv_talkman_get_action__Fi.s deleted file mode 100644 index b723a76406f..00000000000 --- a/asm/d/event/d_event_manager/dEv_talkman_get_action__Fi.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80048748: -/* 80048748 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8004874C 7C 08 02 A6 */ mflr r0 -/* 80048750 90 01 00 24 */ stw r0, 0x24(r1) -/* 80048754 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048758 48 31 9A 81 */ bl _savegpr_28 -/* 8004875C 7C 7C 1B 78 */ mr r28, r3 -/* 80048760 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80048764 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80048768 3B E3 4F F8 */ addi r31, r3, 0x4ff8 -/* 8004876C 7F E3 FB 78 */ mr r3, r31 -/* 80048770 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80048774 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80048778 38 84 01 9C */ addi r4, r4, 0x19c -/* 8004877C 38 A0 00 00 */ li r5, 0 -/* 80048780 38 C0 FF FF */ li r6, -1 -/* 80048784 4B FF F3 99 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80048788 7C 7E 1B 78 */ mr r30, r3 -/* 8004878C 2C 1E FF FF */ cmpwi r30, -1 -/* 80048790 40 82 00 0C */ bne lbl_8004879C -/* 80048794 38 60 FF FF */ li r3, -1 -/* 80048798 48 00 00 40 */ b lbl_800487D8 -lbl_8004879C: -/* 8004879C 7F E3 FB 78 */ mr r3, r31 -/* 800487A0 7F C4 F3 78 */ mr r4, r30 -/* 800487A4 3C A0 80 3B */ lis r5, action_table@ha /* 0x803A82A8@ha */ -/* 800487A8 38 A5 82 A8 */ addi r5, r5, action_table@l /* 0x803A82A8@l */ -/* 800487AC 38 C0 00 03 */ li r6, 3 -/* 800487B0 38 E0 00 00 */ li r7, 0 -/* 800487B4 39 00 00 00 */ li r8, 0 -/* 800487B8 4B FF F6 59 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 800487BC 7C 7D 1B 78 */ mr r29, r3 -/* 800487C0 7C 1D E0 00 */ cmpw r29, r28 -/* 800487C4 40 82 00 10 */ bne lbl_800487D4 -/* 800487C8 7F E3 FB 78 */ mr r3, r31 -/* 800487CC 7F C4 F3 78 */ mr r4, r30 -/* 800487D0 4B FF F9 AD */ bl cutEnd__16dEvent_manager_cFi -lbl_800487D4: -/* 800487D4 7F A3 EB 78 */ mr r3, r29 -lbl_800487D8: -/* 800487D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800487DC 48 31 9A 49 */ bl _restgpr_28 -/* 800487E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800487E4 7C 08 03 A6 */ mtlr r0 -/* 800487E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800487EC 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/dEvmng_strcmp__FPCcPc.s b/asm/d/event/d_event_manager/dEvmng_strcmp__FPCcPc.s deleted file mode 100644 index 8e465091e9b..00000000000 --- a/asm/d/event/d_event_manager/dEvmng_strcmp__FPCcPc.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80047DAC: -/* 80047DAC 38 E0 00 00 */ li r7, 0 -/* 80047DB0 48 00 00 4C */ b lbl_80047DFC -lbl_80047DB4: -/* 80047DB4 88 C4 00 00 */ lbz r6, 0(r4) -/* 80047DB8 7C C0 07 75 */ extsb. r0, r6 -/* 80047DBC 40 82 00 0C */ bne lbl_80047DC8 -/* 80047DC0 38 60 00 01 */ li r3, 1 -/* 80047DC4 4E 80 00 20 */ blr -lbl_80047DC8: -/* 80047DC8 28 07 00 64 */ cmplwi r7, 0x64 -/* 80047DCC 41 80 00 0C */ blt lbl_80047DD8 -/* 80047DD0 38 60 FF FF */ li r3, -1 -/* 80047DD4 4E 80 00 20 */ blr -lbl_80047DD8: -/* 80047DD8 7C A5 07 74 */ extsb r5, r5 -/* 80047DDC 7C C0 07 74 */ extsb r0, r6 -/* 80047DE0 7C 05 00 00 */ cmpw r5, r0 -/* 80047DE4 41 82 00 0C */ beq lbl_80047DF0 -/* 80047DE8 38 60 00 01 */ li r3, 1 -/* 80047DEC 4E 80 00 20 */ blr -lbl_80047DF0: -/* 80047DF0 38 E7 00 01 */ addi r7, r7, 1 -/* 80047DF4 38 63 00 01 */ addi r3, r3, 1 -/* 80047DF8 38 84 00 01 */ addi r4, r4, 1 -lbl_80047DFC: -/* 80047DFC 88 A3 00 00 */ lbz r5, 0(r3) -/* 80047E00 7C A0 07 75 */ extsb. r0, r5 -/* 80047E04 40 82 FF B0 */ bne lbl_80047DB4 -/* 80047E08 38 60 00 00 */ li r3, 0 -/* 80047E0C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/demoInit__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/demoInit__16dEvent_manager_cFv.s deleted file mode 100644 index ca771e21bf7..00000000000 --- a/asm/d/event/d_event_manager/demoInit__16dEvent_manager_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80046888: -/* 80046888 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8004688C 7C 08 02 A6 */ mflr r0 -/* 80046890 90 01 00 14 */ stw r0, 0x14(r1) -/* 80046894 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80046898 7C 7F 1B 78 */ mr r31, r3 -/* 8004689C 88 03 06 BC */ lbz r0, 0x6bc(r3) -/* 800468A0 28 00 00 00 */ cmplwi r0, 0 -/* 800468A4 40 82 00 4C */ bne lbl_800468F0 -/* 800468A8 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 800468AC 8C 03 61 94 */ lbzu r0, mDemoArcName__20dStage_roomControl_c@l(r3) /* 0x80406194@l */ -/* 800468B0 7C 00 07 75 */ extsb. r0, r0 -/* 800468B4 41 82 00 34 */ beq lbl_800468E8 -/* 800468B8 3C 80 80 38 */ lis r4, data_80379F50@ha /* 0x80379F50@ha */ -/* 800468BC 38 84 9F 50 */ addi r4, r4, data_80379F50@l /* 0x80379F50@l */ -/* 800468C0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800468C4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800468C8 3C A5 00 02 */ addis r5, r5, 2 -/* 800468CC 38 C0 00 80 */ li r6, 0x80 -/* 800468D0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800468D4 4B FF 5A A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 800468D8 7C 64 1B 78 */ mr r4, r3 -/* 800468DC 38 7F 01 68 */ addi r3, r31, 0x168 -/* 800468E0 38 A0 FF FF */ li r5, -1 -/* 800468E4 4B FF F8 89 */ bl init__11dEvDtBase_cFPci -lbl_800468E8: -/* 800468E8 38 00 00 01 */ li r0, 1 -/* 800468EC 98 1F 06 BC */ stb r0, 0x6bc(r31) -lbl_800468F0: -/* 800468F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800468F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800468F8 7C 08 03 A6 */ mtlr r0 -/* 800468FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80046900 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/endCheckOld__16dEvent_manager_cFPCc.s b/asm/d/event/d_event_manager/endCheckOld__16dEvent_manager_cFPCc.s deleted file mode 100644 index 89b72d9d55c..00000000000 --- a/asm/d/event/d_event_manager/endCheckOld__16dEvent_manager_cFPCc.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80047ADC: -/* 80047ADC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80047AE0 7C 08 02 A6 */ mflr r0 -/* 80047AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047AE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80047AEC 7C 7F 1B 78 */ mr r31, r3 -/* 80047AF0 38 A0 00 FF */ li r5, 0xff -/* 80047AF4 38 C0 FF FF */ li r6, -1 -/* 80047AF8 4B FF FA 1D */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80047AFC 7C 64 1B 78 */ mr r4, r3 -/* 80047B00 7F E3 FB 78 */ mr r3, r31 -/* 80047B04 4B FF FF 75 */ bl endCheck__16dEvent_manager_cFs -/* 80047B08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80047B0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80047B10 7C 08 03 A6 */ mtlr r0 -/* 80047B14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80047B18 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/endCheck__16dEvent_manager_cFs.s b/asm/d/event/d_event_manager/endCheck__16dEvent_manager_cFs.s deleted file mode 100644 index 9c544df94c4..00000000000 --- a/asm/d/event/d_event_manager/endCheck__16dEvent_manager_cFs.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80047A78: -/* 80047A78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80047A7C 7C 08 02 A6 */ mflr r0 -/* 80047A80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047A84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80047A88 7C 7F 1B 78 */ mr r31, r3 -/* 80047A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047A94 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80047A98 4B FF BB 75 */ bl runningEventID__14dEvt_control_cFs -/* 80047A9C 7C 64 1B 78 */ mr r4, r3 -/* 80047AA0 7F E3 FB 78 */ mr r3, r31 -/* 80047AA4 4B FF FA 19 */ bl getEventData__16dEvent_manager_cFs -/* 80047AA8 28 03 00 00 */ cmplwi r3, 0 -/* 80047AAC 40 82 00 0C */ bne lbl_80047AB8 -/* 80047AB0 38 60 00 00 */ li r3, 0 -/* 80047AB4 48 00 00 14 */ b lbl_80047AC8 -lbl_80047AB8: -/* 80047AB8 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 80047ABC 20 00 00 02 */ subfic r0, r0, 2 -/* 80047AC0 7C 00 00 34 */ cntlzw r0, r0 -/* 80047AC4 54 03 D9 7E */ srwi r3, r0, 5 -lbl_80047AC8: -/* 80047AC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80047ACC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80047AD0 7C 08 03 A6 */ mtlr r0 -/* 80047AD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80047AD8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/endProc__16dEvent_manager_cFsi.s b/asm/d/event/d_event_manager/endProc__16dEvent_manager_cFsi.s deleted file mode 100644 index d9effcf1714..00000000000 --- a/asm/d/event/d_event_manager/endProc__16dEvent_manager_cFsi.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80046DAC: -/* 80046DAC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046DB0 7C 08 02 A6 */ mflr r0 -/* 80046DB4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046DB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046DBC 48 31 B4 21 */ bl _savegpr_29 -/* 80046DC0 7C 7D 1B 78 */ mr r29, r3 -/* 80046DC4 7C BE 2B 78 */ mr r30, r5 -/* 80046DC8 48 00 06 F5 */ bl getEventData__16dEvent_manager_cFs -/* 80046DCC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80046DD0 41 82 00 7C */ beq lbl_80046E4C -/* 80046DD4 2C 1E 00 00 */ cmpwi r30, 0 -/* 80046DD8 41 82 00 10 */ beq lbl_80046DE8 -/* 80046DDC 7F A3 EB 78 */ mr r3, r29 -/* 80046DE0 7F E4 FB 78 */ mr r4, r31 -/* 80046DE4 4B FF FF BD */ bl closeProc__16dEvent_manager_cFP12dEvDtEvent_c -lbl_80046DE8: -/* 80046DE8 80 1F 00 A4 */ lwz r0, 0xa4(r31) -/* 80046DEC 2C 00 00 02 */ cmpwi r0, 2 -/* 80046DF0 40 82 00 5C */ bne lbl_80046E4C -/* 80046DF4 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80046DF8 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80046DFC 38 83 01 4B */ addi r4, r3, 0x14b -/* 80046E00 3C 60 80 04 */ lis r3, allOffObjectCallBack__FP10fopAc_ac_cPv@ha /* 0x80046C9C@ha */ -/* 80046E04 38 63 6C 9C */ addi r3, r3, allOffObjectCallBack__FP10fopAc_ac_cPv@l /* 0x80046C9C@l */ -/* 80046E08 4B FD 29 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80046E0C 38 00 00 02 */ li r0, 2 -/* 80046E10 90 1D 01 8C */ stw r0, 0x18c(r29) -/* 80046E14 38 00 00 00 */ li r0, 0 -/* 80046E18 90 1F 00 A4 */ stw r0, 0xa4(r31) -/* 80046E1C 90 1D 01 B4 */ stw r0, 0x1b4(r29) -/* 80046E20 38 00 FF FF */ li r0, -1 -/* 80046E24 B0 1D 01 AA */ sth r0, 0x1aa(r29) -/* 80046E28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046E2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80046E30 3B E3 4E C8 */ addi r31, r3, 0x4ec8 -/* 80046E34 7F E3 FB 78 */ mr r3, r31 -/* 80046E38 38 80 00 00 */ li r4, 0 -/* 80046E3C 4B FF C8 B9 */ bl setPtD__14dEvt_control_cFPv -/* 80046E40 7F E3 FB 78 */ mr r3, r31 -/* 80046E44 38 80 00 00 */ li r4, 0 -/* 80046E48 4B FF C8 75 */ bl setPtI__14dEvt_control_cFPv -lbl_80046E4C: -/* 80046E4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046E50 48 31 B3 D9 */ bl _restgpr_29 -/* 80046E54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046E58 7C 08 03 A6 */ mtlr r0 -/* 80046E5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046E60 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/findShutterCallBack__FP10fopAc_ac_cPv.s b/asm/d/event/d_event_manager/findShutterCallBack__FP10fopAc_ac_cPv.s deleted file mode 100644 index 8d29ab866af..00000000000 --- a/asm/d/event/d_event_manager/findShutterCallBack__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8004846C: -/* 8004846C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80048470 7C 08 02 A6 */ mflr r0 -/* 80048474 90 01 00 34 */ stw r0, 0x34(r1) -/* 80048478 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8004847C 7C 7F 1B 78 */ mr r31, r3 -/* 80048480 7C 85 23 78 */ mr r5, r4 -/* 80048484 A8 64 00 00 */ lha r3, 0(r4) -/* 80048488 A8 1F 00 0E */ lha r0, 0xe(r31) -/* 8004848C 7C 03 00 00 */ cmpw r3, r0 -/* 80048490 41 82 00 0C */ beq lbl_8004849C -/* 80048494 38 60 00 00 */ li r3, 0 -/* 80048498 48 00 00 74 */ b lbl_8004850C -lbl_8004849C: -/* 8004849C 38 61 00 08 */ addi r3, r1, 8 -/* 800484A0 38 9F 04 A8 */ addi r4, r31, 0x4a8 -/* 800484A4 80 A5 00 04 */ lwz r5, 4(r5) -/* 800484A8 38 A5 04 A8 */ addi r5, r5, 0x4a8 -/* 800484AC 48 21 E6 89 */ bl __mi__4cXyzCFRC3Vec -/* 800484B0 C0 81 00 08 */ lfs f4, 8(r1) -/* 800484B4 D0 81 00 14 */ stfs f4, 0x14(r1) -/* 800484B8 C0 61 00 0C */ lfs f3, 0xc(r1) -/* 800484BC D0 61 00 18 */ stfs f3, 0x18(r1) -/* 800484C0 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 800484C4 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 800484C8 C0 22 85 2C */ lfs f1, lit_5025(r2) -/* 800484CC FC 04 08 40 */ fcmpo cr0, f4, f1 -/* 800484D0 40 80 00 38 */ bge lbl_80048508 -/* 800484D4 C0 02 85 30 */ lfs f0, lit_5026(r2) -/* 800484D8 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 800484DC 40 81 00 2C */ ble lbl_80048508 -/* 800484E0 FC 03 08 40 */ fcmpo cr0, f3, f1 -/* 800484E4 40 80 00 24 */ bge lbl_80048508 -/* 800484E8 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 800484EC 40 81 00 1C */ ble lbl_80048508 -/* 800484F0 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 800484F4 40 80 00 14 */ bge lbl_80048508 -/* 800484F8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800484FC 40 81 00 0C */ ble lbl_80048508 -/* 80048500 7F E3 FB 78 */ mr r3, r31 -/* 80048504 48 00 00 08 */ b lbl_8004850C -lbl_80048508: -/* 80048508 38 60 00 00 */ li r3, 0 -lbl_8004850C: -/* 8004850C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80048510 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80048514 7C 08 03 A6 */ mtlr r0 -/* 80048518 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004851C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getEventData__16dEvent_manager_cFsi.s b/asm/d/event/d_event_manager/getEventData__16dEvent_manager_cFsi.s deleted file mode 100644 index 53455f7bea1..00000000000 --- a/asm/d/event/d_event_manager/getEventData__16dEvent_manager_cFsi.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80047454: -/* 80047454 2C 05 00 00 */ cmpwi r5, 0 -/* 80047458 40 81 00 0C */ ble lbl_80047464 -/* 8004745C 2C 05 00 0B */ cmpwi r5, 0xb -/* 80047460 40 81 00 0C */ ble lbl_8004746C -lbl_80047464: -/* 80047464 38 60 00 00 */ li r3, 0 -/* 80047468 4E 80 00 20 */ blr -lbl_8004746C: -/* 8004746C 1C 05 00 24 */ mulli r0, r5, 0x24 -/* 80047470 7C A3 02 15 */ add. r5, r3, r0 -/* 80047474 41 82 00 10 */ beq lbl_80047484 -/* 80047478 80 65 00 00 */ lwz r3, 0(r5) -/* 8004747C 28 03 00 00 */ cmplwi r3, 0 -/* 80047480 40 82 00 0C */ bne lbl_8004748C -lbl_80047484: -/* 80047484 38 60 00 00 */ li r3, 0 -/* 80047488 4E 80 00 20 */ blr -lbl_8004748C: -/* 8004748C 7C 80 07 35 */ extsh. r0, r4 -/* 80047490 41 80 00 14 */ blt lbl_800474A4 -/* 80047494 7C 84 07 34 */ extsh r4, r4 -/* 80047498 80 03 00 04 */ lwz r0, 4(r3) -/* 8004749C 7C 04 00 00 */ cmpw r4, r0 -/* 800474A0 41 80 00 0C */ blt lbl_800474AC -lbl_800474A4: -/* 800474A4 38 60 00 00 */ li r3, 0 -/* 800474A8 4E 80 00 20 */ blr -lbl_800474AC: -/* 800474AC 80 65 00 04 */ lwz r3, 4(r5) -/* 800474B0 1C 04 00 B0 */ mulli r0, r4, 0xb0 -/* 800474B4 7C 63 02 14 */ add r3, r3, r0 -/* 800474B8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc.s b/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc.s deleted file mode 100644 index 435b513ca3f..00000000000 --- a/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc.s +++ /dev/null @@ -1,130 +0,0 @@ -lbl_80047758: -/* 80047758 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 8004775C 7C 08 02 A6 */ mflr r0 -/* 80047760 90 01 00 64 */ stw r0, 0x64(r1) -/* 80047764 39 61 00 60 */ addi r11, r1, 0x60 -/* 80047768 48 31 AA 59 */ bl _savegpr_22 -/* 8004776C 7C 7A 1B 78 */ mr r26, r3 -/* 80047770 7C 9B 23 78 */ mr r27, r4 -/* 80047774 7C BC 2B 78 */ mr r28, r5 -/* 80047778 7C D6 33 78 */ mr r22, r6 -/* 8004777C 88 04 04 E2 */ lbz r0, 0x4e2(r4) -/* 80047780 7C 1F 07 74 */ extsb r31, r0 -/* 80047784 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 80047788 28 00 00 FF */ cmplwi r0, 0xff -/* 8004778C 41 82 00 84 */ beq lbl_80047810 -/* 80047790 7E C3 B3 78 */ mr r3, r22 -/* 80047794 7F E4 FB 78 */ mr r4, r31 -/* 80047798 4B FF BD 69 */ bl searchMapEventData__14dEvt_control_cFUcl -/* 8004779C 7C 65 1B 79 */ or. r5, r3, r3 -/* 800477A0 41 82 00 70 */ beq lbl_80047810 -/* 800477A4 88 05 00 00 */ lbz r0, 0(r5) -/* 800477A8 2C 00 00 00 */ cmpwi r0, 0 -/* 800477AC 41 82 00 28 */ beq lbl_800477D4 -/* 800477B0 41 80 00 60 */ blt lbl_80047810 -/* 800477B4 2C 00 00 03 */ cmpwi r0, 3 -/* 800477B8 40 80 00 58 */ bge lbl_80047810 -/* 800477BC 7F 43 D3 78 */ mr r3, r26 -/* 800477C0 7F 64 DB 78 */ mr r4, r27 -/* 800477C4 38 A5 00 0D */ addi r5, r5, 0xd -/* 800477C8 38 C0 00 FF */ li r6, 0xff -/* 800477CC 4B FF FF 8D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 800477D0 48 00 01 48 */ b lbl_80047918 -lbl_800477D4: -/* 800477D4 3C 60 80 42 */ lis r3, map_tool_name_4511@ha /* 0x804246C8@ha */ -/* 800477D8 38 63 46 C8 */ addi r3, r3, map_tool_name_4511@l /* 0x804246C8@l */ -/* 800477DC 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 800477E0 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 800477E4 38 84 01 4F */ addi r4, r4, 0x14f -/* 800477E8 56 C5 06 3E */ clrlwi r5, r22, 0x18 -/* 800477EC 4C C6 31 82 */ crclr 6 -/* 800477F0 48 31 EC ED */ bl sprintf -/* 800477F4 7F 43 D3 78 */ mr r3, r26 -/* 800477F8 7F 64 DB 78 */ mr r4, r27 -/* 800477FC 3C A0 80 42 */ lis r5, map_tool_name_4511@ha /* 0x804246C8@ha */ -/* 80047800 38 A5 46 C8 */ addi r5, r5, map_tool_name_4511@l /* 0x804246C8@l */ -/* 80047804 38 C0 00 FF */ li r6, 0xff -/* 80047808 4B FF FF 51 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8004780C 48 00 01 0C */ b lbl_80047918 -lbl_80047810: -/* 80047810 28 1C 00 00 */ cmplwi r28, 0 -/* 80047814 40 82 00 0C */ bne lbl_80047820 -/* 80047818 38 60 FF FF */ li r3, -1 -/* 8004781C 48 00 00 FC */ b lbl_80047918 -lbl_80047820: -/* 80047820 3B A0 00 0A */ li r29, 0xa -/* 80047824 3B 20 01 68 */ li r25, 0x168 -/* 80047828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8004782C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047830 3F C3 00 02 */ addis r30, r3, 2 -/* 80047834 3B DE C2 F8 */ addi r30, r30, -15624 -lbl_80047838: -/* 80047838 7F 1A CA 14 */ add r24, r26, r25 -/* 8004783C 7F 16 C3 78 */ mr r22, r24 -/* 80047840 38 61 00 08 */ addi r3, r1, 8 -/* 80047844 4B FF E8 F5 */ bl init__11dEvDtBase_cFv -/* 80047848 2C 1D 00 04 */ cmpwi r29, 4 -/* 8004784C 41 80 00 18 */ blt lbl_80047864 -/* 80047850 2C 1D 00 09 */ cmpwi r29, 9 -/* 80047854 41 81 00 10 */ bgt lbl_80047864 -/* 80047858 80 18 00 20 */ lwz r0, 0x20(r24) -/* 8004785C 7C 1F 00 00 */ cmpw r31, r0 -/* 80047860 40 82 00 A4 */ bne lbl_80047904 -lbl_80047864: -/* 80047864 28 1B 00 00 */ cmplwi r27, 0 -/* 80047868 41 82 00 40 */ beq lbl_800478A8 -/* 8004786C 2C 1D 00 02 */ cmpwi r29, 2 -/* 80047870 40 82 00 38 */ bne lbl_800478A8 -/* 80047874 80 7B 01 00 */ lwz r3, 0x100(r27) -/* 80047878 28 03 00 00 */ cmplwi r3, 0 -/* 8004787C 41 82 00 2C */ beq lbl_800478A8 -/* 80047880 3C 80 80 38 */ lis r4, data_80379F50@ha /* 0x80379F50@ha */ -/* 80047884 38 84 9F 50 */ addi r4, r4, data_80379F50@l /* 0x80379F50@l */ -/* 80047888 7F C5 F3 78 */ mr r5, r30 -/* 8004788C 38 C0 00 80 */ li r6, 0x80 -/* 80047890 4B FF 4A ED */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80047894 7C 64 1B 78 */ mr r4, r3 -/* 80047898 38 61 00 08 */ addi r3, r1, 8 -/* 8004789C 38 A0 FF FF */ li r5, -1 -/* 800478A0 4B FF E8 CD */ bl init__11dEvDtBase_cFPci -/* 800478A4 3A C1 00 08 */ addi r22, r1, 8 -lbl_800478A8: -/* 800478A8 80 16 00 00 */ lwz r0, 0(r22) -/* 800478AC 28 00 00 00 */ cmplwi r0, 0 -/* 800478B0 41 82 00 54 */ beq lbl_80047904 -/* 800478B4 3A E0 00 00 */ li r23, 0 -/* 800478B8 3B 00 00 00 */ li r24, 0 -/* 800478BC 48 00 00 38 */ b lbl_800478F4 -lbl_800478C0: -/* 800478C0 80 16 00 04 */ lwz r0, 4(r22) -/* 800478C4 7C 80 C2 14 */ add r4, r0, r24 -/* 800478C8 7F 83 E3 78 */ mr r3, r28 -/* 800478CC 48 32 10 C9 */ bl strcmp -/* 800478D0 2C 03 00 00 */ cmpwi r3, 0 -/* 800478D4 40 82 00 18 */ bne lbl_800478EC -/* 800478D8 7E E3 07 34 */ extsh r3, r23 -/* 800478DC 57 A0 40 2E */ slwi r0, r29, 8 -/* 800478E0 7C 60 03 78 */ or r0, r3, r0 -/* 800478E4 7C 03 07 34 */ extsh r3, r0 -/* 800478E8 48 00 00 30 */ b lbl_80047918 -lbl_800478EC: -/* 800478EC 3A F7 00 01 */ addi r23, r23, 1 -/* 800478F0 3B 18 00 B0 */ addi r24, r24, 0xb0 -lbl_800478F4: -/* 800478F4 80 76 00 00 */ lwz r3, 0(r22) -/* 800478F8 80 03 00 04 */ lwz r0, 4(r3) -/* 800478FC 7C 17 00 00 */ cmpw r23, r0 -/* 80047900 41 80 FF C0 */ blt lbl_800478C0 -lbl_80047904: -/* 80047904 3B BD FF FF */ addi r29, r29, -1 -/* 80047908 2C 1D 00 01 */ cmpwi r29, 1 -/* 8004790C 3B 39 FF DC */ addi r25, r25, -36 -/* 80047910 40 80 FF 28 */ bge lbl_80047838 -/* 80047914 38 60 FF FF */ li r3, -1 -lbl_80047918: -/* 80047918 39 61 00 60 */ addi r11, r1, 0x60 -/* 8004791C 48 31 A8 F1 */ bl _restgpr_22 -/* 80047920 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80047924 7C 08 03 A6 */ mtlr r0 -/* 80047928 38 21 00 60 */ addi r1, r1, 0x60 -/* 8004792C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc.s b/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc.s deleted file mode 100644 index 561e18a92f9..00000000000 --- a/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_80047698: -/* 80047698 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8004769C 7C 08 02 A6 */ mflr r0 -/* 800476A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800476A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800476A8 48 31 AB 35 */ bl _savegpr_29 -/* 800476AC 7C 7D 1B 78 */ mr r29, r3 -/* 800476B0 7C 9E 23 78 */ mr r30, r4 -/* 800476B4 7C BF 2B 78 */ mr r31, r5 -/* 800476B8 7F E3 FB 78 */ mr r3, r31 -/* 800476BC 88 04 04 E2 */ lbz r0, 0x4e2(r4) -/* 800476C0 7C 04 07 74 */ extsb r4, r0 -/* 800476C4 4B FF BE 3D */ bl searchMapEventData__14dEvt_control_cFUcl -/* 800476C8 7C 65 1B 79 */ or. r5, r3, r3 -/* 800476CC 41 82 00 70 */ beq lbl_8004773C -/* 800476D0 88 05 00 00 */ lbz r0, 0(r5) -/* 800476D4 2C 00 00 00 */ cmpwi r0, 0 -/* 800476D8 41 82 00 28 */ beq lbl_80047700 -/* 800476DC 41 80 00 60 */ blt lbl_8004773C -/* 800476E0 2C 00 00 03 */ cmpwi r0, 3 -/* 800476E4 40 80 00 58 */ bge lbl_8004773C -/* 800476E8 7F A3 EB 78 */ mr r3, r29 -/* 800476EC 7F C4 F3 78 */ mr r4, r30 -/* 800476F0 38 A5 00 0D */ addi r5, r5, 0xd -/* 800476F4 38 C0 00 FF */ li r6, 0xff -/* 800476F8 48 00 00 61 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 800476FC 48 00 00 44 */ b lbl_80047740 -lbl_80047700: -/* 80047700 3C 60 80 42 */ lis r3, map_tool_name_4498@ha /* 0x804246B4@ha */ -/* 80047704 38 63 46 B4 */ addi r3, r3, map_tool_name_4498@l /* 0x804246B4@l */ -/* 80047708 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 8004770C 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80047710 38 84 01 4F */ addi r4, r4, 0x14f -/* 80047714 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80047718 4C C6 31 82 */ crclr 6 -/* 8004771C 48 31 ED C1 */ bl sprintf -/* 80047720 7F A3 EB 78 */ mr r3, r29 -/* 80047724 7F C4 F3 78 */ mr r4, r30 -/* 80047728 3C A0 80 42 */ lis r5, map_tool_name_4498@ha /* 0x804246B4@ha */ -/* 8004772C 38 A5 46 B4 */ addi r5, r5, map_tool_name_4498@l /* 0x804246B4@l */ -/* 80047730 38 C0 00 FF */ li r6, 0xff -/* 80047734 48 00 00 25 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 80047738 48 00 00 08 */ b lbl_80047740 -lbl_8004773C: -/* 8004773C 38 60 FF FF */ li r3, -1 -lbl_80047740: -/* 80047740 39 61 00 20 */ addi r11, r1, 0x20 -/* 80047744 48 31 AA E5 */ bl _restgpr_29 -/* 80047748 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8004774C 7C 08 03 A6 */ mtlr r0 -/* 80047750 38 21 00 20 */ addi r1, r1, 0x20 -/* 80047754 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFPCcUcl.s b/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFPCcUcl.s deleted file mode 100644 index e62e2e2188f..00000000000 --- a/asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFPCcUcl.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_80047514: -/* 80047514 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80047518 7C 08 02 A6 */ mflr r0 -/* 8004751C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80047520 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047524 48 31 AC A5 */ bl _savegpr_24 -/* 80047528 7C 7D 1B 78 */ mr r29, r3 -/* 8004752C 7C 9E 23 78 */ mr r30, r4 -/* 80047530 7C B8 2B 78 */ mr r24, r5 -/* 80047534 7C DF 33 78 */ mr r31, r6 -/* 80047538 2C 1F FF FF */ cmpwi r31, -1 -/* 8004753C 40 82 00 0C */ bne lbl_80047548 -/* 80047540 8B ED 87 E4 */ lbz r31, struct_80450D64+0x0(r13) -/* 80047544 7F FF 07 74 */ extsb r31, r31 -lbl_80047548: -/* 80047548 57 00 06 3E */ clrlwi r0, r24, 0x18 -/* 8004754C 28 00 00 FF */ cmplwi r0, 0xff -/* 80047550 41 82 00 84 */ beq lbl_800475D4 -/* 80047554 7F 03 C3 78 */ mr r3, r24 -/* 80047558 7F E4 FB 78 */ mr r4, r31 -/* 8004755C 4B FF BF A5 */ bl searchMapEventData__14dEvt_control_cFUcl -/* 80047560 7C 64 1B 79 */ or. r4, r3, r3 -/* 80047564 41 82 00 70 */ beq lbl_800475D4 -/* 80047568 88 04 00 00 */ lbz r0, 0(r4) -/* 8004756C 2C 00 00 00 */ cmpwi r0, 0 -/* 80047570 41 82 00 28 */ beq lbl_80047598 -/* 80047574 41 80 00 60 */ blt lbl_800475D4 -/* 80047578 2C 00 00 03 */ cmpwi r0, 3 -/* 8004757C 40 80 00 58 */ bge lbl_800475D4 -/* 80047580 7F A3 EB 78 */ mr r3, r29 -/* 80047584 38 84 00 0D */ addi r4, r4, 0xd -/* 80047588 38 A0 00 FF */ li r5, 0xff -/* 8004758C 7F E6 FB 78 */ mr r6, r31 -/* 80047590 4B FF FF 85 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80047594 48 00 00 EC */ b lbl_80047680 -lbl_80047598: -/* 80047598 3C 60 80 42 */ lis r3, map_tool_name_4449@ha /* 0x804246A0@ha */ -/* 8004759C 38 63 46 A0 */ addi r3, r3, map_tool_name_4449@l /* 0x804246A0@l */ -/* 800475A0 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 800475A4 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 800475A8 38 84 01 4F */ addi r4, r4, 0x14f -/* 800475AC 57 05 06 3E */ clrlwi r5, r24, 0x18 -/* 800475B0 4C C6 31 82 */ crclr 6 -/* 800475B4 48 31 EF 29 */ bl sprintf -/* 800475B8 7F A3 EB 78 */ mr r3, r29 -/* 800475BC 3C 80 80 42 */ lis r4, map_tool_name_4449@ha /* 0x804246A0@ha */ -/* 800475C0 38 84 46 A0 */ addi r4, r4, map_tool_name_4449@l /* 0x804246A0@l */ -/* 800475C4 38 A0 00 FF */ li r5, 0xff -/* 800475C8 7F E6 FB 78 */ mr r6, r31 -/* 800475CC 4B FF FF 49 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 800475D0 48 00 00 B0 */ b lbl_80047680 -lbl_800475D4: -/* 800475D4 28 1E 00 00 */ cmplwi r30, 0 -/* 800475D8 40 82 00 0C */ bne lbl_800475E4 -/* 800475DC 38 60 FF FF */ li r3, -1 -/* 800475E0 48 00 00 A0 */ b lbl_80047680 -lbl_800475E4: -/* 800475E4 3B 00 00 0A */ li r24, 0xa -/* 800475E8 3B 80 01 68 */ li r28, 0x168 -lbl_800475EC: -/* 800475EC 2C 18 00 04 */ cmpwi r24, 4 -/* 800475F0 41 80 00 1C */ blt lbl_8004760C -/* 800475F4 2C 18 00 09 */ cmpwi r24, 9 -/* 800475F8 41 81 00 14 */ bgt lbl_8004760C -/* 800475FC 38 1C 00 20 */ addi r0, r28, 0x20 -/* 80047600 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 80047604 7C 1F 00 00 */ cmpw r31, r0 -/* 80047608 40 82 00 64 */ bne lbl_8004766C -lbl_8004760C: -/* 8004760C 7F 5D E2 14 */ add r26, r29, r28 -/* 80047610 80 1A 00 00 */ lwz r0, 0(r26) -/* 80047614 28 00 00 00 */ cmplwi r0, 0 -/* 80047618 41 82 00 54 */ beq lbl_8004766C -/* 8004761C 3B 20 00 00 */ li r25, 0 -/* 80047620 3B 60 00 00 */ li r27, 0 -/* 80047624 48 00 00 38 */ b lbl_8004765C -lbl_80047628: -/* 80047628 80 1A 00 04 */ lwz r0, 4(r26) -/* 8004762C 7C 80 DA 14 */ add r4, r0, r27 -/* 80047630 7F C3 F3 78 */ mr r3, r30 -/* 80047634 48 32 13 61 */ bl strcmp -/* 80047638 2C 03 00 00 */ cmpwi r3, 0 -/* 8004763C 40 82 00 18 */ bne lbl_80047654 -/* 80047640 7F 23 07 34 */ extsh r3, r25 -/* 80047644 57 00 40 2E */ slwi r0, r24, 8 -/* 80047648 7C 60 03 78 */ or r0, r3, r0 -/* 8004764C 7C 03 07 34 */ extsh r3, r0 -/* 80047650 48 00 00 30 */ b lbl_80047680 -lbl_80047654: -/* 80047654 3B 39 00 01 */ addi r25, r25, 1 -/* 80047658 3B 7B 00 B0 */ addi r27, r27, 0xb0 -lbl_8004765C: -/* 8004765C 80 7A 00 00 */ lwz r3, 0(r26) -/* 80047660 80 03 00 04 */ lwz r0, 4(r3) -/* 80047664 7C 19 00 00 */ cmpw r25, r0 -/* 80047668 41 80 FF C0 */ blt lbl_80047628 -lbl_8004766C: -/* 8004766C 3B 18 FF FF */ addi r24, r24, -1 -/* 80047670 2C 18 00 01 */ cmpwi r24, 1 -/* 80047674 3B 9C FF DC */ addi r28, r28, -36 -/* 80047678 40 80 FF 74 */ bge lbl_800475EC -/* 8004767C 38 60 FF FF */ li r3, -1 -lbl_80047680: -/* 80047680 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047684 48 31 AB 91 */ bl _restgpr_24 -/* 80047688 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8004768C 7C 08 03 A6 */ mtlr r0 -/* 80047690 38 21 00 30 */ addi r1, r1, 0x30 -/* 80047694 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getEventName__18dEvent_exception_cFv.s b/asm/d/event/d_event_manager/getEventName__18dEvent_exception_cFv.s deleted file mode 100644 index 5210bcb563c..00000000000 --- a/asm/d/event/d_event_manager/getEventName__18dEvent_exception_cFv.s +++ /dev/null @@ -1,102 +0,0 @@ -lbl_80046480: -/* 80046480 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80046484 7C 08 02 A6 */ mflr r0 -/* 80046488 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004648C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80046490 93 C1 00 08 */ stw r30, 8(r1) -/* 80046494 7C 7E 1B 78 */ mr r30, r3 -/* 80046498 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) -/* 8004649C 7C 84 07 74 */ extsb r4, r4 -/* 800464A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800464A4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800464A8 38 7F 4E C4 */ addi r3, r31, 0x4ec4 -/* 800464AC 4B FD DE D9 */ bl getStatusRoomDt__20dStage_roomControl_cFi -/* 800464B0 81 83 00 00 */ lwz r12, 0(r3) -/* 800464B4 81 8C 00 FC */ lwz r12, 0xfc(r12) -/* 800464B8 7D 89 03 A6 */ mtctr r12 -/* 800464BC 4E 80 04 21 */ bctrl -/* 800464C0 80 9E 00 00 */ lwz r4, 0(r30) -/* 800464C4 2C 04 FF FF */ cmpwi r4, -1 -/* 800464C8 40 82 00 14 */ bne lbl_800464DC -/* 800464CC 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 800464D0 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 800464D4 38 63 00 D6 */ addi r3, r3, 0xd6 -/* 800464D8 48 00 00 F8 */ b lbl_800465D0 -lbl_800464DC: -/* 800464DC 2C 04 00 C8 */ cmpwi r4, 0xc8 -/* 800464E0 40 81 00 6C */ ble lbl_8004654C -/* 800464E4 2C 04 00 D7 */ cmpwi r4, 0xd7 -/* 800464E8 40 80 00 64 */ bge lbl_8004654C -/* 800464EC 2C 04 00 CB */ cmpwi r4, 0xcb -/* 800464F0 40 82 00 1C */ bne lbl_8004650C -/* 800464F4 38 7F 4E 20 */ addi r3, r31, 0x4e20 -/* 800464F8 81 9F 4E 20 */ lwz r12, 0x4e20(r31) -/* 800464FC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80046500 7D 89 03 A6 */ mtctr r12 -/* 80046504 4E 80 04 21 */ bctrl -/* 80046508 48 00 00 28 */ b lbl_80046530 -lbl_8004650C: -/* 8004650C 2C 04 00 D5 */ cmpwi r4, 0xd5 -/* 80046510 40 82 00 20 */ bne lbl_80046530 -/* 80046514 4B FE 95 C1 */ bl dComIfGp_SelectWarpPt_get__Fv -/* 80046518 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8004651C 2C 00 00 03 */ cmpwi r0, 3 -/* 80046520 41 82 00 08 */ beq lbl_80046528 -/* 80046524 48 00 00 0C */ b lbl_80046530 -lbl_80046528: -/* 80046528 38 00 00 D6 */ li r0, 0xd6 -/* 8004652C 90 1E 00 00 */ stw r0, 0(r30) -lbl_80046530: -/* 80046530 3C 60 80 3B */ lis r3, soecial_names@ha /* 0x803A8270@ha */ -/* 80046534 38 63 82 70 */ addi r3, r3, soecial_names@l /* 0x803A8270@l */ -/* 80046538 80 1E 00 00 */ lwz r0, 0(r30) -/* 8004653C 54 00 10 3A */ slwi r0, r0, 2 -/* 80046540 7C 63 02 14 */ add r3, r3, r0 -/* 80046544 80 63 FC DC */ lwz r3, -0x324(r3) -/* 80046548 48 00 00 88 */ b lbl_800465D0 -lbl_8004654C: -/* 8004654C 28 03 00 00 */ cmplwi r3, 0 -/* 80046550 40 82 00 14 */ bne lbl_80046564 -/* 80046554 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80046558 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 8004655C 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 80046560 48 00 00 70 */ b lbl_800465D0 -lbl_80046564: -/* 80046564 2C 04 00 00 */ cmpwi r4, 0 -/* 80046568 41 80 00 10 */ blt lbl_80046578 -/* 8004656C 80 03 00 00 */ lwz r0, 0(r3) -/* 80046570 7C 04 00 00 */ cmpw r4, r0 -/* 80046574 40 81 00 14 */ ble lbl_80046588 -lbl_80046578: -/* 80046578 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 8004657C 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80046580 38 63 00 F0 */ addi r3, r3, 0xf0 -/* 80046584 48 00 00 4C */ b lbl_800465D0 -lbl_80046588: -/* 80046588 80 63 00 04 */ lwz r3, 4(r3) -/* 8004658C 1C 04 00 1C */ mulli r0, r4, 0x1c -/* 80046590 7C 63 02 14 */ add r3, r3, r0 -/* 80046594 88 03 00 00 */ lbz r0, 0(r3) -/* 80046598 2C 00 00 00 */ cmpwi r0, 0 -/* 8004659C 41 82 00 18 */ beq lbl_800465B4 -/* 800465A0 41 80 00 24 */ blt lbl_800465C4 -/* 800465A4 2C 00 00 03 */ cmpwi r0, 3 -/* 800465A8 40 80 00 1C */ bge lbl_800465C4 -/* 800465AC 38 63 00 0D */ addi r3, r3, 0xd -/* 800465B0 48 00 00 20 */ b lbl_800465D0 -lbl_800465B4: -/* 800465B4 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 800465B8 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 800465BC 38 63 00 FF */ addi r3, r3, 0xff -/* 800465C0 48 00 00 10 */ b lbl_800465D0 -lbl_800465C4: -/* 800465C4 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 800465C8 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 800465CC 38 63 01 11 */ addi r3, r3, 0x111 -lbl_800465D0: -/* 800465D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800465D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800465D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800465DC 7C 08 03 A6 */ mtlr r0 -/* 800465E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800465E4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs.s b/asm/d/event/d_event_manager/getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs.s deleted file mode 100644 index d565620e412..00000000000 --- a/asm/d/event/d_event_manager/getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_800481F4: -/* 800481F4 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 800481F8 7C 08 02 A6 */ mflr r0 -/* 800481FC 90 01 00 44 */ stw r0, 0x44(r1) -/* 80048200 39 61 00 40 */ addi r11, r1, 0x40 -/* 80048204 48 31 9F D5 */ bl _savegpr_28 -/* 80048208 7C 7C 1B 78 */ mr r28, r3 -/* 8004820C 7C 9D 23 78 */ mr r29, r4 -/* 80048210 7C BE 2B 78 */ mr r30, r5 -/* 80048214 3B E0 00 00 */ li r31, 0 -/* 80048218 38 61 00 08 */ addi r3, r1, 8 -/* 8004821C 4B FF DF 1D */ bl init__11dEvDtBase_cFv -/* 80048220 7F C4 07 34 */ extsh r4, r30 -/* 80048224 38 04 00 01 */ addi r0, r4, 1 -/* 80048228 30 00 FF FF */ addic r0, r0, -1 -/* 8004822C 7C 60 01 10 */ subfe r3, r0, r0 -/* 80048230 7C 80 46 70 */ srawi r0, r4, 8 -/* 80048234 7C 00 18 78 */ andc r0, r0, r3 -/* 80048238 2C 00 00 02 */ cmpwi r0, 2 -/* 8004823C 40 82 00 4C */ bne lbl_80048288 -/* 80048240 28 1D 00 00 */ cmplwi r29, 0 -/* 80048244 41 82 00 44 */ beq lbl_80048288 -/* 80048248 80 7D 01 00 */ lwz r3, 0x100(r29) -/* 8004824C 28 03 00 00 */ cmplwi r3, 0 -/* 80048250 41 82 00 38 */ beq lbl_80048288 -/* 80048254 3C 80 80 38 */ lis r4, data_80379F50@ha /* 0x80379F50@ha */ -/* 80048258 38 84 9F 50 */ addi r4, r4, data_80379F50@l /* 0x80379F50@l */ -/* 8004825C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80048260 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80048264 3C A5 00 02 */ addis r5, r5, 2 -/* 80048268 38 C0 00 80 */ li r6, 0x80 -/* 8004826C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80048270 4B FF 41 0D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80048274 7C 64 1B 78 */ mr r4, r3 -/* 80048278 38 61 00 08 */ addi r3, r1, 8 -/* 8004827C 38 A0 FF FF */ li r5, -1 -/* 80048280 4B FF DE ED */ bl init__11dEvDtBase_cFPci -/* 80048284 83 E1 00 0C */ lwz r31, 0xc(r1) -lbl_80048288: -/* 80048288 28 1F 00 00 */ cmplwi r31, 0 -/* 8004828C 40 82 00 14 */ bne lbl_800482A0 -/* 80048290 7F 83 E3 78 */ mr r3, r28 -/* 80048294 7F C4 F3 78 */ mr r4, r30 -/* 80048298 4B FF F2 25 */ bl getEventData__16dEvent_manager_cFs -/* 8004829C 7C 7F 1B 78 */ mr r31, r3 -lbl_800482A0: -/* 800482A0 28 1F 00 00 */ cmplwi r31, 0 -/* 800482A4 40 82 00 0C */ bne lbl_800482B0 -/* 800482A8 38 60 00 00 */ li r3, 0 -/* 800482AC 48 00 00 08 */ b lbl_800482B4 -lbl_800482B0: -/* 800482B0 80 7F 00 28 */ lwz r3, 0x28(r31) -lbl_800482B4: -/* 800482B4 39 61 00 40 */ addi r11, r1, 0x40 -/* 800482B8 48 31 9F 6D */ bl _restgpr_28 -/* 800482BC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800482C0 7C 08 03 A6 */ mtlr r0 -/* 800482C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 800482C8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getGoal__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/getGoal__16dEvent_manager_cFv.s deleted file mode 100644 index 03c7f4b9442..00000000000 --- a/asm/d/event/d_event_manager/getGoal__16dEvent_manager_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800483E0: -/* 800483E0 38 63 01 9C */ addi r3, r3, 0x19c -/* 800483E4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getIsAddvance__16dEvent_manager_cFi.s b/asm/d/event/d_event_manager/getIsAddvance__16dEvent_manager_cFi.s deleted file mode 100644 index 6d8fb15b69e..00000000000 --- a/asm/d/event/d_event_manager/getIsAddvance__16dEvent_manager_cFi.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80047D4C: -/* 80047D4C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047D50 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047D54 88 05 4F AC */ lbz r0, 0x4fac(r5) -/* 80047D58 28 00 00 00 */ cmplwi r0, 0 -/* 80047D5C 40 82 00 0C */ bne lbl_80047D68 -/* 80047D60 38 60 00 00 */ li r3, 0 -/* 80047D64 4E 80 00 20 */ blr -lbl_80047D68: -/* 80047D68 2C 04 FF FF */ cmpwi r4, -1 -/* 80047D6C 40 82 00 0C */ bne lbl_80047D78 -/* 80047D70 38 60 00 00 */ li r3, 0 -/* 80047D74 4E 80 00 20 */ blr -lbl_80047D78: -/* 80047D78 A8 03 01 AA */ lha r0, 0x1aa(r3) -/* 80047D7C 2C 00 FF FF */ cmpwi r0, -1 -/* 80047D80 40 82 00 0C */ bne lbl_80047D8C -/* 80047D84 38 60 00 00 */ li r3, 0 -/* 80047D88 4E 80 00 20 */ blr -lbl_80047D8C: -/* 80047D8C 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 80047D90 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80047D94 7C 63 02 14 */ add r3, r3, r0 -/* 80047D98 80 63 00 08 */ lwz r3, 8(r3) -/* 80047D9C 1C 04 00 50 */ mulli r0, r4, 0x50 -/* 80047DA0 7C 63 02 14 */ add r3, r3, r0 -/* 80047DA4 88 63 00 40 */ lbz r3, 0x40(r3) -/* 80047DA8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getMyActIdx__16dEvent_manager_cFiPCPCciii.s b/asm/d/event/d_event_manager/getMyActIdx__16dEvent_manager_cFiPCPCciii.s deleted file mode 100644 index 3dda8ba1ec5..00000000000 --- a/asm/d/event/d_event_manager/getMyActIdx__16dEvent_manager_cFiPCPCciii.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80047E10: -/* 80047E10 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80047E14 7C 08 02 A6 */ mflr r0 -/* 80047E18 90 01 00 34 */ stw r0, 0x34(r1) -/* 80047E1C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047E20 48 31 A3 AD */ bl _savegpr_25 -/* 80047E24 7C BD 2B 78 */ mr r29, r5 -/* 80047E28 7C DE 33 78 */ mr r30, r6 -/* 80047E2C 7D 1F 43 78 */ mr r31, r8 -/* 80047E30 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047E34 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047E38 88 05 4F AC */ lbz r0, 0x4fac(r5) -/* 80047E3C 28 00 00 00 */ cmplwi r0, 0 -/* 80047E40 40 82 00 0C */ bne lbl_80047E4C -/* 80047E44 38 60 00 00 */ li r3, 0 -/* 80047E48 48 00 00 FC */ b lbl_80047F44 -lbl_80047E4C: -/* 80047E4C 2C 04 FF FF */ cmpwi r4, -1 -/* 80047E50 40 82 00 0C */ bne lbl_80047E5C -/* 80047E54 38 60 FF FF */ li r3, -1 -/* 80047E58 48 00 00 EC */ b lbl_80047F44 -lbl_80047E5C: -/* 80047E5C A8 03 01 AA */ lha r0, 0x1aa(r3) -/* 80047E60 2C 00 FF FF */ cmpwi r0, -1 -/* 80047E64 40 82 00 0C */ bne lbl_80047E70 -/* 80047E68 38 60 FF FF */ li r3, -1 -/* 80047E6C 48 00 00 D8 */ b lbl_80047F44 -lbl_80047E70: -/* 80047E70 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 80047E74 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80047E78 7C A3 02 14 */ add r5, r3, r0 -/* 80047E7C 80 A5 00 08 */ lwz r5, 8(r5) -/* 80047E80 1C 04 00 50 */ mulli r0, r4, 0x50 -/* 80047E84 7F 65 02 15 */ add. r27, r5, r0 -/* 80047E88 41 82 00 20 */ beq lbl_80047EA8 -/* 80047E8C 88 1B 00 41 */ lbz r0, 0x41(r27) -/* 80047E90 28 00 00 00 */ cmplwi r0, 0 -/* 80047E94 41 82 00 1C */ beq lbl_80047EB0 -/* 80047E98 2C 07 00 00 */ cmpwi r7, 0 -/* 80047E9C 40 82 00 14 */ bne lbl_80047EB0 -/* 80047EA0 80 7B 00 3C */ lwz r3, 0x3c(r27) -/* 80047EA4 48 00 00 A0 */ b lbl_80047F44 -lbl_80047EA8: -/* 80047EA8 38 60 FF FF */ li r3, -1 -/* 80047EAC 48 00 00 98 */ b lbl_80047F44 -lbl_80047EB0: -/* 80047EB0 48 00 00 AD */ bl getMyNowCutName__16dEvent_manager_cFi -/* 80047EB4 7C 79 1B 79 */ or. r25, r3, r3 -/* 80047EB8 40 82 00 14 */ bne lbl_80047ECC -/* 80047EBC 38 00 FF FF */ li r0, -1 -/* 80047EC0 90 1B 00 3C */ stw r0, 0x3c(r27) -/* 80047EC4 38 60 FF FF */ li r3, -1 -/* 80047EC8 48 00 00 7C */ b lbl_80047F44 -lbl_80047ECC: -/* 80047ECC 38 00 00 01 */ li r0, 1 -/* 80047ED0 98 1B 00 41 */ stb r0, 0x41(r27) -/* 80047ED4 3B 40 00 00 */ li r26, 0 -/* 80047ED8 3B 80 00 00 */ li r28, 0 -/* 80047EDC 48 00 00 54 */ b lbl_80047F30 -lbl_80047EE0: -/* 80047EE0 2C 1F 00 00 */ cmpwi r31, 0 -/* 80047EE4 41 82 00 24 */ beq lbl_80047F08 -/* 80047EE8 7C 7D E0 2E */ lwzx r3, r29, r28 -/* 80047EEC 7F 24 CB 78 */ mr r4, r25 -/* 80047EF0 4B FF FE BD */ bl dEvmng_strcmp__FPCcPc -/* 80047EF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80047EF8 40 82 00 30 */ bne lbl_80047F28 -/* 80047EFC 93 5B 00 3C */ stw r26, 0x3c(r27) -/* 80047F00 7F 43 D3 78 */ mr r3, r26 -/* 80047F04 48 00 00 40 */ b lbl_80047F44 -lbl_80047F08: -/* 80047F08 7C 7D E0 2E */ lwzx r3, r29, r28 -/* 80047F0C 7F 24 CB 78 */ mr r4, r25 -/* 80047F10 48 32 0A 85 */ bl strcmp -/* 80047F14 2C 03 00 00 */ cmpwi r3, 0 -/* 80047F18 40 82 00 10 */ bne lbl_80047F28 -/* 80047F1C 93 5B 00 3C */ stw r26, 0x3c(r27) -/* 80047F20 7F 43 D3 78 */ mr r3, r26 -/* 80047F24 48 00 00 20 */ b lbl_80047F44 -lbl_80047F28: -/* 80047F28 3B 5A 00 01 */ addi r26, r26, 1 -/* 80047F2C 3B 9C 00 04 */ addi r28, r28, 4 -lbl_80047F30: -/* 80047F30 7C 1A F0 00 */ cmpw r26, r30 -/* 80047F34 41 80 FF AC */ blt lbl_80047EE0 -/* 80047F38 38 00 FF FF */ li r0, -1 -/* 80047F3C 90 1B 00 3C */ stw r0, 0x3c(r27) -/* 80047F40 38 60 00 00 */ li r3, 0 -lbl_80047F44: -/* 80047F44 39 61 00 30 */ addi r11, r1, 0x30 -/* 80047F48 48 31 A2 D1 */ bl _restgpr_25 -/* 80047F4C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80047F50 7C 08 03 A6 */ mtlr r0 -/* 80047F54 38 21 00 30 */ addi r1, r1, 0x30 -/* 80047F58 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getMyDataP__16dEvent_manager_cFiPCci.s b/asm/d/event/d_event_manager/getMyDataP__16dEvent_manager_cFiPCci.s deleted file mode 100644 index 55b521b5276..00000000000 --- a/asm/d/event/d_event_manager/getMyDataP__16dEvent_manager_cFiPCci.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_80047FC8: -/* 80047FC8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80047FCC 7C 08 02 A6 */ mflr r0 -/* 80047FD0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80047FD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80047FD8 48 31 A2 05 */ bl _savegpr_29 -/* 80047FDC 7C 7E 1B 78 */ mr r30, r3 -/* 80047FE0 7C BF 2B 78 */ mr r31, r5 -/* 80047FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047FEC 88 03 4F AC */ lbz r0, 0x4fac(r3) -/* 80047FF0 28 00 00 00 */ cmplwi r0, 0 -/* 80047FF4 40 82 00 0C */ bne lbl_80048000 -/* 80047FF8 38 60 00 00 */ li r3, 0 -/* 80047FFC 48 00 00 D8 */ b lbl_800480D4 -lbl_80048000: -/* 80048000 2C 04 FF FF */ cmpwi r4, -1 -/* 80048004 40 82 00 0C */ bne lbl_80048010 -/* 80048008 38 60 00 00 */ li r3, 0 -/* 8004800C 48 00 00 C8 */ b lbl_800480D4 -lbl_80048010: -/* 80048010 A8 1E 01 AA */ lha r0, 0x1aa(r30) -/* 80048014 2C 00 FF FF */ cmpwi r0, -1 -/* 80048018 40 82 00 0C */ bne lbl_80048024 -/* 8004801C 38 60 00 00 */ li r3, 0 -/* 80048020 48 00 00 B4 */ b lbl_800480D4 -lbl_80048024: -/* 80048024 2C 06 00 00 */ cmpwi r6, 0 -/* 80048028 41 82 00 34 */ beq lbl_8004805C -/* 8004802C 80 1E 01 B4 */ lwz r0, 0x1b4(r30) -/* 80048030 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80048034 7C DE 02 14 */ add r6, r30, r0 -/* 80048038 80 A6 00 08 */ lwz r5, 8(r6) -/* 8004803C 1C 64 00 50 */ mulli r3, r4, 0x50 -/* 80048040 38 03 00 30 */ addi r0, r3, 0x30 -/* 80048044 7C 05 00 2E */ lwzx r0, r5, r0 -/* 80048048 80 66 00 0C */ lwz r3, 0xc(r6) -/* 8004804C 1C 00 00 50 */ mulli r0, r0, 0x50 -/* 80048050 7C 03 02 14 */ add r0, r3, r0 -/* 80048054 7C 03 03 78 */ mr r3, r0 -/* 80048058 48 00 00 30 */ b lbl_80048088 -lbl_8004805C: -/* 8004805C 80 1E 01 B4 */ lwz r0, 0x1b4(r30) -/* 80048060 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80048064 7C DE 02 14 */ add r6, r30, r0 -/* 80048068 80 A6 00 08 */ lwz r5, 8(r6) -/* 8004806C 1C 64 00 50 */ mulli r3, r4, 0x50 -/* 80048070 38 03 00 38 */ addi r0, r3, 0x38 -/* 80048074 7C 05 00 2E */ lwzx r0, r5, r0 -/* 80048078 80 66 00 0C */ lwz r3, 0xc(r6) -/* 8004807C 1C 00 00 50 */ mulli r0, r0, 0x50 -/* 80048080 7C 03 02 14 */ add r0, r3, r0 -/* 80048084 7C 03 03 78 */ mr r3, r0 -lbl_80048088: -/* 80048088 80 83 00 38 */ lwz r4, 0x38(r3) -/* 8004808C 48 00 00 3C */ b lbl_800480C8 -lbl_80048090: -/* 80048090 80 1E 01 B4 */ lwz r0, 0x1b4(r30) -/* 80048094 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80048098 7C 7E 02 14 */ add r3, r30, r0 -/* 8004809C 80 63 00 10 */ lwz r3, 0x10(r3) -/* 800480A0 54 80 30 32 */ slwi r0, r4, 6 -/* 800480A4 7F A3 02 14 */ add r29, r3, r0 -/* 800480A8 7F E3 FB 78 */ mr r3, r31 -/* 800480AC 7F A4 EB 78 */ mr r4, r29 -/* 800480B0 48 32 08 E5 */ bl strcmp -/* 800480B4 2C 03 00 00 */ cmpwi r3, 0 -/* 800480B8 40 82 00 0C */ bne lbl_800480C4 -/* 800480BC 7F A3 EB 78 */ mr r3, r29 -/* 800480C0 48 00 00 14 */ b lbl_800480D4 -lbl_800480C4: -/* 800480C4 80 9D 00 30 */ lwz r4, 0x30(r29) -lbl_800480C8: -/* 800480C8 2C 04 FF FF */ cmpwi r4, -1 -/* 800480CC 40 82 FF C4 */ bne lbl_80048090 -/* 800480D0 38 60 00 00 */ li r3, 0 -lbl_800480D4: -/* 800480D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800480D8 48 31 A1 51 */ bl _restgpr_29 -/* 800480DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800480E0 7C 08 03 A6 */ mtlr r0 -/* 800480E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800480E8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getMyNowCutName__16dEvent_manager_cFi.s b/asm/d/event/d_event_manager/getMyNowCutName__16dEvent_manager_cFi.s deleted file mode 100644 index e16957f84f7..00000000000 --- a/asm/d/event/d_event_manager/getMyNowCutName__16dEvent_manager_cFi.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80047F5C: -/* 80047F5C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047F60 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047F64 88 05 4F AC */ lbz r0, 0x4fac(r5) -/* 80047F68 28 00 00 00 */ cmplwi r0, 0 -/* 80047F6C 40 82 00 0C */ bne lbl_80047F78 -/* 80047F70 38 60 00 00 */ li r3, 0 -/* 80047F74 4E 80 00 20 */ blr -lbl_80047F78: -/* 80047F78 2C 04 FF FF */ cmpwi r4, -1 -/* 80047F7C 40 82 00 0C */ bne lbl_80047F88 -/* 80047F80 38 60 00 00 */ li r3, 0 -/* 80047F84 4E 80 00 20 */ blr -lbl_80047F88: -/* 80047F88 A8 03 01 AA */ lha r0, 0x1aa(r3) -/* 80047F8C 2C 00 FF FF */ cmpwi r0, -1 -/* 80047F90 40 82 00 0C */ bne lbl_80047F9C -/* 80047F94 38 60 00 00 */ li r3, 0 -/* 80047F98 4E 80 00 20 */ blr -lbl_80047F9C: -/* 80047F9C 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 80047FA0 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80047FA4 7C C3 02 14 */ add r6, r3, r0 -/* 80047FA8 80 A6 00 08 */ lwz r5, 8(r6) -/* 80047FAC 1C 64 00 50 */ mulli r3, r4, 0x50 -/* 80047FB0 38 03 00 38 */ addi r0, r3, 0x38 -/* 80047FB4 7C 05 00 2E */ lwzx r0, r5, r0 -/* 80047FB8 80 66 00 0C */ lwz r3, 0xc(r6) -/* 80047FBC 1C 00 00 50 */ mulli r0, r0, 0x50 -/* 80047FC0 7C 63 02 14 */ add r3, r3, r0 -/* 80047FC4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci.s b/asm/d/event/d_event_manager/getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci.s deleted file mode 100644 index ca7ef573cf1..00000000000 --- a/asm/d/event/d_event_manager/getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci.s +++ /dev/null @@ -1,161 +0,0 @@ -lbl_80047B1C: -/* 80047B1C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80047B20 7C 08 02 A6 */ mflr r0 -/* 80047B24 90 01 00 54 */ stw r0, 0x54(r1) -/* 80047B28 39 61 00 50 */ addi r11, r1, 0x50 -/* 80047B2C 48 31 A6 8D */ bl _savegpr_20 -/* 80047B30 7C 75 1B 78 */ mr r21, r3 -/* 80047B34 7C 96 23 78 */ mr r22, r4 -/* 80047B38 7C D7 33 78 */ mr r23, r6 -/* 80047B3C 3B 40 FF FF */ li r26, -1 -/* 80047B40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80047B44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80047B48 88 03 4F AC */ lbz r0, 0x4fac(r3) -/* 80047B4C 28 00 00 00 */ cmplwi r0, 0 -/* 80047B50 40 82 00 0C */ bne lbl_80047B5C -/* 80047B54 38 60 FF FF */ li r3, -1 -/* 80047B58 48 00 01 DC */ b lbl_80047D34 -lbl_80047B5C: -/* 80047B5C 28 05 00 00 */ cmplwi r5, 0 -/* 80047B60 41 82 00 10 */ beq lbl_80047B70 -/* 80047B64 88 05 00 FF */ lbz r0, 0xff(r5) -/* 80047B68 7C 00 07 74 */ extsb r0, r0 -/* 80047B6C 7C 1A 03 78 */ mr r26, r0 -lbl_80047B70: -/* 80047B70 A8 95 01 AA */ lha r4, 0x1aa(r21) -/* 80047B74 2C 04 FF FF */ cmpwi r4, -1 -/* 80047B78 40 82 00 0C */ bne lbl_80047B84 -/* 80047B7C 38 60 FF FF */ li r3, -1 -/* 80047B80 48 00 01 B4 */ b lbl_80047D34 -lbl_80047B84: -/* 80047B84 7E A3 AB 78 */ mr r3, r21 -/* 80047B88 4B FF F9 35 */ bl getEventData__16dEvent_manager_cFs -/* 80047B8C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80047B90 41 82 01 A0 */ beq lbl_80047D30 -/* 80047B94 80 1F 00 A4 */ lwz r0, 0xa4(r31) -/* 80047B98 2C 00 00 01 */ cmpwi r0, 1 -/* 80047B9C 41 82 00 0C */ beq lbl_80047BA8 -/* 80047BA0 2C 00 00 02 */ cmpwi r0, 2 -/* 80047BA4 40 82 01 8C */ bne lbl_80047D30 -lbl_80047BA8: -/* 80047BA8 83 DF 00 7C */ lwz r30, 0x7c(r31) -/* 80047BAC 3B 20 00 00 */ li r25, 0 -/* 80047BB0 7E C3 B3 78 */ mr r3, r22 -/* 80047BB4 38 80 00 3A */ li r4, 0x3a -/* 80047BB8 48 32 0D 6D */ bl strchr -/* 80047BBC 28 03 00 00 */ cmplwi r3, 0 -/* 80047BC0 41 82 00 08 */ beq lbl_80047BC8 -/* 80047BC4 3B 20 00 01 */ li r25, 1 -lbl_80047BC8: -/* 80047BC8 3B 60 00 00 */ li r27, 0 -/* 80047BCC 3A 80 00 00 */ li r20, 0 -/* 80047BD0 48 00 01 58 */ b lbl_80047D28 -lbl_80047BD4: -/* 80047BD4 38 14 00 2C */ addi r0, r20, 0x2c -/* 80047BD8 7F BF 00 2E */ lwzx r29, r31, r0 -/* 80047BDC 80 15 01 B4 */ lwz r0, 0x1b4(r21) -/* 80047BE0 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80047BE4 7C 75 02 14 */ add r3, r21, r0 -/* 80047BE8 80 63 00 08 */ lwz r3, 8(r3) -/* 80047BEC 1C 1D 00 50 */ mulli r0, r29, 0x50 -/* 80047BF0 7F 83 02 14 */ add r28, r3, r0 -/* 80047BF4 80 1C 00 2C */ lwz r0, 0x2c(r28) -/* 80047BF8 2C 00 00 01 */ cmpwi r0, 1 -/* 80047BFC 41 82 01 24 */ beq lbl_80047D20 -/* 80047C00 38 61 00 08 */ addi r3, r1, 8 -/* 80047C04 7F 84 E3 78 */ mr r4, r28 -/* 80047C08 48 32 0F 25 */ bl strcpy -/* 80047C0C 3B 00 00 00 */ li r24, 0 -/* 80047C10 57 20 06 3F */ clrlwi. r0, r25, 0x18 -/* 80047C14 40 82 00 28 */ bne lbl_80047C3C -/* 80047C18 38 61 00 08 */ addi r3, r1, 8 -/* 80047C1C 38 80 00 3A */ li r4, 0x3a -/* 80047C20 48 32 0D 05 */ bl strchr -/* 80047C24 7C 78 1B 78 */ mr r24, r3 -/* 80047C28 28 03 00 00 */ cmplwi r3, 0 -/* 80047C2C 41 82 00 10 */ beq lbl_80047C3C -/* 80047C30 38 00 00 00 */ li r0, 0 -/* 80047C34 98 03 00 00 */ stb r0, 0(r3) -/* 80047C38 3B 18 00 01 */ addi r24, r24, 1 -lbl_80047C3C: -/* 80047C3C 7E C3 B3 78 */ mr r3, r22 -/* 80047C40 38 81 00 08 */ addi r4, r1, 8 -/* 80047C44 48 32 0D 51 */ bl strcmp -/* 80047C48 2C 03 00 00 */ cmpwi r3, 0 -/* 80047C4C 40 82 00 88 */ bne lbl_80047CD4 -/* 80047C50 2C 17 00 00 */ cmpwi r23, 0 -/* 80047C54 41 80 00 10 */ blt lbl_80047C64 -/* 80047C58 80 1C 00 20 */ lwz r0, 0x20(r28) -/* 80047C5C 7C 17 00 00 */ cmpw r23, r0 -/* 80047C60 40 82 00 74 */ bne lbl_80047CD4 -lbl_80047C64: -/* 80047C64 38 80 00 00 */ li r4, 0 -/* 80047C68 28 18 00 00 */ cmplwi r24, 0 -/* 80047C6C 41 82 00 60 */ beq lbl_80047CCC -/* 80047C70 48 00 00 34 */ b lbl_80047CA4 -lbl_80047C74: -/* 80047C74 7C 63 07 74 */ extsb r3, r3 -/* 80047C78 2C 03 00 30 */ cmpwi r3, 0x30 -/* 80047C7C 41 80 00 0C */ blt lbl_80047C88 -/* 80047C80 2C 03 00 39 */ cmpwi r3, 0x39 -/* 80047C84 40 81 00 0C */ ble lbl_80047C90 -lbl_80047C88: -/* 80047C88 38 80 00 00 */ li r4, 0 -/* 80047C8C 48 00 00 24 */ b lbl_80047CB0 -lbl_80047C90: -/* 80047C90 1C 04 00 0A */ mulli r0, r4, 0xa -/* 80047C94 7C 63 02 14 */ add r3, r3, r0 -/* 80047C98 38 03 FF D0 */ addi r0, r3, -48 -/* 80047C9C 7C 04 07 34 */ extsh r4, r0 -/* 80047CA0 3B 18 00 01 */ addi r24, r24, 1 -lbl_80047CA4: -/* 80047CA4 88 78 00 00 */ lbz r3, 0(r24) -/* 80047CA8 7C 60 07 75 */ extsb. r0, r3 -/* 80047CAC 40 82 FF C8 */ bne lbl_80047C74 -lbl_80047CB0: -/* 80047CB0 2C 1A 00 00 */ cmpwi r26, 0 -/* 80047CB4 41 80 00 10 */ blt lbl_80047CC4 -/* 80047CB8 7C 80 07 34 */ extsh r0, r4 -/* 80047CBC 7C 00 D0 00 */ cmpw r0, r26 -/* 80047CC0 40 82 00 14 */ bne lbl_80047CD4 -lbl_80047CC4: -/* 80047CC4 7F A3 EB 78 */ mr r3, r29 -/* 80047CC8 48 00 00 6C */ b lbl_80047D34 -lbl_80047CCC: -/* 80047CCC 7F A3 EB 78 */ mr r3, r29 -/* 80047CD0 48 00 00 64 */ b lbl_80047D34 -lbl_80047CD4: -/* 80047CD4 7E C3 B3 78 */ mr r3, r22 -/* 80047CD8 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80047CDC 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80047CE0 38 84 01 5F */ addi r4, r4, 0x15f -/* 80047CE4 48 32 0C B1 */ bl strcmp -/* 80047CE8 2C 03 00 00 */ cmpwi r3, 0 -/* 80047CEC 40 82 00 34 */ bne lbl_80047D20 -/* 80047CF0 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80047CF4 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80047CF8 38 63 01 65 */ addi r3, r3, 0x165 -/* 80047CFC 38 81 00 08 */ addi r4, r1, 8 -/* 80047D00 48 32 0C 95 */ bl strcmp -/* 80047D04 2C 03 00 00 */ cmpwi r3, 0 -/* 80047D08 40 82 00 18 */ bne lbl_80047D20 -/* 80047D0C 80 1C 00 20 */ lwz r0, 0x20(r28) -/* 80047D10 7C 17 00 00 */ cmpw r23, r0 -/* 80047D14 40 82 00 0C */ bne lbl_80047D20 -/* 80047D18 7F A3 EB 78 */ mr r3, r29 -/* 80047D1C 48 00 00 18 */ b lbl_80047D34 -lbl_80047D20: -/* 80047D20 3B 7B 00 01 */ addi r27, r27, 1 -/* 80047D24 3A 94 00 04 */ addi r20, r20, 4 -lbl_80047D28: -/* 80047D28 7C 1B F0 00 */ cmpw r27, r30 -/* 80047D2C 41 80 FE A8 */ blt lbl_80047BD4 -lbl_80047D30: -/* 80047D30 38 60 FF FF */ li r3, -1 -lbl_80047D34: -/* 80047D34 39 61 00 50 */ addi r11, r1, 0x50 -/* 80047D38 48 31 A4 CD */ bl _restgpr_20 -/* 80047D3C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80047D40 7C 08 03 A6 */ mtlr r0 -/* 80047D44 38 21 00 50 */ addi r1, r1, 0x50 -/* 80047D48 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getMySubstanceNum__16dEvent_manager_cFiPCc.s b/asm/d/event/d_event_manager/getMySubstanceNum__16dEvent_manager_cFiPCc.s deleted file mode 100644 index 213e4babb94..00000000000 --- a/asm/d/event/d_event_manager/getMySubstanceNum__16dEvent_manager_cFiPCc.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80048144: -/* 80048144 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80048148 7C 08 02 A6 */ mflr r0 -/* 8004814C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80048150 38 C0 00 00 */ li r6, 0 -/* 80048154 4B FF FE 75 */ bl getMyDataP__16dEvent_manager_cFiPCci -/* 80048158 28 03 00 00 */ cmplwi r3, 0 -/* 8004815C 40 82 00 0C */ bne lbl_80048168 -/* 80048160 38 60 00 00 */ li r3, 0 -/* 80048164 48 00 00 08 */ b lbl_8004816C -lbl_80048168: -/* 80048168 80 63 00 2C */ lwz r3, 0x2c(r3) -lbl_8004816C: -/* 8004816C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80048170 7C 08 03 A6 */ mtlr r0 -/* 80048174 38 21 00 10 */ addi r1, r1, 0x10 -/* 80048178 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getRunEventName__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/getRunEventName__16dEvent_manager_cFv.s deleted file mode 100644 index de95a751b39..00000000000 --- a/asm/d/event/d_event_manager/getRunEventName__16dEvent_manager_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800483E8: -/* 800483E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800483EC 7C 08 02 A6 */ mflr r0 -/* 800483F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800483F4 A8 83 01 AA */ lha r4, 0x1aa(r3) -/* 800483F8 2C 04 FF FF */ cmpwi r4, -1 -/* 800483FC 40 82 00 14 */ bne lbl_80048410 -/* 80048400 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80048404 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80048408 38 63 01 6A */ addi r3, r3, 0x16a -/* 8004840C 48 00 00 50 */ b lbl_8004845C -lbl_80048410: -/* 80048410 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 80048414 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80048418 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8004841C 28 00 00 00 */ cmplwi r0, 0 -/* 80048420 40 82 00 14 */ bne lbl_80048434 -/* 80048424 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80048428 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 8004842C 38 63 01 6A */ addi r3, r3, 0x16a -/* 80048430 48 00 00 2C */ b lbl_8004845C -lbl_80048434: -/* 80048434 4B FF F0 89 */ bl getEventData__16dEvent_manager_cFs -/* 80048438 28 03 00 00 */ cmplwi r3, 0 -/* 8004843C 41 82 00 14 */ beq lbl_80048450 -/* 80048440 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 80048444 2C 00 00 01 */ cmpwi r0, 1 -/* 80048448 40 82 00 08 */ bne lbl_80048450 -/* 8004844C 48 00 00 10 */ b lbl_8004845C -lbl_80048450: -/* 80048450 3C 60 80 38 */ lis r3, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80048454 38 63 9F 60 */ addi r3, r3, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80048458 38 63 01 72 */ addi r3, r3, 0x172 -lbl_8004845C: -/* 8004845C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80048460 7C 08 03 A6 */ mtlr r0 -/* 80048464 38 21 00 10 */ addi r1, r1, 0x10 -/* 80048468 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/isMapToolCamera__16dEvent_manager_cFUcl.s b/asm/d/event/d_event_manager/isMapToolCamera__16dEvent_manager_cFUcl.s deleted file mode 100644 index 25e27394f23..00000000000 --- a/asm/d/event/d_event_manager/isMapToolCamera__16dEvent_manager_cFUcl.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80047930: -/* 80047930 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80047934 7C 08 02 A6 */ mflr r0 -/* 80047938 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004793C 2C 05 FF FF */ cmpwi r5, -1 -/* 80047940 40 82 00 0C */ bne lbl_8004794C -/* 80047944 88 AD 87 E4 */ lbz r5, struct_80450D64+0x0(r13) -/* 80047948 7C A5 07 74 */ extsb r5, r5 -lbl_8004794C: -/* 8004794C 7C 83 23 78 */ mr r3, r4 -/* 80047950 7C A4 2B 78 */ mr r4, r5 -/* 80047954 4B FF BB AD */ bl searchMapEventData__14dEvt_control_cFUcl -/* 80047958 28 03 00 00 */ cmplwi r3, 0 -/* 8004795C 41 82 00 14 */ beq lbl_80047970 -/* 80047960 88 03 00 00 */ lbz r0, 0(r3) -/* 80047964 7C 00 00 34 */ cntlzw r0, r0 -/* 80047968 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8004796C 48 00 00 08 */ b lbl_80047974 -lbl_80047970: -/* 80047970 38 60 00 00 */ li r3, 0 -lbl_80047974: -/* 80047974 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80047978 7C 08 03 A6 */ mtlr r0 -/* 8004797C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80047980 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/issueStaff__16dEvent_manager_cFPCc.s b/asm/d/event/d_event_manager/issueStaff__16dEvent_manager_cFPCc.s deleted file mode 100644 index 31dae3dc588..00000000000 --- a/asm/d/event/d_event_manager/issueStaff__16dEvent_manager_cFPCc.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800482CC: -/* 800482CC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800482D0 7C 08 02 A6 */ mflr r0 -/* 800482D4 90 01 00 34 */ stw r0, 0x34(r1) -/* 800482D8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 800482DC 7C 9F 23 78 */ mr r31, r4 -/* 800482E0 7F E3 FB 78 */ mr r3, r31 -/* 800482E4 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 800482E8 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 800482EC 38 84 01 4B */ addi r4, r4, 0x14b -/* 800482F0 48 32 06 A5 */ bl strcmp -/* 800482F4 2C 03 00 00 */ cmpwi r3, 0 -/* 800482F8 40 82 00 18 */ bne lbl_80048310 -/* 800482FC 3C 60 80 04 */ lis r3, extraOnObjectCallBack__FP10fopAc_ac_cPv@ha /* 0x80046C74@ha */ -/* 80048300 38 63 6C 74 */ addi r3, r3, extraOnObjectCallBack__FP10fopAc_ac_cPv@l /* 0x80046C74@l */ -/* 80048304 38 80 00 00 */ li r4, 0 -/* 80048308 4B FD 14 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8004830C 48 00 00 28 */ b lbl_80048334 -lbl_80048310: -/* 80048310 38 61 00 08 */ addi r3, r1, 8 -/* 80048314 7F E4 FB 78 */ mr r4, r31 -/* 80048318 48 32 08 15 */ bl strcpy -/* 8004831C 38 61 00 08 */ addi r3, r1, 8 -/* 80048320 38 80 FF FF */ li r4, -1 -/* 80048324 4B FD 54 7D */ bl fopAcM_searchFromName4Event__FPCcs -/* 80048328 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 8004832C 60 00 08 00 */ ori r0, r0, 0x800 -/* 80048330 90 03 04 9C */ stw r0, 0x49c(r3) -lbl_80048334: -/* 80048334 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80048338 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8004833C 7C 08 03 A6 */ mtlr r0 -/* 80048340 38 21 00 30 */ addi r1, r1, 0x30 -/* 80048344 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/orderStartDemo__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/orderStartDemo__16dEvent_manager_cFv.s deleted file mode 100644 index 7574f5de833..00000000000 --- a/asm/d/event/d_event_manager/orderStartDemo__16dEvent_manager_cFv.s +++ /dev/null @@ -1,118 +0,0 @@ -lbl_80046A58: -/* 80046A58 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046A5C 7C 08 02 A6 */ mflr r0 -/* 80046A60 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046A64 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046A68 48 31 B7 75 */ bl _savegpr_29 -/* 80046A6C 7C 7F 1B 78 */ mr r31, r3 -/* 80046A70 38 60 00 00 */ li r3, 0 -/* 80046A74 80 1F 01 90 */ lwz r0, 0x190(r31) -/* 80046A78 2C 00 FF FE */ cmpwi r0, -2 -/* 80046A7C 40 82 00 0C */ bne lbl_80046A88 -/* 80046A80 38 60 FF FE */ li r3, -2 -/* 80046A84 48 00 01 70 */ b lbl_80046BF4 -lbl_80046A88: -/* 80046A88 2C 00 00 C8 */ cmpwi r0, 0xc8 -/* 80046A8C 40 81 00 50 */ ble lbl_80046ADC -/* 80046A90 2C 00 00 D7 */ cmpwi r0, 0xd7 -/* 80046A94 40 80 00 48 */ bge lbl_80046ADC -/* 80046A98 38 7F 01 90 */ addi r3, r31, 0x190 -/* 80046A9C 4B FF F9 E5 */ bl getEventName__18dEvent_exception_cFv -/* 80046AA0 7C 64 1B 78 */ mr r4, r3 -/* 80046AA4 7F E3 FB 78 */ mr r3, r31 -/* 80046AA8 38 A0 00 FF */ li r5, 0xff -/* 80046AAC 38 C0 FF FF */ li r6, -1 -/* 80046AB0 48 00 0A 65 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80046AB4 7C 7E 1B 78 */ mr r30, r3 -/* 80046AB8 38 60 00 00 */ li r3, 0 -/* 80046ABC 7F C4 F3 78 */ mr r4, r30 -/* 80046AC0 38 A0 00 FF */ li r5, 0xff -/* 80046AC4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80046AC8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80046ACC 38 E0 00 05 */ li r7, 5 -/* 80046AD0 39 00 00 01 */ li r8, 1 -/* 80046AD4 4B FD 4B A9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 80046AD8 48 00 00 D0 */ b lbl_80046BA8 -lbl_80046ADC: -/* 80046ADC 2C 00 FF FF */ cmpwi r0, -1 -/* 80046AE0 41 82 00 4C */ beq lbl_80046B2C -/* 80046AE4 2C 00 00 FF */ cmpwi r0, 0xff -/* 80046AE8 41 82 00 44 */ beq lbl_80046B2C -/* 80046AEC 54 1D 06 3E */ clrlwi r29, r0, 0x18 -/* 80046AF0 7F E3 FB 78 */ mr r3, r31 -/* 80046AF4 38 80 00 00 */ li r4, 0 -/* 80046AF8 7F A5 EB 78 */ mr r5, r29 -/* 80046AFC 38 C0 FF FF */ li r6, -1 -/* 80046B00 48 00 0A 15 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80046B04 7C 7E 1B 78 */ mr r30, r3 -/* 80046B08 38 60 00 00 */ li r3, 0 -/* 80046B0C 7F A4 EB 78 */ mr r4, r29 -/* 80046B10 7F C5 F3 78 */ mr r5, r30 -/* 80046B14 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80046B18 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80046B1C 38 E0 00 01 */ li r7, 1 -/* 80046B20 39 00 00 05 */ li r8, 5 -/* 80046B24 4B FD 4D BD */ bl fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs -/* 80046B28 48 00 00 80 */ b lbl_80046BA8 -lbl_80046B2C: -/* 80046B2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046B30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80046B34 A8 04 4E 08 */ lha r0, 0x4e08(r4) -/* 80046B38 2C 00 FF FE */ cmpwi r0, -2 -/* 80046B3C 41 82 00 10 */ beq lbl_80046B4C -/* 80046B40 7C 00 07 34 */ extsh r0, r0 -/* 80046B44 2C 00 FF FD */ cmpwi r0, -3 -/* 80046B48 40 82 00 60 */ bne lbl_80046BA8 -lbl_80046B4C: -/* 80046B4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046B50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80046B54 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80046B58 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80046B5C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80046B60 7F E3 FB 78 */ mr r3, r31 -/* 80046B64 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80046B68 38 A4 9F 60 */ addi r5, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80046B6C 38 85 01 3A */ addi r4, r5, 0x13a -/* 80046B70 41 82 00 08 */ beq lbl_80046B78 -/* 80046B74 38 85 01 24 */ addi r4, r5, 0x124 -lbl_80046B78: -/* 80046B78 38 A0 00 FF */ li r5, 0xff -/* 80046B7C 38 C0 FF FF */ li r6, -1 -/* 80046B80 48 00 09 95 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80046B84 7C 7E 1B 78 */ mr r30, r3 -/* 80046B88 38 60 00 00 */ li r3, 0 -/* 80046B8C 7F C4 F3 78 */ mr r4, r30 -/* 80046B90 38 A0 00 FF */ li r5, 0xff -/* 80046B94 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80046B98 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80046B9C 38 E0 00 05 */ li r7, 5 -/* 80046BA0 39 00 00 01 */ li r8, 1 -/* 80046BA4 4B FD 4A D9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -lbl_80046BA8: -/* 80046BA8 2C 03 00 00 */ cmpwi r3, 0 -/* 80046BAC 40 82 00 44 */ bne lbl_80046BF0 -/* 80046BB0 7F E3 FB 78 */ mr r3, r31 -/* 80046BB4 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80046BB8 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80046BBC 38 84 00 10 */ addi r4, r4, 0x10 -/* 80046BC0 38 A0 00 FF */ li r5, 0xff -/* 80046BC4 38 C0 FF FF */ li r6, -1 -/* 80046BC8 48 00 09 4D */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80046BCC 7C 7E 1B 78 */ mr r30, r3 -/* 80046BD0 38 60 00 00 */ li r3, 0 -/* 80046BD4 7F C4 F3 78 */ mr r4, r30 -/* 80046BD8 38 A0 00 FF */ li r5, 0xff -/* 80046BDC 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 80046BE0 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 80046BE4 38 E0 00 05 */ li r7, 5 -/* 80046BE8 39 00 00 01 */ li r8, 1 -/* 80046BEC 4B FD 4A 91 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -lbl_80046BF0: -/* 80046BF0 7F C3 07 34 */ extsh r3, r30 -lbl_80046BF4: -/* 80046BF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046BF8 48 31 B6 31 */ bl _restgpr_29 -/* 80046BFC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046C00 7C 08 03 A6 */ mtlr r0 -/* 80046C04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046C08 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/order__16dEvent_manager_cFs.s b/asm/d/event/d_event_manager/order__16dEvent_manager_cFs.s deleted file mode 100644 index fb5669dbbee..00000000000 --- a/asm/d/event/d_event_manager/order__16dEvent_manager_cFs.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80047984: -/* 80047984 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80047988 7C 08 02 A6 */ mflr r0 -/* 8004798C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047990 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80047994 93 C1 00 08 */ stw r30, 8(r1) -/* 80047998 7C 7E 1B 78 */ mr r30, r3 -/* 8004799C 7C 9F 23 78 */ mr r31, r4 -/* 800479A0 4B FF FB 1D */ bl getEventData__16dEvent_manager_cFs -/* 800479A4 7C 64 1B 79 */ or. r4, r3, r3 -/* 800479A8 40 82 00 0C */ bne lbl_800479B4 -/* 800479AC 38 60 00 00 */ li r3, 0 -/* 800479B0 48 00 00 30 */ b lbl_800479E0 -lbl_800479B4: -/* 800479B4 7F E5 07 34 */ extsh r5, r31 -/* 800479B8 38 05 00 01 */ addi r0, r5, 1 -/* 800479BC 30 00 FF FF */ addic r0, r0, -1 -/* 800479C0 7C 60 01 10 */ subfe r3, r0, r0 -/* 800479C4 7C A0 46 70 */ srawi r0, r5, 8 -/* 800479C8 7C 00 18 78 */ andc r0, r0, r3 -/* 800479CC 90 1E 01 B4 */ stw r0, 0x1b4(r30) -/* 800479D0 B3 FE 01 AA */ sth r31, 0x1aa(r30) -/* 800479D4 7F C3 F3 78 */ mr r3, r30 -/* 800479D8 4B FF F2 E1 */ bl startProc__16dEvent_manager_cFP12dEvDtEvent_c -/* 800479DC 38 60 00 01 */ li r3, 1 -lbl_800479E0: -/* 800479E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800479E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800479E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800479EC 7C 08 03 A6 */ mtlr r0 -/* 800479F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800479F4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/roomInit__16dEvent_manager_cFi.s b/asm/d/event/d_event_manager/roomInit__16dEvent_manager_cFi.s deleted file mode 100644 index e5f3e1a537d..00000000000 --- a/asm/d/event/d_event_manager/roomInit__16dEvent_manager_cFi.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80046904: -/* 80046904 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046908 7C 08 02 A6 */ mflr r0 -/* 8004690C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046910 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80046914 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80046918 7C 7E 1B 78 */ mr r30, r3 -/* 8004691C 7C 9F 23 78 */ mr r31, r4 -/* 80046920 2C 1F FF FF */ cmpwi r31, -1 -/* 80046924 40 82 00 0C */ bne lbl_80046930 -/* 80046928 8B ED 87 E4 */ lbz r31, struct_80450D64+0x0(r13) -/* 8004692C 7F FF 07 74 */ extsb r31, r31 -lbl_80046930: -/* 80046930 7F E3 FB 78 */ mr r3, r31 -/* 80046934 4B FE 8B 89 */ bl dComIfG_getRoomArcName__Fi -/* 80046938 7C 64 1B 78 */ mr r4, r3 -/* 8004693C 38 61 00 08 */ addi r3, r1, 8 -/* 80046940 48 32 21 ED */ bl strcpy -/* 80046944 38 61 00 08 */ addi r3, r1, 8 -/* 80046948 3C 80 80 38 */ lis r4, data_80379F50@ha /* 0x80379F50@ha */ -/* 8004694C 38 84 9F 50 */ addi r4, r4, data_80379F50@l /* 0x80379F50@l */ -/* 80046950 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046954 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80046958 3C A5 00 02 */ addis r5, r5, 2 -/* 8004695C 38 A5 D4 F8 */ addi r5, r5, -11016 -/* 80046960 38 C0 00 40 */ li r6, 0x40 -/* 80046964 4B FF 5A 19 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 80046968 7C 64 1B 78 */ mr r4, r3 -/* 8004696C 38 E0 FF FF */ li r7, -1 -/* 80046970 38 C0 00 04 */ li r6, 4 -/* 80046974 38 60 00 90 */ li r3, 0x90 -/* 80046978 38 00 00 06 */ li r0, 6 -/* 8004697C 7C 09 03 A6 */ mtctr r0 -lbl_80046980: -/* 80046980 7C BE 1A 14 */ add r5, r30, r3 -/* 80046984 80 05 00 00 */ lwz r0, 0(r5) -/* 80046988 28 00 00 00 */ cmplwi r0, 0 -/* 8004698C 40 82 00 0C */ bne lbl_80046998 -/* 80046990 7C C7 33 78 */ mr r7, r6 -/* 80046994 48 00 00 18 */ b lbl_800469AC -lbl_80046998: -/* 80046998 80 05 00 20 */ lwz r0, 0x20(r5) -/* 8004699C 7C 1F 00 00 */ cmpw r31, r0 -/* 800469A0 40 82 00 0C */ bne lbl_800469AC -/* 800469A4 7C C7 33 78 */ mr r7, r6 -/* 800469A8 48 00 00 10 */ b lbl_800469B8 -lbl_800469AC: -/* 800469AC 38 C6 00 01 */ addi r6, r6, 1 -/* 800469B0 38 63 00 24 */ addi r3, r3, 0x24 -/* 800469B4 42 00 FF CC */ bdnz lbl_80046980 -lbl_800469B8: -/* 800469B8 2C 07 FF FF */ cmpwi r7, -1 -/* 800469BC 41 82 00 14 */ beq lbl_800469D0 -/* 800469C0 1C 07 00 24 */ mulli r0, r7, 0x24 -/* 800469C4 7C 7E 02 14 */ add r3, r30, r0 -/* 800469C8 7F E5 FB 78 */ mr r5, r31 -/* 800469CC 4B FF F7 A1 */ bl init__11dEvDtBase_cFPci -lbl_800469D0: -/* 800469D0 93 FE 01 B0 */ stw r31, 0x1b0(r30) -/* 800469D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 800469D8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 800469DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800469E0 7C 08 03 A6 */ mtlr r0 -/* 800469E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800469E8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/setGoal__16dEvent_manager_cFP4cXyz.s b/asm/d/event/d_event_manager/setGoal__16dEvent_manager_cFP4cXyz.s deleted file mode 100644 index b3e045a3beb..00000000000 --- a/asm/d/event/d_event_manager/setGoal__16dEvent_manager_cFP4cXyz.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800483C4: -/* 800483C4 C0 04 00 00 */ lfs f0, 0(r4) -/* 800483C8 D0 03 01 9C */ stfs f0, 0x19c(r3) -/* 800483CC C0 04 00 04 */ lfs f0, 4(r4) -/* 800483D0 D0 03 01 A0 */ stfs f0, 0x1a0(r3) -/* 800483D4 C0 04 00 08 */ lfs f0, 8(r4) -/* 800483D8 D0 03 01 A4 */ stfs f0, 0x1a4(r3) -/* 800483DC 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/setStartDemo__18dEvent_exception_cFi.s b/asm/d/event/d_event_manager/setStartDemo__18dEvent_exception_cFi.s deleted file mode 100644 index c4e5c8be37d..00000000000 --- a/asm/d/event/d_event_manager/setStartDemo__18dEvent_exception_cFi.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800463F0: -/* 800463F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800463F4 7C 08 02 A6 */ mflr r0 -/* 800463F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800463FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046400 48 31 BD DD */ bl _savegpr_29 -/* 80046404 7C 7D 1B 78 */ mr r29, r3 -/* 80046408 7C 9E 23 78 */ mr r30, r4 -/* 8004640C 8B ED 87 E4 */ lbz r31, struct_80450D64+0x0(r13) -/* 80046410 7F FF 07 74 */ extsb r31, r31 -/* 80046414 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80046418 7F E4 FB 78 */ mr r4, r31 -/* 8004641C 4B FF D0 E5 */ bl searchMapEventData__14dEvt_control_cFUcl -/* 80046420 28 03 00 00 */ cmplwi r3, 0 -/* 80046424 41 82 00 30 */ beq lbl_80046454 -/* 80046428 88 83 00 1B */ lbz r4, 0x1b(r3) -/* 8004642C 28 04 00 FF */ cmplwi r4, 0xff -/* 80046430 41 82 00 24 */ beq lbl_80046454 -/* 80046434 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80046438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8004643C 7F E5 FB 78 */ mr r5, r31 -/* 80046440 4B FE EF 21 */ bl isSwitch__10dSv_info_cCFii -/* 80046444 2C 03 00 00 */ cmpwi r3, 0 -/* 80046448 41 82 00 0C */ beq lbl_80046454 -/* 8004644C 38 60 00 FF */ li r3, 0xff -/* 80046450 48 00 00 18 */ b lbl_80046468 -lbl_80046454: -/* 80046454 80 1D 00 00 */ lwz r0, 0(r29) -/* 80046458 7C 00 F0 00 */ cmpw r0, r30 -/* 8004645C 41 82 00 08 */ beq lbl_80046464 -/* 80046460 93 DD 00 00 */ stw r30, 0(r29) -lbl_80046464: -/* 80046464 7F C3 F3 78 */ mr r3, r30 -lbl_80046468: -/* 80046468 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004646C 48 31 BD BD */ bl _restgpr_29 -/* 80046470 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046474 7C 08 03 A6 */ mtlr r0 -/* 80046478 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004647C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/specialCast_Shutter__16dEvent_manager_cFsi.s b/asm/d/event/d_event_manager/specialCast_Shutter__16dEvent_manager_cFsi.s deleted file mode 100644 index 8f66a48e24e..00000000000 --- a/asm/d/event/d_event_manager/specialCast_Shutter__16dEvent_manager_cFsi.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80048520: -/* 80048520 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80048524 7C 08 02 A6 */ mflr r0 -/* 80048528 90 01 00 34 */ stw r0, 0x34(r1) -/* 8004852C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80048530 48 31 9C AD */ bl _savegpr_29 -/* 80048534 7C 7F 1B 78 */ mr r31, r3 -/* 80048538 7C BD 2B 78 */ mr r29, r5 -/* 8004853C B0 81 00 08 */ sth r4, 8(r1) -/* 80048540 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80048544 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80048548 80 03 5D AC */ lwz r0, 0x5dac(r3) -/* 8004854C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80048550 3C 60 80 05 */ lis r3, findShutterCallBack__FP10fopAc_ac_cPv@ha /* 0x8004846C@ha */ -/* 80048554 38 63 84 6C */ addi r3, r3, findShutterCallBack__FP10fopAc_ac_cPv@l /* 0x8004846C@l */ -/* 80048558 38 81 00 08 */ addi r4, r1, 8 -/* 8004855C 4B FD 12 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80048560 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80048564 41 82 00 98 */ beq lbl_800485FC -/* 80048568 2C 1D 00 00 */ cmpwi r29, 0 -/* 8004856C 41 82 00 90 */ beq lbl_800485FC -/* 80048570 C0 7E 04 A8 */ lfs f3, 0x4a8(r30) -/* 80048574 D0 61 00 10 */ stfs f3, 0x10(r1) -/* 80048578 C0 1E 04 AC */ lfs f0, 0x4ac(r30) -/* 8004857C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80048580 C0 5E 04 B0 */ lfs f2, 0x4b0(r30) -/* 80048584 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 80048588 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8004858C A8 63 04 B6 */ lha r3, 0x4b6(r3) -/* 80048590 3C 63 00 01 */ addis r3, r3, 1 -/* 80048594 38 03 80 00 */ addi r0, r3, -32768 -/* 80048598 C0 22 85 34 */ lfs f1, lit_5055(r2) -/* 8004859C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800485A0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800485A4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800485A8 7C 03 04 2E */ lfsx f0, r3, r0 -/* 800485AC EC 01 00 32 */ fmuls f0, f1, f0 -/* 800485B0 EC 03 00 2A */ fadds f0, f3, f0 -/* 800485B4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800485B8 7C 63 02 14 */ add r3, r3, r0 -/* 800485BC C0 03 00 04 */ lfs f0, 4(r3) -/* 800485C0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800485C4 EC 02 00 2A */ fadds f0, f2, f0 -/* 800485C8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 800485CC 7F E3 FB 78 */ mr r3, r31 -/* 800485D0 38 81 00 10 */ addi r4, r1, 0x10 -/* 800485D4 4B FF FD F1 */ bl setGoal__16dEvent_manager_cFP4cXyz -/* 800485D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800485DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800485E0 3B E3 4E C8 */ addi r31, r3, 0x4ec8 -/* 800485E4 7F E3 FB 78 */ mr r3, r31 -/* 800485E8 7F C4 F3 78 */ mr r4, r30 -/* 800485EC 4B FF B0 71 */ bl setPt2__14dEvt_control_cFPv -/* 800485F0 7F E3 FB 78 */ mr r3, r31 -/* 800485F4 7F C4 F3 78 */ mr r4, r30 -/* 800485F8 4B FF B0 FD */ bl setPtD__14dEvt_control_cFPv -lbl_800485FC: -/* 800485FC 7F C3 F3 78 */ mr r3, r30 -/* 80048600 39 61 00 30 */ addi r11, r1, 0x30 -/* 80048604 48 31 9C 25 */ bl _restgpr_29 -/* 80048608 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8004860C 7C 08 03 A6 */ mtlr r0 -/* 80048610 38 21 00 30 */ addi r1, r1, 0x30 -/* 80048614 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/specialCast__16dEvent_manager_cFPCci.s b/asm/d/event/d_event_manager/specialCast__16dEvent_manager_cFPCci.s deleted file mode 100644 index 8e95732274d..00000000000 --- a/asm/d/event/d_event_manager/specialCast__16dEvent_manager_cFPCci.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80048618: -/* 80048618 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8004861C 7C 08 02 A6 */ mflr r0 -/* 80048620 90 01 00 24 */ stw r0, 0x24(r1) -/* 80048624 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048628 48 31 9B B5 */ bl _savegpr_29 -/* 8004862C 7C 7D 1B 78 */ mr r29, r3 -/* 80048630 7C BE 2B 78 */ mr r30, r5 -/* 80048634 3B E0 00 00 */ li r31, 0 -/* 80048638 28 04 00 00 */ cmplwi r4, 0 -/* 8004863C 40 82 00 0C */ bne lbl_80048648 -/* 80048640 38 60 00 00 */ li r3, 0 -/* 80048644 48 00 00 EC */ b lbl_80048730 -lbl_80048648: -/* 80048648 7C 83 23 78 */ mr r3, r4 -/* 8004864C 3C 80 80 38 */ lis r4, d_event_d_event_manager__stringBase0@ha /* 0x80379F60@ha */ -/* 80048650 38 84 9F 60 */ addi r4, r4, d_event_d_event_manager__stringBase0@l /* 0x80379F60@l */ -/* 80048654 38 84 01 7E */ addi r4, r4, 0x17e -/* 80048658 48 32 03 3D */ bl strcmp -/* 8004865C 2C 03 00 00 */ cmpwi r3, 0 -/* 80048660 40 82 00 A0 */ bne lbl_80048700 -/* 80048664 7F A3 EB 78 */ mr r3, r29 -/* 80048668 38 80 02 26 */ li r4, 0x226 -/* 8004866C 7F C5 F3 78 */ mr r5, r30 -/* 80048670 4B FF FE B1 */ bl specialCast_Shutter__16dEvent_manager_cFsi -/* 80048674 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80048678 40 82 00 18 */ bne lbl_80048690 -/* 8004867C 7F A3 EB 78 */ mr r3, r29 -/* 80048680 38 80 02 28 */ li r4, 0x228 -/* 80048684 7F C5 F3 78 */ mr r5, r30 -/* 80048688 4B FF FE 99 */ bl specialCast_Shutter__16dEvent_manager_cFsi -/* 8004868C 7C 7F 1B 78 */ mr r31, r3 -lbl_80048690: -/* 80048690 28 1F 00 00 */ cmplwi r31, 0 -/* 80048694 40 82 00 18 */ bne lbl_800486AC -/* 80048698 7F A3 EB 78 */ mr r3, r29 -/* 8004869C 38 80 02 29 */ li r4, 0x229 -/* 800486A0 7F C5 F3 78 */ mr r5, r30 -/* 800486A4 4B FF FE 7D */ bl specialCast_Shutter__16dEvent_manager_cFsi -/* 800486A8 7C 7F 1B 78 */ mr r31, r3 -lbl_800486AC: -/* 800486AC 28 1F 00 00 */ cmplwi r31, 0 -/* 800486B0 40 82 00 18 */ bne lbl_800486C8 -/* 800486B4 7F A3 EB 78 */ mr r3, r29 -/* 800486B8 38 80 02 2A */ li r4, 0x22a -/* 800486BC 7F C5 F3 78 */ mr r5, r30 -/* 800486C0 4B FF FE 61 */ bl specialCast_Shutter__16dEvent_manager_cFsi -/* 800486C4 7C 7F 1B 78 */ mr r31, r3 -lbl_800486C8: -/* 800486C8 28 1F 00 00 */ cmplwi r31, 0 -/* 800486CC 40 82 00 18 */ bne lbl_800486E4 -/* 800486D0 7F A3 EB 78 */ mr r3, r29 -/* 800486D4 38 80 02 2B */ li r4, 0x22b -/* 800486D8 7F C5 F3 78 */ mr r5, r30 -/* 800486DC 4B FF FE 45 */ bl specialCast_Shutter__16dEvent_manager_cFsi -/* 800486E0 7C 7F 1B 78 */ mr r31, r3 -lbl_800486E4: -/* 800486E4 28 1F 00 00 */ cmplwi r31, 0 -/* 800486E8 41 82 00 18 */ beq lbl_80048700 -/* 800486EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800486F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800486F4 A0 03 4F A0 */ lhz r0, 0x4fa0(r3) -/* 800486F8 60 00 00 10 */ ori r0, r0, 0x10 -/* 800486FC B0 03 4F A0 */ sth r0, 0x4fa0(r3) -lbl_80048700: -/* 80048700 28 1F 00 00 */ cmplwi r31, 0 -/* 80048704 41 82 00 28 */ beq lbl_8004872C -/* 80048708 2C 1E 00 00 */ cmpwi r30, 0 -/* 8004870C 41 82 00 14 */ beq lbl_80048720 -/* 80048710 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80048714 60 00 10 00 */ ori r0, r0, 0x1000 -/* 80048718 90 1F 04 9C */ stw r0, 0x49c(r31) -/* 8004871C 48 00 00 10 */ b lbl_8004872C -lbl_80048720: -/* 80048720 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80048724 54 00 05 24 */ rlwinm r0, r0, 0, 0x14, 0x12 -/* 80048728 90 1F 04 9C */ stw r0, 0x49c(r31) -lbl_8004872C: -/* 8004872C 7F E3 FB 78 */ mr r3, r31 -lbl_80048730: -/* 80048730 39 61 00 20 */ addi r11, r1, 0x20 -/* 80048734 48 31 9A F5 */ bl _restgpr_29 -/* 80048738 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8004873C 7C 08 03 A6 */ mtlr r0 -/* 80048740 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048744 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/startCheckOld__16dEvent_manager_cFPCc.s b/asm/d/event/d_event_manager/startCheckOld__16dEvent_manager_cFPCc.s deleted file mode 100644 index c6baee59bb0..00000000000 --- a/asm/d/event/d_event_manager/startCheckOld__16dEvent_manager_cFPCc.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80047A38: -/* 80047A38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80047A3C 7C 08 02 A6 */ mflr r0 -/* 80047A40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047A44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80047A48 7C 7F 1B 78 */ mr r31, r3 -/* 80047A4C 38 A0 00 FF */ li r5, 0xff -/* 80047A50 38 C0 FF FF */ li r6, -1 -/* 80047A54 4B FF FA C1 */ bl getEventIdx__16dEvent_manager_cFPCcUcl -/* 80047A58 7C 64 1B 78 */ mr r4, r3 -/* 80047A5C 7F E3 FB 78 */ mr r3, r31 -/* 80047A60 4B FF FF 99 */ bl startCheck__16dEvent_manager_cFs -/* 80047A64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80047A68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80047A6C 7C 08 03 A6 */ mtlr r0 -/* 80047A70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80047A74 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/startCheck__16dEvent_manager_cFs.s b/asm/d/event/d_event_manager/startCheck__16dEvent_manager_cFs.s deleted file mode 100644 index 3e71de36ae7..00000000000 --- a/asm/d/event/d_event_manager/startCheck__16dEvent_manager_cFs.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800479F8: -/* 800479F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800479FC 7C 08 02 A6 */ mflr r0 -/* 80047A00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047A04 4B FF FA B9 */ bl getEventData__16dEvent_manager_cFs -/* 80047A08 28 03 00 00 */ cmplwi r3, 0 -/* 80047A0C 40 82 00 0C */ bne lbl_80047A18 -/* 80047A10 38 60 00 00 */ li r3, 0 -/* 80047A14 48 00 00 14 */ b lbl_80047A28 -lbl_80047A18: -/* 80047A18 80 03 00 A4 */ lwz r0, 0xa4(r3) -/* 80047A1C 20 00 00 01 */ subfic r0, r0, 1 -/* 80047A20 7C 00 00 34 */ cntlzw r0, r0 -/* 80047A24 54 03 D9 7E */ srwi r3, r0, 5 -lbl_80047A28: -/* 80047A28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80047A2C 7C 08 03 A6 */ mtlr r0 -/* 80047A30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80047A34 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index f4ea4432335..ce6b801e643 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1374,6 +1374,7 @@ u8 dComIfGp_getSelectItem(int index); u8 dComIfGp_TargetWarpPt_get(); void dComIfGp_TargetWarpPt_set(u8); BOOL dComIfGp_TransportWarp_check(); +u8 dComIfGp_SelectWarpPt_get(); void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer, f32 lastSpeed, u32 lastMode, int, s8 wipe, s16 lastAngle, int, int); void dComIfGp_setNextStage(char const* stage, s16 point, s8 roomNo, s8 layer); diff --git a/include/d/d_camera.h b/include/d/d_camera.h index fb7e2fef14b..a82d9e14594 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -1,6 +1,193 @@ #ifndef D_D_CAMERA_H #define D_D_CAMERA_H +#include "SSystem/SComponent/c_angle.h" +#include "SSystem/SComponent/c_xyz.h" +#include "d/bg/d_bg_s_lin_chk.h" +#include "d/d_stage.h" #include "dolphin/types.h" +#include "f_op/f_op_camera_mng.h" + +class fopAc_ac_c; + +struct dCamMapToolData { + /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); +}; + +struct dCamera_c { + struct dCamInfo_c { + /* 8018291C */ dCamInfo_c(); + /* 80182920 */ ~dCamInfo_c(); + }; + + /* 8008908C */ void getEvIntData(int*, char*, int); + /* 80088CB0 */ void getEvIntData(int*, char*); + /* 80089154 */ void getEvFloatData(f32*, char*, f32); + /* 80088D90 */ void getEvFloatData(f32*, char*); + /* 8008933C */ void getEvStringData(char*, char*, char*); + /* 800894C4 */ void getEvActor(char*); + /* 800895F4 */ void getEvActor(char*, char*); + /* 80089730 */ void pauseEvCamera(); + /* 800897E8 */ void fixedFrameEvCamera(); + /* 8008A510 */ void stokerEvCamera(); + /* 8008A974 */ void rollingEvCamera(); + /* 8008B9B0 */ void fixedPositionEvCamera(); + /* 8008BE2C */ void uniformTransEvCamera(); + /* 8008BE50 */ void uniformBrakeEvCamera(); + /* 8008BE74 */ void uniformAcceleEvCamera(); + /* 8008E938 */ void watchActorEvCamera(); + /* 8008FAE8 */ void restorePosEvCamera(); + /* 80090174 */ void talktoEvCamera(); + /* 80090230 */ void maptoolIdEvCamera(); + /* 80090478 */ void styleEvCamera(); + /* 80090514 */ void gameOverEvCamera(); + /* 80091468 */ void tactEvCamera(); + /* 800923B8 */ bool turnToActorEvCamera(); + /* 800923C0 */ void stbWaitEvCamera(); + /* 800924D0 */ void saveEvCamera(); + /* 8009258C */ void loadEvCamera(); + /* 800929AC */ void useItem0EvCamera(); + /* 800937AC */ void useItem1EvCamera(); + /* 80094240 */ void getItemEvCamera(); + /* 80094A70 */ void possessedEvCamera(); + /* 80095010 */ void fixedFramesEvCamera(); + /* 8009544C */ void bSplineEvCamera(); + /* 800956E4 */ void twoActor0EvCamera(); + /* 80095E7C */ void peepHoleEvCamera(); + /* 80095FD0 */ void digHoleEvCamera(); + /* 800965AC */ void hintTalkEvCamera(); + /* 80096EDC */ void bspTransEvCamera(); + /* 80097694 */ bool portalWarpEvCamera(); + /* 8009771C */ void attentionPos(fopAc_ac_c*); + /* 80097738 */ void directionOf(fopAc_ac_c*); + /* 8009775C */ void positionOf(fopAc_ac_c*); + /* 80097778 */ void setFlag(u32); + /* 8009778C */ void eyePos(fopAc_ac_c*); + /* 8016008C */ dCamera_c(camera_class*); + /* 80160304 */ ~dCamera_c(); + /* 80160470 */ void initialize(camera_class*, fopAc_ac_c*, u32, u32); + /* 801614AC */ void Start(); + /* 801614C4 */ void QuickStart(); + /* 801614D0 */ void Stop(); + /* 801614E8 */ void Stay(); + /* 801614F4 */ void ChangeModeOK(s32); + /* 80161550 */ void initPad(); + /* 801617B0 */ void updatePad(); + /* 80161D84 */ void initMonitor(); + /* 80161E34 */ void updateMonitor(); + /* 80162088 */ void checkForceLockTarget(); + /* 801622B0 */ void infoReport(); + /* 801622B4 */ void Run(); + /* 80162D38 */ void NotRun(); + /* 80162FB8 */ void V(); + /* 80162FD4 */ void U(); + /* 8016300C */ void SetTrimSize(s32); + /* 80163028 */ void SetTrimTypeForce(s32); + /* 80163034 */ void CalcTrimSize(); + /* 80163154 */ void Draw(); + /* 8016317C */ void setStageMapToolData(); + /* 80163340 */ void setMapToolData(); + /* 80163558 */ void SetTagData(fopAc_ac_c*, s32, u16, u8); + /* 801635AC */ void setRoomMapToolData(dCamMapToolData*, s32, s32); + /* 801635E4 */ void nextMode(s32); + /* 80163C38 */ void onModeChange(s32, s32); + /* 80163D50 */ void ModeFix(s32); + /* 80163D5C */ void nextType(s32); + /* 8016444C */ void onTypeChange(s32, s32); + /* 8016469C */ void onStyleChange(s32, s32); + /* 801647B0 */ void onRoomChange(s32); + /* 80164878 */ void getParamTargetActor(s32); + /* 80164944 */ void GetCameraTypeFromMapToolID(s32, s32); + /* 80164B64 */ void GetCameraTypeFromCameraName(char const*); + /* 80164C10 */ void GetCameraTypeFromToolData(stage_camera2_data_class*); + /* 80164C64 */ void pushInfo(dCamera_c::dCamInfo_c*, s16); + /* 80164CAC */ void popInfo(dCamera_c::dCamInfo_c*); + /* 80164D2C */ void heightOf(fopAc_ac_c*); + /* 80164E20 */ void relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, f32); + /* 80164D6C */ void relationalPos(fopAc_ac_c*, cXyz*); + /* 80165104 */ void setUSOAngle(); + /* 80165158 */ void getUSOAngle(cSAngle); + /* 8016517C */ void pointInSight(cXyz*); + /* 80167C24 */ void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); + /* 80165238 */ void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16, f32); + /* 801657EC */ void groundHeight(cXyz*); + /* 801658C0 */ void lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32); + /* 80165AF0 */ void lineBGCheck(cXyz*, cXyz*, u32); + /* 801659F4 */ void lineBGCheck(cXyz*, cXyz*, cXyz*, u32); + /* 80165B60 */ void lineCollisionCheckBush(cXyz*, cXyz*); + /* 80165CE0 */ void compWallMargin(cXyz*, cXyz*, f32); + /* 80165EF4 */ void defaultTriming(); + /* 80165FB4 */ void setView(f32, f32, f32, f32); + /* 8016608C */ void forwardCheckAngle(); + /* 80166764 */ void bumpCheck(u32); + /* 80167BF8 */ void lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32); + /* 80167CD8 */ void jutOutCheck(cXyz*, f32); + /* 80167E3C */ void tooNearEscape(cXyz*); + /* 80167EF4 */ void getWaterSurfaceHeight(cXyz*); + /* 80167FEC */ void checkGroundInfo(); + /* 80168744 */ void chaseCamera(s32); + /* 8016C384 */ void lockonCamera(s32); + /* 8016E448 */ void getMsgCmdSpeaker(); + /* 8016E4A4 */ void getMsgCmdCut(s32); + /* 8016E4F4 */ void talktoCamera(s32); + /* 80174E18 */ void talkBasePos(fopAc_ac_c*); + /* 80174E34 */ void talkEyePos(fopAc_ac_c*); + /* 80174EA4 */ bool CalcSubjectAngle(s16*, s16*); + /* 80174EAC */ void SaveZoomRatio(); + /* 80174ED4 */ void subjectCamera(s32); + /* 80176074 */ void magneCamera(s32); + /* 801767F8 */ void colosseumCamera(s32); + /* 80176DF0 */ bool test1Camera(s32); + /* 80176DF8 */ bool test2Camera(s32); + /* 80176E00 */ void towerCamera(s32); + /* 80178E50 */ void hookshotCamera(s32); + /* 80179590 */ void railCamera(s32); + /* 8017A2A0 */ void paraRailCamera(s32); + /* 8017ADC0 */ void rideCamera(s32); + /* 8017D974 */ bool manualCamera(s32); + /* 8017D97C */ void observeCamera(s32); + /* 8017DFAC */ void fixedFrameCamera(s32); + /* 8017E730 */ void fixedPositionCamera(s32); + /* 8017F25C */ void oneSideCamera(s32); + /* 8017F828 */ void eventCamera(s32); + /* 8018050C */ void currentEvCamera(); + /* 801806D4 */ bool letCamera(s32); + /* 801806DC */ void setEventRecoveryTrans(s16); + /* 80180738 */ void runEventRecoveryTrans(); + /* 80180A40 */ void EventRecoverNotime(); + /* 80180AA8 */ void Set(cXyz, cXyz); + /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); + /* 80180B40 */ void Set(cXyz, cXyz, s16, f32); + /* 80180C18 */ void Reset(cXyz, cXyz); + /* 80180C68 */ void Reset(); + /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16); + /* 80180D24 */ void shakeCamera(); + /* 80181000 */ void StartShake(s32, u8*, s32, cXyz); + /* 80181158 */ void StopShake(); + /* 80181170 */ void StartBlure(int, fopAc_ac_c*, f32, f32); + /* 801811B8 */ void ResetBlure(); + /* 80181208 */ void SetBlureAlpha(f32); + /* 80181210 */ void SetBlureScale(f32, f32, f32); + /* 80181220 */ void SetBlurePosition(f32, f32, f32); + /* 80181278 */ void SetBlureActor(fopAc_ac_c*); + /* 80181280 */ void blureCamera(); + /* 80181490 */ void onHorseDush(); + /* 80181500 */ void GetForceLockOnActor(); + /* 80181534 */ void ForceLockOn(fopAc_ac_c*); + /* 80181560 */ void ForceLockOff(unsigned int); + /* 8018159C */ void ForceLockOff(fopAc_ac_c*); + /* 80181E20 */ void Up(); + /* 80181E64 */ void Eye(); + /* 80181E98 */ cXyz Center(); + /* 8018295C */ void footHeightOf(fopAc_ac_c*); + /* 80182964 */ void push_any_key(); + /* 8018296C */ void clrFlag(u32); + /* 80182980 */ void chkFlag(u32); + /* 801829AC */ void Bank(); + + static u8 engine_tbl[240]; +}; + +dCamera_c* dCam_getBody(); #endif /* D_D_CAMERA_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index ae0e3dc679f..032fac58c65 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -236,8 +236,26 @@ struct dStage_DMap_c { // DMAP }; +struct dStage_MapEvent_dt_c { + u8 mType; + u8 field_0x1[3 - 1]; + u8 field_0x3; + u8 field_0x4[7 - 4]; + u8 field_0x7; + u8 field_0x8; + u8 field_0x9; + u8 field_0xA[0xD - 0xA]; + char mName[10]; + u8 field_0x17; + u8 field_0x18; + u8 field_0x19[0x1B - 0x19]; + u8 field_0x1B; +}; // SIZE = 0x1C + struct dStage_MapEventInfo_c { // REVT + int mCount; + dStage_MapEvent_dt_c* mData; }; class dStage_dt_c { @@ -892,4 +910,12 @@ inline u32 dStage_FileList_dt_getMiniMap(dStage_FileList_dt_c* p_fList) { return p_fList->mParameters >> 3 & 7; } +inline int dStage_MapEvent_dt_c_getEventSCutSW(dStage_MapEvent_dt_c* event) { + return event->field_0x8 & 1; +} + +inline int dStage_MapEvent_dt_c_getEventSCutType(dStage_MapEvent_dt_c* event) { + return event->field_0x8 >> 1 & 3; +} + #endif /* D_D_STAGE_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 20c6f4be3f5..52d9896d30f 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -62,13 +62,13 @@ public: void moveApproval(void*); BOOL compulsory(void*, char const*, u16); void remove(); - void* getStageEventDt(); // ret type probably wrong, fix later + dStage_MapEvent_dt_c* getStageEventDt(); void sceneChange(int); u32 getPId(void*); - void convPId(unsigned int); + void* convPId(unsigned int); void getStbDemoData(char*); - static void searchMapEventData(u8, s32); - static void searchMapEventData(u8); + static dStage_MapEvent_dt_c* searchMapEventData(u8, s32); + static dStage_MapEvent_dt_c* searchMapEventData(u8); s16 runningEventID(s16); void setPt1(void*); void setPt2(void*); @@ -82,11 +82,14 @@ public: u16 chkFlag2(u16 flag) { return flag & mFlag2; } bool runCheck() { return field_0xe5 != 0; } u16 chkEventFlag(u16 flag) { return flag & mEventFlag; } + void onEventFlag(u16 flag) { mEventFlag |= flag; } u8 getMode() const { return mMode; } u16 checkHind(u16 flag) { return flag & mHindFlag; } u8 checkCompulsory() { return mCompulsory; } bool i_isOrderOK() { return field_0xe5 == 0 || field_0xe5 == 2; } + void* getPt1() { return convPId(mPt1); } + void* getPt2() { return convPId(mPt2); } public: /* 0x000 */ u8 field_0x0[4]; @@ -116,7 +119,7 @@ public: /* 0x0EE */ u8 mPreItemNo; /* 0x0EF */ u8 mGtItm; /* 0x0F0 */ float mCullRate; - /* 0x0F4 */ void* mStageEventDt; + /* 0x0F4 */ dStage_MapEvent_dt_c* mStageEventDt; /* 0x0F8 */ void* mChangeOK; /* 0x0FC */ u8 field_0xfc[4]; /* 0x100 */ SkipFunc mSkipFunc; @@ -130,4 +133,9 @@ public: /* 0x12C */ int field_0x12c; }; // Size = 0x130 +int dEv_defaultSkipProc(void* param_0, int param_1); +int dEv_defaultSkipZev(void* param_0, int param_1); +int dEv_defaultSkipStb(void* param_0, int param_1); +int dEv_noFinishSkipProc(void* param_0, int param_1); + #endif /* D_EVENT_D_EVENT_H */ diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index b1517d7bfaa..1d2e77e3571 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -52,6 +52,8 @@ public: void startCheck(); int getDataTop() { return mDataTop; } + int getFlagId() { return mFlagId; } + char* getName() { return mName; } private: /* 0x00 */ char mName[32]; @@ -98,9 +100,9 @@ public: int getCurrentCut() { return mCurrentCut; } int getStartCut() { return mStartCut; } -private: + // private: /* 0x00 */ char mName[32]; - /* 0x20 */ u32 mTagID; + /* 0x20 */ s32 mTagID; /* 0x24 */ u32 mIndex; /* 0x28 */ u32 mFlagID; /* 0x2C */ int mType; @@ -108,7 +110,7 @@ private: /* 0x34 */ u8 field_0x34[2]; /* 0x36 */ s16 field_0x36; /* 0x38 */ int mCurrentCut; - /* 0x3C */ u32 field_0x3c; + /* 0x3C */ s32 field_0x3c; /* 0x40 */ bool field_0x40; /* 0x41 */ bool field_0x41; /* 0x42 */ s16 field_0x42; @@ -118,11 +120,13 @@ private: class dEvDtEvent_c { public: - void finishCheck(); + int finishCheck(); void forceFinish(); void specialStaffProc(dEvDtStaff_c*); int getNStaff() { return mNStaff; } int getStaff(int idx) { return mStaff[idx]; } + char* getName() { return mName; } + int getPriority() { return mPriority; } /* 0x00 */ char mName[32]; /* 0x20 */ u32 mIndex; @@ -156,7 +160,7 @@ private: class dEvDtBase_c { public: - dEvDtBase_c(); + dEvDtBase_c() { init(); } ~dEvDtBase_c() {} int init(); int init(char*, int); @@ -168,6 +172,7 @@ public: dEvDtEvent_c* getEventP(int i) { return &mEventP[i]; } dEvDtData_c* getDataP(int i) { return &mDataP[i]; } dEvDtCut_c* getCutP(int i) { return &mCutP[i]; } + char* getEventName(int i) { return mEventP[i].getName(); } int getStaffCurrentCut(int i) { return mStaffP[i].getCurrentCut(); } dEvDtCut_c* getCutStaffCurrentCutP(int i) { return getCutP(getStaffCurrentCut(i)); } int getStaffStartCut(int i) { return mStaffP[i].getStartCut(); } @@ -200,7 +205,7 @@ public: void setIDataP(int* p_idata) { mIDataP = p_idata; } void setSDataP(char* p_sdata) { mSDataP = p_sdata; } -private: + // private: /* 0x00 */ event_binary_data_header* mHeaderP; /* 0x04 */ dEvDtEvent_c* mEventP; /* 0x08 */ dEvDtStaff_c* mStaffP; diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index 7427c80c4dc..344f1f59ad6 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -8,16 +8,16 @@ class dEvent_exception_c { public: dEvent_exception_c() { mEventInfoIdx = -1; } void init(); - void setStartDemo(int); - void getEventName(); + s32 setStartDemo(int); + const char* getEventName(); -private: - u32 mEventInfoIdx; + // private: + s32 mEventInfoIdx; u8 field_0x4; u8 field_0x5; u8 field_0x6; u8 field_0x7; - u32 mState; + s32 mState; }; class dEvent_manager_c { @@ -30,7 +30,7 @@ public: void demoInit(); void roomInit(int); void roomFinish(int); - void orderStartDemo(); + int orderStartDemo(); void remove(); void startProc(dEvDtEvent_c*); void closeProc(dEvDtEvent_c*); @@ -39,37 +39,44 @@ public: void Experts(); dEvDtEvent_c* getEventData(s16); dEvDtEvent_c* getEventData(s16, int); - int getEventIdx(char const*, u8, s32); - void getEventIdx(fopAc_ac_c*, u8); - void getEventIdx(fopAc_ac_c*, char const*, u8); - void isMapToolCamera(u8, s32); - void order(s16); - void startCheck(s16); - void startCheckOld(char const*); - void endCheck(s16); - void endCheckOld(char const*); + s16 getEventIdx(char const*, u8, s32); + s16 getEventIdx(fopAc_ac_c*, u8); + s16 getEventIdx(fopAc_ac_c*, char const*, u8); + int isMapToolCamera(u8, s32); + int order(s16); + int startCheck(s16); + int startCheckOld(char const*); + int endCheck(s16); + int endCheckOld(char const*); s32 getMyStaffId(char const*, fopAc_ac_c*, int); - void getIsAddvance(int); - void getMyActIdx(int, char const* const*, int, int, int); - void getMyNowCutName(int); + int getIsAddvance(int); + int getMyActIdx(int, char const* const*, int, int, int); + char* getMyNowCutName(int); dEvDtData_c* getMyDataP(int, char const*, int); void* getMySubstanceP(int, char const*, int); - void getMySubstanceNum(int, char const*); + int getMySubstanceNum(int, char const*); void cutEnd(int); - void getEventPrio(fopAc_ac_c*, s16); + int getEventPrio(fopAc_ac_c*, s16); void issueStaff(char const*); void cancelStaff(char const*); void setGoal(cXyz*); - void getGoal(); - void getRunEventName(); - void specialCast_Shutter(s16, int); + cXyz* getGoal(); + const char* getRunEventName(); + fopAc_ac_c* specialCast_Shutter(s16, int); fopAc_ac_c* specialCast(char const*, int); - void ChkPresentEnd(); - void checkStartDemo(); + int ChkPresentEnd(); + int checkStartDemo(); void setStartDemo(int param_0) { mEventException.setStartDemo(param_0); } void setCameraPlay(int status) { mCameraPlay = status; } - dEvDtBase_c& getBase() { return mEventList[field_0x1b4]; } + dEvDtBase_c& getBase() { return mEventList[mCurrentEventType]; } + + void setFlag(int flag) { mFlags.flagSet(flag); } + + static int getIndexCompositId(s16 param_0) { return param_0 != -1 ? (u8)param_0 : -1; } + static int getTypeCompositId(s16 param_0) { return param_0 == -1 ? 0 : param_0 >> 8; } + + static s16 makeCompositId(s16 a, int b) { return a | (b << 8); } private: /* 0x0000 */ dEvDtBase_c mEventList[11]; @@ -77,11 +84,11 @@ private: /* 0x0190 */ dEvent_exception_c mEventException; /* 0x019C */ cXyz mGoal; /* 0x01A8 */ u8 field_0x1a8[2]; - /* 0x01AA */ s16 field_0x1aa; + /* 0x01AA */ s16 mCurrentEventCompositId; /* 0x01AC */ u8 field_0x1ac[4]; /* 0x01B0 */ int mRoomNo; - /* 0x01B4 */ u32 field_0x1b4; - /* 0x01B8 */ u32 field_0x1b8; + /* 0x01B4 */ u32 mCurrentEventType; + /* 0x01B8 */ s32 field_0x1b8; /* 0x01BC */ dEvDtFlag_c mFlags; /* 0x06BC */ bool mDataLoaded; }; diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 576474fc8ec..54f6bbac2bb 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -14,7 +14,7 @@ public: dEvt_info_c(); virtual ~dEvt_info_c(); void setEventName(char*); - s16 getEventName(); + char* getEventName(); void beforeProc(); void onCondition(u16); void offCondition(u16); @@ -29,7 +29,7 @@ public: void setArchiveName(char* name) { mArchiveName = name; } u8 getMapToolId() { return mMapToolId; } s16 getEventId() { return mEventId; } - u8 getIdx() { return mIndex; } + s16 getIdx() { return mIndex; } char* getArchiveName() { return mArchiveName; } bool chkCondition(u16 condition) { return mCondition == condition; } @@ -40,7 +40,7 @@ public: /* 0x06 */ u16 mCondition; /* 0x08 */ s16 mEventId; /* 0x0A */ u8 mMapToolId; - /* 0x0B */ u8 mIndex; + /* 0x0B */ s8 mIndex; /* 0x0C */ char* mArchiveName; /* 0x10 */ void* field_0x10; /* 0x14 */ void* field_0x14; @@ -119,6 +119,7 @@ public: const cXyz& getPosition() const { return mCurrent.mPosition; } const csXyz& getAngle() const { return mCurrent.mAngle; } + s8 getRoomNo() const { return mCurrent.mRoomNo; } }; // Size: 0x568 s32 fopAc_IsActor(void* actor); diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index df0443d5c12..3f57e4d41c8 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -110,6 +110,10 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) { fpcM_SetParam(p_actor, param); } +inline s16 fpcAcM_GetProfName(void* pActor) { + return fpcM_GetProfName(pActor); +} + inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) { return p_actor->mGroup; } @@ -122,6 +126,10 @@ inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) { pActor->mStatus &= ~flag; } +inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) { + return (fopAc_ac_c*)fopAcIt_Judge(func, param); +} + inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) { return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id); } @@ -374,9 +382,8 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void); void fopAcM_riverStream__FP4cXyzPsPff(void); void fopAcM_carryOffRevise__FP10fopAc_ac_c(void); void fopAcM_searchFromName4Event__FPCcs(void); -void fopAcM_GetName__FPv(void); // mostly inlined -void fopAcM_GetID__FPCv(void); // mostly inlined -static void fopAcM_GetParam__FPCv(void const*); // mostly inlined +void fopAcM_GetName__FPv(void); // mostly inlined +void fopAcM_GetID__FPCv(void); // mostly inlined } #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 6d5fbb611c0..6d5a7ac875f 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -27,6 +27,10 @@ inline void fpcM_SetParam(void* p_actor, u32 param) { ((base_process_class*)p_actor)->mParameters = param; } +inline s16 fpcM_GetProfName(void* pActor) { + return ((base_process_class*)pActor)->mBsTypeId; +} + inline int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) { return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL, process); @@ -54,4 +58,4 @@ extern "C" { void fpcM_Delete__FPv(void); } -#endif \ No newline at end of file +#endif diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 55949c71f9d..ba60b9996d2 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -16,34 +16,6 @@ namespace std { /* 80182D10 */ void fabs(f32); }; // namespace std -struct stage_camera2_data_class {}; - -struct request_of_phase_process_class {}; - -struct Vec {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 800977F4 */ cXyz(cXyz const&); - /* 8014195C */ cXyz(f32, f32, f32); - /* 800125DC */ cXyz(); - /* 8008E790 */ void abs() const; - /* 8008E8D0 */ void operator-=(Vec const&); - /* 8008E904 */ void operator+=(Vec const&); - /* 800977D8 */ void operator=(cXyz const&); - /* 80182D8C */ void set(f32, f32, f32); - /* 80266AE4 */ void operator+(Vec const&) const; - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266BD0 */ void operator*(Vec const&) const; - /* 80266CE4 */ void norm() const; - /* 80266EF4 */ void normalize(); - /* 8026706C */ bool operator!=(Vec const&) const; - - static f32 Zero[3]; - static u8 BaseY[12]; -}; - struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CE70 */ void scaleM(cXyz const&); @@ -67,10 +39,6 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct fopAc_ac_c { - static u8 stopStatus[4]; -}; - struct daTagMwait_c { /* 80182D9C */ void checkEndMessage(); }; @@ -126,22 +94,6 @@ struct dVibration_c { /* 8006FA24 */ void StartShock(int, int, cXyz); }; -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_tmp_flag_c { - static u8 const tempBitLabels[370 + 2 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dStage_roomControl_c { - /* 80024384 */ void getStatusRoomDt(int); -}; - struct dRes_info_c {}; struct dRes_control_c { @@ -164,8 +116,6 @@ struct dDlst_window_c { /* 80051ADC */ void setScissor(f32, f32, f32, f32); }; -struct _GXColor {}; - struct dDlst_effectLine_c { /* 800541F4 */ void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32); }; @@ -206,226 +156,6 @@ struct dCcMassS_Mng { /* 80085EB8 */ void GetCamTopPos(Vec*); }; -struct cSAngle { - /* 80030510 */ ~cSAngle(); - /* 8027100C */ void Val(f32); - /* 8016C2CC */ void Val() const; - /* 80270FF8 */ void Val(cSAngle const&); - /* 80270F98 */ cSAngle(s16); - /* 80182A48 */ cSAngle(); - /* 80270FC8 */ cSAngle(f32); - /* 80270F68 */ cSAngle(cSAngle const&); - /* 80182A6C */ bool operator<(cSAngle const&) const; - /* 80182A8C */ bool operator>(cSAngle const&) const; - /* 80182C14 */ void __ops() const; - /* 80182CA8 */ void operator=(cSAngle const&); - /* 80271030 */ void Degree() const; - /* 80271098 */ void Norm() const; - /* 802710CC */ void Abs() const; - /* 802710E8 */ void Inv() const; - /* 802710F8 */ void Sin() const; - /* 80271120 */ void Cos() const; - /* 802711A4 */ void operator-(cSAngle const&) const; - /* 80271228 */ void operator-(s16) const; - /* 80271148 */ void operator-() const; - /* 80271174 */ void operator+(cSAngle const&) const; - /* 802711FC */ void operator+(s16) const; - /* 802711D4 */ void operator+=(cSAngle const&); - /* 80271254 */ void operator+=(s16); - /* 802711E8 */ void operator-=(cSAngle const&); - /* 80271264 */ void operator*(f32) const; - /* 802712B4 */ void operator*=(f32); - - static u8 _0[2 + 2 /* padding */]; - static u8 _90[2 + 2 /* padding */]; - static u8 _180[2 + 2 /* padding */]; - static u8 _270[2 + 6 /* padding */]; -}; - -struct dCamMapToolData { - /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); -}; - -struct camera_class {}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dCamera_c { - struct dCamInfo_c { - /* 8018291C */ dCamInfo_c(); - /* 80182920 */ ~dCamInfo_c(); - }; - - /* 8008908C */ void getEvIntData(int*, char*, int); - /* 80088CB0 */ void getEvIntData(int*, char*); - /* 80089154 */ void getEvFloatData(f32*, char*, f32); - /* 80088D90 */ void getEvFloatData(f32*, char*); - /* 8008933C */ void getEvStringData(char*, char*, char*); - /* 800894C4 */ void getEvActor(char*); - /* 800895F4 */ void getEvActor(char*, char*); - /* 80089730 */ void pauseEvCamera(); - /* 800897E8 */ void fixedFrameEvCamera(); - /* 8008A510 */ void stokerEvCamera(); - /* 8008A974 */ void rollingEvCamera(); - /* 8008B9B0 */ void fixedPositionEvCamera(); - /* 8008BE2C */ void uniformTransEvCamera(); - /* 8008BE50 */ void uniformBrakeEvCamera(); - /* 8008BE74 */ void uniformAcceleEvCamera(); - /* 8008E938 */ void watchActorEvCamera(); - /* 8008FAE8 */ void restorePosEvCamera(); - /* 80090174 */ void talktoEvCamera(); - /* 80090230 */ void maptoolIdEvCamera(); - /* 80090478 */ void styleEvCamera(); - /* 80090514 */ void gameOverEvCamera(); - /* 80091468 */ void tactEvCamera(); - /* 800923B8 */ bool turnToActorEvCamera(); - /* 800923C0 */ void stbWaitEvCamera(); - /* 800924D0 */ void saveEvCamera(); - /* 8009258C */ void loadEvCamera(); - /* 800929AC */ void useItem0EvCamera(); - /* 800937AC */ void useItem1EvCamera(); - /* 80094240 */ void getItemEvCamera(); - /* 80094A70 */ void possessedEvCamera(); - /* 80095010 */ void fixedFramesEvCamera(); - /* 8009544C */ void bSplineEvCamera(); - /* 800956E4 */ void twoActor0EvCamera(); - /* 80095E7C */ void peepHoleEvCamera(); - /* 80095FD0 */ void digHoleEvCamera(); - /* 800965AC */ void hintTalkEvCamera(); - /* 80096EDC */ void bspTransEvCamera(); - /* 80097694 */ bool portalWarpEvCamera(); - /* 8009771C */ void attentionPos(fopAc_ac_c*); - /* 80097738 */ void directionOf(fopAc_ac_c*); - /* 8009775C */ void positionOf(fopAc_ac_c*); - /* 80097778 */ void setFlag(u32); - /* 8009778C */ void eyePos(fopAc_ac_c*); - /* 8016008C */ dCamera_c(camera_class*); - /* 80160304 */ ~dCamera_c(); - /* 80160470 */ void initialize(camera_class*, fopAc_ac_c*, u32, u32); - /* 801614AC */ void Start(); - /* 801614C4 */ void QuickStart(); - /* 801614D0 */ void Stop(); - /* 801614E8 */ void Stay(); - /* 801614F4 */ void ChangeModeOK(s32); - /* 80161550 */ void initPad(); - /* 801617B0 */ void updatePad(); - /* 80161D84 */ void initMonitor(); - /* 80161E34 */ void updateMonitor(); - /* 80162088 */ void checkForceLockTarget(); - /* 801622B0 */ void infoReport(); - /* 801622B4 */ void Run(); - /* 80162D38 */ void NotRun(); - /* 80162FB8 */ void V(); - /* 80162FD4 */ void U(); - /* 8016300C */ void SetTrimSize(s32); - /* 80163028 */ void SetTrimTypeForce(s32); - /* 80163034 */ void CalcTrimSize(); - /* 80163154 */ void Draw(); - /* 8016317C */ void setStageMapToolData(); - /* 80163340 */ void setMapToolData(); - /* 80163558 */ void SetTagData(fopAc_ac_c*, s32, u16, u8); - /* 801635AC */ void setRoomMapToolData(dCamMapToolData*, s32, s32); - /* 801635E4 */ void nextMode(s32); - /* 80163C38 */ void onModeChange(s32, s32); - /* 80163D50 */ void ModeFix(s32); - /* 80163D5C */ void nextType(s32); - /* 8016444C */ void onTypeChange(s32, s32); - /* 8016469C */ void onStyleChange(s32, s32); - /* 801647B0 */ void onRoomChange(s32); - /* 80164878 */ void getParamTargetActor(s32); - /* 80164944 */ void GetCameraTypeFromMapToolID(s32, s32); - /* 80164B64 */ void GetCameraTypeFromCameraName(char const*); - /* 80164C10 */ void GetCameraTypeFromToolData(stage_camera2_data_class*); - /* 80164C64 */ void pushInfo(dCamera_c::dCamInfo_c*, s16); - /* 80164CAC */ void popInfo(dCamera_c::dCamInfo_c*); - /* 80164D2C */ void heightOf(fopAc_ac_c*); - /* 80164E20 */ void relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, f32); - /* 80164D6C */ void relationalPos(fopAc_ac_c*, cXyz*); - /* 80165104 */ void setUSOAngle(); - /* 80165158 */ void getUSOAngle(cSAngle); - /* 8016517C */ void pointInSight(cXyz*); - /* 80167C24 */ void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); - /* 80165238 */ void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16, f32); - /* 801657EC */ void groundHeight(cXyz*); - /* 801658C0 */ void lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32); - /* 80165AF0 */ void lineBGCheck(cXyz*, cXyz*, u32); - /* 801659F4 */ void lineBGCheck(cXyz*, cXyz*, cXyz*, u32); - /* 80165B60 */ void lineCollisionCheckBush(cXyz*, cXyz*); - /* 80165CE0 */ void compWallMargin(cXyz*, cXyz*, f32); - /* 80165EF4 */ void defaultTriming(); - /* 80165FB4 */ void setView(f32, f32, f32, f32); - /* 8016608C */ void forwardCheckAngle(); - /* 80166764 */ void bumpCheck(u32); - /* 80167BF8 */ void lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32); - /* 80167CD8 */ void jutOutCheck(cXyz*, f32); - /* 80167E3C */ void tooNearEscape(cXyz*); - /* 80167EF4 */ void getWaterSurfaceHeight(cXyz*); - /* 80167FEC */ void checkGroundInfo(); - /* 80168744 */ void chaseCamera(s32); - /* 8016C384 */ void lockonCamera(s32); - /* 8016E448 */ void getMsgCmdSpeaker(); - /* 8016E4A4 */ void getMsgCmdCut(s32); - /* 8016E4F4 */ void talktoCamera(s32); - /* 80174E18 */ void talkBasePos(fopAc_ac_c*); - /* 80174E34 */ void talkEyePos(fopAc_ac_c*); - /* 80174EA4 */ bool CalcSubjectAngle(s16*, s16*); - /* 80174EAC */ void SaveZoomRatio(); - /* 80174ED4 */ void subjectCamera(s32); - /* 80176074 */ void magneCamera(s32); - /* 801767F8 */ void colosseumCamera(s32); - /* 80176DF0 */ bool test1Camera(s32); - /* 80176DF8 */ bool test2Camera(s32); - /* 80176E00 */ void towerCamera(s32); - /* 80178E50 */ void hookshotCamera(s32); - /* 80179590 */ void railCamera(s32); - /* 8017A2A0 */ void paraRailCamera(s32); - /* 8017ADC0 */ void rideCamera(s32); - /* 8017D974 */ bool manualCamera(s32); - /* 8017D97C */ void observeCamera(s32); - /* 8017DFAC */ void fixedFrameCamera(s32); - /* 8017E730 */ void fixedPositionCamera(s32); - /* 8017F25C */ void oneSideCamera(s32); - /* 8017F828 */ void eventCamera(s32); - /* 8018050C */ void currentEvCamera(); - /* 801806D4 */ bool letCamera(s32); - /* 801806DC */ void setEventRecoveryTrans(s16); - /* 80180738 */ void runEventRecoveryTrans(); - /* 80180A40 */ void EventRecoverNotime(); - /* 80180AA8 */ void Set(cXyz, cXyz); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); - /* 80180B40 */ void Set(cXyz, cXyz, s16, f32); - /* 80180C18 */ void Reset(cXyz, cXyz); - /* 80180C68 */ void Reset(); - /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16); - /* 80180D24 */ void shakeCamera(); - /* 80181000 */ void StartShake(s32, u8*, s32, cXyz); - /* 80181158 */ void StopShake(); - /* 80181170 */ void StartBlure(int, fopAc_ac_c*, f32, f32); - /* 801811B8 */ void ResetBlure(); - /* 80181208 */ void SetBlureAlpha(f32); - /* 80181210 */ void SetBlureScale(f32, f32, f32); - /* 80181220 */ void SetBlurePosition(f32, f32, f32); - /* 80181278 */ void SetBlureActor(fopAc_ac_c*); - /* 80181280 */ void blureCamera(); - /* 80181490 */ void onHorseDush(); - /* 80181500 */ void GetForceLockOnActor(); - /* 80181534 */ void ForceLockOn(fopAc_ac_c*); - /* 80181560 */ void ForceLockOff(unsigned int); - /* 8018159C */ void ForceLockOff(fopAc_ac_c*); - /* 80181E20 */ void Up(); - /* 80181E64 */ void Eye(); - /* 80181E98 */ void Center(); - /* 8018295C */ void footHeightOf(fopAc_ac_c*); - /* 80182964 */ void push_any_key(); - /* 8018296C */ void clrFlag(u32); - /* 80182980 */ void chkFlag(u32); - /* 801829AC */ void Bank(); - - static u8 engine_tbl[240]; -}; - struct dCamSetup_c { /* 80088668 */ dCamSetup_c(); /* 800888B8 */ ~dCamSetup_c(); @@ -486,14 +216,6 @@ struct dBgS_RoofChk { /* 80079090 */ ~dBgS_RoofChk(); }; -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); - /* 80078E74 */ void ClrObj(); - /* 80078E80 */ void SetCam(); - /* 80078E8C */ void ClrCam(); - /* 80078EEC */ void SetUnderwaterRoof(); -}; - struct dBgS_GndChk { /* 8007757C */ dBgS_GndChk(); /* 800775F0 */ ~dBgS_GndChk(); @@ -503,10 +225,7 @@ struct dBgS_CamSphChk { /* 80165E74 */ ~dBgS_CamSphChk(); }; -struct dBgS_CamLinChk { - /* 80077DA4 */ dBgS_CamLinChk(); - /* 80077E00 */ ~dBgS_CamLinChk(); -}; +struct cBgD_Vtx_t; struct dBgS_CamGndChk_Wtr { /* 80077A00 */ dBgS_CamGndChk_Wtr(); @@ -517,10 +236,6 @@ struct dBgS_CamGndChk { /* 80077988 */ ~dBgS_CamGndChk(); }; -struct cBgS_PolyInfo {}; - -struct csXyz {}; - struct dBgS { /* 80074ABC */ void ChkMoveBG(cBgS_PolyInfo const&); /* 80074EF0 */ void GetGroundCode(cBgS_PolyInfo const&); @@ -552,31 +267,6 @@ struct d2DBSplinePath { struct camera_process_class {}; -struct cSPolar { - /* 802716EC */ void Xyz() const; -}; - -struct cSGlobe { - /* 8007167C */ ~cSGlobe(); - /* 8008E774 */ void operator=(cSGlobe const&); - /* 80182C84 */ void U() const; - /* 8008E894 */ void U(cSAngle const&); - /* 80182A08 */ void V() const; - /* 8008FA58 */ void V(cSAngle const&); - /* 8016E420 */ cSGlobe(); - /* 80271820 */ cSGlobe(f32, s16, s16); - /* 80271880 */ cSGlobe(cXyz const&); - /* 802717F0 */ cSGlobe(cSGlobe const&); - /* 80271850 */ cSGlobe(f32, cSAngle const&, cSAngle const&); - /* 80182A64 */ void R() const; - /* 80182A4C */ void R(f32); - /* 802719A4 */ void Val(f32, s16, s16); - /* 80271A08 */ void Val(f32, cSAngle const&, cSAngle const&); - /* 80271A70 */ void Val(cXyz const&); - /* 80271AB4 */ void Xyz() const; - /* 80271B7C */ void Invert(); -}; - struct cM_rnd_c { /* 80053CDC */ void init(int, int, int); }; @@ -585,71 +275,11 @@ struct cM3dGSph { /* 8026F664 */ void Set(cXyz const&, f32); }; -struct cM3dGPla { - /* 8001DB90 */ ~cM3dGPla(); - /* 801411F0 */ cM3dGPla(); - /* 801829EC */ void GetNP(); -}; - -struct cM3dGLin { - /* 80036A5C */ ~cM3dGLin(); - /* 8026F2A8 */ cM3dGLin(cXyz const&, cXyz const&); - /* 8026F31C */ void SetStartEnd(Vec const&, Vec const&); -}; - struct cM3dGCyl { /* 80030E3C */ ~cM3dGCyl(); /* 8026F0A8 */ cM3dGCyl(cXyz const*, f32, f32); }; -struct cDegree { - /* 800882E0 */ ~cDegree(); - /* 8027134C */ cDegree(f32); - /* 80271418 */ void Cos() const; - /* 80271440 */ void Tan() const; -}; - -struct cBgS_LinChk { - /* 801829F0 */ void GetCross(); -}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074618 */ void GetActorPointer(int) const; - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct cBgD_Vtx_t {}; - -struct cAngle { - /* 80182D28 */ void d2s(f32); -}; - -struct Z2StatusMgr { - /* 802B6760 */ void setCameraPolygonPos(Vec*); - /* 802B6784 */ void setCameraGroupInfo(u8); - /* 802B6788 */ void setCameraInWaterDepth(f32); -}; - -struct JAISoundID {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct Z2Audience { - /* 802BD2DC */ void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int, bool); -}; - // // Forward References: // @@ -1139,17 +769,6 @@ extern "C" void setCameraGroupInfo__11Z2StatusMgrFUc(); extern "C" void setCameraInWaterDepth__11Z2StatusMgrFf(); extern "C" void setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSMTXMultVecSR(); -extern "C" void C_MTXPerspective(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void PSVECCrossProduct(); extern "C" void __register_global_object(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); @@ -1179,15 +798,11 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strncmp(); -extern "C" void strcmp(); -extern "C" void tan(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; extern "C" extern void* __vt__8cM3dGPla[3]; extern "C" extern void* g_fopCam_Method[5 + 1 /* padding */]; extern "C" extern void* g_fopVw_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__8cM3dGLin[3]; extern "C" extern void* __vt__8cM3dGSph[3]; @@ -1198,13 +813,10 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 struct_80450BE4[4]; extern "C" u8 stopStatus__10fopAc_ac_c[4]; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 _0__7cSAngle[2 + 2 /* padding */]; @@ -3220,7 +2832,8 @@ static asm void func_8016C25C() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSAngle::Val() const { +// asm void cSAngle::Val() const { +extern "C" asm void Val__7cSAngleCFv() { nofralloc #include "asm/d/d_camera/Val__7cSAngleCFv.s" } @@ -3328,7 +2941,8 @@ static asm void func_8016E410() { #pragma pop /* 8016E420-8016E424 168D60 0004+00 2/2 0/0 0/0 .text __ct__7cSGlobeFv */ -cSGlobe::cSGlobe() { +// cSGlobe::cSGlobe() { +extern "C" asm void __ct__7cSGlobeFv() { /* empty function */ } @@ -4189,7 +3803,7 @@ asm void dCam_getCamera() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCam_getBody() { +asm dCamera_c* dCam_getBody() { nofralloc #include "asm/d/d_camera/dCam_getBody__Fv.s" } @@ -4253,7 +3867,7 @@ asm void dCamera_c::Eye() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCamera_c::Center() { +asm cXyz dCamera_c::Center() { nofralloc #include "asm/d/d_camera/Center__9dCamera_cFv.s" } @@ -4632,7 +4246,8 @@ static asm void dComIfG_Bgsp() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSGlobe::V() const { +// asm void cSGlobe::V() const { +extern "C" asm void V__7cSGlobeCFv() { nofralloc #include "asm/d/d_camera/V__7cSGlobeCFv.s" } @@ -4670,7 +4285,8 @@ asm void std::fabsf(f32 param_0) { #pragma pop /* 80182A48-80182A4C 17D388 0004+00 2/2 0/0 0/0 .text __ct__7cSAngleFv */ -cSAngle::cSAngle() { +// cSAngle::cSAngle() { +extern "C" asm void __ct__7cSAngleFv() { /* empty function */ } @@ -4678,7 +4294,8 @@ cSAngle::cSAngle() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSGlobe::R(f32 param_0) { +// asm void cSGlobe::R(f32 param_0) { +extern "C" asm void R__7cSGlobeFf() { nofralloc #include "asm/d/d_camera/R__7cSGlobeFf.s" } @@ -4698,7 +4315,8 @@ static asm void dComIfGp_evmng_cameraPlay() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSGlobe::R() const { +// asm void cSGlobe::R() const { +extern "C" asm void R__7cSGlobeCFv() { nofralloc #include "asm/d/d_camera/R__7cSGlobeCFv.s" } @@ -4708,7 +4326,8 @@ asm void cSGlobe::R() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cSAngle::operator<(cSAngle const& param_0) const { +// asm bool cSAngle::operator<(cSAngle const& param_0) const { +extern "C" asm bool __lt__7cSAngleCFRC7cSAngle() { nofralloc #include "asm/d/d_camera/__lt__7cSAngleCFRC7cSAngle.s" } @@ -4718,7 +4337,8 @@ asm bool cSAngle::operator<(cSAngle const& param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool cSAngle::operator>(cSAngle const& param_0) const { +// asm bool cSAngle::operator>(cSAngle const& param_0) const { +extern "C" asm bool __gt__7cSAngleCFRC7cSAngle() { nofralloc #include "asm/d/d_camera/__gt__7cSAngleCFRC7cSAngle.s" } @@ -4838,7 +4458,8 @@ asm void mDoCPd_c::getTrigA(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSAngle::__ops() const { +// asm void cSAngle::__ops() const { +extern "C" asm void __ops__7cSAngleCFv() { nofralloc #include "asm/d/d_camera/__ops__7cSAngleCFv.s" } @@ -4953,7 +4574,8 @@ void dCamParam_c::Fovy(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSGlobe::U() const { +// asm void cSGlobe::U() const { +extern "C" asm void U__7cSGlobeCFv() { nofralloc #include "asm/d/d_camera/U__7cSGlobeCFv.s" } @@ -4973,7 +4595,8 @@ asm void dCamParam_c::Flag(s32 param_0, u16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cSAngle::operator=(cSAngle const& param_0) { +// asm void cSAngle::operator=(cSAngle const& param_0) { +extern "C" asm void __as__7cSAngleFRC7cSAngle() { nofralloc #include "asm/d/d_camera/__as__7cSAngleFRC7cSAngle.s" } @@ -5064,7 +4687,8 @@ asm void daHorse_c::checkTurnStandCamera() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cAngle::d2s(f32 param_0) { +// asm void cAngle::d2s(f32 param_0) { +extern "C" asm void d2s__6cAngleFf() { nofralloc #include "asm/d/d_camera/d2s__6cAngleFf.s" } @@ -5084,7 +4708,8 @@ asm void daHorse_c::checkJump() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fopAcM_GetParam(void const* param_0) { +// static asm void fopAcM_GetParam(void const* param_0) { +extern "C" static asm void fopAcM_GetParam__FPCv() { nofralloc #include "asm/d/d_camera/fopAcM_GetParam__FPCv.s" } @@ -5116,7 +4741,8 @@ asm void daTagMhint_c::checkNoAttention() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cXyz::set(f32 param_0, f32 param_1, f32 param_2) { +// asm void cXyz::set(f32 param_0, f32 param_1, f32 param_2) { +extern "C" asm void set__4cXyzFfff() { nofralloc #include "asm/d/d_camera/set__4cXyzFfff.s" } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index fb0461a8165..025b6f74731 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -195,7 +195,7 @@ dEvt_order_c::dEvt_order_c() { */ bool 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) { - s16 eventIdx = dComIfGp_getEventManager().getEventIdx((char*)param_6, -1, -1); + int eventIdx = dComIfGp_getEventManager().getEventIdx((char*)param_6, -1, -1); return order(param_0, param_1, param_2, param_3, param_4, param_5, eventIdx, -1); } @@ -649,13 +649,12 @@ void dEvt_control_c::remove() { /* 80043278-80043280 03DBB8 0008+00 2/2 2/2 0/0 .text getStageEventDt__14dEvt_control_cFv */ -// ret type probably wrong, fix later -void* dEvt_control_c::getStageEventDt() { +dStage_MapEvent_dt_c* dEvt_control_c::getStageEventDt() { return mStageEventDt; } -void dEvt_control_c::sceneChange(int param_0) { - dStage_changeScene4Event__FiScibfUlsi(param_0, field_0x12c, -1, field_0x129, 0.0f, 0, 0, -1); +void dEvt_control_c::sceneChange(int exitId) { + dStage_changeScene4Event__FiScibfUlsi(exitId, field_0x12c, -1, field_0x129, 0.0f, 0, 0, -1); } u32 dEvt_control_c::getPId(void* param_0) { @@ -668,14 +667,14 @@ u32 dEvt_control_c::getPId(void* param_0) { /* 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) { - fopAcIt_Judge(fpcSch_JudgeByID, (void*)param_0); +void* dEvt_control_c::convPId(unsigned int param_0) { + return fopAcIt_Judge(fpcSch_JudgeByID, (void*)param_0); } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::convPId(unsigned int param_0) { +asm void* dEvt_control_c::convPId(unsigned int param_0) { nofralloc #include "asm/d/event/d_event/convPId__14dEvt_control_cFUi.s" } @@ -712,14 +711,15 @@ void dEvt_info_c::setEventName(char* param_0) { } /* 80043480-800434CC 03DDC0 004C+00 1/1 0/0 0/0 .text getEventName__11dEvt_info_cFv */ -// fake match? -s16 dEvt_info_c::getEventName() { +char* dEvt_info_c::getEventName() { if (mEventId == -1) { return 0; } else { dEvDtEvent_c* data = dComIfGp_getEventManager().getEventData(mEventId); if (data == NULL) { return 0; + } else { + return data->getName(); } } } @@ -729,15 +729,15 @@ void dEvt_info_c::beforeProc() { } /* 800434D8-80043500 03DE18 0028+00 0/0 4/4 1/1 .text searchMapEventData__14dEvt_control_cFUc */ -void dEvt_control_c::searchMapEventData(u8 param_0) { - searchMapEventData(param_0, (s32)struct_80450D64); +dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 param_0) { + return searchMapEventData(param_0, (s32)struct_80450D64); } /* 80043500-8004360C 03DE40 010C+00 3/3 7/7 5/5 .text searchMapEventData__14dEvt_control_cFUcl */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::searchMapEventData(u8 param_0, s32 param_1) { +asm dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 param_0, s32 param_1) { nofralloc #include "asm/d/event/d_event/searchMapEventData__14dEvt_control_cFUcl.s" } diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 5b453acd408..9f3c49323ca 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -404,7 +404,7 @@ void dEvDtFlag_c::init() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvDtEvent_c::finishCheck() { +asm int dEvDtEvent_c::finishCheck() { nofralloc #include "asm/d/event/d_event_data/finishCheck__12dEvDtEvent_cFv.s" } diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index ee0927975a2..d3da00c8f60 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -4,18 +4,14 @@ // #include "d/event/d_event_manager.h" +#include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2AudioMgr.h" #include "d/com/d_com_inf_game.h" +#include "d/d_camera.h" +#include "d/d_stage.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct dCamera_c { - /* 80180A40 */ void EventRecoverNotime(); - /* 80181E98 */ void Center(); -}; +#include "m_Do/m_Do_audio.h" // // Forward References: @@ -138,6 +134,18 @@ extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; +inline dEvent_manager_c& dComIfGp_getEventManager() { + return g_dComIfG_gameInfo.play.getEvtManager(); +} + +inline dEvt_control_c& dComIfGp_getEvent() { + return g_dComIfG_gameInfo.play.getEvent(); +} + +BOOL daPy_py_c::checkNowWolf() { + return dComIfGp_getLinkPlayer()->i_checkWolf(); +} + // // Declarations: // @@ -148,57 +156,62 @@ void dEvent_exception_c::init() { } /* 800463F0-80046480 040D30 0090+00 0/0 2/2 0/0 .text setStartDemo__18dEvent_exception_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_exception_c::setStartDemo(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/setStartDemo__18dEvent_exception_cFi.s" +s32 dEvent_exception_c::setStartDemo(int index) { + int tmp = dComIfGp_roomControl_getStayNo(); + dStage_MapEvent_dt_c* eventData = dEvt_control_c::searchMapEventData(index, tmp); + if (eventData != NULL && eventData->field_0x1B != 0xFF && + dComIfGs_isSwitch(eventData->field_0x1B, tmp)) { + return 0xFF; + } else if (mEventInfoIdx != index) { + mEventInfoIdx = index; + } + return index; } -#pragma pop - -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379F60 = "NORMAL_COMEBACK"; -SECTION_DEAD static char const* const stringBase_80379F70 = "DEFAULT_START"; -SECTION_DEAD static char const* const stringBase_80379F7E = "SHUTTER_START"; -SECTION_DEAD static char const* const stringBase_80379F8C = "SHUTTER_START_STOP"; -SECTION_DEAD static char const* const stringBase_80379F9F = "BS_SHUTTER_START"; -SECTION_DEAD static char const* const stringBase_80379FB0 = "BS_SHUTTER_START_B"; -SECTION_DEAD static char const* const stringBase_80379FC3 = "KNOB_START"; -SECTION_DEAD static char const* const stringBase_80379FCE = "KNOB_START_B"; -SECTION_DEAD static char const* const stringBase_80379FDB = "FMASTER_START"; -SECTION_DEAD static char const* const stringBase_80379FE9 = "FALL_START"; -SECTION_DEAD static char const* const stringBase_80379FF4 = "CRAWLOUT_START"; -SECTION_DEAD static char const* const stringBase_8037A003 = "BOSSWARP_START"; -SECTION_DEAD static char const* const stringBase_8037A012 = "PORTALWARP_START"; -SECTION_DEAD static char const* const stringBase_8037A023 = "PORTALWARP_START_B"; -SECTION_DEAD static char const* const stringBase_8037A036 = "(!NO REGIST!)"; -SECTION_DEAD static char const* const stringBase_8037A044 = "(!NO INFO!)"; -SECTION_DEAD static char const* const stringBase_8037A050 = "(!BAD NUMBER!)"; -SECTION_DEAD static char const* const stringBase_8037A05F = "(MAP TOOL CAMERA)"; -SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)"; -#pragma pop - -/* 803A8270-803A82A8 -00001 0038+00 1/1 0/0 0/0 .data soecial_names$3966 */ -SECTION_DATA static char* soecial_names[14] = { - "NORMAL_COMEBACK", "DEFAULT_START", "SHUTTER_START", "SHUTTER_START_STOP", - "BS_SHUTTER_START", "BS_SHUTTER_START_B", "KNOB_START", "KNOB_START_B", - "FMASTER_START", "FALL_START", "CRAWLOUT_START", "BOSSWARP_START", - "PORTALWARP_START", "PORTALWARP_START_B", -}; /* 80046480-800465E8 040DC0 0168+00 1/1 0/0 0/0 .text getEventName__18dEvent_exception_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_exception_c::getEventName() { - nofralloc -#include "asm/d/event/d_event_manager/getEventName__18dEvent_exception_cFv.s" +const char* dEvent_exception_c::getEventName() { + /* 803A8270-803A82A8 -00001 0038+00 1/1 0/0 0/0 .data soecial_names$3966 */ + static char* soecial_names[14] = { + "NORMAL_COMEBACK", "DEFAULT_START", "SHUTTER_START", "SHUTTER_START_STOP", + "BS_SHUTTER_START", "BS_SHUTTER_START_B", "KNOB_START", "KNOB_START_B", + "FMASTER_START", "FALL_START", "CRAWLOUT_START", "BOSSWARP_START", + "PORTALWARP_START", "PORTALWARP_START_B", + }; + s32 roomNo = dComIfGp_roomControl_getStayNo(); + dStage_roomStatus_c* roomStatus = dComIfGp_roomControl_getStatusRoomDt(roomNo); + dStage_MapEventInfo_c* eventInfo = roomStatus->mRoomDt.getMapEventInfo(); + if (mEventInfoIdx == -1) { + return "(!NO REGIST!)"; + } + if (0xC8 < mEventInfoIdx && mEventInfoIdx < 0xD7) { + if (mEventInfoIdx == 0xCB) { + dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()); + } else if (mEventInfoIdx == 0xD5) { + switch (dComIfGp_SelectWarpPt_get()) { + case 3: + mEventInfoIdx = 0xD6; + } + } + return soecial_names[mEventInfoIdx - 0xC9]; + } else { + if (eventInfo == NULL) { + return "(!NO INFO!)"; + } + if (mEventInfoIdx < 0 || mEventInfoIdx > eventInfo->mCount) { + return "(!BAD NUMBER!)"; + } + dStage_MapEvent_dt_c* revt = &eventInfo->mData[mEventInfoIdx]; + switch (revt->mType) { + case 1: + case 2: + return revt->mName; + case 0: + return "(MAP TOOL CAMERA)"; + default: + return "(!BAD DATA!)"; + } + } } -#pragma pop /* 800465E8-80046688 040F28 00A0+00 1/1 0/0 0/0 .text * getSubstance__16dEvent_manager_cFP11dEvDtData_ci */ @@ -224,28 +237,18 @@ dEvent_manager_c::dEvent_manager_c() { mDataLoaded = false; } -dEvDtBase_c::dEvDtBase_c() { - init(); -} - /* ############################################################################################## */ /* 80379F50-80379F60 0065B0 000F+01 6/6 0/0 0/0 .rodata * DataFileName__29@unnamed@d_event_manager_cpp@ */ -SECTION_RODATA static char const data_80379F50[16] = "event_list.dat"; - -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A07E = "Event"; -#pragma pop +static char const DataFileName[] = "event_list.dat"; /* 80046710-80046800 041050 00F0+00 0/0 1/1 0/0 .text create__16dEvent_manager_cFv */ int dEvent_manager_c::create() { mCameraPlay = 0; mEventException.init(); mFlags.init(); - field_0x1b4 = 0; - field_0x1aa = -1; + mCurrentEventType = 0; + mCurrentEventCompositId = -1; field_0x1b8 = 0; mRoomNo = -1; mDataLoaded = 0; @@ -254,9 +257,9 @@ int dEvent_manager_c::create() { mEventList[i].init(); } - mEventList[3].init((char*)dComIfG_getStageRes(data_80379F50), -1); + mEventList[3].init((char*)dComIfG_getStageRes(DataFileName), -1); mEventList[10].init(); - mEventList[1].init((char*)dComIfG_getObjectRes("Event", data_80379F50), -1); + mEventList[1].init((char*)dComIfG_getObjectRes("Event", DataFileName), -1); mEventList[2].init(); return 1; } @@ -266,7 +269,7 @@ bool dEvent_manager_c::setObjectArchive(char* param_0) { char* rt = NULL; if (param_0 != NULL) { - char* res = (char*)dComIfG_getObjectRes(param_0, data_80379F50); + char* res = (char*)dComIfG_getObjectRes(param_0, DataFileName); rt = res; mEventList[2].init(res, -1); } else { @@ -276,54 +279,45 @@ bool dEvent_manager_c::setObjectArchive(char* param_0) { } /* 80046888-80046904 0411C8 007C+00 0/0 1/1 0/0 .text demoInit__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::demoInit() { - nofralloc -#include "asm/d/event/d_event_manager/demoInit__16dEvent_manager_cFv.s" +void dEvent_manager_c::demoInit() { + if (mDataLoaded == false) { + if (dStage_roomControl_c::getDemoArcName()[0] != '\0') { + mEventList[10].init( + (char*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), DataFileName), + -1); + } + mDataLoaded = true; + } } -#pragma pop /* 80046904-800469EC 041244 00E8+00 0/0 1/1 0/0 .text roomInit__16dEvent_manager_cFi */ -// reversed reg alloc -#ifdef NONMATCHING void dEvent_manager_c::roomInit(int roomNo) { if (roomNo == -1) { roomNo = dComIfGp_roomControl_getStayNo(); } char arc_name[8]; strcpy(arc_name, dComIfG_getRoomArcName(roomNo)); - char* data = (char*)dComIfG_getStageRes(arc_name, data_80379F50); + char* data = (char*)dComIfG_getStageRes(arc_name, DataFileName); - int tmp = -1; - for (int i = 4; i <= 9; i++) { + int i; + int eventIdx = -1; + for (i = 4; i <= 9; i++) { if (mEventList[i].getHeaderP() == NULL) { - tmp = i; + eventIdx = i; continue; } if (mEventList[i].roomNo() == roomNo) { - tmp = i; + eventIdx = i; break; } } - if (tmp != -1) { - mEventList[tmp].init(data, roomNo); + if (eventIdx != -1) { + mEventList[eventIdx].init(data, roomNo); } mRoomNo = roomNo; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::roomInit(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/roomInit__16dEvent_manager_cFi.s" -} -#pragma pop -#endif void dEvent_manager_c::roomFinish(int param_0) { for (int i = 4; i <= 9; i++) { @@ -333,23 +327,31 @@ void dEvent_manager_c::roomFinish(int param_0) { } } -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A084 = "WOLF_WORLD_CHANGE_OUT"; -SECTION_DEAD static char const* const stringBase_8037A09A = "WORLD_CHANGE_OUT"; -#pragma pop - /* 80046A58-80046C0C 041398 01B4+00 0/0 1/1 0/0 .text orderStartDemo__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::orderStartDemo() { - nofralloc -#include "asm/d/event/d_event_manager/orderStartDemo__16dEvent_manager_cFv.s" +int dEvent_manager_c::orderStartDemo() { + BOOL success = FALSE; + if (mEventException.mEventInfoIdx == -2) { + return -2; + } + s16 eventIdx; + if (0xC8 < mEventException.mEventInfoIdx && mEventException.mEventInfoIdx < 0xD7) { + eventIdx = this->getEventIdx(mEventException.getEventName(), -1, -1); + success = fopAcM_orderOtherEventId(NULL, eventIdx, 0xFF, 0xFFFF, 5, 1); + } else if (mEventException.mEventInfoIdx != -1 && mEventException.mEventInfoIdx != 0xFF) { + u8 eventInfoIdx = mEventException.mEventInfoIdx; + eventIdx = this->getEventIdx(NULL, eventInfoIdx, -1); + success = fopAcM_orderMapToolAutoNextEvent(NULL, eventInfoIdx, eventIdx, 0xFFFF, 1, 5); + } else if (dComIfGp_getStartStagePoint() == -2 || dComIfGp_getStartStagePoint() == -3) { + eventIdx = this->getEventIdx( + daPy_py_c::checkNowWolf() ? "WOLF_WORLD_CHANGE_OUT" : "WORLD_CHANGE_OUT", 0xFF, -1); + success = fopAcM_orderOtherEventId(NULL, eventIdx, 0xFF, 0xFFFF, 5, 1); + } + if (success == FALSE) { + eventIdx = this->getEventIdx("DEFAULT_START", 0xFF, -1); + fopAcM_orderOtherEventId(NULL, eventIdx, 0xFF, 0xFFFF, 5, 1); + } + return eventIdx; } -#pragma pop void dEvent_manager_c::remove() { for (int i = 0; i < 11; i++) { @@ -407,74 +409,184 @@ void dEvent_manager_c::closeProc(dEvDtEvent_c* p_evnt) { p_evnt->mEventState = 2; } -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A0AB = "ALL"; -#pragma pop - /* 80046DAC-80046E64 0416EC 00B8+00 0/0 2/2 0/0 .text endProc__16dEvent_manager_cFsi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::endProc(s16 param_0, int param_1) { - nofralloc -#include "asm/d/event/d_event_manager/endProc__16dEvent_manager_cFsi.s" +void dEvent_manager_c::endProc(s16 param_0, int param_1) { + dEvDtEvent_c* event = this->getEventData(param_0); + if (event != NULL) { + if (param_1 != 0) { + this->closeProc(event); + } + if (event->mEventState == 2) { + char* param = "ALL"; + fopAcM_Search((fopAcIt_JudgeFunc)allOffObjectCallBack, (void*)param); + mCameraPlay = 2; + event->mEventState = 0; + mCurrentEventType = 0; + mCurrentEventCompositId = -1; + dComIfGp_getEvent().setPtD(NULL); + dComIfGp_getEvent().setPtI(NULL); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80451F00-80451F08 000500 0004+04 1/1 0/0 0/0 .sdata2 @4398 */ -SECTION_SDATA2 static f32 lit_4398[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 80451F08-80451F10 000508 0008+00 1/1 0/0 0/0 .sdata2 @4399 */ -SECTION_SDATA2 static f64 lit_4399 = 0.5; - -/* 80451F10-80451F18 000510 0008+00 1/1 0/0 0/0 .sdata2 @4400 */ -SECTION_SDATA2 static f64 lit_4400 = 3.0; - -/* 80451F18-80451F20 000518 0008+00 1/1 0/0 0/0 .sdata2 @4401 */ -SECTION_SDATA2 static u8 lit_4401[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80451F20-80451F24 000520 0004+00 1/1 0/0 0/0 .sdata2 @4402 */ -SECTION_SDATA2 static f32 lit_4402 = 180.0f; - -/* 80451F24-80451F28 000524 0004+00 1/1 0/0 0/0 .sdata2 @4403 */ -SECTION_SDATA2 static f32 lit_4403 = 1.0f; - -/* 80451F28-80451F2C 000528 0004+00 1/1 0/0 0/0 .sdata2 @4404 */ -SECTION_SDATA2 static f32 lit_4404 = -1.0f; /* 80046E64-800473FC 0417A4 0598+00 0/0 1/1 0/0 .text Sequencer__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::Sequencer() { - nofralloc -#include "asm/d/event/d_event_manager/Sequencer__16dEvent_manager_cFv.s" +void dEvent_manager_c::Sequencer() { + dEvt_control_c& evtControl = dComIfGp_getEvent(); + dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId); + dStage_MapEvent_dt_c* mapEvent = evtControl.getStageEventDt(); + if (event != NULL) { + if (evtControl.chkEventFlag(0x100)) { + char* name = NULL; + if (mapEvent != NULL) { + switch (mapEvent->mType) { + case 0: + default: + break; + case 1: + case 2: + name = mapEvent->mName; + break; + } + if (dStage_MapEvent_dt_c_getEventSCutSW(mapEvent) != 0 && !evtControl.chkFlag2(2)) { + if (dStage_MapEvent_dt_c_getEventSCutType(mapEvent) == 2) { + evtControl.onSkipFade(); + } + void* actor = evtControl.getPt1(); + if (actor == NULL) { + actor = evtControl.getPt2(); + } + if (actor == NULL) { + actor = dComIfGp_getPlayer(0); + } + if (actor != NULL) { + switch (mapEvent->mType) { + case 2: + evtControl.setSkipProc(actor, dEv_defaultSkipStb, 0); + break; + case 1: + evtControl.setSkipProc(actor, dEv_defaultSkipZev, 0); + break; + case 0: + evtControl.setSkipProc(actor, dEv_defaultSkipProc, 0); + break; + } + } + } + } + Z2GetAudioMgr()->mStatusMgr.setDemoName(name); + } + if (event->finishCheck() != 0) { + bool bVar1 = false; + if (evtControl.chkFlag2(1)) { + bVar1 = true; + } + int exit = -1; + bool iVar5; + if (evtControl.chkFlag2(2)) { + iVar5 = true; + } else { + iVar5 = false; + } + if (mapEvent != NULL) { + int cutType = dStage_MapEvent_dt_c_getEventSCutType(mapEvent); + if (iVar5 && cutType != 1) { + bVar1 = true; + cXyz attentionPos( + ((fopAc_ac_c*)dComIfGp_getPlayer(0))->mAttentionInfo.mPosition); + cXyz camCenter = dCam_getBody()->Center(); + f32 distance = cXyz((attentionPos - camCenter)).abs(); + if (cutType == 0) { + if (distance > 180) { + dCam_getBody()->EventRecoverNotime(); + } + } else { + switch (mapEvent->field_0x3) { + case 1: + case 2: + if (distance > 180) { + dCam_getBody()->EventRecoverNotime(); + } + break; + case 3: + dCam_getBody()->EventRecoverNotime(); + break; + } + } + } + switch (mapEvent->mType) { + case 0: + switch (mapEvent->field_0x18) { + case 1: + mDoAud_seStart(0xC, NULL, 0, 0); + break; + case 2: + mDoAud_seStart(0xD, NULL, 0, 0); + break; + } + if (!bVar1) { + if (iVar5 && mapEvent->field_0x9 != 0xFF) { + exit = mapEvent->field_0x9; + evtControl.sceneChange(exit); + } else if (mapEvent->field_0x17 != 0xFF) { + exit = mapEvent->field_0x17; + evtControl.sceneChange(exit); + } + } + break; + case 2: + if (!bVar1) { + if (iVar5 && mapEvent->field_0x9 != 0xFF) { + exit = mapEvent->field_0x9; + evtControl.sceneChange(exit); + } else if (mapEvent->field_0x7 != 0xFF) { + exit = mapEvent->field_0x7; + evtControl.sceneChange(exit); + } + } + break; + case 1: + if (!bVar1) { + if (iVar5 && mapEvent->field_0x9 != 0xFF) { + exit = mapEvent->field_0x9; + evtControl.sceneChange(exit); + } else if (mapEvent->field_0x7 != 0xFF) { + exit = mapEvent->field_0x7; + evtControl.sceneChange(exit); + } + } + break; + } + } + if (exit == -1) { + getBase().advanceCut(event); + closeProc(event); + evtControl.reset(); + } + } else { + if (event->mEventState == 1) { + getBase().advanceCut(event); + } + } + if (field_0x1b8 != 0) { + field_0x1b8--; + } + } else { + if (evtControl.chkEventFlag(0x100)) { + Z2GetAudioMgr()->mStatusMgr.setDemoName(NULL); + } + } } -#pragma pop /* 800473FC-80047454 041D3C 0058+00 0/0 1/1 0/0 .text Experts__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::Experts() { - nofralloc -#include "asm/d/event/d_event_manager/Experts__16dEvent_manager_cFv.s" +void dEvent_manager_c::Experts() { + dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId); + if (event != NULL && event->mEventState == 1) { + event->specialStaffProc(this->getBase().getStaffP(0)); + } } -#pragma pop /* 80047454-800474BC 041D94 0068+00 1/1 0/0 0/0 .text getEventData__16dEvent_manager_cFsi */ -#ifdef NONMATCHING dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int idx) { if (idx <= 0 || idx > 11) { return NULL; @@ -486,218 +598,369 @@ dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int idx) { } else if (param_0 < 0 || param_0 >= base->getEventNum()) { return NULL; } else { - return base->getEventP(idx); + return base->getEventP(param_0); } } return NULL; } + +/* 800474BC-80047514 041DFC 0058+00 9/9 3/3 4/4 .text getEventData__16dEvent_manager_cFs + */ +#ifdef NONMATCHING +dEvDtEvent_c* dEvent_manager_c::getEventData(s16 eventCompositId) { + if (param_0 == -1) { + return NULL; + } else { + // extsh instead of mr here + return this->getEventData(getIndexCompositId(param_0), getTypeCompositId(param_0)); + } +} #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int param_1) { - nofralloc -#include "asm/d/event/d_event_manager/getEventData__16dEvent_manager_cFsi.s" -} -#pragma pop -#endif - -/* 800474BC-80047514 041DFC 0058+00 9/9 3/3 4/4 .text getEventData__16dEvent_manager_cFs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0) { +asm dEvDtEvent_c* dEvent_manager_c::getEventData(s16 eventCompositId) { nofralloc #include "asm/d/event/d_event_manager/getEventData__16dEvent_manager_cFs.s" } #pragma pop - -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A0AF = "MapToolCamera%d"; -#pragma pop - -/* 804246A0-804246B4 0513C0 0011+03 1/1 0/0 0/0 .bss map_tool_name$4449 */ -static u8 map_tool_name_4449[17 + 3 /* padding */]; +#endif /* 80047514-80047698 041E54 0184+00 3/3 8/8 3/3 .text getEventIdx__16dEvent_manager_cFPCcUcl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dEvent_manager_c::getEventIdx(char const* param_0, u8 param_1, s32 param_2) { - nofralloc -#include "asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFPCcUcl.s" +s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 param_1, s32 roomNo) { + if (roomNo == -1) { + roomNo = dComIfGp_roomControl_getStayNo(); + } + if (param_1 != 0xFF) { + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_1, roomNo); + if (data != NULL) { + switch (data->mType) { + case 1: + case 2: + return getEventIdx(data->mName, 0xFF, roomNo); + case 0: + static char map_tool_name[17]; + sprintf(map_tool_name, "MapToolCamera%d", param_1); + return getEventIdx(map_tool_name, 0xFF, roomNo); + } + } + } + if (eventName == NULL) { + return -1; + } + dEvDtBase_c* event; + int j; + int i; + for (i = ARRAY_SIZE(mEventList) - 1; i >= 1; i--) { + if (i < 4 || 9 < i || roomNo == mEventList[i].roomNo()) { + event = &mEventList[i]; + if (event->getHeaderP() != NULL) { + for (j = 0; j < event->getHeaderP()->eventNum; j++) { + if (strcmp(eventName, event->getEventName(j)) == 0) { + return makeCompositId(j, i); + } + } + } + } + } + return -1; } -#pragma pop - -/* ############################################################################################## */ -/* 804246B4-804246C8 0513D4 0011+03 1/1 0/0 0/0 .bss map_tool_name$4498 */ -static u8 map_tool_name_4498[17 + 3 /* padding */]; /* 80047698-80047758 041FD8 00C0+00 0/0 3/3 25/25 .text * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getEventIdx(fopAc_ac_c* param_0, u8 param_1) { - nofralloc -#include "asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc.s" +s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 param_1) { + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_1, pActor->getRoomNo()); + if (data != NULL) { + switch (data->mType) { + case 1: + case 2: + return getEventIdx(pActor, data->mName, 0xFF); + case 0: + static char map_tool_name[17]; + sprintf(map_tool_name, "MapToolCamera%d", param_1); + return getEventIdx(pActor, map_tool_name, 0xFF); + } + } + return -1; } -#pragma pop - -/* ############################################################################################## */ -/* 804246C8-804246E0 0513E8 0011+07 1/1 0/0 0/0 .bss map_tool_name$4511 */ -static u8 map_tool_name_4511[17 + 7 /* padding */]; /* 80047758-80047930 042098 01D8+00 1/1 10/10 92/92 .text * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getEventIdx(fopAc_ac_c* param_0, char const* param_1, u8 param_2) { - nofralloc -#include "asm/d/event/d_event_manager/getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc.s" +s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 param_2) { + s8 actorRoomNo = pActor->getRoomNo(); + if (param_2 != 0xFF) { + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_2, actorRoomNo); + if (data != NULL) { + switch (data->mType) { + case 1: + case 2: + return getEventIdx(pActor, data->mName, 0xFF); + case 0: + static char map_tool_name[17]; + sprintf(map_tool_name, "MapToolCamera%d", param_2); + return getEventIdx(pActor, map_tool_name, 0xFF); + } + } + } + if (eventName == NULL) { + return -1; + } + dEvDtBase_c* event; + int j; + int type; + for (type = ARRAY_SIZE(mEventList) - 1; type >= 1; type--) { + dEvDtBase_c* eventP = &mEventList[type]; + dEvDtBase_c event; + if (type < 4 || 9 < type || actorRoomNo == mEventList[type].roomNo()) { + if (pActor != NULL && type == 2 && pActor->mEvtInfo.getArchiveName() != NULL) { + event.init( + (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName), + -1); + eventP = &event; + } + if (eventP->getHeaderP() != NULL) { + for (j = 0; j < eventP->getHeaderP()->eventNum; j++) { + if (strcmp(eventName, eventP->getEventName(j)) == 0) { + return makeCompositId(j, type); + } + } + } + } + } + return -1; } -#pragma pop /* 80047930-80047984 042270 0054+00 0/0 0/0 1/1 .text isMapToolCamera__16dEvent_manager_cFUcl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::isMapToolCamera(u8 param_0, s32 param_1) { - nofralloc -#include "asm/d/event/d_event_manager/isMapToolCamera__16dEvent_manager_cFUcl.s" +int dEvent_manager_c::isMapToolCamera(u8 param_0, s32 roomNo) { + if (roomNo == -1) { + roomNo = dComIfGp_roomControl_getStayNo(); + } + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_0, roomNo); + if (data != NULL) { + return data->mType == 0; + } else { + return 0; + } } -#pragma pop /* 80047984-800479F8 0422C4 0074+00 0/0 6/6 0/0 .text order__16dEvent_manager_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::order(s16 param_0) { - nofralloc -#include "asm/d/event/d_event_manager/order__16dEvent_manager_cFs.s" +int dEvent_manager_c::order(s16 eventCompositId) { + dEvDtEvent_c* event = this->getEventData(eventCompositId); + if (event == NULL) { + return 0; + } else { + mCurrentEventType = getTypeCompositId(eventCompositId); + mCurrentEventCompositId = eventCompositId; + this->startProc(event); + return 1; + } } -#pragma pop /* 800479F8-80047A38 042338 0040+00 1/1 0/0 9/9 .text startCheck__16dEvent_manager_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::startCheck(s16 param_0) { - nofralloc -#include "asm/d/event/d_event_manager/startCheck__16dEvent_manager_cFs.s" +int dEvent_manager_c::startCheck(s16 eventCompositId) { + dEvDtEvent_c* event = this->getEventData(eventCompositId); + if (event == NULL) { + return 0; + } else { + if (event->mEventState == 1) { + return 1; + } else { + return 0; + } + } } -#pragma pop /* 80047A38-80047A78 042378 0040+00 0/0 2/2 0/0 .text startCheckOld__16dEvent_manager_cFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::startCheckOld(char const* param_0) { - nofralloc -#include "asm/d/event/d_event_manager/startCheckOld__16dEvent_manager_cFPCc.s" +int dEvent_manager_c::startCheckOld(char const* pName) { + return this->startCheck(this->getEventIdx(pName, 0xFF, -1)); } -#pragma pop /* 80047A78-80047ADC 0423B8 0064+00 1/1 2/2 122/122 .text endCheck__16dEvent_manager_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::endCheck(s16 param_0) { - nofralloc -#include "asm/d/event/d_event_manager/endCheck__16dEvent_manager_cFs.s" +int dEvent_manager_c::endCheck(s16 param_0) { + dEvDtEvent_c* event = this->getEventData(dComIfGp_getEvent().runningEventID(param_0)); + if (event == NULL) { + return 0; + } else { + if (event->mEventState == 2) { + return 1; + } else { + return 0; + } + } } -#pragma pop /* 80047ADC-80047B1C 04241C 0040+00 0/0 2/2 10/10 .text endCheckOld__16dEvent_manager_cFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::endCheckOld(char const* param_0) { - nofralloc -#include "asm/d/event/d_event_manager/endCheckOld__16dEvent_manager_cFPCc.s" +int dEvent_manager_c::endCheckOld(char const* pName) { + return this->endCheck(this->getEventIdx(pName, 0xFF, -1)); } -#pragma pop - -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A0BF = "Alink"; -SECTION_DEAD static char const* const stringBase_8037A0C5 = "Link"; -#pragma pop /* 80047B1C-80047D4C 04245C 0230+00 1/1 10/10 210/210 .text * getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dEvent_manager_c::getMyStaffId(char const* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/event/d_event_manager/getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci.s" +s32 dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, int tagId) { + int staffNum; + int i; + int evtIdx = -1; + if (dComIfGp_getEvent().getMode() == 0) { + return -1; + } else { + if (pActor != NULL) { + evtIdx = pActor->mEvtInfo.getIdx(); + } + if (mCurrentEventCompositId == -1) { + return -1; + } else { + dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId); + if (event != NULL && (event->mEventState == 1 || event->mEventState == 2)) { + int staffCount = event->getNStaff(); + bool hasDp = false; + if (strchr(pStaffName, ':') != NULL) { + hasDp = true; + } + for (i = 0; i < staffCount; i++) { + staffNum = event->getStaff(i); + dEvDtStaff_c* staff = getBase().getStaffP(staffNum); + if (staff->mType != 1) { + char buf[0x18]; + strcpy(buf, staff->mName); + char* ptr = NULL; + if (!hasDp) { + char* tmpPtr = strchr(buf, ':'); + ptr = tmpPtr; + if (tmpPtr != NULL) { + *tmpPtr = '\0'; + ptr++; + } + } + if (strcmp(pStaffName, buf) == 0 && (tagId < 0 || tagId == staff->mTagID)) { + s16 num = 0; + if (ptr != NULL) { + char c; + while ((c = *ptr) != '\0') { + if (c < '0' || '9' < c) { + num = 0; + break; + } + num = c - '0' + num * 10; + ptr++; + } + if (evtIdx < 0 || num == evtIdx) { + return staffNum; + } + } else { + return staffNum; + } + } + if (strcmp(pStaffName, "Alink") == 0 && strcmp("Link", buf) == 0 && + tagId == staff->mTagID) { + return staffNum; + } + } + } + } + } + } + return -1; } -#pragma pop /* 80047D4C-80047DAC 04268C 0060+00 0/0 9/9 417/417 .text getIsAddvance__16dEvent_manager_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getIsAddvance(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/getIsAddvance__16dEvent_manager_cFi.s" +int dEvent_manager_c::getIsAddvance(int param_0) { + if (dComIfGp_getEvent().getMode() == 0) { + return 0; + } else if (param_0 == -1) { + return 0; + } else if (mCurrentEventCompositId == -1) { + return 0; + } else { + return this->getBase().getStaffP(param_0)->field_0x40; + } } -#pragma pop /* 80047DAC-80047E10 0426EC 0064+00 1/1 0/0 0/0 .text dEvmng_strcmp__FPCcPc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dEvmng_strcmp(char const* param_0, char* param_1) { - nofralloc -#include "asm/d/event/d_event_manager/dEvmng_strcmp__FPCcPc.s" +static int dEvmng_strcmp(char const* param_0, char* param_1) { + u32 len = 0; + while (*param_0 != '\0') { + if (*param_1 == '\0') { + return 1; + } + if (len >= 100) { + return -1; + } + if (*param_0 != *param_1) { + return 1; + } + len++; + param_0++; + param_1++; + } + return 0; } -#pragma pop /* 80047E10-80047F5C 042750 014C+00 1/1 1/1 118/118 .text * getMyActIdx__16dEvent_manager_cFiPCPCciii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int param_2, - int param_3, int param_4) { - nofralloc -#include "asm/d/event/d_event_manager/getMyActIdx__16dEvent_manager_cFiPCPCciii.s" +int dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int param_2, int param_3, + int param_4) { + if (dComIfGp_getEvent().getMode() == 0) { + return 0; + } else if (param_0 == -1) { + return -1; + } else if (mCurrentEventCompositId == -1) { + return -1; + } + dEvDtStaff_c* staff = getBase().getStaffP(param_0); + if (staff) { + if (staff->field_0x41 != false && param_3 == 0) { + return staff->field_0x3c; + } + } else { + return -1; + } + + int i; + char* nowCutName = this->getMyNowCutName(param_0); + if (nowCutName == NULL) { + staff->field_0x3c = -1; + return -1; + } else { + staff->field_0x41 = true; + for (i = 0; i < param_2; i++) { + if (param_4 != 0) { + if (dEvmng_strcmp(param_1[i], nowCutName) == 0) { + staff->field_0x3c = i; + return i; + } + } else { + if (strcmp(param_1[i], nowCutName) == 0) { + staff->field_0x3c = i; + return i; + } + } + } + staff->field_0x3c = -1; + } + return 0; } -#pragma pop /* 80047F5C-80047FC8 04289C 006C+00 1/1 9/9 62/62 .text getMyNowCutName__16dEvent_manager_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getMyNowCutName(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/getMyNowCutName__16dEvent_manager_cFi.s" -} -#pragma pop - -inline dEvt_control_c& dComIfGp_getEvent() { - return g_dComIfG_gameInfo.play.getEvent(); +char* dEvent_manager_c::getMyNowCutName(int index) { + if (dComIfGp_getEvent().getMode() == 0) { + return NULL; + } else if (index == -1) { + return NULL; + } else if (mCurrentEventCompositId == -1) { + return NULL; + } else { + return getBase().getCutStaffCurrentCutP(index)->getName(); + } } /* 80047FC8-800480EC 042908 0124+00 2/2 0/0 0/0 .text getMyDataP__16dEvent_manager_cFiPCci */ -// instruction in wrong place -#ifdef NONMATCHING dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) { if (dComIfGp_getEvent().getMode() == 0) { return NULL; } else if (index == -1) { return NULL; - } else if (field_0x1aa == -1) { + } else if (mCurrentEventCompositId == -1) { return NULL; } else { dEvDtCut_c* cut; @@ -709,7 +972,7 @@ dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) int top = cut->getDataTop(); while (top != -1) { - dEvDtData_c* data = getBase().getDataP(index); + dEvDtData_c* data = getBase().getDataP(top); if (!strcmp(name, data->getName())) { return data; } @@ -719,16 +982,6 @@ dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) return NULL; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvDtData_c* dEvent_manager_c::getMyDataP(int param_0, char const* param_1, int param_2) { - nofralloc -#include "asm/d/event/d_event_manager/getMyDataP__16dEvent_manager_cFiPCci.s" -} -#pragma pop -#endif /* 800480EC-80048144 042A2C 0058+00 0/0 22/22 355/355 .text * getMySubstanceP__16dEvent_manager_cFiPCci */ @@ -742,17 +995,31 @@ void* dEvent_manager_c::getMySubstanceP(int index, char const* name, int type) { /* 80048144-8004817C 042A84 0038+00 0/0 12/12 0/0 .text getMySubstanceNum__16dEvent_manager_cFiPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getMySubstanceNum(int param_0, char const* param_1) { - nofralloc -#include "asm/d/event/d_event_manager/getMySubstanceNum__16dEvent_manager_cFiPCc.s" +int dEvent_manager_c::getMySubstanceNum(int index, char const* name) { + dEvDtData_c* data = getMyDataP(index, name, 0); + if (data == NULL) { + return NULL; + } else { + return data->getNumber(); + } } -#pragma pop /* 8004817C-800481F4 042ABC 0078+00 1/1 78/78 182/182 .text cutEnd__16dEvent_manager_cFi */ +#ifdef NONMATCHING +void dEvent_manager_c::cutEnd(int index) { + if (dComIfGp_getEvent().getMode() == 0) { + return; + } else if (index == -1) { + return; + } else if (field_0x1aa == -1) { + return; + } else { + // instruction swap + mFlags.flagSet(getBase().getCutStaffCurrentCutP(index)->getFlagId()); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -761,176 +1028,189 @@ asm void dEvent_manager_c::cutEnd(int param_0) { #include "asm/d/event/d_event_manager/cutEnd__16dEvent_manager_cFi.s" } #pragma pop +#endif /* 800481F4-800482CC 042B34 00D8+00 0/0 4/4 0/0 .text * getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getEventPrio(fopAc_ac_c* param_0, s16 param_1) { - nofralloc -#include "asm/d/event/d_event_manager/getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs.s" +int dEvent_manager_c::getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId) { + dEvDtEvent_c* event = NULL; + dEvDtBase_c eventBase; + if (getTypeCompositId(eventCompositId) == 2 && pActor != NULL && + pActor->mEvtInfo.getArchiveName() != NULL) { + char* data = (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName); + eventBase.init(data, -1); + event = eventBase.mEventP; + } + if (event == NULL) { + event = getEventData(eventCompositId); + } + if (event == NULL) { + return 0; + } else { + return event->getPriority(); + } } -#pragma pop /* 800482CC-80048348 042C0C 007C+00 1/1 1/1 0/0 .text issueStaff__16dEvent_manager_cFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::issueStaff(char const* param_0) { - nofralloc -#include "asm/d/event/d_event_manager/issueStaff__16dEvent_manager_cFPCc.s" +void dEvent_manager_c::issueStaff(char const* pName) { + if (!strcmp(pName, "ALL")) { + fopAcM_Search((fopAcIt_JudgeFunc)extraOnObjectCallBack, NULL); + } else { + char nameBuf[0x20]; + strcpy(nameBuf, pName); + fopAcM_OnStatus(fopAcM_searchFromName4Event(nameBuf, -1), 0x800); + } } -#pragma pop /* 80048348-800483C4 042C88 007C+00 0/0 1/1 0/0 .text cancelStaff__16dEvent_manager_cFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::cancelStaff(char const* param_0) { - nofralloc -#include "asm/d/event/d_event_manager/cancelStaff__16dEvent_manager_cFPCc.s" +void dEvent_manager_c::cancelStaff(char const* pName) { + if (!strcmp(pName, "ALL")) { + fopAcM_Search((fopAcIt_JudgeFunc)extraOffObjectCallBack, NULL); + } else { + char nameBuf[0x20]; + strcpy(nameBuf, pName); + fopAcM_OffStatus(fopAcM_searchFromName4Event(nameBuf, -1), 0x800); + } } -#pragma pop /* 800483C4-800483E0 042D04 001C+00 1/1 2/2 38/38 .text setGoal__16dEvent_manager_cFP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::setGoal(cXyz* param_0) { - nofralloc -#include "asm/d/event/d_event_manager/setGoal__16dEvent_manager_cFP4cXyz.s" +void dEvent_manager_c::setGoal(cXyz* pGoal) { + mGoal = *pGoal; } -#pragma pop /* 800483E0-800483E8 042D20 0008+00 0/0 1/1 1/1 .text getGoal__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getGoal() { - nofralloc -#include "asm/d/event/d_event_manager/getGoal__16dEvent_manager_cFv.s" +cXyz* dEvent_manager_c::getGoal() { + return &mGoal; } -#pragma pop - -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A0CA = "NO DATA"; -SECTION_DEAD static char const* const stringBase_8037A0D2 = "NOT RUNNING"; -#pragma pop /* 800483E8-8004846C 042D28 0084+00 0/0 5/5 27/27 .text getRunEventName__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getRunEventName() { - nofralloc -#include "asm/d/event/d_event_manager/getRunEventName__16dEvent_manager_cFv.s" +const char* dEvent_manager_c::getRunEventName() { + if (mCurrentEventCompositId == -1) { + return "NO DATA"; + } + if (getBase().getHeaderP() == NULL) { + return "NO DATA"; + } + dEvDtEvent_c* event = getEventData(mCurrentEventCompositId); + if (event != NULL && event->mEventState == 1) { + return event->getName(); + } else { + return "NOT RUNNING"; + } } -#pragma pop -/* ############################################################################################## */ -/* 80451F2C-80451F30 00052C 0004+00 1/1 0/0 0/0 .sdata2 @5025 */ -SECTION_SDATA2 static f32 lit_5025 = 10.0f; - -/* 80451F30-80451F34 000530 0004+00 1/1 0/0 0/0 .sdata2 @5026 */ -SECTION_SDATA2 static f32 lit_5026 = -10.0f; +struct FindShtrCbPrms { + s16 mBsTypeId; + fopAc_ac_c* mActor; +}; /* 8004846C-80048520 042DAC 00B4+00 1/1 0/0 0/0 .text findShutterCallBack__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void findShutterCallBack(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/event/d_event_manager/findShutterCallBack__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* pActor, void* param_1) { + FindShtrCbPrms* prms = (FindShtrCbPrms*)param_1; + if (prms->mBsTypeId != fpcAcM_GetProfName(pActor)) { + return NULL; + } + cXyz diff = pActor->mOrig.mPosition - prms->mActor->mOrig.mPosition; + if (diff.x < 10 && diff.x > -10 && diff.y < 10 && diff.y > -10 && diff.z < 10 && diff.z > -10) { + return pActor; + } + return NULL; } -#pragma pop - -/* ############################################################################################## */ -/* 80451F34-80451F38 000534 0004+00 1/1 0/0 0/0 .sdata2 @5055 */ -SECTION_SDATA2 static f32 lit_5055 = 100.0f; /* 80048520-80048618 042E60 00F8+00 1/1 0/0 0/0 .text specialCast_Shutter__16dEvent_manager_cFsi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::specialCast_Shutter(s16 param_0, int param_1) { - nofralloc -#include "asm/d/event/d_event_manager/specialCast_Shutter__16dEvent_manager_cFsi.s" +fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) { + FindShtrCbPrms prms; + prms.mBsTypeId = bsTypeId; + prms.mActor = (fopAc_ac_c*)dComIfGp_getPlayer(0); + fopAc_ac_c* shutterActor = + (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)findShutterCallBack, &prms); + if (shutterActor != NULL && param_1 != 0) { + cXyz goal(shutterActor->mOrig.mPosition); + s16 angle = prms.mActor->mOrig.mAngle.y + 0x8000; + goal.x += cM_ssin(angle) * 100; + goal.z += cM_scos(angle) * 100; + this->setGoal(&goal); + dComIfGp_getEvent().setPt2(shutterActor); + dComIfGp_getEvent().setPtD(shutterActor); + } + return shutterActor; } -#pragma pop - -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A0DE = "SHUTTER_DOOR"; -#pragma pop /* 80048618-80048748 042F58 0130+00 1/1 0/0 0/0 .text specialCast__16dEvent_manager_cFPCci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fopAc_ac_c* dEvent_manager_c::specialCast(char const* param_0, int param_1) { - nofralloc -#include "asm/d/event/d_event_manager/specialCast__16dEvent_manager_cFPCci.s" +fopAc_ac_c* dEvent_manager_c::specialCast(char const* pName, int param_1) { + fopAc_ac_c* shutterActor = NULL; + if (pName == NULL) { + return NULL; + } + if (!strcmp(pName, "SHUTTER_DOOR")) { + shutterActor = specialCast_Shutter(0x226, param_1); + if (shutterActor == NULL) { + shutterActor = specialCast_Shutter(0x228, param_1); + } + if (shutterActor == NULL) { + shutterActor = specialCast_Shutter(0x229, param_1); + } + if (shutterActor == NULL) { + shutterActor = specialCast_Shutter(0x22A, param_1); + } + if (shutterActor == NULL) { + shutterActor = specialCast_Shutter(0x22B, param_1); + } + if (shutterActor != NULL) { + dComIfGp_getEvent().onEventFlag(0x10); + } + } + if (shutterActor != NULL) { + if (param_1 != 0) { + fopAcM_OnStatus(shutterActor, 0x1000); + } else { + fopAcM_OffStatus(shutterActor, 0x1000); + } + } + return shutterActor; } -#pragma pop - -/* ############################################################################################## */ -/* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8037A0EB = "WAIT"; -SECTION_DEAD static char const* const stringBase_8037A0F0 = "TALK0"; -SECTION_DEAD static char const* const stringBase_8037A0F6 = "TALK1"; -SECTION_DEAD static char const* const stringBase_8037A0FC = "TALKMAN"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8037A104 = "\0\0\0"; -#pragma pop - -/* 803A82A8-803A82B8 -00001 000C+04 1/1 0/0 0/0 .data action_table$5100 */ -SECTION_DATA static void* action_table[3 + 1 /* padding */] = { - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x18B), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x190), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x196), - /* padding */ - NULL, -}; /* 80048748-800487F0 043088 00A8+00 1/1 0/0 0/0 .text dEv_talkman_get_action__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dEv_talkman_get_action(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/dEv_talkman_get_action__Fi.s" +static int dEv_talkman_get_action(int param_0) { + int staffId = dComIfGp_getEventManager().getMyStaffId("TALKMAN", NULL, -1); + if (staffId == -1) { + return -1; + } else { + /* 803A82A8-803A82B8 -00001 000C+04 1/1 0/0 0/0 .data action_table$5100 */ + static char* action_table[] = { + "WAIT", + "TALK0", + "TALK1", + }; + int actIdx = dComIfGp_getEventManager().getMyActIdx(staffId, action_table, + ARRAY_SIZE(action_table), 0, 0); + if (actIdx == param_0) { + dComIfGp_getEventManager().cutEnd(staffId); + } + return actIdx; + } } -#pragma pop /* 800487F0-8004882C 043130 003C+00 0/0 0/0 108/108 .text ChkPresentEnd__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::ChkPresentEnd() { - nofralloc -#include "asm/d/event/d_event_manager/ChkPresentEnd__16dEvent_manager_cFv.s" +int dEvent_manager_c::ChkPresentEnd() { + return dEv_talkman_get_action(0) >= 1; } -#pragma pop /* 8004882C-8004886C 04316C 0040+00 0/0 2/2 2/2 .text checkStartDemo__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::checkStartDemo() { - nofralloc -#include "asm/d/event/d_event_manager/checkStartDemo__16dEvent_manager_cFv.s" +int dEvent_manager_c::checkStartDemo() { + if (!dComIfGp_getEvent().runCheck()) { + return 0; + } + if (mEventException.mEventInfoIdx == -1) { + return 0; + } + if (mEventException.mEventInfoIdx == -2) { + return 0; + } + return 1; } -#pragma pop /* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */