Move overlay4 lib files to lib directories

.github/calcrom/BuildAnalyzer.cpp

@@ -104,7 +104,7 @@ BuildAnalyzer &BuildAnalyzer::operator()() {
     if (analyzed) {
         reset();
     }
-    string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/{NitroSDK,NitroSystem,NitroDWC,NitroWiFi,libVCT}/{src,asm}}/{,*/}*.{c,s,cpp}";
+     string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/{NitroSDK,NitroSystem,NitroDWC,NitroWiFi,libVCT}/{src,asm}}/{,*/,*/*/}*.{c,s,cpp}";
     for (char const * & fname : Glob(pattern, GLOB_TILDE | GLOB_BRACE | GLOB_NOSORT)) {
         AnalyzeObject(fname);
     }

common.mk

@@ -75,8 +75,8 @@ ASM_SRCS                  := $(foreach dname,$(ASM_SUBDIR),$(wildcard $(dname)/*
 
 # asm processor should only be necessary for libcrypto
 GLOBAL_ASM_SRCS           := 
-LIB_C_SRCS                := $(foreach dname,$(LIB_SRC_SUBDIR),$(wildcard $(dname)/*.c $(dname)/*/*.c))
-LIB_ASM_SRCS              := $(foreach dname,$(LIB_ASM_SUBDIR),$(wildcard $(dname)/*.s $(dname)/*/*.s))
+LIB_C_SRCS                := $(foreach dname,$(LIB_SRC_SUBDIR),$(wildcard $(dname)/*.c $(dname)/*/*.c $(dname)/*/*/*.c))
+LIB_ASM_SRCS              := $(foreach dname,$(LIB_ASM_SUBDIR),$(wildcard $(dname)/*.s $(dname)/*/*.s $(dname)/*/*/*.s))
 ALL_SRCS                  := $(C_SRCS) $(ASM_SRCS) $(LIB_C_SRCS) $(LIB_ASM_SRCS)
 
 C_OBJS                    = $(C_SRCS:%.c=$(BUILD_DIR)/%.o)

lib/NitroDWC/asm/ac/beacon.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E6588.inc"
+	.include "include/beacon.inc"
 
 	
 

lib/NitroDWC/asm/ac/callback.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E6B04.inc"
+	.include "include/callback.inc"
 
 	
 

lib/NitroDWC/asm/ac/close.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E70C8.inc"
+	.include "include/close.inc"
 
 	
 

lib/NitroDWC/asm/ac/connect.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E6B90.inc"
+	.include "include/connect.inc"
 
 	
 

lib/NitroDWC/asm/ac/dwc_ac.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E5C34.inc"
+	.include "include/dwc_ac.inc"
 
 	
 

lib/NitroDWC/asm/ac/error.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E7210.inc"
+	.include "include/error.inc"
 
 	
 

lib/NitroDWC/asm/ac/makelist.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E73FC.inc"
+	.include "include/makelist.inc"
 
 	
 

lib/NitroDWC/asm/ac/nintendospot.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E91B4.inc"
+	.include "include/nintendospot.inc"
 
 	
 

lib/NitroDWC/asm/ac/retry.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E7804.inc"
+	.include "include/retry.inc"
 
 	
 

lib/NitroDWC/asm/ac/search.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E78E0.inc"
+	.include "include/search.inc"
 
 	
 

lib/NitroDWC/asm/ac/shop_usb.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E85F4.inc"
+	.include "include/shop_usb.inc"
 
 	
 

lib/NitroDWC/asm/ac/start.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E80B0.inc"
+	.include "include/start.inc"
 
 	
 

lib/NitroDWC/asm/ac/test.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E8138.inc"
+	.include "include/test.inc"
 
 	.extern Unk_ov4_0221DBF0
 

lib/NitroDWC/asm/ac/wds.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E8BA8.inc"
+	.include "include/wds.inc"
 
 	
 

