fix release version, better mset9.py clarity, tidy up build

Naim2000 · Oct 11, 2023 · 335c214 · 335c214
1 parent 61696ec
commit 335c214
Show file tree

Hide file tree

Showing 51 changed files with 14 additions and 17 deletions.
diff --git a/MSET9_installer_script/mset9.py b/MSET9_installer_script/mset9.py
@@ -1,6  1,6 @@
 #!/usr/bin/python3
 import os,sys,platform,time,shutil,binascii
-VERSION="v3beta"
 VERSION="v1.0"
 
 p=platform.system()
 if p == 'Windows':	#0-win, 1-lin, 2-mac, x-win   lol go with the market leader i guess
@@ -293,7  293,10 @@ def reapply_cwd():
 for i in id0_list:
 	print(i)
 print("")
-assert(id0_count == 1)
 if id0_count != 1:
 	print("You don't have 1 ID0 in your Nintendo 3DS folder, you have %d!" % id0_count)
 	print("Consult:\nhttps://3ds.hacks.guide/troubleshooting#installing-boot9strap-mset9\nfor help!")
 	sys.exit(0)
 
 if OPSYS == 0:				#windows
 	_ = os.system('cls')
@@ -307,7  310,7 @@ def reapply_cwd():
 print("1. Setup MSET9")
 print("2. Inject trigger file %s" % trigger)
 print("3. Delete trigger file %s" % trigger)
-print("4. Remove MSET9, restore original ID1")
 print("4. Remove MSET9, DO NOT FORGET to run this after you finish the exploit!")
 print("5. Exit")
 
 while 1:

