1 files changed, 39 insertions, 38 deletions
diff --git a/context.h b/context.h
index a869b7d..24f7b2d 100644
--- a/context.h
+++ b/context.h
@@ -493,44 +493,6 @@ struct TPlyText {
 	};
 };
 
-struct game_command_header {
-	u8 command;
-	u8 size;
-	u16 id;
-
-	void bswap() {
-		bswap_16(&id);
-	};
-};
-
-struct extended_game_command_header {
-	game_command_header header;
-	u32 size;
-
-	void bswap() {
-		bswap_16(&header.id);
-		bswap_32(&size);
-	};
-};
-
-struct game_command {
-	game_command_header header;
-	u8 data[1024-sizeof(game_command_header)];
-
-	void bswap() {
-		header.bswap();
-	};
-};
-
-struct extended_game_command {
-	extended_game_command_header header;
-	u8 data[1024-sizeof(extended_game_command_header)];
-
-	void bswap() {
-		header.bswap();
-	};
-};
-
 TMenuListEntry(GameListEntry,
 	u8 difficulty_tag;
 	u8 num_players;
@@ -773,6 +735,45 @@ struct send_buffs {
 	u8 *buff;
 };
 
+// pso/packet_classes.h
+struct game_command_header {
+	u8 command;
+	u8 size;
+	u16 id;
+
+	void bswap() {
+		bswap_16(&id);
+	};
+};
+
+struct extended_game_command_header {
+	game_command_header header;
+	u32 size;
+
+	void bswap() {
+		bswap_16(&header.id);
+		bswap_32(&size);
+	};
+};
+
+struct game_command {
+	game_command_header header;
+	u8 data[1024-sizeof(game_command_header)];
+
+	void bswap() {
+		header.bswap();
+	};
+};
+
+struct extended_game_command {
+	extended_game_command_header header;
+	u8 data[1024-sizeof(extended_game_command_header)];
+
+	void bswap() {
+		header.bswap();
+	};
+};
+
 // pso/TProtocol.h
 struct packet {
 	union {