More Monsters v0.5.0 - Part 2

Author: ArchbishopDave

MRDX.Game.MoreMonsters/CombinationHandler.cs

@@ -446,6 +446,10 @@ private void SetupCombinationFinalStatsUpdate ( nuint unk1 ) {
             else { ApplyTechniquesParentDifferent( childBreed ); }
 
         }
+
+        if ( _monsterCurrent.GenusMain == MonsterGenus.Worm ) { // Handle Worm Info
+            Memory.Instance.WriteRaw( Mod.address_monster_mm_wormsub, [ (byte) ( _monsterCurrent.GenusSub + 1 ) ] );
+        }
     }
 
     private void ApplyParentStatBonuses ( MonsterBreed breed, (byte, double)[] childGrowths ) {

MRDX.Game.MoreMonsters/FreezerHandler.cs

@@ -78,6 +78,10 @@ private void FreezerWriteMonsterToFreezer ( nuint self, int freezerID, int unk2
         Memory.Instance.WriteRaw( Mod.address_monster_mm_truemain, [ (byte) ( _monsterCurrent.GenusMain + 1 ) ] );
         Memory.Instance.WriteRaw( Mod.address_monster_mm_truesub, [ (byte) (_monsterCurrent.GenusSub + 1) ] );
 
+        if ( _monsterCurrent.GenusMain == MonsterGenus.Worm ) { // Handle Worm Info
+            Memory.Instance.WriteRaw( Mod.address_monster_mm_wormsub, [ (byte) ( _monsterCurrent.GenusSub + 1 ) ] );
+        }
+
         _hook_freezerWriteFreezer!.OriginalFunction( self, freezerID, unk2 );
 
 

MRDX.Game.MoreMonsters/ManualRedirector/Resources/data/mf2/data/mon/mochy/mo_me.tex

@@ -77,6 +77,9 @@ [ HookDef( BaseGame.Mr2, Region.Us, "51 56 8B F1 8B 0D ?? ?? ?? ??" )]
 [Function( CallingConventions.Fastcall )]
 public delegate void H_LoadingRanch ( int unk1, int unk2, nuint unk3, nuint unk4 );
 
+[HookDef( BaseGame.Mr2, Region.Us, "55 8B EC 83 E4 F8 83 EC 24 A1 ?? ?? ?? ?? 33 C4 89 44 24 ?? 53" ) ]
+[Function( CallingConventions.MicrosoftThiscall )]
+public delegate void H_WormCocoonStart ( nuint unk1, nuint unk2, nuint unk3ptr );
 
 
 public class Mod : ModBase // <= Do not Remove.
@@ -96,14 +99,16 @@ public class Mod : ModBase // <= Do not Remove.
 
     // Offsets are exact for monster values. For Freezer Data, add +2.
     public static short memory_mm_version = 1; // Versioning starts at 1, with 0.5.0
-    public static nuint offset_mm_version { get { return 0x15C; } }
+    public static nuint offset_mm_version { get { return 0x159; } }
+    public static nuint offset_mm_wormsub { get { return 0x162; } }
     public static nuint offset_mm_truemain { get { return 0x163; } }
     public static nuint offset_mm_alternate { get { return 0x164; } }
     public static nuint offset_mm_scaling { get { return 0x165; } }
     public static nuint offset_mm_truesub { get { return 0x166; } }
     public static nuint offset_mm_trueguts { get { return 0x167; } }
 
     public static nuint address_monster_mm_version { get { return address_monster + offset_mm_version; } }
+    public static nuint address_monster_mm_wormsub { get { return address_monster + offset_mm_wormsub; } }
     public static nuint address_monster_mm_truemain {  get { return address_monster + offset_mm_truemain; } }
     public static nuint address_monster_mm_alternate { get { return address_monster + offset_mm_alternate; } }
     public static nuint address_monster_mm_scaling { get { return address_monster + offset_mm_scaling; } }
@@ -139,6 +144,8 @@ public class Mod : ModBase // <= Do not Remove.
     private IHook<H_FileSave> _hook_fileSave;
     private IHook<H_LoadingRanch> _hook_loadingRanch;
 
+    private IHook<H_WormCocoonStart> _hook_wormCocoonStart;
+
     private IHook<H_ShrineMonsterUnlockedChecker> _hook_shrineMonsterUnlockedChecker;
 
     private int _loadedFileCorrectFreezer = 0;
@@ -150,7 +157,6 @@ public class Mod : ModBase // <= Do not Remove.
 
     private Dictionary<int, (MMBreed, byte)> _songIDMapping = new Dictionary<int, (MMBreed, byte)>();
 
-
     private IHook<H_GetMonsterBreedName> _hook_monsterBreedNames;
 
     public CombinationHandler handlerCombination;
@@ -235,6 +241,8 @@ public Mod(ModContext context)
 
         _iHooks.AddHook<H_LoadingRanch>( HFLoadingRanch ).ContinueWith( result => _hook_loadingRanch = result.Result );
 
+        //_iHooks.AddHook<H_WormCocoonStart>( HF_WormCocoonStart ).ContinueWith( result => _hook_wormCocoonStart = result.Result );
+
         _iHooks.AddHook<H_ShrineMonsterUnlockedChecker>( CheckShrineMonsterUnlocked ).ContinueWith( result => _hook_shrineMonsterUnlockedChecker = result.Result );
 
         handlerFreezer = new FreezerHandler( this, _iHooks, _monsterCurrent );
@@ -598,14 +606,18 @@ private int SetupMysteryStat ( nuint self ) {
         var ret = _hook_statUpdate!.OriginalFunction( self );
 
         if ( shrineReplacementActive ) {
-            // TODO - Choose Random Variant or something akin to that. _shrineReplacementMonster._monsterVariants[ 0 ];
             var variant = MonsterBreed.GetBreed( _shrineReplacementMonster._genusNewMain, _shrineReplacementMonster._genusNewSub );
             WriteMonsterData( variant );
 
             Memory.Instance.Write( address_monster_mm_alternate, _shrineMonsterAlternate );
 
             shrineReplacementActive = false;
         }
+
+        if ( _monsterCurrent.GenusMain == MonsterGenus.Worm ) { // Handle Worm Info
+            Memory.Instance.WriteRaw( Mod.address_monster_mm_wormsub, [ (byte) ( _monsterCurrent.GenusSub + 1 ) ] );
+        }
+
         return ret;
     }
 
@@ -764,6 +776,7 @@ private void VersionUpdateFreezerMonster_V0x5x0_MM1 ( byte freezerSlot ) {
         var mainPosMM = startPos + offset_mm_truemain + 0x8;
         var subPosMM = startPos + offset_mm_truesub + 0x8;
         var gutsPosMM = startPos + offset_mm_trueguts + 0x8;
+        var wormPosMM = startPos + offset_mm_wormsub + 0x8;
 
         byte mmMain = (byte) ( mainA + 1 );
         byte mmSub = (byte) ( subA + 1 );
@@ -782,6 +795,11 @@ private void VersionUpdateFreezerMonster_V0x5x0_MM1 ( byte freezerSlot ) {
             Memory.Instance.Write<Byte>( gutsPosMM, ref gutsA );
         }
 
+        // Handle Worm
+        if ( (MonsterGenus) mainA == MonsterGenus.Worm ) {
+            Memory.Instance.Write<byte>( wormPosMM, ref mmSub );
+        }
+
         Logger.Info( $"Monster in Freezer Slot {freezerSlot} updated to Version 0.5.0 Standards (v1)." );
     }
 
@@ -880,6 +898,25 @@ private void HFLoadingRanch ( int unk1, int unk2, nuint unk3, nuint unk4 ) {
         Memory.Instance.WriteRaw( address_game + 0x571470, rawSoundData );
     }
 
+    /// <summary>
+    /// This function refuses to hook properly so we're doing it another way for now. Leaving it in as this is the PROPER way to do things.
+    /// THis should be writing the Worm's Sub ON Cocoon, instead it crashes the game. Cool!
+    /// </summary>
+    /// <param name="self"></param>
+    /// <param name="unk1"></param>
+    /// <param name="unk2"></param>
+    /// <param name="unk3ptr"></param>
+    public void HF_WormCocoonStart ( nuint unk1, nuint unk2, nuint unk3ptr ) {
+        
+        Logger.Debug( $"Worm Cocoon Starting with {unk1}, {unk2}, {unk3ptr}.", Color.WhiteSmoke );
+        byte wormSub = (byte) ( (byte) _monsterCurrent.GenusSub + 1);
+        Memory.Instance.Write<byte>( address_monster_mm_wormsub, ref wormSub );
+
+        _hook_wormCocoonStart!.OriginalFunction( unk1, unk2, unk3ptr );
+        Logger.Debug( $"Worm Sub : {wormSub} written to MM Data.", Color.WhiteSmoke );
+
+
+    }
     /// <summary>
     ///     This function replaces the location where the game is looking for sound data when wandering around on the ranch.
     ///     Errantry files can only be of length 0x7EF.

MRDX.Game.MoreMonsters/ManualRedirector/Resources/data/mf2/data/mon/mochy/mo_me_bt.tex

@@ -220,3 +220,5 @@
 1272626	0	Skele Zilla	17	26	17	0	310	-40	3	140	150	130	110	80	100	3	3	2	2	1	2	1	16	1031	1001	1024
 1272627	0	Dire Penguin	25	34	25	25	310	0	0	110	110	130	120	90	170	2	2	2	2	2	3	1	14	7	10001	0
 1272628	0	Display Case	34	4	34	34	270	5	1	110	140	100	90	40	190	2	2	1	1	0	4	0	16	67	1000001	64
+1272629	0	Golden Mocchi	25	15	25	25	310	75	0	110	110	140	130	130	120	2	2	3	3	2	3	2	13	7	10001	0
+1272630	0	Probe Worm	36	22	36	33	320	-5	0	130	70	70	140	50	120	3	2	1	3	0	2	2	11	3	1001	0

MRDX.Game.MoreMonsters/ManualRedirector/Resources/data/mf2/data/mon/mzmus/mz_ml.tex

@@ -41,7 +41,7 @@ Monster size variations are random from the shrine, and partially inherited from
 
 ##### v0.5.0 - 3/22/26
 
-* 2 additional monsters combinations have been added!
+* 4 additional monsters combinations have been added!
 * Fixed an issue where using guaranteed monster combination items (Phoenix Feather, Ducken Doll, etc.) would crash the game.
 * Fixed an issue where Japanese Version generated monsters in VS Mode could load incorrectly.
 * Fixed a rare issue where all More Monster related data would be removed from monsters in the freezer, reverting them to Base/Base monsters.