diff --git a/_build_delete-file.bat b/_build_delete-file.bat
diff --git a/build.py → _deprecated/build.py b/build.py → _deprecated/build.py
diff --git a/mini_b9s_installer/Makefile → _deprecated/mini_b9s_installer/Makefile b/mini_b9s_installer/Makefile → _deprecated/mini_b9s_installer/Makefile
diff --git a/mini_b9s_installer/build.bat → _deprecated/mini_b9s_installer/build.bat b/mini_b9s_installer/build.bat → _deprecated/mini_b9s_installer/build.bat
diff --git a/mini_b9s_installer/linker.ld → _deprecated/mini_b9s_installer/linker.ld b/mini_b9s_installer/linker.ld → _deprecated/mini_b9s_installer/linker.ld
diff --git a/mini_b9s_installer/linker.specs → _deprecated/mini_b9s_installer/linker.specs b/mini_b9s_installer/linker.specs → _deprecated/mini_b9s_installer/linker.specs
diff --git a/mini_b9s_installer/source/3dsheaders.h → ...ed/mini_b9s_installer/source/3dsheaders.h b/mini_b9s_installer/source/3dsheaders.h → ...ed/mini_b9s_installer/source/3dsheaders.h
diff --git a/mini_b9s_installer/source/cache.h → ...recated/mini_b9s_installer/source/cache.h b/mini_b9s_installer/source/cache.h → ...recated/mini_b9s_installer/source/cache.h
diff --git a/mini_b9s_installer/source/cache.s → ...recated/mini_b9s_installer/source/cache.s b/mini_b9s_installer/source/cache.s → ...recated/mini_b9s_installer/source/cache.s
diff --git a/mini_b9s_installer/source/crypto.c → ...ecated/mini_b9s_installer/source/crypto.c b/mini_b9s_installer/source/crypto.c → ...ecated/mini_b9s_installer/source/crypto.c
diff --git a/mini_b9s_installer/source/crypto.h → ...ecated/mini_b9s_installer/source/crypto.h b/mini_b9s_installer/source/crypto.h → ...ecated/mini_b9s_installer/source/crypto.h
diff --git a/mini_b9s_installer/source/draw.c → _deprecated/mini_b9s_installer/source/draw.c b/mini_b9s_installer/source/draw.c → _deprecated/mini_b9s_installer/source/draw.c
diff --git a/mini_b9s_installer/source/draw.h → _deprecated/mini_b9s_installer/source/draw.h b/mini_b9s_installer/source/draw.h → _deprecated/mini_b9s_installer/source/draw.h
diff --git a/..._b9s_installer/source/fatfs/00history.txt → ..._b9s_installer/source/fatfs/00history.txt b/..._b9s_installer/source/fatfs/00history.txt → ..._b9s_installer/source/fatfs/00history.txt
diff --git a/mini_b9s_installer/source/fatfs/00readme.txt → ...i_b9s_installer/source/fatfs/00readme.txt b/mini_b9s_installer/source/fatfs/00readme.txt → ...i_b9s_installer/source/fatfs/00readme.txt
diff --git a/mini_b9s_installer/source/fatfs/diskio.c → .../mini_b9s_installer/source/fatfs/diskio.c b/mini_b9s_installer/source/fatfs/diskio.c → .../mini_b9s_installer/source/fatfs/diskio.c
diff --git a/mini_b9s_installer/source/fatfs/diskio.h → .../mini_b9s_installer/source/fatfs/diskio.h b/mini_b9s_installer/source/fatfs/diskio.h → .../mini_b9s_installer/source/fatfs/diskio.h
diff --git a/mini_b9s_installer/source/fatfs/ff.c → ...ated/mini_b9s_installer/source/fatfs/ff.c b/mini_b9s_installer/source/fatfs/ff.c → ...ated/mini_b9s_installer/source/fatfs/ff.c
diff --git a/mini_b9s_installer/source/fatfs/ff.h → ...ated/mini_b9s_installer/source/fatfs/ff.h b/mini_b9s_installer/source/fatfs/ff.h → ...ated/mini_b9s_installer/source/fatfs/ff.h
diff --git a/mini_b9s_installer/source/fatfs/ffconf.h → .../mini_b9s_installer/source/fatfs/ffconf.h b/mini_b9s_installer/source/fatfs/ffconf.h → .../mini_b9s_installer/source/fatfs/ffconf.h
diff --git a/mini_b9s_installer/source/fatfs/ffsystem.c → ...ini_b9s_installer/source/fatfs/ffsystem.c b/mini_b9s_installer/source/fatfs/ffsystem.c → ...ini_b9s_installer/source/fatfs/ffsystem.c
diff --git a/mini_b9s_installer/source/fatfs/ffunicode.c → ...ni_b9s_installer/source/fatfs/ffunicode.c b/mini_b9s_installer/source/fatfs/ffunicode.c → ...ni_b9s_installer/source/fatfs/ffunicode.c
diff --git a/mini_b9s_installer/source/fatfs/integer.h → ...mini_b9s_installer/source/fatfs/integer.h b/mini_b9s_installer/source/fatfs/integer.h → ...mini_b9s_installer/source/fatfs/integer.h
diff --git a/..._b9s_installer/source/fatfs/sdmmc/delay.h → ..._b9s_installer/source/fatfs/sdmmc/delay.h b/..._b9s_installer/source/fatfs/sdmmc/delay.h → ..._b9s_installer/source/fatfs/sdmmc/delay.h
diff --git a/..._b9s_installer/source/fatfs/sdmmc/delay.s → ..._b9s_installer/source/fatfs/sdmmc/delay.s b/..._b9s_installer/source/fatfs/sdmmc/delay.s → ..._b9s_installer/source/fatfs/sdmmc/delay.s
diff --git a/..._b9s_installer/source/fatfs/sdmmc/sdmmc.c → ..._b9s_installer/source/fatfs/sdmmc/sdmmc.c b/..._b9s_installer/source/fatfs/sdmmc/sdmmc.c → ..._b9s_installer/source/fatfs/sdmmc/sdmmc.c
diff --git a/..._b9s_installer/source/fatfs/sdmmc/sdmmc.h → ..._b9s_installer/source/fatfs/sdmmc/sdmmc.h b/..._b9s_installer/source/fatfs/sdmmc/sdmmc.h → ..._b9s_installer/source/fatfs/sdmmc/sdmmc.h
diff --git a/mini_b9s_installer/source/font.h → _deprecated/mini_b9s_installer/source/font.h b/mini_b9s_installer/source/font.h → _deprecated/mini_b9s_installer/source/font.h
diff --git a/mini_b9s_installer/source/fs.c → _deprecated/mini_b9s_installer/source/fs.c b/mini_b9s_installer/source/fs.c → _deprecated/mini_b9s_installer/source/fs.c
diff --git a/mini_b9s_installer/source/fs.h → _deprecated/mini_b9s_installer/source/fs.h b/mini_b9s_installer/source/fs.h → _deprecated/mini_b9s_installer/source/fs.h
diff --git a/mini_b9s_installer/source/i2c.c → _deprecated/mini_b9s_installer/source/i2c.c b/mini_b9s_installer/source/i2c.c → _deprecated/mini_b9s_installer/source/i2c.c
diff --git a/mini_b9s_installer/source/i2c.h → _deprecated/mini_b9s_installer/source/i2c.h b/mini_b9s_installer/source/i2c.h → _deprecated/mini_b9s_installer/source/i2c.h
diff --git a/mini_b9s_installer/source/main.c → _deprecated/mini_b9s_installer/source/main.c b/mini_b9s_installer/source/main.c → _deprecated/mini_b9s_installer/source/main.c
diff --git a/mini_b9s_installer/source/memory.c → ...ecated/mini_b9s_installer/source/memory.c b/mini_b9s_installer/source/memory.c → ...ecated/mini_b9s_installer/source/memory.c
diff --git a/mini_b9s_installer/source/memory.h → ...ecated/mini_b9s_installer/source/memory.h b/mini_b9s_installer/source/memory.h → ...ecated/mini_b9s_installer/source/memory.h
diff --git a/mini_b9s_installer/source/screen.c → ...ecated/mini_b9s_installer/source/screen.c b/mini_b9s_installer/source/screen.c → ...ecated/mini_b9s_installer/source/screen.c
diff --git a/mini_b9s_installer/source/screen.h → ...ecated/mini_b9s_installer/source/screen.h b/mini_b9s_installer/source/screen.h → ...ecated/mini_b9s_installer/source/screen.h
diff --git a/mini_b9s_installer/source/start.s → ...recated/mini_b9s_installer/source/start.s b/mini_b9s_installer/source/start.s → ...recated/mini_b9s_installer/source/start.s
diff --git a/mini_b9s_installer/source/strings.c → ...cated/mini_b9s_installer/source/strings.c b/mini_b9s_installer/source/strings.c → ...cated/mini_b9s_installer/source/strings.c
diff --git a/mini_b9s_installer/source/strings.h → ...cated/mini_b9s_installer/source/strings.h b/mini_b9s_installer/source/strings.h → ...cated/mini_b9s_installer/source/strings.h
diff --git a/mini_b9s_installer/source/types.h → ...recated/mini_b9s_installer/source/types.h b/mini_b9s_installer/source/types.h → ...recated/mini_b9s_installer/source/types.h
diff --git a/mini_b9s_installer/source/utils.c → ...recated/mini_b9s_installer/source/utils.c b/mini_b9s_installer/source/utils.c → ...recated/mini_b9s_installer/source/utils.c
diff --git a/mini_b9s_installer/source/utils.h → ...recated/mini_b9s_installer/source/utils.h b/mini_b9s_installer/source/utils.h → ...recated/mini_b9s_installer/source/utils.h
diff --git a/_insert-file.bat b/_insert-file.bat
diff --git a/build.bat b/build.bat
@@ -0,0  1,5 @@
 cd ID1gen && make clean && make && cd..
 python id1gen.py
 cd usr2arm9ldr && make clean && make && cd ..
 cp usr2arm9ldr/build/arm9.bin out/b9
 pause
