mirror of https://github.com/zeldaret/tp.git
d_a_tag_bottle_item OK, d_a_tag_chgrestart work (#1878)
* d_a_tag_chgrestart * d_a_tag_bottle_item * deps fix
This commit is contained in:
Pheenoh
GitHub
parent
08fa2f03fc
commit
91d04c794d
16
Progress.md
16
Progress.md
|
|
@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
|
|||
.init | 97.972973% | 9280 | 9472
|
||||
.extab | 100.000000% | 96 | 96
|
||||
.extabindex | 100.000000% | 96 | 96
|
||||
.text | 30.684235% | 1103572 | 3596544
|
||||
.text | 30.962168% | 1113568 | 3596544
|
||||
.ctors | 100.000000% | 448 | 448
|
||||
.dtors | 100.000000% | 32 | 32
|
||||
.rodata | 100.000000% | 193856 | 193856
|
||||
.data | 100.000000% | 197632 | 197632
|
||||
.sdata | 100.000000% | 1408 | 1408
|
||||
.sdata2 | 100.000000% | 20832 | 20832
|
||||
Total | 37.991361% | 1527508 | 4020672
|
||||
Total | 38.239976% | 1537504 | 4020672
|
||||
|
||||
## Total
|
||||
|
||||
Section | Percentage | Decompiled (bytes) | Total (bytes)
|
||||
---|---|---|---
|
||||
main.dol | 37.991361% | 1527508 | 4020672
|
||||
RELs | 34.103178% | 3921976 | 11500324
|
||||
Total | 35.110401% | 5449484 | 15520996
|
||||
main.dol | 38.239976% | 1537504 | 4020672
|
||||
RELs | 34.121230% | 3924052 | 11500324
|
||||
Total | 35.188180% | 5461556 | 15520996
|
||||
|
||||
## RELs
|
||||
|
||||
|
|
@ -714,9 +714,9 @@ d_a_tag_arena | 100.000000% | 712 | 712
|
|||
d_a_tag_assistance | 100.000000% | 824 | 824
|
||||
d_a_tag_attack_item | 43.212237% | 1808 | 4184
|
||||
d_a_tag_attention | 100.000000% | 2024 | 2024
|
||||
d_a_tag_bottle_item | 38.554217% | 1024 | 2656
|
||||
d_a_tag_bottle_item | 100.000000% | 2656 | 2656
|
||||
d_a_tag_camera | 37.023593% | 1632 | 4408
|
||||
d_a_tag_chgrestart | 48.868778% | 864 | 1768
|
||||
d_a_tag_chgrestart | 73.981900% | 1308 | 1768
|
||||
d_a_tag_chkpoint | 39.852399% | 864 | 2168
|
||||
d_a_tag_csw | 35.869565% | 3696 | 10304
|
||||
d_a_tag_escape | 100.000000% | 712 | 712
|
||||
|
|
@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244
|
|||
d_a_warp_bug | 100.000000% | 2024 | 2024
|
||||
d_a_ykgr | 44.400631% | 2252 | 5072
|
||||
f_pc_profile_lst | 100.000000% | 28156 | 28156
|
||||
Total | 34.103178% | 3921976 | 11500324
|
||||
Total | 34.121230% | 3924052 | 11500324
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
lbl_80D56064:
|
||||
/* 80D56064 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D56068 7C 08 02 A6 */ mflr r0
|
||||
/* 80D5606C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56070 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D56074 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D56078 48 00 02 BD */ bl chkEvent__18daTag_BottleItem_cFv
|
||||
/* 80D5607C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56080 41 82 00 30 */ beq lbl_80D560B0
|
||||
/* 80D56084 38 7F 05 68 */ addi r3, r31, 0x568
|
||||
/* 80D56088 4B 60 BF 91 */ bl __ptmf_test
|
||||
/* 80D5608C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56090 41 82 00 18 */ beq lbl_80D560A8
|
||||
/* 80D56094 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D56098 38 80 00 00 */ li r4, 0
|
||||
/* 80D5609C 39 9F 05 68 */ addi r12, r31, 0x568
|
||||
/* 80D560A0 4B 60 BF E5 */ bl __ptmf_scall
|
||||
/* 80D560A4 60 00 00 00 */ nop
|
||||
lbl_80D560A8:
|
||||
/* 80D560A8 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D560AC 48 00 02 D9 */ bl orderEvent__18daTag_BottleItem_cFv
|
||||
lbl_80D560B0:
|
||||
/* 80D560B0 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D560B4 48 00 02 4D */ bl setAttnPos__18daTag_BottleItem_cFv
|
||||
/* 80D560B8 38 60 00 01 */ li r3, 1
|
||||
/* 80D560BC 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D560C0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D560C4 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D560C8 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D560CC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
lbl_80D565F0:
|
||||
/* 80D565F0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D565F4 7C 08 02 A6 */ mflr r0
|
||||
/* 80D565F8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D565FC 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D56600 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 80D56604 7C 7E 1B 79 */ or. r30, r3, r3
|
||||
/* 80D56608 7C 9F 23 78 */ mr r31, r4
|
||||
/* 80D5660C 41 82 00 28 */ beq lbl_80D56634
|
||||
/* 80D56610 3C 80 80 D5 */ lis r4, __vt__18daTag_BottleItem_c@ha /* 0x80D566CC@ha */
|
||||
/* 80D56614 38 04 66 CC */ addi r0, r4, __vt__18daTag_BottleItem_c@l /* 0x80D566CC@l */
|
||||
/* 80D56618 90 1E 05 78 */ stw r0, 0x578(r30)
|
||||
/* 80D5661C 38 80 00 00 */ li r4, 0
|
||||
/* 80D56620 4B 2C 26 6D */ bl __dt__10fopAc_ac_cFv
|
||||
/* 80D56624 7F E0 07 35 */ extsh. r0, r31
|
||||
/* 80D56628 40 81 00 0C */ ble lbl_80D56634
|
||||
/* 80D5662C 7F C3 F3 78 */ mr r3, r30
|
||||
/* 80D56630 4B 57 87 0D */ bl __dl__FPv
|
||||
lbl_80D56634:
|
||||
/* 80D56634 7F C3 F3 78 */ mr r3, r30
|
||||
/* 80D56638 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D5663C 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 80D56640 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56644 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56648 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D5664C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
lbl_80D56334:
|
||||
/* 80D56334 38 A0 00 01 */ li r5, 1
|
||||
/* 80D56338 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D5633C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D56340 38 00 00 00 */ li r0, 0
|
||||
/* 80D56344 88 84 4F AD */ lbz r4, 0x4fad(r4)
|
||||
/* 80D56348 28 04 00 00 */ cmplwi r4, 0
|
||||
/* 80D5634C 41 82 00 0C */ beq lbl_80D56358
|
||||
/* 80D56350 28 04 00 02 */ cmplwi r4, 2
|
||||
/* 80D56354 40 82 00 08 */ bne lbl_80D5635C
|
||||
lbl_80D56358:
|
||||
/* 80D56358 38 00 00 01 */ li r0, 1
|
||||
lbl_80D5635C:
|
||||
/* 80D5635C 54 00 06 3F */ clrlwi. r0, r0, 0x18
|
||||
/* 80D56360 40 82 00 1C */ bne lbl_80D5637C
|
||||
/* 80D56364 38 A0 00 00 */ li r5, 0
|
||||
/* 80D56368 A0 03 00 F8 */ lhz r0, 0xf8(r3)
|
||||
/* 80D5636C 28 00 00 06 */ cmplwi r0, 6
|
||||
/* 80D56370 40 82 00 0C */ bne lbl_80D5637C
|
||||
/* 80D56374 38 60 00 00 */ li r3, 0
|
||||
/* 80D56378 4E 80 00 20 */ blr
|
||||
lbl_80D5637C:
|
||||
/* 80D5637C 7C A3 2B 78 */ mr r3, r5
|
||||
/* 80D56380 4E 80 00 20 */ blr
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
lbl_80D55FD8:
|
||||
/* 80D55FD8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D55FDC 7C 08 02 A6 */ mflr r0
|
||||
/* 80D55FE0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D55FE4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D55FE8 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D55FEC 80 03 04 A0 */ lwz r0, 0x4a0(r3)
|
||||
/* 80D55FF0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
|
||||
/* 80D55FF4 40 82 00 28 */ bne lbl_80D5601C
|
||||
/* 80D55FF8 28 1F 00 00 */ cmplwi r31, 0
|
||||
/* 80D55FFC 41 82 00 14 */ beq lbl_80D56010
|
||||
/* 80D56000 4B 2C 2B 65 */ bl __ct__10fopAc_ac_cFv
|
||||
/* 80D56004 3C 60 80 D5 */ lis r3, __vt__18daTag_BottleItem_c@ha /* 0x80D566CC@ha */
|
||||
/* 80D56008 38 03 66 CC */ addi r0, r3, __vt__18daTag_BottleItem_c@l /* 0x80D566CC@l */
|
||||
/* 80D5600C 90 1F 05 78 */ stw r0, 0x578(r31)
|
||||
lbl_80D56010:
|
||||
/* 80D56010 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
|
||||
/* 80D56014 60 00 00 08 */ ori r0, r0, 8
|
||||
/* 80D56018 90 1F 04 A0 */ stw r0, 0x4a0(r31)
|
||||
lbl_80D5601C:
|
||||
/* 80D5601C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D56020 48 00 00 B9 */ bl setTypeFromParam__18daTag_BottleItem_cFv
|
||||
/* 80D56024 88 7F 05 76 */ lbz r3, 0x576(r31)
|
||||
/* 80D56028 4B 34 56 E1 */ bl isBottleItem__FUc
|
||||
/* 80D5602C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56030 40 82 00 0C */ bne lbl_80D5603C
|
||||
/* 80D56034 38 60 00 05 */ li r3, 5
|
||||
/* 80D56038 48 00 00 10 */ b lbl_80D56048
|
||||
lbl_80D5603C:
|
||||
/* 80D5603C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D56040 48 00 01 31 */ bl initialize__18daTag_BottleItem_cFv
|
||||
/* 80D56044 38 60 00 04 */ li r3, 4
|
||||
lbl_80D56048:
|
||||
/* 80D56048 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D5604C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56050 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56054 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56058 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D56568:
|
||||
/* 80D56568 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D5656C 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56570 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56574 4B FF FA 65 */ bl create__18daTag_BottleItem_cFv
|
||||
/* 80D56578 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D5657C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56580 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56584 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D56588:
|
||||
/* 80D56588 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D5658C 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56590 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56594 4B FF FA C9 */ bl Delete__18daTag_BottleItem_cFv
|
||||
/* 80D56598 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D5659C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D565A0 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D565A4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D565C8:
|
||||
/* 80D565C8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D565CC 7C 08 02 A6 */ mflr r0
|
||||
/* 80D565D0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D565D4 4B FF FA FD */ bl Draw__18daTag_BottleItem_cFv
|
||||
/* 80D565D8 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D565DC 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D565E0 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D565E4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D565A8:
|
||||
/* 80D565A8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D565AC 7C 08 02 A6 */ mflr r0
|
||||
/* 80D565B0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D565B4 4B FF FA B1 */ bl Execute__18daTag_BottleItem_cFv
|
||||
/* 80D565B8 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D565BC 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D565C0 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D565C4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
lbl_80D561E8:
|
||||
/* 80D561E8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D561EC 7C 08 02 A6 */ mflr r0
|
||||
/* 80D561F0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D561F4 38 63 05 68 */ addi r3, r3, 0x568
|
||||
/* 80D561F8 4B 60 BE 51 */ bl __ptmf_cmpr
|
||||
/* 80D561FC 7C 60 00 34 */ cntlzw r0, r3
|
||||
/* 80D56200 54 03 D9 7E */ srwi r3, r0, 5
|
||||
/* 80D56204 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56208 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D5620C 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56210 4E 80 00 20 */ blr
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
lbl_80D56214:
|
||||
/* 80D56214 94 21 FF D0 */ stwu r1, -0x30(r1)
|
||||
/* 80D56218 7C 08 02 A6 */ mflr r0
|
||||
/* 80D5621C 90 01 00 34 */ stw r0, 0x34(r1)
|
||||
/* 80D56220 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 80D56224 4B 60 BF B9 */ bl _savegpr_29
|
||||
/* 80D56228 7C 7D 1B 78 */ mr r29, r3
|
||||
/* 80D5622C 7C 9E 23 78 */ mr r30, r4
|
||||
/* 80D56230 3B E0 00 00 */ li r31, 0
|
||||
/* 80D56234 80 84 00 00 */ lwz r4, 0(r4)
|
||||
/* 80D56238 80 1E 00 04 */ lwz r0, 4(r30)
|
||||
/* 80D5623C 90 81 00 08 */ stw r4, 8(r1)
|
||||
/* 80D56240 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 80D56244 80 1E 00 08 */ lwz r0, 8(r30)
|
||||
/* 80D56248 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 80D5624C 38 81 00 08 */ addi r4, r1, 8
|
||||
/* 80D56250 4B FF FF 99 */ bl checkProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i
|
||||
/* 80D56254 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56258 41 82 00 0C */ beq lbl_80D56264
|
||||
/* 80D5625C 38 60 00 00 */ li r3, 0
|
||||
/* 80D56260 48 00 00 88 */ b lbl_80D562E8
|
||||
lbl_80D56264:
|
||||
/* 80D56264 38 00 00 02 */ li r0, 2
|
||||
/* 80D56268 B0 1D 05 74 */ sth r0, 0x574(r29)
|
||||
/* 80D5626C 38 7D 05 68 */ addi r3, r29, 0x568
|
||||
/* 80D56270 4B 60 BD A9 */ bl __ptmf_test
|
||||
/* 80D56274 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56278 41 82 00 1C */ beq lbl_80D56294
|
||||
/* 80D5627C 7F A3 EB 78 */ mr r3, r29
|
||||
/* 80D56280 38 80 00 00 */ li r4, 0
|
||||
/* 80D56284 39 9D 05 68 */ addi r12, r29, 0x568
|
||||
/* 80D56288 4B 60 BD FD */ bl __ptmf_scall
|
||||
/* 80D5628C 60 00 00 00 */ nop
|
||||
/* 80D56290 7C 7F 1B 78 */ mr r31, r3
|
||||
lbl_80D56294:
|
||||
/* 80D56294 38 00 00 00 */ li r0, 0
|
||||
/* 80D56298 B0 1D 05 74 */ sth r0, 0x574(r29)
|
||||
/* 80D5629C 80 7E 00 00 */ lwz r3, 0(r30)
|
||||
/* 80D562A0 80 1E 00 04 */ lwz r0, 4(r30)
|
||||
/* 80D562A4 90 7D 05 68 */ stw r3, 0x568(r29)
|
||||
/* 80D562A8 90 1D 05 6C */ stw r0, 0x56c(r29)
|
||||
/* 80D562AC 80 1E 00 08 */ lwz r0, 8(r30)
|
||||
/* 80D562B0 90 1D 05 70 */ stw r0, 0x570(r29)
|
||||
/* 80D562B4 38 7D 05 68 */ addi r3, r29, 0x568
|
||||
/* 80D562B8 4B 60 BD 61 */ bl __ptmf_test
|
||||
/* 80D562BC 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D562C0 41 82 00 1C */ beq lbl_80D562DC
|
||||
/* 80D562C4 7F A3 EB 78 */ mr r3, r29
|
||||
/* 80D562C8 38 80 00 00 */ li r4, 0
|
||||
/* 80D562CC 39 9D 05 68 */ addi r12, r29, 0x568
|
||||
/* 80D562D0 4B 60 BD B5 */ bl __ptmf_scall
|
||||
/* 80D562D4 60 00 00 00 */ nop
|
||||
/* 80D562D8 7C 7F 1B 78 */ mr r31, r3
|
||||
lbl_80D562DC:
|
||||
/* 80D562DC 38 00 00 01 */ li r0, 1
|
||||
/* 80D562E0 B0 1D 05 74 */ sth r0, 0x574(r29)
|
||||
/* 80D562E4 7F E3 FB 78 */ mr r3, r31
|
||||
lbl_80D562E8:
|
||||
/* 80D562E8 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 80D562EC 4B 60 BF 3D */ bl _restgpr_29
|
||||
/* 80D562F0 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 80D562F4 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D562F8 38 21 00 30 */ addi r1, r1, 0x30
|
||||
/* 80D562FC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
lbl_80D56170:
|
||||
/* 80D56170 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D56174 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56178 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D5617C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D56180 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D56184 3C 80 80 D5 */ lis r4, lit_3697@ha /* 0x80D56658@ha */
|
||||
/* 80D56188 38 84 66 58 */ addi r4, r4, lit_3697@l /* 0x80D56658@l */
|
||||
/* 80D5618C C0 24 00 00 */ lfs f1, 0(r4)
|
||||
/* 80D56190 C0 44 00 04 */ lfs f2, 4(r4)
|
||||
/* 80D56194 FC 60 08 90 */ fmr f3, f1
|
||||
/* 80D56198 C0 84 00 08 */ lfs f4, 8(r4)
|
||||
/* 80D5619C C0 A4 00 0C */ lfs f5, 0xc(r4)
|
||||
/* 80D561A0 FC C0 20 90 */ fmr f6, f4
|
||||
/* 80D561A4 4B 2C 43 A5 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff
|
||||
/* 80D561A8 38 00 00 00 */ li r0, 0
|
||||
/* 80D561AC 90 1F 05 5C */ stw r0, 0x55c(r31)
|
||||
/* 80D561B0 38 00 00 06 */ li r0, 6
|
||||
/* 80D561B4 98 1F 05 48 */ stb r0, 0x548(r31)
|
||||
/* 80D561B8 88 1F 04 9A */ lbz r0, 0x49a(r31)
|
||||
/* 80D561BC 60 00 00 04 */ ori r0, r0, 4
|
||||
/* 80D561C0 98 1F 04 9A */ stb r0, 0x49a(r31)
|
||||
/* 80D561C4 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D561C8 4B FF FF 39 */ bl restart__18daTag_BottleItem_cFv
|
||||
/* 80D561CC 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D561D0 4B FF FE 95 */ bl Execute__18daTag_BottleItem_cFv
|
||||
/* 80D561D4 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D561D8 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D561DC 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D561E0 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D561E4 4E 80 00 20 */ blr
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
lbl_80D56418:
|
||||
/* 80D56418 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D5641C 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56420 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56424 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D56428 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D5642C 88 03 05 76 */ lbz r0, 0x576(r3)
|
||||
/* 80D56430 28 00 00 7D */ cmplwi r0, 0x7d
|
||||
/* 80D56434 40 82 00 28 */ bne lbl_80D5645C
|
||||
/* 80D56438 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D5643C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D56440 38 63 07 F0 */ addi r3, r3, 0x7f0
|
||||
/* 80D56444 38 80 00 02 */ li r4, 2
|
||||
/* 80D56448 4B 2D E5 75 */ bl isEventBit__11dSv_event_cCFUs
|
||||
/* 80D5644C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56450 41 82 00 0C */ beq lbl_80D5645C
|
||||
/* 80D56454 38 00 00 7E */ li r0, 0x7e
|
||||
/* 80D56458 98 1F 05 76 */ stb r0, 0x576(r31)
|
||||
lbl_80D5645C:
|
||||
/* 80D5645C 88 1F 05 76 */ lbz r0, 0x576(r31)
|
||||
/* 80D56460 28 00 00 7E */ cmplwi r0, 0x7e
|
||||
/* 80D56464 40 82 00 28 */ bne lbl_80D5648C
|
||||
/* 80D56468 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D5646C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D56470 38 63 07 F0 */ addi r3, r3, 0x7f0
|
||||
/* 80D56474 38 80 00 01 */ li r4, 1
|
||||
/* 80D56478 4B 2D E5 45 */ bl isEventBit__11dSv_event_cCFUs
|
||||
/* 80D5647C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56480 41 82 00 0C */ beq lbl_80D5648C
|
||||
/* 80D56484 38 00 00 7F */ li r0, 0x7f
|
||||
/* 80D56488 98 1F 05 76 */ stb r0, 0x576(r31)
|
||||
lbl_80D5648C:
|
||||
/* 80D5648C 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D56490 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56494 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56498 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D5649C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
lbl_80D56384:
|
||||
/* 80D56384 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D56388 7C 08 02 A6 */ mflr r0
|
||||
/* 80D5638C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56390 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D56394 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D56398 48 00 00 81 */ bl makeSoup__18daTag_BottleItem_cFv
|
||||
/* 80D5639C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D563A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D563A4 80 63 5D B4 */ lwz r3, 0x5db4(r3)
|
||||
/* 80D563A8 80 03 05 74 */ lwz r0, 0x574(r3)
|
||||
/* 80D563AC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
|
||||
/* 80D563B0 40 82 00 20 */ bne lbl_80D563D0
|
||||
/* 80D563B4 88 1F 05 76 */ lbz r0, 0x576(r31)
|
||||
/* 80D563B8 28 00 00 60 */ cmplwi r0, 0x60
|
||||
/* 80D563BC 41 82 00 14 */ beq lbl_80D563D0
|
||||
/* 80D563C0 3C 60 20 00 */ lis r3, 0x2000 /* 0x20000008@ha */
|
||||
/* 80D563C4 38 03 00 08 */ addi r0, r3, 0x0008 /* 0x20000008@l */
|
||||
/* 80D563C8 90 1F 05 5C */ stw r0, 0x55c(r31)
|
||||
/* 80D563CC 48 00 00 0C */ b lbl_80D563D8
|
||||
lbl_80D563D0:
|
||||
/* 80D563D0 38 00 00 00 */ li r0, 0
|
||||
/* 80D563D4 90 1F 05 5C */ stw r0, 0x55c(r31)
|
||||
lbl_80D563D8:
|
||||
/* 80D563D8 80 7F 05 5C */ lwz r3, 0x55c(r31)
|
||||
/* 80D563DC 3C 03 E0 00 */ addis r0, r3, 0xe000
|
||||
/* 80D563E0 28 00 00 08 */ cmplwi r0, 8
|
||||
/* 80D563E4 40 82 00 1C */ bne lbl_80D56400
|
||||
/* 80D563E8 38 00 00 60 */ li r0, 0x60
|
||||
/* 80D563EC 98 1F 05 45 */ stb r0, 0x545(r31)
|
||||
/* 80D563F0 98 1F 05 47 */ stb r0, 0x547(r31)
|
||||
/* 80D563F4 A0 1F 00 FA */ lhz r0, 0xfa(r31)
|
||||
/* 80D563F8 60 00 00 01 */ ori r0, r0, 1
|
||||
/* 80D563FC B0 1F 00 FA */ sth r0, 0xfa(r31)
|
||||
lbl_80D56400:
|
||||
/* 80D56400 38 60 00 01 */ li r3, 1
|
||||
/* 80D56404 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D56408 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D5640C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56410 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56414 4E 80 00 20 */ blr
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
lbl_80D56100:
|
||||
/* 80D56100 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 80D56104 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56108 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 80D5610C A8 83 04 B6 */ lha r4, 0x4b6(r3)
|
||||
/* 80D56110 38 00 00 00 */ li r0, 0
|
||||
/* 80D56114 B0 03 04 DC */ sth r0, 0x4dc(r3)
|
||||
/* 80D56118 B0 83 04 DE */ sth r4, 0x4de(r3)
|
||||
/* 80D5611C B0 03 04 E0 */ sth r0, 0x4e0(r3)
|
||||
/* 80D56120 A8 03 04 DC */ lha r0, 0x4dc(r3)
|
||||
/* 80D56124 B0 03 04 E4 */ sth r0, 0x4e4(r3)
|
||||
/* 80D56128 A8 03 04 DE */ lha r0, 0x4de(r3)
|
||||
/* 80D5612C B0 03 04 E6 */ sth r0, 0x4e6(r3)
|
||||
/* 80D56130 A8 03 04 E0 */ lha r0, 0x4e0(r3)
|
||||
/* 80D56134 B0 03 04 E8 */ sth r0, 0x4e8(r3)
|
||||
/* 80D56138 3C 80 80 D5 */ lis r4, lit_3683@ha /* 0x80D56670@ha */
|
||||
/* 80D5613C 38 A4 66 70 */ addi r5, r4, lit_3683@l /* 0x80D56670@l */
|
||||
/* 80D56140 80 85 00 00 */ lwz r4, 0(r5)
|
||||
/* 80D56144 80 05 00 04 */ lwz r0, 4(r5)
|
||||
/* 80D56148 90 81 00 08 */ stw r4, 8(r1)
|
||||
/* 80D5614C 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 80D56150 80 05 00 08 */ lwz r0, 8(r5)
|
||||
/* 80D56154 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 80D56158 38 81 00 08 */ addi r4, r1, 8
|
||||
/* 80D5615C 48 00 00 B9 */ bl setProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i
|
||||
/* 80D56160 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 80D56164 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56168 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 80D5616C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
lbl_80D56300:
|
||||
/* 80D56300 C0 03 04 D0 */ lfs f0, 0x4d0(r3)
|
||||
/* 80D56304 D0 03 05 50 */ stfs f0, 0x550(r3)
|
||||
/* 80D56308 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
|
||||
/* 80D5630C D0 03 05 54 */ stfs f0, 0x554(r3)
|
||||
/* 80D56310 C0 03 04 D8 */ lfs f0, 0x4d8(r3)
|
||||
/* 80D56314 D0 03 05 58 */ stfs f0, 0x558(r3)
|
||||
/* 80D56318 C0 03 04 D0 */ lfs f0, 0x4d0(r3)
|
||||
/* 80D5631C D0 03 05 38 */ stfs f0, 0x538(r3)
|
||||
/* 80D56320 C0 03 04 D4 */ lfs f0, 0x4d4(r3)
|
||||
/* 80D56324 D0 03 05 3C */ stfs f0, 0x53c(r3)
|
||||
/* 80D56328 C0 03 04 D8 */ lfs f0, 0x4d8(r3)
|
||||
/* 80D5632C D0 03 05 40 */ stfs f0, 0x540(r3)
|
||||
/* 80D56330 4E 80 00 20 */ blr
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
lbl_80D560D8:
|
||||
/* 80D560D8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D560DC 7C 08 02 A6 */ mflr r0
|
||||
/* 80D560E0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D560E4 80 03 00 B0 */ lwz r0, 0xb0(r3)
|
||||
/* 80D560E8 98 03 05 76 */ stb r0, 0x576(r3)
|
||||
/* 80D560EC 48 00 03 2D */ bl makeSoup__18daTag_BottleItem_cFv
|
||||
/* 80D560F0 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D560F4 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D560F8 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D560FC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
lbl_80D564A0:
|
||||
/* 80D564A0 94 21 FF D0 */ stwu r1, -0x30(r1)
|
||||
/* 80D564A4 7C 08 02 A6 */ mflr r0
|
||||
/* 80D564A8 90 01 00 34 */ stw r0, 0x34(r1)
|
||||
/* 80D564AC 93 E1 00 2C */ stw r31, 0x2c(r1)
|
||||
/* 80D564B0 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D564B4 A0 03 05 74 */ lhz r0, 0x574(r3)
|
||||
/* 80D564B8 2C 00 00 01 */ cmpwi r0, 1
|
||||
/* 80D564BC 41 82 00 10 */ beq lbl_80D564CC
|
||||
/* 80D564C0 40 80 00 90 */ bge lbl_80D56550
|
||||
/* 80D564C4 48 00 00 8C */ b lbl_80D56550
|
||||
/* 80D564C8 48 00 00 88 */ b lbl_80D56550
|
||||
lbl_80D564CC:
|
||||
/* 80D564CC A0 1F 00 F8 */ lhz r0, 0xf8(r31)
|
||||
/* 80D564D0 28 00 00 06 */ cmplwi r0, 6
|
||||
/* 80D564D4 41 82 00 7C */ beq lbl_80D56550
|
||||
/* 80D564D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D564DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D564E0 80 A3 5D AC */ lwz r5, 0x5dac(r3)
|
||||
/* 80D564E4 38 61 00 08 */ addi r3, r1, 8
|
||||
/* 80D564E8 38 9F 05 50 */ addi r4, r31, 0x550
|
||||
/* 80D564EC 38 A5 05 50 */ addi r5, r5, 0x550
|
||||
/* 80D564F0 4B 51 06 45 */ bl __mi__4cXyzCFRC3Vec
|
||||
/* 80D564F4 C0 01 00 08 */ lfs f0, 8(r1)
|
||||
/* 80D564F8 D0 01 00 14 */ stfs f0, 0x14(r1)
|
||||
/* 80D564FC C0 61 00 0C */ lfs f3, 0xc(r1)
|
||||
/* 80D56500 D0 61 00 18 */ stfs f3, 0x18(r1)
|
||||
/* 80D56504 C0 01 00 10 */ lfs f0, 0x10(r1)
|
||||
/* 80D56508 D0 01 00 1C */ stfs f0, 0x1c(r1)
|
||||
/* 80D5650C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80D56510 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80D56514 38 63 5B 54 */ addi r3, r3, 0x5b54
|
||||
/* 80D56518 7F E4 FB 78 */ mr r4, r31
|
||||
/* 80D5651C 88 BF 05 76 */ lbz r5, 0x576(r31)
|
||||
/* 80D56520 3C C0 80 D5 */ lis r6, lit_3796@ha /* 0x80D56668@ha */
|
||||
/* 80D56524 C0 26 66 68 */ lfs f1, lit_3796@l(r6) /* 0x80D56668@l */
|
||||
/* 80D56528 3C C0 80 D5 */ lis r6, lit_3797@ha /* 0x80D5666C@ha */
|
||||
/* 80D5652C C0 06 66 6C */ lfs f0, lit_3797@l(r6) /* 0x80D5666C@l */
|
||||
/* 80D56530 EC 40 18 2A */ fadds f2, f0, f3
|
||||
/* 80D56534 EC 63 00 28 */ fsubs f3, f3, f0
|
||||
/* 80D56538 38 C0 20 00 */ li r6, 0x2000
|
||||
/* 80D5653C 38 E0 00 01 */ li r7, 1
|
||||
/* 80D56540 4B 31 D4 C9 */ bl request__11dAttCatch_cFP10fopAc_ac_cUcfffsi
|
||||
/* 80D56544 A0 1F 00 FA */ lhz r0, 0xfa(r31)
|
||||
/* 80D56548 60 00 00 40 */ ori r0, r0, 0x40
|
||||
/* 80D5654C B0 1F 00 FA */ sth r0, 0xfa(r31)
|
||||
lbl_80D56550:
|
||||
/* 80D56550 38 60 00 01 */ li r3, 1
|
||||
/* 80D56554 83 E1 00 2C */ lwz r31, 0x2c(r1)
|
||||
/* 80D56558 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 80D5655C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56560 38 21 00 30 */ addi r1, r1, 0x30
|
||||
/* 80D56564 4E 80 00 20 */ blr
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
lbl_80D56758:
|
||||
/* 80D56758 3C 80 80 D5 */ lis r4, lit_3650@ha /* 0x80D56AF4@ha */
|
||||
/* 80D5675C 38 84 6A F4 */ addi r4, r4, lit_3650@l /* 0x80D56AF4@l */
|
||||
/* 80D56760 C0 44 00 00 */ lfs f2, 0(r4)
|
||||
/* 80D56764 C0 03 04 EC */ lfs f0, 0x4ec(r3)
|
||||
/* 80D56768 EC 02 00 32 */ fmuls f0, f2, f0
|
||||
/* 80D5676C D0 03 05 68 */ stfs f0, 0x568(r3)
|
||||
/* 80D56770 C0 03 04 F4 */ lfs f0, 0x4f4(r3)
|
||||
/* 80D56774 EC 02 00 32 */ fmuls f0, f2, f0
|
||||
/* 80D56778 D0 03 05 70 */ stfs f0, 0x570(r3)
|
||||
/* 80D5677C C0 24 00 04 */ lfs f1, 4(r4)
|
||||
/* 80D56780 C0 03 04 EC */ lfs f0, 0x4ec(r3)
|
||||
/* 80D56784 EC 01 00 32 */ fmuls f0, f1, f0
|
||||
/* 80D56788 D0 03 05 74 */ stfs f0, 0x574(r3)
|
||||
/* 80D5678C C0 03 04 F4 */ lfs f0, 0x4f4(r3)
|
||||
/* 80D56790 EC 02 00 32 */ fmuls f0, f2, f0
|
||||
/* 80D56794 D0 03 05 7C */ stfs f0, 0x57c(r3)
|
||||
/* 80D56798 C0 03 04 EC */ lfs f0, 0x4ec(r3)
|
||||
/* 80D5679C EC 01 00 32 */ fmuls f0, f1, f0
|
||||
/* 80D567A0 D0 03 05 80 */ stfs f0, 0x580(r3)
|
||||
/* 80D567A4 C0 03 04 F4 */ lfs f0, 0x4f4(r3)
|
||||
/* 80D567A8 EC 01 00 32 */ fmuls f0, f1, f0
|
||||
/* 80D567AC D0 03 05 88 */ stfs f0, 0x588(r3)
|
||||
/* 80D567B0 C0 03 04 EC */ lfs f0, 0x4ec(r3)
|
||||
/* 80D567B4 EC 02 00 32 */ fmuls f0, f2, f0
|
||||
/* 80D567B8 D0 03 05 8C */ stfs f0, 0x58c(r3)
|
||||
/* 80D567BC C0 03 04 F4 */ lfs f0, 0x4f4(r3)
|
||||
/* 80D567C0 EC 01 00 32 */ fmuls f0, f1, f0
|
||||
/* 80D567C4 D0 03 05 94 */ stfs f0, 0x594(r3)
|
||||
/* 80D567C8 C0 04 00 08 */ lfs f0, 8(r4)
|
||||
/* 80D567CC D0 03 05 90 */ stfs f0, 0x590(r3)
|
||||
/* 80D567D0 D0 03 05 84 */ stfs f0, 0x584(r3)
|
||||
/* 80D567D4 D0 03 05 78 */ stfs f0, 0x578(r3)
|
||||
/* 80D567D8 D0 03 05 6C */ stfs f0, 0x56c(r3)
|
||||
/* 80D567DC 38 60 00 01 */ li r3, 1
|
||||
/* 80D567E0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
lbl_80D56878:
|
||||
/* 80D56878 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D5687C 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56880 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56884 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D56888 7C 7F 1B 79 */ or. r31, r3, r3
|
||||
/* 80D5688C 41 82 00 10 */ beq lbl_80D5689C
|
||||
/* 80D56890 7C 80 07 35 */ extsh. r0, r4
|
||||
/* 80D56894 40 81 00 08 */ ble lbl_80D5689C
|
||||
/* 80D56898 4B 57 84 A5 */ bl __dl__FPv
|
||||
lbl_80D5689C:
|
||||
/* 80D5689C 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D568A0 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D568A4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D568A8 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D568AC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D568B0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D56ACC:
|
||||
/* 80D56ACC 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D56AD0 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56AD4 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56AD8 4B FF FD 0D */ bl create__17daTagChgRestart_cFv
|
||||
/* 80D56ADC 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56AE0 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56AE4 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56AE8 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D56AAC:
|
||||
/* 80D56AAC 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D56AB0 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56AB4 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56AB8 4B FF FF CD */ bl _delete__17daTagChgRestart_cFv
|
||||
/* 80D56ABC 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56AC0 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56AC4 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56AC8 4E 80 00 20 */ blr
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
lbl_80D56A8C:
|
||||
/* 80D56A8C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D56A90 7C 08 02 A6 */ mflr r0
|
||||
/* 80D56A94 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D56A98 4B FF FE 21 */ bl execute__17daTagChgRestart_cFv
|
||||
/* 80D56A9C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D56AA0 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56AA4 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56AA8 4E 80 00 20 */ blr
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
lbl_80D567E4:
|
||||
/* 80D567E4 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80D567E8 7C 08 02 A6 */ mflr r0
|
||||
/* 80D567EC 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80D567F0 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80D567F4 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 80D567F8 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80D567FC 80 03 04 A0 */ lwz r0, 0x4a0(r3)
|
||||
/* 80D56800 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
|
||||
/* 80D56804 40 82 00 40 */ bne lbl_80D56844
|
||||
/* 80D56808 7F E0 FB 79 */ or. r0, r31, r31
|
||||
/* 80D5680C 41 82 00 2C */ beq lbl_80D56838
|
||||
/* 80D56810 7C 1E 03 78 */ mr r30, r0
|
||||
/* 80D56814 4B 2C 23 51 */ bl __ct__10fopAc_ac_cFv
|
||||
/* 80D56818 38 7E 05 68 */ addi r3, r30, 0x568
|
||||
/* 80D5681C 3C 80 80 D5 */ lis r4, __ct__4cXyzFv@ha /* 0x80D568B4@ha */
|
||||
/* 80D56820 38 84 68 B4 */ addi r4, r4, __ct__4cXyzFv@l /* 0x80D568B4@l */
|
||||
/* 80D56824 3C A0 80 D5 */ lis r5, __dt__4cXyzFv@ha /* 0x80D56878@ha */
|
||||
/* 80D56828 38 A5 68 78 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80D56878@l */
|
||||
/* 80D5682C 38 C0 00 0C */ li r6, 0xc
|
||||
/* 80D56830 38 E0 00 04 */ li r7, 4
|
||||
/* 80D56834 4B 60 B5 2D */ bl __construct_array
|
||||
lbl_80D56838:
|
||||
/* 80D56838 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
|
||||
/* 80D5683C 60 00 00 08 */ ori r0, r0, 8
|
||||
/* 80D56840 90 1F 04 A0 */ stw r0, 0x4a0(r31)
|
||||
lbl_80D56844:
|
||||
/* 80D56844 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80D56848 4B FF FF 11 */ bl Create__17daTagChgRestart_cFv
|
||||
/* 80D5684C 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80D56850 40 82 00 0C */ bne lbl_80D5685C
|
||||
/* 80D56854 38 60 00 05 */ li r3, 5
|
||||
/* 80D56858 48 00 00 08 */ b lbl_80D56860
|
||||
lbl_80D5685C:
|
||||
/* 80D5685C 38 60 00 04 */ li r3, 4
|
||||
lbl_80D56860:
|
||||
/* 80D56860 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80D56864 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 80D56868 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80D5686C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80D56870 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80D56874 4E 80 00 20 */ blr
|
||||
|
|
@ -1811,6 +1811,12 @@ inline void dComIfGp_att_LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist,
|
|||
param_5);
|
||||
}
|
||||
|
||||
inline void dComIfGp_att_CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, f32 i_upDist,
|
||||
f32 i_downDist, s16 i_angle, int param_5) {
|
||||
dComIfGp_getAttention().getCatghTarget().request(param_0, param_1, i_horizontalDist, i_upDist, i_downDist, i_angle,
|
||||
param_5);
|
||||
}
|
||||
|
||||
inline J2DGrafContext* dComIfGp_getCurrentGrafPort() {
|
||||
return g_dComIfG_gameInfo.play.getCurrentGrafPort();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -388,5 +388,6 @@ BOOL isHeart(u8 item_no);
|
|||
s32 isBomb(u8);
|
||||
s32 isArrow(u8);
|
||||
int addBombCount(u8, u8);
|
||||
BOOL isBottleItem(u8 item_no);
|
||||
|
||||
#endif /* D_D_ITEM_H */
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ public:
|
|||
bool checkCommandItem() { return mCommand == 4; }
|
||||
BOOL i_checkCommandDoor() { return mCommand == 3; }
|
||||
bool i_checkCommandDemoAccrpt() { return mCommand == 2; }
|
||||
bool i_checkCommandCatch() { return mCommand == 6; }
|
||||
|
||||
void suspendProc(void* actor) {
|
||||
if (field_0x10 != NULL) {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,36 @@
|
|||
#ifndef D_A_TAG_BOTTLE_ITEM_H
|
||||
#define D_A_TAG_BOTTLE_ITEM_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
|
||||
|
||||
class daTag_BottleItem_c;
|
||||
typedef int (daTag_BottleItem_c::*ProcessFunc)(void*);
|
||||
|
||||
class daTag_BottleItem_c : public fopAc_ac_c {
|
||||
private:
|
||||
/* 0x0568 */ ProcessFunc mProcessFunc;
|
||||
/* 0x056C */ u16 mEventType;
|
||||
/* 0x0576 */ u8 mBottleItemType;
|
||||
|
||||
public:
|
||||
/* 80D55FD8 */ s32 create();
|
||||
/* 80D5605C */ s32 Delete();
|
||||
/* 80D56064 */ s32 Execute();
|
||||
/* 80D560D0 */ s32 Draw();
|
||||
/* 80D560D8 */ void setTypeFromParam();
|
||||
/* 80D56100 */ void restart();
|
||||
/* 80D56170 */ void initialize();
|
||||
/* 80D561E8 */ int checkProcess(ProcessFunc);
|
||||
/* 80D56214 */ int setProcess(ProcessFunc);
|
||||
/* 80D56300 */ void setAttnPos();
|
||||
/* 80D56334 */ s32 chkEvent();
|
||||
/* 80D56384 */ s32 orderEvent();
|
||||
/* 80D56418 */ void makeSoup();
|
||||
/* 80D564A0 */ int wait(void*);
|
||||
/* 80D565F0 */ virtual ~daTag_BottleItem_c();
|
||||
};
|
||||
STATIC_ASSERT(sizeof(daTag_BottleItem_c) == 0x57C);
|
||||
|
||||
#endif /* D_A_TAG_BOTTLE_ITEM_H */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,24 @@
|
|||
#ifndef D_A_TAG_CHGRESTART_H
|
||||
#define D_A_TAG_CHGRESTART_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daTagChgRestart_c : public fopAc_ac_c {
|
||||
public:
|
||||
daTagChgRestart_c() {}
|
||||
/* 80D56758 */ s32 Create();
|
||||
/* 80D567E4 */ s32 create();
|
||||
/* 80D568B8 */ s32 execute();
|
||||
/* 80D56A84 */ s32 _delete();
|
||||
|
||||
/* 0x0568 */ cXyz field_0x568[4];
|
||||
};
|
||||
STATIC_ASSERT(sizeof(daTagChgRestart_c) == 0x598);
|
||||
|
||||
namespace daTagChgRestart_prm {
|
||||
inline u8 getSwNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart) >> 8; }
|
||||
inline u8 getPlayerNo(daTagChgRestart_c* p_chgRestart) { return fopAcM_GetParam(p_chgRestart); }
|
||||
}; // namespace daTagChgRestart_prm
|
||||
|
||||
#endif /* D_A_TAG_CHGRESTART_H */
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
*/
|
||||
|
||||
#include "rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80D55CD8-80D55D28 000078 0050+00 1/0 0/0 0/0 .text daTagArena_Create__FP10fopAc_ac_c
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
*/
|
||||
|
||||
#include "rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80D55E38-80D55E98 000078 0060+00 1/0 0/0 0/0 .text daTagAssist_Create__FP10fopAc_ac_c
|
||||
|
|
|
|||
|
|
@ -1,361 +1,235 @@
|
|||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d_a_tag_bottle_item
|
||||
//
|
||||
/**
|
||||
* d_a_tag_bottle_item.cpp
|
||||
*
|
||||
*/
|
||||
|
||||
#include "rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
/* 80018C8C */ ~fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daTag_BottleItem_c {
|
||||
/* 80D55FD8 */ void create();
|
||||
/* 80D5605C */ bool Delete();
|
||||
/* 80D56064 */ void Execute();
|
||||
/* 80D560D0 */ bool Draw();
|
||||
/* 80D560D8 */ void setTypeFromParam();
|
||||
/* 80D56100 */ void restart();
|
||||
/* 80D56170 */ void initialize();
|
||||
/* 80D561E8 */ void checkProcess(int (daTag_BottleItem_c::*)(void*));
|
||||
/* 80D56214 */ void setProcess(int (daTag_BottleItem_c::*)(void*));
|
||||
/* 80D56300 */ void setAttnPos();
|
||||
/* 80D56334 */ void chkEvent();
|
||||
/* 80D56384 */ void orderEvent();
|
||||
/* 80D56418 */ void makeSoup();
|
||||
/* 80D564A0 */ void wait(void*);
|
||||
/* 80D565F0 */ ~daTag_BottleItem_c();
|
||||
};
|
||||
|
||||
struct dSv_event_c {
|
||||
/* 800349BC */ void isEventBit(u16) const;
|
||||
};
|
||||
|
||||
struct dAttCatch_c {
|
||||
/* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int);
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
/* 80266B34 */ void operator-(Vec const&) const;
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void create__18daTag_BottleItem_cFv();
|
||||
extern "C" bool Delete__18daTag_BottleItem_cFv();
|
||||
extern "C" void Execute__18daTag_BottleItem_cFv();
|
||||
extern "C" bool Draw__18daTag_BottleItem_cFv();
|
||||
extern "C" void setTypeFromParam__18daTag_BottleItem_cFv();
|
||||
extern "C" void restart__18daTag_BottleItem_cFv();
|
||||
extern "C" void initialize__18daTag_BottleItem_cFv();
|
||||
extern "C" void checkProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i();
|
||||
extern "C" void setProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i();
|
||||
extern "C" void setAttnPos__18daTag_BottleItem_cFv();
|
||||
extern "C" void chkEvent__18daTag_BottleItem_cFv();
|
||||
extern "C" void orderEvent__18daTag_BottleItem_cFv();
|
||||
extern "C" void makeSoup__18daTag_BottleItem_cFv();
|
||||
extern "C" void wait__18daTag_BottleItem_cFPv();
|
||||
extern "C" static void daTag_BottleItem_Create__FPv();
|
||||
extern "C" static void daTag_BottleItem_Delete__FPv();
|
||||
extern "C" static void daTag_BottleItem_Execute__FPv();
|
||||
extern "C" static void daTag_BottleItem_Draw__FPv();
|
||||
extern "C" static bool daTag_BottleItem_IsDelete__FPv();
|
||||
extern "C" void __dt__18daTag_BottleItem_cFv();
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void __dt__10fopAc_ac_cFv();
|
||||
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
|
||||
extern "C" void isEventBit__11dSv_event_cCFUs();
|
||||
extern "C" void request__11dAttCatch_cFP10fopAc_ac_cUcfffsi();
|
||||
extern "C" void isBottleItem__FUc();
|
||||
extern "C" void __mi__4cXyzCFRC3Vec();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void __ptmf_test();
|
||||
extern "C" void __ptmf_cmpr();
|
||||
extern "C" void __ptmf_scall();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D56670-80D5667C -00001 000C+00 1/1 0/0 0/0 .data @3683 */
|
||||
SECTION_DATA static void* lit_3683[3] = {
|
||||
(void*)NULL,
|
||||
(void*)0xFFFFFFFF,
|
||||
(void*)wait__18daTag_BottleItem_cFPv,
|
||||
};
|
||||
|
||||
/* 80D5667C-80D5669C -00001 0020+00 1/0 0/0 0/0 .data daTag_BottleItem_MethodTable */
|
||||
SECTION_DATA static void* daTag_BottleItem_MethodTable[8] = {
|
||||
(void*)daTag_BottleItem_Create__FPv,
|
||||
(void*)daTag_BottleItem_Delete__FPv,
|
||||
(void*)daTag_BottleItem_Execute__FPv,
|
||||
(void*)daTag_BottleItem_IsDelete__FPv,
|
||||
(void*)daTag_BottleItem_Draw__FPv,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
};
|
||||
|
||||
/* 80D5669C-80D566CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_BTLITM */
|
||||
SECTION_DATA extern void* g_profile_TAG_BTLITM[12] = {
|
||||
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
|
||||
(void*)0x01220000, (void*)&g_fpcLf_Method,
|
||||
(void*)0x0000057C, (void*)NULL,
|
||||
(void*)NULL, (void*)&g_fopAc_Method,
|
||||
(void*)0x00460000, (void*)&daTag_BottleItem_MethodTable,
|
||||
(void*)0x00064100, (void*)0x050E0000,
|
||||
};
|
||||
|
||||
/* 80D566CC-80D566D8 00005C 000C+00 2/2 0/0 0/0 .data __vt__18daTag_BottleItem_c */
|
||||
SECTION_DATA extern void* __vt__18daTag_BottleItem_c[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
(void*)NULL,
|
||||
(void*)__dt__18daTag_BottleItem_cFv,
|
||||
};
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "d/d_item.h"
|
||||
#include "d/a/d_a_player.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80D55FD8-80D5605C 000078 0084+00 1/1 0/0 0/0 .text create__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::create() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/create__18daTag_BottleItem_cFv.s"
|
||||
s32 daTag_BottleItem_c::create() {
|
||||
s32 ret;
|
||||
|
||||
if (!fopAcM_CheckCondition(this, 8)) {
|
||||
new (this) daTag_BottleItem_c();
|
||||
fopAcM_OnCondition(this, 8);
|
||||
}
|
||||
|
||||
setTypeFromParam();
|
||||
|
||||
if (!isBottleItem(mBottleItemType)) {
|
||||
ret = cPhs_ERROR_e;
|
||||
} else {
|
||||
initialize();
|
||||
ret = cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
|
||||
/* 80D5605C-80D56064 0000FC 0008+00 1/1 0/0 0/0 .text Delete__18daTag_BottleItem_cFv */
|
||||
bool daTag_BottleItem_c::Delete() {
|
||||
return true;
|
||||
s32 daTag_BottleItem_c::Delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D56064-80D560D0 000104 006C+00 2/2 0/0 0/0 .text Execute__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::Execute() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/Execute__18daTag_BottleItem_cFv.s"
|
||||
s32 daTag_BottleItem_c::Execute() {
|
||||
if (chkEvent()) {
|
||||
if (mProcessFunc) {
|
||||
(this->*mProcessFunc)(0);
|
||||
}
|
||||
orderEvent();
|
||||
}
|
||||
|
||||
setAttnPos();
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D560D0-80D560D8 000170 0008+00 1/1 0/0 0/0 .text Draw__18daTag_BottleItem_cFv */
|
||||
bool daTag_BottleItem_c::Draw() {
|
||||
return true;
|
||||
s32 daTag_BottleItem_c::Draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D560D8-80D56100 000178 0028+00 1/1 0/0 0/0 .text setTypeFromParam__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::setTypeFromParam() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/setTypeFromParam__18daTag_BottleItem_cFv.s"
|
||||
void daTag_BottleItem_c::setTypeFromParam() {
|
||||
mBottleItemType = fopAcM_GetParam(this);
|
||||
makeSoup();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56100-80D56170 0001A0 0070+00 1/1 0/0 0/0 .text restart__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::restart() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/restart__18daTag_BottleItem_cFv.s"
|
||||
void daTag_BottleItem_c::restart() {
|
||||
current.angle.set(0,orig.angle.y,0);
|
||||
shape_angle = current.angle;
|
||||
setProcess(&daTag_BottleItem_c::wait);
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D56658-80D5665C 000000 0004+00 1/1 0/0 0/0 .rodata @3697 */
|
||||
SECTION_RODATA static f32 const lit_3697 = -30.0f;
|
||||
COMPILER_STRIP_GATE(0x80D56658, &lit_3697);
|
||||
|
||||
/* 80D5665C-80D56660 000004 0004+00 0/1 0/0 0/0 .rodata @3698 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3698 = -15.0f;
|
||||
COMPILER_STRIP_GATE(0x80D5665C, &lit_3698);
|
||||
#pragma pop
|
||||
|
||||
/* 80D56660-80D56664 000008 0004+00 0/1 0/0 0/0 .rodata @3699 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3699 = 30.0f;
|
||||
COMPILER_STRIP_GATE(0x80D56660, &lit_3699);
|
||||
#pragma pop
|
||||
|
||||
/* 80D56664-80D56668 00000C 0004+00 0/1 0/0 0/0 .rodata @3700 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3700 = 45.0f;
|
||||
COMPILER_STRIP_GATE(0x80D56664, &lit_3700);
|
||||
#pragma pop
|
||||
|
||||
/* 80D56170-80D561E8 000210 0078+00 1/1 0/0 0/0 .text initialize__18daTag_BottleItem_cFv
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::initialize() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/initialize__18daTag_BottleItem_cFv.s"
|
||||
void daTag_BottleItem_c::initialize() {
|
||||
fopAcM_setCullSizeBox(this,-30.0f,-15.0f,-30.0f,30.0f,45.0f,30.0f);
|
||||
mAttentionInfo.mFlags = 0;
|
||||
mAttentionInfo.field_0x0[4] = 6;
|
||||
fopAcM_OnCarryType(this,fopAcM_CARRY_SIDE);
|
||||
restart();
|
||||
Execute();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D561E8-80D56214 000288 002C+00 1/1 0/0 0/0 .text
|
||||
* checkProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::checkProcess(int (daTag_BottleItem_c::*param_0)(void*)) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/func_80D561E8.s"
|
||||
int daTag_BottleItem_c::checkProcess(ProcessFunc i_processFunc) {
|
||||
return mProcessFunc == i_processFunc;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56214-80D56300 0002B4 00EC+00 1/1 0/0 0/0 .text
|
||||
* setProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::setProcess(int (daTag_BottleItem_c::*param_0)(void*)) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/func_80D56214.s"
|
||||
int daTag_BottleItem_c::setProcess(ProcessFunc i_processFunc) {
|
||||
int uVar3 = 0;
|
||||
|
||||
if (checkProcess(i_processFunc)) {
|
||||
return 0;
|
||||
} else {
|
||||
mEventType = 2;
|
||||
|
||||
if (mProcessFunc) {
|
||||
uVar3 = (this->*mProcessFunc)(0);
|
||||
}
|
||||
|
||||
mEventType = 0;
|
||||
mProcessFunc = i_processFunc;
|
||||
|
||||
if (mProcessFunc) {
|
||||
uVar3 = (this->*mProcessFunc)(0);
|
||||
}
|
||||
mEventType = 1;
|
||||
}
|
||||
return uVar3;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56300-80D56334 0003A0 0034+00 1/1 0/0 0/0 .text setAttnPos__18daTag_BottleItem_cFv
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::setAttnPos() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/setAttnPos__18daTag_BottleItem_cFv.s"
|
||||
void daTag_BottleItem_c::setAttnPos() {
|
||||
mAttentionInfo.mPosition = current.pos;
|
||||
mEyePos = current.pos;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56334-80D56384 0003D4 0050+00 1/1 0/0 0/0 .text chkEvent__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::chkEvent() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/chkEvent__18daTag_BottleItem_cFv.s"
|
||||
s32 daTag_BottleItem_c::chkEvent() {
|
||||
s32 uVar2 = 1;
|
||||
|
||||
if (!i_dComIfGp_getEvent().i_isOrderOK()) {
|
||||
uVar2 = 0;
|
||||
|
||||
if (mEvtInfo.i_checkCommandCatch()) {
|
||||
return uVar2;
|
||||
}
|
||||
}
|
||||
return uVar2;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56384-80D56418 000424 0094+00 1/1 0/0 0/0 .text orderEvent__18daTag_BottleItem_cFv
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::orderEvent() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/orderEvent__18daTag_BottleItem_cFv.s"
|
||||
s32 daTag_BottleItem_c::orderEvent() {
|
||||
makeSoup();
|
||||
|
||||
if (!daPy_py_c::i_checkNowWolf() && mBottleItemType != EMPTY_BOTTLE) {
|
||||
mAttentionInfo.mFlags = 0x20000008;
|
||||
} else {
|
||||
mAttentionInfo.mFlags = 0;
|
||||
}
|
||||
|
||||
if (mAttentionInfo.mFlags == 0x20000008) {
|
||||
mAttentionInfo.field_0x0[1] = EMPTY_BOTTLE;
|
||||
mAttentionInfo.field_0x0[3] = EMPTY_BOTTLE;
|
||||
mEvtInfo.i_onCondition(1);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56418-80D564A0 0004B8 0088+00 2/2 0/0 0/0 .text makeSoup__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::makeSoup() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/makeSoup__18daTag_BottleItem_cFv.s"
|
||||
void daTag_BottleItem_c::makeSoup() {
|
||||
if (mBottleItemType == LV1_SOUP && i_dComIfGs_isEventBit(2)) {
|
||||
mBottleItemType = LV2_SOUP;
|
||||
}
|
||||
|
||||
if (mBottleItemType == LV2_SOUP && i_dComIfGs_isEventBit(1)) {
|
||||
mBottleItemType = LV3_SOUP;
|
||||
}
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D56668-80D5666C 000010 0004+00 1/1 0/0 0/0 .rodata @3796 */
|
||||
SECTION_RODATA static f32 const lit_3796 = 140.0f;
|
||||
COMPILER_STRIP_GATE(0x80D56668, &lit_3796);
|
||||
|
||||
/* 80D5666C-80D56670 000014 0004+00 1/1 0/0 0/0 .rodata @3797 */
|
||||
SECTION_RODATA static f32 const lit_3797 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x80D5666C, &lit_3797);
|
||||
|
||||
/* 80D564A0-80D56568 000540 00C8+00 1/0 0/0 0/0 .text wait__18daTag_BottleItem_cFPv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTag_BottleItem_c::wait(void* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/wait__18daTag_BottleItem_cFPv.s"
|
||||
int daTag_BottleItem_c::wait(void* param_0) {
|
||||
switch(mEventType) {
|
||||
case 1:
|
||||
if (mEvtInfo.i_checkCommandCatch() == 0){
|
||||
fopAc_ac_c* player = dComIfGp_getPlayer(0);
|
||||
cXyz pos = mAttentionInfo.mPosition - player->mAttentionInfo.mPosition;
|
||||
|
||||
dComIfGp_att_CatchRequest(this,mBottleItemType,140.0f,pos.y+100.0f,pos.y-100.0f,0x2000,1);
|
||||
mEvtInfo.i_onCondition(0x40);
|
||||
}
|
||||
case 2:
|
||||
case 0:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56568-80D56588 000608 0020+00 1/0 0/0 0/0 .text daTag_BottleItem_Create__FPv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTag_BottleItem_Create(void* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/daTag_BottleItem_Create__FPv.s"
|
||||
static s32 daTag_BottleItem_Create(void* i_this) {
|
||||
return static_cast<daTag_BottleItem_c*>(i_this)->create();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56588-80D565A8 000628 0020+00 1/0 0/0 0/0 .text daTag_BottleItem_Delete__FPv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTag_BottleItem_Delete(void* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/daTag_BottleItem_Delete__FPv.s"
|
||||
static s32 daTag_BottleItem_Delete(void* i_this) {
|
||||
return static_cast<daTag_BottleItem_c*>(i_this)->Delete();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D565A8-80D565C8 000648 0020+00 1/0 0/0 0/0 .text daTag_BottleItem_Execute__FPv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTag_BottleItem_Execute(void* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/daTag_BottleItem_Execute__FPv.s"
|
||||
static s32 daTag_BottleItem_Execute(void* i_this) {
|
||||
return static_cast<daTag_BottleItem_c*>(i_this)->Execute();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D565C8-80D565E8 000668 0020+00 1/0 0/0 0/0 .text daTag_BottleItem_Draw__FPv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTag_BottleItem_Draw(void* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/daTag_BottleItem_Draw__FPv.s"
|
||||
static s32 daTag_BottleItem_Draw(void* i_this) {
|
||||
return static_cast<daTag_BottleItem_c*>(i_this)->Draw();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D565E8-80D565F0 000688 0008+00 1/0 0/0 0/0 .text daTag_BottleItem_IsDelete__FPv */
|
||||
static bool daTag_BottleItem_IsDelete(void* param_0) {
|
||||
return true;
|
||||
static s32 daTag_BottleItem_IsDelete(void* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D565F0-80D56650 000690 0060+00 1/0 0/0 0/0 .text __dt__18daTag_BottleItem_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm daTag_BottleItem_c::~daTag_BottleItem_c() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item/__dt__18daTag_BottleItem_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
daTag_BottleItem_c::~daTag_BottleItem_c() {}
|
||||
|
||||
static actor_method_class daTag_BottleItem_MethodTable = {
|
||||
(process_method_func)daTag_BottleItem_Create,
|
||||
(process_method_func)daTag_BottleItem_Delete,
|
||||
(process_method_func)daTag_BottleItem_Execute,
|
||||
(process_method_func)daTag_BottleItem_IsDelete,
|
||||
(process_method_func)daTag_BottleItem_Draw
|
||||
};
|
||||
|
||||
/* 80D5669C-80D566CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_BTLITM */
|
||||
extern actor_process_profile_definition g_profile_TAG_BTLITM = {
|
||||
-3, // mLayerID
|
||||
7, // mListID
|
||||
-3, // mListPri
|
||||
PROC_TAG_SSDRINK, // mProcName
|
||||
&g_fpcLf_Method.mBase, // mSubMtd
|
||||
sizeof(daTag_BottleItem_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // mSubMtd
|
||||
0x46, // mPriority
|
||||
&daTag_BottleItem_MethodTable, // mSubMtd
|
||||
0x00064100, // mStatus
|
||||
5, // mActorType
|
||||
0xE, // mCullType
|
||||
};
|
||||
|
|
@ -1,214 +1,159 @@
|
|||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d_a_tag_chgrestart
|
||||
//
|
||||
/**
|
||||
* d_a_tag_chgrestart.cpp
|
||||
*
|
||||
*/
|
||||
|
||||
#include "rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct mDoMtx_stack_c {
|
||||
static u8 now[48];
|
||||
};
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daTagChgRestart_c {
|
||||
/* 80D56758 */ void Create();
|
||||
/* 80D567E4 */ void create();
|
||||
/* 80D568B8 */ void execute();
|
||||
/* 80D56A84 */ bool _delete();
|
||||
};
|
||||
|
||||
struct cXyz {
|
||||
/* 80D56878 */ ~cXyz();
|
||||
/* 80D568B4 */ cXyz();
|
||||
};
|
||||
|
||||
struct dSv_restart_c {
|
||||
/* 80034F80 */ void setRoom(cXyz const&, s16, s8);
|
||||
};
|
||||
|
||||
struct dSv_info_c {
|
||||
/* 80035200 */ void onSwitch(int, int);
|
||||
/* 80035360 */ void isSwitch(int, int) const;
|
||||
};
|
||||
|
||||
struct dStage_roomControl_c {
|
||||
/* 80024384 */ void getStatusRoomDt(int);
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void Create__17daTagChgRestart_cFv();
|
||||
extern "C" void create__17daTagChgRestart_cFv();
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
extern "C" void __ct__4cXyzFv();
|
||||
extern "C" void execute__17daTagChgRestart_cFv();
|
||||
extern "C" bool _delete__17daTagChgRestart_cFv();
|
||||
extern "C" static void daTagChgRestart_Execute__FP17daTagChgRestart_c();
|
||||
extern "C" static void daTagChgRestart_Delete__FP17daTagChgRestart_c();
|
||||
extern "C" static void daTagChgRestart_Create__FP10fopAc_ac_c();
|
||||
extern "C" extern void* g_profile_Tag_ChgRestart[12];
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void mDoMtx_YrotS__FPA4_fs();
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
|
||||
extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc();
|
||||
extern "C" void onSwitch__10dSv_info_cFii();
|
||||
extern "C" void isSwitch__10dSv_info_cCFii();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void PSMTXMultVec();
|
||||
extern "C" void PSVECSubtract();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" u8 now__14mDoMtx_stack_c[48];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D56AF4-80D56AF8 000000 0004+00 1/1 0/0 0/0 .rodata @3650 */
|
||||
SECTION_RODATA static f32 const lit_3650 = -100.0f;
|
||||
COMPILER_STRIP_GATE(0x80D56AF4, &lit_3650);
|
||||
|
||||
/* 80D56AF8-80D56AFC 000004 0004+00 0/1 0/0 0/0 .rodata @3651 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3651 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x80D56AF8, &lit_3651);
|
||||
#pragma pop
|
||||
|
||||
/* 80D56AFC-80D56B00 000008 0004+00 0/1 0/0 0/0 .rodata @3652 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3652[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80D56AFC, &lit_3652);
|
||||
#pragma pop
|
||||
|
||||
/* 80D56758-80D567E4 000078 008C+00 1/1 0/0 0/0 .text Create__17daTagChgRestart_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTagChgRestart_c::Create() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/Create__17daTagChgRestart_cFv.s"
|
||||
s32 daTagChgRestart_c::Create() {
|
||||
field_0x568[0].x = -100.0f * mScale.x;
|
||||
field_0x568[0].z = -100.0f * mScale.z;
|
||||
|
||||
field_0x568[1].x = 100.0f * mScale.x;
|
||||
field_0x568[1].z = -100.0f * mScale.z;
|
||||
|
||||
field_0x568[2].x = 100.0f * mScale.x;
|
||||
field_0x568[2].z = 100.0f * mScale.z;
|
||||
|
||||
field_0x568[3].x = -100.0f * mScale.x;
|
||||
field_0x568[3].z = 100.0f * mScale.z;
|
||||
|
||||
field_0x568[3].y = 0.0f;
|
||||
field_0x568[2].y = 0.0f;
|
||||
field_0x568[1].y = 0.0f;
|
||||
field_0x568[0].y = 0.0f;
|
||||
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D567E4-80D56878 000104 0094+00 1/1 0/0 0/0 .text create__17daTagChgRestart_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTagChgRestart_c::create() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/func_80D567E4.s"
|
||||
}
|
||||
#pragma pop
|
||||
s32 daTagChgRestart_c::create() {
|
||||
if (!fopAcM_CheckCondition(this, 8)) {
|
||||
new (this) daTagChgRestart_c();
|
||||
fopAcM_OnCondition(this, 8);
|
||||
}
|
||||
|
||||
/* 80D56878-80D568B4 000198 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::~cXyz() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/__dt__4cXyzFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
if (!Create()) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
|
||||
/* 80D568B4-80D568B8 0001D4 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
|
||||
cXyz::cXyz() {
|
||||
/* empty function */
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
|
||||
/* 80D568B8-80D56A84 0001D8 01CC+00 1/1 0/0 0/0 .text execute__17daTagChgRestart_cFv */
|
||||
#ifdef NONMATCHING
|
||||
// do-while loop is wrong
|
||||
s32 daTagChgRestart_c::execute() {
|
||||
if (i_fopAcM_isSwitch(this,daTagChgRestart_prm::getSwNo(this))) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
fopAc_ac_c* player = dComIfGp_getPlayer(0);
|
||||
cXyz pos = player->current.pos;
|
||||
pos -= orig.pos;
|
||||
|
||||
mDoMtx_stack_c::YrotS(-current.angle.y);
|
||||
mDoMtx_stack_c::multVec(&pos,&pos);
|
||||
|
||||
if (field_0x568[0].x < pos.x && field_0x568[0].z < pos.z &&
|
||||
field_0x568[2].x > pos.x && field_0x568[2].z > pos.z) {
|
||||
cXyz l_restartPos = orig.pos;
|
||||
s16 l_restartAngle = orig.angle.y;
|
||||
|
||||
u8 playerNo = daTagChgRestart_prm::getPlayerNo(this);
|
||||
if (playerNo != 0xFF) {
|
||||
dStage_roomStatus_c* roomStatusDt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this));
|
||||
stage_actor_class* actor = roomStatusDt->mRoomDt.getPlayer();
|
||||
stage_actor_data_class* actor_data = actor->mEntries;
|
||||
int entryNum = actor->mEntryNum;
|
||||
|
||||
do {
|
||||
actor_data++;
|
||||
}
|
||||
while (entryNum > 0 && actor->mEntryNum > playerNo && actor_data != 0);
|
||||
|
||||
l_restartPos = actor_data->mSpawnPos;
|
||||
l_restartAngle = actor_data->mAngle.y;
|
||||
}
|
||||
|
||||
s32 l_roomNo = fopAcM_GetRoomNo(player);
|
||||
dComIfGs_setRestartRoom(l_restartPos,l_restartAngle,l_roomNo);
|
||||
i_fopAcM_onSwitch(this,daTagChgRestart_prm::getSwNo(this));
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daTagChgRestart_c::execute() {
|
||||
asm s32 daTagChgRestart_c::execute() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/execute__17daTagChgRestart_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80D56A84-80D56A8C 0003A4 0008+00 1/1 0/0 0/0 .text _delete__17daTagChgRestart_cFv */
|
||||
bool daTagChgRestart_c::_delete() {
|
||||
return true;
|
||||
s32 daTagChgRestart_c::_delete() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D56A8C-80D56AAC 0003AC 0020+00 1/0 0/0 0/0 .text
|
||||
* daTagChgRestart_Execute__FP17daTagChgRestart_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTagChgRestart_Execute(daTagChgRestart_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/daTagChgRestart_Execute__FP17daTagChgRestart_c.s"
|
||||
static s32 daTagChgRestart_Execute(daTagChgRestart_c* i_this) {
|
||||
return i_this->execute();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56AAC-80D56ACC 0003CC 0020+00 1/0 0/0 0/0 .text
|
||||
* daTagChgRestart_Delete__FP17daTagChgRestart_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTagChgRestart_Delete(daTagChgRestart_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/daTagChgRestart_Delete__FP17daTagChgRestart_c.s"
|
||||
static s32 daTagChgRestart_Delete(daTagChgRestart_c* i_this) {
|
||||
return i_this->_delete();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80D56ACC-80D56AEC 0003EC 0020+00 1/0 0/0 0/0 .text daTagChgRestart_Create__FP10fopAc_ac_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daTagChgRestart_Create(fopAc_ac_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart/daTagChgRestart_Create__FP10fopAc_ac_c.s"
|
||||
static s32 daTagChgRestart_Create(fopAc_ac_c* param_0) {
|
||||
return static_cast<daTagChgRestart_c*>(param_0)->create();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80D56B00-80D56B20 -00001 0020+00 1/0 0/0 0/0 .data l_daTagChgRestart_Method */
|
||||
SECTION_DATA static void* l_daTagChgRestart_Method[8] = {
|
||||
(void*)daTagChgRestart_Create__FP10fopAc_ac_c,
|
||||
(void*)daTagChgRestart_Delete__FP17daTagChgRestart_c,
|
||||
(void*)daTagChgRestart_Execute__FP17daTagChgRestart_c,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
static actor_method_class l_daTagChgRestart_Method = {
|
||||
(process_method_func)daTagChgRestart_Create,
|
||||
(process_method_func)daTagChgRestart_Delete,
|
||||
(process_method_func)daTagChgRestart_Execute
|
||||
};
|
||||
|
||||
/* 80D56B20-80D56B50 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_ChgRestart */
|
||||
SECTION_DATA extern void* g_profile_Tag_ChgRestart[12] = {
|
||||
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
|
||||
(void*)0x022E0000, (void*)&g_fpcLf_Method,
|
||||
(void*)0x00000598, (void*)NULL,
|
||||
(void*)NULL, (void*)&g_fopAc_Method,
|
||||
(void*)0x024F0000, (void*)&l_daTagChgRestart_Method,
|
||||
(void*)0x00040000, (void*)0x000E0000,
|
||||
};
|
||||
extern actor_process_profile_definition g_profile_Tag_ChgRestart = {
|
||||
-3, // mLayerID
|
||||
7, // mListID
|
||||
-3, // mListPrio
|
||||
PROC_Tag_ChgRestart, // mProcName
|
||||
&g_fpcLf_Method.mBase, // mSubMtd
|
||||
sizeof(daTagChgRestart_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // mSubMtd
|
||||
0x024F, // mPriority
|
||||
&l_daTagChgRestart_Method, // mSubMtd
|
||||
0x00040000, // mStatus
|
||||
0, // mActorType
|
||||
0x0E // mCullType
|
||||
};
|
||||
|
|
@ -2448,7 +2448,7 @@ s32 isArrow(u8 item_no) {
|
|||
}
|
||||
|
||||
/* 8009B708-8009B77C 096048 0074+00 0/0 4/4 1/1 .text isBottleItem__FUc */
|
||||
bool isBottleItem(u8 item_no) {
|
||||
BOOL isBottleItem(u8 item_no) {
|
||||
switch (item_no) {
|
||||
case OIL_BOTTLE3:
|
||||
case EMPTY_BOTTLE:
|
||||
|
|
@ -2481,9 +2481,9 @@ bool isBottleItem(u8 item_no) {
|
|||
case POU_FIRE2:
|
||||
case POU_FIRE3:
|
||||
case POU_FIRE4:
|
||||
return true;
|
||||
return TRUE;
|
||||
default:
|
||||
return false;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue