falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_wind_stone OK (#2066) 

* set up TU

* d_a_obj_wind_stone OK
This commit is contained in:
Trueffel 2024-02-08 13:35:24 +01:00 committed by GitHub
parent a825c39d93
commit 95176edb82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
51 changed files with 413 additions and 1883 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Progress.md
View File

@ -21,8 +21,8 @@ Total | 51.360867% | 2065052 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 51.360867% | 2065052 | 4020672
RELs | 35.736871% | 4109856 | 11500324
Total | 39.784225% | 6174908 | 15520996
RELs | 35.763653% | 4112936 | 11500324
Total | 39.804069% | 6177988 | 15520996
## RELs
@ -669,7 +669,7 @@ d_a_obj_web0 | 75.286533% | 4204 | 5584
d_a_obj_web1 | 100.000000% | 5772 | 5772
d_a_obj_well_cover | 45.704467% | 1596 | 3492
d_a_obj_wflag | 41.214286% | 2308 | 5600
d_a_obj_wind_stone | 37.702265% | 1864 | 4944
d_a_obj_wind_stone | 100.000000% | 4944 | 4944
d_a_obj_window | 100.000000% | 4820 | 4820
d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932
d_a_obj_wood_statue | 36.601579% | 3524 | 9628
@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 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 | 35.736871% | 4109856 | 11500324
Total | 35.763653% | 4112936 | 11500324

47
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/Delete__13daWindStone_cFv.s
View File

@ -1,47 +0,0 @@
lbl_80D3806C:
/* 80D3806C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38070 7C 08 02 A6 */ mflr r0
/* 80D38074 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D38078 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D3807C 7C 7F 1B 78 */ mr r31, r3
/* 80D38080 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D38084 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D38088 A8 1F 04 B4 */ lha r0, 0x4b4(r31)
/* 80D3808C 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80D38090 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D38094 7C 05 07 74 */ extsb r5, r0
/* 80D38098 4B 2F D2 C9 */ bl isSwitch__10dSv_info_cCFii
/* 80D3809C 2C 03 00 00 */ cmpwi r3, 0
/* 80D380A0 41 82 00 20 */ beq lbl_80D380C0
/* 80D380A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D380A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D380AC A8 1F 04 B4 */ lha r0, 0x4b4(r31)
/* 80D380B0 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80D380B4 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D380B8 7C 05 07 74 */ extsb r5, r0
/* 80D380BC 4B 2F D1 F5 */ bl offSwitch__10dSv_info_cFii
lbl_80D380C0:
/* 80D380C0 80 7F 05 88 */ lwz r3, 0x588(r31)
/* 80D380C4 28 03 00 00 */ cmplwi r3, 0
/* 80D380C8 41 82 00 24 */ beq lbl_80D380EC
/* 80D380CC 4B 53 01 09 */ bl ChkUsed__9cBgW_BgIdCFv
/* 80D380D0 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D380D4 41 82 00 18 */ beq lbl_80D380EC
/* 80D380D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D380DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D380E0 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80D380E4 80 9F 05 88 */ lwz r4, 0x588(r31)
/* 80D380E8 4B 33 C1 69 */ bl Release__4cBgSFP9dBgW_Base
lbl_80D380EC:
/* 80D380EC 7F E3 FB 78 */ mr r3, r31
/* 80D380F0 38 80 FF FF */ li r4, -1
/* 80D380F4 81 9F 05 70 */ lwz r12, 0x570(r31)
/* 80D380F8 81 8C 00 08 */ lwz r12, 8(r12)
/* 80D380FC 7D 89 03 A6 */ mtctr r12
/* 80D38100 4E 80 04 21 */ bctrl
/* 80D38104 38 60 00 01 */ li r3, 1
/* 80D38108 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D3810C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D38110 7C 08 03 A6 */ mtlr r0
/* 80D38114 38 21 00 10 */ addi r1, r1, 0x10
/* 80D38118 4E 80 00 20 */ blr

21
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__ct__13daWindStone_cFv.s
View File

@ -1,21 +0,0 @@
lbl_80D37A18:
/* 80D37A18 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D37A1C 7C 08 02 A6 */ mflr r0
/* 80D37A20 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37A24 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D37A28 7C 7F 1B 78 */ mr r31, r3
/* 80D37A2C 4B 2E 11 39 */ bl __ct__10fopAc_ac_cFv
/* 80D37A30 3C 60 80 D4 */ lis r3, __vt__13daWindStone_c@ha /* 0x80D386B8@ha */
/* 80D37A34 38 03 86 B8 */ addi r0, r3, __vt__13daWindStone_c@l /* 0x80D386B8@l */
/* 80D37A38 90 1F 05 70 */ stw r0, 0x570(r31)
/* 80D37A3C 38 7F 05 74 */ addi r3, r31, 0x574
/* 80D37A40 4B 53 06 35 */ bl __ct__13cBgS_PolyInfoFv
/* 80D37A44 38 00 00 00 */ li r0, 0
/* 80D37A48 90 1F 05 88 */ stw r0, 0x588(r31)
/* 80D37A4C 98 1F 05 C4 */ stb r0, 0x5c4(r31)
/* 80D37A50 7F E3 FB 78 */ mr r3, r31
/* 80D37A54 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D37A58 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37A5C 7C 08 03 A6 */ mtlr r0
/* 80D37A60 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37A64 4E 80 00 20 */ blr

30
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__dt__12dBgS_AcchCirFv.s
View File

@ -1,30 +0,0 @@
lbl_80D37E9C:
/* 80D37E9C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D37EA0 7C 08 02 A6 */ mflr r0
/* 80D37EA4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37EA8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D37EAC 93 C1 00 08 */ stw r30, 8(r1)
/* 80D37EB0 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D37EB4 7C 9F 23 78 */ mr r31, r4
/* 80D37EB8 41 82 00 38 */ beq lbl_80D37EF0
/* 80D37EBC 3C 60 80 D4 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80D38688@ha */
/* 80D37EC0 38 03 86 88 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80D38688@l */
/* 80D37EC4 90 1E 00 0C */ stw r0, 0xc(r30)
/* 80D37EC8 38 7E 00 14 */ addi r3, r30, 0x14
/* 80D37ECC 38 80 FF FF */ li r4, -1
/* 80D37ED0 4B 53 70 49 */ bl __dt__8cM3dGCirFv
/* 80D37ED4 7F C3 F3 78 */ mr r3, r30
/* 80D37ED8 38 80 00 00 */ li r4, 0
/* 80D37EDC 4B 53 01 D5 */ bl __dt__13cBgS_PolyInfoFv
/* 80D37EE0 7F E0 07 35 */ extsh. r0, r31
/* 80D37EE4 40 81 00 0C */ ble lbl_80D37EF0
/* 80D37EE8 7F C3 F3 78 */ mr r3, r30
/* 80D37EEC 4B 59 6E 51 */ bl __dl__FPv
lbl_80D37EF0:
/* 80D37EF0 7F C3 F3 78 */ mr r3, r30
/* 80D37EF4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D37EF8 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D37EFC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37F00 7C 08 03 A6 */ mtlr r0
/* 80D37F04 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37F08 4E 80 00 20 */ blr

30
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__dt__12dBgS_ObjAcchFv.s
View File

@ -1,30 +0,0 @@
lbl_80D37E2C:
/* 80D37E2C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D37E30 7C 08 02 A6 */ mflr r0
/* 80D37E34 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37E38 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D37E3C 93 C1 00 08 */ stw r30, 8(r1)
/* 80D37E40 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D37E44 7C 9F 23 78 */ mr r31, r4
/* 80D37E48 41 82 00 38 */ beq lbl_80D37E80
/* 80D37E4C 3C 80 80 D4 */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80D38694@ha */
/* 80D37E50 38 84 86 94 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80D38694@l */
/* 80D37E54 90 9E 00 10 */ stw r4, 0x10(r30)
/* 80D37E58 38 04 00 0C */ addi r0, r4, 0xc
/* 80D37E5C 90 1E 00 14 */ stw r0, 0x14(r30)
/* 80D37E60 38 04 00 18 */ addi r0, r4, 0x18
/* 80D37E64 90 1E 00 24 */ stw r0, 0x24(r30)
/* 80D37E68 38 80 00 00 */ li r4, 0
/* 80D37E6C 4B 33 E1 29 */ bl __dt__9dBgS_AcchFv
/* 80D37E70 7F E0 07 35 */ extsh. r0, r31
/* 80D37E74 40 81 00 0C */ ble lbl_80D37E80
/* 80D37E78 7F C3 F3 78 */ mr r3, r30
/* 80D37E7C 4B 59 6E C1 */ bl __dl__FPv
lbl_80D37E80:
/* 80D37E80 7F C3 F3 78 */ mr r3, r30
/* 80D37E84 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D37E88 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D37E8C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37E90 7C 08 03 A6 */ mtlr r0
/* 80D37E94 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37E98 4E 80 00 20 */ blr

38
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__dt__13daWindStone_cFv.s
View File

@ -1,38 +0,0 @@
lbl_80D37A68:
/* 80D37A68 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D37A6C 7C 08 02 A6 */ mflr r0
/* 80D37A70 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37A74 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D37A78 93 C1 00 08 */ stw r30, 8(r1)
/* 80D37A7C 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D37A80 7C 9F 23 78 */ mr r31, r4
/* 80D37A84 41 82 00 54 */ beq lbl_80D37AD8
/* 80D37A88 3C 60 80 D4 */ lis r3, __vt__13daWindStone_c@ha /* 0x80D386B8@ha */
/* 80D37A8C 38 03 86 B8 */ addi r0, r3, __vt__13daWindStone_c@l /* 0x80D386B8@l */
/* 80D37A90 90 1E 05 70 */ stw r0, 0x570(r30)
/* 80D37A94 7F C3 F3 78 */ mr r3, r30
/* 80D37A98 41 82 00 08 */ beq lbl_80D37AA0
/* 80D37A9C 38 63 05 68 */ addi r3, r3, 0x568
lbl_80D37AA0:
/* 80D37AA0 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D38634@ha */
/* 80D37AA4 38 84 86 34 */ addi r4, r4, l_arcName@l /* 0x80D38634@l */
/* 80D37AA8 80 84 00 00 */ lwz r4, 0(r4)
/* 80D37AAC 4B 2F 55 5D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc
/* 80D37AB0 38 7E 05 74 */ addi r3, r30, 0x574
/* 80D37AB4 38 80 FF FF */ li r4, -1
/* 80D37AB8 4B 53 05 F9 */ bl __dt__13cBgS_PolyInfoFv
/* 80D37ABC 7F C3 F3 78 */ mr r3, r30
/* 80D37AC0 38 80 00 00 */ li r4, 0
/* 80D37AC4 4B 2E 11 C9 */ bl __dt__10fopAc_ac_cFv
/* 80D37AC8 7F E0 07 35 */ extsh. r0, r31
/* 80D37ACC 40 81 00 0C */ ble lbl_80D37AD8
/* 80D37AD0 7F C3 F3 78 */ mr r3, r30
/* 80D37AD4 4B 59 72 69 */ bl __dl__FPv
lbl_80D37AD8:
/* 80D37AD8 7F C3 F3 78 */ mr r3, r30
/* 80D37ADC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D37AE0 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D37AE4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37AE8 7C 08 03 A6 */ mtlr r0
/* 80D37AEC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37AF0 4E 80 00 20 */ blr

20
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/chkEveOccur__13daWindStone_cFv.s
View File

@ -1,20 +0,0 @@
lbl_80D38278:
/* 80D38278 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D3827C 7C 08 02 A6 */ mflr r0
/* 80D38280 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D38284 7C 64 1B 78 */ mr r4, r3
/* 80D38288 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D3828C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D38290 38 63 07 F0 */ addi r3, r3, 0x7f0
/* 80D38294 80 04 00 B0 */ lwz r0, 0xb0(r4)
/* 80D38298 54 00 8B FC */ rlwinm r0, r0, 0x11, 0xf, 0x1e
/* 80D3829C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */
/* 80D382A0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */
/* 80D382A4 7C 84 02 2E */ lhzx r4, r4, r0
/* 80D382A8 4B 2F C7 15 */ bl isEventBit__11dSv_event_cCFUs
/* 80D382AC 7C 60 00 34 */ cntlzw r0, r3
/* 80D382B0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f
/* 80D382B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D382B8 7C 08 03 A6 */ mtlr r0
/* 80D382BC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D382C0 4E 80 00 20 */ blr

57
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/chkMapDispMode__13daWindStone_cFv.s
View File

@ -1,57 +0,0 @@
lbl_80D383FC:
/* 80D383FC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38400 7C 08 02 A6 */ mflr r0
/* 80D38404 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D38408 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D3840C 7C 7F 1B 78 */ mr r31, r3
/* 80D38410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D38414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D38418 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D3841C 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f
/* 80D38420 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D38424 7C 05 07 74 */ extsb r5, r0
/* 80D38428 4B 2F CF 39 */ bl isSwitch__10dSv_info_cCFii
/* 80D3842C 2C 03 00 00 */ cmpwi r3, 0
/* 80D38430 41 82 00 0C */ beq lbl_80D3843C
/* 80D38434 38 60 00 00 */ li r3, 0
/* 80D38438 48 00 00 78 */ b lbl_80D384B0
lbl_80D3843C:
/* 80D3843C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D38440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D38444 A8 63 0D B8 */ lha r3, 0xdb8(r3)
/* 80D38448 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D3844C 54 00 E7 3E */ rlwinm r0, r0, 0x1c, 0x1c, 0x1f
/* 80D38450 7C 00 07 74 */ extsb r0, r0
/* 80D38454 2C 00 00 05 */ cmpwi r0, 5
/* 80D38458 41 82 00 2C */ beq lbl_80D38484
/* 80D3845C 40 80 00 14 */ bge lbl_80D38470
/* 80D38460 2C 00 00 03 */ cmpwi r0, 3
/* 80D38464 41 82 00 20 */ beq lbl_80D38484
/* 80D38468 40 80 00 30 */ bge lbl_80D38498
/* 80D3846C 48 00 00 40 */ b lbl_80D384AC
lbl_80D38470:
/* 80D38470 2C 00 00 09 */ cmpwi r0, 9
/* 80D38474 40 80 00 38 */ bge lbl_80D384AC
/* 80D38478 2C 00 00 07 */ cmpwi r0, 7
/* 80D3847C 40 80 00 08 */ bge lbl_80D38484
/* 80D38480 48 00 00 18 */ b lbl_80D38498
lbl_80D38484:
/* 80D38484 7C 60 07 34 */ extsh r0, r3
/* 80D38488 2C 00 00 64 */ cmpwi r0, 0x64
/* 80D3848C 40 82 00 20 */ bne lbl_80D384AC
/* 80D38490 38 60 00 01 */ li r3, 1
/* 80D38494 48 00 00 1C */ b lbl_80D384B0
lbl_80D38498:
/* 80D38498 7C 60 07 34 */ extsh r0, r3
/* 80D3849C 2C 00 00 65 */ cmpwi r0, 0x65
/* 80D384A0 40 82 00 0C */ bne lbl_80D384AC
/* 80D384A4 38 60 00 01 */ li r3, 1
/* 80D384A8 48 00 00 08 */ b lbl_80D384B0
lbl_80D384AC:
/* 80D384AC 38 60 00 00 */ li r3, 0
lbl_80D384B0:
/* 80D384B0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D384B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D384B8 7C 08 03 A6 */ mtlr r0
/* 80D384BC 38 21 00 10 */ addi r1, r1, 0x10
/* 80D384C0 4E 80 00 20 */ blr

39
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/chkWlfInRange__13daWindStone_cFv.s
View File

@ -1,39 +0,0 @@
lbl_80D381EC:
/* 80D381EC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80D381F0 7C 08 02 A6 */ mflr r0
/* 80D381F4 90 01 00 24 */ stw r0, 0x24(r1)
/* 80D381F8 7C 65 1B 78 */ mr r5, r3
/* 80D381FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D38200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D38204 80 83 5D AC */ lwz r4, 0x5dac(r3)
/* 80D38208 28 04 00 00 */ cmplwi r4, 0
/* 80D3820C 40 82 00 0C */ bne lbl_80D38218
/* 80D38210 38 60 00 00 */ li r3, 0
/* 80D38214 48 00 00 54 */ b lbl_80D38268
lbl_80D38218:
/* 80D38218 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80D3821C 80 03 05 74 */ lwz r0, 0x574(r3)
/* 80D38220 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6
/* 80D38224 41 82 00 40 */ beq lbl_80D38264
/* 80D38228 C0 04 04 D0 */ lfs f0, 0x4d0(r4)
/* 80D3822C D0 01 00 08 */ stfs f0, 8(r1)
/* 80D38230 C0 04 04 D4 */ lfs f0, 0x4d4(r4)
/* 80D38234 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80D38238 C0 04 04 D8 */ lfs f0, 0x4d8(r4)
/* 80D3823C D0 01 00 10 */ stfs f0, 0x10(r1)
/* 80D38240 38 61 00 08 */ addi r3, r1, 8
/* 80D38244 38 85 04 D0 */ addi r4, r5, 0x4d0
/* 80D38248 4B 60 F1 55 */ bl PSVECSquareDistance
/* 80D3824C 3C 60 80 D4 */ lis r3, lit_4243@ha /* 0x80D38624@ha */
/* 80D38250 C0 03 86 24 */ lfs f0, lit_4243@l(r3) /* 0x80D38624@l */
/* 80D38254 FC 01 00 40 */ fcmpo cr0, f1, f0
/* 80D38258 40 80 00 0C */ bge lbl_80D38264
/* 80D3825C 38 60 00 01 */ li r3, 1
/* 80D38260 48 00 00 08 */ b lbl_80D38268
lbl_80D38264:
/* 80D38264 38 60 00 00 */ li r3, 0
lbl_80D38268:
/* 80D38268 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80D3826C 7C 08 03 A6 */ mtlr r0
/* 80D38270 38 21 00 20 */ addi r1, r1, 0x20
/* 80D38274 4E 80 00 20 */ blr

80
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/createHeap__13daWindStone_cFv.s
View File

@ -1,80 +0,0 @@
lbl_80D37AF4:
/* 80D37AF4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D37AF8 7C 08 02 A6 */ mflr r0
/* 80D37AFC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37B00 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D37B04 93 C1 00 08 */ stw r30, 8(r1)
/* 80D37B08 7C 7F 1B 78 */ mr r31, r3
/* 80D37B0C 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D38634@ha */
/* 80D37B10 38 63 86 34 */ addi r3, r3, l_arcName@l /* 0x80D38634@l */
/* 80D37B14 80 63 00 00 */ lwz r3, 0(r3)
/* 80D37B18 38 80 00 04 */ li r4, 4
/* 80D37B1C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D37B20 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D37B24 3F C5 00 02 */ addis r30, r5, 2
/* 80D37B28 3B DE C2 F8 */ addi r30, r30, -15624
/* 80D37B2C 7F C5 F3 78 */ mr r5, r30
/* 80D37B30 38 C0 00 80 */ li r6, 0x80
/* 80D37B34 4B 30 47 B9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80D37B38 3C 80 00 08 */ lis r4, 8
/* 80D37B3C 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */
/* 80D37B40 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */
/* 80D37B44 4B 2D D1 11 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl
/* 80D37B48 90 7F 05 84 */ stw r3, 0x584(r31)
/* 80D37B4C 80 1F 05 84 */ lwz r0, 0x584(r31)
/* 80D37B50 28 00 00 00 */ cmplwi r0, 0
/* 80D37B54 40 82 00 0C */ bne lbl_80D37B60
/* 80D37B58 38 60 00 00 */ li r3, 0
/* 80D37B5C 48 00 00 AC */ b lbl_80D37C08
lbl_80D37B60:
/* 80D37B60 38 60 00 C0 */ li r3, 0xc0
/* 80D37B64 4B 59 70 E9 */ bl __nw__FUl
/* 80D37B68 7C 60 1B 79 */ or. r0, r3, r3
/* 80D37B6C 41 82 00 0C */ beq lbl_80D37B78
/* 80D37B70 4B 34 3E 01 */ bl __ct__4dBgWFv
/* 80D37B74 7C 60 1B 78 */ mr r0, r3
lbl_80D37B78:
/* 80D37B78 90 1F 05 88 */ stw r0, 0x588(r31)
/* 80D37B7C 80 1F 05 88 */ lwz r0, 0x588(r31)
/* 80D37B80 28 00 00 00 */ cmplwi r0, 0
/* 80D37B84 40 82 00 0C */ bne lbl_80D37B90
/* 80D37B88 38 60 00 00 */ li r3, 0
/* 80D37B8C 48 00 00 7C */ b lbl_80D37C08
lbl_80D37B90:
/* 80D37B90 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D37B94 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D37B98 C0 3F 04 D0 */ lfs f1, 0x4d0(r31)
/* 80D37B9C C0 5F 04 D4 */ lfs f2, 0x4d4(r31)
/* 80D37BA0 C0 7F 04 D8 */ lfs f3, 0x4d8(r31)
/* 80D37BA4 4B 60 ED 45 */ bl PSMTXTrans
/* 80D37BA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D37BAC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D37BB0 A8 9F 04 E6 */ lha r4, 0x4e6(r31)
/* 80D37BB4 4B 2D 48 81 */ bl mDoMtx_YrotM__FPA4_fs
/* 80D37BB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D37BBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D37BC0 38 9F 05 8C */ addi r4, r31, 0x58c
/* 80D37BC4 4B 60 E8 ED */ bl PSMTXCopy
/* 80D37BC8 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D38634@ha */
/* 80D37BCC 38 63 86 34 */ addi r3, r3, l_arcName@l /* 0x80D38634@l */
/* 80D37BD0 80 63 00 00 */ lwz r3, 0(r3)
/* 80D37BD4 38 80 00 07 */ li r4, 7
/* 80D37BD8 7F C5 F3 78 */ mr r5, r30
/* 80D37BDC 38 C0 00 80 */ li r6, 0x80
/* 80D37BE0 4B 30 47 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci
/* 80D37BE4 7C 64 1B 78 */ mr r4, r3
/* 80D37BE8 80 7F 05 88 */ lwz r3, 0x588(r31)
/* 80D37BEC 38 A0 00 01 */ li r5, 1
/* 80D37BF0 38 DF 05 8C */ addi r6, r31, 0x58c
/* 80D37BF4 4B 34 23 45 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f
/* 80D37BF8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80D37BFC 20 60 00 01 */ subfic r3, r0, 1
/* 80D37C00 30 03 FF FF */ addic r0, r3, -1
/* 80D37C04 7C 60 19 10 */ subfe r3, r0, r3
lbl_80D37C08:
/* 80D37C08 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D37C0C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D37C10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37C14 7C 08 03 A6 */ mtlr r0
/* 80D37C18 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37C1C 4E 80 00 20 */ blr

140
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/create__13daWindStone_cFv.s
View File

@ -1,140 +0,0 @@
lbl_80D37C20:
/* 80D37C20 94 21 FD C0 */ stwu r1, -0x240(r1)
/* 80D37C24 7C 08 02 A6 */ mflr r0
/* 80D37C28 90 01 02 44 */ stw r0, 0x244(r1)
/* 80D37C2C 39 61 02 40 */ addi r11, r1, 0x240
/* 80D37C30 4B 62 A5 A1 */ bl _savegpr_26
/* 80D37C34 7C 7C 1B 78 */ mr r28, r3
/* 80D37C38 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D37C3C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D37C40 40 82 00 1C */ bne lbl_80D37C5C
/* 80D37C44 28 1C 00 00 */ cmplwi r28, 0
/* 80D37C48 41 82 00 08 */ beq lbl_80D37C50
/* 80D37C4C 4B FF FD CD */ bl __ct__13daWindStone_cFv
lbl_80D37C50:
/* 80D37C50 80 1C 04 A0 */ lwz r0, 0x4a0(r28)
/* 80D37C54 60 00 00 08 */ ori r0, r0, 8
/* 80D37C58 90 1C 04 A0 */ stw r0, 0x4a0(r28)
lbl_80D37C5C:
/* 80D37C5C 7F 83 E3 78 */ mr r3, r28
/* 80D37C60 28 1C 00 00 */ cmplwi r28, 0
/* 80D37C64 41 82 00 08 */ beq lbl_80D37C6C
/* 80D37C68 38 7C 05 68 */ addi r3, r28, 0x568
lbl_80D37C6C:
/* 80D37C6C 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D38634@ha */
/* 80D37C70 38 84 86 34 */ addi r4, r4, l_arcName@l /* 0x80D38634@l */
/* 80D37C74 80 84 00 00 */ lwz r4, 0(r4)
/* 80D37C78 4B 2F 52 45 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc
/* 80D37C7C 7C 7D 1B 78 */ mr r29, r3
/* 80D37C80 2C 1D 00 04 */ cmpwi r29, 4
/* 80D37C84 40 82 01 8C */ bne lbl_80D37E10
/* 80D37C88 7F 83 E3 78 */ mr r3, r28
/* 80D37C8C 3C 80 80 D3 */ lis r4, daWindStone_c_createHeap__FP10fopAc_ac_c@ha /* 0x80D379F8@ha */
/* 80D37C90 38 84 79 F8 */ addi r4, r4, daWindStone_c_createHeap__FP10fopAc_ac_c@l /* 0x80D379F8@l */
/* 80D37C94 38 A0 10 00 */ li r5, 0x1000
/* 80D37C98 4B 2E 28 19 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl
/* 80D37C9C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D37CA0 40 82 00 0C */ bne lbl_80D37CAC
/* 80D37CA4 38 60 00 05 */ li r3, 5
/* 80D37CA8 48 00 01 6C */ b lbl_80D37E14
lbl_80D37CAC:
/* 80D37CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D37CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D37CB4 3B 63 0F 38 */ addi r27, r3, 0xf38
/* 80D37CB8 7F 63 DB 78 */ mr r3, r27
/* 80D37CBC 80 9C 05 88 */ lwz r4, 0x588(r28)
/* 80D37CC0 7F 85 E3 78 */ mr r5, r28
/* 80D37CC4 4B 33 CD 45 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c
/* 80D37CC8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D37CCC 41 82 00 0C */ beq lbl_80D37CD8
/* 80D37CD0 38 60 00 05 */ li r3, 5
/* 80D37CD4 48 00 01 40 */ b lbl_80D37E14
lbl_80D37CD8:
/* 80D37CD8 7F 83 E3 78 */ mr r3, r28
/* 80D37CDC 48 00 04 A5 */ bl init__13daWindStone_cFv
/* 80D37CE0 7F 83 E3 78 */ mr r3, r28
/* 80D37CE4 48 00 04 39 */ bl setModelMtx__13daWindStone_cFv
/* 80D37CE8 80 7C 05 84 */ lwz r3, 0x584(r28)
/* 80D37CEC 38 03 00 24 */ addi r0, r3, 0x24
/* 80D37CF0 90 1C 05 04 */ stw r0, 0x504(r28)
/* 80D37CF4 38 61 00 10 */ addi r3, r1, 0x10
/* 80D37CF8 4B 33 E1 B5 */ bl __ct__12dBgS_AcchCirFv
/* 80D37CFC 3B 41 00 50 */ addi r26, r1, 0x50
/* 80D37D00 7F 43 D3 78 */ mr r3, r26
/* 80D37D04 4B 33 E3 9D */ bl __ct__9dBgS_AcchFv
/* 80D37D08 3C 60 80 D4 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80D38694@ha */
/* 80D37D0C 38 63 86 94 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80D38694@l */
/* 80D37D10 90 61 00 60 */ stw r3, 0x60(r1)
/* 80D37D14 3B E3 00 0C */ addi r31, r3, 0xc
/* 80D37D18 93 E1 00 64 */ stw r31, 0x64(r1)
/* 80D37D1C 3B C3 00 18 */ addi r30, r3, 0x18
/* 80D37D20 93 C1 00 74 */ stw r30, 0x74(r1)
/* 80D37D24 38 7A 00 14 */ addi r3, r26, 0x14
/* 80D37D28 4B 34 11 41 */ bl SetObj__16dBgS_PolyPassChkFv
/* 80D37D2C 38 61 00 10 */ addi r3, r1, 0x10
/* 80D37D30 3C 80 80 D4 */ lis r4, lit_4127@ha /* 0x80D38614@ha */
/* 80D37D34 C0 24 86 14 */ lfs f1, lit_4127@l(r4) /* 0x80D38614@l */
/* 80D37D38 3C 80 80 D4 */ lis r4, lit_4128@ha /* 0x80D38618@ha */
/* 80D37D3C C0 44 86 18 */ lfs f2, lit_4128@l(r4) /* 0x80D38618@l */
/* 80D37D40 4B 33 E2 19 */ bl SetWall__12dBgS_AcchCirFff
/* 80D37D44 38 00 00 00 */ li r0, 0
/* 80D37D48 90 01 00 08 */ stw r0, 8(r1)
/* 80D37D4C 7F 43 D3 78 */ mr r3, r26
/* 80D37D50 38 9C 04 D0 */ addi r4, r28, 0x4d0
/* 80D37D54 38 BC 04 BC */ addi r5, r28, 0x4bc
/* 80D37D58 7F 86 E3 78 */ mr r6, r28
/* 80D37D5C 38 E0 00 01 */ li r7, 1
/* 80D37D60 39 01 00 10 */ addi r8, r1, 0x10
/* 80D37D64 39 3C 04 F8 */ addi r9, r28, 0x4f8
/* 80D37D68 39 40 00 00 */ li r10, 0
/* 80D37D6C 4B 33 E4 DD */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz
/* 80D37D70 7F 43 D3 78 */ mr r3, r26
/* 80D37D74 7F 64 DB 78 */ mr r4, r27
/* 80D37D78 4B 33 ED 35 */ bl CrrPos__9dBgS_AcchFR4dBgS
/* 80D37D7C C0 01 00 E8 */ lfs f0, 0xe8(r1)
/* 80D37D80 D0 1C 05 BC */ stfs f0, 0x5bc(r28)
/* 80D37D84 A0 01 01 40 */ lhz r0, 0x140(r1)
/* 80D37D88 B0 1C 05 74 */ sth r0, 0x574(r28)
/* 80D37D8C A0 01 01 42 */ lhz r0, 0x142(r1)
/* 80D37D90 B0 1C 05 76 */ sth r0, 0x576(r28)
/* 80D37D94 80 01 01 44 */ lwz r0, 0x144(r1)
/* 80D37D98 90 1C 05 78 */ stw r0, 0x578(r28)
/* 80D37D9C 80 01 01 48 */ lwz r0, 0x148(r1)
/* 80D37DA0 90 1C 05 7C */ stw r0, 0x57c(r28)
/* 80D37DA4 88 1C 05 C4 */ lbz r0, 0x5c4(r28)
/* 80D37DA8 28 00 00 00 */ cmplwi r0, 0
/* 80D37DAC 40 82 00 20 */ bne lbl_80D37DCC
/* 80D37DB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D37DB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D37DB8 A8 1C 04 B4 */ lha r0, 0x4b4(r28)
/* 80D37DBC 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80D37DC0 88 1C 04 BA */ lbz r0, 0x4ba(r28)
/* 80D37DC4 7C 05 07 74 */ extsb r5, r0
/* 80D37DC8 4B 2F D4 39 */ bl onSwitch__10dSv_info_cFii
lbl_80D37DCC:
/* 80D37DCC 3C 60 80 D4 */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80D38694@ha */
/* 80D37DD0 38 03 86 94 */ addi r0, r3, __vt__12dBgS_ObjAcch@l /* 0x80D38694@l */
/* 80D37DD4 90 01 00 60 */ stw r0, 0x60(r1)
/* 80D37DD8 93 E1 00 64 */ stw r31, 0x64(r1)
/* 80D37DDC 93 C1 00 74 */ stw r30, 0x74(r1)
/* 80D37DE0 38 61 00 50 */ addi r3, r1, 0x50
/* 80D37DE4 38 80 00 00 */ li r4, 0
/* 80D37DE8 4B 33 E1 AD */ bl __dt__9dBgS_AcchFv
/* 80D37DEC 3C 60 80 D4 */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80D38688@ha */
/* 80D37DF0 38 03 86 88 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80D38688@l */
/* 80D37DF4 90 01 00 1C */ stw r0, 0x1c(r1)
/* 80D37DF8 38 61 00 24 */ addi r3, r1, 0x24
/* 80D37DFC 38 80 FF FF */ li r4, -1
/* 80D37E00 4B 53 71 19 */ bl __dt__8cM3dGCirFv
/* 80D37E04 38 61 00 10 */ addi r3, r1, 0x10
/* 80D37E08 38 80 00 00 */ li r4, 0
/* 80D37E0C 4B 53 02 A5 */ bl __dt__13cBgS_PolyInfoFv
lbl_80D37E10:
/* 80D37E10 7F A3 EB 78 */ mr r3, r29
lbl_80D37E14:
/* 80D37E14 39 61 02 40 */ addi r11, r1, 0x240
/* 80D37E18 4B 62 A4 05 */ bl _restgpr_26
/* 80D37E1C 80 01 02 44 */ lwz r0, 0x244(r1)
/* 80D37E20 7C 08 03 A6 */ mtlr r0
/* 80D37E24 38 21 02 40 */ addi r1, r1, 0x240
/* 80D37E28 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_Delete__FP13daWindStone_c.s
View File

@ -1,9 +0,0 @@
lbl_80D38590:
/* 80D38590 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38594 7C 08 02 A6 */ mflr r0
/* 80D38598 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D3859C 4B FF FA D1 */ bl Delete__13daWindStone_cFv
/* 80D385A0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D385A4 7C 08 03 A6 */ mtlr r0
/* 80D385A8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D385AC 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_c_createHeap__FP10fopAc_ac_c.s
View File

@ -1,9 +0,0 @@
lbl_80D379F8:
/* 80D379F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D379FC 7C 08 02 A6 */ mflr r0
/* 80D37A00 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37A04 48 00 00 F1 */ bl createHeap__13daWindStone_cFv
/* 80D37A08 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37A0C 7C 08 03 A6 */ mtlr r0
/* 80D37A10 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37A14 4E 80 00 20 */ blr

24
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_create__FP13daWindStone_c.s
View File

@ -1,24 +0,0 @@
lbl_80D3853C:
/* 80D3853C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38540 7C 08 02 A6 */ mflr r0
/* 80D38544 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D38548 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D3854C 7C 7F 1B 78 */ mr r31, r3
/* 80D38550 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D38554 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D38558 40 82 00 1C */ bne lbl_80D38574
/* 80D3855C 28 1F 00 00 */ cmplwi r31, 0
/* 80D38560 41 82 00 08 */ beq lbl_80D38568
/* 80D38564 4B FF F4 B5 */ bl __ct__13daWindStone_cFv
lbl_80D38568:
/* 80D38568 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D3856C 60 00 00 08 */ ori r0, r0, 8
/* 80D38570 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D38574:
/* 80D38574 7F E3 FB 78 */ mr r3, r31
/* 80D38578 4B FF F6 A9 */ bl create__13daWindStone_cFv
/* 80D3857C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D38580 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D38584 7C 08 03 A6 */ mtlr r0
/* 80D38588 38 21 00 10 */ addi r1, r1, 0x10
/* 80D3858C 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_draw__FP13daWindStone_c.s
View File

@ -1,9 +0,0 @@
lbl_80D385D0:
/* 80D385D0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D385D4 7C 08 02 A6 */ mflr r0
/* 80D385D8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D385DC 4B FF F9 91 */ bl draw__13daWindStone_cFv
/* 80D385E0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D385E4 7C 08 03 A6 */ mtlr r0
/* 80D385E8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D385EC 4E 80 00 20 */ blr

9
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_execute__FP13daWindStone_c.s
View File

@ -1,9 +0,0 @@
lbl_80D385B0:
/* 80D385B0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D385B4 7C 08 02 A6 */ mflr r0
/* 80D385B8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D385BC 4B FF F9 51 */ bl execute__13daWindStone_cFv
/* 80D385C0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D385C4 7C 08 03 A6 */ mtlr r0
/* 80D385C8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D385CC 4E 80 00 20 */ blr

65
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/draw__13daWindStone_cFv.s
View File

@ -1,65 +0,0 @@
lbl_80D37F6C:
/* 80D37F6C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 80D37F70 7C 08 02 A6 */ mflr r0
/* 80D37F74 90 01 00 34 */ stw r0, 0x34(r1)
/* 80D37F78 39 61 00 30 */ addi r11, r1, 0x30
/* 80D37F7C 4B 62 A2 61 */ bl _savegpr_29
/* 80D37F80 7C 7F 1B 78 */ mr r31, r3
/* 80D37F84 3C 60 80 D4 */ lis r3, lit_3760@ha /* 0x80D38608@ha */
/* 80D37F88 3B A3 86 08 */ addi r29, r3, lit_3760@l /* 0x80D38608@l */
/* 80D37F8C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80D37F90 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80D37F94 38 80 00 08 */ li r4, 8
/* 80D37F98 38 BF 04 D0 */ addi r5, r31, 0x4d0
/* 80D37F9C 38 DF 01 0C */ addi r6, r31, 0x10c
/* 80D37FA0 4B 46 B8 25 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c
/* 80D37FA4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */
/* 80D37FA8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */
/* 80D37FAC 80 9F 05 84 */ lwz r4, 0x584(r31)
/* 80D37FB0 80 84 00 04 */ lwz r4, 4(r4)
/* 80D37FB4 38 BF 01 0C */ addi r5, r31, 0x10c
/* 80D37FB8 4B 46 CD E9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c
/* 80D37FBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D37FC0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D37FC4 80 04 5F 70 */ lwz r0, 0x5f70(r4)
/* 80D37FC8 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */
/* 80D37FCC 3B C3 4A C8 */ addi r30, r3, j3dSys@l /* 0x80434AC8@l */
/* 80D37FD0 90 1E 00 48 */ stw r0, 0x48(r30)
/* 80D37FD4 80 04 5F 74 */ lwz r0, 0x5f74(r4)
/* 80D37FD8 90 1E 00 4C */ stw r0, 0x4c(r30)
/* 80D37FDC 80 7F 05 84 */ lwz r3, 0x584(r31)
/* 80D37FE0 4B 2D 5C E5 */ bl mDoExt_modelUpdateDL__FP8J3DModel
/* 80D37FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D37FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D37FEC 80 03 5F 80 */ lwz r0, 0x5f80(r3)
/* 80D37FF0 90 1E 00 48 */ stw r0, 0x48(r30)
/* 80D37FF4 80 03 5F 84 */ lwz r0, 0x5f84(r3)
/* 80D37FF8 90 1E 00 4C */ stw r0, 0x4c(r30)
/* 80D37FFC C0 3F 04 D8 */ lfs f1, 0x4d8(r31)
/* 80D38000 C0 7F 04 D4 */ lfs f3, 0x4d4(r31)
/* 80D38004 C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
/* 80D38008 D0 01 00 08 */ stfs f0, 8(r1)
/* 80D3800C D0 61 00 0C */ stfs f3, 0xc(r1)
/* 80D38010 D0 21 00 10 */ stfs f1, 0x10(r1)
/* 80D38014 80 7F 05 C0 */ lwz r3, 0x5c0(r31)
/* 80D38018 38 80 00 01 */ li r4, 1
/* 80D3801C 80 BF 05 84 */ lwz r5, 0x584(r31)
/* 80D38020 38 C1 00 08 */ addi r6, r1, 8
/* 80D38024 C0 3D 00 14 */ lfs f1, 0x14(r29)
/* 80D38028 C0 5D 00 0C */ lfs f2, 0xc(r29)
/* 80D3802C C0 9F 05 BC */ lfs f4, 0x5bc(r31)
/* 80D38030 38 FF 05 74 */ addi r7, r31, 0x574
/* 80D38034 39 1F 01 0C */ addi r8, r31, 0x10c
/* 80D38038 39 20 00 00 */ li r9, 0
/* 80D3803C C0 BD 00 18 */ lfs f5, 0x18(r29)
/* 80D38040 3D 40 80 42 */ lis r10, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */
/* 80D38044 39 4A 48 D0 */ addi r10, r10, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */
/* 80D38048 4B 2F 68 C9 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj
/* 80D3804C 90 7F 05 C0 */ stw r3, 0x5c0(r31)
/* 80D38050 38 60 00 01 */ li r3, 1
/* 80D38054 39 61 00 30 */ addi r11, r1, 0x30
/* 80D38058 4B 62 A1 D1 */ bl _restgpr_29
/* 80D3805C 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80D38060 7C 08 03 A6 */ mtlr r0
/* 80D38064 38 21 00 30 */ addi r1, r1, 0x30
/* 80D38068 4E 80 00 20 */ blr

41
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/exeModeHowl__13daWindStone_cFv.s
View File

@ -1,41 +0,0 @@
lbl_80D382C4:
/* 80D382C4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D382C8 7C 08 02 A6 */ mflr r0
/* 80D382CC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D382D0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D382D4 7C 7F 1B 78 */ mr r31, r3
/* 80D382D8 4B FF FF A1 */ bl chkEveOccur__13daWindStone_cFv
/* 80D382DC 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D382E0 40 82 00 18 */ bne lbl_80D382F8
/* 80D382E4 38 00 00 00 */ li r0, 0
/* 80D382E8 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80D382EC 38 00 00 02 */ li r0, 2
/* 80D382F0 98 1F 05 C4 */ stb r0, 0x5c4(r31)
/* 80D382F4 48 00 00 54 */ b lbl_80D38348
lbl_80D382F8:
/* 80D382F8 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D382FC 54 00 E7 3E */ rlwinm r0, r0, 0x1c, 0x1c, 0x1f
/* 80D38300 7C 04 07 74 */ extsb r4, r0
/* 80D38304 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D38308 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D3830C 80 63 5D B4 */ lwz r3, 0x5db4(r3)
/* 80D38310 38 63 2D 84 */ addi r3, r3, 0x2d84
/* 80D38314 38 BF 04 D0 */ addi r5, r31, 0x4d0
/* 80D38318 4B 59 33 D5 */ bl startWindStoneSound__13Z2WolfHowlMgrFScP3Vec
/* 80D3831C 38 00 00 00 */ li r0, 0
/* 80D38320 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80D38324 7F E3 FB 78 */ mr r3, r31
/* 80D38328 4B FF FE C5 */ bl chkWlfInRange__13daWindStone_cFv
/* 80D3832C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D38330 41 82 00 18 */ beq lbl_80D38348
/* 80D38334 80 1F 05 5C */ lwz r0, 0x55c(r31)
/* 80D38338 60 00 00 80 */ ori r0, r0, 0x80
/* 80D3833C 90 1F 05 5C */ stw r0, 0x55c(r31)
/* 80D38340 38 00 00 41 */ li r0, 0x41
/* 80D38344 98 1F 05 4B */ stb r0, 0x54b(r31)
lbl_80D38348:
/* 80D38348 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D3834C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D38350 7C 08 03 A6 */ mtlr r0
/* 80D38354 38 21 00 10 */ addi r1, r1, 0x10
/* 80D38358 4E 80 00 20 */ blr

45
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/exeModeMapDisp__13daWindStone_cFv.s
View File

@ -1,45 +0,0 @@
lbl_80D3835C:
/* 80D3835C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38360 7C 08 02 A6 */ mflr r0
/* 80D38364 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D38368 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D3836C 7C 7F 1B 78 */ mr r31, r3
/* 80D38370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D38374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D38378 38 00 00 00 */ li r0, 0
/* 80D3837C 88 83 4F AD */ lbz r4, 0x4fad(r3)
/* 80D38380 28 04 00 00 */ cmplwi r4, 0
/* 80D38384 41 82 00 0C */ beq lbl_80D38390
/* 80D38388 28 04 00 02 */ cmplwi r4, 2
/* 80D3838C 40 82 00 08 */ bne lbl_80D38394
lbl_80D38390:
/* 80D38390 38 00 00 01 */ li r0, 1
lbl_80D38394:
/* 80D38394 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 80D38398 40 82 00 10 */ bne lbl_80D383A8
/* 80D3839C 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 80D383A0 28 00 00 00 */ cmplwi r0, 0
/* 80D383A4 40 82 00 44 */ bne lbl_80D383E8
lbl_80D383A8:
/* 80D383A8 7F E3 FB 78 */ mr r3, r31
/* 80D383AC 48 00 01 19 */ bl getGoldWolfIdx__13daWindStone_cFv
/* 80D383B0 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */
/* 80D383B4 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */
/* 80D383B8 98 64 00 E2 */ stb r3, 0xe2(r4)
/* 80D383BC 38 00 00 05 */ li r0, 5
/* 80D383C0 98 04 00 C1 */ stb r0, 0xc1(r4)
/* 80D383C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D383C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D383CC 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D383D0 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f
/* 80D383D4 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D383D8 7C 05 07 74 */ extsb r5, r0
/* 80D383DC 4B 2F CE 25 */ bl onSwitch__10dSv_info_cFii
/* 80D383E0 38 00 00 02 */ li r0, 2
/* 80D383E4 98 1F 05 C4 */ stb r0, 0x5c4(r31)
lbl_80D383E8:
/* 80D383E8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D383EC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D383F0 7C 08 03 A6 */ mtlr r0
/* 80D383F4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D383F8 4E 80 00 20 */ blr

28
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/execute__13daWindStone_cFv.s
View File

@ -1,28 +0,0 @@
lbl_80D37F0C:
/* 80D37F0C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D37F10 7C 08 02 A6 */ mflr r0
/* 80D37F14 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D37F18 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D37F1C 7C 7F 1B 78 */ mr r31, r3
/* 80D37F20 88 03 05 C4 */ lbz r0, 0x5c4(r3)
/* 80D37F24 2C 00 00 01 */ cmpwi r0, 1
/* 80D37F28 41 82 00 20 */ beq lbl_80D37F48
/* 80D37F2C 40 80 00 20 */ bge lbl_80D37F4C
/* 80D37F30 2C 00 00 00 */ cmpwi r0, 0
/* 80D37F34 40 80 00 0C */ bge lbl_80D37F40
/* 80D37F38 48 00 00 14 */ b lbl_80D37F4C
/* 80D37F3C 48 00 00 10 */ b lbl_80D37F4C
lbl_80D37F40:
/* 80D37F40 48 00 03 85 */ bl exeModeHowl__13daWindStone_cFv
/* 80D37F44 48 00 00 08 */ b lbl_80D37F4C
lbl_80D37F48:
/* 80D37F48 48 00 04 15 */ bl exeModeMapDisp__13daWindStone_cFv
lbl_80D37F4C:
/* 80D37F4C 7F E3 FB 78 */ mr r3, r31
/* 80D37F50 48 00 01 CD */ bl setModelMtx__13daWindStone_cFv
/* 80D37F54 38 60 00 01 */ li r3, 1
/* 80D37F58 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D37F5C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D37F60 7C 08 03 A6 */ mtlr r0
/* 80D37F64 38 21 00 10 */ addi r1, r1, 0x10
/* 80D37F68 4E 80 00 20 */ blr

3
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/func_80D385F0.s
View File

@ -1,3 +0,0 @@
lbl_80D385F0:
/* 80D385F0 38 63 FF DC */ addi r3, r3, -36
/* 80D385F4 4B FF F8 38 */ b __dt__12dBgS_ObjAcchFv

3
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/func_80D385F8.s
View File

@ -1,3 +0,0 @@
lbl_80D385F8:
/* 80D385F8 38 63 FF EC */ addi r3, r3, -20
/* 80D385FC 4B FF F8 30 */ b __dt__12dBgS_ObjAcchFv

39
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/getGoldWolfIdx__13daWindStone_cFv.s
View File

@ -1,39 +0,0 @@
lbl_80D384C4:
/* 80D384C4 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80D384C8 54 00 E7 3E */ rlwinm r0, r0, 0x1c, 0x1c, 0x1f
/* 80D384CC 7C 00 07 74 */ extsb r0, r0
/* 80D384D0 2C 00 00 06 */ cmpwi r0, 6
/* 80D384D4 41 82 00 48 */ beq lbl_80D3851C
/* 80D384D8 40 80 00 1C */ bge lbl_80D384F4
/* 80D384DC 2C 00 00 04 */ cmpwi r0, 4
/* 80D384E0 41 82 00 2C */ beq lbl_80D3850C
/* 80D384E4 40 80 00 30 */ bge lbl_80D38514
/* 80D384E8 2C 00 00 03 */ cmpwi r0, 3
/* 80D384EC 40 80 00 18 */ bge lbl_80D38504
/* 80D384F0 48 00 00 44 */ b lbl_80D38534
lbl_80D384F4:
/* 80D384F4 2C 00 00 08 */ cmpwi r0, 8
/* 80D384F8 41 82 00 34 */ beq lbl_80D3852C
/* 80D384FC 40 80 00 38 */ bge lbl_80D38534
/* 80D38500 48 00 00 24 */ b lbl_80D38524
lbl_80D38504:
/* 80D38504 38 60 00 02 */ li r3, 2
/* 80D38508 4E 80 00 20 */ blr
lbl_80D3850C:
/* 80D3850C 38 60 00 03 */ li r3, 3
/* 80D38510 4E 80 00 20 */ blr
lbl_80D38514:
/* 80D38514 38 60 00 04 */ li r3, 4
/* 80D38518 4E 80 00 20 */ blr
lbl_80D3851C:
/* 80D3851C 38 60 00 05 */ li r3, 5
/* 80D38520 4E 80 00 20 */ blr
lbl_80D38524:
/* 80D38524 38 60 00 06 */ li r3, 6
/* 80D38528 4E 80 00 20 */ blr
lbl_80D3852C:
/* 80D3852C 38 60 00 07 */ li r3, 7
/* 80D38530 4E 80 00 20 */ blr
lbl_80D38534:
/* 80D38534 38 60 00 02 */ li r3, 2
/* 80D38538 4E 80 00 20 */ blr

31
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/init__13daWindStone_cFv.s
View File

@ -1,31 +0,0 @@
lbl_80D38180:
/* 80D38180 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38184 7C 08 02 A6 */ mflr r0
/* 80D38188 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D3818C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D38190 7C 7F 1B 78 */ mr r31, r3
/* 80D38194 48 00 00 E5 */ bl chkEveOccur__13daWindStone_cFv
/* 80D38198 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D3819C 40 82 00 2C */ bne lbl_80D381C8
/* 80D381A0 7F E3 FB 78 */ mr r3, r31
/* 80D381A4 48 00 02 59 */ bl chkMapDispMode__13daWindStone_cFv
/* 80D381A8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80D381AC 41 82 00 10 */ beq lbl_80D381BC
/* 80D381B0 38 00 00 01 */ li r0, 1
/* 80D381B4 98 1F 05 C4 */ stb r0, 0x5c4(r31)
/* 80D381B8 48 00 00 18 */ b lbl_80D381D0
lbl_80D381BC:
/* 80D381BC 38 00 00 02 */ li r0, 2
/* 80D381C0 98 1F 05 C4 */ stb r0, 0x5c4(r31)
/* 80D381C4 48 00 00 0C */ b lbl_80D381D0
lbl_80D381C8:
/* 80D381C8 38 00 00 00 */ li r0, 0
/* 80D381CC 98 1F 05 C4 */ stb r0, 0x5c4(r31)
lbl_80D381D0:
/* 80D381D0 38 00 00 00 */ li r0, 0
/* 80D381D4 90 1F 05 C0 */ stw r0, 0x5c0(r31)
/* 80D381D8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D381DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D381E0 7C 08 03 A6 */ mtlr r0
/* 80D381E4 38 21 00 10 */ addi r1, r1, 0x10
/* 80D381E8 4E 80 00 20 */ blr

26
asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/setModelMtx__13daWindStone_cFv.s
View File

@ -1,26 +0,0 @@
lbl_80D3811C:
/* 80D3811C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D38120 7C 08 02 A6 */ mflr r0
/* 80D38124 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D38128 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D3812C 7C 7F 1B 78 */ mr r31, r3
/* 80D38130 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D38134 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D38138 C0 3F 04 D0 */ lfs f1, 0x4d0(r31)
/* 80D3813C C0 5F 04 D4 */ lfs f2, 0x4d4(r31)
/* 80D38140 C0 7F 04 D8 */ lfs f3, 0x4d8(r31)
/* 80D38144 4B 60 E7 A5 */ bl PSMTXTrans
/* 80D38148 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D3814C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D38150 A8 9F 04 E6 */ lha r4, 0x4e6(r31)
/* 80D38154 4B 2D 42 E1 */ bl mDoMtx_YrotM__FPA4_fs
/* 80D38158 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */
/* 80D3815C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */
/* 80D38160 80 9F 05 84 */ lwz r4, 0x584(r31)
/* 80D38164 38 84 00 24 */ addi r4, r4, 0x24
/* 80D38168 4B 60 E3 49 */ bl PSMTXCopy
/* 80D3816C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D38170 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D38174 7C 08 03 A6 */ mtlr r0
/* 80D38178 38 21 00 10 */ addi r1, r1, 0x10
/* 80D3817C 4E 80 00 20 */ blr

0
diff.py Normal file → Executable file
View File

1
include/d/a/d_a_alink.h
View File

@ -3140,6 +3140,7 @@ public:
u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool i_checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
bool i_checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
// this might be a fake match, but helps fix usage in many functions
#pragma optimization_level 2

15
include/d/a/d_a_obj.h
View File

@ -1,5 +1,20 @@
#ifndef D_A_D_A_OBJ_H
#define D_A_D_A_OBJ_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
namespace daObj {
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
/* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*);
/* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*);
/* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*);
/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
/* 80037620 */ void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*,
f32, f32, cXyz const*);
/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&);
/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
}; // namespace daObj
#endif /* D_A_D_A_OBJ_H */

2
include/d/event/d_event.h
View File

@ -143,7 +143,7 @@ public:
/* 807E2908 */ void startCheckSkipEdge(void*);
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
bool runCheck() { return mEventStatus != 0; }
BOOL runCheck() { return mEventStatus != 0; }
f32 getCullRate() { return mCullRate; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
void onEventFlag(u16 flag) { mEventFlag |= flag; }

5
include/d/meter/d_meter2_info.h
View File

@ -142,6 +142,7 @@ public:
void setLightDropGetFlag(int index, u8 flag) { mLightDropGetFlag[index] = flag; }
u8 getRentalBombBag() { return mRentalBombBagIdx; }
void setTableMapRegionNo(u8 regionNo) { mTableMapRegionNo = regionNo; }
void setGoldWolfMapType(u8 i_mapType) { mGoldWolfMapType = i_mapType; }
dMeter2_c* getMeterClass() { return mMeterClass; }
u8 getMiniGameItemSetFlag() { return mMiniGameItemSetFlag; }
s16 getMsgKeyWaitTimer() { return mMsgKeyWaitTimer; }
@ -543,6 +544,10 @@ inline void dMeter2Info_setTableMapRegionNo(u8 regionNo) {
g_meter2_info.setTableMapRegionNo(regionNo);
}
inline void dMeter2Info_setGoldWolfMapType(u8 i_mapType) {
g_meter2_info.setGoldWolfMapType(i_mapType);
}
inline void dMeter2Info_changeWater(u8 bottleIdx) {
g_meter2_info.changeWater(bottleIdx);
}

60
include/d/shop/d_shop_system.h
View File

@ -3,69 +3,11 @@
#include "d/a/d_a_npc.h"
#include "d/shop/d_shop_item_ctrl.h"
#include "d/shop/d_shop_camera.h"
class dSelect_cursor_c;
class STControl;
typedef int (*ShopCam_actionFunc)(void);
class ShopCam_action_c {
public:
/* 80196544 */ void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*,
cXyz*);
/* 80196608 */ void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*,
fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*);
/* 801968B8 */ void setMasterCamCtrPos(cXyz*);
void setCameraSpeed(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
field_0xc0 = param_0;
field_0xc4 = param_1;
field_0xc8 = param_2;
field_0xcc = param_3;
}
void SetSelectIdx(s16 idx) {
mSelectIdx = idx;
setCameraSpeed(0.25f, 20.0f, 0.25f, 5.0f);
}
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ ShopCam_actionFunc mCamActionFunc;
/* 0x0C */ u8 field_0xc[0xC];
/* 0x18 */ fopAc_ac_c* field_0x18;
/* 0x1C */ fopAc_ac_c* field_0x1c;
/* 0x20 */ fopAc_ac_c* field_0x20;
/* 0x24 */ fopAc_ac_c* field_0x24;
/* 0x28 */ fopAc_ac_c* field_0x28;
/* 0x2C */ fopAc_ac_c* field_0x2c;
/* 0x30 */ fopAc_ac_c* field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ cXyz field_0x38;
/* 0x44 */ cXyz field_0x44;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ cXyz field_0x54;
/* 0x60 */ cXyz field_0x60;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ cXyz field_0x70;
/* 0x7C */ cXyz field_0x7c;
/* 0x88 */ cXyz field_0x88;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ cXyz field_0x98;
/* 0xA4 */ cXyz field_0xa4;
/* 0xB0 */ cXyz field_0xb0;
/* 0xBC */ f32 field_0xbc;
/* 0xC0 */ f32 field_0xc0;
/* 0xC4 */ f32 field_0xc4;
/* 0xC8 */ f32 field_0xc8;
/* 0xCC */ f32 field_0xcc;
/* 0xD0 */ u8 field_0xd0[4];
/* 0xD4 */ s16 mSelectIdx;
/* 0xD6 */ s16 field_0xd6;
/* 0xD8 */ s16 field_0xd8;
/* 0xDA */ u8 field_0xda;
};
class dShopSystem_c : public daNpcT_c {
public:
enum {

3
include/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.h
View File

@ -5,7 +5,7 @@
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daObjKJgjs_c : public dBgS_MoveBgActor {
class daObjKJgjs_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
public:
/* 80C46098 */ int create1st();
/* 80C4616C */ void setMtx();
@ -18,7 +18,6 @@ public:
u32 getType() { return fopAcM_GetParamBit(this, 0, 4); }
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ Mtx mMtx[2];
/* 0x608 */ J3DModel* mpModel;
/* 0x60C */ s32 field_0x60c;

72
include/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h
View File

@ -1,6 +1,76 @@
#ifndef D_A_OBJ_MOVEBOX_H
#define D_A_OBJ_MOVEBOX_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/bg/d_bg_w.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
struct daObjMovebox {
struct Act_c {
struct Prm_e {};
/* 8047E628 */ void prm_get_swSave1() const;
/* 8047E650 */ void prmZ_init();
/* 8047E680 */ void prmX_init();
/* 8047E6B0 */ void attr() const;
/* 8047E6C8 */ void set_mtx();
/* 8047E7B0 */ void init_mtx();
/* 8047E7F4 */ void path_init();
/* 8047E92C */ void path_save();
/* 8047EB48 */ void CreateHeap();
/* 8047EBEC */ void RideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 8047ED10 */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
/* 8047EE0C */ void Create();
/* 8047F11C */ void afl_sway();
/* 8047F38C */ void check_to_walk();
/* 8047F50C */ void clr_moment_cnt();
/* 8047F530 */ void chk_appear() const;
/* 8047F5CC */ void eff_smoke_slip_start();
/* 8047F634 */ void mode_wait_init();
/* 8047F6A8 */ void mode_wait();
/* 8047F8D4 */ void mode_walk_init();
/* 8047F8F4 */ void mode_walk();
/* 8047FCBC */ void mode_afl_init();
/* 8047FCE4 */ void mode_afl();
/* 8047FF5C */ void sound_slip();
/* 80480020 */ void sound_limit();
/* 804800E4 */ void sound_land();
/* 804801A8 */ void vib_land();
/* 804801FC */ void eff_land_smoke();
/* 8048027C */ void Execute(f32 (**)[3][4]);
/* 80480728 */ void Draw();
/* 804808FC */ void Delete();
static void* M_dir_base[2];
static void* const M_arcname[8];
static u8 const M_cyl_src[68];
static u8 const M_attr[1280];
};
struct BgcSrc_c {};
struct Bgc_c {
/* 8047DAEC */ Bgc_c();
/* 8047DBF0 */ void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
f32);
/* 8047DD88 */ void wrt_pos(cXyz const&);
/* 8047DE58 */ void wall_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
s16, f32);
/* 8047E134 */ void proc_vertical(daObjMovebox::Act_c*);
/* 8047E2D4 */ void chk_wall_pre(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*,
int, s16);
/* 8047E350 */ void chk_wall_touch(daObjMovebox::Act_c const*,
daObjMovebox::BgcSrc_c const*, s16);
/* 8047E5A0 */ void chk_wall_touch2(daObjMovebox::Act_c const*,
daObjMovebox::BgcSrc_c const*, int, s16);
static u8 const M_lin5[80];
static u8 const M_lin20[368];
static u8 M_gnd_work[1932];
static u8 M_wrt_work[84];
static u8 M_wall_work[2576];
};
};
#endif /* D_A_OBJ_MOVEBOX_H */

8
include/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.h
View File

@ -4,10 +4,10 @@
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daObjProp_c : public fopAc_ac_c {
class daObjProp_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
/* 80CB51F8 */ daObjProp_c();
/* 80CB5234 */ virtual ~daObjProp_c();
/* 80CB52B4 */ bool createHeap();
/* 80CB5334 */ int create();
/* 80CB5408 */ int Delete();
@ -19,10 +19,6 @@ public:
u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); }
u32 getArg_0() { return fopAcM_GetParamBit(this, 4, 4); }
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ /* 80CB5234 */ virtual ~daObjProp_c();
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ u8 mArg;
}; // Size: 0x57C

