diff --git a/Progress.md b/Progress.md index 2ac866c90b0..67562e80088 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 31.257674% | 1124196 | 3596544 +.text | 31.559742% | 1135060 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 38.504310% | 1548132 | 4020672 +Total | 38.774513% | 1558996 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 38.504310% | 1548132 | 4020672 -RELs | 34.251939% | 3939084 | 11500324 -Total | 35.353504% | 5487216 | 15520996 +main.dol | 38.774513% | 1558996 | 4020672 +RELs | 34.280808% | 3942404 | 11500324 +Total | 35.444890% | 5501400 | 15520996 ## RELs @@ -533,7 +533,7 @@ d_a_obj_lv8OptiLift | 35.768374% | 3212 | 8980 d_a_obj_lv8UdFloor | 39.681529% | 2492 | 6280 d_a_obj_lv9SwShutter | 48.128342% | 2160 | 4488 d_a_obj_magLift | 41.319181% | 2180 | 5276 -d_a_obj_magLiftRot | 40.697674% | 3080 | 7568 +d_a_obj_magLiftRot | 51.744186% | 3916 | 7568 d_a_obj_magne_arm | 34.395028% | 7084 | 20596 d_a_obj_maki | 45.531587% | 2364 | 5192 d_a_obj_master_sword | 43.575419% | 2808 | 6444 @@ -613,7 +613,7 @@ d_a_obj_stone | 35.435257% | 7148 | 20172 d_a_obj_stoneMark | 64.901961% | 1324 | 2040 d_a_obj_stopper | 31.675996% | 3848 | 12148 d_a_obj_stopper2 | 38.987342% | 1848 | 4740 -d_a_obj_suisya | 49.914821% | 1172 | 2348 +d_a_obj_suisya | 100.000000% | 2348 | 2348 d_a_obj_sw | 27.590884% | 4068 | 14744 d_a_obj_swBallA | 35.803945% | 2396 | 6692 d_a_obj_swBallB | 34.276891% | 2664 | 7772 @@ -636,7 +636,7 @@ d_a_obj_takaraDai | 46.376812% | 2304 | 4968 d_a_obj_tatigi | 40.549020% | 2068 | 5100 d_a_obj_ten | 30.064631% | 5396 | 17948 d_a_obj_testcube | 100.000000% | 504 | 504 -d_a_obj_tgake | 49.302326% | 1272 | 2580 +d_a_obj_tgake | 100.000000% | 2580 | 2580 d_a_obj_thashi | 49.534161% | 3828 | 7728 d_a_obj_thdoor | 39.419319% | 2824 | 7164 d_a_obj_timeFire | 43.483146% | 1548 | 3560 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 34.251939% | 3939084 | 11500324 +Total | 34.280808% | 3942404 | 11500324 diff --git a/asm/a/npc/d_a_npc_cd/ObjCreate__9daNpcCd_cFi.s b/asm/a/npc/d_a_npc_cd/ObjCreate__9daNpcCd_cFi.s deleted file mode 100644 index 98659cee830..00000000000 --- a/asm/a/npc/d_a_npc_cd/ObjCreate__9daNpcCd_cFi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_801561E8: -/* 801561E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801561EC 7C 08 02 A6 */ mflr r0 -/* 801561F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801561F4 48 00 13 95 */ bl getObjMdlDataP__9daNpcCd_cFi -/* 801561F8 28 03 00 00 */ cmplwi r3, 0 -/* 801561FC 41 82 00 18 */ beq lbl_80156214 -/* 80156200 3C 80 00 08 */ lis r4, 8 -/* 80156204 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80156208 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8015620C 4B EB EA 49 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80156210 48 00 00 08 */ b lbl_80156218 -lbl_80156214: -/* 80156214 38 60 00 00 */ li r3, 0 -lbl_80156218: -/* 80156218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015621C 7C 08 03 A6 */ mtlr r0 -/* 80156220 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156224 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd/animation__9daNpcCd_cFv.s b/asm/a/npc/d_a_npc_cd/animation__9daNpcCd_cFv.s deleted file mode 100644 index a238fa98413..00000000000 --- a/asm/a/npc/d_a_npc_cd/animation__9daNpcCd_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80156DBC: -/* 80156DBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80156DC0 7C 08 02 A6 */ mflr r0 -/* 80156DC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80156DC8 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80156DCC F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80156DD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80156DD4 7C 7F 1B 78 */ mr r31, r3 -/* 80156DD8 80 63 05 8C */ lwz r3, 0x58c(r3) -/* 80156DDC C3 E3 00 1C */ lfs f31, 0x1c(r3) -/* 80156DE0 38 80 00 00 */ li r4, 0 -/* 80156DE4 38 A0 00 00 */ li r5, 0 -/* 80156DE8 4B EB A2 C9 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 80156DEC 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80156DF0 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80156DF4 FC 00 F8 40 */ fcmpo cr0, f0, f31 -/* 80156DF8 40 80 00 0C */ bge lbl_80156E04 -/* 80156DFC 38 7F 09 C8 */ addi r3, r31, 0x9c8 -/* 80156E00 4B FF 65 49 */ bl func_8014D348 -lbl_80156E04: -/* 80156E04 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80156E08 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80156E0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80156E10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80156E14 7C 08 03 A6 */ mtlr r0 -/* 80156E18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80156E1C 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd/jntNodeCallBack__FP8J3DJointi.s b/asm/a/npc/d_a_npc_cd/jntNodeCallBack__FP8J3DJointi.s deleted file mode 100644 index 53a479a64a8..00000000000 --- a/asm/a/npc/d_a_npc_cd/jntNodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80156010: -/* 80156010 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80156014 7C 08 02 A6 */ mflr r0 -/* 80156018 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015601C 7C 60 1B 78 */ mr r0, r3 -/* 80156020 2C 04 00 00 */ cmpwi r4, 0 -/* 80156024 40 82 00 24 */ bne lbl_80156048 -/* 80156028 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8015602C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80156030 80 A3 00 38 */ lwz r5, 0x38(r3) -/* 80156034 80 65 00 14 */ lwz r3, 0x14(r5) -/* 80156038 28 03 00 00 */ cmplwi r3, 0 -/* 8015603C 41 82 00 0C */ beq lbl_80156048 -/* 80156040 7C 04 03 78 */ mr r4, r0 -/* 80156044 48 00 10 41 */ bl jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel -lbl_80156048: -/* 80156048 38 60 00 01 */ li r3, 1 -/* 8015604C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80156050 7C 08 03 A6 */ mtlr r0 -/* 80156054 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156058 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd/loadResrc__9daNpcCd_cFii.s b/asm/a/npc/d_a_npc_cd/loadResrc__9daNpcCd_cFii.s deleted file mode 100644 index 9293a10e77f..00000000000 --- a/asm/a/npc/d_a_npc_cd/loadResrc__9daNpcCd_cFii.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80156B4C: -/* 80156B4C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80156B50 7C 08 02 A6 */ mflr r0 -/* 80156B54 90 01 00 24 */ stw r0, 0x24(r1) -/* 80156B58 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156B5C 48 20 B6 7D */ bl _savegpr_28 -/* 80156B60 7C 7C 1B 78 */ mr r28, r3 -/* 80156B64 7C 9D 23 78 */ mr r29, r4 -/* 80156B68 88 03 09 E8 */ lbz r0, 0x9e8(r3) -/* 80156B6C 28 00 00 00 */ cmplwi r0, 0 -/* 80156B70 41 82 00 48 */ beq lbl_80156BB8 -/* 80156B74 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80156B78 57 BF 10 3A */ slwi r31, r29, 2 -/* 80156B7C 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B3B8C@ha */ -/* 80156B80 3B C4 3B 8C */ addi r30, r4, l_resNameTbl@l /* 0x803B3B8C@l */ -/* 80156B84 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156B88 80 84 00 04 */ lwz r4, 4(r4) -/* 80156B8C 4B ED 63 31 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80156B90 2C 03 00 04 */ cmpwi r3, 4 -/* 80156B94 41 82 00 08 */ beq lbl_80156B9C -/* 80156B98 48 00 00 A0 */ b lbl_80156C38 -lbl_80156B9C: -/* 80156B9C 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80156BA0 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156BA4 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80156BA8 4B ED 63 15 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80156BAC 2C 03 00 04 */ cmpwi r3, 4 -/* 80156BB0 41 82 00 4C */ beq lbl_80156BFC -/* 80156BB4 48 00 00 84 */ b lbl_80156C38 -lbl_80156BB8: -/* 80156BB8 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80156BBC 57 BF 10 3A */ slwi r31, r29, 2 -/* 80156BC0 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B3B8C@ha */ -/* 80156BC4 3B C4 3B 8C */ addi r30, r4, l_resNameTbl@l /* 0x803B3B8C@l */ -/* 80156BC8 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156BCC 80 84 00 00 */ lwz r4, 0(r4) -/* 80156BD0 4B ED 62 ED */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80156BD4 2C 03 00 04 */ cmpwi r3, 4 -/* 80156BD8 41 82 00 08 */ beq lbl_80156BE0 -/* 80156BDC 48 00 00 5C */ b lbl_80156C38 -lbl_80156BE0: -/* 80156BE0 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80156BE4 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156BE8 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80156BEC 4B ED 62 D1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80156BF0 2C 03 00 04 */ cmpwi r3, 4 -/* 80156BF4 41 82 00 08 */ beq lbl_80156BFC -/* 80156BF8 48 00 00 40 */ b lbl_80156C38 -lbl_80156BFC: -/* 80156BFC 38 7C 05 74 */ addi r3, r28, 0x574 -/* 80156C00 57 BE 10 3A */ slwi r30, r29, 2 -/* 80156C04 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B3B8C@ha */ -/* 80156C08 3B E4 3B 8C */ addi r31, r4, l_resNameTbl@l /* 0x803B3B8C@l */ -/* 80156C0C 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80156C10 80 84 00 08 */ lwz r4, 8(r4) -/* 80156C14 4B ED 62 A9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80156C18 2C 03 00 04 */ cmpwi r3, 4 -/* 80156C1C 41 82 00 08 */ beq lbl_80156C24 -/* 80156C20 48 00 00 18 */ b lbl_80156C38 -lbl_80156C24: -/* 80156C24 38 7C 05 7C */ addi r3, r28, 0x57c -/* 80156C28 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80156C2C 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80156C30 4B ED 62 8D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80156C34 2C 03 00 04 */ cmpwi r3, 4 -lbl_80156C38: -/* 80156C38 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156C3C 48 20 B5 E9 */ bl _restgpr_28 -/* 80156C40 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80156C44 7C 08 03 A6 */ mtlr r0 -/* 80156C48 38 21 00 20 */ addi r1, r1, 0x20 -/* 80156C4C 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd/removeResrc__9daNpcCd_cFii.s b/asm/a/npc/d_a_npc_cd/removeResrc__9daNpcCd_cFii.s deleted file mode 100644 index 91f90993cd1..00000000000 --- a/asm/a/npc/d_a_npc_cd/removeResrc__9daNpcCd_cFii.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80156C50: -/* 80156C50 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80156C54 7C 08 02 A6 */ mflr r0 -/* 80156C58 90 01 00 24 */ stw r0, 0x24(r1) -/* 80156C5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156C60 48 20 B5 79 */ bl _savegpr_28 -/* 80156C64 7C 7C 1B 78 */ mr r28, r3 -/* 80156C68 7C 9D 23 78 */ mr r29, r4 -/* 80156C6C 88 03 09 E8 */ lbz r0, 0x9e8(r3) -/* 80156C70 28 00 00 00 */ cmplwi r0, 0 -/* 80156C74 41 82 00 34 */ beq lbl_80156CA8 -/* 80156C78 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80156C7C 57 BF 10 3A */ slwi r31, r29, 2 -/* 80156C80 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B3B8C@ha */ -/* 80156C84 3B C4 3B 8C */ addi r30, r4, l_resNameTbl@l /* 0x803B3B8C@l */ -/* 80156C88 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156C8C 80 84 00 04 */ lwz r4, 4(r4) -/* 80156C90 4B ED 63 79 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80156C94 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80156C98 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156C9C 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80156CA0 4B ED 63 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80156CA4 48 00 00 30 */ b lbl_80156CD4 -lbl_80156CA8: -/* 80156CA8 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80156CAC 57 BF 10 3A */ slwi r31, r29, 2 -/* 80156CB0 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B3B8C@ha */ -/* 80156CB4 3B C4 3B 8C */ addi r30, r4, l_resNameTbl@l /* 0x803B3B8C@l */ -/* 80156CB8 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156CBC 80 84 00 00 */ lwz r4, 0(r4) -/* 80156CC0 4B ED 63 49 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80156CC4 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80156CC8 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80156CCC 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80156CD0 4B ED 63 39 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_80156CD4: -/* 80156CD4 38 7C 05 74 */ addi r3, r28, 0x574 -/* 80156CD8 57 BE 10 3A */ slwi r30, r29, 2 -/* 80156CDC 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B3B8C@ha */ -/* 80156CE0 3B E4 3B 8C */ addi r31, r4, l_resNameTbl@l /* 0x803B3B8C@l */ -/* 80156CE4 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80156CE8 80 84 00 08 */ lwz r4, 8(r4) -/* 80156CEC 4B ED 63 1D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80156CF0 38 7C 05 7C */ addi r3, r28, 0x57c -/* 80156CF4 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80156CF8 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80156CFC 4B ED 63 0D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80156D00 38 60 00 01 */ li r3, 1 -/* 80156D04 39 61 00 20 */ addi r11, r1, 0x20 -/* 80156D08 48 20 B5 1D */ bl _restgpr_28 -/* 80156D0C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80156D10 7C 08 03 A6 */ mtlr r0 -/* 80156D14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80156D18 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd/setEnvTevCol__9daNpcCd_cFv.s b/asm/a/npc/d_a_npc_cd/setEnvTevCol__9daNpcCd_cFv.s deleted file mode 100644 index 8b3c996a843..00000000000 --- a/asm/a/npc/d_a_npc_cd/setEnvTevCol__9daNpcCd_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80156D1C: -/* 80156D1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80156D20 7C 08 02 A6 */ mflr r0 -/* 80156D24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80156D28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80156D2C 93 C1 00 08 */ stw r30, 8(r1) -/* 80156D30 7C 7E 1B 78 */ mr r30, r3 -/* 80156D34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80156D38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80156D3C 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80156D40 7F E3 FB 78 */ mr r3, r31 -/* 80156D44 38 9E 07 24 */ addi r4, r30, 0x724 -/* 80156D48 4B F1 DE A1 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80156D4C 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80156D50 7F E3 FB 78 */ mr r3, r31 -/* 80156D54 38 9E 07 24 */ addi r4, r30, 0x724 -/* 80156D58 4B F1 E3 A9 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80156D5C 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80156D60 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80156D64 83 C1 00 08 */ lwz r30, 8(r1) -/* 80156D68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80156D6C 7C 08 03 A6 */ mtlr r0 -/* 80156D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156D74 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd/setRoomNo__9daNpcCd_cFv.s b/asm/a/npc/d_a_npc_cd/setRoomNo__9daNpcCd_cFv.s deleted file mode 100644 index 537177582bf..00000000000 --- a/asm/a/npc/d_a_npc_cd/setRoomNo__9daNpcCd_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80156D78: -/* 80156D78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80156D7C 7C 08 02 A6 */ mflr r0 -/* 80156D80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80156D84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80156D88 7C 7F 1B 78 */ mr r31, r3 -/* 80156D8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80156D90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80156D94 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80156D98 38 9F 07 24 */ addi r4, r31, 0x724 -/* 80156D9C 4B F1 E3 65 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80156DA0 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80156DA4 98 7F 08 6E */ stb r3, 0x86e(r31) -/* 80156DA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80156DAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80156DB0 7C 08 03 A6 */ mtlr r0 -/* 80156DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156DB8 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/ObjCreate__10daNpcCd2_cFi.s b/asm/a/npc/d_a_npc_cd2/ObjCreate__10daNpcCd2_cFi.s deleted file mode 100644 index 6f44d3681f1..00000000000 --- a/asm/a/npc/d_a_npc_cd2/ObjCreate__10daNpcCd2_cFi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80157F28: -/* 80157F28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80157F2C 7C 08 02 A6 */ mflr r0 -/* 80157F30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80157F34 48 00 1A 19 */ bl getObjMdlDataP__10daNpcCd2_cFi -/* 80157F38 28 03 00 00 */ cmplwi r3, 0 -/* 80157F3C 41 82 00 18 */ beq lbl_80157F54 -/* 80157F40 3C 80 00 08 */ lis r4, 8 -/* 80157F44 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80157F48 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80157F4C 4B EB CD 09 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80157F50 48 00 00 08 */ b lbl_80157F58 -lbl_80157F54: -/* 80157F54 38 60 00 00 */ li r3, 0 -lbl_80157F58: -/* 80157F58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80157F5C 7C 08 03 A6 */ mtlr r0 -/* 80157F60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80157F64 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/checkObstacle__11PathTrace_cFP10fopAc_ac_c.s b/asm/a/npc/d_a_npc_cd2/checkObstacle__11PathTrace_cFP10fopAc_ac_c.s deleted file mode 100644 index 6d5e1c254fb..00000000000 --- a/asm/a/npc/d_a_npc_cd2/checkObstacle__11PathTrace_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8015A370: -/* 8015A370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015A374 7C 08 02 A6 */ mflr r0 -/* 8015A378 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015A37C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015A380 7C 7F 1B 78 */ mr r31, r3 -/* 8015A384 90 83 00 00 */ stw r4, 0(r3) -/* 8015A388 38 00 00 00 */ li r0, 0 -/* 8015A38C 90 03 00 04 */ stw r0, 4(r3) -/* 8015A390 80 63 00 00 */ lwz r3, 0(r3) -/* 8015A394 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8015A398 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8015A39C 41 82 00 0C */ beq lbl_8015A3A8 -/* 8015A3A0 38 60 00 00 */ li r3, 0 -/* 8015A3A4 48 00 00 2C */ b lbl_8015A3D0 -lbl_8015A3A8: -/* 8015A3A8 3C 60 80 16 */ lis r3, s_sub__FPvPv@ha /* 0x8015A2C4@ha */ -/* 8015A3AC 38 63 A2 C4 */ addi r3, r3, s_sub__FPvPv@l /* 0x8015A2C4@l */ -/* 8015A3B0 7F E4 FB 78 */ mr r4, r31 -/* 8015A3B4 4B EC 6F 85 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 8015A3B8 80 1F 00 04 */ lwz r0, 4(r31) -/* 8015A3BC 28 00 00 00 */ cmplwi r0, 0 -/* 8015A3C0 41 82 00 0C */ beq lbl_8015A3CC -/* 8015A3C4 7F E3 FB 78 */ mr r3, r31 -/* 8015A3C8 4B FF FB 05 */ bl setAvoidPoint__11PathTrace_cFv -lbl_8015A3CC: -/* 8015A3CC 80 7F 00 04 */ lwz r3, 4(r31) -lbl_8015A3D0: -/* 8015A3D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015A3D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015A3D8 7C 08 03 A6 */ mtlr r0 -/* 8015A3DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015A3E0 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/drawNpc__10daNpcCd2_cFv.s b/asm/a/npc/d_a_npc_cd2/drawNpc__10daNpcCd2_cFv.s deleted file mode 100644 index c1da0fe675d..00000000000 --- a/asm/a/npc/d_a_npc_cd2/drawNpc__10daNpcCd2_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_801590FC: -/* 801590FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80159100 7C 08 02 A6 */ mflr r0 -/* 80159104 90 01 00 14 */ stw r0, 0x14(r1) -/* 80159108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015910C 7C 7F 1B 78 */ mr r31, r3 -/* 80159110 88 03 0A C6 */ lbz r0, 0xac6(r3) -/* 80159114 28 00 00 00 */ cmplwi r0, 0 -/* 80159118 41 82 00 20 */ beq lbl_80159138 -/* 8015911C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80159120 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80159124 38 80 00 04 */ li r4, 4 -/* 80159128 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8015912C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80159130 48 04 A6 95 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80159134 48 00 00 1C */ b lbl_80159150 -lbl_80159138: -/* 80159138 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8015913C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80159140 38 80 00 00 */ li r4, 0 -/* 80159144 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80159148 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8015914C 48 04 A6 79 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -lbl_80159150: -/* 80159150 88 1F 0A C6 */ lbz r0, 0xac6(r31) -/* 80159154 28 00 00 00 */ cmplwi r0, 0 -/* 80159158 41 82 00 20 */ beq lbl_80159178 -/* 8015915C 48 00 62 C9 */ bl checkNowWolfEyeUp__9daPy_py_cFv -/* 80159160 2C 03 00 00 */ cmpwi r3, 0 -/* 80159164 40 82 00 14 */ bne lbl_80159178 -/* 80159168 7F E3 FB 78 */ mr r3, r31 -/* 8015916C 48 00 03 E5 */ bl setHitodamaParticle__10daNpcCd2_cFv -/* 80159170 38 60 00 01 */ li r3, 1 -/* 80159174 48 00 00 D0 */ b lbl_80159244 -lbl_80159178: -/* 80159178 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 8015917C 80 83 00 04 */ lwz r4, 4(r3) -/* 80159180 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80159184 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80159188 80 84 00 04 */ lwz r4, 4(r4) -/* 8015918C 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80159190 48 04 BC 11 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80159194 88 1F 0A C6 */ lbz r0, 0xac6(r31) -/* 80159198 28 00 00 00 */ cmplwi r0, 0 -/* 8015919C 41 82 00 24 */ beq lbl_801591C0 -/* 801591A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801591A4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801591A8 80 04 5F 88 */ lwz r0, 0x5f88(r4) -/* 801591AC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 801591B0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 801591B4 90 03 00 48 */ stw r0, 0x48(r3) -/* 801591B8 80 04 5F 8C */ lwz r0, 0x5f8c(r4) -/* 801591BC 90 03 00 4C */ stw r0, 0x4c(r3) -lbl_801591C0: -/* 801591C0 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 801591C4 28 03 00 00 */ cmplwi r3, 0 -/* 801591C8 41 82 00 44 */ beq lbl_8015920C -/* 801591CC 80 9F 05 8C */ lwz r4, 0x58c(r31) -/* 801591D0 80 84 00 04 */ lwz r4, 4(r4) -/* 801591D4 80 84 00 04 */ lwz r4, 4(r4) -/* 801591D8 38 84 00 58 */ addi r4, r4, 0x58 -/* 801591DC A8 BF 0A C4 */ lha r5, 0xac4(r31) -/* 801591E0 4B EB 44 09 */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables -/* 801591E4 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 801591E8 4B EB 7F D9 */ bl entryDL__16mDoExt_McaMorfSOFv -/* 801591EC 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 801591F0 80 63 00 04 */ lwz r3, 4(r3) -/* 801591F4 80 63 00 04 */ lwz r3, 4(r3) -/* 801591F8 38 63 00 58 */ addi r3, r3, 0x58 -/* 801591FC 80 9F 05 90 */ lwz r4, 0x590(r31) -/* 80159200 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80159204 48 1D 64 F5 */ bl removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern -/* 80159208 48 00 00 0C */ b lbl_80159214 -lbl_8015920C: -/* 8015920C 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80159210 4B EB 7F B1 */ bl entryDL__16mDoExt_McaMorfSOFv -lbl_80159214: -/* 80159214 88 1F 0A C6 */ lbz r0, 0xac6(r31) -/* 80159218 28 00 00 00 */ cmplwi r0, 0 -/* 8015921C 41 82 00 24 */ beq lbl_80159240 -/* 80159220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80159224 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80159228 80 04 5F 80 */ lwz r0, 0x5f80(r4) -/* 8015922C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80159230 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80159234 90 03 00 48 */ stw r0, 0x48(r3) -/* 80159238 80 04 5F 84 */ lwz r0, 0x5f84(r4) -/* 8015923C 90 03 00 4C */ stw r0, 0x4c(r3) -lbl_80159240: -/* 80159240 38 60 00 01 */ li r3, 1 -lbl_80159244: -/* 80159244 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80159248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015924C 7C 08 03 A6 */ mtlr r0 -/* 80159250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80159254 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/drawShadow__10daNpcCd2_cFf.s b/asm/a/npc/d_a_npc_cd2/drawShadow__10daNpcCd2_cFf.s deleted file mode 100644 index 7c43ee6dd17..00000000000 --- a/asm/a/npc/d_a_npc_cd2/drawShadow__10daNpcCd2_cFf.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80158F6C: -/* 80158F6C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80158F70 7C 08 02 A6 */ mflr r0 -/* 80158F74 90 01 00 24 */ stw r0, 0x24(r1) -/* 80158F78 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80158F7C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 80158F80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80158F84 7C 7F 1B 78 */ mr r31, r3 -/* 80158F88 FF E0 08 90 */ fmr f31, f1 -/* 80158F8C 88 03 0A C6 */ lbz r0, 0xac6(r3) -/* 80158F90 28 00 00 00 */ cmplwi r0, 0 -/* 80158F94 41 82 00 18 */ beq lbl_80158FAC -/* 80158F98 48 00 64 8D */ bl checkNowWolfEyeUp__9daPy_py_cFv -/* 80158F9C 2C 03 00 00 */ cmpwi r3, 0 -/* 80158FA0 40 82 00 0C */ bne lbl_80158FAC -/* 80158FA4 38 60 00 01 */ li r3, 1 -/* 80158FA8 48 00 00 2C */ b lbl_80158FD4 -lbl_80158FAC: -/* 80158FAC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80158FB0 C0 3F 06 D0 */ lfs f1, 0x6d0(r31) -/* 80158FB4 FC 40 F8 90 */ fmr f2, f31 -/* 80158FB8 38 9F 07 28 */ addi r4, r31, 0x728 -/* 80158FBC 38 A0 00 00 */ li r5, 0 -/* 80158FC0 C0 62 9A E0 */ lfs f3, lit_4050(r2) -/* 80158FC4 3C C0 80 42 */ lis r6, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80158FC8 38 C6 48 D0 */ addi r6, r6, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80158FCC 4B ED 40 E9 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj -/* 80158FD0 38 60 00 01 */ li r3, 1 -lbl_80158FD4: -/* 80158FD4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 80158FD8 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 80158FDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80158FE0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80158FE4 7C 08 03 A6 */ mtlr r0 -/* 80158FE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80158FEC 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/getEscapeTag__10daNpcCd2_cFv.s b/asm/a/npc/d_a_npc_cd2/getEscapeTag__10daNpcCd2_cFv.s deleted file mode 100644 index bdb9176f381..00000000000 --- a/asm/a/npc/d_a_npc_cd2/getEscapeTag__10daNpcCd2_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801597C0: -/* 801597C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801597C4 7C 08 02 A6 */ mflr r0 -/* 801597C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801597CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801597D0 7C 7F 1B 78 */ mr r31, r3 -/* 801597D4 38 00 00 00 */ li r0, 0 -/* 801597D8 90 0D 8A 84 */ stw r0, target(r13) -/* 801597DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801597E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801597E4 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 801597E8 4B EC 0F 29 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 801597EC B0 6D 8A 8C */ sth r3, wolfAngle(r13) -/* 801597F0 3C 60 80 16 */ lis r3, s_sub1__FPvPv@ha /* 0x80159708@ha */ -/* 801597F4 38 63 97 08 */ addi r3, r3, s_sub1__FPvPv@l /* 0x80159708@l */ -/* 801597F8 7F E4 FB 78 */ mr r4, r31 -/* 801597FC 4B EC 7B 3D */ bl fpcEx_Search__FPFPvPv_PvPv -/* 80159800 80 6D 8A 84 */ lwz r3, target(r13) -/* 80159804 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80159808 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015980C 7C 08 03 A6 */ mtlr r0 -/* 80159810 38 21 00 10 */ addi r1, r1, 0x10 -/* 80159814 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/jntNodeCallBack__FP8J3DJointi.s b/asm/a/npc/d_a_npc_cd2/jntNodeCallBack__FP8J3DJointi.s deleted file mode 100644 index d15f72f8f70..00000000000 --- a/asm/a/npc/d_a_npc_cd2/jntNodeCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80157CB4: -/* 80157CB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80157CB8 7C 08 02 A6 */ mflr r0 -/* 80157CBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80157CC0 7C 60 1B 78 */ mr r0, r3 -/* 80157CC4 2C 04 00 00 */ cmpwi r4, 0 -/* 80157CC8 40 82 00 24 */ bne lbl_80157CEC -/* 80157CCC 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80157CD0 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80157CD4 80 A3 00 38 */ lwz r5, 0x38(r3) -/* 80157CD8 80 65 00 14 */ lwz r3, 0x14(r5) -/* 80157CDC 28 03 00 00 */ cmplwi r3, 0 -/* 80157CE0 41 82 00 0C */ beq lbl_80157CEC -/* 80157CE4 7C 04 03 78 */ mr r4, r0 -/* 80157CE8 48 00 15 71 */ bl jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel -lbl_80157CEC: -/* 80157CEC 38 60 00 01 */ li r3, 1 -/* 80157CF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80157CF4 7C 08 03 A6 */ mtlr r0 -/* 80157CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80157CFC 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/loadResrc__10daNpcCd2_cFii.s b/asm/a/npc/d_a_npc_cd2/loadResrc__10daNpcCd2_cFii.s deleted file mode 100644 index be9a15b3047..00000000000 --- a/asm/a/npc/d_a_npc_cd2/loadResrc__10daNpcCd2_cFii.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80158BB8: -/* 80158BB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80158BBC 7C 08 02 A6 */ mflr r0 -/* 80158BC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80158BC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158BC8 48 20 96 11 */ bl _savegpr_28 -/* 80158BCC 7C 7C 1B 78 */ mr r28, r3 -/* 80158BD0 7C 9D 23 78 */ mr r29, r4 -/* 80158BD4 88 03 0A C6 */ lbz r0, 0xac6(r3) -/* 80158BD8 28 00 00 00 */ cmplwi r0, 0 -/* 80158BDC 41 82 00 48 */ beq lbl_80158C24 -/* 80158BE0 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80158BE4 57 BF 10 3A */ slwi r31, r29, 2 -/* 80158BE8 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B61CC@ha */ -/* 80158BEC 3B C4 61 CC */ addi r30, r4, l_resNameTbl@l /* 0x803B61CC@l */ -/* 80158BF0 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158BF4 80 84 00 04 */ lwz r4, 4(r4) -/* 80158BF8 4B ED 42 C5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80158BFC 2C 03 00 04 */ cmpwi r3, 4 -/* 80158C00 41 82 00 08 */ beq lbl_80158C08 -/* 80158C04 48 00 00 A0 */ b lbl_80158CA4 -lbl_80158C08: -/* 80158C08 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80158C0C 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158C10 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80158C14 4B ED 42 A9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80158C18 2C 03 00 04 */ cmpwi r3, 4 -/* 80158C1C 41 82 00 4C */ beq lbl_80158C68 -/* 80158C20 48 00 00 84 */ b lbl_80158CA4 -lbl_80158C24: -/* 80158C24 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80158C28 57 BF 10 3A */ slwi r31, r29, 2 -/* 80158C2C 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B61CC@ha */ -/* 80158C30 3B C4 61 CC */ addi r30, r4, l_resNameTbl@l /* 0x803B61CC@l */ -/* 80158C34 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158C38 80 84 00 00 */ lwz r4, 0(r4) -/* 80158C3C 4B ED 42 81 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80158C40 2C 03 00 04 */ cmpwi r3, 4 -/* 80158C44 41 82 00 08 */ beq lbl_80158C4C -/* 80158C48 48 00 00 5C */ b lbl_80158CA4 -lbl_80158C4C: -/* 80158C4C 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80158C50 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158C54 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80158C58 4B ED 42 65 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80158C5C 2C 03 00 04 */ cmpwi r3, 4 -/* 80158C60 41 82 00 08 */ beq lbl_80158C68 -/* 80158C64 48 00 00 40 */ b lbl_80158CA4 -lbl_80158C68: -/* 80158C68 38 7C 05 74 */ addi r3, r28, 0x574 -/* 80158C6C 57 BE 10 3A */ slwi r30, r29, 2 -/* 80158C70 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B61CC@ha */ -/* 80158C74 3B E4 61 CC */ addi r31, r4, l_resNameTbl@l /* 0x803B61CC@l */ -/* 80158C78 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80158C7C 80 84 00 08 */ lwz r4, 8(r4) -/* 80158C80 4B ED 42 3D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80158C84 2C 03 00 04 */ cmpwi r3, 4 -/* 80158C88 41 82 00 08 */ beq lbl_80158C90 -/* 80158C8C 48 00 00 18 */ b lbl_80158CA4 -lbl_80158C90: -/* 80158C90 38 7C 05 7C */ addi r3, r28, 0x57c -/* 80158C94 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80158C98 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80158C9C 4B ED 42 21 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80158CA0 2C 03 00 04 */ cmpwi r3, 4 -lbl_80158CA4: -/* 80158CA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158CA8 48 20 95 7D */ bl _restgpr_28 -/* 80158CAC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80158CB0 7C 08 03 A6 */ mtlr r0 -/* 80158CB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80158CB8 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/removeResrc__10daNpcCd2_cFii.s b/asm/a/npc/d_a_npc_cd2/removeResrc__10daNpcCd2_cFii.s deleted file mode 100644 index c02f7271e89..00000000000 --- a/asm/a/npc/d_a_npc_cd2/removeResrc__10daNpcCd2_cFii.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80158CBC: -/* 80158CBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80158CC0 7C 08 02 A6 */ mflr r0 -/* 80158CC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80158CC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158CCC 48 20 95 0D */ bl _savegpr_28 -/* 80158CD0 7C 7C 1B 78 */ mr r28, r3 -/* 80158CD4 7C 9D 23 78 */ mr r29, r4 -/* 80158CD8 88 03 0A C6 */ lbz r0, 0xac6(r3) -/* 80158CDC 28 00 00 00 */ cmplwi r0, 0 -/* 80158CE0 41 82 00 34 */ beq lbl_80158D14 -/* 80158CE4 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80158CE8 57 BF 10 3A */ slwi r31, r29, 2 -/* 80158CEC 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B61CC@ha */ -/* 80158CF0 3B C4 61 CC */ addi r30, r4, l_resNameTbl@l /* 0x803B61CC@l */ -/* 80158CF4 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158CF8 80 84 00 04 */ lwz r4, 4(r4) -/* 80158CFC 4B ED 43 0D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80158D00 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80158D04 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158D08 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80158D0C 4B ED 42 FD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80158D10 48 00 00 30 */ b lbl_80158D40 -lbl_80158D14: -/* 80158D14 38 7C 05 6C */ addi r3, r28, 0x56c -/* 80158D18 57 BF 10 3A */ slwi r31, r29, 2 -/* 80158D1C 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B61CC@ha */ -/* 80158D20 3B C4 61 CC */ addi r30, r4, l_resNameTbl@l /* 0x803B61CC@l */ -/* 80158D24 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158D28 80 84 00 00 */ lwz r4, 0(r4) -/* 80158D2C 4B ED 42 DD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80158D30 38 7C 05 84 */ addi r3, r28, 0x584 -/* 80158D34 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 80158D38 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80158D3C 4B ED 42 CD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -lbl_80158D40: -/* 80158D40 38 7C 05 74 */ addi r3, r28, 0x574 -/* 80158D44 57 BE 10 3A */ slwi r30, r29, 2 -/* 80158D48 3C 80 80 3B */ lis r4, l_resNameTbl@ha /* 0x803B61CC@ha */ -/* 80158D4C 3B E4 61 CC */ addi r31, r4, l_resNameTbl@l /* 0x803B61CC@l */ -/* 80158D50 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80158D54 80 84 00 08 */ lwz r4, 8(r4) -/* 80158D58 4B ED 42 B1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80158D5C 38 7C 05 7C */ addi r3, r28, 0x57c -/* 80158D60 7C 9F F0 2E */ lwzx r4, r31, r30 -/* 80158D64 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80158D68 4B ED 42 A1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80158D6C 38 60 00 01 */ li r3, 1 -/* 80158D70 39 61 00 20 */ addi r11, r1, 0x20 -/* 80158D74 48 20 94 B1 */ bl _restgpr_28 -/* 80158D78 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80158D7C 7C 08 03 A6 */ mtlr r0 -/* 80158D80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80158D84 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/s_sub1__FPvPv.s b/asm/a/npc/d_a_npc_cd2/s_sub1__FPvPv.s deleted file mode 100644 index 854c4cca53b..00000000000 --- a/asm/a/npc/d_a_npc_cd2/s_sub1__FPvPv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80159708: -/* 80159708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015970C 7C 08 02 A6 */ mflr r0 -/* 80159710 90 01 00 14 */ stw r0, 0x14(r1) -/* 80159714 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80159718 93 C1 00 08 */ stw r30, 8(r1) -/* 8015971C 7C 7E 1B 78 */ mr r30, r3 -/* 80159720 7C 9F 23 78 */ mr r31, r4 -/* 80159724 4B EB F5 BD */ bl fopAc_IsActor__FPv -/* 80159728 2C 03 00 00 */ cmpwi r3, 0 -/* 8015972C 41 82 00 78 */ beq lbl_801597A4 -/* 80159730 A8 1E 00 08 */ lha r0, 8(r30) -/* 80159734 2C 00 02 8A */ cmpwi r0, 0x28a -/* 80159738 40 82 00 6C */ bne lbl_801597A4 -/* 8015973C 7F E3 FB 78 */ mr r3, r31 -/* 80159740 7F C4 F3 78 */ mr r4, r30 -/* 80159744 4B EC 0F CD */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80159748 7C 64 1B 78 */ mr r4, r3 -/* 8015974C A8 6D 8A 8C */ lha r3, wolfAngle(r13) -/* 80159750 48 11 76 D5 */ bl cLib_distanceAngleS__Fss -/* 80159754 80 0D 8A 84 */ lwz r0, target(r13) -/* 80159758 28 00 00 00 */ cmplwi r0, 0 -/* 8015975C 40 82 00 20 */ bne lbl_8015977C -/* 80159760 7F E3 FB 78 */ mr r3, r31 -/* 80159764 7F C4 F3 78 */ mr r4, r30 -/* 80159768 4B EC 13 2D */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8015976C D0 2D 8A 88 */ stfs f1, targetWay(r13) -/* 80159770 93 CD 8A 84 */ stw r30, target(r13) -/* 80159774 38 60 00 00 */ li r3, 0 -/* 80159778 48 00 00 30 */ b lbl_801597A8 -lbl_8015977C: -/* 8015977C 2C 03 40 00 */ cmpwi r3, 0x4000 -/* 80159780 40 81 00 24 */ ble lbl_801597A4 -/* 80159784 7F E3 FB 78 */ mr r3, r31 -/* 80159788 7F C4 F3 78 */ mr r4, r30 -/* 8015978C 4B EC 13 09 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80159790 C0 0D 8A 88 */ lfs f0, targetWay(r13) -/* 80159794 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80159798 40 81 00 0C */ ble lbl_801597A4 -/* 8015979C D0 2D 8A 88 */ stfs f1, targetWay(r13) -/* 801597A0 93 CD 8A 84 */ stw r30, target(r13) -lbl_801597A4: -/* 801597A4 38 60 00 00 */ li r3, 0 -lbl_801597A8: -/* 801597A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801597AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 801597B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801597B4 7C 08 03 A6 */ mtlr r0 -/* 801597B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801597BC 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/setEnvTevCol__10daNpcCd2_cFv.s b/asm/a/npc/d_a_npc_cd2/setEnvTevCol__10daNpcCd2_cFv.s deleted file mode 100644 index 445bb82126f..00000000000 --- a/asm/a/npc/d_a_npc_cd2/setEnvTevCol__10daNpcCd2_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80158D88: -/* 80158D88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80158D8C 7C 08 02 A6 */ mflr r0 -/* 80158D90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80158D94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80158D98 93 C1 00 08 */ stw r30, 8(r1) -/* 80158D9C 7C 7E 1B 78 */ mr r30, r3 -/* 80158DA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80158DA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80158DA8 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80158DAC 7F E3 FB 78 */ mr r3, r31 -/* 80158DB0 38 9E 07 28 */ addi r4, r30, 0x728 -/* 80158DB4 4B F1 BE 35 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80158DB8 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80158DBC 7F E3 FB 78 */ mr r3, r31 -/* 80158DC0 38 9E 07 28 */ addi r4, r30, 0x728 -/* 80158DC4 4B F1 C3 3D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80158DC8 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80158DCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80158DD0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80158DD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80158DD8 7C 08 03 A6 */ mtlr r0 -/* 80158DDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80158DE0 4E 80 00 20 */ blr diff --git a/asm/a/npc/d_a_npc_cd2/setRoomNo__10daNpcCd2_cFv.s b/asm/a/npc/d_a_npc_cd2/setRoomNo__10daNpcCd2_cFv.s deleted file mode 100644 index ab2fc8e7075..00000000000 --- a/asm/a/npc/d_a_npc_cd2/setRoomNo__10daNpcCd2_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80158DE4: -/* 80158DE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80158DE8 7C 08 02 A6 */ mflr r0 -/* 80158DEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80158DF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80158DF4 7C 7F 1B 78 */ mr r31, r3 -/* 80158DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80158DFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80158E00 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80158E04 38 9F 07 28 */ addi r4, r31, 0x728 -/* 80158E08 4B F1 C2 F9 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80158E0C 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80158E10 98 7F 08 72 */ stb r3, 0x872(r31) -/* 80158E14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80158E18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80158E1C 7C 08 03 A6 */ mtlr r0 -/* 80158E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80158E24 4E 80 00 20 */ blr diff --git a/asm/d/d_npc_lib/__ct__16dNpcLib_lookat_cFv.s b/asm/d/d_npc_lib/__ct__16dNpcLib_lookat_cFv.s deleted file mode 100644 index 4759552418b..00000000000 --- a/asm/d/d_npc_lib/__ct__16dNpcLib_lookat_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80251314: -/* 80251314 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80251318 7C 08 02 A6 */ mflr r0 -/* 8025131C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80251320 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80251324 7C 7F 1B 78 */ mr r31, r3 -/* 80251328 3C 60 80 3C */ lis r3, __vt__16dNpcLib_lookat_c@ha /* 0x803C2B88@ha */ -/* 8025132C 38 03 2B 88 */ addi r0, r3, __vt__16dNpcLib_lookat_c@l /* 0x803C2B88@l */ -/* 80251330 90 1F 00 00 */ stw r0, 0(r31) -/* 80251334 38 7F 00 04 */ addi r3, r31, 4 -/* 80251338 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha /* 0x800125DC@ha */ -/* 8025133C 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l /* 0x800125DC@l */ -/* 80251340 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80251344 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 80251348 38 C0 00 0C */ li r6, 0xc -/* 8025134C 38 E0 00 04 */ li r7, 4 -/* 80251350 48 11 0A 11 */ bl __construct_array -/* 80251354 38 7F 00 34 */ addi r3, r31, 0x34 -/* 80251358 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /* 0x80112C80@ha */ -/* 8025135C 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l /* 0x80112C80@l */ -/* 80251360 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 80251364 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 80251368 38 C0 00 06 */ li r6, 6 -/* 8025136C 38 E0 00 04 */ li r7, 4 -/* 80251370 48 11 09 F1 */ bl __construct_array -/* 80251374 38 7F 00 4C */ addi r3, r31, 0x4c -/* 80251378 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /* 0x80112C80@ha */ -/* 8025137C 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l /* 0x80112C80@l */ -/* 80251380 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 80251384 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 80251388 38 C0 00 06 */ li r6, 6 -/* 8025138C 38 E0 00 04 */ li r7, 4 -/* 80251390 48 11 09 D1 */ bl __construct_array -/* 80251394 38 7F 00 64 */ addi r3, r31, 0x64 -/* 80251398 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /* 0x80112C80@ha */ -/* 8025139C 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l /* 0x80112C80@l */ -/* 802513A0 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 802513A4 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 802513A8 38 C0 00 06 */ li r6, 6 -/* 802513AC 38 E0 00 04 */ li r7, 4 -/* 802513B0 48 11 09 B1 */ bl __construct_array -/* 802513B4 38 7F 00 7C */ addi r3, r31, 0x7c -/* 802513B8 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /* 0x80112C80@ha */ -/* 802513BC 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l /* 0x80112C80@l */ -/* 802513C0 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 802513C4 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 802513C8 38 C0 00 06 */ li r6, 6 -/* 802513CC 38 E0 00 04 */ li r7, 4 -/* 802513D0 48 11 09 91 */ bl __construct_array -/* 802513D4 38 7F 00 94 */ addi r3, r31, 0x94 -/* 802513D8 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /* 0x80112C80@ha */ -/* 802513DC 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l /* 0x80112C80@l */ -/* 802513E0 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 802513E4 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 802513E8 38 C0 00 06 */ li r6, 6 -/* 802513EC 38 E0 00 04 */ li r7, 4 -/* 802513F0 48 11 09 71 */ bl __construct_array -/* 802513F4 7F E3 FB 78 */ mr r3, r31 -/* 802513F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802513FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80251400 7C 08 03 A6 */ mtlr r0 -/* 80251404 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251408 4E 80 00 20 */ blr diff --git a/asm/d/d_npc_lib/__dt__16dNpcLib_lookat_cFv.s b/asm/d/d_npc_lib/__dt__16dNpcLib_lookat_cFv.s deleted file mode 100644 index 68ec6972a07..00000000000 --- a/asm/d/d_npc_lib/__dt__16dNpcLib_lookat_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80252094: -/* 80252094 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80252098 7C 08 02 A6 */ mflr r0 -/* 8025209C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802520A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802520A4 93 C1 00 08 */ stw r30, 8(r1) -/* 802520A8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802520AC 7C 9F 23 78 */ mr r31, r4 -/* 802520B0 41 82 00 B0 */ beq lbl_80252160 -/* 802520B4 3C 60 80 3C */ lis r3, __vt__16dNpcLib_lookat_c@ha /* 0x803C2B88@ha */ -/* 802520B8 38 03 2B 88 */ addi r0, r3, __vt__16dNpcLib_lookat_c@l /* 0x803C2B88@l */ -/* 802520BC 90 1E 00 00 */ stw r0, 0(r30) -/* 802520C0 38 7E 00 94 */ addi r3, r30, 0x94 -/* 802520C4 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 802520C8 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 802520CC 38 A0 00 06 */ li r5, 6 -/* 802520D0 38 C0 00 04 */ li r6, 4 -/* 802520D4 48 10 FC 15 */ bl __destroy_arr -/* 802520D8 38 7E 00 7C */ addi r3, r30, 0x7c -/* 802520DC 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 802520E0 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 802520E4 38 A0 00 06 */ li r5, 6 -/* 802520E8 38 C0 00 04 */ li r6, 4 -/* 802520EC 48 10 FB FD */ bl __destroy_arr -/* 802520F0 38 7E 00 64 */ addi r3, r30, 0x64 -/* 802520F4 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 802520F8 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 802520FC 38 A0 00 06 */ li r5, 6 -/* 80252100 38 C0 00 04 */ li r6, 4 -/* 80252104 48 10 FB E5 */ bl __destroy_arr -/* 80252108 38 7E 00 4C */ addi r3, r30, 0x4c -/* 8025210C 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 80252110 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 80252114 38 A0 00 06 */ li r5, 6 -/* 80252118 38 C0 00 04 */ li r6, 4 -/* 8025211C 48 10 FB CD */ bl __destroy_arr -/* 80252120 38 7E 00 34 */ addi r3, r30, 0x34 -/* 80252124 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha /* 0x80018BD0@ha */ -/* 80252128 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 0x80018BD0@l */ -/* 8025212C 38 A0 00 06 */ li r5, 6 -/* 80252130 38 C0 00 04 */ li r6, 4 -/* 80252134 48 10 FB B5 */ bl __destroy_arr -/* 80252138 38 7E 00 04 */ addi r3, r30, 4 -/* 8025213C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80252140 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 80252144 38 A0 00 0C */ li r5, 0xc -/* 80252148 38 C0 00 04 */ li r6, 4 -/* 8025214C 48 10 FB 9D */ bl __destroy_arr -/* 80252150 7F E0 07 35 */ extsh. r0, r31 -/* 80252154 40 81 00 0C */ ble lbl_80252160 -/* 80252158 7F C3 F3 78 */ mr r3, r30 -/* 8025215C 48 07 CB E1 */ bl __dl__FPv -lbl_80252160: -/* 80252160 7F C3 F3 78 */ mr r3, r30 -/* 80252164 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80252168 83 C1 00 08 */ lwz r30, 8(r1) -/* 8025216C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80252170 7C 08 03 A6 */ mtlr r0 -/* 80252174 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252178 4E 80 00 20 */ blr diff --git a/asm/d/d_npc_lib/limitter__16dNpcLib_lookat_cFPssss.s b/asm/d/d_npc_lib/limitter__16dNpcLib_lookat_cFPssss.s deleted file mode 100644 index 92fc405728e..00000000000 --- a/asm/d/d_npc_lib/limitter__16dNpcLib_lookat_cFPssss.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80252018: -/* 80252018 7C A0 07 34 */ extsh r0, r5 -/* 8025201C A8 64 00 00 */ lha r3, 0(r4) -/* 80252020 7D 00 1A 14 */ add r8, r0, r3 -/* 80252024 7C C6 07 34 */ extsh r6, r6 -/* 80252028 7C 06 40 00 */ cmpw r6, r8 -/* 8025202C 41 81 00 28 */ bgt lbl_80252054 -/* 80252030 7C 06 00 00 */ cmpw r6, r0 -/* 80252034 41 81 00 10 */ bgt lbl_80252044 -/* 80252038 38 00 00 00 */ li r0, 0 -/* 8025203C B0 04 00 00 */ sth r0, 0(r4) -/* 80252040 48 00 00 14 */ b lbl_80252054 -lbl_80252044: -/* 80252044 7C 06 40 50 */ subf r0, r6, r8 -/* 80252048 7C 00 07 34 */ extsh r0, r0 -/* 8025204C 7C 00 18 50 */ subf r0, r0, r3 -/* 80252050 B0 04 00 00 */ sth r0, 0(r4) -lbl_80252054: -/* 80252054 7C E3 07 34 */ extsh r3, r7 -/* 80252058 7C 08 18 00 */ cmpw r8, r3 -/* 8025205C 41 81 00 30 */ bgt lbl_8025208C -/* 80252060 7C A0 07 34 */ extsh r0, r5 -/* 80252064 7C 00 18 00 */ cmpw r0, r3 -/* 80252068 41 81 00 10 */ bgt lbl_80252078 -/* 8025206C 38 00 00 00 */ li r0, 0 -/* 80252070 B0 04 00 00 */ sth r0, 0(r4) -/* 80252074 48 00 00 18 */ b lbl_8025208C -lbl_80252078: -/* 80252078 7C 03 40 50 */ subf r0, r3, r8 -/* 8025207C 7C 03 07 34 */ extsh r3, r0 -/* 80252080 A8 04 00 00 */ lha r0, 0(r4) -/* 80252084 7C 03 00 50 */ subf r0, r3, r0 -/* 80252088 B0 04 00 00 */ sth r0, 0(r4) -lbl_8025208C: -/* 8025208C 38 60 00 01 */ li r3, 1 -/* 80252090 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_npc_cd.h b/include/d/a/d_a_npc_cd.h index 9b1b9451423..dead035706b 100644 --- a/include/d/a/d_a_npc_cd.h +++ b/include/d/a/d_a_npc_cd.h @@ -1,6 +1,50 @@ #ifndef A_NPC_D_A_NPC_CD_H #define A_NPC_D_A_NPC_CD_H +#include "Z2AudioLib/Z2Creature.h" +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +class daNpcCd_c : public fopAc_ac_c { +public: + /* 8015605C */ int NpcCreate(int); + /* 801561E8 */ J3DModel* ObjCreate(int); + /* 80156228 */ void isM_(); + /* 80156248 */ void getAnmP(int, int); + /* 801563C8 */ void setAttention(int); + /* 80156B4C */ int loadResrc(int, int); + /* 80156C50 */ int removeResrc(int, int); + /* 80156D1C */ void setEnvTevCol(); + /* 80156D78 */ void setRoomNo(); + /* 80156DBC */ void animation(); + /* 80156E20 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int); + /* 80156E8C */ void drawObj(int, J3DModel*, f32); + /* 80156F74 */ void drawNpc(); + /* 80157084 */ void jntNodeCB(J3DJoint*, J3DModel*); + /* 8015736C */ void setHitodamaParticle(); + /* 80157524 */ J3DModelData* getNpcMdlDataP(int); + /* 80157588 */ J3DModelData* getObjMdlDataP(int); + /* 80AA8694 */ virtual ~daNpcCd_c(); + + static u8 const m_cylDat[68]; + + /* 0x56C */ request_of_phase_process_class mPhase1; + /* 0x574 */ request_of_phase_process_class mPhase2; + /* 0x57C */ request_of_phase_process_class mPhase3; + /* 0x584 */ request_of_phase_process_class mPhase4; + /* 0x58C */ mDoExt_McaMorfSO* mpMorf; + /* 0x590 */ Z2CreatureCitizen mCreature; + /* 0x634 */ dBgS_ObjAcch mAcch; + /* 0x80C */ dBgS_AcchCir mAcchCir; + /* 0x84C */ dCcD_Stts mStts; + /* 0x888 */ dCcD_Cyl mCyl; + /* 0x9C4 */ u32 field_0x9c4; + /* 0x9C8 */ int field_0x9c8; + /* 0x9CC */ int field_0x9cc[3]; + /* 0x9D8 */ cXyz field_0x9d8; + /* 0x9E4 */ u16 field_0x9e4; + /* 0x9E6 */ s16 field_0x9e6; + /* 0x9E8 */ bool field_0x9e8; +}; + #endif /* A_NPC_D_A_NPC_CD_H */ diff --git a/include/d/a/d_a_npc_cd2.h b/include/d/a/d_a_npc_cd2.h index 91962a66d4c..c9282c9301c 100644 --- a/include/d/a/d_a_npc_cd2.h +++ b/include/d/a/d_a_npc_cd2.h @@ -1,6 +1,72 @@ #ifndef A_NPC_D_A_NPC_CD2_H #define A_NPC_D_A_NPC_CD2_H +#include "Z2AudioLib/Z2Creature.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_npc_lib.h" #include "dolphin/types.h" +class PathTrace_c { +public: + /* 80159A38 */ void setPath(int, int, int, cXyz*, bool); + /* 80159C14 */ void checkPoint(cXyz, f32); + /* 80159DC0 */ void checkPathEnd(cXyz, f32); + /* 80159E54 */ void getTargetPoint(Vec*); + /* 80159ECC */ void setAvoidPoint(); + /* 8015A0D0 */ void setNextPoint(); + /* 80159F98 */ void setNextPoint(cXyz&); + /* 8015A264 */ void incIndex(int); + /* 8015A294 */ void decIndex(int); + /* 8015A370 */ fopAc_ac_c* checkObstacle(fopAc_ac_c*); + /* 8015A3E4 */ void* checkObstacleSub(fopAc_ac_c*); + + /* 0x00 */ fopAc_ac_c* field_0x00; + /* 0x04 */ fopAc_ac_c* field_0x04; +}; + +class daNpcCd2_c : public fopAc_ac_c { +public: + /* 80157D00 */ void NpcCreate(int); + /* 80157F28 */ J3DModel* ObjCreate(int); + /* 80157F68 */ void ChairCreate(f32); + /* 801580A8 */ bool isM_(); + /* 801580F0 */ void* getAnmP(int, int); + /* 80158420 */ void setAttention(int); + /* 80158BB8 */ int loadResrc(int, int); + /* 80158CBC */ int removeResrc(int, int); + /* 80158D88 */ void setEnvTevCol(); + /* 80158DE4 */ void setRoomNo(); + /* 80158E28 */ void animation(int); + /* 80158F00 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int); + /* 80158F6C */ int drawShadow(f32); + /* 80158FF0 */ int drawObj(int, J3DModel*, f32); + /* 801590FC */ int drawNpc(); + /* 80159258 */ void jntNodeCB(J3DJoint*, J3DModel*); + /* 80159550 */ void setHitodamaParticle(); + /* 801597C0 */ void* getEscapeTag(); + /* 80159818 */ void checkFearSituation(); + /* 801598E8 */ void getNpcMdlDataP(int); + /* 8015994C */ J3DModelData* getObjMdlDataP(int); + /* 801599C4 */ void getTexAnmP(int); + /* 8097F030 */ virtual ~daNpcCd2_c(); + + static u8 const m_cylDat[68]; + + /* 0x56C */ request_of_phase_process_class mPhase1; + /* 0x574 */ request_of_phase_process_class mPhase2; + /* 0x57C */ request_of_phase_process_class mPhase3; + /* 0x584 */ request_of_phase_process_class mPhase4; + /* 0x58C */ mDoExt_McaMorfSO* mpMorf; + /* 0x590 */ mDoExt_btpAnm* mpBtpAnm; + /* 0x594 */ Z2CreatureCitizen mCitizen; + /* 0x638 */ dBgS_Acch mAcch; + /* 0x810 */ dBgS_AcchCir mAcchCir; + /* 0x850 */ dCcD_Stts mStts; + /* 0x88C */ dCcD_Cyl mCyl; + /* 0x9C8 */ dNpcLib_lookat_c mLookat; + /* 0xA98 */ u8 field_0xa98[0xAC4 - 0xA98]; + /* 0xAC4 */ s16 field_0xac4; + /* 0xAC6 */ bool field_0xac6; +}; + #endif /* A_NPC_D_A_NPC_CD2_H */ diff --git a/include/d/d_npc_lib.h b/include/d/d_npc_lib.h index 630a74999a4..f01ada8b9ff 100644 --- a/include/d/d_npc_lib.h +++ b/include/d/d_npc_lib.h @@ -1,6 +1,28 @@ #ifndef D_D_NPC_LIB_H #define D_D_NPC_LIB_H +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +struct dNpcLib_lookat_c { + /* 80251314 */ dNpcLib_lookat_c(); + /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*); + /* 80251534 */ void action(cXyz, cXyz, fopAc_ac_c*, f32 (*)[4], int); + /* 80251B60 */ void dbView(); + /* 80251B64 */ void setPrm(); + /* 80251EF8 */ void update(); + /* 80252018 */ int limitter(s16*, s16, s16, s16); + /* 80252094 */ virtual ~dNpcLib_lookat_c(); + + /* 0x04 */ cXyz field_0x04[4]; + /* 0x34 */ csXyz field_0x34[4]; + /* 0x4C */ csXyz field_0x4c[4]; + /* 0x64 */ csXyz field_0x64[4]; + /* 0x7C */ csXyz field_0x7c[4]; + /* 0x94 */ csXyz field_0x94[4]; + /* 0xAC */ f32 field_0xac[4]; + /* 0xBC */ s32 field_0xbc[4]; + /* 0xCC */ s32 mCount; +}; + #endif /* D_D_NPC_LIB_H */ diff --git a/src/d/a/d_a_npc_cd.cpp b/src/d/a/d_a_npc_cd.cpp index 3f904b00353..b83fe83d273 100644 --- a/src/d/a/d_a_npc_cd.cpp +++ b/src/d/a/d_a_npc_cd.cpp @@ -5,44 +5,16 @@ #include "d/a/d_a_npc_cd.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" // // Types: // -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD9C */ void transM(f32, f32, f32); - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - struct mDoHIO_entry_c { /* 8015791C */ ~mDoHIO_entry_c(); }; -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 80011310 */ void stopZelAnime(); -}; - struct fOpAcm_HIO_entry_c { /* 801578C0 */ ~fOpAcm_HIO_entry_c(); }; @@ -51,34 +23,6 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DAnmTransformKey {}; - -struct daNpcCd_c { - /* 8015605C */ void NpcCreate(int); - /* 801561E8 */ void ObjCreate(int); - /* 80156228 */ void isM_(); - /* 80156248 */ void getAnmP(int, int); - /* 801563C8 */ void setAttention(int); - /* 80156B4C */ void loadResrc(int, int); - /* 80156C50 */ void removeResrc(int, int); - /* 80156D1C */ void setEnvTevCol(); - /* 80156D78 */ void setRoomNo(); - /* 80156DBC */ void animation(); - /* 80156E20 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 80156E8C */ void drawObj(int, J3DModel*, f32); - /* 80156F74 */ void drawNpc(); - /* 80157084 */ void jntNodeCB(J3DJoint*, J3DModel*); - /* 8015736C */ void setHitodamaParticle(); - /* 80157524 */ void getNpcMdlDataP(int); - /* 80157588 */ void getObjMdlDataP(int); - - static u8 const m_cylDat[68]; -}; - struct daNpcCd_HIO_c { /* 80157600 */ daNpcCd_HIO_c(); /* 80157964 */ ~daNpcCd_HIO_c(); @@ -94,61 +38,6 @@ struct daNpcCd_HIO_Child_c { /* 80157858 */ daNpcCd_HIO_Child_c(); }; -struct dKy_tevstr_c {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); -}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct Vec {}; - -struct Z2CreatureCitizen { - /* 802C0CE4 */ void init(Vec*, Vec*, u8, u8); - /* 802C0D48 */ void setMdlType(s8, bool, bool); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - // // Forward References: // @@ -187,7 +76,6 @@ extern "C" extern char const* const a_npc_d_a_npc_cd__stringBase0; // External References: // -SECTION_INIT void memcpy(); extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); @@ -208,7 +96,7 @@ extern "C" void set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void func_8014D348(void* _this, int*); +extern "C" void func_8014D348(int*); extern "C" void checkNowWolfEyeUp__9daPy_py_cFv(); extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); @@ -216,8 +104,6 @@ extern "C" void init__17Z2CreatureCitizenFP3VecP3VecUcUc(); extern "C" void setMdlType__17Z2CreatureCitizenFScbb(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); extern "C" void __register_global_object(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); @@ -230,9 +116,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 data_80450FF8[8]; @@ -242,543 +125,164 @@ extern "C" extern u8 data_80450FF8[8]; // /* 80156010-8015605C 150950 004C+00 1/1 0/0 0/0 .text jntNodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void jntNodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd/jntNodeCallBack__FP8J3DJointi.s" +static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { + if (param_1 == 0) { + if (j3dSys.getModel()->getUserArea() != 0) { + ((daNpcCd_c*)j3dSys.getModel()->getUserArea())->jntNodeCB(i_jnt, j3dSys.getModel()); + } + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80392FE8-80392FF0 01F648 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80392FE8; - -/* 80392FF0-80392FFA 01F650 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80392FF0; - -/* 80392FFA-80393004 01F65A 000A+00 17/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80392FFA; - -/* 80393004-8039300E 01F664 000A+00 17/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393004; - -/* 8039300E-80393017 01F66E 0009+00 31/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039300E; - -/* 80393017-80393021 01F677 000A+00 31/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393017; - -/* 80393021-80393029 01F681 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393021; - -/* 80393029-80393033 01F689 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393029; - -/* 80393033-8039303B 01F693 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393033; - -/* 8039303B-80393045 01F69B 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039303B; - -/* 80393045-8039304D 01F6A5 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393045; - -/* 8039304D-80393057 01F6AD 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039304D; - -/* 80393057-8039305F 01F6B7 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393057; - -/* 8039305F-80393069 01F6BF 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039305F; - -/* 80393069-80393071 01F6C9 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393069; - -/* 80393071-8039307B 01F6D1 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393071; - -/* 8039307B-80393083 01F6DB 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039307B; - -/* 80393083-8039308D 01F6E3 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393083; - -/* 8039308D-80393095 01F6ED 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039308D; - -/* 80393095-8039309F 01F6F5 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393095; - -/* 8039309F-803930A8 01F6FF 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039309F; - -/* 803930A8-803930B2 01F708 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930A8; - -/* 803930B2-803930BB 01F712 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930B2; - -/* 803930BB-803930C5 01F71B 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930BB; - -/* 803930C5-803930CE 01F725 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930C5; - -/* 803930CE-803930D8 01F72E 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930CE; - -/* 803930D8-803930E1 01F738 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930D8; - -/* 803930E1-803930EB 01F741 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930E1; - -/* 803930EB-803930F4 01F74B 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930EB; - -/* 803930F4-803930FE 01F754 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930F4; - -/* 803930FE-80393107 01F75E 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803930FE; - -/* 80393107-80393111 01F767 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393107; - -/* 80393111-8039311A 01F771 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393111; - -/* 8039311A-80393124 01F77A 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039311A; - -/* 80393124-8039312D 01F784 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393124; - -/* 8039312D-80393137 01F78D 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039312D; - -/* 80393137-8039313F 01F797 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393137; - -/* 8039313F-80393149 01F79F 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039313F; - -/* 80393149-80393153 01F7A9 000A+00 15/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393149; - -/* 80393153-8039315D 01F7B3 000A+00 15/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393153; - -/* 8039315D-80393165 01F7BD 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039315D; - -/* 80393165-8039316F 01F7C5 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393165; - -/* 8039316F-80393177 01F7CF 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039316F; - -/* 80393177-80393181 01F7D7 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393177; - -/* 80393181-80393189 01F7E1 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393181; - -/* 80393189-80393193 01F7E9 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393189; - -/* 80393193-8039319B 01F7F3 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393193; - -/* 8039319B-803931A5 01F7FB 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039319B; - -/* 803931A5-803931AD 01F805 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931A5; - -/* 803931AD-803931B7 01F80D 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931AD; - -/* 803931B7-803931BF 01F817 0008+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931B7; - -/* 803931BF-803931C9 01F81F 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931BF; - -/* 803931C9-803931D2 01F829 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931C9; - -/* 803931D2-803931DC 01F832 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931D2; - -/* 803931DC-803931E5 01F83C 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931DC; - -/* 803931E5-803931EF 01F845 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931E5; - -/* 803931EF-803931F8 01F84F 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931EF; - -/* 803931F8-80393202 01F858 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_803931F8; - -/* 80393202-8039320B 01F862 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393202; - -/* 8039320B-80393215 01F86B 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039320B; - -/* 80393215-8039321E 01F875 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393215; - -/* 8039321E-80393228 01F87E 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039321E; - -/* 80393228-80393231 01F888 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393228; - -/* 80393231-8039323B 01F891 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393231; - -/* 8039323B-80393244 01F89B 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_8039323B; - -/* 80393244-80393250 01F8A4 000A+02 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393244; /* 80392A18-80392A30 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */ -SECTION_RODATA static void* const l_resMANa[6] = { - (void*)&a_npc_d_a_npc_cd__stringBase0, - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x8), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMANa[6] = { + "MAN_a_L", "MAN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392A18, &l_resMANa); /* 80392A30-80392A48 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */ -SECTION_RODATA static void* const l_resMADa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x39), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x41), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMADa[6] = { + "MAD_a_L", "MAD_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392A30, &l_resMADa); /* 80392A48-80392A60 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */ -SECTION_RODATA static void* const l_resMCNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x4B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x53), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMCNa[6] = { + "MCN_a_L", "MCN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392A48, &l_resMCNa); /* 80392A60-80392A78 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */ -SECTION_RODATA static void* const l_resMONa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x5D), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x65), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMONa[6] = { + "MON_a_L", "MON_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392A60, &l_resMONa); /* 80392A78-80392A90 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */ -SECTION_RODATA static void* const l_resMANb[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x6F), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x77), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMANb[6] = { + "MAN_b_L", "MAN_b_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392A78, &l_resMANb); /* 80392A90-80392AA8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */ -SECTION_RODATA static void* const l_resMANc[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x81), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x89), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMANc[6] = { + "MAN_c_L", "MAN_c_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392A90, &l_resMANc); /* 80392AA8-80392AC0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */ -SECTION_RODATA static void* const l_resMASa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x93), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x9B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMASa[6] = { + "MAS_a_L", "MAS_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392AA8, &l_resMASa); /* 80392AC0-80392AD8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */ -SECTION_RODATA static void* const l_resMBNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xA5), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xAD), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMBNa[6] = { + "MBN_a_L", "MBN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392AC0, &l_resMBNa); /* 80392AD8-80392AF0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */ -SECTION_RODATA static void* const l_resMANa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xB7), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xC0), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMANa2[6] = { + "MAN_a2_L", "MAN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392AD8, &l_resMANa2); /* 80392AF0-80392B08 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */ -SECTION_RODATA static void* const l_resMADa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xCA), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xD3), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMADa2[6] = { + "MAD_a2_L", "MAD_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392AF0, &l_resMADa2); /* 80392B08-80392B20 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */ -SECTION_RODATA static void* const l_resMCNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xDD), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xE6), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMCNa2[6] = { + "MCN_a2_L", "MCN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B08, &l_resMCNa2); /* 80392B20-80392B38 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */ -SECTION_RODATA static void* const l_resMONa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xF0), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0xF9), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMONa2[6] = { + "MON_a2_L", "MON_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B20, &l_resMONa2); /* 80392B38-80392B50 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */ -SECTION_RODATA static void* const l_resMANb2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x103), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x10C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMANb2[6] = { + "MAN_b2_L", "MAN_b2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B38, &l_resMANb2); /* 80392B50-80392B68 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */ -SECTION_RODATA static void* const l_resMANc2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x116), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x11F), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMANc2[6] = { + "MAN_c2_L", "MAN_c2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B50, &l_resMANc2); /* 80392B68-80392B80 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */ -SECTION_RODATA static void* const l_resMASa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x129), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x132), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMASa2[6] = { + "MAS_a2_L", "MAS_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B68, &l_resMASa2); /* 80392B80-80392B98 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */ -SECTION_RODATA static void* const l_resMBNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x13C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x145), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x12), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMBNa2[6] = { + "MBN_a2_L", "MBN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B80, &l_resMBNa2); /* 80392B98-80392BB0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */ -SECTION_RODATA static void* const l_resWANa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x14F), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x157), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWANa[6] = { + "WAN_a_L", "WAN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392B98, &l_resWANa); /* 80392BB0-80392BC8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */ -SECTION_RODATA static void* const l_resWADa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x175), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x17D), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWADa[6] = { + "WAD_a_L", "WAD_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392BB0, &l_resWADa); /* 80392BC8-80392BE0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */ -SECTION_RODATA static void* const l_resMATa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x187), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x18F), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMATa[6] = { + "MAT_a_L", "MAT_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392BC8, &l_resMATa); /* 80392BE0-80392BF8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */ -SECTION_RODATA static void* const l_resWCNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x199), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1A1), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWCNa[6] = { + "WCN_a_L", "WCN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392BE0, &l_resWCNa); /* 80392BF8-80392C10 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */ -SECTION_RODATA static void* const l_resWONa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1AB), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1B3), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWONa[6] = { + "WON_a_L", "WON_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392BF8, &l_resWONa); /* 80392C10-80392C28 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */ -SECTION_RODATA static void* const l_resWGNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1BD), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1C5), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWGNa[6] = { + "WGN_a_L", "WGN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392C10, &l_resWGNa); /* 80392C28-80392C40 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */ -SECTION_RODATA static void* const l_resWANb[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1CF), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1D7), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWANb[6] = { + "WAN_b_L", "WAN_b_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392C28, &l_resWANb); /* 80392C40-80392C58 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */ -SECTION_RODATA static void* const l_resWANa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1E1), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1EA), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWANa2[6] = { + "WAN_a2_L", "WAN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392C40, &l_resWANa2); /* 80392C58-80392C70 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */ -SECTION_RODATA static void* const l_resWADa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1F4), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x1FD), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWADa2[6] = { + "WAD_a2_L", "WAD_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392C58, &l_resWADa2); /* 80392C70-80392C88 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */ -SECTION_RODATA static void* const l_resMATa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x207), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x210), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resMATa2[6] = { + "MAT_a2_L", "MAT_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392C70, &l_resMATa2); /* 80392C88-80392CA0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */ -SECTION_RODATA static void* const l_resWCNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x21A), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x223), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWCNa2[6] = { + "WCN_a2_L", "WCN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392C88, &l_resWCNa2); /* 80392CA0-80392CB8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */ -SECTION_RODATA static void* const l_resWONa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x22D), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x236), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWONa2[6] = { + "WON_a2_L", "WON_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392CA0, &l_resWONa2); /* 80392CB8-80392CD0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */ -SECTION_RODATA static void* const l_resWGNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x240), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x249), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWGNa2[6] = { + "WGN_a2_L", "WGN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392CB8, &l_resWGNa2); /* 80392CD0-80392CE8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */ -SECTION_RODATA static void* const l_resWANb2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x253), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x25C), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x16B), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x26), - (void*)(((char*)&a_npc_d_a_npc_cd__stringBase0) + 0x2F), +static char* const l_resWANb2[6] = { + "WAN_b2_L", "WAN_b2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -COMPILER_STRIP_GATE(0x80392CD0, &l_resWANb2); /* 80392CE8-80392D30 -00001 0048+00 1/1 0/0 0/0 .rodata l_objTbl */ SECTION_RODATA static void* const l_objTbl[18] = { @@ -849,105 +353,23 @@ SECTION_RODATA u8 const daNpcCd_c::m_cylDat[68] = { COMPILER_STRIP_GATE(0x80392E18, &daNpcCd_c::m_cylDat); /* 80392E5C-80392FC4 01F4BC 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3984 */ -SECTION_RODATA static u8 const a_transScaleTbl[360] = { - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x99, 0x63, 0x54, 0x40, 0x0B, 0x18, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x0E, 0xE0, 0xA7, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x95, 0x06, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x8A, 0x81, 0x82, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x49, 0xC4, 0xEC, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x6B, 0x85, 0x1E, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x99, 0x63, 0x54, 0x40, 0x0B, 0x18, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x0E, 0xE0, 0xA7, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x95, 0x06, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x8A, 0x81, 0x82, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x49, 0xC4, 0xEC, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x6B, 0x85, 0x1E, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCC, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x10, 0xCE, 0x59, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x86, 0xC7, 0x2F, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x8C, 0xCC, 0xCC, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x10, 0xCE, 0x59, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00, +static Vec const a_transScaleTbl[30] = { + {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, + {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95f, 1.0f}, + {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, + {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, + {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, + {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95f, 1.0f}, + {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, + {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, + {1.0f, 1.0f, 1.0f}, {1.0f, 0.95f, 1.0f}, + {1.0f, 1.0999999f, 1.0f}, {1.0f, 0.5656486f, 1.0f}, + {1.0f, 0.9f, 1.0f}, {1.0f, 0.8630768f, 1.0f}, + {1.0f, 1.0529536f, 1.0f}, {1.0f, 1.0f, 1.0f}, + {1.0f, 0.95f, 1.0f}, {1.0f, 1.0999999f, 1.0f}, + {1.0f, 0.5656486f, 1.0f}, {1.0f, 0.9f, 1.0f}, + {1.0f, 0.8630768f, 1.0f}, {1.0f, 1.0529536f, 1.0f}, }; -COMPILER_STRIP_GATE(0x80392E5C, &a_transScaleTbl); - -/* 80392FE8-80392FE8 01F648 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80392FE8 = "MAN_a_L"; -SECTION_DEAD static char const* const stringBase_80392FF0 = "MAN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80392FFA = "Mgenral_l"; -SECTION_DEAD static char const* const stringBase_80393004 = "Mspcial_l"; -SECTION_DEAD static char const* const stringBase_8039300E = "object_l"; -SECTION_DEAD static char const* const stringBase_80393017 = "objectLTW"; -SECTION_DEAD static char const* const stringBase_80393021 = "MAD_a_L"; -SECTION_DEAD static char const* const stringBase_80393029 = "MAD_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393033 = "MCN_a_L"; -SECTION_DEAD static char const* const stringBase_8039303B = "MCN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393045 = "MON_a_L"; -SECTION_DEAD static char const* const stringBase_8039304D = "MON_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393057 = "MAN_b_L"; -SECTION_DEAD static char const* const stringBase_8039305F = "MAN_b_LTW"; -SECTION_DEAD static char const* const stringBase_80393069 = "MAN_c_L"; -SECTION_DEAD static char const* const stringBase_80393071 = "MAN_c_LTW"; -SECTION_DEAD static char const* const stringBase_8039307B = "MAS_a_L"; -SECTION_DEAD static char const* const stringBase_80393083 = "MAS_a_LTW"; -SECTION_DEAD static char const* const stringBase_8039308D = "MBN_a_L"; -SECTION_DEAD static char const* const stringBase_80393095 = "MBN_a_LTW"; -SECTION_DEAD static char const* const stringBase_8039309F = "MAN_a2_L"; -SECTION_DEAD static char const* const stringBase_803930A8 = "MAN_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930B2 = "MAD_a2_L"; -SECTION_DEAD static char const* const stringBase_803930BB = "MAD_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930C5 = "MCN_a2_L"; -SECTION_DEAD static char const* const stringBase_803930CE = "MCN_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930D8 = "MON_a2_L"; -SECTION_DEAD static char const* const stringBase_803930E1 = "MON_a2LTW"; -SECTION_DEAD static char const* const stringBase_803930EB = "MAN_b2_L"; -SECTION_DEAD static char const* const stringBase_803930F4 = "MAN_b2LTW"; -SECTION_DEAD static char const* const stringBase_803930FE = "MAN_c2_L"; -SECTION_DEAD static char const* const stringBase_80393107 = "MAN_c2LTW"; -SECTION_DEAD static char const* const stringBase_80393111 = "MAS_a2_L"; -SECTION_DEAD static char const* const stringBase_8039311A = "MAS_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393124 = "MBN_a2_L"; -SECTION_DEAD static char const* const stringBase_8039312D = "MBN_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393137 = "WAN_a_L"; -SECTION_DEAD static char const* const stringBase_8039313F = "WAN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393149 = "Wgenral_l"; -SECTION_DEAD static char const* const stringBase_80393153 = "Wspcial_l"; -SECTION_DEAD static char const* const stringBase_8039315D = "WAD_a_L"; -SECTION_DEAD static char const* const stringBase_80393165 = "WAD_a_LTW"; -SECTION_DEAD static char const* const stringBase_8039316F = "MAT_a_L"; -SECTION_DEAD static char const* const stringBase_80393177 = "MAT_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393181 = "WCN_a_L"; -SECTION_DEAD static char const* const stringBase_80393189 = "WCN_a_LTW"; -SECTION_DEAD static char const* const stringBase_80393193 = "WON_a_L"; -SECTION_DEAD static char const* const stringBase_8039319B = "WON_a_LTW"; -SECTION_DEAD static char const* const stringBase_803931A5 = "WGN_a_L"; -SECTION_DEAD static char const* const stringBase_803931AD = "WGN_a_LTW"; -SECTION_DEAD static char const* const stringBase_803931B7 = "WAN_b_L"; -SECTION_DEAD static char const* const stringBase_803931BF = "WAN_b_LTW"; -SECTION_DEAD static char const* const stringBase_803931C9 = "WAN_a2_L"; -SECTION_DEAD static char const* const stringBase_803931D2 = "WAN_a2LTW"; -SECTION_DEAD static char const* const stringBase_803931DC = "WAD_a2_L"; -SECTION_DEAD static char const* const stringBase_803931E5 = "WAD_a2LTW"; -SECTION_DEAD static char const* const stringBase_803931EF = "MAT_a2_L"; -SECTION_DEAD static char const* const stringBase_803931F8 = "MAT_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393202 = "WCN_a2_L"; -SECTION_DEAD static char const* const stringBase_8039320B = "WCN_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393215 = "WON_a2_L"; -SECTION_DEAD static char const* const stringBase_8039321E = "WON_a2LTW"; -SECTION_DEAD static char const* const stringBase_80393228 = "WGN_a2_L"; -SECTION_DEAD static char const* const stringBase_80393231 = "WGN_a2LTW"; -SECTION_DEAD static char const* const stringBase_8039323B = "WAN_b2_L"; -SECTION_DEAD static char const* const stringBase_80393244 = "WAN_b2LTW"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039324E = "\0"; -#pragma pop /* 804534B8-804534BC 001AB8 0004+00 2/2 0/0 0/0 .sdata2 @4021 */ SECTION_SDATA2 static f32 lit_4021 = 1.0f; @@ -956,23 +378,25 @@ SECTION_SDATA2 static f32 lit_4021 = 1.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd_c::NpcCreate(int param_0) { +asm int daNpcCd_c::NpcCreate(int param_0) { nofralloc #include "asm/a/npc/d_a_npc_cd/NpcCreate__9daNpcCd_cFi.s" } #pragma pop -/* 801561E8-80156228 150B28 0040+00 0/0 0/0 1/1 .text ObjCreate__9daNpcCd_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd_c::ObjCreate(int param_0) { - nofralloc -#include "asm/a/npc/d_a_npc_cd/ObjCreate__9daNpcCd_cFi.s" +/* 801561E8-80156228 150B28 0040+00 0/0 0/0 1/1 .text ObjCreate__9daNpcCd_cFi */ +J3DModel* daNpcCd_c::ObjCreate(int param_0) { + J3DModel* model; + J3DModelData* modelData = getObjMdlDataP(param_0); + if (modelData) { + model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + } else { + model = NULL; + } + return model; } -#pragma pop -/* 80156228-80156248 150B68 0020+00 1/1 0/0 0/0 .text isM___9daNpcCd_cFv */ +/* 80156228-80156248 150B68 0020+00 1/1 0/0 0/0 .text isM___9daNpcCd_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1221,66 +645,81 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803B3B8C-803B3C04 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */ -SECTION_DATA static void* l_resNameTbl[30] = { - (void*)&l_resMANa, (void*)&l_resMADa, (void*)&l_resMCNa, (void*)&l_resMONa, - (void*)&l_resMANb, (void*)&l_resMANc, (void*)&l_resMASa, (void*)&l_resMBNa, - (void*)&l_resMANa2, (void*)&l_resMADa2, (void*)&l_resMCNa2, (void*)&l_resMONa2, - (void*)&l_resMANb2, (void*)&l_resMANc2, (void*)&l_resMASa2, (void*)&l_resMBNa2, - (void*)&l_resWANa, (void*)&l_resWADa, (void*)&l_resMATa, (void*)&l_resWCNa, - (void*)&l_resWONa, (void*)&l_resWGNa, (void*)&l_resWANb, (void*)&l_resWANa2, - (void*)&l_resWADa2, (void*)&l_resMATa2, (void*)&l_resWCNa2, (void*)&l_resWONa2, - (void*)&l_resWGNa2, (void*)&l_resWANb2, +static char* const* l_resNameTbl[30] = { + l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, + l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, + l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, + l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2, }; /* 80156B4C-80156C50 15148C 0104+00 0/0 0/0 1/1 .text loadResrc__9daNpcCd_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd_c::loadResrc(int param_0, int param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd/loadResrc__9daNpcCd_cFii.s" +int daNpcCd_c::loadResrc(int param_0, int param_1) { + int result; + if (field_0x9e8) { + result = dComIfG_resLoad(&mPhase1, l_resNameTbl[param_0][1]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + result = dComIfG_resLoad(&mPhase4, l_resNameTbl[param_0][5]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + } else { + result = dComIfG_resLoad(&mPhase1, l_resNameTbl[param_0][0]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + result = dComIfG_resLoad(&mPhase4, l_resNameTbl[param_0][4]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + } + result = dComIfG_resLoad(&mPhase2, l_resNameTbl[param_0][2]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + result = dComIfG_resLoad(&mPhase3, l_resNameTbl[param_0][3]); + if (result != cPhs_COMPLEATE_e) { + return result; + } } -#pragma pop /* 80156C50-80156D1C 151590 00CC+00 0/0 0/0 1/1 .text removeResrc__9daNpcCd_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd_c::removeResrc(int param_0, int param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd/removeResrc__9daNpcCd_cFii.s" +int daNpcCd_c::removeResrc(int idx, int param_1) { + if (field_0x9e8) { + dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]); + dComIfG_resDelete(&mPhase4, l_resNameTbl[idx][5]); + } else { + dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][0]); + dComIfG_resDelete(&mPhase4, l_resNameTbl[idx][4]); + } + dComIfG_resDelete(&mPhase2, l_resNameTbl[idx][2]); + dComIfG_resDelete(&mPhase3, l_resNameTbl[idx][3]); + return 1; } -#pragma pop /* 80156D1C-80156D78 15165C 005C+00 0/0 0/0 1/1 .text setEnvTevCol__9daNpcCd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd_c::setEnvTevCol() { - nofralloc -#include "asm/a/npc/d_a_npc_cd/setEnvTevCol__9daNpcCd_cFv.s" +void daNpcCd_c::setEnvTevCol() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); } -#pragma pop /* 80156D78-80156DBC 1516B8 0044+00 0/0 0/0 1/1 .text setRoomNo__9daNpcCd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd_c::setRoomNo() { - nofralloc -#include "asm/a/npc/d_a_npc_cd/setRoomNo__9daNpcCd_cFv.s" +void daNpcCd_c::setRoomNo() { + s32 id = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); + fopAcM_SetRoomNo(this, id); + mStts.SetRoomId(id); } -#pragma pop /* 80156DBC-80156E20 1516FC 0064+00 0/0 0/0 1/1 .text animation__9daNpcCd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd_c::animation() { - nofralloc -#include "asm/a/npc/d_a_npc_cd/animation__9daNpcCd_cFv.s" +void daNpcCd_c::animation() { + f32 lastframe = mpMorf->getFrame(); + mpMorf->play(0, 0); + if (mpMorf->getFrame() < lastframe) { + // cLib_calcTimer + func_8014D348(&field_0x9c8); + } } -#pragma pop /* 80156E20-80156E8C 151760 006C+00 0/0 0/0 1/1 .text * setAnm__9daNpcCd_cFP18J3DAnmTransformKeyffiii */ @@ -1407,7 +846,7 @@ SECTION_DATA static u8 l_bmdTWTbl[240] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd_c::getNpcMdlDataP(int param_0) { +asm J3DModelData* daNpcCd_c::getNpcMdlDataP(int param_0) { nofralloc #include "asm/a/npc/d_a_npc_cd/getNpcMdlDataP__9daNpcCd_cFi.s" } @@ -1417,7 +856,7 @@ asm void daNpcCd_c::getNpcMdlDataP(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd_c::getObjMdlDataP(int param_0) { +asm J3DModelData* daNpcCd_c::getObjMdlDataP(int param_0) { nofralloc #include "asm/a/npc/d_a_npc_cd/getObjMdlDataP__9daNpcCd_cFi.s" } @@ -2141,8 +1580,7 @@ asm daNpcCd_HIO_c::~daNpcCd_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_npc_cd_cpp() { - nofralloc +asm void __sinit_d_a_npc_cd_cpp(){nofralloc #include "asm/a/npc/d_a_npc_cd/__sinit_d_a_npc_cd_cpp.s" } #pragma pop diff --git a/src/d/a/d_a_npc_cd2.cpp b/src/d/a/d_a_npc_cd2.cpp index 94731512ed7..d21840bd8ae 100644 --- a/src/d/a/d_a_npc_cd2.cpp +++ b/src/d/a/d_a_npc_cd2.cpp @@ -4,101 +4,15 @@ // #include "d/a/d_a_npc_cd2.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" // // Types: // -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct cXyz { - /* 80009184 */ ~cXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CDD4 */ void transM(cXyz const&); - /* 8000CE38 */ void scaleM(f32, f32, f32); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DAnmTexPattern {}; - -struct J3DMaterialTable { - /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); -}; - -struct mDoExt_btpAnm { - /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); - /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature {}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_py_c { - /* 8015F424 */ void checkNowWolfEyeUp(); -}; - -struct J3DModel {}; - -struct J3DJoint {}; - -struct J3DAnmTransformKey {}; - -struct daNpcCd2_c { - /* 80157D00 */ void NpcCreate(int); - /* 80157F28 */ void ObjCreate(int); - /* 80157F68 */ void ChairCreate(f32); - /* 801580A8 */ void isM_(); - /* 801580F0 */ void getAnmP(int, int); - /* 80158420 */ void setAttention(int); - /* 80158BB8 */ void loadResrc(int, int); - /* 80158CBC */ void removeResrc(int, int); - /* 80158D88 */ void setEnvTevCol(); - /* 80158DE4 */ void setRoomNo(); - /* 80158E28 */ void animation(int); - /* 80158F00 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int); - /* 80158F6C */ void drawShadow(f32); - /* 80158FF0 */ void drawObj(int, J3DModel*, f32); - /* 801590FC */ void drawNpc(); - /* 80159258 */ void jntNodeCB(J3DJoint*, J3DModel*); - /* 80159550 */ void setHitodamaParticle(); - /* 801597C0 */ void getEscapeTag(); - /* 80159818 */ void checkFearSituation(); - /* 801598E8 */ void getNpcMdlDataP(int); - /* 8015994C */ void getObjMdlDataP(int); - /* 801599C4 */ void getTexAnmP(int); - - static u8 const m_cylDat[68]; -}; - struct daNpcCd2_HIO_c { /* 8015A4D8 */ daNpcCd2_HIO_c(); /* 8015A860 */ ~daNpcCd2_HIO_c(); @@ -119,81 +33,8 @@ struct daNpcCd2_HIO_Jnt_c { /* 8015A788 */ daNpcCd2_HIO_Jnt_c(); }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - struct dPath {}; -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct cBgS_PolyInfo {}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct _GXTexObj {}; - -struct Vec {}; - -struct Z2CreatureCitizen { - /* 802C0CE4 */ void init(Vec*, Vec*, u8, u8); - /* 802C0D48 */ void setMdlType(s8, bool, bool); -}; - -struct PathTrace_c { - /* 80159A38 */ void setPath(int, int, int, cXyz*, bool); - /* 80159C14 */ void checkPoint(cXyz, f32); - /* 80159DC0 */ void checkPathEnd(cXyz, f32); - /* 80159E54 */ void getTargetPoint(Vec*); - /* 80159ECC */ void setAvoidPoint(); - /* 8015A0D0 */ void setNextPoint(); - /* 80159F98 */ void setNextPoint(cXyz&); - /* 8015A264 */ void incIndex(int); - /* 8015A294 */ void decIndex(int); - /* 8015A370 */ void checkObstacle(fopAc_ac_c*); - /* 8015A3E4 */ void checkObstacleSub(fopAc_ac_c*); -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); -}; - // // Forward References: // @@ -251,7 +92,6 @@ extern "C" extern u8 data_80451010[8]; // External References: // -SECTION_INIT void memcpy(); extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); @@ -299,9 +139,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareDistance(); extern "C" void __register_global_object(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); @@ -317,713 +154,228 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void pow(); extern "C" extern void* __vt__12J3DFrameCtrl[3]; extern "C" extern void* __vt__18fOpAcm_HIO_entry_c[3]; extern "C" extern void* __vt__14mDoHIO_entry_c[3]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; // // Declarations: // /* 80157CB4-80157D00 1525F4 004C+00 1/1 0/0 0/0 .text jntNodeCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void jntNodeCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/jntNodeCallBack__FP8J3DJointi.s" +static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { + if (param_1 == 0) { + if (j3dSys.getModel()->getUserArea() != 0) { + ((daNpcCd2_c*)j3dSys.getModel()->getUserArea())->jntNodeCB(i_jnt, j3dSys.getModel()); + } + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80393B70-80393B76 0201D0 0006+00 2/1 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393B70; - -/* 80393B76-80393B7F 0201D6 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393B76; - -/* 80393B7F-80393B88 0201DF 0009+00 17/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393B7F; - -/* 80393B88-80393B91 0201E8 0009+00 17/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393B88; - -/* 80393B91-80393B98 0201F1 0007+00 31/1 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393B91; - -/* 80393B98-80393BA1 0201F8 0009+00 31/1 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393B98; - -/* 80393BA1-80393BA7 020201 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BA1; - -/* 80393BA7-80393BB0 020207 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BA7; - -/* 80393BB0-80393BB6 020210 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BB0; - -/* 80393BB6-80393BBF 020216 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BB6; - -/* 80393BBF-80393BC5 02021F 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BBF; - -/* 80393BC5-80393BCE 020225 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BC5; - -/* 80393BCE-80393BD4 02022E 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BCE; - -/* 80393BD4-80393BDD 020234 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BD4; - -/* 80393BDD-80393BE3 02023D 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BDD; - -/* 80393BE3-80393BEC 020243 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BE3; - -/* 80393BEC-80393BF2 02024C 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BEC; - -/* 80393BF2-80393BFB 020252 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BF2; - -/* 80393BFB-80393C01 02025B 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393BFB; - -/* 80393C01-80393C0A 020261 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C01; - -/* 80393C0A-80393C11 02026A 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C0A; - -/* 80393C11-80393C1B 020271 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C11; - -/* 80393C1B-80393C22 02027B 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C1B; - -/* 80393C22-80393C2C 020282 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C22; - -/* 80393C2C-80393C33 02028C 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C2C; - -/* 80393C33-80393C3D 020293 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C33; - -/* 80393C3D-80393C44 02029D 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C3D; - -/* 80393C44-80393C4E 0202A4 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C44; - -/* 80393C4E-80393C55 0202AE 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C4E; - -/* 80393C55-80393C5F 0202B5 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C55; - -/* 80393C5F-80393C66 0202BF 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C5F; - -/* 80393C66-80393C70 0202C6 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C66; - -/* 80393C70-80393C77 0202D0 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C70; - -/* 80393C77-80393C81 0202D7 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C77; - -/* 80393C81-80393C88 0202E1 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C81; - -/* 80393C88-80393C92 0202E8 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C88; - -/* 80393C92-80393C98 0202F2 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C92; - -/* 80393C98-80393CA1 0202F8 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393C98; - -/* 80393CA1-80393CAA 020301 0009+00 15/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CA1; - -/* 80393CAA-80393CB3 02030A 0009+00 15/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CAA; - -/* 80393CB3-80393CB9 020313 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CB3; - -/* 80393CB9-80393CC2 020319 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CB9; - -/* 80393CC2-80393CC8 020322 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CC2; - -/* 80393CC8-80393CD1 020328 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CC8; - -/* 80393CD1-80393CD7 020331 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CD1; - -/* 80393CD7-80393CE0 020337 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CD7; - -/* 80393CE0-80393CE6 020340 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CE0; - -/* 80393CE6-80393CEF 020346 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CE6; - -/* 80393CEF-80393CF5 02034F 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CEF; - -/* 80393CF5-80393CFE 020355 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CF5; - -/* 80393CFE-80393D04 02035E 0006+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393CFE; - -/* 80393D04-80393D0D 020364 0009+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D04; - -/* 80393D0D-80393D14 02036D 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D0D; - -/* 80393D14-80393D1E 020374 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D14; - -/* 80393D1E-80393D25 02037E 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D1E; - -/* 80393D25-80393D2F 020385 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D25; - -/* 80393D2F-80393D36 02038F 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D2F; - -/* 80393D36-80393D40 020396 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D36; - -/* 80393D40-80393D47 0203A0 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D40; - -/* 80393D47-80393D51 0203A7 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D47; - -/* 80393D51-80393D58 0203B1 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D51; - -/* 80393D58-80393D62 0203B8 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D58; - -/* 80393D62-80393D69 0203C2 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D62; - -/* 80393D69-80393D73 0203C9 000A+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D69; - -/* 80393D73-80393D7A 0203D3 0007+00 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D73; - -/* 80393D7A-80393D88 0203DA 000A+04 1/0 0/0 0/0 .rodata None */ -extern "C" char const* const stringBase_80393D7A; /* 80393250-80393268 -00001 0018+00 2/1 0/0 0/0 .rodata l_resMANa */ -SECTION_RODATA static void* const l_resMANa[6] = { - (void*)&a_npc_d_a_npc_cd2__stringBase0, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x6), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMANa[6] = { + "MAN_a", "MAN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393250, &l_resMANa); /* 80393268-80393280 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa */ -SECTION_RODATA static void* const l_resMADa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x31), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x37), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMADa[6] = { + "MAD_a", "MAD_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393268, &l_resMADa); /* 80393280-80393298 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa */ -SECTION_RODATA static void* const l_resMCNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x40), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x46), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMCNa[6] = { + "MCN_a", "MCN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393280, &l_resMCNa); /* 80393298-803932B0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa */ -SECTION_RODATA static void* const l_resMONa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x4F), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x55), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMONa[6] = { + "MON_a", "MON_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393298, &l_resMONa); /* 803932B0-803932C8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb */ -SECTION_RODATA static void* const l_resMANb[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x5E), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x64), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMANb[6] = { + "MAN_b", "MAN_b_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803932B0, &l_resMANb); /* 803932C8-803932E0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc */ -SECTION_RODATA static void* const l_resMANc[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x6D), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x73), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMANc[6] = { + "MAN_c", "MAN_c_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803932C8, &l_resMANc); /* 803932E0-803932F8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa */ -SECTION_RODATA static void* const l_resMASa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x7C), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x82), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMASa[6] = { + "MAS_a", "MAS_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803932E0, &l_resMASa); /* 803932F8-80393310 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa */ -SECTION_RODATA static void* const l_resMBNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x8B), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x91), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMBNa[6] = { + "MBN_a", "MBN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803932F8, &l_resMBNa); /* 80393310-80393328 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANa2 */ -SECTION_RODATA static void* const l_resMANa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x9A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xA1), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMANa2[6] = { + "MAN_a2", "MAN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393310, &l_resMANa2); /* 80393328-80393340 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMADa2 */ -SECTION_RODATA static void* const l_resMADa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xAB), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xB2), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMADa2[6] = { + "MAD_a2", "MAD_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393328, &l_resMADa2); /* 80393340-80393358 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMCNa2 */ -SECTION_RODATA static void* const l_resMCNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xBC), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xC3), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMCNa2[6] = { + "MCN_a2", "MCN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393340, &l_resMCNa2); /* 80393358-80393370 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMONa2 */ -SECTION_RODATA static void* const l_resMONa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xCD), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xD4), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMONa2[6] = { + "MON_a2", "MON_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393358, &l_resMONa2); /* 80393370-80393388 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANb2 */ -SECTION_RODATA static void* const l_resMANb2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xDE), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xE5), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMANb2[6] = { + "MAN_b2", "MAN_b2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393370, &l_resMANb2); /* 80393388-803933A0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMANc2 */ -SECTION_RODATA static void* const l_resMANc2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xEF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF6), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMANc2[6] = { + "MAN_c2", "MAN_c2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393388, &l_resMANc2); /* 803933A0-803933B8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMASa2 */ -SECTION_RODATA static void* const l_resMASa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x100), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x107), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMASa2[6] = { + "MAS_a2", "MAS_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803933A0, &l_resMASa2); /* 803933B8-803933D0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMBNa2 */ -SECTION_RODATA static void* const l_resMBNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x111), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x118), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMBNa2[6] = { + "MBN_a2", "MBN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803933B8, &l_resMBNa2); /* 803933D0-803933E8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa */ -SECTION_RODATA static void* const l_resWANa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x122), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x128), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWANa[6] = { + "WAN_a", "WAN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803933D0, &l_resWANa); /* 803933E8-80393400 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa */ -SECTION_RODATA static void* const l_resWADa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x143), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x149), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWADa[6] = { + "WAD_a", "WAD_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803933E8, &l_resWADa); /* 80393400-80393418 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa */ -SECTION_RODATA static void* const l_resMATa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x152), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x158), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMATa[6] = { + "MAT_a", "MAT_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393400, &l_resMATa); /* 80393418-80393430 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa */ -SECTION_RODATA static void* const l_resWCNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x161), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x167), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWCNa[6] = { + "WCN_a", "WCN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393418, &l_resWCNa); /* 80393430-80393448 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa */ -SECTION_RODATA static void* const l_resWONa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x170), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x176), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWONa[6] = { + "WON_a", "WON_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393430, &l_resWONa); /* 80393448-80393460 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa */ -SECTION_RODATA static void* const l_resWGNa[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x17F), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x185), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWGNa[6] = { + "WGN_a", "WGN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393448, &l_resWGNa); /* 80393460-80393478 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb */ -SECTION_RODATA static void* const l_resWANb[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18E), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x194), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWANb[6] = { + "WAN_b", "WAN_b_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393460, &l_resWANb); /* 80393478-80393490 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANa2 */ -SECTION_RODATA static void* const l_resWANa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x19D), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1A4), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWANa2[6] = { + "WAN_a2", "WAN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393478, &l_resWANa2); /* 80393490-803934A8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWADa2 */ -SECTION_RODATA static void* const l_resWADa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1AE), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1B5), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWADa2[6] = { + "WAD_a2", "WAD_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x80393490, &l_resWADa2); /* 803934A8-803934C0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resMATa2 */ -SECTION_RODATA static void* const l_resMATa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1BF), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1C6), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resMATa2[6] = { + "MAT_a2", "MAT_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803934A8, &l_resMATa2); /* 803934C0-803934D8 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWCNa2 */ -SECTION_RODATA static void* const l_resWCNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1D0), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1D7), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWCNa2[6] = { + "WCN_a2", "WCN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803934C0, &l_resWCNa2); /* 803934D8-803934F0 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWONa2 */ -SECTION_RODATA static void* const l_resWONa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1E1), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1E8), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWONa2[6] = { + "WON_a2", "WON_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803934D8, &l_resWONa2); /* 803934F0-80393508 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWGNa2 */ -SECTION_RODATA static void* const l_resWGNa2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1F2), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x1F9), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWGNa2[6] = { + "WGN_a2", "WGN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -COMPILER_STRIP_GATE(0x803934F0, &l_resWGNa2); /* 80393508-80393520 -00001 0018+00 1/1 0/0 0/0 .rodata l_resWANb2 */ -SECTION_RODATA static void* const l_resWANb2[6] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x203), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x20A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), +static char* const l_resWANb2[6] = { + "WAN_b2", "WAN_b2_TW", "Wgeneral", "Wspecial", "object", "objectTW", +}; + +struct tbl_entry { + char* name; + int index; }; -COMPILER_STRIP_GATE(0x80393508, &l_resWANb2); /* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTbl */ -SECTION_RODATA static void* const l_objTbl[26] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000008, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000003, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000006, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000007, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x0000000F, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x21), (void*)0x00000010, +SECTION_RODATA static tbl_entry const l_objTbl[13] = { + {"object", 9}, {"object", 9}, {"object", 8}, {"object", 3}, {"object", 13}, + {"object", 14}, {"object", 12}, {"object", 6}, {"object", 7}, {"object", 10}, + {"object", 11}, {"object", 15}, {"object", 16}, }; COMPILER_STRIP_GATE(0x80393520, &l_objTbl); /* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */ -SECTION_RODATA static void* const l_objTWTbl[26] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x00000008, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x00000003, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x0000000D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x0000000E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x0000000C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x00000006, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x00000007, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x0000000A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0x0000000B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x28), (void*)0xFFFFFFFF, +SECTION_RODATA static tbl_entry const l_objTWTbl[13] = { + {"objectTW", 9}, {"objectTW", 9}, {"objectTW", 8}, {"objectTW", 3}, {"objectTW", 13}, + {"objectTW", 14}, {"objectTW", 12}, {"objectTW", 6}, {"objectTW", 7}, {"objectTW", 10}, + {"objectTW", 11}, {"objectTW", -1}, {"objectTW", -1}, }; COMPILER_STRIP_GATE(0x80393588, &l_objTWTbl); /* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_M */ -SECTION_RODATA static void* const l_bckTbl_M[108] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000001A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000001B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000001D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000001E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000008, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000014, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000015, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000017, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000005, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000006, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000001C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000018, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000016, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000011, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000012, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000F, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000010, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000003, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000004, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000012, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x0000000F, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x0000000C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000015, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000013, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000010, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x0000000D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000016, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000014, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000011, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x0000000E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000017, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000007, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000008, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x0000000A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x0000000B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000019, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000013, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000003, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000006, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000005, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x18), (void*)0x00000004, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x00000007, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0xF), (void*)0x0000000A, +SECTION_RODATA static tbl_entry const l_bckTbl_M[54] = { + {"Mgeneral", 26}, {"Mgeneral", 27}, {"Mgeneral", 29}, {"Mgeneral", 30}, {"Mgeneral", 8}, + {"Mgeneral", 9}, {"Mgeneral", 20}, {"Mgeneral", 21}, {"Mgeneral", 23}, {"Mgeneral", 5}, + {"Mgeneral", 6}, {"Mgeneral", 28}, {"Mgeneral", 24}, {"Mgeneral", 22}, {"Mgeneral", 17}, + {"Mgeneral", 13}, {"Mgeneral", 14}, {"Mgeneral", 18}, {"Mgeneral", 15}, {"Mgeneral", 16}, + {"Mgeneral", 3}, {"Mgeneral", 4}, {"Mspecial", 18}, {"Mspecial", 15}, {"Mspecial", 12}, + {"Mspecial", 21}, {"Mspecial", 19}, {"Mspecial", 16}, {"Mspecial", 13}, {"Mspecial", 22}, + {"Mspecial", 20}, {"Mspecial", 17}, {"Mspecial", 14}, {"Mspecial", 23}, {"Mspecial", 7}, + {"Mspecial", 8}, {"Mspecial", 10}, {"Mspecial", 11}, {"Mgeneral", 25}, {"Mgeneral", 11}, + {"Mgeneral", 12}, {"Mgeneral", 19}, {"Mspecial", 3}, {"Mspecial", 6}, {"Mspecial", 5}, + {"Mspecial", 9}, {"Mspecial", 4}, {"Mgeneral", 7}, {"Mgeneral", -1}, {"Mgeneral", -1}, + {"Mgeneral", -1}, {"Mgeneral", -1}, {"Mgeneral", -1}, {"Mgeneral", 10}, }; COMPILER_STRIP_GATE(0x803935F0, &l_bckTbl_M); /* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_W */ -SECTION_RODATA static void* const l_bckTbl_W[108] = { - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000001F, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000020, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000022, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000023, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000019, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000001A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000001C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000021, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000001D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000001B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000016, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000012, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000013, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000017, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000014, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000015, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000007, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000008, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x0000000D, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x0000000A, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000007, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000010, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x0000000E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x0000000B, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000008, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000011, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x0000000F, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x0000000C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000012, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000003, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000004, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000005, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0x00000006, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000001E, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000010, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000011, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000018, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x13A), (void*)0xFFFFFFFF, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000C, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000003, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000004, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000005, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000006, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x00000009, - (void*)(((char*)&a_npc_d_a_npc_cd2__stringBase0) + 0x131), (void*)0x0000000F, +SECTION_RODATA static tbl_entry const l_bckTbl_W[54] = { + {"Wgeneral", 31}, {"Wgeneral", 32}, {"Wgeneral", 34}, {"Wgeneral", 35}, {"Wgeneral", 13}, + {"Wgeneral", 14}, {"Wgeneral", 25}, {"Wgeneral", 26}, {"Wgeneral", 28}, {"Wgeneral", 10}, + {"Wgeneral", 11}, {"Wgeneral", 33}, {"Wgeneral", 29}, {"Wgeneral", 27}, {"Wgeneral", 22}, + {"Wgeneral", 18}, {"Wgeneral", 19}, {"Wgeneral", 23}, {"Wgeneral", 20}, {"Wgeneral", 21}, + {"Wgeneral", 7}, {"Wgeneral", 8}, {"Wspecial", 13}, {"Wspecial", 10}, {"Wspecial", 7}, + {"Wspecial", 16}, {"Wspecial", 14}, {"Wspecial", 11}, {"Wspecial", 8}, {"Wspecial", 17}, + {"Wspecial", 15}, {"Wspecial", 12}, {"Wspecial", 9}, {"Wspecial", 18}, {"Wspecial", 3}, + {"Wspecial", 4}, {"Wspecial", 5}, {"Wspecial", 6}, {"Wgeneral", 30}, {"Wgeneral", 16}, + {"Wgeneral", 17}, {"Wgeneral", 24}, {"Wspecial", -1}, {"Wspecial", -1}, {"Wspecial", -1}, + {"Wspecial", -1}, {"Wspecial", -1}, {"Wgeneral", 12}, {"Wgeneral", 3}, {"Wgeneral", 4}, + {"Wgeneral", 5}, {"Wgeneral", 6}, {"Wgeneral", 9}, {"Wgeneral", 15}, }; COMPILER_STRIP_GATE(0x803937A0, &l_bckTbl_W); @@ -1038,105 +390,23 @@ SECTION_RODATA u8 const daNpcCd2_c::m_cylDat[68] = { COMPILER_STRIP_GATE(0x80393950, &daNpcCd2_c::m_cylDat); /* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3998 */ -SECTION_RODATA static u8 const a_transScaleTbl[360] = { - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x99, 0x63, 0x54, 0x40, 0x0B, 0x18, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x0E, 0xE0, 0xA7, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x95, 0x06, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x8A, 0x81, 0x82, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x49, 0xC4, 0xEC, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x6B, 0x85, 0x1E, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x99, 0x63, 0x54, 0x40, 0x0B, 0x18, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x0E, 0xE0, 0xA7, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x95, 0x06, 0x48, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x8A, 0x81, 0x82, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x49, 0xC4, 0xEC, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x6B, 0x85, 0x1E, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCC, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x10, 0xCE, 0x59, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x86, 0xC7, 0x2F, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x8C, 0xCC, 0xCC, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x10, 0xCE, 0x59, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x5C, 0xF2, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x86, 0xC7, 0x2F, 0x3F, 0x80, 0x00, 0x00, +static Vec const a_transScaleTbl[30] = { + {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, + {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f}, + {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, + {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, + {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, + {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f}, + {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, + {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, + {1.0f, 1.0f, 1.0f}, {1.0f, 0.95, 1.0f}, + {1.0f, 1.0999999f, 1.0f}, {1.0f, 0.5656486f, 1.0f}, + {1.0f, 0.9f, 1.0f}, {1.0f, 0.8630768f, 1.0f}, + {1.0f, 1.0529536f, 1.0f}, {1.0f, 1.0f, 1.0f}, + {1.0f, 0.95, 1.0f}, {1.0f, 1.0999999f, 1.0f}, + {1.0f, 0.5656486f, 1.0f}, {1.0f, 0.9f, 1.0f}, + {1.0f, 0.8630768f, 1.0f}, {1.0f, 1.0529536f, 1.0f}, }; -COMPILER_STRIP_GATE(0x80393994, &a_transScaleTbl); - -/* 80393B70-80393B70 0201D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80393B70 = "MAN_a"; -SECTION_DEAD static char const* const stringBase_80393B76 = "MAN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393B7F = "Mgeneral"; -SECTION_DEAD static char const* const stringBase_80393B88 = "Mspecial"; -SECTION_DEAD static char const* const stringBase_80393B91 = "object"; -SECTION_DEAD static char const* const stringBase_80393B98 = "objectTW"; -SECTION_DEAD static char const* const stringBase_80393BA1 = "MAD_a"; -SECTION_DEAD static char const* const stringBase_80393BA7 = "MAD_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BB0 = "MCN_a"; -SECTION_DEAD static char const* const stringBase_80393BB6 = "MCN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BBF = "MON_a"; -SECTION_DEAD static char const* const stringBase_80393BC5 = "MON_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BCE = "MAN_b"; -SECTION_DEAD static char const* const stringBase_80393BD4 = "MAN_b_TW"; -SECTION_DEAD static char const* const stringBase_80393BDD = "MAN_c"; -SECTION_DEAD static char const* const stringBase_80393BE3 = "MAN_c_TW"; -SECTION_DEAD static char const* const stringBase_80393BEC = "MAS_a"; -SECTION_DEAD static char const* const stringBase_80393BF2 = "MAS_a_TW"; -SECTION_DEAD static char const* const stringBase_80393BFB = "MBN_a"; -SECTION_DEAD static char const* const stringBase_80393C01 = "MBN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393C0A = "MAN_a2"; -SECTION_DEAD static char const* const stringBase_80393C11 = "MAN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C1B = "MAD_a2"; -SECTION_DEAD static char const* const stringBase_80393C22 = "MAD_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C2C = "MCN_a2"; -SECTION_DEAD static char const* const stringBase_80393C33 = "MCN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C3D = "MON_a2"; -SECTION_DEAD static char const* const stringBase_80393C44 = "MON_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C4E = "MAN_b2"; -SECTION_DEAD static char const* const stringBase_80393C55 = "MAN_b2_TW"; -SECTION_DEAD static char const* const stringBase_80393C5F = "MAN_c2"; -SECTION_DEAD static char const* const stringBase_80393C66 = "MAN_c2_TW"; -SECTION_DEAD static char const* const stringBase_80393C70 = "MAS_a2"; -SECTION_DEAD static char const* const stringBase_80393C77 = "MAS_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C81 = "MBN_a2"; -SECTION_DEAD static char const* const stringBase_80393C88 = "MBN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393C92 = "WAN_a"; -SECTION_DEAD static char const* const stringBase_80393C98 = "WAN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CA1 = "Wgeneral"; -SECTION_DEAD static char const* const stringBase_80393CAA = "Wspecial"; -SECTION_DEAD static char const* const stringBase_80393CB3 = "WAD_a"; -SECTION_DEAD static char const* const stringBase_80393CB9 = "WAD_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CC2 = "MAT_a"; -SECTION_DEAD static char const* const stringBase_80393CC8 = "MAT_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CD1 = "WCN_a"; -SECTION_DEAD static char const* const stringBase_80393CD7 = "WCN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CE0 = "WON_a"; -SECTION_DEAD static char const* const stringBase_80393CE6 = "WON_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CEF = "WGN_a"; -SECTION_DEAD static char const* const stringBase_80393CF5 = "WGN_a_TW"; -SECTION_DEAD static char const* const stringBase_80393CFE = "WAN_b"; -SECTION_DEAD static char const* const stringBase_80393D04 = "WAN_b_TW"; -SECTION_DEAD static char const* const stringBase_80393D0D = "WAN_a2"; -SECTION_DEAD static char const* const stringBase_80393D14 = "WAN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D1E = "WAD_a2"; -SECTION_DEAD static char const* const stringBase_80393D25 = "WAD_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D2F = "MAT_a2"; -SECTION_DEAD static char const* const stringBase_80393D36 = "MAT_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D40 = "WCN_a2"; -SECTION_DEAD static char const* const stringBase_80393D47 = "WCN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D51 = "WON_a2"; -SECTION_DEAD static char const* const stringBase_80393D58 = "WON_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D62 = "WGN_a2"; -SECTION_DEAD static char const* const stringBase_80393D69 = "WGN_a2_TW"; -SECTION_DEAD static char const* const stringBase_80393D73 = "WAN_b2"; -SECTION_DEAD static char const* const stringBase_80393D7A = "WAN_b2_TW"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0"; -#pragma pop /* 804534E0-804534E4 001AE0 0004+00 3/3 0/0 0/0 .sdata2 @4050 */ SECTION_SDATA2 static f32 lit_4050 = 1.0f; @@ -1152,14 +422,16 @@ asm void daNpcCd2_c::NpcCreate(int param_0) { #pragma pop /* 80157F28-80157F68 152868 0040+00 0/0 0/0 4/4 .text ObjCreate__10daNpcCd2_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::ObjCreate(int param_0) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/ObjCreate__10daNpcCd2_cFi.s" +J3DModel* daNpcCd2_c::ObjCreate(int param_0) { + J3DModel* model; + J3DModelData* modelData = getObjMdlDataP(param_0); + if (modelData) { + model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + } else { + model = NULL; + } + return model; } -#pragma pop /* ############################################################################################## */ /* 80393AFC-80393B08 02015C 000C+00 1/1 0/0 0/0 .rodata @4072 */ @@ -1182,7 +454,7 @@ asm void daNpcCd2_c::ChairCreate(f32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd2_c::isM_() { +asm bool daNpcCd2_c::isM_() { nofralloc #include "asm/a/npc/d_a_npc_cd2/isM___10daNpcCd2_cFv.s" } @@ -1195,15 +467,11 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803B61CC-803B6244 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */ -SECTION_DATA static void* l_resNameTbl[30] = { - (void*)&l_resMANa, (void*)&l_resMADa, (void*)&l_resMCNa, (void*)&l_resMONa, - (void*)&l_resMANb, (void*)&l_resMANc, (void*)&l_resMASa, (void*)&l_resMBNa, - (void*)&l_resMANa2, (void*)&l_resMADa2, (void*)&l_resMCNa2, (void*)&l_resMONa2, - (void*)&l_resMANb2, (void*)&l_resMANc2, (void*)&l_resMASa2, (void*)&l_resMBNa2, - (void*)&l_resWANa, (void*)&l_resWADa, (void*)&l_resMATa, (void*)&l_resWCNa, - (void*)&l_resWONa, (void*)&l_resWGNa, (void*)&l_resWANb, (void*)&l_resWANa2, - (void*)&l_resWADa2, (void*)&l_resMATa2, (void*)&l_resWCNa2, (void*)&l_resWONa2, - (void*)&l_resWGNa2, (void*)&l_resWANb2, +static char* const* l_resNameTbl[30] = { + l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, + l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, + l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, + l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2, }; /* 803B6244-803B6334 013364 00F0+00 1/2 0/0 0/0 .data l_bmdTbl */ @@ -2261,7 +1529,7 @@ SECTION_DATA static void* lit_4284[54 + 3 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd2_c::getAnmP(int param_0, int param_1) { +asm void* daNpcCd2_c::getAnmP(int param_0, int param_1) { nofralloc #include "asm/a/npc/d_a_npc_cd2/getAnmP__10daNpcCd2_cFii.s" } @@ -2482,7 +1750,7 @@ SECTION_SDATA2 static f32 lit_4586[1 + 1 /* padding */] = { /* 804534F0-804534F8 001AF0 0008+00 3/3 0/0 0/0 .sdata2 @4588 */ SECTION_SDATA2 static f64 lit_4588 = 4503601774854144.0 /* cast s32 to float */; -/* 80158420-80158BB8 152D60 0798+00 0/0 0/0 5/5 .text setAttention__10daNpcCd2_cFi */ +/* 80158420-80158BB8 152D60 0798+00 0/0 0/0 5/5 .text setAttention__10daNpcCd2_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2492,45 +1760,64 @@ asm void daNpcCd2_c::setAttention(int param_0) { } #pragma pop -/* 80158BB8-80158CBC 1534F8 0104+00 0/0 0/0 4/4 .text loadResrc__10daNpcCd2_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::loadResrc(int param_0, int param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/loadResrc__10daNpcCd2_cFii.s" +/* 80158BB8-80158CBC 1534F8 0104+00 0/0 0/0 4/4 .text loadResrc__10daNpcCd2_cFii */ +int daNpcCd2_c::loadResrc(int idx, int param_1) { + int result; + if (field_0xac6) { + result = dComIfG_resLoad(&mPhase1, l_resNameTbl[idx][1]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + result = dComIfG_resLoad(&mPhase4, l_resNameTbl[idx][5]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + } else { + result = dComIfG_resLoad(&mPhase1, l_resNameTbl[idx][0]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + result = dComIfG_resLoad(&mPhase4, l_resNameTbl[idx][4]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + } + result = dComIfG_resLoad(&mPhase2, l_resNameTbl[idx][2]); + if (result != cPhs_COMPLEATE_e) { + return result; + } + result = dComIfG_resLoad(&mPhase3, l_resNameTbl[idx][3]); + if (result != cPhs_COMPLEATE_e) { + return result; + } } -#pragma pop -/* 80158CBC-80158D88 1535FC 00CC+00 0/0 0/0 4/4 .text removeResrc__10daNpcCd2_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::removeResrc(int param_0, int param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/removeResrc__10daNpcCd2_cFii.s" +/* 80158CBC-80158D88 1535FC 00CC+00 0/0 0/0 4/4 .text removeResrc__10daNpcCd2_cFii */ +int daNpcCd2_c::removeResrc(int idx, int param_1) { + if (field_0xac6) { + dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]); + dComIfG_resDelete(&mPhase4, l_resNameTbl[idx][5]); + } else { + dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][0]); + dComIfG_resDelete(&mPhase4, l_resNameTbl[idx][4]); + } + dComIfG_resDelete(&mPhase2, l_resNameTbl[idx][2]); + dComIfG_resDelete(&mPhase3, l_resNameTbl[idx][3]); + return 1; } -#pragma pop -/* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text setEnvTevCol__10daNpcCd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::setEnvTevCol() { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/setEnvTevCol__10daNpcCd2_cFv.s" +/* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text setEnvTevCol__10daNpcCd2_cFv */ +void daNpcCd2_c::setEnvTevCol() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); } -#pragma pop -/* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text setRoomNo__10daNpcCd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::setRoomNo() { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/setRoomNo__10daNpcCd2_cFv.s" +/* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text setRoomNo__10daNpcCd2_cFv */ +void daNpcCd2_c::setRoomNo() { + s32 id = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); + fopAcM_SetRoomNo(this, id); + mStts.SetRoomId(id); } -#pragma pop /* 80158E28-80158F00 153768 00D8+00 0/0 0/0 3/3 .text animation__10daNpcCd2_cFi */ #pragma push @@ -2555,48 +1842,81 @@ asm void daNpcCd2_c::setAnm(J3DAnmTransformKey* param_0, f32 param_1, f32 param_ #pragma pop /* 80158F6C-80158FF0 1538AC 0084+00 0/0 0/0 4/4 .text drawShadow__10daNpcCd2_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::drawShadow(f32 param_0) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/drawShadow__10daNpcCd2_cFf.s" +int daNpcCd2_c::drawShadow(f32 param_0) { + if (field_0xac6 && !daPy_py_c::checkNowWolfEyeUp()) { + return 1; + } + dComIfGd_setSimpleShadow(¤t.pos, mAcch.GetGroundH(), param_0, mAcch.m_gnd, 0, + lit_4050, // todo: lit_4050 = 1.0f + dDlst_shadowControl_c::getSimpleTex()); + return 1; } -#pragma pop /* ############################################################################################## */ /* 80393B08-80393B70 020168 0068+00 1/1 0/0 0/0 .rodata a_jntNumTbl$4692 */ -SECTION_RODATA static u8 const a_jntNumTbl[104] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x0B, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, - 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x00, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, - 0x00, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x0B, +static s32 const a_jntNumTbl[13][2] = { + {-1, -1}, {7, -1}, {11, -1}, {-1, 11}, {7, -1}, {-1, 11}, {1, -1}, + {-1, 11}, {-1, 7}, {10, -1}, {-1, 11}, {10, -1}, {-1, 11}, }; -COMPILER_STRIP_GATE(0x80393B08, &a_jntNumTbl); -/* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text drawObj__10daNpcCd2_cFiP8J3DModelf - */ +/* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text drawObj__10daNpcCd2_cFiP8J3DModelf */ +#ifdef NONMATCHING // rlwinm loading wrong value +int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) { + if (i_model == NULL) { + return 0; + } + if (field_0xac6 && !daPy_py_c::checkNowWolfEyeUp()) { + return 0; + } + u32 x = !isM_(); + s32 jntNum = a_jntNumTbl[idx][x]; + if (i_model && jntNum >= 0) { + g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr); + mDoMtx_copy(mpMorf->getModel()->i_getAnmMtx(jntNum), mDoMtx_stack_c::now); + mDoMtx_stack_c::scaleM(i_scale, i_scale, i_scale); + i_model->i_setBaseTRMtx(mDoMtx_stack_c::now); + mDoExt_modelUpdateDL(i_model); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd2_c::drawObj(int param_0, J3DModel* param_1, f32 param_2) { +asm int daNpcCd2_c::drawObj(int param_0, J3DModel* param_1, f32 param_2) { nofralloc #include "asm/a/npc/d_a_npc_cd2/drawObj__10daNpcCd2_cFiP8J3DModelf.s" } #pragma pop +#endif /* 801590FC-80159258 153A3C 015C+00 0/0 0/0 4/4 .text drawNpc__10daNpcCd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::drawNpc() { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/drawNpc__10daNpcCd2_cFv.s" +int daNpcCd2_c::drawNpc() { + if (field_0xac6) { + g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); + } else { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + } + if (field_0xac6 && !daPy_py_c::checkNowWolfEyeUp()) { + setHitodamaParticle(); + return 1; + } + g_env_light.setLightTevColorType_MAJI(mpMorf->getModel(), &mTevStr); + if (field_0xac6) { + dComIfGd_setListDark(); + } + if (mpBtpAnm) { + mpBtpAnm->entry(mpMorf->getModel()->getModelData(), field_0xac4); + mpMorf->entryDL(); + mpBtpAnm->remove(mpMorf->getModel()->getModelData()); + } else { + mpMorf->entryDL(); + } + if (field_0xac6) { + dComIfGd_setList(); + } + return 1; } -#pragma pop /* ############################################################################################## */ /* 804534F8-804534FC 001AF8 0004+00 1/1 0/0 0/0 .sdata2 @4845 */ @@ -2641,33 +1961,41 @@ asm void daNpcCd2_c::setHitodamaParticle() { /* ############################################################################################## */ /* 80451004-80451008 000504 0004+00 2/2 0/0 0/0 .sbss target */ -static u8 target[4]; +static void* target; /* 80451008-8045100C 000508 0004+00 1/1 0/0 0/0 .sbss targetWay */ static f32 targetWay; /* 8045100C-80451010 00050C 0002+02 2/2 0/0 0/0 .sbss wolfAngle */ -static u8 wolfAngle[2 + 2 /* padding */]; +static s16 wolfAngle; /* 80159708-801597C0 154048 00B8+00 1/1 0/0 0/0 .text s_sub1__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_sub1(void* param_0, void* param_1) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/s_sub1__FPvPv.s" +static void* s_sub1(void* param_0, void* param_1) { + if (fopAc_IsActor(param_0) && fopAcM_GetName(param_0) == 0x28A) { + s16 angle = fopAcM_searchActorAngleY((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0); + s32 dist = cLib_distanceAngleS(wolfAngle, angle); + if (target == NULL) { + targetWay = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0); + target = param_0; + return NULL; + } else if (dist > 0x4000) { + f32 way = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0); + if (targetWay > way) { + targetWay = way; + target = param_0; + } + } + } + return NULL; } -#pragma pop /* 801597C0-80159818 154100 0058+00 0/0 0/0 2/2 .text getEscapeTag__10daNpcCd2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNpcCd2_c::getEscapeTag() { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/getEscapeTag__10daNpcCd2_cFv.s" +void* daNpcCd2_c::getEscapeTag() { + target = NULL; + wolfAngle = fopAcM_searchPlayerAngleY(this); + i_fpcM_Search(s_sub1, this); + return target; } -#pragma pop /* ############################################################################################## */ /* 80453508-80453510 001B08 0004+04 1/1 0/0 0/0 .sdata2 @4970 */ @@ -2708,7 +2036,7 @@ asm void daNpcCd2_c::getNpcMdlDataP(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daNpcCd2_c::getObjMdlDataP(int param_0) { +asm J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_0) { nofralloc #include "asm/a/npc/d_a_npc_cd2/getObjMdlDataP__10daNpcCd2_cFi.s" } @@ -2848,22 +2176,25 @@ asm void PathTrace_c::decIndex(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void s_sub(void* param_0, void* param_1) { +static asm void* s_sub(void* param_0, void* param_1) { nofralloc #include "asm/a/npc/d_a_npc_cd2/s_sub__FPvPv.s" } #pragma pop -/* 8015A370-8015A3E4 154CB0 0074+00 0/0 0/0 4/4 .text checkObstacle__11PathTrace_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void PathTrace_c::checkObstacle(fopAc_ac_c* param_0) { - nofralloc -#include "asm/a/npc/d_a_npc_cd2/checkObstacle__11PathTrace_cFP10fopAc_ac_c.s" +/* 8015A370-8015A3E4 154CB0 0074+00 0/0 0/0 4/4 .text checkObstacle__11PathTrace_cFP10fopAc_ac_c */ +fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) { + field_0x00 = param_0; + field_0x04 = NULL; + if (fopAcM_CheckCondition(field_0x00, 4)) { + return NULL; + } + i_fpcM_Search(s_sub, this); + if (field_0x04) { + setAvoidPoint(); + } + return field_0x04; } -#pragma pop /* ############################################################################################## */ /* 80453548-80453550 001B48 0008+00 1/1 0/0 0/0 .sdata2 @5359 */ @@ -2874,7 +2205,7 @@ SECTION_SDATA2 static f64 lit_5359 = 250.0; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void PathTrace_c::checkObstacleSub(fopAc_ac_c* param_0) { +asm void* PathTrace_c::checkObstacleSub(fopAc_ac_c* param_0) { nofralloc #include "asm/a/npc/d_a_npc_cd2/checkObstacleSub__11PathTrace_cFP10fopAc_ac_c.s" } @@ -3001,8 +2332,7 @@ asm daNpcCd2_HIO_c::~daNpcCd2_HIO_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_npc_cd2_cpp() { - nofralloc +asm void __sinit_d_a_npc_cd2_cpp(){nofralloc #include "asm/a/npc/d_a_npc_cd2/__sinit_d_a_npc_cd2_cpp.s" } #pragma pop diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp index 9eb83e1576a..29cb2333cd8 100644 --- a/src/d/d_npc_lib.cpp +++ b/src/d/d_npc_lib.cpp @@ -6,51 +6,6 @@ #include "d/d_npc_lib.h" #include "dol2asm.h" -// -// Types: -// - -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 80112C80 */ csXyz(); - /* 8026745C */ void operator+=(csXyz&); - - static u8 Zero[4]; -}; - -struct Vec {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); - /* 800125DC */ cXyz(); - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266EF4 */ void normalize(); - /* 802670AC */ void isZero() const; -}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE9C */ void XYZrotS(csXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct J3DModel {}; - -struct dNpcLib_lookat_c { - /* 80251314 */ dNpcLib_lookat_c(); - /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*); - /* 80251534 */ void action(cXyz, cXyz, fopAc_ac_c*, f32 (*)[4], int); - /* 80251B60 */ void dbView(); - /* 80251B64 */ void setPrm(); - /* 80251EF8 */ void update(); - /* 80252018 */ void limitter(s16*, s16, s16, s16); - /* 80252094 */ ~dNpcLib_lookat_c(); -}; - // // Forward References: // @@ -81,11 +36,6 @@ extern "C" void isZero__4cXyzCFv(); extern "C" void __apl__5csXyzFR5csXyz(); extern "C" void cM_atan2s__Fff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSquareMag(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); @@ -95,7 +45,6 @@ extern "C" void _restgpr_22(); extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u32 __float_nan; extern "C" u8 Zero__5csXyz[4]; extern "C" extern u8 data_80451164[4]; @@ -114,14 +63,7 @@ SECTION_DATA extern void* __vt__16dNpcLib_lookat_c[3 + 1 /* padding */] = { }; /* 80251314-8025140C 24BC54 00F8+00 0/0 0/0 4/4 .text __ct__16dNpcLib_lookat_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dNpcLib_lookat_c::dNpcLib_lookat_c() { - nofralloc -#include "asm/d/d_npc_lib/__ct__16dNpcLib_lookat_cFv.s" -} -#pragma pop +dNpcLib_lookat_c::dNpcLib_lookat_c() {} /* 8025140C-80251534 24BD4C 0128+00 0/0 0/0 2/2 .text * init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz */ @@ -212,23 +154,25 @@ asm void dNpcLib_lookat_c::update() { } #pragma pop -/* 80252018-80252094 24C958 007C+00 1/1 0/0 0/0 .text limitter__16dNpcLib_lookat_cFPssss - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dNpcLib_lookat_c::limitter(s16* param_0, s16 param_1, s16 param_2, s16 param_3) { - nofralloc -#include "asm/d/d_npc_lib/limitter__16dNpcLib_lookat_cFPssss.s" +/* 80252018-80252094 24C958 007C+00 1/1 0/0 0/0 .text limitter__16dNpcLib_lookat_cFPssss */ +int dNpcLib_lookat_c::limitter(s16* param_0, s16 param_1, s16 param_2, s16 param_3) { + int limit = param_1 + *param_0; + if (param_2 <= limit) { + if (param_2 <= param_1) { + *param_0 = 0; + } else { + *param_0 -= (s16)(limit - param_2); + } + } + if (limit <= param_3) { + if (param_1 <= param_3) { + *param_0 = 0; + } else { + *param_0 -= (s16)(limit - param_3); + } + } + return 1; } -#pragma pop -/* 80252094-8025217C 24C9D4 00E8+00 1/0 0/0 0/0 .text __dt__16dNpcLib_lookat_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dNpcLib_lookat_c::~dNpcLib_lookat_c() { - nofralloc -#include "asm/d/d_npc_lib/__dt__16dNpcLib_lookat_cFv.s" -} -#pragma pop +/* 80252094-8025217C 24C9D4 00E8+00 1/0 0/0 0/0 .text __dt__16dNpcLib_lookat_cFv */ +dNpcLib_lookat_c::~dNpcLib_lookat_c() {}