mirror of
https://github.com/zeldaret/tp
synced 2026-08-02 08:32:23 -04:00
d_a_npc work
daBaseNpc_c::setBckAnm and J3DAnmTransform* daBaseNpc_c daBaseNpc_c::setBtpAnm daBaseNpc_c::attnSttsOn daBaseNpc_c::orderEvent daBaseNpc_c::setEnvTevColor daBaseNpc_c::setRoomNo daBaseNpc_c::checkEndAnm attempt CheckCreateHeap daNpcF_addIdx daNpcF_subIdx daNpcF_incIdx daNpcF_decIdx daNpcF_ActorMngr_c::initialize() daNpcF_ActorMngr_c::entry cleanup daNpcF_ActorMngr_c::entry daNpcF_ActorMngr_c::remove daNpcF_ActorMngr_c::getActorP daNpcF_MatAnm_c::calc attempt daNpcF_SPCurve_c::initialize minor fixes daNpcF_Path_c::initialize daNpcF_Path_c::setPathInfo daNpcF_Path_c::chkPassed daNpcF_Path_c::reverse daNpcF_Path_c::setNextIdx daNpcF_Path_c::getNextIdx daNpcF_Path_c::getBeforeIdx daNpcF_Path_c::getBeforePos daNpcF_Path_c::getNextPos daNpcT_MatAnm_c::initialize daNpcT_MatAnm_c::calc daNpcT_addIdx daNpcT_subIdx daNpcT_decIdx daNpcT_Path_c::hermite daNpcT_Path_c::initialize daNpcT_Path_c::setPathInfo attempt daNpcT_Path_c::setNextPathInfo daNpcT_Path_c::reverse daNpcT_Path_c::setNextIdx daNpcT_Path_c::getDstPos attempt daNpcT_DmgStagger_c::setParam Add FLOAT_LABEL where possible fopEn_enemy / fix e_wb move jasper's jsystem work over d_attention / d_demo / d_lib work remove asm clean up dolphin files / work on some rels (#212) * d_a_alldie / d_a_tboxSw / d_a_tag_gstart / d_a_tag_hstop * dolphin OS work / cleanup * dolphin GX work / cleanup * finish changing dolphin files to C * more files into C * match rest of MSL_C math functions * more dolphin files converted to C * remove asm * d_bg_w work * remove asm * d_a_alink work / kytag14 initial changes to d_a_e_yc checkpoint until virtual destructor issue is solved daNpcF_Lookat_c::adjustMoveDisAngle daBaseNpc_c::setMtx daBaseNpc_moveBgActor_c::daBaseNpc_moveBgActor_c() daNpcT_c::ctrlFaceMotion daNpcT_c::ctrlMsgAnm attempt daNpcT_c::initTalk daNpcF_clearMessageTmpBit daNpcF_getDistTableIdx daNpcF_offTmpBit daNpcF_onTmpBit daNpcF_chkTmpBit daNpcF_onEvtBit daNpcF_chkEvtBit daNpcF_c::getDistTableIdx daNpcF_chkPointInArea daNpcF_chkDoBtnEqSpeak daNpcF_getPlayerInfoFromPlayerList attempt daNpcF_pntVsLineSegmentLengthSquare2D daNpcF_c::chkPointInArea daNpcF_c::chkPointInArea daNpcF_c::getAttentionPos daNpcT_chkTmpBit daNpcT_offTmpBit daNpcT_onTmpBit daNpcT_chkEvtBit daNpcT_offEvtBit daNpcT_onEvtBit daNpcT_chkDoBtnIsSpeak daNpcT_getDistTableIdx daBaseNpc_acMngr_c::entry daNpcF_c::initTalk undo override
This commit is contained in:
@@ -1,54 +0,0 @@
|
||||
lbl_803255F0:
|
||||
/* 803255F0 3C 60 80 3D */ lis r3, lit_992@ha /* 0x803CEBE8@ha */
|
||||
/* 803255F4 38 A3 EB E8 */ addi r5, r3, lit_992@l /* 0x803CEBE8@l */
|
||||
/* 803255F8 80 65 00 00 */ lwz r3, 0(r5)
|
||||
/* 803255FC 80 05 00 04 */ lwz r0, 4(r5)
|
||||
/* 80325600 90 65 00 48 */ stw r3, 0x48(r5)
|
||||
/* 80325604 90 05 00 4C */ stw r0, 0x4c(r5)
|
||||
/* 80325608 80 05 00 08 */ lwz r0, 8(r5)
|
||||
/* 8032560C 90 05 00 50 */ stw r0, 0x50(r5)
|
||||
/* 80325610 38 85 00 48 */ addi r4, r5, 0x48
|
||||
/* 80325614 80 65 00 0C */ lwz r3, 0xc(r5)
|
||||
/* 80325618 80 05 00 10 */ lwz r0, 0x10(r5)
|
||||
/* 8032561C 90 64 00 0C */ stw r3, 0xc(r4)
|
||||
/* 80325620 90 04 00 10 */ stw r0, 0x10(r4)
|
||||
/* 80325624 80 05 00 14 */ lwz r0, 0x14(r5)
|
||||
/* 80325628 90 04 00 14 */ stw r0, 0x14(r4)
|
||||
/* 8032562C 80 65 00 18 */ lwz r3, 0x18(r5)
|
||||
/* 80325630 80 05 00 1C */ lwz r0, 0x1c(r5)
|
||||
/* 80325634 90 64 00 18 */ stw r3, 0x18(r4)
|
||||
/* 80325638 90 04 00 1C */ stw r0, 0x1c(r4)
|
||||
/* 8032563C 80 05 00 20 */ lwz r0, 0x20(r5)
|
||||
/* 80325640 90 04 00 20 */ stw r0, 0x20(r4)
|
||||
/* 80325644 80 65 00 24 */ lwz r3, 0x24(r5)
|
||||
/* 80325648 80 05 00 28 */ lwz r0, 0x28(r5)
|
||||
/* 8032564C 90 64 00 24 */ stw r3, 0x24(r4)
|
||||
/* 80325650 90 04 00 28 */ stw r0, 0x28(r4)
|
||||
/* 80325654 80 05 00 2C */ lwz r0, 0x2c(r5)
|
||||
/* 80325658 90 04 00 2C */ stw r0, 0x2c(r4)
|
||||
/* 8032565C 80 65 00 30 */ lwz r3, 0x30(r5)
|
||||
/* 80325660 80 05 00 34 */ lwz r0, 0x34(r5)
|
||||
/* 80325664 90 64 00 30 */ stw r3, 0x30(r4)
|
||||
/* 80325668 90 04 00 34 */ stw r0, 0x34(r4)
|
||||
/* 8032566C 80 05 00 38 */ lwz r0, 0x38(r5)
|
||||
/* 80325670 90 04 00 38 */ stw r0, 0x38(r4)
|
||||
/* 80325674 80 65 00 3C */ lwz r3, 0x3c(r5)
|
||||
/* 80325678 80 05 00 40 */ lwz r0, 0x40(r5)
|
||||
/* 8032567C 90 64 00 3C */ stw r3, 0x3c(r4)
|
||||
/* 80325680 90 04 00 40 */ stw r0, 0x40(r4)
|
||||
/* 80325684 80 05 00 44 */ lwz r0, 0x44(r5)
|
||||
/* 80325688 90 04 00 44 */ stw r0, 0x44(r4)
|
||||
/* 8032568C 80 65 00 90 */ lwz r3, 0x90(r5)
|
||||
/* 80325690 80 05 00 94 */ lwz r0, 0x94(r5)
|
||||
/* 80325694 90 65 00 A8 */ stw r3, 0xa8(r5)
|
||||
/* 80325698 90 05 00 AC */ stw r0, 0xac(r5)
|
||||
/* 8032569C 80 05 00 98 */ lwz r0, 0x98(r5)
|
||||
/* 803256A0 90 05 00 B0 */ stw r0, 0xb0(r5)
|
||||
/* 803256A4 38 85 00 A8 */ addi r4, r5, 0xa8
|
||||
/* 803256A8 80 65 00 9C */ lwz r3, 0x9c(r5)
|
||||
/* 803256AC 80 05 00 A0 */ lwz r0, 0xa0(r5)
|
||||
/* 803256B0 90 64 00 0C */ stw r3, 0xc(r4)
|
||||
/* 803256B4 90 04 00 10 */ stw r0, 0x10(r4)
|
||||
/* 803256B8 80 05 00 A4 */ lwz r0, 0xa4(r5)
|
||||
/* 803256BC 90 04 00 14 */ stw r0, 0x14(r4)
|
||||
/* 803256C0 4E 80 00 20 */ blr
|
||||
@@ -1,35 +0,0 @@
|
||||
lbl_80325500:
|
||||
/* 80325500 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 80325504 7C 08 02 A6 */ mflr r0
|
||||
/* 80325508 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 8032550C 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80325510 48 03 CC C5 */ bl _savegpr_27
|
||||
/* 80325514 83 C3 00 04 */ lwz r30, 4(r3)
|
||||
/* 80325518 83 A3 00 00 */ lwz r29, 0(r3)
|
||||
/* 8032551C 3B 80 00 00 */ li r28, 0
|
||||
/* 80325520 3B E0 00 00 */ li r31, 0
|
||||
/* 80325524 48 00 00 34 */ b lbl_80325558
|
||||
lbl_80325528:
|
||||
/* 80325528 7F 7D F8 2E */ lwzx r27, r29, r31
|
||||
/* 8032552C 48 00 00 1C */ b lbl_80325548
|
||||
lbl_80325530:
|
||||
/* 80325530 7F 63 DB 78 */ mr r3, r27
|
||||
/* 80325534 81 9B 00 00 */ lwz r12, 0(r27)
|
||||
/* 80325538 81 8C 00 0C */ lwz r12, 0xc(r12)
|
||||
/* 8032553C 7D 89 03 A6 */ mtctr r12
|
||||
/* 80325540 4E 80 04 21 */ bctrl
|
||||
/* 80325544 83 7B 00 04 */ lwz r27, 4(r27)
|
||||
lbl_80325548:
|
||||
/* 80325548 28 1B 00 00 */ cmplwi r27, 0
|
||||
/* 8032554C 40 82 FF E4 */ bne lbl_80325530
|
||||
/* 80325550 3B 9C 00 01 */ addi r28, r28, 1
|
||||
/* 80325554 3B FF 00 04 */ addi r31, r31, 4
|
||||
lbl_80325558:
|
||||
/* 80325558 7C 1C F0 40 */ cmplw r28, r30
|
||||
/* 8032555C 41 80 FF CC */ blt lbl_80325528
|
||||
/* 80325560 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80325564 48 03 CC BD */ bl _restgpr_27
|
||||
/* 80325568 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 8032556C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80325570 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 80325574 4E 80 00 20 */ blr
|
||||
@@ -1,35 +0,0 @@
|
||||
lbl_80325578:
|
||||
/* 80325578 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 8032557C 7C 08 02 A6 */ mflr r0
|
||||
/* 80325580 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 80325584 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80325588 48 03 CC 51 */ bl _savegpr_28
|
||||
/* 8032558C 80 83 00 04 */ lwz r4, 4(r3)
|
||||
/* 80325590 3B A4 FF FF */ addi r29, r4, -1
|
||||
/* 80325594 83 C3 00 00 */ lwz r30, 0(r3)
|
||||
/* 80325598 57 BF 10 3A */ slwi r31, r29, 2
|
||||
/* 8032559C 48 00 00 34 */ b lbl_803255D0
|
||||
lbl_803255A0:
|
||||
/* 803255A0 7F 9E F8 2E */ lwzx r28, r30, r31
|
||||
/* 803255A4 48 00 00 1C */ b lbl_803255C0
|
||||
lbl_803255A8:
|
||||
/* 803255A8 7F 83 E3 78 */ mr r3, r28
|
||||
/* 803255AC 81 9C 00 00 */ lwz r12, 0(r28)
|
||||
/* 803255B0 81 8C 00 0C */ lwz r12, 0xc(r12)
|
||||
/* 803255B4 7D 89 03 A6 */ mtctr r12
|
||||
/* 803255B8 4E 80 04 21 */ bctrl
|
||||
/* 803255BC 83 9C 00 04 */ lwz r28, 4(r28)
|
||||
lbl_803255C0:
|
||||
/* 803255C0 28 1C 00 00 */ cmplwi r28, 0
|
||||
/* 803255C4 40 82 FF E4 */ bne lbl_803255A8
|
||||
/* 803255C8 3B BD FF FF */ addi r29, r29, -1
|
||||
/* 803255CC 3B FF FF FC */ addi r31, r31, -4
|
||||
lbl_803255D0:
|
||||
/* 803255D0 2C 1D 00 00 */ cmpwi r29, 0
|
||||
/* 803255D4 40 80 FF CC */ bge lbl_803255A0
|
||||
/* 803255D8 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 803255DC 48 03 CC 49 */ bl _restgpr_28
|
||||
/* 803255E0 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 803255E4 7C 08 03 A6 */ mtlr r0
|
||||
/* 803255E8 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 803255EC 4E 80 00 20 */ blr
|
||||
@@ -1,22 +0,0 @@
|
||||
lbl_803254AC:
|
||||
/* 803254AC 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 803254B0 7C 08 02 A6 */ mflr r0
|
||||
/* 803254B4 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 803254B8 80 03 00 08 */ lwz r0, 8(r3)
|
||||
/* 803254BC 1C A0 00 0C */ mulli r5, r0, 0xc
|
||||
/* 803254C0 3C 80 80 3D */ lis r4, drawFuncTable__13J3DDrawBuffer@ha /* 0x803CEC90@ha */
|
||||
/* 803254C4 38 04 EC 90 */ addi r0, r4, drawFuncTable__13J3DDrawBuffer@l /* 0x803CEC90@l */
|
||||
/* 803254C8 7C A0 2A 14 */ add r5, r0, r5
|
||||
/* 803254CC 80 85 00 00 */ lwz r4, 0(r5)
|
||||
/* 803254D0 80 05 00 04 */ lwz r0, 4(r5)
|
||||
/* 803254D4 90 81 00 08 */ stw r4, 8(r1)
|
||||
/* 803254D8 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 803254DC 80 05 00 08 */ lwz r0, 8(r5)
|
||||
/* 803254E0 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 803254E4 39 81 00 08 */ addi r12, r1, 8
|
||||
/* 803254E8 48 03 CB 9D */ bl __ptmf_scall
|
||||
/* 803254EC 60 00 00 00 */ nop
|
||||
/* 803254F0 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 803254F4 7C 08 03 A6 */ mtlr r0
|
||||
/* 803254F8 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 803254FC 4E 80 00 20 */ blr
|
||||
-24
@@ -1,24 +0,0 @@
|
||||
lbl_80325404:
|
||||
/* 80325404 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80325408 7C 08 02 A6 */ mflr r0
|
||||
/* 8032540C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80325410 38 00 00 00 */ li r0, 0
|
||||
/* 80325414 90 04 00 04 */ stw r0, 4(r4)
|
||||
/* 80325418 90 04 00 08 */ stw r0, 8(r4)
|
||||
/* 8032541C 80 A4 00 2C */ lwz r5, 0x2c(r4)
|
||||
/* 80325420 90 05 00 04 */ stw r0, 4(r5)
|
||||
/* 80325424 90 05 00 08 */ stw r0, 8(r5)
|
||||
/* 80325428 80 63 00 20 */ lwz r3, 0x20(r3)
|
||||
/* 8032542C 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 80325430 41 82 00 14 */ beq lbl_80325444
|
||||
/* 80325434 80 84 00 2C */ lwz r4, 0x2c(r4)
|
||||
/* 80325438 4B FE D3 21 */ bl addChildPacket__9J3DPacketFP9J3DPacket
|
||||
/* 8032543C 38 60 00 01 */ li r3, 1
|
||||
/* 80325440 48 00 00 08 */ b lbl_80325448
|
||||
lbl_80325444:
|
||||
/* 80325444 38 60 00 00 */ li r3, 0
|
||||
lbl_80325448:
|
||||
/* 80325448 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8032544C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80325450 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80325454 4E 80 00 20 */ blr
|
||||
-23
@@ -1,23 +0,0 @@
|
||||
lbl_803253B4:
|
||||
/* 803253B4 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 803253B8 7C 08 02 A6 */ mflr r0
|
||||
/* 803253BC 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 803253C0 38 00 00 00 */ li r0, 0
|
||||
/* 803253C4 90 04 00 04 */ stw r0, 4(r4)
|
||||
/* 803253C8 90 04 00 08 */ stw r0, 8(r4)
|
||||
/* 803253CC 80 A4 00 2C */ lwz r5, 0x2c(r4)
|
||||
/* 803253D0 90 05 00 04 */ stw r0, 4(r5)
|
||||
/* 803253D4 90 05 00 08 */ stw r0, 8(r5)
|
||||
/* 803253D8 80 63 00 20 */ lwz r3, 0x20(r3)
|
||||
/* 803253DC 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 803253E0 41 82 00 10 */ beq lbl_803253F0
|
||||
/* 803253E4 4B FE D3 75 */ bl addChildPacket__9J3DPacketFP9J3DPacket
|
||||
/* 803253E8 38 60 00 01 */ li r3, 1
|
||||
/* 803253EC 48 00 00 08 */ b lbl_803253F4
|
||||
lbl_803253F0:
|
||||
/* 803253F0 38 60 00 00 */ li r3, 0
|
||||
lbl_803253F4:
|
||||
/* 803253F4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 803253F8 7C 08 03 A6 */ mtlr r0
|
||||
/* 803253FC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80325400 4E 80 00 20 */ blr
|
||||
@@ -1,25 +0,0 @@
|
||||
lbl_80313048:
|
||||
/* 80313048 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 8031304C 7C 08 02 A6 */ mflr r0
|
||||
/* 80313050 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 80313054 7C 66 1B 78 */ mr r6, r3
|
||||
/* 80313058 80 04 00 0C */ lwz r0, 0xc(r4)
|
||||
/* 8031305C 1C A0 00 0C */ mulli r5, r0, 0xc
|
||||
/* 80313060 3C 60 80 3D */ lis r3, sortFuncTable__13J3DDrawBuffer@ha /* 0x803CEC30@ha */
|
||||
/* 80313064 38 03 EC 30 */ addi r0, r3, sortFuncTable__13J3DDrawBuffer@l /* 0x803CEC30@l */
|
||||
/* 80313068 7C A0 2A 14 */ add r5, r0, r5
|
||||
/* 8031306C 80 65 00 00 */ lwz r3, 0(r5)
|
||||
/* 80313070 80 05 00 04 */ lwz r0, 4(r5)
|
||||
/* 80313074 90 61 00 08 */ stw r3, 8(r1)
|
||||
/* 80313078 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 8031307C 80 05 00 08 */ lwz r0, 8(r5)
|
||||
/* 80313080 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 80313084 7C 83 23 78 */ mr r3, r4
|
||||
/* 80313088 7C C4 33 78 */ mr r4, r6
|
||||
/* 8031308C 39 81 00 08 */ addi r12, r1, 8
|
||||
/* 80313090 48 04 EF F5 */ bl __ptmf_scall
|
||||
/* 80313094 60 00 00 00 */ nop
|
||||
/* 80313098 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 8031309C 7C 08 03 A6 */ mtlr r0
|
||||
/* 803130A0 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 803130A4 4E 80 00 20 */ blr
|
||||
Reference in New Issue
Block a user