Remove djui panels from main djui header

src/game/area.c

@@ -26,6 +26,7 @@
 #include "pc/network/network.h"
 #include "pc/lua/smlua_hooks.h"
 #include "pc/djui/djui.h"
+#include "pc/djui/djui_panel_pause.h"
 
 struct SpawnInfo gPlayerSpawnInfos[MAX_PLAYERS];
 struct GraphNode *D_8033A160[MAX_LOADED_GRAPH_NODES];

src/game/game_init.c

@@ -21,6 +21,7 @@
 #include "segment_symbols.h"
 #include "rng_position.h"
 #include "src/pc/djui/djui.h"
+#include "src/pc/djui/djui_panel_pause.h"
 #include "rumble_init.h"
 #include <prevent_bss_reordering.h>
 #ifdef BETTERCAMERA

src/game/ingame_menu.c

@@ -30,6 +30,7 @@
 #include "pc/cheats.h"
 #include "pc/network/network.h"
 #include "pc/djui/djui.h"
+#include "src/pc/djui/djui_panel_pause.h"
 #include "pc/utils/misc.h"
 #include "data/dynos_mgr_builtin_externs.h"
 #ifdef BETTERCAMERA

src/pc/djui/djui.c

@@ -1,5 +1,10 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_main.h"
 #include "djui_panel_language.h"
+#include "djui_panel_pause.h"
+#include "djui_panel_join.h"
+#include "djui_panel_join_message.h"
 #include "../debuglog.h"
 #include "pc/cliopts.h"
 #include "game/level_update.h"

src/pc/djui/djui.h

@@ -34,34 +34,6 @@
 #include "djui_chat_message.h"
 #include "djui_paginated.h"
 
-#include "djui_panel.h"
-#include "djui_panel_menu.h"
-#include "djui_panel_debug.h"
-#include "djui_panel_main.h"
-#include "djui_panel_host.h"
-#include "djui_panel_host_settings.h"
-#include "djui_panel_host_mods.h"
-#include "djui_panel_host_save.h"
-#include "djui_panel_host_message.h"
-#include "djui_panel_join.h"
-#include "djui_panel_join_message.h"
-#include "djui_panel_pause.h"
-#include "djui_panel_options.h"
-#include "djui_panel_player.h"
-#include "djui_panel_playerlist.h"
-#include "djui_panel_modlist.h"
-#include "djui_panel_misc.h"
-#include "djui_panel_camera.h"
-#include "djui_panel_controls.h"
-#include "djui_panel_controls_n64.h"
-#include "djui_panel_controls_extra.h"
-#include "djui_panel_display.h"
-#include "djui_panel_dynos.h"
-#include "djui_panel_sound.h"
-#include "djui_panel_menu_options.h"
-#include "djui_panel_confirm.h"
-#include "djui_panel_cheats.h"
-
 extern struct DjuiRoot* gDjuiRoot;
 extern bool gDjuiInMainMenu;
 extern bool gDjuiDisabled;

src/pc/djui/djui_cursor.c

@@ -1,4 +1,5 @@
 #include "djui.h"
+#include "djui_panel.h"
 #include "pc/controller/controller_mouse.h"
 #include "pc/controller/controller_sdl.h"
 #include "pc/gfx/gfx_window_manager_api.h"

src/pc/djui/djui_hud_utils.c

@@ -16,6 +16,7 @@
 #include "djui.h"
 #include "djui_unicode.h"
 #include "djui_hud_utils.h"
+#include "djui_panel_pause.h"
 #include "game/camera.h"
 
 

src/pc/djui/djui_interactable.c

@@ -1,5 +1,9 @@
 #include <string.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_pause.h"
+#include "djui_panel_modlist.h"
+#include "djui_panel_playerlist.h"
 
 #include "src/pc/controller/controller_sdl.h"
 #include "src/pc/controller/controller_mouse.h"

src/pc/djui/djui_panel.c

