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
+19 -19
View File
@@ -1101,7 +1101,7 @@ lbl_802022E8:
/* 802022FC 001FF23C 48 0F E3 5D */ bl J2DTextBox_NS_getStringPtr
/* 80202300 001FF240 7C 64 1B 78 */ mr r4, r3
/* 80202304 001FF244 38 61 00 E0 */ addi r3, r1, 0xe0
/* 80202308 001FF248 48 16 68 25 */ bl func_80368B2C
/* 80202308 001FF248 48 16 68 25 */ bl strcpy
/* 8020230C 001FF24C 80 7E 00 14 */ lwz r3, 0x14(r30)
/* 80202310 001FF250 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2)
/* 80202314 001FF254 FC 40 08 90 */ fmr f2, f1
@@ -1131,7 +1131,7 @@ lbl_802022E8:
/* 80202374 001FF2B4 80 63 00 04 */ lwz r3, 4(r3)
/* 80202378 001FF2B8 48 0F E2 E1 */ bl J2DTextBox_NS_getStringPtr
/* 8020237C 001FF2BC 38 81 00 E0 */ addi r4, r1, 0xe0
/* 80202380 001FF2C0 48 16 67 AD */ bl func_80368B2C
/* 80202380 001FF2C0 48 16 67 AD */ bl strcpy
lbl_80202384:
/* 80202384 001FF2C4 3B 60 00 00 */ li r27, 0
/* 80202388 001FF2C8 3B 40 00 00 */ li r26, 0
@@ -1623,7 +1623,7 @@ dMeterButton_c_NS__delete:
/* 80202AA0 001FF9E0 7C 08 02 A6 */ mflr r0
/* 80202AA4 001FF9E4 90 01 00 24 */ stw r0, 0x24(r1)
/* 80202AA8 001FF9E8 39 61 00 20 */ addi r11, r1, 0x20
/* 80202AAC 001FF9EC 48 15 F7 29 */ bl func_803621D4
/* 80202AAC 001FF9EC 48 15 F7 29 */ bl _savegpr_27
/* 80202AB0 001FF9F0 7C 7F 1B 78 */ mr r31, r3
/* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l
@@ -2203,7 +2203,7 @@ lbl_80203284:
/* 802032A4 002001E4 4E 80 04 21 */ bctrl
/* 802032A8 002001E8 38 60 00 01 */ li r3, 1
/* 802032AC 002001EC 39 61 00 20 */ addi r11, r1, 0x20
/* 802032B0 002001F0 48 15 EF 71 */ bl func_80362220
/* 802032B0 002001F0 48 15 EF 71 */ bl _restgpr_27
/* 802032B4 002001F4 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802032B8 002001F8 7C 08 03 A6 */ mtlr r0
/* 802032BC 002001FC 38 21 00 20 */ addi r1, r1, 0x20
@@ -4272,7 +4272,7 @@ lbl_80204F20:
/* 80204F54 00201E94 38 63 00 9C */ addi r3, r3, 0x9c
/* 80204F58 00201E98 38 80 00 14 */ li r4, 0x14
/* 80204F5C 00201E9C 38 A0 00 00 */ li r5, 0
/* 80204F60 00201EA0 4B E2 E0 D1 */ bl dSv_player_item_c_NS_getItem
/* 80204F60 00201EA0 4B E2 E0 D1 */ bl getItem__17dSv_player_item_cCFib
/* 80204F64 00201EA4 7C 79 1B 78 */ mr r25, r3
/* 80204F68 00201EA8 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l
@@ -4375,7 +4375,7 @@ lbl_802050E0:
/* 802050E0 00202020 38 7C 01 14 */ addi r3, r28, 0x114
/* 802050E4 00202024 7C 7F 1A 14 */ add r3, r31, r3
/* 802050E8 00202028 38 99 00 21 */ addi r4, r25, 0x21
/* 802050EC 0020202C 48 16 3A 41 */ bl func_80368B2C
/* 802050EC 0020202C 48 16 3A 41 */ bl strcpy
/* 802050F0 00202030 7C 7F EA 14 */ add r3, r31, r29
/* 802050F4 00202034 D3 E3 02 E8 */ stfs f31, 0x2e8(r3)
/* 802050F8 00202038 7C 9F C2 14 */ add r4, r31, r24
@@ -5158,7 +5158,7 @@ dMeterButton_c_NS_updateButton:
/* 80205CBC 00202BFC DB A1 00 20 */ stfd f29, 0x20(r1)
/* 80205CC0 00202C00 F3 A1 00 28 */ psq_st f29, 40(r1), 0, qr0
/* 80205CC4 00202C04 39 61 00 20 */ addi r11, r1, 0x20
/* 80205CC8 00202C08 48 15 C5 0D */ bl func_803621D4
/* 80205CC8 00202C08 48 15 C5 0D */ bl _savegpr_27
/* 80205CCC 00202C0C 7C 7D 1B 78 */ mr r29, r3
/* 80205CD0 00202C10 C3 E2 AD 48 */ lfs f31, lbl_80454748-_SDA2_BASE_(r2)
/* 80205CD4 00202C14 FF C0 F8 90 */ fmr f30, f31
@@ -6033,7 +6033,7 @@ lbl_80206948:
/* 80206958 00203898 E3 A1 00 28 */ psq_l f29, 40(r1), 0, qr0
/* 8020695C 0020389C CB A1 00 20 */ lfd f29, 0x20(r1)
/* 80206960 002038A0 39 61 00 20 */ addi r11, r1, 0x20
/* 80206964 002038A4 48 15 B8 BD */ bl func_80362220
/* 80206964 002038A4 48 15 B8 BD */ bl _restgpr_27
/* 80206968 002038A8 80 01 00 54 */ lwz r0, 0x54(r1)
/* 8020696C 002038AC 7C 08 03 A6 */ mtlr r0
/* 80206970 002038B0 38 21 00 50 */ addi r1, r1, 0x50
@@ -6047,7 +6047,7 @@ dMeterButton_c_NS_updateText:
/* 80206984 002038C4 DB E1 06 50 */ stfd f31, 0x650(r1)
/* 80206988 002038C8 F3 E1 06 58 */ psq_st f31, 1624(r1), 0, qr0
/* 8020698C 002038CC 39 61 06 50 */ addi r11, r1, 0x650
/* 80206990 002038D0 48 15 B8 45 */ bl func_803621D4
/* 80206990 002038D0 48 15 B8 45 */ bl _savegpr_27
/* 80206994 002038D4 7C 7E 1B 78 */ mr r30, r3
/* 80206998 002038D8 7C 9F 23 78 */ mr r31, r4
/* 8020699C 002038DC 3C 60 80 43 */ lis r3, lbl_80430188@ha
@@ -6129,12 +6129,12 @@ lbl_80206A74:
/* 80206AC0 00203A00 80 63 00 04 */ lwz r3, 4(r3)
/* 80206AC4 00203A04 48 0F 9B 95 */ bl J2DTextBox_NS_getStringPtr
/* 80206AC8 00203A08 38 81 04 28 */ addi r4, r1, 0x428
/* 80206ACC 00203A0C 48 16 20 61 */ bl func_80368B2C
/* 80206ACC 00203A0C 48 16 20 61 */ bl strcpy
/* 80206AD0 00203A10 80 7E 00 E8 */ lwz r3, 0xe8(r30)
/* 80206AD4 00203A14 80 63 00 04 */ lwz r3, 4(r3)
/* 80206AD8 00203A18 48 0F 9B 81 */ bl J2DTextBox_NS_getStringPtr
/* 80206ADC 00203A1C 38 81 00 28 */ addi r4, r1, 0x28
/* 80206AE0 00203A20 48 16 20 4D */ bl func_80368B2C
/* 80206AE0 00203A20 48 16 20 4D */ bl strcpy
/* 80206AE4 00203A24 3B 60 00 00 */ li r27, 0
/* 80206AE8 00203A28 3B A0 00 00 */ li r29, 0
lbl_80206AEC:
@@ -6145,7 +6145,7 @@ lbl_80206AEC:
/* 80206AFC 00203A3C 80 63 00 04 */ lwz r3, 4(r3)
/* 80206B00 00203A40 48 0F 9B 59 */ bl J2DTextBox_NS_getStringPtr
/* 80206B04 00203A44 38 81 02 28 */ addi r4, r1, 0x228
/* 80206B08 00203A48 48 16 20 25 */ bl func_80368B2C
/* 80206B08 00203A48 48 16 20 25 */ bl strcpy
lbl_80206B0C:
/* 80206B0C 00203A4C 3B 7B 00 01 */ addi r27, r27, 1
/* 80206B10 00203A50 2C 1B 00 02 */ cmpwi r27, 2
@@ -6271,7 +6271,7 @@ lbl_80206CC0:
/* 80206CC0 00203C00 E3 E1 06 58 */ psq_l f31, 1624(r1), 0, qr0
/* 80206CC4 00203C04 CB E1 06 50 */ lfd f31, 0x650(r1)
/* 80206CC8 00203C08 39 61 06 50 */ addi r11, r1, 0x650
/* 80206CCC 00203C0C 48 15 B5 55 */ bl func_80362220
/* 80206CCC 00203C0C 48 15 B5 55 */ bl _restgpr_27
/* 80206CD0 00203C10 80 01 06 64 */ lwz r0, 0x664(r1)
/* 80206CD4 00203C14 7C 08 03 A6 */ mtlr r0
/* 80206CD8 00203C18 38 21 06 60 */ addi r1, r1, 0x660
@@ -9669,7 +9669,7 @@ lbl_80209BDC:
lbl_80209C1C:
/* 80209C1C 00206B5C 7F C3 F3 78 */ mr r3, r30
/* 80209C20 00206B60 7F 44 D3 78 */ mr r4, r26
/* 80209C24 00206B64 48 15 EF 09 */ bl func_80368B2C
/* 80209C24 00206B64 48 15 EF 09 */ bl strcpy
/* 80209C28 00206B68 57 80 06 3F */ clrlwi. r0, r28, 0x18
/* 80209C2C 00206B6C 40 82 00 58 */ bne lbl_80209C84
/* 80209C30 00206B70 57 A0 06 3F */ clrlwi. r0, r29, 0x18
@@ -9690,7 +9690,7 @@ lbl_80209C5C:
/* 80209C60 00206BA0 7C 79 00 2E */ lwzx r3, r25, r0
/* 80209C64 00206BA4 48 0F 69 F5 */ bl J2DTextBox_NS_getStringPtr
/* 80209C68 00206BA8 7F 44 D3 78 */ mr r4, r26
/* 80209C6C 00206BAC 48 15 EE C1 */ bl func_80368B2C
/* 80209C6C 00206BAC 48 15 EE C1 */ bl strcpy
/* 80209C70 00206BB0 3B 9C 00 01 */ addi r28, r28, 1
/* 80209C74 00206BB4 2C 1C 00 05 */ cmpwi r28, 5
/* 80209C78 00206BB8 3B 7B 00 04 */ addi r27, r27, 4
@@ -9715,7 +9715,7 @@ lbl_80209CB0:
/* 80209CB4 00206BF4 7C 79 00 2E */ lwzx r3, r25, r0
/* 80209CB8 00206BF8 48 0F 69 A1 */ bl J2DTextBox_NS_getStringPtr
/* 80209CBC 00206BFC 7F 44 D3 78 */ mr r4, r26
/* 80209CC0 00206C00 48 15 EE 6D */ bl func_80368B2C
/* 80209CC0 00206C00 48 15 EE 6D */ bl strcpy
/* 80209CC4 00206C04 3B 9C 00 01 */ addi r28, r28, 1
/* 80209CC8 00206C08 2C 1C 00 05 */ cmpwi r28, 5
/* 80209CCC 00206C0C 3B 7B 00 04 */ addi r27, r27, 4
@@ -10581,7 +10581,7 @@ dMeterButton_c_NS_hide_button:
/* 8020A9B0 002078F0 3C 80 80 3A */ lis r4, lbl_803980E8@ha
/* 8020A9B4 002078F4 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l
/* 8020A9B8 002078F8 38 84 00 21 */ addi r4, r4, 0x21
/* 8020A9BC 002078FC 48 15 E1 71 */ bl func_80368B2C
/* 8020A9BC 002078FC 48 15 E1 71 */ bl strcpy
/* 8020A9C0 00207900 80 7F 00 7C */ lwz r3, 0x7c(r31)
/* 8020A9C4 00207904 A8 03 00 16 */ lha r0, 0x16(r3)
/* 8020A9C8 00207908 80 7F 00 78 */ lwz r3, 0x78(r31)
@@ -10610,7 +10610,7 @@ lbl_8020AA08:
/* 8020AA20 00207960 3C 80 80 3A */ lis r4, lbl_803980E8@ha
/* 8020AA24 00207964 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l
/* 8020AA28 00207968 38 84 00 21 */ addi r4, r4, 0x21
/* 8020AA2C 0020796C 48 15 E1 01 */ bl func_80368B2C
/* 8020AA2C 0020796C 48 15 E1 01 */ bl strcpy
/* 8020AA30 00207970 48 00 00 40 */ b lbl_8020AA70
lbl_8020AA34:
/* 8020AA34 00207974 88 1F 04 BF */ lbz r0, 0x4bf(r31)
@@ -10627,7 +10627,7 @@ lbl_8020AA34:
/* 8020AA60 002079A0 3C 80 80 3A */ lis r4, lbl_803980E8@ha
/* 8020AA64 002079A4 38 84 80 E8 */ addi r4, r4, lbl_803980E8@l
/* 8020AA68 002079A8 38 84 00 21 */ addi r4, r4, 0x21
/* 8020AA6C 002079AC 48 15 E0 C1 */ bl func_80368B2C
/* 8020AA6C 002079AC 48 15 E0 C1 */ bl strcpy
lbl_8020AA70:
/* 8020AA70 002079B0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8020AA74 002079B4 80 01 00 14 */ lwz r0, 0x14(r1)
+4 -4
View File
@@ -67,7 +67,7 @@ lbl_8020C3E4:
/* 8020C404 00209344 7C 08 02 A6 */ mflr r0
/* 8020C408 00209348 90 01 00 24 */ stw r0, 0x24(r1)
/* 8020C40C 0020934C 39 61 00 20 */ addi r11, r1, 0x20
/* 8020C410 00209350 48 15 5D C5 */ bl func_803621D4
/* 8020C410 00209350 48 15 5D C5 */ bl _savegpr_27
/* 8020C414 00209354 7C 7F 1B 78 */ mr r31, r3
/* 8020C418 00209358 3B 60 00 00 */ li r27, 0
/* 8020C41C 0020935C 3B C0 00 00 */ li r30, 0
@@ -327,7 +327,7 @@ lbl_8020C720:
/* 8020C7E8 00209728 D0 1F 00 FC */ stfs f0, 0xfc(r31)
/* 8020C7EC 0020972C 38 60 00 04 */ li r3, 4
/* 8020C7F0 00209730 39 61 00 20 */ addi r11, r1, 0x20
/* 8020C7F4 00209734 48 15 5A 2D */ bl func_80362220
/* 8020C7F4 00209734 48 15 5A 2D */ bl _restgpr_27
/* 8020C7F8 00209738 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8020C7FC 0020973C 7C 08 03 A6 */ mtlr r0
/* 8020C800 00209740 38 21 00 20 */ addi r1, r1, 0x20
@@ -517,7 +517,7 @@ lbl_8020CA94:
/* 8020CAC0 00209A00 7C 08 02 A6 */ mflr r0
/* 8020CAC4 00209A04 90 01 00 24 */ stw r0, 0x24(r1)
/* 8020CAC8 00209A08 39 61 00 20 */ addi r11, r1, 0x20
/* 8020CACC 00209A0C 48 15 57 09 */ bl func_803621D4
/* 8020CACC 00209A0C 48 15 57 09 */ bl _savegpr_27
/* 8020CAD0 00209A10 7C 7F 1B 78 */ mr r31, r3
/* 8020CAD4 00209A14 3B 60 00 00 */ li r27, 0
/* 8020CAD8 00209A18 3B C0 00 00 */ li r30, 0
@@ -619,7 +619,7 @@ lbl_8020CC34:
/* 8020CC38 00209B78 90 1F 00 34 */ stw r0, 0x34(r31)
/* 8020CC3C 00209B7C 38 60 00 01 */ li r3, 1
/* 8020CC40 00209B80 39 61 00 20 */ addi r11, r1, 0x20
/* 8020CC44 00209B84 48 15 55 DD */ bl func_80362220
/* 8020CC44 00209B84 48 15 55 DD */ bl _restgpr_27
/* 8020CC48 00209B88 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8020CC4C 00209B8C 7C 08 03 A6 */ mtlr r0
/* 8020CC50 00209B90 38 21 00 20 */ addi r1, r1, 0x20
+4 -4
View File
@@ -412,7 +412,7 @@ dMeterMap_c_NS__create:
/* 8020D9F0 0020A930 7C 08 02 A6 */ mflr r0
/* 8020D9F4 0020A934 90 01 00 34 */ stw r0, 0x34(r1)
/* 8020D9F8 0020A938 39 61 00 30 */ addi r11, r1, 0x30
/* 8020D9FC 0020A93C 48 15 47 D9 */ bl func_803621D4
/* 8020D9FC 0020A93C 48 15 47 D9 */ bl _savegpr_27
/* 8020DA00 0020A940 7C 7F 1B 78 */ mr r31, r3
/* 8020DA04 0020A944 4B FF FB 25 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo
/* 8020DA08 0020A948 4B FF FB 21 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo
@@ -570,7 +570,7 @@ lbl_8020DC08:
/* 8020DC30 0020AB70 4B E2 6D 8D */ bl dSv_event_c_NS_isEventBit
/* 8020DC34 0020AB74 98 7F 00 2B */ stb r3, 0x2b(r31)
/* 8020DC38 0020AB78 39 61 00 30 */ addi r11, r1, 0x30
/* 8020DC3C 0020AB7C 48 15 45 E5 */ bl func_80362220
/* 8020DC3C 0020AB7C 48 15 45 E5 */ bl _restgpr_27
/* 8020DC40 0020AB80 80 01 00 34 */ lwz r0, 0x34(r1)
/* 8020DC44 0020AB84 7C 08 03 A6 */ mtlr r0
/* 8020DC48 0020AB88 38 21 00 30 */ addi r1, r1, 0x30
@@ -626,7 +626,7 @@ dMeterMap_c_NS__move:
/* 8020DCE8 0020AC28 7C 08 02 A6 */ mflr r0
/* 8020DCEC 0020AC2C 90 01 00 44 */ stw r0, 0x44(r1)
/* 8020DCF0 0020AC30 39 61 00 40 */ addi r11, r1, 0x40
/* 8020DCF4 0020AC34 48 15 44 E5 */ bl func_803621D8
/* 8020DCF4 0020AC34 48 15 44 E5 */ bl _savegpr_28
/* 8020DCF8 0020AC38 7C 7E 1B 78 */ mr r30, r3
/* 8020DCFC 0020AC3C 7C 9F 23 78 */ mr r31, r4
/* 8020DD00 0020AC40 88 03 00 2B */ lbz r0, 0x2b(r3)
@@ -765,7 +765,7 @@ lbl_8020DE6C:
/* 8020DEFC 0020AE3C 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8020DF00 0020AE40 90 1E 00 30 */ stw r0, 0x30(r30)
/* 8020DF04 0020AE44 39 61 00 40 */ addi r11, r1, 0x40
/* 8020DF08 0020AE48 48 15 43 1D */ bl func_80362224
/* 8020DF08 0020AE48 48 15 43 1D */ bl _restgpr_28
/* 8020DF0C 0020AE4C 80 01 00 44 */ lwz r0, 0x44(r1)
/* 8020DF10 0020AE50 7C 08 03 A6 */ mtlr r0
/* 8020DF14 0020AE54 38 21 00 40 */ addi r1, r1, 0x40
+2 -2
View File
@@ -585,7 +585,7 @@ dMeterString_c_NS_createString:
/* 8020F5F4 0020C534 4E 80 04 21 */ bctrl
/* 8020F5F8 0020C538 48 0F 10 61 */ bl J2DTextBox_NS_getStringPtr
/* 8020F5FC 0020C53C 38 81 00 08 */ addi r4, r1, 8
/* 8020F600 0020C540 48 15 95 2D */ bl func_80368B2C
/* 8020F600 0020C540 48 15 95 2D */ bl strcpy
/* 8020F604 0020C544 80 7E 00 04 */ lwz r3, 4(r30)
/* 8020F608 0020C548 3C 80 74 5F */ lis r4, 0x745F696E@ha
/* 8020F60C 0020C54C 38 C4 69 6E */ addi r6, r4, 0x745F696E@l
@@ -596,7 +596,7 @@ dMeterString_c_NS_createString:
/* 8020F620 0020C560 4E 80 04 21 */ bctrl
/* 8020F624 0020C564 48 0F 10 35 */ bl J2DTextBox_NS_getStringPtr
/* 8020F628 0020C568 38 81 00 08 */ addi r4, r1, 8
/* 8020F62C 0020C56C 48 15 95 01 */ bl func_80368B2C
/* 8020F62C 0020C56C 48 15 95 01 */ bl strcpy
/* 8020F630 0020C570 C0 02 AE 78 */ lfs f0, lbl_80454878-_SDA2_BASE_(r2)
/* 8020F634 0020C574 D0 1E 00 2C */ stfs f0, 0x2c(r30)
/* 8020F638 0020C578 C0 02 AE 64 */ lfs f0, lbl_80454864-_SDA2_BASE_(r2)