diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index 42355541e2..e15464c61a 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -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 diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index a83b24ed3c..58531e155b 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -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) diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index c74fd83a39..c51a7771b2 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -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) diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index 3bba5de77f..97a665fd7e 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -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 diff --git a/asm/d/d_item.s b/asm/d/d_item.s index 4ea5355246..2d56770725 100644 --- a/asm/d/d_item.s +++ b/asm/d/d_item.s @@ -14,7 +14,7 @@ execItemGet: /* 80097EA4 00094DE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80097EA8 00094DE8 38 63 00 CC */ addi r3, r3, 0xcc /* 80097EAC 00094DEC 7F E4 FB 78 */ mr r4, r31 -/* 80097EB0 00094DF0 4B F9 BF B1 */ bl dSv_player_get_item_c_NS_onFirstBit +/* 80097EB0 00094DF0 4B F9 BF B1 */ bl onFirstBit__21dSv_player_get_item_cFUc /* 80097EB4 00094DF4 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d /* 80097EB8 00094DF8 3C 60 80 3B */ lis r3, lbl_803AF178@ha /* 80097EBC 00094DFC 38 63 F1 78 */ addi r3, r3, lbl_803AF178@l @@ -1092,7 +1092,7 @@ lbl_80098F3C: /* 80098F4C 00095E8C 38 63 00 EC */ addi r3, r3, 0xec /* 80098F50 00095E90 57 C4 06 3E */ clrlwi r4, r30, 0x18 /* 80098F54 00095E94 38 A0 00 0A */ li r5, 0xa -/* 80098F58 00095E98 4B F9 B0 35 */ bl dSv_player_item_record_c_NS_setBottleNum +/* 80098F58 00095E98 4B F9 B0 35 */ bl setBottleNum__24dSv_player_item_record_cFUcUc /* 80098F5C 00095E9C 7F E3 FB 78 */ mr r3, r31 /* 80098F60 00095EA0 38 80 00 76 */ li r4, 0x76 /* 80098F64 00095EA4 4B F9 A4 ED */ bl setEmptyBottleItemIn__17dSv_player_item_cFUc @@ -1544,7 +1544,7 @@ lbl_80098F68: /* 80099658 00096598 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009965C 0009659C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099660 000965A0 38 80 00 01 */ li r4, 1 -/* 80099664 000965A4 4B F9 A8 65 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099664 000965A4 4B F9 A8 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099668 000965A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009966C 000965AC 7C 08 03 A6 */ mtlr r0 /* 80099670 000965B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1556,7 +1556,7 @@ lbl_80098F68: /* 80099688 000965C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009968C 000965CC 38 63 00 CC */ addi r3, r3, 0xcc /* 80099690 000965D0 38 80 00 02 */ li r4, 2 -/* 80099694 000965D4 4B F9 A8 35 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099694 000965D4 4B F9 A8 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099698 000965D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009969C 000965DC 7C 08 03 A6 */ mtlr r0 /* 800996A0 000965E0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1568,7 +1568,7 @@ lbl_80098F68: /* 800996B8 000965F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800996BC 000965FC 38 63 00 CC */ addi r3, r3, 0xcc /* 800996C0 00096600 38 80 00 03 */ li r4, 3 -/* 800996C4 00096604 4B F9 A8 05 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800996C4 00096604 4B F9 A8 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800996C8 00096608 80 01 00 14 */ lwz r0, 0x14(r1) /* 800996CC 0009660C 7C 08 03 A6 */ mtlr r0 /* 800996D0 00096610 38 21 00 10 */ addi r1, r1, 0x10 @@ -1580,7 +1580,7 @@ lbl_80098F68: /* 800996E8 00096628 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800996EC 0009662C 38 63 00 CC */ addi r3, r3, 0xcc /* 800996F0 00096630 38 80 00 04 */ li r4, 4 -/* 800996F4 00096634 4B F9 A7 D5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800996F4 00096634 4B F9 A7 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800996F8 00096638 80 01 00 14 */ lwz r0, 0x14(r1) /* 800996FC 0009663C 7C 08 03 A6 */ mtlr r0 /* 80099700 00096640 38 21 00 10 */ addi r1, r1, 0x10 @@ -1592,7 +1592,7 @@ lbl_80098F68: /* 80099718 00096658 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009971C 0009665C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099720 00096660 38 80 00 05 */ li r4, 5 -/* 80099724 00096664 4B F9 A7 A5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099724 00096664 4B F9 A7 A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099728 00096668 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009972C 0009666C 7C 08 03 A6 */ mtlr r0 /* 80099730 00096670 38 21 00 10 */ addi r1, r1, 0x10 @@ -1604,7 +1604,7 @@ lbl_80098F68: /* 80099748 00096688 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009974C 0009668C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099750 00096690 38 80 00 06 */ li r4, 6 -/* 80099754 00096694 4B F9 A7 75 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099754 00096694 4B F9 A7 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099758 00096698 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009975C 0009669C 7C 08 03 A6 */ mtlr r0 /* 80099760 000966A0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1616,7 +1616,7 @@ lbl_80098F68: /* 80099778 000966B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009977C 000966BC 38 63 00 CC */ addi r3, r3, 0xcc /* 80099780 000966C0 38 80 00 07 */ li r4, 7 -/* 80099784 000966C4 4B F9 A7 45 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099784 000966C4 4B F9 A7 45 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099788 000966C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009978C 000966CC 7C 08 03 A6 */ mtlr r0 /* 80099790 000966D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1632,7 +1632,7 @@ lbl_80098F68: /* 800997B8 000966F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800997BC 000966FC 38 63 00 CC */ addi r3, r3, 0xcc /* 800997C0 00096700 38 80 00 0A */ li r4, 0xa -/* 800997C4 00096704 4B F9 A7 05 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800997C4 00096704 4B F9 A7 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800997C8 00096708 80 01 00 14 */ lwz r0, 0x14(r1) /* 800997CC 0009670C 7C 08 03 A6 */ mtlr r0 /* 800997D0 00096710 38 21 00 10 */ addi r1, r1, 0x10 @@ -1644,7 +1644,7 @@ lbl_80098F68: /* 800997E8 00096728 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800997EC 0009672C 38 63 00 CC */ addi r3, r3, 0xcc /* 800997F0 00096730 38 80 00 0B */ li r4, 0xb -/* 800997F4 00096734 4B F9 A6 D5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800997F4 00096734 4B F9 A6 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800997F8 00096738 80 01 00 14 */ lwz r0, 0x14(r1) /* 800997FC 0009673C 7C 08 03 A6 */ mtlr r0 /* 80099800 00096740 38 21 00 10 */ addi r1, r1, 0x10 @@ -1656,7 +1656,7 @@ lbl_80098F68: /* 80099818 00096758 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009981C 0009675C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099820 00096760 38 80 00 0C */ li r4, 0xc -/* 80099824 00096764 4B F9 A6 A5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099824 00096764 4B F9 A6 A5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099828 00096768 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009982C 0009676C 7C 08 03 A6 */ mtlr r0 /* 80099830 00096770 38 21 00 10 */ addi r1, r1, 0x10 @@ -1668,7 +1668,7 @@ lbl_80098F68: /* 80099848 00096788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009984C 0009678C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099850 00096790 38 80 00 0D */ li r4, 0xd -/* 80099854 00096794 4B F9 A6 75 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099854 00096794 4B F9 A6 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099858 00096798 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009985C 0009679C 7C 08 03 A6 */ mtlr r0 /* 80099860 000967A0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1680,7 +1680,7 @@ lbl_80098F68: /* 80099878 000967B8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009987C 000967BC 38 63 00 CC */ addi r3, r3, 0xcc /* 80099880 000967C0 38 80 00 0E */ li r4, 0xe -/* 80099884 000967C4 4B F9 A6 45 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099884 000967C4 4B F9 A6 45 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099888 000967C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009988C 000967CC 7C 08 03 A6 */ mtlr r0 /* 80099890 000967D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1692,7 +1692,7 @@ lbl_80098F68: /* 800998A8 000967E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800998AC 000967EC 38 63 00 CC */ addi r3, r3, 0xcc /* 800998B0 000967F0 38 80 00 0F */ li r4, 0xf -/* 800998B4 000967F4 4B F9 A6 15 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800998B4 000967F4 4B F9 A6 15 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800998B8 000967F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800998BC 000967FC 7C 08 03 A6 */ mtlr r0 /* 800998C0 00096800 38 21 00 10 */ addi r1, r1, 0x10 @@ -1704,7 +1704,7 @@ lbl_80098F68: /* 800998D8 00096818 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800998DC 0009681C 38 63 00 CC */ addi r3, r3, 0xcc /* 800998E0 00096820 38 80 00 10 */ li r4, 0x10 -/* 800998E4 00096824 4B F9 A5 E5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800998E4 00096824 4B F9 A5 E5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800998E8 00096828 80 01 00 14 */ lwz r0, 0x14(r1) /* 800998EC 0009682C 7C 08 03 A6 */ mtlr r0 /* 800998F0 00096830 38 21 00 10 */ addi r1, r1, 0x10 @@ -1716,7 +1716,7 @@ lbl_80098F68: /* 80099908 00096848 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009990C 0009684C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099910 00096850 38 80 00 11 */ li r4, 0x11 -/* 80099914 00096854 4B F9 A5 B5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099914 00096854 4B F9 A5 B5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099918 00096858 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009991C 0009685C 7C 08 03 A6 */ mtlr r0 /* 80099920 00096860 38 21 00 10 */ addi r1, r1, 0x10 @@ -1728,7 +1728,7 @@ lbl_80098F68: /* 80099938 00096878 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009993C 0009687C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099940 00096880 38 80 00 12 */ li r4, 0x12 -/* 80099944 00096884 4B F9 A5 85 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099944 00096884 4B F9 A5 85 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099948 00096888 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009994C 0009688C 7C 08 03 A6 */ mtlr r0 /* 80099950 00096890 38 21 00 10 */ addi r1, r1, 0x10 @@ -1750,7 +1750,7 @@ lbl_80098F68: /* 80099990 000968D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099994 000968D4 38 63 00 CC */ addi r3, r3, 0xcc /* 80099998 000968D8 38 80 00 1B */ li r4, 0x1b -/* 8009999C 000968DC 4B F9 A5 2D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009999C 000968DC 4B F9 A5 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800999A0 000968E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800999A4 000968E4 7C 08 03 A6 */ mtlr r0 /* 800999A8 000968E8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1762,7 +1762,7 @@ lbl_80098F68: /* 800999C0 00096900 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800999C4 00096904 38 63 00 CC */ addi r3, r3, 0xcc /* 800999C8 00096908 38 80 00 1C */ li r4, 0x1c -/* 800999CC 0009690C 4B F9 A4 FD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800999CC 0009690C 4B F9 A4 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 800999D0 00096910 80 01 00 14 */ lwz r0, 0x14(r1) /* 800999D4 00096914 7C 08 03 A6 */ mtlr r0 /* 800999D8 00096918 38 21 00 10 */ addi r1, r1, 0x10 @@ -1774,7 +1774,7 @@ lbl_80098F68: /* 800999F0 00096930 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800999F4 00096934 38 63 00 CC */ addi r3, r3, 0xcc /* 800999F8 00096938 38 80 00 1D */ li r4, 0x1d -/* 800999FC 0009693C 4B F9 A4 CD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 800999FC 0009693C 4B F9 A4 CD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099A00 00096940 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099A04 00096944 7C 08 03 A6 */ mtlr r0 /* 80099A08 00096948 38 21 00 10 */ addi r1, r1, 0x10 @@ -1882,7 +1882,7 @@ lbl_80098F68: /* 80099BA0 00096AE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099BA4 00096AE4 38 63 00 CC */ addi r3, r3, 0xcc /* 80099BA8 00096AE8 38 80 00 2A */ li r4, 0x2a -/* 80099BAC 00096AEC 4B F9 A3 1D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099BAC 00096AEC 4B F9 A3 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099BB0 00096AF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099BB4 00096AF4 7C 08 03 A6 */ mtlr r0 /* 80099BB8 00096AF8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1894,7 +1894,7 @@ lbl_80098F68: /* 80099BD0 00096B10 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099BD4 00096B14 38 63 00 CC */ addi r3, r3, 0xcc /* 80099BD8 00096B18 38 80 00 2B */ li r4, 0x2b -/* 80099BDC 00096B1C 4B F9 A2 ED */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099BDC 00096B1C 4B F9 A2 ED */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099BE0 00096B20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099BE4 00096B24 7C 08 03 A6 */ mtlr r0 /* 80099BE8 00096B28 38 21 00 10 */ addi r1, r1, 0x10 @@ -1906,7 +1906,7 @@ lbl_80098F68: /* 80099C00 00096B40 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099C04 00096B44 38 63 00 CC */ addi r3, r3, 0xcc /* 80099C08 00096B48 38 80 00 2C */ li r4, 0x2c -/* 80099C0C 00096B4C 4B F9 A2 BD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099C0C 00096B4C 4B F9 A2 BD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099C10 00096B50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099C14 00096B54 7C 08 03 A6 */ mtlr r0 /* 80099C18 00096B58 38 21 00 10 */ addi r1, r1, 0x10 @@ -1935,7 +1935,7 @@ lbl_80098F68: /* 80099C74 00096BB4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099C78 00096BB8 38 63 00 CC */ addi r3, r3, 0xcc /* 80099C7C 00096BBC 38 80 00 2E */ li r4, 0x2e -/* 80099C80 00096BC0 4B F9 A2 49 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099C80 00096BC0 4B F9 A2 49 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099C84 00096BC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099C88 00096BC8 7C 08 03 A6 */ mtlr r0 /* 80099C8C 00096BCC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1960,7 +1960,7 @@ lbl_80098F68: /* 80099CD8 00096C18 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099CDC 00096C1C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099CE0 00096C20 38 80 00 30 */ li r4, 0x30 -/* 80099CE4 00096C24 4B F9 A1 E5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099CE4 00096C24 4B F9 A1 E5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099CE8 00096C28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099CEC 00096C2C 7C 08 03 A6 */ mtlr r0 /* 80099CF0 00096C30 38 21 00 10 */ addi r1, r1, 0x10 @@ -1972,7 +1972,7 @@ lbl_80098F68: /* 80099D08 00096C48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099D0C 00096C4C 38 63 00 CC */ addi r3, r3, 0xcc /* 80099D10 00096C50 38 80 00 31 */ li r4, 0x31 -/* 80099D14 00096C54 4B F9 A1 B5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099D14 00096C54 4B F9 A1 B5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099D18 00096C58 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099D1C 00096C5C 7C 08 03 A6 */ mtlr r0 /* 80099D20 00096C60 38 21 00 10 */ addi r1, r1, 0x10 @@ -2026,7 +2026,7 @@ lbl_80098F68: /* 80099DE0 00096D20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099DE4 00096D24 38 63 00 CC */ addi r3, r3, 0xcc /* 80099DE8 00096D28 38 80 00 3E */ li r4, 0x3e -/* 80099DEC 00096D2C 4B F9 A0 DD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099DEC 00096D2C 4B F9 A0 DD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099DF0 00096D30 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099DF4 00096D34 7C 08 03 A6 */ mtlr r0 /* 80099DF8 00096D38 38 21 00 10 */ addi r1, r1, 0x10 @@ -2038,7 +2038,7 @@ lbl_80098F68: /* 80099E10 00096D50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80099E14 00096D54 38 63 00 CC */ addi r3, r3, 0xcc /* 80099E18 00096D58 38 80 00 3F */ li r4, 0x3f -/* 80099E1C 00096D5C 4B F9 A0 AD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80099E1C 00096D5C 4B F9 A0 AD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80099E20 00096D60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80099E24 00096D64 7C 08 03 A6 */ mtlr r0 /* 80099E28 00096D68 38 21 00 10 */ addi r1, r1, 0x10 @@ -2320,7 +2320,7 @@ lbl_8009A1D8: /* 8009A258 00097198 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A25C 0009719C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A260 000971A0 38 80 00 4F */ li r4, 0x4f -/* 8009A264 000971A4 4B F9 9C 65 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A264 000971A4 4B F9 9C 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A268 000971A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A26C 000971AC 7C 08 03 A6 */ mtlr r0 /* 8009A270 000971B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2332,7 +2332,7 @@ lbl_8009A1D8: /* 8009A288 000971C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A28C 000971CC 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A290 000971D0 38 80 00 50 */ li r4, 0x50 -/* 8009A294 000971D4 4B F9 9C 35 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A294 000971D4 4B F9 9C 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A298 000971D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A29C 000971DC 7C 08 03 A6 */ mtlr r0 /* 8009A2A0 000971E0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2344,7 +2344,7 @@ lbl_8009A1D8: /* 8009A2B8 000971F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A2BC 000971FC 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A2C0 00097200 38 80 00 51 */ li r4, 0x51 -/* 8009A2C4 00097204 4B F9 9C 05 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A2C4 00097204 4B F9 9C 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A2C8 00097208 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A2CC 0009720C 7C 08 03 A6 */ mtlr r0 /* 8009A2D0 00097210 38 21 00 10 */ addi r1, r1, 0x10 @@ -2356,7 +2356,7 @@ lbl_8009A1D8: /* 8009A2E8 00097228 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A2EC 0009722C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A2F0 00097230 38 80 00 53 */ li r4, 0x53 -/* 8009A2F4 00097234 4B F9 9B D5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A2F4 00097234 4B F9 9B D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A2F8 00097238 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A2FC 0009723C 7C 08 03 A6 */ mtlr r0 /* 8009A300 00097240 38 21 00 10 */ addi r1, r1, 0x10 @@ -2709,7 +2709,7 @@ lbl_8009A438: /* 8009A860 000977A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A864 000977A4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A868 000977A8 38 80 00 70 */ li r4, 0x70 -/* 8009A86C 000977AC 4B F9 96 5D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A86C 000977AC 4B F9 96 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A870 000977B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A874 000977B4 7C 08 03 A6 */ mtlr r0 /* 8009A878 000977B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -2721,7 +2721,7 @@ lbl_8009A438: /* 8009A890 000977D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A894 000977D4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A898 000977D8 38 80 00 71 */ li r4, 0x71 -/* 8009A89C 000977DC 4B F9 96 2D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A89C 000977DC 4B F9 96 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A8A0 000977E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A8A4 000977E4 7C 08 03 A6 */ mtlr r0 /* 8009A8A8 000977E8 38 21 00 10 */ addi r1, r1, 0x10 @@ -2733,7 +2733,7 @@ lbl_8009A438: /* 8009A8C0 00097800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A8C4 00097804 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A8C8 00097808 38 80 00 72 */ li r4, 0x72 -/* 8009A8CC 0009780C 4B F9 95 FD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A8CC 0009780C 4B F9 95 FD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A8D0 00097810 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A8D4 00097814 7C 08 03 A6 */ mtlr r0 /* 8009A8D8 00097818 38 21 00 10 */ addi r1, r1, 0x10 @@ -2771,7 +2771,7 @@ lbl_8009A438: /* 8009A958 00097898 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009A95C 0009789C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009A960 000978A0 38 80 00 75 */ li r4, 0x75 -/* 8009A964 000978A4 4B F9 95 65 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009A964 000978A4 4B F9 95 65 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009A968 000978A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009A96C 000978AC 7C 08 03 A6 */ mtlr r0 /* 8009A970 000978B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2863,7 +2863,7 @@ lbl_8009A438: /* 8009AAC8 00097A08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AACC 00097A0C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AAD0 00097A10 38 80 00 7D */ li r4, 0x7d -/* 8009AAD4 00097A14 4B F9 93 F5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AAD4 00097A14 4B F9 93 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AAD8 00097A18 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AADC 00097A1C 7C 08 03 A6 */ mtlr r0 /* 8009AAE0 00097A20 38 21 00 10 */ addi r1, r1, 0x10 @@ -2875,7 +2875,7 @@ lbl_8009A438: /* 8009AAF8 00097A38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AAFC 00097A3C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AB00 00097A40 38 80 00 7E */ li r4, 0x7e -/* 8009AB04 00097A44 4B F9 93 C5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AB04 00097A44 4B F9 93 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AB08 00097A48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AB0C 00097A4C 7C 08 03 A6 */ mtlr r0 /* 8009AB10 00097A50 38 21 00 10 */ addi r1, r1, 0x10 @@ -2887,7 +2887,7 @@ lbl_8009A438: /* 8009AB28 00097A68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AB2C 00097A6C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AB30 00097A70 38 80 00 7F */ li r4, 0x7f -/* 8009AB34 00097A74 4B F9 93 95 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AB34 00097A74 4B F9 93 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AB38 00097A78 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AB3C 00097A7C 7C 08 03 A6 */ mtlr r0 /* 8009AB40 00097A80 38 21 00 10 */ addi r1, r1, 0x10 @@ -3048,7 +3048,7 @@ lbl_8009A438: /* 8009ADAC 00097CEC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009ADB0 00097CF0 38 63 00 CC */ addi r3, r3, 0xcc /* 8009ADB4 00097CF4 38 80 00 A0 */ li r4, 0xa0 -/* 8009ADB8 00097CF8 4B F9 91 11 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009ADB8 00097CF8 4B F9 91 11 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009ADBC 00097CFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009ADC0 00097D00 7C 08 03 A6 */ mtlr r0 /* 8009ADC4 00097D04 38 21 00 10 */ addi r1, r1, 0x10 @@ -3141,7 +3141,7 @@ lbl_8009A438: /* 8009AF20 00097E60 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AF24 00097E64 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AF28 00097E68 38 80 00 C0 */ li r4, 0xc0 -/* 8009AF2C 00097E6C 4B F9 8F 9D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AF2C 00097E6C 4B F9 8F 9D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AF30 00097E70 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AF34 00097E74 7C 08 03 A6 */ mtlr r0 /* 8009AF38 00097E78 38 21 00 10 */ addi r1, r1, 0x10 @@ -3153,7 +3153,7 @@ lbl_8009A438: /* 8009AF50 00097E90 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AF54 00097E94 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AF58 00097E98 38 80 00 C1 */ li r4, 0xc1 -/* 8009AF5C 00097E9C 4B F9 8F 6D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AF5C 00097E9C 4B F9 8F 6D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AF60 00097EA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AF64 00097EA4 7C 08 03 A6 */ mtlr r0 /* 8009AF68 00097EA8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3165,7 +3165,7 @@ lbl_8009A438: /* 8009AF80 00097EC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AF84 00097EC4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AF88 00097EC8 38 80 00 C2 */ li r4, 0xc2 -/* 8009AF8C 00097ECC 4B F9 8F 3D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AF8C 00097ECC 4B F9 8F 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AF90 00097ED0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AF94 00097ED4 7C 08 03 A6 */ mtlr r0 /* 8009AF98 00097ED8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3177,7 +3177,7 @@ lbl_8009A438: /* 8009AFB0 00097EF0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AFB4 00097EF4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AFB8 00097EF8 38 80 00 C3 */ li r4, 0xc3 -/* 8009AFBC 00097EFC 4B F9 8F 0D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AFBC 00097EFC 4B F9 8F 0D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AFC0 00097F00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AFC4 00097F04 7C 08 03 A6 */ mtlr r0 /* 8009AFC8 00097F08 38 21 00 10 */ addi r1, r1, 0x10 @@ -3189,7 +3189,7 @@ lbl_8009A438: /* 8009AFE0 00097F20 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009AFE4 00097F24 38 63 00 CC */ addi r3, r3, 0xcc /* 8009AFE8 00097F28 38 80 00 C4 */ li r4, 0xc4 -/* 8009AFEC 00097F2C 4B F9 8E DD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009AFEC 00097F2C 4B F9 8E DD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009AFF0 00097F30 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009AFF4 00097F34 7C 08 03 A6 */ mtlr r0 /* 8009AFF8 00097F38 38 21 00 10 */ addi r1, r1, 0x10 @@ -3201,7 +3201,7 @@ lbl_8009A438: /* 8009B010 00097F50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B014 00097F54 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B018 00097F58 38 80 00 C5 */ li r4, 0xc5 -/* 8009B01C 00097F5C 4B F9 8E AD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B01C 00097F5C 4B F9 8E AD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B020 00097F60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B024 00097F64 7C 08 03 A6 */ mtlr r0 /* 8009B028 00097F68 38 21 00 10 */ addi r1, r1, 0x10 @@ -3213,7 +3213,7 @@ lbl_8009A438: /* 8009B040 00097F80 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B044 00097F84 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B048 00097F88 38 80 00 C6 */ li r4, 0xc6 -/* 8009B04C 00097F8C 4B F9 8E 7D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B04C 00097F8C 4B F9 8E 7D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B050 00097F90 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B054 00097F94 7C 08 03 A6 */ mtlr r0 /* 8009B058 00097F98 38 21 00 10 */ addi r1, r1, 0x10 @@ -3225,7 +3225,7 @@ lbl_8009A438: /* 8009B070 00097FB0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B074 00097FB4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B078 00097FB8 38 80 00 C7 */ li r4, 0xc7 -/* 8009B07C 00097FBC 4B F9 8E 4D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B07C 00097FBC 4B F9 8E 4D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B080 00097FC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B084 00097FC4 7C 08 03 A6 */ mtlr r0 /* 8009B088 00097FC8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3237,7 +3237,7 @@ lbl_8009A438: /* 8009B0A0 00097FE0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B0A4 00097FE4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B0A8 00097FE8 38 80 00 C8 */ li r4, 0xc8 -/* 8009B0AC 00097FEC 4B F9 8E 1D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B0AC 00097FEC 4B F9 8E 1D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B0B0 00097FF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B0B4 00097FF4 7C 08 03 A6 */ mtlr r0 /* 8009B0B8 00097FF8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3249,7 +3249,7 @@ lbl_8009A438: /* 8009B0D0 00098010 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B0D4 00098014 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B0D8 00098018 38 80 00 C9 */ li r4, 0xc9 -/* 8009B0DC 0009801C 4B F9 8D ED */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B0DC 0009801C 4B F9 8D ED */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B0E0 00098020 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B0E4 00098024 7C 08 03 A6 */ mtlr r0 /* 8009B0E8 00098028 38 21 00 10 */ addi r1, r1, 0x10 @@ -3261,7 +3261,7 @@ lbl_8009A438: /* 8009B100 00098040 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B104 00098044 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B108 00098048 38 80 00 CA */ li r4, 0xca -/* 8009B10C 0009804C 4B F9 8D BD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B10C 0009804C 4B F9 8D BD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B110 00098050 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B114 00098054 7C 08 03 A6 */ mtlr r0 /* 8009B118 00098058 38 21 00 10 */ addi r1, r1, 0x10 @@ -3273,7 +3273,7 @@ lbl_8009A438: /* 8009B130 00098070 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B134 00098074 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B138 00098078 38 80 00 CB */ li r4, 0xcb -/* 8009B13C 0009807C 4B F9 8D 8D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B13C 0009807C 4B F9 8D 8D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B140 00098080 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B144 00098084 7C 08 03 A6 */ mtlr r0 /* 8009B148 00098088 38 21 00 10 */ addi r1, r1, 0x10 @@ -3285,7 +3285,7 @@ lbl_8009A438: /* 8009B160 000980A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B164 000980A4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B168 000980A8 38 80 00 CC */ li r4, 0xcc -/* 8009B16C 000980AC 4B F9 8D 5D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B16C 000980AC 4B F9 8D 5D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B170 000980B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B174 000980B4 7C 08 03 A6 */ mtlr r0 /* 8009B178 000980B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3297,7 +3297,7 @@ lbl_8009A438: /* 8009B190 000980D0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B194 000980D4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B198 000980D8 38 80 00 CD */ li r4, 0xcd -/* 8009B19C 000980DC 4B F9 8D 2D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B19C 000980DC 4B F9 8D 2D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B1A0 000980E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B1A4 000980E4 7C 08 03 A6 */ mtlr r0 /* 8009B1A8 000980E8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3309,7 +3309,7 @@ lbl_8009A438: /* 8009B1C0 00098100 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B1C4 00098104 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B1C8 00098108 38 80 00 CE */ li r4, 0xce -/* 8009B1CC 0009810C 4B F9 8C FD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B1CC 0009810C 4B F9 8C FD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B1D0 00098110 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B1D4 00098114 7C 08 03 A6 */ mtlr r0 /* 8009B1D8 00098118 38 21 00 10 */ addi r1, r1, 0x10 @@ -3321,7 +3321,7 @@ lbl_8009A438: /* 8009B1F0 00098130 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B1F4 00098134 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B1F8 00098138 38 80 00 CF */ li r4, 0xcf -/* 8009B1FC 0009813C 4B F9 8C CD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B1FC 0009813C 4B F9 8C CD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B200 00098140 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B204 00098144 7C 08 03 A6 */ mtlr r0 /* 8009B208 00098148 38 21 00 10 */ addi r1, r1, 0x10 @@ -3333,7 +3333,7 @@ lbl_8009A438: /* 8009B220 00098160 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B224 00098164 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B228 00098168 38 80 00 D0 */ li r4, 0xd0 -/* 8009B22C 0009816C 4B F9 8C 9D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B22C 0009816C 4B F9 8C 9D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B230 00098170 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B234 00098174 7C 08 03 A6 */ mtlr r0 /* 8009B238 00098178 38 21 00 10 */ addi r1, r1, 0x10 @@ -3345,7 +3345,7 @@ lbl_8009A438: /* 8009B250 00098190 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B254 00098194 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B258 00098198 38 80 00 D1 */ li r4, 0xd1 -/* 8009B25C 0009819C 4B F9 8C 6D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B25C 0009819C 4B F9 8C 6D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B260 000981A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B264 000981A4 7C 08 03 A6 */ mtlr r0 /* 8009B268 000981A8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3357,7 +3357,7 @@ lbl_8009A438: /* 8009B280 000981C0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B284 000981C4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B288 000981C8 38 80 00 D2 */ li r4, 0xd2 -/* 8009B28C 000981CC 4B F9 8C 3D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B28C 000981CC 4B F9 8C 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B290 000981D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B294 000981D4 7C 08 03 A6 */ mtlr r0 /* 8009B298 000981D8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3369,7 +3369,7 @@ lbl_8009A438: /* 8009B2B0 000981F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B2B4 000981F4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B2B8 000981F8 38 80 00 D3 */ li r4, 0xd3 -/* 8009B2BC 000981FC 4B F9 8C 0D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B2BC 000981FC 4B F9 8C 0D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B2C0 00098200 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B2C4 00098204 7C 08 03 A6 */ mtlr r0 /* 8009B2C8 00098208 38 21 00 10 */ addi r1, r1, 0x10 @@ -3381,7 +3381,7 @@ lbl_8009A438: /* 8009B2E0 00098220 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B2E4 00098224 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B2E8 00098228 38 80 00 D4 */ li r4, 0xd4 -/* 8009B2EC 0009822C 4B F9 8B DD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B2EC 0009822C 4B F9 8B DD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B2F0 00098230 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B2F4 00098234 7C 08 03 A6 */ mtlr r0 /* 8009B2F8 00098238 38 21 00 10 */ addi r1, r1, 0x10 @@ -3393,7 +3393,7 @@ lbl_8009A438: /* 8009B310 00098250 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B314 00098254 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B318 00098258 38 80 00 D5 */ li r4, 0xd5 -/* 8009B31C 0009825C 4B F9 8B AD */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B31C 0009825C 4B F9 8B AD */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B320 00098260 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B324 00098264 7C 08 03 A6 */ mtlr r0 /* 8009B328 00098268 38 21 00 10 */ addi r1, r1, 0x10 @@ -3405,7 +3405,7 @@ lbl_8009A438: /* 8009B340 00098280 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B344 00098284 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B348 00098288 38 80 00 D6 */ li r4, 0xd6 -/* 8009B34C 0009828C 4B F9 8B 7D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B34C 0009828C 4B F9 8B 7D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B350 00098290 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B354 00098294 7C 08 03 A6 */ mtlr r0 /* 8009B358 00098298 38 21 00 10 */ addi r1, r1, 0x10 @@ -3417,7 +3417,7 @@ lbl_8009A438: /* 8009B370 000982B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B374 000982B4 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B378 000982B8 38 80 00 D7 */ li r4, 0xd7 -/* 8009B37C 000982BC 4B F9 8B 4D */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B37C 000982BC 4B F9 8B 4D */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B380 000982C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B384 000982C4 7C 08 03 A6 */ mtlr r0 /* 8009B388 000982C8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3515,7 +3515,7 @@ lbl_8009A438: /* 8009B4F8 00098438 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B4FC 0009843C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B500 00098440 38 80 00 F4 */ li r4, 0xf4 -/* 8009B504 00098444 4B F9 89 C5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B504 00098444 4B F9 89 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B508 00098448 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B50C 0009844C 7C 08 03 A6 */ mtlr r0 /* 8009B510 00098450 38 21 00 10 */ addi r1, r1, 0x10 @@ -3527,7 +3527,7 @@ lbl_8009A438: /* 8009B528 00098468 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B52C 0009846C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B530 00098470 38 80 00 F5 */ li r4, 0xf5 -/* 8009B534 00098474 4B F9 89 95 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B534 00098474 4B F9 89 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B538 00098478 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B53C 0009847C 7C 08 03 A6 */ mtlr r0 /* 8009B540 00098480 38 21 00 10 */ addi r1, r1, 0x10 @@ -3555,7 +3555,7 @@ lbl_8009A438: /* 8009B598 000984D8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B59C 000984DC 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B5A0 000984E0 38 80 00 F9 */ li r4, 0xf9 -/* 8009B5A4 000984E4 4B F9 89 25 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B5A4 000984E4 4B F9 89 25 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B5A8 000984E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B5AC 000984EC 7C 08 03 A6 */ mtlr r0 /* 8009B5B0 000984F0 38 21 00 10 */ addi r1, r1, 0x10 @@ -3567,7 +3567,7 @@ lbl_8009A438: /* 8009B5C8 00098508 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B5CC 0009850C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B5D0 00098510 38 80 00 FA */ li r4, 0xfa -/* 8009B5D4 00098514 4B F9 88 F5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B5D4 00098514 4B F9 88 F5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B5D8 00098518 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B5DC 0009851C 7C 08 03 A6 */ mtlr r0 /* 8009B5E0 00098520 38 21 00 10 */ addi r1, r1, 0x10 @@ -3579,7 +3579,7 @@ lbl_8009A438: /* 8009B5F8 00098538 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B5FC 0009853C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B600 00098540 38 80 00 FB */ li r4, 0xfb -/* 8009B604 00098544 4B F9 88 C5 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B604 00098544 4B F9 88 C5 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B608 00098548 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B60C 0009854C 7C 08 03 A6 */ mtlr r0 /* 8009B610 00098550 38 21 00 10 */ addi r1, r1, 0x10 @@ -3591,7 +3591,7 @@ lbl_8009A438: /* 8009B628 00098568 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B62C 0009856C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B630 00098570 38 80 00 FC */ li r4, 0xfc -/* 8009B634 00098574 4B F9 88 95 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B634 00098574 4B F9 88 95 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B638 00098578 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009B63C 0009857C 7C 08 03 A6 */ mtlr r0 /* 8009B640 00098580 38 21 00 10 */ addi r1, r1, 0x10 @@ -3745,7 +3745,7 @@ lbl_8009B808: /* 8009B814 00098754 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B818 00098758 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B81C 0009875C 38 80 00 43 */ li r4, 0x43 -/* 8009B820 00098760 4B F9 86 A9 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B820 00098760 4B F9 86 A9 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B824 00098764 2C 03 00 00 */ cmpwi r3, 0 /* 8009B828 00098768 40 82 00 8C */ bne lbl_8009B8B4 /* 8009B82C 0009876C 38 60 00 01 */ li r3, 1 @@ -3759,7 +3759,7 @@ lbl_8009B834: /* 8009B848 00098788 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B84C 0009878C 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B850 00098790 38 80 00 43 */ li r4, 0x43 -/* 8009B854 00098794 4B F9 86 75 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B854 00098794 4B F9 86 75 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B858 00098798 2C 03 00 00 */ cmpwi r3, 0 /* 8009B85C 0009879C 40 82 00 0C */ bne lbl_8009B868 /* 8009B860 000987A0 38 60 00 01 */ li r3, 1 @@ -3790,7 +3790,7 @@ lbl_8009B8B4: /* 8009B8B8 000987F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8009B8BC 000987FC 38 63 00 CC */ addi r3, r3, 0xcc /* 8009B8C0 00098800 38 80 00 50 */ li r4, 0x50 -/* 8009B8C4 00098804 4B F9 86 05 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 8009B8C4 00098804 4B F9 86 05 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 8009B8C8 00098808 2C 03 00 00 */ cmpwi r3, 0 /* 8009B8CC 0009880C 40 82 00 1C */ bne lbl_8009B8E8 /* 8009B8D0 00098810 57 E3 06 3E */ clrlwi r3, r31, 0x18 @@ -3866,7 +3866,7 @@ lbl_8009B9B4: /* 8009B9BC 000988FC 40 82 00 24 */ bne lbl_8009B9E0 /* 8009B9C0 00098900 7F 83 E3 78 */ mr r3, r28 /* 8009B9C4 00098904 7F 24 CB 78 */ mr r4, r25 -/* 8009B9C8 00098908 4B F9 85 B5 */ bl dSv_player_item_record_c_NS_getBombNum +/* 8009B9C8 00098908 4B F9 85 B5 */ bl getBombNum__24dSv_player_item_record_cCFUc /* 8009B9CC 0009890C 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8009B9D0 00098910 56 A0 10 3A */ slwi r0, r21, 2 /* 8009B9D4 00098914 38 61 00 0C */ addi r3, r1, 0xc diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 32527d04e1..95fe922700 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -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 diff --git a/asm/d/d_save.s b/asm/d/d_save.s index 23e9ec976b..9a25dbe74a 100644 --- a/asm/d/d_save.s +++ b/asm/d/d_save.s @@ -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 diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index 98c7ff0997..3a2162c276 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -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 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index 83c4ffc1aa..5799b45dc6 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -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 diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index 18b2a70633..bba01791fe 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -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 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index c1a321c1cf..a90cd2ae2b 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -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: diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 2faebd9104..6bb65ea108 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -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 diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index 8c14de51d0..131b42d273 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -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 diff --git a/asm/d/menu/window/d_menu_window_HIO.s b/asm/d/menu/window/d_menu_window_HIO.s index e633dfcdc7..8f304d0795 100644 --- a/asm/d/menu/window/d_menu_window_HIO.s +++ b/asm/d/menu/window/d_menu_window_HIO.s @@ -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) diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index fd9e0172f5..c1a41a7edb 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -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 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 7ba45ffcbc..db54752d84 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -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 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 1d808a1a59..a71c928972 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -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 diff --git a/asm/d/s/d_s_name.s b/asm/d/s/d_s_name.s index 134da8296d..c2e911d9eb 100644 --- a/asm/d/s/d_s_name.s +++ b/asm/d/s/d_s_name.s @@ -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) diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 6f3cae349c..13db576199 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -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 diff --git a/include/d_save.h b/include/d_save.h index a4e3e97ed9..369ae61159 100644 --- a/include/d_save.h +++ b/include/d_save.h @@ -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 { diff --git a/include/func_80033754.s b/include/func_80033754.s index 533f3de4aa..f146951d9a 100644 --- a/include/func_80033754.s +++ b/include/func_80033754.s @@ -15,7 +15,7 @@ lbl_80033788: /* 80033788 000306C8 7F A3 EB 78 */ mr r3, r29 /* 8003378C 000306CC 38 1B 00 C0 */ addi r0, r27, 0xc0 /* 80033790 000306D0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80033794 000306D4 48 00 07 35 */ bl dSv_player_get_item_c_NS_isFirstBit +/* 80033794 000306D4 48 00 07 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc /* 80033798 000306D8 2C 03 00 00 */ cmpwi r3, 0 /* 8003379C 000306DC 41 82 00 24 */ beq lbl_800337C0 /* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28 diff --git a/include/func_80033828.s b/include/func_80033828.s index cf72d67c4c..89c9cbc35b 100644 --- a/include/func_80033828.s +++ b/include/func_80033828.s @@ -32,7 +32,7 @@ lbl_80033854: /* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800338A4 000307E4 38 63 00 EC */ addi r3, r3, 0xec /* 800338A8 000307E8 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 800338AC 000307EC 48 00 06 C1 */ bl dSv_player_item_record_c_NS_setBombNum +/* 800338AC 000307EC 48 00 06 C1 */ bl setBombNum__24dSv_player_item_record_cFUcUc lbl_800338B0: /* 800338B0 000307F0 3B A0 00 00 */ li r29, 0 /* 800338B4 000307F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/include/func_80033910.s b/include/func_80033910.s index d7af21d355..1b7fc04ed0 100644 --- a/include/func_80033910.s +++ b/include/func_80033910.s @@ -43,7 +43,7 @@ lbl_800339A8: /* 800339B0 000308F0 38 63 00 EC */ addi r3, r3, 0xec /* 800339B4 000308F4 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 800339B8 000308F8 7F 85 E3 78 */ mr r5, r28 -/* 800339BC 000308FC 48 00 05 B1 */ bl dSv_player_item_record_c_NS_setBombNum +/* 800339BC 000308FC 48 00 05 B1 */ bl setBombNum__24dSv_player_item_record_cFUcUc lbl_800339C0: /* 800339C0 00030900 3B A0 00 00 */ li r29, 0 /* 800339C4 00030904 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/include/func_80033B08.s b/include/func_80033B08.s index 595335da0e..7aabbac55d 100644 --- a/include/func_80033B08.s +++ b/include/func_80033B08.s @@ -46,7 +46,7 @@ lbl_80033BAC: /* 80033BB4 00030AF4 38 63 00 EC */ addi r3, r3, 0xec /* 80033BB8 00030AF8 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 80033BBC 00030AFC 7F C5 F3 78 */ mr r5, r30 -/* 80033BC0 00030B00 48 00 03 AD */ bl dSv_player_item_record_c_NS_setBombNum +/* 80033BC0 00030B00 48 00 03 AD */ bl setBombNum__24dSv_player_item_record_cFUcUc /* 80033BC4 00030B04 48 00 00 10 */ b lbl_80033BD4 lbl_80033BC8: /* 80033BC8 00030B08 3B FF 00 01 */ addi r31, r31, 1 diff --git a/include/func_80033D40.s b/include/func_80033D40.s new file mode 100644 index 0000000000..4deea5ca93 --- /dev/null +++ b/include/func_80033D40.s @@ -0,0 +1,73 @@ +/* 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 isFirstBit__21dSv_player_get_item_cCFUc +/* 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 isFirstBit__21dSv_player_get_item_cCFUc +/* 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 isFirstBit__21dSv_player_get_item_cCFUc +/* 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 \ No newline at end of file diff --git a/include/func_80033E60.s b/include/func_80033E60.s new file mode 100644 index 0000000000..bf28fff34e --- /dev/null +++ b/include/func_80033E60.s @@ -0,0 +1,13 @@ +/* 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 \ No newline at end of file diff --git a/include/func_80033E94.s b/include/func_80033E94.s new file mode 100644 index 0000000000..101b943046 --- /dev/null +++ b/include/func_80033E94.s @@ -0,0 +1,13 @@ +/* 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 \ No newline at end of file diff --git a/include/func_80033EC8.s b/include/func_80033EC8.s new file mode 100644 index 0000000000..96e47547e8 --- /dev/null +++ b/include/func_80033EC8.s @@ -0,0 +1,14 @@ +/* 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 \ No newline at end of file diff --git a/include/func_80033F9C.s b/include/func_80033F9C.s new file mode 100644 index 0000000000..f76bf7908d --- /dev/null +++ b/include/func_80033F9C.s @@ -0,0 +1,40 @@ +/* 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 \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 2dc22e44b1..85829220e9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -5,6 +5,7 @@ extern "C" { void dComIfGs_setMixItemIndex(void); void dComIfGs_setSelectItemIndex(void); void dComIfGs_getMixItemIndex(void); + void dComIfGs_getBottleMax(void); char* strcpy(char*,const char*); void func_80362224(void); void func_803621D8(void); @@ -24,8 +25,8 @@ extern "C" { void setBottleItemIn__17dSv_player_item_cFUcUc(void); void getItem__17dSv_player_item_cCFib(void); void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8,u8); - void dSv_player_get_item_c_NS_isFirstBit(void); - void dSv_player_item_record_c_NS_setBombNum(void); + void isFirstBit__21dSv_player_get_item_cCFUc(void); + void setBombNum__24dSv_player_item_record_cFUcUc(void); void dSv_player_item_max_c_NS_getBombNum(void); void setItem__17dSv_player_item_cFiUc(void); } \ No newline at end of file diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 3d0a827e19..ede793cbc2 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -500,7 +500,7 @@ asm void dSv_player_item_c::setWarashibeItem(u8) { void dSv_player_item_c::setRodTypeLevelUp(void) { int current_fishing_rod_item_id = this->items[0x14]; - + switch (current_fishing_rod_item_id) { case ROD_BEE_LARVA: { this->items[0x14] = ROD_CORAL_EARRING_BEE_LARVA; @@ -519,4 +519,91 @@ void dSv_player_item_c::setRodTypeLevelUp(void) { for (int i = 0; i < 4; i++) { dComIfGp_setSelectItem(i); } -} \ No newline at end of file +} + +// this is a few instructions off +// void dSv_player_item_c::setBaitItem(u8 param_1) { +// switch (param_1) { +// case BEE_LARVA: { +// isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING_BEE_LARVA : this->items[0x14] = ROD_BEE_LARVA; +// break; +// } +// case WORM: { +// isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING_WORM : this->items[0x14] = ROD_WORM; +// break; +// } +// case NO_ITEM: { +// isFirstBit(61) ? this->items[0x14] = ROD_CORAL_EARRING : this->items[0x14] = FISHING_ROD; +// break; +// } +// } + +// for (int i = 0; i < 4; i++) { +// dComIfGp_setSelectItem(i); +// } +// } + +asm void dSv_player_item_c::setBaitItem(u8 param_1) { + nofralloc + #include "func_80033D40.s" +} + +void dSv_player_get_item_c::init(void) { + for (int i = 0; i < 8; i++) { + pause_menu_bit_fields[i] = 0; + } +} + +asm void dSv_player_get_item_c::onFirstBit(u8) { + nofralloc + #include "func_80033E60.s" +} + +asm void dSv_player_get_item_c::offFirstBit(u8) { + nofralloc + #include "func_80033E94.s" +} + +asm bool dSv_player_get_item_c::isFirstBit(u8) const { + nofralloc + #include "func_80033EC8.s" +} + +void dSv_player_item_record_c::init(void) { + this->bow = 0; + + for (int i = 0; i < 3; i++) { + this->bomb_bags[i] = 0; + } + + for (int i = 0; i < 4; i++) { + this->bottles[i] = 0; + } + + this->slingshot = 0; + + for (int i = 0; i < 3; i++) { + this->unk5[i] = 0; + } +} + +void dSv_player_item_record_c::setBombNum(u8 bomb_bag_index, u8 bag_id) { + this->bomb_bags[bomb_bag_index] = bag_id; +} + +u8 dSv_player_item_record_c::getBombNum(u8 bomb_bag_index) const { + return this->bomb_bags[bomb_bag_index]; +} + +void dSv_player_item_record_c::setBottleNum(u8 bottle_index, u8 bottle_num) { + this->bottles[bottle_index] = bottle_num; +} + +asm u8 dSv_player_item_record_c::addBottleNum(u8 param_1, short param_2) { + nofralloc + #include "func_80033F9C.s" +} + +u8 dSv_player_item_record_c::getBottleNum(u8 bottle_index) const { + return bottles[bottle_index]; +}