Migrate many functions from d_save.s

This commit is contained in:
unknown
2020-09-13 02:51:05 -04:00
parent a545ed5837
commit 6359c5f82b
256 changed files with 4307 additions and 3864 deletions
+14 -14
View File
@@ -80,7 +80,7 @@ lbl_8021EB20:
/* 8021EB24 0021BA64 38 19 00 0F */ addi r0, r25, 0xf
/* 8021EB28 0021BA68 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 8021EB2C 0021BA6C 38 A0 00 01 */ li r5, 1
/* 8021EB30 0021BA70 4B E1 45 01 */ bl dSv_player_item_c_NS_getItem
/* 8021EB30 0021BA70 4B E1 45 01 */ bl getItem__17dSv_player_item_cCFib
/* 8021EB34 0021BA74 7C 64 1B 78 */ mr r4, r3
/* 8021EB38 0021BA78 7F A3 EB 78 */ mr r3, r29
/* 8021EB3C 0021BA7C 4B E1 55 BD */ bl dSv_player_item_max_c_NS_getBombNum
@@ -1888,7 +1888,7 @@ dMeter2_c_NS_moveOxygen:
/* 80220520 0021D460 7C 08 02 A6 */ mflr r0
/* 80220524 0021D464 90 01 00 44 */ stw r0, 0x44(r1)
/* 80220528 0021D468 39 61 00 40 */ addi r11, r1, 0x40
/* 8022052C 0021D46C 48 14 1C A9 */ bl func_803621D4
/* 8022052C 0021D46C 48 14 1C A9 */ bl _savegpr_27
/* 80220530 0021D470 7C 7E 1B 78 */ mr r30, r3
/* 80220534 0021D474 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80220538 0021D478 3B E3 61 C0 */ addi r31, r3, lbl_804061C0@l
@@ -2120,7 +2120,7 @@ lbl_80220858:
/* 80220868 0021D7A8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8022086C 0021D7AC 90 03 5D E4 */ stw r0, 0x5de4(r3)
/* 80220870 0021D7B0 39 61 00 40 */ addi r11, r1, 0x40
/* 80220874 0021D7B4 48 14 19 AD */ bl func_80362220
/* 80220874 0021D7B4 48 14 19 AD */ bl _restgpr_27
/* 80220878 0021D7B8 80 01 00 44 */ lwz r0, 0x44(r1)
/* 8022087C 0021D7BC 7C 08 03 A6 */ mtlr r0
/* 80220880 0021D7C0 38 21 00 40 */ addi r1, r1, 0x40
@@ -2140,7 +2140,7 @@ dMeter2_c_NS_moveLightDrop:
/* 802208AC 0021D7EC DB 81 00 30 */ stfd f28, 0x30(r1)
/* 802208B0 0021D7F0 F3 81 00 38 */ psq_st f28, 56(r1), 0, qr0
/* 802208B4 0021D7F4 39 61 00 30 */ addi r11, r1, 0x30
/* 802208B8 0021D7F8 48 14 19 1D */ bl func_803621D4
/* 802208B8 0021D7F8 48 14 19 1D */ bl _savegpr_27
/* 802208BC 0021D7FC 7C 7B 1B 78 */ mr r27, r3
/* 802208C0 0021D800 3B A0 00 00 */ li r29, 0
/* 802208C4 0021D804 3B 80 00 00 */ li r28, 0
@@ -2370,7 +2370,7 @@ lbl_80220BF0:
/* 80220C10 0021DB50 E3 81 00 38 */ psq_l f28, 56(r1), 0, qr0
/* 80220C14 0021DB54 CB 81 00 30 */ lfd f28, 0x30(r1)
/* 80220C18 0021DB58 39 61 00 30 */ addi r11, r1, 0x30
/* 80220C1C 0021DB5C 48 14 16 05 */ bl func_80362220
/* 80220C1C 0021DB5C 48 14 16 05 */ bl _restgpr_27
/* 80220C20 0021DB60 80 01 00 74 */ lwz r0, 0x74(r1)
/* 80220C24 0021DB64 7C 08 03 A6 */ mtlr r0
/* 80220C28 0021DB68 38 21 00 70 */ addi r1, r1, 0x70
@@ -5918,12 +5918,12 @@ lbl_80223E3C:
/* 80223E44 00220D84 54 13 06 3E */ clrlwi r19, r0, 0x18
/* 80223E48 00220D88 7E 64 9B 78 */ mr r4, r19
/* 80223E4C 00220D8C 38 A0 00 01 */ li r5, 1
/* 80223E50 00220D90 4B E0 F1 E1 */ bl dSv_player_item_c_NS_getItem
/* 80223E50 00220D90 4B E0 F1 E1 */ bl getItem__17dSv_player_item_cCFib
/* 80223E54 00220D94 7C 7F 1B 78 */ mr r31, r3
/* 80223E58 00220D98 7F 63 DB 78 */ mr r3, r27
/* 80223E5C 00220D9C 7E 64 9B 78 */ mr r4, r19
/* 80223E60 00220DA0 38 A0 00 00 */ li r5, 0
/* 80223E64 00220DA4 4B E0 F1 CD */ bl dSv_player_item_c_NS_getItem
/* 80223E64 00220DA4 4B E0 F1 CD */ bl getItem__17dSv_player_item_cCFib
/* 80223E68 00220DA8 7C 7C 1B 78 */ mr r28, r3
/* 80223E6C 00220DAC 57 E0 06 3E */ clrlwi r0, r31, 0x18
/* 80223E70 00220DB0 28 00 00 FF */ cmplwi r0, 0xff
@@ -6059,7 +6059,7 @@ lbl_80224050:
/* 80224050 00220F90 7F 63 DB 78 */ mr r3, r27
/* 80224054 00220F94 38 97 00 0F */ addi r4, r23, 0xf
/* 80224058 00220F98 38 A0 00 50 */ li r5, 0x50
/* 8022405C 00220F9C 4B E0 EF 5D */ bl dSv_player_item_c_NS_setItem
/* 8022405C 00220F9C 4B E0 EF 5D */ bl setItem__17dSv_player_item_cFiUc
/* 80224060 00220FA0 3A 97 00 0F */ addi r20, r23, 0xf
/* 80224064 00220FA4 9A 9D 5E 7D */ stb r20, 0x5e7d(r29)
/* 80224068 00220FA8 38 00 00 50 */ li r0, 0x50
@@ -6218,7 +6218,7 @@ lbl_80224284:
/* 80224288 002211C8 38 1F 00 0B */ addi r0, r31, 0xb
/* 8022428C 002211CC 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80224290 002211D0 38 A0 00 01 */ li r5, 1
/* 80224294 002211D4 4B E0 ED 9D */ bl dSv_player_item_c_NS_getItem
/* 80224294 002211D4 4B E0 ED 9D */ bl getItem__17dSv_player_item_cCFib
/* 80224298 002211D8 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8022429C 002211DC 28 00 00 76 */ cmplwi r0, 0x76
/* 802242A0 002211E0 40 82 00 90 */ bne lbl_80224330
@@ -6276,7 +6276,7 @@ dMeter2_c_NS_moveArrowNum:
/* 80224358 00221298 7C 08 02 A6 */ mflr r0
/* 8022435C 0022129C 90 01 00 34 */ stw r0, 0x34(r1)
/* 80224360 002212A0 39 61 00 30 */ addi r11, r1, 0x30
/* 80224364 002212A4 48 13 DE 71 */ bl func_803621D4
/* 80224364 002212A4 48 13 DE 71 */ bl _savegpr_27
/* 80224368 002212A8 7C 7E 1B 78 */ mr r30, r3
/* 8022436C 002212AC 3C 60 80 43 */ lis r3, lbl_8042E86C@ha
/* 80224370 002212B0 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l
@@ -6489,7 +6489,7 @@ lbl_80224658:
/* 80224664 002215A4 41 80 FF 30 */ blt lbl_80224594
lbl_80224668:
/* 80224668 002215A8 39 61 00 30 */ addi r11, r1, 0x30
/* 8022466C 002215AC 48 13 DB B5 */ bl func_80362220
/* 8022466C 002215AC 48 13 DB B5 */ bl _restgpr_27
/* 80224670 002215B0 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80224674 002215B4 7C 08 03 A6 */ mtlr r0
/* 80224678 002215B8 38 21 00 30 */ addi r1, r1, 0x30
@@ -6762,7 +6762,7 @@ dMeter2_c_NS_alphaAnimeKantera:
/* 80224A30 00221970 38 63 00 9C */ addi r3, r3, 0x9c
/* 80224A34 00221974 38 80 00 01 */ li r4, 1
/* 80224A38 00221978 38 A0 00 01 */ li r5, 1
/* 80224A3C 0022197C 4B E0 E5 F5 */ bl dSv_player_item_c_NS_getItem
/* 80224A3C 0022197C 4B E0 E5 F5 */ bl getItem__17dSv_player_item_cCFib
/* 80224A40 00221980 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80224A44 00221984 28 00 00 48 */ cmplwi r0, 0x48
/* 80224A48 00221988 40 82 01 2C */ bne lbl_80224B74
@@ -7250,7 +7250,7 @@ dMeter2_c_NS_alphaAnimeButton:
/* 802250F8 00222038 7C 08 02 A6 */ mflr r0
/* 802250FC 0022203C 90 01 00 24 */ stw r0, 0x24(r1)
/* 80225100 00222040 39 61 00 20 */ addi r11, r1, 0x20
/* 80225104 00222044 48 13 D0 D1 */ bl func_803621D4
/* 80225104 00222044 48 13 D0 D1 */ bl _savegpr_27
/* 80225108 00222048 7C 7E 1B 78 */ mr r30, r3
/* 8022510C 0022204C 3B E0 00 00 */ li r31, 0
/* 80225110 00222050 80 83 01 24 */ lwz r4, 0x124(r3)
@@ -7510,7 +7510,7 @@ lbl_8022548C:
/* 802254A0 002223E0 38 80 00 00 */ li r4, 0
/* 802254A4 002223E4 4B FF 32 E5 */ bl dMeter2Draw_c_NS_setAlphaButtonChange
/* 802254A8 002223E8 39 61 00 20 */ addi r11, r1, 0x20
/* 802254AC 002223EC 48 13 CD 75 */ bl func_80362220
/* 802254AC 002223EC 48 13 CD 75 */ bl _restgpr_27
/* 802254B0 002223F0 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802254B4 002223F4 7C 08 03 A6 */ mtlr r0
/* 802254B8 002223F8 38 21 00 20 */ addi r1, r1, 0x20