mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
Fixed _savegpr etc. (#54)
* renamed func_XXX to _savegpr_XX * renamed func_XXX to _restgpr_XX * renamed func_XXX to _savefpr_XX * renamed func_XXX to _restfpr_XX * cleanup functions.h and moved intrisics to mwcc.h * formatting * cleanup functions.h * fix bad-formatting from master Co-authored-by: Julgodis <>
This commit is contained in:
co-authored by
Julgodis <>
parent
609891bc25
commit
d2e9db3748
@@ -3,6 +3,6 @@
|
||||
|
||||
#include "global.h"
|
||||
|
||||
class J2DPicture{};
|
||||
class J2DPicture {};
|
||||
|
||||
#endif
|
||||
@@ -3,6 +3,6 @@
|
||||
|
||||
#include "global.h"
|
||||
|
||||
class J2DTextBox{};
|
||||
class J2DTextBox {};
|
||||
|
||||
#endif
|
||||
@@ -177,7 +177,7 @@ lbl_802D2590:
|
||||
/* 802D2598 002CF4D8 93 FC 00 00 */ stw r31, 0(r28)
|
||||
lbl_802D259C:
|
||||
/* 802D259C 002CF4DC 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 802D25A0 002CF4E0 48 08 FC 71 */ bl func_80362210
|
||||
/* 802D25A0 002CF4E0 48 08 FC 71 */ bl _restgpr_23
|
||||
/* 802D25A4 002CF4E4 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 802D25A8 002CF4E8 7C 08 03 A6 */ mtlr r0
|
||||
/* 802D25AC 002CF4EC 38 21 00 30 */ addi r1, r1, 0x30
|
||||
|
||||
@@ -172,7 +172,7 @@ lbl_802D2814:
|
||||
/* 802D2814 002CF754 7F 43 D3 78 */ mr r3, r26
|
||||
lbl_802D2818:
|
||||
/* 802D2818 002CF758 39 61 00 70 */ addi r11, r1, 0x70
|
||||
/* 802D281C 002CF75C 48 08 F9 F1 */ bl func_8036220C
|
||||
/* 802D281C 002CF75C 48 08 F9 F1 */ bl _restgpr_22
|
||||
/* 802D2820 002CF760 80 01 00 74 */ lwz r0, 0x74(r1)
|
||||
/* 802D2824 002CF764 7C 08 03 A6 */ mtlr r0
|
||||
/* 802D2828 002CF768 38 21 00 70 */ addi r1, r1, 0x70
|
||||
|
||||
@@ -177,7 +177,7 @@ lbl_802DB3BC:
|
||||
/* 802DB3CC 002D830C 38 60 00 00 */ li r3, 0
|
||||
lbl_802DB3D0:
|
||||
/* 802DB3D0 002D8310 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 802DB3D4 002D8314 48 08 6E 3D */ bl func_80362210
|
||||
/* 802DB3D4 002D8314 48 08 6E 3D */ bl _restgpr_23
|
||||
/* 802DB3D8 002D8318 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 802DB3DC 002D831C 7C 08 03 A6 */ mtlr r0
|
||||
/* 802DB3E0 002D8320 38 21 00 30 */ addi r1, r1, 0x30
|
||||
|
||||
@@ -44,7 +44,7 @@ lbl_802D9C00:
|
||||
/* 802D9C38 002D6B78 7F E3 FB 78 */ mr r3, r31
|
||||
lbl_802D9C3C:
|
||||
/* 802D9C3C 002D6B7C 39 61 01 30 */ addi r11, r1, 0x130
|
||||
/* 802D9C40 002D6B80 48 08 85 D1 */ bl func_80362210
|
||||
/* 802D9C40 002D6B80 48 08 85 D1 */ bl _restgpr_23
|
||||
/* 802D9C44 002D6B84 80 01 01 34 */ lwz r0, 0x134(r1)
|
||||
/* 802D9C48 002D6B88 7C 08 03 A6 */ mtlr r0
|
||||
/* 802D9C4C 002D6B8C 38 21 01 30 */ addi r1, r1, 0x130
|
||||
|
||||
@@ -44,7 +44,7 @@ lbl_802D9CBC:
|
||||
/* 802D9CF4 002D6C34 7F E3 FB 78 */ mr r3, r31
|
||||
lbl_802D9CF8:
|
||||
/* 802D9CF8 002D6C38 39 61 01 30 */ addi r11, r1, 0x130
|
||||
/* 802D9CFC 002D6C3C 48 08 85 15 */ bl func_80362210
|
||||
/* 802D9CFC 002D6C3C 48 08 85 15 */ bl _restgpr_23
|
||||
/* 802D9D00 002D6C40 80 01 01 34 */ lwz r0, 0x134(r1)
|
||||
/* 802D9D04 002D6C44 7C 08 03 A6 */ mtlr r0
|
||||
/* 802D9D08 002D6C48 38 21 01 30 */ addi r1, r1, 0x130
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/* 802D9D14 002D6C54 7C 08 02 A6 */ mflr r0
|
||||
/* 802D9D18 002D6C58 90 01 00 C4 */ stw r0, 0xc4(r1)
|
||||
/* 802D9D1C 002D6C5C 39 61 00 C0 */ addi r11, r1, 0xc0
|
||||
/* 802D9D20 002D6C60 48 08 84 91 */ bl func_803621B0
|
||||
/* 802D9D20 002D6C60 48 08 84 91 */ bl _savegpr_18
|
||||
/* 802D9D24 002D6C64 7C 76 1B 78 */ mr r22, r3
|
||||
/* 802D9D28 002D6C68 7C 9C 23 78 */ mr r28, r4
|
||||
/* 802D9D2C 002D6C6C 7C B5 2B 78 */ mr r21, r5
|
||||
@@ -350,7 +350,7 @@ lbl_802DA1C8:
|
||||
/* 802DA1C8 002D7108 38 60 00 00 */ li r3, 0
|
||||
lbl_802DA1CC:
|
||||
/* 802DA1CC 002D710C 39 61 00 C0 */ addi r11, r1, 0xc0
|
||||
/* 802DA1D0 002D7110 48 08 80 2D */ bl func_803621FC
|
||||
/* 802DA1D0 002D7110 48 08 80 2D */ bl _restgpr_18
|
||||
/* 802DA1D4 002D7114 80 01 00 C4 */ lwz r0, 0xc4(r1)
|
||||
/* 802DA1D8 002D7118 7C 08 03 A6 */ mtlr r0
|
||||
/* 802DA1DC 002D711C 38 21 00 C0 */ addi r1, r1, 0xc0
|
||||
|
||||
@@ -189,7 +189,7 @@ lbl_802E0B9C:
|
||||
/* 802E0B9C 002DDADC 48 00 04 09 */ bl checkResetSwitch__10JUTGamePadFv
|
||||
/* 802E0BA0 002DDAE0 80 6D 8F 60 */ lwz r3, _sRumbleSupported-_SDA_BASE_(r13)
|
||||
/* 802E0BA4 002DDAE4 39 61 00 40 */ addi r11, r1, 0x40
|
||||
/* 802E0BA8 002DDAE8 48 08 16 65 */ bl func_8036220C
|
||||
/* 802E0BA8 002DDAE8 48 08 16 65 */ bl _restgpr_22
|
||||
/* 802E0BAC 002DDAEC 80 01 00 44 */ lwz r0, 0x44(r1)
|
||||
/* 802E0BB0 002DDAF0 7C 08 03 A6 */ mtlr r0
|
||||
/* 802E0BB4 002DDAF4 38 21 00 40 */ addi r1, r1, 0x40
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#ifndef __C_CC_S_H_
|
||||
#define __C_CC_S_H_
|
||||
|
||||
#include "global.h"
|
||||
#include "SComponent/c_cc_d/c_cc_d.h"
|
||||
#include "global.h"
|
||||
|
||||
class cCcS {
|
||||
public:
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/* 802B6B04 002B3A44 DB E1 02 80 */ stfd f31, 0x280(r1)
|
||||
/* 802B6B08 002B3A48 F3 E1 02 88 */ psq_st f31, 648(r1), 0, 0
|
||||
/* 802B6B0C 002B3A4C 39 61 02 80 */ addi r11, r1, 0x280
|
||||
/* 802B6B10 002B3A50 48 0A B6 99 */ bl func_803621A8
|
||||
/* 802B6B10 002B3A50 48 0A B6 99 */ bl _savegpr_16
|
||||
/* 802B6B14 002B3A54 7C 7B 1B 78 */ mr r27, r3
|
||||
/* 802B6B18 002B3A58 7C 92 23 78 */ mr r18, r4
|
||||
/* 802B6B1C 002B3A5C 7C BA 2B 78 */ mr r26, r5
|
||||
@@ -3191,7 +3191,7 @@ lbl_802B9938:
|
||||
/* 802B993C 002B687C E3 E1 02 88 */ psq_l f31, 648(r1), 0, 0
|
||||
/* 802B9940 002B6880 CB E1 02 80 */ lfd f31, 0x280(r1)
|
||||
/* 802B9944 002B6884 39 61 02 80 */ addi r11, r1, 0x280
|
||||
/* 802B9948 002B6888 48 0A 88 AD */ bl func_803621F4
|
||||
/* 802B9948 002B6888 48 0A 88 AD */ bl _restgpr_16
|
||||
/* 802B994C 002B688C 80 01 02 94 */ lwz r0, 0x294(r1)
|
||||
/* 802B9950 002B6890 7C 08 03 A6 */ mtlr r0
|
||||
/* 802B9954 002B6894 38 21 02 90 */ addi r1, r1, 0x290
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/* 8009F060 0009BFA0 DB 61 01 30 */ stfd f27, 0x130(r1)
|
||||
/* 8009F064 0009BFA4 F3 61 01 38 */ psq_st f27, 312(r1), 0, 0
|
||||
/* 8009F068 0009BFA8 39 61 01 30 */ addi r11, r1, 0x130
|
||||
/* 8009F06C 0009BFAC 48 2C 31 4D */ bl func_803621B8
|
||||
/* 8009F06C 0009BFAC 48 2C 31 4D */ bl _savegpr_20
|
||||
/* 8009F070 0009BFB0 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 8009F074 0009BFB4 80 63 20 60 */ lwz r3, 0x2060(r3)
|
||||
/* 8009F078 0009BFB8 88 03 00 00 */ lbz r0, 0(r3)
|
||||
@@ -1099,7 +1099,7 @@ lbl_8009FFB8:
|
||||
/* 8009FFD8 0009CF18 E3 61 01 38 */ psq_l f27, 312(r1), 0, 0
|
||||
/* 8009FFDC 0009CF1C CB 61 01 30 */ lfd f27, 0x130(r1)
|
||||
/* 8009FFE0 0009CF20 39 61 01 30 */ addi r11, r1, 0x130
|
||||
/* 8009FFE4 0009CF24 48 2C 22 21 */ bl func_80362204
|
||||
/* 8009FFE4 0009CF24 48 2C 22 21 */ bl _restgpr_20
|
||||
/* 8009FFE8 0009CF28 80 01 01 84 */ lwz r0, 0x184(r1)
|
||||
/* 8009FFEC 0009CF2C 7C 08 03 A6 */ mtlr r0
|
||||
/* 8009FFF0 0009CF30 38 21 01 80 */ addi r1, r1, 0x180
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/* 800A1430 0009E370 7C 08 02 A6 */ mflr r0
|
||||
/* 800A1434 0009E374 90 01 00 A4 */ stw r0, 0xa4(r1)
|
||||
/* 800A1438 0009E378 39 61 00 A0 */ addi r11, r1, 0xa0
|
||||
/* 800A143C 0009E37C 48 2C 0D 7D */ bl func_803621B8
|
||||
/* 800A143C 0009E37C 48 2C 0D 7D */ bl _savegpr_20
|
||||
/* 800A1440 0009E380 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 800A1444 0009E384 7C 99 23 78 */ mr r25, r4
|
||||
/* 800A1448 0009E388 7C BB 2B 78 */ mr r27, r5
|
||||
@@ -474,7 +474,7 @@ lbl_800A1AC8:
|
||||
lbl_800A1AD0:
|
||||
/* 800A1AD0 0009EA10 7F 03 C3 78 */ mr r3, r24
|
||||
/* 800A1AD4 0009EA14 39 61 00 A0 */ addi r11, r1, 0xa0
|
||||
/* 800A1AD8 0009EA18 48 2C 07 2D */ bl func_80362204
|
||||
/* 800A1AD8 0009EA18 48 2C 07 2D */ bl _restgpr_20
|
||||
/* 800A1ADC 0009EA1C 80 01 00 A4 */ lwz r0, 0xa4(r1)
|
||||
/* 800A1AE0 0009EA20 7C 08 03 A6 */ mtlr r0
|
||||
/* 800A1AE4 0009EA24 38 21 00 A0 */ addi r1, r1, 0xa0
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/* 800A2714 0009F654 7C 08 02 A6 */ mflr r0
|
||||
/* 800A2718 0009F658 90 01 00 64 */ stw r0, 0x64(r1)
|
||||
/* 800A271C 0009F65C 39 61 00 60 */ addi r11, r1, 0x60
|
||||
/* 800A2720 0009F660 48 2B FA 89 */ bl func_803621A8
|
||||
/* 800A2720 0009F660 48 2B FA 89 */ bl _savegpr_16
|
||||
/* 800A2724 0009F664 7C 79 1B 78 */ mr r25, r3
|
||||
/* 800A2728 0009F668 3A 79 2A 4C */ addi r19, r25, 0x2a4c
|
||||
/* 800A272C 0009F66C 3A 80 00 00 */ li r20, 0
|
||||
@@ -180,7 +180,7 @@ lbl_800A282C:
|
||||
/* 800A29C0 0009F900 38 60 00 01 */ li r3, 1
|
||||
lbl_800A29C4:
|
||||
/* 800A29C4 0009F904 39 61 00 60 */ addi r11, r1, 0x60
|
||||
/* 800A29C8 0009F908 48 2B F8 2D */ bl func_803621F4
|
||||
/* 800A29C8 0009F908 48 2B F8 2D */ bl _restgpr_16
|
||||
/* 800A29CC 0009F90C 80 01 00 64 */ lwz r0, 0x64(r1)
|
||||
/* 800A29D0 0009F910 7C 08 03 A6 */ mtlr r0
|
||||
/* 800A29D4 0009F914 38 21 00 60 */ addi r1, r1, 0x60
|
||||
|
||||
@@ -376,7 +376,7 @@ lbl_800A3988:
|
||||
/* 800A3998 000A08D8 E3 A1 00 E8 */ psq_l f29, 232(r1), 0, 0
|
||||
/* 800A399C 000A08DC CB A1 00 E0 */ lfd f29, 0xe0(r1)
|
||||
/* 800A39A0 000A08E0 39 61 00 E0 */ addi r11, r1, 0xe0
|
||||
/* 800A39A4 000A08E4 48 2B E8 6D */ bl func_80362210
|
||||
/* 800A39A4 000A08E4 48 2B E8 6D */ bl _restgpr_23
|
||||
/* 800A39A8 000A08E8 80 01 01 14 */ lwz r0, 0x114(r1)
|
||||
/* 800A39AC 000A08EC 7C 08 03 A6 */ mtlr r0
|
||||
/* 800A39B0 000A08F0 38 21 01 10 */ addi r1, r1, 0x110
|
||||
|
||||
@@ -187,7 +187,7 @@ lbl_800A3C6C:
|
||||
/* 800A3C6C 000A0BAC E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0
|
||||
/* 800A3C70 000A0BB0 CB E1 00 70 */ lfd f31, 0x70(r1)
|
||||
/* 800A3C74 000A0BB4 39 61 00 70 */ addi r11, r1, 0x70
|
||||
/* 800A3C78 000A0BB8 48 2B E5 99 */ bl func_80362210
|
||||
/* 800A3C78 000A0BB8 48 2B E5 99 */ bl _restgpr_23
|
||||
/* 800A3C7C 000A0BBC 80 01 00 84 */ lwz r0, 0x84(r1)
|
||||
/* 800A3C80 000A0BC0 7C 08 03 A6 */ mtlr r0
|
||||
/* 800A3C84 000A0BC4 38 21 00 80 */ addi r1, r1, 0x80
|
||||
|
||||
@@ -557,7 +557,7 @@ lbl_800A54D0:
|
||||
/* 800A54D8 000A2418 90 17 05 7C */ stw r0, 0x57c(r23)
|
||||
lbl_800A54DC:
|
||||
/* 800A54DC 000A241C 39 61 00 30 */ addi r11, r1, 0x30
|
||||
/* 800A54E0 000A2420 48 2B CD 2D */ bl func_8036220C
|
||||
/* 800A54E0 000A2420 48 2B CD 2D */ bl _restgpr_22
|
||||
/* 800A54E4 000A2424 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 800A54E8 000A2428 7C 08 03 A6 */ mtlr r0
|
||||
/* 800A54EC 000A242C 38 21 00 30 */ addi r1, r1, 0x30
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
/* 800ADE58 000AAD98 DB 01 00 80 */ stfd f24, 0x80(r1)
|
||||
/* 800ADE5C 000AAD9C F3 01 00 88 */ psq_st f24, 136(r1), 0, 0
|
||||
/* 800ADE60 000AADA0 39 61 00 80 */ addi r11, r1, 0x80
|
||||
/* 800ADE64 000AADA4 48 2B 43 59 */ bl func_803621BC
|
||||
/* 800ADE64 000AADA4 48 2B 43 59 */ bl _savegpr_21
|
||||
/* 800ADE68 000AADA8 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 800ADE6C 000AADAC FF 20 08 90 */ fmr f25, f1
|
||||
/* 800ADE70 000AADB0 3C 80 80 39 */ lis r4, lbl_8038D658@ha
|
||||
@@ -866,7 +866,7 @@ lbl_800AEA18:
|
||||
/* 800AEA50 000AB990 E3 01 00 88 */ psq_l f24, 136(r1), 0, 0
|
||||
/* 800AEA54 000AB994 CB 01 00 80 */ lfd f24, 0x80(r1)
|
||||
/* 800AEA58 000AB998 39 61 00 80 */ addi r11, r1, 0x80
|
||||
/* 800AEA5C 000AB99C 48 2B 37 AD */ bl func_80362208
|
||||
/* 800AEA5C 000AB99C 48 2B 37 AD */ bl _restgpr_21
|
||||
/* 800AEA60 000AB9A0 80 01 01 04 */ lwz r0, 0x104(r1)
|
||||
/* 800AEA64 000AB9A4 7C 08 03 A6 */ mtlr r0
|
||||
/* 800AEA68 000AB9A8 38 21 01 00 */ addi r1, r1, 0x100
|
||||
|
||||
@@ -1218,7 +1218,7 @@ lbl_800B140C:
|
||||
/* 800B144C 000AE38C E2 E1 00 E8 */ psq_l f23, 232(r1), 0, 0
|
||||
/* 800B1450 000AE390 CA E1 00 E0 */ lfd f23, 0xe0(r1)
|
||||
/* 800B1454 000AE394 39 61 00 E0 */ addi r11, r1, 0xe0
|
||||
/* 800B1458 000AE398 48 2B 0D B9 */ bl func_80362210
|
||||
/* 800B1458 000AE398 48 2B 0D B9 */ bl _restgpr_23
|
||||
/* 800B145C 000AE39C 80 01 01 74 */ lwz r0, 0x174(r1)
|
||||
/* 800B1460 000AE3A0 7C 08 03 A6 */ mtlr r0
|
||||
/* 800B1464 000AE3A4 38 21 01 70 */ addi r1, r1, 0x170
|
||||
|
||||
@@ -1080,7 +1080,7 @@ lbl_800CD770:
|
||||
/* 800CD770 000CA6B0 38 60 00 01 */ li r3, 1
|
||||
lbl_800CD774:
|
||||
/* 800CD774 000CA6B4 39 61 00 A0 */ addi r11, r1, 0xa0
|
||||
/* 800CD778 000CA6B8 48 29 4A 99 */ bl func_80362210
|
||||
/* 800CD778 000CA6B8 48 29 4A 99 */ bl _restgpr_23
|
||||
/* 800CD77C 000CA6BC 80 01 00 A4 */ lwz r0, 0xa4(r1)
|
||||
/* 800CD780 000CA6C0 7C 08 03 A6 */ mtlr r0
|
||||
/* 800CD784 000CA6C4 38 21 00 A0 */ addi r1, r1, 0xa0
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user