encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

dSv_player_item_record_c and dSv_player_get_item_c funcs ok

Browse Source
This commit is contained in:
unknown
2020-11-22 20:17:49 -05:00
parent 5111810104
commit e956a55a26
31 changed files with 431 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/d/a/d_a_alink.s
+8 -8
View File
@@ -10006,17 +10006,17 @@ lbl_800A6550:
/* 800A657C 000A34BC 3B 03 00 CC */ addi r24, r3, 0xcc
/* 800A6580 000A34C0 7F 03 C3 78 */ mr r3, r24
/* 800A6584 000A34C4 38 80 00 2C */ li r4, 0x2c
/* 800A6588 000A34C8 4B F8 D9 41 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 800A6588 000A34C8 4B F8 D9 41 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 800A658C 000A34CC 2C 03 00 00 */ cmpwi r3, 0
/* 800A6590 000A34D0 40 82 00 48 */ bne lbl_800A65D8
/* 800A6594 000A34D4 7F 03 C3 78 */ mr r3, r24
/* 800A6598 000A34D8 38 80 00 2B */ li r4, 0x2b
/* 800A659C 000A34DC 4B F8 D9 2D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 800A659C 000A34DC 4B F8 D9 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 800A65A0 000A34E0 2C 03 00 00 */ cmpwi r3, 0
/* 800A65A4 000A34E4 40 82 00 34 */ bne lbl_800A65D8
/* 800A65A8 000A34E8 7F 03 C3 78 */ mr r3, r24
/* 800A65AC 000A34EC 38 80 00 2A */ li r4, 0x2a
/* 800A65B0 000A34F0 4B F8 D9 19 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 800A65B0 000A34F0 4B F8 D9 19 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 800A65B4 000A34F4 2C 03 00 00 */ cmpwi r3, 0
/* 800A65B8 000A34F8 40 82 00 20 */ bne lbl_800A65D8
/* 800A65BC 000A34FC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -102427,7 +102427,7 @@ lbl_800F784C:
/* 800F7870 000F47B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800F7874 000F47B4 38 63 00 9C */ addi r3, r3, 0x9c
/* 800F7878 000F47B8 38 80 00 FF */ li r4, 0xff
/* 800F787C 000F47BC 4B F3 C4 C5 */ bl dSv_player_item_c_NS_setBaitItem
/* 800F787C 000F47BC 4B F3 C4 C5 */ bl setBaitItem__17dSv_player_item_cFUc
/* 800F7880 000F47C0 A0 1F 2F DC */ lhz r0, 0x2fdc(r31)
/* 800F7884 000F47C4 28 00 00 5F */ cmplwi r0, 0x5f
/* 800F7888 000F47C8 41 82 00 0C */ beq lbl_800F7894
@@ -102691,7 +102691,7 @@ lbl_800F7C20:
/* 800F7C24 000F4B64 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800F7C28 000F4B68 38 63 00 9C */ addi r3, r3, 0x9c
/* 800F7C2C 000F4B6C 7F E4 FB 78 */ mr r4, r31
/* 800F7C30 000F4B70 4B F3 C1 11 */ bl dSv_player_item_c_NS_setBaitItem
/* 800F7C30 000F4B70 4B F3 C1 11 */ bl setBaitItem__17dSv_player_item_cFUc
lbl_800F7C34:
/* 800F7C34 000F4B74 38 60 00 01 */ li r3, 1
/* 800F7C38 000F4B78 83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -141876,7 +141876,7 @@ lbl_8011A80C:
/* 8011A86C 001177AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8011A870 001177B0 38 63 00 CC */ addi r3, r3, 0xcc
/* 8011A874 001177B4 38 80 00 40 */ li r4, 0x40
/* 8011A878 001177B8 4B F1 96 51 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8011A878 001177B8 4B F1 96 51 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8011A87C 001177BC 2C 03 00 00 */ cmpwi r3, 0
/* 8011A880 001177C0 40 82 00 18 */ bne lbl_8011A898
lbl_8011A884:
@@ -142580,7 +142580,7 @@ lbl_8011B234:
/* 8011B274 001181B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8011B278 001181B8 38 63 00 CC */ addi r3, r3, 0xcc
/* 8011B27C 001181BC 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8011B280 001181C0 4B F1 8C 49 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8011B280 001181C0 4B F1 8C 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8011B284 001181C4 2C 03 00 00 */ cmpwi r3, 0
/* 8011B288 001181C8 41 82 00 20 */ beq lbl_8011B2A8
/* 8011B28C 001181CC 80 7C 32 CC */ lwz r3, 0x32cc(r28)
@@ -185252,7 +185252,7 @@ dComIfGs_isItemFirstBit:
/* 80141274 0013E1B4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80141278 0013E1B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8014127C 0013E1BC 38 63 00 CC */ addi r3, r3, 0xcc
/* 80141280 0013E1C0 4B EF 2C 49 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80141280 0013E1C0 4B EF 2C 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80141284 0013E1C4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80141288 0013E1C8 7C 08 03 A6 */ mtlr r0
/* 8014128C 0013E1CC 38 21 00 10 */ addi r1, r1, 0x10
asm/d/a/obj/d_a_obj_item.s
+2 -2
View File
@@ -1532,7 +1532,7 @@ lbl_8015C340:
/* 8015C374 001592B4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015C378 001592B8 38 63 00 CC */ addi r3, r3, 0xcc
/* 8015C37C 001592BC 88 9E 09 2A */ lbz r4, 0x92a(r30)
/* 8015C380 001592C0 4B ED 7B 15 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 8015C380 001592C0 4B ED 7B 15 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 8015C384 001592C4 48 00 00 20 */ b lbl_8015C3A4
lbl_8015C388:
/* 8015C388 001592C8 7F C3 F3 78 */ mr r3, r30
@@ -2410,7 +2410,7 @@ lbl_8015CFD4:
/* 8015CFF0 00159F30 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8015CFF4 00159F34 38 63 00 CC */ addi r3, r3, 0xcc
/* 8015CFF8 00159F38 88 9F 09 2A */ lbz r4, 0x92a(r31)
/* 8015CFFC 00159F3C 4B ED 6E 99 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 8015CFFC 00159F3C 4B ED 6E 99 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 8015D000 00159F40 48 00 00 3C */ b lbl_8015D03C
lbl_8015D004:
/* 8015D004 00159F44 88 7F 09 2A */ lbz r3, 0x92a(r31)
asm/d/com/inf/d_com_inf_game.s
+6 -6
View File
@@ -3708,7 +3708,7 @@ lbl_8002E46C:
/* 8002E46C 0002B3AC 88 9A 00 00 */ lbz r4, 0(r26)
/* 8002E470 0002B3B0 7F A3 EB 78 */ mr r3, r29
/* 8002E474 0002B3B4 3B 5A 00 01 */ addi r26, r26, 1
/* 8002E478 0002B3B8 48 00 5A 51 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8002E478 0002B3B8 48 00 5A 51 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8002E47C 0002B3BC 2C 03 00 00 */ cmpwi r3, 0
/* 8002E480 0002B3C0 41 82 00 20 */ beq lbl_8002E4A0
/* 8002E484 0002B3C4 7F 83 E3 78 */ mr r3, r28
@@ -3827,7 +3827,7 @@ lbl_8002E5F8:
/* 8002E608 0002B548 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8002E60C 0002B54C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8002E610 0002B550 38 63 00 EC */ addi r3, r3, 0xec
/* 8002E614 0002B554 48 00 59 69 */ bl dSv_player_item_record_c_NS_getBombNum
/* 8002E614 0002B554 48 00 59 69 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8002E618 0002B558 54 64 06 3E */ clrlwi r4, r3, 0x18
/* 8002E61C 0002B55C 48 00 00 54 */ b lbl_8002E670
lbl_8002E620:
@@ -3850,7 +3850,7 @@ lbl_8002E638:
/* 8002E65C 0002B59C 38 63 00 EC */ addi r3, r3, 0xec
/* 8002E660 0002B5A0 38 04 FF F5 */ addi r0, r4, -11
/* 8002E664 0002B5A4 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8002E668 0002B5A8 48 00 59 C9 */ bl dSv_player_item_record_c_NS_getBottleNum
/* 8002E668 0002B5A8 48 00 59 C9 */ bl getBottleNum__24dSv_player_item_record_cCFUc
/* 8002E66C 0002B5AC 54 64 06 3E */ clrlwi r4, r3, 0x18
lbl_8002E670:
/* 8002E670 0002B5B0 7C 83 23 78 */ mr r3, r4
@@ -3946,7 +3946,7 @@ lbl_8002E79C:
/* 8002E7A4 0002B6E4 38 63 00 EC */ addi r3, r3, 0xec
/* 8002E7A8 0002B6E8 7F 84 E3 78 */ mr r4, r28
/* 8002E7AC 0002B6EC 57 E5 06 3E */ clrlwi r5, r31, 0x18
/* 8002E7B0 0002B6F0 48 00 57 BD */ bl dSv_player_item_record_c_NS_setBombNum
/* 8002E7B0 0002B6F0 48 00 57 BD */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 8002E7B4 0002B6F4 48 00 00 70 */ b lbl_8002E824
lbl_8002E7B8:
/* 8002E7B8 0002B6F8 28 00 00 4B */ cmplwi r0, 0x4b
@@ -3977,7 +3977,7 @@ lbl_8002E80C:
/* 8002E814 0002B754 38 63 00 EC */ addi r3, r3, 0xec
/* 8002E818 0002B758 7F 84 E3 78 */ mr r4, r28
/* 8002E81C 0002B75C 57 E5 06 3E */ clrlwi r5, r31, 0x18
/* 8002E820 0002B760 48 00 57 6D */ bl dSv_player_item_record_c_NS_setBottleNum
/* 8002E820 0002B760 48 00 57 6D */ bl setBottleNum__24dSv_player_item_record_cFUcUc
lbl_8002E824:
/* 8002E824 0002B764 39 61 00 20 */ addi r11, r1, 0x20
/* 8002E828 0002B768 48 33 39 FD */ bl _restgpr_28
@@ -4037,7 +4037,7 @@ lbl_8002E8C0:
/* 8002E8E8 0002B828 38 04 FF F5 */ addi r0, r4, -11
/* 8002E8EC 0002B82C 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8002E8F0 0002B830 7F E5 FB 78 */ mr r5, r31
/* 8002E8F4 0002B834 48 00 56 A9 */ bl dSv_player_item_record_c_NS_addBottleNum
/* 8002E8F4 0002B834 48 00 56 A9 */ bl addBottleNum__24dSv_player_item_record_cFUcs
lbl_8002E8F8:
/* 8002E8F8 0002B838 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8002E8FC 0002B83C 83 C1 00 08 */ lwz r30, 8(r1)
asm/d/d_gameover.s
+1 -1
View File
@@ -681,7 +681,7 @@ lbl_8019B6E4:
/* 8019B6E8 00198628 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8019B6EC 0019862C 38 63 00 CC */ addi r3, r3, 0xcc
/* 8019B6F0 00198630 38 80 00 48 */ li r4, 0x48
/* 8019B6F4 00198634 4B E9 87 D5 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8019B6F4 00198634 4B E9 87 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8019B6F8 00198638 2C 03 00 00 */ cmpwi r3, 0
/* 8019B6FC 0019863C 41 82 00 54 */ beq lbl_8019B750
/* 8019B700 00198640 3C 60 80 40 */ lis r3, lbl_804061C0@ha
asm/d/d_item.s
+75 -75
View File
File diff suppressed because it is too large Load Diff
asm/d/d_meter2.s
+11 -11
View File
@@ -88,7 +88,7 @@ lbl_8021EB20:
/* 8021EB44 0021BA84 98 7A 01 F6 */ stb r3, 0x1f6(r26)
/* 8021EB48 0021BA88 7F 83 E3 78 */ mr r3, r28
/* 8021EB4C 0021BA8C 57 24 06 3E */ clrlwi r4, r25, 0x18
/* 8021EB50 0021BA90 4B E1 54 2D */ bl dSv_player_item_record_c_NS_getBombNum
/* 8021EB50 0021BA90 4B E1 54 2D */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8021EB54 0021BA94 98 7A 01 F3 */ stb r3, 0x1f3(r26)
/* 8021EB58 0021BA98 3B 39 00 01 */ addi r25, r25, 1
/* 8021EB5C 0021BA9C 2C 19 00 03 */ cmpwi r25, 3
@@ -109,7 +109,7 @@ lbl_8021EB70:
lbl_8021EB94:
/* 8021EB94 0021BAD4 7F 83 E3 78 */ mr r3, r28
/* 8021EB98 0021BAD8 57 24 06 3E */ clrlwi r4, r25, 0x18
/* 8021EB9C 0021BADC 4B E1 54 95 */ bl dSv_player_item_record_c_NS_getBottleNum
/* 8021EB9C 0021BADC 4B E1 54 95 */ bl getBottleNum__24dSv_player_item_record_cCFUc
/* 8021EBA0 0021BAE0 38 19 01 EF */ addi r0, r25, 0x1ef
/* 8021EBA4 0021BAE4 7C 7F 01 AE */ stbx r3, r31, r0
/* 8021EBA8 0021BAE8 3B 39 00 01 */ addi r25, r25, 1
@@ -5944,7 +5944,7 @@ lbl_80223E3C:
lbl_80223EAC:
/* 80223EAC 00220DEC 7F 43 D3 78 */ mr r3, r26
/* 80223EB0 00220DF0 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 80223EB4 00220DF4 4B E1 00 C9 */ bl dSv_player_item_record_c_NS_getBombNum
/* 80223EB4 00220DF4 4B E1 00 C9 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 80223EB8 00220DF8 7C 73 1B 78 */ mr r19, r3
/* 80223EBC 00220DFC 7F 23 CB 78 */ mr r3, r25
/* 80223EC0 00220E00 7F 84 E3 78 */ mr r4, r28
@@ -5978,7 +5978,7 @@ lbl_80223F18:
/* 80223F28 00220E68 40 82 00 40 */ bne lbl_80223F68
/* 80223F2C 00220E6C 7F 43 D3 78 */ mr r3, r26
/* 80223F30 00220E70 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 80223F34 00220E74 4B E1 00 49 */ bl dSv_player_item_record_c_NS_getBombNum
/* 80223F34 00220E74 4B E1 00 49 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 80223F38 00220E78 7E 75 BA 14 */ add r19, r21, r23
/* 80223F3C 00220E7C 88 93 01 F3 */ lbz r4, 0x1f3(r19)
/* 80223F40 00220E80 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -5998,7 +5998,7 @@ lbl_80223F68:
/* 80223F74 00220EB4 7C 73 1B 78 */ mr r19, r3
/* 80223F78 00220EB8 7F 43 D3 78 */ mr r3, r26
/* 80223F7C 00220EBC 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 80223F80 00220EC0 4B E0 FF FD */ bl dSv_player_item_record_c_NS_getBombNum
/* 80223F80 00220EC0 4B E0 FF FD */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 80223F84 00220EC4 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80223F88 00220EC8 7C 00 9A 14 */ add r0, r0, r19
/* 80223F8C 00220ECC 7C 16 07 34 */ extsh r22, r0
@@ -6081,7 +6081,7 @@ lbl_8022409C:
/* 8022409C 00220FDC 7F 43 D3 78 */ mr r3, r26
/* 802240A0 00220FE0 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 802240A4 00220FE4 56 C5 06 3E */ clrlwi r5, r22, 0x18
/* 802240A8 00220FE8 4B E0 FE C5 */ bl dSv_player_item_record_c_NS_setBombNum
/* 802240A8 00220FE8 4B E0 FE C5 */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 802240AC 00220FEC 7F 23 CB 78 */ mr r3, r25
/* 802240B0 00220FF0 7F 84 E3 78 */ mr r4, r28
/* 802240B4 00220FF4 4B E1 00 45 */ bl dSv_player_item_max_c_NS_getBombNum
@@ -6120,7 +6120,7 @@ lbl_80224120:
/* 8022412C 0022106C 7F 43 D3 78 */ mr r3, r26
/* 80224130 00221070 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 80224134 00221074 38 A0 00 00 */ li r5, 0
/* 80224138 00221078 4B E0 FE 35 */ bl dSv_player_item_record_c_NS_setBombNum
/* 80224138 00221078 4B E0 FE 35 */ bl setBombNum__24dSv_player_item_record_cFUcUc
lbl_8022413C:
/* 8022413C 0022107C 7F 03 C3 78 */ mr r3, r24
/* 80224140 00221080 56 E4 06 3E */ clrlwi r4, r23, 0x18
@@ -6133,7 +6133,7 @@ lbl_8022413C:
lbl_8022415C:
/* 8022415C 0022109C 7F 43 D3 78 */ mr r3, r26
/* 80224160 002210A0 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 80224164 002210A4 4B E0 FE 19 */ bl dSv_player_item_record_c_NS_getBombNum
/* 80224164 002210A4 4B E0 FE 19 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 80224168 002210A8 3A 77 01 F3 */ addi r19, r23, 0x1f3
/* 8022416C 002210AC 7C 95 98 AE */ lbzx r4, r21, r19
/* 80224170 002210B0 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -6141,7 +6141,7 @@ lbl_8022415C:
/* 80224178 002210B8 41 82 00 14 */ beq lbl_8022418C
/* 8022417C 002210BC 7F 43 D3 78 */ mr r3, r26
/* 80224180 002210C0 56 E4 06 3E */ clrlwi r4, r23, 0x18
/* 80224184 002210C4 4B E0 FD F9 */ bl dSv_player_item_record_c_NS_getBombNum
/* 80224184 002210C4 4B E0 FD F9 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 80224188 002210C8 7C 75 99 AE */ stbx r3, r21, r19
lbl_8022418C:
/* 8022418C 002210CC 3A F7 00 01 */ addi r23, r23, 1
@@ -6224,7 +6224,7 @@ lbl_80224284:
/* 802242A0 002211E0 40 82 00 90 */ bne lbl_80224330
/* 802242A4 002211E4 7F 23 CB 78 */ mr r3, r25
/* 802242A8 002211E8 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 802242AC 002211EC 4B E0 FD 85 */ bl dSv_player_item_record_c_NS_getBottleNum
/* 802242AC 002211EC 4B E0 FD 85 */ bl getBottleNum__24dSv_player_item_record_cCFUc
/* 802242B0 002211F0 3B 1F 01 EF */ addi r24, r31, 0x1ef
/* 802242B4 002211F4 7C 9E C0 AE */ lbzx r4, r30, r24
/* 802242B8 002211F8 54 60 06 3E */ clrlwi r0, r3, 0x18
@@ -6253,7 +6253,7 @@ lbl_802242D4:
/* 80224310 00221250 4B FF 68 75 */ bl dMeter2Draw_c_NS_setItemNum
/* 80224314 00221254 7F 23 CB 78 */ mr r3, r25
/* 80224318 00221258 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 8022431C 0022125C 4B E0 FD 15 */ bl dSv_player_item_record_c_NS_getBottleNum
/* 8022431C 0022125C 4B E0 FD 15 */ bl getBottleNum__24dSv_player_item_record_cCFUc
/* 80224320 00221260 7C 7E C1 AE */ stbx r3, r30, r24
lbl_80224324:
/* 80224324 00221264 3A F7 00 01 */ addi r23, r23, 1
asm/d/d_save.s
+4 -245
View File
@@ -2,247 +2,6 @@
.section .text, "ax" # 80032918
.global dSv_player_item_c_NS_setBaitItem
dSv_player_item_c_NS_setBaitItem:
/* 80033D40 00030C80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80033D44 00030C84 7C 08 02 A6 */ mflr r0
/* 80033D48 00030C88 90 01 00 14 */ stw r0, 0x14(r1)
/* 80033D4C 00030C8C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80033D50 00030C90 7C 7F 1B 78 */ mr r31, r3
/* 80033D54 00030C94 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033D58 00030C98 2C 00 00 76 */ cmpwi r0, 0x76
/* 80033D5C 00030C9C 41 82 00 20 */ beq lbl_80033D7C
/* 80033D60 00030CA0 40 80 00 10 */ bge lbl_80033D70
/* 80033D64 00030CA4 2C 00 00 74 */ cmpwi r0, 0x74
/* 80033D68 00030CA8 41 82 00 48 */ beq lbl_80033DB0
/* 80033D6C 00030CAC 48 00 00 A8 */ b lbl_80033E14
lbl_80033D70:
/* 80033D70 00030CB0 2C 00 00 FF */ cmpwi r0, 0xff
/* 80033D74 00030CB4 41 82 00 70 */ beq lbl_80033DE4
/* 80033D78 00030CB8 48 00 00 9C */ b lbl_80033E14
lbl_80033D7C:
/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033D84 00030CC4 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033D88 00030CC8 38 80 00 3D */ li r4, 0x3d
/* 80033D8C 00030CCC 48 00 01 3D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80033D90 00030CD0 2C 03 00 00 */ cmpwi r3, 0
/* 80033D94 00030CD4 41 82 00 10 */ beq lbl_80033DA4
/* 80033D98 00030CD8 38 00 00 5E */ li r0, 0x5e
/* 80033D9C 00030CDC 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DA0 00030CE0 48 00 00 74 */ b lbl_80033E14
lbl_80033DA4:
/* 80033DA4 00030CE4 38 00 00 5B */ li r0, 0x5b
/* 80033DA8 00030CE8 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DAC 00030CEC 48 00 00 68 */ b lbl_80033E14
lbl_80033DB0:
/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033DB8 00030CF8 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033DBC 00030CFC 38 80 00 3D */ li r4, 0x3d
/* 80033DC0 00030D00 48 00 01 09 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80033DC4 00030D04 2C 03 00 00 */ cmpwi r3, 0
/* 80033DC8 00030D08 41 82 00 10 */ beq lbl_80033DD8
/* 80033DCC 00030D0C 38 00 00 5F */ li r0, 0x5f
/* 80033DD0 00030D10 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DD4 00030D14 48 00 00 40 */ b lbl_80033E14
lbl_80033DD8:
/* 80033DD8 00030D18 38 00 00 5D */ li r0, 0x5d
/* 80033DDC 00030D1C 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DE0 00030D20 48 00 00 34 */ b lbl_80033E14
lbl_80033DE4:
/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033DEC 00030D2C 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033DF0 00030D30 38 80 00 3D */ li r4, 0x3d
/* 80033DF4 00030D34 48 00 00 D5 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80033DF8 00030D38 2C 03 00 00 */ cmpwi r3, 0
/* 80033DFC 00030D3C 41 82 00 10 */ beq lbl_80033E0C
/* 80033E00 00030D40 38 00 00 5C */ li r0, 0x5c
/* 80033E04 00030D44 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033E08 00030D48 48 00 00 0C */ b lbl_80033E14
lbl_80033E0C:
/* 80033E0C 00030D4C 38 00 00 4A */ li r0, 0x4a
/* 80033E10 00030D50 98 1F 00 14 */ stb r0, 0x14(r31)
lbl_80033E14:
/* 80033E14 00030D54 3B E0 00 00 */ li r31, 0
lbl_80033E18:
/* 80033E18 00030D58 7F E3 FB 78 */ mr r3, r31
/* 80033E1C 00030D5C 4B FF 9F D9 */ bl dComIfGp_setSelectItem
/* 80033E20 00030D60 3B FF 00 01 */ addi r31, r31, 1
/* 80033E24 00030D64 2C 1F 00 04 */ cmpwi r31, 4
/* 80033E28 00030D68 41 80 FF F0 */ blt lbl_80033E18
/* 80033E2C 00030D6C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80033E30 00030D70 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80033E34 00030D74 7C 08 03 A6 */ mtlr r0
/* 80033E38 00030D78 38 21 00 10 */ addi r1, r1, 0x10
/* 80033E3C 00030D7C 4E 80 00 20 */ blr
.global dSv_player_get_item_c_NS_init
dSv_player_get_item_c_NS_init:
/* 80033E40 00030D80 38 80 00 00 */ li r4, 0
/* 80033E44 00030D84 7C 85 23 78 */ mr r5, r4
/* 80033E48 00030D88 38 00 00 08 */ li r0, 8
/* 80033E4C 00030D8C 7C 09 03 A6 */ mtctr r0
lbl_80033E50:
/* 80033E50 00030D90 7C A3 21 2E */ stwx r5, r3, r4
/* 80033E54 00030D94 38 84 00 04 */ addi r4, r4, 4
/* 80033E58 00030D98 42 00 FF F8 */ bdnz lbl_80033E50
/* 80033E5C 00030D9C 4E 80 00 20 */ blr
.global dSv_player_get_item_c_NS_onFirstBit
dSv_player_get_item_c_NS_onFirstBit:
/* 80033E60 00030DA0 54 88 06 3E */ clrlwi r8, r4, 0x18
/* 80033E64 00030DA4 54 87 EE FA */ rlwinm r7, r4, 0x1d, 0x1b, 0x1d
/* 80033E68 00030DA8 7C C3 38 2E */ lwzx r6, r3, r7
/* 80033E6C 00030DAC 38 A0 00 01 */ li r5, 1
/* 80033E70 00030DB0 54 80 D8 08 */ slwi r0, r4, 0x1b
/* 80033E74 00030DB4 55 04 0F FE */ srwi r4, r8, 0x1f
/* 80033E78 00030DB8 7C 04 00 50 */ subf r0, r4, r0
/* 80033E7C 00030DBC 54 00 28 3E */ rotlwi r0, r0, 5
/* 80033E80 00030DC0 7C 00 22 14 */ add r0, r0, r4
/* 80033E84 00030DC4 7C A0 00 30 */ slw r0, r5, r0
/* 80033E88 00030DC8 7C C0 03 78 */ or r0, r6, r0
/* 80033E8C 00030DCC 7C 03 39 2E */ stwx r0, r3, r7
/* 80033E90 00030DD0 4E 80 00 20 */ blr
.global dSv_player_get_item_c_NS_offFirstBit
dSv_player_get_item_c_NS_offFirstBit:
/* 80033E94 00030DD4 54 88 06 3E */ clrlwi r8, r4, 0x18
/* 80033E98 00030DD8 54 87 EE FA */ rlwinm r7, r4, 0x1d, 0x1b, 0x1d
/* 80033E9C 00030DDC 7C C3 38 2E */ lwzx r6, r3, r7
/* 80033EA0 00030DE0 38 A0 00 01 */ li r5, 1
/* 80033EA4 00030DE4 54 80 D8 08 */ slwi r0, r4, 0x1b
/* 80033EA8 00030DE8 55 04 0F FE */ srwi r4, r8, 0x1f
/* 80033EAC 00030DEC 7C 04 00 50 */ subf r0, r4, r0
/* 80033EB0 00030DF0 54 00 28 3E */ rotlwi r0, r0, 5
/* 80033EB4 00030DF4 7C 00 22 14 */ add r0, r0, r4
/* 80033EB8 00030DF8 7C A0 00 30 */ slw r0, r5, r0
/* 80033EBC 00030DFC 7C C0 00 78 */ andc r0, r6, r0
/* 80033EC0 00030E00 7C 03 39 2E */ stwx r0, r3, r7
/* 80033EC4 00030E04 4E 80 00 20 */ blr
.global dSv_player_get_item_c_NS_isFirstBit
dSv_player_get_item_c_NS_isFirstBit:
/* 80033EC8 00030E08 38 C0 00 01 */ li r6, 1
/* 80033ECC 00030E0C 54 85 06 3E */ clrlwi r5, r4, 0x18
/* 80033ED0 00030E10 54 80 D8 08 */ slwi r0, r4, 0x1b
/* 80033ED4 00030E14 54 A5 0F FE */ srwi r5, r5, 0x1f
/* 80033ED8 00030E18 7C 05 00 50 */ subf r0, r5, r0
/* 80033EDC 00030E1C 54 00 28 3E */ rotlwi r0, r0, 5
/* 80033EE0 00030E20 7C 00 2A 14 */ add r0, r0, r5
/* 80033EE4 00030E24 7C C5 00 30 */ slw r5, r6, r0
/* 80033EE8 00030E28 54 80 EE FA */ rlwinm r0, r4, 0x1d, 0x1b, 0x1d
/* 80033EEC 00030E2C 7C 03 00 2E */ lwzx r0, r3, r0
/* 80033EF0 00030E30 7C A3 00 38 */ and r3, r5, r0
/* 80033EF4 00030E34 30 03 FF FF */ addic r0, r3, -1
/* 80033EF8 00030E38 7C 60 19 10 */ subfe r3, r0, r3
/* 80033EFC 00030E3C 4E 80 00 20 */ blr
.global dSv_player_item_record_c_NS_init
dSv_player_item_record_c_NS_init:
/* 80033F00 00030E40 38 80 00 00 */ li r4, 0
/* 80033F04 00030E44 98 83 00 00 */ stb r4, 0(r3)
/* 80033F08 00030E48 38 A0 00 00 */ li r5, 0
/* 80033F0C 00030E4C 38 00 00 03 */ li r0, 3
/* 80033F10 00030E50 7C 09 03 A6 */ mtctr r0
lbl_80033F14:
/* 80033F14 00030E54 38 05 00 01 */ addi r0, r5, 1
/* 80033F18 00030E58 7C 83 01 AE */ stbx r4, r3, r0
/* 80033F1C 00030E5C 38 A5 00 01 */ addi r5, r5, 1
/* 80033F20 00030E60 42 00 FF F4 */ bdnz lbl_80033F14
/* 80033F24 00030E64 38 A0 00 00 */ li r5, 0
/* 80033F28 00030E68 38 80 00 00 */ li r4, 0
/* 80033F2C 00030E6C 38 00 00 04 */ li r0, 4
/* 80033F30 00030E70 7C 09 03 A6 */ mtctr r0
lbl_80033F34:
/* 80033F34 00030E74 38 05 00 04 */ addi r0, r5, 4
/* 80033F38 00030E78 7C 83 01 AE */ stbx r4, r3, r0
/* 80033F3C 00030E7C 38 A5 00 01 */ addi r5, r5, 1
/* 80033F40 00030E80 42 00 FF F4 */ bdnz lbl_80033F34
/* 80033F44 00030E84 38 80 00 00 */ li r4, 0
/* 80033F48 00030E88 98 83 00 08 */ stb r4, 8(r3)
/* 80033F4C 00030E8C 38 A0 00 00 */ li r5, 0
/* 80033F50 00030E90 38 00 00 03 */ li r0, 3
/* 80033F54 00030E94 7C 09 03 A6 */ mtctr r0
lbl_80033F58:
/* 80033F58 00030E98 38 05 00 09 */ addi r0, r5, 9
/* 80033F5C 00030E9C 7C 83 01 AE */ stbx r4, r3, r0
/* 80033F60 00030EA0 38 A5 00 01 */ addi r5, r5, 1
/* 80033F64 00030EA4 42 00 FF F4 */ bdnz lbl_80033F58
/* 80033F68 00030EA8 4E 80 00 20 */ blr
.global dSv_player_item_record_c_NS_setBombNum
dSv_player_item_record_c_NS_setBombNum:
/* 80033F6C 00030EAC 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033F70 00030EB0 7C 63 02 14 */ add r3, r3, r0
/* 80033F74 00030EB4 98 A3 00 01 */ stb r5, 1(r3)
/* 80033F78 00030EB8 4E 80 00 20 */ blr
.global dSv_player_item_record_c_NS_getBombNum
dSv_player_item_record_c_NS_getBombNum:
/* 80033F7C 00030EBC 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033F80 00030EC0 7C 63 02 14 */ add r3, r3, r0
/* 80033F84 00030EC4 88 63 00 01 */ lbz r3, 1(r3)
/* 80033F88 00030EC8 4E 80 00 20 */ blr
.global dSv_player_item_record_c_NS_setBottleNum
dSv_player_item_record_c_NS_setBottleNum:
/* 80033F8C 00030ECC 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033F90 00030ED0 7C 63 02 14 */ add r3, r3, r0
/* 80033F94 00030ED4 98 A3 00 04 */ stb r5, 4(r3)
/* 80033F98 00030ED8 4E 80 00 20 */ blr
.global dSv_player_item_record_c_NS_addBottleNum
dSv_player_item_record_c_NS_addBottleNum:
/* 80033F9C 00030EDC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80033FA0 00030EE0 7C 08 02 A6 */ mflr r0
/* 80033FA4 00030EE4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80033FA8 00030EE8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80033FAC 00030EEC 93 C1 00 08 */ stw r30, 8(r1)
/* 80033FB0 00030EF0 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033FB4 00030EF4 7F E3 02 14 */ add r31, r3, r0
/* 80033FB8 00030EF8 88 7F 00 04 */ lbz r3, 4(r31)
/* 80033FBC 00030EFC 7C A0 07 34 */ extsh r0, r5
/* 80033FC0 00030F00 7F C3 02 14 */ add r30, r3, r0
/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033FCC 00030F0C 38 63 00 9C */ addi r3, r3, 0x9c
/* 80033FD0 00030F10 38 04 00 0B */ addi r0, r4, 0xb
/* 80033FD4 00030F14 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80033FD8 00030F18 38 A0 00 01 */ li r5, 1
/* 80033FDC 00030F1C 4B FF F0 55 */ bl getItem__17dSv_player_item_cCFib
/* 80033FE0 00030F20 2C 1E 00 00 */ cmpwi r30, 0
/* 80033FE4 00030F24 40 80 00 10 */ bge lbl_80033FF4
/* 80033FE8 00030F28 38 00 00 00 */ li r0, 0
/* 80033FEC 00030F2C 98 1F 00 04 */ stb r0, 4(r31)
/* 80033FF0 00030F30 48 00 00 24 */ b lbl_80034014
lbl_80033FF4:
/* 80033FF4 00030F34 4B FF A5 C5 */ bl dComIfGs_getBottleMax
/* 80033FF8 00030F38 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80033FFC 00030F3C 7C 1E 00 00 */ cmpw r30, r0
/* 80034000 00030F40 40 81 00 10 */ ble lbl_80034010
/* 80034004 00030F44 4B FF A5 B5 */ bl dComIfGs_getBottleMax
/* 80034008 00030F48 98 7F 00 04 */ stb r3, 4(r31)
/* 8003400C 00030F4C 48 00 00 08 */ b lbl_80034014
lbl_80034010:
/* 80034010 00030F50 9B DF 00 04 */ stb r30, 4(r31)
lbl_80034014:
/* 80034014 00030F54 88 7F 00 04 */ lbz r3, 4(r31)
/* 80034018 00030F58 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8003401C 00030F5C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80034020 00030F60 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80034024 00030F64 7C 08 03 A6 */ mtlr r0
/* 80034028 00030F68 38 21 00 10 */ addi r1, r1, 0x10
/* 8003402C 00030F6C 4E 80 00 20 */ blr
.global dSv_player_item_record_c_NS_getBottleNum
dSv_player_item_record_c_NS_getBottleNum:
/* 80034030 00030F70 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80034034 00030F74 7C 63 02 14 */ add r3, r3, r0
/* 80034038 00030F78 88 63 00 04 */ lbz r3, 4(r3)
/* 8003403C 00030F7C 4E 80 00 20 */ blr
.global dSv_player_item_max_c_NS_init
dSv_player_item_max_c_NS_init:
/* 80034040 00030F80 94 21 FF F0 */ stwu r1, -0x10(r1)
@@ -314,7 +73,7 @@ dSv_player_item_max_c_NS_getBombNum:
/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80034120 00031060 38 63 00 CC */ addi r3, r3, 0xcc
/* 80034124 00031064 38 80 00 4F */ li r4, 0x4f
/* 80034128 00031068 4B FF FD A1 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80034128 00031068 4B FF FD A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8003412C 0003106C 2C 03 00 00 */ cmpwi r3, 0
/* 80034130 00031070 41 82 00 08 */ beq lbl_80034138
/* 80034134 00031074 3B E0 00 02 */ li r31, 2
@@ -785,9 +544,9 @@ dSv_player_c_NS_init:
/* 800346E4 00031624 38 7F 00 9C */ addi r3, r31, 0x9c
/* 800346E8 00031628 4B FF E8 A9 */ bl init__17dSv_player_item_cFv
/* 800346EC 0003162C 38 7F 00 CC */ addi r3, r31, 0xcc
/* 800346F0 00031630 4B FF F7 51 */ bl dSv_player_get_item_c_NS_init
/* 800346F0 00031630 4B FF F7 51 */ bl init__21dSv_player_get_item_cFv
/* 800346F4 00031634 38 7F 00 EC */ addi r3, r31, 0xec
/* 800346F8 00031638 4B FF F8 09 */ bl dSv_player_item_record_c_NS_init
/* 800346F8 00031638 4B FF F8 09 */ bl init__24dSv_player_item_record_cFv
/* 800346FC 0003163C 38 7F 00 F8 */ addi r3, r31, 0xf8
/* 80034700 00031640 4B FF F9 41 */ bl dSv_player_item_max_c_NS_init
/* 80034704 00031644 38 7F 01 00 */ addi r3, r31, 0x100
@@ -2156,7 +1915,7 @@ lbl_80035834:
/* 80035838 00032778 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003583C 0003277C 38 63 00 CC */ addi r3, r3, 0xcc
/* 80035840 00032780 38 80 00 48 */ li r4, 0x48
/* 80035844 00032784 4B FF E6 85 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80035844 00032784 4B FF E6 85 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80035848 00032788 2C 03 00 00 */ cmpwi r3, 0
/* 8003584C 0003278C 41 82 00 5C */ beq lbl_800358A8
/* 80035850 00032790 3C 60 80 40 */ lis r3, lbl_804061C0@ha
asm/d/file/d_file_select.s
+10 -10
View File
@@ -2982,7 +2982,7 @@ dFile_select_c_NS_makeRecInfo:
/* 80186100 00183040 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 80186104 00183044 38 7F 00 CC */ addi r3, r31, 0xcc
/* 80186108 00183048 38 80 00 28 */ li r4, 0x28
/* 8018610C 0018304C 4B EA DD BD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8018610C 0018304C 4B EA DD BD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80186110 00183050 2C 03 00 00 */ cmpwi r3, 0
/* 80186114 00183054 41 82 00 18 */ beq lbl_8018612C
/* 80186118 00183058 38 00 00 00 */ li r0, 0
@@ -2993,7 +2993,7 @@ dFile_select_c_NS_makeRecInfo:
lbl_8018612C:
/* 8018612C 0018306C 38 7F 00 CC */ addi r3, r31, 0xcc
/* 80186130 00183070 38 80 00 3F */ li r4, 0x3f
/* 80186134 00183074 4B EA DD 95 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80186134 00183074 4B EA DD 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80186138 00183078 2C 03 00 00 */ cmpwi r3, 0
/* 8018613C 0018307C 41 82 00 28 */ beq lbl_80186164
/* 80186140 00183080 38 7F 07 F0 */ addi r3, r31, 0x7f0
@@ -3017,12 +3017,12 @@ lbl_80186164:
/* 80186184 001830C4 7C 7C 1B 78 */ mr r28, r3
/* 80186188 001830C8 38 7F 00 CC */ addi r3, r31, 0xcc
/* 8018618C 001830CC 38 80 00 29 */ li r4, 0x29
/* 80186190 001830D0 4B EA DD 39 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80186190 001830D0 4B EA DD 39 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80186194 001830D4 2C 03 00 00 */ cmpwi r3, 0
/* 80186198 001830D8 40 82 00 18 */ bne lbl_801861B0
/* 8018619C 001830DC 38 7F 00 CC */ addi r3, r31, 0xcc
/* 801861A0 001830E0 38 80 00 49 */ li r4, 0x49
/* 801861A4 001830E4 4B EA DD 25 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801861A4 001830E4 4B EA DD 25 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801861A8 001830E8 2C 03 00 00 */ cmpwi r3, 0
/* 801861AC 001830EC 41 82 00 10 */ beq lbl_801861BC
lbl_801861B0:
@@ -3058,7 +3058,7 @@ lbl_801861C4:
/* 8018621C 0018315C 98 03 00 B0 */ stb r0, 0xb0(r3)
/* 80186220 00183160 38 7F 00 CC */ addi r3, r31, 0xcc
/* 80186224 00183164 38 80 00 2B */ li r4, 0x2b
/* 80186228 00183168 4B EA DC A1 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80186228 00183168 4B EA DC A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8018622C 0018316C 2C 03 00 00 */ cmpwi r3, 0
/* 80186230 00183170 41 82 00 18 */ beq lbl_80186248
/* 80186234 00183174 38 00 00 01 */ li r0, 1
@@ -3069,7 +3069,7 @@ lbl_801861C4:
lbl_80186248:
/* 80186248 00183188 38 7F 00 CC */ addi r3, r31, 0xcc
/* 8018624C 0018318C 38 80 00 2A */ li r4, 0x2a
/* 80186250 00183190 4B EA DC 79 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80186250 00183190 4B EA DC 79 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80186254 00183194 2C 03 00 00 */ cmpwi r3, 0
/* 80186258 00183198 41 82 00 14 */ beq lbl_8018626C
/* 8018625C 0018319C 38 00 00 00 */ li r0, 0
@@ -3089,7 +3089,7 @@ lbl_8018626C:
/* 80186290 001831D0 7C 7D 1B 78 */ mr r29, r3
/* 80186294 001831D4 38 7F 00 CC */ addi r3, r31, 0xcc
/* 80186298 001831D8 38 80 00 2C */ li r4, 0x2c
/* 8018629C 001831DC 4B EA DC 2D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8018629C 001831DC 4B EA DC 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801862A0 001831E0 2C 03 00 00 */ cmpwi r3, 0
/* 801862A4 001831E4 41 82 00 10 */ beq lbl_801862B4
/* 801862A8 001831E8 38 00 00 01 */ li r0, 1
@@ -3111,7 +3111,7 @@ lbl_801862BC:
/* 801862E0 00183220 7C 7D 1B 78 */ mr r29, r3
/* 801862E4 00183224 38 7F 00 CC */ addi r3, r31, 0xcc
/* 801862E8 00183228 38 80 00 2F */ li r4, 0x2f
/* 801862EC 0018322C 4B EA DB DD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801862EC 0018322C 4B EA DB DD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801862F0 00183230 2C 03 00 00 */ cmpwi r3, 0
/* 801862F4 00183234 41 82 00 10 */ beq lbl_80186304
/* 801862F8 00183238 38 00 00 01 */ li r0, 1
@@ -3133,7 +3133,7 @@ lbl_8018630C:
/* 80186330 00183270 7C 7D 1B 78 */ mr r29, r3
/* 80186334 00183274 38 7F 00 CC */ addi r3, r31, 0xcc
/* 80186338 00183278 38 80 00 31 */ li r4, 0x31
/* 8018633C 0018327C 4B EA DB 8D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8018633C 0018327C 4B EA DB 8D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80186340 00183280 2C 03 00 00 */ cmpwi r3, 0
/* 80186344 00183284 41 82 00 10 */ beq lbl_80186354
/* 80186348 00183288 38 00 00 01 */ li r0, 1
@@ -3155,7 +3155,7 @@ lbl_8018635C:
/* 80186380 001832C0 7C 7D 1B 78 */ mr r29, r3
/* 80186384 001832C4 38 7F 00 CC */ addi r3, r31, 0xcc
/* 80186388 001832C8 38 80 00 30 */ li r4, 0x30
/* 8018638C 001832CC 4B EA DB 3D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 8018638C 001832CC 4B EA DB 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80186390 001832D0 2C 03 00 00 */ cmpwi r3, 0
/* 80186394 001832D4 41 82 00 10 */ beq lbl_801863A4
/* 80186398 001832D8 38 00 00 01 */ li r0, 1
asm/d/menu/d_menu_collect.s
+22 -22
View File
@@ -1212,13 +1212,13 @@ lbl_801B0A10:
/* 801B0F00 001ADE40 3A A3 00 CC */ addi r21, r3, 0xcc
/* 801B0F04 001ADE44 7E A3 AB 78 */ mr r3, r21
/* 801B0F08 001ADE48 38 80 00 28 */ li r4, 0x28
/* 801B0F0C 001ADE4C 4B E8 2F BD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B0F0C 001ADE4C 4B E8 2F BD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B0F10 001ADE50 2C 03 00 00 */ cmpwi r3, 0
/* 801B0F14 001ADE54 40 82 00 48 */ bne lbl_801B0F5C
/* 801B0F18 001ADE58 3A C0 00 00 */ li r22, 0
/* 801B0F1C 001ADE5C 7E A3 AB 78 */ mr r3, r21
/* 801B0F20 001ADE60 38 80 00 3F */ li r4, 0x3f
/* 801B0F24 001ADE64 4B E8 2F A5 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B0F24 001ADE64 4B E8 2F A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B0F28 001ADE68 2C 03 00 00 */ cmpwi r3, 0
/* 801B0F2C 001ADE6C 41 82 00 24 */ beq lbl_801B0F50
/* 801B0F30 001ADE70 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -1243,7 +1243,7 @@ lbl_801B0F5C:
/* 801B0F74 001ADEB4 41 82 00 EC */ beq lbl_801B1060
/* 801B0F78 001ADEB8 7E A3 AB 78 */ mr r3, r21
/* 801B0F7C 001ADEBC 38 80 00 28 */ li r4, 0x28
/* 801B0F80 001ADEC0 4B E8 2F 49 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B0F80 001ADEC0 4B E8 2F 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B0F84 001ADEC4 2C 03 00 00 */ cmpwi r3, 0
/* 801B0F88 001ADEC8 41 82 00 58 */ beq lbl_801B0FE0
/* 801B0F8C 001ADECC 80 7F 00 18 */ lwz r3, 0x18(r31)
@@ -1270,7 +1270,7 @@ lbl_801B0F5C:
lbl_801B0FE0:
/* 801B0FE0 001ADF20 7E A3 AB 78 */ mr r3, r21
/* 801B0FE4 001ADF24 38 80 00 3F */ li r4, 0x3f
/* 801B0FE8 001ADF28 4B E8 2E E1 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B0FE8 001ADF28 4B E8 2E E1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B0FEC 001ADF2C 2C 03 00 00 */ cmpwi r3, 0
/* 801B0FF0 001ADF30 41 82 00 70 */ beq lbl_801B1060
/* 801B0FF4 001ADF34 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -1304,12 +1304,12 @@ lbl_801B1060:
/* 801B1060 001ADFA0 3A 80 00 01 */ li r20, 1
/* 801B1064 001ADFA4 7E A3 AB 78 */ mr r3, r21
/* 801B1068 001ADFA8 38 80 00 29 */ li r4, 0x29
/* 801B106C 001ADFAC 4B E8 2E 5D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B106C 001ADFAC 4B E8 2E 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B1070 001ADFB0 2C 03 00 00 */ cmpwi r3, 0
/* 801B1074 001ADFB4 40 82 00 1C */ bne lbl_801B1090
/* 801B1078 001ADFB8 7E A3 AB 78 */ mr r3, r21
/* 801B107C 001ADFBC 38 80 00 49 */ li r4, 0x49
/* 801B1080 001ADFC0 4B E8 2E 49 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B1080 001ADFC0 4B E8 2E 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B1084 001ADFC4 2C 03 00 00 */ cmpwi r3, 0
/* 801B1088 001ADFC8 40 82 00 08 */ bne lbl_801B1090
/* 801B108C 001ADFCC 3A 80 00 00 */ li r20, 0
@@ -1338,12 +1338,12 @@ lbl_801B10C4:
/* 801B10DC 001AE01C 3A 80 00 01 */ li r20, 1
/* 801B10E0 001AE020 7E A3 AB 78 */ mr r3, r21
/* 801B10E4 001AE024 38 80 00 2B */ li r4, 0x2b
/* 801B10E8 001AE028 4B E8 2D E1 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B10E8 001AE028 4B E8 2D E1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B10EC 001AE02C 2C 03 00 00 */ cmpwi r3, 0
/* 801B10F0 001AE030 40 82 00 1C */ bne lbl_801B110C
/* 801B10F4 001AE034 7E A3 AB 78 */ mr r3, r21
/* 801B10F8 001AE038 38 80 00 2A */ li r4, 0x2a
/* 801B10FC 001AE03C 4B E8 2D CD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B10FC 001AE03C 4B E8 2D CD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B1100 001AE040 2C 03 00 00 */ cmpwi r3, 0
/* 801B1104 001AE044 40 82 00 08 */ bne lbl_801B110C
/* 801B1108 001AE048 3A 80 00 00 */ li r20, 0
@@ -1357,7 +1357,7 @@ lbl_801B110C:
/* 801B1124 001AE064 41 82 00 E0 */ beq lbl_801B1204
/* 801B1128 001AE068 7E A3 AB 78 */ mr r3, r21
/* 801B112C 001AE06C 38 80 00 2B */ li r4, 0x2b
/* 801B1130 001AE070 4B E8 2D 99 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B1130 001AE070 4B E8 2D 99 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B1134 001AE074 2C 03 00 00 */ cmpwi r3, 0
/* 801B1138 001AE078 41 82 00 60 */ beq lbl_801B1198
/* 801B113C 001AE07C 80 7F 00 18 */ lwz r3, 0x18(r31)
@@ -1386,7 +1386,7 @@ lbl_801B110C:
lbl_801B1198:
/* 801B1198 001AE0D8 7E A3 AB 78 */ mr r3, r21
/* 801B119C 001AE0DC 38 80 00 2A */ li r4, 0x2a
/* 801B11A0 001AE0E0 4B E8 2D 29 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B11A0 001AE0E0 4B E8 2D 29 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B11A4 001AE0E4 2C 03 00 00 */ cmpwi r3, 0
/* 801B11A8 001AE0E8 41 82 00 5C */ beq lbl_801B1204
/* 801B11AC 001AE0EC 80 7F 00 18 */ lwz r3, 0x18(r31)
@@ -1414,7 +1414,7 @@ lbl_801B1198:
lbl_801B1204:
/* 801B1204 001AE144 7E A3 AB 78 */ mr r3, r21
/* 801B1208 001AE148 38 80 00 2C */ li r4, 0x2c
/* 801B120C 001AE14C 4B E8 2C BD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B120C 001AE14C 4B E8 2C BD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B1210 001AE150 98 7F 02 46 */ stb r3, 0x246(r31)
/* 801B1214 001AE154 38 80 00 00 */ li r4, 0
/* 801B1218 001AE158 98 9F 02 4C */ stb r4, 0x24c(r31)
@@ -1434,15 +1434,15 @@ lbl_801B1204:
lbl_801B1250:
/* 801B1250 001AE190 7E A3 AB 78 */ mr r3, r21
/* 801B1254 001AE194 38 80 00 2F */ li r4, 0x2f
/* 801B1258 001AE198 4B E8 2C 71 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B1258 001AE198 4B E8 2C 71 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B125C 001AE19C 98 7F 02 41 */ stb r3, 0x241(r31)
/* 801B1260 001AE1A0 7E A3 AB 78 */ mr r3, r21
/* 801B1264 001AE1A4 38 80 00 31 */ li r4, 0x31
/* 801B1268 001AE1A8 4B E8 2C 61 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B1268 001AE1A8 4B E8 2C 61 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B126C 001AE1AC 98 7F 02 47 */ stb r3, 0x247(r31)
/* 801B1270 001AE1B0 7E A3 AB 78 */ mr r3, r21
/* 801B1274 001AE1B4 38 80 00 30 */ li r4, 0x30
/* 801B1278 001AE1B8 4B E8 2C 51 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B1278 001AE1B8 4B E8 2C 51 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B127C 001AE1BC 98 7F 02 4D */ stb r3, 0x24d(r31)
lbl_801B1280:
/* 801B1280 001AE1C0 38 00 00 00 */ li r0, 0
@@ -1541,7 +1541,7 @@ lbl_801B1390:
/* 801B13C8 001AE308 B0 7F 01 9C */ sth r3, 0x19c(r31)
/* 801B13CC 001AE30C 7E A3 AB 78 */ mr r3, r21
/* 801B13D0 001AE310 38 80 00 28 */ li r4, 0x28
/* 801B13D4 001AE314 4B E8 2A F5 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B13D4 001AE314 4B E8 2A F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B13D8 001AE318 2C 03 00 00 */ cmpwi r3, 0
/* 801B13DC 001AE31C 41 82 00 10 */ beq lbl_801B13EC
/* 801B13E0 001AE320 38 00 01 8D */ li r0, 0x18d
@@ -1553,7 +1553,7 @@ lbl_801B13EC:
lbl_801B13F4:
/* 801B13F4 001AE334 7E A3 AB 78 */ mr r3, r21
/* 801B13F8 001AE338 38 80 00 49 */ li r4, 0x49
/* 801B13FC 001AE33C 4B E8 2A CD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B13FC 001AE33C 4B E8 2A CD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B1400 001AE340 2C 03 00 00 */ cmpwi r3, 0
/* 801B1404 001AE344 41 82 00 10 */ beq lbl_801B1414
/* 801B1408 001AE348 38 00 01 AE */ li r0, 0x1ae
@@ -1605,7 +1605,7 @@ lbl_801B1498:
/* 801B14A4 001AE3E4 B0 1F 01 9E */ sth r0, 0x19e(r31)
/* 801B14A8 001AE3E8 7E A3 AB 78 */ mr r3, r21
/* 801B14AC 001AE3EC 38 80 00 2B */ li r4, 0x2b
/* 801B14B0 001AE3F0 4B E8 2A 19 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B14B0 001AE3F0 4B E8 2A 19 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B14B4 001AE3F4 2C 03 00 00 */ cmpwi r3, 0
/* 801B14B8 001AE3F8 41 82 00 10 */ beq lbl_801B14C8
/* 801B14BC 001AE3FC 38 00 01 90 */ li r0, 0x190
@@ -3137,7 +3137,7 @@ lbl_801B2AB0:
/* 801B2AB4 001AF9F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2AB8 001AF9F8 38 63 00 CC */ addi r3, r3, 0xcc
/* 801B2ABC 001AF9FC 38 80 00 28 */ li r4, 0x28
/* 801B2AC0 001AFA00 4B E8 14 09 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B2AC0 001AFA00 4B E8 14 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2AC4 001AFA04 2C 03 00 00 */ cmpwi r3, 0
/* 801B2AC8 001AFA08 41 82 00 6C */ beq lbl_801B2B34
/* 801B2ACC 001AFA0C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -3198,7 +3198,7 @@ lbl_801B2B9C:
/* 801B2BA0 001AFAE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801B2BA4 001AFAE4 38 63 00 CC */ addi r3, r3, 0xcc
/* 801B2BA8 001AFAE8 38 80 00 49 */ li r4, 0x49
/* 801B2BAC 001AFAEC 4B E8 13 1D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B2BAC 001AFAEC 4B E8 13 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2BB0 001AFAF0 2C 03 00 00 */ cmpwi r3, 0
/* 801B2BB4 001AFAF4 41 82 00 6C */ beq lbl_801B2C20
/* 801B2BB8 001AFAF8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -3308,7 +3308,7 @@ lbl_801B2D34:
/* 801B2D3C 001AFC7C 3B E3 00 CC */ addi r31, r3, 0xcc
/* 801B2D40 001AFC80 7F E3 FB 78 */ mr r3, r31
/* 801B2D44 001AFC84 38 80 00 2B */ li r4, 0x2b
/* 801B2D48 001AFC88 4B E8 11 81 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B2D48 001AFC88 4B E8 11 81 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2D4C 001AFC8C 2C 03 00 00 */ cmpwi r3, 0
/* 801B2D50 001AFC90 41 82 00 7C */ beq lbl_801B2DCC
/* 801B2D54 001AFC94 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -3344,7 +3344,7 @@ lbl_801B2D34:
lbl_801B2DCC:
/* 801B2DCC 001AFD0C 7F E3 FB 78 */ mr r3, r31
/* 801B2DD0 001AFD10 38 80 00 2A */ li r4, 0x2a
/* 801B2DD4 001AFD14 4B E8 10 F5 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B2DD4 001AFD14 4B E8 10 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B2DD8 001AFD18 2C 03 00 00 */ cmpwi r3, 0
/* 801B2DDC 001AFD1C 41 82 00 F0 */ beq lbl_801B2ECC
/* 801B2DE0 001AFD20 3C 60 80 40 */ lis r3, lbl_804061C0@ha
@@ -4214,7 +4214,7 @@ lbl_801B3A58:
lbl_801B3A60:
/* 801B3A60 001B09A0 38 65 00 CC */ addi r3, r5, 0xcc
/* 801B3A64 001B09A4 38 80 00 49 */ li r4, 0x49
/* 801B3A68 001B09A8 4B E8 04 61 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801B3A68 001B09A8 4B E8 04 61 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801B3A6C 001B09AC 2C 03 00 00 */ cmpwi r3, 0
/* 801B3A70 001B09B0 41 82 00 08 */ beq lbl_801B3A78
/* 801B3A74 001B09B4 3B C0 00 01 */ li r30, 1
asm/d/menu/d_menu_insect.s
+3 -3
View File
@@ -1945,7 +1945,7 @@ lbl_801D9D80:
/* 801D9D80 001D6CC0 88 9D 00 00 */ lbz r4, 0(r29)
/* 801D9D84 001D6CC4 7F E3 FB 78 */ mr r3, r31
/* 801D9D88 001D6CC8 3B BD 00 01 */ addi r29, r29, 1
/* 801D9D8C 001D6CCC 4B E5 A1 3D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801D9D8C 001D6CCC 4B E5 A1 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801D9D90 001D6CD0 2C 03 00 00 */ cmpwi r3, 0
/* 801D9D94 001D6CD4 41 82 00 10 */ beq lbl_801D9DA4
/* 801D9D98 001D6CD8 57 C3 06 3E */ clrlwi r3, r30, 0x18
@@ -1982,7 +1982,7 @@ dMenu_Insect_c_NS_isGetInsect:
/* 801D9DF8 001D6D38 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9DFC 001D6D3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9E00 001D6D40 38 63 00 CC */ addi r3, r3, 0xcc
/* 801D9E04 001D6D44 4B E5 A0 C5 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801D9E04 001D6D44 4B E5 A0 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801D9E08 001D6D48 30 03 FF FF */ addic r0, r3, -1
/* 801D9E0C 001D6D4C 7C 60 19 10 */ subfe r3, r0, r3
/* 801D9E10 001D6D50 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -2030,7 +2030,7 @@ dMenu_Insect_c_NS_isCatchInsect:
/* 801D9EA0 001D6DE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801D9EA4 001D6DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801D9EA8 001D6DE8 38 63 00 CC */ addi r3, r3, 0xcc
/* 801D9EAC 001D6DEC 4B E5 A0 1D */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801D9EAC 001D6DEC 4B E5 A0 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801D9EB0 001D6DF0 30 03 FF FF */ addic r0, r3, -1
/* 801D9EB4 001D6DF4 7C 00 19 10 */ subfe r0, r0, r3
/* 801D9EB8 001D6DF8 54 03 06 3E */ clrlwi r3, r0, 0x18
asm/d/menu/d_menu_ring.s
+2 -2
View File
@@ -5529,7 +5529,7 @@ lbl_801EE0E8:
/* 801EE0F0 001EB030 38 63 00 EC */ addi r3, r3, 0xec
/* 801EE0F4 001EB034 38 1F FF F1 */ addi r0, r31, -15
/* 801EE0F8 001EB038 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 801EE0FC 001EB03C 4B E4 5E 81 */ bl dSv_player_item_record_c_NS_getBombNum
/* 801EE0FC 001EB03C 4B E4 5E 81 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 801EE100 001EB040 7C 64 1B 78 */ mr r4, r3
/* 801EE104 001EB044 48 00 00 40 */ b lbl_801EE144
lbl_801EE108:
@@ -5538,7 +5538,7 @@ lbl_801EE108:
/* 801EE110 001EB050 38 63 00 EC */ addi r3, r3, 0xec
/* 801EE114 001EB054 38 1F FF F5 */ addi r0, r31, -11
/* 801EE118 001EB058 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 801EE11C 001EB05C 4B E4 5F 15 */ bl dSv_player_item_record_c_NS_getBottleNum
/* 801EE11C 001EB05C 4B E4 5F 15 */ bl getBottleNum__24dSv_player_item_record_cCFUc
/* 801EE120 001EB060 7C 64 1B 78 */ mr r4, r3
/* 801EE124 001EB064 48 00 00 20 */ b lbl_801EE144
lbl_801EE128:
asm/d/menu/d_menu_save.s
+1 -1
View File
@@ -4026,7 +4026,7 @@ lbl_801F3118:
/* 801F311C 001F005C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801F3120 001F0060 38 63 00 CC */ addi r3, r3, 0xcc
/* 801F3124 001F0064 38 80 00 48 */ li r4, 0x48
/* 801F3128 001F0068 4B E4 0D A1 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801F3128 001F0068 4B E4 0D A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801F312C 001F006C 2C 03 00 00 */ cmpwi r3, 0
/* 801F3130 001F0070 41 82 00 54 */ beq lbl_801F3184
/* 801F3134 001F0074 3C 60 80 40 */ lis r3, lbl_804061C0@ha
asm/d/menu/item/d_menu_item_explain.s
+3 -3
View File
@@ -2034,7 +2034,7 @@ lbl_801DC48C:
/* 801DC49C 001D93DC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC4A0 001D93E0 38 63 00 CC */ addi r3, r3, 0xcc
/* 801DC4A4 001D93E4 38 80 00 4F */ li r4, 0x4f
/* 801DC4A8 001D93E8 4B E5 7A 21 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801DC4A8 001D93E8 4B E5 7A 21 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801DC4AC 001D93EC 2C 03 00 00 */ cmpwi r3, 0
/* 801DC4B0 001D93F0 41 82 00 1C */ beq lbl_801DC4CC
/* 801DC4B4 001D93F4 3C 60 80 43 */ lis r3, lbl_80430188@ha
@@ -2095,7 +2095,7 @@ lbl_801DC54C:
/* 801DC584 001D94C4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC588 001D94C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC58C 001D94CC 38 63 00 EC */ addi r3, r3, 0xec
/* 801DC590 001D94D0 4B E5 79 ED */ bl dSv_player_item_record_c_NS_getBombNum
/* 801DC590 001D94D0 4B E5 79 ED */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 801DC594 001D94D4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801DC598 001D94D8 41 82 00 10 */ beq lbl_801DC5A8
/* 801DC59C 001D94DC 38 00 02 6D */ li r0, 0x26d
@@ -2175,7 +2175,7 @@ lbl_801DC67C:
/* 801DC6A8 001D95E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 801DC6AC 001D95EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 801DC6B0 001D95F0 38 63 00 EC */ addi r3, r3, 0xec
/* 801DC6B4 001D95F4 4B E5 78 C9 */ bl dSv_player_item_record_c_NS_getBombNum
/* 801DC6B4 001D95F4 4B E5 78 C9 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 801DC6B8 001D95F8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 801DC6BC 001D95FC 41 82 00 10 */ beq lbl_801DC6CC
/* 801DC6C0 001D9600 38 00 02 6D */ li r0, 0x26d
asm/d/menu/window/d_menu_window_HIO.s
+3 -3
View File
@@ -113,7 +113,7 @@ lbl_801F9C44:
lbl_801F9C88:
/* 801F9C88 001F6BC8 7F 83 E3 78 */ mr r3, r28
/* 801F9C8C 001F6BCC 88 9D 00 00 */ lbz r4, 0(r29)
/* 801F9C90 001F6BD0 4B E3 A2 39 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801F9C90 001F6BD0 4B E3 A2 39 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801F9C94 001F6BD4 30 03 FF FF */ addic r0, r3, -1
/* 801F9C98 001F6BD8 7C 00 19 10 */ subfe r0, r0, r3
/* 801F9C9C 001F6BDC 7C 7F DA 14 */ add r3, r31, r27
@@ -129,7 +129,7 @@ lbl_801F9C88:
lbl_801F9CC4:
/* 801F9CC4 001F6C04 7F 83 E3 78 */ mr r3, r28
/* 801F9CC8 001F6C08 88 9D 00 00 */ lbz r4, 0(r29)
/* 801F9CCC 001F6C0C 4B E3 A1 FD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801F9CCC 001F6C0C 4B E3 A1 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801F9CD0 001F6C10 30 03 FF FF */ addic r0, r3, -1
/* 801F9CD4 001F6C14 7C 00 19 10 */ subfe r0, r0, r3
/* 801F9CD8 001F6C18 7F 7F D2 14 */ add r27, r31, r26
@@ -137,7 +137,7 @@ lbl_801F9CC4:
/* 801F9CE0 001F6C20 98 1B 00 96 */ stb r0, 0x96(r27)
/* 801F9CE4 001F6C24 7F 83 E3 78 */ mr r3, r28
/* 801F9CE8 001F6C28 88 9E 00 00 */ lbz r4, 0(r30)
/* 801F9CEC 001F6C2C 4B E3 A1 DD */ bl dSv_player_get_item_c_NS_isFirstBit
/* 801F9CEC 001F6C2C 4B E3 A1 DD */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 801F9CF0 001F6C30 30 03 FF FF */ addic r0, r3, -1
/* 801F9CF4 001F6C34 7C 00 19 10 */ subfe r0, r0, r3
/* 801F9CF8 001F6C38 98 1B 00 A3 */ stb r0, 0xa3(r27)
asm/d/meter2/d_meter2_info.s
+8 -8
View File
@@ -2379,7 +2379,7 @@ lbl_8021DEC4:
/* 8021DEF8 0021AE38 3B E3 00 EC */ addi r31, r3, 0xec
/* 8021DEFC 0021AE3C 7F E3 FB 78 */ mr r3, r31
/* 8021DF00 0021AE40 88 9C 00 DC */ lbz r4, 0xdc(r28)
/* 8021DF04 0021AE44 4B E1 60 79 */ bl dSv_player_item_record_c_NS_getBombNum
/* 8021DF04 0021AE44 4B E1 60 79 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8021DF08 0021AE48 98 7C 00 CC */ stb r3, 0xcc(r28)
/* 8021DF0C 0021AE4C 88 1F 00 00 */ lbz r0, 0(r31)
/* 8021DF10 0021AE50 98 1C 00 CD */ stb r0, 0xcd(r28)
@@ -2435,7 +2435,7 @@ lbl_8021DF5C:
/* 8021DFD4 0021AF14 98 7B 5E 7E */ stb r3, 0x5e7e(r27)
/* 8021DFD8 0021AF18 7F E3 FB 78 */ mr r3, r31
/* 8021DFDC 0021AF1C 88 BC 00 D8 */ lbz r5, 0xd8(r28)
/* 8021DFE0 0021AF20 4B E1 5F 8D */ bl dSv_player_item_record_c_NS_setBombNum
/* 8021DFE0 0021AF20 4B E1 5F 8D */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 8021DFE4 0021AF24 88 1C 00 D9 */ lbz r0, 0xd9(r28)
/* 8021DFE8 0021AF28 98 1F 00 00 */ stb r0, 0(r31)
lbl_8021DFEC:
@@ -2483,7 +2483,7 @@ lbl_8021E084:
/* 8021E08C 0021AFCC 7F E3 FB 78 */ mr r3, r31
/* 8021E090 0021AFD0 88 9C 00 DC */ lbz r4, 0xdc(r28)
/* 8021E094 0021AFD4 38 A0 00 1E */ li r5, 0x1e
/* 8021E098 0021AFD8 4B E1 5E D5 */ bl dSv_player_item_record_c_NS_setBombNum
/* 8021E098 0021AFD8 4B E1 5E D5 */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 8021E09C 0021AFDC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8021E0A0 0021AFE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8021E0A4 0021AFE4 88 03 00 F8 */ lbz r0, 0xf8(r3)
@@ -2530,7 +2530,7 @@ lbl_8021E100:
/* 8021E134 0021B074 3B 83 00 EC */ addi r28, r3, 0xec
/* 8021E138 0021B078 7F 83 E3 78 */ mr r3, r28
/* 8021E13C 0021B07C 88 9E 00 DC */ lbz r4, 0xdc(r30)
/* 8021E140 0021B080 4B E1 5E 3D */ bl dSv_player_item_record_c_NS_getBombNum
/* 8021E140 0021B080 4B E1 5E 3D */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8021E144 0021B084 98 7E 00 D8 */ stb r3, 0xd8(r30)
/* 8021E148 0021B088 88 1C 00 00 */ lbz r0, 0(r28)
/* 8021E14C 0021B08C 98 1E 00 D9 */ stb r0, 0xd9(r30)
@@ -2591,7 +2591,7 @@ lbl_8021E190:
/* 8021E220 0021B160 3B 83 00 EC */ addi r28, r3, 0xec
/* 8021E224 0021B164 7F 83 E3 78 */ mr r3, r28
/* 8021E228 0021B168 88 BE 00 CC */ lbz r5, 0xcc(r30)
/* 8021E22C 0021B16C 4B E1 5D 41 */ bl dSv_player_item_record_c_NS_setBombNum
/* 8021E22C 0021B16C 4B E1 5D 41 */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 8021E230 0021B170 88 1E 00 CD */ lbz r0, 0xcd(r30)
/* 8021E234 0021B174 98 1C 00 00 */ stb r0, 0(r28)
/* 8021E238 0021B178 57 E0 06 3F */ clrlwi. r0, r31, 0x18
@@ -2795,7 +2795,7 @@ lbl_8021E4E0:
/* 8021E4F8 0021B438 28 00 00 FF */ cmplwi r0, 0xff
/* 8021E4FC 0021B43C 41 82 00 0C */ beq lbl_8021E508
/* 8021E500 0021B440 38 63 00 CC */ addi r3, r3, 0xcc
/* 8021E504 0021B444 4B E1 59 91 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 8021E504 0021B444 4B E1 59 91 */ bl offFirstBit__21dSv_player_get_item_cFUc
lbl_8021E508:
/* 8021E508 0021B448 7F E3 FB 78 */ mr r3, r31
/* 8021E50C 0021B44C 4B E1 09 A5 */ bl dComIfGs_setSelectEquipClothes
@@ -2843,7 +2843,7 @@ lbl_8021E584:
/* 8021E59C 0021B4DC 28 00 00 FF */ cmplwi r0, 0xff
/* 8021E5A0 0021B4E0 41 82 00 0C */ beq lbl_8021E5AC
/* 8021E5A4 0021B4E4 38 63 00 CC */ addi r3, r3, 0xcc
/* 8021E5A8 0021B4E8 4B E1 58 ED */ bl dSv_player_get_item_c_NS_offFirstBit
/* 8021E5A8 0021B4E8 4B E1 58 ED */ bl offFirstBit__21dSv_player_get_item_cFUc
lbl_8021E5AC:
/* 8021E5AC 0021B4EC 7F E3 FB 78 */ mr r3, r31
/* 8021E5B0 0021B4F0 4B E1 09 11 */ bl dComIfGs_setSelectEquipSword
@@ -2884,7 +2884,7 @@ lbl_8021E610:
/* 8021E628 0021B568 28 00 00 FF */ cmplwi r0, 0xff
/* 8021E62C 0021B56C 41 82 00 0C */ beq lbl_8021E638
/* 8021E630 0021B570 38 63 00 CC */ addi r3, r3, 0xcc
/* 8021E634 0021B574 4B E1 58 61 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 8021E634 0021B574 4B E1 58 61 */ bl offFirstBit__21dSv_player_get_item_cFUc
lbl_8021E638:
/* 8021E638 0021B578 7F E3 FB 78 */ mr r3, r31
/* 8021E63C 0021B57C 4B E1 09 59 */ bl dComIfGs_setSelectEquipShield
asm/d/msg/d_msg_flow.s
+6 -6
View File
@@ -2191,7 +2191,7 @@ lbl_8024BD94:
/* 8024BDEC 00248D2C 38 63 00 EC */ addi r3, r3, 0xec
/* 8024BDF0 00248D30 38 04 FF FF */ addi r0, r4, -1
/* 8024BDF4 00248D34 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8024BDF8 00248D38 4B DE 81 85 */ bl dSv_player_item_record_c_NS_getBombNum
/* 8024BDF8 00248D38 4B DE 81 85 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8024BDFC 00248D3C 7C 7F 1B 78 */ mr r31, r3
/* 8024BE00 00248D40 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024BE04 00248D44 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -2249,7 +2249,7 @@ lbl_8024BEC4:
/* 8024BEC8 00248E08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8024BECC 00248E0C 38 63 00 EC */ addi r3, r3, 0xec
/* 8024BED0 00248E10 7F C4 F3 78 */ mr r4, r30
/* 8024BED4 00248E14 4B DE 80 A9 */ bl dSv_player_item_record_c_NS_getBombNum
/* 8024BED4 00248E14 4B DE 80 A9 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8024BED8 00248E18 7C 7F 1B 78 */ mr r31, r3
/* 8024BEDC 00248E1C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024BEE0 00248E20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -2301,7 +2301,7 @@ lbl_8024BF34:
/* 8024BF8C 00248ECC 38 63 00 EC */ addi r3, r3, 0xec
/* 8024BF90 00248ED0 38 04 FF FF */ addi r0, r4, -1
/* 8024BF94 00248ED4 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8024BF98 00248ED8 4B DE 7F E5 */ bl dSv_player_item_record_c_NS_getBombNum
/* 8024BF98 00248ED8 4B DE 7F E5 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8024BF9C 00248EDC 7C 7F 1B 78 */ mr r31, r3
/* 8024BFA0 00248EE0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024BFA4 00248EE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -2391,7 +2391,7 @@ lbl_8024C08C:
/* 8024C0E4 00249024 38 63 00 EC */ addi r3, r3, 0xec
/* 8024C0E8 00249028 38 04 FF FF */ addi r0, r4, -1
/* 8024C0EC 0024902C 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8024C0F0 00249030 4B DE 7E 8D */ bl dSv_player_item_record_c_NS_getBombNum
/* 8024C0F0 00249030 4B DE 7E 8D */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 8024C0F4 00249034 7C 7F 1B 78 */ mr r31, r3
/* 8024C0F8 00249038 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024C0FC 0024903C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
@@ -3699,7 +3699,7 @@ lbl_8024D3A8:
/* 8024D420 0024A360 38 65 00 EC */ addi r3, r5, 0xec
/* 8024D424 0024A364 7F E4 FB 78 */ mr r4, r31
/* 8024D428 0024A368 38 A0 00 00 */ li r5, 0
/* 8024D42C 0024A36C 4B DE 6B 41 */ bl dSv_player_item_record_c_NS_setBombNum
/* 8024D42C 0024A36C 4B DE 6B 41 */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 8024D430 0024A370 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8024D434 0024A374 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8024D438 0024A378 3B C3 00 9C */ addi r30, r3, 0x9c
@@ -3958,7 +3958,7 @@ lbl_8024D7F0:
/* 8024D7F4 0024A734 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8024D7F8 0024A738 38 63 00 CC */ addi r3, r3, 0xcc
/* 8024D7FC 0024A73C 54 84 06 3E */ clrlwi r4, r4, 0x18
/* 8024D800 0024A740 4B DE 66 95 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 8024D800 0024A740 4B DE 66 95 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 8024D804 0024A744 48 00 00 58 */ b lbl_8024D85C
lbl_8024D808:
/* 8024D808 0024A748 2C 04 00 90 */ cmpwi r4, 0x90
asm/d/msg/d_msg_object.s
+2 -2
View File
@@ -5531,7 +5531,7 @@ lbl_80237804:
/* 8023782C 0023476C 48 00 00 10 */ b lbl_8023783C
lbl_80237830:
/* 80237830 00234770 7F 03 C3 78 */ mr r3, r24
/* 80237834 00234774 4B DF C7 49 */ bl dSv_player_item_record_c_NS_getBombNum
/* 80237834 00234774 4B DF C7 49 */ bl getBombNum__24dSv_player_item_record_cCFUc
/* 80237838 00234778 98 77 01 8A */ stb r3, 0x18a(r23)
lbl_8023783C:
/* 8023783C 0023477C 3B DE 00 01 */ addi r30, r30, 1
@@ -5994,7 +5994,7 @@ dMsgObject_c_NS_setSmellTypeLocal:
/* 80237E1C 00234D5C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80237E20 00234D60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80237E24 00234D64 38 63 00 CC */ addi r3, r3, 0xcc
/* 80237E28 00234D68 4B DF C0 39 */ bl dSv_player_get_item_c_NS_onFirstBit
/* 80237E28 00234D68 4B DF C0 39 */ bl onFirstBit__21dSv_player_get_item_cFUc
/* 80237E2C 00234D6C 88 9F 01 A0 */ lbz r4, 0x1a0(r31)
/* 80237E30 00234D70 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80237E34 00234D74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
asm/d/s/d_s_name.s
+7 -7
View File
@@ -631,25 +631,25 @@ lbl_80258FC0:
/* 8025908C 00255FCC 3B E3 00 CC */ addi r31, r3, 0xcc
/* 80259090 00255FD0 7F E3 FB 78 */ mr r3, r31
/* 80259094 00255FD4 38 80 00 01 */ li r4, 1
/* 80259098 00255FD8 4B DD AD FD */ bl dSv_player_get_item_c_NS_offFirstBit
/* 80259098 00255FD8 4B DD AD FD */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 8025909C 00255FDC 7F E3 FB 78 */ mr r3, r31
/* 802590A0 00255FE0 38 80 00 02 */ li r4, 2
/* 802590A4 00255FE4 4B DD AD F1 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 802590A4 00255FE4 4B DD AD F1 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 802590A8 00255FE8 7F E3 FB 78 */ mr r3, r31
/* 802590AC 00255FEC 38 80 00 03 */ li r4, 3
/* 802590B0 00255FF0 4B DD AD E5 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 802590B0 00255FF0 4B DD AD E5 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 802590B4 00255FF4 7F E3 FB 78 */ mr r3, r31
/* 802590B8 00255FF8 38 80 00 04 */ li r4, 4
/* 802590BC 00255FFC 4B DD AD D9 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 802590BC 00255FFC 4B DD AD D9 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 802590C0 00256000 7F E3 FB 78 */ mr r3, r31
/* 802590C4 00256004 38 80 00 05 */ li r4, 5
/* 802590C8 00256008 4B DD AD CD */ bl dSv_player_get_item_c_NS_offFirstBit
/* 802590C8 00256008 4B DD AD CD */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 802590CC 0025600C 7F E3 FB 78 */ mr r3, r31
/* 802590D0 00256010 38 80 00 06 */ li r4, 6
/* 802590D4 00256014 4B DD AD C1 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 802590D4 00256014 4B DD AD C1 */ bl offFirstBit__21dSv_player_get_item_cFUc
/* 802590D8 00256018 7F E3 FB 78 */ mr r3, r31
/* 802590DC 0025601C 38 80 00 07 */ li r4, 7
/* 802590E0 00256020 4B DD AD B5 */ bl dSv_player_get_item_c_NS_offFirstBit
/* 802590E0 00256020 4B DD AD B5 */ bl offFirstBit__21dSv_player_get_item_cFUc
lbl_802590E4:
/* 802590E4 00256024 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802590E8 00256028 80 01 00 14 */ lwz r0, 0x14(r1)
asm/d/s/d_s_play.s
+1 -1
View File
@@ -818,7 +818,7 @@ lbl_80259F68:
/* 80259FAC 00256EEC 40 82 00 28 */ bne lbl_80259FD4
/* 80259FB0 00256EF0 38 63 00 CC */ addi r3, r3, 0xcc
/* 80259FB4 00256EF4 38 80 00 84 */ li r4, 0x84
/* 80259FB8 00256EF8 4B DD 9E A9 */ bl dSv_player_get_item_c_NS_onFirstBit
/* 80259FB8 00256EF8 4B DD 9E A9 */ bl onFirstBit__21dSv_player_get_item_cFUc
/* 80259FBC 00256EFC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80259FC0 00256F00 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80259FC4 00256F04 38 63 00 9C */ addi r3, r3, 0x9c
include/d_save.h
+7 -7
View File
@@ -255,10 +255,10 @@ class dSv_player_get_item_c {
void init(void);
void onFirstBit(u8);
void offFirstBit(u8);
u8 isFirstBit(u8) const;
bool isFirstBit(u8) const;
private:
u32 pause_menu_items[4];
u32 pause_menu_bit_fields[4];
};
class dSv_player_item_record_c {
@@ -271,11 +271,11 @@ class dSv_player_item_record_c {
u8 getBottleNum(u8) const;
private:
u8 bow_ammo;
u8 bomb_bags_ammo[3];
u8 unk4_ammo[4];
u8 slingshot_ammo;
u8 unk5_ammo[3];
u8 bow;
u8 bomb_bags[3];
u8 bottles[4];
u8 slingshot;
u8 unk5[3];
};
class dSv_player_item_max_c {

Some files were not shown because too many files have changed in this diff Show More