8
include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
View File

@ -4,10 +4,10 @@
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daObjRCircle_c : public fopAc_ac_c {
class daObjRCircle_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
/* 80CB8678 */ daObjRCircle_c();
/* 80CB874C */ virtual ~daObjRCircle_c();
/* 80CB8814 */ int createHeap();
/* 80CB8928 */ int create();
/* 80CB8A28 */ int Delete();
@ -18,10 +18,6 @@ public:
int getSwBit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; }
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 80CB874C */ virtual ~daObjRCircle_c();
/* 0x574 */ mDoExt_brkAnm mBrk;
/* 0x58C */ mDoExt_btkAnm mBtk;
/* 0x5A4 */ J3DModel* mpModel;

36
include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h
View File

@ -1,28 +1,42 @@
#ifndef D_A_OBJ_WIND_STONE_H
#define D_A_OBJ_WIND_STONE_H
#include "d/bg/d_bg_s.h"
#include "d/bg/d_bg_w.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daWindStone_c : public fopAc_ac_c {
class daWindStone_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
/* 80D37A18 */ daWindStone_c();
/* 80D37A68 */ ~daWindStone_c();
/* 80D37AF4 */ void createHeap();
/* 80D37C20 */ void create();
/* 80D37F0C */ void execute();
/* 80D37F6C */ void draw();
/* 80D3806C */ void Delete();
/* 80D37A68 */ virtual ~daWindStone_c();
/* 80D37AF4 */ int createHeap();
/* 80D37C20 */ int create();
/* 80D37F0C */ int execute();
/* 80D37F6C */ int draw();
/* 80D3806C */ int Delete();
/* 80D3811C */ void setModelMtx();
/* 80D38180 */ void init();
/* 80D381EC */ void chkWlfInRange();
/* 80D38278 */ void chkEveOccur();
/* 80D381EC */ bool chkWlfInRange();
/* 80D38278 */ bool chkEveOccur();
/* 80D382C4 */ void exeModeHowl();
/* 80D3835C */ void exeModeMapDisp();
/* 80D383FC */ void chkMapDispMode();
/* 80D384C4 */ void getGoldWolfIdx();
/* 80D383FC */ bool chkMapDispMode();
/* 80D384C4 */ u8 getGoldWolfIdx();
s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
u32 getSwBit1() { return orig.angle.x & 0xff; }
u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); }
/* 0x574 */ cBgS_PolyInfo mPolyInfo;
/* 0x584 */ J3DModel* mpModel;
/* 0x588 */ dBgW* mpBgW;
/* 0x58C */ Mtx field_0x58c;
/* 0x5BC */ f32 field_0x5bc;
/* 0x5C0 */ u32 field_0x5c0;
/* 0x5C4 */ u8 field_0x5c4;
};
#endif /* D_A_OBJ_WIND_STONE_H */

