mirror of https://github.com/zeldaret/tp.git
work on d_a_npc_ne (#2037)
This commit is contained in:
Caroline Madsen
GitHub
parent
981cfe7283
commit
5ad3727d17
|
|
@ -1,28 +0,0 @@
|
|||
lbl_80A91734:
|
||||
/* 80A91734 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80A91738 7C 08 02 A6 */ mflr r0
|
||||
/* 80A9173C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80A91740 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80A91744 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80A91748 38 7F 05 AC */ addi r3, r31, 0x5ac
|
||||
/* 80A9174C 80 9F 05 E4 */ lwz r4, 0x5e4(r31)
|
||||
/* 80A91750 4B 59 B8 B9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
|
||||
/* 80A91754 88 1F 0C C1 */ lbz r0, 0xcc1(r31)
|
||||
/* 80A91758 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80A9175C 41 82 00 10 */ beq lbl_80A9176C
|
||||
/* 80A91760 38 00 00 00 */ li r0, 0
|
||||
/* 80A91764 3C 60 80 A9 */ lis r3, struct_80A92AC4+0x1@ha /* 0x80A92AC5@ha */
|
||||
/* 80A91768 98 03 2A C5 */ stb r0, struct_80A92AC4+0x1@l(r3) /* 0x80A92AC5@l */
|
||||
lbl_80A9176C:
|
||||
/* 80A9176C 80 1F 00 F0 */ lwz r0, 0xf0(r31)
|
||||
/* 80A91770 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80A91774 41 82 00 0C */ beq lbl_80A91780
|
||||
/* 80A91778 38 7F 06 0C */ addi r3, r31, 0x60c
|
||||
/* 80A9177C 4B 82 C8 7D */ bl deleteObject__14Z2SoundObjBaseFv
|
||||
lbl_80A91780:
|
||||
/* 80A91780 38 60 00 01 */ li r3, 1
|
||||
/* 80A91784 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80A91788 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80A9178C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80A91790 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80A91794 4E 80 00 20 */ blr
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
lbl_80A90E28:
|
||||
/* 80A90E28 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80A90E2C 7C 08 02 A6 */ mflr r0
|
||||
/* 80A90E30 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80A90E34 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80A90E38 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80A90E3C 80 83 05 E4 */ lwz r4, 0x5e4(r3)
|
||||
/* 80A90E40 3C 60 80 A9 */ lis r3, d_a_npc_ne__stringBase0@ha /* 0x80A925D0@ha */
|
||||
/* 80A90E44 38 03 25 D0 */ addi r0, r3, d_a_npc_ne__stringBase0@l /* 0x80A925D0@l */
|
||||
/* 80A90E48 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 80A90E4C 40 82 00 18 */ bne lbl_80A90E64
|
||||
/* 80A90E50 4B 59 EC 05 */ bl dComIfGs_wolfeye_effect_check__Fv
|
||||
/* 80A90E54 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80A90E58 40 82 00 0C */ bne lbl_80A90E64
|
||||
/* 80A90E5C 38 00 00 00 */ li r0, 0
|
||||
/* 80A90E60 98 1F 0C 08 */ stb r0, 0xc08(r31)
|
||||
lbl_80A90E64:
|
||||
/* 80A90E64 A8 1F 0C 0A */ lha r0, 0xc0a(r31)
|
||||
/* 80A90E68 2C 00 00 00 */ cmpwi r0, 0
|
||||
/* 80A90E6C 41 82 00 A4 */ beq lbl_80A90F10
|
||||
/* 80A90E70 38 00 00 0A */ li r0, 0xa
|
||||
/* 80A90E74 B0 1F 06 56 */ sth r0, 0x656(r31)
|
||||
/* 80A90E78 38 7F 0C 10 */ addi r3, r31, 0xc10
|
||||
/* 80A90E7C 7F E4 FB 78 */ mr r4, r31
|
||||
/* 80A90E80 38 A0 00 00 */ li r5, 0
|
||||
/* 80A90E84 38 C0 00 00 */ li r6, 0
|
||||
/* 80A90E88 4B 7B 94 51 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci
|
||||
/* 80A90E8C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80A90E90 41 82 00 78 */ beq lbl_80A90F08
|
||||
/* 80A90E94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80A90E98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80A90E9C 38 63 4E C8 */ addi r3, r3, 0x4ec8
|
||||
/* 80A90EA0 4B 5B 15 C9 */ bl reset__14dEvt_control_cFv
|
||||
/* 80A90EA4 38 00 00 00 */ li r0, 0
|
||||
/* 80A90EA8 B0 1F 0C 0A */ sth r0, 0xc0a(r31)
|
||||
/* 80A90EAC 88 1F 05 B7 */ lbz r0, 0x5b7(r31)
|
||||
/* 80A90EB0 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 80A90EB4 40 82 00 54 */ bne lbl_80A90F08
|
||||
/* 80A90EB8 38 7F 0C 10 */ addi r3, r31, 0xc10
|
||||
/* 80A90EBC 4B 7B 96 85 */ bl getNowMsgNo__10dMsgFlow_cFv
|
||||
/* 80A90EC0 28 03 18 A1 */ cmplwi r3, 0x18a1
|
||||
/* 80A90EC4 41 82 00 14 */ beq lbl_80A90ED8
|
||||
/* 80A90EC8 38 7F 0C 10 */ addi r3, r31, 0xc10
|
||||
/* 80A90ECC 4B 7B 96 75 */ bl getNowMsgNo__10dMsgFlow_cFv
|
||||
/* 80A90ED0 28 03 18 A2 */ cmplwi r3, 0x18a2
|
||||
/* 80A90ED4 40 82 00 34 */ bne lbl_80A90F08
|
||||
lbl_80A90ED8:
|
||||
/* 80A90ED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80A90EDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80A90EE0 80 63 5D AC */ lwz r3, 0x5dac(r3)
|
||||
/* 80A90EE4 38 63 05 38 */ addi r3, r3, 0x538
|
||||
/* 80A90EE8 38 80 00 07 */ li r4, 7
|
||||
/* 80A90EEC 38 A0 FF FF */ li r5, -1
|
||||
/* 80A90EF0 88 1F 04 E2 */ lbz r0, 0x4e2(r31)
|
||||
/* 80A90EF4 7C 06 07 74 */ extsb r6, r0
|
||||
/* 80A90EF8 38 E0 00 00 */ li r7, 0
|
||||
/* 80A90EFC 39 00 00 00 */ li r8, 0
|
||||
/* 80A90F00 39 20 00 03 */ li r9, 3
|
||||
/* 80A90F04 4B 58 B3 3D */ bl fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi
|
||||
lbl_80A90F08:
|
||||
/* 80A90F08 38 60 00 01 */ li r3, 1
|
||||
/* 80A90F0C 48 00 00 E4 */ b lbl_80A90FF0
|
||||
lbl_80A90F10:
|
||||
/* 80A90F10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80A90F14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80A90F18 88 03 4F AD */ lbz r0, 0x4fad(r3)
|
||||
/* 80A90F1C 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80A90F20 41 82 00 30 */ beq lbl_80A90F50
|
||||
/* 80A90F24 A0 1F 00 F8 */ lhz r0, 0xf8(r31)
|
||||
/* 80A90F28 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 80A90F2C 40 82 00 24 */ bne lbl_80A90F50
|
||||
/* 80A90F30 38 7F 0C 10 */ addi r3, r31, 0xc10
|
||||
/* 80A90F34 7F E4 FB 78 */ mr r4, r31
|
||||
/* 80A90F38 A8 BF 0C 0C */ lha r5, 0xc0c(r31)
|
||||
/* 80A90F3C 38 C0 00 00 */ li r6, 0
|
||||
/* 80A90F40 38 E0 00 00 */ li r7, 0
|
||||
/* 80A90F44 4B 7B 90 4D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c
|
||||
/* 80A90F48 38 00 00 01 */ li r0, 1
|
||||
/* 80A90F4C B0 1F 0C 0A */ sth r0, 0xc0a(r31)
|
||||
lbl_80A90F50:
|
||||
/* 80A90F50 88 1F 0C 08 */ lbz r0, 0xc08(r31)
|
||||
/* 80A90F54 2C 00 00 02 */ cmpwi r0, 2
|
||||
/* 80A90F58 40 82 00 74 */ bne lbl_80A90FCC
|
||||
/* 80A90F5C A8 1F 0C 0C */ lha r0, 0xc0c(r31)
|
||||
/* 80A90F60 2C 00 FF FF */ cmpwi r0, -1
|
||||
/* 80A90F64 41 82 00 68 */ beq lbl_80A90FCC
|
||||
/* 80A90F68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80A90F6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80A90F70 80 63 5D B4 */ lwz r3, 0x5db4(r3)
|
||||
/* 80A90F74 80 03 05 74 */ lwz r0, 0x574(r3)
|
||||
/* 80A90F78 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
|
||||
/* 80A90F7C 41 82 00 50 */ beq lbl_80A90FCC
|
||||
/* 80A90F80 7F E4 FB 78 */ mr r4, r31
|
||||
/* 80A90F84 4B 58 BE 79 */ bl fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c
|
||||
/* 80A90F88 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80A90F8C 40 82 00 40 */ bne lbl_80A90FCC
|
||||
/* 80A90F90 80 1F 05 5C */ lwz r0, 0x55c(r31)
|
||||
/* 80A90F94 60 00 00 0A */ ori r0, r0, 0xa
|
||||
/* 80A90F98 90 1F 05 5C */ stw r0, 0x55c(r31)
|
||||
/* 80A90F9C 80 9F 05 E4 */ lwz r4, 0x5e4(r31)
|
||||
/* 80A90FA0 3C 60 80 A9 */ lis r3, d_a_npc_ne__stringBase0@ha /* 0x80A925D0@ha */
|
||||
/* 80A90FA4 38 03 25 D0 */ addi r0, r3, d_a_npc_ne__stringBase0@l /* 0x80A925D0@l */
|
||||
/* 80A90FA8 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 80A90FAC 40 82 00 10 */ bne lbl_80A90FBC
|
||||
/* 80A90FB0 80 1F 05 5C */ lwz r0, 0x55c(r31)
|
||||
/* 80A90FB4 64 00 00 C0 */ oris r0, r0, 0xc0
|
||||
/* 80A90FB8 90 1F 05 5C */ stw r0, 0x55c(r31)
|
||||
lbl_80A90FBC:
|
||||
/* 80A90FBC A0 1F 00 FA */ lhz r0, 0xfa(r31)
|
||||
/* 80A90FC0 60 00 00 01 */ ori r0, r0, 1
|
||||
/* 80A90FC4 B0 1F 00 FA */ sth r0, 0xfa(r31)
|
||||
/* 80A90FC8 48 00 00 24 */ b lbl_80A90FEC
|
||||
lbl_80A90FCC:
|
||||
/* 80A90FCC 80 1F 04 9C */ lwz r0, 0x49c(r31)
|
||||
/* 80A90FD0 54 00 00 3E */ slwi r0, r0, 0
|
||||
/* 80A90FD4 90 1F 04 9C */ stw r0, 0x49c(r31)
|
||||
/* 80A90FD8 80 9F 05 5C */ lwz r4, 0x55c(r31)
|
||||
/* 80A90FDC 3C 60 FF 40 */ lis r3, 0xFF40 /* 0xFF3FFFF5@ha */
|
||||
/* 80A90FE0 38 03 FF F5 */ addi r0, r3, 0xFFF5 /* 0xFF3FFFF5@l */
|
||||
/* 80A90FE4 7C 80 00 38 */ and r0, r4, r0
|
||||
/* 80A90FE8 90 1F 05 5C */ stw r0, 0x55c(r31)
|
||||
lbl_80A90FEC:
|
||||
/* 80A90FEC 38 60 00 00 */ li r3, 0
|
||||
lbl_80A90FF0:
|
||||
/* 80A90FF0 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80A90FF4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80A90FF8 7C 08 03 A6 */ mtlr r0
|
||||
/* 80A90FFC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80A91000 4E 80 00 20 */ blr
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
lbl_80A89298:
|
||||
/* 80A89298 A8 03 06 42 */ lha r0, 0x642(r3)
|
||||
/* 80A8929C 2C 00 00 14 */ cmpwi r0, 0x14
|
||||
/* 80A892A0 41 82 00 2C */ beq lbl_80A892CC
|
||||
/* 80A892A4 80 03 04 9C */ lwz r0, 0x49c(r3)
|
||||
/* 80A892A8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12
|
||||
/* 80A892AC 41 82 00 20 */ beq lbl_80A892CC
|
||||
/* 80A892B0 38 00 00 14 */ li r0, 0x14
|
||||
/* 80A892B4 B0 03 06 42 */ sth r0, 0x642(r3)
|
||||
/* 80A892B8 38 00 00 00 */ li r0, 0
|
||||
/* 80A892BC B0 03 06 46 */ sth r0, 0x646(r3)
|
||||
/* 80A892C0 98 03 07 00 */ stb r0, 0x700(r3)
|
||||
/* 80A892C4 38 60 00 01 */ li r3, 1
|
||||
/* 80A892C8 4E 80 00 20 */ blr
|
||||
lbl_80A892CC:
|
||||
/* 80A892CC 38 60 00 00 */ li r3, 0
|
||||
/* 80A892D0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,139 +0,0 @@
|
|||
lbl_80A88DC0:
|
||||
/* 80A88DC0 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 80A88DC4 7C 08 02 A6 */ mflr r0
|
||||
/* 80A88DC8 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 80A88DCC 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80A88DD0 4B 8D 94 09 */ bl _savegpr_28
|
||||
/* 80A88DD4 2C 04 00 00 */ cmpwi r4, 0
|
||||
/* 80A88DD8 40 82 01 D0 */ bne lbl_80A88FA8
|
||||
/* 80A88DDC A3 E3 00 14 */ lhz r31, 0x14(r3)
|
||||
/* 80A88DE0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
|
||||
/* 80A88DE4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
|
||||
/* 80A88DE8 83 C3 00 38 */ lwz r30, 0x38(r3)
|
||||
/* 80A88DEC 83 9E 00 14 */ lwz r28, 0x14(r30)
|
||||
/* 80A88DF0 28 1C 00 00 */ cmplwi r28, 0
|
||||
/* 80A88DF4 41 82 01 B4 */ beq lbl_80A88FA8
|
||||
/* 80A88DF8 80 7E 00 84 */ lwz r3, 0x84(r30)
|
||||
/* 80A88DFC 80 03 00 0C */ lwz r0, 0xc(r3)
|
||||
/* 80A88E00 1F BF 00 30 */ mulli r29, r31, 0x30
|
||||
/* 80A88E04 7C 60 EA 14 */ add r3, r0, r29
|
||||
/* 80A88E08 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88E0C 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88E10 80 84 00 00 */ lwz r4, 0(r4)
|
||||
/* 80A88E14 4B 8B D6 9D */ bl PSMTXCopy
|
||||
/* 80A88E18 2C 1F 00 04 */ cmpwi r31, 4
|
||||
/* 80A88E1C 40 82 00 58 */ bne lbl_80A88E74
|
||||
/* 80A88E20 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88E24 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88E28 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88E2C A8 9C 06 64 */ lha r4, 0x664(r28)
|
||||
/* 80A88E30 A8 1C 06 9A */ lha r0, 0x69a(r28)
|
||||
/* 80A88E34 7C 04 02 14 */ add r0, r4, r0
|
||||
/* 80A88E38 7C 04 07 34 */ extsh r4, r0
|
||||
/* 80A88E3C 4B 58 35 F9 */ bl mDoMtx_YrotM__FPA4_fs
|
||||
/* 80A88E40 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88E44 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88E48 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88E4C A8 9C 06 66 */ lha r4, 0x666(r28)
|
||||
/* 80A88E50 A8 1C 06 9C */ lha r0, 0x69c(r28)
|
||||
/* 80A88E54 7C 04 02 14 */ add r0, r4, r0
|
||||
/* 80A88E58 7C 04 07 34 */ extsh r4, r0
|
||||
/* 80A88E5C 4B 58 35 41 */ bl mDoMtx_XrotM__FPA4_fs
|
||||
/* 80A88E60 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88E64 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88E68 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88E6C A8 9C 06 62 */ lha r4, 0x662(r28)
|
||||
/* 80A88E70 4B 58 36 5D */ bl mDoMtx_ZrotM__FPA4_fs
|
||||
lbl_80A88E74:
|
||||
/* 80A88E74 38 1F FF FF */ addi r0, r31, -1
|
||||
/* 80A88E78 28 00 00 01 */ cmplwi r0, 1
|
||||
/* 80A88E7C 40 81 00 0C */ ble lbl_80A88E88
|
||||
/* 80A88E80 2C 1F 00 03 */ cmpwi r31, 3
|
||||
/* 80A88E84 40 82 00 34 */ bne lbl_80A88EB8
|
||||
lbl_80A88E88:
|
||||
/* 80A88E88 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88E8C 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88E90 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88E94 A8 9C 06 94 */ lha r4, 0x694(r28)
|
||||
/* 80A88E98 4B 58 35 9D */ bl mDoMtx_YrotM__FPA4_fs
|
||||
/* 80A88E9C 2C 1F 00 03 */ cmpwi r31, 3
|
||||
/* 80A88EA0 40 82 00 18 */ bne lbl_80A88EB8
|
||||
/* 80A88EA4 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88EA8 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88EAC 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88EB0 A8 9C 06 82 */ lha r4, 0x682(r28)
|
||||
/* 80A88EB4 4B 58 35 81 */ bl mDoMtx_YrotM__FPA4_fs
|
||||
lbl_80A88EB8:
|
||||
/* 80A88EB8 2C 1F 00 14 */ cmpwi r31, 0x14
|
||||
/* 80A88EBC 41 82 00 0C */ beq lbl_80A88EC8
|
||||
/* 80A88EC0 2C 1F 00 15 */ cmpwi r31, 0x15
|
||||
/* 80A88EC4 40 82 00 6C */ bne lbl_80A88F30
|
||||
lbl_80A88EC8:
|
||||
/* 80A88EC8 2C 1F 00 14 */ cmpwi r31, 0x14
|
||||
/* 80A88ECC 40 82 00 1C */ bne lbl_80A88EE8
|
||||
/* 80A88ED0 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88ED4 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88ED8 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88EDC A8 9C 06 88 */ lha r4, 0x688(r28)
|
||||
/* 80A88EE0 4B 58 35 ED */ bl mDoMtx_ZrotM__FPA4_fs
|
||||
/* 80A88EE4 48 00 00 30 */ b lbl_80A88F14
|
||||
lbl_80A88EE8:
|
||||
/* 80A88EE8 2C 1F 00 15 */ cmpwi r31, 0x15
|
||||
/* 80A88EEC 40 82 00 28 */ bne lbl_80A88F14
|
||||
/* 80A88EF0 A8 9C 06 88 */ lha r4, 0x688(r28)
|
||||
/* 80A88EF4 7C 80 07 35 */ extsh. r0, r4
|
||||
/* 80A88EF8 40 81 00 1C */ ble lbl_80A88F14
|
||||
/* 80A88EFC 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F00 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F04 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F08 54 80 08 3C */ slwi r0, r4, 1
|
||||
/* 80A88F0C 7C 04 07 34 */ extsh r4, r0
|
||||
/* 80A88F10 4B 58 35 BD */ bl mDoMtx_ZrotM__FPA4_fs
|
||||
lbl_80A88F14:
|
||||
/* 80A88F14 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F18 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F1C 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F20 57 E0 08 3C */ slwi r0, r31, 1
|
||||
/* 80A88F24 7C 9C 02 14 */ add r4, r28, r0
|
||||
/* 80A88F28 A8 84 06 5C */ lha r4, 0x65c(r4)
|
||||
/* 80A88F2C 4B 58 35 A1 */ bl mDoMtx_ZrotM__FPA4_fs
|
||||
lbl_80A88F30:
|
||||
/* 80A88F30 2C 1F 00 00 */ cmpwi r31, 0
|
||||
/* 80A88F34 40 82 00 40 */ bne lbl_80A88F74
|
||||
/* 80A88F38 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F3C 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F40 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F44 38 80 00 00 */ li r4, 0
|
||||
/* 80A88F48 4B 58 34 ED */ bl mDoMtx_YrotM__FPA4_fs
|
||||
/* 80A88F4C 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F50 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F54 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F58 38 80 00 00 */ li r4, 0
|
||||
/* 80A88F5C 4B 58 34 41 */ bl mDoMtx_XrotM__FPA4_fs
|
||||
/* 80A88F60 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F64 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F68 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F6C 38 80 00 00 */ li r4, 0
|
||||
/* 80A88F70 4B 58 35 5D */ bl mDoMtx_ZrotM__FPA4_fs
|
||||
lbl_80A88F74:
|
||||
/* 80A88F74 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F78 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F7C 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F80 80 9E 00 84 */ lwz r4, 0x84(r30)
|
||||
/* 80A88F84 80 04 00 0C */ lwz r0, 0xc(r4)
|
||||
/* 80A88F88 7C 80 EA 14 */ add r4, r0, r29
|
||||
/* 80A88F8C 4B 8B D5 25 */ bl PSMTXCopy
|
||||
/* 80A88F90 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */
|
||||
/* 80A88F94 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */
|
||||
/* 80A88F98 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80A88F9C 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */
|
||||
/* 80A88FA0 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */
|
||||
/* 80A88FA4 4B 8B D5 0D */ bl PSMTXCopy
|
||||
lbl_80A88FA8:
|
||||
/* 80A88FA8 38 60 00 01 */ li r3, 1
|
||||
/* 80A88FAC 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 80A88FB0 4B 8D 92 75 */ bl _restgpr_28
|
||||
/* 80A88FB4 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 80A88FB8 7C 08 03 A6 */ mtlr r0
|
||||
/* 80A88FBC 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 80A88FC0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
lbl_80A899C0:
|
||||
/* 80A899C0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80A899C4 7C 08 02 A6 */ mflr r0
|
||||
/* 80A899C8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80A899CC 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80A899D0 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80A899D4 4B 58 F3 0D */ bl fopAc_IsActor__FPv
|
||||
/* 80A899D8 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80A899DC 41 82 00 44 */ beq lbl_80A89A20
|
||||
/* 80A899E0 A8 1F 00 08 */ lha r0, 8(r31)
|
||||
/* 80A899E4 2C 00 01 10 */ cmpwi r0, 0x110
|
||||
/* 80A899E8 41 82 00 0C */ beq lbl_80A899F4
|
||||
/* 80A899EC 2C 00 03 00 */ cmpwi r0, 0x300
|
||||
/* 80A899F0 40 82 00 30 */ bne lbl_80A89A20
|
||||
lbl_80A899F4:
|
||||
/* 80A899F4 3C 60 80 A9 */ lis r3, target_info_count@ha /* 0x80A92B18@ha */
|
||||
/* 80A899F8 38 83 2B 18 */ addi r4, r3, target_info_count@l /* 0x80A92B18@l */
|
||||
/* 80A899FC 80 A4 00 00 */ lwz r5, 0(r4)
|
||||
/* 80A89A00 2C 05 00 05 */ cmpwi r5, 5
|
||||
/* 80A89A04 40 80 00 1C */ bge lbl_80A89A20
|
||||
/* 80A89A08 54 A0 10 3A */ slwi r0, r5, 2
|
||||
/* 80A89A0C 3C 60 80 A9 */ lis r3, target_info@ha /* 0x80A92AF0@ha */
|
||||
/* 80A89A10 38 63 2A F0 */ addi r3, r3, target_info@l /* 0x80A92AF0@l */
|
||||
/* 80A89A14 7F E3 01 2E */ stwx r31, r3, r0
|
||||
/* 80A89A18 38 05 00 01 */ addi r0, r5, 1
|
||||
/* 80A89A1C 90 04 00 00 */ stw r0, 0(r4)
|
||||
lbl_80A89A20:
|
||||
/* 80A89A20 38 60 00 00 */ li r3, 0
|
||||
/* 80A89A24 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80A89A28 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80A89A2C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80A89A30 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80A89A34 4E 80 00 20 */ blr
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
lbl_80A8AAE8:
|
||||
/* 80A8AAE8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80A8AAEC 7C 08 02 A6 */ mflr r0
|
||||
/* 80A8AAF0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80A8AAF4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80A8AAF8 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 80A8AAFC 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 80A8AB00 7C 9F 23 78 */ mr r31, r4
|
||||
/* 80A8AB04 4B 58 E1 DD */ bl fopAc_IsActor__FPv
|
||||
/* 80A8AB08 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80A8AB0C 41 82 00 48 */ beq lbl_80A8AB54
|
||||
/* 80A8AB10 A8 1E 00 08 */ lha r0, 8(r30)
|
||||
/* 80A8AB14 2C 00 01 36 */ cmpwi r0, 0x136
|
||||
/* 80A8AB18 40 82 00 3C */ bne lbl_80A8AB54
|
||||
/* 80A8AB1C A8 1E 05 B6 */ lha r0, 0x5b6(r30)
|
||||
/* 80A8AB20 2C 00 00 35 */ cmpwi r0, 0x35
|
||||
/* 80A8AB24 40 82 00 30 */ bne lbl_80A8AB54
|
||||
/* 80A8AB28 A8 1E 05 B8 */ lha r0, 0x5b8(r30)
|
||||
/* 80A8AB2C 2C 00 00 0A */ cmpwi r0, 0xa
|
||||
/* 80A8AB30 41 80 00 24 */ blt lbl_80A8AB54
|
||||
/* 80A8AB34 28 1E 00 00 */ cmplwi r30, 0
|
||||
/* 80A8AB38 41 82 00 0C */ beq lbl_80A8AB44
|
||||
/* 80A8AB3C 80 1E 00 04 */ lwz r0, 4(r30)
|
||||
/* 80A8AB40 48 00 00 08 */ b lbl_80A8AB48
|
||||
lbl_80A8AB44:
|
||||
/* 80A8AB44 38 00 FF FF */ li r0, -1
|
||||
lbl_80A8AB48:
|
||||
/* 80A8AB48 90 1F 0C BC */ stw r0, 0xcbc(r31)
|
||||
/* 80A8AB4C 7F C3 F3 78 */ mr r3, r30
|
||||
/* 80A8AB50 48 00 00 08 */ b lbl_80A8AB58
|
||||
lbl_80A8AB54:
|
||||
/* 80A8AB54 38 60 00 00 */ li r3, 0
|
||||
lbl_80A8AB58:
|
||||
/* 80A8AB58 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80A8AB5C 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 80A8AB60 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80A8AB64 7C 08 03 A6 */ mtlr r0
|
||||
/* 80A8AB68 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80A8AB6C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
lbl_80A89A38:
|
||||
/* 80A89A38 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80A89A3C 7C 08 02 A6 */ mflr r0
|
||||
/* 80A89A40 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80A89A44 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80A89A48 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80A89A4C 4B 58 F2 95 */ bl fopAc_IsActor__FPv
|
||||
/* 80A89A50 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80A89A54 41 82 00 44 */ beq lbl_80A89A98
|
||||
/* 80A89A58 A8 1F 00 08 */ lha r0, 8(r31)
|
||||
/* 80A89A5C 2C 00 01 08 */ cmpwi r0, 0x108
|
||||
/* 80A89A60 41 82 00 0C */ beq lbl_80A89A6C
|
||||
/* 80A89A64 2C 00 03 00 */ cmpwi r0, 0x300
|
||||
/* 80A89A68 40 82 00 30 */ bne lbl_80A89A98
|
||||
lbl_80A89A6C:
|
||||
/* 80A89A6C 3C 60 80 A9 */ lis r3, target_info_count@ha /* 0x80A92B18@ha */
|
||||
/* 80A89A70 38 83 2B 18 */ addi r4, r3, target_info_count@l /* 0x80A92B18@l */
|
||||
/* 80A89A74 80 A4 00 00 */ lwz r5, 0(r4)
|
||||
/* 80A89A78 2C 05 00 05 */ cmpwi r5, 5
|
||||
/* 80A89A7C 40 80 00 1C */ bge lbl_80A89A98
|
||||
/* 80A89A80 54 A0 10 3A */ slwi r0, r5, 2
|
||||
/* 80A89A84 3C 60 80 A9 */ lis r3, target_info@ha /* 0x80A92AF0@ha */
|
||||
/* 80A89A88 38 63 2A F0 */ addi r3, r3, target_info@l /* 0x80A92AF0@l */
|
||||
/* 80A89A8C 7F E3 01 2E */ stwx r31, r3, r0
|
||||
/* 80A89A90 38 05 00 01 */ addi r0, r5, 1
|
||||
/* 80A89A94 90 04 00 00 */ stw r0, 0(r4)
|
||||
lbl_80A89A98:
|
||||
/* 80A89A98 38 60 00 00 */ li r3, 0
|
||||
/* 80A89A9C 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80A89AA0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80A89AA4 7C 08 03 A6 */ mtlr r0
|
||||
/* 80A89AA8 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80A89AAC 4E 80 00 20 */ blr
|
||||
|
|
@ -398,6 +398,7 @@ public:
|
|||
RFLG0_UNK_20000000 = 0x20000000,
|
||||
RFLG0_UNK_8000000 = 0x8000000,
|
||||
RFLG0_UNK_4000000 = 0x4000000,
|
||||
RFLG0_GRAB_PUT_START = 0x400000,
|
||||
RFLG0_UNK_20000 = 0x20000,
|
||||
RFLG0_UNK_8000 = 0x8000,
|
||||
RFLG0_UNK_4000 = 0x4000,
|
||||
|
|
@ -760,6 +761,7 @@ public:
|
|||
bool checkFreezeDamage() const { return i_checkNoResetFlg1(FLG1_UNK_40000000); }
|
||||
bool checkWolfTagLockJumpReady() const { return i_checkResetFlg0(RFLG0_UNK_20000); }
|
||||
bool getGrabUpEnd() const { return i_checkResetFlg0(RFLG0_GRAB_UP_END); }
|
||||
bool getGrabPutStart() const { return i_checkResetFlg0(RFLG0_GRAB_PUT_START); }
|
||||
|
||||
void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
|
||||
void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ public:
|
|||
/* 8024A424 */ int checkEventRender(int*, int*, int*, int*);
|
||||
/* 8024A4C4 */ void remove();
|
||||
/* 8024A528 */ u16 getEventId(int*);
|
||||
/* 8024A538 */ int getMsgNo();
|
||||
/* 8024A540 */ int getNowMsgNo();
|
||||
/* 8024A538 */ u32 getMsgNo();
|
||||
/* 8024A540 */ u32 getNowMsgNo();
|
||||
/* 8024A548 */ msg_class* getMsg();
|
||||
/* 8024A580 */ void setInitValue(int);
|
||||
/* 8024A618 */ void setInitValueGroupChange(int, fopAc_ac_c**);
|
||||
|
|
@ -181,8 +181,8 @@ private:
|
|||
/* 0x25 */ u8 field_0x25;
|
||||
/* 0x26 */ u8 field_0x26;
|
||||
/* 0x27 */ u8 field_0x27;
|
||||
/* 0x28 */ int mMsgNo;
|
||||
/* 0x2C */ int mNowMsgNo;
|
||||
/* 0x28 */ u32 mMsgNo;
|
||||
/* 0x2C */ u32 mNowMsgNo;
|
||||
/* 0x30 */ u16 field_0x30;
|
||||
/* 0x32 */ u16 mEventId;
|
||||
/* 0x34 */ int field_0x34;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,74 @@
|
|||
#ifndef D_A_MG_FISH_H
|
||||
#define D_A_MG_FISH_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "Z2AudioLib/Z2Creature.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
// including this causes vtable problems
|
||||
// #include "d/bg/d_bg_s_acch.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
|
||||
struct mf_ke_s {
|
||||
/* 80535F74 */ ~mf_ke_s();
|
||||
/* 80535FD4 */ mf_ke_s();
|
||||
|
||||
/* 0x00 */ u8 field_0x0[0x48];
|
||||
};
|
||||
|
||||
class mg_fish_class : public fopEn_enemy_c {
|
||||
public:
|
||||
/* 0x5AC */ request_of_phase_process_class mPhaseReq;
|
||||
/* 0x5B4 */ s16 field_0x5b4;
|
||||
/* 0x5B6 */ s16 field_0x5b6;
|
||||
/* 0x5B8 */ s16 field_0x5b8;
|
||||
/* 0x5BC */ f32 field_0x5bc;
|
||||
/* 0x5C0 */ cXyz field_0x5c0;
|
||||
/* 0x5CC */ u8 field_0x5cc[0xc];
|
||||
/* 0x5D8 */ f32 field_0x5d8;
|
||||
/* 0x5DC */ f32 field_0x5dc;
|
||||
/* 0x5E0 */ cXyz field_0x5e0;
|
||||
/* 0x5EC */ f32 field_0x5ec;
|
||||
/* 0x5F0 */ f32 field_0x5f0;
|
||||
/* 0x5F4 */ u8 field_0x5f4[8];
|
||||
/* 0x5FC */ char* mResName;
|
||||
/* 0x600 */ mDoExt_McaMorf* mpMorf;
|
||||
/* 0x604 */ J3DAnmTransform* field_0x604;
|
||||
/* 0x608 */ u8 field_0x608[4];
|
||||
/* 0x60C */ int mAnmID;
|
||||
/* 0x610 */ mDoExt_brkAnm* mpBrkAnm;
|
||||
/* 0x614 */ J3DModel* mpModel[3];
|
||||
/* 0x620 */ mDoExt_btpAnm* mpBtpAnm;
|
||||
/* 0x624 */ s16 field_0x624;
|
||||
/* 0x626 */ u8 field_0x626[2];
|
||||
/* 0x628 */ s16 field_0x628;
|
||||
/* 0x62A */ u8 field_0x62a[8];
|
||||
/* 0x632 */ u16 field_0x632;
|
||||
/* 0x634 */ u8 mGedouKind;
|
||||
/* 0x635 */ u8 mKind2;
|
||||
/* 0x638 */ cXyz field_0x638;
|
||||
/* 0x644 */ u16 field_0x644;
|
||||
/* 0x646 */ u8 field_0x646[0x1e];
|
||||
/* 0x664 */ cXyz field_0x664[10];
|
||||
/* 0x6DC */ csXyz field_0x6dc[10];
|
||||
/* 0x718 */ s16 field_0x718[10];
|
||||
/* 0x72C */ int field_0x72c;
|
||||
/* 0x730 */ s16 field_0x730;
|
||||
/* 0x732 */ u8 field_0x732[0xe];
|
||||
/* 0x740 */ f32 field_0x740;
|
||||
/* 0x744 */ u8 field_0x744[0x10];
|
||||
/* 0x754 */ mf_ke_s field_0x754[2];
|
||||
/* 0x7E4 */ mDoExt_3DlineMat0_c field_0x7e4;
|
||||
/* 0x800 */ Z2Creature mSound;
|
||||
// /* 0x890 */ dBgS_AcchCir mAcchCir;
|
||||
// /* 0x8D0 */ dBgS_ObjAcch mAcch;
|
||||
/* 0x890 */ u8 field_0x890[0x218];
|
||||
/* 0xAA8 */ dCcD_Stts mCcStatus;
|
||||
/* 0xAE4 */ dCcD_Cyl mCcCyl;
|
||||
/* 0xC20 */ u8 field_0xc20[0x28];
|
||||
/* 0xC48 */ J3DJointCallBack mNodeCallBack;
|
||||
/* 0xC4C */ u32 field_0xc4c;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(mg_fish_class) == 0xC50);
|
||||
|
||||
#endif /* D_A_MG_FISH_H */
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
|
||||
#include "d/msg/d_msg_flow.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "Z2AudioLib/Z2Creature.h"
|
||||
#include "d/bg/d_bg_s_acch.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
|
||||
struct mg_rod_s {
|
||||
/* 0x0 */ cXyz field_0x0[16];
|
||||
|
|
@ -25,7 +28,6 @@ public:
|
|||
f32 getRodStickY() { return mRodStickY; }
|
||||
bool checkRodEquipPermission() { return field_0x1514 == 0; }
|
||||
|
||||
private:
|
||||
/* 0x0568 */ u8 field_0x568[0x5A4 - 0x568];
|
||||
/* 0x05A4 */ mg_rod_s field_0x5a4;
|
||||
/* 0x0664 */ u8 field_0x664[0x6AC - 0x664];
|
||||
|
|
@ -44,7 +46,10 @@ private:
|
|||
/* 0x075C */ u8 field_0x75c[0x764 - 0x75C];
|
||||
/* 0x0764 */ cXyz field_0x764;
|
||||
/* 0x0770 */ mg_line_s field_0x770;
|
||||
/* 0x0C20 */ u8 field_0xc20[0xFAC - 0xC20];
|
||||
/* 0x0C20 */ u8 field_0xc20[0xF7C - 0xC20];
|
||||
/* 0x0F7C */ s16 field_0xf7c;
|
||||
/* 0x0F7E */ s16 field_0xf7e;
|
||||
/* 0x0F80 */ u8 field_0xf80[0xFAC - 0xF80];
|
||||
/* 0x0FAC */ mg_hook_s field_0xfac[2];
|
||||
/* 0x0FEC */ u8 field_0xfec[0x1060 - 0xFEC];
|
||||
/* 0x1060 */ cXyz field_0x1060;
|
||||
|
|
@ -56,7 +61,9 @@ private:
|
|||
/* 0x1144 */ u8 field_0x1144[0x1190 - 0x1144];
|
||||
/* 0x1190 */ dBgS_AcchCir field_0x1190;
|
||||
/* 0x11D0 */ dBgS_ObjAcch field_0x11d0;
|
||||
/* 0x13A8 */ u8 field_0x13a8[0x1474 - 0x13A8];
|
||||
/* 0x13A8 */ u8 field_0x13a8[0x13B4 - 0x13A8];
|
||||
/* 0x13B4 */ s16 field_0x13b4;
|
||||
/* 0x13B6 */ u8 field_0x13b6[0x1474 - 0x13B6];
|
||||
/* 0x1474 */ dMsgFlow_c mMsgFlow;
|
||||
/* 0x14C0 */ u8 field_0x14c0[0x14C8 - 0x14C0];
|
||||
/* 0x14C8 */ f32 mRodStickX;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,189 @@
|
|||
#ifndef D_A_NPC_NE_H
|
||||
#define D_A_NPC_NE_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "SSystem/SComponent/c_phase.h"
|
||||
#include "d/bg/d_bg_s_acch.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
#include "d/d_path.h"
|
||||
#include "d/msg/d_msg_flow.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
class npc_ne_class : public fopAc_ac_c {
|
||||
public:
|
||||
enum Action {
|
||||
ACT_WAIT = 0,
|
||||
ACT_AWAY = 1,
|
||||
ACT_TAME = 2,
|
||||
ACT_ROOF = 3,
|
||||
ACT_HOME = 4,
|
||||
ACT_JUMP = 5,
|
||||
ACT_S_JUMP = 6,
|
||||
ACT_BIRD = 7,
|
||||
ACT_BALL = 8,
|
||||
ACT_SANBASI = 9,
|
||||
ACT_PATH_WALK = 10,
|
||||
ACT_SWIM = 12,
|
||||
ACT_OUT_SWIM = 13,
|
||||
ACT_CLIMB = 14,
|
||||
ACT_DROP = 15,
|
||||
ACT_S_DROP = 16,
|
||||
ACT_MESSAGE = 17,
|
||||
ACT_DISH = 18,
|
||||
ACT_CARRY = 20,
|
||||
};
|
||||
|
||||
enum Animation {
|
||||
ANM_CARRY_A = 6,
|
||||
ANM_CARRY_B = 7,
|
||||
ANM_DRINK_DISH = 8,
|
||||
ANM_EMPTY_DISH = 9,
|
||||
ANM_FAWN_L = 10,
|
||||
ANM_FAWN_R = 11,
|
||||
ANM_JUMP_END = 12,
|
||||
ANM_JUMP_LOOP = 13,
|
||||
ANM_JUMP_START = 14,
|
||||
ANM_JUMP_UP = 15,
|
||||
ANM_MILK = 16,
|
||||
ANM_RUN = 17,
|
||||
ANM_SIT_A = 18,
|
||||
ANM_SIT_B = 19,
|
||||
ANM_SWIM = 20,
|
||||
ANM_TO_JUMP = 21,
|
||||
ANM_TO_WAIT = 22,
|
||||
ANM_TO_CARRY_B = 23,
|
||||
ANM_WAIT = 24,
|
||||
ANM_WALK = 25,
|
||||
};
|
||||
|
||||
/* 80A92118 */ npc_ne_class();
|
||||
|
||||
/* 0x568 */ u8 field_0x568[0x44];
|
||||
/* 0x5AC */ request_of_phase_process_class mPhase;
|
||||
/* 0x5B4 */ u8 field_0x5b4;
|
||||
/* 0x5B5 */ u8 field_0x5b5;
|
||||
/* 0x5B6 */ u8 mSize;
|
||||
/* 0x5B7 */ u8 field_0x5b7;
|
||||
/* 0x5B8 */ u8 mPathIndex;
|
||||
/* 0x5B9 */ u8 field_0x5b9;
|
||||
/* 0x5BC */ dPath* mpPath;
|
||||
/* 0x5C0 */ s8 mPathPointNo;
|
||||
/* 0x5C1 */ s8 mPathDir;
|
||||
/* 0x5C4 */ cXyz mTargetPos;
|
||||
/* 0x5D0 */ s16 mTargetAngleY;
|
||||
/* 0x5D4 */ f32 mAngleYStep;
|
||||
/* 0x5D8 */ f32 mDistToTarget;
|
||||
/* 0x5DC */ s16 mAngleToPlayer;
|
||||
/* 0x5E0 */ f32 field_0x5e0;
|
||||
/* 0x5E4 */ char* mResName;
|
||||
/* 0x5E8 */ mDoExt_McaMorf* mpMorf;
|
||||
/* 0x5EC */ mDoExt_btkAnm* mpBtkAnm;
|
||||
/* 0x5F0 */ mDoExt_btpAnm* mpBtpAnm;
|
||||
/* 0x5F4 */ s8 mBtkFrame;
|
||||
/* 0x5F6 */ s16 mBtpFrame;
|
||||
/* 0x5F8 */ s8 field_0x5f8;
|
||||
/* 0x5FC */ mDoExt_McaMorf* mpDishMorf;
|
||||
/* 0x600 */ cXyz mDishPos;
|
||||
/* 0x60C */ Z2SoundObjSimple mSound;
|
||||
/* 0x62C */ s16 field_0x62c;
|
||||
/* 0x62E */ u8 field_0x62e[2];
|
||||
/* 0x630 */ int mAnmID;
|
||||
/* 0x634 */ u8 field_0x634[4];
|
||||
/* 0x638 */ f32 mAnmSpeed;
|
||||
/* 0x63C */ u8 field_0x63c[4];
|
||||
/* 0x640 */ s16 field_0x640;
|
||||
/* 0x642 */ s16 mAction;
|
||||
/* 0x644 */ u8 field_0x644[2];
|
||||
/* 0x646 */ s16 mState;
|
||||
/* 0x648 */ u32 mShadowKey;
|
||||
/* 0x64C */ s16 mTimers[5];
|
||||
/* 0x656 */ s16 field_0x656;
|
||||
/* 0x658 */ s16 field_0x658;
|
||||
/* 0x65C */ f32 field_0x65c;
|
||||
/* 0x660 */ s16 field_0x660;
|
||||
/* 0x662 */ s16 mHeadAngleZ;
|
||||
/* 0x664 */ s16 mHeadAngleY;
|
||||
/* 0x666 */ s16 mHeadAngleX;
|
||||
/* 0x668 */ s8 field_0x668;
|
||||
/* 0x66C */ cXyz field_0x66c;
|
||||
/* 0x678 */ s16 field_0x678;
|
||||
/* 0x67A */ s16 field_0x67a;
|
||||
/* 0x67C */ s16 field_0x67c;
|
||||
/* 0x67E */ s16 mHeadTargetAngleY;
|
||||
/* 0x680 */ s16 mHeadTargetAngleZ;
|
||||
/* 0x682 */ s16 field_0x682;
|
||||
/* 0x684 */ s16 field_0x684[2];
|
||||
/* 0x688 */ s16 field_0x688;
|
||||
/* 0x68A */ s16 field_0x68a;
|
||||
/* 0x68C */ f32 field_0x68c;
|
||||
/* 0x690 */ f32 field_0x690;
|
||||
/* 0x694 */ s16 field_0x694;
|
||||
/* 0x696 */ s16 field_0x696;
|
||||
/* 0x698 */ u8 field_0x698[2];
|
||||
/* 0x69A */ s16 mHeadMinorAngleY;
|
||||
/* 0x69C */ s16 mHeadMinorAngleX;
|
||||
/* 0x69E */ u8 field_0x69e[2];
|
||||
/* 0x6A0 */ s16 mHeadMinorTargetAngleY;
|
||||
/* 0x6A2 */ s16 mHeadMinorTargetAngleX;
|
||||
/* 0x6A4 */ s16 field_0x6a4;
|
||||
/* 0x6A6 */ u8 field_0x6a6[0x12];
|
||||
/* 0x6B8 */ f32 field_0x6b8;
|
||||
/* 0x6BC */ f32 field_0x6bc;
|
||||
/* 0x6C0 */ u8 field_0x6c0[0x14];
|
||||
/* 0x6D4 */ f32 field_0x6d4;
|
||||
/* 0x6D8 */ cXyz mBaseScale;
|
||||
/* 0x6E4 */ cXyz field_0x6e4;
|
||||
/* 0x6F0 */ s8 field_0x6f0;
|
||||
/* 0x6F1 */ u8 field_0x6f1[7];
|
||||
/* 0x6F8 */ s8 field_0x6f8;
|
||||
/* 0x6FC */ int mHomePathIdx;
|
||||
/* 0x700 */ s8 mNoFollow;
|
||||
/* 0x701 */ s8 field_0x701;
|
||||
/* 0x704 */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x744 */ dBgS_ObjAcch mAcch;
|
||||
/* 0x91C */ f32 field_0x91c;
|
||||
/* 0x920 */ dCcD_Stts mStts;
|
||||
/* 0x95C */ dCcD_Sph mCcSph;
|
||||
/* 0xA94 */ dCcD_Sph mAtSph;
|
||||
/* 0xBCC */ s8 field_0xbcc;
|
||||
/* 0xBCD */ u8 field_0xbcd[0x27];
|
||||
/* 0xBF4 */ f32 field_0xbf4;
|
||||
/* 0xBF8 */ u8 field_0xbf8[8];
|
||||
/* 0xC00 */ u32 mParticle[2];
|
||||
/* 0xC08 */ s8 field_0xc08;
|
||||
/* 0xC09 */ s16 field_0xc0a;
|
||||
/* 0xC0C */ s16 mFlowID;
|
||||
/* 0xC10 */ dMsgFlow_c mMsgFlow;
|
||||
/* 0xC5C */ s16 field_0xc5c;
|
||||
/* 0xC5E */ s16 field_0xc5e;
|
||||
/* 0xC60 */ u8 field_0xc60[0x54];
|
||||
/* 0xCB4 */ u8 field_0xcb4;
|
||||
/* 0xCB6 */ s16 field_0xcb6;
|
||||
/* 0xCB8 */ f32 field_0xcb8;
|
||||
/* 0xCBC */ u32 mFishID;
|
||||
/* 0xCC0 */ u8 field_0xcc0;
|
||||
/* 0xCC1 */ u8 field_0xcc1;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(npc_ne_class) == 0xCC4);
|
||||
|
||||
class daNpc_Ne_HIO_c {
|
||||
public:
|
||||
/* 80A88CCC */ daNpc_Ne_HIO_c();
|
||||
#ifdef NONMATCHING
|
||||
/* 80A92374 */ virtual ~daNpc_Ne_HIO_c() {}
|
||||
#else
|
||||
/* 80A92374 */ ~daNpc_Ne_HIO_c();
|
||||
/* 0x00 */ void* vtable;
|
||||
#endif
|
||||
|
||||
/* 0x04 */ s8 field_0x04;
|
||||
/* 0x08 */ f32 mScale;
|
||||
/* 0x0C */ f32 mWalkSpeed;
|
||||
/* 0x10 */ f32 mRunSpeed;
|
||||
/* 0x14 */ f32 mSwimSpeed;
|
||||
/* 0x18 */ u8 field_0x18;
|
||||
};
|
||||
|
||||
STATIC_ASSERT(sizeof(daNpc_Ne_HIO_c) == 0x1C);
|
||||
|
||||
#endif /* D_A_NPC_NE_H */
|
||||
|
|
|
|||
|
|
@ -4,90 +4,16 @@
|
|||
//
|
||||
|
||||
#include "rel/d/a/d_a_mg_fish/d_a_mg_fish.h"
|
||||
#include "d/cc/d_cc_d.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct request_of_phase_process_class {};
|
||||
|
||||
struct mg_fish_class {};
|
||||
|
||||
struct mf_ke_s {
|
||||
/* 80535F74 */ ~mf_ke_s();
|
||||
/* 80535FD4 */ mf_ke_s();
|
||||
};
|
||||
|
||||
struct mDoMtx_stack_c {
|
||||
/* 8000CD9C */ void transM(f32, f32, f32);
|
||||
/* 8000CE38 */ void scaleM(f32, f32, f32);
|
||||
|
||||
static u8 now[48];
|
||||
};
|
||||
|
||||
struct J3DMaterialTable {};
|
||||
|
||||
struct J3DAnmTexPattern {};
|
||||
|
||||
struct mDoExt_btpAnm {
|
||||
/* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
|
||||
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
|
||||
};
|
||||
|
||||
struct J3DAnmTevRegKey {};
|
||||
|
||||
struct mDoExt_brkAnm {
|
||||
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
|
||||
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
|
||||
};
|
||||
|
||||
struct mDoExt_baseAnm {
|
||||
/* 8000D428 */ void play();
|
||||
};
|
||||
|
||||
struct mDoExt_McaMorfCallBack2_c {};
|
||||
|
||||
struct mDoExt_McaMorfCallBack1_c {};
|
||||
|
||||
struct J3DAnmTransform {};
|
||||
|
||||
struct J3DModelData {};
|
||||
|
||||
struct mDoExt_McaMorf {
|
||||
/* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
|
||||
mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
|
||||
int, void*, u32, u32);
|
||||
/* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
|
||||
/* 800105C8 */ void play(Vec*, u32, s8);
|
||||
/* 80010680 */ void entryDL();
|
||||
/* 800106AC */ void modelCalc();
|
||||
};
|
||||
|
||||
struct mDoExt_3DlineMat_c {};
|
||||
|
||||
struct mDoExt_3DlineMatSortPacket {
|
||||
/* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
|
||||
};
|
||||
|
||||
struct dKy_tevstr_c {};
|
||||
|
||||
struct _GXColor {};
|
||||
|
||||
struct mDoExt_3DlineMat0_c {
|
||||
/* 800125E0 */ void init(u16, u16, int);
|
||||
/* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
|
||||
};
|
||||
|
||||
struct mDoCPd_c {
|
||||
static u8 m_cpadInfo[256];
|
||||
};
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daPy_py_c {
|
||||
/* 8015F4F0 */ void setLookPos(cXyz*);
|
||||
};
|
||||
|
|
@ -115,11 +41,6 @@ struct dSv_event_c {
|
|||
/* 80034A04 */ void getEventReg(u16) const;
|
||||
};
|
||||
|
||||
struct dScnKy_env_light_c {
|
||||
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
|
||||
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
|
||||
};
|
||||
|
||||
struct dRes_info_c {};
|
||||
|
||||
struct dRes_control_c {
|
||||
|
|
@ -128,11 +49,6 @@ struct dRes_control_c {
|
|||
|
||||
struct dPa_levelEcallBack {};
|
||||
|
||||
struct csXyz {
|
||||
/* 8053601C */ ~csXyz();
|
||||
/* 80536058 */ csXyz();
|
||||
};
|
||||
|
||||
struct dPa_control_c {
|
||||
struct level_c {
|
||||
/* 8004B918 */ void getEmitter(u32);
|
||||
|
|
@ -213,35 +129,6 @@ struct cBgS {
|
|||
/* 800744A0 */ void GroundCross(cBgS_GndChk*);
|
||||
};
|
||||
|
||||
struct _GXTexObj {};
|
||||
|
||||
struct Z2SeqMgr {
|
||||
/* 802AFF8C */ void changeBgmStatus(s32);
|
||||
/* 802B2A88 */ void changeFishingBgm(s32);
|
||||
};
|
||||
|
||||
struct Z2Creature {
|
||||
/* 802C03C8 */ Z2Creature();
|
||||
/* 802C0530 */ void init(Vec*, Vec*, u8, u8);
|
||||
};
|
||||
|
||||
struct JMath {
|
||||
static u8 sincosTable_[65536];
|
||||
};
|
||||
|
||||
struct J3DSys {
|
||||
static u8 mCurrentMtx[48];
|
||||
};
|
||||
|
||||
struct J3DModel {};
|
||||
|
||||
struct J3DJoint {};
|
||||
|
||||
struct J3DFrameCtrl {
|
||||
/* 803283FC */ void init(s16);
|
||||
/* 80534E90 */ ~J3DFrameCtrl();
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
|
@ -438,9 +325,6 @@ extern "C" void init__10Z2CreatureFP3VecP3VecUcUc();
|
|||
extern "C" void* __nw__FUl();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void init__12J3DFrameCtrlFs();
|
||||
extern "C" void PSMTXCopy();
|
||||
extern "C" void PSMTXTrans();
|
||||
extern "C" void PSMTXScale();
|
||||
extern "C" void __destroy_arr();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_20();
|
||||
|
|
@ -460,8 +344,6 @@ extern "C" void _restgpr_27();
|
|||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5];
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
|
||||
extern "C" extern void* __vt__8dCcD_Cyl[36];
|
||||
extern "C" extern void* __vt__9dCcD_Stts[11];
|
||||
|
|
@ -472,9 +354,7 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
|
|||
extern "C" u8 now__14mDoMtx_stack_c[48];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
|
||||
extern "C" extern u8 g_env_light[4880];
|
||||
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
|
||||
extern "C" extern u8 j3dSys[284];
|
||||
extern "C" u8 mCurrentMtx__6J3DSys[48];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
extern "C" extern void* calc_mtx[1 + 1 /* padding */];
|
||||
|
|
@ -2734,7 +2614,8 @@ static asm void useHeapInit2(fopAc_ac_c* param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm J3DFrameCtrl::~J3DFrameCtrl() {
|
||||
// asm J3DFrameCtrl::~J3DFrameCtrl() {
|
||||
extern "C" asm void __dt__12J3DFrameCtrlFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_mg_fish/d_a_mg_fish/__dt__12J3DFrameCtrlFv.s"
|
||||
}
|
||||
|
|
@ -2952,7 +2833,8 @@ extern "C" asm void __dt__10dCcD_GSttsFv() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
||||
// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
||||
extern "C" asm void __dt__12dBgS_ObjAcchFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_mg_fish/d_a_mg_fish/__dt__12dBgS_ObjAcchFv.s"
|
||||
}
|
||||
|
|
@ -2962,7 +2844,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dBgS_AcchCir::~dBgS_AcchCir() {
|
||||
// asm dBgS_AcchCir::~dBgS_AcchCir() {
|
||||
extern "C" asm void __dt__12dBgS_AcchCirFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_mg_fish/d_a_mg_fish/__dt__12dBgS_AcchCirFv.s"
|
||||
}
|
||||
|
|
@ -2992,14 +2875,16 @@ asm mf_ke_s::mf_ke_s() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm csXyz::~csXyz() {
|
||||
// asm csXyz::~csXyz() {
|
||||
extern "C" asm void __dt__5csXyzFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_mg_fish/d_a_mg_fish/__dt__5csXyzFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80536058-8053605C 00C418 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */
|
||||
csXyz::csXyz() {
|
||||
// csXyz::csXyz() {
|
||||
extern "C" void __ct__5csXyzFv() {
|
||||
/* empty function */
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -673,12 +673,12 @@ u16 dMsgFlow_c::getEventId(int* oItemId_p) {
|
|||
}
|
||||
|
||||
/* 8024A538-8024A540 244E78 0008+00 0/0 3/3 4/4 .text getMsgNo__10dMsgFlow_cFv */
|
||||
int dMsgFlow_c::getMsgNo() {
|
||||
u32 dMsgFlow_c::getMsgNo() {
|
||||
return mMsgNo;
|
||||
}
|
||||
|
||||
/* 8024A540-8024A548 244E80 0008+00 0/0 0/0 12/12 .text getNowMsgNo__10dMsgFlow_cFv */
|
||||
int dMsgFlow_c::getNowMsgNo() {
|
||||
u32 dMsgFlow_c::getNowMsgNo() {
|
||||
return mNowMsgNo;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue