mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-30 16:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed _savegpr etc. (#54)

Browse Source 
* 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:
Jonathan Wase
2021-01-03 05:15:12 +01:00
committed by GitHub
parent 609891bc25
commit d2e9db3748
202 changed files with 607 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_meter2/d_meter2/asm/func_80221244.s
+2 -2
View File
@@ -6,7 +6,7 @@
/* 80221258 0021E198 DB C1 00 50 */ stfd f30, 0x50(r1)
/* 8022125C 0021E19C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0
/* 80221260 0021E1A0 39 61 00 50 */ addi r11, r1, 0x50
/* 80221264 0021E1A4 48 14 0F 59 */ bl func_803621BC
/* 80221264 0021E1A4 48 14 0F 59 */ bl _savegpr_21
/* 80221268 0021E1A8 7C 7B 1B 78 */ mr r27, r3
/* 8022126C 0021E1AC 3B C0 00 00 */ li r30, 0
/* 80221270 0021E1B0 3B A0 00 00 */ li r29, 0
@@ -390,7 +390,7 @@ lbl_802217CC:
/* 802217D4 0021E714 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0
/* 802217D8 0021E718 CB C1 00 50 */ lfd f30, 0x50(r1)
/* 802217DC 0021E71C 39 61 00 50 */ addi r11, r1, 0x50
/* 802217E0 0021E720 48 14 0A 29 */ bl func_80362208
/* 802217E0 0021E720 48 14 0A 29 */ bl _restgpr_21
/* 802217E4 0021E724 80 01 00 74 */ lwz r0, 0x74(r1)
/* 802217E8 0021E728 7C 08 03 A6 */ mtlr r0
/* 802217EC 0021E72C 38 21 00 70 */ addi r1, r1, 0x70
include/d/d_meter2/d_meter2/asm/func_802217F4.s
+2 -2
View File
@@ -6,7 +6,7 @@
/* 80221808 0021E748 DB C1 00 50 */ stfd f30, 0x50(r1)
/* 8022180C 0021E74C F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0
/* 80221810 0021E750 39 61 00 50 */ addi r11, r1, 0x50
/* 80221814 0021E754 48 14 09 A9 */ bl func_803621BC
/* 80221814 0021E754 48 14 09 A9 */ bl _savegpr_21
/* 80221818 0021E758 7C 7B 1B 78 */ mr r27, r3
/* 8022181C 0021E75C 3B C0 00 00 */ li r30, 0
/* 80221820 0021E760 3B A0 00 00 */ li r29, 0
@@ -473,7 +473,7 @@ lbl_80221EA0:
/* 80221EA8 0021EDE8 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0
/* 80221EAC 0021EDEC CB C1 00 50 */ lfd f30, 0x50(r1)
/* 80221EB0 0021EDF0 39 61 00 50 */ addi r11, r1, 0x50
/* 80221EB4 0021EDF4 48 14 03 55 */ bl func_80362208
/* 80221EB4 0021EDF4 48 14 03 55 */ bl _restgpr_21
/* 80221EB8 0021EDF8 80 01 00 74 */ lwz r0, 0x74(r1)
/* 80221EBC 0021EDFC 7C 08 03 A6 */ mtlr r0
/* 80221EC0 0021EE00 38 21 00 70 */ addi r1, r1, 0x70
include/d/d_meter2/d_meter2/asm/func_802231C8.s
+2 -2
View File
@@ -2,7 +2,7 @@
/* 802231CC 0022010C 7C 08 02 A6 */ mflr r0
/* 802231D0 00220110 90 01 00 84 */ stw r0, 0x84(r1)
/* 802231D4 00220114 39 61 00 80 */ addi r11, r1, 0x80
/* 802231D8 00220118 48 13 EF DD */ bl func_803621B4
/* 802231D8 00220118 48 13 EF DD */ bl _savegpr_19
/* 802231DC 0022011C 7C 7F 1B 78 */ mr r31, r3
/* 802231E0 00220120 38 00 00 00 */ li r0, 0
/* 802231E4 00220124 98 03 02 01 */ stb r0, 0x201(r3)
@@ -397,7 +397,7 @@ lbl_802237AC:
/* 802237B8 002206F8 4B DE BA 15 */ bl mDoExt_setCurrentHeap
lbl_802237BC:
/* 802237BC 002206FC 39 61 00 80 */ addi r11, r1, 0x80
/* 802237C0 00220700 48 13 EA 41 */ bl func_80362200
/* 802237C0 00220700 48 13 EA 41 */ bl _restgpr_19
/* 802237C4 00220704 80 01 00 84 */ lwz r0, 0x84(r1)
/* 802237C8 00220708 7C 08 03 A6 */ mtlr r0
/* 802237CC 0022070C 38 21 00 80 */ addi r1, r1, 0x80
include/d/d_meter2/d_meter2/asm/func_80223E00.s
+2 -2
View File
@@ -2,7 +2,7 @@
/* 80223E04 00220D44 7C 08 02 A6 */ mflr r0
/* 80223E08 00220D48 90 01 00 44 */ stw r0, 0x44(r1)
/* 80223E0C 00220D4C 39 61 00 40 */ addi r11, r1, 0x40
/* 80223E10 00220D50 48 13 E3 A1 */ bl func_803621B0
/* 80223E10 00220D50 48 13 E3 A1 */ bl _savegpr_18
/* 80223E14 00220D54 7C 75 1B 78 */ mr r21, r3
/* 80223E18 00220D58 3A E0 00 00 */ li r23, 0
/* 80223E1C 00220D5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
@@ -295,7 +295,7 @@ lbl_80224234:
/* 80224238 00221178 2C 12 00 02 */ cmpwi r18, 2
/* 8022423C 0022117C 41 80 FF 68 */ blt lbl_802241A4
/* 80224240 00221180 39 61 00 40 */ addi r11, r1, 0x40
/* 80224244 00221184 48 13 DF B9 */ bl func_803621FC
/* 80224244 00221184 48 13 DF B9 */ bl _restgpr_18
/* 80224248 00221188 80 01 00 44 */ lwz r0, 0x44(r1)
/* 8022424C 0022118C 7C 08 03 A6 */ mtlr r0
/* 80224250 00221190 38 21 00 40 */ addi r1, r1, 0x40
include/d/d_meter2/d_meter2/asm/func_80224258.s
+1 -1
View File
@@ -60,7 +60,7 @@ lbl_80224330:
/* 80224334 00221274 2C 1F 00 04 */ cmpwi r31, 4
/* 80224338 00221278 41 80 FF 4C */ blt lbl_80224284
/* 8022433C 0022127C 39 61 00 30 */ addi r11, r1, 0x30
/* 80224340 00221280 48 13 DE D1 */ bl func_80362210
/* 80224340 00221280 48 13 DE D1 */ bl _restgpr_23
/* 80224344 00221284 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80224348 00221288 7C 08 03 A6 */ mtlr r0
/* 8022434C 0022128C 38 21 00 30 */ addi r1, r1, 0x30
include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s
+1 -1
View File
@@ -556,7 +556,7 @@ lbl_802102B0:
/* 802102D8 0020D218 90 1F 03 6C */ stw r0, 0x36c(r31)
/* 802102DC 0020D21C 7F E3 FB 78 */ mr r3, r31
/* 802102E0 0020D220 39 61 00 70 */ addi r11, r1, 0x70
/* 802102E4 0020D224 48 15 1F 29 */ bl func_8036220C
/* 802102E4 0020D224 48 15 1F 29 */ bl _restgpr_22
/* 802102E8 0020D228 80 01 00 74 */ lwz r0, 0x74(r1)
/* 802102EC 0020D22C 7C 08 03 A6 */ mtlr r0
/* 802102F0 0020D230 38 21 00 70 */ addi r1, r1, 0x70
include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s
+2 -2
View File
@@ -2,7 +2,7 @@
/* 802102FC 0020D23C 7C 08 02 A6 */ mflr r0
/* 80210300 0020D240 90 01 00 44 */ stw r0, 0x44(r1)
/* 80210304 0020D244 39 61 00 40 */ addi r11, r1, 0x40
/* 80210308 0020D248 48 15 1E B1 */ bl func_803621B8
/* 80210308 0020D248 48 15 1E B1 */ bl _savegpr_20
/* 8021030C 0020D24C 7C 7F 1B 79 */ or. r31, r3, r3
/* 80210310 0020D250 7C 9E 23 78 */ mr r30, r4
/* 80210314 0020D254 41 82 0C 80 */ beq lbl_80210F94
@@ -900,7 +900,7 @@ lbl_80210F74:
lbl_80210F94:
/* 80210F94 0020DED4 7F E3 FB 78 */ mr r3, r31
/* 80210F98 0020DED8 39 61 00 40 */ addi r11, r1, 0x40
/* 80210F9C 0020DEDC 48 15 12 69 */ bl func_80362204
/* 80210F9C 0020DEDC 48 15 12 69 */ bl _restgpr_20
/* 80210FA0 0020DEE0 80 01 00 44 */ lwz r0, 0x44(r1)
/* 80210FA4 0020DEE4 7C 08 03 A6 */ mtlr r0
/* 80210FA8 0020DEE8 38 21 00 40 */ addi r1, r1, 0x40
include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s
+2 -2
View File
@@ -10,7 +10,7 @@
/* 80211540 0020E480 DB 81 00 E0 */ stfd f28, 0xe0(r1)
/* 80211544 0020E484 F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0
/* 80211548 0020E488 39 61 00 E0 */ addi r11, r1, 0xe0
/* 8021154C 0020E48C 48 15 0C 71 */ bl func_803621BC
/* 8021154C 0020E48C 48 15 0C 71 */ bl _savegpr_21
/* 80211550 0020E490 7C 79 1B 78 */ mr r25, r3
/* 80211554 0020E494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
/* 80211558 0020E498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -452,7 +452,7 @@ lbl_80211BB4:
/* 80211BCC 0020EB0C E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0
/* 80211BD0 0020EB10 CB 81 00 E0 */ lfd f28, 0xe0(r1)
/* 80211BD4 0020EB14 39 61 00 E0 */ addi r11, r1, 0xe0
/* 80211BD8 0020EB18 48 15 06 31 */ bl func_80362208
/* 80211BD8 0020EB18 48 15 06 31 */ bl _restgpr_21
/* 80211BDC 0020EB1C 80 01 01 24 */ lwz r0, 0x124(r1)
/* 80211BE0 0020EB20 7C 08 03 A6 */ mtlr r0
/* 80211BE4 0020EB24 38 21 01 20 */ addi r1, r1, 0x120
include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s
+1 -1
View File
@@ -949,7 +949,7 @@ lbl_80213364:
/* 802134EC 0021042C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2)
/* 802134F0 00210430 48 04 22 E1 */ bl CPaneMgrAlpha_NS_setAlphaRate
/* 802134F4 00210434 39 61 00 70 */ addi r11, r1, 0x70
/* 802134F8 00210438 48 14 ED 15 */ bl func_8036220C
/* 802134F8 00210438 48 14 ED 15 */ bl _restgpr_22
/* 802134FC 0021043C 80 01 00 74 */ lwz r0, 0x74(r1)
/* 80213500 00210440 7C 08 03 A6 */ mtlr r0
/* 80213504 00210444 38 21 00 70 */ addi r1, r1, 0x70
include/d/d_meter2/d_meter2_draw/asm/func_80218788.s
+2 -2
View File
@@ -2,7 +2,7 @@
/* 8021878C 002156CC 7C 08 02 A6 */ mflr r0
/* 80218790 002156D0 90 01 00 A4 */ stw r0, 0xa4(r1)
/* 80218794 002156D4 39 61 00 A0 */ addi r11, r1, 0xa0
/* 80218798 002156D8 48 14 9A 0D */ bl func_803621A4
/* 80218798 002156D8 48 14 9A 0D */ bl _savegpr_15
/* 8021879C 002156DC 7C 72 1B 78 */ mr r18, r3
/* 802187A0 002156E0 7C 93 23 78 */ mr r19, r4
/* 802187A4 002156E4 3B A0 00 00 */ li r29, 0
@@ -604,7 +604,7 @@ lbl_80218F30:
/* 80219000 00215F40 98 03 01 0B */ stb r0, 0x10b(r3)
lbl_80219004:
/* 80219004 00215F44 39 61 00 A0 */ addi r11, r1, 0xa0
/* 80219008 00215F48 48 14 91 E9 */ bl func_803621F0
/* 80219008 00215F48 48 14 91 E9 */ bl _restgpr_15
/* 8021900C 00215F4C 80 01 00 A4 */ lwz r0, 0xa4(r1)
/* 80219010 00215F50 7C 08 03 A6 */ mtlr r0
/* 80219014 00215F54 38 21 00 A0 */ addi r1, r1, 0xa0
include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s
+2 -2
View File
@@ -2,7 +2,7 @@
/* 8021CF0C 00219E4C 7C 08 02 A6 */ mflr r0
/* 8021CF10 00219E50 90 01 00 44 */ stw r0, 0x44(r1)
/* 8021CF14 00219E54 39 61 00 40 */ addi r11, r1, 0x40
/* 8021CF18 00219E58 48 14 52 9D */ bl func_803621B4
/* 8021CF18 00219E58 48 14 52 9D */ bl _savegpr_19
/* 8021CF1C 00219E5C 7C 7F 1B 78 */ mr r31, r3
/* 8021CF20 00219E60 7C 94 23 78 */ mr r20, r4
/* 8021CF24 00219E64 7C B6 2B 78 */ mr r22, r5
@@ -293,7 +293,7 @@ lbl_8021D34C:
lbl_8021D350:
/* 8021D350 0021A290 7E 63 9B 78 */ mr r3, r19
/* 8021D354 0021A294 39 61 00 40 */ addi r11, r1, 0x40
/* 8021D358 0021A298 48 14 4E A9 */ bl func_80362200
/* 8021D358 0021A298 48 14 4E A9 */ bl _restgpr_19
/* 8021D35C 0021A29C 80 01 00 44 */ lwz r0, 0x44(r1)
/* 8021D360 0021A2A0 7C 08 03 A6 */ mtlr r0
/* 8021D364 0021A2A4 38 21 00 40 */ addi r1, r1, 0x40
include/d/d_meter2/d_meter2_info/d_meter2_info.h
+2 -2
View File
@@ -1,12 +1,12 @@
#ifndef __D_METER2_INFO_H_
#define __D_METER2_INFO_H_
#include "JSystem/JMessage/control/control.h"
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DPicture/J2DPicture.h"
#include "JSystem/J2DGraph/J2DScreen/J2DScreen.h"
#include "JSystem/J2DGraph/J2DTextBox/J2DTextBox.h"
#include "JSystem/JMessage/control/control.h"
#include "JSystem/JUtility/JUTFont/JUTFont.h"
#include "dolphin/types.h"
struct dMeter2Info_c_vtable {
u32* addr1;