From 290420606a0fe41740110a6c1423b9f428f9e6dc Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sun, 15 Dec 2019 13:52:32 +0100
Subject: [PATCH] More shuffling of extra stage bits.

---
 create_mdb.py | 4 ++--
 dump_mdb.py   | 2 +-
 mdb_bin.ksy   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/create_mdb.py b/create_mdb.py
index 0131cfb..bbd5e40 100755
--- a/create_mdb.py
+++ b/create_mdb.py
@@ -87,8 +87,8 @@ with open(output_filename, 'wb') as tabfile:
 		e += struct.pack('B', entry['rating']['double_expert'] | (entry['rating']['double_challenge'] << 4))
 		e += struct.pack('<H', 0)   # Always zero.
 		e += struct.pack('B', (
-			(entry['extra_stage_bit1'] << 7) |
-			(MdbBin.ExtraStageInfo[entry['extra_stage']].value << 5) |
+			(MdbBin.ExtraStageInfo[entry['extra_stage']].value << 6) |
+			(entry['extra_stage_bit3'] << 5) |
 			(entry['extra_stage_bit4'] << 4) |
 			entry['song_type']
 		))
diff --git a/dump_mdb.py b/dump_mdb.py
index 52af40b..2a4ba0d 100755
--- a/dump_mdb.py
+++ b/dump_mdb.py
@@ -54,8 +54,8 @@ def create_json(entry):
 			'double_challenge': entry.double_rating_challenge,
 			'double_expert': entry.double_rating_expert,
 		},
-		'extra_stage_bit1': entry.extra_stage_bit1,
 		'extra_stage': entry.extra_stage.name,
+		'extra_stage_bit3': entry.extra_stage_bit3,
 		'extra_stage_bit4': entry.extra_stage_bit4,
 		'song_type': entry.song_type,
 		'in_default_view': entry.in_default_view,
diff --git a/mdb_bin.ksy b/mdb_bin.ksy
index 6a1dd43..573bef8 100644
--- a/mdb_bin.ksy
+++ b/mdb_bin.ksy
@@ -73,11 +73,11 @@ types:
       - id: always_zero_4
         contents: [0x0, 0x0]
       # Byte 0 of flags bitmask.
-      - id: extra_stage_bit1        # Only true for LoM. (For MAX2, true for KAKUMEI instead.)
-        type: b1
       - id: extra_stage
         type: b2
         enum: extra_stage_info
+      - id: extra_stage_bit3        # Only true for LoM.
+        type: b1
       - id: extra_stage_bit4        # Seems to never be set, must be 0. (MAX2 sets these to true for all regular songs, and false for other music.)
         type: b1
       - id: song_type               # Seems to be 0xc for regular songs, 0x6 for random. Probably a bitmask.
@@ -223,8 +223,8 @@ enums:
 
   extra_stage_info:
     0x0: none
-    0x1: extra_stage
-    0x2: one_more_extra_stage
+    0x1: one_more_extra_stage        # 1 and 2 are swapped on MAX2.
+    0x2: extra_stage
     0x3: unknown
 
   # Kaitai Struct doesn't have constants/configuration, so this is a way to simulate them.
-- 
2.39.5