Skip to content

Improve CFlaahgra PAL matching - #561

Merged
encounter merged 3 commits into
mainfrom
codex/match-flaahgra
Sep 22, 2026
Merged

encounter merged 3 commits into
mainfrom
codex/match-flaahgra

Conversation

@encounter

Copy link
Copy Markdown
Member

Recover PAL/Japanese attack and damage behavior, data ownership, and virtual dispatch; five functions remain nonmatching.

@decomp-dev

decomp-dev Bot commented Sep 22, 2026

Copy link
Copy Markdown

Report for GM8E01_01 (1ca34d7 - 9f1c1f3)

No changes

Report for GM8E01_02 (1ca34d7 - 9f1c1f3)

No changes

Report for GM8E01_00 (1ca34d7 - 9f1c1f3)

No changes

Report for GM8J01_00 (1ca34d7 - 9f1c1f3)

No changes

Report for GM8E01_48 (1ca34d7 - 9f1c1f3)

No changes

Report for GM8P01_00 (1ca34d7 - 9f1c1f3)

📈 Matched code: 72.47% (+0.18%, +7100 bytes)
📈 Matched data: 74.45% (+0.05%, +464 bytes)

✅ 21 new matches
Unit Item Bytes Before After
main/MetroidPrime/Enemies/CFlaahgra .rodata +336 0.00% 100.00%
main/MetroidPrime/Cameras/CCameraShakeData CCameraShakeData::HardVertShake(float, float) +264 0.00% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::Dizzy(CStateManager&, EStateMsg, float) +244 0.00% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::UpdateHealthInfo(CStateManager&) +27 94.43% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::ShouldSpecialAttack(CStateManager&, float) +21 83.75% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::ProjectileAttack(CStateManager&, EStateMsg, float) +13 98.42% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::Faint(CStateManager&, EStateMsg, float) +12 98.43% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::SpecialAttack(CStateManager&, EStateMsg, float) +12 98.22% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::CreateProjectile(const CTransform4f&, CStateManager&) +9 98.19% 100.00%
main/MetroidPrime/Enemies/CFlaahgra .sbss +8 0.00% 100.00%
main/MetroidPrime/CCollisionActor .sbss +6 50.00% 100.00%
main/MetroidPrime/Weapons/CGameProjectile .data +3 98.15% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::~CFlaahgra() +1 99.99% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::OffLine(CStateManager&, float) +1 98.75% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::FadeOut(CStateManager&, EStateMsg, float) +1 99.80% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::TurnAround(CStateManager&, EStateMsg, float) +1 99.85% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::Dead(CStateManager&, EStateMsg, float) +1 99.92% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::UpdateHeadDamageVulnerability(CStateManager&, bool) +1 99.97% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::SetupHealthInfo(CStateManager&) +1 99.93% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::IsSphereCollider(TUniqueId) const +1 99.88% 100.00%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::UpdateAimPosition(CStateManager&, float) +1 99.99% 100.00%
📈 6 improvements in unmatched items
Unit Item Bytes Before After
main/MetroidPrime/Enemies/CFlaahgra .data +940 0.00% 77.30%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) +240 86.66% 99.99%
main/MetroidPrime/Enemies/CFlaahgra .sdata2 +160 0.00% 95.45%
main/MetroidPrime/Weapons/CEnergyProjectile CEnergyProjectile::AddToRenderer(const CFrustumPlanes&, const CStateManager&) const +119 0.00% 58.80%
main/MetroidPrime/Enemies/CFlaahgra .sdata +59 0.00% 74.07%
main/MetroidPrime/Enemies/CFlaahgra CFlaahgra::CFlaahgra(TUniqueId, const rstl::basic_string<char, rstl::char_traits<char>, rstl::rmemory_allocator>&, const CEntityInfo&, const CTransform4f&, const CAnimRes&, const CPatternedInfo&, const CActorParameters&, const CFlaahgraData&) +50 95.54% 98.92%

Comment thread src/MetroidPrime/Enemies/CFlaahgra.cpp Outdated
@Antidote

Copy link
Copy Markdown
Collaborator

config/GM8P01_00/symbols.txt has blocking conflicts that need to be resolved

@encounter
encounter merged commit 802b3b2 into main Sep 22, 2026
6 checks passed
@encounter
encounter deleted the codex/match-flaahgra branch September 22, 2026 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants