Work on daNpcBlueNS_c (#2199)

This commit is contained in:
hatal175 2024-09-26 01:28:26 +03:00 committed by GitHub
parent f2ac35d738
commit 09dfa0a2bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 1458 additions and 1128 deletions

View File

@ -1,10 +0,0 @@
lbl_809691DC:
/* 809691DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 809691E0 7C 08 02 A6 */ mflr r0
/* 809691E4 90 01 00 14 */ stw r0, 0x14(r1)
/* 809691E8 48 00 00 19 */ bl _Execute__13daNpcBlueNS_cFv
/* 809691EC 38 60 00 01 */ li r3, 1
/* 809691F0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 809691F4 7C 08 03 A6 */ mtlr r0
/* 809691F8 38 21 00 10 */ addi r1, r1, 0x10
/* 809691FC 4E 80 00 20 */ blr

View File

@ -1,47 +0,0 @@
lbl_8096B548:
/* 8096B548 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096B54C 7C 08 02 A6 */ mflr r0
/* 8096B550 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096B554 39 61 00 20 */ addi r11, r1, 0x20
/* 8096B558 4B 9F 6C 85 */ bl _savegpr_29
/* 8096B55C 7C 7D 1B 78 */ mr r29, r3
/* 8096B560 7C 9E 23 78 */ mr r30, r4
/* 8096B564 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8096B568 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8096B56C 3B E3 4F F8 */ addi r31, r3, 0x4ff8
/* 8096B570 38 00 FF FF */ li r0, -1
/* 8096B574 90 01 00 08 */ stw r0, 8(r1)
/* 8096B578 7F E3 FB 78 */ mr r3, r31
/* 8096B57C 3C A0 80 97 */ lis r5, d_a_npc_blue_ns__stringBase0@ha /* 0x8096CB4C@ha */
/* 8096B580 38 A5 CB 4C */ addi r5, r5, d_a_npc_blue_ns__stringBase0@l /* 0x8096CB4C@l */
/* 8096B584 38 A5 00 4B */ addi r5, r5, 0x4b
/* 8096B588 38 C0 00 03 */ li r6, 3
/* 8096B58C 4B 6D CB 61 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
/* 8096B590 28 03 00 00 */ cmplwi r3, 0
/* 8096B594 41 82 00 10 */ beq lbl_8096B5A4
/* 8096B598 80 03 00 00 */ lwz r0, 0(r3)
/* 8096B59C 90 01 00 08 */ stw r0, 8(r1)
/* 8096B5A0 48 00 00 0C */ b lbl_8096B5AC
lbl_8096B5A4:
/* 8096B5A4 38 60 00 01 */ li r3, 1
/* 8096B5A8 48 00 00 30 */ b lbl_8096B5D8
lbl_8096B5AC:
/* 8096B5AC 7F E3 FB 78 */ mr r3, r31
/* 8096B5B0 7F C4 F3 78 */ mr r4, r30
/* 8096B5B4 4B 6D C7 99 */ bl getIsAddvance__16dEvent_manager_cFi
/* 8096B5B8 2C 03 00 00 */ cmpwi r3, 0
/* 8096B5BC 41 82 00 10 */ beq lbl_8096B5CC
/* 8096B5C0 7F A3 EB 78 */ mr r3, r29
/* 8096B5C4 38 81 00 08 */ addi r4, r1, 8
/* 8096B5C8 48 00 00 29 */ bl _Evt_ChgYami_Chibi_CutInit__13daNpcBlueNS_cFRCi
lbl_8096B5CC:
/* 8096B5CC 7F A3 EB 78 */ mr r3, r29
/* 8096B5D0 38 81 00 08 */ addi r4, r1, 8
/* 8096B5D4 48 00 00 B5 */ bl _Evt_ChgYami_Chibi_CutMain__13daNpcBlueNS_cFRCi
lbl_8096B5D8:
/* 8096B5D8 39 61 00 20 */ addi r11, r1, 0x20
/* 8096B5DC 4B 9F 6C 4D */ bl _restgpr_29
/* 8096B5E0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096B5E4 7C 08 03 A6 */ mtlr r0
/* 8096B5E8 38 21 00 20 */ addi r1, r1, 0x20
/* 8096B5EC 4E 80 00 20 */ blr

View File

@ -1,47 +0,0 @@
lbl_8096B7B8:
/* 8096B7B8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096B7BC 7C 08 02 A6 */ mflr r0
/* 8096B7C0 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096B7C4 39 61 00 20 */ addi r11, r1, 0x20
/* 8096B7C8 4B 9F 6A 15 */ bl _savegpr_29
/* 8096B7CC 7C 7D 1B 78 */ mr r29, r3
/* 8096B7D0 7C 9E 23 78 */ mr r30, r4
/* 8096B7D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8096B7D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8096B7DC 3B E3 4F F8 */ addi r31, r3, 0x4ff8
/* 8096B7E0 38 00 FF FF */ li r0, -1
/* 8096B7E4 90 01 00 08 */ stw r0, 8(r1)
/* 8096B7E8 7F E3 FB 78 */ mr r3, r31
/* 8096B7EC 3C A0 80 97 */ lis r5, d_a_npc_blue_ns__stringBase0@ha /* 0x8096CB4C@ha */
/* 8096B7F0 38 A5 CB 4C */ addi r5, r5, d_a_npc_blue_ns__stringBase0@l /* 0x8096CB4C@l */
/* 8096B7F4 38 A5 00 4B */ addi r5, r5, 0x4b
/* 8096B7F8 38 C0 00 03 */ li r6, 3
/* 8096B7FC 4B 6D C8 F1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
/* 8096B800 28 03 00 00 */ cmplwi r3, 0
/* 8096B804 41 82 00 10 */ beq lbl_8096B814
/* 8096B808 80 03 00 00 */ lwz r0, 0(r3)
/* 8096B80C 90 01 00 08 */ stw r0, 8(r1)
/* 8096B810 48 00 00 0C */ b lbl_8096B81C
lbl_8096B814:
/* 8096B814 38 60 00 01 */ li r3, 1
/* 8096B818 48 00 00 30 */ b lbl_8096B848
lbl_8096B81C:
/* 8096B81C 7F E3 FB 78 */ mr r3, r31
/* 8096B820 7F C4 F3 78 */ mr r4, r30
/* 8096B824 4B 6D C5 29 */ bl getIsAddvance__16dEvent_manager_cFi
/* 8096B828 2C 03 00 00 */ cmpwi r3, 0
/* 8096B82C 41 82 00 10 */ beq lbl_8096B83C
/* 8096B830 7F A3 EB 78 */ mr r3, r29
/* 8096B834 38 81 00 08 */ addi r4, r1, 8
/* 8096B838 48 00 00 29 */ bl _Evt_ChgYami_Debu_CutInit__13daNpcBlueNS_cFRCi
lbl_8096B83C:
/* 8096B83C 7F A3 EB 78 */ mr r3, r29
/* 8096B840 38 81 00 08 */ addi r4, r1, 8
/* 8096B844 48 00 00 B5 */ bl _Evt_ChgYami_Debu_CutMain__13daNpcBlueNS_cFRCi
lbl_8096B848:
/* 8096B848 39 61 00 20 */ addi r11, r1, 0x20
/* 8096B84C 4B 9F 69 DD */ bl _restgpr_29
/* 8096B850 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096B854 7C 08 03 A6 */ mtlr r0
/* 8096B858 38 21 00 20 */ addi r1, r1, 0x20
/* 8096B85C 4E 80 00 20 */ blr

View File

@ -1,47 +0,0 @@
lbl_8096BA28:
/* 8096BA28 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096BA2C 7C 08 02 A6 */ mflr r0
/* 8096BA30 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096BA34 39 61 00 20 */ addi r11, r1, 0x20
/* 8096BA38 4B 9F 67 A5 */ bl _savegpr_29
/* 8096BA3C 7C 7D 1B 78 */ mr r29, r3
/* 8096BA40 7C 9E 23 78 */ mr r30, r4
/* 8096BA44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8096BA48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8096BA4C 3B E3 4F F8 */ addi r31, r3, 0x4ff8
/* 8096BA50 38 00 FF FF */ li r0, -1
/* 8096BA54 90 01 00 08 */ stw r0, 8(r1)
/* 8096BA58 7F E3 FB 78 */ mr r3, r31
/* 8096BA5C 3C A0 80 97 */ lis r5, d_a_npc_blue_ns__stringBase0@ha /* 0x8096CB4C@ha */
/* 8096BA60 38 A5 CB 4C */ addi r5, r5, d_a_npc_blue_ns__stringBase0@l /* 0x8096CB4C@l */
/* 8096BA64 38 A5 00 4B */ addi r5, r5, 0x4b
/* 8096BA68 38 C0 00 03 */ li r6, 3
/* 8096BA6C 4B 6D C6 81 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
/* 8096BA70 28 03 00 00 */ cmplwi r3, 0
/* 8096BA74 41 82 00 10 */ beq lbl_8096BA84
/* 8096BA78 80 03 00 00 */ lwz r0, 0(r3)
/* 8096BA7C 90 01 00 08 */ stw r0, 8(r1)
/* 8096BA80 48 00 00 0C */ b lbl_8096BA8C
lbl_8096BA84:
/* 8096BA84 38 60 00 01 */ li r3, 1
/* 8096BA88 48 00 00 30 */ b lbl_8096BAB8
lbl_8096BA8C:
/* 8096BA8C 7F E3 FB 78 */ mr r3, r31
/* 8096BA90 7F C4 F3 78 */ mr r4, r30
/* 8096BA94 4B 6D C2 B9 */ bl getIsAddvance__16dEvent_manager_cFi
/* 8096BA98 2C 03 00 00 */ cmpwi r3, 0
/* 8096BA9C 41 82 00 10 */ beq lbl_8096BAAC
/* 8096BAA0 7F A3 EB 78 */ mr r3, r29
/* 8096BAA4 38 81 00 08 */ addi r4, r1, 8
/* 8096BAA8 48 00 00 29 */ bl _Evt_ChgYami_Noppo_CutInit__13daNpcBlueNS_cFRCi
lbl_8096BAAC:
/* 8096BAAC 7F A3 EB 78 */ mr r3, r29
/* 8096BAB0 38 81 00 08 */ addi r4, r1, 8
/* 8096BAB4 48 00 00 B5 */ bl _Evt_ChgYami_Noppo_CutMain__13daNpcBlueNS_cFRCi
lbl_8096BAB8:
/* 8096BAB8 39 61 00 20 */ addi r11, r1, 0x20
/* 8096BABC 4B 9F 67 6D */ bl _restgpr_29
/* 8096BAC0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096BAC4 7C 08 03 A6 */ mtlr r0
/* 8096BAC8 38 21 00 20 */ addi r1, r1, 0x20
/* 8096BACC 4E 80 00 20 */ blr

View File

@ -1,47 +0,0 @@
lbl_8096BC98:
/* 8096BC98 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096BC9C 7C 08 02 A6 */ mflr r0
/* 8096BCA0 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096BCA4 39 61 00 20 */ addi r11, r1, 0x20
/* 8096BCA8 4B 9F 65 35 */ bl _savegpr_29
/* 8096BCAC 7C 7D 1B 78 */ mr r29, r3
/* 8096BCB0 7C 9E 23 78 */ mr r30, r4
/* 8096BCB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8096BCB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8096BCBC 3B E3 4F F8 */ addi r31, r3, 0x4ff8
/* 8096BCC0 38 00 FF FF */ li r0, -1
/* 8096BCC4 90 01 00 08 */ stw r0, 8(r1)
/* 8096BCC8 7F E3 FB 78 */ mr r3, r31
/* 8096BCCC 3C A0 80 97 */ lis r5, d_a_npc_blue_ns__stringBase0@ha /* 0x8096CB4C@ha */
/* 8096BCD0 38 A5 CB 4C */ addi r5, r5, d_a_npc_blue_ns__stringBase0@l /* 0x8096CB4C@l */
/* 8096BCD4 38 A5 00 4B */ addi r5, r5, 0x4b
/* 8096BCD8 38 C0 00 03 */ li r6, 3
/* 8096BCDC 4B 6D C4 11 */ bl getMySubstanceP__16dEvent_manager_cFiPCci
/* 8096BCE0 28 03 00 00 */ cmplwi r3, 0
/* 8096BCE4 41 82 00 10 */ beq lbl_8096BCF4
/* 8096BCE8 80 03 00 00 */ lwz r0, 0(r3)
/* 8096BCEC 90 01 00 08 */ stw r0, 8(r1)
/* 8096BCF0 48 00 00 0C */ b lbl_8096BCFC
lbl_8096BCF4:
/* 8096BCF4 38 60 00 01 */ li r3, 1
/* 8096BCF8 48 00 00 30 */ b lbl_8096BD28
lbl_8096BCFC:
/* 8096BCFC 7F E3 FB 78 */ mr r3, r31
/* 8096BD00 7F C4 F3 78 */ mr r4, r30
/* 8096BD04 4B 6D C0 49 */ bl getIsAddvance__16dEvent_manager_cFi
/* 8096BD08 2C 03 00 00 */ cmpwi r3, 0
/* 8096BD0C 41 82 00 10 */ beq lbl_8096BD1C
/* 8096BD10 7F A3 EB 78 */ mr r3, r29
/* 8096BD14 38 81 00 08 */ addi r4, r1, 8
/* 8096BD18 48 00 00 29 */ bl _Evt_ChgYami_STNoppo_CutInit__13daNpcBlueNS_cFRCi
lbl_8096BD1C:
/* 8096BD1C 7F A3 EB 78 */ mr r3, r29
/* 8096BD20 38 81 00 08 */ addi r4, r1, 8
/* 8096BD24 48 00 00 B5 */ bl _Evt_ChgYami_STNoppo_CutMain__13daNpcBlueNS_cFRCi
lbl_8096BD28:
/* 8096BD28 39 61 00 20 */ addi r11, r1, 0x20
/* 8096BD2C 4B 9F 64 FD */ bl _restgpr_29
/* 8096BD30 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096BD34 7C 08 03 A6 */ mtlr r0
/* 8096BD38 38 21 00 20 */ addi r1, r1, 0x20
/* 8096BD3C 4E 80 00 20 */ blr

View File

@ -1,57 +0,0 @@
lbl_80969E9C:
/* 80969E9C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969EA0 7C 08 02 A6 */ mflr r0
/* 80969EA4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969EA8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969EAC 7C 7F 1B 78 */ mr r31, r3
/* 80969EB0 4B 6A EE 31 */ bl fopAc_IsActor__FPv
/* 80969EB4 2C 03 00 00 */ cmpwi r3, 0
/* 80969EB8 40 82 00 0C */ bne lbl_80969EC4
/* 80969EBC 38 60 00 00 */ li r3, 0
/* 80969EC0 48 00 00 80 */ b lbl_80969F40
lbl_80969EC4:
/* 80969EC4 28 1F 00 00 */ cmplwi r31, 0
/* 80969EC8 41 82 00 0C */ beq lbl_80969ED4
/* 80969ECC 80 7F 00 04 */ lwz r3, 4(r31)
/* 80969ED0 48 00 00 08 */ b lbl_80969ED8
lbl_80969ED4:
/* 80969ED4 38 60 FF FF */ li r3, -1
lbl_80969ED8:
/* 80969ED8 4B 6B 82 61 */ bl fpcM_IsCreating__FUi
/* 80969EDC 2C 03 00 00 */ cmpwi r3, 0
/* 80969EE0 41 82 00 0C */ beq lbl_80969EEC
/* 80969EE4 38 60 00 00 */ li r3, 0
/* 80969EE8 48 00 00 58 */ b lbl_80969F40
lbl_80969EEC:
/* 80969EEC A8 1F 00 08 */ lha r0, 8(r31)
/* 80969EF0 2C 00 02 FC */ cmpwi r0, 0x2fc
/* 80969EF4 41 82 00 0C */ beq lbl_80969F00
/* 80969EF8 38 60 00 00 */ li r3, 0
/* 80969EFC 48 00 00 44 */ b lbl_80969F40
lbl_80969F00:
/* 80969F00 38 00 00 00 */ li r0, 0
/* 80969F04 88 7F 0C F0 */ lbz r3, 0xcf0(r31)
/* 80969F08 2C 03 00 08 */ cmpwi r3, 8
/* 80969F0C 41 82 00 0C */ beq lbl_80969F18
/* 80969F10 2C 03 00 09 */ cmpwi r3, 9
/* 80969F14 40 82 00 08 */ bne lbl_80969F1C
lbl_80969F18:
/* 80969F18 38 00 00 01 */ li r0, 1
lbl_80969F1C:
/* 80969F1C 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 80969F20 40 82 00 0C */ bne lbl_80969F2C
/* 80969F24 38 60 00 00 */ li r3, 0
/* 80969F28 48 00 00 18 */ b lbl_80969F40
lbl_80969F2C:
/* 80969F2C 2C 03 00 09 */ cmpwi r3, 9
/* 80969F30 41 82 00 0C */ beq lbl_80969F3C
/* 80969F34 38 60 00 00 */ li r3, 0
/* 80969F38 48 00 00 08 */ b lbl_80969F40
lbl_80969F3C:
/* 80969F3C 7F E3 FB 78 */ mr r3, r31
lbl_80969F40:
/* 80969F40 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969F44 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969F48 7C 08 03 A6 */ mtlr r0
/* 80969F4C 38 21 00 10 */ addi r1, r1, 0x10
/* 80969F50 4E 80 00 20 */ blr

View File

@ -1,57 +0,0 @@
lbl_80969DE4:
/* 80969DE4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969DE8 7C 08 02 A6 */ mflr r0
/* 80969DEC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969DF0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969DF4 7C 7F 1B 78 */ mr r31, r3
/* 80969DF8 4B 6A EE E9 */ bl fopAc_IsActor__FPv
/* 80969DFC 2C 03 00 00 */ cmpwi r3, 0
/* 80969E00 40 82 00 0C */ bne lbl_80969E0C
/* 80969E04 38 60 00 00 */ li r3, 0
/* 80969E08 48 00 00 80 */ b lbl_80969E88
lbl_80969E0C:
/* 80969E0C 28 1F 00 00 */ cmplwi r31, 0
/* 80969E10 41 82 00 0C */ beq lbl_80969E1C
/* 80969E14 80 7F 00 04 */ lwz r3, 4(r31)
/* 80969E18 48 00 00 08 */ b lbl_80969E20
lbl_80969E1C:
/* 80969E1C 38 60 FF FF */ li r3, -1
lbl_80969E20:
/* 80969E20 4B 6B 83 19 */ bl fpcM_IsCreating__FUi
/* 80969E24 2C 03 00 00 */ cmpwi r3, 0
/* 80969E28 41 82 00 0C */ beq lbl_80969E34
/* 80969E2C 38 60 00 00 */ li r3, 0
/* 80969E30 48 00 00 58 */ b lbl_80969E88
lbl_80969E34:
/* 80969E34 A8 1F 00 08 */ lha r0, 8(r31)
/* 80969E38 2C 00 02 FC */ cmpwi r0, 0x2fc
/* 80969E3C 41 82 00 0C */ beq lbl_80969E48
/* 80969E40 38 60 00 00 */ li r3, 0
/* 80969E44 48 00 00 44 */ b lbl_80969E88
lbl_80969E48:
/* 80969E48 38 00 00 00 */ li r0, 0
/* 80969E4C 88 7F 0C F0 */ lbz r3, 0xcf0(r31)
/* 80969E50 2C 03 00 08 */ cmpwi r3, 8
/* 80969E54 41 82 00 0C */ beq lbl_80969E60
/* 80969E58 2C 03 00 09 */ cmpwi r3, 9
/* 80969E5C 40 82 00 08 */ bne lbl_80969E64
lbl_80969E60:
/* 80969E60 38 00 00 01 */ li r0, 1
lbl_80969E64:
/* 80969E64 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 80969E68 40 82 00 0C */ bne lbl_80969E74
/* 80969E6C 38 60 00 00 */ li r3, 0
/* 80969E70 48 00 00 18 */ b lbl_80969E88
lbl_80969E74:
/* 80969E74 2C 03 00 08 */ cmpwi r3, 8
/* 80969E78 41 82 00 0C */ beq lbl_80969E84
/* 80969E7C 38 60 00 00 */ li r3, 0
/* 80969E80 48 00 00 08 */ b lbl_80969E88
lbl_80969E84:
/* 80969E84 7F E3 FB 78 */ mr r3, r31
lbl_80969E88:
/* 80969E88 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969E8C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969E90 7C 08 03 A6 */ mtlr r0
/* 80969E94 38 21 00 10 */ addi r1, r1, 0x10
/* 80969E98 4E 80 00 20 */ blr

View File

@ -1,37 +0,0 @@
lbl_80969D60:
/* 80969D60 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969D64 7C 08 02 A6 */ mflr r0
/* 80969D68 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969D6C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969D70 93 C1 00 08 */ stw r30, 8(r1)
/* 80969D74 7C 7E 1B 78 */ mr r30, r3
/* 80969D78 7C 9F 23 78 */ mr r31, r4
/* 80969D7C 4B 6A EF 65 */ bl fopAc_IsActor__FPv
/* 80969D80 2C 03 00 00 */ cmpwi r3, 0
/* 80969D84 40 82 00 0C */ bne lbl_80969D90
/* 80969D88 38 60 00 00 */ li r3, 0
/* 80969D8C 48 00 00 40 */ b lbl_80969DCC
lbl_80969D90:
/* 80969D90 A8 1E 00 08 */ lha r0, 8(r30)
/* 80969D94 2C 00 00 23 */ cmpwi r0, 0x23
/* 80969D98 40 82 00 30 */ bne lbl_80969DC8
/* 80969D9C 88 9F 0E 11 */ lbz r4, 0xe11(r31)
/* 80969DA0 38 60 00 03 */ li r3, 3
/* 80969DA4 7C 04 1B D6 */ divw r0, r4, r3
/* 80969DA8 7C 00 19 D6 */ mullw r0, r0, r3
/* 80969DAC 7C 60 20 50 */ subf r3, r0, r4
/* 80969DB0 80 1E 00 B0 */ lwz r0, 0xb0(r30)
/* 80969DB4 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 80969DB8 7C 03 00 40 */ cmplw r3, r0
/* 80969DBC 40 82 00 0C */ bne lbl_80969DC8
/* 80969DC0 7F C3 F3 78 */ mr r3, r30
/* 80969DC4 48 00 00 08 */ b lbl_80969DCC
lbl_80969DC8:
/* 80969DC8 38 60 00 00 */ li r3, 0
lbl_80969DCC:
/* 80969DCC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969DD0 83 C1 00 08 */ lwz r30, 8(r1)
/* 80969DD4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969DD8 7C 08 03 A6 */ mtlr r0
/* 80969DDC 38 21 00 10 */ addi r1, r1, 0x10
/* 80969DE0 4E 80 00 20 */ blr

View File

@ -1,52 +0,0 @@
lbl_8096B490:
/* 8096B490 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096B494 7C 08 02 A6 */ mflr r0
/* 8096B498 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096B49C 88 03 0E 11 */ lbz r0, 0xe11(r3)
/* 8096B4A0 2C 00 00 01 */ cmpwi r0, 1
/* 8096B4A4 41 82 00 48 */ beq lbl_8096B4EC
/* 8096B4A8 40 80 00 10 */ bge lbl_8096B4B8
/* 8096B4AC 2C 00 00 00 */ cmpwi r0, 0
/* 8096B4B0 40 80 00 14 */ bge lbl_8096B4C4
/* 8096B4B4 48 00 00 84 */ b lbl_8096B538
lbl_8096B4B8:
/* 8096B4B8 2C 00 00 06 */ cmpwi r0, 6
/* 8096B4BC 40 80 00 7C */ bge lbl_8096B538
/* 8096B4C0 48 00 00 54 */ b lbl_8096B514
lbl_8096B4C4:
/* 8096B4C4 3C 80 00 06 */ lis r4, 0x0006 /* 0x00060091@ha */
/* 8096B4C8 38 04 00 91 */ addi r0, r4, 0x0091 /* 0x00060091@l */
/* 8096B4CC 90 01 00 10 */ stw r0, 0x10(r1)
/* 8096B4D0 38 81 00 10 */ addi r4, r1, 0x10
/* 8096B4D4 38 A0 FF FF */ li r5, -1
/* 8096B4D8 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B4DC 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B4E0 7D 89 03 A6 */ mtctr r12
/* 8096B4E4 4E 80 04 21 */ bctrl
/* 8096B4E8 48 00 00 50 */ b lbl_8096B538
lbl_8096B4EC:
/* 8096B4EC 3C 80 00 06 */ lis r4, 0x0006 /* 0x00060092@ha */
/* 8096B4F0 38 04 00 92 */ addi r0, r4, 0x0092 /* 0x00060092@l */
/* 8096B4F4 90 01 00 0C */ stw r0, 0xc(r1)
/* 8096B4F8 38 81 00 0C */ addi r4, r1, 0xc
/* 8096B4FC 38 A0 FF FF */ li r5, -1
/* 8096B500 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B504 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B508 7D 89 03 A6 */ mtctr r12
/* 8096B50C 4E 80 04 21 */ bctrl
/* 8096B510 48 00 00 28 */ b lbl_8096B538
lbl_8096B514:
/* 8096B514 3C 80 00 06 */ lis r4, 0x0006 /* 0x00060093@ha */
/* 8096B518 38 04 00 93 */ addi r0, r4, 0x0093 /* 0x00060093@l */
/* 8096B51C 90 01 00 08 */ stw r0, 8(r1)
/* 8096B520 38 81 00 08 */ addi r4, r1, 8
/* 8096B524 38 A0 FF FF */ li r5, -1
/* 8096B528 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B52C 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B530 7D 89 03 A6 */ mtctr r12
/* 8096B534 4E 80 04 21 */ bctrl
lbl_8096B538:
/* 8096B538 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096B53C 7C 08 03 A6 */ mtlr r0
/* 8096B540 38 21 00 20 */ addi r1, r1, 0x20
/* 8096B544 4E 80 00 20 */ blr

View File

@ -1,9 +0,0 @@
lbl_80969B68:
/* 80969B68 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969B6C 7C 08 02 A6 */ mflr r0
/* 80969B70 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969B74 4B FF F4 71 */ bl CreateHeap__13daNpcBlueNS_cFv
/* 80969B78 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969B7C 7C 08 03 A6 */ mtlr r0
/* 80969B80 38 21 00 10 */ addi r1, r1, 0x10
/* 80969B84 4E 80 00 20 */ blr

View File

@ -1,21 +0,0 @@
lbl_80969B88:
/* 80969B88 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969B8C 7C 08 02 A6 */ mflr r0
/* 80969B90 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969B94 7C 60 1B 78 */ mr r0, r3
/* 80969B98 2C 04 00 00 */ cmpwi r4, 0
/* 80969B9C 40 82 00 24 */ bne lbl_80969BC0
/* 80969BA0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 80969BA4 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */
/* 80969BA8 80 A3 00 38 */ lwz r5, 0x38(r3)
/* 80969BAC 80 65 00 14 */ lwz r3, 0x14(r5)
/* 80969BB0 28 03 00 00 */ cmplwi r3, 0
/* 80969BB4 41 82 00 0C */ beq lbl_80969BC0
/* 80969BB8 7C 04 03 78 */ mr r4, r0
/* 80969BBC 4B FF FE 15 */ bl ctrlJoint__13daNpcBlueNS_cFP8J3DJointP8J3DModel
lbl_80969BC0:
/* 80969BC0 38 60 00 01 */ li r3, 1
/* 80969BC4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969BC8 7C 08 03 A6 */ mtlr r0
/* 80969BCC 38 21 00 10 */ addi r1, r1, 0x10
/* 80969BD0 4E 80 00 20 */ blr

View File

@ -1,9 +0,0 @@
lbl_8096BF08:
/* 8096BF08 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8096BF0C 7C 08 02 A6 */ mflr r0
/* 8096BF10 90 01 00 14 */ stw r0, 0x14(r1)
/* 8096BF14 4B FF CE 31 */ bl Create__13daNpcBlueNS_cFv
/* 8096BF18 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096BF1C 7C 08 03 A6 */ mtlr r0
/* 8096BF20 38 21 00 10 */ addi r1, r1, 0x10
/* 8096BF24 4E 80 00 20 */ blr

View File

@ -1,9 +0,0 @@
lbl_8096BF28:
/* 8096BF28 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8096BF2C 7C 08 02 A6 */ mflr r0
/* 8096BF30 90 01 00 14 */ stw r0, 0x14(r1)
/* 8096BF34 4B FF D2 75 */ bl Delete__13daNpcBlueNS_cFv
/* 8096BF38 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096BF3C 7C 08 03 A6 */ mtlr r0
/* 8096BF40 38 21 00 10 */ addi r1, r1, 0x10
/* 8096BF44 4E 80 00 20 */ blr

View File

@ -1,9 +0,0 @@
lbl_8096BF68:
/* 8096BF68 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8096BF6C 7C 08 02 A6 */ mflr r0
/* 8096BF70 90 01 00 14 */ stw r0, 0x14(r1)
/* 8096BF74 4B FF D8 FD */ bl Draw__13daNpcBlueNS_cFv
/* 8096BF78 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096BF7C 7C 08 03 A6 */ mtlr r0
/* 8096BF80 38 21 00 10 */ addi r1, r1, 0x10
/* 8096BF84 4E 80 00 20 */ blr

View File

@ -1,9 +0,0 @@
lbl_8096BF48:
/* 8096BF48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8096BF4C 7C 08 02 A6 */ mflr r0
/* 8096BF50 90 01 00 14 */ stw r0, 0x14(r1)
/* 8096BF54 4B FF D2 89 */ bl Execute__13daNpcBlueNS_cFv
/* 8096BF58 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096BF5C 7C 08 03 A6 */ mtlr r0
/* 8096BF60 38 21 00 10 */ addi r1, r1, 0x10
/* 8096BF64 4E 80 00 20 */ blr

View File

@ -1,52 +0,0 @@
lbl_8096B320:
/* 8096B320 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096B324 7C 08 02 A6 */ mflr r0
/* 8096B328 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096B32C 88 03 0E 11 */ lbz r0, 0xe11(r3)
/* 8096B330 2C 00 00 01 */ cmpwi r0, 1
/* 8096B334 41 82 00 48 */ beq lbl_8096B37C
/* 8096B338 40 80 00 10 */ bge lbl_8096B348
/* 8096B33C 2C 00 00 00 */ cmpwi r0, 0
/* 8096B340 40 80 00 14 */ bge lbl_8096B354
/* 8096B344 48 00 00 84 */ b lbl_8096B3C8
lbl_8096B348:
/* 8096B348 2C 00 00 06 */ cmpwi r0, 6
/* 8096B34C 40 80 00 7C */ bge lbl_8096B3C8
/* 8096B350 48 00 00 54 */ b lbl_8096B3A4
lbl_8096B354:
/* 8096B354 3C 80 00 05 */ lis r4, 0x0005 /* 0x000500CE@ha */
/* 8096B358 38 04 00 CE */ addi r0, r4, 0x00CE /* 0x000500CE@l */
/* 8096B35C 90 01 00 10 */ stw r0, 0x10(r1)
/* 8096B360 38 81 00 10 */ addi r4, r1, 0x10
/* 8096B364 38 A0 FF FF */ li r5, -1
/* 8096B368 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B36C 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B370 7D 89 03 A6 */ mtctr r12
/* 8096B374 4E 80 04 21 */ bctrl
/* 8096B378 48 00 00 50 */ b lbl_8096B3C8
lbl_8096B37C:
/* 8096B37C 3C 80 00 05 */ lis r4, 0x0005 /* 0x000500CF@ha */
/* 8096B380 38 04 00 CF */ addi r0, r4, 0x00CF /* 0x000500CF@l */
/* 8096B384 90 01 00 0C */ stw r0, 0xc(r1)
/* 8096B388 38 81 00 0C */ addi r4, r1, 0xc
/* 8096B38C 38 A0 FF FF */ li r5, -1
/* 8096B390 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B394 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B398 7D 89 03 A6 */ mtctr r12
/* 8096B39C 4E 80 04 21 */ bctrl
/* 8096B3A0 48 00 00 28 */ b lbl_8096B3C8
lbl_8096B3A4:
/* 8096B3A4 3C 80 00 05 */ lis r4, 0x0005 /* 0x000500D0@ha */
/* 8096B3A8 38 04 00 D0 */ addi r0, r4, 0x00D0 /* 0x000500D0@l */
/* 8096B3AC 90 01 00 08 */ stw r0, 8(r1)
/* 8096B3B0 38 81 00 08 */ addi r4, r1, 8
/* 8096B3B4 38 A0 FF FF */ li r5, -1
/* 8096B3B8 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B3BC 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B3C0 7D 89 03 A6 */ mtctr r12
/* 8096B3C4 4E 80 04 21 */ bctrl
lbl_8096B3C8:
/* 8096B3C8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096B3CC 7C 08 03 A6 */ mtlr r0
/* 8096B3D0 38 21 00 20 */ addi r1, r1, 0x20
/* 8096B3D4 4E 80 00 20 */ blr

View File

@ -1,31 +0,0 @@
lbl_80969138:
/* 80969138 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8096913C 7C 08 02 A6 */ mflr r0
/* 80969140 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969144 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969148 93 C1 00 08 */ stw r30, 8(r1)
/* 8096914C 7C 7E 1B 78 */ mr r30, r3
/* 80969150 3B E0 00 00 */ li r31, 0
/* 80969154 38 60 02 3A */ li r3, 0x23a
/* 80969158 4B 7E 39 55 */ bl daNpcT_chkEvtBit__FUl
/* 8096915C 2C 03 00 00 */ cmpwi r3, 0
/* 80969160 40 82 00 28 */ bne lbl_80969188
/* 80969164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80969168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8096916C 80 1E 00 B0 */ lwz r0, 0xb0(r30)
/* 80969170 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f
/* 80969174 88 1E 04 BA */ lbz r0, 0x4ba(r30)
/* 80969178 7C 05 07 74 */ extsb r5, r0
/* 8096917C 4B 6C C1 E5 */ bl isSwitch__10dSv_info_cCFii
/* 80969180 2C 03 00 00 */ cmpwi r3, 0
/* 80969184 41 82 00 08 */ beq lbl_8096918C
lbl_80969188:
/* 80969188 3B E0 00 01 */ li r31, 1
lbl_8096918C:
/* 8096918C 7F E3 FB 78 */ mr r3, r31
/* 80969190 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969194 83 C1 00 08 */ lwz r30, 8(r1)
/* 80969198 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096919C 7C 08 03 A6 */ mtlr r0
/* 809691A0 38 21 00 10 */ addi r1, r1, 0x10
/* 809691A4 4E 80 00 20 */ blr

View File

@ -1,52 +0,0 @@
lbl_8096B3D8:
/* 8096B3D8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8096B3DC 7C 08 02 A6 */ mflr r0
/* 8096B3E0 90 01 00 24 */ stw r0, 0x24(r1)
/* 8096B3E4 88 03 0E 11 */ lbz r0, 0xe11(r3)
/* 8096B3E8 2C 00 00 01 */ cmpwi r0, 1
/* 8096B3EC 41 82 00 48 */ beq lbl_8096B434
/* 8096B3F0 40 80 00 10 */ bge lbl_8096B400
/* 8096B3F4 2C 00 00 00 */ cmpwi r0, 0
/* 8096B3F8 40 80 00 14 */ bge lbl_8096B40C
/* 8096B3FC 48 00 00 84 */ b lbl_8096B480
lbl_8096B400:
/* 8096B400 2C 00 00 06 */ cmpwi r0, 6
/* 8096B404 40 80 00 7C */ bge lbl_8096B480
/* 8096B408 48 00 00 54 */ b lbl_8096B45C
lbl_8096B40C:
/* 8096B40C 3C 80 00 05 */ lis r4, 0x0005 /* 0x000500D1@ha */
/* 8096B410 38 04 00 D1 */ addi r0, r4, 0x00D1 /* 0x000500D1@l */
/* 8096B414 90 01 00 10 */ stw r0, 0x10(r1)
/* 8096B418 38 81 00 10 */ addi r4, r1, 0x10
/* 8096B41C 38 A0 FF FF */ li r5, -1
/* 8096B420 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B424 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B428 7D 89 03 A6 */ mtctr r12
/* 8096B42C 4E 80 04 21 */ bctrl
/* 8096B430 48 00 00 50 */ b lbl_8096B480
lbl_8096B434:
/* 8096B434 3C 80 00 05 */ lis r4, 0x0005 /* 0x000500D2@ha */
/* 8096B438 38 04 00 D2 */ addi r0, r4, 0x00D2 /* 0x000500D2@l */
/* 8096B43C 90 01 00 0C */ stw r0, 0xc(r1)
/* 8096B440 38 81 00 0C */ addi r4, r1, 0xc
/* 8096B444 38 A0 FF FF */ li r5, -1
/* 8096B448 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B44C 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B450 7D 89 03 A6 */ mtctr r12
/* 8096B454 4E 80 04 21 */ bctrl
/* 8096B458 48 00 00 28 */ b lbl_8096B480
lbl_8096B45C:
/* 8096B45C 3C 80 00 05 */ lis r4, 0x0005 /* 0x000500D3@ha */
/* 8096B460 38 04 00 D3 */ addi r0, r4, 0x00D3 /* 0x000500D3@l */
/* 8096B464 90 01 00 08 */ stw r0, 8(r1)
/* 8096B468 38 81 00 08 */ addi r4, r1, 8
/* 8096B46C 38 A0 FF FF */ li r5, -1
/* 8096B470 85 83 0B 48 */ lwzu r12, 0xb48(r3)
/* 8096B474 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 8096B478 7D 89 03 A6 */ mtctr r12
/* 8096B47C 4E 80 04 21 */ bctrl
lbl_8096B480:
/* 8096B480 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8096B484 7C 08 03 A6 */ mtlr r0
/* 8096B488 38 21 00 20 */ addi r1, r1, 0x20
/* 8096B48C 4E 80 00 20 */ blr

View File

@ -1,86 +0,0 @@
lbl_80969F54:
/* 80969F54 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969F58 7C 08 02 A6 */ mflr r0
/* 80969F5C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969F60 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969F64 93 C1 00 08 */ stw r30, 8(r1)
/* 80969F68 7C 7F 1B 78 */ mr r31, r3
/* 80969F6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80969F70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80969F74 38 80 00 58 */ li r4, 0x58
/* 80969F78 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80969F7C 7C 05 07 74 */ extsb r5, r0
/* 80969F80 4B 6C B3 E1 */ bl isSwitch__10dSv_info_cCFii
/* 80969F84 2C 03 00 00 */ cmpwi r3, 0
/* 80969F88 41 82 00 3C */ beq lbl_80969FC4
/* 80969F8C 7F E3 FB 78 */ mr r3, r31
/* 80969F90 38 80 00 01 */ li r4, 1
/* 80969F94 4B FF F5 71 */ bl create_Yamijin__13daNpcBlueNS_cFi
/* 80969F98 90 7F 0E 00 */ stw r3, 0xe00(r31)
/* 80969F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80969FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80969FA4 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80969FA8 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f
/* 80969FAC 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80969FB0 7C 05 07 74 */ extsb r5, r0
/* 80969FB4 4B 6C B2 4D */ bl onSwitch__10dSv_info_cFii
/* 80969FB8 7F E3 FB 78 */ mr r3, r31
/* 80969FBC 4B 6A FC C1 */ bl fopAcM_delete__FP10fopAc_ac_c
/* 80969FC0 48 00 00 B4 */ b lbl_8096A074
lbl_80969FC4:
/* 80969FC4 38 7F 0D C4 */ addi r3, r31, 0xdc4
/* 80969FC8 4B 9F 80 51 */ bl __ptmf_test
/* 80969FCC 2C 03 00 00 */ cmpwi r3, 0
/* 80969FD0 41 82 00 18 */ beq lbl_80969FE8
/* 80969FD4 7F E3 FB 78 */ mr r3, r31
/* 80969FD8 38 80 00 00 */ li r4, 0
/* 80969FDC 39 9F 0D C4 */ addi r12, r31, 0xdc4
/* 80969FE0 4B 9F 80 A5 */ bl __ptmf_scall
/* 80969FE4 60 00 00 00 */ nop
lbl_80969FE8:
/* 80969FE8 7F E3 FB 78 */ mr r3, r31
/* 80969FEC 4B FF F6 05 */ bl col_check__13daNpcBlueNS_cFv
/* 80969FF0 2C 03 00 00 */ cmpwi r3, 0
/* 80969FF4 41 82 00 24 */ beq lbl_8096A018
/* 80969FF8 88 1F 0E 12 */ lbz r0, 0xe12(r31)
/* 80969FFC 7C 00 07 75 */ extsb. r0, r0
/* 8096A000 40 82 00 6C */ bne lbl_8096A06C
/* 8096A004 7F E3 FB 78 */ mr r3, r31
/* 8096A008 4B FF F4 61 */ bl callEvt_changeYami__13daNpcBlueNS_cFv
/* 8096A00C 38 00 00 01 */ li r0, 1
/* 8096A010 98 1F 0E 12 */ stb r0, 0xe12(r31)
/* 8096A014 48 00 00 58 */ b lbl_8096A06C
lbl_8096A018:
/* 8096A018 88 1F 0E 12 */ lbz r0, 0xe12(r31)
/* 8096A01C 7C 00 07 75 */ extsb. r0, r0
/* 8096A020 40 82 00 4C */ bne lbl_8096A06C
/* 8096A024 3B C0 00 01 */ li r30, 1
/* 8096A028 7F E3 FB 78 */ mr r3, r31
/* 8096A02C 80 9F 0D F0 */ lwz r4, 0xdf0(r31)
/* 8096A030 4B FF F6 69 */ bl holyball_check_main__13daNpcBlueNS_cFP10fopAc_ac_c
/* 8096A034 2C 03 00 00 */ cmpwi r3, 0
/* 8096A038 40 82 00 1C */ bne lbl_8096A054
/* 8096A03C 7F E3 FB 78 */ mr r3, r31
/* 8096A040 80 9F 0D F4 */ lwz r4, 0xdf4(r31)
/* 8096A044 4B FF F6 55 */ bl holyball_check_main__13daNpcBlueNS_cFP10fopAc_ac_c
/* 8096A048 2C 03 00 00 */ cmpwi r3, 0
/* 8096A04C 40 82 00 08 */ bne lbl_8096A054
/* 8096A050 3B C0 00 00 */ li r30, 0
lbl_8096A054:
/* 8096A054 57 C0 06 3F */ clrlwi. r0, r30, 0x18
/* 8096A058 41 82 00 14 */ beq lbl_8096A06C
/* 8096A05C 7F E3 FB 78 */ mr r3, r31
/* 8096A060 4B FF F4 09 */ bl callEvt_changeYami__13daNpcBlueNS_cFv
/* 8096A064 38 00 00 01 */ li r0, 1
/* 8096A068 98 1F 0E 12 */ stb r0, 0xe12(r31)
lbl_8096A06C:
/* 8096A06C 7F E3 FB 78 */ mr r3, r31
/* 8096A070 48 00 04 A9 */ bl playMotion__13daNpcBlueNS_cFv
lbl_8096A074:
/* 8096A074 38 60 00 00 */ li r3, 0
/* 8096A078 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8096A07C 83 C1 00 08 */ lwz r30, 8(r1)
/* 8096A080 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096A084 7C 08 03 A6 */ mtlr r0
/* 8096A088 38 21 00 10 */ addi r1, r1, 0x10
/* 8096A08C 4E 80 00 20 */ blr

View File

@ -1,45 +0,0 @@
lbl_8096A750:
/* 8096A750 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8096A754 7C 08 02 A6 */ mflr r0
/* 8096A758 90 01 00 14 */ stw r0, 0x14(r1)
/* 8096A75C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8096A760 93 C1 00 08 */ stw r30, 8(r1)
/* 8096A764 7C 7E 1B 78 */ mr r30, r3
/* 8096A768 7C 9F 23 78 */ mr r31, r4
/* 8096A76C 38 00 00 03 */ li r0, 3
/* 8096A770 B0 03 0D C0 */ sth r0, 0xdc0(r3)
/* 8096A774 38 7E 0D C4 */ addi r3, r30, 0xdc4
/* 8096A778 4B 9F 78 A1 */ bl __ptmf_test
/* 8096A77C 2C 03 00 00 */ cmpwi r3, 0
/* 8096A780 41 82 00 18 */ beq lbl_8096A798
/* 8096A784 7F C3 F3 78 */ mr r3, r30
/* 8096A788 38 80 00 00 */ li r4, 0
/* 8096A78C 39 9E 0D C4 */ addi r12, r30, 0xdc4
/* 8096A790 4B 9F 78 F5 */ bl __ptmf_scall
/* 8096A794 60 00 00 00 */ nop
lbl_8096A798:
/* 8096A798 38 00 00 00 */ li r0, 0
/* 8096A79C B0 1E 0D C0 */ sth r0, 0xdc0(r30)
/* 8096A7A0 80 7F 00 00 */ lwz r3, 0(r31)
/* 8096A7A4 80 1F 00 04 */ lwz r0, 4(r31)
/* 8096A7A8 90 7E 0D C4 */ stw r3, 0xdc4(r30)
/* 8096A7AC 90 1E 0D C8 */ stw r0, 0xdc8(r30)
/* 8096A7B0 80 1F 00 08 */ lwz r0, 8(r31)
/* 8096A7B4 90 1E 0D CC */ stw r0, 0xdcc(r30)
/* 8096A7B8 38 7E 0D C4 */ addi r3, r30, 0xdc4
/* 8096A7BC 4B 9F 78 5D */ bl __ptmf_test
/* 8096A7C0 2C 03 00 00 */ cmpwi r3, 0
/* 8096A7C4 41 82 00 18 */ beq lbl_8096A7DC
/* 8096A7C8 7F C3 F3 78 */ mr r3, r30
/* 8096A7CC 38 80 00 00 */ li r4, 0
/* 8096A7D0 39 9E 0D C4 */ addi r12, r30, 0xdc4
/* 8096A7D4 4B 9F 78 B1 */ bl __ptmf_scall
/* 8096A7D8 60 00 00 00 */ nop
lbl_8096A7DC:
/* 8096A7DC 38 60 00 01 */ li r3, 1
/* 8096A7E0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8096A7E4 83 C1 00 08 */ lwz r30, 8(r1)
/* 8096A7E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8096A7EC 7C 08 03 A6 */ mtlr r0
/* 8096A7F0 38 21 00 10 */ addi r1, r1, 0x10
/* 8096A7F4 4E 80 00 20 */ blr

View File

@ -1,10 +0,0 @@
lbl_8096A7F8:
/* 8096A7F8 2C 04 00 00 */ cmpwi r4, 0
/* 8096A7FC 4D 80 00 20 */ bltlr
/* 8096A800 2C 04 00 04 */ cmpwi r4, 4
/* 8096A804 4C 80 00 20 */ bgelr
/* 8096A808 A8 03 0D E8 */ lha r0, 0xde8(r3)
/* 8096A80C 7C 04 00 00 */ cmpw r4, r0
/* 8096A810 4D 82 00 20 */ beqlr
/* 8096A814 B0 83 0D E8 */ sth r4, 0xde8(r3)
/* 8096A818 4E 80 00 20 */ blr

View File

@ -1,21 +0,0 @@
lbl_80969C48:
/* 80969C48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969C4C 7C 08 02 A6 */ mflr r0
/* 80969C50 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969C54 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969C58 7C 7F 1B 78 */ mr r31, r3
/* 80969C5C 48 00 00 35 */ bl srchHollyBall__13daNpcBlueNS_cFv
/* 80969C60 88 1F 0E 11 */ lbz r0, 0xe11(r31)
/* 80969C64 2C 00 00 05 */ cmpwi r0, 5
/* 80969C68 41 82 00 0C */ beq lbl_80969C74
/* 80969C6C 40 80 00 10 */ bge lbl_80969C7C
/* 80969C70 48 00 00 0C */ b lbl_80969C7C
lbl_80969C74:
/* 80969C74 7F E3 FB 78 */ mr r3, r31
/* 80969C78 48 00 00 81 */ bl srchTagYami__13daNpcBlueNS_cFv
lbl_80969C7C:
/* 80969C7C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969C80 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969C84 7C 08 03 A6 */ mtlr r0
/* 80969C88 38 21 00 10 */ addi r1, r1, 0x10
/* 80969C8C 4E 80 00 20 */ blr

View File

@ -1,29 +0,0 @@
lbl_80969C90:
/* 80969C90 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969C94 7C 08 02 A6 */ mflr r0
/* 80969C98 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969C9C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969CA0 7C 7F 1B 78 */ mr r31, r3
/* 80969CA4 80 03 0D F0 */ lwz r0, 0xdf0(r3)
/* 80969CA8 28 00 00 00 */ cmplwi r0, 0
/* 80969CAC 40 82 00 18 */ bne lbl_80969CC4
/* 80969CB0 3C 60 80 97 */ lis r3, _search_HollyBall_Y__13daNpcBlueNS_cFPvPv@ha /* 0x80969DE4@ha */
/* 80969CB4 38 63 9D E4 */ addi r3, r3, _search_HollyBall_Y__13daNpcBlueNS_cFPvPv@l /* 0x80969DE4@l */
/* 80969CB8 7F E4 FB 78 */ mr r4, r31
/* 80969CBC 4B 6B 76 7D */ bl fpcEx_Search__FPFPvPv_PvPv
/* 80969CC0 90 7F 0D F0 */ stw r3, 0xdf0(r31)
lbl_80969CC4:
/* 80969CC4 80 1F 0D F4 */ lwz r0, 0xdf4(r31)
/* 80969CC8 28 00 00 00 */ cmplwi r0, 0
/* 80969CCC 40 82 00 18 */ bne lbl_80969CE4
/* 80969CD0 3C 60 80 97 */ lis r3, _search_HollyBall_G__13daNpcBlueNS_cFPvPv@ha /* 0x80969E9C@ha */
/* 80969CD4 38 63 9E 9C */ addi r3, r3, _search_HollyBall_G__13daNpcBlueNS_cFPvPv@l /* 0x80969E9C@l */
/* 80969CD8 7F E4 FB 78 */ mr r4, r31
/* 80969CDC 4B 6B 76 5D */ bl fpcEx_Search__FPFPvPv_PvPv
/* 80969CE0 90 7F 0D F4 */ stw r3, 0xdf4(r31)
lbl_80969CE4:
/* 80969CE4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969CE8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969CEC 7C 08 03 A6 */ mtlr r0
/* 80969CF0 38 21 00 10 */ addi r1, r1, 0x10
/* 80969CF4 4E 80 00 20 */ blr

View File

@ -1,28 +0,0 @@
lbl_80969CF8:
/* 80969CF8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80969CFC 7C 08 02 A6 */ mflr r0
/* 80969D00 90 01 00 14 */ stw r0, 0x14(r1)
/* 80969D04 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80969D08 7C 7F 1B 78 */ mr r31, r3
/* 80969D0C 80 03 0D F8 */ lwz r0, 0xdf8(r3)
/* 80969D10 28 00 00 00 */ cmplwi r0, 0
/* 80969D14 40 82 00 38 */ bne lbl_80969D4C
/* 80969D18 3C 60 80 97 */ lis r3, _search_Tag__13daNpcBlueNS_cFPvPv@ha /* 0x80969D60@ha */
/* 80969D1C 38 63 9D 60 */ addi r3, r3, _search_Tag__13daNpcBlueNS_cFPvPv@l /* 0x80969D60@l */
/* 80969D20 7F E4 FB 78 */ mr r4, r31
/* 80969D24 4B 6B 76 15 */ bl fpcEx_Search__FPFPvPv_PvPv
/* 80969D28 90 7F 0D F8 */ stw r3, 0xdf8(r31)
/* 80969D2C 80 7F 0D F8 */ lwz r3, 0xdf8(r31)
/* 80969D30 28 03 00 00 */ cmplwi r3, 0
/* 80969D34 41 82 00 18 */ beq lbl_80969D4C
/* 80969D38 80 03 05 94 */ lwz r0, 0x594(r3)
/* 80969D3C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e
/* 80969D40 90 03 05 94 */ stw r0, 0x594(r3)
/* 80969D44 38 00 00 00 */ li r0, 0
/* 80969D48 98 03 06 E0 */ stb r0, 0x6e0(r3)
lbl_80969D4C:
/* 80969D4C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80969D50 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80969D54 7C 08 03 A6 */ mtlr r0
/* 80969D58 38 21 00 10 */ addi r1, r1, 0x10
/* 80969D5C 4E 80 00 20 */ blr

View File

@ -658,7 +658,7 @@ protected:
/* 0x992 */ s16 field_0x992; /* 0x992 */ s16 field_0x992;
/* 0x994 */ s16 mTurnStartAngle; /* 0x994 */ s16 mTurnStartAngle;
/* 0x996 */ s16 mTurnTargetAngle; /* 0x996 */ s16 mTurnTargetAngle;
/* 0x998 */ u16 field_0x998; /* 0x998 */ s16 mGroundAngle;
/* 0x99C */ u32 mAnmFlags; /* 0x99C */ u32 mAnmFlags;
/* 0x9A0 */ u32 mShadowKey; /* 0x9A0 */ u32 mShadowKey;
/* 0x9A4 */ u32 field_0x9a4; /* 0x9A4 */ u32 field_0x9a4;
@ -739,6 +739,18 @@ public:
/* 5 */ LOOK_ATTN, /* 5 */ LOOK_ATTN,
}; };
#ifdef DANPCF_C_CTOR_HACK
// dummy functions to disable inline for ctor
void initialize5() { initialize(); }
void initialize4() { initialize5(); }
void initialize3() { initialize4(); }
void initialize2() { initialize3(); }
void initialize1() { initialize2(); }
daNpcF_c() { initialize1(); }
#else
daNpcF_c() { initialize(); }
#endif
/* 80152014 */ BOOL execute(); /* 80152014 */ BOOL execute();
/* 801522AC */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL); /* 801522AC */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
/* 80152614 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, /* 80152614 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
@ -850,6 +862,7 @@ BOOL daNpcF_pntVsLineSegmentLengthSquare2D(f32 i_pntX, f32 i_pntZ, f32 i_startX,
f32* o_dist2); f32* o_dist2);
BOOL daNpcF_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_isClosed, BOOL daNpcF_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_isClosed,
BOOL i_isReversed); BOOL i_isReversed);
BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_ActorP);
class daNpcF_MatAnm_c : public J3DMaterialAnm { class daNpcF_MatAnm_c : public J3DMaterialAnm {
private: private:

View File

@ -3,6 +3,11 @@
#include "d/a/d_a_npc.h" #include "d/a/d_a_npc.h"
class daTagYami_c;
class daNpc_yamiS_c;
//#define INHERIT_NPC
/** /**
* @ingroup actors-npcs * @ingroup actors-npcs
* @class daNpcBlueNS_c * @class daNpcBlueNS_c
@ -11,69 +16,143 @@
* @details * @details
* *
*/ */
class daNpcBlueNS_c : public fopAc_ac_c { class daNpcBlueNS_c : public
#ifdef INHERIT_NPC
daNpcF_c
#else
fopAc_ac_c
#endif
{
public: public:
typedef int (daNpcBlueNS_c::*ActionFunc)(int);
typedef int (daNpcBlueNS_c::*EventSeqFunc)(int);
enum LookAtMode {
LOOK_AT_0,
LOOK_AT_1,
LOOK_AT_2,
LOOK_AT_3,
};
/* 8096896C */ daNpcBlueNS_c(); /* 8096896C */ daNpcBlueNS_c();
/* 80968B80 */ ~daNpcBlueNS_c(); /* 80968B80 */ ~daNpcBlueNS_c();
/* 80968D44 */ void Create(); /* 80968D44 */ int Create();
/* 80968FE4 */ void CreateHeap(); /* 80968FE4 */ int CreateHeap();
/* 80969138 */ void isDelete(); /* 80969138 */ int isDelete();
/* 809691A8 */ void Delete(); /* 809691A8 */ int Delete();
/* 809691DC */ void Execute(); /* 809691DC */ int Execute();
/* 80969200 */ void _Execute(); /* 80969200 */ void _Execute();
/* 80969468 */ void callEvt_changeYami(); /* 80969468 */ void callEvt_changeYami();
/* 80969504 */ void create_Yamijin(int); /* 80969504 */ int create_Yamijin(int);
/* 809695F0 */ void col_check(); /* 809695F0 */ int col_check();
/* 80969698 */ void holyball_check_main(fopAc_ac_c*); /* 80969698 */ int holyball_check_main(fopAc_ac_c*);
/* 80969870 */ void Draw(); /* 80969870 */ int Draw();
/* 809699D0 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 809699D0 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80969B68 */ void createHeapCallBack(fopAc_ac_c*); /* 80969B68 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80969B88 */ void ctrlJointCallBack(J3DJoint*, int); /* 80969B88 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80969BD4 */ void setParam(); /* 80969BD4 */ void setParam();
/* 80969C48 */ void srchActor(); /* 80969C48 */ void srchActor();
/* 80969C90 */ void srchHollyBall(); /* 80969C90 */ void srchHollyBall();
/* 80969CF8 */ void srchTagYami(); /* 80969CF8 */ void srchTagYami();
/* 80969D60 */ void _search_Tag(void*, void*); /* 80969D60 */ static void* _search_Tag(void*, void*);
/* 80969DE4 */ void _search_HollyBall_Y(void*, void*); /* 80969DE4 */ static void* _search_HollyBall_Y(void*, void*);
/* 80969E9C */ void _search_HollyBall_G(void*, void*); /* 80969E9C */ static void* _search_HollyBall_G(void*, void*);
/* 80969F54 */ void main(); /* 80969F54 */ BOOL main();
/* 8096A090 */ void setAttnPos(); /* 8096A090 */ void setAttnPos();
/* 8096A238 */ void setMotionAnm(int, f32); /* 8096A238 */ void setMotionAnm(int, f32);
/* 8096A308 */ void setMotion(int, f32, int); /* 8096A308 */ void setMotion(int, f32, int);
/* 8096A350 */ bool drawDbgInfo(); /* 8096A350 */ BOOL drawDbgInfo();
/* 8096A358 */ void reset(); /* 8096A358 */ void reset();
/* 8096A518 */ void playMotion(); /* 8096A518 */ void playMotion();
/* 8096A750 */ void setAction(int (daNpcBlueNS_c::*)(int)); /* 8096A750 */ int setAction(ActionFunc);
/* 8096A7F8 */ void setLookMode(int); /* 8096A7F8 */ void setLookMode(int);
/* 8096A81C */ void lookat(); /* 8096A81C */ void lookat();
/* 8096A9FC */ void step(s16, int); /* 8096A9FC */ int step(s16, int);
/* 8096AAF0 */ void chkFindPlayer(); /* 8096AAF0 */ int chkFindPlayer();
/* 8096ABD4 */ void wait(int); /* 8096ABD4 */ int wait(int);
/* 8096AD70 */ void down(int); /* 8096AD70 */ int down(int);
/* 8096AE5C */ void talk(int); /* 8096AE5C */ int talk(int);
/* 8096AFC8 */ void demo(int); /* 8096AFC8 */ int demo(int);
/* 8096B204 */ void ChgPtclDisp(); /* 8096B204 */ void ChgPtclDisp();
/* 8096B320 */ void downSE(); /* 8096B320 */ void downSE();
/* 8096B3D8 */ void lightsowrdSE(); /* 8096B3D8 */ void lightsowrdSE();
/* 8096B490 */ void appearSE(); /* 8096B490 */ void appearSE();
/* 8096B548 */ void _Evt_ChgYami_Chibi(int); /* 8096B548 */ int _Evt_ChgYami_Chibi(int);
/* 8096B5F0 */ void _Evt_ChgYami_Chibi_CutInit(int const&); /* 8096B5F0 */ int _Evt_ChgYami_Chibi_CutInit(int const&);
/* 8096B688 */ void _Evt_ChgYami_Chibi_CutMain(int const&); /* 8096B688 */ int _Evt_ChgYami_Chibi_CutMain(int const&);
/* 8096B7B8 */ void _Evt_ChgYami_Debu(int); /* 8096B7B8 */ int _Evt_ChgYami_Debu(int);
/* 8096B860 */ void _Evt_ChgYami_Debu_CutInit(int const&); /* 8096B860 */ int _Evt_ChgYami_Debu_CutInit(int const&);
/* 8096B8F8 */ void _Evt_ChgYami_Debu_CutMain(int const&); /* 8096B8F8 */ int _Evt_ChgYami_Debu_CutMain(int const&);
/* 8096BA28 */ void _Evt_ChgYami_Noppo(int); /* 8096BA28 */ int _Evt_ChgYami_Noppo(int);
/* 8096BAD0 */ void _Evt_ChgYami_Noppo_CutInit(int const&); /* 8096BAD0 */ int _Evt_ChgYami_Noppo_CutInit(int const&);
/* 8096BB68 */ void _Evt_ChgYami_Noppo_CutMain(int const&); /* 8096BB68 */ int _Evt_ChgYami_Noppo_CutMain(int const&);
/* 8096BC98 */ void _Evt_ChgYami_STNoppo(int); /* 8096BC98 */ int _Evt_ChgYami_STNoppo(int);
/* 8096BD40 */ void _Evt_ChgYami_STNoppo_CutInit(int const&); /* 8096BD40 */ int _Evt_ChgYami_STNoppo_CutInit(int const&);
/* 8096BDD8 */ void _Evt_ChgYami_STNoppo_CutMain(int const&); /* 8096BDD8 */ int _Evt_ChgYami_STNoppo_CutMain(int const&);
/* 8096C8B0 */ void adjustShapeAngle(); /* 8096C8B0 */ void adjustShapeAngle();
u8 getType() { return fopAcM_GetParam(this); }
u8 getSwitchBitNo() { return fopAcM_GetParam(this) >> 8; }
int getFlowNodeNo() {
return ((u16)home.angle.x == 0xffff) ? -1 : (u16)home.angle.x;
}
int _chk_TagPrm(fopAc_ac_c *param_1) {
return (fopAcM_GetParam(param_1) & 0xff) == field_0xe11 % 3;
}
int holyball_check_yellow() {
return holyball_check_main(field_0xdf0);
}
int holyball_check_green() {
return holyball_check_main(field_0xdf4);
}
int holyball_check() {
return holyball_check_yellow() || holyball_check_green();
}
#ifdef NONMATCHING
static EventSeqFunc mEvtSeqList[7];
#else
static u8 mEvtSeqList[84]; static u8 mEvtSeqList[84];
#endif
private: private:
/* 0x568 */ u8 field_0x568[0xe14 - 0x568]; #ifdef INHERIT_NPC
#else
/* 0xB48 */ u8 field_0x568[0xB48 - 0x568];
#endif
/* 0xB48 */ Z2Creature mCreature;
/* 0xBD8 */ u32 field_0xbd8;
/* 0xBDC */ daNpcF_Lookat_c mLookAt;
/* 0xC78 */ daNpcF_ActorMngr_c mActorMngrs[1];
/* 0xC80 */ u32 field_0xc80;
/* 0xC84 */ dCcD_Cyl mCyl;
/* 0xDC0 */ u16 field_0xdc0;
/* 0xDC4 */ ActionFunc field_0xdc4;
/* 0xDD0 */ request_of_phase_process_class mPhase[1];
/* 0xDD8 */ int field_0xdd8;
/* 0xDDC */ int field_0xddc;
/* 0xDE0 */ int field_0xde0;
/* 0xDE4 */ int field_0xde4;
/* 0xDE8 */ s16 mLookMode;
/* 0xDEA */ s16 field_0xdea;
/* 0xDEC */ u8 field_0xdec;
/* 0xDF0 */ fopAc_ac_c* field_0xdf0;
/* 0xDF4 */ fopAc_ac_c* field_0xdf4;
/* 0xDF8 */ daTagYami_c* field_0xdf8;
/* 0xDFC */ fopAc_ac_c* mYamiActor;
/* 0xE00 */ int field_0xe00;
/* 0xE04 */ int field_0xe04;
/* 0xE08 */ int field_0xe08;
/* 0xE0C */ int field_0xe0c;
/* 0xE10 */ s8 field_0xe10;
/* 0xE11 */ u8 field_0xe11;
/* 0xE12 */ s8 field_0xe12;
/* 0xE13 */ u8 field_0xe13;
}; };
STATIC_ASSERT(sizeof(daNpcBlueNS_c) == 0xe14); STATIC_ASSERT(sizeof(daNpcBlueNS_c) == 0xe14);
@ -81,8 +160,15 @@ STATIC_ASSERT(sizeof(daNpcBlueNS_c) == 0xe14);
class daNpcBlueNS_Param_c { class daNpcBlueNS_Param_c {
public: public:
/* 8096C8B4 */ ~daNpcBlueNS_Param_c(); /* 8096C8B4 */ ~daNpcBlueNS_Param_c();
struct Data {
f32 field_0x00[18];
s16 field_0x48[4];
f32 field_0x50[4];
s16 field_0x60[4];
f32 field_0x68[2];
};
static u8 const m[112]; static Data const m;
}; };