2
rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp
View File

@ -2482,7 +2482,7 @@ BOOL daNpcAsh_c::main() {
if (mpActionFn != NULL) {
(this->*mpActionFn)(NULL);
}
if (i_dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk() && mItemPartnerId != -1) {
if (i_dComIfGp_event_runCheck() != 0 && !mEvtInfo.checkCommandTalk() && mItemPartnerId != -1) {
dComIfGp_event_setItemPartnerId(mItemPartnerId);
mItemPartnerId = -1;
}

9
rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp
View File

@ -11,14 +11,9 @@
static const u32 l_dzbidx[2] = {8, 9};
static const char* l_arcName = "K_jgjs";
inline request_of_phase_process_class* daObjKJgjs_getRes(daObjKJgjs_c* i_kjgjs) {
daObjKJgjs_c* mpKjgjs = (daObjKJgjs_c*)i_kjgjs;
return i_kjgjs ? &mpKjgjs->mPhaseReq : (request_of_phase_process_class*)mpKjgjs;
}
/* 80C46098-80C4616C 000078 00D4+00 1/1 0/0 0/0 .text create1st__12daObjKJgjs_cFv */
int daObjKJgjs_c::create1st() {
int phase = dComIfG_resLoad(daObjKJgjs_getRes(this), l_arcName);
int phase = dComIfG_resLoad(this, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
setMtx();
field_0x60c = getType();
@ -96,7 +91,7 @@ int daObjKJgjs_c::Draw() {
/* 80C463C4-80C46400 0003A4 003C+00 1/0 0/0 0/0 .text Delete__12daObjKJgjs_cFv */
int daObjKJgjs_c::Delete() {
dComIfG_resDelete(daObjKJgjs_getRes(this), l_arcName);
dComIfG_resDelete(this, l_arcName);
return 1;
}

354
rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp
View File

@ -4,312 +4,12 @@
//
#include "rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h"
#include "d/a/d_a_obj.h"
#include "d/bg/d_bg_s.h"
#include "d/cc/d_cc_d.h"
#include "d/d_path.h"
#include "dol2asm.h"
//
// Types:
//
struct request_of_phase_process_class {};
struct csXyz {};
struct Quaternion {};
struct Vec {};
struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
/* 8047DBB0 */ ~cXyz();
/* 8047DBEC */ cXyz();
static f32 Zero[3];
static u8 BaseY[12];
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CDD4 */ void transM(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
/* 8000CE38 */ void scaleM(f32, f32, f32);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
/* 8000CF7C */ void quatM(Quaternion const*);
static u8 now[48];
};
struct fopAc_ac_c {};
struct dBgW_Base {
struct PushPullLabel {};
};
struct dBgW {
/* 8007B9C0 */ void Move();
};
struct daObjMovebox {
struct Act_c {
struct Prm_e {};
/* 8047E628 */ void prm_get_swSave1() const;
/* 8047E650 */ void prmZ_init();
/* 8047E680 */ void prmX_init();
/* 8047E6B0 */ void attr() const;
/* 8047E6C8 */ void set_mtx();
/* 8047E7B0 */ void init_mtx();
/* 8047E7F4 */ void path_init();
/* 8047E92C */ void path_save();
/* 8047EB48 */ void CreateHeap();
/* 8047EBEC */ void RideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 8047ED10 */ void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
/* 8047EE0C */ void Create();
/* 8047F11C */ void afl_sway();
/* 8047F38C */ void check_to_walk();
/* 8047F50C */ void clr_moment_cnt();
/* 8047F530 */ void chk_appear() const;
/* 8047F5CC */ void eff_smoke_slip_start();
/* 8047F634 */ void mode_wait_init();
/* 8047F6A8 */ void mode_wait();
/* 8047F8D4 */ void mode_walk_init();
/* 8047F8F4 */ void mode_walk();
/* 8047FCBC */ void mode_afl_init();
/* 8047FCE4 */ void mode_afl();
/* 8047FF5C */ void sound_slip();
/* 80480020 */ void sound_limit();
/* 804800E4 */ void sound_land();
/* 804801A8 */ void vib_land();
/* 804801FC */ void eff_land_smoke();
/* 8048027C */ void Execute(f32 (**)[3][4]);
/* 80480728 */ void Draw();
/* 804808FC */ void Delete();
static void* M_dir_base[2];
static void* const M_arcname[8];
static u8 const M_cyl_src[68];
static u8 const M_attr[1280];
};
struct BgcSrc_c {};
struct Bgc_c {
/* 8047DAEC */ Bgc_c();
/* 8047DBF0 */ void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
f32);
/* 8047DD88 */ void wrt_pos(cXyz const&);
/* 8047DE58 */ void wall_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
s16, f32);
/* 8047E134 */ void proc_vertical(daObjMovebox::Act_c*);
/* 8047E2D4 */ void chk_wall_pre(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*,
int, s16);
/* 8047E350 */ void chk_wall_touch(daObjMovebox::Act_c const*,
daObjMovebox::BgcSrc_c const*, s16);
/* 8047E5A0 */ void chk_wall_touch2(daObjMovebox::Act_c const*,
daObjMovebox::BgcSrc_c const*, int, s16);
static u8 const M_lin5[80];
static u8 const M_lin20[368];
static u8 M_gnd_work[1932];
static u8 M_wrt_work[84];
static u8 M_wall_work[2576];
};
};
struct daObj {
/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&);
template <typename A1>
void PrmAbstract(/* ... */);
/* 80480CD8 */ /* daObj::PrmAbstract<daObjMovebox::Act_c::Prm_e> */
void func_80480CD8(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e,
daObjMovebox::Act_c::Prm_e);
};
struct dVibration_c {
/* 8006FA24 */ void StartShock(int, int, cXyz);
};
struct dSv_info_c {
/* 80035200 */ void onSwitch(int, int);
/* 800352B0 */ void offSwitch(int, int);
/* 80035360 */ void isSwitch(int, int) const;
};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
};
struct dRes_info_c {};
struct dRes_control_c {
/* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int);
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct dPath {};
struct JPABaseEmitter {};
struct dPa_modelEcallBack {
/* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8,
u8);
static u8 mEcallback[4];
};
struct dPa_levelEcallBack {};
struct _GXColor {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
cXyz const*, f32);
};
struct _GXTexObj {};
struct dDlst_shadowControl_c {
/* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
};
struct dCcD_Stts {
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
};
struct dCcD_SrcCyl {};
struct dCcD_GStts {
/* 80083760 */ dCcD_GStts();
/* 80480B64 */ ~dCcD_GStts();
};
struct dCcD_GObjInf {
/* 80083A28 */ dCcD_GObjInf();
/* 80084460 */ void ChkTgHit();
/* 80084548 */ void GetTgHitGObj();
};
struct dCcD_GAtTgCoCommonBase {
/* 80083688 */ void GetAc();
};
struct dCcD_Cyl {
/* 800848B4 */ void Set(dCcD_SrcCyl const&);
/* 800849C4 */ void MoveCTg(cXyz&);
};
struct dBgS_WtrChk {
/* 80079164 */ dBgS_WtrChk();
/* 80480DD8 */ ~dBgS_WtrChk();
};
struct dBgS_SplGrpChk {
/* 80078B90 */ void Set(cXyz&, f32);
/* 80078C78 */ ~dBgS_SplGrpChk();
};
struct dBgS_PolyPassChk {
/* 80078E68 */ void SetObj();
};
struct dBgS_ObjLinChk {
/* 80077F5C */ dBgS_ObjLinChk();
/* 80077FB8 */ ~dBgS_ObjLinChk();
};
struct dBgS_ObjGndChk {
/* 8047FEE4 */ ~dBgS_ObjGndChk();
/* 80480E88 */ dBgS_ObjGndChk();
};
struct cBgS_PolyInfo {};
struct dBgS_MoveBgActor {
/* 80078624 */ dBgS_MoveBgActor();
/* 800786B0 */ bool IsDelete();
/* 800786B8 */ bool ToFore();
/* 800786C0 */ bool ToBack();
/* 800787BC */ void MoveBGCreate(char const*, int,
void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*,
csXyz*, csXyz*),
u32, f32 (*)[3][4]);
/* 800788DC */ void MoveBGDelete();
/* 80078950 */ void MoveBGExecute();
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dBgS_GndChk {
/* 8007757C */ dBgS_GndChk();
/* 800775F0 */ ~dBgS_GndChk();
};
struct dBgS {
/* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&);
/* 80075564 */ void SplGrpChk(dBgS_SplGrpChk*);
/* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
};
struct cM3dGPla {
/* 804808B4 */ ~cM3dGPla();
};
struct cM3dGCyl {
/* 80480AD4 */ ~cM3dGCyl();
};
struct cM3dGAab {
/* 80480B1C */ ~cM3dGAab();
};
struct cCcD_Obj {};
struct cCcS {
/* 80264BA8 */ void Set(cCcD_Obj*);
};
struct cCcD_GStts {
/* 80480C90 */ ~cCcD_GStts();
};
struct cBgS_LinChk {};
struct cBgS_GndChk {
/* 80267D28 */ void SetPos(cXyz const*);
};
struct cBgS {
/* 800743B4 */ void LineCross(cBgS_LinChk*);
/* 800744A0 */ void GroundCross(cBgS_GndChk*);
/* 80074618 */ void GetActorPointer(int) const;
/* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
};
struct JAISoundID {};
struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DModel {};
//
// Forward References:
//
@ -479,11 +179,6 @@ extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void PSMTXCopy();
extern "C" void PSMTXMultVec();
extern "C" void PSVECAdd();
extern "C" void PSVECScale();
extern "C" void PSVECSquareDistance();
extern "C" void __destroy_arr();
extern "C" void __construct_array();
extern "C" void __ptmf_scall();
@ -503,21 +198,15 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
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 void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 BaseY__4cXyz[12];
extern "C" extern u8 j3dSys[284];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_max;
extern "C" u8 mEcallback__18dPa_modelEcallBack[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void* M_dir_base__Q212daObjMovebox5Act_c[2];
@ -592,14 +281,16 @@ asm daObjMovebox::Bgc_c::Bgc_c() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cXyz::~cXyz() {
// cXyz::~cXyz()
extern "C" asm void __dt__4cXyzFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__4cXyzFv.s"
}
#pragma pop
/* 8047DBEC-8047DBF0 0001EC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
cXyz::cXyz() {
// cXyz::cXyz()
extern "C" void __ct__4cXyzFv() {
/* empty function */
}
@ -1475,7 +1166,8 @@ SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dBgS_ObjGndChk::~dBgS_ObjGndChk() {
// dBgS_ObjGndChk::~dBgS_ObjGndChk()
extern "C" asm void __dt__14dBgS_ObjGndChkFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__14dBgS_ObjGndChkFv.s"
}
@ -1794,7 +1486,8 @@ asm void daObjMovebox::Act_c::Draw() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGPla::~cM3dGPla() {
// cM3dGPla::~cM3dGPla()
extern "C" asm void __dt__8cM3dGPlaFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__8cM3dGPlaFv.s"
}
@ -1840,7 +1533,8 @@ static asm void func_80480920() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGCyl::~cM3dGCyl() {
// cM3dGCyl::~cM3dGCyl()
extern "C" asm void __dt__8cM3dGCylFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__8cM3dGCylFv.s"
}
@ -1850,7 +1544,8 @@ asm cM3dGCyl::~cM3dGCyl() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cM3dGAab::~cM3dGAab() {
// cM3dGAab::~cM3dGAab()
extern "C" asm void __dt__8cM3dGAabFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__8cM3dGAabFv.s"
}
@ -1860,7 +1555,8 @@ asm cM3dGAab::~cM3dGAab() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dCcD_GStts::~dCcD_GStts() {
// dCcD_GStts::~dCcD_GStts()
extern "C" asm void __dt__10dCcD_GSttsFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__10dCcD_GSttsFv.s"
}
@ -1914,7 +1610,8 @@ static asm void func_80480C64() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm cCcD_GStts::~cCcD_GStts() {
// cCcD_GStts::~cCcD_GStts()
extern "C" asm void __dt__10cCcD_GSttsFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__10cCcD_GSttsFv.s"
}
@ -1938,8 +1635,7 @@ extern "C" asm void func_80480CD8(void* _this, fopAc_ac_c const* param_0,
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void __sinit_d_a_obj_movebox_cpp() {
nofralloc
asm void __sinit_d_a_obj_movebox_cpp(){nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__sinit_d_a_obj_movebox_cpp.s"
}
#pragma pop
@ -1980,7 +1676,8 @@ SECTION_DATA extern void* __vt__11dBgS_WtrChk[12] = {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dBgS_WtrChk::~dBgS_WtrChk() {
// dBgS_WtrChk::~dBgS_WtrChk()
extern "C" asm void __dt__11dBgS_WtrChkFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__dt__11dBgS_WtrChkFv.s"
}
@ -2000,7 +1697,8 @@ asm void func_80480E50() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dBgS_ObjGndChk::dBgS_ObjGndChk() {
// dBgS_ObjGndChk::dBgS_ObjGndChk()
extern "C" asm void __ct__14dBgS_ObjGndChkFv() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/__ct__14dBgS_ObjGndChkFv.s"
}
@ -2065,5 +1763,3 @@ static asm void func_80480F0C() {
#include "asm/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox/func_80480F0C.s"
}
#pragma pop
/* 804816A4-804816A4 00077C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

14
rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp
View File

@ -18,14 +18,9 @@ static const char* l_arcName = "L7Prop";
/* 80CB51F8-80CB5234 000098 003C+00 2/2 0/0 0/0 .text __ct__11daObjProp_cFv */
daObjProp_c::daObjProp_c() {}
inline request_of_phase_process_class* daObjProp_getRes(daObjProp_c* i_prop) {
daObjProp_c* mProp2 = (daObjProp_c*)i_prop;
return mProp2 != NULL ? &mProp2->mPhaseReq : (request_of_phase_process_class*)mProp2;
}
/* 80CB5234-80CB52B4 0000D4 0080+00 1/0 0/0 0/0 .text __dt__11daObjProp_cFv */
daObjProp_c::~daObjProp_c() {
dComIfG_resDelete(daObjProp_getRes(this), l_arcName);
dComIfG_resDelete(this, l_arcName);
}
static const u32 BMD_IDX[] = {3, 4};
@ -43,12 +38,7 @@ bool daObjProp_c::createHeap() {
int daObjProp_c::create() {
fopAcM_SetupActor(this, daObjProp_c);
daObjProp_c* tmp = this;
if (this) {
tmp = (daObjProp_c*)&mPhaseReq;
}
int phase = dComIfG_resLoad((request_of_phase_process_class*)tmp, l_arcName);
int phase = dComIfG_resLoad(this, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)daObjProp_c_createHeap, 0x1000)) {
return cPhs_ERROR_e;

14
rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp
View File

@ -18,14 +18,9 @@ static char* l_arcName = "RCircle";
/* 80CB8678-80CB8704 000098 008C+00 2/2 0/0 0/0 .text __ct__14daObjRCircle_cFv */
daObjRCircle_c::daObjRCircle_c() {}
inline request_of_phase_process_class* daObjRCircle_getRes(daObjRCircle_c* i_rcircle) {
daObjRCircle_c* rCircle = (daObjRCircle_c*)i_rcircle;
return i_rcircle ? &rCircle->mPhaseReq : (request_of_phase_process_class*)rCircle;
}
/* 80CB874C-80CB8814 00016C 00C8+00 1/0 0/0 0/0 .text __dt__14daObjRCircle_cFv */
daObjRCircle_c::~daObjRCircle_c() {
dComIfG_resDelete(daObjRCircle_getRes(this), l_arcName);
dComIfG_resDelete(this, l_arcName);
}
/* 80CB8814-80CB8928 000234 0114+00 1/1 0/0 0/0 .text createHeap__14daObjRCircle_cFv */
@ -51,11 +46,8 @@ int daObjRCircle_c::create() {
if (i_fopAcM_isSwitch(this, getSwBit())) {
return cPhs_ERROR_e;
}
daObjRCircle_c* tmp = this;
if (this) {
tmp = (daObjRCircle_c*)&mPhaseReq;
}
int phase = dComIfG_resLoad((request_of_phase_process_class*)tmp, l_arcName);
int phase = dComIfG_resLoad(this, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)daObjRCircle_c_createHeap, 0x1000)) {
return cPhs_ERROR_e;

722
rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp
View File

@ -1,334 +1,54 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_obj_wind_stone
//
/**
* d_a_obj_wind_stone.cpp
* Object - Wind Stone
*/
// #include "rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h"
#include "dolphin/types.h"
#include "rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "Z2AudioLib/Z2WolfHowlMgr.h"
#include "d/a/d_a_alink.h"
#include "d/d_procname.h"
#include "d/meter/d_meter2_info.h"
#include "dol2asm.h"
//
// Types:
//
struct request_of_phase_process_class {};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct daWindStone_c {
/* 80D37A18 */ daWindStone_c();
/* 80D37A68 */ ~daWindStone_c();
/* 80D37AF4 */ void createHeap();
/* 80D37C20 */ void create();
/* 80D37F0C */ void execute();
/* 80D37F6C */ void draw();
/* 80D3806C */ void Delete();
/* 80D3811C */ void setModelMtx();
/* 80D38180 */ void init();
/* 80D381EC */ void chkWlfInRange();
/* 80D38278 */ void chkEveOccur();
/* 80D382C4 */ void exeModeHowl();
/* 80D3835C */ void exeModeMapDisp();
/* 80D383FC */ void chkMapDispMode();
/* 80D384C4 */ void getGoldWolfIdx();
};
struct dSv_info_c {
/* 80035200 */ void onSwitch(int, int);
/* 800352B0 */ void offSwitch(int, int);
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct cXyz {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
};
struct dRes_info_c {};
struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct dDlst_shadowControl_c {
static u8 mSimpleTexObj[32];
};
struct dBgW_Base {};
struct dBgW {
/* 8007B970 */ dBgW();
};
struct dBgS_PolyPassChk {
/* 80078E68 */ void SetObj();
};
struct dBgS_ObjAcch {
/* 80D37E2C */ ~dBgS_ObjAcch();
};
struct dBgS_AcchCir {
/* 80075EAC */ dBgS_AcchCir();
/* 80075F58 */ void SetWall(f32, f32);
/* 80D37E9C */ ~dBgS_AcchCir();
};
struct csXyz {};
struct dBgS {
/* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
/* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
/* 80076AAC */ void CrrPos(dBgS&);
};
struct cM3dGCir {
/* 8026EF18 */ ~cM3dGCir();
};
struct cBgW_BgId {
/* 802681D4 */ void ChkUsed() const;
};
struct cBgD_t {};
struct cBgW {
/* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]);
};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
};
struct cBgS {
/* 80074250 */ void Release(dBgW_Base*);
};
struct _GXTexObj {};
struct Vec {};
struct Z2WolfHowlMgr {
/* 802CB6EC */ void startWindStoneSound(s8, Vec*);
};
struct J3DModel {};
//
// Forward References:
//
extern "C" static void daWindStone_c_createHeap__FP10fopAc_ac_c();
extern "C" void __ct__13daWindStone_cFv();
extern "C" void __dt__13daWindStone_cFv();
extern "C" void createHeap__13daWindStone_cFv();
extern "C" void create__13daWindStone_cFv();
extern "C" void __dt__12dBgS_ObjAcchFv();
extern "C" void __dt__12dBgS_AcchCirFv();
extern "C" void execute__13daWindStone_cFv();
extern "C" void draw__13daWindStone_cFv();
extern "C" void Delete__13daWindStone_cFv();
extern "C" void setModelMtx__13daWindStone_cFv();
extern "C" void init__13daWindStone_cFv();
extern "C" void chkWlfInRange__13daWindStone_cFv();
extern "C" void chkEveOccur__13daWindStone_cFv();
extern "C" void exeModeHowl__13daWindStone_cFv();
extern "C" void exeModeMapDisp__13daWindStone_cFv();
extern "C" void chkMapDispMode__13daWindStone_cFv();
extern "C" void getGoldWolfIdx__13daWindStone_cFv();
extern "C" static void daWindStone_create__FP13daWindStone_c();
extern "C" static void daWindStone_Delete__FP13daWindStone_c();
extern "C" static void daWindStone_execute__FP13daWindStone_c();
extern "C" static void daWindStone_draw__FP13daWindStone_c();
extern "C" static void func_80D385F0();
extern "C" static void func_80D385F8();
extern "C" extern char const* const d_a_obj_wind_stone__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void
dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void SetWall__12dBgS_AcchCirFff();
extern "C" void __dt__9dBgS_AcchFv();
extern "C" void __ct__9dBgS_AcchFv();
extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz();
extern "C" void CrrPos__9dBgS_AcchFR4dBgS();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f();
extern "C" void __ct__4dBgWFv();
extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
extern "C" void __ct__13cBgS_PolyInfoFv();
extern "C" void __dt__13cBgS_PolyInfoFv();
extern "C" void ChkUsed__9cBgW_BgIdCFv();
extern "C" void __dt__8cM3dGCirFv();
extern "C" void startWindStoneSound__13Z2WolfHowlMgrFScP3Vec();
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void PSMTXCopy();
extern "C" void PSMTXTrans();
extern "C" void PSVECSquareDistance();
extern "C" void _savegpr_26();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
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 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 j3dSys[284];
//
// Declarations:
//
#include "dolphin/types.h"
/* 80D379F8-80D37A18 000078 0020+00 1/1 0/0 0/0 .text daWindStone_c_createHeap__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daWindStone_c_createHeap(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_c_createHeap__FP10fopAc_ac_c.s"
static int daWindStone_c_createHeap(fopAc_ac_c* i_this) {
return static_cast<daWindStone_c*>(i_this)->createHeap();
}
#pragma pop
/* ############################################################################################## */
/* 80D38628-80D38628 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80D38628 = "WindStone";
#pragma pop
/* 80D38634-80D38638 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
SECTION_DATA static void* l_arcName = (void*)&d_a_obj_wind_stone__stringBase0;
/* 80D38638-80D38658 -00001 0020+00 1/0 0/0 0/0 .data daWindStone_METHODS */
SECTION_DATA static void* daWindStone_METHODS[8] = {
(void*)daWindStone_create__FP13daWindStone_c,
(void*)daWindStone_Delete__FP13daWindStone_c,
(void*)daWindStone_execute__FP13daWindStone_c,
(void*)NULL,
(void*)daWindStone_draw__FP13daWindStone_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 80D38658-80D38688 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WindStone */
SECTION_DATA extern void* g_profile_Obj_WindStone[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x018A0000, (void*)&g_fpcLf_Method,
(void*)0x000005C8, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02DC0000, (void*)&daWindStone_METHODS,
(void*)0x00040100, (void*)0x03000000,
};
/* 80D38688-80D38694 000054 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_AcchCirFv,
};
/* 80D38694-80D386B8 000060 0024+00 2/2 0/0 0/0 .data __vt__12dBgS_ObjAcch */
SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__12dBgS_ObjAcchFv,
(void*)NULL,
(void*)NULL,
(void*)func_80D385F8,
(void*)NULL,
(void*)NULL,
(void*)func_80D385F0,
};
/* 80D386B8-80D386C4 000084 000C+00 2/2 0/0 0/0 .data __vt__13daWindStone_c */
SECTION_DATA extern void* __vt__13daWindStone_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__13daWindStone_cFv,
};
static char* l_arcName = "WindStone";
/* 80D37A18-80D37A68 000098 0050+00 2/2 0/0 0/0 .text __ct__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daWindStone_c::daWindStone_c() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__ct__13daWindStone_cFv.s"
}
#pragma pop
daWindStone_c::daWindStone_c() : mpBgW(NULL), field_0x5c4(0) {}
/* 80D37A68-80D37AF4 0000E8 008C+00 1/0 0/0 0/0 .text __dt__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daWindStone_c::~daWindStone_c() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__dt__13daWindStone_cFv.s"
daWindStone_c::~daWindStone_c() {
dComIfG_resDelete(this, l_arcName);
}
#pragma pop
/* 80D37AF4-80D37C20 000174 012C+00 1/1 0/0 0/0 .text createHeap__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::createHeap() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/createHeap__13daWindStone_cFv.s"
int daWindStone_c::createHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
if (mpModel == NULL) {
return 0;
}
mpBgW = new dBgW();
if (mpBgW == NULL) {
return 0;
}
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
MTXCopy(mDoMtx_stack_c::get(), field_0x58c);
cBgD_t* res = (cBgD_t*)dComIfG_getObjectRes(l_arcName, 7);
int bgWBase_set = mpBgW->Set(res, 1, &field_0x58c);
if (bgWBase_set == 1) {
return 0;
}
return 1;
}
#pragma pop
/* ############################################################################################## */
/* 80D38608-80D38614 000000 000C+00 1/1 0/0 0/0 .rodata @3760 */
@ -337,241 +57,245 @@ SECTION_RODATA static u8 const lit_3760[12] = {
};
COMPILER_STRIP_GATE(0x80D38608, &lit_3760);
/* 80D38614-80D38618 00000C 0004+00 1/2 0/0 0/0 .rodata @4127 */
SECTION_RODATA static u8 const lit_4127[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80D38614, &lit_4127);
/* 80D38618-80D3861C 000010 0004+00 1/1 0/0 0/0 .rodata @4128 */
SECTION_RODATA static f32 const lit_4128 = 10.0f;
COMPILER_STRIP_GATE(0x80D38618, &lit_4128);
/* 80D37C20-80D37E2C 0002A0 020C+00 1/1 0/0 0/0 .text create__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/create__13daWindStone_cFv.s"
}
#pragma pop
int daWindStone_c::create() {
fopAcM_SetupActor(this, daWindStone_c);
/* 80D37E2C-80D37E9C 0004AC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dBgS_ObjAcch::~dBgS_ObjAcch() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__dt__12dBgS_ObjAcchFv.s"
}
#pragma pop
int phase = dComIfG_resLoad(this, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, daWindStone_c_createHeap, 0x1000)) {
return cPhs_ERROR_e;
}
if (dComIfG_Bgsp().Regist(mpBgW, this)) {
return cPhs_ERROR_e;
}
init();
setModelMtx();
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
/* 80D37E9C-80D37F0C 00051C 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm dBgS_AcchCir::~dBgS_AcchCir() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/__dt__12dBgS_AcchCirFv.s"
dBgS_AcchCir acchCir;
dBgS_ObjAcch objAcch;
acchCir.SetWall(0.0f, 10.0f);
objAcch.Set(&current.pos, &next.pos, this, 1, &acchCir, &fopAcM_GetSpeed_p(this), NULL,
NULL);
objAcch.CrrPos(dComIfG_Bgsp());
field_0x5bc = objAcch.GetGroundH();
mPolyInfo = objAcch.m_gnd;
if (field_0x5c4 == 0) {
i_fopAcM_onSwitch(this, getSwBit1());
}
}
return phase;
}
#pragma pop
/* 80D37F0C-80D37F6C 00058C 0060+00 1/1 0/0 0/0 .text execute__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::execute() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/execute__13daWindStone_cFv.s"
int daWindStone_c::execute() {
switch (field_0x5c4) {
case 0:
exeModeHowl();
break;
case 1:
exeModeMapDisp();
break;
case 2:
break;
}
setModelMtx();
return 1;
}
#pragma pop
/* ############################################################################################## */
/* 80D3861C-80D38620 000014 0004+00 0/1 0/0 0/0 .rodata @4175 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4175 = 500.0f;
COMPILER_STRIP_GATE(0x80D3861C, &lit_4175);
#pragma pop
/* 80D38620-80D38624 000018 0004+00 0/1 0/0 0/0 .rodata @4176 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4176 = 1.0f;
COMPILER_STRIP_GATE(0x80D38620, &lit_4176);
#pragma pop
/* 80D37F6C-80D3806C 0005EC 0100+00 1/1 0/0 0/0 .text draw__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::draw() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/draw__13daWindStone_cFv.s"
int daWindStone_c::draw() {
g_env_light.settingTevStruct(8, &current.pos, &mTevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
cXyz shadowPos(current.pos.x, current.pos.y, current.pos.z);
field_0x5c0 = dComIfGd_setShadow(field_0x5c0, 1, mpModel, &shadowPos, 500.0f, 0.0f,
current.pos.y, field_0x5bc, mPolyInfo, &mTevStr, 0, 1.0f,
dDlst_shadowControl_c::getSimpleTex());
return 1;
}
#pragma pop
/* 80D3806C-80D3811C 0006EC 00B0+00 1/1 0/0 0/0 .text Delete__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::Delete() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/Delete__13daWindStone_cFv.s"
int daWindStone_c::Delete() {
if (i_fopAcM_isSwitch(this, getSwBit1())) {
i_fopAcM_offSwitch(this, getSwBit1());
}
if (mpBgW != NULL && mpBgW->ChkUsed()) {
dComIfG_Bgsp().Release(mpBgW);
}
this->~daWindStone_c();
return 1;
}
#pragma pop
/* 80D3811C-80D38180 00079C 0064+00 2/2 0/0 0/0 .text setModelMtx__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::setModelMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/setModelMtx__13daWindStone_cFv.s"
void daWindStone_c::setModelMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
}
#pragma pop
/* 80D38180-80D381EC 000800 006C+00 1/1 0/0 0/0 .text init__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::init() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/init__13daWindStone_cFv.s"
void daWindStone_c::init() {
if (!chkEveOccur()) {
if (chkMapDispMode()) {
field_0x5c4 = 1;
} else {
field_0x5c4 = 2;
}
} else {
field_0x5c4 = 0;
}
field_0x5c0 = 0;
}
#pragma pop
/* ############################################################################################## */
/* 80D38624-80D38628 00001C 0004+00 1/1 0/0 0/0 .rodata @4243 */
SECTION_RODATA static f32 const lit_4243 = 40000.0f;
COMPILER_STRIP_GATE(0x80D38624, &lit_4243);
/* 80D381EC-80D38278 00086C 008C+00 1/1 0/0 0/0 .text chkWlfInRange__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::chkWlfInRange() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/chkWlfInRange__13daWindStone_cFv.s"
bool daWindStone_c::chkWlfInRange() {
if (dComIfGp_getPlayer(0) == NULL) {
return false;
}
if (daPy_py_c::i_checkNowWolf()) {
cXyz player_pos = dComIfGp_getPlayer(0)->current.pos;
if (player_pos.abs2(current.pos) < 40000.0f) {
return true;
}
}
return false;
}
#pragma pop
/* 80D38278-80D382C4 0008F8 004C+00 2/2 0/0 0/0 .text chkEveOccur__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::chkEveOccur() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/chkEveOccur__13daWindStone_cFv.s"
bool daWindStone_c::chkEveOccur() {
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getDelEveFlgId()]) == false) {
return true;
}
return false;
}
#pragma pop
/* 80D382C4-80D3835C 000944 0098+00 1/1 0/0 0/0 .text exeModeHowl__13daWindStone_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::exeModeHowl() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/exeModeHowl__13daWindStone_cFv.s"
void daWindStone_c::exeModeHowl() {
if (!chkEveOccur()) {
mAttentionInfo.mFlags = 0;
field_0x5c4 = 2;
} else {
s8 tuneId = getTuneId();
// Fake match. Should be:
// daAlink_getAlinkActorClass()->daAlink_c::getWolfHowlMgrP()->startWindStoneSound(tuneId,
// &current.pos);
daAlink_getAlinkActorClass()->i_getWolfHowlMgrP()->startWindStoneSound(tuneId,
&current.pos);
mAttentionInfo.mFlags = 0;
if (chkWlfInRange()) {
mAttentionInfo.mFlags |= 0x80;
mAttentionInfo.field_0x0[7] = 65;
}
}
}
#pragma pop
/* 80D3835C-80D383FC 0009DC 00A0+00 1/1 0/0 0/0 .text exeModeMapDisp__13daWindStone_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::exeModeMapDisp() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/exeModeMapDisp__13daWindStone_cFv.s"
void daWindStone_c::exeModeMapDisp() {
if (i_dComIfGp_getEvent().i_isOrderOK() || !i_dComIfGp_event_runCheck()) {
dMeter2Info_setGoldWolfMapType(getGoldWolfIdx());
dMeter2Info_setPauseStatus(5);
i_fopAcM_onSwitch(this, getSwBit2());
field_0x5c4 = 2;
}
}
#pragma pop
/* 80D383FC-80D384C4 000A7C 00C8+00 1/1 0/0 0/0 .text chkMapDispMode__13daWindStone_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::chkMapDispMode() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/chkMapDispMode__13daWindStone_cFv.s"
bool daWindStone_c::chkMapDispMode() {
if (i_fopAcM_isSwitch(this, getSwBit2())) {
return false;
}
s16 start_point = dComIfGs_getStartPoint();
switch (getTuneId()) {
case 3:
case 5:
case 7:
case 8:
if (start_point == 100) {
return true;
}
break;
case 4:
case 6:
if (start_point == 101) {
return true;
}
break;
}
return false;
}
#pragma pop
/* 80D384C4-80D3853C 000B44 0078+00 1/1 0/0 0/0 .text getGoldWolfIdx__13daWindStone_cFv
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daWindStone_c::getGoldWolfIdx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/getGoldWolfIdx__13daWindStone_cFv.s"
u8 daWindStone_c::getGoldWolfIdx() {
switch (getTuneId()) {
case 3:
return 2;
case 4:
return 3;
case 5:
return 4;
case 6:
return 5;
case 7:
return 6;
case 8:
return 7;
default:
return 2;
}
}
#pragma pop
/* 80D3853C-80D38590 000BBC 0054+00 1/0 0/0 0/0 .text daWindStone_create__FP13daWindStone_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daWindStone_create(daWindStone_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_create__FP13daWindStone_c.s"
static int daWindStone_create(daWindStone_c* i_this) {
fopAcM_SetupActor(i_this, daWindStone_c);
return i_this->create();
}
#pragma pop
/* 80D38590-80D385B0 000C10 0020+00 1/0 0/0 0/0 .text daWindStone_Delete__FP13daWindStone_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daWindStone_Delete(daWindStone_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_Delete__FP13daWindStone_c.s"
static int daWindStone_Delete(daWindStone_c* i_this) {
return i_this->Delete();
}
#pragma pop
/* 80D385B0-80D385D0 000C30 0020+00 1/0 0/0 0/0 .text daWindStone_execute__FP13daWindStone_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daWindStone_execute(daWindStone_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_execute__FP13daWindStone_c.s"
static int daWindStone_execute(daWindStone_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80D385D0-80D385F0 000C50 0020+00 1/0 0/0 0/0 .text daWindStone_draw__FP13daWindStone_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daWindStone_draw(daWindStone_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/daWindStone_draw__FP13daWindStone_c.s"
static int daWindStone_draw(daWindStone_c* i_this) {
return i_this->draw();
}
#pragma pop
/* 80D385F0-80D385F8 000C70 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80D385F0() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/func_80D385F0.s"
}
#pragma pop
/* 80D38638-80D38658 -00001 0020+00 1/0 0/0 0/0 .data daWindStone_METHODS */
static actor_method_class daWindStone_METHODS = {
(process_method_func)daWindStone_create, (process_method_func)daWindStone_Delete,
(process_method_func)daWindStone_execute, (process_method_func)NULL,
(process_method_func)daWindStone_draw,
};
/* 80D385F8-80D38600 000C78 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void func_80D385F8() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone/func_80D385F8.s"
}
#pragma pop
/* 80D38628-80D38628 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80D38658-80D38688 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WindStone */
extern actor_process_profile_definition g_profile_Obj_WindStone = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_WindStone, // mProcName
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daWindStone_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
732, // mPriority
&daWindStone_METHODS, // mSubMtd
0x40100, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_0_e, // mCullType
};

10
rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp
View File

@ -225,13 +225,12 @@ void daTagLv7Gate_c::flyAnime() {
/* 80D511C8-80D51628 000788 0460+00 1/1 0/0 0/0 .text execute__14daTagLv7Gate_cFv */
int daTagLv7Gate_c::execute() {
// Fake match?
// Fakematch
dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay();
if (i_dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk()) {
if (i_dComIfGp_event_runCheck() != 0 && !mEvtInfo.checkCommandTalk()) {
s32 cut_index = i_dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0);
if (cut_index != -1) {
// int* cut_name = (int*)i_dComIfGp_getEventManager().getMyNowCutName(cut_index);
int* cut_name = (int*)play.getEvtManager().getMyNowCutName(cut_index);
int* cut_name = (int*)play.getEvtManager().getMyNowCutName(cut_index); // Fakematch
daPy_getPlayerActorClass()->onShieldBackBone();
@ -264,7 +263,8 @@ int daTagLv7Gate_c::execute() {
if (mEvtInfo.checkCommandDemoAccrpt() && mEvtId != -1 &&
dComIfGp_evmng_endCheck(mEvtId)) {
i_dComIfGp_event_reset();
// i_dComIfGp_event_reset();
play.getEvent().reset(); // Fakematch
mEvtId = -1;
fopAcM_delete(this);
}

2
rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp
View File

@ -55,7 +55,7 @@ int daTag_Evt_c::execute() {
fopAcM_SetRoomNo(this, dComIfGp_roomControl_getStayNo());
if (field_0x5E4 == 0 || field_0x5E4 == 1) {
dComIfG_inf_c* pGameInfo = &g_dComIfG_gameInfo;
if (i_dComIfGp_event_runCheck()) {
if (i_dComIfGp_event_runCheck() != 0) {
bVar = false;
int iVar1 = i_dComIfGp_evmng_getMyStaffId(field_0x568, 0, 0);
if (!mEvtInfo.checkCommandTalk()) {

2
rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp
View File

@ -72,7 +72,7 @@ int daTag_EvtMsg_c::Execute() {
dEvent_manager_c& evt_mng = i_dComIfGp_getEventManager();
if (orig.roomNo == dComIfGp_roomControl_getStayNo()) {
if (i_dComIfGp_event_runCheck()) {
if (i_dComIfGp_event_runCheck() != 0) {
int staff_id;
BOOL reset = false;
if (mEvtInfo.checkCommandTalk()) {

46
src/d/a/d_a_alink.cpp
View File

@ -7,10 +7,12 @@
#include "JSystem/J2DGraph/J2DAnmLoader.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/JAudio2/JAISeq.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JMath/JMath.h"
#include "SSystem/SComponent/c_math.h"
#include "d/a/d_a_npc.h"
#include "d/a/d_a_obj.h"
#include "d/d_item.h"
#include "d/d_procname.h"
#include "d/meter/d_meter2_draw.h"
@ -28,34 +30,13 @@
#include "rel/d/a/d_a_tbox/d_a_tbox.h"
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h"
#include "rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h"
#include "rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.h"
#include "rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h"
#include "rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h"
#include "rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h"
//
// Types:
//
struct daObjMovebox {
struct Act_c {
struct Prm_e {};
};
};
struct daObj {
template <typename A1>
void PrmAbstract(/* ... */);
/* 80141ACC */ /* daObj::PrmAbstract<daObjMovebox::Act_c::Prm_e> */
void func_80141ACC(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e,
daObjMovebox::Act_c::Prm_e);
};
struct JAISeq {
/* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr<JAISeq>*);
};
//
// Forward References:
@ -4784,27 +4765,21 @@ COMPILER_STRIP_GATE(0x8038FAC0, &l_crawlTopUpOffset);
/* 8038FACC-8038FAD8 01C12C 000C+00 0/1 0/0 0/0 .rodata l_wolfLieTopUpOffset */
#pragma push
#pragma force_active on
SECTION_RODATA static Vec const l_wolfLieTopUpOffset = {
0.0f, 75.0f, 0.0f
};
SECTION_RODATA static Vec const l_wolfLieTopUpOffset = {0.0f, 75.0f, 0.0f};
COMPILER_STRIP_GATE(0x8038FACC, &l_wolfLieTopUpOffset);
#pragma pop
/* 8038FAD8-8038FAE4 01C138 000C+00 0/1 0/0 0/0 .rodata l_crawlSideOffset */
#pragma push
#pragma force_active on
SECTION_RODATA static Vec const l_crawlSideOffset = {
55.0f, 80.0f, 0.0f
};
SECTION_RODATA static Vec const l_crawlSideOffset = {55.0f, 80.0f, 0.0f};
COMPILER_STRIP_GATE(0x8038FAD8, &l_crawlSideOffset);
#pragma pop
/* 8038FAE4-8038FAF0 01C144 000C+00 0/1 0/0 0/0 .rodata l_wolfLieSideOffset */
#pragma push
#pragma force_active on
SECTION_RODATA static Vec const l_wolfLieSideOffset = {
55.0f, 75.0f, 0.0f
};
SECTION_RODATA static Vec const l_wolfLieSideOffset = {55.0f, 75.0f, 0.0f};
COMPILER_STRIP_GATE(0x8038FAE4, &l_wolfLieSideOffset);
#pragma pop
@ -5815,7 +5790,9 @@ COMPILER_STRIP_GATE(0x80391A08, &hookRoot);
/* 80391A14-80391A20 01E074 000C+00 1/1 0/0 0/0 .rodata bottleTop$32160 */
SECTION_RODATA static Vec const bottleTop = {
0.0f, 25.0f, 0.0f,
0.0f,
25.0f,
0.0f,
};
COMPILER_STRIP_GATE(0x80391A14, &bottleTop);
@ -18798,7 +18775,8 @@ asm int daAlink_c::changeItemTriggerKeepProc(u8 param_0, int param_1) {
/**
* Determines whether an item action can occur, and which action to use.
*
* @return a `daAlink_ItemProc` value corresponding to the `PROC` function to run in `changeItemTriggerKeepProc`
* @return a `daAlink_ItemProc` value corresponding to the `PROC` function to run in
* `changeItemTriggerKeepProc`
*/
// matches with literals
#ifdef NONMATCHING

2
src/d/a/d_a_npc.cpp
View File

@ -1774,7 +1774,7 @@ int daNpcT_c::execute() {
setCollision();
if (!field_0xe2c) {
if ((field_0xe33 && i_dComIfGp_getEvent().i_isOrderOK()) || !i_dComIfGp_event_runCheck()) {
if ((field_0xe33 && i_dComIfGp_getEvent().i_isOrderOK()) || i_dComIfGp_event_runCheck() == 0) {
evtOrder();
}
}

18
src/d/a/d_a_obj.cpp
View File

@ -4,25 +4,7 @@
//
#include "d/a/d_a_obj.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
//
// Types:
//
namespace daObj {
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
/* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*);
/* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*);
/* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*);
/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
/* 80037620 */ void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*,
f32, f32, cXyz const*);
/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&);
/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
}; // namespace daObj
//
// Forward References:

15
src/d/com/d_com_static.cpp
View File

@ -4,7 +4,6 @@
//
#include "d/com/d_com_static.h"
#include "stdio.h"
#include "d/d_demo.h"
#include "dol2asm.h"
#include "rel/d/a/d_a_dshutter/d_a_dshutter.h"
@ -12,21 +11,13 @@
#include "rel/d/a/d_a_mirror/d_a_mirror.h"
#include "rel/d/a/d_a_movie_player/d_a_movie_player.h"
#include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h"
#include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h"
#include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h"
#include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
//
// Types:
//
struct daObjMovebox {
struct Act_c {
static void* M_dir_base[2];
};
};
#include "stdio.h"
//
// Forward References:

12
src/d/d_ev_camera.cpp
View File

@ -10,14 +10,7 @@
#include "d/d_demo.h"
#include "dol2asm.h"
#include "m_Do/m_Do_controller_pad.h"
//
// Types:
//
struct daMidna_c {
/* 800977A8 */ void checkNoDraw() const;
};
#include "rel/d/a/d_a_midna/d_a_midna.h"
//
// Forward References:
@ -1973,7 +1966,8 @@ asm void dCamera_c::eyePos(fopAc_ac_c* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daMidna_c::checkNoDraw() const {
// BOOL daMidna_c::checkNoDraw() const
extern "C" asm void checkNoDraw__9daMidna_cCFv() {
nofralloc
#include "asm/d/d_ev_camera/checkNoDraw__9daMidna_cCFv.s"
}

13
src/d/d_resorce.cpp
View File

@ -11,8 +11,7 @@
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/JKernel/JKRMemArchive.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "stdio.h"
#include "string.h"
#include "d/bg/d_bg_w_kcol.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/mtx.h"
@ -20,14 +19,8 @@
#include "dolphin/types.h"
#include "global.h"
#include "m_Do/m_Do_graphic.h"
//
// Types:
//
struct dBgWKCol {
/* 8007E7D0 */ static void* initKCollision(void*);
};
#include "stdio.h"
#include "string.h"
//
// Forward References: