encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
Pheenoh
2021-01-02 17:49:20 -05:00
parent 458be4d8cb ad62061cfc
commit e375712d23
1240 changed files with 142288 additions and 95730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_a/d_a_alink/asm/func_800B271C.s
+10 -10
View File
@@ -187,8 +187,8 @@ lbl_800B29B0:
/* 800B29C4 000AF904 B0 7E 2F E0 */ sth r3, 0x2fe0(r30)
/* 800B29C8 000AF908 48 00 00 24 */ b lbl_800B29EC
lbl_800B29CC:
/* 800B29CC 000AF90C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B29D0 000AF910 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B29CC 000AF90C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B29D0 000AF910 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B29D4 000AF914 C0 03 00 08 */ lfs f0, 8(r3)
/* 800B29D8 000AF918 D0 1E 33 A8 */ stfs f0, 0x33a8(r30)
/* 800B29DC 000AF91C A8 63 00 0C */ lha r3, 0xc(r3)
@@ -264,8 +264,8 @@ lbl_800B2AD4:
/* 800B2AD4 000AFA14 38 00 00 01 */ li r0, 1
/* 800B2AD8 000AFA18 98 1E 2F B9 */ stb r0, 0x2fb9(r30)
lbl_800B2ADC:
/* 800B2ADC 000AFA1C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2AE0 000AFA20 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2ADC 000AFA1C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2AE0 000AFA20 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2AE4 000AFA24 80 03 00 34 */ lwz r0, 0x34(r3)
/* 800B2AE8 000AFA28 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16
/* 800B2AEC 000AFA2C 41 82 00 10 */ beq lbl_800B2AFC
@@ -308,8 +308,8 @@ lbl_800B2B5C:
/* 800B2B6C 000AFAAC 60 00 00 20 */ ori r0, r0, 0x20
/* 800B2B70 000AFAB0 98 1E 2F 8D */ stb r0, 0x2f8d(r30)
lbl_800B2B74:
/* 800B2B74 000AFAB4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2B78 000AFAB8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2B74 000AFAB4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2B78 000AFAB8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2B7C 000AFABC 88 03 00 3C */ lbz r0, 0x3c(r3)
/* 800B2B80 000AFAC0 28 00 00 00 */ cmplwi r0, 0
/* 800B2B84 000AFAC4 41 82 00 10 */ beq lbl_800B2B94
@@ -317,8 +317,8 @@ lbl_800B2B74:
/* 800B2B8C 000AFACC 60 00 00 40 */ ori r0, r0, 0x40
/* 800B2B90 000AFAD0 98 1E 2F 8D */ stb r0, 0x2f8d(r30)
lbl_800B2B94:
/* 800B2B94 000AFAD4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2B98 000AFAD8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2B94 000AFAD4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2B98 000AFAD8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2B9C 000AFADC 80 03 00 30 */ lwz r0, 0x30(r3)
/* 800B2BA0 000AFAE0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 800B2BA4 000AFAE4 41 82 00 10 */ beq lbl_800B2BB4
@@ -361,8 +361,8 @@ lbl_800B2C14:
/* 800B2C24 000AFB64 60 00 00 20 */ ori r0, r0, 0x20
/* 800B2C28 000AFB68 98 1E 2F 8E */ stb r0, 0x2f8e(r30)
lbl_800B2C2C:
/* 800B2C2C 000AFB6C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2C30 000AFB70 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2C2C 000AFB6C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2C30 000AFB70 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2C34 000AFB74 88 03 00 3B */ lbz r0, 0x3b(r3)
/* 800B2C38 000AFB78 28 00 00 00 */ cmplwi r0, 0
/* 800B2C3C 000AFB7C 41 82 00 10 */ beq lbl_800B2C4C
include/d/d_a/d_a_alink/asm/func_800C8700.s
+6 -6
View File
@@ -17,7 +17,7 @@
/* 800C8740 000C5680 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13)
/* 800C8744 000C5684 28 03 00 00 */ cmplwi r3, 0
/* 800C8748 000C5688 41 82 00 08 */ beq lbl_800C8750
/* 800C874C 000C568C 48 07 93 39 */ bl daMidna_c_NS_onNoServiceWait
/* 800C874C 000C568C 48 07 93 39 */ bl onNoServiceWait__9daMidna_cFv
lbl_800C8750:
/* 800C8750 000C5690 A0 1F 30 FE */ lhz r0, 0x30fe(r31)
/* 800C8754 000C5694 28 00 00 00 */ cmplwi r0, 0
@@ -1835,12 +1835,12 @@ lbl_800CA150:
/* 800CA164 000C70A4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 800CA168 000C70A8 40 82 00 14 */ bne lbl_800CA17C
/* 800CA16C 000C70AC 7F 63 DB 78 */ mr r3, r27
/* 800CA170 000C70B0 48 07 78 A1 */ bl daMidna_c_NS_checkForceTiredColor
/* 800CA170 000C70B0 48 07 78 A1 */ bl checkForceTiredColor__9daMidna_cCFv
/* 800CA174 000C70B4 28 03 00 00 */ cmplwi r3, 0
/* 800CA178 000C70B8 41 82 00 68 */ beq lbl_800CA1E0
lbl_800CA17C:
/* 800CA17C 000C70BC 7F 63 DB 78 */ mr r3, r27
/* 800CA180 000C70C0 48 07 78 85 */ bl daMidna_c_NS_checkForceNormalColor
/* 800CA180 000C70C0 48 07 78 85 */ bl checkForceNormalColor__9daMidna_cCFv
/* 800CA184 000C70C4 28 03 00 00 */ cmplwi r3, 0
/* 800CA188 000C70C8 40 82 00 58 */ bne lbl_800CA1E0
/* 800CA18C 000C70CC 80 7F 07 9C */ lwz r3, 0x79c(r31)
@@ -2201,7 +2201,7 @@ lbl_800CA684:
/* 800CA6B0 000C75F0 28 03 00 00 */ cmplwi r3, 0
/* 800CA6B4 000C75F4 41 82 00 0C */ beq lbl_800CA6C0
/* 800CA6B8 000C75F8 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13)
/* 800CA6BC 000C75FC 48 07 73 39 */ bl daMidna_c_NS_onForcePanic
/* 800CA6BC 000C75FC 48 07 73 39 */ bl onForcePanic__9daMidna_cFv
lbl_800CA6C0:
/* 800CA6C0 000C7600 38 00 00 00 */ li r0, 0
/* 800CA6C4 000C7604 B0 1F 30 FE */ sth r0, 0x30fe(r31)
@@ -2256,7 +2256,7 @@ lbl_800CA744:
/* 800CA780 000C76C0 4E 80 04 21 */ bctrl
/* 800CA784 000C76C4 38 7F 2C A8 */ addi r3, r31, 0x2ca8
/* 800CA788 000C76C8 38 80 00 05 */ li r4, 5
/* 800CA78C 000C76CC 48 07 71 FD */ bl Z2CreatureLink_NS_setLinkState
/* 800CA78C 000C76CC 48 07 71 FD */ bl setLinkState__14Z2CreatureLinkFUc
/* 800CA790 000C76D0 48 00 00 50 */ b lbl_800CA7E0
lbl_800CA794:
/* 800CA794 000C76D4 48 07 71 FD */ bl dComIfGs_getRupee
@@ -2277,7 +2277,7 @@ lbl_800CA794:
/* 800CA7D0 000C7710 4E 80 04 21 */ bctrl
/* 800CA7D4 000C7714 38 7F 2C A8 */ addi r3, r31, 0x2ca8
/* 800CA7D8 000C7718 38 80 00 04 */ li r4, 4
/* 800CA7DC 000C771C 48 07 71 AD */ bl Z2CreatureLink_NS_setLinkState
/* 800CA7DC 000C771C 48 07 71 AD */ bl setLinkState__14Z2CreatureLinkFUc
lbl_800CA7E0:
/* 800CA7E0 000C7720 7F E3 FB 78 */ mr r3, r31
/* 800CA7E4 000C7724 48 07 6B E9 */ bl daPy_py_c_NS_checkWolf
include/d/d_a/d_a_alink/asm/func_80117CF8.s
+2 -2
View File
@@ -170,8 +170,8 @@ lbl_80117F4C:
/* 80117F60 00114EA0 28 00 00 F2 */ cmplwi r0, 0xf2
/* 80117F64 00114EA4 40 82 00 64 */ bne lbl_80117FC8
lbl_80117F68:
/* 80117F68 00114EA8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80117F6C 00114EAC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80117F68 00114EA8 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80117F6C 00114EAC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80117F70 00114EB0 C0 03 00 08 */ lfs f0, 8(r3)
/* 80117F74 00114EB4 D0 1C 33 A8 */ stfs f0, 0x33a8(r28)
/* 80117F78 00114EB8 A8 63 00 0C */ lha r3, 0xc(r3)
include/d/d_a/d_a_alink/asm/func_80130BC4.s
+4 -4
View File
@@ -108,8 +108,8 @@ lbl_80130D38:
/* 80130D4C 0012DC8C D0 1F 34 7C */ stfs f0, 0x347c(r31)
/* 80130D50 0012DC90 48 00 05 54 */ b lbl_801312A4
lbl_80130D54:
/* 80130D54 0012DC94 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80130D58 0012DC98 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80130D54 0012DC94 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80130D58 0012DC98 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80130D5C 0012DC9C 80 03 00 30 */ lwz r0, 0x30(r3)
/* 80130D60 0012DCA0 54 1A C7 FE */ rlwinm r26, r0, 0x18, 0x1f, 0x1f
/* 80130D64 0012DCA4 A8 1F 30 10 */ lha r0, 0x3010(r31)
@@ -252,8 +252,8 @@ lbl_80130F24:
/* 80130F4C 0012DE8C 4B FF 87 8D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed
lbl_80130F50:
/* 80130F50 0012DE90 AB 3F 30 0E */ lha r25, 0x300e(r31)
/* 80130F54 0012DE94 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80130F58 0012DE98 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80130F54 0012DE94 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80130F58 0012DE98 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80130F5C 0012DE9C C3 E3 00 04 */ lfs f31, 4(r3)
/* 80130F60 0012DEA0 38 7F 2D 84 */ addi r3, r31, 0x2d84
/* 80130F64 0012DEA4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2)
include/d/d_a/d_a_alink/asm/func_80141988.s
-2
View File
@@ -1,2 +0,0 @@
/* 80141988 0013E8C8 98 83 00 C0 */ stb r4, 0xc0(r3)
/* 8014198C 0013E8CC 4E 80 00 20 */ blr
include/d/d_a/d_a_alink/asm/func_801419F4.s
-4
View File
@@ -1,4 +0,0 @@
/* 801419F4 0013E934 80 03 08 98 */ lwz r0, 0x898(r3)
/* 801419F8 0013E938 60 00 00 08 */ ori r0, r0, 8
/* 801419FC 0013E93C 90 03 08 98 */ stw r0, 0x898(r3)
/* 80141A00 0013E940 4E 80 00 20 */ blr
include/d/d_a/d_a_alink/asm/func_80141A04.s
-3
View File
@@ -1,3 +0,0 @@
/* 80141A04 0013E944 80 03 08 94 */ lwz r0, 0x894(r3)
/* 80141A08 0013E948 54 03 07 38 */ rlwinm r3, r0, 0, 0x1c, 0x1c
/* 80141A0C 0013E94C 4E 80 00 20 */ blr
include/d/d_a/d_a_alink/asm/func_80141A10.s
-3
View File
@@ -1,3 +0,0 @@
/* 80141A10 0013E950 80 03 08 94 */ lwz r0, 0x894(r3)
/* 80141A14 0013E954 54 03 07 7A */ rlwinm r3, r0, 0, 0x1d, 0x1d
/* 80141A18 0013E958 4E 80 00 20 */ blr
include/d/d_a/d_a_alink/asm/func_80141A84.s
-4
View File
@@ -1,4 +0,0 @@
/* 80141A84 0013E9C4 80 03 08 98 */ lwz r0, 0x898(r3)
/* 80141A88 0013E9C8 60 00 00 80 */ ori r0, r0, 0x80
/* 80141A8C 0013E9CC 90 03 08 98 */ stw r0, 0x898(r3)
/* 80141A90 0013E9D0 4E 80 00 20 */ blr
include/d/d_a/d_a_alink/d_a_alink.h
+14 -11
View File
@@ -201,14 +201,26 @@ private:
u8 unk[14268];
};
class daMidna_c {
public:
void onForcePanic(void);
u32 checkForceNormalColor(void) const;
u32 checkForceTiredColor(void) const;
bool checkMidnaTired(void);
void onNoServiceWait(void);
private:
u8 unk[0x893];
u32 unk2196;
u32 unk2200;
};
extern "C" {
void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc_ac_c*,
dCcD_GObjInf*,
dCcD_GObjInf*);
void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*);
void J3DMaterialAnm_NS_calc(void);
void PSVECAdd(Vec*, Vec*, Vec*);
void mDoMtx_stack_c_NS_transM(float, float, float);
void daAlink_c_NS_concatMagneBootInvMtx(void);
void mDoMtx_ZXYrotM(void);
void mDoMtx_YrotM(void);
@@ -303,10 +315,6 @@ struct mCurrentMtx { // J3DGraphBase::J3DSys::mCurrentMtx
// extern now lbl_803DD470;
extern mCurrentMtx lbl_80434BE4;
// daalink modelcallback
struct j3dsys; // J3DGraphBase::j3dSys
extern j3dsys lbl_80434AC8;
// daalink headmodelcallback
extern float lbl_80452EDC;
@@ -327,10 +335,6 @@ extern float lbl_80453058;
extern float lbl_80453100;
extern float lbl_804531F0;
extern float lbl_804531F4;
extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero
extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX
extern cXyz lbl_80430D24; // SComponent::cXyz::BaseY
extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_
// daalink sethairangle
extern float lbl_80452C98;
@@ -357,7 +361,6 @@ extern float lbl_80453210;
extern u8 lbl_8038E5A4[0x6C]; // daAlinkHIO_horse_c0::m
// daalink getneckaimpos
extern u32 lbl_80451018; // daPy_py_c::m_midnaActor
extern float lbl_80452D68;
extern float lbl_80452DB0;
extern float lbl_80452DE0;