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

d_eye_hl OK, d_spline_path and JASSeqReader work (#307)

Browse Source
This commit is contained in:
Pheenoh
2023-03-09 01:26:11 -07:00
committed by GitHub
parent f31ab5ae0b
commit 500d079c40
29 changed files with 256 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Progress.md
+4 -4
View File
@@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 25.584339% | 920152 | 3596544
.text | 25.604469% | 920876 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 33.429437% | 1344088 | 4020672
Total | 33.447444% | 1344812 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 33.429437% | 1344088 | 4020672
main.dol | 33.447444% | 1344812 | 4020672
RELs | 33.387651% | 3839688 | 11500324
Total | 33.398475% | 5183776 | 15520996
Total | 33.403140% | 5184500 | 15520996
## RELs
asm/JSystem/JAudio2/JASSeqReader/call__12JASSeqReaderFUl.s
-18
View File
@@ -1,18 +0,0 @@
lbl_8029618C:
/* 8029618C 80 A3 00 08 */ lwz r5, 8(r3)
/* 80296190 28 05 00 08 */ cmplwi r5, 8
/* 80296194 41 80 00 0C */ blt lbl_802961A0
/* 80296198 38 60 00 00 */ li r3, 0
/* 8029619C 4E 80 00 20 */ blr
lbl_802961A0:
/* 802961A0 80 C3 00 04 */ lwz r6, 4(r3)
/* 802961A4 38 05 00 01 */ addi r0, r5, 1
/* 802961A8 90 03 00 08 */ stw r0, 8(r3)
/* 802961AC 54 A0 10 3A */ slwi r0, r5, 2
/* 802961B0 7C A3 02 14 */ add r5, r3, r0
/* 802961B4 90 C5 00 0C */ stw r6, 0xc(r5)
/* 802961B8 80 03 00 00 */ lwz r0, 0(r3)
/* 802961BC 7C 00 22 14 */ add r0, r0, r4
/* 802961C0 90 03 00 04 */ stw r0, 4(r3)
/* 802961C4 38 60 00 01 */ li r3, 1
/* 802961C8 4E 80 00 20 */ blr
asm/JSystem/JAudio2/JASSeqReader/init__12JASSeqReaderFPv.s
-19
View File
@@ -1,19 +0,0 @@
lbl_80296148:
/* 80296148 90 83 00 00 */ stw r4, 0(r3)
/* 8029614C 80 03 00 00 */ lwz r0, 0(r3)
/* 80296150 90 03 00 04 */ stw r0, 4(r3)
/* 80296154 38 C0 00 00 */ li r6, 0
/* 80296158 90 C3 00 08 */ stw r6, 8(r3)
/* 8029615C 38 80 00 00 */ li r4, 0
/* 80296160 7C C5 33 78 */ mr r5, r6
/* 80296164 38 00 00 08 */ li r0, 8
/* 80296168 7C 09 03 A6 */ mtctr r0
lbl_8029616C:
/* 8029616C 38 05 00 0C */ addi r0, r5, 0xc
/* 80296170 7C C3 01 2E */ stwx r6, r3, r0
/* 80296174 38 04 00 2C */ addi r0, r4, 0x2c
/* 80296178 7C C3 03 2E */ sthx r6, r3, r0
/* 8029617C 38 84 00 02 */ addi r4, r4, 2
/* 80296180 38 A5 00 04 */ addi r5, r5, 4
/* 80296184 42 00 FF E8 */ bdnz lbl_8029616C
/* 80296188 4E 80 00 20 */ blr
asm/JSystem/JAudio2/JASSeqReader/init__12JASSeqReaderFv.s
-18
View File
@@ -1,18 +0,0 @@
lbl_80296108:
/* 80296108 38 C0 00 00 */ li r6, 0
/* 8029610C 90 C3 00 00 */ stw r6, 0(r3)
/* 80296110 90 C3 00 04 */ stw r6, 4(r3)
/* 80296114 90 C3 00 08 */ stw r6, 8(r3)
/* 80296118 38 80 00 00 */ li r4, 0
/* 8029611C 7C C5 33 78 */ mr r5, r6
/* 80296120 38 00 00 08 */ li r0, 8
/* 80296124 7C 09 03 A6 */ mtctr r0
lbl_80296128:
/* 80296128 38 05 00 0C */ addi r0, r5, 0xc
/* 8029612C 7C C3 01 2E */ stwx r6, r3, r0
/* 80296130 38 04 00 2C */ addi r0, r4, 0x2c
/* 80296134 7C C3 03 2E */ sthx r6, r3, r0
/* 80296138 38 84 00 02 */ addi r4, r4, 2
/* 8029613C 38 A5 00 04 */ addi r5, r5, 4
/* 80296140 42 00 FF E8 */ bdnz lbl_80296128
/* 80296144 4E 80 00 20 */ blr
asm/JSystem/JAudio2/JASSeqReader/loopStart__12JASSeqReaderFUl.s
-19
View File
@@ -1,19 +0,0 @@
lbl_802961CC:
/* 802961CC 80 03 00 08 */ lwz r0, 8(r3)
/* 802961D0 28 00 00 08 */ cmplwi r0, 8
/* 802961D4 41 80 00 0C */ blt lbl_802961E0
/* 802961D8 38 60 00 00 */ li r3, 0
/* 802961DC 4E 80 00 20 */ blr
lbl_802961E0:
/* 802961E0 80 C3 00 04 */ lwz r6, 4(r3)
/* 802961E4 54 00 10 3A */ slwi r0, r0, 2
/* 802961E8 7C A3 02 14 */ add r5, r3, r0
/* 802961EC 90 C5 00 0C */ stw r6, 0xc(r5)
/* 802961F0 80 A3 00 08 */ lwz r5, 8(r3)
/* 802961F4 38 05 00 01 */ addi r0, r5, 1
/* 802961F8 90 03 00 08 */ stw r0, 8(r3)
/* 802961FC 54 A0 08 3C */ slwi r0, r5, 1
/* 80296200 7C 63 02 14 */ add r3, r3, r0
/* 80296204 B0 83 00 2C */ sth r4, 0x2c(r3)
/* 80296208 38 60 00 01 */ li r3, 1
/* 8029620C 4E 80 00 20 */ blr
asm/JSystem/JAudio2/JASSeqReader/readMidiValue__12JASSeqReaderFv.s
-32
View File
@@ -1,32 +0,0 @@
lbl_802962B0:
/* 802962B0 80 83 00 04 */ lwz r4, 4(r3)
/* 802962B4 38 04 00 01 */ addi r0, r4, 1
/* 802962B8 90 03 00 04 */ stw r0, 4(r3)
/* 802962BC 88 84 00 00 */ lbz r4, 0(r4)
/* 802962C0 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18
/* 802962C4 40 82 00 0C */ bne lbl_802962D0
/* 802962C8 7C 83 23 78 */ mr r3, r4
/* 802962CC 4E 80 00 20 */ blr
lbl_802962D0:
/* 802962D0 54 85 06 7E */ clrlwi r5, r4, 0x19
/* 802962D4 38 C0 00 00 */ li r6, 0
lbl_802962D8:
/* 802962D8 2C 06 00 02 */ cmpwi r6, 2
/* 802962DC 40 81 00 0C */ ble lbl_802962E8
/* 802962E0 38 60 00 00 */ li r3, 0
/* 802962E4 4E 80 00 20 */ blr
lbl_802962E8:
/* 802962E8 80 83 00 04 */ lwz r4, 4(r3)
/* 802962EC 38 04 00 01 */ addi r0, r4, 1
/* 802962F0 90 03 00 04 */ stw r0, 4(r3)
/* 802962F4 88 84 00 00 */ lbz r4, 0(r4)
/* 802962F8 54 A5 38 30 */ slwi r5, r5, 7
/* 802962FC 54 80 06 7E */ clrlwi r0, r4, 0x19
/* 80296300 7C A5 03 78 */ or r5, r5, r0
/* 80296304 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18
/* 80296308 41 82 00 0C */ beq lbl_80296314
/* 8029630C 38 C6 00 01 */ addi r6, r6, 1
/* 80296310 4B FF FF C8 */ b lbl_802962D8
lbl_80296314:
/* 80296314 7C A3 2B 78 */ mr r3, r5
/* 80296318 4E 80 00 20 */ blr
asm/JSystem/JAudio2/JASSeqReader/ret__12JASSeqReaderFv.s
-15
View File
@@ -1,15 +0,0 @@
lbl_8029627C:
/* 8029627C 80 83 00 08 */ lwz r4, 8(r3)
/* 80296280 28 04 00 00 */ cmplwi r4, 0
/* 80296284 40 82 00 0C */ bne lbl_80296290
/* 80296288 38 60 00 00 */ li r3, 0
/* 8029628C 4E 80 00 20 */ blr
lbl_80296290:
/* 80296290 38 04 FF FF */ addi r0, r4, -1
/* 80296294 90 03 00 08 */ stw r0, 8(r3)
/* 80296298 54 00 10 3A */ slwi r0, r0, 2
/* 8029629C 7C 83 02 14 */ add r4, r3, r0
/* 802962A0 80 04 00 0C */ lwz r0, 0xc(r4)
/* 802962A4 90 03 00 04 */ stw r0, 4(r3)
/* 802962A8 38 60 00 01 */ li r3, 1
/* 802962AC 4E 80 00 20 */ blr
asm/d/d_eye_hl/update__12dEyeHL_mng_cFv.s
-60
View File
@@ -1,60 +0,0 @@
lbl_8009CA48:
/* 8009CA48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8009CA4C 80 AD 8A 28 */ lwz r5, m_obj__12dEyeHL_mng_c(r13)
/* 8009CA50 3C 60 80 43 */ lis r3, g_envHIO@ha /* 0x8043079C@ha */
/* 8009CA54 38 63 07 9C */ addi r3, r3, g_envHIO@l /* 0x8043079C@l */
/* 8009CA58 88 03 00 10 */ lbz r0, 0x10(r3)
/* 8009CA5C 28 00 00 00 */ cmplwi r0, 0
/* 8009CA60 41 82 00 2C */ beq lbl_8009CA8C
/* 8009CA64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */
/* 8009CA68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */
/* 8009CA6C 88 03 4F AD */ lbz r0, 0x4fad(r3)
/* 8009CA70 28 00 00 00 */ cmplwi r0, 0
/* 8009CA74 40 82 00 24 */ bne lbl_8009CA98
/* 8009CA78 48 00 00 14 */ b lbl_8009CA8C
lbl_8009CA7C:
/* 8009CA7C A8 05 00 08 */ lha r0, 8(r5)
/* 8009CA80 80 65 00 04 */ lwz r3, 4(r5)
/* 8009CA84 B0 03 00 1A */ sth r0, 0x1a(r3)
/* 8009CA88 80 A5 00 10 */ lwz r5, 0x10(r5)
lbl_8009CA8C:
/* 8009CA8C 28 05 00 00 */ cmplwi r5, 0
/* 8009CA90 40 82 FF EC */ bne lbl_8009CA7C
/* 8009CA94 48 00 00 78 */ b lbl_8009CB0C
lbl_8009CA98:
/* 8009CA98 C0 42 92 10 */ lfs f2, lit_3862(r2)
/* 8009CA9C 80 63 61 B0 */ lwz r3, 0x61b0(r3)
/* 8009CAA0 C0 23 00 D0 */ lfs f1, 0xd0(r3)
/* 8009CAA4 C0 02 92 14 */ lfs f0, lit_3863(r2)
/* 8009CAA8 EC 01 00 28 */ fsubs f0, f1, f0
/* 8009CAAC EC 02 00 32 */ fmuls f0, f2, f0
/* 8009CAB0 FC 00 00 1E */ fctiwz f0, f0
/* 8009CAB4 D8 01 00 08 */ stfd f0, 8(r1)
/* 8009CAB8 80 01 00 0C */ lwz r0, 0xc(r1)
/* 8009CABC 7C 04 07 34 */ extsh r4, r0
/* 8009CAC0 48 00 00 44 */ b lbl_8009CB04
lbl_8009CAC4:
/* 8009CAC4 80 C5 00 04 */ lwz r6, 4(r5)
/* 8009CAC8 A8 05 00 08 */ lha r0, 8(r5)
/* 8009CACC 7C 00 22 14 */ add r0, r0, r4
/* 8009CAD0 B0 06 00 1A */ sth r0, 0x1a(r6)
/* 8009CAD4 A8 66 00 1A */ lha r3, 0x1a(r6)
/* 8009CAD8 2C 03 FE 70 */ cmpwi r3, -400
/* 8009CADC 40 80 00 0C */ bge lbl_8009CAE8
/* 8009CAE0 38 00 FE 70 */ li r0, -400
/* 8009CAE4 48 00 00 18 */ b lbl_8009CAFC
lbl_8009CAE8:
/* 8009CAE8 7C 60 07 34 */ extsh r0, r3
/* 8009CAEC 2C 00 01 8F */ cmpwi r0, 0x18f
/* 8009CAF0 38 00 01 8F */ li r0, 0x18f
/* 8009CAF4 41 81 00 08 */ bgt lbl_8009CAFC
/* 8009CAF8 7C 60 1B 78 */ mr r0, r3
lbl_8009CAFC:
/* 8009CAFC B0 06 00 1A */ sth r0, 0x1a(r6)
/* 8009CB00 80 A5 00 10 */ lwz r5, 0x10(r5)
lbl_8009CB04:
/* 8009CB04 28 05 00 00 */ cmplwi r5, 0
/* 8009CB08 40 82 FF BC */ bne lbl_8009CAC4
lbl_8009CB0C:
/* 8009CB0C 38 21 00 10 */ addi r1, r1, 0x10
/* 8009CB10 4E 80 00 20 */ blr
asm/d/d_spline_path/Calc__14d2DBSplinePathFPf.s
-19
View File
@@ -1,19 +0,0 @@
lbl_80097B20:
/* 80097B20 C0 23 00 1C */ lfs f1, 0x1c(r3)
/* 80097B24 80 03 00 28 */ lwz r0, 0x28(r3)
/* 80097B28 54 00 10 3A */ slwi r0, r0, 2
/* 80097B2C 7C 04 04 2E */ lfsx f0, r4, r0
/* 80097B30 EC 61 00 32 */ fmuls f3, f1, f0
/* 80097B34 C0 23 00 14 */ lfs f1, 0x14(r3)
/* 80097B38 80 03 00 20 */ lwz r0, 0x20(r3)
/* 80097B3C 54 00 10 3A */ slwi r0, r0, 2
/* 80097B40 7C 04 04 2E */ lfsx f0, r4, r0
/* 80097B44 EC 41 00 32 */ fmuls f2, f1, f0
/* 80097B48 C0 23 00 18 */ lfs f1, 0x18(r3)
/* 80097B4C 80 03 00 24 */ lwz r0, 0x24(r3)
/* 80097B50 54 00 10 3A */ slwi r0, r0, 2
/* 80097B54 7C 04 04 2E */ lfsx f0, r4, r0
/* 80097B58 EC 01 00 32 */ fmuls f0, f1, f0
/* 80097B5C EC 02 00 2A */ fadds f0, f2, f0
/* 80097B60 EC 23 00 2A */ fadds f1, f3, f0
/* 80097B64 4E 80 00 20 */ blr
asm/d/d_spline_path/Init__10dPathCurveFP5dPath.s
-7
View File
@@ -1,7 +0,0 @@
lbl_80097C5C:
/* 80097C5C 90 83 00 08 */ stw r4, 8(r3)
/* 80097C60 38 00 00 01 */ li r0, 1
/* 80097C64 90 03 00 00 */ stw r0, 0(r3)
/* 80097C68 38 00 00 00 */ li r0, 0
/* 80097C6C 90 03 00 04 */ stw r0, 4(r3)
/* 80097C70 4E 80 00 20 */ blr
include/JSystem/JAudio2/JASSeqReader.h
+23
View File
@@ -3,4 +3,27 @@
#include "dolphin/types.h"
class JASSeqReader {
public:
/* 80296108 */ void init();
/* 80296148 */ void init(void*);
/* 8029618C */ bool call(u32);
/* 802961CC */ bool loopStart(u32);
/* 80296210 */ bool loopEnd();
/* 8029627C */ bool ret();
/* 802962B0 */ int readMidiValue();
u8 readByte() {
u8* tmp = field_0x04;
field_0x04 += 1;
return *tmp;
}
/* 0x00 */ u32* field_0x00;
/* 0x04 */ u8* field_0x04;
/* 0x08 */ u32 field_0x08;
/* 0x0C */ u16* field_0x0c[8];
/* 0x2C */ s16 field_0x2c[8];
};
#endif /* JASSEQREADER_H */
include/JSystem/JParticle/JPAParticle.h
+3
View File
@@ -260,6 +260,8 @@ public:
void playCalcEmitter() { clearStatus(JPAEmtrStts_StopCalc); }
void stopDrawParticle() { setStatus(JPAEmtrStts_StopDraw); }
void* getUserWork() { return mpUserWork; }
public:
/* 0x00 */ Vec mLocalScl;
/* 0x0C */ Vec mLocalTrs;
@@ -329,6 +331,7 @@ public:
/* 802804C8 */ void canCreateChild(JPAEmitterWorkData*);
/* 80280548 */ f32 getWidth(JPABaseEmitter const*) const;
/* 80280568 */ f32 getHeight(JPABaseEmitter const*) const;
int getAge() { return mAge; }
public:
/* 0x00 */ Vec mPosition;
include/c/c_damagereaction.h
+8
View File
@@ -2,6 +2,14 @@
#define C_C_DAMAGEREACTION_H
#include "dolphin/types.h"
#include "JSystem/JParticle/JPAParticle.h"
class JPTraceParticleCallBack4 {
public:
/* 8001817C */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800182A4 */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 80018328 */ ~JPTraceParticleCallBack4();
};
BOOL cDmrNowMidnaTalk();
include/d/a/d_a_shop_item_static.h
-1
View File
@@ -2,7 +2,6 @@
#define D_A_D_A_SHOP_ITEM_STATIC_H
#include "d/a/d_a_itembase.h"
#include "dolphin/types.h"
struct ResourceData {
char* get_arcName() const { return mArcName; }
include/d/d_eye_hl.h
-1
View File
@@ -4,7 +4,6 @@
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/types.h"
class dEyeHL_c;
include/d/d_path.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_D_PATH_H
#define D_D_PATH_H
#include "dolphin/types.h"
#include "d/d_stage.h"
class dStage_dPnt_c;
include/d/d_select_icon.h
-1
View File
@@ -3,7 +3,6 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
class dSi_HIO_c {
public:
include/d/d_spline_path.h
+33
View File
@@ -2,5 +2,38 @@
#define D_D_SPLINE_PATH_H
#include "dolphin/types.h"
#include "d/d_path.h"
struct dPathCurve {
/* 80097C5C */ void Init(dPath*);
/* 80097C74 */ void bSpline2(f32);
/* 0x00 */ int field_0x00;
/* 0x00 */ int field_0x04;
/* 0x08 */ dPath* mpPath;
};
class d2DBSplinePath {
public:
/* 80097878 */ void Init(s32, s32);
/* 80097904 */ void Step();
/* 80097B20 */ f32 Calc(f32*);
/* 80097A6C */ void Calc(cXyz*);
/* 80097B68 */ void Spot(f32*, f32);
/* 0x00 */ s32 field_0x00;
/* 0x04 */ s32 field_0x04;
/* 0x08 */ s32 field_0x08;
/* 0x0C */ s32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ u32 field_0x20;
/* 0x24 */ int field_0x24;
/* 0x28 */ int field_0x28;
/* 0x2C */ int field_0x2c;
/* 0x30 */ void* field_0x30;
};
#endif /* D_D_SPLINE_PATH_H */
include/d/s/d_s_play.h
+2
View File
@@ -78,4 +78,6 @@ public:
/* 0x1D4 */ u8 field_0x1d4;
};
extern u8 g_envHIO[68];
#endif /* D_S_D_S_PLAY_H */
include/m_Do/m_Do_DVDError.h
-1
View File
@@ -2,7 +2,6 @@
#define M_DO_M_DO_DVDERROR_H
#include "JSystem/JKernel/JKRThread.h"
#include "dolphin/types.h"
void mDoDvdErr_ThdCleanup();
static void mDoDvdErr_Watch(void*);

Some files were not shown because too many files have changed in this diff Show More