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

d_a_tag_stream OK, d_a_swTime OK, d_a_andsw OK (#287)

This commit is contained in:
Pheenoh 2023-02-16 07:30:50 -07:00 committed by GitHub
parent 5ce19327db
commit 2e3352a3a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 336 additions and 812 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Progress.md
View File

@ -21,8 +21,8 @@ Total | 32.316787% | 1299352 | 4020672
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 32.316787% | 1299352 | 4020672
RELs | 33.195239% | 3817560 | 11500324
Total | 32.967678% | 5116912 | 15520996
RELs | 33.566080% | 3860208 | 11500324
Total | 33.242454% | 5159560 | 15520996
## RELs
@ -32,7 +32,7 @@ d_a_L7demo_dr | 30.796884% | 2056 | 6676
d_a_L7low_dr | 38.905775% | 1536 | 3948
d_a_L7op_demo_dr | 26.198715% | 4240 | 16184
d_a_alldie | 100.000000% | 2096 | 2096
d_a_andsw | 60.526316% | 644 | 1064
d_a_andsw | 100.000000% | 1064 | 1064
d_a_andsw2 | 29.472774% | 1364 | 4628
d_a_arrow | 28.104690% | 6400 | 22772
d_a_b_bh | 24.452445% | 6520 | 26664
@ -67,7 +67,7 @@ d_a_coach_2D | 38.344915% | 2428 | 6332
d_a_coach_fire | 44.050104% | 1688 | 3832
d_a_cow | 22.936702% | 12784 | 55736
d_a_crod | 98.228128% | 7096 | 7224
d_a_cstaf | 32.377740% | 3840 | 11860
d_a_cstaF | 100.000000% | 11860 | 11860
d_a_cstatue | 29.155833% | 6728 | 23076
d_a_demo00 | 29.136000% | 7284 | 25000
d_a_demo_item | 33.863165% | 3920 | 11576
@ -75,8 +75,8 @@ d_a_disappear | 45.091514% | 1084 | 2404
d_a_dmidna | 100.000000% | 1888 | 1888
d_a_do | 37.666220% | 14616 | 38804
d_a_door_boss | 40.856890% | 3700 | 9056
d_a_door_bossL1 | 100.000000% | 18732 | 18732
d_a_door_bossL5 | 39.221790% | 4032 | 10280
d_a_door_bossl1 | 39.355114% | 7372 | 18732
d_a_door_dbdoor00 | 40.734908% | 3104 | 7620
d_a_door_knob00 | 37.500000% | 4608 | 12288
d_a_door_mbossL1 | 34.467633% | 10372 | 30092
@ -419,7 +419,7 @@ d_a_obj_glowSphere | 38.917749% | 3596 | 9240
d_a_obj_gm | 35.212957% | 4696 | 13336
d_a_obj_goGate | 48.046181% | 2164 | 4504
d_a_obj_gomikabe | 37.032799% | 3884 | 10488
d_a_obj_gptaru | 33.238231% | 4660 | 14020
d_a_obj_gpTaru | 100.000000% | 14020 | 14020
d_a_obj_gra2 | 24.809250% | 21200 | 85452
d_a_obj_graWall | 55.725191% | 1168 | 2096
d_a_obj_gra_rock | 37.947123% | 2928 | 7716
@ -470,7 +470,7 @@ d_a_obj_kkanban | 47.103514% | 1984 | 4212
d_a_obj_klift00 | 37.650457% | 3128 | 8308
d_a_obj_knBullet | 43.076923% | 1568 | 3640
d_a_obj_kshutter | 35.690936% | 4804 | 13460
d_a_obj_ktonfire | 45.504087% | 2004 | 4404
d_a_obj_ktOnFire | 100.000000% | 4404 | 4404
d_a_obj_kuwagata | 30.226537% | 5604 | 18540
d_a_obj_kwheel00 | 40.352811% | 2928 | 7256
d_a_obj_kwheel01 | 41.610233% | 2212 | 5316
@ -483,7 +483,7 @@ d_a_obj_life_container | 34.456243% | 3764 | 10924
d_a_obj_lp | 29.557762% | 2620 | 8864
d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756
d_a_obj_lv1Candle01 | 44.344569% | 2368 | 5340
d_a_obj_lv2candle | 38.160920% | 2656 | 6960
d_a_obj_lv2Candle | 100.000000% | 6960 | 6960
d_a_obj_lv3Candle | 45.638126% | 2260 | 4952
d_a_obj_lv3Water | 44.263566% | 4568 | 10320
d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672
@ -584,6 +584,7 @@ d_a_obj_rotTrap | 45.877144% | 3316 | 7228
d_a_obj_roten | 41.613588% | 1568 | 3768
d_a_obj_rstair | 37.354086% | 2688 | 7196
d_a_obj_rw | 41.210834% | 3104 | 7532
d_a_obj_sWallShutter | 100.000000% | 5864 | 5864
d_a_obj_saidan | 50.210970% | 1904 | 3792
d_a_obj_sakuita | 43.573382% | 1912 | 4388
d_a_obj_sakuita_rope | 30.817009% | 2580 | 8372
@ -609,7 +610,7 @@ d_a_obj_ss_item | 38.313378% | 2944 | 7684
d_a_obj_stairBlock | 45.129643% | 2576 | 5708
d_a_obj_stick | 43.708609% | 2376 | 5436
d_a_obj_stone | 26.135237% | 5272 | 20172
d_a_obj_stonemark | 52.549020% | 1072 | 2040
d_a_obj_stoneMark | 100.000000% | 2040 | 2040
d_a_obj_stopper | 31.675996% | 3848 | 12148
d_a_obj_stopper2 | 38.987342% | 1848 | 4740
d_a_obj_suisya | 49.914821% | 1172 | 2348
@ -618,7 +619,6 @@ d_a_obj_swBallA | 35.803945% | 2396 | 6692
d_a_obj_swBallB | 34.276891% | 2664 | 7772
d_a_obj_swBallC | 41.458222% | 3116 | 7516
d_a_obj_swLight | 40.346767% | 3444 | 8536
d_a_obj_swallshutter | 41.268759% | 2420 | 5864
d_a_obj_swchain | 24.473297% | 3996 | 16328
d_a_obj_swhang | 38.446450% | 3920 | 10196
d_a_obj_sword | 45.479963% | 1952 | 4292
@ -700,9 +700,10 @@ d_a_startAndGoal | 41.918528% | 1276 | 3044
d_a_suspend | 77.678571% | 696 | 896
d_a_swBall | 33.297414% | 1236 | 3712
d_a_swLBall | 33.651805% | 1268 | 3768
d_a_swTime | 63.076923% | 656 | 1040
d_a_swTime | 100.000000% | 1040 | 1040
d_a_swc00 | 43.087121% | 1820 | 4224
d_a_swhit0 | 35.577421% | 2748 | 7724
d_a_tag_CstaSw | 100.000000% | 2560 | 2560
d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904
d_a_tag_Lv7Gate | 34.752224% | 2188 | 6296
d_a_tag_Lv8Gate | 43.347193% | 1668 | 3848
@ -717,7 +718,6 @@ d_a_tag_bottle_item | 38.554217% | 1024 | 2656
d_a_tag_camera | 37.023593% | 1632 | 4408
d_a_tag_chgrestart | 48.868778% | 864 | 1768
d_a_tag_chkpoint | 39.852399% | 864 | 2168
d_a_tag_cstasw | 51.406250% | 1316 | 2560
d_a_tag_csw | 35.869565% | 3696 | 10304
d_a_tag_escape | 100.000000% | 712 | 712
d_a_tag_event | 31.075697% | 1248 | 4016
@ -767,7 +767,7 @@ d_a_tag_sppath | 33.333333% | 2040 | 6120
d_a_tag_spring | 45.780591% | 868 | 1896
d_a_tag_ss_drink | 36.483740% | 1436 | 3936
d_a_tag_statue_evt | 38.427948% | 2816 | 7328
d_a_tag_stream | 49.729730% | 736 | 1480
d_a_tag_stream | 100.000000% | 1480 | 1480
d_a_tag_telop | 100.000000% | 1040 | 1040
d_a_tag_theB_hint | 67.253521% | 764 | 1136
d_a_tag_wara_howl | 100.000000% | 1420 | 1420
@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244
d_a_warp_bug | 54.940711% | 1112 | 2024
d_a_ykgr | 44.400631% | 2252 | 5072
f_pc_profile_lst | 100.000000% | 28156 | 28156
Total | 33.195239% | 3817560 | 11500324
Total | 33.566080% | 3860208 | 11500324

19
asm/rel/d/a/d_a_andsw/d_a_andsw/Create__9daAndsw_cFv.s
View File

@ -1,19 +0,0 @@
lbl_80457978:
/* 80457978 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 8045797C 98 03 05 68 */ stb r0, 0x568(r3)
/* 80457980 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80457984 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f
/* 80457988 98 03 05 69 */ stb r0, 0x569(r3)
/* 8045798C 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80457990 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f
/* 80457994 28 00 00 FF */ cmplwi r0, 0xff
/* 80457998 41 82 00 10 */ beq lbl_804579A8
/* 8045799C 1C 00 00 0F */ mulli r0, r0, 0xf
/* 804579A0 B0 03 05 6A */ sth r0, 0x56a(r3)
/* 804579A4 48 00 00 0C */ b lbl_804579B0
lbl_804579A8:
/* 804579A8 38 00 00 00 */ li r0, 0
/* 804579AC B0 03 05 6A */ sth r0, 0x56a(r3)
lbl_804579B0:
/* 804579B0 38 60 00 01 */ li r3, 1
/* 804579B4 4E 80 00 20 */ blr

9
asm/rel/d/a/d_a_andsw/d_a_andsw/daAndsw_Create__FP10fopAc_ac_c.s
View File

@ -1,9 +0,0 @@
lbl_80457B04:
/* 80457B04 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80457B08 7C 08 02 A6 */ mflr r0
/* 80457B0C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80457B10 4B FF FE A9 */ bl create__9daAndsw_cFv
/* 80457B14 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80457B18 7C 08 03 A6 */ mtlr r0
/* 80457B1C 38 21 00 10 */ addi r1, r1, 0x10
/* 80457B20 4E 80 00 20 */ blr

9
asm/rel/d/a/d_a_andsw/d_a_andsw/daAndsw_Delete__FP9daAndsw_c.s
View File

@ -1,9 +0,0 @@
lbl_80457AE4:
/* 80457AE4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80457AE8 7C 08 02 A6 */ mflr r0
/* 80457AEC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80457AF0 4B FF FF CD */ bl _delete__9daAndsw_cFv
/* 80457AF4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80457AF8 7C 08 03 A6 */ mtlr r0
/* 80457AFC 38 21 00 10 */ addi r1, r1, 0x10
/* 80457B00 4E 80 00 20 */ blr

9
asm/rel/d/a/d_a_andsw/d_a_andsw/daAndsw_Execute__FP9daAndsw_c.s
View File

@ -1,9 +0,0 @@
lbl_80457AC4:
/* 80457AC4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80457AC8 7C 08 02 A6 */ mflr r0
/* 80457ACC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80457AD0 4B FF FF 51 */ bl execute__9daAndsw_cFv
/* 80457AD4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80457AD8 7C 08 03 A6 */ mtlr r0
/* 80457ADC 38 21 00 10 */ addi r1, r1, 0x10
/* 80457AE0 4E 80 00 20 */ blr

42
asm/rel/d/a/d_a_andsw/d_a_andsw/execute__9daAndsw_cFv.s
View File

@ -1,42 +0,0 @@
lbl_80457A20:
/* 80457A20 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80457A24 7C 08 02 A6 */ mflr r0
/* 80457A28 90 01 00 14 */ stw r0, 0x14(r1)
/* 80457A2C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80457A30 7C 7F 1B 78 */ mr r31, r3
/* 80457A34 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80457A38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80457A3C 88 9F 05 69 */ lbz r4, 0x569(r31)
/* 80457A40 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80457A44 7C 05 07 74 */ extsb r5, r0
/* 80457A48 4B BD D9 19 */ bl isSwitch__10dSv_info_cCFii
/* 80457A4C 2C 03 00 00 */ cmpwi r3, 0
/* 80457A50 41 82 00 54 */ beq lbl_80457AA4
/* 80457A54 A8 7F 05 6A */ lha r3, 0x56a(r31)
/* 80457A58 2C 03 00 00 */ cmpwi r3, 0
/* 80457A5C 40 81 00 0C */ ble lbl_80457A68
/* 80457A60 38 03 FF FF */ addi r0, r3, -1
/* 80457A64 B0 1F 05 6A */ sth r0, 0x56a(r31)
lbl_80457A68:
/* 80457A68 A8 1F 05 6A */ lha r0, 0x56a(r31)
/* 80457A6C 2C 00 00 00 */ cmpwi r0, 0
/* 80457A70 40 82 00 34 */ bne lbl_80457AA4
/* 80457A74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80457A78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80457A7C 88 9F 05 68 */ lbz r4, 0x568(r31)
/* 80457A80 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80457A84 7C 05 07 74 */ extsb r5, r0
/* 80457A88 4B BD D8 29 */ bl offSwitch__10dSv_info_cFii
/* 80457A8C 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80457A90 54 00 46 3E */ srwi r0, r0, 0x18
/* 80457A94 28 00 00 01 */ cmplwi r0, 1
/* 80457A98 40 82 00 0C */ bne lbl_80457AA4
/* 80457A9C 7F E3 FB 78 */ mr r3, r31
/* 80457AA0 4B BC 21 DD */ bl fopAcM_delete__FP10fopAc_ac_c
lbl_80457AA4:
/* 80457AA4 38 60 00 01 */ li r3, 1
/* 80457AA8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80457AAC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80457AB0 7C 08 03 A6 */ mtlr r0
/* 80457AB4 38 21 00 10 */ addi r1, r1, 0x10
/* 80457AB8 4E 80 00 20 */ blr

31
asm/rel/d/a/d_a_andsw/d_a_andsw/func_804579B8.s
View File

@ -1,31 +0,0 @@
lbl_804579B8:
/* 804579B8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 804579BC 7C 08 02 A6 */ mflr r0
/* 804579C0 90 01 00 14 */ stw r0, 0x14(r1)
/* 804579C4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 804579C8 7C 7F 1B 78 */ mr r31, r3
/* 804579CC 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 804579D0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 804579D4 40 82 00 1C */ bne lbl_804579F0
/* 804579D8 28 1F 00 00 */ cmplwi r31, 0
/* 804579DC 41 82 00 08 */ beq lbl_804579E4
/* 804579E0 4B BC 11 85 */ bl __ct__10fopAc_ac_cFv
lbl_804579E4:
/* 804579E4 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 804579E8 60 00 00 08 */ ori r0, r0, 8
/* 804579EC 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_804579F0:
/* 804579F0 7F E3 FB 78 */ mr r3, r31
/* 804579F4 4B FF FF 85 */ bl Create__9daAndsw_cFv
/* 804579F8 2C 03 00 00 */ cmpwi r3, 0
/* 804579FC 40 82 00 0C */ bne lbl_80457A08
/* 80457A00 38 60 00 05 */ li r3, 5
/* 80457A04 48 00 00 08 */ b lbl_80457A0C
lbl_80457A08:
/* 80457A08 38 60 00 04 */ li r3, 4
lbl_80457A0C:
/* 80457A0C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80457A10 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80457A14 7C 08 03 A6 */ mtlr r0
/* 80457A18 38 21 00 10 */ addi r1, r1, 0x10
/* 80457A1C 4E 80 00 20 */ blr

11
asm/rel/d/a/d_a_swTime/d_a_swTime/Create__10daSwTime_cFv.s
View File

@ -1,11 +0,0 @@
lbl_80D4F638:
/* 80D4F638 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80D4F63C 98 03 05 68 */ stb r0, 0x568(r3)
/* 80D4F640 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80D4F644 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f
/* 80D4F648 98 03 05 69 */ stb r0, 0x569(r3)
/* 80D4F64C 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 80D4F650 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f
/* 80D4F654 98 03 05 6A */ stb r0, 0x56a(r3)
/* 80D4F658 38 60 00 01 */ li r3, 1
/* 80D4F65C 4E 80 00 20 */ blr

9
asm/rel/d/a/d_a_swTime/d_a_swTime/daSwTime_Create__FP10daSwTime_c.s
View File

@ -1,9 +0,0 @@
lbl_80D4F7A0:
/* 80D4F7A0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D4F7A4 7C 08 02 A6 */ mflr r0
/* 80D4F7A8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D4F7AC 4B FF FE B5 */ bl create__10daSwTime_cFv
/* 80D4F7B0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D4F7B4 7C 08 03 A6 */ mtlr r0
/* 80D4F7B8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D4F7BC 4E 80 00 20 */ blr

9
asm/rel/d/a/d_a_swTime/d_a_swTime/daSwTime_Delete__FP10daSwTime_c.s
View File

@ -1,9 +0,0 @@
lbl_80D4F780:
/* 80D4F780 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D4F784 7C 08 02 A6 */ mflr r0
/* 80D4F788 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D4F78C 4B FF FF CD */ bl _delete__10daSwTime_cFv
/* 80D4F790 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D4F794 7C 08 03 A6 */ mtlr r0
/* 80D4F798 38 21 00 10 */ addi r1, r1, 0x10
/* 80D4F79C 4E 80 00 20 */ blr

9
asm/rel/d/a/d_a_swTime/d_a_swTime/daSwTime_Execute__FP10daSwTime_c.s
View File

@ -1,9 +0,0 @@
lbl_80D4F760:
/* 80D4F760 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D4F764 7C 08 02 A6 */ mflr r0
/* 80D4F768 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D4F76C 4B FF FF 5D */ bl execute__10daSwTime_cFv
/* 80D4F770 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D4F774 7C 08 03 A6 */ mtlr r0
/* 80D4F778 38 21 00 10 */ addi r1, r1, 0x10
/* 80D4F77C 4E 80 00 20 */ blr

40
asm/rel/d/a/d_a_swTime/d_a_swTime/execute__10daSwTime_cFv.s
View File

@ -1,40 +0,0 @@
lbl_80D4F6C8:
/* 80D4F6C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D4F6CC 7C 08 02 A6 */ mflr r0
/* 80D4F6D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D4F6D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D4F6D8 7C 7F 1B 78 */ mr r31, r3
/* 80D4F6DC 88 83 05 6A */ lbz r4, 0x56a(r3)
/* 80D4F6E0 28 04 00 FF */ cmplwi r4, 0xff
/* 80D4F6E4 41 82 00 28 */ beq lbl_80D4F70C
/* 80D4F6E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D4F6EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D4F6F0 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D4F6F4 7C 05 07 74 */ extsb r5, r0
/* 80D4F6F8 4B 2E 5C 69 */ bl isSwitch__10dSv_info_cCFii
/* 80D4F6FC 2C 03 00 00 */ cmpwi r3, 0
/* 80D4F700 40 82 00 0C */ bne lbl_80D4F70C
/* 80D4F704 38 60 00 01 */ li r3, 1
/* 80D4F708 48 00 00 3C */ b lbl_80D4F744
lbl_80D4F70C:
/* 80D4F70C 4B 45 03 05 */ bl dKy_getdaytime_hour__Fv
/* 80D4F710 88 1F 05 68 */ lbz r0, 0x568(r31)
/* 80D4F714 7C 00 18 00 */ cmpw r0, r3
/* 80D4F718 40 82 00 28 */ bne lbl_80D4F740
/* 80D4F71C 4B 45 03 21 */ bl dKy_getdaytime_minute__Fv
/* 80D4F720 2C 03 00 00 */ cmpwi r3, 0
/* 80D4F724 40 82 00 1C */ bne lbl_80D4F740
/* 80D4F728 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D4F72C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D4F730 88 9F 05 69 */ lbz r4, 0x569(r31)
/* 80D4F734 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D4F738 7C 05 07 74 */ extsb r5, r0
/* 80D4F73C 4B 2E 5A C5 */ bl onSwitch__10dSv_info_cFii
lbl_80D4F740:
/* 80D4F740 38 60 00 01 */ li r3, 1
lbl_80D4F744:
/* 80D4F744 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D4F748 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D4F74C 7C 08 03 A6 */ mtlr r0
/* 80D4F750 38 21 00 10 */ addi r1, r1, 0x10
/* 80D4F754 4E 80 00 20 */ blr

31
asm/rel/d/a/d_a_swTime/d_a_swTime/func_80D4F660.s
View File

@ -1,31 +0,0 @@
lbl_80D4F660:
/* 80D4F660 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D4F664 7C 08 02 A6 */ mflr r0
/* 80D4F668 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D4F66C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D4F670 7C 7F 1B 78 */ mr r31, r3
/* 80D4F674 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D4F678 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D4F67C 40 82 00 1C */ bne lbl_80D4F698
/* 80D4F680 28 1F 00 00 */ cmplwi r31, 0
/* 80D4F684 41 82 00 08 */ beq lbl_80D4F68C
/* 80D4F688 4B 2C 94 DD */ bl __ct__10fopAc_ac_cFv
lbl_80D4F68C:
/* 80D4F68C 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D4F690 60 00 00 08 */ ori r0, r0, 8
/* 80D4F694 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D4F698:
/* 80D4F698 7F E3 FB 78 */ mr r3, r31
/* 80D4F69C 4B FF FF 9D */ bl Create__10daSwTime_cFv
/* 80D4F6A0 2C 03 00 00 */ cmpwi r3, 0
/* 80D4F6A4 40 82 00 0C */ bne lbl_80D4F6B0
/* 80D4F6A8 38 60 00 05 */ li r3, 5
/* 80D4F6AC 48 00 00 08 */ b lbl_80D4F6B4
lbl_80D4F6B0:
/* 80D4F6B0 38 60 00 04 */ li r3, 4
lbl_80D4F6B4:
/* 80D4F6B4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D4F6B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D4F6BC 7C 08 03 A6 */ mtlr r0
/* 80D4F6C0 38 21 00 10 */ addi r1, r1, 0x10
/* 80D4F6C4 4E 80 00 20 */ blr

43
asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/__dt__13daTagStream_cFv.s
View File

@ -1,43 +0,0 @@
lbl_80D63A98:
/* 80D63A98 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D63A9C 7C 08 02 A6 */ mflr r0
/* 80D63AA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D63AA4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D63AA8 93 C1 00 08 */ stw r30, 8(r1)
/* 80D63AAC 7C 7E 1B 79 */ or. r30, r3, r3
/* 80D63AB0 7C 9F 23 78 */ mr r31, r4
/* 80D63AB4 41 82 00 60 */ beq lbl_80D63B14
/* 80D63AB8 80 7E 05 70 */ lwz r3, 0x570(r30)
/* 80D63ABC 28 03 00 00 */ cmplwi r3, 0
/* 80D63AC0 41 82 00 0C */ beq lbl_80D63ACC
/* 80D63AC4 80 1E 05 74 */ lwz r0, 0x574(r30)
/* 80D63AC8 90 03 05 74 */ stw r0, 0x574(r3)
lbl_80D63ACC:
/* 80D63ACC 80 7E 05 74 */ lwz r3, 0x574(r30)
/* 80D63AD0 28 03 00 00 */ cmplwi r3, 0
/* 80D63AD4 41 82 00 0C */ beq lbl_80D63AE0
/* 80D63AD8 80 1E 05 70 */ lwz r0, 0x570(r30)
/* 80D63ADC 90 03 05 70 */ stw r0, 0x570(r3)
lbl_80D63AE0:
/* 80D63AE0 3C 60 80 45 */ lis r3, m_top__13daTagStream_c@ha /* 0x80450DA4@ha */
/* 80D63AE4 84 03 0D A4 */ lwzu r0, m_top__13daTagStream_c@l(r3) /* 0x80450DA4@l */
/* 80D63AE8 7C 00 F0 40 */ cmplw r0, r30
/* 80D63AEC 40 82 00 0C */ bne lbl_80D63AF8
/* 80D63AF0 80 1E 05 74 */ lwz r0, 0x574(r30)
/* 80D63AF4 90 03 00 00 */ stw r0, 0(r3)
lbl_80D63AF8:
/* 80D63AF8 7F C3 F3 78 */ mr r3, r30
/* 80D63AFC 38 80 00 00 */ li r4, 0
/* 80D63B00 4B 2B 51 8D */ bl __dt__10fopAc_ac_cFv
/* 80D63B04 7F E0 07 35 */ extsh. r0, r31
/* 80D63B08 40 81 00 0C */ ble lbl_80D63B14
/* 80D63B0C 7F C3 F3 78 */ mr r3, r30
/* 80D63B10 4B 56 B2 2D */ bl __dl__FPv
lbl_80D63B14:
/* 80D63B14 7F C3 F3 78 */ mr r3, r30
/* 80D63B18 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D63B1C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80D63B20 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D63B24 7C 08 03 A6 */ mtlr r0
/* 80D63B28 38 21 00 10 */ addi r1, r1, 0x10
/* 80D63B2C 4E 80 00 20 */ blr

107
asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/create__13daTagStream_cFv.s
View File

@ -1,107 +0,0 @@
lbl_80D638F8:
/* 80D638F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D638FC 7C 08 02 A6 */ mflr r0
/* 80D63900 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D63904 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D63908 7C 7F 1B 78 */ mr r31, r3
/* 80D6390C 80 03 04 A0 */ lwz r0, 0x4a0(r3)
/* 80D63910 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c
/* 80D63914 40 82 00 1C */ bne lbl_80D63930
/* 80D63918 28 1F 00 00 */ cmplwi r31, 0
/* 80D6391C 41 82 00 08 */ beq lbl_80D63924
/* 80D63920 4B 2B 52 45 */ bl __ct__10fopAc_ac_cFv
lbl_80D63924:
/* 80D63924 80 1F 04 A0 */ lwz r0, 0x4a0(r31)
/* 80D63928 60 00 00 08 */ ori r0, r0, 8
/* 80D6392C 90 1F 04 A0 */ stw r0, 0x4a0(r31)
lbl_80D63930:
/* 80D63930 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D63934 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f
/* 80D63938 98 1F 05 68 */ stb r0, 0x568(r31)
/* 80D6393C 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D63940 98 1F 05 6A */ stb r0, 0x56a(r31)
/* 80D63944 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D63948 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f
/* 80D6394C 98 1F 05 6B */ stb r0, 0x56b(r31)
/* 80D63950 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80D63954 54 00 46 3F */ rlwinm. r0, r0, 8, 0x18, 0x1f
/* 80D63958 41 82 00 10 */ beq lbl_80D63968
/* 80D6395C 38 00 00 00 */ li r0, 0
/* 80D63960 90 1F 05 6C */ stw r0, 0x56c(r31)
/* 80D63964 48 00 00 0C */ b lbl_80D63970
lbl_80D63968:
/* 80D63968 38 00 00 01 */ li r0, 1
/* 80D6396C 90 1F 05 6C */ stw r0, 0x56c(r31)
lbl_80D63970:
/* 80D63970 C0 1F 04 EC */ lfs f0, 0x4ec(r31)
/* 80D63974 3C 60 80 D6 */ lis r3, lit_3721@ha /* 0x80D63BF0@ha */
/* 80D63978 C0 23 3B F0 */ lfs f1, lit_3721@l(r3) /* 0x80D63BF0@l */
/* 80D6397C EC 00 00 72 */ fmuls f0, f0, f1
/* 80D63980 D0 1F 04 EC */ stfs f0, 0x4ec(r31)
/* 80D63984 C0 1F 04 F0 */ lfs f0, 0x4f0(r31)
/* 80D63988 EC 00 00 72 */ fmuls f0, f0, f1
/* 80D6398C D0 1F 04 F0 */ stfs f0, 0x4f0(r31)
/* 80D63990 C0 1F 04 F4 */ lfs f0, 0x4f4(r31)
/* 80D63994 EC 00 00 72 */ fmuls f0, f0, f1
/* 80D63998 D0 1F 04 F4 */ stfs f0, 0x4f4(r31)
/* 80D6399C 3C 60 80 45 */ lis r3, m_top__13daTagStream_c@ha /* 0x80450DA4@ha */
/* 80D639A0 84 83 0D A4 */ lwzu r4, m_top__13daTagStream_c@l(r3) /* 0x80450DA4@l */
/* 80D639A4 28 04 00 00 */ cmplwi r4, 0
/* 80D639A8 41 82 00 70 */ beq lbl_80D63A18
/* 80D639AC 7C 85 23 78 */ mr r5, r4
/* 80D639B0 7C 86 23 78 */ mr r6, r4
/* 80D639B4 48 00 00 1C */ b lbl_80D639D0
lbl_80D639B8:
/* 80D639B8 88 65 05 68 */ lbz r3, 0x568(r5)
/* 80D639BC 88 1F 05 68 */ lbz r0, 0x568(r31)
/* 80D639C0 7C 03 00 40 */ cmplw r3, r0
/* 80D639C4 41 81 00 14 */ bgt lbl_80D639D8
/* 80D639C8 7C A6 2B 78 */ mr r6, r5
/* 80D639CC 80 A5 05 74 */ lwz r5, 0x574(r5)
lbl_80D639D0:
/* 80D639D0 28 05 00 00 */ cmplwi r5, 0
/* 80D639D4 40 82 FF E4 */ bne lbl_80D639B8
lbl_80D639D8:
/* 80D639D8 7C 06 28 40 */ cmplw r6, r5
/* 80D639DC 40 82 00 20 */ bne lbl_80D639FC
/* 80D639E0 90 9F 05 74 */ stw r4, 0x574(r31)
/* 80D639E4 3C 60 80 45 */ lis r3, m_top__13daTagStream_c@ha /* 0x80450DA4@ha */
/* 80D639E8 38 83 0D A4 */ addi r4, r3, m_top__13daTagStream_c@l /* 0x80450DA4@l */
/* 80D639EC 80 64 00 00 */ lwz r3, 0(r4)
/* 80D639F0 93 E3 05 70 */ stw r31, 0x570(r3)
/* 80D639F4 93 E4 00 00 */ stw r31, 0(r4)
/* 80D639F8 48 00 00 24 */ b lbl_80D63A1C
lbl_80D639FC:
/* 80D639FC 93 E6 05 74 */ stw r31, 0x574(r6)
/* 80D63A00 90 DF 05 70 */ stw r6, 0x570(r31)
/* 80D63A04 28 05 00 00 */ cmplwi r5, 0
/* 80D63A08 41 82 00 14 */ beq lbl_80D63A1C
/* 80D63A0C 93 E5 05 70 */ stw r31, 0x570(r5)
/* 80D63A10 90 BF 05 74 */ stw r5, 0x574(r31)
/* 80D63A14 48 00 00 08 */ b lbl_80D63A1C
lbl_80D63A18:
/* 80D63A18 93 E3 00 00 */ stw r31, 0(r3)
lbl_80D63A1C:
/* 80D63A1C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */
/* 80D63A20 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */
/* 80D63A24 38 83 00 04 */ addi r4, r3, 4
/* 80D63A28 A8 1F 04 E4 */ lha r0, 0x4e4(r31)
/* 80D63A2C 54 05 04 38 */ rlwinm r5, r0, 0, 0x10, 0x1c
/* 80D63A30 7C 64 2C 2E */ lfsx f3, r4, r5
/* 80D63A34 A8 1F 04 E6 */ lha r0, 0x4e6(r31)
/* 80D63A38 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c
/* 80D63A3C 7C 24 04 2E */ lfsx f1, r4, r0
/* 80D63A40 7C 43 2C 2E */ lfsx f2, r3, r5
/* 80D63A44 7C 03 04 2E */ lfsx f0, r3, r0
/* 80D63A48 EC 00 00 F2 */ fmuls f0, f0, f3
/* 80D63A4C D0 1F 04 F8 */ stfs f0, 0x4f8(r31)
/* 80D63A50 FC 00 10 50 */ fneg f0, f2
/* 80D63A54 D0 1F 04 FC */ stfs f0, 0x4fc(r31)
/* 80D63A58 EC 01 00 F2 */ fmuls f0, f1, f3
/* 80D63A5C D0 1F 05 00 */ stfs f0, 0x500(r31)
/* 80D63A60 38 60 00 04 */ li r3, 4
/* 80D63A64 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D63A68 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D63A6C 7C 08 03 A6 */ mtlr r0
/* 80D63A70 38 21 00 10 */ addi r1, r1, 0x10
/* 80D63A74 4E 80 00 20 */ blr

9
asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/daTagStream_Create__FP10fopAc_ac_c.s
View File

@ -1,9 +0,0 @@
lbl_80D63A78:
/* 80D63A78 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D63A7C 7C 08 02 A6 */ mflr r0
/* 80D63A80 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D63A84 4B FF FE 75 */ bl create__13daTagStream_cFv
/* 80D63A88 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D63A8C 7C 08 03 A6 */ mtlr r0
/* 80D63A90 38 21 00 10 */ addi r1, r1, 0x10
/* 80D63A94 4E 80 00 20 */ blr

11
asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/daTagStream_Delete__FP13daTagStream_c.s
View File

@ -1,11 +0,0 @@
lbl_80D63B30:
/* 80D63B30 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D63B34 7C 08 02 A6 */ mflr r0
/* 80D63B38 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D63B3C 38 80 FF FF */ li r4, -1
/* 80D63B40 4B FF FF 59 */ bl __dt__13daTagStream_cFv
/* 80D63B44 38 60 00 01 */ li r3, 1
/* 80D63B48 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D63B4C 7C 08 03 A6 */ mtlr r0
/* 80D63B50 38 21 00 10 */ addi r1, r1, 0x10
/* 80D63B54 4E 80 00 20 */ blr

9
asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/daTagStream_Execute__FP13daTagStream_c.s
View File

@ -1,9 +0,0 @@
lbl_80D63BC0:
/* 80D63BC0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D63BC4 7C 08 02 A6 */ mflr r0
/* 80D63BC8 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D63BCC 4B FF FF 8D */ bl execute__13daTagStream_cFv
/* 80D63BD0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D63BD4 7C 08 03 A6 */ mtlr r0
/* 80D63BD8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D63BDC 4E 80 00 20 */ blr

30
asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/execute__13daTagStream_cFv.s
View File

@ -1,30 +0,0 @@
lbl_80D63B58:
/* 80D63B58 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80D63B5C 7C 08 02 A6 */ mflr r0
/* 80D63B60 90 01 00 14 */ stw r0, 0x14(r1)
/* 80D63B64 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80D63B68 7C 7F 1B 78 */ mr r31, r3
/* 80D63B6C 88 83 05 6B */ lbz r4, 0x56b(r3)
/* 80D63B70 28 04 00 FF */ cmplwi r4, 0xff
/* 80D63B74 41 82 00 20 */ beq lbl_80D63B94
/* 80D63B78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 80D63B7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 80D63B80 88 1F 04 BA */ lbz r0, 0x4ba(r31)
/* 80D63B84 7C 05 07 74 */ extsb r5, r0
/* 80D63B88 4B 2D 17 D9 */ bl isSwitch__10dSv_info_cCFii
/* 80D63B8C 2C 03 00 00 */ cmpwi r3, 0
/* 80D63B90 41 82 00 10 */ beq lbl_80D63BA0
lbl_80D63B94:
/* 80D63B94 38 00 00 01 */ li r0, 1
/* 80D63B98 98 1F 05 69 */ stb r0, 0x569(r31)
/* 80D63B9C 48 00 00 0C */ b lbl_80D63BA8
lbl_80D63BA0:
/* 80D63BA0 38 00 00 00 */ li r0, 0
/* 80D63BA4 98 1F 05 69 */ stb r0, 0x569(r31)
lbl_80D63BA8:
/* 80D63BA8 38 60 00 01 */ li r3, 1
/* 80D63BAC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80D63BB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80D63BB4 7C 08 03 A6 */ mtlr r0
/* 80D63BB8 38 21 00 10 */ addi r1, r1, 0x10
/* 80D63BBC 4E 80 00 20 */ blr

32
include/rel/d/a/d_a_andsw/d_a_andsw.h
View File

@ -1,6 +1,36 @@
#ifndef D_A_ANDSW_H
#define D_A_ANDSW_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daAndsw_c : public fopAc_ac_c {
public:
u8 getSwNo() {
return fopAcM_GetParamBit(this,0,8);
}
u8 getSwNo2() {
return fopAcM_GetParamBit(this,8,8);
}
u16 getTimer() {
return fopAcM_GetParamBit(this,16,8);
}
u8 getType() {
return fopAcM_GetParamBit(this,24,8);
}
/* 80457978 */ int Create();
/* 804579B8 */ int create();
/* 80457A20 */ int execute();
/* 80457ABC */ int _delete();
/* 0x568 */ u8 mSwNo;
/* 0x568 */ u8 mSwNo2;
/* 0x56A */ s16 mTimer;
};
#endif /* D_A_ANDSW_H */

