Merge pull request #326 from roblabla/perfect-matching-v2

Perfect matching v2

config/ghidra_ns_to_obj.csv

@@ -6,8 +6,8 @@ Chain,th06::Chain,th06::ChainElem
 EclManager,th06::EclManager
 EffectManager,th06::EffectManager
 Ending,th06::Ending
-Enemy,th06::Enemy
-EnemyManager,th06::EnemyManager
+EnemyEclInstr,th06::EnemyEclInstr
+EnemyManager,th06::EnemyManager,th06::Enemy
 FileAbstraction,th06::FileAbstraction
 FileSystem,th06::FileSystem
 GameErrorContext,th06::GameErrorContext

config/implemented.csv

@@ -101,6 +101,7 @@ th06::Ending::FadingEffect
 th06::Ending::LoadEnding
 th06::Ending::ReadEndFileParameter
 th06::Ending::ParseEndFile
+th06::EffectManager::EffectManager
 th06::EffectManager::Reset
 th06::EffectManager::AddedCallback
 th06::EffectManager::DeletedCallback
@@ -116,6 +117,7 @@ th06::EffectManager::EffectUpdateCallback4
 th06::EffectManager::EffectCallbackAttract
 th06::EffectManager::EffectCallbackAttractSlow
 th06::EnemyManager::Initialize
+th06::EnemyManager::EnemyManager
 th06::EnemyManager::RegisterChain
 th06::EnemyManager::CutChain
 th06::EnemyManager::AddedCallback
@@ -124,42 +126,43 @@ th06::EnemyManager::OnUpdate
 th06::EnemyManager::OnDraw
 th06::EnemyManager::RunEclTimeline
 th06::EnemyManager::SpawnEnemy
-th06::Enemy::GetVar
-th06::Enemy::GetVarFloat
-th06::Enemy::SetVar
-th06::Enemy::MathAdd
-th06::Enemy::MathSub
-th06::Enemy::MathMul
-th06::Enemy::MathDiv
-th06::Enemy::MathMod
-th06::Enemy::MathAtan2
+th06::EnemyEclInstr::GetVar
+th06::EnemyEclInstr::GetVarFloat
+th06::EnemyEclInstr::SetVar
+th06::EnemyEclInstr::MathAdd
+th06::EnemyEclInstr::MathSub
+th06::EnemyEclInstr::MathMul
+th06::EnemyEclInstr::MathDiv
+th06::EnemyEclInstr::MathMod
+th06::EnemyEclInstr::MathAtan2
+th06::EnemyEclInstr::MoveTime
+th06::EnemyEclInstr::MoveDirTime
+th06::EnemyEclInstr::MovePosTime
+th06::EnemyEclInstr::ExInsCirnoRainbowBallJank
+th06::EnemyEclInstr::ExInsShootAtRandomArea
+th06::EnemyEclInstr::ExInsShootStarPattern
+th06::EnemyEclInstr::ExInsPatchouliShottypeSetVars
+th06::EnemyEclInstr::ExInsStage56Func4
+th06::EnemyEclInstr::ExInsStage5Func5
+th06::EnemyEclInstr::ExInsStage6XFunc6
+th06::EnemyEclInstr::ExInsStage6Func7
+th06::EnemyEclInstr::ExInsStage6Func8
+th06::EnemyEclInstr::ExInsStage6Func9
+th06::EnemyEclInstr::ExInsStage6Func11
+th06::EnemyEclInstr::ExInsStage6XFunc10
+th06::EnemyEclInstr::ExInsStage4Func12
+th06::EnemyEclInstr::ExInsStageXFunc13
+th06::EnemyEclInstr::ExInsStageXFunc14
+th06::EnemyEclInstr::ExInsStageXFunc15
+th06::EnemyEclInstr::ExInsStageXFunc16
+th06::Enemy::Enemy
 th06::Enemy::Move
-th06::Enemy::MoveTime
-th06::Enemy::MoveDirTime
-th06::Enemy::MovePosTime
 th06::Enemy::ClampPos
 th06::Enemy::HandleLifeCallback
 th06::Enemy::HandleTimerCallback
 th06::Enemy::Despawn
 th06::Enemy::ResetEffectArray
 th06::Enemy::UpdateEffects
-th06::Enemy::ExInsCirnoRainbowBallJank
-th06::Enemy::ExInsShootAtRandomArea
-th06::Enemy::ExInsShootStarPattern
-th06::Enemy::ExInsPatchouliShottypeSetVars
-th06::Enemy::ExInsStage56Func4
-th06::Enemy::ExInsStage5Func5
-th06::Enemy::ExInsStage6XFunc6
-th06::Enemy::ExInsStage6Func7
-th06::Enemy::ExInsStage6Func8
-th06::Enemy::ExInsStage6Func9
-th06::Enemy::ExInsStage6Func11
-th06::Enemy::ExInsStage6XFunc10
-th06::Enemy::ExInsStage4Func12
-th06::Enemy::ExInsStageXFunc13
-th06::Enemy::ExInsStageXFunc14
-th06::Enemy::ExInsStageXFunc15
-th06::Enemy::ExInsStageXFunc16
 th06::GameErrorContext::Fatal
 th06::GameErrorContext::Log
 th06::GameErrorContext::Flush

config/mapping.csv

@@ -47,36 +47,36 @@ th06::EclManager::Load,0x407340,0xb2,__thiscall,,ZunResult,EclManager*,char*
 th06::EclManager::Unload,0x407400,0x32,__thiscall,,void,EclManager*
 th06::EclManager::CallEclSub,0x407440,0x54,__thiscall,,ZunResult,EclManager*,EnemyEclContext*,i16
 th06::EclManager::RunEcl,0x4074a0,0x3504,__thiscall,,ZunResult,EclManager*,Enemy*