@@ -1,4 +1,8 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_main.h"
+#include "djui_panel_pause.h"
+#include "djui_panel_join_message.h"
 #include "src/pc/utils/misc.h"
 #include "sounds.h"
 #include "audio/external.h"

src/pc/djui/djui_panel_camera.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"
 #include "src/game/bettercamera.h"

src/pc/djui/djui_panel_cheats.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "pc/cheats.h"
 
 void djui_panel_cheats_create(struct DjuiBase* caller) {

src/pc/djui/djui_panel_confirm.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/utils/misc.h"
 
 void djui_panel_confirm_create(struct DjuiBase* caller, char* title, char* message, void (*on_yes_click)(struct DjuiBase*)) {

src/pc/djui/djui_panel_controls.c

@@ -1,4 +1,8 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_controls_n64.h"
+#include "djui_panel_controls_extra.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"
 #include "src/pc/controller/controller_api.h"

src/pc/djui/djui_panel_controls_extra.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/configfile.h"
 
 void djui_panel_controls_extra_create(struct DjuiBase* caller) {

src/pc/djui/djui_panel_controls_n64.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/configfile.h"
 
 void djui_panel_controls_n64_create(struct DjuiBase* caller) {

src/pc/djui/djui_panel_display.c

@@ -1,4 +1,7 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_dynos.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"
 

src/pc/djui/djui_panel_dynos.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"
 #include "data/dynos.c.h"

src/pc/djui/djui_panel_host.c

@@ -1,5 +1,11 @@
 #include <stdio.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_host_mods.h"
+#include "djui_panel_host_settings.h"
+#include "djui_panel_host_save.h"
+#include "djui_panel_host_message.h"
 #include "game/save_file.h"
 #include "pc/network/network.h"
 #include "pc/utils/misc.h"

src/pc/djui/djui_panel_host_message.c

@@ -1,5 +1,8 @@
 #include <stdio.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_modlist.h"
 #include "src/pc/network/network.h"
 #include "src/pc/network/discord/discord.h"
 #include "src/pc/utils/misc.h"

src/pc/djui/djui_panel_host_mods.c

@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "game/save_file.h"
 #include "pc/network/network.h"
 #include "pc/utils/misc.h"

src/pc/djui/djui_panel_host_save.c

@@ -1,5 +1,8 @@
 #include <stdio.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_confirm.h"
 #include "game/save_file.h"
 #include "pc/configfile.h"
 

src/pc/djui/djui_panel_host_settings.c

@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "game/save_file.h"
 #include "pc/network/network.h"
 #include "pc/utils/misc.h"

src/pc/djui/djui_panel_join.c

@@ -1,5 +1,9 @@
 #include <stdio.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_join_message.h"
+#include "djui_panel_modlist.h"
 #include "src/pc/network/network.h"
 #include "src/pc/network/socket/socket.h"
 #include "src/pc/network/socket/domain_res.h"

src/pc/djui/djui_panel_join_message.c

@@ -1,4 +1,8 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_main.h"
+#include "djui_panel_join_message.h"
 #include "src/pc/network/network.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"

src/pc/djui/djui_panel_language.c

@@ -1,4 +1,10 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_main.h"
+#include "djui_panel_options.h"
+#include "djui_panel_misc.h"
+#include "djui_panel_pause.h"
 #include "pc/debuglog.h"
 #include "pc/utils/misc.h"
 #include "pc/configfile.h"

src/pc/djui/djui_panel_main.c

@@ -1,4 +1,10 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_host.h"
+#include "djui_panel_join.h"
+#include "djui_panel_options.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_confirm.h"
 #include "src/pc/controller/controller_sdl.h"
 #include "src/pc/pc_main.h"
 

src/pc/djui/djui_panel_menu.c

@@ -1,4 +1,5 @@
 #include "djui.h"
+#include "djui_panel.h"
 #include "djui_unicode.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"

src/pc/djui/djui_panel_menu_options.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"
 #include "src/game/level_update.h"

src/pc/djui/djui_panel_misc.c

@@ -1,4 +1,7 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_menu_options.h"
 #include "djui_panel_language.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"

src/pc/djui/djui_panel_modlist.c

@@ -1,6 +1,8 @@
 #include <string.h>
 
 #include "djui.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_misc.h"
 #include "pc/mods/mods.h"
 #include "pc/debuglog.h"
 

src/pc/djui/djui_panel_options.c

@@ -1,4 +1,12 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_player.h"
+#include "djui_panel_camera.h"
+#include "djui_panel_controls.h"
+#include "djui_panel_display.h"
+#include "djui_panel_sound.h"
+#include "djui_panel_misc.h"
+#include "djui_panel_menu.h"
 #include "pc/network/network.h"
 #include "pc/utils/misc.h"
 

src/pc/djui/djui_panel_pause.c

@@ -1,4 +1,12 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_player.h"
+#include "djui_panel_dynos.h"
+#include "djui_panel_options.h"
+#include "djui_panel_cheats.h"
+#include "djui_panel_host.h"
+#include "djui_panel_menu.h"
+#include "djui_panel_confirm.h"
 #include "pc/cheats.h"
 #include "pc/pc_main.h"
 #include "pc/network/network.h"

src/pc/djui/djui_panel_player.c

@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "pc/configfile.h"
 #include "pc/network/network_player.h"
 #include "game/level_update.h"

src/pc/djui/djui_panel_playerlist.c

@@ -1,6 +1,7 @@
 #include <string.h>
 
 #include "djui.h"
+#include "djui_panel_menu.h"
 #include "djui_panel_playerlist.h"
 #include "game/level_info.h"
 #include "game/mario_misc.h"

src/pc/djui/djui_panel_sound.c

@@ -1,4 +1,6 @@
 #include "djui.h"
+#include "djui_panel.h"
+#include "djui_panel_menu.h"
 #include "src/pc/utils/misc.h"
 #include "src/pc/configfile.h"
 

src/pc/network/network.c

@@ -13,7 +13,9 @@
 #include "pc/configfile.h"
 #include "pc/cheats.h"
 #include "pc/djui/djui.h"
+#include "pc/djui/djui_panel.h"
 #include "pc/djui/djui_hud_utils.h"
+#include "pc/djui/djui_panel_main.h"
 #include "pc/utils/misc.h"
 #include "pc/lua/smlua.h"
 #include "pc/lua/utils/smlua_model_utils.h"

src/pc/network/packets/packet_join.c

@@ -13,6 +13,11 @@
 #include "PR/os_eeprom.h"
 #include "pc/network/version.h"
 #include "pc/djui/djui.h"
+#include "pc/djui/djui_panel.h"
+#include "pc/djui/djui_panel_modlist.h"
+#include "pc/djui/djui_panel_playerlist.h"
+#include "pc/djui/djui_panel_menu.h"
+#include "pc/djui/djui_panel_join_message.h"
 #include "pc/cheats.h"
 #include "pc/utils/string_builder.h"
 //#define DISABLE_MODULE_LOG 1

src/pc/network/packets/packet_mod_list.c

@@ -3,6 +3,7 @@
 #include "pc/mods/mods.h"
 #include "pc/mods/mods_utils.h"
 #include "pc/djui/djui.h"
+#include "pc/djui/djui_panel_join_message.h"
 #include "pc/debuglog.h"
 #include "pc/mods/mod_cache.h"
 

src/pc/pc_main.c

@@ -51,6 +51,8 @@
 #include "pc/network/network_player.h"
 #include "pc/djui/djui.h"
 #include "pc/djui/djui_unicode.h"
+#include "pc/djui/djui_panel.h"
+#include "pc/djui/djui_panel_modlist.h"
 #include "pc/debuglog.h"
 #include "pc/utils/misc.h"