27
include/rel/d/a/d_a_swTime/d_a_swTime.h
View File

@ -1,6 +1,31 @@
#ifndef D_A_SWTIME_H
#define D_A_SWTIME_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daSwTime_c : public fopAc_ac_c {
public:
u8 getTime() {
return fopAcM_GetParamBit(this,0,8);
}
u8 getSwbit() {
return fopAcM_GetParamBit(this,8,8);
}
u8 getSwbit2() {
return fopAcM_GetParamBit(this,16,8);
}
/* 80D4F638 */ int Create();
/* 80D4F660 */ int create();
/* 80D4F6C8 */ int execute();
/* 80D4F758 */ int _delete();
/* 0x568 */ u8 mTime;
/* 0x569 */ u8 mSwbit;
/* 0x56A */ u8 mSwbit2;
};
#endif /* D_A_SWTIME_H */

23
include/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h
View File

@ -2,5 +2,28 @@
#define D_A_TAG_STREAM_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daTagStream_c : public fopAc_ac_c {
public:
u8 getPriority() {
return mPriority;
}
/* 80D638F8 */ int create();
/* 80D63A98 */ ~daTagStream_c();
/* 80D63B58 */ int execute();
/* 0x568 */ u8 mPriority;
/* 0x569 */ u8 field_0x569;
/* 0x56A */ u8 field_0x56a;
/* 0x56B */ u8 field_0x56b;
/* 0x56C */ u32 mParameters;
/* 0x570 */ daTagStream_c* field_0x570;
/* 0x574 */ daTagStream_c* field_0x574;
static daTagStream_c* m_top;
};
#endif /* D_A_TAG_STREAM_H */

