Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-14 02:31:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
EpochFlame 2021-10-21 19:30:24 -04:00
parent 6cb3be56e3
commit 4646b2be44
4 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asm/ctors.s
View File

@ -241,4 +241,3 @@ __init_cpp_exceptions_reference:
.4byte __sinit_PSMainSide_Scene_cpp
.4byte __sinit_PSMainSide_Sound_cpp
.4byte __sinit_PSMainSide_CreaturePrm_cpp

1
include/BaseParm.h
View File

@ -36,5 +36,4 @@ struct ParmString : public BaseParm {
int m_length;
};
#endif

2
include/printf.h
View File

@ -19,4 +19,4 @@ void longlong2str(void);
void long2str(void);
void parse_format(void);
#endif
#endif

70
src/sysCommonU/parameters.cpp
View File

@ -5,18 +5,19 @@
extern
/*
* --INFO--
* Address: 80413658
* Size: 0000AC
*/
BaseParm::BaseParm(Parameters* parameters, ulong rawID, char* comment)
: m_id()
, m_comment(comment)
/*
* --INFO--
* Address: 80413658
* Size: 0000AC
*/
BaseParm::BaseParm(Parameters* parameters, ulong rawID, char* comment)
: m_id()
, m_comment(comment)
{
BaseParm* parm1;
BaseParm* parm2 = nullptr;
for (parm1 = parameters->m_parmsHead; parm1 != NULL; parm1 = parm2->m_next) {
for (parm1 = parameters->m_parmsHead; parm1 != NULL;
parm1 = parm2->m_next) {
parm2 = parm1;
}
if (parm2 != nullptr) {
@ -24,7 +25,7 @@ BaseParm::BaseParm(Parameters* parameters, ulong rawID, char* comment)
} else {
parameters->m_parmsHead = this;
}
m_id = rawID;
m_id = rawID;
m_next = nullptr;
}
@ -73,7 +74,7 @@ void Parameters::read(Stream& stream)
char buffer[256];
currentID.sprint(buffer);
int parmSize = stream.readInt();
currentParm = findParm(currentID.m_id.raw);
currentParm = findParm(currentID.m_id.raw);
if (currentParm != nullptr) {
currentParm->read(stream);
} else {
@ -93,8 +94,6 @@ void Parameters::read(Stream& stream)
*/
void BaseParm::read(Stream& stream) { return; }
/*
* --INFO--
* Address: 804138C0
@ -115,56 +114,74 @@ BaseParm* Parameters::findParm(ulong rawID)
* Address: 80413924
* Size: 000034
*/
template<> void Parm<int>::read(Stream& stream) { m_value = stream.readInt(); }
template <> void Parm<int>::read(Stream& stream) { m_value = stream.readInt(); }
/*
* --INFO--
* Address: 80413958
* Size: 00002C
*/
template<> void Parm<int>::write(Stream& stream) { stream.writeInt(m_value); }
template <> void Parm<int>::write(Stream& stream) { stream.writeInt(m_value); }
/*
* --INFO--
* Address: 80413984
* Size: 000034
*/
template<> void Parm<unsigned char>::read(Stream& stream) { m_value = stream.readByte(); }
template <> void Parm<unsigned char>::read(Stream& stream)
{
m_value = stream.readByte();
}
/*
* --INFO--
* Address: 804139B8
* Size: 00002C
*/
template<> void Parm<unsigned char>::write(Stream& stream) { stream.writeByte((u8)m_value); }
template <> void Parm<unsigned char>::write(Stream& stream)
{
stream.writeByte((u8)m_value);
}
/*
* --INFO--
* Address: 804139E4
* Size: 000044
*/
template<> void Parm<bool>::read(Stream& stream) { m_value = (bool)stream.readByte(); }
template <> void Parm<bool>::read(Stream& stream)
{
m_value = (bool)stream.readByte();
}
/*
* --INFO--
* Address: 80413A28
* Size: 000034
*/
template<> void Parm<bool>::write(Stream& stream) { stream.writeByte(m_value ? 1 : 0); }
template <> void Parm<bool>::write(Stream& stream)
{
stream.writeByte(m_value ? 1 : 0);
}
/*
* --INFO--
* Address: 80413A5C
* Size: 000034
*/
template<> void Parm<float>::read(Stream& stream) { m_value = stream.readFloat(); }
template <> void Parm<float>::read(Stream& stream)
{
m_value = stream.readFloat();
}
/*
* --INFO--
* Address: 80413A90
* Size: 000028
*/
template<> void Parm<float>::write(Stream& stream) { stream.writeFloat(m_value); }
template <> void Parm<float>::write(Stream& stream)
{
stream.writeFloat(m_value);
}
#ifdef NOPE
@ -173,12 +190,13 @@ template<> void Parm<float>::write(Stream& stream) { stream.writeFloat(m_value);
* Address: 80413AB8
* Size: 0001B0
*/
ParmString::ParmString(Parameters* parameters, char* value, int length, ulong rawID, char* comment)
: BaseParm(parameters, rawID, comment)
, m_length(length)
ParmString::ParmString(Parameters* parameters, char* value, int length,
ulong rawID, char* comment)
: BaseParm(parameters, rawID, comment)
, m_length(length)
{
char* buffer = new char[m_length+1];
m_value = buffer;
char* buffer = new char[m_length + 1];
m_value = buffer;
int actualLength = strlen(value);
int i;
for (i = 0; i < actualLength; ++i) {