mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Proposal) Adjustments to "decomp" language (#308)

Browse Source 
* Adjustments to "decomp" language

* Fix a comment

* Fix accidental clang-formatting

* Fix order

* Fix order

* Remove junk

* Fix OFFSET

* Adjustments based on new suggestions

* Annotate globals

* Globals in ISLE

* More globals

* Merge from parser2 branch

* Allow prepending space for exact marker match

* To eliminate noise, require the 0x prefix on offset for marker match

* fix test from previous

* Count tab stops for indented functions to reduce MISSED_END_OF_FUNCTION noise

* FUNCTION to SYNTHETIC where needed

* Missed marker conversion on SetAtomId

* pylint cleanup, remove unused code

* Fix unexpected function end, add more unit tests

* Be more strict about synthetic name syntax

* Revert "Missed marker conversion on SetAtomId"

This reverts commit d87d665127.

* Revert "FUNCTION to SYNTHETIC where needed"

This reverts commit 8c815418d2.

* Implicit lookup by name for functions

* Fix VTABLE SYNTHETIC and other decomp markers

* Get vtable class name

* Vtable marker should identify struct

* No colon for SIZE comment

* Update README.md

* Update README.md

* Update CONTRIBUTING.md

* Update README.md

* Update README.md

* Update CONTRIBUTING.md

* Update README.md

* Update CONTRIBUTING.md

* Fix destructor/annotation

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

---------

Co-authored-by: disinvite <disinvite@users.noreply.github.com>
This commit is contained in:
Christian Semmler
2023-12-06 07:10:45 -05:00
committed by GitHub
parent 4f5b70013f
commit 494a556f8e
407 changed files with 3505 additions and 2493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
LEGO1/score.cpp
View File

@@ -15,20 +15,20 @@
DECOMP_SIZE_ASSERT(Score, 0x104)
// OFFSET: LEGO1 0x10001000
// FUNCTION: LEGO1 0x10001000
Score::Score()
{
m_unkf8 = 0;
NotificationManager()->Register(this);
}
// OFFSET: LEGO1 0x100010b0
// FUNCTION: LEGO1 0x100010b0
MxBool Score::VTable0x5c()
{
return TRUE;
}
// OFFSET: LEGO1 0x10001200
// FUNCTION: LEGO1 0x10001200
Score::~Score()
{
if (InputManager()->GetWorld() == this)
@@ -38,7 +38,7 @@ Score::~Score()
NotificationManager()->Unregister(this);
}
// OFFSET: LEGO1 0x100012a0
// FUNCTION: LEGO1 0x100012a0
MxResult Score::Create(MxDSObject& p_dsObject)
{
MxResult result = SetAsCurrentWorld(p_dsObject);
@@ -58,7 +58,7 @@ MxResult Score::Create(MxDSObject& p_dsObject)
return result;
}
// OFFSET: LEGO1 0x10001340
// FUNCTION: LEGO1 0x10001340
void Score::DeleteScript()
{
if (m_state->GetTutorialFlag()) {
@@ -71,7 +71,7 @@ void Score::DeleteScript()
}
}
// OFFSET: LEGO1 0x10001410
// FUNCTION: LEGO1 0x10001410
MxLong Score::Notify(MxParam& p)
{
MxLong ret = 0;
@@ -106,7 +106,7 @@ MxLong Score::Notify(MxParam& p)
return ret;
}
// OFFSET: LEGO1 0x10001510
// FUNCTION: LEGO1 0x10001510
MxLong Score::FUN_10001510(MxEndActionNotificationParam& p)
{
MxDSAction* action = p.GetAction();
@@ -127,7 +127,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p)
return 1;
}
// OFFSET: LEGO1 0x10001580
// FUNCTION: LEGO1 0x10001580
void Score::Stop()
{
LegoWorld::Stop();
@@ -150,7 +150,7 @@ void Score::Stop()
FUN_10015820(0, 7);
}
// OFFSET: LEGO1 0x100016d0
// FUNCTION: LEGO1 0x100016d0
MxLong Score::FUN_100016d0(MxType17NotificationParam& p)
{
MxS16 l = p.GetUnknown28();
@@ -211,7 +211,7 @@ MxLong Score::FUN_100016d0(MxType17NotificationParam& p)
return 1;
}
// OFFSET: LEGO1 0x10001980
// FUNCTION: LEGO1 0x10001980
void Score::VTable0x68(MxBool p_add)
{
LegoWorld::VTable0x68(p_add);
@@ -224,7 +224,7 @@ void Score::VTable0x68(MxBool p_add)
InputManager()->ClearWorld();
}
// OFFSET: LEGO1 0x100019d0
// FUNCTION: LEGO1 0x100019d0
void Score::Paint()
{
GifManager* gm = GetGifManager();
@@ -278,7 +278,7 @@ void Score::Paint()
}
}
// OFFSET: LEGO1 0x10001d20
// FUNCTION: LEGO1 0x10001d20
void Score::FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color)
{
MxU32 data[24];
@@ -316,7 +316,7 @@ void Score::FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color)
}
}
// OFFSET: LEGO1 0x10001e40
// FUNCTION: LEGO1 0x10001e40
MxBool Score::VTable0x64()
{
DeleteScript();