mirror of https://github.com/zeldaret/tp.git
Work on multiple files (#2102)
* d_menu_skill OK * remove asm and update progress * work on multiple files * remove asm * update progress
This commit is contained in:
Trueffel
GitHub
parent
eb086d59c1
commit
4ea2b399be
14
Progress.md
14
Progress.md
|
|
@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
|
|||
.init | 97.972973% | 9280 | 9472
|
||||
.extab | 100.000000% | 96 | 96
|
||||
.extabindex | 100.000000% | 96 | 96
|
||||
.text | 47.117010% | 1694584 | 3596544
|
||||
.text | 47.495929% | 1708212 | 3596544
|
||||
.ctors | 100.000000% | 448 | 448
|
||||
.dtors | 100.000000% | 32 | 32
|
||||
.rodata | 100.000000% | 193856 | 193856
|
||||
.data | 100.000000% | 197632 | 197632
|
||||
.sdata | 100.000000% | 1408 | 1408
|
||||
.sdata2 | 100.000000% | 20832 | 20832
|
||||
Total | 52.690694% | 2118520 | 4020672
|
||||
Total | 53.029643% | 2132148 | 4020672
|
||||
|
||||
## Total
|
||||
|
||||
Section | Percentage | Decompiled (bytes) | Total (bytes)
|
||||
---|---|---|---
|
||||
main.dol | 52.690694% | 2118520 | 4020672
|
||||
RELs | 36.717122% | 4222588 | 11500324
|
||||
Total | 40.855033% | 6341108 | 15520996
|
||||
main.dol | 53.029643% | 2132148 | 4020672
|
||||
RELs | 36.718409% | 4222736 | 11500324
|
||||
Total | 40.943790% | 6354884 | 15520996
|
||||
|
||||
## RELs
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ d_a_b_bh | 24.452445% | 6520 | 26664
|
|||
d_a_b_bq | 28.033347% | 11164 | 39824
|
||||
d_a_b_dr | 27.536664% | 18476 | 67096
|
||||
d_a_b_dre | 27.912731% | 4964 | 17784
|
||||
d_a_b_ds | 27.798248% | 27160 | 97704
|
||||
d_a_b_ds | 27.949726% | 27308 | 97704
|
||||
d_a_b_gg | 22.324410% | 17380 | 77852
|
||||
d_a_b_gm | 30.376176% | 11628 | 38280
|
||||
d_a_b_gnd | 25.489573% | 19264 | 75576
|
||||
|
|
@ -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 | 36.717122% | 4222588 | 11500324
|
||||
Total | 36.718409% | 4222736 | 11500324
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
lbl_801EE15C:
|
||||
/* 801EE15C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 801EE160 7C 08 02 A6 */ mflr r0
|
||||
/* 801EE164 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 801EE168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE170 38 63 00 9C */ addi r3, r3, 0x9c
|
||||
/* 801EE174 54 84 06 3E */ clrlwi r4, r4, 0x18
|
||||
/* 801EE178 38 A0 00 00 */ li r5, 0
|
||||
/* 801EE17C 4B E4 4E B5 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE180 7C 64 1B 78 */ mr r4, r3
|
||||
/* 801EE184 38 60 00 00 */ li r3, 0
|
||||
/* 801EE188 54 80 06 3E */ clrlwi r0, r4, 0x18
|
||||
/* 801EE18C 2C 00 00 53 */ cmpwi r0, 0x53
|
||||
/* 801EE190 40 80 00 28 */ bge lbl_801EE1B8
|
||||
/* 801EE194 2C 00 00 4B */ cmpwi r0, 0x4b
|
||||
/* 801EE198 41 82 00 7C */ beq lbl_801EE214
|
||||
/* 801EE19C 40 80 00 10 */ bge lbl_801EE1AC
|
||||
/* 801EE1A0 2C 00 00 43 */ cmpwi r0, 0x43
|
||||
/* 801EE1A4 41 82 00 60 */ beq lbl_801EE204
|
||||
/* 801EE1A8 48 00 00 70 */ b lbl_801EE218
|
||||
lbl_801EE1AC:
|
||||
/* 801EE1AC 2C 00 00 50 */ cmpwi r0, 0x50
|
||||
/* 801EE1B0 41 82 00 30 */ beq lbl_801EE1E0
|
||||
/* 801EE1B4 48 00 00 64 */ b lbl_801EE218
|
||||
lbl_801EE1B8:
|
||||
/* 801EE1B8 2C 00 00 73 */ cmpwi r0, 0x73
|
||||
/* 801EE1BC 40 80 00 18 */ bge lbl_801EE1D4
|
||||
/* 801EE1C0 2C 00 00 70 */ cmpwi r0, 0x70
|
||||
/* 801EE1C4 40 80 00 24 */ bge lbl_801EE1E8
|
||||
/* 801EE1C8 2C 00 00 57 */ cmpwi r0, 0x57
|
||||
/* 801EE1CC 40 80 00 4C */ bge lbl_801EE218
|
||||
/* 801EE1D0 48 00 00 34 */ b lbl_801EE204
|
||||
lbl_801EE1D4:
|
||||
/* 801EE1D4 2C 00 00 76 */ cmpwi r0, 0x76
|
||||
/* 801EE1D8 41 82 00 24 */ beq lbl_801EE1FC
|
||||
/* 801EE1DC 48 00 00 3C */ b lbl_801EE218
|
||||
lbl_801EE1E0:
|
||||
/* 801EE1E0 38 60 00 01 */ li r3, 1
|
||||
/* 801EE1E4 48 00 00 34 */ b lbl_801EE218
|
||||
lbl_801EE1E8:
|
||||
/* 801EE1E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE1EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE1F0 38 63 00 F8 */ addi r3, r3, 0xf8
|
||||
/* 801EE1F4 4B E4 5F 05 */ bl getBombNum__21dSv_player_item_max_cCFUc
|
||||
/* 801EE1F8 48 00 00 20 */ b lbl_801EE218
|
||||
lbl_801EE1FC:
|
||||
/* 801EE1FC 4B E4 03 BD */ bl dComIfGs_getBottleMax__Fv
|
||||
/* 801EE200 48 00 00 18 */ b lbl_801EE218
|
||||
lbl_801EE204:
|
||||
/* 801EE204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE20C 88 63 00 F8 */ lbz r3, 0xf8(r3)
|
||||
/* 801EE210 48 00 00 08 */ b lbl_801EE218
|
||||
lbl_801EE214:
|
||||
/* 801EE214 38 60 00 32 */ li r3, 0x32
|
||||
lbl_801EE218:
|
||||
/* 801EE218 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 801EE21C 7C 08 03 A6 */ mtlr r0
|
||||
/* 801EE220 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 801EE224 4E 80 00 20 */ blr
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
lbl_801EE058:
|
||||
/* 801EE058 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 801EE05C 7C 08 02 A6 */ mflr r0
|
||||
/* 801EE060 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 801EE064 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 801EE068 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE06C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE070 38 63 00 9C */ addi r3, r3, 0x9c
|
||||
/* 801EE074 54 9F 06 3E */ clrlwi r31, r4, 0x18
|
||||
/* 801EE078 7F E4 FB 78 */ mr r4, r31
|
||||
/* 801EE07C 38 A0 00 00 */ li r5, 0
|
||||
/* 801EE080 4B E4 4F B1 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EE084 38 80 00 00 */ li r4, 0
|
||||
/* 801EE088 54 60 06 3E */ clrlwi r0, r3, 0x18
|
||||
/* 801EE08C 2C 00 00 53 */ cmpwi r0, 0x53
|
||||
/* 801EE090 40 80 00 28 */ bge lbl_801EE0B8
|
||||
/* 801EE094 2C 00 00 4B */ cmpwi r0, 0x4b
|
||||
/* 801EE098 41 82 00 A0 */ beq lbl_801EE138
|
||||
/* 801EE09C 40 80 00 10 */ bge lbl_801EE0AC
|
||||
/* 801EE0A0 2C 00 00 43 */ cmpwi r0, 0x43
|
||||
/* 801EE0A4 41 82 00 84 */ beq lbl_801EE128
|
||||
/* 801EE0A8 48 00 00 9C */ b lbl_801EE144
|
||||
lbl_801EE0AC:
|
||||
/* 801EE0AC 2C 00 00 50 */ cmpwi r0, 0x50
|
||||
/* 801EE0B0 41 82 00 30 */ beq lbl_801EE0E0
|
||||
/* 801EE0B4 48 00 00 90 */ b lbl_801EE144
|
||||
lbl_801EE0B8:
|
||||
/* 801EE0B8 2C 00 00 73 */ cmpwi r0, 0x73
|
||||
/* 801EE0BC 40 80 00 18 */ bge lbl_801EE0D4
|
||||
/* 801EE0C0 2C 00 00 70 */ cmpwi r0, 0x70
|
||||
/* 801EE0C4 40 80 00 24 */ bge lbl_801EE0E8
|
||||
/* 801EE0C8 2C 00 00 57 */ cmpwi r0, 0x57
|
||||
/* 801EE0CC 40 80 00 78 */ bge lbl_801EE144
|
||||
/* 801EE0D0 48 00 00 58 */ b lbl_801EE128
|
||||
lbl_801EE0D4:
|
||||
/* 801EE0D4 2C 00 00 76 */ cmpwi r0, 0x76
|
||||
/* 801EE0D8 41 82 00 30 */ beq lbl_801EE108
|
||||
/* 801EE0DC 48 00 00 68 */ b lbl_801EE144
|
||||
lbl_801EE0E0:
|
||||
/* 801EE0E0 38 80 00 00 */ li r4, 0
|
||||
/* 801EE0E4 48 00 00 60 */ b lbl_801EE144
|
||||
lbl_801EE0E8:
|
||||
/* 801EE0E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE0EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE0F0 38 63 00 EC */ addi r3, r3, 0xec
|
||||
/* 801EE0F4 38 1F FF F1 */ addi r0, r31, -15
|
||||
/* 801EE0F8 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 801EE0FC 4B E4 5E 81 */ bl getBombNum__24dSv_player_item_record_cCFUc
|
||||
/* 801EE100 7C 64 1B 78 */ mr r4, r3
|
||||
/* 801EE104 48 00 00 40 */ b lbl_801EE144
|
||||
lbl_801EE108:
|
||||
/* 801EE108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE10C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE110 38 63 00 EC */ addi r3, r3, 0xec
|
||||
/* 801EE114 38 1F FF F5 */ addi r0, r31, -11
|
||||
/* 801EE118 54 04 06 3E */ clrlwi r4, r0, 0x18
|
||||
/* 801EE11C 4B E4 5F 15 */ bl getBottleNum__24dSv_player_item_record_cCFUc
|
||||
/* 801EE120 7C 64 1B 78 */ mr r4, r3
|
||||
/* 801EE124 48 00 00 20 */ b lbl_801EE144
|
||||
lbl_801EE128:
|
||||
/* 801EE128 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE12C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE130 88 83 00 EC */ lbz r4, 0xec(r3)
|
||||
/* 801EE134 48 00 00 10 */ b lbl_801EE144
|
||||
lbl_801EE138:
|
||||
/* 801EE138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EE13C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EE140 88 83 00 F4 */ lbz r4, 0xf4(r3)
|
||||
lbl_801EE144:
|
||||
/* 801EE144 7C 83 23 78 */ mr r3, r4
|
||||
/* 801EE148 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 801EE14C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 801EE150 7C 08 03 A6 */ mtlr r0
|
||||
/* 801EE154 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 801EE158 4E 80 00 20 */ blr
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
lbl_801EC20C:
|
||||
/* 801EC20C 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 801EC210 7C 08 02 A6 */ mflr r0
|
||||
/* 801EC214 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 801EC218 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 801EC21C 48 17 5F B5 */ bl _savegpr_26
|
||||
/* 801EC220 7C 7E 1B 78 */ mr r30, r3
|
||||
/* 801EC224 3B E0 00 00 */ li r31, 0
|
||||
/* 801EC228 3C 60 80 43 */ lis r3, g_ringHIO@ha /* 0x8042FAFC@ha */
|
||||
/* 801EC22C 3B 83 FA FC */ addi r28, r3, g_ringHIO@l /* 0x8042FAFC@l */
|
||||
/* 801EC230 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 801EC234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 801EC238 3B 63 00 9C */ addi r27, r3, 0x9c
|
||||
/* 801EC23C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
|
||||
/* 801EC240 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 0x80430188@l */
|
||||
/* 801EC244 48 00 01 48 */ b lbl_801EC38C
|
||||
lbl_801EC248:
|
||||
/* 801EC248 88 1E 06 CF */ lbz r0, 0x6cf(r30)
|
||||
/* 801EC24C 28 00 00 FF */ cmplwi r0, 0xff
|
||||
/* 801EC250 41 82 00 88 */ beq lbl_801EC2D8
|
||||
/* 801EC254 38 80 00 00 */ li r4, 0
|
||||
/* 801EC258 2C 00 00 01 */ cmpwi r0, 1
|
||||
/* 801EC25C 41 82 00 1C */ beq lbl_801EC278
|
||||
/* 801EC260 40 80 00 1C */ bge lbl_801EC27C
|
||||
/* 801EC264 2C 00 00 00 */ cmpwi r0, 0
|
||||
/* 801EC268 40 80 00 08 */ bge lbl_801EC270
|
||||
/* 801EC26C 48 00 00 10 */ b lbl_801EC27C
|
||||
lbl_801EC270:
|
||||
/* 801EC270 38 80 04 DE */ li r4, 0x4de
|
||||
/* 801EC274 48 00 00 08 */ b lbl_801EC27C
|
||||
lbl_801EC278:
|
||||
/* 801EC278 38 80 04 E0 */ li r4, 0x4e0
|
||||
lbl_801EC27C:
|
||||
/* 801EC27C 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC280 48 00 01 31 */ bl setNameString__12dMenu_Ring_cFUl
|
||||
/* 801EC284 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC288 7F E4 FB 78 */ mr r4, r31
|
||||
/* 801EC28C C0 3C 00 1C */ lfs f1, 0x1c(r28)
|
||||
/* 801EC290 4B FF F7 A9 */ bl setItemScale__12dMenu_Ring_cFif
|
||||
/* 801EC294 3B 40 00 00 */ li r26, 0
|
||||
lbl_801EC298:
|
||||
/* 801EC298 88 1E 06 CF */ lbz r0, 0x6cf(r30)
|
||||
/* 801EC29C 7C 1A 00 00 */ cmpw r26, r0
|
||||
/* 801EC2A0 40 82 00 18 */ bne lbl_801EC2B8
|
||||
/* 801EC2A4 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC2A8 7F 44 D3 78 */ mr r4, r26
|
||||
/* 801EC2AC C0 3C 00 18 */ lfs f1, 0x18(r28)
|
||||
/* 801EC2B0 4B FF F8 09 */ bl setButtonScale__12dMenu_Ring_cFif
|
||||
/* 801EC2B4 48 00 00 14 */ b lbl_801EC2C8
|
||||
lbl_801EC2B8:
|
||||
/* 801EC2B8 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC2BC 7F 44 D3 78 */ mr r4, r26
|
||||
/* 801EC2C0 C0 3C 00 20 */ lfs f1, 0x20(r28)
|
||||
/* 801EC2C4 4B FF F7 F5 */ bl setButtonScale__12dMenu_Ring_cFif
|
||||
lbl_801EC2C8:
|
||||
/* 801EC2C8 3B 5A 00 01 */ addi r26, r26, 1
|
||||
/* 801EC2CC 2C 1A 00 02 */ cmpwi r26, 2
|
||||
/* 801EC2D0 41 80 FF C8 */ blt lbl_801EC298
|
||||
/* 801EC2D4 48 00 00 B4 */ b lbl_801EC388
|
||||
lbl_801EC2D8:
|
||||
/* 801EC2D8 88 1E 06 A8 */ lbz r0, 0x6a8(r30)
|
||||
/* 801EC2DC 7C 1F 00 00 */ cmpw r31, r0
|
||||
/* 801EC2E0 40 82 00 78 */ bne lbl_801EC358
|
||||
/* 801EC2E4 88 1E 06 B0 */ lbz r0, 0x6b0(r30)
|
||||
/* 801EC2E8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 801EC2EC 41 82 00 14 */ beq lbl_801EC300
|
||||
/* 801EC2F0 28 00 00 02 */ cmplwi r0, 2
|
||||
/* 801EC2F4 41 82 00 0C */ beq lbl_801EC300
|
||||
/* 801EC2F8 28 00 00 03 */ cmplwi r0, 3
|
||||
/* 801EC2FC 40 82 00 5C */ bne lbl_801EC358
|
||||
lbl_801EC300:
|
||||
/* 801EC300 7F 63 DB 78 */ mr r3, r27
|
||||
/* 801EC304 3B 5F 06 90 */ addi r26, r31, 0x690
|
||||
/* 801EC308 7C 9E D0 AE */ lbzx r4, r30, r26
|
||||
/* 801EC30C 38 A0 00 00 */ li r5, 0
|
||||
/* 801EC310 4B E4 6D 21 */ bl getItem__17dSv_player_item_cCFib
|
||||
/* 801EC314 54 63 06 3E */ clrlwi r3, r3, 0x18
|
||||
/* 801EC318 38 83 01 65 */ addi r4, r3, 0x165
|
||||
/* 801EC31C 88 BD 00 DC */ lbz r5, 0xdc(r29)
|
||||
/* 801EC320 28 05 00 FF */ cmplwi r5, 0xff
|
||||
/* 801EC324 41 82 00 18 */ beq lbl_801EC33C
|
||||
/* 801EC328 7C 7E D0 AE */ lbzx r3, r30, r26
|
||||
/* 801EC32C 38 05 00 0F */ addi r0, r5, 0xf
|
||||
/* 801EC330 7C 03 00 00 */ cmpw r3, r0
|
||||
/* 801EC334 40 82 00 08 */ bne lbl_801EC33C
|
||||
/* 801EC338 38 80 01 6D */ li r4, 0x16d
|
||||
lbl_801EC33C:
|
||||
/* 801EC33C 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC340 48 00 00 71 */ bl setNameString__12dMenu_Ring_cFUl
|
||||
/* 801EC344 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC348 7F E4 FB 78 */ mr r4, r31
|
||||
/* 801EC34C C0 3C 00 14 */ lfs f1, 0x14(r28)
|
||||
/* 801EC350 4B FF F6 E9 */ bl setItemScale__12dMenu_Ring_cFif
|
||||
/* 801EC354 48 00 00 14 */ b lbl_801EC368
|
||||
lbl_801EC358:
|
||||
/* 801EC358 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC35C 7F E4 FB 78 */ mr r4, r31
|
||||
/* 801EC360 C0 3C 00 1C */ lfs f1, 0x1c(r28)
|
||||
/* 801EC364 4B FF F6 D5 */ bl setItemScale__12dMenu_Ring_cFif
|
||||
lbl_801EC368:
|
||||
/* 801EC368 3B 40 00 00 */ li r26, 0
|
||||
lbl_801EC36C:
|
||||
/* 801EC36C 7F C3 F3 78 */ mr r3, r30
|
||||
/* 801EC370 7F 44 D3 78 */ mr r4, r26
|
||||
/* 801EC374 C0 3C 00 20 */ lfs f1, 0x20(r28)
|
||||
/* 801EC378 4B FF F7 41 */ bl setButtonScale__12dMenu_Ring_cFif
|
||||
/* 801EC37C 3B 5A 00 01 */ addi r26, r26, 1
|
||||
/* 801EC380 2C 1A 00 02 */ cmpwi r26, 2
|
||||
/* 801EC384 41 80 FF E8 */ blt lbl_801EC36C
|
||||
lbl_801EC388:
|
||||
/* 801EC388 3B FF 00 01 */ addi r31, r31, 1
|
||||
lbl_801EC38C:
|
||||
/* 801EC38C 88 1E 06 AE */ lbz r0, 0x6ae(r30)
|
||||
/* 801EC390 7C 1F 00 00 */ cmpw r31, r0
|
||||
/* 801EC394 41 80 FE B4 */ blt lbl_801EC248
|
||||
/* 801EC398 39 61 00 20 */ addi r11, r1, 0x20
|
||||
/* 801EC39C 48 17 5E 81 */ bl _restgpr_26
|
||||
/* 801EC3A0 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 801EC3A4 7C 08 03 A6 */ mtlr r0
|
||||
/* 801EC3A8 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 801EC3AC 4E 80 00 20 */ blr
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
lbl_80224F70:
|
||||
/* 80224F70 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80224F74 7C 08 02 A6 */ mflr r0
|
||||
/* 80224F78 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80224F7C 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80224F80 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 80224F84 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80224F88 80 63 01 24 */ lwz r3, 0x124(r3)
|
||||
/* 80224F8C 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11
|
||||
/* 80224F90 40 82 01 2C */ bne lbl_802250BC
|
||||
/* 80224F94 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19
|
||||
/* 80224F98 41 82 00 30 */ beq lbl_80224FC8
|
||||
/* 80224F9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80224FA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80224FA4 88 03 4F AD */ lbz r0, 0x4fad(r3)
|
||||
/* 80224FA8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80224FAC 41 82 00 10 */ beq lbl_80224FBC
|
||||
/* 80224FB0 A0 03 4F A4 */ lhz r0, 0x4fa4(r3)
|
||||
/* 80224FB4 54 00 06 72 */ rlwinm r0, r0, 0, 0x19, 0x19
|
||||
/* 80224FB8 48 00 00 08 */ b lbl_80224FC0
|
||||
lbl_80224FBC:
|
||||
/* 80224FBC 38 00 00 00 */ li r0, 0
|
||||
lbl_80224FC0:
|
||||
/* 80224FC0 54 00 04 3F */ clrlwi. r0, r0, 0x10
|
||||
/* 80224FC4 40 82 00 F8 */ bne lbl_802250BC
|
||||
lbl_80224FC8:
|
||||
/* 80224FC8 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80224FCC 48 00 09 95 */ bl isKeyVisible__9dMeter2_cFv
|
||||
/* 80224FD0 54 60 06 3F */ clrlwi. r0, r3, 0x18
|
||||
/* 80224FD4 41 82 00 E8 */ beq lbl_802250BC
|
||||
/* 80224FD8 80 7F 01 24 */ lwz r3, 0x124(r31)
|
||||
/* 80224FDC 54 60 00 43 */ rlwinm. r0, r3, 0, 1, 1
|
||||
/* 80224FE0 40 82 00 DC */ bne lbl_802250BC
|
||||
/* 80224FE4 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13
|
||||
/* 80224FE8 40 82 00 D4 */ bne lbl_802250BC
|
||||
/* 80224FEC 54 60 02 D7 */ rlwinm. r0, r3, 0, 0xb, 0xb
|
||||
/* 80224FF0 40 82 00 CC */ bne lbl_802250BC
|
||||
/* 80224FF4 54 60 00 01 */ rlwinm. r0, r3, 0, 0, 0
|
||||
/* 80224FF8 40 82 00 C4 */ bne lbl_802250BC
|
||||
/* 80224FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80225000 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80225004 80 83 5D AC */ lwz r4, 0x5dac(r3)
|
||||
/* 80225008 38 00 00 00 */ li r0, 0
|
||||
/* 8022500C 88 64 05 6A */ lbz r3, 0x56a(r4)
|
||||
/* 80225010 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 80225014 41 82 00 10 */ beq lbl_80225024
|
||||
/* 80225018 28 03 00 26 */ cmplwi r3, 0x26
|
||||
/* 8022501C 40 80 00 08 */ bge lbl_80225024
|
||||
/* 80225020 38 00 00 01 */ li r0, 1
|
||||
lbl_80225024:
|
||||
/* 80225024 54 00 06 3F */ clrlwi. r0, r0, 0x18
|
||||
/* 80225028 40 82 00 94 */ bne lbl_802250BC
|
||||
/* 8022502C 88 04 05 6A */ lbz r0, 0x56a(r4)
|
||||
/* 80225030 28 00 00 2D */ cmplwi r0, 0x2d
|
||||
/* 80225034 40 82 00 30 */ bne lbl_80225064
|
||||
/* 80225038 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8022503C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80225040 3B C3 0F 38 */ addi r30, r3, 0xf38
|
||||
/* 80225044 7F C3 F3 78 */ mr r3, r30
|
||||
/* 80225048 4B E0 7B 75 */ bl getTimerMode__14dComIfG_play_cFv
|
||||
/* 8022504C 2C 03 00 03 */ cmpwi r3, 3
|
||||
/* 80225050 41 82 00 6C */ beq lbl_802250BC
|
||||
/* 80225054 7F C3 F3 78 */ mr r3, r30
|
||||
/* 80225058 4B E0 7B 65 */ bl getTimerMode__14dComIfG_play_cFv
|
||||
/* 8022505C 2C 03 00 04 */ cmpwi r3, 4
|
||||
/* 80225060 41 82 00 5C */ beq lbl_802250BC
|
||||
lbl_80225064:
|
||||
/* 80225064 80 7F 01 24 */ lwz r3, 0x124(r31)
|
||||
/* 80225068 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
|
||||
/* 8022506C 40 82 00 50 */ bne lbl_802250BC
|
||||
/* 80225070 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c
|
||||
/* 80225074 40 82 00 48 */ bne lbl_802250BC
|
||||
/* 80225078 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
/* 8022507C 40 82 00 40 */ bne lbl_802250BC
|
||||
/* 80225080 54 60 01 CF */ rlwinm. r0, r3, 0, 7, 7
|
||||
/* 80225084 40 82 00 38 */ bne lbl_802250BC
|
||||
/* 80225088 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a
|
||||
/* 8022508C 40 82 00 30 */ bne lbl_802250BC
|
||||
/* 80225090 54 60 01 4B */ rlwinm. r0, r3, 0, 5, 5
|
||||
/* 80225094 40 82 00 28 */ bne lbl_802250BC
|
||||
/* 80225098 54 60 01 09 */ rlwinm. r0, r3, 0, 4, 4
|
||||
/* 8022509C 40 82 00 20 */ bne lbl_802250BC
|
||||
/* 802250A0 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3
|
||||
/* 802250A4 40 82 00 18 */ bne lbl_802250BC
|
||||
/* 802250A8 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
|
||||
/* 802250AC 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
|
||||
/* 802250B0 A0 03 00 A2 */ lhz r0, 0xa2(r3)
|
||||
/* 802250B4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
|
||||
/* 802250B8 41 82 00 10 */ beq lbl_802250C8
|
||||
lbl_802250BC:
|
||||
/* 802250BC 80 7F 01 0C */ lwz r3, 0x10c(r31)
|
||||
/* 802250C0 4B FF 1B E9 */ bl setAlphaKeyAnimeMin__13dMeter2Draw_cFv
|
||||
/* 802250C4 48 00 00 0C */ b lbl_802250D0
|
||||
lbl_802250C8:
|
||||
/* 802250C8 80 7F 01 0C */ lwz r3, 0x10c(r31)
|
||||
/* 802250CC 4B FF 1C 61 */ bl setAlphaKeyAnimeMax__13dMeter2Draw_cFv
|
||||
lbl_802250D0:
|
||||
/* 802250D0 80 7F 01 0C */ lwz r3, 0x10c(r31)
|
||||
/* 802250D4 38 80 00 00 */ li r4, 0
|
||||
/* 802250D8 4B FF 1A 51 */ bl setAlphaKeyChange__13dMeter2Draw_cFb
|
||||
/* 802250DC 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 802250E0 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 802250E4 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 802250E8 7C 08 03 A6 */ mtlr r0
|
||||
/* 802250EC 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 802250F0 4E 80 00 20 */ blr
|
||||
|
|
@ -1,122 +0,0 @@
|
|||
lbl_80224DC0:
|
||||
/* 80224DC0 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80224DC4 7C 08 02 A6 */ mflr r0
|
||||
/* 80224DC8 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80224DCC 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 80224DD0 93 C1 00 08 */ stw r30, 8(r1)
|
||||
/* 80224DD4 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80224DD8 80 63 01 24 */ lwz r3, 0x124(r3)
|
||||
/* 80224DDC 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11
|
||||
/* 80224DE0 40 82 01 58 */ bne lbl_80224F38
|
||||
/* 80224DE4 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19
|
||||
/* 80224DE8 41 82 00 30 */ beq lbl_80224E18
|
||||
/* 80224DEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80224DF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80224DF4 88 03 4F AD */ lbz r0, 0x4fad(r3)
|
||||
/* 80224DF8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80224DFC 41 82 00 10 */ beq lbl_80224E0C
|
||||
/* 80224E00 A0 03 4F A4 */ lhz r0, 0x4fa4(r3)
|
||||
/* 80224E04 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18
|
||||
/* 80224E08 48 00 00 08 */ b lbl_80224E10
|
||||
lbl_80224E0C:
|
||||
/* 80224E0C 38 00 00 00 */ li r0, 0
|
||||
lbl_80224E10:
|
||||
/* 80224E10 54 00 04 3F */ clrlwi. r0, r0, 0x10
|
||||
/* 80224E14 40 82 01 24 */ bne lbl_80224F38
|
||||
lbl_80224E18:
|
||||
/* 80224E18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80224E1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80224E20 80 83 5D AC */ lwz r4, 0x5dac(r3)
|
||||
/* 80224E24 38 00 00 00 */ li r0, 0
|
||||
/* 80224E28 88 64 05 6A */ lbz r3, 0x56a(r4)
|
||||
/* 80224E2C 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 80224E30 41 82 00 10 */ beq lbl_80224E40
|
||||
/* 80224E34 28 03 00 26 */ cmplwi r3, 0x26
|
||||
/* 80224E38 40 80 00 08 */ bge lbl_80224E40
|
||||
/* 80224E3C 38 00 00 01 */ li r0, 1
|
||||
lbl_80224E40:
|
||||
/* 80224E40 54 00 06 3F */ clrlwi. r0, r0, 0x18
|
||||
/* 80224E44 40 82 00 F4 */ bne lbl_80224F38
|
||||
/* 80224E48 88 04 05 6A */ lbz r0, 0x56a(r4)
|
||||
/* 80224E4C 28 00 00 2D */ cmplwi r0, 0x2d
|
||||
/* 80224E50 40 82 00 1C */ bne lbl_80224E6C
|
||||
/* 80224E54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80224E58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80224E5C 38 63 0F 38 */ addi r3, r3, 0xf38
|
||||
/* 80224E60 4B E0 7D 5D */ bl getTimerMode__14dComIfG_play_cFv
|
||||
/* 80224E64 2C 03 00 04 */ cmpwi r3, 4
|
||||
/* 80224E68 41 82 00 D0 */ beq lbl_80224F38
|
||||
lbl_80224E6C:
|
||||
/* 80224E6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80224E70 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80224E74 38 7E 4E 00 */ addi r3, r30, 0x4e00
|
||||
/* 80224E78 3C 80 80 3A */ lis r4, d_meter_d_meter2__stringBase0@ha /* 0x80399338@ha */
|
||||
/* 80224E7C 38 84 93 38 */ addi r4, r4, d_meter_d_meter2__stringBase0@l /* 0x80399338@l */
|
||||
/* 80224E80 38 84 00 0F */ addi r4, r4, 0xf
|
||||
/* 80224E84 48 14 3B 11 */ bl strcmp
|
||||
/* 80224E88 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 80224E8C 40 82 00 30 */ bne lbl_80224EBC
|
||||
/* 80224E90 88 1E 4F AD */ lbz r0, 0x4fad(r30)
|
||||
/* 80224E94 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 80224E98 41 82 00 18 */ beq lbl_80224EB0
|
||||
/* 80224E9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 80224EA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 80224EA4 A0 03 4F A4 */ lhz r0, 0x4fa4(r3)
|
||||
/* 80224EA8 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18
|
||||
/* 80224EAC 48 00 00 08 */ b lbl_80224EB4
|
||||
lbl_80224EB0:
|
||||
/* 80224EB0 38 00 00 00 */ li r0, 0
|
||||
lbl_80224EB4:
|
||||
/* 80224EB4 54 00 04 3F */ clrlwi. r0, r0, 0x10
|
||||
/* 80224EB8 41 82 00 28 */ beq lbl_80224EE0
|
||||
lbl_80224EBC:
|
||||
/* 80224EBC 80 7F 01 24 */ lwz r3, 0x124(r31)
|
||||
/* 80224EC0 54 60 00 43 */ rlwinm. r0, r3, 0, 1, 1
|
||||
/* 80224EC4 41 82 00 0C */ beq lbl_80224ED0
|
||||
/* 80224EC8 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
|
||||
/* 80224ECC 41 82 00 6C */ beq lbl_80224F38
|
||||
lbl_80224ED0:
|
||||
/* 80224ED0 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13
|
||||
/* 80224ED4 40 82 00 64 */ bne lbl_80224F38
|
||||
/* 80224ED8 54 60 02 D7 */ rlwinm. r0, r3, 0, 0xb, 0xb
|
||||
/* 80224EDC 40 82 00 5C */ bne lbl_80224F38
|
||||
lbl_80224EE0:
|
||||
/* 80224EE0 80 7F 01 24 */ lwz r3, 0x124(r31)
|
||||
/* 80224EE4 54 60 00 01 */ rlwinm. r0, r3, 0, 0, 0
|
||||
/* 80224EE8 40 82 00 50 */ bne lbl_80224F38
|
||||
/* 80224EEC 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c
|
||||
/* 80224EF0 40 82 00 48 */ bne lbl_80224F38
|
||||
/* 80224EF4 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
/* 80224EF8 40 82 00 40 */ bne lbl_80224F38
|
||||
/* 80224EFC 54 60 01 CF */ rlwinm. r0, r3, 0, 7, 7
|
||||
/* 80224F00 40 82 00 38 */ bne lbl_80224F38
|
||||
/* 80224F04 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a
|
||||
/* 80224F08 40 82 00 30 */ bne lbl_80224F38
|
||||
/* 80224F0C 54 60 01 4B */ rlwinm. r0, r3, 0, 5, 5
|
||||
/* 80224F10 40 82 00 28 */ bne lbl_80224F38
|
||||
/* 80224F14 54 60 01 09 */ rlwinm. r0, r3, 0, 4, 4
|
||||
/* 80224F18 40 82 00 20 */ bne lbl_80224F38
|
||||
/* 80224F1C 54 60 00 C7 */ rlwinm. r0, r3, 0, 3, 3
|
||||
/* 80224F20 40 82 00 18 */ bne lbl_80224F38
|
||||
/* 80224F24 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
|
||||
/* 80224F28 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
|
||||
/* 80224F2C A0 03 00 A2 */ lhz r0, 0xa2(r3)
|
||||
/* 80224F30 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
|
||||
/* 80224F34 41 82 00 10 */ beq lbl_80224F44
|
||||
lbl_80224F38:
|
||||
/* 80224F38 80 7F 01 0C */ lwz r3, 0x10c(r31)
|
||||
/* 80224F3C 4B FF 19 95 */ bl setAlphaRupeeAnimeMin__13dMeter2Draw_cFv
|
||||
/* 80224F40 48 00 00 0C */ b lbl_80224F4C
|
||||
lbl_80224F44:
|
||||
/* 80224F44 80 7F 01 0C */ lwz r3, 0x10c(r31)
|
||||
/* 80224F48 4B FF 1A 49 */ bl setAlphaRupeeAnimeMax__13dMeter2Draw_cFv
|
||||
lbl_80224F4C:
|
||||
/* 80224F4C 80 7F 01 0C */ lwz r3, 0x10c(r31)
|
||||
/* 80224F50 38 80 00 00 */ li r4, 0
|
||||
/* 80224F54 4B FF 17 31 */ bl setAlphaRupeeChange__13dMeter2Draw_cFb
|
||||
/* 80224F58 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 80224F5C 83 C1 00 08 */ lwz r30, 8(r1)
|
||||
/* 80224F60 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80224F64 7C 08 03 A6 */ mtlr r0
|
||||
/* 80224F68 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80224F6C 4E 80 00 20 */ blr
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
lbl_8020D698:
|
||||
/* 8020D698 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8020D69C 7C 08 02 A6 */ mflr r0
|
||||
/* 8020D6A0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8020D6A4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8020D6A8 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8020D6AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8020D6B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8020D6B4 88 03 4F AD */ lbz r0, 0x4fad(r3)
|
||||
/* 8020D6B8 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 8020D6BC 41 82 00 0C */ beq lbl_8020D6C8
|
||||
/* 8020D6C0 38 60 00 01 */ li r3, 1
|
||||
/* 8020D6C4 48 00 00 54 */ b lbl_8020D718
|
||||
lbl_8020D6C8:
|
||||
/* 8020D6C8 48 02 AB 65 */ bl getStatus__12dMsgObject_cFv
|
||||
/* 8020D6CC 54 60 04 3E */ clrlwi r0, r3, 0x10
|
||||
/* 8020D6D0 20 60 00 01 */ subfic r3, r0, 1
|
||||
/* 8020D6D4 30 03 FF FF */ addic r0, r3, -1
|
||||
/* 8020D6D8 7C 00 19 10 */ subfe r0, r0, r3
|
||||
/* 8020D6DC 54 00 06 3F */ clrlwi. r0, r0, 0x18
|
||||
/* 8020D6E0 41 82 00 0C */ beq lbl_8020D6EC
|
||||
/* 8020D6E4 38 60 00 01 */ li r3, 1
|
||||
/* 8020D6E8 48 00 00 30 */ b lbl_8020D718
|
||||
lbl_8020D6EC:
|
||||
/* 8020D6EC 80 9F 00 30 */ lwz r4, 0x30(r31)
|
||||
/* 8020D6F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8020D6F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8020D6F8 88 63 4F AD */ lbz r3, 0x4fad(r3)
|
||||
/* 8020D6FC 30 03 FF FF */ addic r0, r3, -1
|
||||
/* 8020D700 7C 00 19 10 */ subfe r0, r0, r3
|
||||
/* 8020D704 54 00 06 3E */ clrlwi r0, r0, 0x18
|
||||
/* 8020D708 7C 64 00 50 */ subf r3, r4, r0
|
||||
/* 8020D70C 30 03 FF FF */ addic r0, r3, -1
|
||||
/* 8020D710 7C 00 19 10 */ subfe r0, r0, r3
|
||||
/* 8020D714 54 03 06 3E */ clrlwi r3, r0, 0x18
|
||||
lbl_8020D718:
|
||||
/* 8020D718 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8020D71C 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8020D720 7C 08 03 A6 */ mtlr r0
|
||||
/* 8020D724 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8020D728 4E 80 00 20 */ blr
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
lbl_8020E4C8:
|
||||
/* 8020E4C8 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 8020E4CC 7C 08 02 A6 */ mflr r0
|
||||
/* 8020E4D0 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 8020E4D4 93 E1 00 0C */ stw r31, 0xc(r1)
|
||||
/* 8020E4D8 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8020E4DC 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11
|
||||
/* 8020E4E0 40 82 01 20 */ bne lbl_8020E600
|
||||
/* 8020E4E4 4B E1 00 C5 */ bl fopOvlpM_IsDoingReq__Fv
|
||||
/* 8020E4E8 2C 03 00 00 */ cmpwi r3, 0
|
||||
/* 8020E4EC 40 82 01 14 */ bne lbl_8020E600
|
||||
/* 8020E4F0 57 E0 06 73 */ rlwinm. r0, r31, 0, 0x19, 0x19
|
||||
/* 8020E4F4 41 82 00 3C */ beq lbl_8020E530
|
||||
/* 8020E4F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8020E4FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8020E500 88 03 4F AD */ lbz r0, 0x4fad(r3)
|
||||
/* 8020E504 28 00 00 00 */ cmplwi r0, 0
|
||||
/* 8020E508 41 82 00 10 */ beq lbl_8020E518
|
||||
/* 8020E50C A0 03 4F A4 */ lhz r0, 0x4fa4(r3)
|
||||
/* 8020E510 54 00 05 EE */ rlwinm r0, r0, 0, 0x17, 0x17
|
||||
/* 8020E514 48 00 00 08 */ b lbl_8020E51C
|
||||
lbl_8020E518:
|
||||
/* 8020E518 38 00 00 00 */ li r0, 0
|
||||
lbl_8020E51C:
|
||||
/* 8020E51C 54 00 04 3F */ clrlwi. r0, r0, 0x10
|
||||
/* 8020E520 41 82 00 10 */ beq lbl_8020E530
|
||||
/* 8020E524 A0 03 4F A0 */ lhz r0, 0x4fa0(r3)
|
||||
/* 8020E528 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19
|
||||
/* 8020E52C 41 82 00 D4 */ beq lbl_8020E600
|
||||
lbl_8020E530:
|
||||
/* 8020E530 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
|
||||
/* 8020E534 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
|
||||
/* 8020E538 80 83 5D AC */ lwz r4, 0x5dac(r3)
|
||||
/* 8020E53C 38 00 00 00 */ li r0, 0
|
||||
/* 8020E540 88 64 05 6A */ lbz r3, 0x56a(r4)
|
||||
/* 8020E544 28 03 00 00 */ cmplwi r3, 0
|
||||
/* 8020E548 41 82 00 10 */ beq lbl_8020E558
|
||||
/* 8020E54C 28 03 00 26 */ cmplwi r3, 0x26
|
||||
/* 8020E550 40 80 00 08 */ bge lbl_8020E558
|
||||
/* 8020E554 38 00 00 01 */ li r0, 1
|
||||
lbl_8020E558:
|
||||
/* 8020E558 54 00 06 3F */ clrlwi. r0, r0, 0x18
|
||||
/* 8020E55C 40 82 00 A4 */ bne lbl_8020E600
|
||||
/* 8020E560 57 E0 02 95 */ rlwinm. r0, r31, 0, 0xa, 0xa
|
||||
/* 8020E564 40 82 00 9C */ bne lbl_8020E600
|
||||
/* 8020E568 57 E0 05 EF */ rlwinm. r0, r31, 0, 0x17, 0x17
|
||||
/* 8020E56C 40 82 00 94 */ bne lbl_8020E600
|
||||
/* 8020E570 57 E0 06 31 */ rlwinm. r0, r31, 0, 0x18, 0x18
|
||||
/* 8020E574 40 82 00 8C */ bne lbl_8020E600
|
||||
/* 8020E578 57 E0 00 43 */ rlwinm. r0, r31, 0, 1, 1
|
||||
/* 8020E57C 40 82 00 84 */ bne lbl_8020E600
|
||||
/* 8020E580 57 E0 04 E7 */ rlwinm. r0, r31, 0, 0x13, 0x13
|
||||
/* 8020E584 40 82 00 7C */ bne lbl_8020E600
|
||||
/* 8020E588 57 E0 02 D7 */ rlwinm. r0, r31, 0, 0xb, 0xb
|
||||
/* 8020E58C 40 82 00 74 */ bne lbl_8020E600
|
||||
/* 8020E590 57 E0 03 9D */ rlwinm. r0, r31, 0, 0xe, 0xe
|
||||
/* 8020E594 40 82 00 6C */ bne lbl_8020E600
|
||||
/* 8020E598 57 E0 07 39 */ rlwinm. r0, r31, 0, 0x1c, 0x1c
|
||||
/* 8020E59C 40 82 00 64 */ bne lbl_8020E600
|
||||
/* 8020E5A0 57 E0 06 F7 */ rlwinm. r0, r31, 0, 0x1b, 0x1b
|
||||
/* 8020E5A4 40 82 00 5C */ bne lbl_8020E600
|
||||
/* 8020E5A8 57 E0 01 CF */ rlwinm. r0, r31, 0, 7, 7
|
||||
/* 8020E5AC 40 82 00 54 */ bne lbl_8020E600
|
||||
/* 8020E5B0 57 E0 02 11 */ rlwinm. r0, r31, 0, 8, 8
|
||||
/* 8020E5B4 40 82 00 4C */ bne lbl_8020E600
|
||||
/* 8020E5B8 57 E0 06 B5 */ rlwinm. r0, r31, 0, 0x1a, 0x1a
|
||||
/* 8020E5BC 40 82 00 44 */ bne lbl_8020E600
|
||||
/* 8020E5C0 57 E0 01 4B */ rlwinm. r0, r31, 0, 5, 5
|
||||
/* 8020E5C4 40 82 00 3C */ bne lbl_8020E600
|
||||
/* 8020E5C8 57 E0 00 C7 */ rlwinm. r0, r31, 0, 3, 3
|
||||
/* 8020E5CC 40 82 00 34 */ bne lbl_8020E600
|
||||
/* 8020E5D0 57 E0 05 29 */ rlwinm. r0, r31, 0, 0x14, 0x14
|
||||
/* 8020E5D4 40 82 00 2C */ bne lbl_8020E600
|
||||
/* 8020E5D8 57 E0 00 85 */ rlwinm. r0, r31, 0, 2, 2
|
||||
/* 8020E5DC 40 82 00 24 */ bne lbl_8020E600
|
||||
/* 8020E5E0 80 04 05 80 */ lwz r0, 0x580(r4)
|
||||
/* 8020E5E4 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
|
||||
/* 8020E5E8 40 82 00 18 */ bne lbl_8020E600
|
||||
/* 8020E5EC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */
|
||||
/* 8020E5F0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */
|
||||
/* 8020E5F4 A0 03 00 B0 */ lhz r0, 0xb0(r3)
|
||||
/* 8020E5F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e
|
||||
/* 8020E5FC 41 82 00 0C */ beq lbl_8020E608
|
||||
lbl_8020E600:
|
||||
/* 8020E600 38 60 00 00 */ li r3, 0
|
||||
/* 8020E604 48 00 00 08 */ b lbl_8020E60C
|
||||
lbl_8020E608:
|
||||
/* 8020E608 38 60 00 01 */ li r3, 1
|
||||
lbl_8020E60C:
|
||||
/* 8020E60C 83 E1 00 0C */ lwz r31, 0xc(r1)
|
||||
/* 8020E610 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 8020E614 7C 08 03 A6 */ mtlr r0
|
||||
/* 8020E618 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 8020E61C 4E 80 00 20 */ blr
|
||||
|
|
@ -41,7 +41,7 @@ public:
|
|||
/* 801ED2BC */ void stick_wait_init();
|
||||
/* 801ED31C */ void stick_wait_proc();
|
||||
/* 801ED490 */ void stick_move_init();
|
||||
/* 801ED53C */ void stick_move_proc();
|
||||
/* 801ED53C */ f32 stick_move_proc();
|
||||
/* 801ED934 */ void stick_explain_init();
|
||||
/* 801ED938 */ void stick_explain_force_init();
|
||||
/* 801ED93C */ void stick_explain_proc();
|
||||
|
|
@ -52,7 +52,7 @@ public:
|
|||
/* 801EDFDC */ s32 getCursorPos(u8);
|
||||
/* 801EE058 */ u8 getItemNum(u8);
|
||||
/* 801EE15C */ u8 getItemMaxNum(u8);
|
||||
/* 801EE228 */ void checkExplainForce();
|
||||
/* 801EE228 */ bool checkExplainForce();
|
||||
/* 801EE63C */ bool checkCombineBomb(int);
|
||||
/* 801EE644 */ void setCombineBomb(int);
|
||||
/* 801EE648 */ void drawNumber(int, int, f32, f32);
|
||||
|
|
|
|||
|
|
@ -230,19 +230,19 @@ public:
|
|||
/* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
|
||||
/* 80218238 */ f32 getButtonCrossParentInitTransY();
|
||||
/* 80218254 */ void drawButtonCross(f32, f32);
|
||||
/* 80218338 */ void setAlphButtonACrossAnimeMin();
|
||||
/* 802183A8 */ void setAlphButtonACrossAnimeMax();
|
||||
/* 80218448 */ void setAlphButtonACrossItemAnimeMin();
|
||||
/* 80218524 */ void setAlphButtonACrossItemAnimeMax();
|
||||
/* 802185E8 */ void setAlphButtonACrossMapAnimeMin();
|
||||
/* 802186C4 */ void setAlphButtonACrossMapAnimeMax();
|
||||
/* 80218788 */ void setAlphButtonAChange(bool);
|
||||
/* 8021901C */ void setAlphButtonAAnimeMin();
|
||||
/* 802190A8 */ void setAlphButtonAAnimeMax();
|
||||
/* 80219174 */ void setAlphButtonAAAnimeMin();
|
||||
/* 80219258 */ void setAlphButtonAAAnimeMax();
|
||||
/* 80219324 */ void setAlphButtonABAnimeMin();
|
||||
/* 80219474 */ void setAlphButtonABAnimeMax();
|
||||
/* 80218338 */ void setAlphaButtonCrossAnimeMin();
|
||||
/* 802183A8 */ void setAlphaButtonCrossAnimeMax();
|
||||
/* 80218448 */ void setAlphaButtonCrossItemAnimeMin();
|
||||
/* 80218524 */ void setAlphaButtonCrossItemAnimeMax();
|
||||
/* 802185E8 */ void setAlphaButtonCrossMapAnimeMin();
|
||||
/* 802186C4 */ void setAlphaButtonCrossMapAnimeMax();
|
||||
/* 80218788 */ void setAlphaButtonChange(bool);
|
||||
/* 8021901C */ void setAlphaButtonAnimeMin();
|
||||
/* 802190A8 */ void setAlphaButtonAnimeMax();
|
||||
/* 80219174 */ void setAlphaButtonAAnimeMin();
|
||||
/* 80219258 */ void setAlphaButtonAAnimeMax();
|
||||
/* 80219324 */ void setAlphaButtonBAnimeMin();
|
||||
/* 80219474 */ void setAlphaButtonBAnimeMax();
|
||||
/* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool);
|
||||
/* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
|
||||
/* 80219A84 */ void setButtonIconMidonaAlpha(u32);
|
||||
|
|
@ -266,7 +266,7 @@ public:
|
|||
/* 8021BC24 */ bool getCameraSubject();
|
||||
/* 8021BC54 */ bool getItemSubject();
|
||||
/* 8021BCAC */ bool getPlayerSubject();
|
||||
/* 8021BCC0 */ bool isButtonBShow(bool);
|
||||
/* 8021BCC0 */ bool isBButtonShow(bool);
|
||||
/* 8021BDD0 */ s16 getButtonTimer();
|
||||
|
||||
/* 802102F8 */ virtual ~dMeter2Draw_c();
|
||||
|
|
|
|||
|
|
@ -1324,7 +1324,7 @@ SECTION_SDATA2 static f32 lit_5193 = 0.00139999995008111f;
|
|||
u8 data_80450EE0;
|
||||
|
||||
/* 80059728-80059E38 054068 0710+00 1/1 0/0 0/0 .text wether_move_vrkumo__Fv */
|
||||
// gameinfo load issue, cmath instruction order / reg alloc
|
||||
// Matches with literals
|
||||
#ifdef NONMATCHING
|
||||
static void wether_move_vrkumo() {
|
||||
BOOL var_r31 = false;
|
||||
|
|
@ -1431,9 +1431,9 @@ static void wether_move_vrkumo() {
|
|||
|
||||
temp_f27_2 += 24575.0f;
|
||||
|
||||
sp8.x = cM_ssin(temp_f27_2) * cM_scos(temp_r4_2);
|
||||
sp8.x = cM_scos(temp_r4_2) * cM_ssin(temp_f27_2);
|
||||
sp8.y = cM_ssin(temp_r4_2);
|
||||
sp8.z = cM_scos(temp_f27_2) * cM_scos(temp_r4_2);
|
||||
sp8.z = cM_scos(temp_r4_2) * cM_scos(temp_f27_2);
|
||||
|
||||
g_env_light.mpVrkumoPacket->field_0x1150 += (sp8.x * var_f31) * 0.0014f;
|
||||
g_env_light.mpVrkumoPacket->field_0x1154 += (sp8.z * var_f31) * 0.0014f;
|
||||
|
|
|
|||
|
|
@ -3332,7 +3332,7 @@ void dMenu_Collect3D_c::draw() {
|
|||
}
|
||||
|
||||
/* 801B6A30-801B6D30 1B1370 0300+00 2/2 0/0 0/0 .text setJ3D__17dMenu_Collect3D_cFPCcPCcPCc */
|
||||
// b issue and regalloc
|
||||
// regalloc
|
||||
#ifdef NONMATCHING
|
||||
void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const char* param_2) {
|
||||
JKRArchive* resArchive = dComIfGp_getCollectResArchive();
|
||||
|
|
@ -3349,10 +3349,7 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c
|
|||
J3DAnmTransform* pbck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(
|
||||
resArchive->getResource('BCK ', param_1), J3DLOADER_UNK_FLAG0);
|
||||
mpBckAnm = new mDoExt_bckAnm();
|
||||
if (mpBckAnm == NULL) {
|
||||
return;
|
||||
}
|
||||
if (mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false) != 0) {
|
||||
if (mpBckAnm == NULL || !mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -3361,8 +3358,8 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c
|
|||
resArchive->getResource('BRK ', param_2), J3DLOADER_UNK_FLAG0);
|
||||
pbrk->searchUpdateMaterialID(modelData);
|
||||
mpBrkAnm = new mDoExt_brkAnm();
|
||||
if (mpBrkAnm != NULL) {
|
||||
mpBrkAnm->init(modelData, pbrk, -1, 2, 1.0f, 0, -1);
|
||||
if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, -1, 2, 1.0f, 0, -1)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
#include "JSystem/J2DGraph/J2DScreen.h"
|
||||
#include "JSystem/J2DGraph/J2DTextBox.h"
|
||||
#include "JSystem/JKernel/JKRExpHeap.h"
|
||||
#include "string.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "d/a/d_a_alink.h"
|
||||
#include "d/d_item_data.h"
|
||||
|
|
@ -26,6 +25,7 @@
|
|||
#include "dol2asm.h"
|
||||
#include "m_Do/m_Do_controller_pad.h"
|
||||
#include "m_Do/m_Do_graphic.h"
|
||||
#include "string.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
|
|
@ -693,8 +693,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
|
|||
mpItemTex[i][k] = new J2DPicture(mpItemBuf[i][k]);
|
||||
mpItemTex[i][k]->setBasePosition(J2DBasePosition_4);
|
||||
}
|
||||
dMeter2Info_setItemColor(item, mpItemTex[i][0], mpItemTex[i][1],
|
||||
mpItemTex[i][2], NULL);
|
||||
dMeter2Info_setItemColor(item, mpItemTex[i][0], mpItemTex[i][1], mpItemTex[i][2], NULL);
|
||||
u8 texScale = dItem_data::getTexScale(item);
|
||||
f32 fVar1 = (texScale / 100.0f);
|
||||
f32 fVar2 = (mpItemBuf[i][0]->width / 48.0f);
|
||||
|
|
@ -1118,8 +1117,7 @@ bool dMenu_Ring_c::isMoveEnd() {
|
|||
} else {
|
||||
field_0x6bc = 0xff;
|
||||
}
|
||||
Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
|
||||
-1.0f, 0);
|
||||
Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
|
||||
dMeter2Info_set2DVibrationM();
|
||||
ret = 1;
|
||||
}
|
||||
|
|
@ -1339,13 +1337,17 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) {
|
|||
if (field_0x6b3 == 0) {
|
||||
field_0x538[0] = g_ringHIO.mSelectItemScale;
|
||||
field_0x538[1] = g_ringHIO.mUnselectItemScale;
|
||||
if (field_0x6b4[0] != dComIfGs_getSelectItemIndex(0) || field_0x6b8[0] != dComIfGs_getMixItemIndex(0)) {
|
||||
if (field_0x6b4[0] != dComIfGs_getSelectItemIndex(0) ||
|
||||
field_0x6b8[0] != dComIfGs_getMixItemIndex(0))
|
||||
{
|
||||
field_0x674[0] = 1;
|
||||
}
|
||||
} else if (field_0x6b3 == 1) {
|
||||
field_0x538[0] = g_ringHIO.mUnselectItemScale;
|
||||
field_0x538[1] = g_ringHIO.mSelectItemScale;
|
||||
if (field_0x6b4[1] != dComIfGs_getSelectItemIndex(1) || field_0x6b8[1] != dComIfGs_getMixItemIndex(1)) {
|
||||
if (field_0x6b4[1] != dComIfGs_getSelectItemIndex(1) ||
|
||||
field_0x6b8[1] != dComIfGs_getMixItemIndex(1))
|
||||
{
|
||||
field_0x674[1] = 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1385,14 +1387,47 @@ asm void dMenu_Ring_c::setJumpItem(bool param_0) {
|
|||
#endif
|
||||
|
||||
/* 801EC20C-801EC3B0 1E6B4C 01A4+00 2/2 0/0 0/0 .text setScale__12dMenu_Ring_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dMenu_Ring_c::setScale() {
|
||||
nofralloc
|
||||
#include "asm/d/menu/d_menu_ring/setScale__12dMenu_Ring_cFv.s"
|
||||
void dMenu_Ring_c::setScale() {
|
||||
u32 itemId;
|
||||
for (int i = 0; i < field_0x6ae; i++) {
|
||||
if (field_0x6cf != 0xff) {
|
||||
itemId = 0;
|
||||
switch (field_0x6cf) {
|
||||
case 0:
|
||||
itemId = 0x4DE;
|
||||
break;
|
||||
case 1:
|
||||
itemId = 0x4E0;
|
||||
break;
|
||||
}
|
||||
setNameString(itemId);
|
||||
setItemScale(i, g_ringHIO.mUnselectItemScale);
|
||||
for (int j = 0; j < 2; j++) {
|
||||
if (j == field_0x6cf) {
|
||||
setButtonScale(j, g_ringHIO.mSelectButtonScale);
|
||||
} else {
|
||||
setButtonScale(j, g_ringHIO.mUnselectButtonScale);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (i == mStatus && (field_0x6b0 == 0 || field_0x6b0 == 2 || field_0x6b0 == 3)) {
|
||||
itemId = dComIfGs_getItem(field_0x690[i], false) + 0x165;
|
||||
if (dMeter2Info_getRentalBombBag() != 0xff &&
|
||||
field_0x690[i] == dMeter2Info_getRentalBombBag() + 0xf)
|
||||
{
|
||||
itemId = 0x16D;
|
||||
}
|
||||
setNameString(itemId);
|
||||
setItemScale(i, g_ringHIO.mSelectItemScale);
|
||||
} else {
|
||||
setItemScale(i, g_ringHIO.mUnselectItemScale);
|
||||
}
|
||||
for (int j = 0; j < 2; j++) {
|
||||
setButtonScale(j, g_ringHIO.mUnselectButtonScale);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 801EC3B0-801EC504 1E6CF0 0154+00 1/1 0/0 0/0 .text setNameString__12dMenu_Ring_cFUl */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1463,8 +1498,7 @@ void dMenu_Ring_c::setActiveCursor() {
|
|||
}
|
||||
}
|
||||
} else if (mDoCPd_c::getTrigX(PAD_1) || mDoCPd_c::getTrigY(PAD_1)) {
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
|
||||
0);
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1547,6 +1581,35 @@ void dMenu_Ring_c::stick_wait_init() {
|
|||
|
||||
/* 801ED31C-801ED490 1E7C5C 0174+00 1/0 0/0 0/0 .text stick_wait_proc__12dMenu_Ring_cFv
|
||||
*/
|
||||
// Matches with literals
|
||||
#ifdef NONMATCHING
|
||||
void dMenu_Ring_c::stick_wait_proc() {
|
||||
u8 item = dComIfGs_getItem(field_0x690[mStatus], false);
|
||||
|
||||
if (item != 0xff) {
|
||||
setDoStatus(0x24);
|
||||
} else {
|
||||
setDoStatus(0);
|
||||
}
|
||||
if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0x4000) && openExplain(item)) {
|
||||
dMeter2Info_setItemExplainWindowStatus(1);
|
||||
field_0x6c4 = mStatus;
|
||||
field_0x6b0 = 2;
|
||||
dMeter2Info_set2DVibration();
|
||||
setDoStatus(0);
|
||||
return;
|
||||
}
|
||||
if (dMw_A_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0x4000)) {
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
|
||||
}
|
||||
if (field_0x672 > 0) {
|
||||
field_0x672--;
|
||||
} else if (getStickInfo(mpStick) != 0) {
|
||||
field_0x6b0 = 1;
|
||||
field_0x6b2 = 0;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
|
|
@ -1555,6 +1618,7 @@ asm void dMenu_Ring_c::stick_wait_proc() {
|
|||
#include "asm/d/menu/d_menu_ring/stick_wait_proc__12dMenu_Ring_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 801ED490-801ED53C 1E7DD0 00AC+00 1/0 0/0 0/0 .text stick_move_init__12dMenu_Ring_cFv
|
||||
*/
|
||||
|
|
@ -1603,7 +1667,7 @@ SECTION_SDATA2 static u8 lit_5651[8] = {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dMenu_Ring_c::stick_move_proc() {
|
||||
asm f32 dMenu_Ring_c::stick_move_proc() {
|
||||
nofralloc
|
||||
#include "asm/d/menu/d_menu_ring/stick_move_proc__12dMenu_Ring_cFv.s"
|
||||
}
|
||||
|
|
@ -1685,6 +1749,25 @@ asm void dMenu_Ring_c::stick_explain_force_proc() {
|
|||
|
||||
/* 801EDB14-801EDC98 1E8454 0184+00 2/2 0/0 0/0 .text setSelectItem__12dMenu_Ring_cFiUc
|
||||
*/
|
||||
// Matches with literals
|
||||
#ifdef NONMATCHING
|
||||
void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) {
|
||||
f32 texScale = 1.0f;
|
||||
|
||||
if (i_itemNo != 0xff) {
|
||||
if (field_0x6be[i_idx] == 0) {
|
||||
field_0x6be[i_idx] = 1;
|
||||
} else {
|
||||
field_0x6be[i_idx] = 0;
|
||||
}
|
||||
field_0x686[i_idx] = dMeter2Info_readItemTexture(i_itemNo, mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0], mpSelectItemTex[i_idx][0], mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][1], mpSelectItemTex[i_idx][1],
|
||||
mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][2], mpSelectItemTex[i_idx][2], NULL, NULL, -1);
|
||||
texScale = dItem_data::getTexScale(i_itemNo) / 100.0f;
|
||||
}
|
||||
field_0x548[i_idx] = mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0]->width / 48.0f * texScale;
|
||||
field_0x558[i_idx] = mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0]->height / 48.0f * texScale;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
|
|
@ -1693,6 +1776,7 @@ asm void dMenu_Ring_c::setSelectItem(int param_0, u8 param_1) {
|
|||
#include "asm/d/menu/d_menu_ring/setSelectItem__12dMenu_Ring_cFiUc.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80454414-80454418 002A14 0004+00 1/1 0/0 0/0 .sdata2 @5811 */
|
||||
|
|
@ -1735,31 +1819,75 @@ s32 dMenu_Ring_c::getCursorPos(u8 param_0) {
|
|||
}
|
||||
|
||||
/* 801EE058-801EE15C 1E8998 0104+00 4/4 0/0 0/0 .text getItemNum__12dMenu_Ring_cFUc */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm u8 dMenu_Ring_c::getItemNum(u8 param_0) {
|
||||
nofralloc
|
||||
#include "asm/d/menu/d_menu_ring/getItemNum__12dMenu_Ring_cFUc.s"
|
||||
u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) {
|
||||
u8 item = dComIfGs_getItem(i_slotNo, false);
|
||||
u8 ret = 0;
|
||||
|
||||
switch (item) {
|
||||
case 0x50:
|
||||
ret = 0;
|
||||
break;
|
||||
case 0x70:
|
||||
case 0x71:
|
||||
case 0x72:
|
||||
ret = dComIfGs_getBombNum(i_slotNo - 0xF);
|
||||
break;
|
||||
|
||||
case 0x76:
|
||||
ret = dComIfGs_getBottleNum(i_slotNo - 0xB);
|
||||
break;
|
||||
case 0x43:
|
||||
case 0x53:
|
||||
case 0x54:
|
||||
case 0x55:
|
||||
case 0x56:
|
||||
ret = dComIfGs_getArrowNum();
|
||||
break;
|
||||
case 0x4B:
|
||||
ret = dComIfGs_getPachinkoNum();
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 801EE15C-801EE228 1E8A9C 00CC+00 4/4 0/0 0/0 .text getItemMaxNum__12dMenu_Ring_cFUc */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm u8 dMenu_Ring_c::getItemMaxNum(u8 param_0) {
|
||||
nofralloc
|
||||
#include "asm/d/menu/d_menu_ring/getItemMaxNum__12dMenu_Ring_cFUc.s"
|
||||
u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) {
|
||||
u8 item = dComIfGs_getItem(i_slotNo, false);
|
||||
u8 ret = 0;
|
||||
|
||||
switch (item) {
|
||||
case 0x50:
|
||||
ret = 1;
|
||||
break;
|
||||
case 0x70:
|
||||
case 0x71:
|
||||
case 0x72:
|
||||
ret = dComIfGs_getBombMax(item);
|
||||
break;
|
||||
|
||||
case 0x76:
|
||||
ret = dComIfGs_getBottleMax();
|
||||
break;
|
||||
case 0x43:
|
||||
case 0x53:
|
||||
case 0x54:
|
||||
case 0x55:
|
||||
case 0x56:
|
||||
ret = dComIfGs_getArrowMax();
|
||||
break;
|
||||
case 0x4B:
|
||||
ret = dComIfGs_getPachinkoMax();
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 801EE228-801EE63C 1E8B68 0414+00 1/1 0/0 0/0 .text checkExplainForce__12dMenu_Ring_cFv
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dMenu_Ring_c::checkExplainForce() {
|
||||
asm bool dMenu_Ring_c::checkExplainForce() {
|
||||
nofralloc
|
||||
#include "asm/d/menu/d_menu_ring/checkExplainForce__12dMenu_Ring_cFv.s"
|
||||
}
|
||||
|
|
@ -1924,8 +2052,8 @@ void dMenu_Ring_c::setMixMessage() {
|
|||
}
|
||||
if (!mpTextParent[4]->isVisible()) {
|
||||
field_0x570 = 18.0f - g_ringHIO.mHighlightAnimSpeed;
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f,
|
||||
-1.0f, -1.0f, 0);
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
|
||||
-1.0f, 0);
|
||||
}
|
||||
mpTextParent[4]->show();
|
||||
} else if (isMixItemOn()) {
|
||||
|
|
@ -1935,8 +2063,8 @@ void dMenu_Ring_c::setMixMessage() {
|
|||
}
|
||||
if (!mpTextParent[4]->isVisible()) {
|
||||
field_0x570 = 18.0f - g_ringHIO.mHighlightAnimSpeed;
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f,
|
||||
-1.0f, -1.0f, 0);
|
||||
Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ICON, NULL, 0, 0, 1.0f, 1.0f, -1.0f,
|
||||
-1.0f, 0);
|
||||
}
|
||||
mpTextParent[4]->show();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -22,223 +22,6 @@
|
|||
#include "f_op/f_op_msg_mng.h"
|
||||
#include "rel/d/a/d_a_horse/d_a_horse.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void _create__9dMeter2_cFv();
|
||||
extern "C" void _execute__9dMeter2_cFv();
|
||||
extern "C" void _draw__9dMeter2_cFv();
|
||||
extern "C" void _delete__9dMeter2_cFv();
|
||||
extern "C" void emphasisButtonDelete__9dMeter2_cFv();
|
||||
extern "C" void setLifeZero__9dMeter2_cFv();
|
||||
extern "C" void checkStatus__9dMeter2_cFv();
|
||||
extern "C" void moveLife__9dMeter2_cFv();
|
||||
extern "C" void moveKantera__9dMeter2_cFv();
|
||||
extern "C" void moveOxygen__9dMeter2_cFv();
|
||||
extern "C" void moveLightDrop__9dMeter2_cFv();
|
||||
extern "C" void moveRupee__9dMeter2_cFv();
|
||||
extern "C" void moveKey__9dMeter2_cFv();
|
||||
extern "C" void moveButtonA__9dMeter2_cFv();
|
||||
extern "C" void moveButtonB__9dMeter2_cFv();
|
||||
extern "C" void moveButtonR__9dMeter2_cFv();
|
||||
extern "C" void moveButtonZ__9dMeter2_cFv();
|
||||
extern "C" void moveButton3D__9dMeter2_cFv();
|
||||
extern "C" void moveButtonC__9dMeter2_cFv();
|
||||
extern "C" void moveButtonS__9dMeter2_cFv();
|
||||
extern "C" void moveButtonXY__9dMeter2_cFv();
|
||||
extern "C" void moveButtonCross__9dMeter2_cFv();
|
||||
extern "C" void moveTouchSubMenu__9dMeter2_cFv();
|
||||
extern "C" void moveSubContents__9dMeter2_cFv();
|
||||
extern "C" void move2DContents__9dMeter2_cFv();
|
||||
extern "C" void checkSubContents__9dMeter2_cFv();
|
||||
extern "C" void check2DContents__9dMeter2_cFv();
|
||||
extern "C" void moveBombNum__9dMeter2_cFv();
|
||||
extern "C" void moveBottleNum__9dMeter2_cFv();
|
||||
extern "C" void moveArrowNum__9dMeter2_cFv();
|
||||
extern "C" void movePachinkoNum__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeLife__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeKantera__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeOxygen__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeLightDrop__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeRupee__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeKey__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeButton__9dMeter2_cFv();
|
||||
extern "C" void alphaAnimeButtonCross__9dMeter2_cFv();
|
||||
extern "C" void isShowLightDrop__9dMeter2_cFv();
|
||||
extern "C" void killSubContents__9dMeter2_cFUc();
|
||||
extern "C" void isKeyVisible__9dMeter2_cFv();
|
||||
extern "C" void isArrowEquip__9dMeter2_cFv();
|
||||
extern "C" void isPachinkoEquip__9dMeter2_cFv();
|
||||
extern "C" static void dMeter2_Draw__FP9dMeter2_c();
|
||||
extern "C" static void dMeter2_Execute__FP9dMeter2_c();
|
||||
extern "C" static bool dMeter2_IsDelete__FP9dMeter2_c();
|
||||
extern "C" static void dMeter2_Delete__FP9dMeter2_c();
|
||||
extern "C" static void dMeter2_Create__FP9msg_class();
|
||||
extern "C" extern char const* const d_meter_d_meter2__stringBase0;
|
||||
// extern "C" extern void* g_profile_METER2[10];
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
|
||||
extern "C" void fopMsgM_setStageLayer__FPv();
|
||||
extern "C" void fopMsgM_setMessageID__FUi();
|
||||
extern "C" void fopMsgM_Create__FsPFPv_iPv();
|
||||
extern "C" void fopMsgM_createExpHeap__FUlP7JKRHeap();
|
||||
extern "C" void fopMsgM_destroyExpHeap__FP10JKRExpHeap();
|
||||
extern "C" void setItemBombNumCount__14dComIfG_play_cFUcs();
|
||||
extern "C" void getItemBombNumCount__14dComIfG_play_cFUc();
|
||||
extern "C" void clearItemBombNumCount__14dComIfG_play_cFUc();
|
||||
extern "C" void getLayerNo__14dComIfG_play_cFi();
|
||||
extern "C" void getTimerMode__14dComIfG_play_cFv();
|
||||
extern "C" void dComIfGs_setSelectItemIndex__FiUc();
|
||||
extern "C" void dComIfGs_setMixItemIndex__FiUc();
|
||||
extern "C" void dComIfGs_getSelectMixItemNoArrowIndex__Fi();
|
||||
extern "C" void dComIfGs_getMixItemIndex__Fi();
|
||||
extern "C" void dComIfGp_setSelectItem__Fi();
|
||||
extern "C" void dComIfGp_getSelectItem__Fi();
|
||||
extern "C" void dComIfGp_setHeapLockFlag__FUc();
|
||||
extern "C" void dComIfGp_offHeapLockFlag__Fi();
|
||||
extern "C" void dComIfGp_getSubHeap2D__Fi();
|
||||
extern "C" void dComIfGp_getSelectItemNum__Fi();
|
||||
extern "C" void dComIfGp_getSelectItemMaxNum__Fi();
|
||||
extern "C" void getSelectItemIndex__21dSv_player_status_a_cCFi();
|
||||
extern "C" void getRupeeMax__21dSv_player_status_a_cCFv();
|
||||
extern "C" void setItem__17dSv_player_item_cFiUc();
|
||||
extern "C" void getItem__17dSv_player_item_cCFib();
|
||||
extern "C" void setBombNum__24dSv_player_item_record_cFUcUc();
|
||||
extern "C" void getBombNum__24dSv_player_item_record_cCFUc();
|
||||
extern "C" void getBottleNum__24dSv_player_item_record_cCFUc();
|
||||
extern "C" void getBombNum__21dSv_player_item_max_cCFUc();
|
||||
extern "C" void onCollectCrystal__20dSv_player_collect_cFUc();
|
||||
extern "C" void isCollectCrystal__20dSv_player_collect_cCFUc();
|
||||
extern "C" void onCollectMirror__20dSv_player_collect_cFUc();
|
||||
extern "C" void isCollectMirror__20dSv_player_collect_cCFUc();
|
||||
extern "C" void getLightDropNum__16dSv_light_drop_cCFUc();
|
||||
extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc();
|
||||
extern "C" void isEventBit__11dSv_event_cCFUs();
|
||||
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
|
||||
extern "C" bool CalcSubjectAngle__9dCamera_cFPsPs();
|
||||
extern "C" void dCam_getBody__Fv();
|
||||
extern "C" void __ct__8dScope_cFUc();
|
||||
extern "C" void dKy_darkworld_check__Fv();
|
||||
extern "C" bool getBombFlag__9dMw_HIO_cFv();
|
||||
extern "C" bool getArrowFlag__9dMw_HIO_cFv();
|
||||
extern "C" bool getPachinkoFlag__9dMw_HIO_cFv();
|
||||
extern "C" void __ct__14dMeterButton_cFv();
|
||||
extern "C" void _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb();
|
||||
extern "C" void isClose__14dMeterButton_cFv();
|
||||
extern "C" void setString__14dMeterButton_cFPcUcUcUc();
|
||||
extern "C" void hideAll__14dMeterButton_cFv();
|
||||
extern "C" void __ct__14dMeterHaihai_cFUc();
|
||||
extern "C" void __ct__15dMeterHakusha_cFPv();
|
||||
extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv();
|
||||
extern "C" void getMapDispEdgeTop__11dMeterMap_cFv();
|
||||
extern "C" void setMapAlpha__11dMeterMap_cFUc();
|
||||
extern "C" void __ct__11dMeterMap_cFP9J2DScreen();
|
||||
extern "C" void _move__11dMeterMap_cFUl();
|
||||
extern "C" void _draw__11dMeterMap_cFv();
|
||||
extern "C" void meter_map_move__11dMeterMap_cFUl();
|
||||
extern "C" void __ct__14dMeterString_cFi();
|
||||
extern "C" void createString__14dMeterString_cFi();
|
||||
extern "C" void __ct__13dMeter2Draw_cFP10JKRExpHeap();
|
||||
extern "C" void exec__13dMeter2Draw_cFUl();
|
||||
extern "C" void drawLife__13dMeter2Draw_cFssff();
|
||||
extern "C" void setAlphaLifeChange__13dMeter2Draw_cFb();
|
||||
extern "C" void setAlphaLifeAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaLifeAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void drawKantera__13dMeter2Draw_cFllff();
|
||||
extern "C" void setAlphaKanteraChange__13dMeter2Draw_cFb();
|
||||
extern "C" void setAlphaKanteraAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaKanteraAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void drawOxygen__13dMeter2Draw_cFllff();
|
||||
extern "C" void setAlphaOxygenChange__13dMeter2Draw_cFb();
|
||||
extern "C" void setAlphaOxygenAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaOxygenAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void drawLightDrop__13dMeter2Draw_cFUcUcffffUc();
|
||||
extern "C" void setAlphaLightDropChange__13dMeter2Draw_cFb();
|
||||
extern "C" void getNowLightDropRateCalc__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaLightDropAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaLightDropAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void drawRupee__13dMeter2Draw_cFs();
|
||||
extern "C" void setAlphaRupeeChange__13dMeter2Draw_cFb();
|
||||
extern "C" void setAlphaRupeeAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaRupeeAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void drawKey__13dMeter2Draw_cFs();
|
||||
extern "C" void setAlphaKeyChange__13dMeter2Draw_cFb();
|
||||
extern "C" void setAlphaKeyAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphaKeyAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void drawButtonA__13dMeter2Draw_cFUcfffffbb();
|
||||
extern "C" void drawButtonB__13dMeter2Draw_cFUcbfffffb();
|
||||
extern "C" void drawButtonR__13dMeter2Draw_cFUcUcbb();
|
||||
extern "C" void drawButtonZ__13dMeter2Draw_cFUc();
|
||||
extern "C" void drawButton3D__13dMeter2Draw_cFUc();
|
||||
extern "C" void drawButtonC__13dMeter2Draw_cFUcb();
|
||||
extern "C" void drawButtonS__13dMeter2Draw_cFUc();
|
||||
extern "C" void drawButtonBin__13dMeter2Draw_cFUc();
|
||||
extern "C" void drawButtonXY__13dMeter2Draw_cFiUcUcbb();
|
||||
extern "C" void getButtonCrossParentInitTransY__13dMeter2Draw_cFv();
|
||||
extern "C" void drawButtonCross__13dMeter2Draw_cFff();
|
||||
extern "C" void setAlphButtonACrossAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonACrossAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonAChange__13dMeter2Draw_cFb();
|
||||
extern "C" void setAlphButtonAAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonAAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonAAAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonAAAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonABAnimeMin__13dMeter2Draw_cFv();
|
||||
extern "C" void setAlphButtonABAnimeMax__13dMeter2Draw_cFv();
|
||||
extern "C" void setButtonIconAAlpha__13dMeter2Draw_cFUcUlb();
|
||||
extern "C" void setButtonIconBAlpha__13dMeter2Draw_cFUcUlb();
|
||||
extern "C" void setButtonIconMidonaAlpha__13dMeter2Draw_cFUl();
|
||||
extern "C" void setButtonIconAlpha__13dMeter2Draw_cFiUcUlb();
|
||||
extern "C" void getActionString__13dMeter2Draw_cFUcUcPUc();
|
||||
extern "C" void setItemNum__13dMeter2Draw_cFUcUcUc();
|
||||
extern "C" void drawItemNum__13dMeter2Draw_cFUcf();
|
||||
extern "C" void drawKanteraMeter__13dMeter2Draw_cFUcf();
|
||||
extern "C" void isButtonVisible__13dMeter2Draw_cFv();
|
||||
extern "C" void getCameraSubject__13dMeter2Draw_cFv();
|
||||
extern "C" void getItemSubject__13dMeter2Draw_cFv();
|
||||
extern "C" void getPlayerSubject__13dMeter2Draw_cFv();
|
||||
extern "C" void isButtonBShow__13dMeter2Draw_cFb();
|
||||
extern "C" void getButtonTimer__13dMeter2Draw_cFv();
|
||||
extern "C" void isFloatingMessageVisible__13dMeter2Info_cFv();
|
||||
extern "C" void isDirectUseItem__13dMeter2Info_cFi();
|
||||
extern "C" void decHotSpringTimer__13dMeter2Info_cFv();
|
||||
extern "C" bool dMeter2Info_is2DActiveTouchArea__Fv();
|
||||
extern "C" void isPlaceMessage__12dMsgObject_cFv();
|
||||
extern "C" void getStatus__12dMsgObject_cFv();
|
||||
extern "C" void dTimer_createStockTimer__Fv();
|
||||
extern "C" void cLib_addCalc2__FPffff();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void heartGaugeOn__11Z2StatusMgrFv();
|
||||
extern "C" void freeAll__7JKRHeapFv();
|
||||
extern "C" void getTotalFreeSize__7JKRHeapFv();
|
||||
extern "C" void* __nw__FUl();
|
||||
extern "C" void _savegpr_18();
|
||||
extern "C" void _savegpr_19();
|
||||
extern "C" void _savegpr_21();
|
||||
extern "C" void _savegpr_23();
|
||||
extern "C" void _savegpr_25();
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_18();
|
||||
extern "C" void _restgpr_19();
|
||||
extern "C" void _restgpr_21();
|
||||
extern "C" void _restgpr_23();
|
||||
extern "C" void _restgpr_25();
|
||||
extern "C" void _restgpr_27();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" u8 m_mode__7dDemo_c[4];
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 8021EA14-8021F128 219354 0714+00 1/1 0/0 0/0 .text _create__9dMeter2_cFv */
|
||||
int dMeter2_c::_create() {
|
||||
stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
|
||||
|
|
@ -1764,7 +1547,7 @@ void dMeter2_c::moveButtonB() {
|
|||
var_f31 = 1.0f;
|
||||
}
|
||||
|
||||
if (mpMeterDraw->isButtonBShow(false)) {
|
||||
if (mpMeterDraw->isBButtonShow(false)) {
|
||||
if (field_0x1ff == 0) {
|
||||
field_0x1ff = 1;
|
||||
draw_buttonB = true;
|
||||
|
|
@ -3057,18 +2840,8 @@ void dMeter2_c::alphaAnimeLightDrop() {
|
|||
mpMeterDraw->setAlphaLightDropChange(false);
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80399338-80399338 025998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_80399347 = "R_SP127";
|
||||
/* @stringBase0 padding */
|
||||
SECTION_DEAD static char const* const pad_8039934F = "";
|
||||
#pragma pop
|
||||
|
||||
/* 80224DC0-80224F70 21F700 01B0+00 1/1 0/0 0/0 .text alphaAnimeRupee__9dMeter2_cFv */
|
||||
// gameinfo loads have issues
|
||||
#ifdef NONMATCHING
|
||||
void dMeter2_c::alphaAnimeRupee() {
|
||||
if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x80)) ||
|
||||
daPy_getPlayerActorClass()->getSumouMode() ||
|
||||
|
|
@ -3087,20 +2860,8 @@ void dMeter2_c::alphaAnimeRupee() {
|
|||
|
||||
mpMeterDraw->setAlphaRupeeChange(false);
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dMeter2_c::alphaAnimeRupee() {
|
||||
nofralloc
|
||||
#include "asm/d/meter/d_meter2/alphaAnimeRupee__9dMeter2_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 80224F70-802250F4 21F8B0 0184+00 1/1 0/0 0/0 .text alphaAnimeKey__9dMeter2_cFv */
|
||||
// masking issues
|
||||
#ifdef NONMATCHING
|
||||
void dMeter2_c::alphaAnimeKey() {
|
||||
if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x40)) ||
|
||||
!isKeyVisible() || (mStatus & 0x40000000) || (mStatus & 0x1000) || (mStatus & 0x100000) ||
|
||||
|
|
@ -3108,7 +2869,7 @@ void dMeter2_c::alphaAnimeKey() {
|
|||
(daPy_getPlayerActorClass()->checkCanoeSlider() &&
|
||||
(dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) ||
|
||||
(mStatus & 0x100) || (mStatus & 8) || (mStatus & 0x10) ||
|
||||
(mStatus & 0x1000000) | (mStatus & 0x20) || (mStatus & 0x4000000) ||
|
||||
(mStatus & 0x1000000) || (mStatus & 0x20) || (mStatus & 0x4000000) ||
|
||||
(mStatus & 0x8000000) || (mStatus & 0x10000000) || dMeter2Info_isSub2DStatus(1))
|
||||
{
|
||||
mpMeterDraw->setAlphaKeyAnimeMin();
|
||||
|
|
@ -3118,16 +2879,6 @@ void dMeter2_c::alphaAnimeKey() {
|
|||
|
||||
mpMeterDraw->setAlphaKeyChange(false);
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void dMeter2_c::alphaAnimeKey() {
|
||||
nofralloc
|
||||
#include "asm/d/meter/d_meter2/alphaAnimeKey__9dMeter2_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 802250F4-802254C0 21FA34 03CC+00 1/1 0/0 0/0 .text alphaAnimeButton__9dMeter2_cFv */
|
||||
void dMeter2_c::alphaAnimeButton() {
|
||||
|
|
@ -3139,41 +2890,41 @@ void dMeter2_c::alphaAnimeButton() {
|
|||
((mStatus & 0x40000000) && !(mStatus & 0x100)) || (mStatus & 0x80000000) || (mStatus & 8) ||
|
||||
(mStatus & 0x10) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x10000000))
|
||||
{
|
||||
mpMeterDraw->setAlphButtonAAnimeMin();
|
||||
mpMeterDraw->setAlphButtonAAAnimeMin();
|
||||
mpMeterDraw->setAlphButtonABAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonAAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonBAnimeMin();
|
||||
} else if (!(mStatus & 0x1000000) &&
|
||||
((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() ||
|
||||
(mStatus & 0x40) && dComIfGp_event_checkHind(1)))
|
||||
{
|
||||
mpMeterDraw->setAlphButtonAAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonAnimeMin();
|
||||
var_31 = 1;
|
||||
} else if (dMeter2Info_getItemExplainWindowStatus()) {
|
||||
mpMeterDraw->setAlphButtonAAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonAnimeMin();
|
||||
var_31 = 1;
|
||||
} else {
|
||||
mpMeterDraw->setAlphButtonAAnimeMax();
|
||||
mpMeterDraw->setAlphaButtonAnimeMax();
|
||||
}
|
||||
|
||||
field_0x1e6 = 0;
|
||||
|
||||
if (var_31 == 1) {
|
||||
if (dMeter2Info_getItemExplainWindowStatus()) {
|
||||
mpMeterDraw->setAlphButtonAAAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonAAnimeMin();
|
||||
} else if ((mStatus & 0x100) || daPy_getPlayerActorClass()->checkHawkWait() ||
|
||||
!dComIfGp_event_checkHind(2))
|
||||
{
|
||||
mpMeterDraw->setAlphButtonAAAnimeMax();
|
||||
mpMeterDraw->setAlphaButtonAAnimeMax();
|
||||
onShowFlag(0);
|
||||
} else {
|
||||
mpMeterDraw->setAlphButtonAAAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonAAnimeMin();
|
||||
}
|
||||
|
||||
if (mpMeterDraw->isButtonBShow(false)) {
|
||||
mpMeterDraw->setAlphButtonABAnimeMax();
|
||||
if (mpMeterDraw->isBButtonShow(false)) {
|
||||
mpMeterDraw->setAlphaButtonBAnimeMax();
|
||||
onShowFlag(1);
|
||||
} else {
|
||||
mpMeterDraw->setAlphButtonABAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonBAnimeMin();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3210,7 +2961,7 @@ void dMeter2_c::alphaAnimeButton() {
|
|||
}
|
||||
}
|
||||
|
||||
mpMeterDraw->setAlphButtonAChange(false);
|
||||
mpMeterDraw->setAlphaButtonChange(false);
|
||||
}
|
||||
|
||||
/* 802254C0-802256DC 21FE00 021C+00 1/1 0/0 0/0 .text alphaAnimeButtonCross__9dMeter2_cFv
|
||||
|
|
@ -3224,7 +2975,7 @@ void dMeter2_c::alphaAnimeButtonCross() {
|
|||
(mStatus & 0x10000000) || (mStatus & 0x20000000)) ||
|
||||
daPy_getPlayerActorClass()->checkEnemyAttentionLock() || dMeter2Info_isGameStatus(1))
|
||||
{
|
||||
mpMeterDraw->setAlphButtonACrossAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonCrossAnimeMin();
|
||||
|
||||
if ((!dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) ||
|
||||
(mStatus & 0x100)) &&
|
||||
|
|
@ -3233,13 +2984,13 @@ void dMeter2_c::alphaAnimeButtonCross() {
|
|||
field_0x190--;
|
||||
}
|
||||
} else if (dMeter2Info_isSub2DStatus(1) || dMeter2Info_isFloatingMessageVisible()) {
|
||||
mpMeterDraw->setAlphButtonACrossAnimeMin();
|
||||
mpMeterDraw->setAlphaButtonCrossAnimeMin();
|
||||
|
||||
if (field_0x190 < 5) {
|
||||
field_0x190++;
|
||||
}
|
||||
} else {
|
||||
mpMeterDraw->setAlphButtonACrossAnimeMax();
|
||||
mpMeterDraw->setAlphaButtonCrossAnimeMax();
|
||||
|
||||
if (field_0x190 < 5) {
|
||||
field_0x190++;
|
||||
|
|
|
|||
|
|
@ -1209,7 +1209,7 @@ void dMeter2Draw_c::initButton() {
|
|||
drawButtonC(dComIfGp_getCStickStatus(), true);
|
||||
drawButtonS(dComIfGp_getSButtonStatus());
|
||||
|
||||
setAlphButtonAChange(true);
|
||||
setAlphaButtonChange(true);
|
||||
mpButtonParent->setAlphaRate(0.0f);
|
||||
}
|
||||
|
||||
|
|
@ -2245,7 +2245,7 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP
|
|||
f32 var_f31 = g_drawHIO.mButtonAScale;
|
||||
f32 var_f30 = g_drawHIO.mButtonATextScale;
|
||||
|
||||
if (isButtonBShow(false)) {
|
||||
if (isBButtonShow(false)) {
|
||||
var_f31 = g_drawHIO.mButtonATalkScale[0];
|
||||
var_f30 = g_drawHIO.mButtonATalkScale[1];
|
||||
} else if (param_7) {
|
||||
|
|
@ -2310,7 +2310,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
|
|||
f32 var_f31 = g_drawHIO.mButtonBScale;
|
||||
f32 var_f30 = g_drawHIO.mButtonBFontScale;
|
||||
|
||||
if (isButtonBShow(true)) {
|
||||
if (isBButtonShow(true)) {
|
||||
var_f31 = g_drawHIO.mButtonBTalkScale[0];
|
||||
var_f30 = g_drawHIO.mButtonBTalkScale[1];
|
||||
}
|
||||
|
|
@ -2660,41 +2660,41 @@ void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) {
|
|||
}
|
||||
|
||||
/* 80218338-802183A8 212C78 0070+00 0/0 1/1 0/0 .text
|
||||
* setAlphButtonACrossAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonACrossAnimeMin() {
|
||||
* setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() {
|
||||
if (mpButtonCrossParent->getAlphaRate() != 0.0f) {
|
||||
mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha);
|
||||
setAlphaAnimeMin(mpButtonCrossParent, 5);
|
||||
}
|
||||
|
||||
setAlphButtonACrossItemAnimeMin();
|
||||
setAlphButtonACrossMapAnimeMin();
|
||||
setAlphaButtonCrossItemAnimeMin();
|
||||
setAlphaButtonCrossMapAnimeMin();
|
||||
}
|
||||
|
||||
/* 802183A8-80218448 212CE8 00A0+00 0/0 1/1 0/0 .text
|
||||
* setAlphButtonACrossAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonACrossAnimeMax() {
|
||||
* setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() {
|
||||
if (g_drawHIO.mParentAlpha != mpButtonCrossParent->getAlphaRate()) {
|
||||
mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha);
|
||||
setAlphaAnimeMax(mpButtonCrossParent, 5);
|
||||
}
|
||||
|
||||
if (dMeter2Info_isItemOpenCheck()) {
|
||||
setAlphButtonACrossItemAnimeMax();
|
||||
setAlphaButtonCrossItemAnimeMax();
|
||||
} else {
|
||||
setAlphButtonACrossItemAnimeMin();
|
||||
setAlphaButtonCrossItemAnimeMin();
|
||||
}
|
||||
|
||||
if (dMeter2Info_isMapOpenCheck()) {
|
||||
setAlphButtonACrossMapAnimeMax();
|
||||
setAlphaButtonCrossMapAnimeMax();
|
||||
} else {
|
||||
setAlphButtonACrossMapAnimeMin();
|
||||
setAlphaButtonCrossMapAnimeMin();
|
||||
}
|
||||
}
|
||||
|
||||
/* 80218448-80218524 212D88 00DC+00 2/2 0/0 0/0 .text
|
||||
* setAlphButtonACrossItemAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonACrossItemAnimeMin() {
|
||||
* setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() {
|
||||
if (mpTextI->getAlphaRate() != 0.0f) {
|
||||
mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha);
|
||||
setAlphaAnimeMin(mpTextI, 5);
|
||||
|
|
@ -2709,8 +2709,8 @@ void dMeter2Draw_c::setAlphButtonACrossItemAnimeMin() {
|
|||
}
|
||||
|
||||
/* 80218524-802185E8 212E64 00C4+00 1/1 0/0 0/0 .text
|
||||
* setAlphButtonACrossItemAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonACrossItemAnimeMax() {
|
||||
* setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() {
|
||||
if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha != mpTextI->getAlphaRate()) {
|
||||
mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha);
|
||||
setAlphaAnimeMax(mpTextI, 5);
|
||||
|
|
@ -2725,8 +2725,8 @@ void dMeter2Draw_c::setAlphButtonACrossItemAnimeMax() {
|
|||
}
|
||||
|
||||
/* 802185E8-802186C4 212F28 00DC+00 2/2 0/0 0/0 .text
|
||||
* setAlphButtonACrossMapAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonACrossMapAnimeMin() {
|
||||
* setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() {
|
||||
if (mpTextM->getAlphaRate() != 0.0f) {
|
||||
mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha);
|
||||
setAlphaAnimeMin(mpTextM, 5);
|
||||
|
|
@ -2741,8 +2741,8 @@ void dMeter2Draw_c::setAlphButtonACrossMapAnimeMin() {
|
|||
}
|
||||
|
||||
/* 802186C4-80218788 213004 00C4+00 1/1 0/0 0/0 .text
|
||||
* setAlphButtonACrossMapAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonACrossMapAnimeMax() {
|
||||
* setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() {
|
||||
if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha != mpTextM->getAlphaRate()) {
|
||||
mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha);
|
||||
setAlphaAnimeMax(mpTextM, 5);
|
||||
|
|
@ -2756,8 +2756,8 @@ void dMeter2Draw_c::setAlphButtonACrossMapAnimeMax() {
|
|||
}
|
||||
}
|
||||
|
||||
/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphButtonAChange__13dMeter2Draw_cFb */
|
||||
void dMeter2Draw_c::setAlphButtonAChange(bool param_0) {
|
||||
/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphaButtonChange__13dMeter2Draw_cFb */
|
||||
void dMeter2Draw_c::setAlphaButtonChange(bool param_0) {
|
||||
bool set_parent = false;
|
||||
bool set_buttonA = false;
|
||||
bool set_buttonB = false;
|
||||
|
|
@ -2955,8 +2955,8 @@ void dMeter2Draw_c::setAlphButtonAChange(bool param_0) {
|
|||
}
|
||||
}
|
||||
|
||||
/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphButtonAAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonAAnimeMin() {
|
||||
/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMin__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonAnimeMin() {
|
||||
if (mpButtonParent->getAlphaRate() != 0.0f) {
|
||||
mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha);
|
||||
setAlphaAnimeMin(mpButtonParent, 5);
|
||||
|
|
@ -2967,8 +2967,8 @@ void dMeter2Draw_c::setAlphButtonAAnimeMin() {
|
|||
}
|
||||
}
|
||||
|
||||
/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphButtonAAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphButtonAAnimeMax() {
|
||||
/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMax__13dMeter2Draw_cFv */
|
||||
void dMeter2Draw_c::setAlphaButtonAnimeMax() {
|
||||
if (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha != mpButtonParent->getAlphaRate()) {
|
||||
mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha);
|
||||
setAlphaAnimeMax(mpButtonParent, 5);
|
||||
|
|
@ -2985,9 +2985,9 @@ void dMeter2Draw_c::setAlphButtonAAnimeMax() {
|
|||
}
|
||||
}
|
||||
|
||||
/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphButtonAAAnimeMin__13dMeter2Draw_cFv
|
||||
/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMin__13dMeter2Draw_cFv
|
||||
*/
|
||||
void dMeter2Draw_c::setAlphButtonAAAnimeMin() {
|
||||
void dMeter2Draw_c::setAlphaButtonAAnimeMin() {
|
||||
if (mpButtonA->getAlphaRate() != 0.0f) {
|
||||
mpButtonA->setAlphaRate(g_drawHIO.mButtonAAlpha *
|
||||
(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha));
|
||||
|
|
@ -3002,9 +3002,9 @@ void dMeter2Draw_c::setAlphButtonAAAnimeMin() {
|
|||
}
|
||||
}
|
||||
|
||||
/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphButtonAAAnimeMax__13dMeter2Draw_cFv
|
||||
/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMax__13dMeter2Draw_cFv
|
||||
*/
|
||||
void dMeter2Draw_c::setAlphButtonAAAnimeMax() {
|
||||
void dMeter2Draw_c::setAlphaButtonAAnimeMax() {
|
||||
if (g_drawHIO.mButtonAAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) !=
|
||||
mpButtonA->getAlphaRate())
|
||||
{
|
||||
|
|
@ -3021,9 +3021,9 @@ void dMeter2Draw_c::setAlphButtonAAAnimeMax() {
|
|||
}
|
||||
}
|
||||
|
||||
/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphButtonABAnimeMin__13dMeter2Draw_cFv
|
||||
/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMin__13dMeter2Draw_cFv
|
||||
*/
|
||||
void dMeter2Draw_c::setAlphButtonABAnimeMin() {
|
||||
void dMeter2Draw_c::setAlphaButtonBAnimeMin() {
|
||||
if (mpButtonB->getAlphaRate() != 0.0f) {
|
||||
mpButtonB->setAlphaRate(g_drawHIO.mButtonBAlpha *
|
||||
(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha));
|
||||
|
|
@ -3047,9 +3047,9 @@ void dMeter2Draw_c::setAlphButtonABAnimeMin() {
|
|||
}
|
||||
}
|
||||
|
||||
/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphButtonABAnimeMax__13dMeter2Draw_cFv
|
||||
/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMax__13dMeter2Draw_cFv
|
||||
*/
|
||||
void dMeter2Draw_c::setAlphButtonABAnimeMax() {
|
||||
void dMeter2Draw_c::setAlphaButtonBAnimeMax() {
|
||||
if (mpButtonB->getAlphaRate() !=
|
||||
g_drawHIO.mButtonBAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha))
|
||||
{
|
||||
|
|
@ -4037,8 +4037,8 @@ bool dMeter2Draw_c::getPlayerSubject() {
|
|||
return dComIfGp_checkPlayerStatus0(0, 0x8000000);
|
||||
}
|
||||
|
||||
/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isButtonBShow__13dMeter2Draw_cFb */
|
||||
bool dMeter2Draw_c::isButtonBShow(bool param_0) {
|
||||
/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isBButtonShow__13dMeter2Draw_cFb */
|
||||
bool dMeter2Draw_c::isBButtonShow(bool param_0) {
|
||||
if (dMsgObject_getMsgObjectClass() == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d/meter/d_meter_map
|
||||
//
|
||||
/**
|
||||
* d_meter_map.cpp
|
||||
*
|
||||
*/
|
||||
|
||||
#include "d/meter/d_meter_map.h"
|
||||
#include "JSystem/J2DGraph/J2DGrafContext.h"
|
||||
#include "d/a/d_a_player.h"
|
||||
#include "d/map/d_map.h"
|
||||
#include "d/menu/d_menu_window.h"
|
||||
#include "d/meter/d_meter2_info.h"
|
||||
|
|
@ -12,81 +13,6 @@
|
|||
#include "f_op/f_op_overlap_mng.h"
|
||||
#include "m_Do/m_Do_controller_pad.h"
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void isEnableDispMap__11dMeterMap_cFv();
|
||||
extern "C" void getMapDispSizeTypeNo__11dMeterMap_cFv();
|
||||
extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv();
|
||||
extern "C" void getMapDispEdgeBottomY_Layout__11dMeterMap_cFv();
|
||||
extern "C" void isEventRunCheck__11dMeterMap_cFv();
|
||||
extern "C" void getMapDispEdgeLeftX_Layout__11dMeterMap_cFv();
|
||||
extern "C" void getMapDispEdgeTop__11dMeterMap_cFv();
|
||||
extern "C" bool getDispPosInside_OffsetX__11dMeterMap_cFv();
|
||||
extern "C" void getDispPosOutSide_OffsetX__11dMeterMap_cFv();
|
||||
extern "C" void setDispPosInsideFlg_SE_On__11dMeterMap_cFv();
|
||||
extern "C" void setDispPosOutsideFlg_SE_On__11dMeterMap_cFv();
|
||||
extern "C" void setMapAlpha__11dMeterMap_cFUc();
|
||||
extern "C" void isMapOpenCheck__11dMeterMap_cFv();
|
||||
extern "C" void __ct__11dMeterMap_cFP9J2DScreen();
|
||||
extern "C" void __dt__11dMeterMap_cFv();
|
||||
extern "C" void _create__11dMeterMap_cFP9J2DScreen();
|
||||
extern "C" void _delete__11dMeterMap_cFv();
|
||||
extern "C" void _move__11dMeterMap_cFUl();
|
||||
extern "C" void _draw__11dMeterMap_cFv();
|
||||
extern "C" void draw__11dMeterMap_cFv();
|
||||
extern "C" void ctrlShowMap__11dMeterMap_cFv();
|
||||
extern "C" void checkMoveStatus__11dMeterMap_cFv();
|
||||
extern "C" void isShow__11dMeterMap_cFUl();
|
||||
extern "C" void isFmapScreen__11dMeterMap_cFv();
|
||||
extern "C" void isDmapScreen__11dMeterMap_cFv();
|
||||
extern "C" void meter_map_move__11dMeterMap_cFUl();
|
||||
extern "C" void keyCheck__11dMeterMap_cFv();
|
||||
extern "C" extern char const* const d_meter_d_meter_map__stringBase0;
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void fopOvlpM_IsDoingReq__Fv();
|
||||
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
|
||||
extern "C" void __ct__6dMap_cFiiii();
|
||||
extern "C" void _move__6dMap_cFffif();
|
||||
extern "C" void _draw__6dMap_cFv();
|
||||
extern "C" void dComIfGp_mapShow__Fv();
|
||||
extern "C" void dComIfGp_mapHide__Fv();
|
||||
extern "C" void dComIfGp_checkMapShow__Fv();
|
||||
extern "C" void isDungeonItem__12dSv_memBit_cCFi();
|
||||
extern "C" void onEventBit__11dSv_event_cFUs();
|
||||
extern "C" void isEventBit__11dSv_event_cCFUs();
|
||||
extern "C" void getMapPlayerPos__10dMapInfo_nFv();
|
||||
extern "C" void isExistMapPathData__8dMpath_cFv();
|
||||
extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
|
||||
extern "C" void dMw_LEFT_TRIGGER__Fv();
|
||||
extern "C" void dMw_RIGHT_TRIGGER__Fv();
|
||||
extern "C" void dMeter2Info_set2DVibration__Fv();
|
||||
extern "C" void getStatus__12dMsgObject_cFv();
|
||||
extern "C" void cLib_addCalcAngleS__FPsssss();
|
||||
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void* __nw__FUl();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void __ct__10J2DPictureFPC7ResTIMG();
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _savegpr_28();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_27();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* __vt__12dDlst_base_c[3];
|
||||
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
|
||||
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 8020D49C-8020D528 207DDC 008C+00 1/1 0/0 0/0 .text isEnableDispMap__11dMeterMap_cFv */
|
||||
bool dMeterMap_c::isEnableDispMap() {
|
||||
bool minimapEnable = false;
|
||||
|
|
@ -168,8 +94,6 @@ f32 dMeterMap_c::getMapDispEdgeBottomY_Layout() {
|
|||
}
|
||||
|
||||
/* 8020D698-8020D72C 207FD8 0094+00 2/2 0/0 0/0 .text isEventRunCheck__11dMeterMap_cFv */
|
||||
// missing gameinfo load
|
||||
#ifdef NONMATCHING
|
||||
bool dMeterMap_c::isEventRunCheck() {
|
||||
if (dComIfGp_event_runCheck()) {
|
||||
return true;
|
||||
|
|
@ -179,16 +103,6 @@ bool dMeterMap_c::isEventRunCheck() {
|
|||
|
||||
return dComIfGp_event_runCheck() != field_0x30 ? 1 : 0;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm bool dMeterMap_c::isEventRunCheck() {
|
||||
nofralloc
|
||||
#include "asm/d/meter/d_meter_map/isEventRunCheck__11dMeterMap_cFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 8020D72C-8020D75C 20806C 0030+00 2/2 0/0 0/0 .text getMapDispEdgeLeftX_Layout__11dMeterMap_cFv
|
||||
*/
|
||||
|
|
@ -540,8 +454,6 @@ u8 dMeterMap_c::checkMoveStatus() {
|
|||
}
|
||||
|
||||
/* 8020E4C8-8020E620 208E08 0158+00 2/2 0/0 0/0 .text isShow__11dMeterMap_cFUl */
|
||||
// extra gameinfo label load for dComIfGp_event_checkHind
|
||||
#ifdef NONMATCHING
|
||||
bool dMeterMap_c::isShow(u32 param_0) {
|
||||
if ((param_0 & 0x4000) || fopOvlpM_IsDoingReq() ||
|
||||
((param_0 & 0x40) && dComIfGp_event_checkHind(0x100) &&
|
||||
|
|
@ -557,16 +469,6 @@ bool dMeterMap_c::isShow(u32 param_0) {
|
|||
}
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm bool dMeterMap_c::isShow(u32 param_0) {
|
||||
nofralloc
|
||||
#include "asm/d/meter/d_meter_map/isShow__11dMeterMap_cFUl.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 8020E620-8020E70C 208F60 00EC+00 3/3 0/0 0/0 .text isFmapScreen__11dMeterMap_cFv */
|
||||
bool dMeterMap_c::isFmapScreen() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue