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

decomp some small files, do some cleanup (#42)

Browse Source 
* remove leftover asm: JSUList.s

* d_save_init: decomp

* JMath/random: decomp

* J3DUDL: fixup label

* JAUClusterSound: decomp

* c_API_controller_pad: decomp, elaborate globals/types

* clang-format

* don't add guards to functions.h

* semantic merge of m_cpadInfo stuff

* fix undef symbols

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Erin Moon
2021-01-03 01:04:15 -05:00
committed by GitHub
co-authored by Pheenoh
parent b679127675
commit 5c4ac052c3
38 changed files with 137 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/J3DU/J3DUDL.s
+3 -1
View File
@@ -2,7 +2,9 @@
.section .text, "ax" # 80273e08
/* only pointed at from vtables afaict, and mislabeled */
.global getUseMtxNum__11J3DShapeMtxCFv
getUseMtxNum__11J3DShapeMtxCFv:
/* 80273E08 00270D48 38 60 00 01 */ li r3, 1
/* 80273E0C 00270D4C 4E 80 00 20 */ blr
asm/JAudio2/JASSeqParser.s
+1 -1
View File
@@ -1166,7 +1166,7 @@ lbl_80294D5C:
/* 80294E70 00291DB0 40 82 00 18 */ bne lbl_80294E88
/* 80294E74 00291DB4 38 6D 8C C8 */ addi r3, r13, lbl_80451248-_SDA_BASE_
/* 80294E78 00291DB8 38 80 00 00 */ li r4, 0
/* 80294E7C 00291DBC 48 0A 4C 69 */ bl JMath_NS_TRandom_fast_
/* 80294E7C 00291DBC 48 0A 4C 69 */ bl __ct__Q25JMath13TRandom_fast_FUl
/* 80294E80 00291DC0 38 00 00 01 */ li r0, 1
/* 80294E84 00291DC4 98 0D 8C C4 */ stb r0, lbl_80451244-_SDA_BASE_(r13)
lbl_80294E88:
asm/JAudio2/JAUClusterSound.s
-11
View File
@@ -1,11 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 802a4ac4
.global JAISoundHandle
JAISoundHandle:
/* 802A4AC4 002A1A04 38 00 00 00 */ li r0, 0
/* 802A4AC8 002A1A08 90 03 00 00 */ stw r0, 0(r3)
/* 802A4ACC 002A1A0C 4E 80 00 20 */ blr
asm/JMath/random.s
-9
View File
@@ -1,9 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 80339ae4
.global JMath_NS_TRandom_fast_
JMath_NS_TRandom_fast_:
/* 80339AE4 00336A24 90 83 00 00 */ stw r4, 0(r3)
/* 80339AE8 00336A28 4E 80 00 20 */ blr
asm/JSupport/JSUList.s
-3
View File
@@ -1,3 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 802dbdfc
asm/SComponent/c/API/controller/c_API_controller_pad.s
-26
View File
@@ -1,26 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 8026328c
.global cAPICPad_recalibrate
cAPICPad_recalibrate:
/* 8026328C 002601CC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80263290 002601D0 7C 08 02 A6 */ mflr r0
/* 80263294 002601D4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80263298 002601D8 4B DA 4A DD */ bl recalibrate__8mDoCPd_cFv
/* 8026329C 002601DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802632A0 002601E0 7C 08 03 A6 */ mtlr r0
/* 802632A4 002601E4 38 21 00 10 */ addi r1, r1, 0x10
/* 802632A8 002601E8 4E 80 00 20 */ blr
.global cAPICPad_ANY_BUTTON
cAPICPad_ANY_BUTTON:
/* 802632AC 002601EC 54 64 30 32 */ slwi r4, r3, 6
/* 802632B0 002601F0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 802632B4 002601F4 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 802632B8 002601F8 7C 60 22 14 */ add r3, r0, r4
/* 802632BC 002601FC 80 03 00 34 */ lwz r0, 0x34(r3)
/* 802632C0 00260200 70 03 13 00 */ andi. r3, r0, 0x1300
/* 802632C4 00260204 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2SpeechMgr2.s
+1 -1
View File
@@ -16,7 +16,7 @@ Z2SpeechMgr2:
/* 802CBC80 002C8BC0 90 03 00 04 */ stw r0, 4(r3)
/* 802CBC84 002C8BC4 38 7F 00 08 */ addi r3, r31, 8
/* 802CBC88 002C8BC8 38 80 00 00 */ li r4, 0
/* 802CBC8C 002C8BCC 48 06 DE 59 */ bl JMath_NS_TRandom_fast_
/* 802CBC8C 002C8BCC 48 06 DE 59 */ bl __ct__Q25JMath13TRandom_fast_FUl
/* 802CBC90 002C8BD0 38 7F 00 0C */ addi r3, r31, 0xc
/* 802CBC94 002C8BD4 48 00 13 25 */ bl Z2SpeechStarter
/* 802CBC98 002C8BD8 38 00 00 00 */ li r0, 0
asm/d/file/d_file_select.s
+2 -2
View File
@@ -8132,7 +8132,7 @@ lbl_8018AD20:
/* 8018AD5C 00187C9C B0 1F 03 AC */ sth r0, 0x3ac(r31)
lbl_8018AD60:
/* 8018AD60 00187CA0 38 60 00 00 */ li r3, 0
/* 8018AD64 00187CA4 48 0D 85 49 */ bl cAPICPad_ANY_BUTTON
/* 8018AD64 00187CA4 48 0D 85 49 */ bl cAPICPad_ANY_BUTTON__FUl
/* 8018AD68 00187CA8 28 03 00 00 */ cmplwi r3, 0
/* 8018AD6C 00187CAC 40 82 00 10 */ bne lbl_8018AD7C
/* 8018AD70 00187CB0 A8 1F 03 AC */ lha r0, 0x3ac(r31)
@@ -12180,7 +12180,7 @@ lbl_8018E928:
/* 8018E948 0018B888 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8018E94C 0018B88C 7C 7F 1B 78 */ mr r31, r3
/* 8018E950 0018B890 38 60 00 00 */ li r3, 0
/* 8018E954 0018B894 48 0D 49 59 */ bl cAPICPad_ANY_BUTTON
/* 8018E954 0018B894 48 0D 49 59 */ bl cAPICPad_ANY_BUTTON__FUl
/* 8018E958 0018B898 28 03 00 00 */ cmplwi r3, 0
/* 8018E95C 0018B89C 41 82 00 40 */ beq lbl_8018E99C
/* 8018E960 0018B8A0 3C 60 80 43 */ lis r3, lbl_80430188@ha
asm/d/menu/d_menu_save.s
+1 -1
View File
@@ -2395,7 +2395,7 @@ lbl_801F1908:
/* 801F1928 001EE868 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801F192C 001EE86C 7C 7F 1B 78 */ mr r31, r3
/* 801F1930 001EE870 38 60 00 00 */ li r3, 0
/* 801F1934 001EE874 48 07 19 79 */ bl cAPICPad_ANY_BUTTON
/* 801F1934 001EE874 48 07 19 79 */ bl cAPICPad_ANY_BUTTON__FUl
/* 801F1938 001EE878 28 03 00 00 */ cmplwi r3, 0
/* 801F193C 001EE87C 41 82 00 58 */ beq lbl_801F1994
/* 801F1940 001EE880 3C 60 80 43 */ lis r3, lbl_80430188@ha
asm/d/save/d_save_init.s
-9
View File
@@ -1,9 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 80035c88
.global setInitEventBit
setInitEventBit:
/* 80035C88 00032BC8 4E 80 00 20 */ blr
asm/m/Do/m_Do_machine.s
+1 -1
View File
@@ -448,7 +448,7 @@ myExceptionCallback:
/* 8000B7DC 0000871C 90 8D 85 94 */ stw r4, lbl_80450B14-_SDA_BASE_(r13)
/* 8000B7E0 00008720 90 6D 85 90 */ stw r3, lbl_80450B10-_SDA_BASE_(r13)
/* 8000B7E4 00008724 4B FF B0 BD */ bl OSReportEnable
/* 8000B7E8 00008728 48 25 7A A5 */ bl cAPICPad_recalibrate
/* 8000B7E8 00008728 48 25 7A A5 */ bl cAPICPad_recalibrate__Fv
/* 8000B7EC 0000872C 3C 60 80 37 */ lis r3, lbl_80373DE8@ha
/* 8000B7F0 00008730 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l
/* 8000B7F4 00008734 38 63 01 19 */ addi r3, r3, 0x119
include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h
+6 -2
View File
@@ -1,8 +1,12 @@
#ifndef JAUCLUSTERSOUND_H_
#define JAUCLUSTERSOUND_H_
#include "global.h"
#include "dolphin/types.h"
struct JAISoundHandle {};
struct JAISoundHandle {
void* unk; // probably JAISound*
JAISoundHandle();
};
#endif
include/JSystem/JMath/random.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef __JSYSTEM_JMATH_RANDOM_H__
#define __JSYSTEM_JMATH_RANDOM_H__
#include "dolphin/types.h"
namespace JMath {
struct TRandom_fast_ {
u32 value;
TRandom_fast_(u32 value);
};
} // namespace JMath
// needed for Z2Calc.cpp
extern "C" {
void __ct__Q25JMath13TRandom_fast_FUl(JMath::TRandom_fast_*, u32);
};
#endif
include/SComponent/c_API_controller_pad.h
+37
View File
@@ -0,0 +1,37 @@
#ifndef __C_API_CONTROLLER_PAD__
#define __C_API_CONTROLLER_PAD__
#include "global.h"
struct interface_of_controller_pad {
f32 mMainStickPosX;
f32 mMainStickPosY;
f32 mMainStickValue;
s16 mMainStickAngle;
u8 field_0xe;
u8 field_0xf;
f32 mCStickPosX;
f32 mCStickPosY;
f32 mCStickValue;
s16 mCStickAngle;
u8 field_0x1e;
u8 field_0x1f;
f32 mAnalogA;
f32 mAnalogB;
f32 mTriggerLeft;
f32 mTriggerRight;
u32 mButtonFlags;
u32 mPressedButtonFlags;
s8 mGamepadErrorFlags;
u8 field_0x39;
u8 field_0x3a;
u8 field_0x3b;
u8 field_0x3c;
u8 field_0x3d;
u8 field_0x3e;
u8 field_0x3f;
};
void cAPICPad_recalibrate(void);
#endif
include/Z2AudioLib/Z2Calc/asm/func_802A98D4.s
+1 -1
View File
@@ -6,7 +6,7 @@
/* 802A98E8 002A6828 40 82 00 18 */ bne lbl_802A9900
/* 802A98EC 002A682C 38 6D 8D B4 */ subi r3, r13, 0x724c
/* 802A98F0 002A6830 38 80 00 00 */ li r4, 0
/* 802A98F4 002A6834 48 09 01 F1 */ bl JMath_NS_TRandom_fast_
/* 802A98F4 002A6834 48 09 01 F1 */ bl __ct__Q25JMath13TRandom_fast_FUl
/* 802A98F8 002A6838 38 00 00 01 */ li r0, 1
/* 802A98FC 002A683C 98 0D 8D B0 */ stb r0, lbl_80451330-_SDA_BASE_(r13)
lbl_802A9900:
include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h
+2
View File
@@ -76,6 +76,8 @@ void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*);
void resetMultiSePos__12Z2MultiSeMgrFv(void);
float getPanPower__12Z2MultiSeMgrFv(void);
float getDolbyPower__12Z2MultiSeMgrFv(void);
void __ct__14JAISoundHandleFv(void);
}
extern Z2SeMgr* lbl_80450B88; // Z2SeMgr sInstance
include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s
+2 -2
View File
@@ -4,8 +4,8 @@
/* 802AB658 002A8598 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802AB65C 002A859C 7C 7F 1B 78 */ mr r31, r3
/* 802AB660 002A85A0 93 ED 86 08 */ stw r31, lbl_80450B88-_SDA_BASE_(r13)
/* 802AB664 002A85A4 3C 80 80 2A */ lis r4, JAISoundHandle@ha
/* 802AB668 002A85A8 38 84 4A C4 */ addi r4, r4, JAISoundHandle@l
/* 802AB664 002A85A4 3C 80 80 2A */ lis r4, __ct__14JAISoundHandleFv@ha
/* 802AB668 002A85A8 38 84 4A C4 */ addi r4, r4, __ct__14JAISoundHandleFv@l
/* 802AB66C 002A85AC 3C A0 80 00 */ lis r5, JAISoundHandle_NS_dtor@ha
/* 802AB670 002A85B0 38 A5 78 38 */ addi r5, r5, JAISoundHandle_NS_dtor@l
/* 802AB674 002A85B4 38 C0 00 04 */ li r6, 4
include/d/d_lib/d_lib.h
+1 -2
View File
@@ -1,5 +1,6 @@
#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
#include "SComponent/c_xyz.h"
#include "f/f_op/f_op_actor.h"
#include "global.h"
struct STControl_vtable {
@@ -56,8 +57,6 @@ struct CSTControl {
u32 dLib_getEventSwitchNo(int param_1);
struct fopAc_ac_c;
bool dLib_checkActorInRectangle(fopAc_ac_c* param_1, fopAc_ac_c* param_2, cXyz const* param_3,
cXyz const* param_4);
include/d/d_save/d_save_init/d_save_init.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef __D_SAVE_INIT_H__
#define __D_SAVE_INIT_H__
extern "C" {
void setInitEventBit();
}
#endif
include/functions.h
+1 -2
View File
@@ -505,7 +505,7 @@ void DVDReadDir(void);
class mDoCPd_c;
extern "C" {
void cAPICPad_recalibrate(void);
void mDoCPd_c_NS_recalibrate(void);
}
// JSystem/JSupport/JSUList
@@ -705,7 +705,6 @@ void func_8036C740(void);
void func_8036C780(void);
void getRandom_0_1__6Z2CalcFv(void);
void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(void);
void JMath_NS_TRandom_fast_(void);
}
// d_a_horse_static

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