View File

@ -57,11 +57,21 @@ public:
/* 80B45F64 */ void checkRemoveJoint(int); /* 80B45F64 */ void checkRemoveJoint(int);
/* 80B45F74 */ void evtEndProc(); /* 80B45F74 */ void evtEndProc();
void vanish_off() { field_0xf81 = 0; }
void on_CoHit() {
mCyl.OnCoSetBit();
mCyl.OnTgSetBit();
}
static void* mCutNameList[2]; static void* mCutNameList[2];
static u8 mCutList[24]; static u8 mCutList[24];
private: private:
/* 0x568 */ u8 field_0x568[0xfcc - 0x568]; /* 0x568 */ u8 field_0x568[0xe44 - 0x568];
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 field_0xf80;
/* 0xF81 */ u8 field_0xf81;
/* 0xF82 */ u8 field_0xf82[0xfcc - 0xf82];
}; };
STATIC_ASSERT(sizeof(daNpc_yamiD_c) == 0xfcc); STATIC_ASSERT(sizeof(daNpc_yamiD_c) == 0xfcc);

View File

@ -57,11 +57,21 @@ public:
/* 80B495C8 */ void checkRemoveJoint(int); /* 80B495C8 */ void checkRemoveJoint(int);
/* 80B495D8 */ void evtEndProc(); /* 80B495D8 */ void evtEndProc();
void vanish_off() { field_0xf81 = 0; }
void on_CoHit() {
mCyl.OnCoSetBit();
mCyl.OnTgSetBit();
}
static void* mCutNameList[2]; static void* mCutNameList[2];
static u8 mCutList[24]; static u8 mCutList[24];
private: private:
/* 0x568 */ u8 field_0x568[0xfcc - 0x568]; /* 0x568 */ u8 field_0x568[0xe44 - 0x568];
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 field_0xf80;
/* 0xF81 */ u8 field_0xf81;
/* 0xF82 */ u8 field_0xf82[0xfcc - 0xf82];
}; };
STATIC_ASSERT(sizeof(daNpc_yamiS_c) == 0xfcc); STATIC_ASSERT(sizeof(daNpc_yamiS_c) == 0xfcc);