lib/NitroDWC/asm/auth/dwc_auth.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D3038.inc"
+	.include "include/dwc_auth.inc"
 
 	.extern Unk_021CCC80
 	.extern Unk_021D0D40

lib/NitroDWC/asm/auth/dwc_cal.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D3E5C.inc"
+	.include "include/dwc_cal.inc"
 
 	
 

lib/NitroDWC/asm/auth/dwc_http.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D4478.inc"
+	.include "include/dwc_http.inc"
 
 	.extern Unk_ov4_0221DE40
 	.extern Unk_ov4_02216F08

lib/NitroDWC/asm/auth/dwc_nastime.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D6A88.inc"
+	.include "include/dwc_nastime.inc"
 
 	.extern Unk_021D0D40
 

lib/NitroDWC/asm/auth/dwc_netcheck.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D5818.inc"
+	.include "include/dwc_netcheck.inc"
 
 	.extern Unk_021CCC80
 	.extern Unk_021D0D40

lib/NitroDWC/asm/auth/dwc_svl.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D6CA4.inc"
+	.include "include/dwc_svl.inc"
 
 	.extern Unk_021CCC80
 	.extern Unk_021D0D40

lib/NitroDWC/asm/auth/util_base64.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D72E0.inc"
+	.include "include/util_base64.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_common.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D8948.inc"
+	.include "include/dwc_common.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_connectinet.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D78C8.inc"
+	.include "include/dwc_connectinet.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_friend.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021DB170.inc"
+	.include "include/dwc_friend.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_ghttp.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E558C.inc"
+	.include "include/dwc_ghttp.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_login.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021DA6C8.inc"
+	.include "include/dwc_login.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_main.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D8C08.inc"
+	.include "include/dwc_main.inc"
 
 	.extern Unk_ov4_0221B1B0
 	.extern Unk_ov4_0221B2B0

lib/NitroDWC/asm/base/dwc_memfunc.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D773C.inc"
+	.include "include/dwc_memfunc.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_nasfunc.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D806C.inc"
+	.include "include/dwc_nasfunc.inc"
 
 	.extern Unk_ov4_0221A4B4
 	.extern Unk_ov4_0221A4B8

lib/NitroDWC/asm/base/dwc_nd.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021D83A4.inc"
+	.include "include/dwc_nd.inc"
 
 	
 

lib/NitroDWC/asm/base/dwc_transport.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E4A58.inc"
+	.include "include/dwc_transport.inc"
 
 	
 

lib/NitroDWC/asm/gs/available.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E963C.inc"
+	.include "include/available.inc"
 
 	.text
 

lib/NitroDWC/asm/gs/darray.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021E99EC.inc"
+	.include "include/darray.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gp.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021EB228.inc"
+	.include "include/gp.inc"
 
 	.extern Unk_ov4_0221AE50
 

lib/NitroDWC/asm/gs/gp/gpi.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021EBDCC.inc"
+	.include "include/gpi.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpibuddy.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021EC564.inc"
+	.include "include/gpibuddy.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpibuffer.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021ED420.inc"
+	.include "include/gpibuffer.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpicallback.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021EDE68.inc"
+	.include "include/gpicallback.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpiconnect.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021EE2E0.inc"
+	.include "include/gpiconnect.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpiinfo.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021EF924.inc"
+	.include "include/gpiinfo.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpioperation.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F1708.inc"
+	.include "include/gpioperation.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpipeer.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F1D24.inc"
+	.include "include/gpipeer.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpiprofile.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F2F6C.inc"
+	.include "include/gpiprofile.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpisearch.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F34C8.inc"
+	.include "include/gpisearch.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpitransfer.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F55F4.inc"
+	.include "include/gpitransfer.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpiunique.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F571C.inc"
+	.include "include/gpiunique.inc"
 
 	
 

lib/NitroDWC/asm/gs/gp/gpiutility.s

@@ -1,5 +1,5 @@
 	.include "macros/function.inc"
-	.include "overlay004/ov4_021F5820.inc"
+	.include "include/gpiutility.inc"