From 1983ab6c5f2d29a99d2fb5025a5e55e84f16df9b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 3 Jul 2020 09:15:00 -0400 Subject: [PATCH 1/3] Remove unneeded files --- Makefile | 1 - arm9/Makefile | 3 - arm9/lib/Makefile | 1 - files/particledata/particledata/narc_0000.bin | Bin 712 -> 0 bytes files/particledata/particledata/narc_0001.bin | Bin 1220 -> 0 bytes files/particledata/particledata/narc_0002.bin | Bin 6112 -> 0 bytes files/particledata/particledata/narc_0003.bin | Bin 12904 -> 0 bytes files/particledata/particledata/narc_0004.bin | Bin 7892 -> 0 bytes files/particledata/particledata/narc_0005.bin | Bin 5360 -> 0 bytes ld_script.txt | 98 ------- tools/narccomp/.gitignore | 1 - tools/narccomp/Makefile | 12 - tools/narccomp/narccomp.cpp | 261 ------------------ 13 files changed, 377 deletions(-) delete mode 100644 files/particledata/particledata/narc_0000.bin delete mode 100644 files/particledata/particledata/narc_0001.bin delete mode 100644 files/particledata/particledata/narc_0002.bin delete mode 100644 files/particledata/particledata/narc_0003.bin delete mode 100644 files/particledata/particledata/narc_0004.bin delete mode 100644 files/particledata/particledata/narc_0005.bin delete mode 100644 ld_script.txt delete mode 100644 tools/narccomp/.gitignore delete mode 100644 tools/narccomp/Makefile delete mode 100644 tools/narccomp/narccomp.cpp diff --git a/Makefile b/Makefile index ee4233446..78e2ede42 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,6 @@ MWCCARM = tools/mwccarm/$(MWCCVERSION)/mwccarm.exe KNARC = tools/knarc/knarc$(EXE) MWLDARM = tools/mwccarm/$(MWCCVERSION)/mwldarm.exe MWASMARM = tools/mwccarm/$(MWCCVERSION)/mwasmarm.exe -NARCCOMP = tools/narccomp/narccomp$(EXE) SCANINC = tools/scaninc/scaninc$(EXE) AS = $(WINE) $(MWASMARM) diff --git a/arm9/Makefile b/arm9/Makefile index 8efb8421f..47051dd6a 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -285,9 +285,6 @@ $(S_OBJS) $(LIBS_OBJS): $(BUILD_DIR)/%.o: %.s $$(dep) $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE) $(MAKELCF) $(MAKELCF_FLAGS) $^ $@ -#$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) -# $(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $< - $(ROM): $(BUILD_DIR)/$(LD_SCRIPT) $(O_FILES) $(STATIC_LIBS) cd $(BUILD_DIR) && LM_LICENSE_FILE=../../$(LM_LICENSE_FILE) $(WINE) ../../$(MWLDARM) $(LDFLAGS) $(LIBS) -o ../../$(ELF) $(LD_SCRIPT) $(O_FILES:$(BUILD_DIR)/%=%) $(OBJCOPY) $(foreach ov,arm9 $(OVERLAYS),--update-section $(ov)=$(BUILD_DIR)/$(ov).sbin -j $(ov)) $(ELF) 2>/dev/null diff --git a/arm9/lib/Makefile b/arm9/lib/Makefile index fd6471f1a..0ff7e9e4c 100644 --- a/arm9/lib/Makefile +++ b/arm9/lib/Makefile @@ -44,7 +44,6 @@ MWCCARM = ../../tools/mwccarm/$(MWCCVERSION)/mwccarm.exe # only dependency should be MWCCARM. MWLDARM = ../../tools/mwccarm/$(MWCCVERSION)/mwldarm.exe MWASMARM = ../../tools/mwccarm/$(MWCCVERSION)/mwasmarm.exe -NARCCOMP = ../../tools/narccomp/narccomp$(EXE) SCANINC = ../../tools/scaninc/scaninc$(EXE) AS = $(WINE) $(MWASMARM) diff --git a/files/particledata/particledata/narc_0000.bin b/files/particledata/particledata/narc_0000.bin deleted file mode 100644 index bf480346ca4bf742c51e4f40359ff2f20e1973fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 712 zcmZ8euTR536n?iKEj3$mJDR6&u+0r$|G>iO@NE9KEvBx z=wao@G>!Ky{hf(T=%8!{k)J(J9i!Zr^vAlZR?|9cANJl(q`Z6`K{+e0YEPf{|2z%L z8G2&mNj&%ymNV@)KxI;Y#zj#h2qBPSCd3p30RmiJQ<3MoUbxOk#R^rnjiYHeS2=NTJvs{M%ll2W1D?IzUnxjq?VAQJ2KYO8Ue`WY0~bQob;oB*^&z_ld{;1`9~s;|7`I z8pT+q4qiF#8b~-M-V0`laPQfe3Oz#1T<(v35XdNp2*&OHQ@ES}{xWgF_y(NQ{M4n4 zDlp6fd?MDQgr5ZsmI&UIitLBOzApX9uvQ${--9ACfwzy1vyn`<6yRYIEASs6@G-=7JkhDT;)IEg`L~s^QIhGqYaXFMdJbd+l{?`H%k%-}ZU z{RE-Ro0Qk^VDtC)PnMr7zwwr|eR$^LYb!UlG4CUp_YbJ=s*q5!Ok6a9c3zfAOJZEB zH$KR)_tCENdSCtUtzxpDmNy~q$DgjOt}x2QSaw}l8b=B7e%AeB$ERjs-z@^eR|JJ)|AP%UcLK5e!=%I!CC+Q^{s3w_vcGYeBoX@ z+XFB774VYNy8u!yElFdR#krg?EsNVCm&+SXRdRUUkh)yTHD*8TEZy@^{}-a?eFh{Y8SkqejBvz@$oUR^Ccft(Ef_!7}&*1Ed*6+ zpi4MxMM{k=+o{xmeT--v1HD>r-PLf+b16FLUI5WFJ?8neEYeaDONrkgk2bJQcHbC2-28wf*5ZCvD6jg54VbW+r9 zJxqU5D-X)oRT^V0WK+FW<*7u=kVZElqPhVJM@)zOqA*lVIHP`gPb}R4RqP@dNdK;Y zy;a3fQwy*V>Y@i@R1J07m54_GR?y{&l@b*UkVhK@3kXO5koFFI4~OAY|2+Cr1JsN| zJ}m?yXQ~%b@E!BeiBro8qggSCl;h*( zZlL=}g&s+x>aI%v)`;C~^Vnh>8bf+RbE9#&8lp=^X;vg-cQrO9>7*!!Icb`mP}K0> z{8?3^xB?T}MLi^)V}7L=irLWQq(gE>9Q|Xw==10vo8FA0-VmPduu1{qC{k$G^rqd6 z^b}WLyArTyAPNED82ZFU6&uS>fms#~P5XC~)(j)rP_B_{7a37F)s}OWL z4Ml+ThrP5vxa=GqC<1qzCvh5QGG(6#GJJm=mp%g^csb4;2tR>COM|#~&?q~F5>Ur+ ztSOFrhj;4LV6P9)kFl_$a*JRmd$?~mSsd3OB40?UwboL&}y7a>Kh#*aaLBBtoz$rpc`3x|zQqW(e&;$jc zP&h>J8mh5TIGL}NE8l_h7+=~S{s4Ar4@WB_rok;d{{!{b BjDi3F diff --git a/files/particledata/particledata/narc_0003.bin b/files/particledata/particledata/narc_0003.bin deleted file mode 100644 index c9dd0fc79f1c17c544d680b893b0d64fe586cadb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12904 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 diff --git a/files/particledata/particledata/narc_0004.bin b/files/particledata/particledata/narc_0004.bin deleted file mode 100644 index 4f15716cd4325272c65a96c7c919320d9736e7bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7892 zcmc(jZHOIb6~~`@)6}&udTV2xQfVIBQU_^qYQT=*%Lsj0p_IW2=7X>kY}$$?9h25p zTARTYNwO-rF36BYToS~k0SOI-OY%Xjrp~?!+hLqH}{$Pw#RBx_jc`pa-%Wt)E>Y2om!UF z&2?sV-@~t%Y?U`-{=mkpY0S=g-PFI`*O+pxTal^>c- z+n(A~tM-)7KX1Br>n-*@1 zcE9^{E#WI@Ln5bMLNF&YZq(?53$( zvh2?7cN&+2)5d)M`np+XFEHji)MiP}Ud2@Qe))+X{KJ^N-(T{ zG}5p^6z@oqlJ$bo9qEhN{{4<`*l-A9aom=SCz=4I!b0?2Xj+ZLP&ykaJmlvx17!+JM zbMn>02M_)PI(YE#t0&J~=!zS+Vea&6M-KlAI(+1{({p{xZo}odGpA3!2Aw>82IU>& zMG;V+3zsj*YKk~d>ot6p7l7(;?bGz`Y8O&%u-ih zJUTi<&+O1B+k1EkXFdC25%265>w0b}FWo)7qj8}l87C7w0B5hACdSclgaGfSO#j}{(vcoQq$)x+z4{cpZ8uY)j(qbLe}A0?HT(>BCn zwMR2Mh>|o-lQc>2AqoR4*pLwQsOyUKyfv)P$j`DoZ$WvUWvGclfsjXj5Cq-^5Ik&W zS*z7qsVUl4O;VeR+V@UA?Irc*Z#viP}vr&pT(#aqb z=<{qCMFb@rq`(U}2=Y3%0wtRr00qhh!42a$Ns<8yyue{^rB8?4sf;<3& zG7K`{+;oUMRYm0c3AGnCY^n+hd*cHF6ySC0mo5YVP_9JoxH|E6JMt_TvLsxaA88;a zX;3JT2LN!4{0sdc$=mJ3xlY{Hh%1@OYnEq{A+0voArSzon)|(t5pP*9kzRc7=G)nj z5Vf0Rt(5FQjTrd?fGgG@Hta<3SM(5eES= zAn?fA0Hgq*ROAi%K#%u6mA&3~_7tS*1b_nW+YkWGfkwl6k<5quq#(ydRw|jkr$PV# zOB?YqnWw%y^{hwE+d1`@fWA+npCMIv5K%C3=qCz*jFs?H%0G^K>!x2=oX7bm1;B`T zp-Lt1e4%#eF42bOrN9PhZhd-C6y>c%@?K=A_%@Z#*hs1bU8?829M3WV+5I`EwX7I`seDNb@aG3Jp6e?}@O%z-j} zUwW~V&*C^E+6ubPTq~_MeUOeu6q#5ZsFaUozbo(g8>i5i$T!5EHWU9(xLG7p9UAl=Nyh<4H92qNLr)KY3t1HcK<1n3OILa1IJ7U#v8mwe92*L|xr${bKL z7>GdC8VA1GMP}VJ3789X9*yj>Zd@zoI1WmJvK{*o?za<~sA-TtrR)bAhOgXDGKDq}( zK~up^kufHs9z*(Y6vR}ydKv3fnX1l>goa{$1D(9OZ9dpU#;n5*R| z)WsI@RzmHPT`mjMVG(d{9{|X#;bg39;6+W+m~<~jTt`oH$Jgbk@K%>6Es=sy_n@c> zLXph^JmSEPJa1%Uh`?ikdGCc1XHa$P9sRl!=0sM#5LL`z zpt+l06*)CHu63%6GmRsj}i~$ zDo%9Jmp(>_u|su4p%mn#DKp$q!YBrnmBgz$>wqA3piP9-Wn1?}6e>;JUik^5O7eWt zFu=OBsJtQC2pYI~>qi`%%g3r`zo&P)E zgsOYX|2tRD0owmxUy+K9OlR5o4L4*L<}YlZ0P*>a6tFzchG7V@jOF?Hp$MG#a0R9K zPz8W5Xow4?`k@92bPnM_4?gsDMNc#&g7WX;#f$U9Qbc@MX2Y-mXXh`TKhNK=1d(3R uFmYqthT+R@!$!+&7;3x-`3J7g4+CGyZ*0EU^uPVwTz{hW`}&joPx)UvleVk? diff --git a/files/particledata/particledata/narc_0005.bin b/files/particledata/particledata/narc_0005.bin deleted file mode 100644 index 852d1063af6e45413c25527724c8eb673904ebb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5360 zcmeHLF>KpL6g@db>m{fVw2g+KVF9Bc+J(;0a8$M%4{!!<)u@ppVIc601hR1C(19aI zEd?}c)Q~}=wrGn+0YLz6&int4lp-A^+Q?*>ut<@-_x}6u-~AKpy-`<}ul~L4i8Db* zijVw7h?4Jw=w1DBZoisKUx>H%$?Wt0Uxeu2yz2?^{ztsVJNkTh`r#=J{$0EhFK|73 zsm0H@dS|ccF(1#*e|`3;r}g!Juf@y1KK?EAtssiu#5K+r0N>v9#7|&GyeGiERabwW z;r0i7#|MAnf=)YEbN3+5wf$|$RBbQJb5*Hh1IntZ+9Q;e0$#R_D3y@9(m1;*AWbf- zB?LG{mQt!E;$whv5XeeudW`{E9%MnnzdiOT)DGV1LaCIAFO@ri6Z(bCUpnQJ>t!X8 zg=+JUM;!AX0}eAM;+?~3?aupsTXtSO%&)gMrbqnq1U&*h$is(w1g>;k*sHmFJU=?{ zy&X8G)^RlSK|l=r?gRmi z!B7C;ogC>*k7eki3Jt?if(GsZK2&j5WDpSe%y3%47Vi5&i15XvNXKdz5<{)vh=5u= zf`>yHCHZ7F$&(QXz`z6)p_Rad=hO*4PRrS1R;KYtNs>?#wBh&RI-f39(BoL=<#fJe@#cr!X1!X>CPkLSWP+Q3yA7snth0iG!@BJO z0+PTk7=i-5COFfme3TC%U7Tg)icmtf8KBE2?Q5- z_Se-%?Ep8`r#^U~9uM%CHY~JFR$vJrem-TmnLO^~nUC-+fajpjY58*Q1pj9GJL7K! zVEwWOSOR37g|m9I8@lA%1R#Ji;8g$%R#?3z`Y;G+Gi}SBC`|%X116vbv_SWOb#((g z)_xiR4S_DEGqgW){;my}x`;vpo|M=?xc4>f*KMA$glkAeG;Ju!OSFHiSuFdydmn>y z38;vM00PkYl-+%dcka2<6odqTfEj{el;~tcb!#@S6L3=mOF$biRvfqOuKTwoU -#include -#include -#include -#include -#include -#include -#include - -using namespace std; - -struct Options -{ - fstream outfile; - map infiles; - unsigned char padval; - bool keep_names; - string host_root; - string nitro_root; - Options(int const & argc, char ** const & argv) : - // Default values - padval(255), - keep_names(false) - { - char last_opt = 0; - string outfname; // Use this to avoid clobbering an existing file in the event of an error - for (string arg : vector(argv + 1, argv + argc)) - { - if (last_opt != 0) { - switch (last_opt) - { - case 'p': - { - // Padding - unsigned long x; - stringstream is(arg); - is >> x; - if (x >= 256) { - stringstream ss; - ss << "Invalid value for -p: " << x << endl; - throw invalid_argument(ss.str()); - } - padval = x; - break; - } - case 'o': - // Outfile - if (!outfname.empty()) { - throw invalid_argument("Can't output more than one file\n"); - } - outfname = arg; - break; - case 'r': - // Not fully implemented - if (!host_root.empty()) { - throw invalid_argument("Duplicate settings for option -r\n"); - } - host_root = arg; - break; - case 'R': - // Not fully implemented - if (!nitro_root.empty()) { - throw invalid_argument("Duplicate settings for option -R\n"); - } - nitro_root = arg; - break; - default: - stringstream ss; - ss << "Unrecognized option: -" << (char)last_opt << endl; - throw invalid_argument(ss.str()); - } - last_opt = 0; - } - else if (arg[0] == '-') { - if (arg[1] == 0 || arg[2] != 0) { - stringstream ss; - ss << "Unrecognized option: " << arg << endl; - throw invalid_argument(ss.str()); - } - switch (arg[1]) { - case 'h': - cout << "Usage: " << argv[0] << " [-p PADVAL] [-h] -o OUTFILE FILE [FILE ...]" << endl; - cout << endl; - cout << " FILE [FILE ...] List of files to be packed into the archive." << endl; - cout << " -o OUTFILE The destination archive, in NARC format" << endl; - cout << " -p PADVAL Pad archive members to word with this character. Default: 255" << endl; - cout << " -h Print this message and exit" << endl; - exit(0); - case 'k': - throw invalid_argument("'-k': not implemented\n"); -// if (keep_names) { -// throw invalid_argument("'-k' specified more than once\n"); -// } -// keep_names = true; -// break; - default: - last_opt = arg[1]; - } - } - else - { - fstream file; - stringstream uss; - - if (!infiles[arg].empty()) { - stringstream ss; - ss << "Duplicate file: " << arg << endl; - throw invalid_argument(ss.str()); - } - file.open(arg, ios_base::in | ios_base::binary); - uss << file.rdbuf(); - file.close(); - infiles[arg] = uss.str(); - } - } - if (outfname.empty()) { - throw invalid_argument("Must specify an output file (-o OUTFILE)\n"); - } - if (infiles.empty()) { - throw invalid_argument("No input files\n"); - } - outfile.open(outfname, ios_base::binary | ios_base::out); - } -}; - -struct FatbEntry -{ - uint32_t start; - uint32_t end; -}; - -struct FatbHeader -{ - char magic[4]; - uint32_t chunk_size; - uint16_t file_count; - char padding[2]; - FatbHeader(uint16_t numfiles) : - chunk_size(sizeof(FatbHeader) + sizeof(FatbEntry) * numfiles), - file_count(numfiles) - { strncpy(magic, "BTAF", 4); memset(padding, 0, 2); } -}; - -struct FntbDirHeader -{ - uint32_t offset; - uint16_t first_file; - uint16_t id_or_count; -}; - -struct FntbHeader -{ - char magic[4]; - uint32_t chunk_size; - FntbHeader() : - chunk_size(sizeof(FntbHeader) + sizeof(FntbDirHeader)) - { strncpy(magic, "BTNF", 4); } - string set_names(Options*& opt, FntbDirHeader*& dirHeader) { - throw runtime_error("not implemented\n"); -// typedef struct NitroFS { -// bool is_dir; -// vector children; -// } nitrofs_t; -// map fs; -// fs[opt->nitro_root].is_dir = true; -// string host_root; -// for (auto pair : opt->infiles) { -// string fname = pair.first; -// fname = fname.replace(0, opt->host_root.size(), opt->nitro_root); -// int pos; -// while ((pos = fname.find("//")) != fname.npos) { -// fname = fname.replace(pos, 2, 1, '/'); -// } -// } -// return nullptr; - } -}; - -#define FNT_END 0 -#define FNT_LENGTH_MASK 0x7F -#define FNT_IS_DIR_MASK 0x80 - -struct FimgHeader -{ - char magic[4]; - uint32_t chunk_size; - FimgHeader(size_t image_size) : - chunk_size(sizeof(FimgHeader) + image_size) - { strncpy(magic, "GMIF", 4); } -}; - -struct NarcHeader -{ - char magic[4]; // NARC - uint16_t bom; - uint16_t version; - uint32_t size; - uint16_t chunk_size; - uint16_t num_chunks; - NarcHeader(uint16_t numfiles, size_t image_size) : - bom(0xFFFE), - version(0x0100), - size(sizeof(NarcHeader) + sizeof(FatbHeader) + sizeof(FatbEntry) * numfiles + sizeof(FntbHeader) + sizeof(FntbDirHeader) + sizeof(FimgHeader) + image_size), - chunk_size(sizeof(NarcHeader)), - num_chunks(3) - { strncpy(magic, "NARC", 4); } -}; - -int main(int argc, char ** argv) -{ - try - { - auto opt = new Options(argc, argv); - size_t nfiles = opt->infiles.size(); - auto fatb = new FatbEntry[nfiles]; - FatbEntry *entry = fatb; - for (auto pair : opt->infiles) - { - entry->start = (entry == fatb ? 0 : (entry[-1].end + 3) & ~3); - entry->end = entry->start + pair.second.size(); - entry++; - } - size_t image_size = (fatb[nfiles - 1].end + 3) & ~3; - FntbHeader fntbHeader; - auto fntbDir = new FntbDirHeader; - *fntbDir = (FntbDirHeader) {4, 0, 1}; // dummy - stringstream fnt; - if (opt->keep_names) - { - fntbHeader.set_names(opt, fntbDir); - } - NarcHeader narcHeader(nfiles, (fatb[nfiles - 1].end + 3) & ~3); - FatbHeader fatbHeader(nfiles); - FimgHeader fimgHeader((fatb[nfiles - 1].end + 3) & ~3); - opt->outfile.write((char *) &narcHeader, sizeof(NarcHeader)); - opt->outfile.write((char *) &fatbHeader, sizeof(FatbHeader)); - opt->outfile.write((char *) fatb, sizeof(FatbEntry) * nfiles); - opt->outfile.write((char *) &fntbHeader, sizeof(FntbHeader)); - opt->outfile.write((char *) fntbDir, sizeof(FntbDirHeader)); - opt->outfile.write((char *) &fimgHeader, sizeof(FimgHeader)); - char padding[4]; - memset(padding, opt->padval, 4); - for (auto pair : opt->infiles) - { - stringstream uss(pair.second); - opt->outfile.write(pair.second.c_str(), pair.second.size()); - opt->outfile.write(padding, (4 - pair.second.size()) & 3); - } - opt->outfile.close(); - return 0; - } catch (invalid_argument e) { - cerr << "Invalid exception: " << e.what() << endl; - return 1; - } catch (runtime_error e) { - cerr << "Runtime error: " << e.what() << endl; - return 2; - } catch (exception e) { - cerr << "unhandled exception caught" << endl; - return 3; - } -} From 6a0ba69526484c7fc707777327be80ab90fea215 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 3 Jul 2020 09:48:07 -0400 Subject: [PATCH 2/3] Simplify ARM9 makefile definition of OVERLAYS --- arm9/Makefile | 89 +----------------- files/particledata/particledata/narc_0000.bin | Bin 0 -> 712 bytes files/particledata/particledata/narc_0001.bin | Bin 0 -> 1220 bytes files/particledata/particledata/narc_0002.bin | Bin 0 -> 6112 bytes files/particledata/particledata/narc_0003.bin | Bin 0 -> 12904 bytes files/particledata/particledata/narc_0004.bin | Bin 0 -> 7892 bytes files/particledata/particledata/narc_0005.bin | Bin 0 -> 5360 bytes 7 files changed, 1 insertion(+), 88 deletions(-) create mode 100644 files/particledata/particledata/narc_0000.bin create mode 100644 files/particledata/particledata/narc_0001.bin create mode 100644 files/particledata/particledata/narc_0002.bin create mode 100644 files/particledata/particledata/narc_0003.bin create mode 100644 files/particledata/particledata/narc_0004.bin create mode 100644 files/particledata/particledata/narc_0005.bin diff --git a/arm9/Makefile b/arm9/Makefile index 47051dd6a..42f86232e 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -66,94 +66,7 @@ LIBS_OBJS = $(LIBS_FILES:%.s=$(BUILD_DIR)/%.o) O_FILES := $(C_OBJS) $(CXX_OBJS) $(S_OBJS) # Overlay modules -OVERLAYS := \ - MODULE_00 \ - MODULE_01 \ - MODULE_02 \ - MODULE_03 \ - MODULE_04 \ - MODULE_05 \ - MODULE_06 \ - MODULE_07 \ - MODULE_08 \ - MODULE_09 \ - MODULE_10 \ - MODULE_11 \ - MODULE_12 \ - MODULE_13 \ - MODULE_14 \ - MODULE_15 \ - MODULE_16 \ - MODULE_17 \ - MODULE_18 \ - MODULE_19 \ - MODULE_20 \ - MODULE_21 \ - MODULE_22 \ - MODULE_23 \ - MODULE_24 \ - MODULE_25 \ - MODULE_26 \ - MODULE_27 \ - MODULE_28 \ - MODULE_29 \ - MODULE_30 \ - MODULE_31 \ - MODULE_32 \ - MODULE_33 \ - MODULE_34 \ - MODULE_35 \ - MODULE_36 \ - MODULE_37 \ - MODULE_38 \ - MODULE_39 \ - MODULE_40 \ - MODULE_41 \ - MODULE_42 \ - MODULE_43 \ - MODULE_44 \ - MODULE_45 \ - MODULE_46 \ - MODULE_47 \ - MODULE_48 \ - MODULE_49 \ - MODULE_50 \ - MODULE_51 \ - MODULE_52 \ - MODULE_53 \ - MODULE_54 \ - MODULE_55 \ - MODULE_56 \ - MODULE_57 \ - MODULE_58 \ - MODULE_59 \ - MODULE_60 \ - MODULE_61 \ - MODULE_62 \ - MODULE_63 \ - MODULE_64 \ - MODULE_65 \ - MODULE_66 \ - MODULE_67 \ - MODULE_68 \ - MODULE_69 \ - MODULE_70 \ - MODULE_71 \ - MODULE_72 \ - MODULE_73 \ - MODULE_74 \ - MODULE_75 \ - MODULE_76 \ - MODULE_77 \ - MODULE_78 \ - MODULE_79 \ - MODULE_80 \ - MODULE_81 \ - MODULE_82 \ - MODULE_83 \ - MODULE_84 \ - MODULE_85 \ - MODULE_86 \ +OVERLAYS := $(shell grep -oE "Overlay \w+" $(LD_SPEC) | cut -d' ' -f2) .SECONDARY: .DELETE_ON_ERROR: diff --git a/files/particledata/particledata/narc_0000.bin b/files/particledata/particledata/narc_0000.bin new file mode 100644 index 0000000000000000000000000000000000000000..bf480346ca4bf742c51e4f40359ff2f20e1973fe GIT binary patch literal 712 zcmZ8euTR536n?iKEj3$mJDR6&u+0r$|G>iO@NE9KEvBx z=wao@G>!Ky{hf(T=%8!{k)J(J9i!Zr^vAlZR?|9cANJl(q`Z6`K{+e0YEPf{|2z%L z8G2&mNj&%ymNV@)KxI;Y#zj#h2qBPSCd3p30RmiJQ<3MoUbxOk#R^rnjiYHeS2=NTJvs{M%ll2W1D?IzUnxjq?VAQJ2KYO8Ue`WY0~bQob;oB*^&z_ld{;1`9~s;|7`I z8pT+q4qiF#8b~-M-V0`laPQfe3Oz#1T<(v35XdNp2*&OHQ@ES}{xWgF_y(NQ{M4n4 zDlp6fd?MDQgr5ZsmI&UIitLBOzApX9uvQ${--9ACfwzy1vyn`<6yRYIEASs6@G-=7JkhDT;)IEg`L~s^QIhGqYaXFMdJbd+l{?`H%k%-}ZU z{RE-Ro0Qk^VDtC)PnMr7zwwr|eR$^LYb!UlG4CUp_YbJ=s*q5!Ok6a9c3zfAOJZEB zH$KR)_tCENdSCtUtzxpDmNy~q$DgjOt}x2QSaw}l8b=B7e%AeB$ERjs-z@^eR|JJ)|AP%UcLK5e!=%I!CC+Q^{s3w_vcGYeBoX@ z+XFB774VYNy8u!yElFdR#krg?EsNVCm&+SXRdRUUkh)yTHD*8TEZy@^{}-a?eFh{Y8SkqejBvz@$oUR^Ccft(Ef_!7}&*1Ed*6+ zpi4MxMM{k=+o{xmeT--v1HD>r-PLf+b16FLUI5WFJ?8neEYeaDONrkgk2bJQcHbC2-28wf*5ZCvD6jg54VbW+r9 zJxqU5D-X)oRT^V0WK+FW<*7u=kVZElqPhVJM@)zOqA*lVIHP`gPb}R4RqP@dNdK;Y zy;a3fQwy*V>Y@i@R1J07m54_GR?y{&l@b*UkVhK@3kXO5koFFI4~OAY|2+Cr1JsN| zJ}m?yXQ~%b@E!BeiBro8qggSCl;h*( zZlL=}g&s+x>aI%v)`;C~^Vnh>8bf+RbE9#&8lp=^X;vg-cQrO9>7*!!Icb`mP}K0> z{8?3^xB?T}MLi^)V}7L=irLWQq(gE>9Q|Xw==10vo8FA0-VmPduu1{qC{k$G^rqd6 z^b}WLyArTyAPNED82ZFU6&uS>fms#~P5XC~)(j)rP_B_{7a37F)s}OWL z4Ml+ThrP5vxa=GqC<1qzCvh5QGG(6#GJJm=mp%g^csb4;2tR>COM|#~&?q~F5>Ur+ ztSOFrhj;4LV6P9)kFl_$a*JRmd$?~mSsd3OB40?UwboL&}y7a>Kh#*aaLBBtoz$rpc`3x|zQqW(e&;$jc zP&h>J8mh5TIGL}NE8l_h7+=~S{s4Ar4@WB_rok;d{{!{b BjDi3F literal 0 HcmV?d00001 diff --git a/files/particledata/particledata/narc_0003.bin b/files/particledata/particledata/narc_0003.bin new file mode 100644 index 0000000000000000000000000000000000000000..c9dd0fc79f1c17c544d680b893b0d64fe586cadb GIT binary patch literal 12904 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 literal 0 HcmV?d00001 diff --git a/files/particledata/particledata/narc_0004.bin b/files/particledata/particledata/narc_0004.bin new file mode 100644 index 0000000000000000000000000000000000000000..4f15716cd4325272c65a96c7c919320d9736e7bc GIT binary patch literal 7892 zcmc(jZHOIb6~~`@)6}&udTV2xQfVIBQU_^qYQT=*%Lsj0p_IW2=7X>kY}$$?9h25p zTARTYNwO-rF36BYToS~k0SOI-OY%Xjrp~?!+hLqH}{$Pw#RBx_jc`pa-%Wt)E>Y2om!UF z&2?sV-@~t%Y?U`-{=mkpY0S=g-PFI`*O+pxTal^>c- z+n(A~tM-)7KX1Br>n-*@1 zcE9^{E#WI@Ln5bMLNF&YZq(?53$( zvh2?7cN&+2)5d)M`np+XFEHji)MiP}Ud2@Qe))+X{KJ^N-(T{ zG}5p^6z@oqlJ$bo9qEhN{{4<`*l-A9aom=SCz=4I!b0?2Xj+ZLP&ykaJmlvx17!+JM zbMn>02M_)PI(YE#t0&J~=!zS+Vea&6M-KlAI(+1{({p{xZo}odGpA3!2Aw>82IU>& zMG;V+3zsj*YKk~d>ot6p7l7(;?bGz`Y8O&%u-ih zJUTi<&+O1B+k1EkXFdC25%265>w0b}FWo)7qj8}l87C7w0B5hACdSclgaGfSO#j}{(vcoQq$)x+z4{cpZ8uY)j(qbLe}A0?HT(>BCn zwMR2Mh>|o-lQc>2AqoR4*pLwQsOyUKyfv)P$j`DoZ$WvUWvGclfsjXj5Cq-^5Ik&W zS*z7qsVUl4O;VeR+V@UA?Irc*Z#viP}vr&pT(#aqb z=<{qCMFb@rq`(U}2=Y3%0wtRr00qhh!42a$Ns<8yyue{^rB8?4sf;<3& zG7K`{+;oUMRYm0c3AGnCY^n+hd*cHF6ySC0mo5YVP_9JoxH|E6JMt_TvLsxaA88;a zX;3JT2LN!4{0sdc$=mJ3xlY{Hh%1@OYnEq{A+0voArSzon)|(t5pP*9kzRc7=G)nj z5Vf0Rt(5FQjTrd?fGgG@Hta<3SM(5eES= zAn?fA0Hgq*ROAi%K#%u6mA&3~_7tS*1b_nW+YkWGfkwl6k<5quq#(ydRw|jkr$PV# zOB?YqnWw%y^{hwE+d1`@fWA+npCMIv5K%C3=qCz*jFs?H%0G^K>!x2=oX7bm1;B`T zp-Lt1e4%#eF42bOrN9PhZhd-C6y>c%@?K=A_%@Z#*hs1bU8?829M3WV+5I`EwX7I`seDNb@aG3Jp6e?}@O%z-j} zUwW~V&*C^E+6ubPTq~_MeUOeu6q#5ZsFaUozbo(g8>i5i$T!5EHWU9(xLG7p9UAl=Nyh<4H92qNLr)KY3t1HcK<1n3OILa1IJ7U#v8mwe92*L|xr${bKL z7>GdC8VA1GMP}VJ3789X9*yj>Zd@zoI1WmJvK{*o?za<~sA-TtrR)bAhOgXDGKDq}( zK~up^kufHs9z*(Y6vR}ydKv3fnX1l>goa{$1D(9OZ9dpU#;n5*R| z)WsI@RzmHPT`mjMVG(d{9{|X#;bg39;6+W+m~<~jTt`oH$Jgbk@K%>6Es=sy_n@c> zLXph^JmSEPJa1%Uh`?ikdGCc1XHa$P9sRl!=0sM#5LL`z zpt+l06*)CHu63%6GmRsj}i~$ zDo%9Jmp(>_u|su4p%mn#DKp$q!YBrnmBgz$>wqA3piP9-Wn1?}6e>;JUik^5O7eWt zFu=OBsJtQC2pYI~>qi`%%g3r`zo&P)E zgsOYX|2tRD0owmxUy+K9OlR5o4L4*L<}YlZ0P*>a6tFzchG7V@jOF?Hp$MG#a0R9K zPz8W5Xow4?`k@92bPnM_4?gsDMNc#&g7WX;#f$U9Qbc@MX2Y-mXXh`TKhNK=1d(3R uFmYqthT+R@!$!+&7;3x-`3J7g4+CGyZ*0EU^uPVwTz{hW`}&joPx)UvleVk? literal 0 HcmV?d00001 diff --git a/files/particledata/particledata/narc_0005.bin b/files/particledata/particledata/narc_0005.bin new file mode 100644 index 0000000000000000000000000000000000000000..852d1063af6e45413c25527724c8eb673904ebb0 GIT binary patch literal 5360 zcmeHLF>KpL6g@db>m{fVw2g+KVF9Bc+J(;0a8$M%4{!!<)u@ppVIc601hR1C(19aI zEd?}c)Q~}=wrGn+0YLz6&int4lp-A^+Q?*>ut<@-_x}6u-~AKpy-`<}ul~L4i8Db* zijVw7h?4Jw=w1DBZoisKUx>H%$?Wt0Uxeu2yz2?^{ztsVJNkTh`r#=J{$0EhFK|73 zsm0H@dS|ccF(1#*e|`3;r}g!Juf@y1KK?EAtssiu#5K+r0N>v9#7|&GyeGiERabwW z;r0i7#|MAnf=)YEbN3+5wf$|$RBbQJb5*Hh1IntZ+9Q;e0$#R_D3y@9(m1;*AWbf- zB?LG{mQt!E;$whv5XeeudW`{E9%MnnzdiOT)DGV1LaCIAFO@ri6Z(bCUpnQJ>t!X8 zg=+JUM;!AX0}eAM;+?~3?aupsTXtSO%&)gMrbqnq1U&*h$is(w1g>;k*sHmFJU=?{ zy&X8G)^RlSK|l=r?gRmi z!B7C;ogC>*k7eki3Jt?if(GsZK2&j5WDpSe%y3%47Vi5&i15XvNXKdz5<{)vh=5u= zf`>yHCHZ7F$&(QXz`z6)p_Rad=hO*4PRrS1R;KYtNs>?#wBh&RI-f39(BoL=<#fJe@#cr!X1!X>CPkLSWP+Q3yA7snth0iG!@BJO z0+PTk7=i-5COFfme3TC%U7Tg)icmtf8KBE2?Q5- z_Se-%?Ep8`r#^U~9uM%CHY~JFR$vJrem-TmnLO^~nUC-+fajpjY58*Q1pj9GJL7K! zVEwWOSOR37g|m9I8@lA%1R#Ji;8g$%R#?3z`Y;G+Gi}SBC`|%X116vbv_SWOb#((g z)_xiR4S_DEGqgW){;my}x`;vpo|M=?xc4>f*KMA$glkAeG;Ju!OSFHiSuFdydmn>y z38;vM00PkYl-+%dcka2<6odqTfEj{el;~tcb!#@S6L3=mOF$biRvfqOuKTwoU Date: Fri, 3 Jul 2020 10:37:24 -0400 Subject: [PATCH 3/3] Remove unused definitions in toplevel makefile --- Makefile | 96 -------------------------------------------------------- 1 file changed, 96 deletions(-) diff --git a/Makefile b/Makefile index 78e2ede42..2e1b1082a 100644 --- a/Makefile +++ b/Makefile @@ -72,102 +72,6 @@ S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \ $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \ -ARM9SBIN := arm9/$(BUILD_DIR)/arm9.sbin -ARM7SBIN := arm7/build/arm7.sbin - -SBINFILES = \ - $(ARM9SBIN) \ - $(ARM9SBIN:%.sbin=%_table.sbin) \ - $(ARM9SBIN:%.sbin=%_defs.sbin) \ - $(ARM7SBIN) \ - arm9/$(BUILD_DIR)/MODULE_00.sbin \ - arm9/$(BUILD_DIR)/MODULE_01.sbin \ - arm9/$(BUILD_DIR)/MODULE_02.sbin \ - arm9/$(BUILD_DIR)/MODULE_03.sbin \ - arm9/$(BUILD_DIR)/MODULE_04.sbin \ - arm9/$(BUILD_DIR)/MODULE_05.sbin \ - arm9/$(BUILD_DIR)/MODULE_06.sbin \ - arm9/$(BUILD_DIR)/MODULE_07.sbin \ - arm9/$(BUILD_DIR)/MODULE_08.sbin \ - arm9/$(BUILD_DIR)/MODULE_09.sbin \ - arm9/$(BUILD_DIR)/MODULE_10.sbin \ - arm9/$(BUILD_DIR)/MODULE_11.sbin \ - arm9/$(BUILD_DIR)/MODULE_12.sbin \ - arm9/$(BUILD_DIR)/MODULE_13.sbin \ - arm9/$(BUILD_DIR)/MODULE_14.sbin \ - arm9/$(BUILD_DIR)/MODULE_15.sbin \ - arm9/$(BUILD_DIR)/MODULE_16.sbin \ - arm9/$(BUILD_DIR)/MODULE_17.sbin \ - arm9/$(BUILD_DIR)/MODULE_18.sbin \ - arm9/$(BUILD_DIR)/MODULE_19.sbin \ - arm9/$(BUILD_DIR)/MODULE_20.sbin \ - arm9/$(BUILD_DIR)/MODULE_21.sbin \ - arm9/$(BUILD_DIR)/MODULE_22.sbin \ - arm9/$(BUILD_DIR)/MODULE_23.sbin \ - arm9/$(BUILD_DIR)/MODULE_24.sbin \ - arm9/$(BUILD_DIR)/MODULE_25.sbin \ - arm9/$(BUILD_DIR)/MODULE_26.sbin \ - arm9/$(BUILD_DIR)/MODULE_27.sbin \ - arm9/$(BUILD_DIR)/MODULE_28.sbin \ - arm9/$(BUILD_DIR)/MODULE_29.sbin \ - arm9/$(BUILD_DIR)/MODULE_30.sbin \ - arm9/$(BUILD_DIR)/MODULE_31.sbin \ - arm9/$(BUILD_DIR)/MODULE_32.sbin \ - arm9/$(BUILD_DIR)/MODULE_33.sbin \ - arm9/$(BUILD_DIR)/MODULE_34.sbin \ - arm9/$(BUILD_DIR)/MODULE_35.sbin \ - arm9/$(BUILD_DIR)/MODULE_36.sbin \ - arm9/$(BUILD_DIR)/MODULE_37.sbin \ - arm9/$(BUILD_DIR)/MODULE_38.sbin \ - arm9/$(BUILD_DIR)/MODULE_39.sbin \ - arm9/$(BUILD_DIR)/MODULE_40.sbin \ - arm9/$(BUILD_DIR)/MODULE_41.sbin \ - arm9/$(BUILD_DIR)/MODULE_42.sbin \ - arm9/$(BUILD_DIR)/MODULE_43.sbin \ - arm9/$(BUILD_DIR)/MODULE_44.sbin \ - arm9/$(BUILD_DIR)/MODULE_45.sbin \ - arm9/$(BUILD_DIR)/MODULE_46.sbin \ - arm9/$(BUILD_DIR)/MODULE_47.sbin \ - arm9/$(BUILD_DIR)/MODULE_48.sbin \ - arm9/$(BUILD_DIR)/MODULE_49.sbin \ - arm9/$(BUILD_DIR)/MODULE_50.sbin \ - arm9/$(BUILD_DIR)/MODULE_51.sbin \ - arm9/$(BUILD_DIR)/MODULE_52.sbin \ - arm9/$(BUILD_DIR)/MODULE_53.sbin \ - arm9/$(BUILD_DIR)/MODULE_54.sbin \ - arm9/$(BUILD_DIR)/MODULE_55.sbin \ - arm9/$(BUILD_DIR)/MODULE_56.sbin \ - arm9/$(BUILD_DIR)/MODULE_57.sbin \ - arm9/$(BUILD_DIR)/MODULE_58.sbin \ - arm9/$(BUILD_DIR)/MODULE_59.sbin \ - arm9/$(BUILD_DIR)/MODULE_60.sbin \ - arm9/$(BUILD_DIR)/MODULE_61.sbin \ - arm9/$(BUILD_DIR)/MODULE_62.sbin \ - arm9/$(BUILD_DIR)/MODULE_63.sbin \ - arm9/$(BUILD_DIR)/MODULE_64.sbin \ - arm9/$(BUILD_DIR)/MODULE_65.sbin \ - arm9/$(BUILD_DIR)/MODULE_66.sbin \ - arm9/$(BUILD_DIR)/MODULE_67.sbin \ - arm9/$(BUILD_DIR)/MODULE_68.sbin \ - arm9/$(BUILD_DIR)/MODULE_69.sbin \ - arm9/$(BUILD_DIR)/MODULE_70.sbin \ - arm9/$(BUILD_DIR)/MODULE_71.sbin \ - arm9/$(BUILD_DIR)/MODULE_72.sbin \ - arm9/$(BUILD_DIR)/MODULE_73.sbin \ - arm9/$(BUILD_DIR)/MODULE_74.sbin \ - arm9/$(BUILD_DIR)/MODULE_75.sbin \ - arm9/$(BUILD_DIR)/MODULE_76.sbin \ - arm9/$(BUILD_DIR)/MODULE_77.sbin \ - arm9/$(BUILD_DIR)/MODULE_78.sbin \ - arm9/$(BUILD_DIR)/MODULE_79.sbin \ - arm9/$(BUILD_DIR)/MODULE_80.sbin \ - arm9/$(BUILD_DIR)/MODULE_81.sbin \ - arm9/$(BUILD_DIR)/MODULE_82.sbin \ - arm9/$(BUILD_DIR)/MODULE_83.sbin \ - arm9/$(BUILD_DIR)/MODULE_84.sbin \ - arm9/$(BUILD_DIR)/MODULE_85.sbin \ - arm9/$(BUILD_DIR)/MODULE_86.sbin - ##################### Compiler Options ####################### MWCCVERSION = 2.0/sp1