From e841829b2c24a0511ec32e83894d7b4eda119f92 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Tue, 20 Dec 2022 09:36:38 -0700 Subject: [PATCH] remove asm --- .../d_a_npc/CheckCreateHeap__FP10fopAc_ac_c.s | 9 - .../__ct__23daBaseNpc_moveBgActor_cFv.s | 18 -- .../a/d_a_npc/attnSttsOn__11daBaseNpc_cFii.s | 24 -- .../chkPassed__13daNpcF_Path_cF4cXyz.s | 23 -- ...kPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs.s | 31 --- asm/d/a/d_a_npc/ctrlFaceMotion__8daNpcT_cFv.s | 48 ---- asm/d/a/d_a_npc/daBaseNpc_decIdx__FiPUsii.s | 26 --- asm/d/a/d_a_npc/daBaseNpc_incIdx__FiPUsii.s | 26 --- asm/d/a/d_a_npc/daNpcF_addIdx__FiiRUsi.s | 19 -- .../daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c.s | 77 ------ asm/d/a/d_a_npc/daNpcF_chkEvtBit__FUl.s | 17 -- ...daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs.s | 95 -------- asm/d/a/d_a_npc/daNpcF_chkTmpBit__FUl.s | 17 -- .../a/d_a_npc/daNpcF_clearMessageTmpBit__Fv.s | 28 --- asm/d/a/d_a_npc/daNpcF_decIdx__FiRUsii.s | 26 --- asm/d/a/d_a_npc/daNpcF_getDistTableIdx__Fii.s | 6 - asm/d/a/d_a_npc/daNpcF_incIdx__FiRUsii.s | 26 --- asm/d/a/d_a_npc/daNpcF_offTmpBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcF_onEvtBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcF_onTmpBit__FUl.s | 17 -- ...LineSegmentLengthSquare2D__FffffffPfPfPf.s | 46 ---- asm/d/a/d_a_npc/daNpcF_subIdx__FiiRUsi.s | 22 -- asm/d/a/d_a_npc/daNpcT_addIdx__FiiRUsi.s | 19 -- .../daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c.s | 80 ------- asm/d/a/d_a_npc/daNpcT_chkEvtBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcT_chkTmpBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcT_decIdx__FiRUsii.s | 26 --- asm/d/a/d_a_npc/daNpcT_getDistTableIdx__Fii.s | 6 - asm/d/a/d_a_npc/daNpcT_incIdx__FiRUsii.s | 26 --- asm/d/a/d_a_npc/daNpcT_offEvtBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcT_offTmpBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcT_onEvtBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcT_onTmpBit__FUl.s | 17 -- asm/d/a/d_a_npc/daNpcT_subIdx__FiiRUsi.s | 22 -- ...ntry__18daNpcF_ActorMngr_cFP10fopAc_ac_c.s | 10 - asm/d/a/d_a_npc/execute__8daNpcT_cFv.s | 221 ------------------ .../getActorP__18daNpcF_ActorMngr_cFv.s | 22 -- ...getAttentionPos__8daNpcF_cFP10fopAc_ac_c.s | 31 --- .../a/d_a_npc/getDistTableIdx__8daNpcF_cFii.s | 11 - .../a/d_a_npc/getIdx__16daBaseNpc_path_cFv.s | 3 - .../getTexPtrnAnmP__11daBaseNpc_cFPci.s | 16 -- .../getTrnsfrmKeyAnmP__11daBaseNpc_cFPci.s | 16 -- ...XyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz.s | 50 ---- .../initTalk__8daNpcF_cFiPP10fopAc_ac_c.s | 27 --- .../initTalk__8daNpcT_cFiPP10fopAc_ac_c.s | 36 --- .../a/d_a_npc/initialize__13daNpcF_Path_cFv.s | 24 -- .../a/d_a_npc/initialize__13daNpcT_Path_cFv.s | 14 -- .../d_a_npc/initialize__15daNpcF_MatAnm_cFv.s | 10 - .../d_a_npc/initialize__15daNpcT_MatAnm_cFv.s | 10 - .../initialize__18daNpcF_ActorMngr_cFv.s | 4 - .../a/d_a_npc/isPath__16daBaseNpc_path_cFv.s | 6 - .../limitter__18daBaseNpc_lookat_cFsPsss.s | 33 --- .../a/d_a_npc/orderEvent__11daBaseNpc_cFiPc.s | 45 ---- .../d_a_npc/remove__18daNpcF_ActorMngr_cFv.s | 4 - .../reverseDir__16daBaseNpc_path_cFv.s | 9 - asm/d/a/d_a_npc/reverse__13daNpcF_Path_cFv.s | 11 - asm/d/a/d_a_npc/reverse__13daNpcT_Path_cFv.s | 14 -- .../setAttnPos__18daBaseNpc_lookat_cFP4cXyz.s | 4 - ...m__11daBaseNpc_cFP15J3DAnmTransformfiiib.s | 18 -- ...c_cFP16J3DAnmTexPatternP12J3DModelDatafi.s | 17 -- .../d_a_npc/setEnvTevColor__11daBaseNpc_cFv.s | 24 -- .../setJntPos__18daBaseNpc_lookat_cF4cXyzi.s | 10 - ...tMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi.s | 10 - ...tMinJntLmt__18daBaseNpc_lookat_cF5csXyzi.s | 10 - asm/d/a/d_a_npc/setMtx__11daBaseNpc_cFi.s | 77 ------ .../setNextPathInfo__13daNpcT_Path_cFScUc.s | 33 --- ...DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs.s | 30 --- asm/d/a/d_a_npc/setRoomNo__11daBaseNpc_cFv.s | 18 -- 68 files changed, 1794 deletions(-) delete mode 100644 asm/d/a/d_a_npc/CheckCreateHeap__FP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/__ct__23daBaseNpc_moveBgActor_cFv.s delete mode 100644 asm/d/a/d_a_npc/attnSttsOn__11daBaseNpc_cFii.s delete mode 100644 asm/d/a/d_a_npc/chkPassed__13daNpcF_Path_cF4cXyz.s delete mode 100644 asm/d/a/d_a_npc/chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs.s delete mode 100644 asm/d/a/d_a_npc/ctrlFaceMotion__8daNpcT_cFv.s delete mode 100644 asm/d/a/d_a_npc/daBaseNpc_decIdx__FiPUsii.s delete mode 100644 asm/d/a/d_a_npc/daBaseNpc_incIdx__FiPUsii.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_addIdx__FiiRUsi.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_chkEvtBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_chkTmpBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_clearMessageTmpBit__Fv.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_decIdx__FiRUsii.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_getDistTableIdx__Fii.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_incIdx__FiRUsii.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_offTmpBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_onEvtBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_onTmpBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf.s delete mode 100644 asm/d/a/d_a_npc/daNpcF_subIdx__FiiRUsi.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_addIdx__FiiRUsi.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_chkEvtBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_chkTmpBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_decIdx__FiRUsii.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_getDistTableIdx__Fii.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_incIdx__FiRUsii.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_offEvtBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_offTmpBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_onEvtBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_onTmpBit__FUl.s delete mode 100644 asm/d/a/d_a_npc/daNpcT_subIdx__FiiRUsi.s delete mode 100644 asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/execute__8daNpcT_cFv.s delete mode 100644 asm/d/a/d_a_npc/getActorP__18daNpcF_ActorMngr_cFv.s delete mode 100644 asm/d/a/d_a_npc/getAttentionPos__8daNpcF_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/getDistTableIdx__8daNpcF_cFii.s delete mode 100644 asm/d/a/d_a_npc/getIdx__16daBaseNpc_path_cFv.s delete mode 100644 asm/d/a/d_a_npc/getTexPtrnAnmP__11daBaseNpc_cFPci.s delete mode 100644 asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__11daBaseNpc_cFPci.s delete mode 100644 asm/d/a/d_a_npc/hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz.s delete mode 100644 asm/d/a/d_a_npc/initTalk__8daNpcF_cFiPP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/initTalk__8daNpcT_cFiPP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_npc/initialize__13daNpcF_Path_cFv.s delete mode 100644 asm/d/a/d_a_npc/initialize__13daNpcT_Path_cFv.s delete mode 100644 asm/d/a/d_a_npc/initialize__15daNpcF_MatAnm_cFv.s delete mode 100644 asm/d/a/d_a_npc/initialize__15daNpcT_MatAnm_cFv.s delete mode 100644 asm/d/a/d_a_npc/initialize__18daNpcF_ActorMngr_cFv.s delete mode 100644 asm/d/a/d_a_npc/isPath__16daBaseNpc_path_cFv.s delete mode 100644 asm/d/a/d_a_npc/limitter__18daBaseNpc_lookat_cFsPsss.s delete mode 100644 asm/d/a/d_a_npc/orderEvent__11daBaseNpc_cFiPc.s delete mode 100644 asm/d/a/d_a_npc/remove__18daNpcF_ActorMngr_cFv.s delete mode 100644 asm/d/a/d_a_npc/reverseDir__16daBaseNpc_path_cFv.s delete mode 100644 asm/d/a/d_a_npc/reverse__13daNpcF_Path_cFv.s delete mode 100644 asm/d/a/d_a_npc/reverse__13daNpcT_Path_cFv.s delete mode 100644 asm/d/a/d_a_npc/setAttnPos__18daBaseNpc_lookat_cFP4cXyz.s delete mode 100644 asm/d/a/d_a_npc/setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib.s delete mode 100644 asm/d/a/d_a_npc/setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi.s delete mode 100644 asm/d/a/d_a_npc/setEnvTevColor__11daBaseNpc_cFv.s delete mode 100644 asm/d/a/d_a_npc/setJntPos__18daBaseNpc_lookat_cF4cXyzi.s delete mode 100644 asm/d/a/d_a_npc/setMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi.s delete mode 100644 asm/d/a/d_a_npc/setMinJntLmt__18daBaseNpc_lookat_cF5csXyzi.s delete mode 100644 asm/d/a/d_a_npc/setMtx__11daBaseNpc_cFi.s delete mode 100644 asm/d/a/d_a_npc/setNextPathInfo__13daNpcT_Path_cFScUc.s delete mode 100644 asm/d/a/d_a_npc/setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs.s delete mode 100644 asm/d/a/d_a_npc/setRoomNo__11daBaseNpc_cFv.s diff --git a/asm/d/a/d_a_npc/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/d/a/d_a_npc/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 379cc511f3..0000000000 --- a/asm/d/a/d_a_npc/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8014F4F8: -/* 8014F4F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014F4FC 7C 08 02 A6 */ mflr r0 -/* 8014F500 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014F504 48 00 00 15 */ bl MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv -/* 8014F508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014F50C 7C 08 03 A6 */ mtlr r0 -/* 8014F510 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F514 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/__ct__23daBaseNpc_moveBgActor_cFv.s b/asm/d/a/d_a_npc/__ct__23daBaseNpc_moveBgActor_cFv.s deleted file mode 100644 index 4711dd2e1f..0000000000 --- a/asm/d/a/d_a_npc/__ct__23daBaseNpc_moveBgActor_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8014F4B4: -/* 8014F4B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014F4B8 7C 08 02 A6 */ mflr r0 -/* 8014F4BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014F4C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014F4C4 7C 7F 1B 78 */ mr r31, r3 -/* 8014F4C8 4B FF F2 01 */ bl __ct__11daBaseNpc_cFv -/* 8014F4CC 3C 60 80 3B */ lis r3, __vt__23daBaseNpc_moveBgActor_c@ha /* 0x803B3948@ha */ -/* 8014F4D0 38 03 39 48 */ addi r0, r3, __vt__23daBaseNpc_moveBgActor_c@l /* 0x803B3948@l */ -/* 8014F4D4 90 1F 05 68 */ stw r0, 0x568(r31) -/* 8014F4D8 38 00 00 00 */ li r0, 0 -/* 8014F4DC 90 1F 0A 14 */ stw r0, 0xa14(r31) -/* 8014F4E0 7F E3 FB 78 */ mr r3, r31 -/* 8014F4E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8014F4E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014F4EC 7C 08 03 A6 */ mtlr r0 -/* 8014F4F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F4F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/attnSttsOn__11daBaseNpc_cFii.s b/asm/d/a/d_a_npc/attnSttsOn__11daBaseNpc_cFii.s deleted file mode 100644 index cfbb599229..0000000000 --- a/asm/d/a/d_a_npc/attnSttsOn__11daBaseNpc_cFii.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8014EFA4: -/* 8014EFA4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014EFA8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014EFAC 80 C6 5D B4 */ lwz r6, 0x5db4(r6) -/* 8014EFB0 80 06 05 74 */ lwz r0, 0x574(r6) -/* 8014EFB4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8014EFB8 41 82 00 1C */ beq lbl_8014EFD4 -/* 8014EFBC 2C 05 00 00 */ cmpwi r5, 0 -/* 8014EFC0 41 82 00 0C */ beq lbl_8014EFCC -/* 8014EFC4 38 00 00 0A */ li r0, 0xa -/* 8014EFC8 48 00 00 20 */ b lbl_8014EFE8 -lbl_8014EFCC: -/* 8014EFCC 38 00 00 01 */ li r0, 1 -/* 8014EFD0 48 00 00 18 */ b lbl_8014EFE8 -lbl_8014EFD4: -/* 8014EFD4 2C 04 00 00 */ cmpwi r4, 0 -/* 8014EFD8 41 82 00 0C */ beq lbl_8014EFE4 -/* 8014EFDC 38 00 00 0A */ li r0, 0xa -/* 8014EFE0 48 00 00 08 */ b lbl_8014EFE8 -lbl_8014EFE4: -/* 8014EFE4 38 00 00 01 */ li r0, 1 -lbl_8014EFE8: -/* 8014EFE8 90 03 05 5C */ stw r0, 0x55c(r3) -/* 8014EFEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/chkPassed__13daNpcF_Path_cF4cXyz.s b/asm/d/a/d_a_npc/chkPassed__13daNpcF_Path_cF4cXyz.s deleted file mode 100644 index d49a580f4f..0000000000 --- a/asm/d/a/d_a_npc/chkPassed__13daNpcF_Path_cF4cXyz.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80150A24: -/* 80150A24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80150A28 7C 08 02 A6 */ mflr r0 -/* 80150A2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80150A30 7C 68 1B 78 */ mr r8, r3 -/* 80150A34 C0 04 00 00 */ lfs f0, 0(r4) -/* 80150A38 D0 01 00 08 */ stfs f0, 8(r1) -/* 80150A3C C0 04 00 04 */ lfs f0, 4(r4) -/* 80150A40 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80150A44 C0 04 00 08 */ lfs f0, 8(r4) -/* 80150A48 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80150A4C 80 C3 00 04 */ lwz r6, 4(r3) -/* 80150A50 38 61 00 08 */ addi r3, r1, 8 -/* 80150A54 80 86 00 08 */ lwz r4, 8(r6) -/* 80150A58 A0 A8 00 00 */ lhz r5, 0(r8) -/* 80150A5C A0 C6 00 00 */ lhz r6, 0(r6) -/* 80150A60 88 E8 00 03 */ lbz r7, 3(r8) -/* 80150A64 89 08 00 02 */ lbz r8, 2(r8) -/* 80150A68 48 00 43 F5 */ bl daNpcF_chkPassed__F4cXyzP4dPntUsUsii -/* 80150A6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80150A70 7C 08 03 A6 */ mtlr r0 -/* 80150A74 38 21 00 20 */ addi r1, r1, 0x20 -/* 80150A78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs.s b/asm/d/a/d_a_npc/chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs.s deleted file mode 100644 index a69cb010c6..0000000000 --- a/asm/d/a/d_a_npc/chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801548F4: -/* 801548F4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 801548F8 7C 08 02 A6 */ mflr r0 -/* 801548FC 90 01 00 34 */ stw r0, 0x34(r1) -/* 80154900 C0 04 00 00 */ lfs f0, 0(r4) -/* 80154904 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80154908 C0 04 00 04 */ lfs f0, 4(r4) -/* 8015490C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80154910 C0 04 00 08 */ lfs f0, 8(r4) -/* 80154914 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80154918 C0 05 00 00 */ lfs f0, 0(r5) -/* 8015491C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80154920 C0 05 00 04 */ lfs f0, 4(r5) -/* 80154924 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80154928 C0 05 00 08 */ lfs f0, 8(r5) -/* 8015492C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80154930 C0 06 00 00 */ lfs f0, 0(r6) -/* 80154934 D0 01 00 08 */ stfs f0, 8(r1) -/* 80154938 C0 06 00 04 */ lfs f0, 4(r6) -/* 8015493C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80154940 C0 06 00 08 */ lfs f0, 8(r6) -/* 80154944 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80154948 38 61 00 20 */ addi r3, r1, 0x20 -/* 8015494C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80154950 38 A1 00 08 */ addi r5, r1, 8 -/* 80154954 7C E6 3B 78 */ mr r6, r7 -/* 80154958 48 00 10 11 */ bl daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs -/* 8015495C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80154960 7C 08 03 A6 */ mtlr r0 -/* 80154964 38 21 00 30 */ addi r1, r1, 0x30 -/* 80154968 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/ctrlFaceMotion__8daNpcT_cFv.s b/asm/d/a/d_a_npc/ctrlFaceMotion__8daNpcT_cFv.s deleted file mode 100644 index 2b114c4d05..0000000000 --- a/asm/d/a/d_a_npc/ctrlFaceMotion__8daNpcT_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_8014924C: -/* 8014924C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80149250 7C 08 02 A6 */ mflr r0 -/* 80149254 90 01 00 24 */ stw r0, 0x24(r1) -/* 80149258 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8014925C 7C 7F 1B 78 */ mr r31, r3 -/* 80149260 38 7F 0B 50 */ addi r3, r31, 0xb50 -/* 80149264 A0 9F 0E 20 */ lhz r4, 0xe20(r31) -/* 80149268 38 A1 00 0C */ addi r5, r1, 0xc -/* 8014926C 38 C1 00 08 */ addi r6, r1, 8 -/* 80149270 4B FF C6 51 */ bl play__22daNpcT_MotionSeqMngr_cFUsPiPf -/* 80149274 2C 03 00 00 */ cmpwi r3, 0 -/* 80149278 41 82 00 74 */ beq lbl_801492EC -/* 8014927C 7F E3 FB 78 */ mr r3, r31 -/* 80149280 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80149284 38 A0 00 01 */ li r5, 1 -/* 80149288 48 00 11 01 */ bl setFaceMotionAnm__8daNpcT_cFib -/* 8014928C C0 21 00 08 */ lfs f1, 8(r1) -/* 80149290 C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 80149294 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80149298 40 80 00 30 */ bge lbl_801492C8 -/* 8014929C 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 801492A0 C0 3F 0A 80 */ lfs f1, 0xa80(r31) -/* 801492A4 4B EC 68 D9 */ bl setMorf__13mDoExt_morf_cFf -/* 801492A8 C0 1F 0A 80 */ lfs f0, 0xa80(r31) -/* 801492AC D0 1F 0D FC */ stfs f0, 0xdfc(r31) -/* 801492B0 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 801492B4 28 03 00 00 */ cmplwi r3, 0 -/* 801492B8 41 82 00 34 */ beq lbl_801492EC -/* 801492BC C0 3F 0A 80 */ lfs f1, 0xa80(r31) -/* 801492C0 4B EC 68 BD */ bl setMorf__13mDoExt_morf_cFf -/* 801492C4 48 00 00 28 */ b lbl_801492EC -lbl_801492C8: -/* 801492C8 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 801492CC 4B EC 68 B1 */ bl setMorf__13mDoExt_morf_cFf -/* 801492D0 C0 01 00 08 */ lfs f0, 8(r1) -/* 801492D4 D0 1F 0D FC */ stfs f0, 0xdfc(r31) -/* 801492D8 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 801492DC 28 03 00 00 */ cmplwi r3, 0 -/* 801492E0 41 82 00 0C */ beq lbl_801492EC -/* 801492E4 C0 21 00 08 */ lfs f1, 8(r1) -/* 801492E8 4B EC 68 95 */ bl setMorf__13mDoExt_morf_cFf -lbl_801492EC: -/* 801492EC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801492F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801492F4 7C 08 03 A6 */ mtlr r0 -/* 801492F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801492FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daBaseNpc_decIdx__FiPUsii.s b/asm/d/a/d_a_npc/daBaseNpc_decIdx__FiPUsii.s deleted file mode 100644 index 4feac3a000..0000000000 --- a/asm/d/a/d_a_npc/daBaseNpc_decIdx__FiPUsii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8014D620: -/* 8014D620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014D624 7C 08 02 A6 */ mflr r0 -/* 8014D628 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014D62C 7C 68 1B 78 */ mr r8, r3 -/* 8014D630 7C 87 23 78 */ mr r7, r4 -/* 8014D634 7C A0 2B 78 */ mr r0, r5 -/* 8014D638 2C 06 00 00 */ cmpwi r6, 0 -/* 8014D63C 40 80 00 1C */ bge lbl_8014D658 -/* 8014D640 38 60 00 01 */ li r3, 1 -/* 8014D644 7D 04 43 78 */ mr r4, r8 -/* 8014D648 7C E5 3B 78 */ mr r5, r7 -/* 8014D64C 7C 06 03 78 */ mr r6, r0 -/* 8014D650 4B FF FE E9 */ bl daBaseNpc_addIdx__FiiPUsi -/* 8014D654 48 00 00 18 */ b lbl_8014D66C -lbl_8014D658: -/* 8014D658 38 60 00 01 */ li r3, 1 -/* 8014D65C 7D 04 43 78 */ mr r4, r8 -/* 8014D660 7C E5 3B 78 */ mr r5, r7 -/* 8014D664 7C 06 03 78 */ mr r6, r0 -/* 8014D668 4B FF FF 1D */ bl daBaseNpc_subIdx__FiiPUsi -lbl_8014D66C: -/* 8014D66C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014D670 7C 08 03 A6 */ mtlr r0 -/* 8014D674 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D678 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daBaseNpc_incIdx__FiPUsii.s b/asm/d/a/d_a_npc/daBaseNpc_incIdx__FiPUsii.s deleted file mode 100644 index 0d5edf3164..0000000000 --- a/asm/d/a/d_a_npc/daBaseNpc_incIdx__FiPUsii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8014D5C4: -/* 8014D5C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014D5C8 7C 08 02 A6 */ mflr r0 -/* 8014D5CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014D5D0 7C 68 1B 78 */ mr r8, r3 -/* 8014D5D4 7C 87 23 78 */ mr r7, r4 -/* 8014D5D8 7C A0 2B 78 */ mr r0, r5 -/* 8014D5DC 2C 06 00 00 */ cmpwi r6, 0 -/* 8014D5E0 40 80 00 1C */ bge lbl_8014D5FC -/* 8014D5E4 38 60 00 01 */ li r3, 1 -/* 8014D5E8 7D 04 43 78 */ mr r4, r8 -/* 8014D5EC 7C E5 3B 78 */ mr r5, r7 -/* 8014D5F0 7C 06 03 78 */ mr r6, r0 -/* 8014D5F4 4B FF FF 91 */ bl daBaseNpc_subIdx__FiiPUsi -/* 8014D5F8 48 00 00 18 */ b lbl_8014D610 -lbl_8014D5FC: -/* 8014D5FC 38 60 00 01 */ li r3, 1 -/* 8014D600 7D 04 43 78 */ mr r4, r8 -/* 8014D604 7C E5 3B 78 */ mr r5, r7 -/* 8014D608 7C 06 03 78 */ mr r6, r0 -/* 8014D60C 4B FF FF 2D */ bl daBaseNpc_addIdx__FiiPUsi -lbl_8014D610: -/* 8014D610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014D614 7C 08 03 A6 */ mtlr r0 -/* 8014D618 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D61C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_addIdx__FiiRUsi.s b/asm/d/a/d_a_npc/daNpcF_addIdx__FiiRUsi.s deleted file mode 100644 index 48756ed948..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_addIdx__FiiRUsi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8015056C: -/* 8015056C 38 E0 00 00 */ li r7, 0 -/* 80150570 A1 05 00 00 */ lhz r8, 0(r5) -/* 80150574 7D 08 1A 14 */ add r8, r8, r3 -/* 80150578 7C 04 40 00 */ cmpw r4, r8 -/* 8015057C 41 81 00 24 */ bgt lbl_801505A0 -/* 80150580 2C 06 00 00 */ cmpwi r6, 0 -/* 80150584 41 82 00 14 */ beq lbl_80150598 -/* 80150588 7C 08 23 D6 */ divw r0, r8, r4 -/* 8015058C 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80150590 7D 00 40 50 */ subf r8, r0, r8 -/* 80150594 48 00 00 0C */ b lbl_801505A0 -lbl_80150598: -/* 80150598 39 04 FF FF */ addi r8, r4, -1 -/* 8015059C 38 E0 00 01 */ li r7, 1 -lbl_801505A0: -/* 801505A0 B1 05 00 00 */ sth r8, 0(r5) -/* 801505A4 7C E3 3B 78 */ mr r3, r7 -/* 801505A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c.s b/asm/d/a/d_a_npc/daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c.s deleted file mode 100644 index bfe8ac41c2..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80155854: -/* 80155854 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80155858 7C 08 02 A6 */ mflr r0 -/* 8015585C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80155860 39 61 00 20 */ addi r11, r1, 0x20 -/* 80155864 48 20 C9 75 */ bl _savegpr_28 -/* 80155868 7C 7C 1B 78 */ mr r28, r3 -/* 8015586C 3B C0 00 00 */ li r30, 0 -/* 80155870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80155874 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80155878 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8015587C 7F 84 E3 78 */ mr r4, r28 -/* 80155880 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80155884 81 8C 01 D8 */ lwz r12, 0x1d8(r12) -/* 80155888 7D 89 03 A6 */ mtctr r12 -/* 8015588C 4E 80 04 21 */ bctrl -/* 80155890 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80155894 41 82 00 B8 */ beq lbl_8015594C -/* 80155898 3B A0 00 00 */ li r29, 0 -/* 8015589C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801558A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801558A4 3B E3 56 B8 */ addi r31, r3, 0x56b8 -/* 801558A8 48 00 00 44 */ b lbl_801558EC -lbl_801558AC: -/* 801558AC 7F E3 FB 78 */ mr r3, r31 -/* 801558B0 7F A4 EB 78 */ mr r4, r29 -/* 801558B4 4B F1 DE 81 */ bl ActionTarget__12dAttention_cFl -/* 801558B8 7C 03 E0 40 */ cmplw r3, r28 -/* 801558BC 40 82 00 2C */ bne lbl_801558E8 -/* 801558C0 7F E3 FB 78 */ mr r3, r31 -/* 801558C4 4B F1 AF BD */ bl getActionBtnB__12dAttention_cFv -/* 801558C8 28 03 00 00 */ cmplwi r3, 0 -/* 801558CC 41 82 00 1C */ beq lbl_801558E8 -/* 801558D0 7F E3 FB 78 */ mr r3, r31 -/* 801558D4 4B F1 AF AD */ bl getActionBtnB__12dAttention_cFv -/* 801558D8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 801558DC 28 00 00 03 */ cmplwi r0, 3 -/* 801558E0 40 82 00 08 */ bne lbl_801558E8 -/* 801558E4 3B C0 00 01 */ li r30, 1 -lbl_801558E8: -/* 801558E8 3B BD 00 01 */ addi r29, r29, 1 -lbl_801558EC: -/* 801558EC 80 1F 04 30 */ lwz r0, 0x430(r31) -/* 801558F0 7C 1D 00 00 */ cmpw r29, r0 -/* 801558F4 41 80 FF B8 */ blt lbl_801558AC -/* 801558F8 3B A0 00 00 */ li r29, 0 -/* 801558FC 48 00 00 44 */ b lbl_80155940 -lbl_80155900: -/* 80155900 7F E3 FB 78 */ mr r3, r31 -/* 80155904 7F A4 EB 78 */ mr r4, r29 -/* 80155908 4B F1 DC 35 */ bl LockonTarget__12dAttention_cFl -/* 8015590C 7C 03 E0 40 */ cmplw r3, r28 -/* 80155910 40 82 00 2C */ bne lbl_8015593C -/* 80155914 7F E3 FB 78 */ mr r3, r31 -/* 80155918 4B F1 AF 69 */ bl getActionBtnB__12dAttention_cFv -/* 8015591C 28 03 00 00 */ cmplwi r3, 0 -/* 80155920 41 82 00 1C */ beq lbl_8015593C -/* 80155924 7F E3 FB 78 */ mr r3, r31 -/* 80155928 4B F1 AF 59 */ bl getActionBtnB__12dAttention_cFv -/* 8015592C 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80155930 28 00 00 01 */ cmplwi r0, 1 -/* 80155934 40 82 00 08 */ bne lbl_8015593C -/* 80155938 3B C0 00 01 */ li r30, 1 -lbl_8015593C: -/* 8015593C 3B BD 00 01 */ addi r29, r29, 1 -lbl_80155940: -/* 80155940 80 1F 03 D8 */ lwz r0, 0x3d8(r31) -/* 80155944 7C 1D 00 00 */ cmpw r29, r0 -/* 80155948 41 80 FF B8 */ blt lbl_80155900 -lbl_8015594C: -/* 8015594C 7F C3 F3 78 */ mr r3, r30 -/* 80155950 39 61 00 20 */ addi r11, r1, 0x20 -/* 80155954 48 20 C8 D1 */ bl _restgpr_28 -/* 80155958 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8015595C 7C 08 03 A6 */ mtlr r0 -/* 80155960 38 21 00 20 */ addi r1, r1, 0x20 -/* 80155964 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_chkEvtBit__FUl.s b/asm/d/a/d_a_npc/daNpcF_chkEvtBit__FUl.s deleted file mode 100644 index ac122900a2..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_chkEvtBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80155634: -/* 80155634 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80155638 7C 08 02 A6 */ mflr r0 -/* 8015563C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80155640 7C 60 1B 78 */ mr r0, r3 -/* 80155644 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80155648 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015564C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80155650 54 00 08 3C */ slwi r0, r0, 1 -/* 80155654 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80155658 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8015565C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80155660 4B ED F3 5D */ bl isEventBit__11dSv_event_cCFUs -/* 80155664 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80155668 7C 08 03 A6 */ mtlr r0 -/* 8015566C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155670 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs.s b/asm/d/a/d_a_npc/daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs.s deleted file mode 100644 index bd5a02b901..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs.s +++ /dev/null @@ -1,95 +0,0 @@ -lbl_80155968: -/* 80155968 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8015596C 7C 08 02 A6 */ mflr r0 -/* 80155970 90 01 00 84 */ stw r0, 0x84(r1) -/* 80155974 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 80155978 F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 8015597C DB C1 00 60 */ stfd f30, 0x60(r1) -/* 80155980 F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0 /* qr0 */ -/* 80155984 DB A1 00 50 */ stfd f29, 0x50(r1) -/* 80155988 F3 A1 00 58 */ psq_st f29, 88(r1), 0, 0 /* qr0 */ -/* 8015598C DB 81 00 40 */ stfd f28, 0x40(r1) -/* 80155990 F3 81 00 48 */ psq_st f28, 72(r1), 0, 0 /* qr0 */ -/* 80155994 39 61 00 40 */ addi r11, r1, 0x40 -/* 80155998 48 20 C8 45 */ bl _savegpr_29 -/* 8015599C 7C 7D 1B 78 */ mr r29, r3 -/* 801559A0 7C 9E 23 78 */ mr r30, r4 -/* 801559A4 7C BF 2B 78 */ mr r31, r5 -/* 801559A8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801559AC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801559B0 7C 06 00 D0 */ neg r0, r6 -/* 801559B4 7C 04 07 34 */ extsh r4, r0 -/* 801559B8 4B EB 6A 25 */ bl mDoMtx_YrotS__FPA4_fs -/* 801559BC C0 1E 00 00 */ lfs f0, 0(r30) -/* 801559C0 FC 20 00 50 */ fneg f1, f0 -/* 801559C4 C0 1E 00 04 */ lfs f0, 4(r30) -/* 801559C8 FC 40 00 50 */ fneg f2, f0 -/* 801559CC C0 1E 00 08 */ lfs f0, 8(r30) -/* 801559D0 FC 60 00 50 */ fneg f3, f0 -/* 801559D4 4B EB 73 C9 */ bl transM__14mDoMtx_stack_cFfff -/* 801559D8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801559DC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 801559E0 7F A4 EB 78 */ mr r4, r29 -/* 801559E4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801559E8 48 1F 13 85 */ bl PSMTXMultVec -/* 801559EC C0 1F 00 00 */ lfs f0, 0(r31) -/* 801559F0 FC 00 02 10 */ fabs f0, f0 -/* 801559F4 FF E0 00 18 */ frsp f31, f0 -/* 801559F8 C0 1F 00 08 */ lfs f0, 8(r31) -/* 801559FC FC 00 02 10 */ fabs f0, f0 -/* 80155A00 FF C0 00 18 */ frsp f30, f0 -/* 80155A04 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80155A08 FC 00 02 10 */ fabs f0, f0 -/* 80155A0C FF A0 00 18 */ frsp f29, f0 -/* 80155A10 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80155A14 FC 00 02 10 */ fabs f0, f0 -/* 80155A18 FF 80 00 18 */ frsp f28, f0 -/* 80155A1C 38 61 00 08 */ addi r3, r1, 8 -/* 80155A20 7F C4 F3 78 */ mr r4, r30 -/* 80155A24 7F A5 EB 78 */ mr r5, r29 -/* 80155A28 48 11 11 0D */ bl __mi__4cXyzCFRC3Vec -/* 80155A2C C0 01 00 08 */ lfs f0, 8(r1) -/* 80155A30 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80155A34 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80155A38 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80155A3C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80155A40 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80155A44 C0 5F 00 04 */ lfs f2, 4(r31) -/* 80155A48 FC 00 10 50 */ fneg f0, f2 -/* 80155A4C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80155A50 4C 40 13 82 */ cror 2, 0, 2 -/* 80155A54 41 82 00 10 */ beq lbl_80155A64 -/* 80155A58 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80155A5C 4C 40 13 82 */ cror 2, 0, 2 -/* 80155A60 40 82 00 0C */ bne lbl_80155A6C -lbl_80155A64: -/* 80155A64 38 60 00 00 */ li r3, 0 -/* 80155A68 48 00 00 34 */ b lbl_80155A9C -lbl_80155A6C: -/* 80155A6C EC 3D 07 72 */ fmuls f1, f29, f29 -/* 80155A70 EC 1F 07 F2 */ fmuls f0, f31, f31 -/* 80155A74 EC 41 00 24 */ fdivs f2, f1, f0 -/* 80155A78 EC 3C 07 32 */ fmuls f1, f28, f28 -/* 80155A7C EC 1E 07 B2 */ fmuls f0, f30, f30 -/* 80155A80 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80155A84 EC 22 00 2A */ fadds f1, f2, f0 -/* 80155A88 C0 02 99 DC */ lfs f0, lit_4140(r2) -/* 80155A8C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80155A90 4C 40 13 82 */ cror 2, 0, 2 -/* 80155A94 7C 00 00 26 */ mfcr r0 -/* 80155A98 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -lbl_80155A9C: -/* 80155A9C E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 80155AA0 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 80155AA4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 /* qr0 */ -/* 80155AA8 CB C1 00 60 */ lfd f30, 0x60(r1) -/* 80155AAC E3 A1 00 58 */ psq_l f29, 88(r1), 0, 0 /* qr0 */ -/* 80155AB0 CB A1 00 50 */ lfd f29, 0x50(r1) -/* 80155AB4 E3 81 00 48 */ psq_l f28, 72(r1), 0, 0 /* qr0 */ -/* 80155AB8 CB 81 00 40 */ lfd f28, 0x40(r1) -/* 80155ABC 39 61 00 40 */ addi r11, r1, 0x40 -/* 80155AC0 48 20 C7 69 */ bl _restgpr_29 -/* 80155AC4 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80155AC8 7C 08 03 A6 */ mtlr r0 -/* 80155ACC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80155AD0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_chkTmpBit__FUl.s b/asm/d/a/d_a_npc/daNpcF_chkTmpBit__FUl.s deleted file mode 100644 index 4ec4872dae..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_chkTmpBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801556B4: -/* 801556B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801556B8 7C 08 02 A6 */ mflr r0 -/* 801556BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801556C0 7C 60 1B 78 */ mr r0, r3 -/* 801556C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801556C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801556CC 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 801556D0 54 00 08 3C */ slwi r0, r0, 1 -/* 801556D4 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 801556D8 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 801556DC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801556E0 4B ED F2 DD */ bl isEventBit__11dSv_event_cCFUs -/* 801556E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801556E8 7C 08 03 A6 */ mtlr r0 -/* 801556EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801556F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_clearMessageTmpBit__Fv.s b/asm/d/a/d_a_npc/daNpcF_clearMessageTmpBit__Fv.s deleted file mode 100644 index b73cca0baa..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_clearMessageTmpBit__Fv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80155AE8: -/* 80155AE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80155AEC 7C 08 02 A6 */ mflr r0 -/* 80155AF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80155AF4 38 60 00 0B */ li r3, 0xb -/* 80155AF8 4B FF FC 3D */ bl daNpcF_offTmpBit__FUl -/* 80155AFC 38 60 00 0C */ li r3, 0xc -/* 80155B00 4B FF FC 35 */ bl daNpcF_offTmpBit__FUl -/* 80155B04 38 60 00 0D */ li r3, 0xd -/* 80155B08 4B FF FC 2D */ bl daNpcF_offTmpBit__FUl -/* 80155B0C 38 60 00 0E */ li r3, 0xe -/* 80155B10 4B FF FC 25 */ bl daNpcF_offTmpBit__FUl -/* 80155B14 38 60 00 0F */ li r3, 0xf -/* 80155B18 4B FF FC 1D */ bl daNpcF_offTmpBit__FUl -/* 80155B1C 38 60 00 33 */ li r3, 0x33 -/* 80155B20 4B FF FC 15 */ bl daNpcF_offTmpBit__FUl -/* 80155B24 38 60 00 34 */ li r3, 0x34 -/* 80155B28 4B FF FC 0D */ bl daNpcF_offTmpBit__FUl -/* 80155B2C 38 60 00 35 */ li r3, 0x35 -/* 80155B30 4B FF FC 05 */ bl daNpcF_offTmpBit__FUl -/* 80155B34 38 60 00 36 */ li r3, 0x36 -/* 80155B38 4B FF FB FD */ bl daNpcF_offTmpBit__FUl -/* 80155B3C 38 60 00 37 */ li r3, 0x37 -/* 80155B40 4B FF FB F5 */ bl daNpcF_offTmpBit__FUl -/* 80155B44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80155B48 7C 08 03 A6 */ mtlr r0 -/* 80155B4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155B50 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_decIdx__FiRUsii.s b/asm/d/a/d_a_npc/daNpcF_decIdx__FiRUsii.s deleted file mode 100644 index 64aab097d1..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_decIdx__FiRUsii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80150654: -/* 80150654 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80150658 7C 08 02 A6 */ mflr r0 -/* 8015065C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150660 7C 68 1B 78 */ mr r8, r3 -/* 80150664 7C 87 23 78 */ mr r7, r4 -/* 80150668 7C A0 2B 78 */ mr r0, r5 -/* 8015066C 2C 06 00 00 */ cmpwi r6, 0 -/* 80150670 41 82 00 1C */ beq lbl_8015068C -/* 80150674 38 60 00 01 */ li r3, 1 -/* 80150678 7D 04 43 78 */ mr r4, r8 -/* 8015067C 7C E5 3B 78 */ mr r5, r7 -/* 80150680 7C 06 03 78 */ mr r6, r0 -/* 80150684 4B FF FE E9 */ bl daNpcF_addIdx__FiiRUsi -/* 80150688 48 00 00 18 */ b lbl_801506A0 -lbl_8015068C: -/* 8015068C 38 60 00 01 */ li r3, 1 -/* 80150690 7D 04 43 78 */ mr r4, r8 -/* 80150694 7C E5 3B 78 */ mr r5, r7 -/* 80150698 7C 06 03 78 */ mr r6, r0 -/* 8015069C 4B FF FF 11 */ bl daNpcF_subIdx__FiiRUsi -lbl_801506A0: -/* 801506A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801506A4 7C 08 03 A6 */ mtlr r0 -/* 801506A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801506AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_getDistTableIdx__Fii.s b/asm/d/a/d_a_npc/daNpcF_getDistTableIdx__Fii.s deleted file mode 100644 index 21d54fd324..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_getDistTableIdx__Fii.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80155AD4: -/* 80155AD4 1C 84 00 14 */ mulli r4, r4, 0x14 -/* 80155AD8 38 04 00 5E */ addi r0, r4, 0x5e -/* 80155ADC 7C 03 02 14 */ add r0, r3, r0 -/* 80155AE0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80155AE4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_incIdx__FiRUsii.s b/asm/d/a/d_a_npc/daNpcF_incIdx__FiRUsii.s deleted file mode 100644 index 6baa3fa163..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_incIdx__FiRUsii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801505F8: -/* 801505F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801505FC 7C 08 02 A6 */ mflr r0 -/* 80150600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80150604 7C 68 1B 78 */ mr r8, r3 -/* 80150608 7C 87 23 78 */ mr r7, r4 -/* 8015060C 7C A0 2B 78 */ mr r0, r5 -/* 80150610 2C 06 00 00 */ cmpwi r6, 0 -/* 80150614 41 82 00 1C */ beq lbl_80150630 -/* 80150618 38 60 00 01 */ li r3, 1 -/* 8015061C 7D 04 43 78 */ mr r4, r8 -/* 80150620 7C E5 3B 78 */ mr r5, r7 -/* 80150624 7C 06 03 78 */ mr r6, r0 -/* 80150628 4B FF FF 85 */ bl daNpcF_subIdx__FiiRUsi -/* 8015062C 48 00 00 18 */ b lbl_80150644 -lbl_80150630: -/* 80150630 38 60 00 01 */ li r3, 1 -/* 80150634 7D 04 43 78 */ mr r4, r8 -/* 80150638 7C E5 3B 78 */ mr r5, r7 -/* 8015063C 7C 06 03 78 */ mr r6, r0 -/* 80150640 4B FF FF 2D */ bl daNpcF_addIdx__FiiRUsi -lbl_80150644: -/* 80150644 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80150648 7C 08 03 A6 */ mtlr r0 -/* 8015064C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150650 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_offTmpBit__FUl.s b/asm/d/a/d_a_npc/daNpcF_offTmpBit__FUl.s deleted file mode 100644 index ac06ebcc88..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_offTmpBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80155734: -/* 80155734 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80155738 7C 08 02 A6 */ mflr r0 -/* 8015573C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80155740 7C 60 1B 78 */ mr r0, r3 -/* 80155744 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80155748 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015574C 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 80155750 54 00 08 3C */ slwi r0, r0, 1 -/* 80155754 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80155758 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8015575C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80155760 4B ED F2 45 */ bl offEventBit__11dSv_event_cFUs -/* 80155764 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80155768 7C 08 03 A6 */ mtlr r0 -/* 8015576C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155770 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_onEvtBit__FUl.s b/asm/d/a/d_a_npc/daNpcF_onEvtBit__FUl.s deleted file mode 100644 index 88a50e36ba..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_onEvtBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80155674: -/* 80155674 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80155678 7C 08 02 A6 */ mflr r0 -/* 8015567C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80155680 7C 60 1B 78 */ mr r0, r3 -/* 80155684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80155688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015568C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80155690 54 00 08 3C */ slwi r0, r0, 1 -/* 80155694 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80155698 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8015569C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801556A0 4B ED F2 ED */ bl onEventBit__11dSv_event_cFUs -/* 801556A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801556A8 7C 08 03 A6 */ mtlr r0 -/* 801556AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801556B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_onTmpBit__FUl.s b/asm/d/a/d_a_npc/daNpcF_onTmpBit__FUl.s deleted file mode 100644 index 286afc42ce..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_onTmpBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801556F4: -/* 801556F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801556F8 7C 08 02 A6 */ mflr r0 -/* 801556FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80155700 7C 60 1B 78 */ mr r0, r3 -/* 80155704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80155708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015570C 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 80155710 54 00 08 3C */ slwi r0, r0, 1 -/* 80155714 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 80155718 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8015571C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80155720 4B ED F2 6D */ bl onEventBit__11dSv_event_cFUs -/* 80155724 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80155728 7C 08 03 A6 */ mtlr r0 -/* 8015572C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155730 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf.s b/asm/d/a/d_a_npc/daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf.s deleted file mode 100644 index d35ac230c9..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80154DA8: -/* 80154DA8 38 00 00 00 */ li r0, 0 -/* 80154DAC ED 05 18 28 */ fsubs f8, f5, f3 -/* 80154DB0 ED 26 20 28 */ fsubs f9, f6, f4 -/* 80154DB4 EC A8 02 32 */ fmuls f5, f8, f8 -/* 80154DB8 EC 09 02 72 */ fmuls f0, f9, f9 -/* 80154DBC EC E5 00 2A */ fadds f7, f5, f0 -/* 80154DC0 C0 C2 99 D8 */ lfs f6, lit_4116(r2) -/* 80154DC4 FC 06 38 00 */ fcmpu cr0, f6, f7 -/* 80154DC8 40 82 00 10 */ bne lbl_80154DD8 -/* 80154DCC D0 C5 00 00 */ stfs f6, 0(r5) -/* 80154DD0 38 60 00 00 */ li r3, 0 -/* 80154DD4 4E 80 00 20 */ blr -lbl_80154DD8: -/* 80154DD8 EC 01 18 28 */ fsubs f0, f1, f3 -/* 80154DDC EC A8 00 32 */ fmuls f5, f8, f0 -/* 80154DE0 EC 02 20 28 */ fsubs f0, f2, f4 -/* 80154DE4 EC 09 00 32 */ fmuls f0, f9, f0 -/* 80154DE8 EC 05 00 2A */ fadds f0, f5, f0 -/* 80154DEC EC A0 38 24 */ fdivs f5, f0, f7 -/* 80154DF0 FC 06 28 40 */ fcmpo cr0, f6, f5 -/* 80154DF4 4C 40 13 82 */ cror 2, 0, 2 -/* 80154DF8 40 82 00 18 */ bne lbl_80154E10 -/* 80154DFC C0 02 99 DC */ lfs f0, lit_4140(r2) -/* 80154E00 FC 05 00 40 */ fcmpo cr0, f5, f0 -/* 80154E04 4C 40 13 82 */ cror 2, 0, 2 -/* 80154E08 40 82 00 08 */ bne lbl_80154E10 -/* 80154E0C 38 00 00 01 */ li r0, 1 -lbl_80154E10: -/* 80154E10 EC 08 01 72 */ fmuls f0, f8, f5 -/* 80154E14 EC 03 00 2A */ fadds f0, f3, f0 -/* 80154E18 D0 03 00 00 */ stfs f0, 0(r3) -/* 80154E1C EC 09 01 72 */ fmuls f0, f9, f5 -/* 80154E20 EC 04 00 2A */ fadds f0, f4, f0 -/* 80154E24 D0 04 00 00 */ stfs f0, 0(r4) -/* 80154E28 C0 83 00 00 */ lfs f4, 0(r3) -/* 80154E2C EC 04 08 28 */ fsubs f0, f4, f1 -/* 80154E30 EC 60 00 32 */ fmuls f3, f0, f0 -/* 80154E34 C0 04 00 00 */ lfs f0, 0(r4) -/* 80154E38 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80154E3C EC 04 10 28 */ fsubs f0, f4, f2 -/* 80154E40 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80154E44 EC 03 00 2A */ fadds f0, f3, f0 -/* 80154E48 D0 05 00 00 */ stfs f0, 0(r5) -/* 80154E4C 7C 03 03 78 */ mr r3, r0 -/* 80154E50 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcF_subIdx__FiiRUsi.s b/asm/d/a/d_a_npc/daNpcF_subIdx__FiiRUsi.s deleted file mode 100644 index b4b5c3f1e2..0000000000 --- a/asm/d/a/d_a_npc/daNpcF_subIdx__FiiRUsi.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801505AC: -/* 801505AC 38 E0 00 00 */ li r7, 0 -/* 801505B0 A1 05 00 00 */ lhz r8, 0(r5) -/* 801505B4 7D 03 40 51 */ subf. r8, r3, r8 -/* 801505B8 40 80 00 34 */ bge lbl_801505EC -/* 801505BC 2C 06 00 00 */ cmpwi r6, 0 -/* 801505C0 41 82 00 24 */ beq lbl_801505E4 -/* 801505C4 7C 08 23 D6 */ divw r0, r8, r4 -/* 801505C8 7C 00 21 D6 */ mullw r0, r0, r4 -/* 801505CC 7C 00 40 50 */ subf r0, r0, r8 -/* 801505D0 7C 64 02 14 */ add r3, r4, r0 -/* 801505D4 7C 03 23 D6 */ divw r0, r3, r4 -/* 801505D8 7C 00 21 D6 */ mullw r0, r0, r4 -/* 801505DC 7D 00 18 50 */ subf r8, r0, r3 -/* 801505E0 48 00 00 0C */ b lbl_801505EC -lbl_801505E4: -/* 801505E4 39 00 00 00 */ li r8, 0 -/* 801505E8 38 E0 00 01 */ li r7, 1 -lbl_801505EC: -/* 801505EC B1 05 00 00 */ sth r8, 0(r5) -/* 801505F0 7C E3 3B 78 */ mr r3, r7 -/* 801505F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_addIdx__FiiRUsi.s b/asm/d/a/d_a_npc/daNpcT_addIdx__FiiRUsi.s deleted file mode 100644 index a9821d8f54..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_addIdx__FiiRUsi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80145A38: -/* 80145A38 38 E0 00 00 */ li r7, 0 -/* 80145A3C A1 05 00 00 */ lhz r8, 0(r5) -/* 80145A40 7D 08 1A 14 */ add r8, r8, r3 -/* 80145A44 7C 04 40 00 */ cmpw r4, r8 -/* 80145A48 41 81 00 24 */ bgt lbl_80145A6C -/* 80145A4C 2C 06 00 00 */ cmpwi r6, 0 -/* 80145A50 41 82 00 14 */ beq lbl_80145A64 -/* 80145A54 7C 08 23 D6 */ divw r0, r8, r4 -/* 80145A58 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80145A5C 7D 00 40 50 */ subf r8, r0, r8 -/* 80145A60 48 00 00 0C */ b lbl_80145A6C -lbl_80145A64: -/* 80145A64 39 04 FF FF */ addi r8, r4, -1 -/* 80145A68 38 E0 00 01 */ li r7, 1 -lbl_80145A6C: -/* 80145A6C B1 05 00 00 */ sth r8, 0(r5) -/* 80145A70 7C E3 3B 78 */ mr r3, r7 -/* 80145A74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c.s b/asm/d/a/d_a_npc/daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c.s deleted file mode 100644 index 75dce9e89e..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_8014C5E0: -/* 8014C5E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8014C5E4 7C 08 02 A6 */ mflr r0 -/* 8014C5E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8014C5EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014C5F0 48 21 5B E9 */ bl _savegpr_28 -/* 8014C5F4 7C 7C 1B 78 */ mr r28, r3 -/* 8014C5F8 3B C0 00 00 */ li r30, 0 -/* 8014C5FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014C600 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014C604 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 8014C608 28 00 00 1C */ cmplwi r0, 0x1c -/* 8014C60C 40 82 00 D8 */ bne lbl_8014C6E4 -/* 8014C610 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8014C614 7F 84 E3 78 */ mr r4, r28 -/* 8014C618 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8014C61C 81 8C 01 D8 */ lwz r12, 0x1d8(r12) -/* 8014C620 7D 89 03 A6 */ mtctr r12 -/* 8014C624 4E 80 04 21 */ bctrl -/* 8014C628 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8014C62C 41 82 00 B8 */ beq lbl_8014C6E4 -/* 8014C630 3B A0 00 00 */ li r29, 0 -/* 8014C634 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014C638 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014C63C 3B E3 56 B8 */ addi r31, r3, 0x56b8 -/* 8014C640 48 00 00 44 */ b lbl_8014C684 -lbl_8014C644: -/* 8014C644 7F E3 FB 78 */ mr r3, r31 -/* 8014C648 7F A4 EB 78 */ mr r4, r29 -/* 8014C64C 4B F2 70 E9 */ bl ActionTarget__12dAttention_cFl -/* 8014C650 7C 03 E0 40 */ cmplw r3, r28 -/* 8014C654 40 82 00 2C */ bne lbl_8014C680 -/* 8014C658 7F E3 FB 78 */ mr r3, r31 -/* 8014C65C 4B F2 42 25 */ bl getActionBtnB__12dAttention_cFv -/* 8014C660 28 03 00 00 */ cmplwi r3, 0 -/* 8014C664 41 82 00 1C */ beq lbl_8014C680 -/* 8014C668 7F E3 FB 78 */ mr r3, r31 -/* 8014C66C 4B F2 42 15 */ bl getActionBtnB__12dAttention_cFv -/* 8014C670 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8014C674 28 00 00 03 */ cmplwi r0, 3 -/* 8014C678 40 82 00 08 */ bne lbl_8014C680 -/* 8014C67C 3B C0 00 01 */ li r30, 1 -lbl_8014C680: -/* 8014C680 3B BD 00 01 */ addi r29, r29, 1 -lbl_8014C684: -/* 8014C684 80 1F 04 30 */ lwz r0, 0x430(r31) -/* 8014C688 7C 1D 00 00 */ cmpw r29, r0 -/* 8014C68C 41 80 FF B8 */ blt lbl_8014C644 -/* 8014C690 3B A0 00 00 */ li r29, 0 -/* 8014C694 48 00 00 44 */ b lbl_8014C6D8 -lbl_8014C698: -/* 8014C698 7F E3 FB 78 */ mr r3, r31 -/* 8014C69C 7F A4 EB 78 */ mr r4, r29 -/* 8014C6A0 4B F2 6E 9D */ bl LockonTarget__12dAttention_cFl -/* 8014C6A4 7C 03 E0 40 */ cmplw r3, r28 -/* 8014C6A8 40 82 00 2C */ bne lbl_8014C6D4 -/* 8014C6AC 7F E3 FB 78 */ mr r3, r31 -/* 8014C6B0 4B F2 41 D1 */ bl getActionBtnB__12dAttention_cFv -/* 8014C6B4 28 03 00 00 */ cmplwi r3, 0 -/* 8014C6B8 41 82 00 1C */ beq lbl_8014C6D4 -/* 8014C6BC 7F E3 FB 78 */ mr r3, r31 -/* 8014C6C0 4B F2 41 C1 */ bl getActionBtnB__12dAttention_cFv -/* 8014C6C4 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8014C6C8 28 00 00 01 */ cmplwi r0, 1 -/* 8014C6CC 40 82 00 08 */ bne lbl_8014C6D4 -/* 8014C6D0 3B C0 00 01 */ li r30, 1 -lbl_8014C6D4: -/* 8014C6D4 3B BD 00 01 */ addi r29, r29, 1 -lbl_8014C6D8: -/* 8014C6D8 80 1F 03 D8 */ lwz r0, 0x3d8(r31) -/* 8014C6DC 7C 1D 00 00 */ cmpw r29, r0 -/* 8014C6E0 41 80 FF B8 */ blt lbl_8014C698 -lbl_8014C6E4: -/* 8014C6E4 7F C3 F3 78 */ mr r3, r30 -/* 8014C6E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014C6EC 48 21 5B 39 */ bl _restgpr_28 -/* 8014C6F0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8014C6F4 7C 08 03 A6 */ mtlr r0 -/* 8014C6F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014C6FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_chkEvtBit__FUl.s b/asm/d/a/d_a_npc/daNpcT_chkEvtBit__FUl.s deleted file mode 100644 index 0830c5b663..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_chkEvtBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014CAAC: -/* 8014CAAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014CAB0 7C 08 02 A6 */ mflr r0 -/* 8014CAB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014CAB8 7C 60 1B 78 */ mr r0, r3 -/* 8014CABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014CAC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014CAC4 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8014CAC8 54 00 08 3C */ slwi r0, r0, 1 -/* 8014CACC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8014CAD0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8014CAD4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CAD8 4B EE 7E E5 */ bl isEventBit__11dSv_event_cCFUs -/* 8014CADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014CAE0 7C 08 03 A6 */ mtlr r0 -/* 8014CAE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014CAE8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_chkTmpBit__FUl.s b/asm/d/a/d_a_npc/daNpcT_chkTmpBit__FUl.s deleted file mode 100644 index b25b02c100..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_chkTmpBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014CB6C: -/* 8014CB6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014CB70 7C 08 02 A6 */ mflr r0 -/* 8014CB74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014CB78 7C 60 1B 78 */ mr r0, r3 -/* 8014CB7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014CB80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014CB84 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8014CB88 54 00 08 3C */ slwi r0, r0, 1 -/* 8014CB8C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8014CB90 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8014CB94 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CB98 4B EE 7E 25 */ bl isEventBit__11dSv_event_cCFUs -/* 8014CB9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014CBA0 7C 08 03 A6 */ mtlr r0 -/* 8014CBA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014CBA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_decIdx__FiRUsii.s b/asm/d/a/d_a_npc/daNpcT_decIdx__FiRUsii.s deleted file mode 100644 index 71b9379fd6..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_decIdx__FiRUsii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80145B20: -/* 80145B20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80145B24 7C 08 02 A6 */ mflr r0 -/* 80145B28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80145B2C 7C 68 1B 78 */ mr r8, r3 -/* 80145B30 7C 87 23 78 */ mr r7, r4 -/* 80145B34 7C A0 2B 78 */ mr r0, r5 -/* 80145B38 2C 06 00 00 */ cmpwi r6, 0 -/* 80145B3C 41 82 00 1C */ beq lbl_80145B58 -/* 80145B40 38 60 00 01 */ li r3, 1 -/* 80145B44 7D 04 43 78 */ mr r4, r8 -/* 80145B48 7C E5 3B 78 */ mr r5, r7 -/* 80145B4C 7C 06 03 78 */ mr r6, r0 -/* 80145B50 4B FF FE E9 */ bl daNpcT_addIdx__FiiRUsi -/* 80145B54 48 00 00 18 */ b lbl_80145B6C -lbl_80145B58: -/* 80145B58 38 60 00 01 */ li r3, 1 -/* 80145B5C 7D 04 43 78 */ mr r4, r8 -/* 80145B60 7C E5 3B 78 */ mr r5, r7 -/* 80145B64 7C 06 03 78 */ mr r6, r0 -/* 80145B68 4B FF FF 11 */ bl daNpcT_subIdx__FiiRUsi -lbl_80145B6C: -/* 80145B6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80145B70 7C 08 03 A6 */ mtlr r0 -/* 80145B74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80145B78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_getDistTableIdx__Fii.s b/asm/d/a/d_a_npc/daNpcT_getDistTableIdx__Fii.s deleted file mode 100644 index 2e46d0b907..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_getDistTableIdx__Fii.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8014CA18: -/* 8014CA18 1C 84 00 14 */ mulli r4, r4, 0x14 -/* 8014CA1C 38 04 00 5E */ addi r0, r4, 0x5e -/* 8014CA20 7C 03 02 14 */ add r0, r3, r0 -/* 8014CA24 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8014CA28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_incIdx__FiRUsii.s b/asm/d/a/d_a_npc/daNpcT_incIdx__FiRUsii.s deleted file mode 100644 index bf41ff5d1d..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_incIdx__FiRUsii.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80145AC4: -/* 80145AC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80145AC8 7C 08 02 A6 */ mflr r0 -/* 80145ACC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80145AD0 7C 68 1B 78 */ mr r8, r3 -/* 80145AD4 7C 87 23 78 */ mr r7, r4 -/* 80145AD8 7C A0 2B 78 */ mr r0, r5 -/* 80145ADC 2C 06 00 00 */ cmpwi r6, 0 -/* 80145AE0 41 82 00 1C */ beq lbl_80145AFC -/* 80145AE4 38 60 00 01 */ li r3, 1 -/* 80145AE8 7D 04 43 78 */ mr r4, r8 -/* 80145AEC 7C E5 3B 78 */ mr r5, r7 -/* 80145AF0 7C 06 03 78 */ mr r6, r0 -/* 80145AF4 4B FF FF 85 */ bl daNpcT_subIdx__FiiRUsi -/* 80145AF8 48 00 00 18 */ b lbl_80145B10 -lbl_80145AFC: -/* 80145AFC 38 60 00 01 */ li r3, 1 -/* 80145B00 7D 04 43 78 */ mr r4, r8 -/* 80145B04 7C E5 3B 78 */ mr r5, r7 -/* 80145B08 7C 06 03 78 */ mr r6, r0 -/* 80145B0C 4B FF FF 2D */ bl daNpcT_addIdx__FiiRUsi -lbl_80145B10: -/* 80145B10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80145B14 7C 08 03 A6 */ mtlr r0 -/* 80145B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80145B1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_offEvtBit__FUl.s b/asm/d/a/d_a_npc/daNpcT_offEvtBit__FUl.s deleted file mode 100644 index 28bcba2a80..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_offEvtBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014CA6C: -/* 8014CA6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014CA70 7C 08 02 A6 */ mflr r0 -/* 8014CA74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014CA78 7C 60 1B 78 */ mr r0, r3 -/* 8014CA7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014CA80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014CA84 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8014CA88 54 00 08 3C */ slwi r0, r0, 1 -/* 8014CA8C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8014CA90 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8014CA94 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CA98 4B EE 7F 0D */ bl offEventBit__11dSv_event_cFUs -/* 8014CA9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014CAA0 7C 08 03 A6 */ mtlr r0 -/* 8014CAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014CAA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_offTmpBit__FUl.s b/asm/d/a/d_a_npc/daNpcT_offTmpBit__FUl.s deleted file mode 100644 index 2b2255bacb..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_offTmpBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014CB2C: -/* 8014CB2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014CB30 7C 08 02 A6 */ mflr r0 -/* 8014CB34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014CB38 7C 60 1B 78 */ mr r0, r3 -/* 8014CB3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014CB40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014CB44 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8014CB48 54 00 08 3C */ slwi r0, r0, 1 -/* 8014CB4C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8014CB50 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8014CB54 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CB58 4B EE 7E 4D */ bl offEventBit__11dSv_event_cFUs -/* 8014CB5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014CB60 7C 08 03 A6 */ mtlr r0 -/* 8014CB64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014CB68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_onEvtBit__FUl.s b/asm/d/a/d_a_npc/daNpcT_onEvtBit__FUl.s deleted file mode 100644 index 75becefa1f..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_onEvtBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014CA2C: -/* 8014CA2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014CA30 7C 08 02 A6 */ mflr r0 -/* 8014CA34 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014CA38 7C 60 1B 78 */ mr r0, r3 -/* 8014CA3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014CA40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014CA44 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8014CA48 54 00 08 3C */ slwi r0, r0, 1 -/* 8014CA4C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8014CA50 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8014CA54 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CA58 4B EE 7F 35 */ bl onEventBit__11dSv_event_cFUs -/* 8014CA5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014CA60 7C 08 03 A6 */ mtlr r0 -/* 8014CA64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014CA68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_onTmpBit__FUl.s b/asm/d/a/d_a_npc/daNpcT_onTmpBit__FUl.s deleted file mode 100644 index d3d829e4c9..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_onTmpBit__FUl.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014CAEC: -/* 8014CAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014CAF0 7C 08 02 A6 */ mflr r0 -/* 8014CAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014CAF8 7C 60 1B 78 */ mr r0, r3 -/* 8014CAFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014CB00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014CB04 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8014CB08 54 00 08 3C */ slwi r0, r0, 1 -/* 8014CB0C 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8014CB10 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8014CB14 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CB18 4B EE 7E 75 */ bl onEventBit__11dSv_event_cFUs -/* 8014CB1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014CB20 7C 08 03 A6 */ mtlr r0 -/* 8014CB24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014CB28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/daNpcT_subIdx__FiiRUsi.s b/asm/d/a/d_a_npc/daNpcT_subIdx__FiiRUsi.s deleted file mode 100644 index c5387f1d35..0000000000 --- a/asm/d/a/d_a_npc/daNpcT_subIdx__FiiRUsi.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80145A78: -/* 80145A78 38 E0 00 00 */ li r7, 0 -/* 80145A7C A1 05 00 00 */ lhz r8, 0(r5) -/* 80145A80 7D 03 40 51 */ subf. r8, r3, r8 -/* 80145A84 40 80 00 34 */ bge lbl_80145AB8 -/* 80145A88 2C 06 00 00 */ cmpwi r6, 0 -/* 80145A8C 41 82 00 24 */ beq lbl_80145AB0 -/* 80145A90 7C 08 23 D6 */ divw r0, r8, r4 -/* 80145A94 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80145A98 7C 00 40 50 */ subf r0, r0, r8 -/* 80145A9C 7C 64 02 14 */ add r3, r4, r0 -/* 80145AA0 7C 03 23 D6 */ divw r0, r3, r4 -/* 80145AA4 7C 00 21 D6 */ mullw r0, r0, r4 -/* 80145AA8 7D 00 18 50 */ subf r8, r0, r3 -/* 80145AAC 48 00 00 0C */ b lbl_80145AB8 -lbl_80145AB0: -/* 80145AB0 39 00 00 00 */ li r8, 0 -/* 80145AB4 38 E0 00 01 */ li r7, 1 -lbl_80145AB8: -/* 80145AB8 B1 05 00 00 */ sth r8, 0(r5) -/* 80145ABC 7C E3 3B 78 */ mr r3, r7 -/* 80145AC0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c.s b/asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c.s deleted file mode 100644 index 1cf593250c..0000000000 --- a/asm/d/a/d_a_npc/entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801506BC: -/* 801506BC 28 04 00 00 */ cmplwi r4, 0 -/* 801506C0 41 82 00 0C */ beq lbl_801506CC -/* 801506C4 80 04 00 04 */ lwz r0, 4(r4) -/* 801506C8 48 00 00 08 */ b lbl_801506D0 -lbl_801506CC: -/* 801506CC 38 00 FF FF */ li r0, -1 -lbl_801506D0: -/* 801506D0 90 03 00 00 */ stw r0, 0(r3) -/* 801506D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/execute__8daNpcT_cFv.s b/asm/d/a/d_a_npc/execute__8daNpcT_cFv.s deleted file mode 100644 index 86934a6e07..0000000000 --- a/asm/d/a/d_a_npc/execute__8daNpcT_cFv.s +++ /dev/null @@ -1,221 +0,0 @@ -lbl_8014852C: -/* 8014852C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80148530 7C 08 02 A6 */ mflr r0 -/* 80148534 90 01 00 14 */ stw r0, 0x14(r1) -/* 80148538 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014853C 93 C1 00 08 */ stw r30, 8(r1) -/* 80148540 7C 7E 1B 78 */ mr r30, r3 -/* 80148544 81 83 0E 3C */ lwz r12, 0xe3c(r3) -/* 80148548 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 8014854C 7D 89 03 A6 */ mtctr r12 -/* 80148550 4E 80 04 21 */ bctrl -/* 80148554 7F C3 F3 78 */ mr r3, r30 -/* 80148558 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 8014855C 81 8C 00 5C */ lwz r12, 0x5c(r12) -/* 80148560 7D 89 03 A6 */ mtctr r12 -/* 80148564 4E 80 04 21 */ bctrl -/* 80148568 2C 03 00 00 */ cmpwi r3, 0 -/* 8014856C 40 82 00 18 */ bne lbl_80148584 -/* 80148570 7F C3 F3 78 */ mr r3, r30 -/* 80148574 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 80148578 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8014857C 7D 89 03 A6 */ mtctr r12 -/* 80148580 4E 80 04 21 */ bctrl -lbl_80148584: -/* 80148584 7F C3 F3 78 */ mr r3, r30 -/* 80148588 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 8014858C 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 80148590 7D 89 03 A6 */ mtctr r12 -/* 80148594 4E 80 04 21 */ bctrl -/* 80148598 7F C3 F3 78 */ mr r3, r30 -/* 8014859C 38 9E 08 64 */ addi r4, r30, 0x864 -/* 801485A0 4B ED 21 2D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 801485A4 38 7E 06 8C */ addi r3, r30, 0x68c -/* 801485A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801485AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801485B0 3B E4 0F 38 */ addi r31, r4, 0xf38 -/* 801485B4 7F E4 FB 78 */ mr r4, r31 -/* 801485B8 4B F2 E4 F5 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 801485BC 80 1E 07 68 */ lwz r0, 0x768(r30) -/* 801485C0 90 1E 09 30 */ stw r0, 0x930(r30) -/* 801485C4 80 1E 07 6C */ lwz r0, 0x76c(r30) -/* 801485C8 90 1E 09 34 */ stw r0, 0x934(r30) -/* 801485CC 80 1E 07 70 */ lwz r0, 0x770(r30) -/* 801485D0 90 1E 09 38 */ stw r0, 0x938(r30) -/* 801485D4 88 1E 07 74 */ lbz r0, 0x774(r30) -/* 801485D8 98 1E 09 3C */ stb r0, 0x93c(r30) -/* 801485DC A0 1E 07 7C */ lhz r0, 0x77c(r30) -/* 801485E0 B0 1E 09 44 */ sth r0, 0x944(r30) -/* 801485E4 A0 1E 07 7E */ lhz r0, 0x77e(r30) -/* 801485E8 B0 1E 09 46 */ sth r0, 0x946(r30) -/* 801485EC 80 1E 07 80 */ lwz r0, 0x780(r30) -/* 801485F0 90 1E 09 48 */ stw r0, 0x948(r30) -/* 801485F4 80 1E 07 84 */ lwz r0, 0x784(r30) -/* 801485F8 90 1E 09 4C */ stw r0, 0x94c(r30) -/* 801485FC C0 1E 07 8C */ lfs f0, 0x78c(r30) -/* 80148600 D0 1E 09 54 */ stfs f0, 0x954(r30) -/* 80148604 C0 1E 07 90 */ lfs f0, 0x790(r30) -/* 80148608 D0 1E 09 58 */ stfs f0, 0x958(r30) -/* 8014860C C0 1E 07 94 */ lfs f0, 0x794(r30) -/* 80148610 D0 1E 09 5C */ stfs f0, 0x95c(r30) -/* 80148614 80 1E 07 98 */ lwz r0, 0x798(r30) -/* 80148618 90 1E 09 60 */ stw r0, 0x960(r30) -/* 8014861C C0 1E 07 9C */ lfs f0, 0x79c(r30) -/* 80148620 D0 1E 09 64 */ stfs f0, 0x964(r30) -/* 80148624 80 1E 07 A0 */ lwz r0, 0x7a0(r30) -/* 80148628 90 1E 09 68 */ stw r0, 0x968(r30) -/* 8014862C 38 7E 09 44 */ addi r3, r30, 0x944 -/* 80148630 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80148634 4B ED 54 B1 */ bl fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos -/* 80148638 B0 7E 0D CA */ sth r3, 0xdca(r30) -/* 8014863C C0 1E 07 24 */ lfs f0, 0x724(r30) -/* 80148640 D0 1E 0D F4 */ stfs f0, 0xdf4(r30) -/* 80148644 C0 22 9A 40 */ lfs f1, lit_5667(r2) -/* 80148648 C0 1E 0D F4 */ lfs f0, 0xdf4(r30) -/* 8014864C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80148650 41 82 00 4C */ beq lbl_8014869C -/* 80148654 38 7E 07 7C */ addi r3, r30, 0x77c -/* 80148658 48 06 2E 69 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo -/* 8014865C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80148660 90 1E 0D A8 */ stw r0, 0xda8(r30) -/* 80148664 88 7E 08 86 */ lbz r3, 0x886(r30) -/* 80148668 4B EE 4A 05 */ bl dComIfGp_getReverb__Fi -/* 8014866C 98 7E 0E 24 */ stb r3, 0xe24(r30) -/* 80148670 80 1E 06 B8 */ lwz r0, 0x6b8(r30) -/* 80148674 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 80148678 41 82 00 24 */ beq lbl_8014869C -/* 8014867C C0 3E 08 58 */ lfs f1, 0x858(r30) -/* 80148680 C0 1E 0D F4 */ lfs f0, 0xdf4(r30) -/* 80148684 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80148688 40 81 00 14 */ ble lbl_8014869C -/* 8014868C 38 7E 08 0C */ addi r3, r30, 0x80c -/* 80148690 48 06 2E 31 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo -/* 80148694 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80148698 90 1E 0D A8 */ stw r0, 0xda8(r30) -lbl_8014869C: -/* 8014869C 7F C3 F3 78 */ mr r3, r30 -/* 801486A0 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 801486A4 81 8C 00 68 */ lwz r12, 0x68(r12) -/* 801486A8 7D 89 03 A6 */ mtctr r12 -/* 801486AC 4E 80 04 21 */ bctrl -/* 801486B0 C0 22 9A 40 */ lfs f1, lit_5667(r2) -/* 801486B4 C0 1E 0D F4 */ lfs f0, 0xdf4(r30) -/* 801486B8 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 801486BC 41 82 00 14 */ beq lbl_801486D0 -/* 801486C0 7F C3 F3 78 */ mr r3, r30 -/* 801486C4 48 00 05 AD */ bl setEnvTevColor__8daNpcT_cFv -/* 801486C8 7F C3 F3 78 */ mr r3, r30 -/* 801486CC 48 00 06 01 */ bl setRoomNo__8daNpcT_cFv -lbl_801486D0: -/* 801486D0 38 60 00 00 */ li r3, 0 -/* 801486D4 80 1E 0B 60 */ lwz r0, 0xb60(r30) -/* 801486D8 2C 00 00 00 */ cmpwi r0, 0 -/* 801486DC 40 82 00 14 */ bne lbl_801486F0 -/* 801486E0 80 1E 0B 64 */ lwz r0, 0xb64(r30) -/* 801486E4 2C 00 FF FF */ cmpwi r0, -1 -/* 801486E8 40 82 00 08 */ bne lbl_801486F0 -/* 801486EC 38 60 00 01 */ li r3, 1 -lbl_801486F0: -/* 801486F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801486F4 41 82 00 24 */ beq lbl_80148718 -/* 801486F8 7F C3 F3 78 */ mr r3, r30 -/* 801486FC 48 00 0B 51 */ bl ctrlFaceMotion__8daNpcT_cFv -/* 80148700 7F C3 F3 78 */ mr r3, r30 -/* 80148704 38 80 00 01 */ li r4, 1 -/* 80148708 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 8014870C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80148710 7D 89 03 A6 */ mtctr r12 -/* 80148714 4E 80 04 21 */ bctrl -lbl_80148718: -/* 80148718 38 60 00 00 */ li r3, 0 -/* 8014871C 80 1E 0B 84 */ lwz r0, 0xb84(r30) -/* 80148720 2C 00 00 00 */ cmpwi r0, 0 -/* 80148724 40 82 00 14 */ bne lbl_80148738 -/* 80148728 80 1E 0B 88 */ lwz r0, 0xb88(r30) -/* 8014872C 2C 00 FF FF */ cmpwi r0, -1 -/* 80148730 40 82 00 08 */ bne lbl_80148738 -/* 80148734 38 60 00 01 */ li r3, 1 -lbl_80148738: -/* 80148738 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8014873C 41 82 00 0C */ beq lbl_80148748 -/* 80148740 7F C3 F3 78 */ mr r3, r30 -/* 80148744 48 00 0B BD */ bl ctrlMotion__8daNpcT_cFv -lbl_80148748: -/* 80148748 7F C3 F3 78 */ mr r3, r30 -/* 8014874C 48 00 07 01 */ bl playAllAnm__8daNpcT_cFv -/* 80148750 7F C3 F3 78 */ mr r3, r30 -/* 80148754 48 00 0A F9 */ bl ctrlFaceMotion__8daNpcT_cFv -/* 80148758 7F C3 F3 78 */ mr r3, r30 -/* 8014875C 38 80 00 00 */ li r4, 0 -/* 80148760 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 80148764 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80148768 7D 89 03 A6 */ mtctr r12 -/* 8014876C 4E 80 04 21 */ bctrl -/* 80148770 7F C3 F3 78 */ mr r3, r30 -/* 80148774 48 00 0B 8D */ bl ctrlMotion__8daNpcT_cFv -/* 80148778 7F C3 F3 78 */ mr r3, r30 -/* 8014877C 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 80148780 81 8C 00 6C */ lwz r12, 0x6c(r12) -/* 80148784 7D 89 03 A6 */ mtctr r12 -/* 80148788 4E 80 04 21 */ bctrl -/* 8014878C 38 7E 0D FC */ addi r3, r30, 0xdfc -/* 80148790 C0 22 99 D8 */ lfs f1, lit_4116(r2) -/* 80148794 C0 42 99 DC */ lfs f2, lit_4140(r2) -/* 80148798 48 12 7F A9 */ bl cLib_chaseF__FPfff -/* 8014879C 7F C3 F3 78 */ mr r3, r30 -/* 801487A0 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 801487A4 81 8C 00 80 */ lwz r12, 0x80(r12) -/* 801487A8 7D 89 03 A6 */ mtctr r12 -/* 801487AC 4E 80 04 21 */ bctrl -/* 801487B0 7F C3 F3 78 */ mr r3, r30 -/* 801487B4 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 801487B8 81 8C 00 74 */ lwz r12, 0x74(r12) -/* 801487BC 7D 89 03 A6 */ mtctr r12 -/* 801487C0 4E 80 04 21 */ bctrl -/* 801487C4 88 1E 0E 2C */ lbz r0, 0xe2c(r30) -/* 801487C8 28 00 00 00 */ cmplwi r0, 0 -/* 801487CC 40 82 00 5C */ bne lbl_80148828 -/* 801487D0 88 1E 0E 33 */ lbz r0, 0xe33(r30) -/* 801487D4 28 00 00 00 */ cmplwi r0, 0 -/* 801487D8 41 82 00 28 */ beq lbl_80148800 -/* 801487DC 38 00 00 00 */ li r0, 0 -/* 801487E0 88 7F 40 75 */ lbz r3, 0x4075(r31) -/* 801487E4 28 03 00 00 */ cmplwi r3, 0 -/* 801487E8 41 82 00 0C */ beq lbl_801487F4 -/* 801487EC 28 03 00 02 */ cmplwi r3, 2 -/* 801487F0 40 82 00 08 */ bne lbl_801487F8 -lbl_801487F4: -/* 801487F4 38 00 00 01 */ li r0, 1 -lbl_801487F8: -/* 801487F8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 801487FC 40 82 00 18 */ bne lbl_80148814 -lbl_80148800: -/* 80148800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80148804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80148808 88 03 4F AD */ lbz r0, 0x4fad(r3) -/* 8014880C 28 00 00 00 */ cmplwi r0, 0 -/* 80148810 40 82 00 18 */ bne lbl_80148828 -lbl_80148814: -/* 80148814 7F C3 F3 78 */ mr r3, r30 -/* 80148818 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 8014881C 81 8C 00 88 */ lwz r12, 0x88(r12) -/* 80148820 7D 89 03 A6 */ mtctr r12 -/* 80148824 4E 80 04 21 */ bctrl -lbl_80148828: -/* 80148828 7F C3 F3 78 */ mr r3, r30 -/* 8014882C 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 80148830 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 80148834 7D 89 03 A6 */ mtctr r12 -/* 80148838 4E 80 04 21 */ bctrl -/* 8014883C 7F C3 F3 78 */ mr r3, r30 -/* 80148840 81 9E 0E 3C */ lwz r12, 0xe3c(r30) -/* 80148844 81 8C 00 8C */ lwz r12, 0x8c(r12) -/* 80148848 7D 89 03 A6 */ mtctr r12 -/* 8014884C 4E 80 04 21 */ bctrl -/* 80148850 38 60 00 01 */ li r3, 1 -/* 80148854 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80148858 83 C1 00 08 */ lwz r30, 8(r1) -/* 8014885C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80148860 7C 08 03 A6 */ mtlr r0 -/* 80148864 38 21 00 10 */ addi r1, r1, 0x10 -/* 80148868 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getActorP__18daNpcF_ActorMngr_cFv.s b/asm/d/a/d_a_npc/getActorP__18daNpcF_ActorMngr_cFv.s deleted file mode 100644 index c5482c63d5..0000000000 --- a/asm/d/a/d_a_npc/getActorP__18daNpcF_ActorMngr_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801506EC: -/* 801506EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801506F0 7C 08 02 A6 */ mflr r0 -/* 801506F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801506F8 38 00 00 00 */ li r0, 0 -/* 801506FC 90 01 00 08 */ stw r0, 8(r1) -/* 80150700 80 63 00 00 */ lwz r3, 0(r3) -/* 80150704 38 81 00 08 */ addi r4, r1, 8 -/* 80150708 4B EC 92 B5 */ bl fopAcM_SearchByID__FUiPP10fopAc_ac_c -/* 8015070C 2C 03 00 01 */ cmpwi r3, 1 -/* 80150710 40 82 00 14 */ bne lbl_80150724 -/* 80150714 80 61 00 08 */ lwz r3, 8(r1) -/* 80150718 28 03 00 00 */ cmplwi r3, 0 -/* 8015071C 41 82 00 08 */ beq lbl_80150724 -/* 80150720 48 00 00 08 */ b lbl_80150728 -lbl_80150724: -/* 80150724 38 60 00 00 */ li r3, 0 -lbl_80150728: -/* 80150728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8015072C 7C 08 03 A6 */ mtlr r0 -/* 80150730 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150734 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getAttentionPos__8daNpcF_cFP10fopAc_ac_c.s b/asm/d/a/d_a_npc/getAttentionPos__8daNpcF_cFP10fopAc_ac_c.s deleted file mode 100644 index 23f4734da0..0000000000 --- a/asm/d/a/d_a_npc/getAttentionPos__8daNpcF_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8015496C: -/* 8015496C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80154970 7C 08 02 A6 */ mflr r0 -/* 80154974 90 01 00 24 */ stw r0, 0x24(r1) -/* 80154978 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8015497C 7C 7F 1B 78 */ mr r31, r3 -/* 80154980 C0 05 05 50 */ lfs f0, 0x550(r5) -/* 80154984 D0 01 00 08 */ stfs f0, 8(r1) -/* 80154988 C0 05 05 54 */ lfs f0, 0x554(r5) -/* 8015498C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80154990 C0 05 05 58 */ lfs f0, 0x558(r5) -/* 80154994 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80154998 A8 05 00 08 */ lha r0, 8(r5) -/* 8015499C 2C 00 00 FD */ cmpwi r0, 0xfd -/* 801549A0 40 82 00 14 */ bne lbl_801549B4 -/* 801549A4 48 00 AA 59 */ bl getAttentionOffsetY__9daPy_py_cFv -/* 801549A8 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801549AC EC 00 08 28 */ fsubs f0, f0, f1 -/* 801549B0 D0 01 00 0C */ stfs f0, 0xc(r1) -lbl_801549B4: -/* 801549B4 C0 01 00 08 */ lfs f0, 8(r1) -/* 801549B8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 801549BC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801549C0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 801549C4 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801549C8 D0 1F 00 08 */ stfs f0, 8(r31) -/* 801549CC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801549D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801549D4 7C 08 03 A6 */ mtlr r0 -/* 801549D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801549DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getDistTableIdx__8daNpcF_cFii.s b/asm/d/a/d_a_npc/getDistTableIdx__8daNpcF_cFii.s deleted file mode 100644 index aac3f7b3e5..0000000000 --- a/asm/d/a/d_a_npc/getDistTableIdx__8daNpcF_cFii.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80154278: -/* 80154278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8015427C 7C 08 02 A6 */ mflr r0 -/* 80154280 90 01 00 14 */ stw r0, 0x14(r1) -/* 80154284 7C 83 23 78 */ mr r3, r4 -/* 80154288 7C A4 2B 78 */ mr r4, r5 -/* 8015428C 48 00 18 49 */ bl daNpcF_getDistTableIdx__Fii -/* 80154290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80154294 7C 08 03 A6 */ mtlr r0 -/* 80154298 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015429C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getIdx__16daBaseNpc_path_cFv.s b/asm/d/a/d_a_npc/getIdx__16daBaseNpc_path_cFv.s deleted file mode 100644 index 3abcfbdc97..0000000000 --- a/asm/d/a/d_a_npc/getIdx__16daBaseNpc_path_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8014DB04: -/* 8014DB04 A0 63 0A 10 */ lhz r3, 0xa10(r3) -/* 8014DB08 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getTexPtrnAnmP__11daBaseNpc_cFPci.s b/asm/d/a/d_a_npc/getTexPtrnAnmP__11daBaseNpc_cFPci.s deleted file mode 100644 index 7e981ee209..0000000000 --- a/asm/d/a/d_a_npc/getTexPtrnAnmP__11daBaseNpc_cFPci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8014EF28: -/* 8014EF28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014EF2C 7C 08 02 A6 */ mflr r0 -/* 8014EF30 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014EF34 7C 83 23 78 */ mr r3, r4 -/* 8014EF38 7C A4 2B 78 */ mr r4, r5 -/* 8014EF3C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014EF40 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014EF44 3C A5 00 02 */ addis r5, r5, 2 -/* 8014EF48 38 C0 00 80 */ li r6, 0x80 -/* 8014EF4C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8014EF50 4B EE D3 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8014EF54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014EF58 7C 08 03 A6 */ mtlr r0 -/* 8014EF5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EF60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__11daBaseNpc_cFPci.s b/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__11daBaseNpc_cFPci.s deleted file mode 100644 index 611ab9a58b..0000000000 --- a/asm/d/a/d_a_npc/getTrnsfrmKeyAnmP__11daBaseNpc_cFPci.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8014EE44: -/* 8014EE44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014EE48 7C 08 02 A6 */ mflr r0 -/* 8014EE4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014EE50 7C 83 23 78 */ mr r3, r4 -/* 8014EE54 7C A4 2B 78 */ mr r4, r5 -/* 8014EE58 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014EE5C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014EE60 3C A5 00 02 */ addis r5, r5, 2 -/* 8014EE64 38 C0 00 80 */ li r6, 0x80 -/* 8014EE68 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8014EE6C 4B EE D4 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8014EE70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014EE74 7C 08 03 A6 */ mtlr r0 -/* 8014EE78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EE7C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz.s b/asm/d/a/d_a_npc/hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz.s deleted file mode 100644 index 9d1cdc59e7..0000000000 --- a/asm/d/a/d_a_npc/hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_80145B7C: -/* 80145B7C C0 27 00 00 */ lfs f1, 0(r7) -/* 80145B80 C0 08 00 10 */ lfs f0, 0x10(r8) -/* 80145B84 EC 81 00 32 */ fmuls f4, f1, f0 -/* 80145B88 C0 25 00 00 */ lfs f1, 0(r5) -/* 80145B8C C0 08 00 0C */ lfs f0, 0xc(r8) -/* 80145B90 EC 61 00 32 */ fmuls f3, f1, f0 -/* 80145B94 C0 24 00 00 */ lfs f1, 0(r4) -/* 80145B98 C0 08 00 04 */ lfs f0, 4(r8) -/* 80145B9C EC 41 00 32 */ fmuls f2, f1, f0 -/* 80145BA0 C0 26 00 00 */ lfs f1, 0(r6) -/* 80145BA4 C0 08 00 08 */ lfs f0, 8(r8) -/* 80145BA8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80145BAC EC 02 00 2A */ fadds f0, f2, f0 -/* 80145BB0 EC 03 00 2A */ fadds f0, f3, f0 -/* 80145BB4 EC 04 00 2A */ fadds f0, f4, f0 -/* 80145BB8 D0 09 00 00 */ stfs f0, 0(r9) -/* 80145BBC C0 27 00 04 */ lfs f1, 4(r7) -/* 80145BC0 C0 08 00 10 */ lfs f0, 0x10(r8) -/* 80145BC4 EC 81 00 32 */ fmuls f4, f1, f0 -/* 80145BC8 C0 25 00 04 */ lfs f1, 4(r5) -/* 80145BCC C0 08 00 0C */ lfs f0, 0xc(r8) -/* 80145BD0 EC 61 00 32 */ fmuls f3, f1, f0 -/* 80145BD4 C0 24 00 04 */ lfs f1, 4(r4) -/* 80145BD8 C0 08 00 04 */ lfs f0, 4(r8) -/* 80145BDC EC 41 00 32 */ fmuls f2, f1, f0 -/* 80145BE0 C0 26 00 04 */ lfs f1, 4(r6) -/* 80145BE4 C0 08 00 08 */ lfs f0, 8(r8) -/* 80145BE8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80145BEC EC 02 00 2A */ fadds f0, f2, f0 -/* 80145BF0 EC 03 00 2A */ fadds f0, f3, f0 -/* 80145BF4 EC 04 00 2A */ fadds f0, f4, f0 -/* 80145BF8 D0 09 00 04 */ stfs f0, 4(r9) -/* 80145BFC C0 27 00 08 */ lfs f1, 8(r7) -/* 80145C00 C0 08 00 10 */ lfs f0, 0x10(r8) -/* 80145C04 EC 81 00 32 */ fmuls f4, f1, f0 -/* 80145C08 C0 25 00 08 */ lfs f1, 8(r5) -/* 80145C0C C0 08 00 0C */ lfs f0, 0xc(r8) -/* 80145C10 EC 61 00 32 */ fmuls f3, f1, f0 -/* 80145C14 C0 24 00 08 */ lfs f1, 8(r4) -/* 80145C18 C0 08 00 04 */ lfs f0, 4(r8) -/* 80145C1C EC 41 00 32 */ fmuls f2, f1, f0 -/* 80145C20 C0 26 00 08 */ lfs f1, 8(r6) -/* 80145C24 C0 08 00 08 */ lfs f0, 8(r8) -/* 80145C28 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80145C2C EC 02 00 2A */ fadds f0, f2, f0 -/* 80145C30 EC 03 00 2A */ fadds f0, f3, f0 -/* 80145C34 EC 04 00 2A */ fadds f0, f4, f0 -/* 80145C38 D0 09 00 08 */ stfs f0, 8(r9) -/* 80145C3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initTalk__8daNpcF_cFiPP10fopAc_ac_c.s b/asm/d/a/d_a_npc/initTalk__8daNpcF_cFiPP10fopAc_ac_c.s deleted file mode 100644 index 91c7360c1b..0000000000 --- a/asm/d/a/d_a_npc/initTalk__8daNpcF_cFiPP10fopAc_ac_c.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80153D1C: -/* 80153D1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80153D20 7C 08 02 A6 */ mflr r0 -/* 80153D24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80153D28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80153D2C 7C 7F 1B 78 */ mr r31, r3 -/* 80153D30 7C 80 23 78 */ mr r0, r4 -/* 80153D34 7C A7 2B 78 */ mr r7, r5 -/* 80153D38 38 7F 09 F8 */ addi r3, r31, 0x9f8 -/* 80153D3C 7F E4 FB 78 */ mr r4, r31 -/* 80153D40 7C 05 03 78 */ mr r5, r0 -/* 80153D44 38 C0 00 00 */ li r6, 0 -/* 80153D48 48 0F 62 49 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 80153D4C C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 80153D50 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 80153D54 D0 1F 04 F8 */ stfs f0, 0x4f8(r31) -/* 80153D58 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80153D5C D0 1F 05 00 */ stfs f0, 0x500(r31) -/* 80153D60 38 00 00 00 */ li r0, 0 -/* 80153D64 98 1F 09 E9 */ stb r0, 0x9e9(r31) -/* 80153D68 98 1F 09 EC */ stb r0, 0x9ec(r31) -/* 80153D6C 38 60 00 01 */ li r3, 1 -/* 80153D70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80153D74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80153D78 7C 08 03 A6 */ mtlr r0 -/* 80153D7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80153D80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initTalk__8daNpcT_cFiPP10fopAc_ac_c.s b/asm/d/a/d_a_npc/initTalk__8daNpcT_cFiPP10fopAc_ac_c.s deleted file mode 100644 index 5508d0b9f9..0000000000 --- a/asm/d/a/d_a_npc/initTalk__8daNpcT_cFiPP10fopAc_ac_c.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8014BBF0: -/* 8014BBF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014BBF4 7C 08 02 A6 */ mflr r0 -/* 8014BBF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014BBFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014BC00 7C 7F 1B 78 */ mr r31, r3 -/* 8014BC04 7C 80 23 78 */ mr r0, r4 -/* 8014BC08 7C A7 2B 78 */ mr r7, r5 -/* 8014BC0C 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8014BC10 7F E4 FB 78 */ mr r4, r31 -/* 8014BC14 7C 05 03 78 */ mr r5, r0 -/* 8014BC18 38 C0 00 00 */ li r6, 0 -/* 8014BC1C 48 0F E3 75 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 8014BC20 7F E3 FB 78 */ mr r3, r31 -/* 8014BC24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014BC28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014BC2C 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 8014BC30 4B EC EA E1 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8014BC34 B0 7F 0D C8 */ sth r3, 0xdc8(r31) -/* 8014BC38 A8 1F 0D D8 */ lha r0, 0xdd8(r31) -/* 8014BC3C 2C 00 00 01 */ cmpwi r0, 1 -/* 8014BC40 40 82 00 0C */ bne lbl_8014BC4C -/* 8014BC44 38 00 00 00 */ li r0, 0 -/* 8014BC48 B0 1F 0D D8 */ sth r0, 0xdd8(r31) -lbl_8014BC4C: -/* 8014BC4C C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 8014BC50 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 8014BC54 D0 1F 04 F8 */ stfs f0, 0x4f8(r31) -/* 8014BC58 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 8014BC5C D0 1F 05 00 */ stfs f0, 0x500(r31) -/* 8014BC60 38 60 00 01 */ li r3, 1 -/* 8014BC64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8014BC68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014BC6C 7C 08 03 A6 */ mtlr r0 -/* 8014BC70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014BC74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initialize__13daNpcF_Path_cFv.s b/asm/d/a/d_a_npc/initialize__13daNpcF_Path_cFv.s deleted file mode 100644 index 8d1fb84add..0000000000 --- a/asm/d/a/d_a_npc/initialize__13daNpcF_Path_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80150900: -/* 80150900 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80150904 7C 08 02 A6 */ mflr r0 -/* 80150908 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015090C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80150910 7C 7F 1B 78 */ mr r31, r3 -/* 80150914 38 00 00 00 */ li r0, 0 -/* 80150918 B0 03 00 00 */ sth r0, 0(r3) -/* 8015091C 98 03 00 02 */ stb r0, 2(r3) -/* 80150920 98 03 00 03 */ stb r0, 3(r3) -/* 80150924 90 03 00 04 */ stw r0, 4(r3) -/* 80150928 38 7F 00 20 */ addi r3, r31, 0x20 -/* 8015092C 38 80 00 00 */ li r4, 0 -/* 80150930 38 A0 00 00 */ li r5, 0 -/* 80150934 4B FF FF 3D */ bl initialize__16daNpcF_SPCurve_cFP5dPathi -/* 80150938 C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 8015093C D0 1F 00 08 */ stfs f0, 8(r31) -/* 80150940 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 80150944 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 80150948 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8015094C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80150950 7C 08 03 A6 */ mtlr r0 -/* 80150954 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150958 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initialize__13daNpcT_Path_cFv.s b/asm/d/a/d_a_npc/initialize__13daNpcT_Path_cFv.s deleted file mode 100644 index b047750e58..0000000000 --- a/asm/d/a/d_a_npc/initialize__13daNpcT_Path_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80145C40: -/* 80145C40 38 00 00 00 */ li r0, 0 -/* 80145C44 90 03 00 00 */ stw r0, 0(r3) -/* 80145C48 C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 80145C4C D0 03 00 04 */ stfs f0, 4(r3) -/* 80145C50 D0 03 00 08 */ stfs f0, 8(r3) -/* 80145C54 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80145C58 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80145C5C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80145C60 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80145C64 B0 03 00 1C */ sth r0, 0x1c(r3) -/* 80145C68 98 03 00 20 */ stb r0, 0x20(r3) -/* 80145C6C 98 03 00 21 */ stb r0, 0x21(r3) -/* 80145C70 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initialize__15daNpcF_MatAnm_cFv.s b/asm/d/a/d_a_npc/initialize__15daNpcF_MatAnm_cFv.s deleted file mode 100644 index 52926b30a3..0000000000 --- a/asm/d/a/d_a_npc/initialize__15daNpcF_MatAnm_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80150738: -/* 80150738 C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 8015073C D0 03 00 F4 */ stfs f0, 0xf4(r3) -/* 80150740 D0 03 00 F8 */ stfs f0, 0xf8(r3) -/* 80150744 D0 03 00 FC */ stfs f0, 0xfc(r3) -/* 80150748 D0 03 01 00 */ stfs f0, 0x100(r3) -/* 8015074C 38 00 00 00 */ li r0, 0 -/* 80150750 98 03 01 04 */ stb r0, 0x104(r3) -/* 80150754 98 03 01 05 */ stb r0, 0x105(r3) -/* 80150758 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initialize__15daNpcT_MatAnm_cFv.s b/asm/d/a/d_a_npc/initialize__15daNpcT_MatAnm_cFv.s deleted file mode 100644 index 397ed3b84b..0000000000 --- a/asm/d/a/d_a_npc/initialize__15daNpcT_MatAnm_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80145764: -/* 80145764 C0 02 99 D8 */ lfs f0, lit_4116(r2) -/* 80145768 D0 03 00 F4 */ stfs f0, 0xf4(r3) -/* 8014576C D0 03 00 F8 */ stfs f0, 0xf8(r3) -/* 80145770 D0 03 00 FC */ stfs f0, 0xfc(r3) -/* 80145774 D0 03 01 00 */ stfs f0, 0x100(r3) -/* 80145778 38 00 00 00 */ li r0, 0 -/* 8014577C 98 03 01 04 */ stb r0, 0x104(r3) -/* 80145780 98 03 01 05 */ stb r0, 0x105(r3) -/* 80145784 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/initialize__18daNpcF_ActorMngr_cFv.s b/asm/d/a/d_a_npc/initialize__18daNpcF_ActorMngr_cFv.s deleted file mode 100644 index 2f0c72e21f..0000000000 --- a/asm/d/a/d_a_npc/initialize__18daNpcF_ActorMngr_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_801506B0: -/* 801506B0 38 00 FF FF */ li r0, -1 -/* 801506B4 90 03 00 00 */ stw r0, 0(r3) -/* 801506B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/isPath__16daBaseNpc_path_cFv.s b/asm/d/a/d_a_npc/isPath__16daBaseNpc_path_cFv.s deleted file mode 100644 index 11db162cf7..0000000000 --- a/asm/d/a/d_a_npc/isPath__16daBaseNpc_path_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8014D9A8: -/* 8014D9A8 80 63 00 04 */ lwz r3, 4(r3) -/* 8014D9AC 30 03 FF FF */ addic r0, r3, -1 -/* 8014D9B0 7C 00 19 10 */ subfe r0, r0, r3 -/* 8014D9B4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8014D9B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/limitter__18daBaseNpc_lookat_cFsPsss.s b/asm/d/a/d_a_npc/limitter__18daBaseNpc_lookat_cFsPsss.s deleted file mode 100644 index 502af22d29..0000000000 --- a/asm/d/a/d_a_npc/limitter__18daBaseNpc_lookat_cFsPsss.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8014DB40: -/* 8014DB40 7C 88 07 34 */ extsh r8, r4 -/* 8014DB44 A8 65 00 00 */ lha r3, 0(r5) -/* 8014DB48 7D 28 1A 14 */ add r9, r8, r3 -/* 8014DB4C 7C C0 07 34 */ extsh r0, r6 -/* 8014DB50 7C 00 48 00 */ cmpw r0, r9 -/* 8014DB54 40 80 00 24 */ bge lbl_8014DB78 -/* 8014DB58 7C 08 00 00 */ cmpw r8, r0 -/* 8014DB5C 40 80 00 14 */ bge lbl_8014DB70 -/* 8014DB60 7C 00 48 50 */ subf r0, r0, r9 -/* 8014DB64 7C 00 18 50 */ subf r0, r0, r3 -/* 8014DB68 B0 05 00 00 */ sth r0, 0(r5) -/* 8014DB6C 48 00 00 0C */ b lbl_8014DB78 -lbl_8014DB70: -/* 8014DB70 38 00 00 00 */ li r0, 0 -/* 8014DB74 B0 05 00 00 */ sth r0, 0(r5) -lbl_8014DB78: -/* 8014DB78 A8 C5 00 00 */ lha r6, 0(r5) -/* 8014DB7C 7D 08 32 14 */ add r8, r8, r6 -/* 8014DB80 7C E3 07 34 */ extsh r3, r7 -/* 8014DB84 7C 08 18 00 */ cmpw r8, r3 -/* 8014DB88 4C 80 00 20 */ bgelr -/* 8014DB8C 7C 80 07 34 */ extsh r0, r4 -/* 8014DB90 7C 03 00 00 */ cmpw r3, r0 -/* 8014DB94 40 80 00 14 */ bge lbl_8014DBA8 -/* 8014DB98 7C 03 40 50 */ subf r0, r3, r8 -/* 8014DB9C 7C 00 30 50 */ subf r0, r0, r6 -/* 8014DBA0 B0 05 00 00 */ sth r0, 0(r5) -/* 8014DBA4 4E 80 00 20 */ blr -lbl_8014DBA8: -/* 8014DBA8 38 00 00 00 */ li r0, 0 -/* 8014DBAC B0 05 00 00 */ sth r0, 0(r5) -/* 8014DBB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/orderEvent__11daBaseNpc_cFiPc.s b/asm/d/a/d_a_npc/orderEvent__11daBaseNpc_cFiPc.s deleted file mode 100644 index e0301e9417..0000000000 --- a/asm/d/a/d_a_npc/orderEvent__11daBaseNpc_cFiPc.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8014EFF4: -/* 8014EFF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014EFF8 7C 08 02 A6 */ mflr r0 -/* 8014EFFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014F000 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014F004 7C 7F 1B 78 */ mr r31, r3 -/* 8014F008 28 05 00 00 */ cmplwi r5, 0 -/* 8014F00C 41 82 00 44 */ beq lbl_8014F050 -/* 8014F010 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014F014 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014F018 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8014F01C 7F E4 FB 78 */ mr r4, r31 -/* 8014F020 38 C0 00 FF */ li r6, 0xff -/* 8014F024 4B EF 87 35 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8014F028 B0 7F 08 9A */ sth r3, 0x89a(r31) -/* 8014F02C 7F E3 FB 78 */ mr r3, r31 -/* 8014F030 A8 9F 08 9A */ lha r4, 0x89a(r31) -/* 8014F034 38 A0 00 FF */ li r5, 0xff -/* 8014F038 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8014F03C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8014F040 38 E0 00 00 */ li r7, 0 -/* 8014F044 39 00 00 01 */ li r8, 1 -/* 8014F048 4B EC C6 35 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8014F04C 48 00 00 3C */ b lbl_8014F088 -lbl_8014F050: -/* 8014F050 80 1F 08 48 */ lwz r0, 0x848(r31) -/* 8014F054 2C 00 00 00 */ cmpwi r0, 0 -/* 8014F058 41 80 00 30 */ blt lbl_8014F088 -/* 8014F05C 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 8014F060 28 00 00 0A */ cmplwi r0, 0xa -/* 8014F064 40 82 00 24 */ bne lbl_8014F088 -/* 8014F068 A0 1F 00 FA */ lhz r0, 0xfa(r31) -/* 8014F06C 60 00 00 01 */ ori r0, r0, 1 -/* 8014F070 B0 1F 00 FA */ sth r0, 0xfa(r31) -/* 8014F074 2C 04 00 00 */ cmpwi r4, 0 -/* 8014F078 41 82 00 10 */ beq lbl_8014F088 -/* 8014F07C 38 80 00 00 */ li r4, 0 -/* 8014F080 38 A0 00 00 */ li r5, 0 -/* 8014F084 4B EC C1 19 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs -lbl_8014F088: -/* 8014F088 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8014F08C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014F090 7C 08 03 A6 */ mtlr r0 -/* 8014F094 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F098 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/remove__18daNpcF_ActorMngr_cFv.s b/asm/d/a/d_a_npc/remove__18daNpcF_ActorMngr_cFv.s deleted file mode 100644 index 49c64dc578..0000000000 --- a/asm/d/a/d_a_npc/remove__18daNpcF_ActorMngr_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_801506E0: -/* 801506E0 38 00 FF FF */ li r0, -1 -/* 801506E4 90 03 00 00 */ stw r0, 0(r3) -/* 801506E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/reverseDir__16daBaseNpc_path_cFv.s b/asm/d/a/d_a_npc/reverseDir__16daBaseNpc_path_cFv.s deleted file mode 100644 index 52b65f5549..0000000000 --- a/asm/d/a/d_a_npc/reverseDir__16daBaseNpc_path_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8014DA48: -/* 8014DA48 88 03 0A 12 */ lbz r0, 0xa12(r3) -/* 8014DA4C 7C 00 07 75 */ extsb. r0, r0 -/* 8014DA50 38 00 00 01 */ li r0, 1 -/* 8014DA54 40 81 00 08 */ ble lbl_8014DA5C -/* 8014DA58 38 00 FF FF */ li r0, -1 -lbl_8014DA5C: -/* 8014DA5C 98 03 0A 12 */ stb r0, 0xa12(r3) -/* 8014DA60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/reverse__13daNpcF_Path_cFv.s b/asm/d/a/d_a_npc/reverse__13daNpcF_Path_cFv.s deleted file mode 100644 index 6a24d437db..0000000000 --- a/asm/d/a/d_a_npc/reverse__13daNpcF_Path_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80150BBC: -/* 80150BBC 88 03 00 02 */ lbz r0, 2(r3) -/* 80150BC0 28 00 00 01 */ cmplwi r0, 1 -/* 80150BC4 40 82 00 10 */ bne lbl_80150BD4 -/* 80150BC8 38 00 00 00 */ li r0, 0 -/* 80150BCC 98 03 00 02 */ stb r0, 2(r3) -/* 80150BD0 4E 80 00 20 */ blr -lbl_80150BD4: -/* 80150BD4 38 00 00 01 */ li r0, 1 -/* 80150BD8 98 03 00 02 */ stb r0, 2(r3) -/* 80150BDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/reverse__13daNpcT_Path_cFv.s b/asm/d/a/d_a_npc/reverse__13daNpcT_Path_cFv.s deleted file mode 100644 index b77e19f753..0000000000 --- a/asm/d/a/d_a_npc/reverse__13daNpcT_Path_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80145DA0: -/* 80145DA0 88 03 00 20 */ lbz r0, 0x20(r3) -/* 80145DA4 28 00 00 01 */ cmplwi r0, 1 -/* 80145DA8 40 82 00 18 */ bne lbl_80145DC0 -/* 80145DAC 38 00 00 00 */ li r0, 0 -/* 80145DB0 98 03 00 20 */ stb r0, 0x20(r3) -/* 80145DB4 38 00 00 01 */ li r0, 1 -/* 80145DB8 B0 03 00 1E */ sth r0, 0x1e(r3) -/* 80145DBC 4E 80 00 20 */ blr -lbl_80145DC0: -/* 80145DC0 38 00 00 01 */ li r0, 1 -/* 80145DC4 98 03 00 20 */ stb r0, 0x20(r3) -/* 80145DC8 B0 03 00 1E */ sth r0, 0x1e(r3) -/* 80145DCC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setAttnPos__18daBaseNpc_lookat_cFP4cXyz.s b/asm/d/a/d_a_npc/setAttnPos__18daBaseNpc_lookat_cFP4cXyz.s deleted file mode 100644 index 279ae843d3..0000000000 --- a/asm/d/a/d_a_npc/setAttnPos__18daBaseNpc_lookat_cFP4cXyz.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8014E6A0: -/* 8014E6A0 90 83 00 98 */ stw r4, 0x98(r3) -/* 8014E6A4 38 60 00 01 */ li r3, 1 -/* 8014E6A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib.s b/asm/d/a/d_a_npc/setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib.s deleted file mode 100644 index d5371b3289..0000000000 --- a/asm/d/a/d_a_npc/setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8014EEE4: -/* 8014EEE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014EEE8 7C 08 02 A6 */ mflr r0 -/* 8014EEEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014EEF0 7C AB 2B 78 */ mr r11, r5 -/* 8014EEF4 7C CA 33 78 */ mr r10, r6 -/* 8014EEF8 7C E0 3B 78 */ mr r0, r7 -/* 8014EEFC 7D 09 43 78 */ mr r9, r8 -/* 8014EF00 38 A0 00 01 */ li r5, 1 -/* 8014EF04 7D 66 5B 78 */ mr r6, r11 -/* 8014EF08 7D 47 07 34 */ extsh r7, r10 -/* 8014EF0C 7C 08 07 34 */ extsh r8, r0 -/* 8014EF10 38 63 07 EC */ addi r3, r3, 0x7ec -/* 8014EF14 4B EB E8 C9 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 8014EF18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014EF1C 7C 08 03 A6 */ mtlr r0 -/* 8014EF20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EF24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi.s b/asm/d/a/d_a_npc/setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi.s deleted file mode 100644 index 2c855bfedf..0000000000 --- a/asm/d/a/d_a_npc/setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8014EF64: -/* 8014EF64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014EF68 7C 08 02 A6 */ mflr r0 -/* 8014EF6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014EF70 7C 80 23 78 */ mr r0, r4 -/* 8014EF74 7C C7 33 78 */ mr r7, r6 -/* 8014EF78 38 85 00 58 */ addi r4, r5, 0x58 -/* 8014EF7C 7C 05 03 78 */ mr r5, r0 -/* 8014EF80 38 C0 00 01 */ li r6, 1 -/* 8014EF84 39 00 00 00 */ li r8, 0 -/* 8014EF88 39 20 FF FF */ li r9, -1 -/* 8014EF8C 38 63 08 08 */ addi r3, r3, 0x808 -/* 8014EF90 4B EB E5 BD */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss -/* 8014EF94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014EF98 7C 08 03 A6 */ mtlr r0 -/* 8014EF9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EFA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setEnvTevColor__11daBaseNpc_cFv.s b/asm/d/a/d_a_npc/setEnvTevColor__11daBaseNpc_cFv.s deleted file mode 100644 index 523d1d1dfd..0000000000 --- a/asm/d/a/d_a_npc/setEnvTevColor__11daBaseNpc_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8014F0A0: -/* 8014F0A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014F0A4 7C 08 02 A6 */ mflr r0 -/* 8014F0A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014F0AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014F0B0 93 C1 00 08 */ stw r30, 8(r1) -/* 8014F0B4 7C 7E 1B 78 */ mr r30, r3 -/* 8014F0B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014F0BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014F0C0 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8014F0C4 7F E3 FB 78 */ mr r3, r31 -/* 8014F0C8 38 9E 09 E8 */ addi r4, r30, 0x9e8 -/* 8014F0CC 4B F2 5B 1D */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 8014F0D0 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 8014F0D4 7F E3 FB 78 */ mr r3, r31 -/* 8014F0D8 38 9E 09 E8 */ addi r4, r30, 0x9e8 -/* 8014F0DC 4B F2 60 25 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 8014F0E0 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 8014F0E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8014F0E8 83 C1 00 08 */ lwz r30, 8(r1) -/* 8014F0EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014F0F0 7C 08 03 A6 */ mtlr r0 -/* 8014F0F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F0F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setJntPos__18daBaseNpc_lookat_cF4cXyzi.s b/asm/d/a/d_a_npc/setJntPos__18daBaseNpc_lookat_cF4cXyzi.s deleted file mode 100644 index 0bda9ba38d..0000000000 --- a/asm/d/a/d_a_npc/setJntPos__18daBaseNpc_lookat_cF4cXyzi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8014E67C: -/* 8014E67C C0 04 00 00 */ lfs f0, 0(r4) -/* 8014E680 1C 05 00 0C */ mulli r0, r5, 0xc -/* 8014E684 7C 63 02 14 */ add r3, r3, r0 -/* 8014E688 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 8014E68C C0 04 00 04 */ lfs f0, 4(r4) -/* 8014E690 D0 03 00 38 */ stfs f0, 0x38(r3) -/* 8014E694 C0 04 00 08 */ lfs f0, 8(r4) -/* 8014E698 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 8014E69C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi.s b/asm/d/a/d_a_npc/setMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi.s deleted file mode 100644 index 32fb389fc5..0000000000 --- a/asm/d/a/d_a_npc/setMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8014E634: -/* 8014E634 A8 04 00 00 */ lha r0, 0(r4) -/* 8014E638 1C A5 00 06 */ mulli r5, r5, 6 -/* 8014E63C 7C 63 2A 14 */ add r3, r3, r5 -/* 8014E640 B0 03 00 04 */ sth r0, 4(r3) -/* 8014E644 A8 04 00 02 */ lha r0, 2(r4) -/* 8014E648 B0 03 00 06 */ sth r0, 6(r3) -/* 8014E64C A8 04 00 04 */ lha r0, 4(r4) -/* 8014E650 B0 03 00 08 */ sth r0, 8(r3) -/* 8014E654 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setMinJntLmt__18daBaseNpc_lookat_cF5csXyzi.s b/asm/d/a/d_a_npc/setMinJntLmt__18daBaseNpc_lookat_cF5csXyzi.s deleted file mode 100644 index 20fd31a1a0..0000000000 --- a/asm/d/a/d_a_npc/setMinJntLmt__18daBaseNpc_lookat_cF5csXyzi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8014E658: -/* 8014E658 A8 04 00 00 */ lha r0, 0(r4) -/* 8014E65C 1C A5 00 06 */ mulli r5, r5, 6 -/* 8014E660 7C 63 2A 14 */ add r3, r3, r5 -/* 8014E664 B0 03 00 1C */ sth r0, 0x1c(r3) -/* 8014E668 A8 04 00 02 */ lha r0, 2(r4) -/* 8014E66C B0 03 00 1E */ sth r0, 0x1e(r3) -/* 8014E670 A8 04 00 04 */ lha r0, 4(r4) -/* 8014E674 B0 03 00 20 */ sth r0, 0x20(r3) -/* 8014E678 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setMtx__11daBaseNpc_cFi.s b/asm/d/a/d_a_npc/setMtx__11daBaseNpc_cFi.s deleted file mode 100644 index 9b9de4bdd9..0000000000 --- a/asm/d/a/d_a_npc/setMtx__11daBaseNpc_cFi.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_8014F390: -/* 8014F390 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8014F394 7C 08 02 A6 */ mflr r0 -/* 8014F398 90 01 00 24 */ stw r0, 0x24(r1) -/* 8014F39C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014F3A0 48 21 2E 39 */ bl _savegpr_28 -/* 8014F3A4 7C 7F 1B 78 */ mr r31, r3 -/* 8014F3A8 7C 9C 23 78 */ mr r28, r4 -/* 8014F3AC 80 63 07 54 */ lwz r3, 0x754(r3) -/* 8014F3B0 83 C3 00 04 */ lwz r30, 4(r3) -/* 8014F3B4 83 BE 00 04 */ lwz r29, 4(r30) -/* 8014F3B8 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8014F3BC 4B EB D9 A9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 8014F3C0 38 7F 09 1A */ addi r3, r31, 0x91a -/* 8014F3C4 4B EB DB 81 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 8014F3C8 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 8014F3CC 4B EB DA A5 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 8014F3D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8014F3D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8014F3D8 38 9E 00 24 */ addi r4, r30, 0x24 -/* 8014F3DC 48 1F 70 D5 */ bl PSMTXCopy -/* 8014F3E0 2C 1C 00 00 */ cmpwi r28, 0 -/* 8014F3E4 41 82 00 0C */ beq lbl_8014F3F0 -/* 8014F3E8 93 FE 00 14 */ stw r31, 0x14(r30) -/* 8014F3EC 48 00 00 0C */ b lbl_8014F3F8 -lbl_8014F3F0: -/* 8014F3F0 38 00 00 00 */ li r0, 0 -/* 8014F3F4 90 1E 00 14 */ stw r0, 0x14(r30) -lbl_8014F3F8: -/* 8014F3F8 A0 1F 08 40 */ lhz r0, 0x840(r31) -/* 8014F3FC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8014F400 41 82 00 80 */ beq lbl_8014F480 -/* 8014F404 80 1F 08 3C */ lwz r0, 0x83c(r31) -/* 8014F408 28 00 00 00 */ cmplwi r0, 0 -/* 8014F40C 41 82 00 74 */ beq lbl_8014F480 -/* 8014F410 3B C0 00 00 */ li r30, 0 -/* 8014F414 48 00 00 18 */ b lbl_8014F42C -lbl_8014F418: -/* 8014F418 38 7F 07 EC */ addi r3, r31, 0x7ec -/* 8014F41C 7F A4 EB 78 */ mr r4, r29 -/* 8014F420 C0 3F 07 FC */ lfs f1, 0x7fc(r31) -/* 8014F424 4B EB E5 C5 */ bl entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf -/* 8014F428 3B DE 00 01 */ addi r30, r30, 1 -lbl_8014F42C: -/* 8014F42C 80 7F 08 3C */ lwz r3, 0x83c(r31) -/* 8014F430 57 C0 0B FC */ rlwinm r0, r30, 1, 0xf, 0x1e -/* 8014F434 7C A3 02 2E */ lhzx r5, r3, r0 -/* 8014F438 28 05 FF FF */ cmplwi r5, 0xffff -/* 8014F43C 40 82 FF DC */ bne lbl_8014F418 -/* 8014F440 80 7F 07 54 */ lwz r3, 0x754(r31) -/* 8014F444 4B EC 1D A9 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 8014F448 38 A0 00 00 */ li r5, 0 -/* 8014F44C 38 80 00 00 */ li r4, 0 -/* 8014F450 48 00 00 18 */ b lbl_8014F468 -lbl_8014F454: -/* 8014F454 80 7D 00 28 */ lwz r3, 0x28(r29) -/* 8014F458 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 8014F45C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8014F460 90 83 00 54 */ stw r4, 0x54(r3) -/* 8014F464 38 A5 00 01 */ addi r5, r5, 1 -lbl_8014F468: -/* 8014F468 80 7F 08 3C */ lwz r3, 0x83c(r31) -/* 8014F46C 54 A0 0B FC */ rlwinm r0, r5, 1, 0xf, 0x1e -/* 8014F470 7C 03 02 2E */ lhzx r0, r3, r0 -/* 8014F474 28 00 FF FF */ cmplwi r0, 0xffff -/* 8014F478 40 82 FF DC */ bne lbl_8014F454 -/* 8014F47C 48 00 00 0C */ b lbl_8014F488 -lbl_8014F480: -/* 8014F480 80 7F 07 54 */ lwz r3, 0x754(r31) -/* 8014F484 4B EC 1D 69 */ bl modelCalc__16mDoExt_McaMorfSOFv -lbl_8014F488: -/* 8014F488 39 61 00 20 */ addi r11, r1, 0x20 -/* 8014F48C 48 21 2D 99 */ bl _restgpr_28 -/* 8014F490 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8014F494 7C 08 03 A6 */ mtlr r0 -/* 8014F498 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014F49C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setNextPathInfo__13daNpcT_Path_cFScUc.s b/asm/d/a/d_a_npc/setNextPathInfo__13daNpcT_Path_cFScUc.s deleted file mode 100644 index 25e29e5b70..0000000000 --- a/asm/d/a/d_a_npc/setNextPathInfo__13daNpcT_Path_cFScUc.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80145D2C: -/* 80145D2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80145D30 7C 08 02 A6 */ mflr r0 -/* 80145D34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80145D38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80145D3C 7C 7F 1B 78 */ mr r31, r3 -/* 80145D40 38 00 00 00 */ li r0, 0 -/* 80145D44 B0 03 00 1C */ sth r0, 0x1c(r3) -/* 80145D48 98 A3 00 20 */ stb r5, 0x20(r3) -/* 80145D4C 80 63 00 00 */ lwz r3, 0(r3) -/* 80145D50 A0 63 00 02 */ lhz r3, 2(r3) -/* 80145D54 28 03 FF FF */ cmplwi r3, 0xffff -/* 80145D58 41 82 00 30 */ beq lbl_80145D88 -/* 80145D5C 7C 84 07 74 */ extsb r4, r4 -/* 80145D60 4B F0 BA 8D */ bl dPath_GetRoomPath__Fii -/* 80145D64 90 7F 00 00 */ stw r3, 0(r31) -/* 80145D68 80 7F 00 00 */ lwz r3, 0(r31) -/* 80145D6C 28 03 00 00 */ cmplwi r3, 0 -/* 80145D70 40 82 00 0C */ bne lbl_80145D7C -/* 80145D74 38 60 00 00 */ li r3, 0 -/* 80145D78 48 00 00 14 */ b lbl_80145D8C -lbl_80145D7C: -/* 80145D7C 88 03 00 05 */ lbz r0, 5(r3) -/* 80145D80 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 80145D84 98 1F 00 21 */ stb r0, 0x21(r31) -lbl_80145D88: -/* 80145D88 38 60 00 01 */ li r3, 1 -lbl_80145D8C: -/* 80145D8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80145D90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80145D94 7C 08 03 A6 */ mtlr r0 -/* 80145D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80145D9C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs.s b/asm/d/a/d_a_npc/setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs.s deleted file mode 100644 index 2e5d6b7856..0000000000 --- a/asm/d/a/d_a_npc/setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80147DCC: -/* 80147DCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80147DD0 7C 08 02 A6 */ mflr r0 -/* 80147DD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80147DD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80147DDC 93 C1 00 08 */ stw r30, 8(r1) -/* 80147DE0 7C 7E 1B 78 */ mr r30, r3 -/* 80147DE4 7C DF 33 78 */ mr r31, r6 -/* 80147DE8 28 05 00 00 */ cmplwi r5, 0 -/* 80147DEC 41 82 00 38 */ beq lbl_80147E24 -/* 80147DF0 28 04 00 00 */ cmplwi r4, 0 -/* 80147DF4 41 82 00 30 */ beq lbl_80147E24 -/* 80147DF8 C0 02 9A 30 */ lfs f0, lit_5422(r2) -/* 80147DFC D0 1E 00 0C */ stfs f0, 0xc(r30) -/* 80147E00 C0 02 9A 34 */ lfs f0, lit_5423(r2) -/* 80147E04 D0 1E 00 10 */ stfs f0, 0x10(r30) -/* 80147E08 7C 83 23 78 */ mr r3, r4 -/* 80147E0C 7C A4 2B 78 */ mr r4, r5 -/* 80147E10 4B ED 29 01 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80147E14 7C 1F 18 50 */ subf r0, r31, r3 -/* 80147E18 B0 1E 00 16 */ sth r0, 0x16(r30) -/* 80147E1C 38 00 40 00 */ li r0, 0x4000 -/* 80147E20 B0 1E 00 14 */ sth r0, 0x14(r30) -lbl_80147E24: -/* 80147E24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80147E28 83 C1 00 08 */ lwz r30, 8(r1) -/* 80147E2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80147E30 7C 08 03 A6 */ mtlr r0 -/* 80147E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80147E38 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_npc/setRoomNo__11daBaseNpc_cFv.s b/asm/d/a/d_a_npc/setRoomNo__11daBaseNpc_cFv.s deleted file mode 100644 index 6d57796432..0000000000 --- a/asm/d/a/d_a_npc/setRoomNo__11daBaseNpc_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8014F0FC: -/* 8014F0FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8014F100 7C 08 02 A6 */ mflr r0 -/* 8014F104 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014F108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8014F10C 7C 7F 1B 78 */ mr r31, r3 -/* 8014F110 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014F114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014F118 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8014F11C 38 9F 09 E8 */ addi r4, r31, 0x9e8 -/* 8014F120 4B F2 5F E1 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 8014F124 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 8014F128 98 7F 08 BE */ stb r3, 0x8be(r31) -/* 8014F12C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8014F130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014F134 7C 08 03 A6 */ mtlr r0 -/* 8014F138 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F13C 4E 80 00 20 */ blr