mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-01 01:41:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix symbol names (#118)

Browse Source 
* checkpoint

* checkpoint

* rename f_pc

* checkpoint

* small symbol rename and fix some fpc symbols

* remove unneeded entries from ldscript

* simplify ok check, update docker container

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
lepelog
2021-03-15 07:12:44 +01:00
committed by GitHub
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTGamePad/JUTGamePad.h
+11 -7
View File
@@ -7,9 +7,6 @@
#include "os/OS.h"
#include "pad/pad.h"
typedef u32 EStickMode;
typedef u32 EWhichStick;
namespace CButton {
enum {
DPAD_LEFT = 0x0001,
@@ -29,6 +26,8 @@ enum {
struct JUTGamePad : public JKRDisposer {
public:
enum EStickMode {};
enum EWhichStick {};
// typedef u32 EPadPort;
enum EPadPort { Port_1 = 0, Port_2 = 0, Port_3 = 0, Port_4 = 0 };
JUTGamePad(JUTGamePad::EPadPort port);
@@ -77,7 +76,8 @@ public:
CStick();
void clear();
void clear(JUTGamePad* pad);
u32 update(s8 unk0, s8 unk1, EStickMode mode, EWhichStick stick, u32 unk2);
u32 update(s8 unk0, s8 unk1, JUTGamePad::EStickMode mode, JUTGamePad::EWhichStick stick,
u32 unk2);
u32 getButton(u32 unk);
float mPosX;
@@ -89,7 +89,11 @@ public:
};
struct CRumble {
typedef s32 ERumble; // should probably be an enum
enum ERumble {
VAL_0 = 0,
VAL_1 = 1,
VAL_2 = 2,
};
void clear();
void clear(JUTGamePad* pad);
@@ -129,7 +133,7 @@ public:
};
struct JUTGamePadLongPress {
void checkCallback(s32 unk0, u32 unk2);
void checkCallback(int unk0, u32 unk2);
u8 unk0[17];
bool field_0x11; // bool?
@@ -145,7 +149,7 @@ struct JUTGamePadLongPress {
extern "C" {
// s32 JUTGamePad_NS_init(void);
bool getNumBit(u8* unk0, u32 unk1);
bool getNumBit__FPUci(u8* unk0, u32 unk1);
}
extern float lbl_80456028; // JUTGamePad::CStick::clear() init to 0.0
include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
+6 -6
View File
@@ -45,7 +45,7 @@ lbl_802E0954:
/* 802E0984 002DD8C4 3A FF 00 48 */ addi r23, r31, 0x48
/* 802E0988 002DD8C8 7E F7 E2 14 */ add r23, r23, r28
/* 802E098C 002DD8CC 81 17 00 00 */ lwz r8, 0(r23)
/* 802E0990 002DD8D0 48 00 08 A9 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0990 002DD8D0 48 00 08 A9 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0994 002DD8D4 54 76 C0 0E */ slwi r22, r3, 0x18
/* 802E0998 002DD8D8 38 7F 01 48 */ addi r3, r31, 0x148
/* 802E099C 002DD8DC 7C 63 DA 14 */ add r3, r3, r27
@@ -54,7 +54,7 @@ lbl_802E0954:
/* 802E09A8 002DD8E8 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E09AC 002DD8EC 38 E0 00 01 */ li r7, 1
/* 802E09B0 002DD8F0 81 17 00 00 */ lwz r8, 0(r23)
/* 802E09B4 002DD8F4 48 00 08 85 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E09B4 002DD8F4 48 00 08 85 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E09B8 002DD8F8 54 60 80 1E */ slwi r0, r3, 0x10
/* 802E09BC 002DD8FC 7E D6 03 78 */ or r22, r22, r0
/* 802E09C0 002DD900 7E E3 BB 78 */ mr r3, r23
@@ -73,7 +73,7 @@ lbl_802E09D4:
/* 802E09F0 002DD930 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E09F4 002DD934 38 E0 00 00 */ li r7, 0
/* 802E09F8 002DD938 39 00 00 00 */ li r8, 0
/* 802E09FC 002DD93C 48 00 08 3D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E09FC 002DD93C 48 00 08 3D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0A00 002DD940 38 7F 01 48 */ addi r3, r31, 0x148
/* 802E0A04 002DD944 7C 63 DA 14 */ add r3, r3, r27
/* 802E0A08 002DD948 38 80 00 00 */ li r4, 0
@@ -81,7 +81,7 @@ lbl_802E09D4:
/* 802E0A10 002DD950 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E0A14 002DD954 38 E0 00 01 */ li r7, 1
/* 802E0A18 002DD958 39 00 00 00 */ li r8, 0
/* 802E0A1C 002DD95C 48 00 08 1D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0A1C 002DD95C 48 00 08 1D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0A20 002DD960 38 7F 00 48 */ addi r3, r31, 0x48
/* 802E0A24 002DD964 7C 63 E2 14 */ add r3, r3, r28
/* 802E0A28 002DD968 38 80 00 00 */ li r4, 0
@@ -128,7 +128,7 @@ lbl_802E0A80:
/* 802E0AC0 002DDA00 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E0AC4 002DDA04 38 E0 00 00 */ li r7, 0
/* 802E0AC8 002DDA08 81 08 00 18 */ lwz r8, 0x18(r8)
/* 802E0ACC 002DDA0C 48 00 07 6D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0ACC 002DDA0C 48 00 07 6D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0AD0 002DDA10 54 76 C0 0E */ slwi r22, r3, 0x18
/* 802E0AD4 002DDA14 81 19 00 00 */ lwz r8, 0(r25)
/* 802E0AD8 002DDA18 38 68 00 58 */ addi r3, r8, 0x58
@@ -137,7 +137,7 @@ lbl_802E0A80:
/* 802E0AE4 002DDA24 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13)
/* 802E0AE8 002DDA28 38 E0 00 01 */ li r7, 1
/* 802E0AEC 002DDA2C 81 08 00 18 */ lwz r8, 0x18(r8)
/* 802E0AF0 002DDA30 48 00 07 49 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl
/* 802E0AF0 002DDA30 48 00 07 49 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl
/* 802E0AF4 002DDA34 54 60 80 1E */ slwi r0, r3, 0x10
/* 802E0AF8 002DDA38 7E D6 03 78 */ or r22, r22, r0
/* 802E0AFC 002DDA3C 80 79 00 00 */ lwz r3, 0(r25)
include/JSystem/JUtility/JUTGamePad/asm/func_802E0CD8.s
+1 -1
View File
@@ -151,7 +151,7 @@ lbl_802E0EB8:
/* 802E0F18 002DDE58 7C A5 20 10 */ subfc r5, r5, r4
/* 802E0F1C 002DDE5C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802E0F20 002DDE60 A8 9E 00 7C */ lha r4, 0x7c(r30)
/* 802E0F24 002DDE64 48 00 0B D9 */ bl checkCallback__19JUTGamePadLongPressFlUl
/* 802E0F24 002DDE64 48 00 0B D9 */ bl checkCallback__19JUTGamePadLongPressFiUl
/* 802E0F28 002DDE68 48 00 00 3C */ b lbl_802E0F64
lbl_802E0F2C:
/* 802E0F2C 002DDE6C 38 00 00 01 */ li r0, 1
include/JSystem/JUtility/JUTGamePad/asm/func_802E1720.s
+2 -2
View File
@@ -52,7 +52,7 @@ lbl_802E17DC:
/* 802E17E0 002DE720 7C 05 23 96 */ divwu r0, r5, r4
/* 802E17E4 002DE724 7C 00 21 D6 */ mullw r0, r0, r4
/* 802E17E8 002DE728 7C 80 28 50 */ subf r4, r0, r5
/* 802E17EC 002DE72C 4B FF FF 0D */ bl getNumBit
/* 802E17EC 002DE72C 4B FF FF 0D */ bl getNumBit__FPUci
/* 802E17F0 002DE730 7F A0 07 34 */ extsh r0, r29
/* 802E17F4 002DE734 38 8D 8F 64 */ addi r4, r13, 0x804514E4-0x80458580/*lbl_804514E4-_SDA_BASE_*/
/* 802E17F8 002DE738 7C 84 00 AE */ lbzx r4, r4, r0
@@ -78,7 +78,7 @@ lbl_802E1824:
/* 802E1844 002DE784 7C 05 23 96 */ divwu r0, r5, r4
/* 802E1848 002DE788 7C 00 21 D6 */ mullw r0, r0, r4
/* 802E184C 002DE78C 7C 80 28 50 */ subf r4, r0, r5
/* 802E1850 002DE790 4B FF FE A9 */ bl getNumBit
/* 802E1850 002DE790 4B FF FE A9 */ bl getNumBit__FPUci
/* 802E1854 002DE794 7C 64 1B 78 */ mr r4, r3
lbl_802E1858:
/* 802E1858 002DE798 28 1D 00 00 */ cmplwi r29, 0
include/JSystem/JUtility/JUTXfb/JUTXfb.h
+7 -2
View File
@@ -7,12 +7,17 @@
class JUTXfb {
public:
typedef s32 EXfbNumber;
enum EXfbNumber { // TODO: placeholder
UNK_0 = 0,
UNK_1 = 1,
UNK_2 = 2,
UNK_3 = 3,
};
JUTXfb(GXRenderModeObj* obj, JKRHeap* heap, EXfbNumber xfb_number);
~JUTXfb();
void clearIndex();
void common_init(s32 xfb_number);
void common_init(int xfb_number);
void delXfb(s32 index);
static JUTXfb* createManager(JKRHeap* heap, EXfbNumber xfb_number);
static void destroyManager();
include/JSystem/JUtility/JUTXfb/asm/func_802E5260.s
+3 -3
View File
@@ -8,7 +8,7 @@
/* 802E527C 002E21BC 7C BC 2B 78 */ mr r28, r5
/* 802E5280 002E21C0 7C DD 33 78 */ mr r29, r6
/* 802E5284 002E21C4 7F A4 EB 78 */ mr r4, r29
/* 802E5288 002E21C8 4B FF FF A1 */ bl common_init__6JUTXfbFl
/* 802E5288 002E21C8 4B FF FF A1 */ bl common_init__6JUTXfbFi
/* 802E528C 002E21CC 28 1E 00 00 */ cmplwi r30, 0
/* 802E5290 002E21D0 41 82 00 20 */ beq lbl_802E52B0
/* 802E5294 002E21D4 7F 63 DB 78 */ mr r3, r27
@@ -16,7 +16,7 @@
/* 802E529C 002E21DC A0 BE 00 08 */ lhz r5, 8(r30)
/* 802E52A0 002E21E0 7F 86 E3 78 */ mr r6, r28
/* 802E52A4 002E21E4 7F A7 EB 78 */ mr r7, r29
/* 802E52A8 002E21E8 48 00 01 AD */ bl initiate__6JUTXfbFUsUsP7JKRHeapl
/* 802E52A8 002E21E8 48 00 01 AD */ bl initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber
/* 802E52AC 002E21EC 48 00 00 40 */ b lbl_802E52EC
lbl_802E52B0:
/* 802E52B0 002E21F0 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13)
@@ -33,7 +33,7 @@ lbl_802E52B0:
/* 802E52DC 002E221C 7F E4 FB 78 */ mr r4, r31
/* 802E52E0 002E2220 7F 86 E3 78 */ mr r6, r28
/* 802E52E4 002E2224 7F A7 EB 78 */ mr r7, r29
/* 802E52E8 002E2228 48 00 01 6D */ bl initiate__6JUTXfbFUsUsP7JKRHeapl
/* 802E52E8 002E2228 48 00 01 6D */ bl initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber
lbl_802E52EC:
/* 802E52EC 002E222C 7F 63 DB 78 */ mr r3, r27
/* 802E52F0 002E2230 39 61 00 20 */ addi r11, r1, 0x20