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

Matching spree (#98)

Browse Source 
* LegoNavController: Match CalculateNewTargetSpeed

Ghidra showed this correctly too, but the asm showed the problem simply, an incorrect comparison

* Match a MxPresenter vtable function

* Match known functions in LegoPhonemePresenter

* Revert "LegoNavController: Match CalculateNewTargetSpeed"

This reverts commit 718489923b.

* MxPresenter: rename tickle flag fields

* LegoPhonemePresenter: add size assert

---------

Co-authored-by: MattKC <34096995+itsmattkc@users.noreply.github.com>
This commit is contained in:
Joshua Peisach
2023-08-28 05:38:46 -04:00
committed by GitHub
parent 1d104141b5
commit 23457da730
4 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
LEGO1/mxpresenter.cpp
View File

@@ -4,20 +4,21 @@
DECOMP_SIZE_ASSERT(MxPresenter, 0x40);
// OFFSET: LEGO1 0x1000bee0 STUB
// OFFSET: LEGO1 0x1000bee0
void MxPresenter::DoneTickle()
{
// TODO
m_previousTickleFlags |= 1 << m_currentTickleFlag;
m_currentTickleFlag = 0;
}
// OFFSET: LEGO1 0x100b4d50
void MxPresenter::Init()
{
m_unk0x8 = 0;
m_currentTickleFlag = 0;
m_action = NULL;
m_unk0x18 = 0;
m_unk0x3c = 0;
m_unk0xc = 0;
m_previousTickleFlags = 0;
m_unk0x10 = 0;
m_unk0x14 = 0;
}
@@ -70,36 +71,36 @@ void MxPresenter::VTable0x14()
void MxPresenter::VTable0x18()
{
ParseExtra();
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 2;
m_previousTickleFlags |= 1 << (unsigned char)m_currentTickleFlag;
m_currentTickleFlag = 2;
}
// OFFSET: LEGO1 0x1000be60
void MxPresenter::VTable0x1c()
{
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 3;
m_previousTickleFlags |= 1 << (unsigned char)m_currentTickleFlag;
m_currentTickleFlag = 3;
}
// OFFSET: LEGO1 0x1000be80
void MxPresenter::VTable0x20()
{
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 4;
m_previousTickleFlags |= 1 << (unsigned char)m_currentTickleFlag;
m_currentTickleFlag = 4;
}
// OFFSET: LEGO1 0x1000bea0
void MxPresenter::VTable0x24()
{
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 5;
m_previousTickleFlags |= 1 << (unsigned char)m_currentTickleFlag;
m_currentTickleFlag = 5;
}
// OFFSET: LEGO1 0x1000bec0
void MxPresenter::VTable0x28()
{
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = 6;
m_previousTickleFlags |= 1 << (unsigned char)m_currentTickleFlag;
m_currentTickleFlag = 6;
}
// OFFSET: LEGO1 0x1000bf70
@@ -116,14 +117,14 @@ void MxPresenter::InitVirtual()
// OFFSET: LEGO1 0x1000bf90
void MxPresenter::VTable0x44(undefined4 param)
{
m_unk0xc |= 1 << (unsigned char)m_unk0x8;
m_unk0x8 = param;
m_previousTickleFlags |= 1 << (unsigned char)m_currentTickleFlag;
m_currentTickleFlag = param;
}
// OFFSET: LEGO1 0x1000bfb0
unsigned char MxPresenter::VTable0x48(unsigned char param)
{
return m_unk0xc & (1 << param);
return m_previousTickleFlags & (1 << param);
}
// OFFSET: LEGO1 0x1000bfc0