Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select

1 files changed, 8 insertions, 4 deletions

diff --git a/include/game.h b/include/game.h
index 91dd77a..1e0c484 100755
--- a/include/game.h
+++ b/include/game.h
@@ -170,7 +170,7 @@ bool IsWideScreen();
 // All of these are set by "SetWorldCompleteionBitfield" (I didn't name it)

 // at 801028D0. It's called by ScStage so it doesn't depend on Nintendo maps.

 

-#define SAVE_BIT_EXISTS_MAYBE 1

+#define SAVE_BIT_NEW 1

 

 // Controls whether you can QUICK SAVE or not. 

 // Set if 8-Castle is complete.

@@ -190,6 +190,8 @@ bool IsWideScreen();
 // Set when, well... EVERYTHING is done.

 #define SAVE_BIT_EVERYTHING_TRULY_DONE 0x20

 

+#define SAVE_BIT_NO_SUPER_GUIDE 0x40

+

 

 class SaveFirstBlock {

 public:

@@ -243,9 +245,11 @@ public:
 			GXColor fsTextColours[2]; // 0x720

 			GXColor fsHintColours[2]; // 0x728

 			GXColor hudTextColours[2]; // 0x730

-			s16 hudHintH, hudHintS, hudHintL; // 0x738

-			u8 currentMapMusic; // 0x73E

-			u8 newerWorldID; // 0x73F

+			s16 hudHintH; // 0x738

+			s8 hudHintS, hudHintL; // 0x73A

+			u8 currentMapMusic; // 0x73C

+			u8 newerWorldID; // 0x73D

+			// Pretty much full up here...

 		};

 	};

 	u8 toad_location[10];		// 0x742