185
rel/d/a/d_a_andsw/d_a_andsw.cpp
View File

@ -1,145 +1,100 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_andsw
//
/**
* d_a_andsw.cpp
* AND - Switch
*/
#include "rel/d/a/d_a_andsw/d_a_andsw.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct daAndsw_c {
/* 80457978 */ void Create();
/* 804579B8 */ void create();
/* 80457A20 */ void execute();
/* 80457ABC */ bool _delete();
};
struct dSv_info_c {
/* 800352B0 */ void offSwitch(int, int);
/* 80035360 */ void isSwitch(int, int) const;
};
//
// Forward References:
//
extern "C" void Create__9daAndsw_cFv();
extern "C" void create__9daAndsw_cFv();
extern "C" void execute__9daAndsw_cFv();
extern "C" bool _delete__9daAndsw_cFv();
extern "C" static void daAndsw_Execute__FP9daAndsw_c();
extern "C" static void daAndsw_Delete__FP9daAndsw_c();
extern "C" static void daAndsw_Create__FP10fopAc_ac_c();
extern "C" extern void* g_profile_ANDSW[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
extern "C" void offSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
#include "d/d_procname.h"
/* 80457978-804579B8 000078 0040+00 1/1 0/0 0/0 .text Create__9daAndsw_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAndsw_c::Create() {
nofralloc
#include "asm/rel/d/a/d_a_andsw/d_a_andsw/Create__9daAndsw_cFv.s"
int daAndsw_c::Create() {
mSwNo = getSwNo();
mSwNo2 = getSwNo2();
u16 timer = getTimer();
timer != 0xFF ? mTimer = getTimer() * 15 : mTimer = 0;
return 1;
}
#pragma pop
/* 804579B8-80457A20 0000B8 0068+00 1/1 0/0 0/0 .text create__9daAndsw_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAndsw_c::create() {
nofralloc
#include "asm/rel/d/a/d_a_andsw/d_a_andsw/func_804579B8.s"
int daAndsw_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daAndsw_c();
fopAcM_OnCondition(this, 8);
}
if (!Create()) {
return cPhs_ERROR_e;
}
return cPhs_COMPLEATE_e;
}
#pragma pop
/* 80457A20-80457ABC 000120 009C+00 1/1 0/0 0/0 .text execute__9daAndsw_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAndsw_c::execute() {
nofralloc
#include "asm/rel/d/a/d_a_andsw/d_a_andsw/execute__9daAndsw_cFv.s"
int daAndsw_c::execute() {
if (i_fopAcM_isSwitch(this,mSwNo2)) {
if (0 < mTimer) {
mTimer--;
}
if (mTimer == 0) {
i_fopAcM_offSwitch(this,mSwNo);
if (getType() == 1) {
fopAcM_delete(this);
}
}
}
return 1;
}
#pragma pop
/* 80457ABC-80457AC4 0001BC 0008+00 1/1 0/0 0/0 .text _delete__9daAndsw_cFv */
bool daAndsw_c::_delete() {
return true;
int daAndsw_c::_delete() {
return 1;
}
/* 80457AC4-80457AE4 0001C4 0020+00 1/0 0/0 0/0 .text daAndsw_Execute__FP9daAndsw_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daAndsw_Execute(daAndsw_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_andsw/d_a_andsw/daAndsw_Execute__FP9daAndsw_c.s"
static int daAndsw_Execute(daAndsw_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80457AE4-80457B04 0001E4 0020+00 1/0 0/0 0/0 .text daAndsw_Delete__FP9daAndsw_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daAndsw_Delete(daAndsw_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_andsw/d_a_andsw/daAndsw_Delete__FP9daAndsw_c.s"
static int daAndsw_Delete(daAndsw_c* i_this) {
return i_this->_delete();
}
#pragma pop
/* 80457B04-80457B24 000204 0020+00 1/0 0/0 0/0 .text daAndsw_Create__FP10fopAc_ac_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daAndsw_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_andsw/d_a_andsw/daAndsw_Create__FP10fopAc_ac_c.s"
static int daAndsw_Create(fopAc_ac_c* i_this) {
return static_cast<daAndsw_c*>(i_this)->create();
}
#pragma pop
/* ############################################################################################## */
/* 80457B2C-80457B4C -00001 0020+00 1/0 0/0 0/0 .data l_daAndsw_Method */
SECTION_DATA static void* l_daAndsw_Method[8] = {
(void*)daAndsw_Create__FP10fopAc_ac_c,
(void*)daAndsw_Delete__FP9daAndsw_c,
(void*)daAndsw_Execute__FP9daAndsw_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daAndsw_Method = {
(process_method_func)daAndsw_Create,
(process_method_func)daAndsw_Delete,
(process_method_func)daAndsw_Execute
};
/* 80457B4C-80457B7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_ANDSW */
SECTION_DATA extern void* g_profile_ANDSW[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02300000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x012E0000, (void*)&l_daAndsw_Method,
(void*)0x00040000, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_ANDSW = {
-3, // mLayerID
7, // mListID
-3, // mListPrio
PROC_ANDSW, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daAndsw_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x012E, // mPriority
0, // padding
0, // padding
&l_daAndsw_Method, // mSubMtd
0x00040000, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};

176
rel/d/a/d_a_swTime/d_a_swTime.cpp
View File

@ -1,146 +1,92 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_swTime
//
/**
* d_a_swTime.cpp
* Switch Time
*/
#include "rel/d/a/d_a_swTime/d_a_swTime.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "d/d_procname.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct daSwTime_c {
/* 80D4F638 */ void Create();
/* 80D4F660 */ void create();
/* 80D4F6C8 */ void execute();
/* 80D4F758 */ bool _delete();
};
struct dSv_info_c {
/* 80035200 */ void onSwitch(int, int);
/* 80035360 */ void isSwitch(int, int) const;
};
//
// Forward References:
//
extern "C" void Create__10daSwTime_cFv();
extern "C" void create__10daSwTime_cFv();
extern "C" void execute__10daSwTime_cFv();
extern "C" bool _delete__10daSwTime_cFv();
extern "C" static void daSwTime_Execute__FP10daSwTime_c();
extern "C" static void daSwTime_Delete__FP10daSwTime_c();
extern "C" static void daSwTime_Create__FP10daSwTime_c();
extern "C" extern void* g_profile_SwTime[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void onSwitch__10dSv_info_cFii();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void dKy_getdaytime_hour__Fv();
extern "C" void dKy_getdaytime_minute__Fv();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* 80D4F638-80D4F660 000078 0028+00 1/1 0/0 0/0 .text Create__10daSwTime_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daSwTime_c::Create() {
nofralloc
#include "asm/rel/d/a/d_a_swTime/d_a_swTime/Create__10daSwTime_cFv.s"
int daSwTime_c::Create() {
mTime = getTime();
mSwbit = getSwbit();
mSwbit2 = getSwbit2();
return 1;
}
#pragma pop
/* 80D4F660-80D4F6C8 0000A0 0068+00 1/1 0/0 0/0 .text create__10daSwTime_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daSwTime_c::create() {
nofralloc
#include "asm/rel/d/a/d_a_swTime/d_a_swTime/func_80D4F660.s"
int daSwTime_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daSwTime_c();
fopAcM_OnCondition(this, 8);
}
if (!Create()) {
return cPhs_ERROR_e;
}
return cPhs_COMPLEATE_e;
}
#pragma pop
/* 80D4F6C8-80D4F758 000108 0090+00 1/1 0/0 0/0 .text execute__10daSwTime_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daSwTime_c::execute() {
nofralloc
#include "asm/rel/d/a/d_a_swTime/d_a_swTime/execute__10daSwTime_cFv.s"
int daSwTime_c::execute() {
if (mSwbit2 != 0xFF && !i_fopAcM_isSwitch(this,mSwbit2)) {
return 1;
}
if (dKy_getdaytime_hour() == mTime && dKy_getdaytime_minute() == 0) {
i_fopAcM_onSwitch(this,mSwbit);
}
return 1;
}
#pragma pop
/* 80D4F758-80D4F760 000198 0008+00 1/1 0/0 0/0 .text _delete__10daSwTime_cFv */
bool daSwTime_c::_delete() {
return true;
int daSwTime_c::_delete() {
return 1;
}
/* 80D4F760-80D4F780 0001A0 0020+00 1/0 0/0 0/0 .text daSwTime_Execute__FP10daSwTime_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daSwTime_Execute(daSwTime_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_swTime/d_a_swTime/daSwTime_Execute__FP10daSwTime_c.s"
static int daSwTime_Execute(daSwTime_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80D4F780-80D4F7A0 0001C0 0020+00 1/0 0/0 0/0 .text daSwTime_Delete__FP10daSwTime_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daSwTime_Delete(daSwTime_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_swTime/d_a_swTime/daSwTime_Delete__FP10daSwTime_c.s"
static int daSwTime_Delete(daSwTime_c* i_this) {
return i_this->_delete();
}
#pragma pop
/* 80D4F7A0-80D4F7C0 0001E0 0020+00 1/0 0/0 0/0 .text daSwTime_Create__FP10daSwTime_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daSwTime_Create(daSwTime_c* param_0) {
nofralloc
#include "asm/rel/d/a/d_a_swTime/d_a_swTime/daSwTime_Create__FP10daSwTime_c.s"
static int daSwTime_Create(daSwTime_c* i_this) {
return i_this->create();
}
#pragma pop
/* ############################################################################################## */
/* 80D4F7C8-80D4F7E8 -00001 0020+00 1/0 0/0 0/0 .data l_daSwTime_Method */
SECTION_DATA static void* l_daSwTime_Method[8] = {
(void*)daSwTime_Create__FP10daSwTime_c,
(void*)daSwTime_Delete__FP10daSwTime_c,
(void*)daSwTime_Execute__FP10daSwTime_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daSwTime_Method = {
(process_method_func)daSwTime_Create,
(process_method_func)daSwTime_Delete,
(process_method_func)daSwTime_Execute
};
/* 80D4F7E8-80D4F818 -00001 0030+00 0/0 0/0 1/0 .data g_profile_SwTime */
SECTION_DATA extern void* g_profile_SwTime[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01A10000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02400000, (void*)&l_daSwTime_Method,
(void*)0x00040100, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_SwTime = {
-3, // mLayerID
7, // mListID
-3, // mListPrio
PROC_SwTime, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daSwTime_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0240, // mPriority
0, // padding
0, // padding
&l_daSwTime_Method, // mSubMtd
0x00040100, // mStatus
0, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};

4
rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp
View File

@ -1,11 +1,9 @@
/**
* d_a_tag_gra.cpp
*
* Tag - Goron A
*/
#include "rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "d/d_procname.h"
/* 80D59658-80D596E8 000078 0090+00 1/0 0/0 0/0 .text daTagGra_Create__FP10fopAc_ac_c */

236
rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp
View File

@ -1,133 +1,107 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_stream
//
/**
* d_a_tag_stream.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
/* 80018C8C */ ~fopAc_ac_c();
};
struct daTagStream_c {
/* 80D638F8 */ void create();
/* 80D63A98 */ ~daTagStream_c();
/* 80D63B58 */ void execute();
static u8 m_top[4];
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
extern "C" void create__13daTagStream_cFv();
extern "C" static void daTagStream_Create__FP10fopAc_ac_c();
extern "C" void __dt__13daTagStream_cFv();
extern "C" static void daTagStream_Delete__FP13daTagStream_c();
extern "C" void execute__13daTagStream_cFv();
extern "C" static void daTagStream_Execute__FP13daTagStream_c();
extern "C" static bool daTagStream_Draw__FP13daTagStream_c();
extern "C" extern void* g_profile_Tag_Stream[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void __dl__FPv();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 m_top__13daTagStream_c[4];
//
// Declarations:
//
/* ############################################################################################## */
/* 80D63BF0-80D63BF4 000000 0004+00 1/1 0/0 0/0 .rodata @3721 */
SECTION_RODATA static f32 const lit_3721 = 100.0f;
COMPILER_STRIP_GATE(0x80D63BF0, &lit_3721);
#include "SSystem/SComponent/c_math.h"
/* 80D638F8-80D63A78 000078 0180+00 1/1 0/0 0/0 .text create__13daTagStream_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTagStream_c::create() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/create__13daTagStream_cFv.s"
int daTagStream_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daTagStream_c();
fopAcM_OnCondition(this, 8);
}
mPriority = fopAcM_GetParam(this) >> 8;
field_0x56a = fopAcM_GetParam(this);
field_0x56b = fopAcM_GetParam(this) >> 16;
fopAcM_GetParam(this) >> 24 != 0 ? mParameters = 0 : mParameters = 1;
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 100.0f;
if (m_top) {
daTagStream_c* top = m_top;
daTagStream_c* top_loop = m_top;
for (; top; top = top->field_0x574) {
if (top->getPriority() > this->getPriority()) {
break;
}
top_loop = top;
}
if (top_loop == top) {
field_0x574 = m_top;
m_top->field_0x570 = this;
m_top = this;
} else {
top_loop->field_0x574 = this;
field_0x570 = top_loop;
if (top) {
top->field_0x570 = this;
field_0x574 = top;
}
}
} else {
m_top = this;
}
f32 float1 = cM_scos(shape_angle.y) * cM_scos(shape_angle.x);
f32 float2 = -cM_ssin(shape_angle.x);
f32 float3 = cM_ssin(shape_angle.y) * cM_scos(shape_angle.x);
speed.set(float3,float2,float1);
return cPhs_COMPLEATE_e;
}
#pragma pop
/* 80D63A78-80D63A98 0001F8 0020+00 1/0 0/0 0/0 .text daTagStream_Create__FP10fopAc_ac_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagStream_Create(fopAc_ac_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/daTagStream_Create__FP10fopAc_ac_c.s"
static int daTagStream_Create(fopAc_ac_c* i_this) {
return static_cast<daTagStream_c*>(i_this)->create();
}
#pragma pop
/* 80D63A98-80D63B30 000218 0098+00 1/1 0/0 0/0 .text __dt__13daTagStream_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm daTagStream_c::~daTagStream_c() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/__dt__13daTagStream_cFv.s"
}
#pragma pop
daTagStream_c::~daTagStream_c() {
if (field_0x570) {
field_0x570->field_0x574 = field_0x574;
}
if (field_0x574) {
field_0x574->field_0x570 = field_0x570;
}
if (m_top == this) {
m_top = field_0x574;
}
};
/* 80D63B30-80D63B58 0002B0 0028+00 1/0 0/0 0/0 .text daTagStream_Delete__FP13daTagStream_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagStream_Delete(daTagStream_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/daTagStream_Delete__FP13daTagStream_c.s"
static int daTagStream_Delete(daTagStream_c* i_this) {
i_this->~daTagStream_c();
return 1;
}
#pragma pop
/* 80D63B58-80D63BC0 0002D8 0068+00 1/1 0/0 0/0 .text execute__13daTagStream_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daTagStream_c::execute() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/execute__13daTagStream_cFv.s"
int daTagStream_c::execute() {
if (field_0x56b == 0xFF || i_fopAcM_isSwitch(this,field_0x56b)) {
field_0x569 = 1;
} else {
field_0x569 = 0;
}
return 1;
}
#pragma pop
/* 80D63BC0-80D63BE0 000340 0020+00 1/0 0/0 0/0 .text daTagStream_Execute__FP13daTagStream_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daTagStream_Execute(daTagStream_c* param_0) {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream/daTagStream_Execute__FP13daTagStream_c.s"
static int daTagStream_Execute(daTagStream_c* i_this) {
return i_this->execute();
}
#pragma pop
/* 80D63BE0-80D63BE8 000360 0008+00 1/0 0/0 0/0 .text daTagStream_Draw__FP13daTagStream_c
*/
@ -137,23 +111,33 @@ static bool daTagStream_Draw(daTagStream_c* param_0) {
/* ############################################################################################## */
/* 80D63BF4-80D63C14 -00001 0020+00 1/0 0/0 0/0 .data l_daTagStream_Method */
SECTION_DATA static void* l_daTagStream_Method[8] = {
(void*)daTagStream_Create__FP10fopAc_ac_c,
(void*)daTagStream_Delete__FP13daTagStream_c,
(void*)daTagStream_Execute__FP13daTagStream_c,
(void*)NULL,
(void*)daTagStream_Draw__FP13daTagStream_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagStream_Method = {
(process_method_func)daTagStream_Create,
(process_method_func)daTagStream_Delete,
(process_method_func)daTagStream_Execute,
0, // ?
(process_method_func)daTagStream_Draw
};
/* 80D63C14-80D63C44 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Stream */
SECTION_DATA extern void* g_profile_Tag_Stream[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02C50000, (void*)&g_fpcLf_Method,
(void*)0x00000578, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01030000, (void*)&l_daTagStream_Method,
(void*)0x00044000, (void*)0x030E0000,
extern actor_process_profile_definition g_profile_Tag_Stream = {
-3, // mLayerID
7, // mListID
-3, // mListPrio
PROC_Tag_Stream, // mProcName
0, // padding
&g_fpcLf_Method.mBase, // mSubMtd
sizeof(daTagStream_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // mSubMtd
0x0103, // mPriority
0, // padding
0, // padding
&l_daTagStream_Method, // mSubMtd
0x00044000, // mStatus
3, // mActorType
0x0E, // mCullType
0, // padding
0 // padding
};