diff --git a/id1gen.bat b/id1gen.bat
diff --git a/id1gen.py b/id1gen.py
@@ -21,8  21,8 @@
 
 print("length of path: %d" % len(path))  #always be 32 chars
 
-os.mkdir(path)
 os.mkdir("out/" path)
 
-with open("haxID1_output.txt","w") as f:
 with open("out/haxID1_output.txt","w") as f:
 	f.write(path.encode('utf-16le').hex().upper())
 	f.write("\n\nTo be placed in var id1_haxstr, in mset9.py")
diff --git a/002F003A.txt → out/002F003A.txt b/002F003A.txt → out/002F003A.txt
diff --git a/out/b9 b/out/b9
diff --git a/usr2arm9ldr b/usr2arm9ldr
2 −0		.gitignore
0 −46		arm9/source/petitfs/00readme.txt
0 −96		arm9/source/petitfs/diskio.c
0 −42		arm9/source/petitfs/diskio.h
0 −33		arm9/source/petitfs/integer.h
0 −1,108		arm9/source/petitfs/pff.c
0 −159		arm9/source/petitfs/pff.h
0 −89		arm9/source/petitfs/pffconf.h
0 −5		arm9/source/petitfs/sdmmc/delay.h
0 −16		arm9/source/petitfs/sdmmc/delay.s
0 −482		arm9/source/petitfs/sdmmc/sdmmc.c
0 −100		arm9/source/petitfs/sdmmc/sdmmc.h