Version 1.7

Added NTSC-J support

MPItemTracker/MPItemTracker.csproj

@@ -54,8 +54,9 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Memory\Constants\MPT_MP1_NTSC_J.cs" />
     <Compile Include="Memory\Constants\MPT_MP1_PAL.cs" />
-    <Compile Include="Memory\Constants\MPT_MP1_NTSC.cs" />
+    <Compile Include="Memory\Constants\MPT_MP1_NTSC_U.cs" />
     <Compile Include="Memory\Constants\MP1_NTSC_1_02.cs" />
     <Compile Include="Memory\Constants\MP1_PAL.cs" />
     <Compile Include="Memory\Constants\_MP1.cs" />

MPItemTracker/Memory/Constants/MPT_MP1_NTSC_J.cs

@@ -0,0 +1,361 @@
+using System;
+
+namespace Prime.Memory.Constants
+{
+    internal class MPT_MP1_NTSC_J : _MP1
+    {
+        internal const long OFF_CGAMEGLOBALOBJECTS = 0x4DEF10;
+        internal const long OFF_CGAMESTATE = OFF_CGAMEGLOBALOBJECTS + 0x134;
+        internal const long OFF_CSTATEMANAGER = 0x4BF69C;
+        internal const long OFF_MORPHBALLBOMBS_COUNT = 0x4C0F20;
+
+        internal override long CPlayer
+        {
+            get
+            {
+                long result = Dolphin.ReadUInt32(GC.RAMBaseAddress + OFF_CSTATEMANAGER + OFF_CPLAYER);
+                if (result < GC.RAMBaseAddress)
+                    return -1;
+                return result;
+            }
+        }
+
+        internal override long CWorld
+        {
+            get
+            {
+                long result = Dolphin.ReadUInt32(GC.RAMBaseAddress + OFF_CSTATEMANAGER + OFF_CWORLD);
+                if (result < GC.RAMBaseAddress)
+                    return -1;
+                return result;
+            }
+        }
+
+        internal override long CGameState
+        {
+            get
+            {
+                long result = Dolphin.ReadUInt32(GC.RAMBaseAddress + OFF_CGAMESTATE);
+                if (result < GC.RAMBaseAddress)
+                    return -1;
+                return result;
+            }
+        }
+
+        internal override long CPlayerState
+        {
+            get
+            {
+                long result = Dolphin.ReadUInt32(GC.RAMBaseAddress + OFF_CSTATEMANAGER + OFF_CPLAYERSTATE);
+                if (result < GC.RAMBaseAddress)
+                    return -1;
+                return result;
+            }
+        }
+
+        internal override long IGT
+        {
+            get
+            {
+                if (CGameState == -1)
+                    return -1;
+                return (long)(Dolphin.ReadFloat64(CGameState + OFF_PLAYTIME + 8) * 1000);
+            }
+        }
+
+        internal override string IGTAsStr
+        {
+            get
+            {
+                if (IGT == -1)
+                    return "00:00:00.000";
+                return String.Format("{0:00}:{1:00}:{2:00}.{3:000}", IGT / (60 * 60 * 1000), (IGT / (60 * 1000)) % 60, (IGT / 1000) % 60, IGT % 1000);
+            }
+        }
+
+        internal override bool IsMorphed
+        {
+            get
+            {
+                if (CPlayer == -1)
+                    return false;
+                return Dolphin.ReadInt32(CWorld + OFF_CWORLD_MORPHSTATE) == 1;
+            }
+        }
+
+        internal override bool IsSwitchingState
+        {
+            get
+            {
+                if (CPlayer == -1)
+                    return false;
+                return Dolphin.ReadInt32(CWorld + OFF_CWORLD_MORPHSTATE) == 3;
+            }
+        }
+
+        internal override int MaxMissiles
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return 0;
+                return Dolphin.ReadInt32(CPlayerState + OFF_MAX_MISSILES + 4);
+            }
+        }
+
+        internal override int MaxPowerBombs
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return 0;
+                return Dolphin.ReadInt32(CPlayerState + OFF_MAX_POWERBOMBS + 4);
+            }
+        }
+
+        internal override bool HaveIceBeam
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_ICEBEAM_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveWaveBeam
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_WAVEBEAM_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HavePlasmaBeam
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_PLASMABEAM_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveMissiles
+        {
+            get
+            {
+                return MaxMissiles > 0;
+            }
+        }
+
+        internal override bool HaveMorphBallBombs
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_MORPHBALLBOMBS_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HavePowerBombs
+        {
+            get
+            {
+                return MaxPowerBombs > 0;
+            }
+        }
+
+        internal override bool HaveFlamethrower
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_FLAMETHROWER_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveThermalVisor
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_THERMALVISOR_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveChargeBeam
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_CHARGEBEAM_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveSuperMissile
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_SUPERMISSILE_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveGrappleBeam
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_GRAPPLEBEAM_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveXRayVisor
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_XRAYVISOR_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveIceSpreader
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_ICESPREADER_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveSpaceJumpBoots
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_SPACEJUMPBOOTS_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveMorphBall
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_MORPHBALL_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveBoostBall
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_BOOSTBALL_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveSpiderBall
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_SPIDERBALL_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveGravitySuit
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_GRAVITYSUIT_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveVariaSuit
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_VARIASUIT_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HavePhazonSuit
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_PHAZONSUIT_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool HaveWavebuster
+        {
+            get
+            {
+                if (CPlayerState == -1)
+                    return false;
+                return Dolphin.ReadInt32(CPlayerState + OFF_WAVEBUSTER_OBTAINED + 4) > 0;
+            }
+        }
+
+        internal override bool Artifacts(int index)
+        {
+            var offset = default(long);
+            if (CPlayerState == -1)
+                return false;
+            if (index < 0)
+                throw new Exception("Index can't be negative");
+            offset = CPlayerState + 4;
+            switch (index)
+            {
+                case 0:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_TRUTH_OBTAINED) > 0;
+                case 1:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_STRENGTH_OBTAINED) > 0;
+                case 2:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_ELDER_OBTAINED) > 0;
+                case 3:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_WILD_OBTAINED) > 0;
+                case 4:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_LIFEGIVER_OBTAINED) > 0;
+                case 5:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_WARRIOR_OBTAINED) > 0;
+                case 6:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_CHOZO_OBTAINED) > 0;
+                case 7:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_NATURE_OBTAINED) > 0;
+                case 8:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_SUN_OBTAINED) > 0;
+                case 9:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_WORLD_OBTAINED) > 0;
+                case 10:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_SPIRIT_OBTAINED) > 0;
+                case 11:
+                    return Dolphin.ReadInt32(offset + OFF_ARTIFACT_OF_NEWBORN_OBTAINED) > 0;
+                default:
+                    throw new Exception("There are no artifacts past the 12th artifact");
+            }
+        }
+    }
+}

MPItemTracker/Memory/Constants/MPT_MP1_NTSC.cs → MPItemTracker/Memory/Constants/MPT_MP1_NTSC_U.cs

@@ -2,12 +2,12 @@
 
 namespace Prime.Memory.Constants
 {
-    internal class MPT_MP1_NTSC : _MP1
+    internal class MPT_MP1_NTSC_U : _MP1
     {
         internal const long OFF_CGAMEGLOBALOBJECTS = 0x4DEC90;
         internal const long OFF_CGAMESTATE = OFF_CGAMEGLOBALOBJECTS + 0x134;
         internal const long OFF_CSTATEMANAGER = 0x4BF41C;
-        internal const long OFF_MORPHBALLBOMBS_COUNT = 0x4C0F20;
+        internal const long OFF_MORPHBALLBOMBS_COUNT = 0x4C11A0;
 
         internal override long CPlayer
         {