Link CHUDMemoParms.cpp, minor data fixes

asm/MetroidPrime/Decode.s

@@ -438,10 +438,8 @@ lbl_803CCF28:
 	# ROM: 0x3C9F28
 	.asciz "Msg[%3d] %s"
 	.asciz "-------------------------"
-	.byte 0x44, 0x72
-	.asciz "aw[%3d] %s"
-	.byte 0x3F
-	.asciz "?(??)"
+	.asciz "Draw[%3d] %s"
+	.asciz "??(??)"
 	.balign 4
 	.4byte 0
 

asm/MetroidPrime/Tweaks/CTweaks.s

@@ -1954,27 +1954,19 @@ lbl_800371A0:
 lbl_803CCD88:
 	# ROM: 0x3C9D88
 	.asciz "GunRes"
-	.byte 0x3F
-	.asciz "?(??)"
-	.byte 0x50, 0x6C
-	.asciz "ayerRes"
+	.asciz "??(??)"
+	.asciz "PlayerRes"
 	.asciz "Particle"
-	.byte 0x50, 0x6C, 0x61
-	.4byte 0x79657200
+	.asciz "Player"
 	.asciz "CameraBob"
-	.byte 0x42, 0x61
-	.4byte 0x6C6C0050
-	.asciz "layerGun"
-	.byte 0x54, 0x61, 0x72
-	.asciz "geting"
-	.byte 0x47
-	.4byte 0x616D6500
+	.asciz "Ball"
+	.asciz "PlayerGun"
+	.asciz "Targeting"
+	.asciz "Game"
 	.asciz "GuiColors"
-	.byte 0x41, 0x75
-	.asciz "toMapper"
-	.byte 0x47, 0x75, 0x69
-	.4byte 0x00506C61
-	.asciz "yerControls"
+	.asciz "AutoMapper"
+	.asciz "Gui"
+	.asciz "PlayerControls"
 	.asciz "PlayerControls2"
 	.asciz "SlideShow"
 	.balign 4

include/MetroidPrime/HUD/CHUDMemoParms.hpp

@@ -0,0 +1,21 @@
+#ifndef __CHUDMEMOPARMS_HPP__
+#define __CHUDMEMOPARMS_HPP__
+
+#include "types.h"
+class CInputStream;
+class CHUDMemoParms {
+public:
+    CHUDMemoParms(CInputStream& in);
+    
+    float GetDisplayTime() const { return mDispTime; }
+    bool IsClearMemoWindow() const { return mClearMemoWindow; }
+    bool IsFadeOutOnly() const { return mFadeOutOnly; }
+    bool IsHintMemo() const { return mHintMemo; }
+    
+private:
+    float mDispTime;
+    bool mClearMemoWindow;
+    bool mFadeOutOnly;
+    bool mHintMemo;
+};
+#endif // __CHUDMEMOPARMS_HPP__

obj_files.mk

@@ -111,7 +111,7 @@ METROIDPRIME :=\
 	$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.o\
 	$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.o\
 	$(BUILD_DIR)/asm/MetroidPrime/Enemies/CBeetle.o\
-	$(BUILD_DIR)/asm/MetroidPrime/HUD/CHUDMemoParms.o\
+	$(BUILD_DIR)/src/MetroidPrime/HUD/CHUDMemoParms.o\
 	$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.o\
 	$(BUILD_DIR)/asm/MetroidPrime/CMappableObject.o\
 	$(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerCameraBob.o\

src/MetroidPrime/HUD/CHUDMemoParms.cpp

@@ -0,0 +1,5 @@
+#include "MetroidPrime/HUD/CHUDMemoParms.hpp"
+#include "Kyoto/Streams/CInputStream.hpp"
+
+CHUDMemoParms::CHUDMemoParms(CInputStream& in)
+: mDispTime(in.ReadFloat()), mClearMemoWindow(in.ReadBool()), mFadeOutOnly(false), mHintMemo(false) {}