View File

@ -59,11 +59,21 @@ public:
/* 80B4CD18 */ void checkChangeJoint(int); /* 80B4CD18 */ void checkChangeJoint(int);
/* 80B4CD28 */ void checkRemoveJoint(int); /* 80B4CD28 */ void checkRemoveJoint(int);
void vanish_off() { field_0xf81 = 0; }
void on_CoHit() {
mCyl.OnCoSetBit();
mCyl.OnTgSetBit();
}
static void* mCutNameList[2]; static void* mCutNameList[2];
static u8 mCutList[24]; static u8 mCutList[24];
private: private:
/* 0x568 */ u8 field_0x568[0xfcc - 0x568]; /* 0x568 */ u8 field_0x568[0xe44 - 0x568];
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 field_0xf80;
/* 0xF81 */ u8 field_0xf81;
/* 0xF82 */ u8 field_0xf82[0xfcc - 0xf82];
}; };
STATIC_ASSERT(sizeof(daNpc_yamiT_c) == 0xfcc); STATIC_ASSERT(sizeof(daNpc_yamiT_c) == 0xfcc);

File diff suppressed because it is too large Load Diff

View File

@ -4614,7 +4614,7 @@ BOOL daNpcF_c::execute() {
mGndChk = mAcch.m_gnd; mGndChk = mAcch.m_gnd;
mGroundH = mAcch.GetGroundH(); mGroundH = mAcch.GetGroundH();
if (mGroundH != -1e+9f) { if (mGroundH != -1e+9f) {
field_0x998 = daNpcF_getGroundAngle(&mGndChk, mCurAngle.y); mGroundAngle = daNpcF_getGroundAngle(&mGndChk, mCurAngle.y);
setEnvTevColor(); setEnvTevColor();
setRoomNo(); setRoomNo();
mPolySound = dKy_pol_sound_get(&mAcch.m_gnd); mPolySound = dKy_pol_sound_get(&mAcch.m_gnd);
@ -4901,7 +4901,7 @@ void daNpcF_c::initialize() {
field_0x992 = 0; field_0x992 = 0;
mTurnStartAngle = 0; mTurnStartAngle = 0;
mTurnTargetAngle = 0; mTurnTargetAngle = 0;
field_0x998 = 0; mGroundAngle = 0;
mAnmFlags = 0; mAnmFlags = 0;
mShadowKey = 0; mShadowKey = 0;
field_0x9a4 = -1; field_0x9a4 = -1;
@ -6226,8 +6226,8 @@ int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2,
} }
/* 80155854-80155968 150194 0114+00 0/0 0/0 1/1 .text daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c */ /* 80155854-80155968 150194 0114+00 0/0 0/0 1/1 .text daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c */
bool daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_ActorP) { BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_ActorP) {
bool ret = 0; BOOL ret = 0;
if (daPy_getPlayerActorClass()->checkPriActorOwn(i_ActorP)) { if (daPy_getPlayerActorClass()->checkPriActorOwn(i_ActorP)) {
for (int i = 0; i < dComIfGp_getAttention().GetActionCount(); i++) { for (int i = 0; i < dComIfGp_getAttention().GetActionCount(); i++) {