-th06::Enemy::MoveDirTime,0x40abe0,0x123,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::MovePosTime,0x40ad10,0x166,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::MoveTime,0x40ae80,0x12c,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::GetVar,0x40afb0,0x36c,default,,i32*,Enemy*,EclVarId*,EclValueType*
-th06::Enemy::GetVarFloat,0x40b380,0x40,default,,f32*,Enemy*,f32*,EclValueType*
-th06::Enemy::SetVar,0x40b3c0,0x58,default,,void,Enemy*,EclVarId,void*
-th06::Enemy::MathAdd,0x40b420,0xa1,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
-th06::Enemy::MathSub,0x40b4d0,0xa1,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
-th06::Enemy::MathMul,0x40b580,0xcc,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
-th06::Enemy::MathDiv,0x40b650,0xa4,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
-th06::Enemy::MathMod,0x40b700,0xca,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
-th06::Enemy::MathAtan2,0x40b7d0,0xbe,default,,void,Enemy*,EclVarId,f32*,f32*,f32*,f32*
+th06::EnemyEclInstr::MoveDirTime,0x40abe0,0x123,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::MovePosTime,0x40ad10,0x166,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::MoveTime,0x40ae80,0x12c,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::GetVar,0x40afb0,0x36c,default,,i32*,Enemy*,EclVarId*,EclValueType*
+th06::EnemyEclInstr::GetVarFloat,0x40b380,0x40,default,,f32*,Enemy*,f32*,EclValueType*
+th06::EnemyEclInstr::SetVar,0x40b3c0,0x58,default,,void,Enemy*,EclVarId,void*
+th06::EnemyEclInstr::MathAdd,0x40b420,0xa1,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
+th06::EnemyEclInstr::MathSub,0x40b4d0,0xa1,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
+th06::EnemyEclInstr::MathMul,0x40b580,0xcc,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
+th06::EnemyEclInstr::MathDiv,0x40b650,0xa4,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
+th06::EnemyEclInstr::MathMod,0x40b700,0xca,default,,void,Enemy*,EclVarId,EclVarId*,EclVarId*
+th06::EnemyEclInstr::MathAtan2,0x40b7d0,0xbe,default,,void,Enemy*,EclVarId,f32*,f32*,f32*,f32*
 D3DXVec3Length,0x40b890,0x4a,__stdcall,,f32,D3DXVECTOR3*
-th06::Enemy::ExInsCirnoRainbowBallJank,0x40b8e0,0x19e,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsShootAtRandomArea,0x40ba80,0xf4,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsShootStarPattern,0x40bb80,0x574,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsPatchouliShottypeSetVars,0x40c100,0x75,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage56Func4,0x40c180,0x42a,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage5Func5,0x40c5b0,0x533,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage6XFunc6,0x40caf0,0x550,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage6Func7,0x40d040,0x3bb,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage6Func8,0x40d400,0x125,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage6Func9,0x40d530,0x238,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage6Func11,0x40d770,0x1b6,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage6XFunc10,0x40d930,0x164,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStage4Func12,0x40daa0,0x114,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStageXFunc13,0x40dbc0,0xf2,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStageXFunc14,0x40dcc0,0x139,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStageXFunc15,0x40de00,0x3ae,default,,void,Enemy*,EclRawInstr*
-th06::Enemy::ExInsStageXFunc16,0x40e1b0,0x114,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsCirnoRainbowBallJank,0x40b8e0,0x19e,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsShootAtRandomArea,0x40ba80,0xf4,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsShootStarPattern,0x40bb80,0x574,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsPatchouliShottypeSetVars,0x40c100,0x75,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage56Func4,0x40c180,0x42a,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage5Func5,0x40c5b0,0x533,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage6XFunc6,0x40caf0,0x550,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage6Func7,0x40d040,0x3bb,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage6Func8,0x40d400,0x125,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage6Func9,0x40d530,0x238,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage6Func11,0x40d770,0x1b6,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage6XFunc10,0x40d930,0x164,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStage4Func12,0x40daa0,0x114,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStageXFunc13,0x40dbc0,0xf2,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStageXFunc14,0x40dcc0,0x139,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStageXFunc15,0x40de00,0x3ae,default,,void,Enemy*,EclRawInstr*
+th06::EnemyEclInstr::ExInsStageXFunc16,0x40e1b0,0x114,default,,void,Enemy*,EclRawInstr*
 th06::EffectManager::EffectManager,0x40e2d0,0x65,__thiscall,,u32*,EffectManager*
 th06::EffectManager::Reset,0x40e340,0x19,__thiscall,,void,EffectManager*
 th06::EffectManager::EffectCallbackRandomSplash,0x40e360,0x24d,default,,i32,Effect*

objdiff.json

@@ -83,10 +83,10 @@
             "reverse_fn_order": false
         },
         {
-            "name": "Enemy",
+            "name": "EnemyEclInstr",
 
-            "target_path": "build/objdiff/orig/Enemy.obj",
-            "base_path": "build/objdiff/reimpl/Enemy.obj",
+            "target_path": "build/objdiff/orig/EnemyEclInstr.obj",
+            "base_path": "build/objdiff/reimpl/EnemyEclInstr.obj",
 
             "reverse_fn_order": false
         },

scripts/configure.py

@@ -95,7 +95,7 @@ def configure(build_type):
             "Stage",
             "BombData",
             "EclManager",
-            "Enemy",  # ECL instructions.
+            "EnemyEclInstr",
             "EffectManager",
             "Ending",
             "EnemyManager",