From 577fc92607817a77a46994d9be5a31c6f4c868ad Mon Sep 17 00:00:00 2001 From: Nomura <72407407+Nomura-RH@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:06:17 +0100 Subject: [PATCH] Move overlay4 lib files to lib directories --- .github/calcrom/BuildAnalyzer.cpp | 2 +- common.mk | 4 +- .../NitroDWC/asm/ac/beacon.s | 2 +- .../NitroDWC/asm/ac/callback.s | 2 +- .../NitroDWC/asm/ac/close.s | 2 +- .../NitroDWC/asm/ac/connect.s | 2 +- .../NitroDWC/asm/ac/dwc_ac.s | 2 +- .../NitroDWC/asm/ac/error.s | 2 +- .../NitroDWC/asm/ac/include/beacon.inc | 0 .../NitroDWC/asm/ac/include/callback.inc | 0 .../NitroDWC/asm/ac/include/close.inc | 0 .../NitroDWC/asm/ac/include/connect.inc | 0 .../NitroDWC/asm/ac/include/dwc_ac.inc | 0 .../NitroDWC/asm/ac/include/error.inc | 0 .../NitroDWC/asm/ac/include/makelist.inc | 0 .../NitroDWC/asm/ac/include/nintendospot.inc | 0 .../NitroDWC/asm/ac/include/retry.inc | 0 .../NitroDWC/asm/ac/include/search.inc | 0 .../NitroDWC/asm/ac/include/shop_usb.inc | 0 .../NitroDWC/asm/ac/include/start.inc | 0 .../NitroDWC/asm/ac/include/test.inc | 0 .../NitroDWC/asm/ac/include/wds.inc | 0 .../NitroDWC/asm/ac/makelist.s | 2 +- .../NitroDWC/asm/ac/nintendospot.s | 2 +- .../NitroDWC/asm/ac/retry.s | 2 +- .../NitroDWC/asm/ac/search.s | 2 +- .../NitroDWC/asm/ac/shop_usb.s | 2 +- .../NitroDWC/asm/ac/start.s | 2 +- .../NitroDWC/asm/ac/test.s | 2 +- .../NitroDWC/asm/ac/wds.s | 2 +- .../NitroDWC/asm/auth/dwc_auth.s | 2 +- .../NitroDWC/asm/auth/dwc_ca_cybertru.s | 0 .../NitroDWC/asm/auth/dwc_ca_globalsi.s | 0 .../NitroDWC/asm/auth/dwc_ca_nas_self.s | 0 .../NitroDWC/asm/auth/dwc_ca_thawte_p.s | 0 .../NitroDWC/asm/auth/dwc_ca_thawte_s.s | 0 .../NitroDWC/asm/auth/dwc_ca_verisign.s | 0 .../NitroDWC/asm/auth/dwc_cal.s | 2 +- .../NitroDWC/asm/auth/dwc_http.s | 2 +- .../NitroDWC/asm/auth/dwc_nastime.s | 2 +- .../NitroDWC/asm/auth/dwc_netcheck.s | 2 +- .../NitroDWC/asm/auth/dwc_svl.s | 2 +- .../NitroDWC/asm/auth/include/dwc_auth.inc | 0 .../NitroDWC/asm/auth/include/dwc_cal.inc | 0 .../NitroDWC/asm/auth/include/dwc_http.inc | 0 .../NitroDWC/asm/auth/include/dwc_nastime.inc | 0 .../asm/auth/include/dwc_netcheck.inc | 0 .../NitroDWC/asm/auth/include/dwc_svl.inc | 0 .../NitroDWC/asm/auth/include/util_base64.inc | 0 .../NitroDWC/asm/auth/util_base64.s | 2 +- .../NitroDWC/asm/base/dwc_common.s | 2 +- .../NitroDWC/asm/base/dwc_connectinet.s | 2 +- .../NitroDWC/asm/base/dwc_error.s | 0 .../NitroDWC/asm/base/dwc_friend.s | 2 +- .../NitroDWC/asm/base/dwc_ghttp.s | 2 +- .../NitroDWC/asm/base/dwc_login.s | 2 +- .../NitroDWC/asm/base/dwc_main.s | 2 +- .../NitroDWC/asm/base/dwc_memfunc.s | 2 +- .../NitroDWC/asm/base/dwc_nasfunc.s | 2 +- .../NitroDWC/asm/base/dwc_nd.s | 2 +- .../NitroDWC/asm/base/dwc_transport.s | 2 +- .../NitroDWC/asm/base/include/dwc_common.inc | 0 .../asm/base/include/dwc_connectinet.inc | 0 .../NitroDWC/asm/base/include/dwc_friend.inc | 0 .../NitroDWC/asm/base/include/dwc_ghttp.inc | 0 .../NitroDWC/asm/base/include/dwc_login.inc | 0 .../NitroDWC/asm/base/include/dwc_main.inc | 0 .../NitroDWC/asm/base/include/dwc_memfunc.inc | 0 .../NitroDWC/asm/base/include/dwc_nasfunc.inc | 0 .../NitroDWC/asm/base/include/dwc_nd.inc | 0 .../asm/base/include/dwc_transport.inc | 0 .../NitroDWC/asm/gs/available.s | 2 +- .../NitroDWC/asm/gs/darray.s | 2 +- .../NitroDWC/asm/gs/gp/gp.s | 2 +- .../NitroDWC/asm/gs/gp/gpi.s | 2 +- .../NitroDWC/asm/gs/gp/gpibuddy.s | 2 +- .../NitroDWC/asm/gs/gp/gpibuffer.s | 2 +- .../NitroDWC/asm/gs/gp/gpicallback.s | 2 +- .../NitroDWC/asm/gs/gp/gpiconnect.s | 2 +- .../NitroDWC/asm/gs/gp/gpiinfo.s | 2 +- .../NitroDWC/asm/gs/gp/gpioperation.s | 2 +- .../NitroDWC/asm/gs/gp/gpipeer.s | 2 +- .../NitroDWC/asm/gs/gp/gpiprofile.s | 2 +- .../NitroDWC/asm/gs/gp/gpisearch.s | 2 +- .../NitroDWC/asm/gs/gp/gpitransfer.s | 2 +- .../NitroDWC/asm/gs/gp/gpiunique.s | 2 +- .../NitroDWC/asm/gs/gp/gpiutility.s | 2 +- .../NitroDWC/asm/gs/gp/include/gp.inc | 0 .../NitroDWC/asm/gs/gp/include/gpi.inc | 0 .../NitroDWC/asm/gs/gp/include/gpibuddy.inc | 0 .../NitroDWC/asm/gs/gp/include/gpibuffer.inc | 0 .../asm/gs/gp/include/gpicallback.inc | 0 .../NitroDWC/asm/gs/gp/include/gpiconnect.inc | 0 .../NitroDWC/asm/gs/gp/include/gpiinfo.inc | 0 .../asm/gs/gp/include/gpioperation.inc | 0 .../NitroDWC/asm/gs/gp/include/gpipeer.inc | 0 .../NitroDWC/asm/gs/gp/include/gpiprofile.inc | 0 .../NitroDWC/asm/gs/gp/include/gpisearch.inc | 0 .../asm/gs/gp/include/gpitransfer.inc | 0 .../NitroDWC/asm/gs/gp/include/gpiunique.inc | 0 .../NitroDWC/asm/gs/gp/include/gpiutility.inc | 0 .../NitroDWC/asm/gs/gstats/gbucket.s | 2 +- .../NitroDWC/asm/gs/gstats/gstats.s | 2 +- .../asm/gs/gstats/include/gbucket.inc | 0 .../NitroDWC/asm/gs/gstats/include/gstats.inc | 0 .../NitroDWC/asm/gs/gt2/gt2auth.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2buffer.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2callback.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2connection.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2main.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2message.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2socket.s | 2 +- .../NitroDWC/asm/gs/gt2/gt2utility.s | 2 +- .../NitroDWC/asm/gs/gt2/include/gt2auth.inc | 0 .../NitroDWC/asm/gs/gt2/include/gt2buffer.inc | 0 .../asm/gs/gt2/include/gt2callback.inc | 0 .../asm/gs/gt2/include/gt2connection.inc | 0 .../NitroDWC/asm/gs/gt2/include/gt2main.inc | 0 .../asm/gs/gt2/include/gt2message.inc | 0 .../NitroDWC/asm/gs/gt2/include/gt2socket.inc | 0 .../asm/gs/gt2/include/gt2utility.inc | 0 .../NitroDWC/asm/gs/hashtable.s | 2 +- .../NitroDWC/asm/gs/include/available.inc | 0 .../NitroDWC/asm/gs/include/darray.inc | 0 .../NitroDWC/asm/gs/include/hashtable.inc | 0 .../NitroDWC/asm/gs/include/md5c.inc | 0 .../NitroDWC/asm/gs/include/nonport.inc | 0 .../NitroDWC/asm/gs/md5c.s | 2 +- .../NitroDWC/asm/gs/natneg/include/natneg.inc | 0 .../NitroDWC/asm/gs/natneg/natneg.s | 2 +- .../NitroDWC/asm/gs/nonport.s | 2 +- .../NitroDWC/asm/gs/qr2/include/qr2.inc | 0 .../NitroDWC/asm/gs/qr2/qr2.s | 2 +- .../NitroDWC/asm/gs/qr2/qr2regkeys.s | 0 .../gs/serverbrowsing/include/sb_crypt.inc | 0 .../serverbrowsing/include/sb_queryengine.inc | 0 .../gs/serverbrowsing/include/sb_server.inc | 0 .../include/sb_serverbrowsing.inc | 0 .../serverbrowsing/include/sb_serverlist.inc | 0 .../NitroDWC/asm/gs/serverbrowsing/sb_crypt.s | 2 +- .../asm/gs/serverbrowsing/sb_queryengine.s | 2 +- .../asm/gs/serverbrowsing/sb_server.s | 2 +- .../asm/gs/serverbrowsing/sb_serverbrowsing.s | 2 +- .../asm/gs/serverbrowsing/sb_serverlist.s | 2 +- .../NitroWiFi/asm/cps/include/network.inc | 0 .../NitroWiFi/asm/cps/network.s | 2 +- .../NitroWiFi/asm/soc/include/soc.inc | 0 .../NitroWiFi/asm/soc/include/socl_bind.inc | 0 .../asm/soc/include/socl_cleanup.inc | 0 .../NitroWiFi/asm/soc/include/socl_close.inc | 0 .../asm/soc/include/socl_command.inc | 0 .../NitroWiFi/asm/soc/include/socl_create.inc | 0 .../NitroWiFi/asm/soc/include/socl_list.inc | 0 .../asm/soc/include/socl_listen_acc.inc | 0 .../NitroWiFi/asm/soc/include/socl_poll.inc | 0 .../NitroWiFi/asm/soc/include/socl_read.inc | 0 .../asm/soc/include/socl_resolve.inc | 0 .../asm/soc/include/socl_shutdown.inc | 0 .../NitroWiFi/asm/soc/include/socl_ssl.inc | 0 .../asm/soc/include/socl_startup.inc | 0 .../NitroWiFi/asm/soc/include/socl_write.inc | 0 .../NitroWiFi/asm/soc/soc.s | 2 +- .../NitroWiFi/asm/soc/socl_bind.s | 2 +- .../NitroWiFi/asm/soc/socl_cleanup.s | 2 +- .../NitroWiFi/asm/soc/socl_close.s | 2 +- .../NitroWiFi/asm/soc/socl_command.s | 2 +- .../NitroWiFi/asm/soc/socl_const.s | 0 .../NitroWiFi/asm/soc/socl_create.s | 2 +- .../NitroWiFi/asm/soc/socl_list.s | 2 +- .../NitroWiFi/asm/soc/socl_listen_acc.s | 2 +- .../NitroWiFi/asm/soc/socl_misc.s | 0 .../NitroWiFi/asm/soc/socl_poll.s | 2 +- .../NitroWiFi/asm/soc/socl_read.s | 2 +- .../NitroWiFi/asm/soc/socl_resolve.s | 2 +- .../NitroWiFi/asm/soc/socl_shutdown.s | 2 +- .../NitroWiFi/asm/soc/socl_ssl.s | 2 +- .../NitroWiFi/asm/soc/socl_startup.s | 2 +- .../NitroWiFi/asm/soc/socl_write.s | 2 +- .../NitroWiFi/asm/ssl/arc4.s | 0 .../NitroWiFi/asm/ssl/biginteger.s | 2 +- .../NitroWiFi/asm/ssl/include/biginteger.inc | 0 .../NitroWiFi/asm/ssl/include/md5.inc | 0 .../NitroWiFi/asm/ssl/include/sha1.inc | 0 .../NitroWiFi/asm/ssl/include/ssl.inc | 0 .../NitroWiFi/asm/ssl/md5.s | 2 +- .../NitroWiFi/asm/ssl/sha1.s | 2 +- .../NitroWiFi/asm/ssl/ssl.s | 2 +- .../NitroWiFi/asm/stubsmd5/dummy_md5.s | 2 +- .../asm/stubsmd5/include/dummy_md5.inc | 0 .../NitroWiFi/asm/wcm/aplist.s | 2 +- .../NitroWiFi/asm/wcm/cpsif.s | 2 +- .../NitroWiFi/asm/wcm/include/aplist.inc | 0 .../NitroWiFi/asm/wcm/include/cpsif.inc | 0 .../NitroWiFi/asm/wcm/include/system.inc | 0 .../NitroWiFi/asm/wcm/include/util.inc | 0 .../NitroWiFi/asm/wcm/system.s | 2 +- .../NitroWiFi/asm/wcm/util.s | 2 +- .../ov4_02201504.s => lib/libVCT/asm/adpcm.s | 2 +- .../ov4_02202698.s => lib/libVCT/asm/audio.s | 2 +- .../libVCT/asm/decoder.s | 2 +- .../ov4_022054E4.s => lib/libVCT/asm/fir.s | 2 +- .../ov4_02203798.s => lib/libVCT/asm/g711.s | 0 .../libVCT/asm/include/adpcm.inc | 0 .../libVCT/asm/include/audio.inc | 0 .../libVCT/asm/include/decoder.inc | 0 .../libVCT/asm/include/fir.inc | 0 .../libVCT/asm/include/queue.inc | 0 .../libVCT/asm/include/ssp.inc | 0 .../libVCT/asm/include/stream.inc | 0 .../libVCT/asm/include/udp_buffer.inc | 0 .../libVCT/asm/include/vad.inc | 0 .../libVCT/asm/include/vct_main.inc | 0 .../ov4_022058A0.s => lib/libVCT/asm/mixer.s | 0 .../ov4_022038F4.s => lib/libVCT/asm/queue.s | 2 +- .../ov4_02204160.s => lib/libVCT/asm/ssp.s | 2 +- .../ov4_02203BD4.s => lib/libVCT/asm/stream.s | 2 +- .../libVCT/asm/udp_buffer.s | 2 +- .../ov4_02205270.s => lib/libVCT/asm/vad.s | 2 +- .../libVCT/asm/vct_main.s | 2 +- main.lsf | 230 +++++++++--------- 220 files changed, 220 insertions(+), 220 deletions(-) rename asm/overlay004/ov4_021E6588.s => lib/NitroDWC/asm/ac/beacon.s (99%) rename asm/overlay004/ov4_021E6B04.s => lib/NitroDWC/asm/ac/callback.s (91%) rename asm/overlay004/ov4_021E70C8.s => lib/NitroDWC/asm/ac/close.s (96%) rename asm/overlay004/ov4_021E6B90.s => lib/NitroDWC/asm/ac/connect.s (99%) rename asm/overlay004/ov4_021E5C34.s => lib/NitroDWC/asm/ac/dwc_ac.s (99%) rename asm/overlay004/ov4_021E7210.s => lib/NitroDWC/asm/ac/error.s (97%) rename asm/overlay004/ov4_021E6588.inc => lib/NitroDWC/asm/ac/include/beacon.inc (100%) rename asm/overlay004/ov4_021E6B04.inc => lib/NitroDWC/asm/ac/include/callback.inc (100%) rename asm/overlay004/ov4_021E70C8.inc => lib/NitroDWC/asm/ac/include/close.inc (100%) rename asm/overlay004/ov4_021E6B90.inc => lib/NitroDWC/asm/ac/include/connect.inc (100%) rename asm/overlay004/ov4_021E5C34.inc => lib/NitroDWC/asm/ac/include/dwc_ac.inc (100%) rename asm/overlay004/ov4_021E7210.inc => lib/NitroDWC/asm/ac/include/error.inc (100%) rename asm/overlay004/ov4_021E73FC.inc => lib/NitroDWC/asm/ac/include/makelist.inc (100%) rename asm/overlay004/ov4_021E91B4.inc => lib/NitroDWC/asm/ac/include/nintendospot.inc (100%) rename asm/overlay004/ov4_021E7804.inc => lib/NitroDWC/asm/ac/include/retry.inc (100%) rename asm/overlay004/ov4_021E78E0.inc => lib/NitroDWC/asm/ac/include/search.inc (100%) rename asm/overlay004/ov4_021E85F4.inc => lib/NitroDWC/asm/ac/include/shop_usb.inc (100%) rename asm/overlay004/ov4_021E80B0.inc => lib/NitroDWC/asm/ac/include/start.inc (100%) rename asm/overlay004/ov4_021E8138.inc => lib/NitroDWC/asm/ac/include/test.inc (100%) rename asm/overlay004/ov4_021E8BA8.inc => lib/NitroDWC/asm/ac/include/wds.inc (100%) rename asm/overlay004/ov4_021E73FC.s => lib/NitroDWC/asm/ac/makelist.s (99%) rename asm/overlay004/ov4_021E91B4.s => lib/NitroDWC/asm/ac/nintendospot.s (99%) rename asm/overlay004/ov4_021E7804.s => lib/NitroDWC/asm/ac/retry.s (94%) rename asm/overlay004/ov4_021E78E0.s => lib/NitroDWC/asm/ac/search.s (99%) rename asm/overlay004/ov4_021E85F4.s => lib/NitroDWC/asm/ac/shop_usb.s (99%) rename asm/overlay004/ov4_021E80B0.s => lib/NitroDWC/asm/ac/start.s (91%) rename asm/overlay004/ov4_021E8138.s => lib/NitroDWC/asm/ac/test.s (99%) rename asm/overlay004/ov4_021E8BA8.s => lib/NitroDWC/asm/ac/wds.s (99%) rename asm/overlay004/ov4_021D3038.s => lib/NitroDWC/asm/auth/dwc_auth.s (99%) rename asm/overlay004/ov4_02216670.s => lib/NitroDWC/asm/auth/dwc_ca_cybertru.s (100%) rename asm/overlay004/ov4_02217270.s => lib/NitroDWC/asm/auth/dwc_ca_globalsi.s (100%) rename asm/overlay004/ov4_02216AB8.s => lib/NitroDWC/asm/auth/dwc_ca_nas_self.s (100%) rename asm/overlay004/ov4_02216BA0.s => lib/NitroDWC/asm/auth/dwc_ca_thawte_p.s (100%) rename asm/overlay004/ov4_02216CC0.s => lib/NitroDWC/asm/auth/dwc_ca_thawte_s.s (100%) rename asm/overlay004/ov4_02216DD8.s => lib/NitroDWC/asm/auth/dwc_ca_verisign.s (100%) rename asm/overlay004/ov4_021D3E5C.s => lib/NitroDWC/asm/auth/dwc_cal.s (99%) rename asm/overlay004/ov4_021D4478.s => lib/NitroDWC/asm/auth/dwc_http.s (99%) rename asm/overlay004/ov4_021D6A88.s => lib/NitroDWC/asm/auth/dwc_nastime.s (99%) rename asm/overlay004/ov4_021D5818.s => lib/NitroDWC/asm/auth/dwc_netcheck.s (99%) rename asm/overlay004/ov4_021D6CA4.s => lib/NitroDWC/asm/auth/dwc_svl.s (99%) rename asm/overlay004/ov4_021D3038.inc => lib/NitroDWC/asm/auth/include/dwc_auth.inc (100%) rename asm/overlay004/ov4_021D3E5C.inc => lib/NitroDWC/asm/auth/include/dwc_cal.inc (100%) rename asm/overlay004/ov4_021D4478.inc => lib/NitroDWC/asm/auth/include/dwc_http.inc (100%) rename asm/overlay004/ov4_021D6A88.inc => lib/NitroDWC/asm/auth/include/dwc_nastime.inc (100%) rename asm/overlay004/ov4_021D5818.inc => lib/NitroDWC/asm/auth/include/dwc_netcheck.inc (100%) rename asm/overlay004/ov4_021D6CA4.inc => lib/NitroDWC/asm/auth/include/dwc_svl.inc (100%) rename asm/overlay004/ov4_021D72E0.inc => lib/NitroDWC/asm/auth/include/util_base64.inc (100%) rename asm/overlay004/ov4_021D72E0.s => lib/NitroDWC/asm/auth/util_base64.s (99%) rename asm/overlay004/ov4_021D8948.s => lib/NitroDWC/asm/base/dwc_common.s (99%) rename asm/overlay004/ov4_021D78C8.s => lib/NitroDWC/asm/base/dwc_connectinet.s (99%) rename asm/overlay004/ov4_021D75D4.s => lib/NitroDWC/asm/base/dwc_error.s (100%) rename asm/overlay004/ov4_021DB170.s => lib/NitroDWC/asm/base/dwc_friend.s (99%) rename asm/overlay004/ov4_021E558C.s => lib/NitroDWC/asm/base/dwc_ghttp.s (99%) rename asm/overlay004/ov4_021DA6C8.s => lib/NitroDWC/asm/base/dwc_login.s (99%) rename asm/overlay004/ov4_021D8C08.s => lib/NitroDWC/asm/base/dwc_main.s (99%) rename asm/overlay004/ov4_021D773C.s => lib/NitroDWC/asm/base/dwc_memfunc.s (98%) rename asm/overlay004/ov4_021D806C.s => lib/NitroDWC/asm/base/dwc_nasfunc.s (99%) rename asm/overlay004/ov4_021D83A4.s => lib/NitroDWC/asm/base/dwc_nd.s (99%) rename asm/overlay004/ov4_021E4A58.s => lib/NitroDWC/asm/base/dwc_transport.s (99%) rename asm/overlay004/ov4_021D8948.inc => lib/NitroDWC/asm/base/include/dwc_common.inc (100%) rename asm/overlay004/ov4_021D78C8.inc => lib/NitroDWC/asm/base/include/dwc_connectinet.inc (100%) rename asm/overlay004/ov4_021DB170.inc => lib/NitroDWC/asm/base/include/dwc_friend.inc (100%) rename asm/overlay004/ov4_021E558C.inc => lib/NitroDWC/asm/base/include/dwc_ghttp.inc (100%) rename asm/overlay004/ov4_021DA6C8.inc => lib/NitroDWC/asm/base/include/dwc_login.inc (100%) rename asm/overlay004/ov4_021D8C08.inc => lib/NitroDWC/asm/base/include/dwc_main.inc (100%) rename asm/overlay004/ov4_021D773C.inc => lib/NitroDWC/asm/base/include/dwc_memfunc.inc (100%) rename asm/overlay004/ov4_021D806C.inc => lib/NitroDWC/asm/base/include/dwc_nasfunc.inc (100%) rename asm/overlay004/ov4_021D83A4.inc => lib/NitroDWC/asm/base/include/dwc_nd.inc (100%) rename asm/overlay004/ov4_021E4A58.inc => lib/NitroDWC/asm/base/include/dwc_transport.inc (100%) rename asm/overlay004/ov4_021E963C.s => lib/NitroDWC/asm/gs/available.s (99%) rename asm/overlay004/ov4_021E99EC.s => lib/NitroDWC/asm/gs/darray.s (99%) rename asm/overlay004/ov4_021EB228.s => lib/NitroDWC/asm/gs/gp/gp.s (99%) rename asm/overlay004/ov4_021EBDCC.s => lib/NitroDWC/asm/gs/gp/gpi.s (99%) rename asm/overlay004/ov4_021EC564.s => lib/NitroDWC/asm/gs/gp/gpibuddy.s (99%) rename asm/overlay004/ov4_021ED420.s => lib/NitroDWC/asm/gs/gp/gpibuffer.s (99%) rename asm/overlay004/ov4_021EDE68.s => lib/NitroDWC/asm/gs/gp/gpicallback.s (99%) rename asm/overlay004/ov4_021EE2E0.s => lib/NitroDWC/asm/gs/gp/gpiconnect.s (99%) rename asm/overlay004/ov4_021EF924.s => lib/NitroDWC/asm/gs/gp/gpiinfo.s (99%) rename asm/overlay004/ov4_021F1708.s => lib/NitroDWC/asm/gs/gp/gpioperation.s (99%) rename asm/overlay004/ov4_021F1D24.s => lib/NitroDWC/asm/gs/gp/gpipeer.s (99%) rename asm/overlay004/ov4_021F2F6C.s => lib/NitroDWC/asm/gs/gp/gpiprofile.s (99%) rename asm/overlay004/ov4_021F34C8.s => lib/NitroDWC/asm/gs/gp/gpisearch.s (99%) rename asm/overlay004/ov4_021F55F4.s => lib/NitroDWC/asm/gs/gp/gpitransfer.s (98%) rename asm/overlay004/ov4_021F571C.s => lib/NitroDWC/asm/gs/gp/gpiunique.s (97%) rename asm/overlay004/ov4_021F5820.s => lib/NitroDWC/asm/gs/gp/gpiutility.s (99%) rename asm/overlay004/ov4_021EB228.inc => lib/NitroDWC/asm/gs/gp/include/gp.inc (100%) rename asm/overlay004/ov4_021EBDCC.inc => lib/NitroDWC/asm/gs/gp/include/gpi.inc (100%) rename asm/overlay004/ov4_021EC564.inc => lib/NitroDWC/asm/gs/gp/include/gpibuddy.inc (100%) rename asm/overlay004/ov4_021ED420.inc => lib/NitroDWC/asm/gs/gp/include/gpibuffer.inc (100%) rename asm/overlay004/ov4_021EDE68.inc => lib/NitroDWC/asm/gs/gp/include/gpicallback.inc (100%) rename asm/overlay004/ov4_021EE2E0.inc => lib/NitroDWC/asm/gs/gp/include/gpiconnect.inc (100%) rename asm/overlay004/ov4_021EF924.inc => lib/NitroDWC/asm/gs/gp/include/gpiinfo.inc (100%) rename asm/overlay004/ov4_021F1708.inc => lib/NitroDWC/asm/gs/gp/include/gpioperation.inc (100%) rename asm/overlay004/ov4_021F1D24.inc => lib/NitroDWC/asm/gs/gp/include/gpipeer.inc (100%) rename asm/overlay004/ov4_021F2F6C.inc => lib/NitroDWC/asm/gs/gp/include/gpiprofile.inc (100%) rename asm/overlay004/ov4_021F34C8.inc => lib/NitroDWC/asm/gs/gp/include/gpisearch.inc (100%) rename asm/overlay004/ov4_021F55F4.inc => lib/NitroDWC/asm/gs/gp/include/gpitransfer.inc (100%) rename asm/overlay004/ov4_021F571C.inc => lib/NitroDWC/asm/gs/gp/include/gpiunique.inc (100%) rename asm/overlay004/ov4_021F5820.inc => lib/NitroDWC/asm/gs/gp/include/gpiutility.inc (100%) rename asm/overlay004/ov4_021F5D7C.s => lib/NitroDWC/asm/gs/gstats/gbucket.s (99%) rename asm/overlay004/ov4_021F6338.s => lib/NitroDWC/asm/gs/gstats/gstats.s (99%) rename asm/overlay004/ov4_021F5D7C.inc => lib/NitroDWC/asm/gs/gstats/include/gbucket.inc (100%) rename asm/overlay004/ov4_021F6338.inc => lib/NitroDWC/asm/gs/gstats/include/gstats.inc (100%) rename asm/overlay004/ov4_021F7128.s => lib/NitroDWC/asm/gs/gt2/gt2auth.s (99%) rename asm/overlay004/ov4_021F741C.s => lib/NitroDWC/asm/gs/gt2/gt2buffer.s (99%) rename asm/overlay004/ov4_021F763C.s => lib/NitroDWC/asm/gs/gt2/gt2callback.s (99%) rename asm/overlay004/ov4_021F7F54.s => lib/NitroDWC/asm/gs/gt2/gt2connection.s (99%) rename asm/overlay004/ov4_021F8470.s => lib/NitroDWC/asm/gs/gt2/gt2main.s (99%) rename asm/overlay004/ov4_021F87F0.s => lib/NitroDWC/asm/gs/gt2/gt2message.s (99%) rename asm/overlay004/ov4_021FA360.s => lib/NitroDWC/asm/gs/gt2/gt2socket.s (99%) rename asm/overlay004/ov4_021FABFC.s => lib/NitroDWC/asm/gs/gt2/gt2utility.s (99%) rename asm/overlay004/ov4_021F7128.inc => lib/NitroDWC/asm/gs/gt2/include/gt2auth.inc (100%) rename asm/overlay004/ov4_021F741C.inc => lib/NitroDWC/asm/gs/gt2/include/gt2buffer.inc (100%) rename asm/overlay004/ov4_021F763C.inc => lib/NitroDWC/asm/gs/gt2/include/gt2callback.inc (100%) rename asm/overlay004/ov4_021F7F54.inc => lib/NitroDWC/asm/gs/gt2/include/gt2connection.inc (100%) rename asm/overlay004/ov4_021F8470.inc => lib/NitroDWC/asm/gs/gt2/include/gt2main.inc (100%) rename asm/overlay004/ov4_021F87F0.inc => lib/NitroDWC/asm/gs/gt2/include/gt2message.inc (100%) rename asm/overlay004/ov4_021FA360.inc => lib/NitroDWC/asm/gs/gt2/include/gt2socket.inc (100%) rename asm/overlay004/ov4_021FABFC.inc => lib/NitroDWC/asm/gs/gt2/include/gt2utility.inc (100%) rename asm/overlay004/ov4_021EA1FC.s => lib/NitroDWC/asm/gs/hashtable.s (99%) rename asm/overlay004/ov4_021E963C.inc => lib/NitroDWC/asm/gs/include/available.inc (100%) rename asm/overlay004/ov4_021E99EC.inc => lib/NitroDWC/asm/gs/include/darray.inc (100%) rename asm/overlay004/ov4_021EA1FC.inc => lib/NitroDWC/asm/gs/include/hashtable.inc (100%) rename asm/overlay004/ov4_021EA7B4.inc => lib/NitroDWC/asm/gs/include/md5c.inc (100%) rename asm/overlay004/ov4_021EA840.inc => lib/NitroDWC/asm/gs/include/nonport.inc (100%) rename asm/overlay004/ov4_021EA7B4.s => lib/NitroDWC/asm/gs/md5c.s (96%) rename asm/overlay004/ov4_021FAE80.inc => lib/NitroDWC/asm/gs/natneg/include/natneg.inc (100%) rename asm/overlay004/ov4_021FAE80.s => lib/NitroDWC/asm/gs/natneg/natneg.s (99%) rename asm/overlay004/ov4_021EA840.s => lib/NitroDWC/asm/gs/nonport.s (99%) rename asm/overlay004/ov4_021FBD94.inc => lib/NitroDWC/asm/gs/qr2/include/qr2.inc (100%) rename asm/overlay004/ov4_021FBD94.s => lib/NitroDWC/asm/gs/qr2/qr2.s (99%) rename asm/overlay004/ov4_021FD4E0.s => lib/NitroDWC/asm/gs/qr2/qr2regkeys.s (100%) rename asm/overlay004/ov4_021FD500.inc => lib/NitroDWC/asm/gs/serverbrowsing/include/sb_crypt.inc (100%) rename asm/overlay004/ov4_021FD7CC.inc => lib/NitroDWC/asm/gs/serverbrowsing/include/sb_queryengine.inc (100%) rename asm/overlay004/ov4_021FE0AC.inc => lib/NitroDWC/asm/gs/serverbrowsing/include/sb_server.inc (100%) rename asm/overlay004/ov4_021FE890.inc => lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverbrowsing.inc (100%) rename asm/overlay004/ov4_021FEEC8.inc => lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverlist.inc (100%) rename asm/overlay004/ov4_021FD500.s => lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.s (98%) rename asm/overlay004/ov4_021FD7CC.s => lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.s (99%) rename asm/overlay004/ov4_021FE0AC.s => lib/NitroDWC/asm/gs/serverbrowsing/sb_server.s (99%) rename asm/overlay004/ov4_021FE890.s => lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.s (99%) rename asm/overlay004/ov4_021FEEC8.s => lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.s (99%) rename asm/overlay004/ov4_02208CEC.inc => lib/NitroWiFi/asm/cps/include/network.inc (100%) rename asm/overlay004/ov4_02208CEC.s => lib/NitroWiFi/asm/cps/network.s (99%) rename asm/overlay004/ov4_02208324.inc => lib/NitroWiFi/asm/soc/include/soc.inc (100%) rename asm/overlay004/ov4_02206808.inc => lib/NitroWiFi/asm/soc/include/socl_bind.inc (100%) rename asm/overlay004/ov4_02207D90.inc => lib/NitroWiFi/asm/soc/include/socl_cleanup.inc (100%) rename asm/overlay004/ov4_02207A18.inc => lib/NitroWiFi/asm/soc/include/socl_close.inc (100%) rename asm/overlay004/ov4_02205EF0.inc => lib/NitroWiFi/asm/soc/include/socl_command.inc (100%) rename asm/overlay004/ov4_02206224.inc => lib/NitroWiFi/asm/soc/include/socl_create.inc (100%) rename asm/overlay004/ov4_02208214.inc => lib/NitroWiFi/asm/soc/include/socl_list.inc (100%) rename asm/overlay004/ov4_0220657C.inc => lib/NitroWiFi/asm/soc/include/socl_listen_acc.inc (100%) rename asm/overlay004/ov4_022080F0.inc => lib/NitroWiFi/asm/soc/include/socl_poll.inc (100%) rename asm/overlay004/ov4_02206A3C.inc => lib/NitroWiFi/asm/soc/include/socl_read.inc (100%) rename asm/overlay004/ov4_02207F58.inc => lib/NitroWiFi/asm/soc/include/socl_resolve.inc (100%) rename asm/overlay004/ov4_0220793C.inc => lib/NitroWiFi/asm/soc/include/socl_shutdown.inc (100%) rename asm/overlay004/ov4_02208BCC.inc => lib/NitroWiFi/asm/soc/include/socl_ssl.inc (100%) rename asm/overlay004/ov4_02205C7C.inc => lib/NitroWiFi/asm/soc/include/socl_startup.inc (100%) rename asm/overlay004/ov4_0220729C.inc => lib/NitroWiFi/asm/soc/include/socl_write.inc (100%) rename asm/overlay004/ov4_02208324.s => lib/NitroWiFi/asm/soc/soc.s (99%) rename asm/overlay004/ov4_02206808.s => lib/NitroWiFi/asm/soc/socl_bind.s (98%) rename asm/overlay004/ov4_02207D90.s => lib/NitroWiFi/asm/soc/socl_cleanup.s (97%) rename asm/overlay004/ov4_02207A18.s => lib/NitroWiFi/asm/soc/socl_close.s (98%) rename asm/overlay004/ov4_02205EF0.s => lib/NitroWiFi/asm/soc/socl_command.s (99%) rename asm/overlay004/ov4_0221A13C.s => lib/NitroWiFi/asm/soc/socl_const.s (100%) rename asm/overlay004/ov4_02206224.s => lib/NitroWiFi/asm/soc/socl_create.s (98%) rename asm/overlay004/ov4_02208214.s => lib/NitroWiFi/asm/soc/socl_list.s (98%) rename asm/overlay004/ov4_0220657C.s => lib/NitroWiFi/asm/soc/socl_listen_acc.s (98%) rename asm/overlay004/ov4_02208208.s => lib/NitroWiFi/asm/soc/socl_misc.s (100%) rename asm/overlay004/ov4_022080F0.s => lib/NitroWiFi/asm/soc/socl_poll.s (95%) rename asm/overlay004/ov4_02206A3C.s => lib/NitroWiFi/asm/soc/socl_read.s (99%) rename asm/overlay004/ov4_02207F58.s => lib/NitroWiFi/asm/soc/socl_resolve.s (97%) rename asm/overlay004/ov4_0220793C.s => lib/NitroWiFi/asm/soc/socl_shutdown.s (95%) rename asm/overlay004/ov4_02208BCC.s => lib/NitroWiFi/asm/soc/socl_ssl.s (96%) rename asm/overlay004/ov4_02205C7C.s => lib/NitroWiFi/asm/soc/socl_startup.s (99%) rename asm/overlay004/ov4_0220729C.s => lib/NitroWiFi/asm/soc/socl_write.s (99%) rename asm/overlay004/ov4_02211D9C.s => lib/NitroWiFi/asm/ssl/arc4.s (100%) rename asm/overlay004/ov4_02211E7C.s => lib/NitroWiFi/asm/ssl/biginteger.s (99%) rename asm/overlay004/ov4_02211E7C.inc => lib/NitroWiFi/asm/ssl/include/biginteger.inc (100%) rename asm/overlay004/ov4_02210EEC.inc => lib/NitroWiFi/asm/ssl/include/md5.inc (100%) rename asm/overlay004/ov4_022114A0.inc => lib/NitroWiFi/asm/ssl/include/sha1.inc (100%) rename asm/overlay004/ov4_0220DA10.inc => lib/NitroWiFi/asm/ssl/include/ssl.inc (100%) rename asm/overlay004/ov4_02210EEC.s => lib/NitroWiFi/asm/ssl/md5.s (99%) rename asm/overlay004/ov4_022114A0.s => lib/NitroWiFi/asm/ssl/sha1.s (99%) rename asm/overlay004/ov4_0220DA10.s => lib/NitroWiFi/asm/ssl/ssl.s (99%) rename asm/overlay004/ov4_02215844.s => lib/NitroWiFi/asm/stubsmd5/dummy_md5.s (89%) rename asm/overlay004/ov4_02215844.inc => lib/NitroWiFi/asm/stubsmd5/include/dummy_md5.inc (100%) rename asm/overlay004/ov4_02214E34.s => lib/NitroWiFi/asm/wcm/aplist.s (98%) rename asm/overlay004/ov4_022152B4.s => lib/NitroWiFi/asm/wcm/cpsif.s (99%) rename asm/overlay004/ov4_02214E34.inc => lib/NitroWiFi/asm/wcm/include/aplist.inc (100%) rename asm/overlay004/ov4_022152B4.inc => lib/NitroWiFi/asm/wcm/include/cpsif.inc (100%) rename asm/overlay004/ov4_02212CC8.inc => lib/NitroWiFi/asm/wcm/include/system.inc (100%) rename asm/overlay004/ov4_022156C0.inc => lib/NitroWiFi/asm/wcm/include/util.inc (100%) rename asm/overlay004/ov4_02212CC8.s => lib/NitroWiFi/asm/wcm/system.s (99%) rename asm/overlay004/ov4_022156C0.s => lib/NitroWiFi/asm/wcm/util.s (98%) rename asm/overlay004/ov4_02201504.s => lib/libVCT/asm/adpcm.s (99%) rename asm/overlay004/ov4_02202698.s => lib/libVCT/asm/audio.s (99%) rename asm/overlay004/ov4_02203504.s => lib/libVCT/asm/decoder.s (99%) rename asm/overlay004/ov4_022054E4.s => lib/libVCT/asm/fir.s (99%) rename asm/overlay004/ov4_02203798.s => lib/libVCT/asm/g711.s (100%) rename asm/overlay004/ov4_02201504.inc => lib/libVCT/asm/include/adpcm.inc (100%) rename asm/overlay004/ov4_02202698.inc => lib/libVCT/asm/include/audio.inc (100%) rename asm/overlay004/ov4_02203504.inc => lib/libVCT/asm/include/decoder.inc (100%) rename asm/overlay004/ov4_022054E4.inc => lib/libVCT/asm/include/fir.inc (100%) rename asm/overlay004/ov4_022038F4.inc => lib/libVCT/asm/include/queue.inc (100%) rename asm/overlay004/ov4_02204160.inc => lib/libVCT/asm/include/ssp.inc (100%) rename asm/overlay004/ov4_02203BD4.inc => lib/libVCT/asm/include/stream.inc (100%) rename asm/overlay004/ov4_02205128.inc => lib/libVCT/asm/include/udp_buffer.inc (100%) rename asm/overlay004/ov4_02205270.inc => lib/libVCT/asm/include/vad.inc (100%) rename asm/overlay004/ov4_02205988.inc => lib/libVCT/asm/include/vct_main.inc (100%) rename asm/overlay004/ov4_022058A0.s => lib/libVCT/asm/mixer.s (100%) rename asm/overlay004/ov4_022038F4.s => lib/libVCT/asm/queue.s (99%) rename asm/overlay004/ov4_02204160.s => lib/libVCT/asm/ssp.s (99%) rename asm/overlay004/ov4_02203BD4.s => lib/libVCT/asm/stream.s (99%) rename asm/overlay004/ov4_02205128.s => lib/libVCT/asm/udp_buffer.s (98%) rename asm/overlay004/ov4_02205270.s => lib/libVCT/asm/vad.s (99%) rename asm/overlay004/ov4_02205988.s => lib/libVCT/asm/vct_main.s (99%) diff --git a/.github/calcrom/BuildAnalyzer.cpp b/.github/calcrom/BuildAnalyzer.cpp index 2b3779250b..18f71c11bb 100644 --- a/.github/calcrom/BuildAnalyzer.cpp +++ b/.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); } diff --git a/common.mk b/common.mk index 5a4635a42f..9c3668f9bc 100644 --- a/common.mk +++ b/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) diff --git a/asm/overlay004/ov4_021E6588.s b/lib/NitroDWC/asm/ac/beacon.s similarity index 99% rename from asm/overlay004/ov4_021E6588.s rename to lib/NitroDWC/asm/ac/beacon.s index 66c3bfe324..23d1323bec 100644 --- a/asm/overlay004/ov4_021E6588.s +++ b/lib/NitroDWC/asm/ac/beacon.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E6588.inc" + .include "include/beacon.inc" diff --git a/asm/overlay004/ov4_021E6B04.s b/lib/NitroDWC/asm/ac/callback.s similarity index 91% rename from asm/overlay004/ov4_021E6B04.s rename to lib/NitroDWC/asm/ac/callback.s index 9d419182e4..243236fd38 100644 --- a/asm/overlay004/ov4_021E6B04.s +++ b/lib/NitroDWC/asm/ac/callback.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E6B04.inc" + .include "include/callback.inc" diff --git a/asm/overlay004/ov4_021E70C8.s b/lib/NitroDWC/asm/ac/close.s similarity index 96% rename from asm/overlay004/ov4_021E70C8.s rename to lib/NitroDWC/asm/ac/close.s index 9575c1707b..c52517cb50 100644 --- a/asm/overlay004/ov4_021E70C8.s +++ b/lib/NitroDWC/asm/ac/close.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E70C8.inc" + .include "include/close.inc" diff --git a/asm/overlay004/ov4_021E6B90.s b/lib/NitroDWC/asm/ac/connect.s similarity index 99% rename from asm/overlay004/ov4_021E6B90.s rename to lib/NitroDWC/asm/ac/connect.s index c7032933c0..0e3d7c1f46 100644 --- a/asm/overlay004/ov4_021E6B90.s +++ b/lib/NitroDWC/asm/ac/connect.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E6B90.inc" + .include "include/connect.inc" diff --git a/asm/overlay004/ov4_021E5C34.s b/lib/NitroDWC/asm/ac/dwc_ac.s similarity index 99% rename from asm/overlay004/ov4_021E5C34.s rename to lib/NitroDWC/asm/ac/dwc_ac.s index 8382b947bf..7e0051bfeb 100644 --- a/asm/overlay004/ov4_021E5C34.s +++ b/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" diff --git a/asm/overlay004/ov4_021E7210.s b/lib/NitroDWC/asm/ac/error.s similarity index 97% rename from asm/overlay004/ov4_021E7210.s rename to lib/NitroDWC/asm/ac/error.s index e060b15682..420df27b49 100644 --- a/asm/overlay004/ov4_021E7210.s +++ b/lib/NitroDWC/asm/ac/error.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E7210.inc" + .include "include/error.inc" diff --git a/asm/overlay004/ov4_021E6588.inc b/lib/NitroDWC/asm/ac/include/beacon.inc similarity index 100% rename from asm/overlay004/ov4_021E6588.inc rename to lib/NitroDWC/asm/ac/include/beacon.inc diff --git a/asm/overlay004/ov4_021E6B04.inc b/lib/NitroDWC/asm/ac/include/callback.inc similarity index 100% rename from asm/overlay004/ov4_021E6B04.inc rename to lib/NitroDWC/asm/ac/include/callback.inc diff --git a/asm/overlay004/ov4_021E70C8.inc b/lib/NitroDWC/asm/ac/include/close.inc similarity index 100% rename from asm/overlay004/ov4_021E70C8.inc rename to lib/NitroDWC/asm/ac/include/close.inc diff --git a/asm/overlay004/ov4_021E6B90.inc b/lib/NitroDWC/asm/ac/include/connect.inc similarity index 100% rename from asm/overlay004/ov4_021E6B90.inc rename to lib/NitroDWC/asm/ac/include/connect.inc diff --git a/asm/overlay004/ov4_021E5C34.inc b/lib/NitroDWC/asm/ac/include/dwc_ac.inc similarity index 100% rename from asm/overlay004/ov4_021E5C34.inc rename to lib/NitroDWC/asm/ac/include/dwc_ac.inc diff --git a/asm/overlay004/ov4_021E7210.inc b/lib/NitroDWC/asm/ac/include/error.inc similarity index 100% rename from asm/overlay004/ov4_021E7210.inc rename to lib/NitroDWC/asm/ac/include/error.inc diff --git a/asm/overlay004/ov4_021E73FC.inc b/lib/NitroDWC/asm/ac/include/makelist.inc similarity index 100% rename from asm/overlay004/ov4_021E73FC.inc rename to lib/NitroDWC/asm/ac/include/makelist.inc diff --git a/asm/overlay004/ov4_021E91B4.inc b/lib/NitroDWC/asm/ac/include/nintendospot.inc similarity index 100% rename from asm/overlay004/ov4_021E91B4.inc rename to lib/NitroDWC/asm/ac/include/nintendospot.inc diff --git a/asm/overlay004/ov4_021E7804.inc b/lib/NitroDWC/asm/ac/include/retry.inc similarity index 100% rename from asm/overlay004/ov4_021E7804.inc rename to lib/NitroDWC/asm/ac/include/retry.inc diff --git a/asm/overlay004/ov4_021E78E0.inc b/lib/NitroDWC/asm/ac/include/search.inc similarity index 100% rename from asm/overlay004/ov4_021E78E0.inc rename to lib/NitroDWC/asm/ac/include/search.inc diff --git a/asm/overlay004/ov4_021E85F4.inc b/lib/NitroDWC/asm/ac/include/shop_usb.inc similarity index 100% rename from asm/overlay004/ov4_021E85F4.inc rename to lib/NitroDWC/asm/ac/include/shop_usb.inc diff --git a/asm/overlay004/ov4_021E80B0.inc b/lib/NitroDWC/asm/ac/include/start.inc similarity index 100% rename from asm/overlay004/ov4_021E80B0.inc rename to lib/NitroDWC/asm/ac/include/start.inc diff --git a/asm/overlay004/ov4_021E8138.inc b/lib/NitroDWC/asm/ac/include/test.inc similarity index 100% rename from asm/overlay004/ov4_021E8138.inc rename to lib/NitroDWC/asm/ac/include/test.inc diff --git a/asm/overlay004/ov4_021E8BA8.inc b/lib/NitroDWC/asm/ac/include/wds.inc similarity index 100% rename from asm/overlay004/ov4_021E8BA8.inc rename to lib/NitroDWC/asm/ac/include/wds.inc diff --git a/asm/overlay004/ov4_021E73FC.s b/lib/NitroDWC/asm/ac/makelist.s similarity index 99% rename from asm/overlay004/ov4_021E73FC.s rename to lib/NitroDWC/asm/ac/makelist.s index 59f1e076c4..87f178b6a0 100644 --- a/asm/overlay004/ov4_021E73FC.s +++ b/lib/NitroDWC/asm/ac/makelist.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E73FC.inc" + .include "include/makelist.inc" diff --git a/asm/overlay004/ov4_021E91B4.s b/lib/NitroDWC/asm/ac/nintendospot.s similarity index 99% rename from asm/overlay004/ov4_021E91B4.s rename to lib/NitroDWC/asm/ac/nintendospot.s index d2d3a910ca..cc27de6c2c 100644 --- a/asm/overlay004/ov4_021E91B4.s +++ b/lib/NitroDWC/asm/ac/nintendospot.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E91B4.inc" + .include "include/nintendospot.inc" diff --git a/asm/overlay004/ov4_021E7804.s b/lib/NitroDWC/asm/ac/retry.s similarity index 94% rename from asm/overlay004/ov4_021E7804.s rename to lib/NitroDWC/asm/ac/retry.s index de54842ce0..cd40c6b661 100644 --- a/asm/overlay004/ov4_021E7804.s +++ b/lib/NitroDWC/asm/ac/retry.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E7804.inc" + .include "include/retry.inc" diff --git a/asm/overlay004/ov4_021E78E0.s b/lib/NitroDWC/asm/ac/search.s similarity index 99% rename from asm/overlay004/ov4_021E78E0.s rename to lib/NitroDWC/asm/ac/search.s index 4e2c8d3d3b..5057ca1c49 100644 --- a/asm/overlay004/ov4_021E78E0.s +++ b/lib/NitroDWC/asm/ac/search.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E78E0.inc" + .include "include/search.inc" diff --git a/asm/overlay004/ov4_021E85F4.s b/lib/NitroDWC/asm/ac/shop_usb.s similarity index 99% rename from asm/overlay004/ov4_021E85F4.s rename to lib/NitroDWC/asm/ac/shop_usb.s index dab62e9fe5..7a930ceac0 100644 --- a/asm/overlay004/ov4_021E85F4.s +++ b/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" diff --git a/asm/overlay004/ov4_021E80B0.s b/lib/NitroDWC/asm/ac/start.s similarity index 91% rename from asm/overlay004/ov4_021E80B0.s rename to lib/NitroDWC/asm/ac/start.s index 8ccddaac09..23daafdb99 100644 --- a/asm/overlay004/ov4_021E80B0.s +++ b/lib/NitroDWC/asm/ac/start.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E80B0.inc" + .include "include/start.inc" diff --git a/asm/overlay004/ov4_021E8138.s b/lib/NitroDWC/asm/ac/test.s similarity index 99% rename from asm/overlay004/ov4_021E8138.s rename to lib/NitroDWC/asm/ac/test.s index a38b88ba0a..39624bc34a 100644 --- a/asm/overlay004/ov4_021E8138.s +++ b/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 diff --git a/asm/overlay004/ov4_021E8BA8.s b/lib/NitroDWC/asm/ac/wds.s similarity index 99% rename from asm/overlay004/ov4_021E8BA8.s rename to lib/NitroDWC/asm/ac/wds.s index a81e901bfc..5c5b70fe06 100644 --- a/asm/overlay004/ov4_021E8BA8.s +++ b/lib/NitroDWC/asm/ac/wds.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E8BA8.inc" + .include "include/wds.inc" diff --git a/asm/overlay004/ov4_021D3038.s b/lib/NitroDWC/asm/auth/dwc_auth.s similarity index 99% rename from asm/overlay004/ov4_021D3038.s rename to lib/NitroDWC/asm/auth/dwc_auth.s index 084aa25cd0..70330febe1 100644 --- a/asm/overlay004/ov4_021D3038.s +++ b/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 diff --git a/asm/overlay004/ov4_02216670.s b/lib/NitroDWC/asm/auth/dwc_ca_cybertru.s similarity index 100% rename from asm/overlay004/ov4_02216670.s rename to lib/NitroDWC/asm/auth/dwc_ca_cybertru.s diff --git a/asm/overlay004/ov4_02217270.s b/lib/NitroDWC/asm/auth/dwc_ca_globalsi.s similarity index 100% rename from asm/overlay004/ov4_02217270.s rename to lib/NitroDWC/asm/auth/dwc_ca_globalsi.s diff --git a/asm/overlay004/ov4_02216AB8.s b/lib/NitroDWC/asm/auth/dwc_ca_nas_self.s similarity index 100% rename from asm/overlay004/ov4_02216AB8.s rename to lib/NitroDWC/asm/auth/dwc_ca_nas_self.s diff --git a/asm/overlay004/ov4_02216BA0.s b/lib/NitroDWC/asm/auth/dwc_ca_thawte_p.s similarity index 100% rename from asm/overlay004/ov4_02216BA0.s rename to lib/NitroDWC/asm/auth/dwc_ca_thawte_p.s diff --git a/asm/overlay004/ov4_02216CC0.s b/lib/NitroDWC/asm/auth/dwc_ca_thawte_s.s similarity index 100% rename from asm/overlay004/ov4_02216CC0.s rename to lib/NitroDWC/asm/auth/dwc_ca_thawte_s.s diff --git a/asm/overlay004/ov4_02216DD8.s b/lib/NitroDWC/asm/auth/dwc_ca_verisign.s similarity index 100% rename from asm/overlay004/ov4_02216DD8.s rename to lib/NitroDWC/asm/auth/dwc_ca_verisign.s diff --git a/asm/overlay004/ov4_021D3E5C.s b/lib/NitroDWC/asm/auth/dwc_cal.s similarity index 99% rename from asm/overlay004/ov4_021D3E5C.s rename to lib/NitroDWC/asm/auth/dwc_cal.s index b06aeea996..05400a7d20 100644 --- a/asm/overlay004/ov4_021D3E5C.s +++ b/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" diff --git a/asm/overlay004/ov4_021D4478.s b/lib/NitroDWC/asm/auth/dwc_http.s similarity index 99% rename from asm/overlay004/ov4_021D4478.s rename to lib/NitroDWC/asm/auth/dwc_http.s index 267126b5a1..511b93574c 100644 --- a/asm/overlay004/ov4_021D4478.s +++ b/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 diff --git a/asm/overlay004/ov4_021D6A88.s b/lib/NitroDWC/asm/auth/dwc_nastime.s similarity index 99% rename from asm/overlay004/ov4_021D6A88.s rename to lib/NitroDWC/asm/auth/dwc_nastime.s index 84c4fcb829..570a6f57b3 100644 --- a/asm/overlay004/ov4_021D6A88.s +++ b/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 diff --git a/asm/overlay004/ov4_021D5818.s b/lib/NitroDWC/asm/auth/dwc_netcheck.s similarity index 99% rename from asm/overlay004/ov4_021D5818.s rename to lib/NitroDWC/asm/auth/dwc_netcheck.s index 8ecef9bb37..8d74abfd06 100644 --- a/asm/overlay004/ov4_021D5818.s +++ b/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 diff --git a/asm/overlay004/ov4_021D6CA4.s b/lib/NitroDWC/asm/auth/dwc_svl.s similarity index 99% rename from asm/overlay004/ov4_021D6CA4.s rename to lib/NitroDWC/asm/auth/dwc_svl.s index 1a94c81c1a..9f6be9d19e 100644 --- a/asm/overlay004/ov4_021D6CA4.s +++ b/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 diff --git a/asm/overlay004/ov4_021D3038.inc b/lib/NitroDWC/asm/auth/include/dwc_auth.inc similarity index 100% rename from asm/overlay004/ov4_021D3038.inc rename to lib/NitroDWC/asm/auth/include/dwc_auth.inc diff --git a/asm/overlay004/ov4_021D3E5C.inc b/lib/NitroDWC/asm/auth/include/dwc_cal.inc similarity index 100% rename from asm/overlay004/ov4_021D3E5C.inc rename to lib/NitroDWC/asm/auth/include/dwc_cal.inc diff --git a/asm/overlay004/ov4_021D4478.inc b/lib/NitroDWC/asm/auth/include/dwc_http.inc similarity index 100% rename from asm/overlay004/ov4_021D4478.inc rename to lib/NitroDWC/asm/auth/include/dwc_http.inc diff --git a/asm/overlay004/ov4_021D6A88.inc b/lib/NitroDWC/asm/auth/include/dwc_nastime.inc similarity index 100% rename from asm/overlay004/ov4_021D6A88.inc rename to lib/NitroDWC/asm/auth/include/dwc_nastime.inc diff --git a/asm/overlay004/ov4_021D5818.inc b/lib/NitroDWC/asm/auth/include/dwc_netcheck.inc similarity index 100% rename from asm/overlay004/ov4_021D5818.inc rename to lib/NitroDWC/asm/auth/include/dwc_netcheck.inc diff --git a/asm/overlay004/ov4_021D6CA4.inc b/lib/NitroDWC/asm/auth/include/dwc_svl.inc similarity index 100% rename from asm/overlay004/ov4_021D6CA4.inc rename to lib/NitroDWC/asm/auth/include/dwc_svl.inc diff --git a/asm/overlay004/ov4_021D72E0.inc b/lib/NitroDWC/asm/auth/include/util_base64.inc similarity index 100% rename from asm/overlay004/ov4_021D72E0.inc rename to lib/NitroDWC/asm/auth/include/util_base64.inc diff --git a/asm/overlay004/ov4_021D72E0.s b/lib/NitroDWC/asm/auth/util_base64.s similarity index 99% rename from asm/overlay004/ov4_021D72E0.s rename to lib/NitroDWC/asm/auth/util_base64.s index fcbd3d496a..907a894963 100644 --- a/asm/overlay004/ov4_021D72E0.s +++ b/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" diff --git a/asm/overlay004/ov4_021D8948.s b/lib/NitroDWC/asm/base/dwc_common.s similarity index 99% rename from asm/overlay004/ov4_021D8948.s rename to lib/NitroDWC/asm/base/dwc_common.s index 7145ca7447..b45b8025cf 100644 --- a/asm/overlay004/ov4_021D8948.s +++ b/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" diff --git a/asm/overlay004/ov4_021D78C8.s b/lib/NitroDWC/asm/base/dwc_connectinet.s similarity index 99% rename from asm/overlay004/ov4_021D78C8.s rename to lib/NitroDWC/asm/base/dwc_connectinet.s index ed7797e8c7..f03719cf47 100644 --- a/asm/overlay004/ov4_021D78C8.s +++ b/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" diff --git a/asm/overlay004/ov4_021D75D4.s b/lib/NitroDWC/asm/base/dwc_error.s similarity index 100% rename from asm/overlay004/ov4_021D75D4.s rename to lib/NitroDWC/asm/base/dwc_error.s diff --git a/asm/overlay004/ov4_021DB170.s b/lib/NitroDWC/asm/base/dwc_friend.s similarity index 99% rename from asm/overlay004/ov4_021DB170.s rename to lib/NitroDWC/asm/base/dwc_friend.s index f132a0a6a7..a080f3afb4 100644 --- a/asm/overlay004/ov4_021DB170.s +++ b/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" diff --git a/asm/overlay004/ov4_021E558C.s b/lib/NitroDWC/asm/base/dwc_ghttp.s similarity index 99% rename from asm/overlay004/ov4_021E558C.s rename to lib/NitroDWC/asm/base/dwc_ghttp.s index 9a7154cd04..71ae48f280 100644 --- a/asm/overlay004/ov4_021E558C.s +++ b/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" diff --git a/asm/overlay004/ov4_021DA6C8.s b/lib/NitroDWC/asm/base/dwc_login.s similarity index 99% rename from asm/overlay004/ov4_021DA6C8.s rename to lib/NitroDWC/asm/base/dwc_login.s index 9d16ffe2c7..5be128e4a9 100644 --- a/asm/overlay004/ov4_021DA6C8.s +++ b/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" diff --git a/asm/overlay004/ov4_021D8C08.s b/lib/NitroDWC/asm/base/dwc_main.s similarity index 99% rename from asm/overlay004/ov4_021D8C08.s rename to lib/NitroDWC/asm/base/dwc_main.s index 7c7c67c9d4..5a7825585b 100644 --- a/asm/overlay004/ov4_021D8C08.s +++ b/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 diff --git a/asm/overlay004/ov4_021D773C.s b/lib/NitroDWC/asm/base/dwc_memfunc.s similarity index 98% rename from asm/overlay004/ov4_021D773C.s rename to lib/NitroDWC/asm/base/dwc_memfunc.s index 90590caad9..68ba9e2182 100644 --- a/asm/overlay004/ov4_021D773C.s +++ b/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" diff --git a/asm/overlay004/ov4_021D806C.s b/lib/NitroDWC/asm/base/dwc_nasfunc.s similarity index 99% rename from asm/overlay004/ov4_021D806C.s rename to lib/NitroDWC/asm/base/dwc_nasfunc.s index 713fe9878b..c7fce7ba40 100644 --- a/asm/overlay004/ov4_021D806C.s +++ b/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 diff --git a/asm/overlay004/ov4_021D83A4.s b/lib/NitroDWC/asm/base/dwc_nd.s similarity index 99% rename from asm/overlay004/ov4_021D83A4.s rename to lib/NitroDWC/asm/base/dwc_nd.s index 1b6166f644..57f54ad4b0 100644 --- a/asm/overlay004/ov4_021D83A4.s +++ b/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" diff --git a/asm/overlay004/ov4_021E4A58.s b/lib/NitroDWC/asm/base/dwc_transport.s similarity index 99% rename from asm/overlay004/ov4_021E4A58.s rename to lib/NitroDWC/asm/base/dwc_transport.s index 09e89a21af..bfbc036b28 100644 --- a/asm/overlay004/ov4_021E4A58.s +++ b/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" diff --git a/asm/overlay004/ov4_021D8948.inc b/lib/NitroDWC/asm/base/include/dwc_common.inc similarity index 100% rename from asm/overlay004/ov4_021D8948.inc rename to lib/NitroDWC/asm/base/include/dwc_common.inc diff --git a/asm/overlay004/ov4_021D78C8.inc b/lib/NitroDWC/asm/base/include/dwc_connectinet.inc similarity index 100% rename from asm/overlay004/ov4_021D78C8.inc rename to lib/NitroDWC/asm/base/include/dwc_connectinet.inc diff --git a/asm/overlay004/ov4_021DB170.inc b/lib/NitroDWC/asm/base/include/dwc_friend.inc similarity index 100% rename from asm/overlay004/ov4_021DB170.inc rename to lib/NitroDWC/asm/base/include/dwc_friend.inc diff --git a/asm/overlay004/ov4_021E558C.inc b/lib/NitroDWC/asm/base/include/dwc_ghttp.inc similarity index 100% rename from asm/overlay004/ov4_021E558C.inc rename to lib/NitroDWC/asm/base/include/dwc_ghttp.inc diff --git a/asm/overlay004/ov4_021DA6C8.inc b/lib/NitroDWC/asm/base/include/dwc_login.inc similarity index 100% rename from asm/overlay004/ov4_021DA6C8.inc rename to lib/NitroDWC/asm/base/include/dwc_login.inc diff --git a/asm/overlay004/ov4_021D8C08.inc b/lib/NitroDWC/asm/base/include/dwc_main.inc similarity index 100% rename from asm/overlay004/ov4_021D8C08.inc rename to lib/NitroDWC/asm/base/include/dwc_main.inc diff --git a/asm/overlay004/ov4_021D773C.inc b/lib/NitroDWC/asm/base/include/dwc_memfunc.inc similarity index 100% rename from asm/overlay004/ov4_021D773C.inc rename to lib/NitroDWC/asm/base/include/dwc_memfunc.inc diff --git a/asm/overlay004/ov4_021D806C.inc b/lib/NitroDWC/asm/base/include/dwc_nasfunc.inc similarity index 100% rename from asm/overlay004/ov4_021D806C.inc rename to lib/NitroDWC/asm/base/include/dwc_nasfunc.inc diff --git a/asm/overlay004/ov4_021D83A4.inc b/lib/NitroDWC/asm/base/include/dwc_nd.inc similarity index 100% rename from asm/overlay004/ov4_021D83A4.inc rename to lib/NitroDWC/asm/base/include/dwc_nd.inc diff --git a/asm/overlay004/ov4_021E4A58.inc b/lib/NitroDWC/asm/base/include/dwc_transport.inc similarity index 100% rename from asm/overlay004/ov4_021E4A58.inc rename to lib/NitroDWC/asm/base/include/dwc_transport.inc diff --git a/asm/overlay004/ov4_021E963C.s b/lib/NitroDWC/asm/gs/available.s similarity index 99% rename from asm/overlay004/ov4_021E963C.s rename to lib/NitroDWC/asm/gs/available.s index 573698f0cf..561f38f703 100644 --- a/asm/overlay004/ov4_021E963C.s +++ b/lib/NitroDWC/asm/gs/available.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E963C.inc" + .include "include/available.inc" .text diff --git a/asm/overlay004/ov4_021E99EC.s b/lib/NitroDWC/asm/gs/darray.s similarity index 99% rename from asm/overlay004/ov4_021E99EC.s rename to lib/NitroDWC/asm/gs/darray.s index 959313d2de..7e8986766b 100644 --- a/asm/overlay004/ov4_021E99EC.s +++ b/lib/NitroDWC/asm/gs/darray.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021E99EC.inc" + .include "include/darray.inc" diff --git a/asm/overlay004/ov4_021EB228.s b/lib/NitroDWC/asm/gs/gp/gp.s similarity index 99% rename from asm/overlay004/ov4_021EB228.s rename to lib/NitroDWC/asm/gs/gp/gp.s index 2e780b86f0..9a39418c68 100644 --- a/asm/overlay004/ov4_021EB228.s +++ b/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 diff --git a/asm/overlay004/ov4_021EBDCC.s b/lib/NitroDWC/asm/gs/gp/gpi.s similarity index 99% rename from asm/overlay004/ov4_021EBDCC.s rename to lib/NitroDWC/asm/gs/gp/gpi.s index 18724e5aa1..2d15eafe06 100644 --- a/asm/overlay004/ov4_021EBDCC.s +++ b/lib/NitroDWC/asm/gs/gp/gpi.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EBDCC.inc" + .include "include/gpi.inc" diff --git a/asm/overlay004/ov4_021EC564.s b/lib/NitroDWC/asm/gs/gp/gpibuddy.s similarity index 99% rename from asm/overlay004/ov4_021EC564.s rename to lib/NitroDWC/asm/gs/gp/gpibuddy.s index 4e16285970..18755a3668 100644 --- a/asm/overlay004/ov4_021EC564.s +++ b/lib/NitroDWC/asm/gs/gp/gpibuddy.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EC564.inc" + .include "include/gpibuddy.inc" diff --git a/asm/overlay004/ov4_021ED420.s b/lib/NitroDWC/asm/gs/gp/gpibuffer.s similarity index 99% rename from asm/overlay004/ov4_021ED420.s rename to lib/NitroDWC/asm/gs/gp/gpibuffer.s index 4442916acf..ca5cde2874 100644 --- a/asm/overlay004/ov4_021ED420.s +++ b/lib/NitroDWC/asm/gs/gp/gpibuffer.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021ED420.inc" + .include "include/gpibuffer.inc" diff --git a/asm/overlay004/ov4_021EDE68.s b/lib/NitroDWC/asm/gs/gp/gpicallback.s similarity index 99% rename from asm/overlay004/ov4_021EDE68.s rename to lib/NitroDWC/asm/gs/gp/gpicallback.s index 0dd44cf144..c971a139a6 100644 --- a/asm/overlay004/ov4_021EDE68.s +++ b/lib/NitroDWC/asm/gs/gp/gpicallback.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EDE68.inc" + .include "include/gpicallback.inc" diff --git a/asm/overlay004/ov4_021EE2E0.s b/lib/NitroDWC/asm/gs/gp/gpiconnect.s similarity index 99% rename from asm/overlay004/ov4_021EE2E0.s rename to lib/NitroDWC/asm/gs/gp/gpiconnect.s index d75564a75a..d84fc51f0f 100644 --- a/asm/overlay004/ov4_021EE2E0.s +++ b/lib/NitroDWC/asm/gs/gp/gpiconnect.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EE2E0.inc" + .include "include/gpiconnect.inc" diff --git a/asm/overlay004/ov4_021EF924.s b/lib/NitroDWC/asm/gs/gp/gpiinfo.s similarity index 99% rename from asm/overlay004/ov4_021EF924.s rename to lib/NitroDWC/asm/gs/gp/gpiinfo.s index d97a103014..22e5050016 100644 --- a/asm/overlay004/ov4_021EF924.s +++ b/lib/NitroDWC/asm/gs/gp/gpiinfo.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EF924.inc" + .include "include/gpiinfo.inc" diff --git a/asm/overlay004/ov4_021F1708.s b/lib/NitroDWC/asm/gs/gp/gpioperation.s similarity index 99% rename from asm/overlay004/ov4_021F1708.s rename to lib/NitroDWC/asm/gs/gp/gpioperation.s index 91f044f4e6..29f1d4e3ab 100644 --- a/asm/overlay004/ov4_021F1708.s +++ b/lib/NitroDWC/asm/gs/gp/gpioperation.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F1708.inc" + .include "include/gpioperation.inc" diff --git a/asm/overlay004/ov4_021F1D24.s b/lib/NitroDWC/asm/gs/gp/gpipeer.s similarity index 99% rename from asm/overlay004/ov4_021F1D24.s rename to lib/NitroDWC/asm/gs/gp/gpipeer.s index 6618f710d1..451cee4e4e 100644 --- a/asm/overlay004/ov4_021F1D24.s +++ b/lib/NitroDWC/asm/gs/gp/gpipeer.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F1D24.inc" + .include "include/gpipeer.inc" diff --git a/asm/overlay004/ov4_021F2F6C.s b/lib/NitroDWC/asm/gs/gp/gpiprofile.s similarity index 99% rename from asm/overlay004/ov4_021F2F6C.s rename to lib/NitroDWC/asm/gs/gp/gpiprofile.s index 94374d3570..3dd29da602 100644 --- a/asm/overlay004/ov4_021F2F6C.s +++ b/lib/NitroDWC/asm/gs/gp/gpiprofile.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F2F6C.inc" + .include "include/gpiprofile.inc" diff --git a/asm/overlay004/ov4_021F34C8.s b/lib/NitroDWC/asm/gs/gp/gpisearch.s similarity index 99% rename from asm/overlay004/ov4_021F34C8.s rename to lib/NitroDWC/asm/gs/gp/gpisearch.s index 1ed03dc32c..c82b63433a 100644 --- a/asm/overlay004/ov4_021F34C8.s +++ b/lib/NitroDWC/asm/gs/gp/gpisearch.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F34C8.inc" + .include "include/gpisearch.inc" diff --git a/asm/overlay004/ov4_021F55F4.s b/lib/NitroDWC/asm/gs/gp/gpitransfer.s similarity index 98% rename from asm/overlay004/ov4_021F55F4.s rename to lib/NitroDWC/asm/gs/gp/gpitransfer.s index d1654c0473..a405a66e97 100644 --- a/asm/overlay004/ov4_021F55F4.s +++ b/lib/NitroDWC/asm/gs/gp/gpitransfer.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F55F4.inc" + .include "include/gpitransfer.inc" diff --git a/asm/overlay004/ov4_021F571C.s b/lib/NitroDWC/asm/gs/gp/gpiunique.s similarity index 97% rename from asm/overlay004/ov4_021F571C.s rename to lib/NitroDWC/asm/gs/gp/gpiunique.s index 6e96dfad29..7ba469c15e 100644 --- a/asm/overlay004/ov4_021F571C.s +++ b/lib/NitroDWC/asm/gs/gp/gpiunique.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F571C.inc" + .include "include/gpiunique.inc" diff --git a/asm/overlay004/ov4_021F5820.s b/lib/NitroDWC/asm/gs/gp/gpiutility.s similarity index 99% rename from asm/overlay004/ov4_021F5820.s rename to lib/NitroDWC/asm/gs/gp/gpiutility.s index b5f5336bbc..0c88685e22 100644 --- a/asm/overlay004/ov4_021F5820.s +++ b/lib/NitroDWC/asm/gs/gp/gpiutility.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F5820.inc" + .include "include/gpiutility.inc" diff --git a/asm/overlay004/ov4_021EB228.inc b/lib/NitroDWC/asm/gs/gp/include/gp.inc similarity index 100% rename from asm/overlay004/ov4_021EB228.inc rename to lib/NitroDWC/asm/gs/gp/include/gp.inc diff --git a/asm/overlay004/ov4_021EBDCC.inc b/lib/NitroDWC/asm/gs/gp/include/gpi.inc similarity index 100% rename from asm/overlay004/ov4_021EBDCC.inc rename to lib/NitroDWC/asm/gs/gp/include/gpi.inc diff --git a/asm/overlay004/ov4_021EC564.inc b/lib/NitroDWC/asm/gs/gp/include/gpibuddy.inc similarity index 100% rename from asm/overlay004/ov4_021EC564.inc rename to lib/NitroDWC/asm/gs/gp/include/gpibuddy.inc diff --git a/asm/overlay004/ov4_021ED420.inc b/lib/NitroDWC/asm/gs/gp/include/gpibuffer.inc similarity index 100% rename from asm/overlay004/ov4_021ED420.inc rename to lib/NitroDWC/asm/gs/gp/include/gpibuffer.inc diff --git a/asm/overlay004/ov4_021EDE68.inc b/lib/NitroDWC/asm/gs/gp/include/gpicallback.inc similarity index 100% rename from asm/overlay004/ov4_021EDE68.inc rename to lib/NitroDWC/asm/gs/gp/include/gpicallback.inc diff --git a/asm/overlay004/ov4_021EE2E0.inc b/lib/NitroDWC/asm/gs/gp/include/gpiconnect.inc similarity index 100% rename from asm/overlay004/ov4_021EE2E0.inc rename to lib/NitroDWC/asm/gs/gp/include/gpiconnect.inc diff --git a/asm/overlay004/ov4_021EF924.inc b/lib/NitroDWC/asm/gs/gp/include/gpiinfo.inc similarity index 100% rename from asm/overlay004/ov4_021EF924.inc rename to lib/NitroDWC/asm/gs/gp/include/gpiinfo.inc diff --git a/asm/overlay004/ov4_021F1708.inc b/lib/NitroDWC/asm/gs/gp/include/gpioperation.inc similarity index 100% rename from asm/overlay004/ov4_021F1708.inc rename to lib/NitroDWC/asm/gs/gp/include/gpioperation.inc diff --git a/asm/overlay004/ov4_021F1D24.inc b/lib/NitroDWC/asm/gs/gp/include/gpipeer.inc similarity index 100% rename from asm/overlay004/ov4_021F1D24.inc rename to lib/NitroDWC/asm/gs/gp/include/gpipeer.inc diff --git a/asm/overlay004/ov4_021F2F6C.inc b/lib/NitroDWC/asm/gs/gp/include/gpiprofile.inc similarity index 100% rename from asm/overlay004/ov4_021F2F6C.inc rename to lib/NitroDWC/asm/gs/gp/include/gpiprofile.inc diff --git a/asm/overlay004/ov4_021F34C8.inc b/lib/NitroDWC/asm/gs/gp/include/gpisearch.inc similarity index 100% rename from asm/overlay004/ov4_021F34C8.inc rename to lib/NitroDWC/asm/gs/gp/include/gpisearch.inc diff --git a/asm/overlay004/ov4_021F55F4.inc b/lib/NitroDWC/asm/gs/gp/include/gpitransfer.inc similarity index 100% rename from asm/overlay004/ov4_021F55F4.inc rename to lib/NitroDWC/asm/gs/gp/include/gpitransfer.inc diff --git a/asm/overlay004/ov4_021F571C.inc b/lib/NitroDWC/asm/gs/gp/include/gpiunique.inc similarity index 100% rename from asm/overlay004/ov4_021F571C.inc rename to lib/NitroDWC/asm/gs/gp/include/gpiunique.inc diff --git a/asm/overlay004/ov4_021F5820.inc b/lib/NitroDWC/asm/gs/gp/include/gpiutility.inc similarity index 100% rename from asm/overlay004/ov4_021F5820.inc rename to lib/NitroDWC/asm/gs/gp/include/gpiutility.inc diff --git a/asm/overlay004/ov4_021F5D7C.s b/lib/NitroDWC/asm/gs/gstats/gbucket.s similarity index 99% rename from asm/overlay004/ov4_021F5D7C.s rename to lib/NitroDWC/asm/gs/gstats/gbucket.s index 31ecb848bb..5bd361f610 100644 --- a/asm/overlay004/ov4_021F5D7C.s +++ b/lib/NitroDWC/asm/gs/gstats/gbucket.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F5D7C.inc" + .include "include/gbucket.inc" diff --git a/asm/overlay004/ov4_021F6338.s b/lib/NitroDWC/asm/gs/gstats/gstats.s similarity index 99% rename from asm/overlay004/ov4_021F6338.s rename to lib/NitroDWC/asm/gs/gstats/gstats.s index 8b2189e292..aa5e24adfb 100644 --- a/asm/overlay004/ov4_021F6338.s +++ b/lib/NitroDWC/asm/gs/gstats/gstats.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F6338.inc" + .include "include/gstats.inc" diff --git a/asm/overlay004/ov4_021F5D7C.inc b/lib/NitroDWC/asm/gs/gstats/include/gbucket.inc similarity index 100% rename from asm/overlay004/ov4_021F5D7C.inc rename to lib/NitroDWC/asm/gs/gstats/include/gbucket.inc diff --git a/asm/overlay004/ov4_021F6338.inc b/lib/NitroDWC/asm/gs/gstats/include/gstats.inc similarity index 100% rename from asm/overlay004/ov4_021F6338.inc rename to lib/NitroDWC/asm/gs/gstats/include/gstats.inc diff --git a/asm/overlay004/ov4_021F7128.s b/lib/NitroDWC/asm/gs/gt2/gt2auth.s similarity index 99% rename from asm/overlay004/ov4_021F7128.s rename to lib/NitroDWC/asm/gs/gt2/gt2auth.s index 5609eeeb3a..80d81f2acf 100644 --- a/asm/overlay004/ov4_021F7128.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2auth.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F7128.inc" + .include "include/gt2auth.inc" diff --git a/asm/overlay004/ov4_021F741C.s b/lib/NitroDWC/asm/gs/gt2/gt2buffer.s similarity index 99% rename from asm/overlay004/ov4_021F741C.s rename to lib/NitroDWC/asm/gs/gt2/gt2buffer.s index e6cf872491..bd60e346c5 100644 --- a/asm/overlay004/ov4_021F741C.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2buffer.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F741C.inc" + .include "include/gt2buffer.inc" diff --git a/asm/overlay004/ov4_021F763C.s b/lib/NitroDWC/asm/gs/gt2/gt2callback.s similarity index 99% rename from asm/overlay004/ov4_021F763C.s rename to lib/NitroDWC/asm/gs/gt2/gt2callback.s index 9ac9d9aa48..037558c748 100644 --- a/asm/overlay004/ov4_021F763C.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2callback.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F763C.inc" + .include "include/gt2callback.inc" diff --git a/asm/overlay004/ov4_021F7F54.s b/lib/NitroDWC/asm/gs/gt2/gt2connection.s similarity index 99% rename from asm/overlay004/ov4_021F7F54.s rename to lib/NitroDWC/asm/gs/gt2/gt2connection.s index 448426141a..4331213323 100644 --- a/asm/overlay004/ov4_021F7F54.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2connection.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F7F54.inc" + .include "include/gt2connection.inc" diff --git a/asm/overlay004/ov4_021F8470.s b/lib/NitroDWC/asm/gs/gt2/gt2main.s similarity index 99% rename from asm/overlay004/ov4_021F8470.s rename to lib/NitroDWC/asm/gs/gt2/gt2main.s index d08ffad994..5ffeba231b 100644 --- a/asm/overlay004/ov4_021F8470.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2main.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F8470.inc" + .include "include/gt2main.inc" diff --git a/asm/overlay004/ov4_021F87F0.s b/lib/NitroDWC/asm/gs/gt2/gt2message.s similarity index 99% rename from asm/overlay004/ov4_021F87F0.s rename to lib/NitroDWC/asm/gs/gt2/gt2message.s index 153c1b2e42..4a1132b306 100644 --- a/asm/overlay004/ov4_021F87F0.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2message.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021F87F0.inc" + .include "include/gt2message.inc" diff --git a/asm/overlay004/ov4_021FA360.s b/lib/NitroDWC/asm/gs/gt2/gt2socket.s similarity index 99% rename from asm/overlay004/ov4_021FA360.s rename to lib/NitroDWC/asm/gs/gt2/gt2socket.s index 79ca616ed7..338ca782c5 100644 --- a/asm/overlay004/ov4_021FA360.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2socket.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FA360.inc" + .include "include/gt2socket.inc" diff --git a/asm/overlay004/ov4_021FABFC.s b/lib/NitroDWC/asm/gs/gt2/gt2utility.s similarity index 99% rename from asm/overlay004/ov4_021FABFC.s rename to lib/NitroDWC/asm/gs/gt2/gt2utility.s index b63da15627..7fa8e08752 100644 --- a/asm/overlay004/ov4_021FABFC.s +++ b/lib/NitroDWC/asm/gs/gt2/gt2utility.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FABFC.inc" + .include "include/gt2utility.inc" diff --git a/asm/overlay004/ov4_021F7128.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2auth.inc similarity index 100% rename from asm/overlay004/ov4_021F7128.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2auth.inc diff --git a/asm/overlay004/ov4_021F741C.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2buffer.inc similarity index 100% rename from asm/overlay004/ov4_021F741C.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2buffer.inc diff --git a/asm/overlay004/ov4_021F763C.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2callback.inc similarity index 100% rename from asm/overlay004/ov4_021F763C.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2callback.inc diff --git a/asm/overlay004/ov4_021F7F54.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2connection.inc similarity index 100% rename from asm/overlay004/ov4_021F7F54.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2connection.inc diff --git a/asm/overlay004/ov4_021F8470.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2main.inc similarity index 100% rename from asm/overlay004/ov4_021F8470.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2main.inc diff --git a/asm/overlay004/ov4_021F87F0.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2message.inc similarity index 100% rename from asm/overlay004/ov4_021F87F0.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2message.inc diff --git a/asm/overlay004/ov4_021FA360.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2socket.inc similarity index 100% rename from asm/overlay004/ov4_021FA360.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2socket.inc diff --git a/asm/overlay004/ov4_021FABFC.inc b/lib/NitroDWC/asm/gs/gt2/include/gt2utility.inc similarity index 100% rename from asm/overlay004/ov4_021FABFC.inc rename to lib/NitroDWC/asm/gs/gt2/include/gt2utility.inc diff --git a/asm/overlay004/ov4_021EA1FC.s b/lib/NitroDWC/asm/gs/hashtable.s similarity index 99% rename from asm/overlay004/ov4_021EA1FC.s rename to lib/NitroDWC/asm/gs/hashtable.s index 3f5398f44c..65bd0d477e 100644 --- a/asm/overlay004/ov4_021EA1FC.s +++ b/lib/NitroDWC/asm/gs/hashtable.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EA1FC.inc" + .include "include/hashtable.inc" diff --git a/asm/overlay004/ov4_021E963C.inc b/lib/NitroDWC/asm/gs/include/available.inc similarity index 100% rename from asm/overlay004/ov4_021E963C.inc rename to lib/NitroDWC/asm/gs/include/available.inc diff --git a/asm/overlay004/ov4_021E99EC.inc b/lib/NitroDWC/asm/gs/include/darray.inc similarity index 100% rename from asm/overlay004/ov4_021E99EC.inc rename to lib/NitroDWC/asm/gs/include/darray.inc diff --git a/asm/overlay004/ov4_021EA1FC.inc b/lib/NitroDWC/asm/gs/include/hashtable.inc similarity index 100% rename from asm/overlay004/ov4_021EA1FC.inc rename to lib/NitroDWC/asm/gs/include/hashtable.inc diff --git a/asm/overlay004/ov4_021EA7B4.inc b/lib/NitroDWC/asm/gs/include/md5c.inc similarity index 100% rename from asm/overlay004/ov4_021EA7B4.inc rename to lib/NitroDWC/asm/gs/include/md5c.inc diff --git a/asm/overlay004/ov4_021EA840.inc b/lib/NitroDWC/asm/gs/include/nonport.inc similarity index 100% rename from asm/overlay004/ov4_021EA840.inc rename to lib/NitroDWC/asm/gs/include/nonport.inc diff --git a/asm/overlay004/ov4_021EA7B4.s b/lib/NitroDWC/asm/gs/md5c.s similarity index 96% rename from asm/overlay004/ov4_021EA7B4.s rename to lib/NitroDWC/asm/gs/md5c.s index deb296290d..e2477e3eb2 100644 --- a/asm/overlay004/ov4_021EA7B4.s +++ b/lib/NitroDWC/asm/gs/md5c.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EA7B4.inc" + .include "include/md5c.inc" diff --git a/asm/overlay004/ov4_021FAE80.inc b/lib/NitroDWC/asm/gs/natneg/include/natneg.inc similarity index 100% rename from asm/overlay004/ov4_021FAE80.inc rename to lib/NitroDWC/asm/gs/natneg/include/natneg.inc diff --git a/asm/overlay004/ov4_021FAE80.s b/lib/NitroDWC/asm/gs/natneg/natneg.s similarity index 99% rename from asm/overlay004/ov4_021FAE80.s rename to lib/NitroDWC/asm/gs/natneg/natneg.s index faae8e9482..b8caad9aa4 100644 --- a/asm/overlay004/ov4_021FAE80.s +++ b/lib/NitroDWC/asm/gs/natneg/natneg.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FAE80.inc" + .include "include/natneg.inc" .extern Unk_ov4_0221AE50 diff --git a/asm/overlay004/ov4_021EA840.s b/lib/NitroDWC/asm/gs/nonport.s similarity index 99% rename from asm/overlay004/ov4_021EA840.s rename to lib/NitroDWC/asm/gs/nonport.s index 592344d3a3..eca9641223 100644 --- a/asm/overlay004/ov4_021EA840.s +++ b/lib/NitroDWC/asm/gs/nonport.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021EA840.inc" + .include "include/nonport.inc" .extern Unk_020FE764 diff --git a/asm/overlay004/ov4_021FBD94.inc b/lib/NitroDWC/asm/gs/qr2/include/qr2.inc similarity index 100% rename from asm/overlay004/ov4_021FBD94.inc rename to lib/NitroDWC/asm/gs/qr2/include/qr2.inc diff --git a/asm/overlay004/ov4_021FBD94.s b/lib/NitroDWC/asm/gs/qr2/qr2.s similarity index 99% rename from asm/overlay004/ov4_021FBD94.s rename to lib/NitroDWC/asm/gs/qr2/qr2.s index 029e7534b6..cd9cbb3a79 100644 --- a/asm/overlay004/ov4_021FBD94.s +++ b/lib/NitroDWC/asm/gs/qr2/qr2.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FBD94.inc" + .include "include/qr2.inc" diff --git a/asm/overlay004/ov4_021FD4E0.s b/lib/NitroDWC/asm/gs/qr2/qr2regkeys.s similarity index 100% rename from asm/overlay004/ov4_021FD4E0.s rename to lib/NitroDWC/asm/gs/qr2/qr2regkeys.s diff --git a/asm/overlay004/ov4_021FD500.inc b/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_crypt.inc similarity index 100% rename from asm/overlay004/ov4_021FD500.inc rename to lib/NitroDWC/asm/gs/serverbrowsing/include/sb_crypt.inc diff --git a/asm/overlay004/ov4_021FD7CC.inc b/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_queryengine.inc similarity index 100% rename from asm/overlay004/ov4_021FD7CC.inc rename to lib/NitroDWC/asm/gs/serverbrowsing/include/sb_queryengine.inc diff --git a/asm/overlay004/ov4_021FE0AC.inc b/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_server.inc similarity index 100% rename from asm/overlay004/ov4_021FE0AC.inc rename to lib/NitroDWC/asm/gs/serverbrowsing/include/sb_server.inc diff --git a/asm/overlay004/ov4_021FE890.inc b/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverbrowsing.inc similarity index 100% rename from asm/overlay004/ov4_021FE890.inc rename to lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverbrowsing.inc diff --git a/asm/overlay004/ov4_021FEEC8.inc b/lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverlist.inc similarity index 100% rename from asm/overlay004/ov4_021FEEC8.inc rename to lib/NitroDWC/asm/gs/serverbrowsing/include/sb_serverlist.inc diff --git a/asm/overlay004/ov4_021FD500.s b/lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.s similarity index 98% rename from asm/overlay004/ov4_021FD500.s rename to lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.s index 3667b1e9b8..38152e519d 100644 --- a/asm/overlay004/ov4_021FD500.s +++ b/lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FD500.inc" + .include "include/sb_crypt.inc" diff --git a/asm/overlay004/ov4_021FD7CC.s b/lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.s similarity index 99% rename from asm/overlay004/ov4_021FD7CC.s rename to lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.s index ca1d7234ff..a68eb7ee60 100644 --- a/asm/overlay004/ov4_021FD7CC.s +++ b/lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FD7CC.inc" + .include "include/sb_queryengine.inc" .extern Unk_ov4_0221AE50 diff --git a/asm/overlay004/ov4_021FE0AC.s b/lib/NitroDWC/asm/gs/serverbrowsing/sb_server.s similarity index 99% rename from asm/overlay004/ov4_021FE0AC.s rename to lib/NitroDWC/asm/gs/serverbrowsing/sb_server.s index ce419528a7..6bea90dbf7 100644 --- a/asm/overlay004/ov4_021FE0AC.s +++ b/lib/NitroDWC/asm/gs/serverbrowsing/sb_server.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FE0AC.inc" + .include "include/sb_server.inc" .extern Unk_020FE764 diff --git a/asm/overlay004/ov4_021FE890.s b/lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.s similarity index 99% rename from asm/overlay004/ov4_021FE890.s rename to lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.s index 9a08fc9fc0..aca7d69daa 100644 --- a/asm/overlay004/ov4_021FE890.s +++ b/lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FE890.inc" + .include "include/sb_serverbrowsing.inc" .extern Unk_ov4_0221AE50 diff --git a/asm/overlay004/ov4_021FEEC8.s b/lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.s similarity index 99% rename from asm/overlay004/ov4_021FEEC8.s rename to lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.s index 0dd5afe920..b4123669df 100644 --- a/asm/overlay004/ov4_021FEEC8.s +++ b/lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_021FEEC8.inc" + .include "include/sb_serverlist.inc" .extern Unk_020FE764 .extern Unk_ov4_0221AE50 diff --git a/asm/overlay004/ov4_02208CEC.inc b/lib/NitroWiFi/asm/cps/include/network.inc similarity index 100% rename from asm/overlay004/ov4_02208CEC.inc rename to lib/NitroWiFi/asm/cps/include/network.inc diff --git a/asm/overlay004/ov4_02208CEC.s b/lib/NitroWiFi/asm/cps/network.s similarity index 99% rename from asm/overlay004/ov4_02208CEC.s rename to lib/NitroWiFi/asm/cps/network.s index 08f4ad3c94..f8877c8099 100644 --- a/asm/overlay004/ov4_02208CEC.s +++ b/lib/NitroWiFi/asm/cps/network.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02208CEC.inc" + .include "include/network.inc" .extern Unk_021CCC80 .extern Unk_ov4_0221F620 diff --git a/asm/overlay004/ov4_02208324.inc b/lib/NitroWiFi/asm/soc/include/soc.inc similarity index 100% rename from asm/overlay004/ov4_02208324.inc rename to lib/NitroWiFi/asm/soc/include/soc.inc diff --git a/asm/overlay004/ov4_02206808.inc b/lib/NitroWiFi/asm/soc/include/socl_bind.inc similarity index 100% rename from asm/overlay004/ov4_02206808.inc rename to lib/NitroWiFi/asm/soc/include/socl_bind.inc diff --git a/asm/overlay004/ov4_02207D90.inc b/lib/NitroWiFi/asm/soc/include/socl_cleanup.inc similarity index 100% rename from asm/overlay004/ov4_02207D90.inc rename to lib/NitroWiFi/asm/soc/include/socl_cleanup.inc diff --git a/asm/overlay004/ov4_02207A18.inc b/lib/NitroWiFi/asm/soc/include/socl_close.inc similarity index 100% rename from asm/overlay004/ov4_02207A18.inc rename to lib/NitroWiFi/asm/soc/include/socl_close.inc diff --git a/asm/overlay004/ov4_02205EF0.inc b/lib/NitroWiFi/asm/soc/include/socl_command.inc similarity index 100% rename from asm/overlay004/ov4_02205EF0.inc rename to lib/NitroWiFi/asm/soc/include/socl_command.inc diff --git a/asm/overlay004/ov4_02206224.inc b/lib/NitroWiFi/asm/soc/include/socl_create.inc similarity index 100% rename from asm/overlay004/ov4_02206224.inc rename to lib/NitroWiFi/asm/soc/include/socl_create.inc diff --git a/asm/overlay004/ov4_02208214.inc b/lib/NitroWiFi/asm/soc/include/socl_list.inc similarity index 100% rename from asm/overlay004/ov4_02208214.inc rename to lib/NitroWiFi/asm/soc/include/socl_list.inc diff --git a/asm/overlay004/ov4_0220657C.inc b/lib/NitroWiFi/asm/soc/include/socl_listen_acc.inc similarity index 100% rename from asm/overlay004/ov4_0220657C.inc rename to lib/NitroWiFi/asm/soc/include/socl_listen_acc.inc diff --git a/asm/overlay004/ov4_022080F0.inc b/lib/NitroWiFi/asm/soc/include/socl_poll.inc similarity index 100% rename from asm/overlay004/ov4_022080F0.inc rename to lib/NitroWiFi/asm/soc/include/socl_poll.inc diff --git a/asm/overlay004/ov4_02206A3C.inc b/lib/NitroWiFi/asm/soc/include/socl_read.inc similarity index 100% rename from asm/overlay004/ov4_02206A3C.inc rename to lib/NitroWiFi/asm/soc/include/socl_read.inc diff --git a/asm/overlay004/ov4_02207F58.inc b/lib/NitroWiFi/asm/soc/include/socl_resolve.inc similarity index 100% rename from asm/overlay004/ov4_02207F58.inc rename to lib/NitroWiFi/asm/soc/include/socl_resolve.inc diff --git a/asm/overlay004/ov4_0220793C.inc b/lib/NitroWiFi/asm/soc/include/socl_shutdown.inc similarity index 100% rename from asm/overlay004/ov4_0220793C.inc rename to lib/NitroWiFi/asm/soc/include/socl_shutdown.inc diff --git a/asm/overlay004/ov4_02208BCC.inc b/lib/NitroWiFi/asm/soc/include/socl_ssl.inc similarity index 100% rename from asm/overlay004/ov4_02208BCC.inc rename to lib/NitroWiFi/asm/soc/include/socl_ssl.inc diff --git a/asm/overlay004/ov4_02205C7C.inc b/lib/NitroWiFi/asm/soc/include/socl_startup.inc similarity index 100% rename from asm/overlay004/ov4_02205C7C.inc rename to lib/NitroWiFi/asm/soc/include/socl_startup.inc diff --git a/asm/overlay004/ov4_0220729C.inc b/lib/NitroWiFi/asm/soc/include/socl_write.inc similarity index 100% rename from asm/overlay004/ov4_0220729C.inc rename to lib/NitroWiFi/asm/soc/include/socl_write.inc diff --git a/asm/overlay004/ov4_02208324.s b/lib/NitroWiFi/asm/soc/soc.s similarity index 99% rename from asm/overlay004/ov4_02208324.s rename to lib/NitroWiFi/asm/soc/soc.s index ca890803f2..5868acac88 100644 --- a/asm/overlay004/ov4_02208324.s +++ b/lib/NitroWiFi/asm/soc/soc.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02208324.inc" + .include "include/soc.inc" .extern Unk_ov4_0221A13C .extern Unk_ov4_0221A154 diff --git a/asm/overlay004/ov4_02206808.s b/lib/NitroWiFi/asm/soc/socl_bind.s similarity index 98% rename from asm/overlay004/ov4_02206808.s rename to lib/NitroWiFi/asm/soc/socl_bind.s index 8be0dc829b..ee6899ddd4 100644 --- a/asm/overlay004/ov4_02206808.s +++ b/lib/NitroWiFi/asm/soc/socl_bind.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02206808.inc" + .include "include/socl_bind.inc" diff --git a/asm/overlay004/ov4_02207D90.s b/lib/NitroWiFi/asm/soc/socl_cleanup.s similarity index 97% rename from asm/overlay004/ov4_02207D90.s rename to lib/NitroWiFi/asm/soc/socl_cleanup.s index 6a6f484fa3..268c722f4b 100644 --- a/asm/overlay004/ov4_02207D90.s +++ b/lib/NitroWiFi/asm/soc/socl_cleanup.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02207D90.inc" + .include "include/socl_cleanup.inc" .extern Unk_ov4_0221DC60 .extern Unk_ov4_0221DE40 diff --git a/asm/overlay004/ov4_02207A18.s b/lib/NitroWiFi/asm/soc/socl_close.s similarity index 98% rename from asm/overlay004/ov4_02207A18.s rename to lib/NitroWiFi/asm/soc/socl_close.s index 909e9d88fe..a67425ae6a 100644 --- a/asm/overlay004/ov4_02207A18.s +++ b/lib/NitroWiFi/asm/soc/socl_close.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02207A18.inc" + .include "include/socl_close.inc" .extern Unk_ov4_0221DC60 diff --git a/asm/overlay004/ov4_02205EF0.s b/lib/NitroWiFi/asm/soc/socl_command.s similarity index 99% rename from asm/overlay004/ov4_02205EF0.s rename to lib/NitroWiFi/asm/soc/socl_command.s index 9304914b60..653635c29d 100644 --- a/asm/overlay004/ov4_02205EF0.s +++ b/lib/NitroWiFi/asm/soc/socl_command.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02205EF0.inc" + .include "include/socl_command.inc" diff --git a/asm/overlay004/ov4_0221A13C.s b/lib/NitroWiFi/asm/soc/socl_const.s similarity index 100% rename from asm/overlay004/ov4_0221A13C.s rename to lib/NitroWiFi/asm/soc/socl_const.s diff --git a/asm/overlay004/ov4_02206224.s b/lib/NitroWiFi/asm/soc/socl_create.s similarity index 98% rename from asm/overlay004/ov4_02206224.s rename to lib/NitroWiFi/asm/soc/socl_create.s index 5ab8743ceb..d2a282000a 100644 --- a/asm/overlay004/ov4_02206224.s +++ b/lib/NitroWiFi/asm/soc/socl_create.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02206224.inc" + .include "include/socl_create.inc" .extern Unk_ov4_0221DBFC diff --git a/asm/overlay004/ov4_02208214.s b/lib/NitroWiFi/asm/soc/socl_list.s similarity index 98% rename from asm/overlay004/ov4_02208214.s rename to lib/NitroWiFi/asm/soc/socl_list.s index ac8d0933ce..7e80302337 100644 --- a/asm/overlay004/ov4_02208214.s +++ b/lib/NitroWiFi/asm/soc/socl_list.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02208214.inc" + .include "include/socl_list.inc" diff --git a/asm/overlay004/ov4_0220657C.s b/lib/NitroWiFi/asm/soc/socl_listen_acc.s similarity index 98% rename from asm/overlay004/ov4_0220657C.s rename to lib/NitroWiFi/asm/soc/socl_listen_acc.s index 241aed8117..61c09af1c4 100644 --- a/asm/overlay004/ov4_0220657C.s +++ b/lib/NitroWiFi/asm/soc/socl_listen_acc.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_0220657C.inc" + .include "include/socl_listen_acc.inc" .extern Unk_ov4_0221A154 diff --git a/asm/overlay004/ov4_02208208.s b/lib/NitroWiFi/asm/soc/socl_misc.s similarity index 100% rename from asm/overlay004/ov4_02208208.s rename to lib/NitroWiFi/asm/soc/socl_misc.s diff --git a/asm/overlay004/ov4_022080F0.s b/lib/NitroWiFi/asm/soc/socl_poll.s similarity index 95% rename from asm/overlay004/ov4_022080F0.s rename to lib/NitroWiFi/asm/soc/socl_poll.s index 574958f6fb..4e15b86c7c 100644 --- a/asm/overlay004/ov4_022080F0.s +++ b/lib/NitroWiFi/asm/soc/socl_poll.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_022080F0.inc" + .include "include/socl_poll.inc" diff --git a/asm/overlay004/ov4_02206A3C.s b/lib/NitroWiFi/asm/soc/socl_read.s similarity index 99% rename from asm/overlay004/ov4_02206A3C.s rename to lib/NitroWiFi/asm/soc/socl_read.s index c467912bee..61acf94eab 100644 --- a/asm/overlay004/ov4_02206A3C.s +++ b/lib/NitroWiFi/asm/soc/socl_read.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02206A3C.inc" + .include "include/socl_read.inc" diff --git a/asm/overlay004/ov4_02207F58.s b/lib/NitroWiFi/asm/soc/socl_resolve.s similarity index 97% rename from asm/overlay004/ov4_02207F58.s rename to lib/NitroWiFi/asm/soc/socl_resolve.s index a16390b815..f770177ddd 100644 --- a/asm/overlay004/ov4_02207F58.s +++ b/lib/NitroWiFi/asm/soc/socl_resolve.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02207F58.inc" + .include "include/socl_resolve.inc" .extern Unk_ov4_0221DE40 .extern Unk_ov4_0221DE50 diff --git a/asm/overlay004/ov4_0220793C.s b/lib/NitroWiFi/asm/soc/socl_shutdown.s similarity index 95% rename from asm/overlay004/ov4_0220793C.s rename to lib/NitroWiFi/asm/soc/socl_shutdown.s index 25dda19bf5..590d7f73a5 100644 --- a/asm/overlay004/ov4_0220793C.s +++ b/lib/NitroWiFi/asm/soc/socl_shutdown.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_0220793C.inc" + .include "include/socl_shutdown.inc" diff --git a/asm/overlay004/ov4_02208BCC.s b/lib/NitroWiFi/asm/soc/socl_ssl.s similarity index 96% rename from asm/overlay004/ov4_02208BCC.s rename to lib/NitroWiFi/asm/soc/socl_ssl.s index 884325e51f..70f68407cb 100644 --- a/asm/overlay004/ov4_02208BCC.s +++ b/lib/NitroWiFi/asm/soc/socl_ssl.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02208BCC.inc" + .include "include/socl_ssl.inc" diff --git a/asm/overlay004/ov4_02205C7C.s b/lib/NitroWiFi/asm/soc/socl_startup.s similarity index 99% rename from asm/overlay004/ov4_02205C7C.s rename to lib/NitroWiFi/asm/soc/socl_startup.s index 9f8965a7b0..2961cb737e 100644 --- a/asm/overlay004/ov4_02205C7C.s +++ b/lib/NitroWiFi/asm/soc/socl_startup.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02205C7C.inc" + .include "include/socl_startup.inc" .extern Unk_ov4_0221DE50 .extern Unk_ov4_0221DE40 diff --git a/asm/overlay004/ov4_0220729C.s b/lib/NitroWiFi/asm/soc/socl_write.s similarity index 99% rename from asm/overlay004/ov4_0220729C.s rename to lib/NitroWiFi/asm/soc/socl_write.s index b6a3a772d9..faf172176e 100644 --- a/asm/overlay004/ov4_0220729C.s +++ b/lib/NitroWiFi/asm/soc/socl_write.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_0220729C.inc" + .include "include/socl_write.inc" .extern Unk_021CCC80 .extern Unk_ov4_0221DC00 diff --git a/asm/overlay004/ov4_02211D9C.s b/lib/NitroWiFi/asm/ssl/arc4.s similarity index 100% rename from asm/overlay004/ov4_02211D9C.s rename to lib/NitroWiFi/asm/ssl/arc4.s diff --git a/asm/overlay004/ov4_02211E7C.s b/lib/NitroWiFi/asm/ssl/biginteger.s similarity index 99% rename from asm/overlay004/ov4_02211E7C.s rename to lib/NitroWiFi/asm/ssl/biginteger.s index a4420ae0f9..903c7416bd 100644 --- a/asm/overlay004/ov4_02211E7C.s +++ b/lib/NitroWiFi/asm/ssl/biginteger.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02211E7C.inc" + .include "include/biginteger.inc" .extern Unk_ov4_0221DE04 .extern Unk_ov4_0221DE30 diff --git a/asm/overlay004/ov4_02211E7C.inc b/lib/NitroWiFi/asm/ssl/include/biginteger.inc similarity index 100% rename from asm/overlay004/ov4_02211E7C.inc rename to lib/NitroWiFi/asm/ssl/include/biginteger.inc diff --git a/asm/overlay004/ov4_02210EEC.inc b/lib/NitroWiFi/asm/ssl/include/md5.inc similarity index 100% rename from asm/overlay004/ov4_02210EEC.inc rename to lib/NitroWiFi/asm/ssl/include/md5.inc diff --git a/asm/overlay004/ov4_022114A0.inc b/lib/NitroWiFi/asm/ssl/include/sha1.inc similarity index 100% rename from asm/overlay004/ov4_022114A0.inc rename to lib/NitroWiFi/asm/ssl/include/sha1.inc diff --git a/asm/overlay004/ov4_0220DA10.inc b/lib/NitroWiFi/asm/ssl/include/ssl.inc similarity index 100% rename from asm/overlay004/ov4_0220DA10.inc rename to lib/NitroWiFi/asm/ssl/include/ssl.inc diff --git a/asm/overlay004/ov4_02210EEC.s b/lib/NitroWiFi/asm/ssl/md5.s similarity index 99% rename from asm/overlay004/ov4_02210EEC.s rename to lib/NitroWiFi/asm/ssl/md5.s index 9901b4c675..298199ce19 100644 --- a/asm/overlay004/ov4_02210EEC.s +++ b/lib/NitroWiFi/asm/ssl/md5.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02210EEC.inc" + .include "include/md5.inc" diff --git a/asm/overlay004/ov4_022114A0.s b/lib/NitroWiFi/asm/ssl/sha1.s similarity index 99% rename from asm/overlay004/ov4_022114A0.s rename to lib/NitroWiFi/asm/ssl/sha1.s index d2273d60db..e8b56a684b 100644 --- a/asm/overlay004/ov4_022114A0.s +++ b/lib/NitroWiFi/asm/ssl/sha1.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_022114A0.inc" + .include "include/sha1.inc" diff --git a/asm/overlay004/ov4_0220DA10.s b/lib/NitroWiFi/asm/ssl/ssl.s similarity index 99% rename from asm/overlay004/ov4_0220DA10.s rename to lib/NitroWiFi/asm/ssl/ssl.s index 99685a7781..c279d3a6ee 100644 --- a/asm/overlay004/ov4_0220DA10.s +++ b/lib/NitroWiFi/asm/ssl/ssl.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_0220DA10.inc" + .include "include/ssl.inc" .extern Unk_021CCC80 .extern Unk_ov4_0221DE04 diff --git a/asm/overlay004/ov4_02215844.s b/lib/NitroWiFi/asm/stubsmd5/dummy_md5.s similarity index 89% rename from asm/overlay004/ov4_02215844.s rename to lib/NitroWiFi/asm/stubsmd5/dummy_md5.s index d8fc559740..823337d596 100644 --- a/asm/overlay004/ov4_02215844.s +++ b/lib/NitroWiFi/asm/stubsmd5/dummy_md5.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02215844.inc" + .include "include/dummy_md5.inc" diff --git a/asm/overlay004/ov4_02215844.inc b/lib/NitroWiFi/asm/stubsmd5/include/dummy_md5.inc similarity index 100% rename from asm/overlay004/ov4_02215844.inc rename to lib/NitroWiFi/asm/stubsmd5/include/dummy_md5.inc diff --git a/asm/overlay004/ov4_02214E34.s b/lib/NitroWiFi/asm/wcm/aplist.s similarity index 98% rename from asm/overlay004/ov4_02214E34.s rename to lib/NitroWiFi/asm/wcm/aplist.s index 8bd86a4dbf..1364308275 100644 --- a/asm/overlay004/ov4_02214E34.s +++ b/lib/NitroWiFi/asm/wcm/aplist.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02214E34.inc" + .include "include/aplist.inc" diff --git a/asm/overlay004/ov4_022152B4.s b/lib/NitroWiFi/asm/wcm/cpsif.s similarity index 99% rename from asm/overlay004/ov4_022152B4.s rename to lib/NitroWiFi/asm/wcm/cpsif.s index bfb4bbc6bd..878450ba7e 100644 --- a/asm/overlay004/ov4_022152B4.s +++ b/lib/NitroWiFi/asm/wcm/cpsif.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_022152B4.inc" + .include "include/cpsif.inc" diff --git a/asm/overlay004/ov4_02214E34.inc b/lib/NitroWiFi/asm/wcm/include/aplist.inc similarity index 100% rename from asm/overlay004/ov4_02214E34.inc rename to lib/NitroWiFi/asm/wcm/include/aplist.inc diff --git a/asm/overlay004/ov4_022152B4.inc b/lib/NitroWiFi/asm/wcm/include/cpsif.inc similarity index 100% rename from asm/overlay004/ov4_022152B4.inc rename to lib/NitroWiFi/asm/wcm/include/cpsif.inc diff --git a/asm/overlay004/ov4_02212CC8.inc b/lib/NitroWiFi/asm/wcm/include/system.inc similarity index 100% rename from asm/overlay004/ov4_02212CC8.inc rename to lib/NitroWiFi/asm/wcm/include/system.inc diff --git a/asm/overlay004/ov4_022156C0.inc b/lib/NitroWiFi/asm/wcm/include/util.inc similarity index 100% rename from asm/overlay004/ov4_022156C0.inc rename to lib/NitroWiFi/asm/wcm/include/util.inc diff --git a/asm/overlay004/ov4_02212CC8.s b/lib/NitroWiFi/asm/wcm/system.s similarity index 99% rename from asm/overlay004/ov4_02212CC8.s rename to lib/NitroWiFi/asm/wcm/system.s index c5d770953e..cd77705cb0 100644 --- a/asm/overlay004/ov4_02212CC8.s +++ b/lib/NitroWiFi/asm/wcm/system.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02212CC8.inc" + .include "include/system.inc" diff --git a/asm/overlay004/ov4_022156C0.s b/lib/NitroWiFi/asm/wcm/util.s similarity index 98% rename from asm/overlay004/ov4_022156C0.s rename to lib/NitroWiFi/asm/wcm/util.s index 346b5f4404..cbfdceba6c 100644 --- a/asm/overlay004/ov4_022156C0.s +++ b/lib/NitroWiFi/asm/wcm/util.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_022156C0.inc" + .include "include/util.inc" diff --git a/asm/overlay004/ov4_02201504.s b/lib/libVCT/asm/adpcm.s similarity index 99% rename from asm/overlay004/ov4_02201504.s rename to lib/libVCT/asm/adpcm.s index 965e67aedf..529a1cc9fa 100644 --- a/asm/overlay004/ov4_02201504.s +++ b/lib/libVCT/asm/adpcm.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02201504.inc" + .include "include/adpcm.inc" diff --git a/asm/overlay004/ov4_02202698.s b/lib/libVCT/asm/audio.s similarity index 99% rename from asm/overlay004/ov4_02202698.s rename to lib/libVCT/asm/audio.s index 05e94071f4..c189828de1 100644 --- a/asm/overlay004/ov4_02202698.s +++ b/lib/libVCT/asm/audio.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02202698.inc" + .include "include/audio.inc" .extern Unk_ov4_0221DBD8 diff --git a/asm/overlay004/ov4_02203504.s b/lib/libVCT/asm/decoder.s similarity index 99% rename from asm/overlay004/ov4_02203504.s rename to lib/libVCT/asm/decoder.s index fd647596bb..bafc90c72b 100644 --- a/asm/overlay004/ov4_02203504.s +++ b/lib/libVCT/asm/decoder.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02203504.inc" + .include "include/decoder.inc" diff --git a/asm/overlay004/ov4_022054E4.s b/lib/libVCT/asm/fir.s similarity index 99% rename from asm/overlay004/ov4_022054E4.s rename to lib/libVCT/asm/fir.s index c240f7c8e6..3f4a448be7 100644 --- a/asm/overlay004/ov4_022054E4.s +++ b/lib/libVCT/asm/fir.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_022054E4.inc" + .include "include/fir.inc" diff --git a/asm/overlay004/ov4_02203798.s b/lib/libVCT/asm/g711.s similarity index 100% rename from asm/overlay004/ov4_02203798.s rename to lib/libVCT/asm/g711.s diff --git a/asm/overlay004/ov4_02201504.inc b/lib/libVCT/asm/include/adpcm.inc similarity index 100% rename from asm/overlay004/ov4_02201504.inc rename to lib/libVCT/asm/include/adpcm.inc diff --git a/asm/overlay004/ov4_02202698.inc b/lib/libVCT/asm/include/audio.inc similarity index 100% rename from asm/overlay004/ov4_02202698.inc rename to lib/libVCT/asm/include/audio.inc diff --git a/asm/overlay004/ov4_02203504.inc b/lib/libVCT/asm/include/decoder.inc similarity index 100% rename from asm/overlay004/ov4_02203504.inc rename to lib/libVCT/asm/include/decoder.inc diff --git a/asm/overlay004/ov4_022054E4.inc b/lib/libVCT/asm/include/fir.inc similarity index 100% rename from asm/overlay004/ov4_022054E4.inc rename to lib/libVCT/asm/include/fir.inc diff --git a/asm/overlay004/ov4_022038F4.inc b/lib/libVCT/asm/include/queue.inc similarity index 100% rename from asm/overlay004/ov4_022038F4.inc rename to lib/libVCT/asm/include/queue.inc diff --git a/asm/overlay004/ov4_02204160.inc b/lib/libVCT/asm/include/ssp.inc similarity index 100% rename from asm/overlay004/ov4_02204160.inc rename to lib/libVCT/asm/include/ssp.inc diff --git a/asm/overlay004/ov4_02203BD4.inc b/lib/libVCT/asm/include/stream.inc similarity index 100% rename from asm/overlay004/ov4_02203BD4.inc rename to lib/libVCT/asm/include/stream.inc diff --git a/asm/overlay004/ov4_02205128.inc b/lib/libVCT/asm/include/udp_buffer.inc similarity index 100% rename from asm/overlay004/ov4_02205128.inc rename to lib/libVCT/asm/include/udp_buffer.inc diff --git a/asm/overlay004/ov4_02205270.inc b/lib/libVCT/asm/include/vad.inc similarity index 100% rename from asm/overlay004/ov4_02205270.inc rename to lib/libVCT/asm/include/vad.inc diff --git a/asm/overlay004/ov4_02205988.inc b/lib/libVCT/asm/include/vct_main.inc similarity index 100% rename from asm/overlay004/ov4_02205988.inc rename to lib/libVCT/asm/include/vct_main.inc diff --git a/asm/overlay004/ov4_022058A0.s b/lib/libVCT/asm/mixer.s similarity index 100% rename from asm/overlay004/ov4_022058A0.s rename to lib/libVCT/asm/mixer.s diff --git a/asm/overlay004/ov4_022038F4.s b/lib/libVCT/asm/queue.s similarity index 99% rename from asm/overlay004/ov4_022038F4.s rename to lib/libVCT/asm/queue.s index f248cd28f5..0d2cffb783 100644 --- a/asm/overlay004/ov4_022038F4.s +++ b/lib/libVCT/asm/queue.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_022038F4.inc" + .include "include/queue.inc" diff --git a/asm/overlay004/ov4_02204160.s b/lib/libVCT/asm/ssp.s similarity index 99% rename from asm/overlay004/ov4_02204160.s rename to lib/libVCT/asm/ssp.s index a1b6bd7e76..a3f0aa8380 100644 --- a/asm/overlay004/ov4_02204160.s +++ b/lib/libVCT/asm/ssp.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02204160.inc" + .include "include/ssp.inc" .extern Unk_ov4_0221DBD8 diff --git a/asm/overlay004/ov4_02203BD4.s b/lib/libVCT/asm/stream.s similarity index 99% rename from asm/overlay004/ov4_02203BD4.s rename to lib/libVCT/asm/stream.s index f97b1fcfcf..7e305dba12 100644 --- a/asm/overlay004/ov4_02203BD4.s +++ b/lib/libVCT/asm/stream.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02203BD4.inc" + .include "include/stream.inc" diff --git a/asm/overlay004/ov4_02205128.s b/lib/libVCT/asm/udp_buffer.s similarity index 98% rename from asm/overlay004/ov4_02205128.s rename to lib/libVCT/asm/udp_buffer.s index 6f93164eca..b3e86bf2fd 100644 --- a/asm/overlay004/ov4_02205128.s +++ b/lib/libVCT/asm/udp_buffer.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02205128.inc" + .include "include/udp_buffer.inc" diff --git a/asm/overlay004/ov4_02205270.s b/lib/libVCT/asm/vad.s similarity index 99% rename from asm/overlay004/ov4_02205270.s rename to lib/libVCT/asm/vad.s index 38e00a6366..f58e1d4906 100644 --- a/asm/overlay004/ov4_02205270.s +++ b/lib/libVCT/asm/vad.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02205270.inc" + .include "include/vad.inc" diff --git a/asm/overlay004/ov4_02205988.s b/lib/libVCT/asm/vct_main.s similarity index 99% rename from asm/overlay004/ov4_02205988.s rename to lib/libVCT/asm/vct_main.s index 5955742205..3e6244bc60 100644 --- a/asm/overlay004/ov4_02205988.s +++ b/lib/libVCT/asm/vct_main.s @@ -1,5 +1,5 @@ .include "macros/function.inc" - .include "overlay004/ov4_02205988.inc" + .include "include/vct_main.inc" diff --git a/main.lsf b/main.lsf index fe173f8f91..cb918f546b 100644 --- a/main.lsf +++ b/main.lsf @@ -693,122 +693,122 @@ Overlay overlay4 After main Object src/overlay004/ov4_021D0D80.o Object src/overlay004/ov4_021D2808.o - Object asm/overlay004/ov4_021D3038.o - Object asm/overlay004/ov4_021D3E5C.o - Object asm/overlay004/ov4_021D4478.o - Object asm/overlay004/ov4_021D5818.o - Object asm/overlay004/ov4_021D6A88.o - Object asm/overlay004/ov4_021D6CA4.o - Object asm/overlay004/ov4_021D72E0.o - Object asm/overlay004/ov4_021D75D4.o - Object asm/overlay004/ov4_021D773C.o - Object asm/overlay004/ov4_02216670.o - Object asm/overlay004/ov4_02216AB8.o - Object asm/overlay004/ov4_02216BA0.o - Object asm/overlay004/ov4_02216CC0.o - Object asm/overlay004/ov4_02216DD8.o - Object asm/overlay004/ov4_02217270.o - Object asm/overlay004/ov4_021D78C8.o - Object asm/overlay004/ov4_021D806C.o - Object asm/overlay004/ov4_021D83A4.o - Object asm/overlay004/ov4_021D8948.o - Object asm/overlay004/ov4_021D8C08.o - Object asm/overlay004/ov4_021DA6C8.o - Object asm/overlay004/ov4_021DB170.o + Object lib/NitroDWC/asm/auth/dwc_auth.o + Object lib/NitroDWC/asm/auth/dwc_cal.o + Object lib/NitroDWC/asm/auth/dwc_http.o + Object lib/NitroDWC/asm/auth/dwc_netcheck.o + Object lib/NitroDWC/asm/auth/dwc_nastime.o + Object lib/NitroDWC/asm/auth/dwc_svl.o + Object lib/NitroDWC/asm/auth/util_base64.o + Object lib/NitroDWC/asm/base/dwc_error.o + Object lib/NitroDWC/asm/base/dwc_memfunc.o + Object lib/NitroDWC/asm/auth/dwc_ca_cybertru.o + Object lib/NitroDWC/asm/auth/dwc_ca_nas_self.o + Object lib/NitroDWC/asm/auth/dwc_ca_thawte_p.o + Object lib/NitroDWC/asm/auth/dwc_ca_thawte_s.o + Object lib/NitroDWC/asm/auth/dwc_ca_verisign.o + Object lib/NitroDWC/asm/auth/dwc_ca_globalsi.o + Object lib/NitroDWC/asm/base/dwc_connectinet.o + Object lib/NitroDWC/asm/base/dwc_nasfunc.o + Object lib/NitroDWC/asm/base/dwc_nd.o + Object lib/NitroDWC/asm/base/dwc_common.o + Object lib/NitroDWC/asm/base/dwc_main.o + Object lib/NitroDWC/asm/base/dwc_login.o + Object lib/NitroDWC/asm/base/dwc_friend.o Object lib/NitroDWC/asm/base/dwc_match.o - Object asm/overlay004/ov4_021E4A58.o - Object asm/overlay004/ov4_021E558C.o - Object asm/overlay004/ov4_021E5C34.o - Object asm/overlay004/ov4_021E6588.o - Object asm/overlay004/ov4_021E6B04.o - Object asm/overlay004/ov4_021E6B90.o - Object asm/overlay004/ov4_021E70C8.o - Object asm/overlay004/ov4_021E7210.o - Object asm/overlay004/ov4_021E73FC.o - Object asm/overlay004/ov4_021E7804.o - Object asm/overlay004/ov4_021E78E0.o - Object asm/overlay004/ov4_021E80B0.o - Object asm/overlay004/ov4_021E8138.o - Object asm/overlay004/ov4_021E85F4.o - Object asm/overlay004/ov4_021E8BA8.o - Object asm/overlay004/ov4_021E91B4.o - Object asm/overlay004/ov4_021E963C.o - Object asm/overlay004/ov4_021E99EC.o - Object asm/overlay004/ov4_021EA1FC.o - Object asm/overlay004/ov4_021EA7B4.o - Object asm/overlay004/ov4_021EA840.o - Object asm/overlay004/ov4_021EB228.o - Object asm/overlay004/ov4_021EBDCC.o - Object asm/overlay004/ov4_021EC564.o - Object asm/overlay004/ov4_021ED420.o - Object asm/overlay004/ov4_021EDE68.o - Object asm/overlay004/ov4_021EE2E0.o - Object asm/overlay004/ov4_021EF924.o - Object asm/overlay004/ov4_021F1708.o - Object asm/overlay004/ov4_021F1D24.o - Object asm/overlay004/ov4_021F2F6C.o - Object asm/overlay004/ov4_021F34C8.o - Object asm/overlay004/ov4_021F55F4.o - Object asm/overlay004/ov4_021F571C.o - Object asm/overlay004/ov4_021F5820.o - Object asm/overlay004/ov4_021F5D7C.o - Object asm/overlay004/ov4_021F6338.o - Object asm/overlay004/ov4_021F7128.o - Object asm/overlay004/ov4_021F741C.o - Object asm/overlay004/ov4_021F763C.o - Object asm/overlay004/ov4_021F7F54.o - Object asm/overlay004/ov4_021F8470.o - Object asm/overlay004/ov4_021F87F0.o - Object asm/overlay004/ov4_021FA360.o - Object asm/overlay004/ov4_021FABFC.o - Object asm/overlay004/ov4_021FAE80.o - Object asm/overlay004/ov4_021FBD94.o - Object asm/overlay004/ov4_021FD4E0.o - Object asm/overlay004/ov4_021FD500.o - Object asm/overlay004/ov4_021FD7CC.o - Object asm/overlay004/ov4_021FE0AC.o - Object asm/overlay004/ov4_021FE890.o - Object asm/overlay004/ov4_021FEEC8.o - Object asm/overlay004/ov4_02201504.o - Object asm/overlay004/ov4_02202698.o - Object asm/overlay004/ov4_02203504.o - Object asm/overlay004/ov4_02203798.o - Object asm/overlay004/ov4_022038F4.o - Object asm/overlay004/ov4_02203BD4.o - Object asm/overlay004/ov4_02204160.o - Object asm/overlay004/ov4_02205128.o - Object asm/overlay004/ov4_02205270.o - Object asm/overlay004/ov4_022054E4.o - Object asm/overlay004/ov4_022058A0.o - Object asm/overlay004/ov4_02205988.o - Object asm/overlay004/ov4_02205C7C.o - Object asm/overlay004/ov4_02205EF0.o - Object asm/overlay004/ov4_02206224.o - Object asm/overlay004/ov4_0220657C.o - Object asm/overlay004/ov4_02206808.o - Object asm/overlay004/ov4_0221A13C.o - Object asm/overlay004/ov4_02206A3C.o - Object asm/overlay004/ov4_0220729C.o - Object asm/overlay004/ov4_0220793C.o - Object asm/overlay004/ov4_02207A18.o - Object asm/overlay004/ov4_02207D90.o - Object asm/overlay004/ov4_02207F58.o - Object asm/overlay004/ov4_022080F0.o - Object asm/overlay004/ov4_02208208.o - Object asm/overlay004/ov4_02208214.o - Object asm/overlay004/ov4_02208324.o - Object asm/overlay004/ov4_02208BCC.o - Object asm/overlay004/ov4_02208CEC.o - Object asm/overlay004/ov4_0220DA10.o - Object asm/overlay004/ov4_02210EEC.o - Object asm/overlay004/ov4_022114A0.o - Object asm/overlay004/ov4_02211D9C.o - Object asm/overlay004/ov4_02211E7C.o - Object asm/overlay004/ov4_02212CC8.o - Object asm/overlay004/ov4_02214E34.o - Object asm/overlay004/ov4_022152B4.o - Object asm/overlay004/ov4_022156C0.o - Object asm/overlay004/ov4_02215844.o + Object lib/NitroDWC/asm/base/dwc_transport.o + Object lib/NitroDWC/asm/base/dwc_ghttp.o + Object lib/NitroDWC/asm/ac/dwc_ac.o + Object lib/NitroDWC/asm/ac/beacon.o + Object lib/NitroDWC/asm/ac/callback.o + Object lib/NitroDWC/asm/ac/connect.o + Object lib/NitroDWC/asm/ac/close.o + Object lib/NitroDWC/asm/ac/error.o + Object lib/NitroDWC/asm/ac/makelist.o + Object lib/NitroDWC/asm/ac/retry.o + Object lib/NitroDWC/asm/ac/search.o + Object lib/NitroDWC/asm/ac/start.o + Object lib/NitroDWC/asm/ac/test.o + Object lib/NitroDWC/asm/ac/shop_usb.o + Object lib/NitroDWC/asm/ac/wds.o + Object lib/NitroDWC/asm/ac/nintendospot.o + Object lib/NitroDWC/asm/gs/available.o + Object lib/NitroDWC/asm/gs/darray.o + Object lib/NitroDWC/asm/gs/hashtable.o + Object lib/NitroDWC/asm/gs/md5c.o + Object lib/NitroDWC/asm/gs/nonport.o + Object lib/NitroDWC/asm/gs/gp/gp.o + Object lib/NitroDWC/asm/gs/gp/gpi.o + Object lib/NitroDWC/asm/gs/gp/gpibuddy.o + Object lib/NitroDWC/asm/gs/gp/gpibuffer.o + Object lib/NitroDWC/asm/gs/gp/gpicallback.o + Object lib/NitroDWC/asm/gs/gp/gpiconnect.o + Object lib/NitroDWC/asm/gs/gp/gpiinfo.o + Object lib/NitroDWC/asm/gs/gp/gpioperation.o + Object lib/NitroDWC/asm/gs/gp/gpipeer.o + Object lib/NitroDWC/asm/gs/gp/gpiprofile.o + Object lib/NitroDWC/asm/gs/gp/gpisearch.o + Object lib/NitroDWC/asm/gs/gp/gpitransfer.o + Object lib/NitroDWC/asm/gs/gp/gpiunique.o + Object lib/NitroDWC/asm/gs/gp/gpiutility.o + Object lib/NitroDWC/asm/gs/gstats/gbucket.o + Object lib/NitroDWC/asm/gs/gstats/gstats.o + Object lib/NitroDWC/asm/gs/gt2/gt2auth.o + Object lib/NitroDWC/asm/gs/gt2/gt2buffer.o + Object lib/NitroDWC/asm/gs/gt2/gt2callback.o + Object lib/NitroDWC/asm/gs/gt2/gt2connection.o + Object lib/NitroDWC/asm/gs/gt2/gt2main.o + Object lib/NitroDWC/asm/gs/gt2/gt2message.o + Object lib/NitroDWC/asm/gs/gt2/gt2socket.o + Object lib/NitroDWC/asm/gs/gt2/gt2utility.o + Object lib/NitroDWC/asm/gs/natneg/natneg.o + Object lib/NitroDWC/asm/gs/qr2/qr2.o + Object lib/NitroDWC/asm/gs/qr2/qr2regkeys.o + Object lib/NitroDWC/asm/gs/serverbrowsing/sb_crypt.o + Object lib/NitroDWC/asm/gs/serverbrowsing/sb_queryengine.o + Object lib/NitroDWC/asm/gs/serverbrowsing/sb_server.o + Object lib/NitroDWC/asm/gs/serverbrowsing/sb_serverbrowsing.o + Object lib/NitroDWC/asm/gs/serverbrowsing/sb_serverlist.o + Object lib/libVCT/asm/adpcm.o + Object lib/libVCT/asm/audio.o + Object lib/libVCT/asm/decoder.o + Object lib/libVCT/asm/g711.o + Object lib/libVCT/asm/queue.o + Object lib/libVCT/asm/stream.o + Object lib/libVCT/asm/ssp.o + Object lib/libVCT/asm/udp_buffer.o + Object lib/libVCT/asm/vad.o + Object lib/libVCT/asm/fir.o + Object lib/libVCT/asm/mixer.o + Object lib/libVCT/asm/vct_main.o + Object lib/NitroWiFi/asm/soc/socl_startup.o + Object lib/NitroWiFi/asm/soc/socl_command.o + Object lib/NitroWiFi/asm/soc/socl_create.o + Object lib/NitroWiFi/asm/soc/socl_listen_acc.o + Object lib/NitroWiFi/asm/soc/socl_bind.o + Object lib/NitroWiFi/asm/soc/socl_const.o + Object lib/NitroWiFi/asm/soc/socl_read.o + Object lib/NitroWiFi/asm/soc/socl_write.o + Object lib/NitroWiFi/asm/soc/socl_shutdown.o + Object lib/NitroWiFi/asm/soc/socl_close.o + Object lib/NitroWiFi/asm/soc/socl_cleanup.o + Object lib/NitroWiFi/asm/soc/socl_resolve.o + Object lib/NitroWiFi/asm/soc/socl_poll.o + Object lib/NitroWiFi/asm/soc/socl_misc.o + Object lib/NitroWiFi/asm/soc/socl_list.o + Object lib/NitroWiFi/asm/soc/soc.o + Object lib/NitroWiFi/asm/soc/socl_ssl.o + Object lib/NitroWiFi/asm/cps/network.o + Object lib/NitroWiFi/asm/ssl/ssl.o + Object lib/NitroWiFi/asm/ssl/md5.o + Object lib/NitroWiFi/asm/ssl/sha1.o + Object lib/NitroWiFi/asm/ssl/arc4.o + Object lib/NitroWiFi/asm/ssl/biginteger.o + Object lib/NitroWiFi/asm/wcm/system.o + Object lib/NitroWiFi/asm/wcm/aplist.o + Object lib/NitroWiFi/asm/wcm/cpsif.o + Object lib/NitroWiFi/asm/wcm/util.o + Object lib/NitroWiFi/asm/stubsmd5/dummy_md5.o } Overlay overlay5