Merge remote-tracking branch 'origin/master' into mcuev

refactors all the ugly "pendingX" atomic operations into a single "Event" subsystem/interface thing with two operations

moves all existing code to use this instead

also changes the "bkpt" macro to also indicate unreachable code

.github/workflows/ci.yml

@@ -4,8 +4,8 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    container: devkitpro/devkitarm
+    runs-on: ubuntu-18.04
+    container: devkitpro/devkitarm:latest
 
     steps:
       - uses: actions/checkout@v1
@@ -23,20 +23,21 @@ jobs:
           apt-get -y install python3 python3-pip p7zip-full libarchive13
           python3 --version
           python3 -m pip install --upgrade pip setuptools
-          python3 -m pip install cryptography git+https://github.com/TuxSH/firmtool.git
+          python3 -m pip install cryptography
+          python3 -m pip install git+https://github.com/TuxSH/firmtool.git
 
       - name: Build Project
-        run: make release -j$(nproc)
+        run: make release
 
       - name: Prepare build artifact
-        working-directory: release
         run: |
+          cd release
           ZIPNAME=$(ls GodMode9-*.zip)
           rm $ZIPNAME
           echo "OUTNAME=${ZIPNAME%.zip}" >> $GITHUB_ENV
+          cd ..
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ env.OUTNAME }}
           path: release/*
-          if-no-files-found: error

.gitignore

@@ -5,7 +5,6 @@
 *.obj
 *.elf
 *.map
-*.dis
 
 # Precompiled Headers
 *.gch
@@ -36,14 +35,10 @@
 
 # OS leftovers
 desktop.ini
-.DS_Store
 
 # Sublime files
 *.sublime-*
 
-# Visual Studio Code files
-.vscode
-
 # Build directories
 /build
 /output
@@ -53,6 +48,6 @@ desktop.ini
 /data/README_internal.md
 
 # User additions
+/data/aeskeydb.bin
+/data/aeskeydb_.bin
 /zzz_backup
-/arm9/source/language.inl
-*.trf

Makefile

@@ -16,28 +16,15 @@ export RELDIR := release
 export COMMON_DIR := ../common
 
 # Definitions for initial RAM disk
-VRAM_TAR    := $(OUTDIR)/vram0.tar
-VRAM_DATA   := data/*
-VRAM_FLAGS  := --make-new --path-limit 99
-ifeq ($(NTRBOOT),1)
-	VRAM_SCRIPTS := resources/gm9/scripts/*
-endif
-
-# Definitions for translation files
-JSON_FOLDER    := resources/languages
-TRF_FOLDER     := resources/gm9/languages
-
-SOURCE_JSON    := $(JSON_FOLDER)/source.json
-LANGUAGE_INL   := arm9/source/language.inl
-
-JSON_FILES     := $(filter-out $(SOURCE_JSON),$(wildcard $(JSON_FOLDER)/*.json))
-TRF_FILES      := $(subst $(JSON_FOLDER),$(TRF_FOLDER),$(JSON_FILES:.json=.trf))
+VRAM_OUT    := $(OUTDIR)/vram0.tar
+VRAM_DATA   := data
+VRAM_FLAGS  := --make-new --path-limit 99 --size-limit 262144
 
 ifeq ($(OS),Windows_NT)
 	ifeq ($(TERM),cygwin)
 		PY3 := py -3 # Windows / CMD/PowerShell
 	else
-		PY3 := py # Windows / MSYS2
+		PY3 := python3 # Windows / MSYS2
 	endif
 else
 	PY3 := python3 # Unix-like
@@ -50,18 +37,18 @@ export ASFLAGS := -g -x assembler-with-cpp $(INCLUDE)
 export CFLAGS  := -DDBUILTS="\"$(DBUILTS)\"" -DDBUILTL="\"$(DBUILTL)\"" -DVERSION="\"$(VERSION)\"" -DFLAVOR="\"$(FLAVOR)\"" \
                   -g -Os -Wall -Wextra -Wcast-align -Wformat=2 -Wno-main \
                   -fomit-frame-pointer -ffast-math -std=gnu11 -MMD -MP \
-                  -Wno-unused-function -Wno-format-truncation -Wno-format-nonliteral $(INCLUDE) -ffunction-sections -fdata-sections
+                  -Wno-unused-function -Wno-format-truncation $(INCLUDE) -ffunction-sections -fdata-sections
 export LDFLAGS := -Tlink.ld -nostartfiles -Wl,--gc-sections,-z,max-page-size=4096
-ELF := arm9/arm9_code.elf arm9/arm9_data.elf arm11/arm11.elf
+ELF := arm9/arm9.elf arm11/arm11.elf
 
-.PHONY: all firm $(VRAM_TAR) elf release clean
+.PHONY: all firm vram0 elf release clean
 all: firm
 
 clean:
 	@set -e; for elf in $(ELF); do \
 	    $(MAKE) --no-print-directory -C $$(dirname $$elf) clean; \
 	done
-	@rm -rf $(OUTDIR) $(RELDIR) $(FIRM) $(FIRMD) $(VRAM_TAR) $(LANGUAGE_INL) $(TRF_FILES)
+	@rm -rf $(OUTDIR) $(RELDIR) $(FIRM) $(FIRMD) $(VRAM_OUT)
 
 unmarked_readme: .FORCE
 	@$(PY3) utils/unmark.py -f README.md data/README_internal.md
@@ -85,44 +72,29 @@ release: clean unmarked_readme
 	@cp $(OUTDIR)/$(FLAVOR)_dev.firm.sha $(RELDIR)/
 	@cp $(ELF) $(RELDIR)/elf
 	@cp $(CURDIR)/README.md $(RELDIR)
-	@cp $(CURDIR)/resources/lua-doc.md $(RELDIR)/lua-doc.md
 	@cp -R $(CURDIR)/resources/gm9 $(RELDIR)/gm9
 	@cp -R $(CURDIR)/resources/sample $(RELDIR)/sample
 
 	@-7za a $(RELDIR)/$(FLAVOR)-$(VERSION)-$(DBUILTS).zip ./$(RELDIR)/*
 
-$(VRAM_TAR): $(SPLASH) $(OVERRIDE_FONT) $(VRAM_DATA) $(VRAM_SCRIPTS)
-	@mkdir -p "$(@D)"
-	@echo "Creating $@"
-	@$(PY3) utils/add2tar.py $(VRAM_FLAGS) $(VRAM_TAR) $(shell ls -d -1 $^)
-
-$(LANGUAGE_INL): $(SOURCE_JSON)
-	@echo "Creating $@"
-	@$(PY3) utils/transcp.py $< $@
-
-$(TRF_FOLDER)/%.trf: $(JSON_FOLDER)/%.json
-	@$(PY3) utils/transriff.py $< $@
+vram0:
+	@mkdir -p "$(OUTDIR)"
+	@echo "Creating $(VRAM_OUT)"
+	@$(PY3) utils/add2tar.py $(VRAM_FLAGS) $(VRAM_OUT) $(shell ls -d $(SPLASH) $(OVERRIDE_FONT) $(VRAM_DATA)/*)
 
 %.elf: .FORCE
 	@echo "Building $@"
-	@$(MAKE) --no-print-directory -C $(@D) $(@F)
+	@$(MAKE) --no-print-directory -C $(@D)
 
-# Indicate a few explicit dependencies:
-# The ARM9 data section depends on the VRAM drive
-arm9/arm9_data.elf: $(VRAM_TAR) $(LANGUAGE_INL)
-# And the code section depends on the data section being built already
-arm9/arm9_code.elf: arm9/arm9_data.elf
-
-firm: $(ELF) $(TRF_FILES)
+firm: $(ELF) vram0
+	@test `wc -c <$(VRAM_OUT)` -le 262144
 	@mkdir -p $(call dirname,"$(FIRM)") $(call dirname,"$(FIRMD)")
 	@echo "[FLAVOR] $(FLAVOR)"
 	@echo "[VERSION] $(VERSION)"
 	@echo "[BUILD] $(DBUILTL)"
 	@echo "[FIRM] $(FIRM)"
-	@$(PY3) -m firmtool build $(FIRM) $(FTFLAGS) -g -D $(ELF) -C NDMA NDMA XDMA
+	@$(PY3) -m firmtool build $(FIRM) $(FTFLAGS) -g -A 0x80C0000 -D $(ELF) $(VRAM_OUT) -C NDMA XDMA memcpy
 	@echo "[FIRM] $(FIRMD)"
-	@$(PY3) -m firmtool build $(FIRMD) $(FTDFLAGS) -g -D $(ELF) -C NDMA NDMA XDMA
-
-vram0: $(VRAM_TAR) .FORCE # legacy target name
+	@$(PY3) -m firmtool build $(FIRMD) $(FTDFLAGS) -g -A 0x80C0000 -D $(ELF) $(VRAM_OUT)  -C NDMA XDMA memcpy
 
 .FORCE:

Makefile.build

@@ -1,6 +1,4 @@
 
-LIBS ?= 
-
 OBJECTS := $(patsubst $(SOURCE)/%.s, $(BUILD)/%.o, \
           $(patsubst $(SOURCE)/%.c, $(BUILD)/%.o, \
           $(call rwildcard, $(SOURCE), *.s *.c)))
@@ -13,12 +11,11 @@ all: $(TARGET).elf
 
 .PHONY: clean
 clean:
-	@rm -rf $(BUILD) $(TARGET).elf $(TARGET).dis $(TARGET).map
+	@rm -rf $(BUILD) $(TARGET).elf $(TARGET).map
 
 $(TARGET).elf: $(OBJECTS) $(OBJECTS_COMMON)
 	@mkdir -p "$(@D)"
-	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
-	@$(OBJDUMP) -S -h $@ > $@.dis
+	@$(CC) $(LDFLAGS) $^ -o $@
 
 $(BUILD)/%.cmn.o: $(COMMON_DIR)/%.c
 	@mkdir -p "$(@D)"

Makefile.common

@@ -1,4 +1,3 @@
-export OBJDUMP	:=	arm-none-eabi-objdump
 
 dirname   = $(shell dirname $(1))
 
@@ -26,12 +25,6 @@ else ifeq ($(FLAVOR),ZuishMode9)
     CFLAGS += -DDEFAULT_FONT=\"font_zuish_8x8.pbm\"
 endif
 
-ifeq ($(LARGEDLC),1)
-    CFLAGS += -DTITLE_MAX_CONTENTS=1536
-else
-    CFLAGS += -DTITLE_MAX_CONTENTS=1024
-endif
-
 ifeq ($(SALTMODE),1)
     CFLAGS += -DSALTMODE
 endif
@@ -68,10 +61,6 @@ ifdef SD_TIMEOUT
     CFLAGS += -DSD_TIMEOUT=$(SD_TIMEOUT)
 endif
 
-ifeq ($(NO_LUA),1)
-    CFLAGS += -DNO_LUA
-endif
-
 ifdef N_PANES
     CFLAGS += -DN_PANES=$(N_PANES)
 endif

README.md

@@ -39,9 +39,9 @@ GodMode9 is designed to be intuitive, buttons leading to the results you'd expec
 ## How to build this / developer info
 Build `GodMode9.firm` via `make firm`. This requires [firmtool](https://github.com/TuxSH/firmtool), [Python 3.5+](https://www.python.org/downloads/) and [devkitARM](https://sourceforge.net/projects/devkitpro/) installed).
 
-You may run `make release` to get a nice, release-ready package of all required files. To build __SafeMode9__ (a bricksafe variant of GodMode9, with limited write permissions) instead of GodMode9, compile with `make FLAVOR=SafeMode9`. To switch screens, compile with `make SWITCH_SCREENS=1`. For additional customization, you may choose the internal font by replacing `font_default.frf` inside the `data` directory. You may also hardcode the brightness via `make FIXED_BRIGHTNESS=x`, whereas `x` is a value between 0...15.
+You may run `make release` to get a nice, release-ready package of all required files. To build __SafeMode9__ (a bricksafe variant of GodMode9, with limited write permissions) instead of GodMode9, compile with `make FLAVOR=SafeMode9`. To switch screens, compile with `make SWITCH_SCREENS=1`. For additional customization, you may choose the internal font by replacing `font_default.pbm` inside the `data` directory. You may also hardcode the brightness via `make FIXED_BRIGHTNESS=x`, whereas `x` is a value between 0...15.
 
-Further customization is possible by hardcoding `aeskeydb.bin` (just put the file into the `data` folder when compiling). All files put into the `data` folder will turn up in the `V:` drive, but keep in mind there's a hard 223.5KiB limit for all files inside, including overhead. A standalone script runner is compiled by providing `autorun.lua` or `autorun.gm9` (again, in the `data` folder) and building with `make SCRIPT_RUNNER=1`. There's more possibility for customization, read the Makefiles to learn more.
+Further customization is possible by hardcoding `aeskeydb.bin` (just put the file into the `data` folder when compiling). All files put into the `data` folder will turn up in the `V:` drive, but keep in mind there's a hard 3MB limit for all files inside, including overhead. A standalone script runner is compiled by providing `autorun.gm9` (again, in the `data` folder) and building with `make SCRIPT_RUNNER=1`. There's more possibility for customization, read the Makefiles to learn more.
 
 To build a .firm signed with SPI boot keys (for ntrboot and the like), run `make NTRBOOT=1`. You may need to rename the output files if the ntrboot installer you use uses hardcoded filenames. Some features such as boot9 / boot11 access are not currently available from the ntrboot environment.
 
@@ -61,14 +61,10 @@ GodMode9 provides a write permissions system, which will protect you from accide
 
 ## Support files
 For certain functionality, GodMode9 may need 'support files'. Support files should be placed into either `0:/gm9/support` or `1:/gm9/support`. Support files contain additional information that is required in decryption operations. A list of support files, and what they do, is found below. Please don't ask for support files - find them yourself.
-* __`aeskeydb.bin`__: This should contain 0x25keyX, 0x18keyX and 0x1BkeyX to enable decryption of 7x / Secure3 / Secure4 encrypted NCCH files, 0x11key95 / 0x11key96 for FIRM decrypt support and 0x11keyOTP / 0x11keyIVOTP for 'secret' sector 0x96 crypto support. Entrypoints other than [boot9strap](https://github.com/SciresM/boot9strap) or [fastboot3ds](https://github.com/derrekr/fastboot3DS) may require a aeskeydb.bin file. This is now included in standard releases of GM9. No need to hunt down the file!
-* __`seeddb.bin`__: This file is optional and required to decrypt and mount seed-encrypted NCCHs and CIAs (if the seed in question is not installed to your NAND). Note that your seeddb.bin must also contain the seed for the specific game you need to decrypt.
-* __`encTitleKeys.bin`__ / __`decTitleKeys.bin`__: These files are optional and provide titlekeys, which are required to decrypt and install contents downloaded from CDN (for DSi and 3DS content).
+* __`aeskeydb.bin`__: This should contain 0x25keyX, 0x18keyX and 0x1BkeyX to enable decryption of 7x / Secure3 / Secure4 encrypted NCCH files, 0x11key95 / 0x11key96 for FIRM decrypt support and 0x11keyOTP / 0x11keyIVOTP for 'secret' sector 0x96 crypto support. Entrypoints other than [boot9strap](https://github.com/SciresM/boot9strap) or [fastboot3ds](https://github.com/derrekr/fastboot3DS) may require a aeskeydb.bin file. A known perfect `aeskeydb.bin` can be found somewhere on the net, is exactly 1024 byte big and has an MD5 of A5B28945A7C051D7A0CD18AF0E580D1B. Have fun hunting!
+* __`seeddb.bin`__: This file is required to decrypt and mount seed encrypted NCCHs and CIAs if the seed in question is not installed to your NAND. Note that your seeddb.bin must also contain the seed for the specific game you need to decrypt.
+* __`encTitleKeys.bin`__ / __`decTitleKeys.bin`__: These files are optional and provide titlekeys, which are required to create updatable CIAs from NCCH / NCSD files. CIAs created without these files will still work, but won't be updatable from eShop.
 
-### Fonts and translations
-GodMode9 also supports custom fonts and translations as support files. These both use custom formats, fonts use FRF (Font RIFF) files which can be created using the `fontriff.py` Python script in the 'utils' folder. Translations use TRF (Translation RIFF) files from the `transriff.py` script. Examples of the inputs to these scripts can be found in the 'fonts' and 'languages' folders of the 'resources' folder respectively.
-
-TRF files can be placed in `0:/gm9/languages` to show in the language menu accessible from the HOME menu and shown on first load. Official translations are provided from the community via the [GodMode9 Crowdin](https://crowdin.com/project/GodMode9). Languages can use a special font by having an FRF with the same name, for example `en.trf` and `en.frf`.
 
 ## Drives in GodMode9
 GodMode9 provides access to system data via drives, a listing of what each drive contains and additional info follows below. Some of these drives are removable (such as drive `7:`), some will only turn up if they are available (drive `8:` and everything associated with EmuNAND, f.e.). Information on the 3DS console file system is also found on [3Dbrew.org](https://3dbrew.org/wiki/Flash_Filesystem).
@@ -90,10 +86,9 @@ GodMode9 provides access to system data via drives, a listing of what each drive
 * __`C: GAMECART`__: This is read-only and provides access to the game cartridge currently inserted into the cart slot. This can be used for dumps of CTR and TWL mode cartridges. Flash cards are supported only to a limited extent.
 * __`G: GAME IMAGE`__: CIA/NCSD/NCCH/EXEFS/ROMFS/FIRM images can be accessed via this drive when mounted. This is read-only.
 * __`K: AESKEYDB IMAGE`__: An `aeskeydb.bin` image can be mounted and accessed via this drive. The drive shows all keys inside the aeskeydb.bin. This is read-only.
-* __`T: TICKET.DB IMAGE / BDRI IMAGE`__: Ticket database files can be mounted and accessed via this drive. This provides easy and quick access to all tickets inside the `ticket.db`. This drive also provides access to other BDRI images, such as the Title database (`title.db`).
+* __`T: TICKET.DB IMAGE`__: Ticket database files can be mounted and accessed via this drive. This provides easy and quick access to all tickets inside the `ticket.db`. This is read-only.
 * __`M: MEMORY VIRTUAL`__: This provides access to various memory regions. This is protected by a special write permission, and caution is advised when doing modifications inside this drive. This drive also gives access to `boot9.bin`, `boot11.bin` (boot9strap only) and `otp.mem` (sighaxed systems only).
-* __`V: VRAM VIRTUAL`__: This drive resides in part of ARM9 internal memory and contains files essential to GodMode9. The font (in FRF format), the splash logo (in PNG format) and the readme file are found there, as well as any file that is provided inside the `data` folder at build time. This is read-only.
-* __`Y: TITLE MANAGER`__: The title manager is accessed via the HOME menu and provides easy access to all installed titles.
+* __`V: VRAM VIRTUAL`__: This drive resides in the first VRAM bank and contains files essential to GodMode9. The font (in PBM format), the splash logo (in PNG format) and the readme file are found there, as well as any file that is provided inside the `data` folder at build time. This is read-only.
 * __`Z: LAST SEARCH`__: After a search operation, search results are found inside this drive. The drive can be accessed at a later point to return to the former search results.
 
 
@@ -101,8 +96,8 @@ GodMode9 provides access to system data via drives, a listing of what each drive
 GodMode9 is one of the most important tools for digital preservation of 3DS content data. Here's some stuff you should know:
 * __Dumping game cartridges (size < 4GiB)__: Game cartridges turn up inside the `C:` drive (see above). For most carts all you need to do is copy the `.3DS` game image to some place of your choice. Game images dumped by GodMode9 contain no identifying info such as private headers or savegames. Private headers can be dumped in a separate image.
 * __Dumping game cartridges (size = 4GiB)__: Everything written above applies here as well. However, the FAT32 file system (which is what the 3DS uses) is limited to _4GiB - 1byte_. Take note that the `.3DS` game image, as provided by GodMode9 actually misses the last byte in these cases. That byte is 0xFF and unused in all known cases. It is not required for playing the image. If you need to check, we also provide split files (`.000`, `.001)`, which contain all the data. If you need a valid checksum for the `.3DS` game image, append a 0xFF byte before checking.
-* __Building CIAs (all types)__: You may convert compatible file types (game images, installed content, CDN content) to the CIA installable format using the A button menu. To get a list of installed content, press HOME, select `Title manager` and choose a drive. Take note that `standard` built CIAs are decrypted by default (decryption allows better compression by ZIP and 7Z). If you should need an encrypted CIA for some reason, apply the encryption to the CIA afterwards.
-* __Building CIAs (legit type)__: Installed content can be built as `legit` or `standard` CIA. Legit CIAs preserve more of the original data and are thus recommended for preservation purposes. When building legit CIAs, GodMode9 keeps the original crypto and tries to find a genuine, signature-valid ticket. If it doesn't find one on your system, it will use a generic ticket instead. If it only finds a personalized one, it still offers to use a generic ticket. It is not recommended to use personalized tickets - only choose this if you know what you're doing.
+* __Building CIAs (all types)__: You may convert compatible file types (game images, installed content) to the CIA installable format using the A button menu. To get a list of installed content, press R+A on one of the compatible drives (`1:`, `2:`, `A:`, ...) and select `Search for titles`. Take note that `standard` built CIAs are decrypted by default (decryption allows better compression by ZIP and 7Z). If you should need an encrypted CIA for some reason, apply the encryption to the CIA afterwards.
+* __Building CIAs (legit type)__: Installed content can be built as `legit` or `standard` CIA. Legit CIAs preserve more of the original data and are thus recommended for preservation purposes. When building legit CIAs, GodMode9 keeps the original crypto and tries to find a genuine, signature-valid ticket. If it doesn't find one on your system or if it only finds a personalized one, it offers to use a generic ticket instead. It is not recommended to use personalized tickets - only choose this if you know what you're doing.
 * __Checking CIAs__: You may also check your CIA files with the builtin `CIA checker tool`. Legit CIAs with generic tickets are identified as `Universal Pirate Legit`, which is the recommended preservation format where `Universal Legit` is not available. Note: apart from system titles, `Universal Legit` is only available for a handful of preinstalled games from special edition 3DS consoles.
 
 
@@ -122,9 +117,8 @@ With the possibilites GodMode9 provides, not everything may be obvious at first
 * __Inject a file to another file__: Put exactly one file (the file to be injected from) into the clipboard (via the Y button). Press A on the file to be injected to. There will be an option to inject the first file into it.
 
 ### Scripting functionality
-* __Run .lua scripts from anywhere on your SD card__: You can run Lua scripts via the A button menu. For an overview of usable commands have a look into the documentation and sample scripts included in the release archive. *Don't run scripts from untrusted sources.*
-* __Run Lua scripts via a neat menu__: Press the HOME button, select `More...` -> `Lua scripts...`. Any script you put into `0:/gm9/luascripts` (subdirs included) will be found here. Scripts ran via this method won't have the confirmation at the beginning either.
-* __Run legacy .gm9 scripts__: The old format of .gm9 scripts is still available, but is deprecated and will see no further development.
+* __Run .gm9 scripts from anywhere on your SD card__: You can run scripts in .gm9 format via the A button menu. .gm9 scripts use a shell-like language and can be edited in any text editor. For an overview of usable commands have a look into the sample scripts included in the release archive. *Don't run scripts from untrusted sources.*
+* __Run .gm9 scripts via a neat menu__: Press the HOME button, select `More...` -> `Scripts...`. Any script you put into `0:/gm9/scripts` (subdirs included) will be found here. Scripts ran via this method won't have the confirmation at the beginning either.
 
 ### SD card handling
 * __Format your SD card / setup an EmuNAND__: Press the HOME button, select `More...` -> `SD format menu`. This also allows to setup a RedNAND (single/multi) or GW type EmuNAND on your SD card. You will get a warning prompt and an unlock sequence before any operation starts.
@@ -134,17 +128,15 @@ With the possibilites GodMode9 provides, not everything may be obvious at first
 * __Set (and use) the RTC clock__: For correct modification / creation dates in your file system, you need to setup the RTC clock first. Press the HOME Button and select `More...` to find the option. Keep in mind that modifying the RTC clock means you should also fix system OS time afterwards.
 
 ### Game file handling
-* __List titles installed on your system__: Press HOME and select `Title manager`. This will also work via R+A for `CTRNAND` and `A:`/`B:` drives. This will list all titles installed in the selected location.
-* __Install titles to your system__: Just press A on any file you want installed and select `Install game image` from the submenu. Works with NCCH / NCSD / CIA / DSiWare SRLs / 3DS CDN TMDs / DSi CDN TMDs / NUS TMDs.
-* __(Batch) Uninstall titles from your system__: Most easily done via the HOME menu `Title manager`. Just select one or more titles and find the option inside the `Manage title...` submenu.
-* __Build CIAs from NCCH / NCSD (.3DS) / SRL / TMD__: Press A on the file you want converted and the option will be shown. Installed contents are found most easily via the HOME menu `Title manager`. Where applicable, you will also be able to generate legit CIAs. Note: this works also from a file search and title listing.
+* __List titles installed on your system__: Press R+A on a /title dir or a subdir below that. This will also work directly for `CTRNAND`, `TWLN` and `A:`/`B:` drives. This will list all titles installed in the selected location. Works best with the below two features.
+* __Build CIAs from NCCH / NCSD (.3DS) / TMD (installed contents)__: Press A on the file you want converted and the option will be shown. Installed contents are found (among others) in `1:/titles/`(SysNAND) and `A:/titles/`(SD installed). Where applicable, you will also be able to generate legit CIAs. Note: this works also from a file search and title listing.
 * __Dump CXIs / NDS from TMD (installed contents)__: This works the same as building CIAs, but dumps decrypted CXIs or NDS rom dumps instead. Note: this works also from a file search and title listing.
 * __Decrypt, encrypt and verify NCCH / NCSD / CIA / BOSS / FIRM images__: Options are found inside the A button menu. You will be able to decrypt/encrypt to the standard output directory or (where applicable) in place.
 * __Decrypt content downloaded from CDN / NUS__: Press A on the file you want decrypted. For this to work, you need at least a TMD file (`encTitlekeys.bin` / `decTitlekeys.bin` also required, see _Support files_ below) or a CETK file. Either keep the names provided by CDN / NUS, or rename the downloaded content to `(anything).nus` or `(anything).cdn` and the CETK to `(anything).cetk`.
 * __Batch mode for the above operations__: Just select multiple files of the same type via the L button, then press the A button on one of the selected files.
 * __Access any file inside NCCH / NCSD / CIA / FIRM / NDS images__: Just mount the file via the A button menu and browse to the file you want. For CDN / NUS content, prior decryption is required for full access.
 * __Rename your NCCH / NCSD / CIA / NDS / GBA files to proper names__: Find this feature inside the A button menu. Proper names include title id, game name, product code and region.
-* __Trim NCCH / NCSD / NDS / GBA / FIRM / NAND images__: This feature is found inside the A button menu. It allows you to trim excess data from supported file types. *Warning: Excess data may not be empty, bonus drives are stored there for NAND images, NCSD card2 images store savedata there, for FIRMs parts of the A9LH exploit may be stored there*.
+* __Trim NCCH / NCSD / NDS / FIRM / NAND images__: This feature is found inside the A button menu. It allows you to trim excess data from supported file types. *Warning: Excess data may not be empty, bonus drives are stored there for NAND images, NCSD card2 images store savedata there, for FIRMs parts of the A9LH exploit may be stored there*.
 * __Dump 3DS / NDS / DSi type retail game cartridges__: Insert the cartridge and take a look inside the `C:` drive. You may also dump private headers from 3DS game cartridges. The `C:` drive also gives you read/write access to the saves on the cartridges. Note: For 4GiB cartridges, the last byte is not included in the .3ds file dump. This is due to restrictrions of the FAT32 file system.
 
 ### NAND handling
@@ -162,7 +154,7 @@ With the possibilites GodMode9 provides, not everything may be obvious at first
 * __Check and fix CMACs (for any file that has them)__: The option will turn up in the A button menu if it is available for a given file (f.e. system savegames, `ticket.db`, etc...). This can also be done for multiple files at once if they are marked.
 * __Mount ticket.db files and dump tickets__: Mount the file via the A button menu. Tickets are sorted into `eshop` (stuff from eshop), `system` (system tickets), `unknown` (typically empty) and `hidden` (hidden tickets, found via a deeper scan) categories. All tickets displayed are legit, fake tickets are ignored
 * __Inject any NCCH CXI file into Health & Safety__: The option is found inside the A button menu for any NCCH CXI file. NCCH CXIs are found, f.e. inside of CIAs. Keep in mind there is a (system internal) size restriction on H&S injectable apps.
-* __Inject and dump GBA VC saves__: Find the options to do this inside the A button menu for `agbsave.bin` in the `S:` drive. Keep in mind that you need to start the specific GBA game on your console before dumping / injecting the save. _To inject a save it needs to be in the clipboard_.
+* __Inject and dump GBA VC saves__: Find the options to do this inside the A button menu for `agbsave.bin` in the `S:` drive. Keep in mind that you need to start the specific GBA game on your console before dumping / injecting the save.
 * __Dump a copy of boot9, boot11 & your OTP__: This works on sighax, via boot9strap only. These files are found inside the `M:` drive and can be copied from there to any other place.
 
 ### Support file handling
@@ -173,8 +165,6 @@ With the possibilites GodMode9 provides, not everything may be obvious at first
 ## License
 You may use this under the terms of the GNU General Public License GPL v2 or under the terms of any later revisions of the GPL. Refer to the provided `LICENSE.txt` file for further information.
 
-## Contact info
-You can chat directly with us via IRC @ #GodMode9 on [libera.chat](https://web.libera.chat/#GodMode9) or [Discord](https://discord.gg/BRcbvtFxX4)!
 
 ## Credits
 This tool would not have been possible without the help of numerous people. Thanks go to (in no particular order)...
@@ -184,13 +174,9 @@ This tool would not have been possible without the help of numerous people. Than
 * **Wolfvak** for ARM11 code, FIRM binary launcher, exception handlers, PCX code, Makefile and for help on countless other occasions
 * **SciresM** for helping me figure out RomFS and for boot9strap
 * **SciresM**, **Myria**, **Normmatt**, **TuxSH** and **hedgeberg** for figuring out sighax and giving us access to bootrom
-* **ihaveamac** for implementing Lua support, and first developing the simple CIA generation method and for being of great help in porting it
-* **DarkRTA** for linker support during the implementation of Lua
-* **luigoalma** for fixing Lua to compile without issues
-* **Gruetzig** for re-implementing the Lua os module
+* **ihaveamac** for first developing the simple CIA generation method and for being of great help in porting it
 * **wwylele** and **aspargas2** for documenting and implementing the DISA, DIFF, and BDRI formats
 * **dratini0** for savefile management, based on [TWLSaveTool](https://github.com/TuxSH/TWLSaveTool/)
-* **Pk11** for unicode support and her ongoing work on GodMode9 translations and translation support
 * **b1l1s** for helping me figure out A9LH compatibility
 * **Gelex** and **AuroraWright** for helping me figure out various things
 * **stuckpixel** for the new 6x10 font and help on various things
@@ -199,16 +185,14 @@ This tool would not have been possible without the help of numerous people. Than
 * **profi200** for always useful advice and helpful hints on various things
 * **windows-server-2003** for the initial implementation of if-else-goto in .gm9 scripts
 * **Kazuma77** for pushing forward scripting, for testing and for always useful advice
-* **TurdPooCharger** for being one of the most meticulous software testers around
 * **JaySea**, **YodaDaCoda**, **liomajor**, **Supster131**, **imanoob**, **Kasher_CS** and countless others from freenode #Cakey and the GBAtemp forums for testing, feedback and helpful hints
 * **Shadowhand** for being awesome and [hosting my nightlies](https://d0k3.secretalgorithm.com/)
 * **Plailect** for putting his trust in my tools and recommending this in [The Guide](https://3ds.guide/)
-* **SirNapkin1334** for testing, bug reports and for hosting the original GodMode9 Discord server
+* **SirNapkin1334** for testing, bug reports and for hosting the official [GodMode9 Discord channel](https://discord.gg/EGu6Qxw)
 * **Lilith Valentine** for testing and helpful advice
 * **Project Nayuki** for [qrcodegen](https://github.com/nayuki/QR-Code-generator)
 * **Amazingmax fonts** for the Amazdoom font
-* **TakWolf** for [fusion-pixel-font](https://github.com/TakWolf/fusion-pixel-font) used for Chinese and Korean
-* The fine folks on **the official GodMode9 IRC channel and Discord server**
+* The fine folks on **the official GodMode9 Discord**
 * The fine folks on **freenode #Cakey**
 * All **[3dbrew.org](https://www.3dbrew.org/wiki/Main_Page) editors**
-* Everyone I possibly forgot, if you think you deserve to be mentioned, just contact us!
+* Everyone I possibly forgot, if you think you deserve to be mentioned, just contact me!

arm11/Makefile

@@ -1,6 +1,6 @@
 PROCESSOR := ARM11
 
-TARGET := $(shell basename "$(CURDIR)")
+TARGET := $(shell basename $(CURDIR))
 
 SOURCE := source
 BUILD  := build
@@ -11,7 +11,7 @@ INCLUDE := $(foreach dir,$(INCDIRS),-I"$(shell pwd)/$(dir)")
 
 ASFLAGS += $(SUBARCH) $(INCLUDE)
 CFLAGS  += $(SUBARCH) $(INCLUDE) -flto
-LDFLAGS += $(SUBARCH) -Wl,--use-blx,-Map,$(TARGET).map -flto
+LDFLAGS += $(SUBARCH) -Wl,-Map,$(TARGET).map -flto
 
 include ../Makefile.common
 include ../Makefile.build

arm11/link.ld

@@ -16,7 +16,7 @@ SECTIONS
         __text_va = ABSOLUTE(.);
         *(.text*)
         . = ALIGN(4K);
-        __text_va_end = .;
+        __text_len = . - __text_va;
     } >AXIWRAM
 
     .data : ALIGN(4K)
@@ -25,7 +25,7 @@ SECTIONS
         __data_va = ABSOLUTE(.);
         *(.data*)
         . = ALIGN(4K);
-        __data_va_end = .;
+        __data_len = . - __data_va;
     } >AXIWRAM
 
     .rodata : ALIGN(4K)
@@ -34,7 +34,7 @@ SECTIONS
         __rodata_va = ABSOLUTE(.);
         *(.rodata*)
         . = ALIGN(4K);
-        __rodata_va_end = .;
+        __rodata_len = . - __rodata_va;
     } >AXIWRAM
 
     .shared (NOLOAD) : ALIGN(4K)
@@ -43,7 +43,7 @@ SECTIONS
         __shared_va = ABSOLUTE(.);
         *(.shared*)
         . = ALIGN(4K);
-        __shared_va_end = .;
+        __shared_len = . - __shared_va;
     } >AXIWRAM
 
     .bss (NOLOAD) : ALIGN(4K)
@@ -52,6 +52,6 @@ SECTIONS
         __bss_va = ABSOLUTE(.);
         *(.bss*)
         . = ALIGN(4K);
-        __bss_va_end = .;
+        __bss_len = . - __bss_va;
     } >AXIWRAM
 }

arm11/source/boot.s

@@ -76,12 +76,10 @@ __boot:
     b 1b
 
 corezero_start:
-    @ assumes the .bss section size is 128 byte aligned (or zero)
+    @ assume __bss_len is 128 byte aligned
     ldr r0, =__bss_pa
-    ldr r1, =__bss_va_end   @ calculate the length of .bss using the VA start and end
-    ldr r2, =__bss_va
-    sub r1, r1, r2
-    add r1, r0, r1          @ fixup to be PA start and end
+    ldr r1, =__bss_len
+    add r1, r0, r1
     mov r2, #0
     mov r3, #0
     mov r4, #0

arm11/source/hw/mcu.c

@@ -22,8 +22,6 @@
 
 #include <stdatomic.h>
 
-#include "common.h"
-
 #include "arm/timer.h"
 
 #include "hw/gpio.h"
@@ -118,13 +116,16 @@ u32 mcuGetSpecialHID(void)
 
 void mcuSetStatusLED(u32 period_ms, u32 color)
 {
-	u32 r, g, b, delay;
+	u32 r, g, b;
 	mcuStatusLED ledState;
 
-	delay = clamp((period_ms * 0x200) / 1000, 1, 0xFF);
+	// handle proper non-zero periods
+	// so small the hardware can't handle it
+	if (period_ms != 0 && period_ms < 63)
+		period_ms = 63;
 
-	ledState.delay = delay;
-	ledState.smoothing = delay;
+	ledState.delay = (period_ms * 0x10) / 1000;
+	ledState.smoothing = 0x40;
 	ledState.loop_delay = 0x10;
 	ledState.unk = 0;
 

arm11/source/main.c

@@ -33,7 +33,7 @@
 #include "system/sys.h"
 #include "system/event.h"
 
-static const u8 brightness_lvls[] = {
+static const u8 brLvlTbl[] = {
 	0x10, 0x17, 0x1E, 0x25,
 	0x2C, 0x34, 0x3C, 0x44,
 	0x4D, 0x56, 0x60, 0x6B,
@@ -41,8 +41,8 @@ static const u8 brightness_lvls[] = {
 };
 
 #ifndef FIXED_BRIGHTNESS
-static int prev_bright_lvl;
-static bool auto_brightness;
+static int oldBrLvl;
+static bool autoBr;
 #endif
 
 static SystemSHMEM __attribute__((section(".shared"))) sharedMem;
@@ -53,10 +53,10 @@ static void vblankUpdate(void)
 		return;
 
 	#ifndef FIXED_BRIGHTNESS
-	int cur_bright_lvl = (mcuGetVolumeSlider() >> 2) % countof(brightness_lvls);
-	if ((cur_bright_lvl != prev_bright_lvl) && auto_brightness) {
-		prev_bright_lvl = cur_bright_lvl;
-		u8 br = brightness_lvls[cur_bright_lvl];
+	int newBrLvl = (mcuGetVolumeSlider() >> 2) % countof(brLvlTbl);
+	if ((newBrLvl != oldBrLvl) && autoBr) {
+		oldBrLvl = newBrLvl;
+		u8 br = brLvlTbl[newBrLvl];
 		GFX_setBrightness(br, br);
 	}
 	#endif
@@ -93,11 +93,11 @@ void __attribute__((noreturn)) MainLoop(void)
 	bool runPxiCmdProcessor = true;
 
 	#ifdef FIXED_BRIGHTNESS
-	u8 fixed_bright_lvl = brightness_lvls[clamp(FIXED_BRIGHTNESS, 0, countof(brightness_lvls)-1)];
-	GFX_setBrightness(fixed_bright_lvl, fixed_bright_lvl);
+	u8 fixBrLvl = brLvlTbl[clamp(FIXED_BRIGHTNESS, 0, countof(brLvlTbl)-1)];
+	GFX_setBrightness(fixBrLvl, fixBrLvl);
 	#else
-	prev_bright_lvl = -1;
-	auto_brightness = true;
+	oldBrLvl = -1;
+	autoBr = true;
 	#endif
 
 	// initialize state stuff
@@ -187,15 +187,15 @@ void __attribute__((noreturn)) MainLoop(void)
 			// sets the LCDs brightness (if FIXED_BRIGHTNESS is disabled)
 			case PXICMD_SET_BRIGHTNESS:
 			{
+				s32 newbrightness = (s32)args[0];
 				pxiReply = GFX_getBrightness();
 				#ifndef FIXED_BRIGHTNESS
-				s32 newbrightness = (s32)args[0];
 				if ((newbrightness > 0) && (newbrightness < 0x100)) {
 					GFX_setBrightness(newbrightness, newbrightness);
-					auto_brightness = false;
+					autoBr = false;
 				} else {
-					prev_bright_lvl = -1;
-					auto_brightness = true;
+					oldBrLvl = -1;
+					autoBr = true;
 				}
 				#endif
 				break;

arm11/source/system/sections.h

@@ -20,7 +20,7 @@
 
 #include <types.h>
 
-#define DEF_SECT_(n)	extern u32 __##n##_pa, __##n##_va, __##n##_va_end;
+#define DEF_SECT_(n)	extern u32 __##n##_pa, __##n##_va, __##n##_len;
 DEF_SECT_(text)
 DEF_SECT_(data)
 DEF_SECT_(rodata)
@@ -30,6 +30,6 @@ DEF_SECT_(shared)
 
 #define SECTION_VA(n)	((u32)&__##n##_va)
 #define SECTION_PA(n)	((u32)&__##n##_pa)
-#define SECTION_LEN(n)	(((u32)(&__##n##_va_end) - (u32)(&__##n##_va)))
+#define SECTION_LEN(n)	((u32)&__##n##_len)
 
 #define SECTION_TRI(n)	SECTION_VA(n), SECTION_PA(n), SECTION_LEN(n)

arm9/Makefile

@@ -1,24 +1,17 @@
 PROCESSOR := ARM9
 
-TARGET := $(shell basename "$(CURDIR)")
+TARGET := $(shell basename $(CURDIR))
 
 SOURCE := source
 BUILD  := build
 
 SUBARCH := -D$(PROCESSOR) -march=armv5te -mtune=arm946e-s -mthumb -mfloat-abi=soft
-INCDIRS := source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/lodepng source/lua source/qrcodegen source/system source/utils
+INCDIRS := source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/lodepng source/qrcodegen source/system source/utils
 INCLUDE := $(foreach dir,$(INCDIRS),-I"$(shell pwd)/$(dir)")
 
 ASFLAGS += $(SUBARCH) $(INCLUDE)
 CFLAGS  += $(SUBARCH) $(INCLUDE) -fno-builtin-memcpy -flto
-LDFLAGS += $(SUBARCH) -Wl,--use-blx,-Map,$(TARGET).map -flto
-LIBS    += -lm
+LDFLAGS += $(SUBARCH) -Wl,-Map,$(TARGET).map -flto
 
 include ../Makefile.common
 include ../Makefile.build
-
-arm9_data.elf: arm9.elf
-	$(OBJCOPY) -O elf32-littlearm -j .rodata* -j .data* -j .bss* $< $@
-
-arm9_code.elf: arm9.elf
-	$(OBJCOPY) -O elf32-littlearm -j .text* -j .vectors* $< $@

arm9/link.ld

@@ -4,10 +4,8 @@ ENTRY(_start)
 
 MEMORY
 {
+    AHBWRAM (RWX) : ORIGIN = 0x08006000, LENGTH = 512K
     VECTORS (RX) : ORIGIN = 0x08000000, LENGTH = 64
-    CODEMEM (RX) : ORIGIN = 0x08000040, LENGTH = 512K - 64
-    BOOTROM (R)  : ORIGIN = 0x08080000, LENGTH = 128K /* BootROM mirrors, don't touch! */
-    DATAMEM (RW) : ORIGIN = 0x080A0000, LENGTH = 384K
 }
 
 SECTIONS
@@ -18,7 +16,7 @@ SECTIONS
         KEEP(*(.vectors));
         . = ALIGN(4);
         __vectors_len = ABSOLUTE(.) - __vectors_vma;
-    } >VECTORS AT>CODEMEM
+    } >VECTORS AT>AHBWRAM
 
     .text : ALIGN(4) {
         __text_s = ABSOLUTE(.);
@@ -26,28 +24,24 @@ SECTIONS
         *(.text*);
         . = ALIGN(4);
         __text_e = ABSOLUTE(.);
-    } >CODEMEM
+    } >AHBWRAM
 
     .rodata : ALIGN(4) {
         *(.rodata*);
         . = ALIGN(4);
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-        . = ALIGN(4);
-    } >DATAMEM
+    } >AHBWRAM
 
     .data : ALIGN(4) {
         *(.data*);
         . = ALIGN(4);
-    } >DATAMEM
+    } >AHBWRAM
 
-    .bss (NOLOAD) : ALIGN(4) {
+    .bss : ALIGN(4) {
         __bss_start = .;
         *(.bss*);
         . = ALIGN(4);
         __bss_end = .;
-    } >DATAMEM
+    } >AHBWRAM
 
     __end__ = ABSOLUTE(.);
 }

arm9/source/common/screenshot.c

@@ -27,7 +27,7 @@ void CreateScreenshot(void) {
 
     fvx_rmkdir(OUTPUT_PATH);
     get_dstime(&dstime);
-    snprintf(filename, sizeof(filename), OUTPUT_PATH "/snap_%02X%02X%02X%02X%02X%02X.png",
+    snprintf(filename, 64, OUTPUT_PATH "/snap_%02X%02X%02X%02X%02X%02X.png",
         dstime.bcd_Y, dstime.bcd_M, dstime.bcd_D,
         dstime.bcd_h, dstime.bcd_m, dstime.bcd_s);
     filename[63] = '\0';

arm9/source/common/swkbd.c

@@ -1,10 +1,8 @@
 #include <stdarg.h>
 
-#include "language.h"
 #include "swkbd.h"
 #include "timer.h"
 #include "hid.h"
-#include "utf.h"
 
 
 static inline char to_uppercase(char c) {
@@ -81,7 +79,7 @@ static void DrawKey(const TouchBox* key, const bool pressed, const u32 uppercase
     if (key->id == KEY_TXTBOX) return;
 
     char keystr[16];
-    if (key->id >= 0x80) snprintf(keystr, sizeof(keystr), "%s", keystrs[key->id - 0x80]);
+    if (key->id >= 0x80) snprintf(keystr, 16, "%s", keystrs[key->id - 0x80]);
     else {
         keystr[0] = (uppercase) ? to_uppercase(key->id) : key->id;
         keystr[1] = 0;
@@ -92,7 +90,7 @@ static void DrawKey(const TouchBox* key, const bool pressed, const u32 uppercase
     const u32 f_offs_y = (key->h - FONT_HEIGHT_EXT) / 2;
 
     DrawRectangle(BOT_SCREEN, key->x, key->y, key->w, key->h, color);
-    DrawString(BOT_SCREEN, keystr, key->x + f_offs_x, key->y + f_offs_y, COLOR_SWKBD_CHARS, color);
+    DrawString(BOT_SCREEN, keystr, key->x + f_offs_x, key->y + f_offs_y, COLOR_SWKBD_CHARS, color, false);
 }
 
 static void DrawKeyBoardBox(TouchBox* swkbd, u32 color) {
@@ -121,50 +119,34 @@ static void DrawKeyBoard(TouchBox* swkbd, const u32 uppercase) {
 }
 
 static void DrawTextBox(const TouchBox* txtbox, const char* inputstr, const u32 cursor, u32* scroll) {
-    const u32 input_shown_length = (txtbox->w / FONT_WIDTH_EXT) - 2;
+    const u32 input_shown = (txtbox->w / FONT_WIDTH_EXT) - 2;
     const u32 inputstr_size = strlen(inputstr); // we rely on a zero terminated string
     const u16 x = txtbox->x;
     const u16 y = txtbox->y;
 
     // fix scroll
-    if (cursor < *scroll) {
-        *scroll = cursor;
-    } else {
-        int scroll_adjust = -input_shown_length;
-        for (u32 i = *scroll; i < cursor; i++) {
-            if (i >= inputstr_size || (inputstr[i] & 0xC0) != 0x80) scroll_adjust++;
-        }
-
-        for (int i = 0; i < scroll_adjust; i++)
-            *scroll += *scroll >= inputstr_size ? 1 : GetCharSize(inputstr + *scroll);
-    }
-
-    u32 input_shown_size = 0;
-    for (u32 i = 0; i < input_shown_length || (*scroll + input_shown_size < inputstr_size && (inputstr[*scroll + input_shown_size] & 0xC0) == 0x80); input_shown_size++) {
-        if (*scroll + input_shown_size >= inputstr_size || (inputstr[*scroll + input_shown_size] & 0xC0) != 0x80) i++;
-    }
+    if (cursor < *scroll) *scroll = cursor;
+    else if (cursor - *scroll > input_shown) *scroll = cursor - input_shown;
 
     // draw input string
-    DrawStringF(BOT_SCREEN, x, y, COLOR_STD_FONT, COLOR_STD_BG, "%c%-*.*s%c",
+    DrawStringF(BOT_SCREEN, x, y, COLOR_STD_FONT, COLOR_STD_BG, "%c%-*.*s%-*.*s%c",
         (*scroll) ? '<' : '|',
-        (int) input_shown_size,
-        (int) input_shown_size,
+        (inputstr_size > input_shown) ? input_shown : inputstr_size,
+        (inputstr_size > input_shown) ? input_shown : inputstr_size,
         (*scroll > inputstr_size) ? "" : inputstr + *scroll,
-        (inputstr_size - (s32) *scroll > input_shown_size) ? '>' : '|'
+        (inputstr_size > input_shown) ? 0 : input_shown - inputstr_size,
+        (inputstr_size > input_shown) ? 0 : input_shown - inputstr_size,
+        "",
+        (inputstr_size - (s32) *scroll > input_shown) ? '>' : '|'
     );
 
     // draw cursor
-    u16 cpos = 0;
-    for (u16 i = *scroll; i < cursor; i++) {
-        if (i >= inputstr_size || (inputstr[i] & 0xC0) != 0x80) cpos++;
-    }
-
     DrawStringF(BOT_SCREEN, x-(FONT_WIDTH_EXT/2), y+10, COLOR_STD_FONT, COLOR_STD_BG, "%-*.*s^%-*.*s",
-        (int) (1 + cpos),
-        (int) (1 + cpos),
+        1 + cursor - *scroll,
+        1 + cursor - *scroll,
         "",
-        (int) (input_shown_length - cpos),
-        (int) (input_shown_length - cpos),
+        input_shown - (cursor - *scroll),
+        input_shown - (cursor - *scroll),
         ""
     );
 }
@@ -181,17 +163,8 @@ static void MoveTextBoxCursor(const TouchBox* txtbox, const char* inputstr, cons
         const TouchBox* tb = TouchBoxGet(&id, x, y, txtbox, 0);
         if (id == KEY_TXTBOX) {
             u16 x_tb = x - tb->x;
-
-            const u32 inputstr_size = strlen(inputstr);
-            const u16 cpos_x = (x_tb < (FONT_WIDTH_EXT/2)) ? 0 : (x_tb - (FONT_WIDTH_EXT/2)) / FONT_WIDTH_EXT;
-            u16 cpos_length = 0;
-            u16 cpos_size = 0;
-            while ((cpos_length < cpos_x && cpos_length < input_shown) || (*scroll + cpos_size < inputstr_size && (inputstr[*scroll + cpos_size] & 0xC0) == 0x80)) {
-                if (*scroll + cpos_size >= inputstr_size || (inputstr[*scroll + cpos_size] & 0xC0) != 0x80) cpos_length++;
-                cpos_size++;
-            }
-
-            u32 cursor_next = *scroll + cpos_size;
+            u16 cpos = (x_tb < (FONT_WIDTH_EXT/2)) ? 0 : (x_tb - (FONT_WIDTH_EXT/2)) / FONT_WIDTH_EXT;
+            u32 cursor_next = *scroll + ((cpos <= input_shown) ? cpos : input_shown);
             // move cursor to position pointed to
             if (*cursor != cursor_next) {
                 if (cursor_next < max_size) *cursor = cursor_next;
@@ -200,10 +173,10 @@ static void MoveTextBoxCursor(const TouchBox* txtbox, const char* inputstr, cons
             }
             // move beyound visible field
             if (timer_msec(timer) >= scroll_cooldown) {
-                if ((cpos_length == 0) && (*scroll > 0))
-                    *scroll -= GetPrevCharSize(inputstr + *scroll);
-                else if ((cpos_length >= input_shown) && (*cursor < (max_size-1)))
-                    *scroll += GetCharSize(inputstr + *scroll);
+                if ((cpos == 0) && (*scroll > 0))
+                    (*scroll)--;
+                else if ((cpos >= input_shown) && (*cursor < (max_size-1)))
+                    (*scroll)++;
             }
         }
     }
@@ -253,13 +226,6 @@ bool ShowKeyboard(char* inputstr, const u32 max_size, const char *format, ...) {
     TouchBox swkbd_numpad[32];
     TouchBox* textbox = swkbd_alphabet; // always use this textbox
 
-    static bool show_instr = true;
-    const char* instr = STR_KEYBOARD_CONTROLS_DETAILS;
-    if (show_instr) {
-        ShowPrompt(false, "%s", instr);
-        show_instr = false;
-    }
-
     // generate keyboards
     if (!BuildKeyboard(swkbd_alphabet, keys_alphabet, layout_alphabet)) return false;
     if (!BuildKeyboard(swkbd_special, keys_special, layout_special)) return false;
@@ -269,7 +235,7 @@ bool ShowKeyboard(char* inputstr, const u32 max_size, const char *format, ...) {
     char str[512]; // arbitrary limit, should be more than enough
     va_list va;
     va_start(va, format);
-    vsnprintf(str, sizeof(str), format, va);
+    vsnprintf(str, 512, format, va);
     va_end(va);
     u32 str_width = GetDrawStringWidth(str);
     if (str_width < (24 * FONT_WIDTH_EXT)) str_width = 24 * FONT_WIDTH_EXT;
@@ -313,18 +279,16 @@ bool ShowKeyboard(char* inputstr, const u32 max_size, const char *format, ...) {
             break;
         } else if (key == KEY_BKSPC) {
             if (cursor) {
-                int size = GetPrevCharSize(inputstr + cursor);
                 if (cursor <= inputstr_size) {
-                    memmove(inputstr + cursor - size, inputstr + cursor, inputstr_size - cursor + size);
-                    inputstr_size -= size;
+                    memmove(inputstr + cursor - 1, inputstr + cursor, inputstr_size - cursor + 1);
+                    inputstr_size--;
                 }
-                cursor -= size;
+                cursor--;
             }
         } else if (key == KEY_LEFT) {
-            if (cursor) cursor -= GetPrevCharSize(inputstr + cursor);
+            if (cursor) cursor--;
         } else if (key == KEY_RIGHT) {
-            int size = cursor > inputstr_size ? 1 : GetCharSize(inputstr + cursor);
-            if (cursor + size < max_size) cursor += size;
+            if (cursor < (max_size-1)) cursor++;
         } else if (key == KEY_ALPHA) {
             swkbd = swkbd_alphabet;
         } else if (key == KEY_SPECIAL) {
@@ -333,31 +297,7 @@ bool ShowKeyboard(char* inputstr, const u32 max_size, const char *format, ...) {
             swkbd = swkbd_numpad;
         } else if (key == KEY_SWITCH) {
             ClearScreen(BOT_SCREEN, COLOR_STD_BG);
-            return ShowStringPrompt(inputstr, max_size, "%s", str);
-        } else if (key == KEY_UNICODE) {
-            if (cursor > 3 && cursor <= inputstr_size) {
-                u16 codepoint = 0;
-                for (char *c = inputstr + cursor - 4; c < inputstr + cursor; c++) {
-                    if ((*c >= '0' && *c <= '9') || (*c >= 'A' && *c <= 'F') || (*c >= 'a' && *c <= 'f')) {
-                        codepoint <<= 4;
-                        codepoint |= *c - (*c <= '9' ? '0' : ((*c <= 'F' ? 'A' : 'a') - 10));
-                    } else {
-                        codepoint = 0;
-                        break;
-                    }
-                }
-
-                if(codepoint != 0) {
-                    char character[5] = {0};
-                    u16 input[2] = {codepoint, 0};
-                    utf16_to_utf8((u8*)character, input, 4, 1);
-
-                    u32 char_size = GetCharSize(character);
-                    memmove(inputstr + cursor - 4 + char_size, inputstr + cursor, max_size - cursor + 4 - char_size);
-                    memcpy(inputstr + cursor - 4, character, char_size);
-                    cursor -= 4 - char_size;
-                }
-            }
+            return ShowStringPrompt(inputstr, max_size, str);
         } else if (key && (key < 0x80)) {
             if ((cursor < (max_size-1)) && (inputstr_size < max_size)) {
                 // pad string (if cursor beyound string size)

arm9/source/common/swkbd.h

@@ -19,12 +19,11 @@ enum {
     KEY_RIGHT   = 0x89,
     KEY_ESCAPE  = 0x8A,
     KEY_SWITCH  = 0x8B,
-    KEY_UNICODE = 0x8C,
     KEY_TXTBOX  = 0xFF
 };
 
 // special key strings
-#define SWKBD_KEYSTR "", "DEL", "INS", "SUBMIT", "CAPS", "#$@", "123", "ABC", "←", "→", "ESC", "SWITCH", "U+"
+#define SWKBD_KEYSTR "", "DEL", "INS", "SUBMIT", "CAPS", "#$@", "123", "ABC", "\x1b", "\x1a", "ESC", "SWITCH"
 
 #define COLOR_SWKBD_NORMAL  COLOR_GREY
 #define COLOR_SWKBD_PRESSED COLOR_LIGHTGREY
@@ -57,7 +56,7 @@ enum {
     '4', '5', '6', 'D', 'C', \
     '3', '2', '1', 'B', 'A', \
     '0', '.', '_', KEY_LEFT, KEY_RIGHT, \
-    KEY_ALPHA, KEY_UNICODE, ' ', KEY_BKSPC
+    KEY_ALPHA, ' ', KEY_BKSPC
 
 // offset, num of keys in row, width of special keys (...), 0
 #define SWKBD_LAYOUT_ALPHABET \
@@ -81,9 +80,9 @@ enum {
     5, 0, \
     5, 0, \
     5, 18, 18, 0, \
-    4, 20, 20, 31, 20, 0, \
+    3, 30, 34, 30, 0, \
     0
 
 
 #define ShowKeyboardOrPrompt (TouchIsCalibrated() ? ShowKeyboard : ShowStringPrompt)
-bool PRINTF_ARGS(3) ShowKeyboard(char* inputstr, u32 max_size, const char *format, ...);
+bool ShowKeyboard(char* inputstr, u32 max_size, const char *format, ...);

arm9/source/common/touchcal.c

@@ -2,7 +2,6 @@
 #include "ui.h"
 #include "hid.h"
 #include "crc16.h"
-#include "language.h"
 #include "spiflash.h"
 #include "support.h"
 
@@ -47,8 +46,8 @@ bool ShowTouchCalibrationDialog(void)
 
     // clear screen, draw instructions
     ClearScreen(BOT_SCREEN, COLOR_STD_BG);
-    DrawStringCenter(BOT_SCREEN, COLOR_STD_FONT, COLOR_STD_BG, "%s",
-        STR_TOUCH_CROSSHAIRS_TO_CALIBRATE_TOUCHSCREEN_USE_STYLUS);
+    DrawStringCenter(BOT_SCREEN, COLOR_STD_FONT, COLOR_STD_BG,
+        "Touch the red crosshairs to\ncalibrate your touchscreen.\n \nUse the stylus for best\nresults!");
 
     // set calibration defaults
     SetCalibrationDefaults();

arm9/source/common/ui.c

@@ -15,134 +15,21 @@
 #include "power.h"
 #include "hid.h"
 #include "fixp.h"
-#include "language.h"
 
 #define STRBUF_SIZE 512 // maximum size of the string buffer
 #define FONT_MAX_WIDTH 8
 #define FONT_MAX_HEIGHT 10
 #define PROGRESS_REFRESH_RATE 30 // the progress bar is only allowed to draw to screen every X milliseconds
 
-typedef struct {
-    char chunk_id[4]; // NOT null terminated
-    u32 size;
-} RiffChunkHeader;
-
-typedef struct {
-    u8 width;
-    u8 height;
-    u16 count;
-} FontMeta;
-
 static u32 font_width = 0;
 static u32 font_height = 0;
-static u32 font_count = 0;
 static u32 line_height = 0;
-static u8* font_bin = NULL;
-static u16* font_map = NULL;
-static u16 ascii_lut[0x60];
-
-// lookup table to sort CP-437 so it can be binary searched with Unicode codepoints
-static const u8 cp437_sorted[0x100] = {
-    0x00, 0xF5, 0xF6, 0xFC, 0xFD, 0xFB, 0xFA, 0xA4, 0xF3, 0xF2, 0xF4, 0xF9, 0xF8, 0xFE, 0xFF, 0xF7,
-    0xEF, 0xF1, 0xAD, 0xA5, 0x6D, 0x65, 0xED, 0xAE, 0xA9, 0xAB, 0xAA, 0xA8, 0xB2, 0xAC, 0xEE, 0xF0,
-    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
-    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
-    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
-    0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40,
-    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
-    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0xB8,
-    0x77, 0x95, 0x85, 0x7F, 0x80, 0x7D, 0x81, 0x83, 0x86, 0x87, 0x84, 0x8B, 0x8A, 0x88, 0x74, 0x75,
-    0x78, 0x82, 0x76, 0x8F, 0x90, 0x8D, 0x94, 0x92, 0x96, 0x7A, 0x7B, 0x62, 0x63, 0x64, 0xA7, 0x97,
-    0x7E, 0x89, 0x8E, 0x93, 0x8C, 0x79, 0x66, 0x6F, 0x73, 0xB9, 0x68, 0x72, 0x71, 0x61, 0x67, 0x70,
-    0xE9, 0xEA, 0xEB, 0xBD, 0xC3, 0xD8, 0xD9, 0xCD, 0xCC, 0xDA, 0xC8, 0xCE, 0xD4, 0xD3, 0xD2, 0xBF,
-    0xC0, 0xC5, 0xC4, 0xC2, 0xBC, 0xC6, 0xD5, 0xD6, 0xD1, 0xCB, 0xE0, 0xDD, 0xD7, 0xC7, 0xE3, 0xDE,
-    0xDF, 0xDB, 0xDC, 0xD0, 0xCF, 0xC9, 0xCA, 0xE2, 0xE1, 0xC1, 0xBE, 0xE6, 0xE5, 0xE7, 0xE8, 0xE4,
-    0x9D, 0x7C, 0x98, 0xA0, 0x9A, 0xA1, 0x6C, 0xA2, 0x9B, 0x99, 0x9C, 0x9E, 0xB1, 0xA3, 0x9F, 0xB3,
-    0xB5, 0x6A, 0xB7, 0xB6, 0xBA, 0xBB, 0x91, 0xB4, 0x69, 0xAF, 0x6E, 0xB0, 0xA6, 0x6B, 0xEC, 0x60
-};
-
-// Unicode font mapping for sorted CP-437
-static const u16 cp437_sorted_map[0x100] = {
-    0x0000, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E,
-    0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E,
-    0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E,
-    0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E,
-    0x005F, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E,
-    0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A5, 0x00A7, 0x00AA, 0x00AB, 0x00AC, 0x00B0, 0x00B1, 0x00B2, 0x00B5, 0x00B6, 0x00B7, 0x00BA,
-    0x00BB, 0x00BC, 0x00BD, 0x00BF, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00DF, 0x00E0, 0x00E1, 0x00E2,
-    0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F1, 0x00F2, 0x00F3, 0x00F4,
-    0x00F6, 0x00F7, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FF, 0x0192, 0x0393, 0x0398, 0x03A3, 0x03A6, 0x03A9, 0x03B1, 0x03B4, 0x03B5,
-    0x03C0, 0x03C3, 0x03C4, 0x03C6, 0x2022, 0x203C, 0x207F, 0x20A7, 0x2190, 0x2191, 0x2192, 0x2193, 0x2194, 0x2195, 0x21A8, 0x2219,
-    0x221A, 0x221E, 0x221F, 0x2229, 0x2248, 0x2261, 0x2264, 0x2265, 0x2302, 0x2310, 0x2320, 0x2321, 0x2500, 0x2502, 0x250C, 0x2510,
-    0x2514, 0x2518, 0x251C, 0x2524, 0x252C, 0x2534, 0x253C, 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557, 0x2558,
-    0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567, 0x2568,
-    0x2569, 0x256A, 0x256B, 0x256C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, 0x2591, 0x2592, 0x2593, 0x25A0, 0x25AC, 0x25B2, 0x25BA,
-    0x25BC, 0x25C4, 0x25CB, 0x25D8, 0x25D9, 0x263A, 0x263B, 0x263C, 0x2640, 0x2642, 0x2660, 0x2663, 0x2665, 0x2666, 0x266A, 0x266B
-};
-
-// lookup table to convert the old CP-437 escapes to Unicode
-static const u16 cp437_escapes[0x20] = {
-    0x0000, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, 0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C,
-    0x25BA, 0x25C4, 0x2195, 0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8, 0x2191, 0x2193, 0x2192, 0x2190, 0x221F, 0x2194, 0x25B2, 0x25BC
-};
+static u8 font_bin[FONT_MAX_HEIGHT * 256];
 
 #define PIXEL_OFFSET(x, y)  (((x) * SCREEN_HEIGHT) + (SCREEN_HEIGHT - (y) - 1))
 
-
-u16 GetFontIndex(u16 c, bool use_ascii_lut)
-{
-    if (c < 0x20) return GetFontIndex(cp437_escapes[c], use_ascii_lut);
-    else if (use_ascii_lut && c < 0x80) return ascii_lut[c - 0x20];
-
-    int left = 0;
-    int right = font_count;
-
-    while (left <= right) {
-        int mid = left + ((right - left) / 2);
-        if (font_map[mid] == c)
-            return mid;
-
-        if (font_map[mid] < c)
-            left = mid + 1;
-        else
-            right = mid - 1;
-    }
-
-    // if not found in font, return a '?'
-    return ascii_lut['?' - 0x20];
-}
-
-// gets a u32 codepoint from a UTF-8 string and moves the pointer to the next character
-u32 GetCharacter(const char** str)
-{
-    u32 c;
-
-    if ((**str & 0x80) == 0) {
-        c = *(*str)++;
-    } else if ((**str & 0xE0) == 0xC0) {
-        c  = (*(*str)++ & 0x1F) << 6;
-        c |=  *(*str)++ & 0x3F;
-    } else if ((**str & 0xF0) == 0xE0) {
-        c  = (*(*str)++ & 0x0F) << 12;
-        c |= (*(*str)++ & 0x3F) << 6;
-        c |=  *(*str)++ & 0x3F;
-    } else if ((**str & 0xF8) == 0xF0) {
-        c  = (*(*str)++ & 0x07) << 18;
-        c |= (*(*str)++ & 0x3F) << 12;
-        c |= (*(*str)++ & 0x3F) << 6;
-        c |=  *(*str)++ & 0x3F;
-    } else {
-        // invalid UTF-8, skip to next character
-        (*str)++;
-        c = '?';
-    }
-
-    return c;
-}
-
-const u8* GetFontFromPbm(const void* pbm, const u32 pbm_size, u32* w, u32* h) {
-    const char* hdr = (const char*) pbm;
+u8* GetFontFromPbm(const void* pbm, const u32 pbm_size, u32* w, u32* h) {
+    char* hdr = (char*) pbm;
     u32 hdr_max_size = min(512, pbm_size);
     u32 pbm_w = 0;
     u32 pbm_h = 0;
@@ -203,101 +90,27 @@ const u8* GetFontFromPbm(const void* pbm, const u32 pbm_size, u32* w, u32* h) {
     return (u8*) pbm + p;
 }
 
-const u8* GetFontFromRiff(const void* riff, const u32 riff_size, u32* w, u32* h, u16* count) {
-    const void* ptr = riff;
-    const RiffChunkHeader* riff_header;
-    const RiffChunkHeader* chunk_header;
-
-    // check header magic and load size
-    if (!ptr) return NULL;
-    riff_header = ptr;
-    if (memcmp(riff_header->chunk_id, "RIFF", 4) != 0) return NULL;
-
-    // ensure enough space is allocated
-    if (riff_header->size > riff_size) return NULL;
-
-    ptr += sizeof(RiffChunkHeader);
-
-    while ((u32)(ptr - riff) < riff_header->size + sizeof(RiffChunkHeader)) {
-        chunk_header = ptr;
-
-        // check for and load META section
-        if (memcmp(chunk_header->chunk_id, "META", 4) == 0) {
-
-            if (chunk_header->size != 4) return NULL;
-
-            const FontMeta *meta = ptr + sizeof(RiffChunkHeader);
-            if (meta->width > FONT_MAX_WIDTH || meta->height > FONT_MAX_HEIGHT) return NULL;
-
-            // all good
-            if (w) *w = meta->width;
-            if (h) *h = meta->height;
-            if (count) *count = meta->count;
-            return ptr;
-        }
-
-        ptr += sizeof(RiffChunkHeader) + chunk_header->size;
-    }
-
-    return NULL;
-}
-
-// sets the font from a given RIFF or PBM
-// if no font is given, the font is fetched from the default VRAM0 location
-bool SetFont(const void* font, u32 font_size) {
+// sets the font from a given PBM
+// if no PBM is given, the PBM is fetched from the default VRAM0 location
+bool SetFontFromPbm(const void* pbm, u32 pbm_size) {
     u32 w, h;
-    u16 count;
-    const u8* ptr = NULL;
+    u8* ptr = NULL;
 
-    if (!font) {
-        u64 font_size64 = 0;
-        font = FindVTarFileInfo(VRAM0_FONT, &font_size64);
-        font_size = (u32) font_size64;
+    if (!pbm) {
+        u64 pbm_size64 = 0;
+        pbm = FindVTarFileInfo(VRAM0_FONT_PBM, &pbm_size64);
+        pbm_size = (u32) pbm_size64;
     }
 
-    if (!font)
+    if (pbm)
+        ptr = GetFontFromPbm(pbm, pbm_size, &w, &h);
+
+    if (!ptr) {
         return false;
-
-    if ((ptr = GetFontFromRiff(font, font_size, &w, &h, &count))) { // RIFF font
-        font_width = w;
-        font_height = h;
-        font_count = count;
-
-        const RiffChunkHeader* riff_header;
-        const RiffChunkHeader* chunk_header;
-
-        // load total size
-        riff_header = font;
-
-        while (((u32)ptr - (u32)font) < riff_header->size + sizeof(RiffChunkHeader)) {
-            chunk_header = (const void *)ptr;
-
-            if (memcmp(chunk_header->chunk_id, "CDAT", 4) == 0) { // character data
-                if (font_bin) free(font_bin);
-                font_bin = malloc(font_height * font_count);
-                if (!font_bin) return NULL;
-
-                memcpy(font_bin, ptr + sizeof(RiffChunkHeader), font_height * font_count);
-            } else if (memcmp(chunk_header->chunk_id, "CMAP", 4) == 0) { // character map
-                if (font_map) free(font_map);
-                font_map = malloc(sizeof(u16) * font_count);
-                if (!font_map) return NULL;
-
-                memcpy(font_map, ptr + sizeof(RiffChunkHeader), sizeof(u16) * font_count);
-            }
-
-            ptr += sizeof(RiffChunkHeader) + chunk_header->size;
-        }
-    } else if ((ptr = GetFontFromPbm(font, font_size, &w, &h))) {
-        font_count = 0x100;
-
-        if (w > 8) {
+    } else if (w > 8) {
         font_width = w / 16;
         font_height = h / 16;
-
-            if (font_bin) free(font_bin);
-            font_bin = malloc(font_height * font_count);
-            if (!font_bin) return NULL;
+        memset(font_bin, 0x00, w * h / 8);
 
         for (u32 cy = 0; cy < 16; cy++) {
             for (u32 row = 0; row < font_height; row++) {
@@ -305,7 +118,7 @@ bool SetFont(const void* font, u32 font_size) {
                     u32 bp0 = (cx * font_width) >> 3;
                     u32 bm0 = (cx * font_width) % 8;
                     u8 byte = ((ptr[bp0] << bm0) | (ptr[bp0+1] >> (8 - bm0))) & (0xFF << (8 - font_width));
-                        font_bin[(cp437_sorted[(cy << 4) + cx] * font_height) + row] = byte;
+                    font_bin[(((cy << 4) + cx) * font_height) + row] = byte;
                 }
                 ptr += font_width << 1;
             }
@@ -313,24 +126,7 @@ bool SetFont(const void* font, u32 font_size) {
     } else {
         font_width = w;
         font_height = h / 256;
-            for (u32 i = 0; i < font_count; i++)
-                memcpy(font_bin + cp437_sorted[i] * font_height, ptr + i * font_height, font_height);
-        }
-
-        if (font_map) free(font_map);
-        font_map = malloc(sizeof(u16) * font_count);
-        if (!font_map) return NULL;
-
-        memcpy(font_map, cp437_sorted_map, sizeof(cp437_sorted_map));
-    } else {
-        return false;
-    }
-
-
-    // set up ASCII lookup table
-    ascii_lut['?' - 0x20] = GetFontIndex('?', false);
-    for (int i = 0; i < 0x60; i++) {
-        ascii_lut[i] = GetFontIndex(i + 0x20, false);
+        memcpy(font_bin, ptr, h);
     }
 
     line_height = min(10, font_height + 2);
@@ -426,14 +222,14 @@ void DrawQrCode(u16 *screen, const u8* qrcode)
     }
 }
 
-void DrawCharacter(u16 *screen, u32 character, int x, int y, u32 color, u32 bgcolor)
+void DrawCharacter(u16 *screen, int character, int x, int y, u32 color, u32 bgcolor)
 {
     for (int yy = 0; yy < (int) font_height; yy++) {
         int xDisplacement = x * SCREEN_HEIGHT;
         int yDisplacement = SCREEN_HEIGHT - (y + yy) - 1;
         u16* screenPos = screen + xDisplacement + yDisplacement;
 
-        u8 charPos = font_bin[GetFontIndex(character, true) * font_height + yy];
+        u8 charPos = font_bin[character * font_height + yy];
         for (int xx = 7; xx >= (8 - (int) font_width); xx--) {
             if ((charPos >> xx) & 1) {
                 *screenPos = color;
@@ -445,12 +241,14 @@ void DrawCharacter(u16 *screen, u32 character, int x, int y, u32 color, u32 bgco
     }
 }
 
-void DrawString(u16 *screen, const char *str, int x, int y, u32 color, u32 bgcolor)
+void DrawString(u16 *screen, const char *str, int x, int y, u32 color, u32 bgcolor, bool fix_utf8)
 {
     size_t max_len = (((screen == TOP_SCREEN) ? SCREEN_WIDTH_TOP : SCREEN_WIDTH_BOT) - x) / font_width;
+    size_t len = (strlen(str) > max_len) ? max_len : strlen(str);
 
-    for (size_t i = 0; i < max_len && *str; i++) {
-        DrawCharacter(screen, GetCharacter(&str), x + i * font_width, y, color, bgcolor);
+    for (size_t i = 0; i < len; i++) {
+        char c = (char) (fix_utf8 && str[i] >= 0x80) ? '?' : str[i];
+        DrawCharacter(screen, c, x + i * font_width, y, color, bgcolor);
     }
 }
 
@@ -463,7 +261,7 @@ void DrawStringF(u16 *screen, int x, int y, u32 color, u32 bgcolor, const char *
     va_end(va);
 
     for (char* text = strtok(str, "\n"); text != NULL; text = strtok(NULL, "\n"), y += line_height)
-        DrawString(screen, text, x, y, color, bgcolor);
+        DrawString(screen, text, x, y, color, bgcolor, true);
 }
 
 void DrawStringCenter(u16 *screen, u32 color, u32 bgcolor, const char *format, ...)
@@ -489,44 +287,16 @@ u32 GetDrawStringHeight(const char* str) {
     return height;
 }
 
-u32 GetCharSize(const char* str) {
-    const char *start = str;
-    do {
-        str++;
-    } while ((*str & 0xC0) == 0x80);
-
-    return str - start;
-}
-
-u32 GetPrevCharSize(const char* str) {
-    const char *start = str;
-    do {
-        str--;
-    } while ((*str & 0xC0) == 0x80);
-
-    return start - str;
-}
-
 u32 GetDrawStringWidth(const char* str) {
     u32 width = 0;
     char* old_lf = (char*) str;
     char* str_end = (char*) str + strnlen(str, STRBUF_SIZE);
     for (char* lf = strchr(str, '\n'); lf != NULL; lf = strchr(lf + 1, '\n')) {
-        u32 length = 0;
-        for (char* c = old_lf; c != lf; c++) {
-            if ((*c & 0xC0) != 0x80) length++;
-        }
-
-        if (length > width) width = length;
+        if ((u32) (lf - old_lf) > width) width = lf - old_lf;
         old_lf = lf;
     }
-
-    u32 length = 0;
-    for (char* c = old_lf; c != str_end; c++) {
-        if ((*c & 0xC0) != 0x80) length++;
-    }
-
-    if (length > width) width = length;
+    if ((u32) (str_end - old_lf) > width)
+        width = str_end - old_lf;
     width *= font_width;
     return width;
 }
@@ -539,26 +309,6 @@ u32 GetFontHeight(void) {
     return font_height;
 }
 
-void MultiLineString(char* dest, const char* orig, int llen, int maxl) {
-    char* ptr_o = (char*) orig;
-    char* ptr_d = (char*) dest;
-    for (int l = 0; l < maxl; l++) {
-        int len = strnlen(ptr_o, llen+1);
-        snprintf(ptr_d, llen+1, "%.*s", llen, ptr_o);
-        ptr_o += min(len, llen);
-        ptr_d += min(len, llen);
-        if (len <= llen) break;
-        *(ptr_d++) = '\n';
-    }
-
-    // string too long?
-    if (!maxl) *dest = '\0';
-    else if (*ptr_o) {
-        if (llen >= 3) snprintf(ptr_d - 4, 4, "...");
-        else *(ptr_d-1) = '\0';
-    } 
-}
-
 void WordWrapString(char* str, int llen) {
     char* last_brk = str - 1;
     char* last_spc = str - 1;
@@ -580,50 +330,26 @@ void WordWrapString(char* str, int llen) {
     }
 }
 
-// dest must be at least 4x the size of nlength to account for UTF-8
-void ResizeString(char* dest, const char* orig, int nlength, int tpos, bool align_right) {
-    int olength = 0;
-    for (int i = 0; i < 256 && orig[i]; i++) {
-        if ((orig[i] & 0xC0) != 0x80) olength++;
-    }
-
-    if (nlength < olength) {
-        TruncateString(dest, orig, nlength, tpos);
-    } else {
-        int nsize = 0;
+void ResizeString(char* dest, const char* orig, int nsize, int tpos, bool align_right) {
     int osize = strnlen(orig, 256);
-        for (int i = 0; i < nlength || (nsize <= osize && (orig[nsize] & 0xC0) == 0x80); nsize++) {
-            if (nsize > osize || (orig[nsize] & 0xC0) != 0x80) i++;
-        }
-        snprintf(dest, UTF_BUFFER_BYTESIZE(nlength), align_right ? "%*.*s" : "%-*.*s", nsize, nsize, orig);
-    }
-}
-
-// dest must be at least 4x the size of nlength to account for UTF-8
-void TruncateString(char* dest, const char* orig, int nlength, int tpos) {
-    int osize = strnlen(orig, 256), olength = 0;
-    for (int i = 0; i < 256 && orig[i]; i++) {
-        if ((orig[i] & 0xC0) != 0x80) olength++;
-    }
-
-    if (nlength < 0) {
-        return;
-    } else if ((nlength <= 3) || (nlength >= olength)) {
-        strcpy(dest, orig);
+    if (nsize < osize) {
+        TruncateString(dest, orig, nsize, tpos);
+    } else if (!align_right) {
+        snprintf(dest, nsize + 1, "%-*.*s", nsize, nsize, orig);
     } else {
-        if (tpos + 3 > nlength) tpos = nlength - 3;
-
-        int tposStart = 0;
-        for (int i = 0; i < tpos || (orig[tposStart] & 0xC0) == 0x80; tposStart++) {
-            if ((orig[tposStart] & 0xC0) != 0x80) i++;
+        snprintf(dest, nsize + 1, "%*.*s", nsize, nsize, orig);
+    }
 }
 
-        int tposEnd = 0;
-        for (int i = 0; i < nlength - tpos - 3; tposEnd++) {
-            if ((orig[osize - 1 - tposEnd] & 0xC0) != 0x80) i++;
-        }
-
-        snprintf(dest, UTF_BUFFER_BYTESIZE(nlength), "%-.*s...%-.*s", tposStart, orig, tposEnd, orig + osize - tposEnd);
+void TruncateString(char* dest, const char* orig, int nsize, int tpos) {
+    int osize = strnlen(orig, 256);
+    if (nsize < 0) {
+        return;
+    } else if ((nsize <= 3) || (nsize >= osize)) {
+        snprintf(dest, nsize + 1, "%s", orig);
+    } else {
+        if (tpos + 3 > nsize) tpos = nsize - 3;
+        snprintf(dest, nsize + 1, "%-.*s...%-.*s", tpos, orig, nsize - (3 + tpos), orig + osize - (nsize - (3 + tpos)));
     }
 }
 
@@ -633,20 +359,20 @@ void FormatNumber(char* str, u64 number) { // str should be 32 byte in size
     for (; number / (mag1000 * 1000) > 0; mag1000 *= 1000);
     for (; mag1000 > 0; mag1000 /= 1000) {
         u32 pos = strnlen(str, 31);
-        snprintf(str + pos, 31 - pos, "%0*llu%s", (pos) ? 3 : 1, (number / mag1000) % 1000, (mag1000 > 1) ? STR_THOUSAND_SEPARATOR : "");
+        snprintf(str + pos, 31 - pos, "%0*llu%c", (pos) ? 3 : 1, (number / mag1000) % 1000, (mag1000 > 1) ? ',' : '\0');
     }
 }
 
 void FormatBytes(char* str, u64 bytes) { // str should be 32 byte in size, just to be safe
-    const char* units[] = {STR_BYTE, STR_KB, STR_MB, STR_GB};
+    const char* units[] = {" Byte", " kB", " MB", " GB"};
 
-    if (bytes == (u64) -1) snprintf(str, 32, "%s", STR_INVALID);
+    if (bytes == (u64) -1) snprintf(str, 32, "INVALID");
     else if (bytes < 1024) snprintf(str, 32, "%llu%s", bytes, units[0]);
     else {
         u32 scale = 1;
         u64 bytes100 = (bytes * 100) >> 10;
         for(; (bytes100 >= 1024*100) && (scale < 3); scale++, bytes100 >>= 10);
-        snprintf(str, 32, "%llu%s%llu%s", bytes100 / 100, STR_DECIMAL_SEPARATOR, (bytes100 % 100) / 10, units[scale]);
+        snprintf(str, 32, "%llu.%llu%s", bytes100 / 100, (bytes100 % 100) / 10, units[scale]);
     }
 }
 
@@ -713,7 +439,7 @@ void ShowIconString(u16* icon, int w, int h, const char *format, ...)
     vsnprintf(str, STRBUF_SIZE, format, va);
     va_end(va);
 
-    ShowIconStringF(MAIN_SCREEN, icon, w, h, "%s", str);
+    ShowIconStringF(MAIN_SCREEN, icon, w, h, str);
 }
 
 bool ShowPrompt(bool ask, const char *format, ...)
@@ -728,7 +454,7 @@ bool ShowPrompt(bool ask, const char *format, ...)
 
     ClearScreenF(true, false, COLOR_STD_BG);
     DrawStringCenter(MAIN_SCREEN, COLOR_STD_FONT, COLOR_STD_BG, "%s\n \n%s", str,
-        (ask) ? STR_A_YES_B_NO : STR_A_TO_CONTINUE);
+        (ask) ? "(<A> yes, <B> no)" : "(<A> to continue)");
 
     while (true) {
         u32 pad_state = InputWait(0);
@@ -748,7 +474,7 @@ bool ShowPrompt(bool ask, const char *format, ...)
 #define PRNG (*(volatile u32*)0x10011000)
 bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
     static const int seqcolors[7] = { COLOR_STD_FONT, COLOR_BRIGHTGREEN,
-        COLOR_BRIGHTYELLOW, COLOR_ORANGE, COLOR_BRIGHTBLUE, COLOR_BRIGHTBLUE, COLOR_DARKRED };
+        COLOR_BRIGHTYELLOW, COLOR_ORANGE, COLOR_BRIGHTBLUE, COLOR_RED, COLOR_DARKRED };
     const u32 seqlen_max = 7;
     const u32 seqlen = seqlen_max - ((seqlvl < 3) ? 2 : (seqlvl < 4) ? 1 : 0);
 
@@ -773,7 +499,7 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
     x = (str_width >= SCREEN_WIDTH_MAIN) ? 0 : (SCREEN_WIDTH_MAIN - str_width) / 2;
     y = (str_height >= SCREEN_HEIGHT) ? 0 : (SCREEN_HEIGHT - str_height) / 2;
 
-    if (seqlvl >= 5) { // special handling
+    if (seqlvl >= 6) { // special handling
         color_bg = seqcolors[seqlvl];
         color_font = COLOR_BLACK;
         color_off = COLOR_BLACK;
@@ -783,13 +509,13 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
     ClearScreenF(true, false, color_bg);
     DrawStringF(MAIN_SCREEN, x, y, color_font, color_bg, "%s", str);
     #ifndef TIMER_UNLOCK
-    DrawStringF(MAIN_SCREEN, x, y + str_height - 28, color_font, color_bg, "%s", STR_TO_PROCEED_ENTER_THIS);
+    DrawStringF(MAIN_SCREEN, x, y + str_height - 28, color_font, color_bg, "To proceed, enter this:");
 
     // generate sequence
-    const char *dpad_symbols[] = { "→", "←", "↑", "↓" }; // R L U D
+    const char dpad_symbols[] = { '\x1A', '\x1B', '\x18', '\x19' }; // R L U D
 
     u32 sequence[seqlen_max];
-    const char *seqsymbols[seqlen_max];
+    char seqsymbols[seqlen_max];
     u32 lastlsh = (u32) -1;
     for (u32 n = 0; n < (seqlen-1); n++) {
         u32 lsh = lastlsh;
@@ -799,13 +525,13 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
         seqsymbols[n] = dpad_symbols[lsh];
     }
     sequence[seqlen-1] = BUTTON_A;
-    seqsymbols[seqlen-1] = "A";
+    seqsymbols[seqlen-1] = 'A';
 
 
     while (true) {
         for (u32 n = 0; n < seqlen; n++) {
             DrawStringF(MAIN_SCREEN, x + (n*4*FONT_WIDTH_EXT), y + str_height - 28 + line_height,
-                (lvl > n) ? color_on : color_off, color_bg, "<%s>", seqsymbols[n]);
+                (lvl > n) ? color_on : color_off, color_bg, "<%c>", seqsymbols[n]);
         }
         if (lvl == seqlen)
             break;
@@ -820,7 +546,7 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
             lvl = 0;
     }
     #else
-    DrawStringF(MAIN_SCREEN, x, y + str_height - 28, color_font, color_bg, STR_TO_PROCEED_HOLD_X);
+    DrawStringF(MAIN_SCREEN, x, y + str_height - 28, color_font, color_bg, "To proceed, hold <X>:");
 
     while (!CheckButton(BUTTON_B)) {
         for (u32 n = 0; n < seqlen; n++) {
@@ -847,11 +573,10 @@ bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
 }
 #endif
 
-u32 ShowSelectPrompt(int n, const char** options, const char *format, ...) {
+u32 ShowSelectPrompt(u32 n, const char** options, const char *format, ...) {
     u32 str_width, str_height;
     u32 x, y, yopt;
-    int sel = 0, scroll = 0;
-    int n_show = min(n, 10);
+    u32 sel = 0;
 
     char str[STRBUF_SIZE];
     va_list va;
@@ -863,64 +588,30 @@ u32 ShowSelectPrompt(int n, const char** options, const char *format, ...) {
     // else if (n == 1) return ShowPrompt(true, "%s\n%s?", str, options[0]) ? 1 : 0;
 
     str_width = GetDrawStringWidth(str);
-    str_height = GetDrawStringHeight(str) + (n_show * (line_height + 2)) + (3 * line_height);
+    str_height = GetDrawStringHeight(str) + (n * (line_height + 2)) + (3 * line_height);
     if (str_width < 24 * font_width) str_width = 24 * font_width;
-    for (int i = 0; i < n; i++) if (str_width < GetDrawStringWidth(options[i]) + (3 * font_width))
-        str_width = GetDrawStringWidth(options[i]) + (3 * font_width);
+    for (u32 i = 0; i < n; i++) if (str_width < GetDrawStringWidth(options[i]))
+        str_width = GetDrawStringWidth(options[i]);
     x = (str_width >= SCREEN_WIDTH_MAIN) ? 0 : (SCREEN_WIDTH_MAIN - str_width) / 2;
     y = (str_height >= SCREEN_HEIGHT) ? 0 : (SCREEN_HEIGHT - str_height) / 2;
     yopt = y + GetDrawStringHeight(str) + 8;
 
     ClearScreenF(true, false, COLOR_STD_BG);
     DrawStringF(MAIN_SCREEN, x, y, COLOR_STD_FONT, COLOR_STD_BG, "%s", str);
-    DrawStringF(MAIN_SCREEN, x, yopt + (n_show*(line_height+2)) + line_height, COLOR_STD_FONT, COLOR_STD_BG, "%s", STR_A_SELECT_B_CANCEL);
+    DrawStringF(MAIN_SCREEN, x, yopt + (n*(line_height+2)) + line_height, COLOR_STD_FONT, COLOR_STD_BG, "(<A> select, <B> cancel)");
     while (true) {
-        for (int i = scroll; i < scroll+n_show; i++) {
-            DrawStringF(MAIN_SCREEN, x, yopt + ((line_height+2)*(i-scroll)), (sel == i) ? COLOR_STD_FONT : COLOR_LIGHTGREY, COLOR_STD_BG, "%2.2s %s",
+        for (u32 i = 0; i < n; i++) {
+            DrawStringF(MAIN_SCREEN, x, yopt + ((line_height+2)*i), (sel == i) ? COLOR_STD_FONT : COLOR_LIGHTGREY, COLOR_STD_BG, "%2.2s %s",
                 (sel == i) ? "->" : "", options[i]);
         }
-
-        // show [n more]
-        if (n - n_show - scroll > 0) {
-            char more_str[UTF_BUFFER_BYTESIZE(str_width / font_width)], temp_str[UTF_BUFFER_BYTESIZE(64)];
-            snprintf(temp_str, sizeof(temp_str), STR_N_MORE, (n - (n_show-1) - scroll));
-            ResizeString(more_str, temp_str, str_width / font_width, 8, false);
-            DrawString(MAIN_SCREEN, more_str, x, yopt + (line_height+2)*(n_show-1), COLOR_LIGHTGREY, COLOR_STD_BG);
-        }
-        // show scroll bar
-        u32 bar_x = x + str_width + 2;
-        const u32 flist_height = (n_show * (line_height + 2));
-        const u32 bar_width = 2;
-        if (n > n_show) { // draw position bar at the right
-            const u32 bar_height_min = 32;
-            u32 bar_height = (n_show * flist_height) / n;
-            if (bar_height < bar_height_min) bar_height = bar_height_min;
-            const u32 bar_y = ((u64) scroll * (flist_height - bar_height)) / (n - n_show) + yopt;
-
-            DrawRectangle(MAIN_SCREEN, bar_x, bar_y, bar_width, bar_height, COLOR_SIDE_BAR);
-        }
-
         u32 pad_state = InputWait(0);
         if (pad_state & BUTTON_DOWN) sel = (sel+1) % n;
         else if (pad_state & BUTTON_UP) sel = (sel+n-1) % n;
-        else if (pad_state & BUTTON_RIGHT) sel += n_show;
-        else if (pad_state & BUTTON_LEFT) sel -= n_show;
         else if (pad_state & BUTTON_A) break;
         else if (pad_state & BUTTON_B) {
             sel = n;
             break;
         }
-        if (sel < 0) sel = 0;
-        else if (sel >= n) sel = n-1;
-
-        int prev_scroll = scroll;
-        if (sel < scroll) scroll = sel;
-        else if (sel ==  n-1 && sel >= (scroll + n_show - 1)) scroll = sel - n_show + 1;
-        else if (sel >= (scroll + (n_show-1) - 1)) scroll = sel - (n_show-1) + 1;
-
-        if (scroll != prev_scroll) {
-            DrawRectangle(MAIN_SCREEN, x + font_width * 3, yopt, str_width + 4, (n_show * (line_height + 2)), COLOR_STD_BG);
-        }
     }
 
     ClearScreenF(true, false, COLOR_STD_BG);
@@ -928,12 +619,12 @@ u32 ShowSelectPrompt(int n, const char** options, const char *format, ...) {
     return (sel >= n) ? 0 : sel + 1;
 }
 
-u32 ShowFileScrollPrompt(int n, const DirEntry** options, bool hide_ext, const char *format, ...) {
+u32 ShowFileScrollPrompt(u32 n, const DirEntry** options, bool hide_ext, const char *format, ...) {
     u32 str_height, fname_len;
     u32 x, y, yopt;
     const u32 item_width = SCREEN_WIDTH(MAIN_SCREEN) - 40;
     int sel = 0, scroll = 0;
-    int n_show = min(n, 10);
+    u32 n_show = min(n, 10);
 
     char str[STRBUF_SIZE];
     va_list va;
@@ -952,15 +643,15 @@ u32 ShowFileScrollPrompt(int n, const DirEntry** options, bool hide_ext, const c
 
     ClearScreenF(true, false, COLOR_STD_BG);
     DrawStringF(MAIN_SCREEN, x, y, COLOR_STD_FONT, COLOR_STD_BG, "%s", str);
-    DrawStringF(MAIN_SCREEN, x, yopt + (n_show*(line_height+2)) + line_height, COLOR_STD_FONT, COLOR_STD_BG, "%s", STR_A_SELECT_B_CANCEL);
+    DrawStringF(MAIN_SCREEN, x, yopt + (n_show*(line_height+2)) + line_height, COLOR_STD_FONT, COLOR_STD_BG, "(<A> select, <B> cancel)");
     while (true) {
-        for (int i = scroll; i < scroll+n_show; i++) {
+        for (u32 i = scroll; i < scroll+n_show; i++) {
             char bytestr[16];
             FormatBytes(bytestr, options[i]->size);
 
-            char content_str[UTF_BUFFER_BYTESIZE(fname_len)];
+            char content_str[64 + 1];
             char temp_str[256];
-            strncpy(temp_str, options[i]->name, 256);
+            strncpy(temp_str, options[i]->name, 255);
 
             char* dot = strrchr(temp_str, '.');
             if (hide_ext && dot) *dot = '\0';
@@ -968,19 +659,18 @@ u32 ShowFileScrollPrompt(int n, const DirEntry** options, bool hide_ext, const c
             ResizeString(content_str, temp_str, fname_len, 8, false);
 
             DrawStringF(MAIN_SCREEN, x, yopt + ((line_height+2)*(i-scroll)),
-                (sel == i) ? COLOR_STD_FONT : COLOR_ENTRY(options[i]), COLOR_STD_BG, "%2.2s %s",
-                (sel == i) ? "->" : "", content_str);
+                (sel == (int)i) ? COLOR_STD_FONT : COLOR_ENTRY(options[i]), COLOR_STD_BG, "%2.2s %s",
+                (sel == (int)i) ? "->" : "", content_str);
 
             DrawStringF(MAIN_SCREEN, x + item_width - font_width * 11, yopt + ((line_height+2)*(i-scroll)),
-                (sel == i) ? COLOR_STD_FONT : COLOR_ENTRY(options[i]), COLOR_STD_BG, "%10.10s",
-                (options[i]->type == T_DIR) ? STR_DIR : (options[i]->type == T_DOTDOT) ? "(..)" : bytestr);
+                (sel == (int)i) ? COLOR_STD_FONT : COLOR_ENTRY(options[i]), COLOR_STD_BG, "%10.10s",
+                (options[i]->type == T_DIR) ? "(dir)" : (options[i]->type == T_DOTDOT) ? "(..)" : bytestr);
         }
         // show [n more]
-        if (n - n_show - scroll > 0) {
-            char more_str[UTF_BUFFER_BYTESIZE(item_width / font_width)], temp_str[UTF_BUFFER_BYTESIZE(64)];
-            snprintf(temp_str, sizeof(temp_str), STR_N_MORE, (n - (n_show-1) - scroll));
-            ResizeString(more_str, temp_str, item_width / font_width, 8, false);
-            DrawString(MAIN_SCREEN, more_str, x, yopt + (line_height+2)*(n_show-1), COLOR_LIGHTGREY, COLOR_STD_BG);
+        if (n - n_show - scroll) {
+            char more_str[64 + 1];
+            snprintf(more_str, 64, "   [%d more]", (int)(n - (n_show-1) - scroll));
+            DrawStringF(MAIN_SCREEN, x, yopt + (line_height+2)*(n_show-1), COLOR_LIGHTGREY, COLOR_STD_BG, "%-*s", item_width / font_width, more_str);
         }
         // show scroll bar
         u32 bar_x = x + item_width + 2;
@@ -998,8 +688,8 @@ u32 ShowFileScrollPrompt(int n, const DirEntry** options, bool hide_ext, const c
         } else DrawRectangle(MAIN_SCREEN, bar_x, yopt, bar_width, flist_height, COLOR_STD_BG);
 
         u32 pad_state = InputWait(0);
-        if (pad_state & BUTTON_DOWN) sel = (sel+1) % n;
-        else if (pad_state & BUTTON_UP) sel = (sel+n-1) % n;
+        if (pad_state & BUTTON_DOWN) sel++;
+        else if (pad_state & BUTTON_UP) sel--;
         else if (pad_state & BUTTON_RIGHT) sel += n_show;
         else if (pad_state & BUTTON_LEFT) sel -= n_show;
         else if (pad_state & BUTTON_A) break;
@@ -1008,15 +698,15 @@ u32 ShowFileScrollPrompt(int n, const DirEntry** options, bool hide_ext, const c
             break;
         }
         if (sel < 0) sel = 0;
-        else if (sel >= n) sel = n-1;
+        else if (sel >= (int)n) sel = n-1;
         if (sel < scroll) scroll = sel;
-        else if (sel ==  n-1 && sel >= (scroll + n_show - 1)) scroll = sel - n_show + 1;
-        else if (sel >= (scroll + (n_show-1) - 1)) scroll = sel - (n_show-1) + 1;
+        else if (sel == (int) n-1 && sel >= (int)(scroll + n_show - 1)) scroll = sel - n_show + 1;
+        else if (sel >= (int)(scroll + (n_show-1) - 1)) scroll = sel - (n_show-1) + 1;
     }
 
     ClearScreenF(true, false, COLOR_STD_BG);
 
-    return (sel >= n) ? 0 : sel + 1;
+    return (sel >= (int)n) ? 0 : sel + 1;
 }
 
 u32 ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *format, ...) {
@@ -1033,7 +723,7 @@ u32 ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *f
         ButtonToString(keys[i], buttonstr);
         ptr += snprintf(ptr, STRBUF_SIZE - (ptr-str), "\n<%s> %s", buttonstr, options[i]);
     }
-    ptr += snprintf(ptr, STRBUF_SIZE - (ptr-str), "\n \n<%s> %s", "B", STR_CANCEL);
+    ptr += snprintf(ptr, STRBUF_SIZE - (ptr-str), "\n \n<%s> %s", "B", "cancel");
 
     ClearScreenF(true, false, COLOR_STD_BG);
     DrawStringCenter(MAIN_SCREEN, COLOR_STD_FONT, COLOR_STD_BG, "%s", str);
@@ -1056,7 +746,7 @@ u32 ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *f
 
 bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alphabet, const char *format, va_list va) {
     const u32 alphabet_size = strnlen(alphabet, 256);
-    const u32 input_shown_length = 22;
+    const u32 input_shown = 22;
     const u32 fast_scroll = 4;
     const u64 aprv_delay = 128;
 
@@ -1082,7 +772,7 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
     ClearScreenF(true, false, COLOR_STD_BG);
     DrawStringF(MAIN_SCREEN, x, y, COLOR_STD_FONT, COLOR_STD_BG, "%s", str);
     DrawStringF(MAIN_SCREEN, x + 8, y + str_height - 40, COLOR_STD_FONT, COLOR_STD_BG,
-        "%s\n%s", STR_R_FAST_SCROLL_L_CLEAR_DATA, resize ? STR_X_REMOVE_CHAR_Y_INSERT_CHAR : "");
+        "R - (\x18\x19) fast scroll\nL - clear data%s", resize ? "\nX - remove char\nY - insert char" : "");
 
     // wait for all keys released
     while (HID_ReadState() & BUTTON_ANY);
@@ -1095,43 +785,25 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
 
     while (true) {
         u32 inputstr_size = strnlen(inputstr, max_size - 1);
-
-        if (cursor_s < scroll) {
-            scroll = cursor_s;
-        } else {
-            int scroll_adjust = -input_shown_length;
-            for (u32 i = scroll; i < cursor_s; i++) {
-                if (i >= inputstr_size || (inputstr[i] & 0xC0) != 0x80) scroll_adjust++;
-            }
-
-            for (int i = 0; i <= scroll_adjust; i++)
-                scroll += scroll >= inputstr_size ? 1 : GetCharSize(inputstr + scroll);
-        }
-
-        u32 input_shown_size = 0;
-        for (u32 i = 0; i < input_shown_length || (scroll + input_shown_size < inputstr_size && (inputstr[scroll + input_shown_size] & 0xC0) == 0x80); input_shown_size++) {
-            if (scroll + input_shown_size >= inputstr_size || (inputstr[scroll + input_shown_size] & 0xC0) != 0x80) i++;
-        }
-
-        u16 cpos = 0;
-        for (u16 i = scroll; i < cursor_s; i++) {
-            if (i >= inputstr_size || (inputstr[i] & 0xC0) != 0x80) cpos++;
-        }
-
-        DrawStringF(MAIN_SCREEN, x, y + str_height - 76, COLOR_STD_FONT, COLOR_STD_BG, "%c%-*.*s%c\n%-*.*s^%-*.*s",
+        if (cursor_s < scroll) scroll = cursor_s;
+        else if (cursor_s - scroll >= input_shown) scroll = cursor_s - input_shown + 1;
+        while (scroll && (inputstr_size - scroll < input_shown)) scroll--;
+        DrawStringF(MAIN_SCREEN, x, y + str_height - 76, COLOR_STD_FONT, COLOR_STD_BG, "%c%-*.*s%c%-*.*s\n%-*.*s^%-*.*s",
             (scroll) ? '<' : '|',
-            (int) input_shown_size,
-            (int) input_shown_size,
-            (scroll > inputstr_size) ? "" : inputstr + scroll,
-            (inputstr_size - (s32) scroll > input_shown_size) ? '>' : '|',
-            (int) 1 + cpos,
-            (int) 1 + cpos,
+            (inputstr_size > input_shown) ? input_shown : inputstr_size,
+            (inputstr_size > input_shown) ? input_shown : inputstr_size,
+            inputstr + scroll,
+            (inputstr_size - scroll > input_shown) ? '>' : '|',
+            (inputstr_size > input_shown) ? 0 : input_shown - inputstr_size,
+            (inputstr_size > input_shown) ? 0 : input_shown - inputstr_size,
             "",
-            (int) input_shown_length - cpos,
-            (int) input_shown_length - cpos,
+            1 + cursor_s - scroll,
+            1 + cursor_s - scroll,
+            "",
+            input_shown - (cursor_s - scroll),
+            input_shown - (cursor_s - scroll),
             ""
         );
-
         if (cursor_a < 0) {
             for (cursor_a = alphabet_size - 1; (cursor_a > 0) && (alphabet[cursor_a] != inputstr[cursor_s]); cursor_a--);
         }
@@ -1171,26 +843,11 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
             }
         } else if (pad_state & BUTTON_X) {
             if (resize && (inputstr_size > resize)) {
-                u32 char_index = 0;
-                for(u32 i = 0; i < cursor_s; i++) {
-                    if (i >= inputstr_size || (inputstr[i] & 0xC0) != 0x80) char_index++;
-                }
-
-                u32 to_index = char_index - (char_index % resize);
-                u32 from_index = to_index + resize;
-
-                char* inputto = inputstr + cursor_s;
-                for (u32 i = 0; i < char_index - to_index; i++) {
-                    inputto -= GetPrevCharSize(inputto);
-                }
-                char* inputfrom = inputto;
-                for (u32 i = 0; i < from_index - to_index; i++) {
-                    inputfrom += GetCharSize(inputfrom);
-                }
-
+                char* inputfrom = inputstr + cursor_s - (cursor_s % resize) + resize;
+                char* inputto = inputstr + cursor_s - (cursor_s % resize);
                 memmove(inputto, inputfrom, max_size - (inputfrom - inputstr));
-                inputstr_size -= inputfrom - inputto;
-                while (cursor_s >= inputstr_size || (inputstr[cursor_s] & 0xC0) == 0x80)
+                inputstr_size -= resize;
+                while (cursor_s >= inputstr_size)
                     cursor_s--;
                 cursor_a = -1;
             } else if (resize == 1) {
@@ -1207,29 +864,18 @@ bool ShowInputPrompt(char* inputstr, u32 max_size, u32 resize, const char* alpha
                 cursor_a = 0;
             }
         } else if (pad_state & BUTTON_UP) {
-            int size = GetCharSize(inputstr + cursor_s);
-            if(size > 1) {
-                memmove(inputstr + cursor_s, inputstr + cursor_s + size - 1, inputstr_size - cursor_s + size - 1);
-            }
-
             cursor_a += (pad_state & BUTTON_R1) ? fast_scroll : 1;
             cursor_a = cursor_a % alphabet_size;
             inputstr[cursor_s] = alphabet[cursor_a];
         } else if (pad_state & BUTTON_DOWN) {
-            int size = GetCharSize(inputstr + cursor_s);
-            if(size > 1) {
-                memmove(inputstr + cursor_s, inputstr + cursor_s + size - 1, inputstr_size - cursor_s + size - 1);
-            }
-
             cursor_a -= (pad_state & BUTTON_R1) ? fast_scroll : 1;
             if (cursor_a < 0) cursor_a = alphabet_size + cursor_a;
             inputstr[cursor_s] = alphabet[cursor_a];
         } else if (pad_state & BUTTON_LEFT) {
-            if (cursor_s > 0) cursor_s -= GetPrevCharSize(inputstr + cursor_s);
+            if (cursor_s > 0) cursor_s--;
             cursor_a = -1;
         } else if (pad_state & BUTTON_RIGHT) {
-            int size = cursor_s > inputstr_size ? 1 : GetCharSize(inputstr + cursor_s);
-            if (cursor_s + size < max_size - 1) cursor_s += size;
+            if (cursor_s < max_size - 2) cursor_s++;
             if (cursor_s >= inputstr_size) {
                 memset(inputstr + cursor_s, alphabet[0], resize);
                 inputstr[cursor_s + resize] = '\0';
@@ -1265,7 +911,7 @@ u64 ShowHexPrompt(u64 start_val, u32 n_digits, const char *format, ...) {
     va_list va;
 
     if (n_digits > 16) n_digits = 16;
-    snprintf(inputstr, sizeof(inputstr), "%0*llX", (int) n_digits, start_val);
+    snprintf(inputstr, 16 + 1, "%0*llX", (int) n_digits, start_val);
 
     va_start(va, format);
     if (ShowInputPrompt(inputstr, n_digits + 1, 0, alphabet, format, va)) {
@@ -1282,7 +928,7 @@ u64 ShowNumberPrompt(u64 start_val, const char *format, ...) {
     u64 ret = 0;
     va_list va;
 
-    snprintf(inputstr, sizeof(inputstr), "%llu", start_val);
+    snprintf(inputstr, 20 + 1, "%llu", start_val);
 
     va_start(va, format);
     if (ShowInputPrompt(inputstr, 20 + 1, 1, alphabet, format, va)) {
@@ -1402,8 +1048,8 @@ bool ShowProgress(u64 current, u64 total, const char* opstr)
     const u32 text_pos_y = bar_pos_y + bar_height + 2;
     u32 prog_width = ((total > 0) && (current <= total)) ? (current * (bar_width-4)) / total : 0;
     u32 prog_percent = ((total > 0) && (current <= total)) ? (current * 100) / total : 0;
-    char tempstr[UTF_BUFFER_BYTESIZE(64)];
-    char progstr[UTF_BUFFER_BYTESIZE(64)];
+    char tempstr[64];
+    char progstr[64];
 
     static u64 last_msec_elapsed = 0;
     static u64 last_sec_remain = 0;
@@ -1427,20 +1073,16 @@ bool ShowProgress(u64 current, u64 total, const char* opstr)
     DrawRectangle(MAIN_SCREEN, bar_pos_x + 2 + prog_width, bar_pos_y + 2, (bar_width-4) - prog_width, bar_height - 4, COLOR_STD_BG);
 
     TruncateString(progstr, opstr, min(63, (bar_width / FONT_WIDTH_EXT) - 7), 8);
-    snprintf(tempstr, sizeof(tempstr), "%s (%lu%%)", progstr, prog_percent);
+    snprintf(tempstr, 64, "%s (%lu%%)", progstr, prog_percent);
     ResizeString(progstr, tempstr, bar_width / FONT_WIDTH_EXT, 8, false);
-    DrawString(MAIN_SCREEN, progstr, bar_pos_x, text_pos_y, COLOR_STD_FONT, COLOR_STD_BG);
+    DrawString(MAIN_SCREEN, progstr, bar_pos_x, text_pos_y, COLOR_STD_FONT, COLOR_STD_BG, true);
     if (sec_elapsed >= 1) {
-        if (sec_remain >= 3600) {
-            snprintf(tempstr, sizeof(tempstr), STR_ETA_N_HOUR_N_MIN_N_SEC, (sec_remain / 3600), (sec_remain / 60) % 60, sec_remain % 60);
-        } else {
-            snprintf(tempstr, sizeof(tempstr), STR_ETA_N_MIN_N_SEC, sec_remain / 60, sec_remain % 60);
-        }
+        snprintf(tempstr, 16, "ETA %02llum%02llus", sec_remain / 60, sec_remain % 60);
         ResizeString(progstr, tempstr, 16, 8, true);
         DrawString(MAIN_SCREEN, progstr, bar_pos_x + bar_width - 1 - (FONT_WIDTH_EXT * 16),
-            bar_pos_y - line_height - 1, COLOR_STD_FONT, COLOR_STD_BG);
+            bar_pos_y - line_height - 1, COLOR_STD_FONT, COLOR_STD_BG, true);
     }
-    DrawString(MAIN_SCREEN, STR_HOLD_B_TO_CANCEL, bar_pos_x + 2, text_pos_y + 14, COLOR_STD_FONT, COLOR_STD_BG);
+    DrawString(MAIN_SCREEN, "(hold B to cancel)", bar_pos_x + 2, text_pos_y + 14, COLOR_STD_FONT, COLOR_STD_BG, false);
 
     last_prog_width = prog_width;
 
@@ -1453,7 +1095,13 @@ int ShowBrightnessConfig(int set_brightness)
     u32 btn_input, bar_count;
     int bar_x_pos, bar_y_pos, bar_width, bar_height;
 
-    const char *brightness_str = STR_BRIGHTNESS_CONTROLS;
+    const char *brightness_str =
+        "[\x1B] Decrease brightness\n"
+        "[\x1A] Increase brightness\n"
+        " \n"
+        "[X] Use volume slider control\n"
+        "[A] Set current brightness\n"
+        "[B] Cancel";
     static const u16 brightness_slider_colmasks[] = {
         COLOR_RED, COLOR_GREEN, COLOR_BLUE, COLOR_WHITE
     };
@@ -1474,7 +1122,7 @@ int ShowBrightnessConfig(int set_brightness)
     // draw initial UI stuff
     DrawStringF(MAIN_SCREEN,
         (SCREEN_WIDTH_MAIN - GetDrawStringWidth(brightness_str)) / 2,
-        (SCREEN_HEIGHT / 4) * 2, COLOR_STD_FONT, COLOR_STD_BG, "%s", brightness_str);
+        (SCREEN_HEIGHT / 4) * 2, COLOR_STD_FONT, COLOR_STD_BG, brightness_str);
 
     // draw all color gradient bars
     for (int x = 0; x < bar_width; x++) {

arm9/source/common/ui.h

@@ -21,11 +21,6 @@
 #define FONT_WIDTH_EXT   GetFontWidth()
 #define FONT_HEIGHT_EXT  GetFontHeight()
 
-#define UTF_MAX_BYTES_PER_RUNE 4
-#define UTF_BUFFER_BYTESIZE(rune_count) (((rune_count) + 1) * UTF_MAX_BYTES_PER_RUNE)
-
-#define PRINTF_ARGS(n) __attribute__ ((format (printf, (n), (n) + 1)))
-
 #define TOP_SCREEN          ((u16*)VRAM_TOP_LA)
 #define BOT_SCREEN          ((u16*)VRAM_BOT_A)
 
@@ -45,14 +40,13 @@
 
 
 #ifndef AUTO_UNLOCK
-bool PRINTF_ARGS(2) ShowUnlockSequence(u32 seqlvl, const char *format, ...);
+bool ShowUnlockSequence(u32 seqlvl, const char *format, ...);
 #else
 #define ShowUnlockSequence ShowPrompt
 #endif
 
-const u8* GetFontFromPbm(const void* pbm, const u32 riff_size, u32* w, u32* h);
-const u8* GetFontFromRiff(const void* riff, const u32 riff_size, u32* w, u32* h, u16* count);
-bool SetFont(const void* font, const u32 font_size);
+u8* GetFontFromPbm(const void* pbm, const u32 pbm_size, u32* w, u32* h);
+bool SetFontFromPbm(const void* pbm, const u32 pbm_size);
 
 u16 GetColor(const u16 *screen, int x, int y);
 
@@ -63,39 +57,35 @@ void DrawRectangle(u16 *screen, int x, int y, u32 width, u32 height, u32 color);
 void DrawBitmap(u16 *screen, int x, int y, u32 w, u32 h, const u16* bitmap);
 void DrawQrCode(u16 *screen, const u8* qrcode);
 
-void DrawCharacter(u16 *screen, u32 character, int x, int y, u32 color, u32 bgcolor);
-void DrawString(u16 *screen, const char *str, int x, int y, u32 color, u32 bgcolor);
-void PRINTF_ARGS(6) DrawStringF(u16 *screen, int x, int y, u32 color, u32 bgcolor, const char *format, ...);
-void PRINTF_ARGS(4) DrawStringCenter(u16 *screen, u32 color, u32 bgcolor, const char *format, ...);
-
-u32 GetCharSize(const char* str);
-u32 GetPrevCharSize(const char* str);
+void DrawCharacter(u16 *screen, int character, int x, int y, u32 color, u32 bgcolor);
+void DrawString(u16 *screen, const char *str, int x, int y, u32 color, u32 bgcolor, bool fix_utf8);
+void DrawStringF(u16 *screen, int x, int y, u32 color, u32 bgcolor, const char *format, ...);
+void DrawStringCenter(u16 *screen, u32 color, u32 bgcolor, const char *format, ...);
 
 u32 GetDrawStringHeight(const char* str);
 u32 GetDrawStringWidth(const char* str);
 u32 GetFontWidth(void);
 u32 GetFontHeight(void);
 
-void MultiLineString(char* dest, const char* orig, int llen, int maxl);
 void WordWrapString(char* str, int llen);
-void ResizeString(char* dest, const char* orig, int nlength, int tpos, bool align_right);
-void TruncateString(char* dest, const char* orig, int nlength, int tpos);
+void ResizeString(char* dest, const char* orig, int nsize, int tpos, bool align_right);
+void TruncateString(char* dest, const char* orig, int nsize, int tpos);
 void FormatNumber(char* str, u64 number);
 void FormatBytes(char* str, u64 bytes);
 
-void PRINTF_ARGS(1) ShowString(const char *format, ...);
-void PRINTF_ARGS(2) ShowStringF(u16* screen, const char *format, ...);
-void PRINTF_ARGS(4) ShowIconString(u16* icon, int w, int h, const char *format, ...);
-void PRINTF_ARGS(5) ShowIconStringF(u16* screen, u16* icon, int w, int h, const char *format, ...);
-bool PRINTF_ARGS(2) ShowPrompt(bool ask, const char *format, ...);
-u32 PRINTF_ARGS(3) ShowSelectPrompt(int n, const char** options, const char *format, ...);
-u32 PRINTF_ARGS(4) ShowFileScrollPrompt(int n, const DirEntry** entries, bool hide_ext, const char *format, ...);
-u32 PRINTF_ARGS(4) ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *format, ...);
-bool PRINTF_ARGS(3) ShowStringPrompt(char* inputstr, u32 max_size, const char *format, ...);
-u64 PRINTF_ARGS(3) ShowHexPrompt(u64 start_val, u32 n_digits, const char *format, ...);
-u64 PRINTF_ARGS(2) ShowNumberPrompt(u64 start_val, const char *format, ...);
-bool PRINTF_ARGS(3) ShowDataPrompt(u8* data, u32* size, const char *format, ...);
-bool PRINTF_ARGS(2) ShowRtcSetterPrompt(void* time, const char *format, ...);
+void ShowString(const char *format, ...);
+void ShowStringF(u16* screen, const char *format, ...);
+void ShowIconString(u16* icon, int w, int h, const char *format, ...);
+void ShowIconStringF(u16* screen, u16* icon, int w, int h, const char *format, ...);
+bool ShowPrompt(bool ask, const char *format, ...);
+u32 ShowSelectPrompt(u32 n, const char** options, const char *format, ...);
+u32 ShowFileScrollPrompt(u32 n, const DirEntry** entries, bool hide_ext, const char *format, ...);
+u32 ShowHotkeyPrompt(u32 n, const char** options, const u32* keys, const char *format, ...);
+bool ShowStringPrompt(char* inputstr, u32 max_size, const char *format, ...);
+u64 ShowHexPrompt(u64 start_val, u32 n_digits, const char *format, ...);
+u64 ShowNumberPrompt(u64 start_val, const char *format, ...);
+bool ShowDataPrompt(u8* data, u32* size, const char *format, ...);
+bool ShowRtcSetterPrompt(void* time, const char *format, ...);
 bool ShowProgress(u64 current, u64 total, const char* opstr);
 
 int ShowBrightnessConfig(int set_brightness);

arm9/source/crypto/keydb.c

@@ -40,13 +40,10 @@ u32 GetUnitKeysType(void)
 }
 
 void CryptAesKeyInfo(AesKeyInfo* info) {
-    static const u8 zeros[16] = { 0 };
-    static const u8 keyY_dev[16] = {
-        0xA2, 0x32, 0x4A, 0x7E, 0x7C, 0xE6, 0x1A, 0x9A, 0x45, 0x4A, 0x52, 0x19, 0xB3, 0x5B, 0xE9, 0x3B };
-    const u8* aeskeyY = GetUnitKeysType() == KEYS_DEVKIT ? &keyY_dev[0] : &zeros[0];
+    static u8 zeroes[16] = { 0 };
     u8 ctr[16] = { 0 };
     memcpy(ctr, (void*) info, 12); // CTR -> slot + type + id + zeroes
-    setup_aeskeyY(0x2C, aeskeyY);
+    setup_aeskeyY(0x2C, zeroes);
     use_aeskey(0x2C);
     set_ctr(ctr);
     aes_decrypt(info->key, info->key, 1, AES_CNT_CTRNAND_MODE);
@@ -155,7 +152,7 @@ u32 LoadKeyFromFile(void* key, u32 keyslot, char type, char* id)
     // load legacy slot0x??Key?.bin file instead
     if (!found && (type != 'I')) {
         char fname[64];
-        snprintf(fname, sizeof(fname), "slot0x%02lXKey%s%s.bin", keyslot,
+        snprintf(fname, 64, "slot0x%02lXKey%s%s.bin", keyslot,
             (type == 'X') ? "X" : (type == 'Y') ? "Y" : (type == 'I') ? "IV" : "", (id) ? id : "");
         found = (LoadSupportFile(fname, key, 16) == 16);
     }
@@ -229,3 +226,25 @@ u32 InitKeyDb(const char* path)
     free(keydb);
     return (nkeys) ? 0 : 1;
 }
+
+// creates dependency to "sha.h", not required for base keydb functions
+u32 CheckRecommendedKeyDb(const char* path)
+{
+    // SHA-256 of the recommended aeskeydb.bin file
+    // equals MD5 A5B28945A7C051D7A0CD18AF0E580D1B
+    static const u8 recommended_sha[0x20] = {
+        0x40, 0x76, 0x54, 0x3D, 0xA3, 0xFF, 0x91, 0x1C, 0xE1, 0xCC, 0x4E, 0xC7, 0x2F, 0x92, 0xE4, 0xB7,
+        0x2B, 0x24, 0x00, 0x15, 0xBE, 0x9B, 0xFC, 0xDE, 0x7F, 0xED, 0x95, 0x1D, 0xD5, 0xAB, 0x2D, 0xCB
+    };
+
+    // try to load aeskeydb.bin file
+    AesKeyInfo* keydb = (AesKeyInfo*) malloc(STD_BUFFER_SIZE);
+    if (!keydb) return 1;
+    u32 nkeys = LoadKeyDb(path, keydb, STD_BUFFER_SIZE);
+
+    // compare with recommended SHA
+    bool res = (nkeys && (sha_cmp(recommended_sha, keydb, nkeys * sizeof(AesKeyInfo), SHA256_MODE) == 0));
+
+    free(keydb);
+    return res ? 0 : 1;
+}

arm9/source/crypto/keydb.h

@@ -30,3 +30,4 @@ u32 GetUnitKeysType(void);
 void CryptAesKeyInfo(AesKeyInfo* info);
 u32 LoadKeyFromFile(void* key, u32 keyslot, char type, char* id);
 u32 InitKeyDb(const char* path);
+u32 CheckRecommendedKeyDb(const char* path);

arm9/source/filesys/filetype.c

@@ -8,7 +8,6 @@
 #include "keydb.h"
 #include "ctrtransfer.h"
 #include "scripting.h"
-#include "gm9lua.h"
 #include "png.h"
 #include "ui.h" // only for font file detection
 
@@ -87,14 +86,11 @@ u64 IdentifyFileType(const char* path) {
             return GAME_ROMFS; // RomFS file (check could be better)
         } else if (ValidateTmd((TitleMetaData*) data) == 0) {
             if (fsize == TMD_SIZE_N(getbe16(header + 0x1DE)) + TMD_CDNCERT_SIZE)
-                return GAME_CDNTMD; // TMD file from NUS/CDN
+                return GAME_TMD | FLAG_NUSCDN; // TMD file from NUS/CDN
             else if (fsize >= TMD_SIZE_N(getbe16(header + 0x1DE)))
                 return GAME_TMD; // TMD file
-        } else if (ValidateTwlTmd((TitleMetaData*) data) == 0) {
-            if (fsize == TMD_SIZE_TWL + TMD_CDNCERT_SIZE)
-                return GAME_TWLTMD; // TMD file from NUS/CDN (TWL)
         } else if (ValidateTicket((Ticket*) data) == 0) {
-            return GAME_TICKET; // Ticket file
+            return GAME_TICKET; // Ticket file (not used for anything right now)
         } else if (ValidateFirmHeader((FirmHeader*) data, fsize) == 0) {
             return SYS_FIRM; // FIRM file
         } else if ((ValidateAgbSaveHeader((AgbSaveHeader*) data) == 0) && (fsize >= AGBSAVE_MAX_SIZE)) {
@@ -128,10 +124,6 @@ u64 IdentifyFileType(const char* path) {
         }
     } else if (GetFontFromPbm(data, fsize, NULL, NULL)) {
         return FONT_PBM;
-    } else if (GetFontFromRiff(data, fsize, NULL, NULL, NULL)) {
-        return FONT_RIFF;
-    } else if (GetLanguage(data, fsize, NULL, NULL, NULL)) {
-        return TRANSLATION;
     } else if ((fsize > sizeof(AgbHeader)) &&
         (ValidateAgbHeader((AgbHeader*) data) == 0)) {
         return GAME_GBA;
@@ -151,6 +143,14 @@ u64 IdentifyFileType(const char* path) {
     } else if ((strncasecmp(ext, "png", 4) == 0) &&
         (fsize > sizeof(png_magic)) && (memcmp(data, png_magic, sizeof(png_magic)) == 0)) {
         return GFX_PNG;
+    } else if ((strncasecmp(ext, "cdn", 4) == 0) || (strncasecmp(ext, "nus", 4) == 0)) {
+        char path_cetk[256];
+        char* ext_cetk = path_cetk + (ext - path);
+        strncpy(path_cetk, path, 256);
+        path_cetk[255] = '\0';
+        strncpy(ext_cetk, "cetk", 5);
+        if (FileGetSize(path_cetk) > 0)
+            return GAME_NUSCDN; // NUS/CDN type 2
     } else if (strncasecmp(fname, TIKDB_NAME_ENC, sizeof(TIKDB_NAME_ENC)+1) == 0) {
         return BIN_TIKDB | FLAG_ENC; // titlekey database / encrypted
     } else if (strncasecmp(fname, TIKDB_NAME_DEC, sizeof(TIKDB_NAME_DEC)+1) == 0) {
@@ -159,16 +159,10 @@ u64 IdentifyFileType(const char* path) {
         return BIN_KEYDB; // key database
     } else if ((sscanf(fname, "slot%02lXKey", &id) == 1) && (strncasecmp(ext, "bin", 4) == 0) && (fsize = 16) && (id < 0x40)) {
         return BIN_LEGKEY; // legacy key file
-    } else if ((strncmp((char*) data, CIFINISH_MAGIC, strlen(CIFINISH_MAGIC)) == 0) &&
-        (fsize == CIFINISH_SIZE((void*) data)) && (fsize > sizeof(CifinishHeader))) {
-        return BIN_CIFNSH;
     } else if (ValidateText((char*) data, (fsize > 0x200) ? 0x200 : fsize)) {
         u64 type = 0;
-        if ((fsize < SCRIPT_MAX_SIZE) && (strcasecmp(ext, SCRIPT_EXT) == 0))
+        if ((fsize < SCRIPT_MAX_SIZE) && (strncasecmp(ext, SCRIPT_EXT, strnlen(SCRIPT_EXT, 16) + 1) == 0))
             type |= TXT_SCRIPT; // should be a script (which is also generic text)
-        // this should check if it's compiled lua bytecode (done with luac), which is NOT text
-        else if ((fsize < LUASCRIPT_MAX_SIZE) && (strcasecmp(ext, LUASCRIPT_EXT) == 0))
-            type |= TXT_LUA;
         if (fsize < STD_BUFFER_SIZE) type |= TXT_GENERIC;
         return type;
     } else if ((strncmp(path + 2, "/Nintendo DSiWare/", 18) == 0) &&
@@ -182,12 +176,12 @@ u64 IdentifyFileType(const char* path) {
         char* name_cdn = path_cdn + (fname - path);
         strncpy(path_cdn, path, 256);
         path_cdn[255] = '\0';
-        strncpy(name_cdn, "tmd", 4); // this will not catch tmd with version
+        strncpy(name_cdn, "tmd", 4);
         if (FileGetSize(path_cdn) > 0)
-            return GAME_NUSCDN; // NUS/CDN, recognized by TMD
+            return GAME_NUSCDN; // NUS/CDN type 1
         strncpy(name_cdn, "cetk", 5);
         if (FileGetSize(path_cdn) > 0)
-            return GAME_NUSCDN; // NUS/CDN, recognized by CETK
+            return GAME_NUSCDN; // NUS/CDN type 1
     }
 
     return 0;

arm9/source/filesys/filetype.h

@@ -8,65 +8,58 @@
 #define GAME_NCSD   (1ULL<<3)
 #define GAME_NCCH   (1ULL<<4)
 #define GAME_TMD    (1ULL<<5)
-#define GAME_CDNTMD (1ULL<<6)
-#define GAME_TWLTMD (1ULL<<7)
-#define GAME_CMD    (1ULL<<8)
-#define GAME_EXEFS  (1ULL<<9)
-#define GAME_ROMFS  (1ULL<<10)
-#define GAME_BOSS   (1ULL<<11)
-#define GAME_NUSCDN (1ULL<<12)
-#define GAME_TICKET (1ULL<<13)
-#define GAME_TIE    (1ULL<<14)
-#define GAME_SMDH   (1ULL<<15)
-#define GAME_3DSX   (1ULL<<16)
-#define GAME_NDS    (1ULL<<17)
-#define GAME_GBA    (1ULL<<18)
-#define GAME_TAD    (1ULL<<19)
-#define SYS_FIRM    (1ULL<<20)
-#define SYS_DIFF    (1ULL<<21)
-#define SYS_DISA    (1ULL<<22)
-#define SYS_AGBSAVE (1ULL<<23)
-#define SYS_TICKDB  (1ULL<<24)
-#define BIN_CIFNSH  (1ULL<<25)
-#define BIN_NCCHNFO (1ULL<<26)
-#define BIN_TIKDB   (1ULL<<27)
-#define BIN_KEYDB   (1ULL<<28)
-#define BIN_LEGKEY  (1ULL<<29)
-#define TXT_SCRIPT  (1ULL<<30)
-#define TXT_GENERIC (1ULL<<31)
-#define GFX_PNG     (1ULL<<32)
-#define FONT_PBM    (1ULL<<33)
-#define FONT_RIFF   (1ULL<<34)
-#define NOIMG_NAND  (1ULL<<35)
-#define HDR_NAND    (1ULL<<36)
-#define TRANSLATION (1ULL<<37)
-#define TXT_LUA     (1ULL<<38)
+#define GAME_CMD    (1ULL<<6)
+#define GAME_EXEFS  (1ULL<<7)
+#define GAME_ROMFS  (1ULL<<8)
+#define GAME_BOSS   (1ULL<<9)
+#define GAME_NUSCDN (1ULL<<10)
+#define GAME_TICKET (1ULL<<11)
+#define GAME_TIE 	(1ULL<<12)
+#define GAME_SMDH   (1ULL<<13)
+#define GAME_3DSX   (1ULL<<14)
+#define GAME_NDS    (1ULL<<15)
+#define GAME_GBA    (1ULL<<16)
+#define GAME_TAD    (1ULL<<17)
+#define SYS_FIRM    (1ULL<<18)
+#define SYS_DIFF    (1ULL<<19)
+#define SYS_DISA    (1ULL<<20)
+#define SYS_AGBSAVE (1ULL<<21)
+#define SYS_TICKDB  (1ULL<<22)
+#define BIN_NCCHNFO (1ULL<<23)
+#define BIN_TIKDB   (1ULL<<24)
+#define BIN_KEYDB   (1ULL<<25)
+#define BIN_LEGKEY  (1ULL<<26)
+#define TXT_SCRIPT  (1ULL<<27)
+#define TXT_GENERIC (1ULL<<28)
+#define GFX_PNG     (1ULL<<29)
+#define FONT_PBM    (1ULL<<30)
+#define NOIMG_NAND  (1ULL<<31)
+#define HDR_NAND    (1ULL<<32)
 #define TYPE_BASE   0xFFFFFFFFFFULL // 40 bit reserved for base types
 
-// #define FLAG_FIRM   (1ULL<<58) // <--- for CXIs containing FIRMs
-// #define FLAG_GBAVC  (1ULL<<59) // <--- for GBAVC CXIs
-#define FLAG_DSIW   (1ULL<<60)
-#define FLAG_ENC    (1ULL<<61)
-#define FLAG_CTR    (1ULL<<62)
+// #define FLAG_FIRM   (1ULL<<57) // <--- for CXIs containing FIRMs
+// #define FLAG_GBAVC  (1ULL<<58) // <--- for GBAVC CXIs
+#define FLAG_DSIW   (1ULL<<59)
+#define FLAG_ENC    (1ULL<<60)
+#define FLAG_CTR    (1ULL<<61)
+#define FLAG_NUSCDN (1ULL<<62)
 #define FLAG_CXI    (1ULL<<63)
 
 #define FTYPE_MOUNTABLE(tp)     (tp&(IMG_FAT|IMG_NAND|GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_EXEFS|GAME_ROMFS|GAME_NDS|GAME_TAD|SYS_FIRM|SYS_DIFF|SYS_DISA|SYS_TICKDB|BIN_KEYDB))
-#define FTYPE_VERIFICABLE(tp)   (tp&(IMG_NAND|GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_TMD|GAME_CDNTMD|GAME_TWLTMD|GAME_TIE|GAME_TAD|GAME_TICKET|GAME_BOSS|SYS_FIRM))
+#define FTYPE_VERIFICABLE(tp)   (tp&(IMG_NAND|GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_TMD|GAME_TIE|GAME_BOSS|SYS_FIRM))
 #define FTYPE_DECRYPTABLE(tp)   (tp&(GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_BOSS|GAME_NUSCDN|SYS_FIRM|BIN_KEYDB))
 #define FTYPE_ENCRYPTABLE(tp)   (tp&(GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_BOSS|BIN_KEYDB))
-#define FTYPE_CIABUILD(tp)      ((tp&(GAME_NCSD|GAME_NCCH|GAME_TMD|GAME_CDNTMD|GAME_TWLTMD|GAME_TIE|GAME_TAD)) || ((tp&GAME_NDS)&&(tp&(FLAG_DSIW))))
-#define FTYPE_CIABUILD_L(tp)    (tp&(GAME_TMD|GAME_CDNTMD|GAME_TIE|GAME_TAD))
-#define FTYPE_CIAINSTALL(tp)    ((tp&(GAME_NCSD|GAME_NCCH|GAME_CIA|GAME_CDNTMD|GAME_TWLTMD)) || ((tp&GAME_NDS)&&(tp&(FLAG_DSIW))))
-#define FTYPE_TIKINSTALL(tp)    (tp&(GAME_TICKET))
-#define FTYPE_CIFINSTALL(tp)    (tp&(BIN_CIFNSH))
-#define FTYPE_TIKDUMP(tp)       (tp&(GAME_TIE))
-#define FTYPE_CXIDUMP(tp)       (tp&(GAME_TMD|GAME_TIE))
+#define FTYPE_CIABUILD(tp)      ((tp&(GAME_NCSD|GAME_NCCH|GAME_TMD|GAME_TIE)) || ((tp&GAME_NDS)&&(tp&(FLAG_DSIW))))
+#define FTYPE_CIABUILD_L(tp)    (FTYPE_CIABUILD(tp) && (tp&(GAME_TMD|GAME_TIE)))
+#define FTYPE_CIAINSTALL(tp)    ((tp&(GAME_NCSD|GAME_NCCH|GAME_CIA)) || ((tp&GAME_NDS)&&(tp&(FLAG_DSIW))) || (tp&(GAME_TMD)&&(tp&(FLAG_NUSCDN))))
+#define FTYPE_CXIDUMP(tp)       (tp&(GAME_TMD))
 #define FTYPE_UNINSTALL(tp)     (tp&(GAME_TIE))
 #define FTYPE_TIKBUILD(tp)      (tp&(GAME_TICKET|SYS_TICKDB|BIN_TIKDB))
 #define FTYPE_KEYBUILD(tp)      (tp&(BIN_KEYDB|BIN_LEGKEY))
-#define FTYPE_TITLEINFO(tp)     (tp&(GAME_TIE|GAME_CIA|GAME_TMD|GAME_CDNTMD|GAME_TWLTMD))
+#define FTYPE_TITLEINFO(tp)     (tp&(GAME_TIE|GAME_SMDH|GAME_NCCH|GAME_NCSD|GAME_CIA|GAME_TMD|GAME_NDS|GAME_GBA|GAME_TAD|GAME_3DSX))
+#define FTYPE_CIACHECK(tp)      (tp&GAME_CIA)
 #define FTYPE_RENAMABLE(tp)     (tp&(GAME_NCCH|GAME_NCSD|GAME_CIA|GAME_NDS|GAME_GBA))
-#define FTYPE_TRIMABLE(tp)      (tp&(IMG_NAND|GAME_NCCH|GAME_NCSD|GAME_NDS|GAME_GBA|SYS_FIRM))
+#define FTYPE_TRIMABLE(tp)      (tp&(IMG_NAND|GAME_NCCH|GAME_NCSD|GAME_NDS|SYS_FIRM))
 #define FTYPE_TRANSFERABLE(tp)  ((u64) (tp&(IMG_FAT|FLAG_CTR)) == (u64) (IMG_FAT|FLAG_CTR))
 #define FTYPE_NCSDFIXABLE(tp)   (tp&(HDR_NAND|NOIMG_NAND))
 #define FTYPE_HASCODE(tp)       (((u64) (tp&(GAME_NCCH|FLAG_CXI)) == (u64) (GAME_NCCH|FLAG_CXI))|(tp&GAME_NCSD))
@@ -78,11 +71,9 @@
 #define FTYPE_KEYINIT(tp)       (tp&(BIN_KEYDB))
 #define FTYPE_KEYINSTALL(tp)    (tp&(BIN_KEYDB))
 #define FTYPE_SCRIPT(tp)        (tp&(TXT_SCRIPT))
-#define FTYPE_LUA(tp)           (tp&(TXT_LUA))
-#define FTYPE_FONT(tp)          (tp&(FONT_PBM|FONT_RIFF))
-#define FTYPE_TRANSLATION(tp)   (tp&(TRANSLATION))
+#define FTYPE_FONT(tp)          (tp&(FONT_PBM))
 #define FTYPE_GFX(tp)           (tp&(GFX_PNG))
-#define FTYPE_SETABLE(tp)       (tp&(FONT_PBM|FONT_RIFF|TRANSLATION))
+#define FTYPE_SETABLE(tp)       (tp&(FONT_PBM))
 #define FTYPE_BOOTABLE(tp)      (tp&(SYS_FIRM))
 #define FTYPE_INSTALLABLE(tp)   (tp&(SYS_FIRM))
 #define FTYPE_AGBSAVE(tp)       (tp&(SYS_AGBSAVE))

arm9/source/filesys/fsdrive.c

@@ -1,7 +1,6 @@
 #include "fsdrive.h"
 #include "fsgame.h"
 #include "fsinit.h"
-#include "language.h"
 #include "virtual.h"
 #include "vcart.h"
 #include "sddata.h"
@@ -12,7 +11,7 @@
 // last search pattern, path & mode
 static char search_pattern[256] = { 0 };
 static char search_path[256] = { 0 };
-static bool title_manager_mode = false;
+static bool search_title_mode = false;
 
 int DriveType(const char* path) {
     int type = DRV_UNKNOWN;
@@ -22,8 +21,6 @@ int DriveType(const char* path) {
         type = DRV_FAT | DRV_ALIAS | ((*path == 'A') ? DRV_SYSNAND : DRV_EMUNAND);
     } else if (*search_pattern && *search_path && (strncmp(path, "Z:", 3) == 0)) {
         type = DRV_SEARCH;
-    } else if (title_manager_mode && (strncmp(path, "Y:", 3) == 0)) {
-        type = DRV_VIRTUAL | DRV_TITLEMAN;
     } else if ((pdrv >= 0) && (pdrv < NORM_FS)) {
         if (pdrv == 0) {
             type = DRV_FAT | DRV_SDCARD | DRV_STDFAT;
@@ -67,31 +64,28 @@ int DriveType(const char* path) {
     return type;
 }
 
-void SetFSSearch(const char* pattern, const char* path) {
+void SetFSSearch(const char* pattern, const char* path, bool mode) {
     if (pattern && path) {
         strncpy(search_pattern, pattern, 256);
         search_pattern[255] = '\0';
         strncpy(search_path, path, 256);
         search_path[255] = '\0';
+        search_title_mode = mode;
     } else *search_pattern = *search_path = '\0';
 }
 
-void SetTitleManagerMode(bool mode) {
-    title_manager_mode = mode;
-}
-
 bool GetFATVolumeLabel(const char* drv, char* label) {
     return (f_getlabel(drv, label, NULL) == FR_OK);
 }
 
 bool GetRootDirContentsWorker(DirStruct* contents) {
-    const char* drvname[] = { FS_DRVNAME };
+    static const char* drvname[] = { FS_DRVNAME };
     static const char* drvnum[] = { FS_DRVNUM };
     u32 n_entries = 0;
 
     char sdlabel[DRV_LABEL_LEN];
     if (!GetFATVolumeLabel("0:", sdlabel) || !(*sdlabel))
-        strcpy(sdlabel, STR_LAB_NOLABEL);
+        strcpy(sdlabel, "NOLABEL");
 
     char carttype[16];
     GetVCartTypeString(carttype);
@@ -102,15 +96,15 @@ bool GetRootDirContentsWorker(DirStruct* contents) {
         if (!DriveType(drvnum[i])) continue; // drive not available
         entry->p_name = 4;
         entry->name = entry->path + entry->p_name;
-        memset(entry->path, 0x00, 256);
+        memset(entry->path, 0x00, 64);
         snprintf(entry->path,  4, "%s", drvnum[i]);
         if ((*(drvnum[i]) >= '7') && (*(drvnum[i]) <= '9') && !(GetMountState() & IMG_NAND)) // Drive 7...9 handling
-            snprintf(entry->name, 252, "[%s] %s", drvnum[i],
-                (*(drvnum[i]) == '7') ? STR_LAB_FAT_IMAGE :
-                (*(drvnum[i]) == '8') ? STR_LAB_BONUS_DRIVE :
-                (*(drvnum[i]) == '9') ? STR_LAB_RAMDRIVE : "UNK");
+            snprintf(entry->name, 32, "[%s] %s", drvnum[i],
+                (*(drvnum[i]) == '7') ? "FAT IMAGE" :
+                (*(drvnum[i]) == '8') ? "BONUS DRIVE" :
+                (*(drvnum[i]) == '9') ? "RAMDRIVE" : "UNK");
         else if (*(drvnum[i]) == 'G') // Game drive special handling
-            snprintf(entry->name, 252, "[%s] %s %s", drvnum[i],
+            snprintf(entry->name, 32, "[%s] %s %s", drvnum[i],
                 (GetMountState() & GAME_CIA  ) ? "CIA"   :
                 (GetMountState() & GAME_NCSD ) ? "NCSD"  :
                 (GetMountState() & GAME_NCCH ) ? "NCCH"  :
@@ -120,10 +114,10 @@ bool GetRootDirContentsWorker(DirStruct* contents) {
                 (GetMountState() & SYS_FIRM  ) ? "FIRM"  :
                 (GetMountState() & GAME_TAD  ) ? "DSIWARE" : "UNK", drvname[i]);
         else if (*(drvnum[i]) == 'C') // Game cart handling
-            snprintf(entry->name, 252, "[%s] %s (%s)", drvnum[i], drvname[i], carttype);
+            snprintf(entry->name, 32, "[%s] %s (%s)", drvnum[i], drvname[i], carttype);
         else if (*(drvnum[i]) == '0') // SD card handling
-            snprintf(entry->name, 252, "[%s] %s (%s)", drvnum[i], drvname[i], sdlabel);
-        else snprintf(entry->name, 252, "[%s] %s", drvnum[i], drvname[i]);
+            snprintf(entry->name, 32, "[%s] %s (%s)", drvnum[i], drvname[i], sdlabel);
+        else snprintf(entry->name, 32, "[%s] %s", drvnum[i], drvname[i]);
         entry->size = GetTotalSpace(entry->path);
         entry->type = T_ROOT;
         entry->marked = 0;
@@ -212,12 +206,9 @@ void SearchDirContents(DirStruct* contents, const char* path, const char* patter
 
 void GetDirContents(DirStruct* contents, const char* path) {
     if (*search_path && (DriveType(path) & DRV_SEARCH)) {
-        ShowString("%s", STR_SEARCHING_PLEASE_WAIT);
+        ShowString("Searching, please wait...");
         SearchDirContents(contents, search_path, search_pattern, true);
-        ClearScreenF(true, false, COLOR_STD_BG);
-    } else if (title_manager_mode && (DriveType(path) & DRV_TITLEMAN)) {
-        SearchDirContents(contents, "T:", "*", false);
-        SetupTitleManager(contents);
+        if (search_title_mode) SetDirGoodNames(contents);
         ClearScreenF(true, false, COLOR_STD_BG);
     } else SearchDirContents(contents, path, NULL, false);
     if (*path) SortDirStruct(contents);
@@ -232,7 +223,7 @@ uint64_t GetFreeSpace(const char* path)
     FATFS* fsobj = GetMountedFSObject(path);
     if ((pdrv < 0) || !fsobj) return 0;
 
-    snprintf(fsname, sizeof(fsname), "%i:", pdrv);
+    snprintf(fsname, 3, "%i:", pdrv);
     if (f_getfree(fsname, &free_clusters, &fsptr) != FR_OK)
         return 0;
 

arm9/source/filesys/fsdrive.h

@@ -25,36 +25,30 @@
 #define DRV_VRAM        (1UL<<13)
 #define DRV_ALIAS       (1UL<<14)
 #define DRV_BONUS       (1UL<<15)
-#define DRV_TITLEMAN    (1UL<<16)
-#define DRV_SEARCH      (1UL<<17)
-#define DRV_STDFAT      (1UL<<18) // standard FAT drive without limitations
+#define DRV_SEARCH      (1UL<<16)
+#define DRV_STDFAT      (1UL<<17) // standard FAT drive without limitations
 
 #define DRV_LABEL_LEN   (36)
 
 #define FS_DRVNAME \
-        STR_LAB_SDCARD, \
-        STR_LAB_SYSNAND_CTRNAND, STR_LAB_SYSNAND_TWLN, STR_LAB_SYSNAND_TWLP, STR_LAB_SYSNAND_SD, STR_LAB_SYSNAND_VIRTUAL, \
-        STR_LAB_EMUNAND_CTRNAND, STR_LAB_EMUNAND_TWLN, STR_LAB_EMUNAND_TWLP, STR_LAB_EMUNAND_SD, STR_LAB_EMUNAND_VIRTUAL, \
-        STR_LAB_IMGNAND_CTRNAND, STR_LAB_IMGNAND_TWLN, STR_LAB_IMGNAND_TWLP, STR_LAB_IMGNAND_VIRTUAL, \
-        STR_LAB_GAMECART, \
-        STR_LAB_GAME_IMAGE, STR_LAB_AESKEYDB_IMAGE, STR_LAB_BDRI_IMAGE, STR_LAB_DISA_DIFF_IMAGE, \
-        STR_LAB_MEMORY_VIRTUAL, \
-        STR_LAB_VRAM_VIRTUAL, \
-        STR_LAB_TITLE_MANAGER, \
-        STR_LAB_LAST_SEARCH
+        "SDCARD", \
+        "SYSNAND CTRNAND", "SYSNAND TWLN", "SYSNAND TWLP", "SYSNAND SD", "SYSNAND VIRTUAL", \
+        "EMUNAND CTRNAND", "EMUNAND TWLN", "EMUNAND TWLP", "EMUNAND SD", "EMUNAND VIRTUAL", \
+        "IMGNAND CTRNAND", "IMGNAND TWLN", "IMGNAND TWLP", "IMGNAND VIRTUAL", \
+        "GAMECART", \
+        "GAME IMAGE", "AESKEYDB IMAGE", "BDRI IMAGE", "DISA/DIFF IMAGE", \
+        "MEMORY VIRTUAL", \
+        "VRAM VIRTUAL", \
+        "LAST SEARCH" \
 
 #define FS_DRVNUM \
-    "0:", "1:", "2:", "3:", "A:", "S:", "4:", "5:", "6:", "B:", "E:", "7:", "8:", "9:", \
-    "I:", "C:", "G:", "K:", "T:", "D:", "M:", "V:", "Y:", "Z:"
+    "0:", "1:", "2:", "3:", "A:", "S:", "4:", "5:", "6:", "B:", "E:", "7:", "8:", "9:", "I:", "C:", "G:", "K:", "T:", "D:", "M:", "V:", "Z:"
 
 /** Function to identify the type of a drive **/
 int DriveType(const char* path);
 
 /** Set search pattern / path / mode for special Z: drive **/
-void SetFSSearch(const char* pattern, const char* path);
-
-/** Enable title manager for special processing of mounted title.db **/
-void SetTitleManagerMode(bool mode);
+void SetFSSearch(const char* pattern, const char* path, bool mode);
 
 /** Read the FAT volume label of a partition **/
 bool GetFATVolumeLabel(const char* drv, char* label);

arm9/source/filesys/fsgame.c

@@ -1,17 +1,14 @@
 #include "fsgame.h"
 #include "fsperm.h"
 #include "gameutil.h"
-#include "language.h"
-#include "tie.h"
 #include "ui.h"
-#include "vff.h"
+#include "ff.h"
 
-void SetupTitleManager(DirStruct* contents) {
+void SetDirGoodNames(DirStruct* contents) {
     char goodname[256];
     ShowProgress(0, 0, "");
     for (u32 s = 0; s < contents->n_entries; s++) {
         DirEntry* entry = &(contents->entry[s]);
-        // set good name for entry
         u32 plen = strnlen(entry->path, 256);
         if (!ShowProgress(s+1, contents->n_entries, entry->path)) break;
         if ((GetGoodName(goodname, entry->path, false) != 0) ||
@@ -20,11 +17,6 @@ void SetupTitleManager(DirStruct* contents) {
         entry->p_name = plen + 1;
         entry->name = entry->path + entry->p_name;
         snprintf(entry->name, 256 - entry->p_name, "%s", goodname);
-        // grab title size from tie
-        TitleInfoEntry tie;
-        if (fvx_qread(entry->path, &tie, 0, sizeof(TitleInfoEntry), NULL) != FR_OK)
-            continue;
-        entry->size = tie.title_size;
     }
 }
 
@@ -35,12 +27,12 @@ bool GoodRenamer(DirEntry* entry, bool ask) {
         return false;
 
     if (ask) { // ask for confirmatiom
-        char oldname_tr[UTF_BUFFER_BYTESIZE(32)];
+        char oldname_tr[32+1];
         char newname_ww[256];
         TruncateString(oldname_tr, entry->name, 32, 8);
         strncpy(newname_ww, goodname, 256);
         WordWrapString(newname_ww, 32);
-        if (!ShowPrompt(true, "%s\n%s\n \n%s", oldname_tr, STR_RENAME_TO_GOOD_NAME, newname_ww))
+        if (!ShowPrompt(true, "%s\nRename to good name?\n \n%s", oldname_tr, newname_ww))
             return true; // call it a success because user choice
     }
 

arm9/source/filesys/fsgame.h

@@ -3,5 +3,5 @@
 #include "common.h"
 #include "fsdir.h"
 
-void SetupTitleManager(DirStruct* contents);
+void SetDirGoodNames(DirStruct* contents);
 bool GoodRenamer(DirEntry* entry, bool ask);

arm9/source/filesys/fsinit.c

@@ -21,7 +21,7 @@ bool InitExtFS() {
 
     for (u32 i = 1; i < NORM_FS; i++) {
         char fsname[8];
-        snprintf(fsname, sizeof(fsname), "%lu:", i);
+        snprintf(fsname, 7, "%lu:", i);
         if (fs_mounted[i]) continue;
         fs_mounted[i] = (f_mount(fs + i, fsname, 1) == FR_OK);
         if ((!fs_mounted[i] || !ramdrv_ready) && (i == NORM_FS - 1) && !(GetMountState() & IMG_NAND)) {
@@ -44,7 +44,7 @@ bool InitImgFS(const char* path) {
     u32 drv_i = NORM_FS - IMGN_FS;
     char fsname[8];
     for (; drv_i < NORM_FS; drv_i++) {
-        snprintf(fsname, sizeof(fsname), "%lu:", drv_i);
+        snprintf(fsname, 7, "%lu:", drv_i);
         if (!(DriveType(fsname)&DRV_IMAGE)) break;
     }
     // deinit virtual filesystem
@@ -58,7 +58,7 @@ bool InitImgFS(const char* path) {
     else if ((type&IMG_FAT) && (drv_i < NORM_FS - IMGN_FS + 1)) drv_i = NORM_FS - IMGN_FS + 1;
     // reinit image filesystem
     for (u32 i = NORM_FS - IMGN_FS; i < drv_i; i++) {
-        snprintf(fsname, sizeof(fsname), "%lu:", i);
+        snprintf(fsname, 7, "%lu:", i);
         fs_mounted[i] = (f_mount(fs + i, fsname, 1) == FR_OK);
     }
     return GetMountState();
@@ -71,7 +71,7 @@ void DeinitExtFS() {
     for (u32 i = NORM_FS - 1; i > 0; i--) {
         if (fs_mounted[i]) {
             char fsname[8];
-            snprintf(fsname, sizeof(fsname), "%lu:", i);
+            snprintf(fsname, 7, "%lu:", i);
             f_mount(NULL, fsname, 1);
             fs_mounted[i] = false;
         }
@@ -91,7 +91,7 @@ void DismountDriveType(u32 type) { // careful with this - no safety checks
     }
     for (u32 i = 0; i < NORM_FS; i++) {
         char fsname[8];
-        snprintf(fsname, sizeof(fsname), "%lu:", i);
+        snprintf(fsname, 7, "%lu:", i);
         if (!fs_mounted[i] || !(type & DriveType(fsname)))
             continue;
         f_mount(NULL, fsname, 1);

arm9/source/filesys/fsperm.c

@@ -4,7 +4,6 @@
 #include "image.h"
 #include "unittype.h"
 #include "essentials.h"
-#include "language.h"
 #include "ui.h"
 #include "sdmmc.h"
 
@@ -21,7 +20,7 @@
 static u32 write_permissions = PERM_BASE;
 
 bool CheckWritePermissions(const char* path) {
-    char area_name[UTF_BUFFER_BYTESIZE(16)];
+    char area_name[16];
     int drvtype = DriveType(path);
     u32 perm;
 
@@ -41,7 +40,7 @@ bool CheckWritePermissions(const char* path) {
 
     // SD card write protection check
     if ((drvtype & (DRV_SDCARD | DRV_EMUNAND | DRV_ALIAS)) && SD_WRITE_PROTECTED) {
-        ShowPrompt(false, "%s", STR_SD_WRITE_PROTECTED_CANT_CONTINUE);
+        ShowPrompt(false, "SD card is write protected!\nCan't continue.");
         return false;
     }
 
@@ -64,7 +63,7 @@ bool CheckWritePermissions(const char* path) {
             if ((drvtype & DRV_CTRNAND) || (lvl == 2)) lvl = 3;
         }
         perm = perms[lvl];
-        snprintf(area_name, sizeof(area_name), STR_SYSNAND_LVL_N, lvl);
+        snprintf(area_name, 16, "SysNAND (lvl%lu)", lvl);
     } else if (drvtype & DRV_EMUNAND) {
         static const u32 perms[] = { PERM_EMU_LVL0, PERM_EMU_LVL1 };
         u32 lvl = (drvtype & (DRV_ALIAS|DRV_CTRNAND)) ? 1 : 0;
@@ -74,34 +73,34 @@ bool CheckWritePermissions(const char* path) {
                 if (strncasecmp(path_f, path_lvl1[i], 256) == 0) lvl = 1;
         }
         perm = perms[lvl];
-        snprintf(area_name, sizeof(area_name), STR_EMUNAND_LVL_N, lvl);
+        snprintf(area_name, 16, "EmuNAND (lvl%lu)", lvl);
     } else if (drvtype & DRV_GAME) {
         perm = PERM_GAME;
-        snprintf(area_name, sizeof(area_name), "%s", STR_GAME_IMAGES);
+        snprintf(area_name, 16, "game images");
     } else if (drvtype & DRV_CART) {
         perm = PERM_CART;
-        snprintf(area_name, sizeof(area_name), "%s", STR_GAMECART_SAVES);
+        snprintf(area_name, 16, "gamecart saves");
     } else if (drvtype & DRV_VRAM) {
         perm = PERM_VRAM;
-        snprintf(area_name, sizeof(area_name), "vram0");
+        snprintf(area_name, 16, "vram0");
     } else if (drvtype & DRV_XORPAD) {
         perm = PERM_XORPAD;
-        snprintf(area_name, sizeof(area_name), "XORpads");
+        snprintf(area_name, 16, "XORpads");
     } else if (drvtype & DRV_IMAGE) {
         perm = PERM_IMAGE;
-        snprintf(area_name, sizeof(area_name), "%s", STR_IMAGES);
+        snprintf(area_name, 16, "images");
     } else if (drvtype & DRV_MEMORY) {
         perm = PERM_MEMORY;
-        snprintf(area_name, sizeof(area_name), "%s", STR_MEMORY_AREAS);
+        snprintf(area_name, 16, "memory areas");
     } else if (strncasecmp(path_f, "0:/Nintendo 3DS", 15) == 0) { // this check could be better
         perm = PERM_SDDATA;
-        snprintf(area_name, sizeof(area_name), "%s", STR_SD_SYSTEM_DATA);
+        snprintf(area_name, 16, "SD system data");
     } else if (drvtype & DRV_SDCARD) {
         perm = PERM_SDCARD;
-        snprintf(area_name, sizeof(area_name), "%s", STR_SD_CARD);
+        snprintf(area_name, 16, "SD card");
     } else if (drvtype & DRV_RAMDRIVE) {
         perm = PERM_RAMDRIVE;
-        snprintf(area_name, sizeof(area_name), "%s", STR_RAM_DRIVE);
+        snprintf(area_name, 16, "RAM drive");
     } else {
         return false;
     }
@@ -113,14 +112,14 @@ bool CheckWritePermissions(const char* path) {
     // offer unlock if possible
     if (!(perm & (PERM_VRAM|PERM_GAME|PERM_XORPAD))) {
         // ask the user
-        if (!ShowPrompt(true, STR_WRITING_TO_DRIVE_IS_LOCKED_UNLOCK_NOW, area_name))
+        if (!ShowPrompt(true, "Writing to %s is locked!\nUnlock it now?", area_name))
             return false;
 
         return SetWritePermissions(perm, true);
     }
 
     // unlock not possible
-    ShowPrompt(false, STR_UNLOCK_WRITE_FOR_DRIVE_NOT_ALLOWED, area_name);
+    ShowPrompt(false, "Unlock write permission for\n%s is not allowed.", area_name);
     return false;
 }
 
@@ -145,65 +144,65 @@ bool SetWritePermissions(u32 perm, bool add_perm) {
 
     switch (perm) {
         case PERM_BASE:
-            if (!ShowUnlockSequence(1, "%s", STR_ENABLE_BASE_WRITE))
+            if (!ShowUnlockSequence(1, "You want to enable base\nwriting permissions."))
                 return false;
             break;
         case PERM_SDCARD:
-            if (!ShowUnlockSequence(1, "%s", STR_ENABLE_SD_WRITE))
+            if (!ShowUnlockSequence(1, "You want to enable SD card\nwriting permissions."))
                 return false;
             break;
         case PERM_IMAGE:
-            if (!ShowUnlockSequence(1, "%s", STR_ENABLE_IMAGE_WRITE))
+            if (!ShowUnlockSequence(1, "You want to enable image\nwriting permissions."))
                 return false;
             break;
         case PERM_RAMDRIVE:
-            if (!ShowUnlockSequence(1, "%s", STR_ENABLE_RAM_DRIVE_WRITE))
+            if (!ShowUnlockSequence(1, "You want to enable RAM drive\nwriting permissions."))
                 return false;
             break;
         case PERM_EMU_LVL0:
-            if (!ShowUnlockSequence(1, "%s", STR_ENABLE_EMUNAND_0_WRITE))
+            if (!ShowUnlockSequence(1, "You want to enable EmuNAND\nlvl0 writing permissions."))
                 return false;
             break;
         case PERM_SYS_LVL0:
-            if (!ShowUnlockSequence(1, "%s", STR_ENABLE_SYSNAND_0_WRITE))
+            if (!ShowUnlockSequence(1, "You want to enable SysNAND\nlvl0 writing permissions."))
                 return false;
             break;
         case PERM_EMU_LVL1:
-            if (!ShowUnlockSequence(2, "%s", STR_ENABLE_EMUNAND_1_WRITE))
+            if (!ShowUnlockSequence(2, "You want to enable EmuNAND\nlvl1 writing permissions.\n \nThis enables you to modify\nrecoverable system data,\nuser data & savegames."))
                 return false;
             break;
         case PERM_SYS_LVL1:
-            if (!ShowUnlockSequence(2, "%s", STR_ENABLE_SYSNAND_1_WRITE))
+            if (!ShowUnlockSequence(2, "You want to enable SysNAND\nlvl1 writing permissions.\n \nThis enables you to modify\nsystem data, installations,\nuser data & savegames."))
+                return false;
+            break;
+        case PERM_SDDATA:
+            if (!ShowUnlockSequence(2, "You want to enable SD data\nwriting permissions.\n \nThis enables you to modify\ninstallations, user data &\nsavegames."))
                 return false;
             break;
         case PERM_CART:
-            if (!ShowUnlockSequence(2, "%s", STR_ENABLE_GAMECART_SAVE_WRITE))
+            if (!ShowUnlockSequence(2, "You want to enable gamecart\nsave writing permissions."))
                 return false;
             break;
         #ifndef SAFEMODE
         case PERM_SYS_LVL2:
-            if (!ShowUnlockSequence(3, "%s", STR_ENABLE_SYSNAND_2_WRITE))
+            if (!ShowUnlockSequence(3, "!Better be careful!\n \nYou want to enable SysNAND\nlvl2 writing permissions.\n \nThis enables you to modify\nirrecoverable system data!"))
                 return false;
             break;
         case PERM_MEMORY:
-            if (!ShowUnlockSequence(4, "%s", STR_ENABLE_MEMORY_WRITE))
-                return false;
-            break;
-        case PERM_SDDATA:
-            if (!ShowUnlockSequence(5, "%s", STR_ENABLE_SD_DATA_WRITE))
+            if (!ShowUnlockSequence(4, "!Better be careful!\n \nYou want to enable memory\nwriting permissions.\n \nWriting to certain areas may\nlead to unexpected results."))
                 return false;
             break;
         case PERM_SYS_LVL3:
-            if (!ShowUnlockSequence(6, "%s", STR_ENABLE_SYSNAND_3_WRITE))
+            if (!ShowUnlockSequence(6, "!THIS IS YOUR ONLY WARNING!\n \nYou want to enable SysNAND\nlvl3 writing permissions.\n \nThis enables you to OVERWRITE\nyour bootloader installation,\nessential system files and/or\nBRICK your console!"))
                 return false;
             break;
         default:
-            ShowPrompt(false, "%s", STR_UNLOCK_WRITE_NOT_ALLOWED);
+            ShowPrompt(false, "Unlock write permission is not allowed.");
             return false;
             break;
         #else
         default:
-            ShowPrompt(false, "%s", STR_CANT_UNLOCK_WRITE_TRY_GODMODE9);
+            ShowPrompt(false, "Can't unlock write permission.\nTry GodMode9 instead!");
             return false;
             break;
         #endif

arm9/source/filesys/fsperm.h

@@ -21,7 +21,7 @@
 #define PERM_BASE       (PERM_SDCARD | PERM_IMAGE | PERM_RAMDRIVE | PERM_EMU_LVL0 | PERM_SYS_LVL0)
 
 // permission levels / colors
-#define PERM_BLUE       (GetWritePermissions()&(PERM_MEMORY|(PERM_SDDATA&~PERM_SDCARD)))
+#define PERM_BLUE       (GetWritePermissions()&PERM_MEMORY)
 #define PERM_RED        (GetWritePermissions()&(PERM_SYS_LVL3&~PERM_SYS_LVL2))
 #define PERM_ORANGE     (GetWritePermissions()&(PERM_SYS_LVL2&~PERM_SYS_LVL1))
 #define PERM_YELLOW     (GetWritePermissions()&((PERM_SYS_LVL1&~PERM_SYS_LVL0)|(PERM_EMU_LVL1&~PERM_EMU_LVL0)|(PERM_SDDATA&~PERM_SDCARD)|PERM_CART))

arm9/source/filesys/fsutil.c

@@ -11,10 +11,9 @@
 #include "ff.h"
 #include "ui.h"
 #include "swkbd.h"
-#include "language.h"
 
-#define SKIP_CUR        (1UL<<11)
-#define OVERWRITE_CUR   (1UL<<12)
+#define SKIP_CUR        (1UL<<10)
+#define OVERWRITE_CUR   (1UL<<11)
 
 #define _MAX_FS_OPT     8 // max file selector options
 
@@ -47,13 +46,13 @@ bool FormatSDCard(u64 hidden_mb, u32 cluster_size, const char* label) {
 
     // FAT size check
     if (fat_size < 0x80000) { // minimum free space: 256MB
-        ShowPrompt(false, "%s", STR_ERROR_SD_TOO_SMALL);
+        ShowPrompt(false, "Error: SD card is too small");
         return false;
     }
 
     // Write protection check
     if (SD_WRITE_PROTECTED) {
-        ShowPrompt(false, "%s", STR_SD_WRITE_PROTECTED_CANT_CONTINUE);
+        ShowPrompt(false, "SD card is write protected!\nCan't continue.");
         return false;
     }
 
@@ -68,15 +67,15 @@ bool FormatSDCard(u64 hidden_mb, u32 cluster_size, const char* label) {
 
     // one last warning....
     // 0:/Nintendo 3DS/ write permission is ignored here, this warning is enough
-    if (!ShowUnlockSequence(5, "%s", STR_WARNING_PROCEEDING_WILL_FORMAT_SD_DELETE_ALL_DATA))
+    if (!ShowUnlockSequence(5, "!WARNING!\n \nProceeding will format this SD.\nThis will irreversibly delete\nALL data on it."))
         return false;
-    ShowString("%s", STR_FORMATTING_SD_PLEASE_WAIT);
+    ShowString("Formatting SD, please wait...");
 
     // write the MBR to disk
     // !this assumes a fully deinitialized file system!
     if ((sdmmc_sdcard_init() != 0) || (sdmmc_sdcard_writesectors(0, 1, mbr) != 0) ||
         (emu_size && ((sdmmc_nand_readsectors(0, 1, ncsd) != 0) || (sdmmc_sdcard_writesectors(1, 1, ncsd) != 0)))) {
-        ShowPrompt(false, "%s", STR_ERROR_SD_CARD_IO_FAILURE);
+        ShowPrompt(false, "Error: SD card i/o failure");
         return false;
     }
 
@@ -105,9 +104,9 @@ bool FormatSDCard(u64 hidden_mb, u32 cluster_size, const char* label) {
 }
 
 bool SetupBonusDrive(void) {
-    if (!ShowUnlockSequence(3, "%s", STR_FORMAT_BONUS_DRIVE_DELETE_ALL_DATA))
+    if (!ShowUnlockSequence(3, "Format the bonus drive?\nThis will irreversibly delete\nALL data on it."))
         return false;
-    ShowString("%s", STR_FORMATTING_DRIVE_PLEASE_WAIT);
+    ShowString("Formatting drive, please wait...");
     if (GetMountState() & IMG_NAND) InitImgFS(NULL);
 
     u8* buffer = (u8*) malloc(STD_BUFFER_SIZE);
@@ -128,10 +127,10 @@ bool FileUnlock(const char* path) {
 
     if (!(DriveType(path) & DRV_FAT)) return true; // can't really check this
     if ((res = fx_open(&file, path, FA_READ | FA_OPEN_EXISTING)) != FR_OK) {
-        char pathstr[UTF_BUFFER_BYTESIZE(32)];
+        char pathstr[32 + 1];
         TruncateString(pathstr, path, 32, 8);
         if (GetMountState() && (res == FR_LOCKED) &&
-            (ShowPrompt(true, "%s\n%s", pathstr, STR_FILE_IS_MOUNTED_UNMOUNT_TO_UNLOCK))) {
+            (ShowPrompt(true, "%s\nFile is currently mounted.\nUnmount to unlock?", pathstr))) {
             InitImgFS(NULL);
             if (fx_open(&file, path, FA_READ | FA_OPEN_EXISTING) != FR_OK)
                 return false;
@@ -162,7 +161,7 @@ size_t FileGetSize(const char* path) {
     return fno.fsize;
 }
 
-bool FileGetSha(const char* path, u8* hash, u64 offset, u64 size, bool sha1) {
+bool FileGetSha256(const char* path, u8* sha256, u64 offset, u64 size) {
     bool ret = true;
     FIL file;
     u64 fsize;
@@ -180,7 +179,7 @@ bool FileGetSha(const char* path, u8* hash, u64 offset, u64 size, bool sha1) {
     if (!buffer) return false;
 
     ShowProgress(0, 0, path);
-    sha_init(sha1 ? SHA1_MODE : SHA256_MODE);
+    sha_init(SHA256_MODE);
     for (u64 pos = 0; (pos < size) && ret; pos += bufsiz) {
         UINT read_bytes = min(bufsiz, size - pos);
         UINT bytes_read = 0;
@@ -191,7 +190,7 @@ bool FileGetSha(const char* path, u8* hash, u64 offset, u64 size, bool sha1) {
         sha_update(buffer, bytes_read);
     }
 
-    sha_get(hash);
+    sha_get(sha256);
     fvx_close(&file);
     free(buffer);
 
@@ -251,7 +250,7 @@ bool FileInjectFile(const char* dest, const char* orig, u64 off_dest, u64 off_or
 
     if (!CheckWritePermissions(dest)) return false;
     if (strncasecmp(dest, orig, 256) == 0) {
-        ShowPrompt(false, "%s", STR_ERROR_CANT_INJECT_FILE_INTO_ITSELF);
+        ShowPrompt(false, "Error: Can't inject file into itself");
         return false;
     }
 
@@ -270,12 +269,12 @@ bool FileInjectFile(const char* dest, const char* orig, u64 off_dest, u64 off_or
 
     // check file limits
     if (!allow_expand && (off_dest + size > fvx_size(&dfile))) {
-        ShowPrompt(false, "%s", STR_OPERATION_WOULD_WRITE_BEYOND_EOF);
+        ShowPrompt(false, "Operation would write beyond end of file");
         fvx_close(&dfile);
         fvx_close(&ofile);
         return false;
     } else if (off_orig + size > fvx_size(&ofile)) {
-        ShowPrompt(false, "%s", STR_NOT_ENOUGH_DATA_IN_FILE);
+        ShowPrompt(false, "Not enough data in file");
         fvx_close(&dfile);
         fvx_close(&ofile);
         return false;
@@ -296,8 +295,8 @@ bool FileInjectFile(const char* dest, const char* orig, u64 off_dest, u64 off_or
             ret = false;
         if (ret && !ShowProgress(pos + bytes_read, size, orig)) {
             if (flags && (*flags & NO_CANCEL)) {
-                ShowPrompt(false, "%s", STR_CANCEL_IS_NOT_ALLOWED_HERE);
-            } else ret = !ShowPrompt(true, "%s", STR_B_DETECTED_CANCEL);
+                ShowPrompt(false, "Cancel is not allowed here");
+            } else ret = !ShowPrompt(true, "B button detected. Cancel?");
             ShowProgress(0, 0, orig);
             ShowProgress(pos + bytes_read, size, orig);
         }
@@ -326,7 +325,7 @@ bool FileSetByte(const char* dest, u64 offset, u64 size, u8 fillbyte, u32* flags
 
     // check file limits
     if (!allow_expand && (offset + size > fvx_size(&dfile))) {
-        ShowPrompt(false, "%s", STR_OPERATION_WOULD_WRITE_BEYOND_EOF);
+        ShowPrompt(false, "Operation would write beyond end of file");
         fvx_close(&dfile);
         return false;
     }
@@ -346,8 +345,8 @@ bool FileSetByte(const char* dest, u64 offset, u64 size, u8 fillbyte, u32* flags
             ret = false;
         if (ret && !ShowProgress(pos + bytes_written, size, dest)) {
             if (flags && (*flags & NO_CANCEL)) {
-                ShowPrompt(false, "%s", STR_CANCEL_IS_NOT_ALLOWED_HERE);
-            } else ret = !ShowPrompt(true, "%s", STR_B_DETECTED_CANCEL);
+                ShowPrompt(false, "Cancel is not allowed here");
+            } else ret = !ShowPrompt(true, "B button detected. Cancel?");
             ShowProgress(0, 0, dest);
             ShowProgress(pos + bytes_written, size, dest);
         }
@@ -363,8 +362,8 @@ bool FileSetByte(const char* dest, u64 offset, u64 size, u8 fillbyte, u32* flags
 bool FileCreateDummy(const char* cpath, const char* filename, u64 size) {
     char npath[256]; // 256 is the maximum length of a full path
     if (!CheckWritePermissions(cpath)) return false;
-    if (filename) snprintf(npath, sizeof(npath), "%s/%s", cpath, filename);
-    else snprintf(npath, sizeof(npath), "%s", cpath);
+    if (filename) snprintf(npath, 255, "%s/%s", cpath, filename);
+    else snprintf(npath, 255, "%s", cpath);
 
     // create dummy file (fail if already existing)
     // then, expand the file size via cluster preallocation
@@ -381,7 +380,7 @@ bool FileCreateDummy(const char* cpath, const char* filename, u64 size) {
 bool DirCreate(const char* cpath, const char* dirname) {
     char npath[256]; // 256 is the maximum length of a full path
     if (!CheckWritePermissions(cpath)) return false;
-    snprintf(npath, sizeof(npath), "%s/%s", cpath, dirname);
+    snprintf(npath, 255, "%s/%s", cpath, dirname);
     if (fa_mkdir(npath) != FR_OK) return false;
     return (fa_stat(npath, NULL) == FR_OK);
 }
@@ -449,7 +448,6 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
     bool silent = (flags && (*flags & SILENT));
     bool append = (flags && (*flags & APPEND_ALL));
     bool calcsha = (flags && (*flags & CALC_SHA) && !append);
-    bool sha1 = (flags && (*flags & USE_SHA1));
     bool ret = false;
 
     // check destination write permission (special paths only)
@@ -462,12 +460,12 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
     if (move && (to_virtual || fno.fattrib & AM_VRT)) return false; // trying to move a virtual file
 
     // path string (for output)
-    char deststr[UTF_BUFFER_BYTESIZE(36)];
+    char deststr[36 + 1];
     TruncateString(deststr, dest, 36, 8);
 
     // the copy process takes place here
     if (!ShowProgress(0, 0, orig) && !(flags && (*flags & NO_CANCEL))) {
-        if (ShowPrompt(true, "%s\n%s", deststr, STR_B_DETECTED_CANCEL)) return false;
+        if (ShowPrompt(true, "%s\nB button detected. Cancel?", deststr)) return false;
         ShowProgress(0, 0, orig);
     }
     if (move && fvx_stat(dest, NULL) != FR_OK) { // moving if dest not existing
@@ -477,14 +475,14 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
         char* fname = orig + strnlen(orig, 256);
 
         if (append) {
-            if (!silent) ShowPrompt(false, "%s\n%s", deststr, STR_ERROR_CANNOT_APPEND_FOLDER);
+            if (!silent) ShowPrompt(false, "%s\nError: Cannot append a folder", deststr);
             return false;
         }
 
         // create the destination folder if it does not already exist
         if (fvx_opendir(&pdir, dest) != FR_OK) {
             if (fvx_mkdir(dest) != FR_OK) {
-                if (!silent) ShowPrompt(false, "%s\n%s", deststr, STR_ERROR_OVERWRITING_FILE_WITH_DIR);
+                if (!silent) ShowPrompt(false, "%s\nError: Overwriting file with dir", deststr);
                 return false;
             }
         } else fvx_closedir(&pdir);
@@ -517,7 +515,7 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
     } else if (move) { // moving if destination exists
         if (fvx_stat(dest, &fno) != FR_OK) return false;
         if (fno.fattrib & AM_DIR) {
-            if (!silent) ShowPrompt(false, "%s\n%s", deststr, STR_ERROR_OVERWRITING_DIR_WITH_FILE);
+            if (!silent) ShowPrompt(false, "%s\nError: Overwriting dir with file", deststr);
             return false;
         }
         if (fvx_unlink(dest) != FR_OK) return false;
@@ -536,7 +534,7 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
 
         if ((!append || (fvx_open(&dfile, dest, FA_WRITE | FA_OPEN_EXISTING) != FR_OK)) &&
             (fvx_open(&dfile, dest, FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)) {
-            if (!silent) ShowPrompt(false, "%s\n%s", deststr, STR_ERROR_CANNOT_OPEN_DESTINATION_FILE);
+            if (!silent) ShowPrompt(false, "%s\nError: Cannot open destination file", deststr);
             fvx_close(&ofile);
             return false;
         }
@@ -545,7 +543,7 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
         osize = fvx_size(&ofile);
         dsize = append ? fvx_size(&dfile) : 0; // always 0 if not appending to file
         if ((fvx_lseek(&dfile, (osize + dsize)) != FR_OK) || (fvx_sync(&dfile) != FR_OK) || (fvx_tell(&dfile) != (osize + dsize))) { // check space via cluster preallocation
-            if (!silent) ShowPrompt(false, "%s\n%s", deststr, STR_ERROR_NOT_ENOUGH_SPACE_AVAILABLE);
+            if (!silent) ShowPrompt(false, "%s\nError: Not enough space available", deststr);
             ret = false;
         }
 
@@ -554,7 +552,7 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
         fvx_lseek(&ofile, 0);
         fvx_sync(&ofile);
 
-        if (calcsha) sha_init(sha1 ? SHA1_MODE : SHA256_MODE);
+        if (calcsha) sha_init(SHA256_MODE);
         for (u64 pos = 0; (pos < osize) && ret; pos += bufsiz) {
             UINT bytes_read = 0;
             UINT bytes_written = 0;
@@ -567,8 +565,8 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
             u64 total = osize;
             if (ret && !ShowProgress(current, total, orig)) {
                 if (flags && (*flags & NO_CANCEL)) {
-                    ShowPrompt(false, "%s\n%s", deststr, STR_CANCEL_IS_NOT_ALLOWED_HERE);
-                } else ret = !ShowPrompt(true, "%s\n%s", deststr, STR_B_DETECTED_CANCEL);
+                    ShowPrompt(false, "%s\nCancel is not allowed here", deststr);
+                } else ret = !ShowPrompt(true, "%s\nB button detected. Cancel?", deststr);
                 ShowProgress(0, 0, orig);
                 ShowProgress(current, total, orig);
             }
@@ -582,11 +580,11 @@ bool PathMoveCopyRec(char* dest, char* orig, u32* flags, bool move, u8* buffer,
         if (!ret && ((dsize == 0) || (fvx_lseek(&dfile, dsize) != FR_OK) || (f_truncate(&dfile) != FR_OK))) {
             fvx_unlink(dest);
         } else if (!to_virtual && calcsha) {
-            u8 hash[0x20];
+            u8 sha256[0x20];
             char* ext_sha = dest + strnlen(dest, 256);
-            snprintf(ext_sha, 256 - (ext_sha - dest), ".sha%c", sha1 ? '1' : '\0');
-            sha_get(hash);
-            FileSetData(dest, hash, sha1 ? 20 : 32, 0, true);
+            strncpy(ext_sha, ".sha", 256 - (ext_sha - dest));
+            sha_get(sha256);
+            FileSetData(dest, sha256, 0x20, 0, true);
         }
     }
 
@@ -608,21 +606,21 @@ bool PathMoveCopy(const char* dest, const char* orig, u32* flags, bool move) {
     int odrvtype = DriveType(orig);
     char ldest[256]; // 256 is the maximum length of a full path
     char lorig[256];
-    strncpy(ldest, dest, 256);
-    strncpy(lorig, orig, 256);
-    char deststr[UTF_BUFFER_BYTESIZE(36)];
+    strncpy(ldest, dest, 255);
+    strncpy(lorig, orig, 255);
+    char deststr[36 + 1];
     TruncateString(deststr, ldest, 36, 8);
 
     // moving only for regular FAT drives (= not alias drives)
     if (move && !(ddrvtype & odrvtype & DRV_STDFAT)) {
-        ShowPrompt(false, "%s", STR_ERROR_ONLY_FAT_FILES_CAN_BE_MOVED);
+        ShowPrompt(false, "Error: Only FAT files can be moved");
         return false;
     }
 
     // is destination part of origin?
     u32 olen = strnlen(lorig, 255);
     if ((strncasecmp(ldest, lorig, olen) == 0) && (ldest[olen] == '/')) {
-        ShowPrompt(false, "%s\n%s", deststr, STR_ERROR_DESTINATION_IS_PART_OF_ORIGIN);
+        ShowPrompt(false, "%s\nError: Destination is part of origin", deststr);
         return false;
     }
 
@@ -634,7 +632,7 @@ bool PathMoveCopy(const char* dest, const char* orig, u32* flags, bool move) {
 
         // check & fix destination == origin
         while (strncasecmp(ldest, lorig, 255) == 0) {
-            if (!ShowKeyboardOrPrompt(dname, 255 - (dname - ldest), "%s\n%s", deststr, STR_ERROR_DESTINATION_EQUALS_ORIGIN_CHOOSE_ANOTHER_NAME))
+            if (!ShowKeyboardOrPrompt(dname, 255 - (dname - ldest), "%s\nDestination equals origin\nChoose another name?", deststr))
                 return false;
         }
 
@@ -645,11 +643,12 @@ bool PathMoveCopy(const char* dest, const char* orig, u32* flags, bool move) {
                 return true;
             }
             const char* optionstr[5] =
-                {STR_CHOOSE_NEW_NAME, STR_OVERWRITE_FILES, STR_SKIP_FILES, STR_OVERWRITE_ALL, STR_SKIP_ALL};
-            u32 user_select = ShowSelectPrompt((*flags & ASK_ALL) ? 5 : 3, optionstr, STR_DESTINATION_ALREADY_EXISTS, deststr);
+                {"Choose new name", "Overwrite file(s)", "Skip file(s)", "Overwrite all", "Skip all"};
+            u32 user_select = ShowSelectPrompt((*flags & ASK_ALL) ? 5 : 3, optionstr,
+                "Destination already exists:\n%s", deststr);
             if (user_select == 1) {
                 do {
-                    if (!ShowKeyboardOrPrompt(dname, 255 - (dname - ldest), "%s", STR_CHOOSE_NEW_DESTINATION_NAME))
+                    if (!ShowKeyboardOrPrompt(dname, 255 - (dname - ldest), "Choose new destination name"))
                         return false;
                 } while (fa_stat(ldest, NULL) == FR_OK);
             } else if (user_select == 2) {
@@ -673,7 +672,7 @@ bool PathMoveCopy(const char* dest, const char* orig, u32* flags, bool move) {
         // setup buffer
         u8* buffer = (u8*) malloc(STD_BUFFER_SIZE);
         if (!buffer) {
-            ShowPrompt(false, "%s", STR_OUT_OF_MEMORY);
+            ShowPrompt(false, "Out of memory.");
             return false;
         }
 
@@ -699,20 +698,20 @@ bool PathMoveCopy(const char* dest, const char* orig, u32* flags, bool move) {
 
         // prevent illegal operations
         if (force_unmount && (odrvtype & ddrvtype & (DRV_SYSNAND|DRV_EMUNAND|DRV_IMAGE))) {
-            ShowPrompt(false, "%s", STR_COPY_OPERATION_IS_NOT_ALLOWED);
+            ShowPrompt(false, "Copy operation is not allowed");
             return false;
         }
 
         // check destination == origin
         if (strncasecmp(ldest, lorig, 255) == 0) {
-            ShowPrompt(false, "%s\n%s", deststr, STR_DESTINATION_EQUALS_ORIGIN);
+            ShowPrompt(false, "%s\nDestination equals origin", deststr);
             return false;
         }
 
         // setup buffer
         u8* buffer = (u8*) malloc(STD_BUFFER_SIZE);
         if (!buffer) {
-            ShowPrompt(false, "%s", STR_OUT_OF_MEMORY);
+            ShowPrompt(false, "Out of memory.");
             return false;
         }
 
@@ -731,7 +730,7 @@ bool PathCopy(const char* destdir, const char* orig, u32* flags) {
     char dest[256]; // maximum path name length in FAT
     char* oname = strrchr(orig, '/');
     if (oname == NULL) return false; // not a proper origin path
-    snprintf(dest, sizeof(dest), "%s/%s", destdir, (++oname));
+    snprintf(dest, 255, "%s/%s", destdir, (++oname));
 
     // virtual destination special handling
     if (GetVirtualSource(destdir) & ~VRT_BDRI) {
@@ -745,12 +744,12 @@ bool PathCopy(const char* destdir, const char* orig, u32* flags) {
                 if (!ReadVirtualDir(&dvfile, &vdir)) return false;
                 if (dvfile.size == osize) break; // file found
             }
-            if (!ShowPrompt(true, STR_ENTRY_NOT_FOUND_PATH_INJECT_INTO_PATH_INSTEAD, dest, dvfile.name))
+            if (!ShowPrompt(true, "Entry not found: %s\nInject into %s instead?", dest, dvfile.name))
                 return false;
-            snprintf(dest, sizeof(dest), "%s/%s", destdir, dvfile.name);
+            snprintf(dest, 255, "%s/%s", destdir, dvfile.name);
         } else if (osize < dvfile.size) { // if origin is smaller than destination...
-            char deststr[UTF_BUFFER_BYTESIZE(36)];
-            char origstr[UTF_BUFFER_BYTESIZE(36)];
+            char deststr[36 + 1];
+            char origstr[36 + 1];
             char osizestr[32];
             char dsizestr[32];
             TruncateString(deststr, dest, 36, 8);
@@ -758,7 +757,7 @@ bool PathCopy(const char* destdir, const char* orig, u32* flags) {
             FormatBytes(osizestr, osize);
             FormatBytes(dsizestr, dvfile.size);
             if (dvfile.size > osize) {
-                if (!ShowPrompt(true, STR_FILE_SMALLER_THAN_SPACE_SIZES_CONTINUE, origstr, osizestr, deststr, dsizestr))
+                if (!ShowPrompt(true, "File smaller than available space:\n%s (%s)\n%s (%s)\nContinue?", origstr, osizestr, deststr, dsizestr))
                     return false;
             }
         }
@@ -772,7 +771,7 @@ bool PathMove(const char* destdir, const char* orig, u32* flags) {
     char dest[256]; // maximum path name length in FAT
     char* oname = strrchr(orig, '/');
     if (oname == NULL) return false; // not a proper origin path
-    snprintf(dest, sizeof(dest), "%s/%s", destdir, (++oname));
+    snprintf(dest, 255, "%s/%s", destdir, (++oname));
 
     return PathMoveCopy(dest, orig, flags, true);
 }
@@ -822,7 +821,7 @@ bool FileSelectorWorker(char* result, const char* text, const char* path, const
         GetDirContents(contents, path_local);
 
         while (pos < contents->n_entries) {
-            char opt_names[_MAX_FS_OPT+1][UTF_BUFFER_BYTESIZE(32)];
+            char opt_names[_MAX_FS_OPT+1][32+1];
             DirEntry* res_entry[MAX_DIR_ENTRIES+1] = { NULL };
             u32 n_opt = 0;
             for (; pos < contents->n_entries; pos++) {
@@ -832,13 +831,13 @@ bool FileSelectorWorker(char* result, const char* text, const char* path, const
                     (entry->type == T_DOTDOT) || (strncmp(entry->name, "._", 2) == 0))
                     continue;
                 if (!new_style && n_opt == _MAX_FS_OPT) {
-                    snprintf(opt_names[n_opt++], 32, "%s", STR_BRACKET_MORE);
+                    snprintf(opt_names[n_opt++], 32, "[more...]");
                     break;
                 }
 
                 if (!new_style) {
                     char temp_str[256];
-                    snprintf(temp_str, sizeof(temp_str), "%s", entry->name);
+                    snprintf(temp_str, 256, "%s", entry->name);
                     if (hide_ext && (entry->type == T_FILE)) {
                         char* dot = strrchr(temp_str, '.');
                         if (dot) *dot = '\0';
@@ -849,7 +848,7 @@ bool FileSelectorWorker(char* result, const char* text, const char* path, const
                 n_found++;
             }
             if ((pos >= contents->n_entries) && (n_opt < n_found) && !new_style)
-                snprintf(opt_names[n_opt++], 32, "%s", STR_BRACKET_MORE);
+                snprintf(opt_names[n_opt++], 32, "[more...]");
             if (!n_opt) break;
 
             const char* optionstr[_MAX_FS_OPT+1] = { NULL };
@@ -872,9 +871,9 @@ bool FileSelectorWorker(char* result, const char* text, const char* path, const
             }
         }
         if (!n_found) { // not a single matching entry found
-            char pathstr[UTF_BUFFER_BYTESIZE(32)];
+            char pathstr[32+1];
             TruncateString(pathstr, path_local, 32, 8);
-            ShowPrompt(false, "%s\n%s", pathstr, STR_NO_USABLE_ENTRIES_FOUND);
+            ShowPrompt(false, "%s\nNo usable entries found.", pathstr);
             return false;
         }
     }
@@ -884,7 +883,6 @@ bool FileSelector(char* result, const char* text, const char* path, const char*
     void* buffer = (void*) malloc(sizeof(DirStruct));
     if (!buffer) return false;
 
-    // for this to work, result needs to be at least 256 bytes in size
     bool ret = FileSelectorWorker(result, text, path, pattern, flags, buffer, new_style);
     free(buffer);
     return ret;

arm9/source/filesys/fsutil.h

@@ -7,13 +7,12 @@
 #define NO_CANCEL       (1UL<<1)
 #define SILENT          (1UL<<2)
 #define CALC_SHA        (1UL<<3)
-#define USE_SHA1        (1UL<<4)
-#define BUILD_PATH      (1UL<<5)
-#define ALLOW_EXPAND    (1UL<<6)
-#define ASK_ALL         (1UL<<7)
-#define SKIP_ALL        (1UL<<8)
-#define OVERWRITE_ALL   (1UL<<9)
-#define APPEND_ALL      (1UL<<10)
+#define BUILD_PATH      (1UL<<4)
+#define ALLOW_EXPAND    (1UL<<5)
+#define ASK_ALL         (1UL<<6)
+#define SKIP_ALL        (1UL<<7)
+#define OVERWRITE_ALL   (1UL<<8)
+#define APPEND_ALL      (1UL<<9)
 
 // file selector flags
 #define NO_DIRS         (1UL<<0)
@@ -44,7 +43,7 @@ size_t FileGetData(const char* path, void* data, size_t size, size_t foffset);
 size_t FileGetSize(const char* path);
 
 /** Get SHA-256 of file **/
-bool FileGetSha(const char* path, u8* hash, u64 offset, u64 size, bool sha1);
+bool FileGetSha256(const char* path, u8* sha256, u64 offset, u64 size);
 
 /** Find data in file **/
 u32 FileFindData(const char* path, u8* data, u32 size_data, u32 offset_file);

arm9/source/filesys/image.c

@@ -74,6 +74,6 @@ u64 MountImage(const char* path) {
         return 0;
     fvx_lseek(&mount_file, 0);
     fvx_sync(&mount_file);
-    strncpy(mount_path, path, 256);
+    strncpy(mount_path, path, 255);
     return (mount_state = type);
 }

arm9/source/filesys/sddata.c

@@ -35,9 +35,9 @@ int alias_num (const TCHAR* path) {
 void dealias_path (TCHAR* alias, const TCHAR* path) {
     int num = alias_num(path);
     u32 p_offs = (path[2] == '/' && ((path[3] == '/') || (path[3] == '\0'))) ? 3 : 2;
-    if (num >= 0) // set alias (alias is assumed to be 256 byte!)
+    if (num >= 0) // set alias (alias is assumed to be 256 byte)
         snprintf(alias, 256, "%s%s", alias_path[num], path + p_offs);
-    else snprintf(alias, 256, "%s", path);
+    else strncpy(alias, path, 256);
 }
 
 FilCryptInfo* fx_find_cryptinfo(FIL* fptr) {
@@ -276,7 +276,7 @@ bool SetupNandSdDrive(const char* path, const char* sd_path, const char* movable
     // build the alias path (id0)
     u32 sha256sum[8];
     sha_quick(sha256sum, sd_keyy[num], 0x10, SHA256_MODE);
-    snprintf(alias, sizeof(alias), "%s/Nintendo 3DS/%08lX%08lX%08lX%08lX",
+    snprintf(alias, 127, "%s/Nintendo 3DS/%08lX%08lX%08lX%08lX",
         sd_path, sha256sum[0], sha256sum[1], sha256sum[2], sha256sum[3]);
 
     // find the alias path (id1)

arm9/source/filesys/support.c

@@ -17,7 +17,7 @@ bool CheckSupportFile(const char* fname)
     const char* base_paths[] = { SUPPORT_FILE_PATHS };
     for (u32 i = 0; i < countof(base_paths); i++) {
         char path[256];
-        snprintf(path, sizeof(path), "%s/%s", base_paths[i], fname);
+        snprintf(path, 256, "%s/%s", base_paths[i], fname);
         if (fvx_stat(path, NULL) == FR_OK)
             return true;
     }
@@ -40,7 +40,7 @@ size_t LoadSupportFile(const char* fname, void* buffer, size_t max_len)
     for (u32 i = 0; i < countof(base_paths); i++) {
         UINT len32;
         char path[256];
-        snprintf(path, sizeof(path), "%s/%s", base_paths[i], fname);
+        snprintf(path, 256, "%s/%s", base_paths[i], fname);
         if (fvx_qread(path, buffer, 0, max_len, &len32) == FR_OK)
             return len32;
     }
@@ -68,7 +68,7 @@ bool SaveSupportFile(const char* fname, void* buffer, size_t len)
     // write support file
     if (idx >= 0) {
         char path[256];
-        snprintf(path, sizeof(path), "%s/%s", base_paths[idx], fname);
+        snprintf(path, 256, "%s/%s", base_paths[idx], fname);
         fvx_unlink(path);
         if (fvx_qwrite(path, buffer, 0, len, NULL) == FR_OK)
             return true;
@@ -115,7 +115,6 @@ bool CheckSupportDir(const char* dname)
 bool FileSelectorSupport(char* result, const char* text, const char* dname, const char* pattern)
 {
     char path[256];
-    // result needs to be at least 256 bytes long for this to work!
     if (!GetSupportDir(path, dname)) return false;
     return FileSelector(result, text, path, pattern, HIDE_EXT, false);
 }

arm9/source/filesys/support.h

@@ -3,9 +3,7 @@
 #include "common.h"
 
 // scripts / payloads dir names
-#define LANGUAGES_DIR   "languages"
 #define SCRIPTS_DIR     "scripts"
-#define LUASCRIPTS_DIR  "luascripts"
 #define PAYLOADS_DIR    "payloads"
 
 bool CheckSupportFile(const char* fname);
@@ -13,6 +11,5 @@ size_t LoadSupportFile(const char* fname, void* buffer, size_t max_len);
 bool SaveSupportFile(const char* fname, void* buffer, size_t len);
 bool SetAsSupportFile(const char* fname, const char* source);
 
-bool GetSupportDir(char* path, const char* dname);
 bool CheckSupportDir(const char* fpath);
 bool FileSelectorSupport(char* result, const char* text, const char* dname, const char* pattern);

arm9/source/filesys/vff.c

@@ -257,8 +257,7 @@ FRESULT worker_fvx_rmkdir (TCHAR* tpath) {
 FRESULT fvx_rmkdir (const TCHAR* path) {
     #if !_LFN_UNICODE // this will not work for unicode
     TCHAR tpath[_MAX_FN_LEN+1];
-    if (strlen(path) > _MAX_FN_LEN) return FR_INVALID_NAME;
-    strcpy(tpath, path);
+    strncpy(tpath, path, _MAX_FN_LEN);
     return worker_fvx_rmkdir( tpath );
     #else
     return FR_DENIED;
@@ -268,8 +267,7 @@ FRESULT fvx_rmkdir (const TCHAR* path) {
 FRESULT fvx_rmkpath (const TCHAR* path) {
     #if !_LFN_UNICODE // this will not work for unicode
     TCHAR tpath[_MAX_FN_LEN+1];
-    if (strlen(path) > _MAX_FN_LEN) return FR_INVALID_NAME;
-    strcpy(tpath, path);
+    strncpy(tpath, path, _MAX_FN_LEN);
     TCHAR* slash = strrchr(tpath, '/');
     if (!slash) return FR_DENIED;
     *slash = '\0';
@@ -297,7 +295,7 @@ FRESULT worker_fvx_runlink (TCHAR* tpath) {
         while (fvx_readdir(&pdir, &fno) == FR_OK) {
             if ((strncmp(fno.fname, ".", 2) == 0) || (strncmp(fno.fname, "..", 3) == 0))
                 continue; // filter out virtual entries
-            strcpy(fname, fno.fname);
+            strncpy(fname, fno.fname, tpath + 255 - fname);
             if (fno.fname[0] == 0) {
                 break;
             } else { // return value won't matter
@@ -315,8 +313,7 @@ FRESULT worker_fvx_runlink (TCHAR* tpath) {
 FRESULT fvx_runlink (const TCHAR* path) {
     #if !_LFN_UNICODE // this will not work for unicode
     TCHAR tpath[_MAX_FN_LEN+1];
-    if (strlen(path) > _MAX_FN_LEN) return FR_INVALID_NAME;
-    strcpy(tpath, path);
+    strncpy(tpath, path, _MAX_FN_LEN);
     return worker_fvx_runlink( tpath );
     #else
     return FR_DENIED;
@@ -359,8 +356,7 @@ FRESULT fvx_preaddir (DIR* dp, FILINFO* fno, const TCHAR* pattern) {
 }
 
 FRESULT fvx_findpath (TCHAR* path, const TCHAR* pattern, BYTE mode) {
-    if (strlen(pattern) > _MAX_FN_LEN) return FR_INVALID_NAME;
-    strcpy(path, pattern);
+    strncpy(path, pattern, _MAX_FN_LEN);
     TCHAR* fname = strrchr(path, '/');
     if (!fname) return FR_DENIED;
     *fname = '\0';
@@ -380,7 +376,7 @@ FRESULT fvx_findpath (TCHAR* path, const TCHAR* pattern, BYTE mode) {
     while ((fvx_preaddir(&pdir, &fno, npattern) == FR_OK) && *(fno.fname)) {
         int cmp = strncmp(fno.fname, fname, _MAX_FN_LEN);
         if (((mode & FN_HIGHEST) && (cmp > 0)) || ((mode & FN_LOWEST) && (cmp < 0)) || !(*fname))
-            strcpy(fname, fno.fname);
+            strncpy(fname, fno.fname, _MAX_FN_LEN - (fname - path));
         if (!(mode & (FN_HIGHEST|FN_LOWEST))) break;
     }
     fvx_closedir( &pdir );
@@ -389,8 +385,7 @@ FRESULT fvx_findpath (TCHAR* path, const TCHAR* pattern, BYTE mode) {
 }
 
 FRESULT fvx_findnopath (TCHAR* path, const TCHAR* pattern) {
-    if (strlen(pattern) > _MAX_FN_LEN) return FR_INVALID_NAME;
-    strcpy(path, pattern);
+    strncpy(path, pattern, _MAX_FN_LEN);
     TCHAR* fname = strrchr(path, '/');
     if (!fname) return FR_DENIED;
     fname++;

arm9/source/filesys/vff.h

@@ -8,7 +8,6 @@
 
 #define fvx_tell(fp) ((fp)->fptr)
 #define fvx_size(fp) ((fp)->obj.objsize)
-#define fvx_eof(fp) (fvx_tell(fp) == fvx_size(fp))
 
 #define FN_ANY      0x00
 #define FN_HIGHEST  0x01

arm9/source/game/bdri.c

@@ -2,7 +2,6 @@
 #include "vff.h"
 
 #define FAT_ENTRY_SIZE 2 * sizeof(u32)
-#define REPLACE_SIZE_MISMATCH 2
 
 #define getfatflag(uv) (((uv) & 0x80000000UL) != 0)
 #define getfatindex(uv) ((uv) & 0x7FFFFFFFUL)
@@ -370,8 +369,7 @@ static u32 AddBDRIEntry(const BDRIFsHeader* fs_header, const u32 fs_header_offse
 
         // If an entry for the tid already existed that is already the specified size and replace was specified, just replace the existing entry
         if (memcmp(title_id_be, file_entry.title_id, 8) == 0) {
-            if (!replace) return 1;
-            else if (file_entry.size != size) return REPLACE_SIZE_MISMATCH;
+            if (!replace || (file_entry.size != size)) return 1;
             else {
                 do_replace = true;
                 break;
@@ -866,15 +864,10 @@ u32 AddTicketToDB(const char* path, const u8* title_id, const Ticket* ticket, bo
 
     bdrifp = &file;
 
-    u32 add_bdri_res = 0;
-
     if ((BDRIRead(0, sizeof(TickDBPreHeader), &pre_header) != FR_OK) ||
         !CheckDBMagic((u8*) &pre_header, true) ||
-        ((add_bdri_res = AddBDRIEntry(&(pre_header.fs_header), sizeof(TickDBPreHeader) - sizeof(BDRIFsHeader), title_id,
-            (const u8*) te, entry_size, replace)) == 1) ||
-        (add_bdri_res == REPLACE_SIZE_MISMATCH && ((RemoveBDRIEntry(&(pre_header.fs_header), sizeof(TickDBPreHeader) - sizeof(BDRIFsHeader), title_id) != 0) ||
         (AddBDRIEntry(&(pre_header.fs_header), sizeof(TickDBPreHeader) - sizeof(BDRIFsHeader), title_id,
-            (const u8*) te, entry_size, replace) != 0)))) {
+            (const u8*) te, entry_size, replace) != 0)) {
         free(te);
         fvx_close(bdrifp);
         bdrifp = NULL;

arm9/source/game/bps.c

@@ -18,7 +18,6 @@
 
 #include <libgen.h>
 
-#include "language.h"
 #include "common.h"
 #include "timer.h"
 #include "crc32.h"
@@ -144,18 +143,18 @@ static bool BEAT_UpdateProgress(const BEAT_Context *ctx)
 static const char *BEAT_ErrString(int error)
 { // Get an error description string
 	switch(error) {
-		case BEAT_OK: return STR_BEAT_NO_ERROR;
-		case BEAT_EOAL: return STR_BEAT_END_OF_ACTION_LIST;
-		case BEAT_ABORTED: return STR_BEAT_ABORTED_BY_USER;
-		case BEAT_IO_ERROR: return STR_BEAT_FAILED_TO_READ_WRITE_FILE;
-		case BEAT_OVERFLOW: return STR_BEAT_ATTEMPTED_TO_WRITE_BEYOND_EOF;
-		case BEAT_BADPATCH: return STR_BEAT_INVALID_PATCH_FILE;
-		case BEAT_BADINPUT: return STR_BEAT_INVALID_INPUT_FILE;
-		case BEAT_BADOUTPUT: return STR_BEAT_OUTPUT_FILE_CHECKSUM_MISMATCH;
-		case BEAT_BADCHKSUM: return STR_BEAT_FILE_CHECKSUM_FAILED;
-		case BEAT_PATCH_EXPECT: return STR_BEAT_EXPECTED_MORE_PATCH_DATA;
-		case BEAT_OUT_OF_MEMORY: return STR_BEAT_OUT_OF_MEMORY;
-		default: return STR_BEAT_UNKNOWN_ERROR;
+		case BEAT_OK: return "No error";
+		case BEAT_EOAL: return "End of action list";
+		case BEAT_ABORTED: return "Aborted by user";
+		case BEAT_IO_ERROR: return "Failed to read/write file";
+		case BEAT_OVERFLOW: return "Attempted to write beyond end of file";
+		case BEAT_BADPATCH: return "Invalid patch file";
+		case BEAT_BADINPUT: return "Invalid input file";
+		case BEAT_BADOUTPUT: return "Output file checksum mismatch";
+		case BEAT_BADCHKSUM: return "File checksum failed";
+		case BEAT_PATCH_EXPECT: return "Expected more patch data";
+		case BEAT_OUT_OF_MEMORY: return "Out of memory";
+		default: return "Unknown error";
 	}
 }
 
@@ -222,7 +221,7 @@ static s32 BEAT_DecodeSigned(u32 val) // Extract the signed number
 static int BEAT_RunActions(BEAT_Context *ctx, const BEAT_Action *acts)
 { // Parses an action list and runs commands specified in `acts`
 	u32 vli, len;
-	int cmd, res = BEAT_OK;
+	int cmd, res;
 
 	while((res == BEAT_OK) &&
 		(ctx->foff[BEAT_PF] < (BEAT_RANGE(ctx, BEAT_PF) - ctx->eoal_offset))) {
@@ -661,18 +660,19 @@ static int BEAT_Run(const char *p, const char *s, const char *d, bool bpm)
 	progress_timer = timer_start();
 	res = (bpm ? BPM_InitCTX : BPS_InitCTX)(&ctx, p, s, d);
 	if (res != BEAT_OK) {
-		ShowPrompt(false, bpm ? STR_FAILED_TO_INITIALIZE_BPM_FILE : STR_FAILED_TO_INITIALIZE_BPS_FILE, BEAT_ErrString(res));
+		ShowPrompt(false, "Failed to initialize %s file:\n%s",
+			bpm ? "BPM" : "BPS", BEAT_ErrString(res));
 	} else {
 		res = (bpm ? BPM_RunActions : BPS_RunActions)(&ctx);
 		switch(res) {
 			case BEAT_OK:
-				ShowPrompt(false, "%s", STR_PATCH_SUCCESSFULLY_APPLIED);
+				ShowPrompt(false, "Patch successfully applied");
 				break;
 			case BEAT_ABORTED:
-				ShowPrompt(false, "%s", STR_PATCHING_ABORTED_BY_USER);
+				ShowPrompt(false, "Patching aborted by user");
 				break;
 			default:
-				ShowPrompt(false, STR_FAILED_TO_RUN_PATCH, BEAT_ErrString(res));
+				ShowPrompt(false, "Failed to run patch:\n%s", BEAT_ErrString(res));
 				break;
 		}
 	}

arm9/source/game/cert.c

@@ -1,816 +1,21 @@
 #include "cert.h"
-#include "disadiff.h"
-#include "rsa.h"
-
-typedef struct {
-    char magic[4]; // "CERT"
-    u8 unk[4]; // afaik, always 0
-    u8 used_size[4]; // size used after this header
-    u8 garbage[4]; // literally garbage values
-} PACKED_STRUCT CertsDbPartitionHeader;
-
-static inline void GetCertDBPath(char* path, bool emunand) {
-    path[0] = emunand ? '4' : '1';
-    strcpy(&path[1], ":/dbs/certs.db");
-}
-
-#define CERT_RETAIL_CA3_IDENT BIT(0)
-#define CERT_RETAIL_XSc_IDENT BIT(1)
-#define CERT_RETAIL_CPb_IDENT BIT(2)
-#define CERT_DEV_CA4_IDENT    BIT(3)
-#define CERT_DEV_XS9_IDENT    BIT(4)
-#define CERT_DEV_CPa_IDENT    BIT(5)
-#define CERT_NO_STORE_SPACE   (0xFF)
-
-static struct {
-    u32 loaded_certs_flg;
-    u8 retail_CA3_raw[CERT_RSA4096_SIG_SIZE + CERT_RSA2048_BODY_SIZE];
-    u8 retail_XSc_raw[CERT_RSA2048_SIG_SIZE + CERT_RSA2048_BODY_SIZE];
-    u8 retail_CPb_raw[CERT_RSA2048_SIG_SIZE + CERT_RSA2048_BODY_SIZE];
-    u8 dev_CA4_raw[CERT_RSA4096_SIG_SIZE + CERT_RSA2048_BODY_SIZE];
-    u8 dev_XS9_raw[CERT_RSA2048_SIG_SIZE + CERT_RSA2048_BODY_SIZE];
-    u8 dev_CPa_raw[CERT_RSA2048_SIG_SIZE + CERT_RSA2048_BODY_SIZE];
-    Certificate retail_CA3;
-    Certificate retail_XSc;
-    Certificate retail_CPb;
-    Certificate dev_CA4;
-    Certificate dev_XS9;
-    Certificate dev_CPa;
-} _CommonCertsStorage = {
-    0, // none loaded yet, ident defines used to say what's loaded
-    {0}, {0}, {0}, {0}, {0}, {0}, // no data yet
-    // cert structs pre-point already to raw certs
-    {
-        (CertificateSignature*)&_CommonCertsStorage.retail_CA3_raw[0],
-        (CertificateBody*)&_CommonCertsStorage.retail_CA3_raw[CERT_RSA4096_SIG_SIZE]
-    },
-    {
-        (CertificateSignature*)&_CommonCertsStorage.retail_XSc_raw[0],
-        (CertificateBody*)&_CommonCertsStorage.retail_XSc_raw[CERT_RSA2048_SIG_SIZE]
-    },
-    {
-        (CertificateSignature*)&_CommonCertsStorage.retail_CPb_raw[0],
-        (CertificateBody*)&_CommonCertsStorage.retail_CPb_raw[CERT_RSA2048_SIG_SIZE]
-    },
-    {
-        (CertificateSignature*)&_CommonCertsStorage.dev_CA4_raw[0],
-        (CertificateBody*)&_CommonCertsStorage.dev_CA4_raw[CERT_RSA4096_SIG_SIZE]
-    },
-    {
-        (CertificateSignature*)&_CommonCertsStorage.dev_XS9_raw[0],
-        (CertificateBody*)&_CommonCertsStorage.dev_XS9_raw[CERT_RSA2048_SIG_SIZE]
-    },
-    {
-        (CertificateSignature*)&_CommonCertsStorage.dev_CPa_raw[0],
-        (CertificateBody*)&_CommonCertsStorage.dev_CPa_raw[CERT_RSA2048_SIG_SIZE]
-    }
-};
-
-static inline void _Certificate_CleanupImpl(Certificate* cert);
-
-bool Certificate_IsValid(const Certificate* cert) {
-    if (!cert || !cert->sig || !cert->data)
-        return false;
-
-    u32 sig_type = getbe32(cert->sig->sig_type);
-    if (sig_type < 0x10000 || sig_type > 0x10005)
-        return false;
-
-    u32 keytype = getbe32(cert->data->keytype);
-    if (keytype > 2)
-        return false;
-
-    size_t issuer_len = strnlen(cert->data->issuer, 0x40);
-    size_t name_len = strnlen(cert->data->name, 0x40);
-    // if >= 0x40, cert can't fit as issuer for other objects later
-    // since later objects using the certificate as their issuer will have them use it as certissuer-certname
-    if (!issuer_len || !name_len || (issuer_len + name_len + 1) >= 0x40)
-        return false;
-
-    return true;
-}
-
-bool Certificate_IsRSA(const Certificate* cert) {
-    if (!Certificate_IsValid(cert)) return false;
-    if (getbe32(cert->data->keytype) >= 2) return false;
-    return true;
-}
-
-bool Certificate_IsECC(const Certificate* cert) {
-    if (!Certificate_IsValid(cert)) return false;
-    if (getbe32(cert->data->keytype) != 2) return false;
-    return true;
-}
-
-u32 Certificate_GetSignatureSize(const Certificate* cert, u32* size) {
-    if (!size || !Certificate_IsValid(cert)) return 1;
-
-    u32 sig_type = getbe32(cert->sig->sig_type);
-
-    if (sig_type == 0x10000 || sig_type == 0x10003)
-        *size = 0x200;
-    else if (sig_type == 0x10001 || sig_type == 0x10004)
-        *size = 0x100;
-    else if (sig_type == 0x10002 || sig_type == 0x10005)
-        *size = 0x3C;
-    else
-        return 1;
-
-    return 0;
-}
-
-u32 Certificate_GetModulusSize(const Certificate* cert, u32* size) {
-    if (!size || !Certificate_IsRSA(cert)) return 1;
-
-    u32 keytype = getbe32(cert->data->keytype);
-
-    if (keytype == 0)
-        *size = 4096 / 8;
-    else if (keytype == 1)
-        *size = 2048 / 8;
-    else return 1;
-
-    return 0;
-}
-
-u32 Certificate_GetModulus(const Certificate* cert, void* mod) {
-    u32 size;
-    if (!mod || Certificate_GetModulusSize(cert, &size)) return 1;
-
-    memcpy(mod, cert->data->pub_key_data, size);
-
-    return 0;
-}
-
-u32 Certificate_GetExponent(const Certificate* cert, void* exp) {
-    u32 size;
-    if (!exp || Certificate_GetModulusSize(cert, &size)) return 1;
-
-    memcpy(exp, &cert->data->pub_key_data[size], 4);
-
-    return 0;
-}
-
-u32 Certificate_GetEccSingleCoordinateSize(const Certificate* cert, u32* size) {
-    if (!size || !Certificate_IsECC(cert)) return 1;
-
-    u32 keytype = getbe32(cert->data->keytype);
-
-    if (keytype == 2)
-        *size = 0x3C / 2;
-    else return 1;
-
-    return 0;
-}
-
-u32 Certificate_GetEccXY(const Certificate* cert, void* X, void* Y) {
-    u32 size;
-    if (!X || !Y || Certificate_GetEccSingleCoordinateSize(cert, &size)) return 1;
-
-    memcpy(X, cert->data->pub_key_data, size);
-    memcpy(Y, &cert->data->pub_key_data[size], size);
-
-    return 0;
-}
-
-static inline u32 _Certificate_GetSignatureChunkSizeFromType(u32 sig_type) {
-    if (sig_type == 0x10000 || sig_type == 0x10003)
-        return CERT_RSA4096_SIG_SIZE;
-    else if (sig_type == 0x10001 || sig_type == 0x10004)
-        return CERT_RSA2048_SIG_SIZE;
-    else if (sig_type == 0x10002 || sig_type == 0x10005)
-        return CERT_ECC_SIG_SIZE;
-    return 0;
-}
-
-u32 Certificate_GetSignatureChunkSize(const Certificate* cert, u32* size) {
-    if (!size || !Certificate_IsValid(cert)) return 1;
-
-    u32 _size = _Certificate_GetSignatureChunkSizeFromType(getbe32(cert->sig->sig_type));
-
-    if (_size == 0) return 1;
-
-    *size = _size;
-
-    return 0;
-}
-
-static inline u32 _Certificate_GetDataChunkSizeFromType(u32 keytype) {
-    if (keytype == 0)
-        return CERT_RSA4096_BODY_SIZE;
-    else if (keytype == 1)
-        return CERT_RSA2048_BODY_SIZE;
-    else if (keytype == 2)
-        return CERT_ECC_BODY_SIZE;
-    return 0;
-}
-
-u32 Certificate_GetDataChunkSize(const Certificate* cert, u32* size) {
-    if (!size || !Certificate_IsValid(cert)) return 1;
-
-    u32 _size = _Certificate_GetDataChunkSizeFromType(getbe32(cert->data->keytype));
-
-    if (_size == 0) return 1;
-
-    *size = _size;
-
-    return 0;
-}
-
-u32 Certificate_GetFullSize(const Certificate* cert, u32* size) {
-    if (!size || !Certificate_IsValid(cert)) return 1;
-
-    u32 sig_size = _Certificate_GetSignatureChunkSizeFromType(getbe32(cert->sig->sig_type));
-    u32 data_size = _Certificate_GetDataChunkSizeFromType(getbe32(cert->data->keytype));
-
-    if (sig_size == 0 || data_size == 0)
-        return 1;
-
-    *size = sig_size + data_size;
-
-    return 0;
-}
-
-static inline u32 _Certificate_KeytypeSignatureSize(u32 keytype) {
-    if (keytype == 0)
-        return 0x200;
-    else if (keytype == 1)
-        return 0x100;
-    else if (keytype == 2)
-        return 0x3C;
-    return 0;
-}
-
-static inline u32 _Certificate_VerifyRSA4096(const Certificate* cert, const void* sig, const void* data, u32 data_size, bool sha256) {
-    (void)cert; (void)sig; (void)data; (void)data_size; (void)sha256;
-    return 2; // not implemented
-}
-
-// noipa, to avoid form of inlining, cloning, etc, to avoid the extra stack usage when unneeded
-static __attribute__((noipa)) bool _Certificate_SetKey2048Misaligned(const Certificate* cert) {
-    u32 mod[2048/8];
-    u32 exp;
-
-    memcpy(mod, cert->data->pub_key_data, 2048/8);
-    exp = getle32(&cert->data->pub_key_data[2048/8]);
-
-    return RSA_setKey2048(3, mod, exp);
-}
-
-static inline u32 _Certificate_VerifyRSA2048(const Certificate* cert, const void* sig, const void* data, u32 data_size, bool sha256) {
-    if (!sha256)
-        return 2; // not implemented
-
-    int ret;
-
-    if (((u32)&cert->data->pub_key_data[0]) & 0x3)
-        ret = !_Certificate_SetKey2048Misaligned(cert);
-    else
-        ret = !RSA_setKey2048(3, (const u32*)(const void*)&cert->data->pub_key_data[0], getle32(&cert->data->pub_key_data[2048/8]));
-
-    if (ret)
-        return ret;
-
-    return !RSA_verify2048(sig, data, data_size);
-}
-
-static inline u32 _Certificate_VerifyECC(const Certificate* cert, const void* sig, const void* data, u32 data_size, bool sha256) {
-    (void)cert; (void)sig; (void)data; (void)data_size; (void)sha256;
-    return 2; // not implemented
-}
-
-u32 Certificate_VerifySignatureBlock(const Certificate* cert, const void* sig, u32 sig_size, const void* data, u32 data_size, bool sha256) {
-    if (!sig || !sig_size || (!data && data_size) || !Certificate_IsValid(cert))
-        return 1;
-
-    u32 keytype = getbe32(cert->data->keytype);
-    u32 _sig_size = _Certificate_KeytypeSignatureSize(keytype);
-
-    if (sig_size != _sig_size)
-        return 1;
-
-    if (keytype == 0)
-        return _Certificate_VerifyRSA4096(cert, sig, data, data_size, sha256);
-    if (keytype == 1)
-        return _Certificate_VerifyRSA2048(cert, sig, data, data_size, sha256);
-    if (keytype == 2)
-        return _Certificate_VerifyECC(cert, sig, data, data_size, sha256);
-    return 1;
-}
-
-static inline void* _Certificate_SafeRealloc(void* ptr, size_t size, size_t oldsize) {
-    void* new_ptr;
-    size_t min_size = min(oldsize, size);
-
-    if ((u32)ptr >= (u32)&_CommonCertsStorage && (u32)ptr < (u32)&_CommonCertsStorage + sizeof(_CommonCertsStorage)) {
-        new_ptr = malloc(size);
-        if (new_ptr) memcpy(new_ptr, ptr, min_size);
-    } else {
-        new_ptr = realloc(ptr, size);
-    }
-    if (!new_ptr) return NULL;
-
-    memset(&((u8*)new_ptr)[min_size], 0, size - min_size);
-    return new_ptr;
-}
-
-// will reallocate memory for certificate signature and body to fit the max possible size.
-// will also allocate an empty object if Certificate is NULL initialized.
-// if certificate points to static storage, an allocated version will be created.
-// if function fails, the Certificate, even if previously NULL initialized, still has to be passed to cleaned up after use.
-u32 Certificate_MakeEditSafe(Certificate* cert) {
-    if (!cert) return 1;
-    bool isvalid = Certificate_IsValid(cert);
-    if ((cert->sig || cert->data) && !isvalid) return 1;
+#include "ff.h"
 
+u32 LoadCertFromCertDb(u64 offset, Certificate* cert, u32* mod, u32* exp) {
     Certificate cert_local;
+    FIL db;
+    UINT bytes_read;
 
-    u32 sig_size = isvalid ? _Certificate_GetSignatureChunkSizeFromType(getbe32(cert->sig->sig_type)) : 0;
-    u32 data_size = isvalid ? _Certificate_GetDataChunkSizeFromType(getbe32(cert->data->keytype)) : 0;
+    // not much in terms of error checking here
+    if (f_open(&db, "1:/dbs/certs.db", FA_READ | FA_OPEN_EXISTING) != FR_OK)
+        return 1;
+    f_lseek(&db, offset);
+    if (!cert) cert = &cert_local;
+    f_read(&db, cert, CERT_SIZE, &bytes_read);
+    f_close(&db);
 
-    if (isvalid && (sig_size == 0 || data_size == 0)) return 1;
-
-    cert_local.sig = _Certificate_SafeRealloc(cert->sig, CERT_RSA4096_SIG_SIZE, sig_size);
-    if (!cert_local.sig) return 1;
-    cert->sig = cert_local.sig;
-    cert_local.data = _Certificate_SafeRealloc(cert->data, CERT_RSA4096_BODY_SIZE, data_size);
-    if (!cert_local.data) return 1;
-    cert->data = cert_local.data;
+    if (mod) memcpy(mod, cert->mod, 0x100);
+    if (exp) *exp = getle32(cert->exp);
 
     return 0;
 }
-
-static u32 _Certificate_AllocCopyOutImpl(const Certificate* cert, Certificate* out_cert) {
-    u32 sig_size = _Certificate_GetSignatureChunkSizeFromType(getbe32(cert->sig->sig_type));
-    u32 data_size = _Certificate_GetDataChunkSizeFromType(getbe32(cert->data->keytype));
-
-    if (sig_size == 0 || data_size == 0)
-        return 1;
-
-    out_cert->sig = (CertificateSignature*)malloc(sig_size);
-    out_cert->data = (CertificateBody*)malloc(data_size);
-
-    if (!out_cert->sig || !out_cert->data) {
-        _Certificate_CleanupImpl(out_cert);
-        return 1;
-    }
-
-    memcpy(out_cert->sig, cert->sig, sig_size);
-    memcpy(out_cert->data, cert->data, data_size);
-
-    return 0;
-}
-
-u32 Certificate_AllocCopyOut(const Certificate* cert, Certificate* out_cert) {
-    if (!out_cert || !Certificate_IsValid(cert)) return 1;
-
-    return _Certificate_AllocCopyOutImpl(cert, out_cert);
-}
-
-static u32 _Certificate_RawCopyImpl(const Certificate* cert, void* raw) {
-    u32 sig_size = _Certificate_GetSignatureChunkSizeFromType(getbe32(cert->sig->sig_type));
-    u32 data_size = _Certificate_GetDataChunkSizeFromType(getbe32(cert->data->keytype));
-
-    if (sig_size == 0 || data_size == 0)
-        return 1;
-
-    memcpy(raw, cert->sig, sig_size);
-    memcpy(&((u8*)raw)[sig_size], cert->data, data_size);
-
-    return 0;
-}
-
-u32 Certificate_RawCopy(const Certificate* cert, void* raw) {
-    if (!raw || !Certificate_IsValid(cert)) return 1;
-
-    return _Certificate_RawCopyImpl(cert, raw);
-}
-
-// ptr free check, to not free if ptr is pointing to static storage!!
-static inline void _Certificate_SafeFree(void* ptr) {
-    if ((u32)ptr >= (u32)&_CommonCertsStorage && (u32)ptr < (u32)&_CommonCertsStorage + sizeof(_CommonCertsStorage))
-        return;
-
-    free(ptr);
-}
-
-static inline void _Certificate_CleanupImpl(Certificate* cert) {
-    _Certificate_SafeFree(cert->sig);
-    _Certificate_SafeFree(cert->data);
-    cert->sig = NULL;
-    cert->data = NULL;
-}
-
-u32 Certificate_Cleanup(Certificate* cert) {
-    if (!cert) return 1;
-
-    _Certificate_CleanupImpl(cert);
-
-    return 0;
-}
-
-static u32 _Issuer_To_StorageIdent(const char* issuer) {
-    if (strncmp(issuer, "Root-CA0000000", 14) != 0)
-        return CERT_NO_STORE_SPACE;
-
-    if (issuer[14] == '3') { // retail
-        if (issuer[15] == 0)
-            return CERT_RETAIL_CA3_IDENT;
-        if (issuer[15] != '-')
-            return CERT_NO_STORE_SPACE;
-        if (!strcmp(&issuer[16], "XS0000000c"))
-            return CERT_RETAIL_XSc_IDENT;
-        if (!strcmp(&issuer[16], "CP0000000b"))
-            return CERT_RETAIL_CPb_IDENT;
-    }
-
-    if (issuer[14] == '4') { // dev
-        if (issuer[15] == 0)
-            return CERT_DEV_CA4_IDENT;
-        if (issuer[15] != '-')
-            return CERT_NO_STORE_SPACE;
-        if (!strcmp(&issuer[16], "XS00000009"))
-            return CERT_DEV_XS9_IDENT;
-        if (!strcmp(&issuer[16], "CP0000000a"))
-            return CERT_DEV_CPa_IDENT;
-    }
-
-    return CERT_NO_STORE_SPACE;
-}
-
-static bool _LoadFromCertStorage(Certificate* cert, u32 ident) {
-    if (ident == CERT_NO_STORE_SPACE)
-        return false;
-
-    Certificate* _cert = NULL;
-
-    switch (ident) {
-    case CERT_RETAIL_CA3_IDENT:
-        if (_CommonCertsStorage.loaded_certs_flg & CERT_RETAIL_CA3_IDENT)
-            _cert = &_CommonCertsStorage.retail_CA3;
-        break;
-    case CERT_RETAIL_XSc_IDENT:
-        if (_CommonCertsStorage.loaded_certs_flg & CERT_RETAIL_XSc_IDENT)
-            _cert = &_CommonCertsStorage.retail_XSc;
-        break;
-    case CERT_RETAIL_CPb_IDENT:
-        if (_CommonCertsStorage.loaded_certs_flg & CERT_RETAIL_CPb_IDENT)
-            _cert = &_CommonCertsStorage.retail_CPb;
-        break;
-    case CERT_DEV_CA4_IDENT:
-        if (_CommonCertsStorage.loaded_certs_flg & CERT_DEV_CA4_IDENT)
-            _cert = &_CommonCertsStorage.dev_CA4;
-        break;
-    case CERT_DEV_XS9_IDENT:
-        if (_CommonCertsStorage.loaded_certs_flg & CERT_DEV_XS9_IDENT)
-            _cert = &_CommonCertsStorage.dev_XS9;
-        break;
-    case CERT_DEV_CPa_IDENT:
-        if (_CommonCertsStorage.loaded_certs_flg & CERT_DEV_CPa_IDENT)
-            _cert = &_CommonCertsStorage.dev_CPa;
-        break;
-    default:
-        break;
-    }
-
-    if (!_cert)
-        return false;
-
-    *cert = *_cert;
-    return true;
-}
-
-static void _SaveToCertStorage(const Certificate* cert, u32 ident) {
-    if (ident == CERT_NO_STORE_SPACE)
-        return;
-
-    Certificate* _cert = NULL;
-    u8* raw_space = NULL;
-    u32 raw_size = 0;
-
-    switch (ident) {
-    case CERT_RETAIL_CA3_IDENT:
-        if (!(_CommonCertsStorage.loaded_certs_flg & CERT_RETAIL_CA3_IDENT)) {
-            _cert = &_CommonCertsStorage.retail_CA3;
-            raw_space = &_CommonCertsStorage.retail_CA3_raw[0];
-            raw_size = sizeof(_CommonCertsStorage.retail_CA3_raw);
-        }
-        break;
-    case CERT_RETAIL_XSc_IDENT:
-        if (!(_CommonCertsStorage.loaded_certs_flg & CERT_RETAIL_XSc_IDENT)) {
-            _cert = &_CommonCertsStorage.retail_XSc;
-            raw_space = &_CommonCertsStorage.retail_XSc_raw[0];
-            raw_size = sizeof(_CommonCertsStorage.retail_XSc_raw);
-        }
-        break;
-    case CERT_RETAIL_CPb_IDENT:
-        if (!(_CommonCertsStorage.loaded_certs_flg & CERT_RETAIL_CPb_IDENT)) {
-            _cert = &_CommonCertsStorage.retail_CPb;
-            raw_space = &_CommonCertsStorage.retail_CPb_raw[0];
-            raw_size = sizeof(_CommonCertsStorage.retail_CPb_raw);
-        }
-        break;
-    case CERT_DEV_CA4_IDENT:
-        if (!(_CommonCertsStorage.loaded_certs_flg & CERT_DEV_CA4_IDENT)) {
-            _cert = &_CommonCertsStorage.dev_CA4;
-            raw_space = &_CommonCertsStorage.dev_CA4_raw[0];
-            raw_size = sizeof(_CommonCertsStorage.dev_CA4_raw);
-        }
-        break;
-    case CERT_DEV_XS9_IDENT:
-        if (!(_CommonCertsStorage.loaded_certs_flg & CERT_DEV_XS9_IDENT)) {
-            _cert = &_CommonCertsStorage.dev_XS9;
-            raw_space = &_CommonCertsStorage.dev_XS9_raw[0];
-            raw_size = sizeof(_CommonCertsStorage.dev_XS9_raw);
-        }
-        break;
-    case CERT_DEV_CPa_IDENT:
-        if (!(_CommonCertsStorage.loaded_certs_flg & CERT_DEV_CPa_IDENT)) {
-            _cert = &_CommonCertsStorage.dev_CPa;
-            raw_space = &_CommonCertsStorage.dev_CPa_raw[0];
-            raw_size = sizeof(_CommonCertsStorage.dev_CPa_raw);
-        }
-        break;
-    default:
-        break;
-    }
-
-    if (!_cert || !raw_space || !raw_size)
-        return;
-
-    u32 sig_size = _Certificate_GetSignatureChunkSizeFromType(getbe32(cert->sig->sig_type));
-    u32 data_size = _Certificate_GetDataChunkSizeFromType(getbe32(cert->data->keytype));
-
-    if (sig_size == 0 || data_size == 0)
-        return;
-
-    if (sig_size + data_size != raw_size)
-        return;
-
-    if (!_Certificate_RawCopyImpl(cert, raw_space)) {
-        _CommonCertsStorage.loaded_certs_flg |= ident;
-    }
-}
-
-// grumble grumble, gotta avoid repeated code when possible or at least if significant enough
-
-static u32 _DisaOpenCertDb(char (*path)[16], bool emunand, DisaDiffRWInfo* info, u8** cache, u32* offset, u32* max_offset) {
-    GetCertDBPath(*path, emunand);
-
-    u8* _cache = NULL;
-    if (GetDisaDiffRWInfo(*path, info, false) != 0) return 1;
-    _cache = (u8*)malloc(info->size_dpfs_lvl2);
-    if (!_cache) return 1;
-    if (BuildDisaDiffDpfsLvl2Cache(*path, info, _cache, info->size_dpfs_lvl2) != 0) {
-        free(_cache);
-        return 1;
-    }
-
-    CertsDbPartitionHeader header;
-
-    if (ReadDisaDiffIvfcLvl4(*path, info, 0, sizeof(CertsDbPartitionHeader), &header) != sizeof(CertsDbPartitionHeader)) {
-        free(_cache);
-        return 1;
-    }
-
-    if (getbe32(header.magic) != 0x43455254 /* 'CERT' */ ||
-      getbe32(header.unk) != 0 ||
-      getle32(header.used_size) & 0xFF) {
-        free(_cache);
-        return 1;
-    }
-
-    *cache = _cache;
-
-    *offset = sizeof(CertsDbPartitionHeader);
-    *max_offset = getle32(header.used_size) + sizeof(CertsDbPartitionHeader);
-
-    return 0;
-}
-
-static u32 _ProcessNextCertDbEntry(const char* path, DisaDiffRWInfo* info, Certificate* cert, u32 *full_size, char (*full_issuer)[0x41], u32* offset, u32 max_offset) {
-    u8 sig_type_data[4];
-    u8 keytype_data[4];
-
-    if (*offset + 4 > max_offset) return 1;
-
-    if (ReadDisaDiffIvfcLvl4(path, info, *offset, 4, sig_type_data) != 4)
-        return 1;
-
-    u32 sig_type = getbe32(sig_type_data);
-
-    if (sig_type == 0x10002 || sig_type == 0x10005) return 1; // ECC signs not allowed on db
-
-    u32 sig_size = _Certificate_GetSignatureChunkSizeFromType(sig_type);
-    if (sig_size == 0) return 1;
-
-    u32 keytype_off = *offset + sig_size + offsetof(CertificateBody, keytype);
-    if (keytype_off + 4 > max_offset) return 1;
-
-    if (ReadDisaDiffIvfcLvl4(path, info, keytype_off, 4, keytype_data) != 4)
-        return 1;
-
-    u32 keytype = getbe32(keytype_data);
-
-    if (keytype == 2) return 1; // ECC keys not allowed on db
-
-    u32 data_size = _Certificate_GetDataChunkSizeFromType(keytype);
-    if (data_size == 0) return 1;
-
-    *full_size = sig_size + data_size;
-    if (*offset + *full_size > max_offset) return 1;
-
-    cert->sig = (CertificateSignature*)malloc(sig_size);
-    cert->data = (CertificateBody*)malloc(data_size);
-    if (!cert->sig || !cert->data)
-        return 1;
-
-    if (ReadDisaDiffIvfcLvl4(path, info, *offset, sig_size, cert->sig) != sig_size)
-        return 1;
-
-    if (ReadDisaDiffIvfcLvl4(path, info, *offset + sig_size, data_size, cert->data) != data_size)
-        return 1;
-
-    if (!Certificate_IsValid(cert))
-        return 1;
-
-    if (snprintf(*full_issuer, 0x41, "%s-%s", cert->data->issuer, cert->data->name) > 0x40)
-        return 1;
-
-    return 0;
-}
-
-// certificates returned by this call are not to be deemed safe to edit, pointers or pointed data
-u32 LoadCertFromCertDb(Certificate* cert, const char* issuer) {
-    if (!issuer || !cert) return 1;
-
-    u32 _ident = _Issuer_To_StorageIdent(issuer);
-    if (_LoadFromCertStorage(cert, _ident)) {
-        return 0;
-    }
-
-    int ret = 1;
-
-    for (int i = 0; i < 2 && ret; ++i) {
-        Certificate cert_local = CERTIFICATE_NULL_INIT;
-
-        char path[16];
-        DisaDiffRWInfo info;
-        u8* cache;
-
-        u32 offset, max_offset;
-
-        if (_DisaOpenCertDb(&path, i ? true : false, &info, &cache, &offset, &max_offset))
-            return 1;
-
-        // certs.db has no filesystem.. its pretty plain, certificates after another
-        // but also, certificates are not equally sized
-        // so most cases of bad data, leads to giving up
-        while (offset < max_offset) {
-            char full_issuer[0x41];
-            u32 full_size;
-
-            if (_ProcessNextCertDbEntry(path, &info, &cert_local, &full_size, &full_issuer, &offset, max_offset))
-                break;
-
-            if (!strcmp(full_issuer, issuer)) {
-                ret = 0;
-                break;
-            }
-
-            _Certificate_CleanupImpl(&cert_local);
-
-            offset += full_size;
-        }
-
-        if (ret) {
-            _Certificate_CleanupImpl(&cert_local);
-        } else {
-            *cert = cert_local;
-            _SaveToCertStorage(&cert_local, _ident);
-        }
-
-        free(cache);
-    }
-
-    return ret;
-}
-
-// I dont expect many certs on a cert bundle, so I'll cap it to 8
-u32 BuildRawCertBundleFromCertDb(void* rawout, size_t* size, const char* const* cert_issuers, int count) {
-    if (!rawout || !size || !cert_issuers || count < 0 || count > 8) return 1;
-    if (!*size && count) return 1;
-    if (!count) { // *shrug*
-        *size = 0;
-        return 0;
-    }
-
-    for (int i = 0; i < count; ++i) {
-        if (!cert_issuers[i])
-            return 1;
-    }
-
-    Certificate certs[8];
-    u8 certs_loaded = 0;
-
-    memset(certs, 0, sizeof(certs));
-
-    int loaded_count = 0;
-
-    // search static storage first
-    for (int i = 0; i < count; ++i) {
-        u32 _ident = _Issuer_To_StorageIdent(cert_issuers[i]);
-        if (_LoadFromCertStorage(&certs[i], _ident)) {
-            certs_loaded |= BIT(i);
-            ++loaded_count;
-        }
-    }
-
-    int ret = 0;
-
-    for (int i = 0; i < 2 && loaded_count != count && !ret; ++i) {
-        Certificate cert_local = CERTIFICATE_NULL_INIT;
-
-        char path[16];
-        DisaDiffRWInfo info;
-        u8* cache;
-
-        u32 offset, max_offset;
-
-        if (_DisaOpenCertDb(&path, i ? true : false, &info, &cache, &offset, &max_offset))
-            continue;
-
-        while (offset < max_offset) {
-            char full_issuer[0x41];
-            u32 full_size;
-
-            if (_ProcessNextCertDbEntry(path, &info, &cert_local, &full_size, &full_issuer, &offset, max_offset))
-                break;
-
-            for (int j = 0; j < count; j++) {
-                if (certs_loaded & BIT(j)) continue;
-                if (!strcmp(full_issuer, cert_issuers[j])) {
-                    ret = _Certificate_AllocCopyOutImpl(&cert_local, &certs[j]);
-                    if (ret) break;
-                    certs_loaded |= BIT(j);
-                    ++loaded_count;
-                }
-            }
-
-            // while at it, try to save to static storage, if applicable
-            u32 _ident = _Issuer_To_StorageIdent(full_issuer);
-            _SaveToCertStorage(&cert_local, _ident);
-
-            _Certificate_CleanupImpl(&cert_local);
-
-            if (loaded_count == count || ret) // early exit
-                break;
-
-            offset += full_size;
-        }
-
-        free(cache);
-    }
-
-    if (!ret && loaded_count == count) {
-        u8* out = (u8*)rawout;
-        size_t limit = *size, written = 0;
-
-        for (int i = 0; i < count; ++i) {
-            u32 sig_size = _Certificate_GetSignatureChunkSizeFromType(getbe32(certs[i].sig->sig_type));
-            u32 data_size = _Certificate_GetDataChunkSizeFromType(getbe32(certs[i].data->keytype));
-
-            if (sig_size == 0 || data_size == 0) {
-                ret = 1;
-                break;
-            }
-
-            u32 full_size = sig_size + data_size;
-
-            if (written + full_size > limit) {
-                ret = 1;
-                break;
-            }
-
-            if (_Certificate_RawCopyImpl(&certs[i], out)) {
-                ret = 1;
-                break;
-            }
-
-            out += full_size;
-            written += full_size;
-        }
-
-        if (!ret)
-            *size = written;
-    } else {
-        ret = 1;
-    }
-
-    for (int i = 0; i < count; ++i) {
-        if (certs_loaded & BIT(i))
-            _Certificate_CleanupImpl(&certs[i]);
-    }
-
-    return ret;
-}

arm9/source/game/cert.h

@@ -2,54 +2,21 @@
 
 #include "common.h"
 
-#define CERT_MAX_SIZE          (sizeof(CertificateSignature) + 0x23C + sizeof(CertificateBody) + 0x238)
-
-#define CERT_RSA4096_SIG_SIZE  (sizeof(CertificateSignature) + 0x23C)
-#define CERT_RSA2048_SIG_SIZE  (sizeof(CertificateSignature) + 0x13C)
-#define CERT_ECC_SIG_SIZE      (sizeof(CertificateSignature) + 0x7C)
-#define CERT_RSA4096_BODY_SIZE (sizeof(CertificateBody) + 0x238)
-#define CERT_RSA2048_BODY_SIZE (sizeof(CertificateBody) + 0x138)
-#define CERT_ECC_BODY_SIZE     (sizeof(CertificateBody) + 0x78)
-
-#define CERTIFICATE_NULL_INIT  ((Certificate){NULL, NULL})
+#define CERT_SIZE  sizeof(Certificate)
 
 // from: http://3dbrew.org/wiki/Certificates
 // all numbers in big endian
 typedef struct {
-    u8 sig_type[4];
-    u8 signature[];
-} PACKED_ALIGN(1) CertificateSignature;
+    u8 sig_type[4]; // expected: 0x010004 / RSA_2048 SHA256
+    u8 signature[0x100];
+    u8 padding0[0x3C];
+    u8 issuer[0x40];
+    u8 keytype[4]; // expected: 0x01 / RSA_2048
+    u8 name[0x40];
+    u8 unknown[4];
+    u8 mod[0x100];
+    u8 exp[0x04];
+    u8 padding1[0x34];
+} PACKED_STRUCT Certificate;
 
-typedef struct {
-    char issuer[0x40];
-    u8 keytype[4];
-    char name[0x40];
-    u8 expiration[4];
-    u8 pub_key_data[];
-} PACKED_ALIGN(1) CertificateBody;
-
-typedef struct {
-    CertificateSignature* sig;
-    CertificateBody* data;
-} Certificate;
-
-bool Certificate_IsValid(const Certificate* cert);
-bool Certificate_IsRSA(const Certificate* cert);
-bool Certificate_IsECC(const Certificate* cert);
-u32 Certificate_GetSignatureSize(const Certificate* cert, u32* size);
-u32 Certificate_GetModulusSize(const Certificate* cert, u32* size);
-u32 Certificate_GetModulus(const Certificate* cert, void* mod);
-u32 Certificate_GetExponent(const Certificate* cert, void* exp);
-u32 Certificate_GetEccSingleCoordinateSize(const Certificate* cert, u32* size);
-u32 Certificate_GetEccXY(const Certificate* cert, void* X, void* Y);
-u32 Certificate_GetSignatureChunkSize(const Certificate* cert, u32* size);
-u32 Certificate_GetDataChunkSize(const Certificate* cert, u32* size);
-u32 Certificate_GetFullSize(const Certificate* cert, u32* size);
-u32 Certificate_VerifySignatureBlock(const Certificate* cert, const void* sig, u32 sig_size, const void* data, u32 data_size, bool sha256);
-u32 Certificate_MakeEditSafe(Certificate* cert);
-u32 Certificate_AllocCopyOut(const Certificate* cert, Certificate* out_cert);
-u32 Certificate_RawCopy(const Certificate* cert, void* raw);
-u32 Certificate_Cleanup(Certificate* cert);
-
-u32 LoadCertFromCertDb(Certificate* cert, const char* issuer);
-u32 BuildRawCertBundleFromCertDb(void* rawout, size_t* size, const char* const* cert_issuers, int count);
+u32 LoadCertFromCertDb(u64 offset, Certificate* cert, u32* mod, u32* exp);

arm9/source/game/cia.c

@@ -4,7 +4,6 @@
 #include "ff.h"
 #include "aes.h"
 #include "sha.h"
-#include "cert.h"
 
 u32 ValidateCiaHeader(CiaHeader* header) {
     if ((header->size_header != CIA_HEADER_SIZE) ||
@@ -60,14 +59,21 @@ u32 BuildCiaCert(u8* ciacert) {
         0x18, 0x83, 0xAF, 0xE0, 0xF4, 0xE5, 0x62, 0xBA, 0x69, 0xEE, 0x72, 0x2A, 0xC2, 0x4E, 0x95, 0xB3
     };
 
-    static const char* const retail_issuers[] = {"Root-CA00000003", "Root-CA00000003-XS0000000c", "Root-CA00000003-CP0000000b"};
-    static const char* const dev_issuers[] = {"Root-CA00000004", "Root-CA00000004-XS00000009", "Root-CA00000004-CP0000000a"};
-
-    size_t size = CIA_CERT_SIZE;
-    if (BuildRawCertBundleFromCertDb(ciacert, &size, !IS_DEVKIT ? retail_issuers : dev_issuers, 3) ||
-        size != CIA_CERT_SIZE) {
+    // open certs.db file on SysNAND
+    FIL db;
+    UINT bytes_read;
+    if (f_open(&db, "1:/dbs/certs.db", FA_READ | FA_OPEN_EXISTING) != FR_OK)
         return 1;
-    }
+    // grab CIA cert from 4 offsets
+    f_lseek(&db, 0x0C10);
+    f_read(&db, ciacert + 0x000, 0x1F0, &bytes_read);
+    f_lseek(&db, 0x3A00);
+    f_read(&db, ciacert + 0x1F0, 0x210, &bytes_read);
+    f_lseek(&db, 0x3F10);
+    f_read(&db, ciacert + 0x400, 0x300, &bytes_read);
+    f_lseek(&db, 0x3C10);
+    f_read(&db, ciacert + 0x700, 0x300, &bytes_read);
+    f_close(&db);
 
     // check the certificate hash
     u8 cert_hash[0x20];

arm9/source/game/cifinish.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-#define CIFINISH_MAGIC			"CIFINISH"
-#define CIFINISH_TITLE_MAGIC	"TITLE"
-#define CIFINISH_SIZE(c)		(sizeof(CifinishHeader) + ((((CifinishHeader*)(c))->n_entries) * sizeof(CifinishTitle)))
-
-// see: https://github.com/ihaveamac/custom-install/blob/ac0be9d61d7ebef9356df23036dc53e8e862011a/custominstall.py#L163
-typedef struct {
-    char magic[8];
-    u32 version;
-    u32 n_entries;
-} __attribute__((packed, aligned(4))) CifinishHeader;
-
-typedef struct {
-    char magic[5];
-    u8  padding0;
-    u8  has_seed; // 1 if it does, otherwise 0
-    u8  padding1;
-    u64 title_id;
-    u8  seed[16];
-} __attribute__((packed, aligned(4))) CifinishTitle;

arm9/source/game/codelzss.c

@@ -1,5 +1,4 @@
 #include "codelzss.h"
-#include "language.h"
 #include "ui.h"
 
 #define CODE_COMP_SIZE(f)   ((f)->off_size_comp & 0xFFFFFF)
@@ -46,10 +45,10 @@ u32 DecompressCodeLzss(u8* code, u32* code_size, u32 max_size) {
 
     // main decompression loop
     while ((ptr_in > comp_start) && (ptr_out > comp_start)) {
-        if (!ShowProgress(data_end - ptr_out, data_end - data_start, STR_DECOMPRESSING_DOT_CODE)) {
-            if (ShowPrompt(true, "%s", STR_DECOMPRESSING_DOT_CODE_B_DETECTED_CANCEL)) return 1;
-            ShowProgress(0, data_end - data_start, STR_DECOMPRESSING_DOT_CODE);
-            ShowProgress(data_end - ptr_out, data_end - data_start, STR_DECOMPRESSING_DOT_CODE);
+        if (!ShowProgress(data_end - ptr_out, data_end - data_start, "Decompressing .code...")) {
+            if (ShowPrompt(true, "Decompressing .code...\nB button detected. Cancel?")) return 1;
+            ShowProgress(0, data_end - data_start, "Decompressing .code...");
+            ShowProgress(data_end - ptr_out, data_end - data_start, "Decompressing .code...");
         }
 
         // sanity check
@@ -243,13 +242,13 @@ bool CompressCodeLzss(const u8* a_pUncompressed, u32 a_uUncompressedSize, u8* a_
             u8* pDest = a_pCompressed + a_uUncompressedSize;
 
             while (pSrc - a_pUncompressed > 0 && pDest - a_pCompressed > 0) {
-                if (!ShowProgress((u32)(a_pUncompressed + a_uUncompressedSize - pSrc), a_uUncompressedSize, STR_COMPRESSING_DOT_CODE)) {
-                    if (ShowPrompt(true, "%s", STR_COMPRESSING_DOT_CODE_B_DETECTED_CANCEL)) {
+                if (!ShowProgress((u32)(a_pUncompressed + a_uUncompressedSize - pSrc), a_uUncompressedSize, "Compressing .code...")) {
+                    if (ShowPrompt(true, "Compressing .code...\nB button detected. Cancel?")) {
                         bResult = false;
                         break;
                     }
-                    ShowProgress(0, a_uUncompressedSize, STR_COMPRESSING_DOT_CODE);
-                    ShowProgress((u32)(a_pUncompressed + a_uUncompressedSize - pSrc), a_uUncompressedSize, STR_COMPRESSING_DOT_CODE);
+                    ShowProgress(0, a_uUncompressedSize, "Compressing .code...");
+                    ShowProgress((u32)(a_pUncompressed + a_uUncompressedSize - pSrc), a_uUncompressedSize, "Compressing .code...");
                 }
 
                 u8* pFlag = --pDest;

arm9/source/game/firm.c

@@ -12,19 +12,18 @@
 // valid addresses for FIRM section loading
 // pairs of start / end address, provided by Wolfvak
 #define FIRM_VALID_ADDRESS  \
+    0x08000040, 0x08100000, \
     0x18000000, 0x18600000, \
     0x1FF00000, 0x1FFFFC00
 
 // valid addresses (installable) for FIRM section loading
 #define FIRM_VALID_ADDRESS_INSTALL  \
     FIRM_VALID_ADDRESS, \
-    0x08000040, 0x080F7FFF, \
     0x10000000, 0x10200000
 
 // valid addresses (bootable) for FIRM section loading
 #define FIRM_VALID_ADDRESS_BOOT \
     FIRM_VALID_ADDRESS, \
-    0x08000040, 0x08100000, \
     0x20000000, 0x27FFFA00
 
 static const u32 whitelist_boot[] = { FIRM_VALID_ADDRESS_BOOT };

arm9/source/game/game.h

@@ -20,4 +20,3 @@
 #include "bdri.h"
 #include "ticketdb.h"
 #include "ncchinfo.h"
-#include "cifinish.h"

arm9/source/game/gba.c

@@ -87,17 +87,3 @@ u32 ValidateAgbHeader(AgbHeader* agb) {
 
     return 0;
 } */
-
-// see: http://problemkaputt.de/gbatek.htm#gbacartridgeheader
-const char* AgbDestStr(const char* code) {
-    switch(code[3]) {
-        case 'J': return STR_REGION_JAPAN;
-        case 'E': return STR_REGION_AMERICAS;
-        case 'P': return STR_REGION_EUROPE;
-        case 'D': return STR_REGION_GERMANY;
-        case 'F': return STR_REGION_FRANCE;
-        case 'I': return STR_REGION_ITALY;
-        case 'S': return STR_REGION_SPAIN;
-        default:  return STR_REGION_UNKNOWN;
-    }
-}

arm9/source/game/gba.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common.h"
-#include "language.h"
 
 #define GBAVC_MAGIC         '.', 'C', 'A', 'A'
 #define AGBSAVE_MAGIC       '.', 'S', 'A', 'V'
@@ -29,6 +28,16 @@
     ((size) == GBASAVE_FLASH_64K)  || \
     ((size) == GBASAVE_FLASH_128K))
 
+// see: http://problemkaputt.de/gbatek.htm#gbacartridgeheader
+#define AGB_DESTSTR(code) \
+   (((code)[3] == 'J') ? "Japan"            : \
+    ((code)[3] == 'E') ? "USA/English"      : \
+    ((code)[3] == 'P') ? "Europe/Elsewhere" : \
+    ((code)[3] == 'D') ? "German"           : \
+    ((code)[3] == 'F') ? "French"           : \
+    ((code)[3] == 'I') ? "Italian"          : \
+    ((code)[3] == 'S') ? "Spanish" : "Unknown")
+
 
 // see: http://3dbrew.org/wiki/3DS_Virtual_Console#Footer
 // still a lot of unknowns in here, also redundant stuff left out
@@ -80,8 +89,5 @@ typedef struct {
 } __attribute__((packed, aligned(16))) AgbHeader;
 
 
-
 u32 ValidateAgbSaveHeader(AgbSaveHeader* header);
 u32 ValidateAgbHeader(AgbHeader* agb);
-
-const char* AgbDestStr(const char* code);

arm9/source/game/ips.c

@@ -5,7 +5,6 @@
 #include "ips.h"
 #include "common.h"
 #include "fsperm.h"
-#include "language.h"
 #include "ui.h"
 #include "vff.h"
 
@@ -31,21 +30,21 @@ char errName[256];
 int displayError(int errcode) {
     switch(errcode) {
         case IPS_NOTTHIS:
-            ShowPrompt(false, "%s\n%s", errName, STR_PATCH_MOST_LIKELY_NOT_FOR_THIS_FILE); break;
+            ShowPrompt(false, "%s\nThe patch is most likely not intended for this file.", errName); break;
         case IPS_THISOUT:
-            ShowPrompt(false, "%s\n%s", errName, STR_YOU_MOST_LIKELY_APPLIED_PATCH_ON_OUTPUT); break;
+            ShowPrompt(false, "%s\nYou most likely applied the patch on the output file.", errName); break;
         case IPS_SCRAMBLED:
-            ShowPrompt(false, "%s\n%s", errName, STR_PATCH_TECHNICALLY_VALID_BUT_SEEMS_SCRAMBLED); break;
+            ShowPrompt(false, "%s\nThe patch is technically valid,\nbut seems scrambled or malformed.", errName); break;
         case IPS_INVALID:
-            ShowPrompt(false, "%s\n%s", errName, STR_PATCH_IS_INVALID); break;
+            ShowPrompt(false, "%s\nThe patch is invalid.", errName); break;
         case IPS_16MB:
-            ShowPrompt(false, "%s\n%s", errName, STR_FILES_BIGGER_THAN_16MB_IPS_DOESNT_SUPPORT_THAT); break;
+            ShowPrompt(false, "%s\nOne or both files is bigger than 16MB.\nThe IPS format doesn't support that.", errName); break;
         case IPS_INVALID_FILE_PATH:
-            ShowPrompt(false, "%s\n%s", errName, STR_REQUESTED_FILE_PATH_WAS_INVALID); break;
+            ShowPrompt(false, "%s\nThe requested file path was invalid.", errName); break;
         case IPS_CANCELED:
-            ShowPrompt(false, "%s\n%s", errName, STR_PATCHING_CANCELED); break;
+            ShowPrompt(false, "%s\nPatching canceled.", errName); break;
         case IPS_MEMORY:
-            ShowPrompt(false, "%s\n%s", errName, STR_NOT_ENOUGH_MEMORY); break;
+            ShowPrompt(false, "%s\nNot enough memory.", errName); break;
     }
     fvx_close(&patchFile);
     fvx_close(&inFile);
@@ -113,7 +112,7 @@ UINT read24() {
 int ApplyIPSPatch(const char* patchName, const char* inName, const char* outName) {
     int error = IPS_INVALID;
     UINT outlen_min, outlen_max, outlen_min_mem;
-    snprintf(errName, sizeof(errName), "%s", patchName);
+    snprintf(errName, 256, "%s", patchName);
 
     if (fvx_open(&patchFile, patchName, FA_READ) != FR_OK) return displayError(IPS_INVALID_FILE_PATH);
     patchSize = fvx_size(&patchFile);
@@ -141,7 +140,7 @@ int ApplyIPSPatch(const char* patchName, const char* inName, const char* outName
     while (offset != 0x454F46) // 454F46=EOF
     {
         if (!ShowProgress(patchOffset, patchSize, patchName)) {
-            if (ShowPrompt(true, "%s\n%s", patchName, STR_B_DETECTED_CANCEL)) return displayError(IPS_CANCELED);
+            if (ShowPrompt(true, "%s\nB button detected. Cancel?", patchName)) return displayError(IPS_CANCELED);
             ShowProgress(0, patchSize, patchName);
             ShowProgress(patchOffset, patchSize, patchName);
         }
@@ -212,7 +211,7 @@ int ApplyIPSPatch(const char* patchName, const char* inName, const char* outName
     while (offset != 0x454F46)
     {
         if (!ShowProgress(offset, outSize, outName)) {
-            if (ShowPrompt(true, "%s\n%s", outName, STR_B_DETECTED_CANCEL)) return displayError(IPS_CANCELED);
+            if (ShowPrompt(true, "%s\nB button detected. Cancel?", outName)) return displayError(IPS_CANCELED);
             ShowProgress(0, outSize, outName);
             ShowProgress(offset, outSize, outName);
         }

arm9/source/game/nds.c

@@ -27,23 +27,6 @@ u32 ValidateTwlHeader(TwlHeader* twl) {
     return (crc16_quick(twl->logo, sizeof(twl->logo)) == NDS_LOGO_CRC16) ? 0 : 1;
 }
 
-u32 VerifyTwlIconData(TwlIconData* icon, u32 version) {
-    u32 tsize = TWLICON_SIZE_DATA(version);
-    u32 isize = TWLICON_SIZE_DATA(icon->version);
-    u8* icn = (u8*) icon;
-
-    if (!isize) return 1;
-    if (version && (!tsize || tsize > isize)) return 1;
-
-    u32 size = version ? tsize : isize;
-    if ((size >= 0x0840) && (crc16_quick(icn + 0x0020, 0x0840 - 0x0020) != icon->crc_0x0020_0x0840)) return 1;
-    if ((size >= 0x0940) && (crc16_quick(icn + 0x0020, 0x0940 - 0x0020) != icon->crc_0x0020_0x0940)) return 1;
-    if ((size >= 0x1240) && (crc16_quick(icn + 0x0020, 0x0A40 - 0x0020) != icon->crc_0x0020_0x0A40)) return 1;
-    if ((size >= 0x23C0) && (crc16_quick(icn + 0x1240, 0x23C0 - 0x1240) != icon->crc_0x1240_0x23C0)) return 1;
-    
-    return 0;
-}
-
 u32 BuildTwlSaveHeader(void* sav, u32 size) {
     const u16 sct_size = 0x200;
     if (size / (u32) sct_size > 0xFFFF)
@@ -55,24 +38,20 @@ u32 BuildTwlSaveHeader(void* sav, u32 size) {
     u16 n_sct = 1;
     u16 sct_track = 1;
     u16 sct_heads = 1;
-    u16 n_sct_next = 0;
-    while (n_sct_next <= n_sct_max) {
-        n_sct_next = sct_track * (sct_heads + 1) * (sct_heads + 1);
-        if (n_sct_next <= n_sct_max) {
+    while (true) {
+        if (sct_heads < sct_track) {
+            u16 n_sct_next = sct_track * (sct_heads+1) * (sct_heads+1);
+            if (n_sct_next < n_sct_max) {
                 sct_heads++;
                 n_sct = n_sct_next;
-
-            sct_track++;
-            n_sct_next = sct_track * sct_heads * sct_heads;
-            if (n_sct_next <= n_sct_max) {
-                n_sct = n_sct_next;
-            }
-        }
-    }
-    n_sct_next = (sct_track + 1) * sct_heads * sct_heads;
-    if (n_sct_next <= n_sct_max) {
+            } else break;
+        } else {
+            u16 n_sct_next = (sct_track+1) * sct_heads * sct_heads;
+            if (n_sct_next < n_sct_max) {
                 sct_track++;
                 n_sct = n_sct_next;
+            } else break;
+        }
     }
 
     // sectors per cluster (should be identical to Nintendo)
@@ -147,19 +126,11 @@ u32 GetTwlIcon(u16* icon, const TwlIconData* twl_icon) {
                 u32 ix = x + (i & 0x7);
                 u32 iy = y + (i >> 3);
 
-                int palette_index = ((i%2) ? (*pix4 >> 4) : *pix4) & 0xF;
-                if (palette_index) {
-                    pix555 = palette[palette_index];
+                pix555 = palette[((i%2) ? (*pix4 >> 4) : *pix4) & 0xF];
                 r = pix555 & 0x1F;
                 g = ((pix555 >> 5) & 0x1F) << 1;
                 g |= (g >> 1) & 1;
                 b = (pix555 >> 10) & 0x1F;
-                } else {
-                    // Set transparent pixels to white
-                    r = 31;
-                    g = 63;
-                    b = 31;
-                }
                 icon[(iy * w) + ix] = (r << 11) | (g << 5) | b;
                 if (i % 2) pix4++;
             }

arm9/source/game/nds.h

@@ -127,7 +127,6 @@ typedef struct {
 } PACKED_STRUCT TwlHeader;
 
 u32 ValidateTwlHeader(TwlHeader* twl);
-u32 VerifyTwlIconData(TwlIconData* icon, u32 size);
 u32 BuildTwlSaveHeader(void* sav, u32 size);
 u32 LoadTwlMetaData(const char* path, TwlHeader* hdr, TwlIconData* icon);
 u32 GetTwlTitle(char* desc, const TwlIconData* twl_icon);

arm9/source/game/region.c

@@ -1,5 +1,4 @@
 #include "common.h"
-#include "language.h"
 #include "region.h"
 
 // Names of system regions, short form.
@@ -13,16 +12,13 @@ const char* const g_regionNamesShort[SMDH_NUM_REGIONS] = {
     "TWN",
 };
 
-// Names of system regions, long form and translatable.
-const char* regionNameLong(int region) {
-    switch(region) {
-        case REGION_JPN: return STR_REGION_JAPAN;
-        case REGION_USA: return STR_REGION_AMERICAS;
-        case REGION_EUR: return STR_REGION_EUROPE;
-        case REGION_AUS: return STR_REGION_AUSTRALIA;
-        case REGION_CHN: return STR_REGION_CHINA;
-        case REGION_KOR: return STR_REGION_KOREA;
-        case REGION_TWN: return STR_REGION_TAIWAN;
-        default:         return STR_REGION_UNKNOWN;
-    }
+// Names of system regions, long form.
+const char* const g_regionNamesLong[SMDH_NUM_REGIONS] = {
+    "Japan",
+    "Americas",
+    "Europe",
+    "Australia",
+    "China",
+    "Korea",
+    "Taiwan",
 };

arm9/source/game/region.h

@@ -27,5 +27,5 @@
 
 // Names of system regions, short form.
 extern const char* const g_regionNamesShort[SMDH_NUM_REGIONS];
-// Names of system regions, long form and translatable.
-const char* regionNameLong(int region);
+// Names of system regions, long form.
+extern const char* const g_regionNamesLong[SMDH_NUM_REGIONS];

arm9/source/game/tad.c

@@ -1,20 +1,6 @@
 #include "tad.h"
-#include "sha.h"
 
 
-u32 VerifyTadStub(TadStub* tad) {
-    TadFooter* ftr = &(tad->footer);
-    TadHeader* hdr = &(tad->header);
-    TadBanner* bnr = &(tad->banner);
-
-    if ((strncmp(hdr->magic, TAD_HEADER_MAGIC, strlen(TAD_HEADER_MAGIC)) != 0) ||
-        (sha_cmp(ftr->banner_sha256, bnr, sizeof(TadBanner), SHA256_MODE) != 0) ||
-        (sha_cmp(ftr->header_sha256, hdr, sizeof(TadHeader), SHA256_MODE) != 0))
-        return 1;
-
-    return 0;
-}
-
 u32 BuildTadContentTable(void* table, void* header) {
     TadHeader* hdr = (TadHeader*) header;
     TadContentTable* tbl = (TadContentTable*) table;

arm9/source/game/tad.h

@@ -56,14 +56,4 @@ typedef struct {
     u8  padding[0x4];
 } PACKED_STRUCT TadFooter;
 
-typedef struct {
-    TadBanner banner;
-    TadBlockMetaData banner_bmd;
-    TadHeader header;
-    TadBlockMetaData header_bmd;
-    TadFooter footer;
-    TadBlockMetaData footer_bmd;
-} PACKED_STRUCT TadStub;
-
-u32 VerifyTadStub(TadStub* tad);
 u32 BuildTadContentTable(void* table, void* header);

arm9/source/game/ticket.c

@@ -19,113 +19,47 @@ u32 ValidateTicket(Ticket* ticket) {
     return 0;
 }
 
-u32 ValidateTwlTicket(Ticket* ticket) {
-    static const u8 magic[] = { TICKET_SIG_TYPE_TWL };
-    if ((memcmp(ticket->sig_type, magic, sizeof(magic)) != 0) ||
-        (strncmp((char*) ticket->issuer, TICKET_ISSUER_TWL, 0x40) != 0))
-        return 1;
-    return 0;
-}
-
 u32 ValidateTicketSignature(Ticket* ticket) {
-    Certificate cert;
+    static bool got_modexp = false;
+    static u32 mod[0x100 / 0x4] = { 0 };
+    static u32 exp = 0;
 
-    // grab cert from certs.db
-    if (LoadCertFromCertDb(&cert, (char*)(ticket->issuer)) != 0)
-        return 1;
-
-    int ret = Certificate_VerifySignatureBlock(&cert, &(ticket->signature), 0x100, (void*)&(ticket->issuer), GetTicketSize(ticket) - 0x140, true);
-
-    Certificate_Cleanup(&cert);
-
-    return ret;
+    if (!got_modexp) {
+        // grab mod/exp from cert from cert.db
+        if (LoadCertFromCertDb(0x3F10, NULL, mod, &exp) == 0)
+            got_modexp = true;
+        else return 1;
     }
 
-u32 BuildVariableFakeTicket(Ticket** ticket, u32* ticket_size, const u8* title_id, u32 index_max) {
-    if (!ticket || !ticket_size)
+    if (!RSA_setKey2048(3, mod, exp) ||
+        !RSA_verify2048((void*) &(ticket->signature), (void*) &(ticket->issuer), GetTicketSize(ticket) - 0x140))
         return 1;
 
-    static const u8 sig_type[4] =  { TICKET_SIG_TYPE }; // RSA_2048 SHA256
-
-    // calculate sizes and determine pointers to use
-    u32 rights_field_count = (min(index_max, 0x10000) + 1023) >> 10; // round up to 1024 and cap at 65536, and div by 1024
-    u32 content_index_size = sizeof(TicketContentIndexMainHeader) + sizeof(TicketContentIndexDataHeader) + sizeof(TicketRightsField) * rights_field_count;
-    u32 _ticket_size = sizeof(Ticket) + content_index_size;
-    Ticket *_ticket;
-
-    if (*ticket) { // if a pointer was pregiven
-        if (*ticket_size < _ticket_size) { // then check given boundary size
-            *ticket_size = _ticket_size; // if not enough, inform the actual needed size
-            return 2; // indicate a size error
-        }
-        _ticket = *ticket; // get the pointer if we good to go
-    } else // if not pregiven, allocate one
-        _ticket = (Ticket*)malloc(_ticket_size);
-
-    if (!_ticket)
-        return 1;
-
-    // set ticket all zero for a clean start
-    memset(_ticket, 0x00, _ticket_size);
-    // fill ticket values
-    memcpy(_ticket->sig_type, sig_type, 4);
-    memset(_ticket->signature, 0xFF, 0x100);
-    snprintf((char*) _ticket->issuer, 0x40, IS_DEVKIT ? TICKET_ISSUER_DEV : TICKET_ISSUER);
-    memset(_ticket->ecdsa, 0xFF, 0x3C);
-    _ticket->version = 0x01;
-    memset(_ticket->titlekey, 0xFF, 16);
-    if (title_id) memcpy(_ticket->title_id, title_id, 8);
-    _ticket->commonkey_idx = 0x00; // eshop
-    _ticket->audit = 0x01; // whatever
-
-    // fill in rights
-    TicketContentIndexMainHeader* mheader = (TicketContentIndexMainHeader*)&_ticket->content_index[0];
-    TicketContentIndexDataHeader* dheader = (TicketContentIndexDataHeader*)&_ticket->content_index[0x14];
-    TicketRightsField* rights = (TicketRightsField*)&_ticket->content_index[0x28];
-
-    // first main data header
-    mheader->unk1[1] = 0x1; mheader->unk2[1] = 0x14;
-    mheader->content_index_size[3] = (u8)(content_index_size >>  0);
-    mheader->content_index_size[2] = (u8)(content_index_size >>  8);
-    mheader->content_index_size[1] = (u8)(content_index_size >> 16);
-    mheader->content_index_size[0] = (u8)(content_index_size >> 24);
-    mheader->data_header_relative_offset[3] = 0x14; // relative offset for TicketContentIndexDataHeader
-    mheader->unk3[1] = 0x1; mheader->unk4[1] = 0x14;
-
-    // then the data header
-    dheader->data_relative_offset[3] = 0x28; // relative offset for TicketRightsField
-    dheader->max_entry_count[3] = (u8)(rights_field_count >>  0);
-    dheader->max_entry_count[2] = (u8)(rights_field_count >>  8);
-    dheader->max_entry_count[1] = (u8)(rights_field_count >> 16);
-    dheader->max_entry_count[0] = (u8)(rights_field_count >> 24);
-    dheader->size_per_entry[3] = (u8)sizeof(TicketRightsField); // sizeof should be 0x84
-    dheader->total_size_used[3] = (u8)((sizeof(TicketRightsField) * rights_field_count) >>  0);
-    dheader->total_size_used[2] = (u8)((sizeof(TicketRightsField) * rights_field_count) >>  8);
-    dheader->total_size_used[1] = (u8)((sizeof(TicketRightsField) * rights_field_count) >> 16);
-    dheader->total_size_used[0] = (u8)((sizeof(TicketRightsField) * rights_field_count) >> 24);
-    dheader->data_type[1] = 3; // right fields
-
-    // now the right fields
-    // indexoffets must be in accending order to have the desired effect
-    for (u32 i = 0; i < rights_field_count; ++i) {
-        rights[i].indexoffset[1] = (u8)((1024 * i) >> 0);
-        rights[i].indexoffset[0] = (u8)((1024 * i) >> 8);
-        memset(&rights[i].rightsbitfield[0], 0xFF, sizeof(rights[0].rightsbitfield));
-    }
-
-    *ticket = _ticket;
-    *ticket_size = _ticket_size;
-
     return 0;
 }
 
-u32 BuildFakeTicket(Ticket* ticket, const u8* title_id) {
-    Ticket* tik = NULL;
-    u32 ticket_size = sizeof(TicketCommon);
-    u32 res = BuildVariableFakeTicket(&tik, &ticket_size, title_id, TICKET_MAX_CONTENTS);
-    if (res != 0) return res;
-    memcpy(ticket, tik, ticket_size);
-    free(tik);
+u32 BuildFakeTicket(Ticket* ticket, u8* title_id) {
+    static const u8 sig_type[4] =  { TICKET_SIG_TYPE }; // RSA_2048 SHA256
+    static const u8 ticket_cnt_index[] = { // whatever this is
+        0x00, 0x01, 0x00, 0x14, 0x00, 0x00, 0x00, 0xAC, 0x00, 0x00, 0x00, 0x14, 0x00, 0x01, 0x00, 0x14,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x84,
+        0x00, 0x00, 0x00, 0x84, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    // set ticket all zero for a clean start
+    memset(ticket, 0x00, TICKET_COMMON_SIZE); // 0xAC being size of this fake ticket's content index
+    // fill ticket values
+    memcpy(ticket->sig_type, sig_type, 4);
+    memset(ticket->signature, 0xFF, 0x100);
+    snprintf((char*) ticket->issuer, 0x40, IS_DEVKIT ? TICKET_ISSUER_DEV : TICKET_ISSUER);
+    memset(ticket->ecdsa, 0xFF, 0x3C);
+    ticket->version = 0x01;
+    memset(ticket->titlekey, 0xFF, 16);
+    memcpy(ticket->title_id, title_id, 8);
+    ticket->commonkey_idx = 0x00; // eshop
+    ticket->audit = 0x01; // whatever
+    memcpy(ticket->content_index, ticket_cnt_index, sizeof(ticket_cnt_index));
+    memset(&ticket->content_index[sizeof(ticket_cnt_index)], 0xFF, 0x80); // 1024 content indexes
+
     return 0;
 }
 
@@ -147,14 +81,19 @@ u32 BuildTicketCert(u8* tickcert) {
         0xC6, 0x4B, 0xD4, 0x8F, 0xDF, 0x13, 0x21, 0x3D, 0xFC, 0x72, 0xFC, 0x8D, 0x9F, 0xDD, 0x01, 0x0E
     };
 
-    static const char* const retail_issuers[] = {"Root-CA00000003-XS0000000c", "Root-CA00000003"};
-    static const char* const dev_issuers[] = {"Root-CA00000004-XS00000009", "Root-CA00000004"};
-
-    size_t size = TICKET_CDNCERT_SIZE;
-    if (BuildRawCertBundleFromCertDb(tickcert, &size, !IS_DEVKIT ? retail_issuers : dev_issuers, 2) ||
-        size != TICKET_CDNCERT_SIZE) {
+    // open certs.db file on SysNAND
+    FIL db;
+    UINT bytes_read;
+    if (f_open(&db, "1:/dbs/certs.db", FA_READ | FA_OPEN_EXISTING) != FR_OK)
         return 1;
-    }
+    // grab ticket cert from 3 offsets
+    f_lseek(&db, 0x3F10);
+    f_read(&db, tickcert + 0x000, 0x300, &bytes_read);
+    f_lseek(&db, 0x0C10);
+    f_read(&db, tickcert + 0x300, 0x1F0, &bytes_read);
+    f_lseek(&db, 0x3A00);
+    f_read(&db, tickcert + 0x4F0, 0x210, &bytes_read);
+    f_close(&db);
 
     // check the certificate hash
     u8 cert_hash[0x20];

arm9/source/game/ticket.h

@@ -1,22 +1,15 @@
 #pragma once
 
 #include "common.h"
-#include "tmd.h"
 
 #define TICKET_COMMON_SIZE  sizeof(TicketCommon)
 #define TICKET_MINIMUM_SIZE sizeof(TicketMinimum)
-#define TICKET_TWL_SIZE     sizeof(Ticket)
 #define TICKET_CDNCERT_SIZE 0x700
-#define TICKET_MAX_CONTENTS TITLE_MAX_CONTENTS // should be TMD_MAX_CONTENTS
-#define TICKET_COMMON_CNT_INDEX_SIZE (0x28 + (((TICKET_MAX_CONTENTS + 1023) >> 10) * 0x84))
 
 #define TICKET_ISSUER       "Root-CA00000003-XS0000000c"
 #define TICKET_ISSUER_DEV   "Root-CA00000004-XS00000009"
 #define TICKET_SIG_TYPE     0x00, 0x01, 0x00, 0x04 // RSA_2048 SHA256
 
-#define TICKET_ISSUER_TWL   "Root-CA00000001-XS00000006"
-#define TICKET_SIG_TYPE_TWL 0x00, 0x01, 0x00, 0x01 // RSA_2048 SHA1
-
 #define TICKET_DEVKIT(tick) (strncmp((char*)tick->issuer, TICKET_ISSUER_DEV, 0x40) == 0)
 
 // from: https://github.com/profi200/Project_CTR/blob/02159e17ee225de3f7c46ca195ff0f9ba3b3d3e4/ctrtool/tik.h#L15-L39
@@ -53,18 +46,18 @@
 typedef struct {
     TICKETBASE;
     u8 content_index[];
-} PACKED_STRUCT Ticket;
+} __attribute__((packed, aligned(4))) Ticket;
 
 typedef struct {
     TICKETBASE;
-    u8 content_index[TICKET_COMMON_CNT_INDEX_SIZE];
-} PACKED_STRUCT TicketCommon;
+    u8 content_index[0xAC];
+} __attribute__((packed, aligned(4))) TicketCommon;
 
 // minimum allowed content_index is 0x14
 typedef struct {
     TICKETBASE;
     u8 content_index[0x14];
-} PACKED_STRUCT TicketMinimum;
+} __attribute__((packed, aligned(4))) TicketMinimum;
 
 typedef struct {
     u8 unk1[2];
@@ -74,7 +67,7 @@ typedef struct {
     u8 unk3[2];
     u8 unk4[2];
     u8 unk5[4];
-} PACKED_ALIGN(1) TicketContentIndexMainHeader;
+} __attribute__((packed)) TicketContentIndexMainHeader;
 
 typedef struct {
     u8 data_relative_offset[4]; // relative to content index start
@@ -83,14 +76,14 @@ typedef struct {
     u8 total_size_used[4]; // also no effect
     u8 data_type[2]; // perhaps, does have effect and change with different data like on 0004000D tickets
     u8 unknown[2]; // or padding
-} PACKED_ALIGN(1) TicketContentIndexDataHeader;
+} __attribute__((packed)) TicketContentIndexDataHeader;
 
 // data type == 3
 typedef struct {
     u8 unk[2]; // seemly has no meaning
     u8 indexoffset[2];
     u8 rightsbitfield[0x80];
-} PACKED_ALIGN(1) TicketRightsField;
+} __attribute__((packed)) TicketRightsField;
 
 typedef struct {
     size_t count;
@@ -98,9 +91,8 @@ typedef struct {
 } TicketRightsCheck;
 
 u32 ValidateTicket(Ticket* ticket);
-u32 ValidateTwlTicket(Ticket* ticket);
 u32 ValidateTicketSignature(Ticket* ticket);
-u32 BuildFakeTicket(Ticket* ticket, const u8* title_id);
+u32 BuildFakeTicket(Ticket* ticket, u8* title_id);
 u32 GetTicketContentIndexSize(const Ticket* ticket);
 u32 GetTicketSize(const Ticket* ticket);
 u32 BuildTicketCert(u8* tickcert);

arm9/source/game/ticketdb.c

@@ -26,21 +26,15 @@ u32 CryptTitleKey(TitleKeyEntry* tik, bool encrypt, bool devkit) {
         {0x75, 0x05, 0x52, 0xBF, 0xAA, 0x1C, 0x04, 0x07, 0x55, 0xC8, 0xD5, 0x9A, 0x55, 0xF9, 0xAD, 0x1F} , // 4
         {0xAA, 0xDA, 0x4C, 0xA8, 0xF6, 0xE5, 0xA9, 0x77, 0xE0, 0xA0, 0xF9, 0xE4, 0x76, 0xCF, 0x0D, 0x63} , // 5
     };
-    // From unknown source
-    static const u8 common_key_twl[16] __attribute__((aligned(16))) =
-        {0xAF, 0x1B, 0xF5, 0x16, 0xA8, 0x07, 0xD2, 0x1A, 0xEA, 0x45, 0x98, 0x4F, 0x04, 0x74, 0x28, 0x61};  // TWL
 
     u32 mode = (encrypt) ? AES_CNT_TITLEKEY_ENCRYPT_MODE : AES_CNT_TITLEKEY_DECRYPT_MODE;
     u8 ctr[16] = { 0 };
 
-    if (getbe16(tik->title_id) == 0x3) { // setup TWL key
-        setup_aeskey(0x11, (void*) common_key_twl);
-        use_aeskey(0x11);
-    } else { // setup key 0x3D // ctr
+    // setup key 0x3D // ctr
+    if (tik->commonkey_idx >= 6) return 1;
     if (!devkit) setup_aeskeyY(0x3D, (void*) common_keyy[tik->commonkey_idx]);
     else setup_aeskey(0x3D, (void*) common_key_dev[tik->commonkey_idx]);
     use_aeskey(0x3D);
-    }
     memcpy(ctr, tik->title_id, 8);
     set_ctr(ctr);
 
@@ -60,17 +54,6 @@ u32 GetTitleKey(u8* titlekey, Ticket* ticket) {
     return 0;
 }
 
-u32 SetTitleKey(const u8* titlekey, Ticket* ticket) {
-    TitleKeyEntry tik = { 0 };
-    memcpy(tik.title_id, ticket->title_id, 8);
-    memcpy(tik.titlekey, titlekey, 16);
-    tik.commonkey_idx = ticket->commonkey_idx;
-
-    if (CryptTitleKey(&tik, true, TICKET_DEVKIT(ticket)) != 0) return 1;
-    memcpy(ticket->titlekey, tik.titlekey, 16);
-    return 0;
-}
-
 u32 FindTicket(Ticket** ticket, u8* title_id, bool force_legit, bool emunand) {
     const char* path_db = TICKDB_PATH(emunand); // EmuNAND / SysNAND
     char path_store[256] = { 0 };
@@ -105,11 +88,11 @@ u32 FindTicket(Ticket** ticket, u8* title_id, bool force_legit, bool emunand) {
 
 u32 FindTitleKey(Ticket* ticket, u8* title_id) {
     bool found = false;
+    TitleKeysInfo* tikdb = (TitleKeysInfo*) malloc(STD_BUFFER_SIZE); // more than enough
+    if (!tikdb) return 1;
 
     // search for a titlekey inside encTitleKeys.bin / decTitleKeys.bin
     // when found, add it to the ticket
-    TitleKeysInfo* tikdb = (TitleKeysInfo*) malloc(STD_BUFFER_SIZE); // more than enough
-    if (!tikdb) return 1;
     for (u32 enc = 0; (enc <= 1) && !found; enc++) {
         u32 len = LoadSupportFile((enc) ? TIKDB_NAME_ENC : TIKDB_NAME_DEC, tikdb, STD_BUFFER_SIZE);
 
@@ -128,31 +111,11 @@ u32 FindTitleKey(Ticket* ticket, u8* title_id) {
             break;
         }
     }
+
     free(tikdb);
-
-    // desperate measures - search in the internal ticket database
-    Ticket* ticket_tmp = NULL;
-    if (FindTicket(&ticket_tmp, title_id, false, false) == 0) {
-        memcpy(ticket->titlekey, ticket_tmp->titlekey, 16);
-        ticket->commonkey_idx = ticket_tmp->commonkey_idx;
-        free(ticket_tmp);
-        found = true;
-    }
-
     return (found) ? 0 : 1;
 }
 
-u32 FindTitleKeyForId(u8* titlekey, u8* title_id) {
-    TicketCommon tik;
-
-    if ((BuildFakeTicket((Ticket*) &tik, title_id) != 0) ||
-        (FindTitleKey((Ticket*) &tik, title_id) != 0) ||
-        (GetTitleKey(titlekey, (Ticket*) &tik) != 0))
-        return 1;
-
-    return 0;
-}
-
 u32 AddTitleKeyToInfo(TitleKeysInfo* tik_info, TitleKeyEntry* tik_entry, bool decrypted_in, bool decrypted_out, bool devkit) {
     if (!tik_entry) { // no titlekey entry -> reset database
         memset(tik_info, 0, 16);
@@ -178,9 +141,3 @@ u32 AddTicketToInfo(TitleKeysInfo* tik_info, Ticket* ticket, bool decrypt) { //
     tik.commonkey_idx = ticket->commonkey_idx;
     return AddTitleKeyToInfo(tik_info, &tik, false, decrypt, TICKET_DEVKIT(ticket));
 }
-
-u32 CryptTitleKeyInfo(TitleKeysInfo* tik_info, bool encrypt) {
-    for (u32 t = 0; t < tik_info->n_entries; t++)
-        CryptTitleKey(tik_info->entries + t, encrypt, false);
-    return 0;
-}

arm9/source/game/ticketdb.h

@@ -35,10 +35,7 @@ typedef struct {
 
 
 u32 GetTitleKey(u8* titlekey, Ticket* ticket);
-u32 SetTitleKey(const u8* titlekey, Ticket* ticket);
 u32 FindTicket(Ticket** ticket, u8* title_id, bool force_legit, bool emunand);
 u32 FindTitleKey(Ticket* ticket, u8* title_id);
-u32 FindTitleKeyForId(u8* titlekey, u8* title_id);
 u32 AddTitleKeyToInfo(TitleKeysInfo* tik_info, TitleKeyEntry* tik_entry, bool decrypted_in, bool decrypted_out, bool devkit);
 u32 AddTicketToInfo(TitleKeysInfo* tik_info, Ticket* ticket, bool decrypt);
-u32 CryptTitleKeyInfo(TitleKeysInfo* tik_info, bool encrypt);

arm9/source/game/tie.c

@@ -44,9 +44,7 @@ u32 BuildTitleInfoEntryTmd(TitleInfoEntry* tie, TitleMetaData* tmd, bool sd) {
     }
 
     // manual? dlp? save? (we need to properly check this later)
-    if (((title_id >> 32) == 0x00040000) ||
-        ((title_id >> 32) == 0x0004000E) ||
-        ((title_id >> 32) == 0x00040010)) {
+    if (((title_id >> 32) == 0x00040000) || ((title_id >> 32) == 0x00040010)) {
         if (has_idx1) tie->flags_0[0] = 0x1; // this may have a manual
         if (has_idx2) tie->title_version |= (0xFFFF << 16); // this may have a dlp
         if (getle32(tmd->save_size)) tie->flags_1[0] = 0x01; // this may have an sd save

arm9/source/game/tmd.c

@@ -14,27 +14,23 @@ u32 ValidateTmd(TitleMetaData* tmd) {
     return 0;
 }
 
-u32 ValidateTwlTmd(TitleMetaData* tmd) {
-    static const u8 magic[] = { TMD_SIG_TYPE_TWL };
-    if ((memcmp(tmd->sig_type, magic, sizeof(magic)) != 0) ||
-        (strncmp((char*) tmd->issuer, TMD_ISSUER_TWL, 0x40) != 0) ||
-        (getbe16(tmd->content_count) != 1))
-        return 1;
-    return 0;
+u32 ValidateTmdSignature(TitleMetaData* tmd) {
+    static bool got_modexp = false;
+    static u32 mod[0x100 / 4] = { 0 };
+    static u32 exp = 0;
+
+    if (!got_modexp) {
+        // grab mod/exp from cert from cert.db
+        if (LoadCertFromCertDb(0x3C10, NULL, mod, &exp) == 0)
+            got_modexp = true;
+        else return 1;
     }
 
-u32 ValidateTmdSignature(TitleMetaData* tmd) {
-    Certificate cert;
-
-    // grab cert from certs.db
-    if (LoadCertFromCertDb(&cert, (char*)(tmd->issuer)) != 0)
+    if (!RSA_setKey2048(3, mod, exp) ||
+        !RSA_verify2048((void*) &(tmd->signature), (void*) &(tmd->issuer), 0xC4))
         return 1;
 
-    int ret = Certificate_VerifySignatureBlock(&cert, &(tmd->signature), 0x100, (void*)&(tmd->issuer), 0xC4, true);
-
-    Certificate_Cleanup(&cert);
-
-    return ret;
+    return 0;
 }
 
 u32 VerifyTmd(TitleMetaData* tmd) {
@@ -116,14 +112,19 @@ u32 BuildTmdCert(u8* tmdcert) {
         0xC2, 0xE9, 0xCA, 0x93, 0x94, 0xF4, 0x29, 0xA0, 0x38, 0x54, 0x75, 0xFF, 0xAB, 0x6E, 0x8E, 0x71
     };
 
-    static const char* const retail_issuers[] = {"Root-CA00000003-CP0000000b", "Root-CA00000003"};
-    static const char* const dev_issuers[] = {"Root-CA00000004-CP0000000a", "Root-CA00000004"};
-
-    size_t size = TMD_CDNCERT_SIZE;
-    if (BuildRawCertBundleFromCertDb(tmdcert, &size, !IS_DEVKIT ? retail_issuers : dev_issuers, 2) ||
-        size != TMD_CDNCERT_SIZE) {
+    // open certs.db file on SysNAND
+    FIL db;
+    UINT bytes_read;
+    if (f_open(&db, "1:/dbs/certs.db", FA_READ | FA_OPEN_EXISTING) != FR_OK)
         return 1;
-    }
+    // grab TMD cert from 3 offsets
+    f_lseek(&db, 0x3C10);
+    f_read(&db, tmdcert + 0x000, 0x300, &bytes_read);
+    f_lseek(&db, 0x0C10);
+    f_read(&db, tmdcert + 0x300, 0x1F0, &bytes_read);
+    f_lseek(&db, 0x3A00);
+    f_read(&db, tmdcert + 0x4F0, 0x210, &bytes_read);
+    f_close(&db);
 
     // check the certificate hash
     u8 cert_hash[0x20];

arm9/source/game/tmd.h

@@ -2,22 +2,17 @@
 
 #include "common.h"
 
-#define TMD_MAX_CONTENTS    TITLE_MAX_CONTENTS // 1024 // 383 // theme CIAs contain maximum 100 themes + 1 index content
+#define TMD_MAX_CONTENTS    1000 // 383 // theme CIAs contain maximum 100 themes + 1 index content
 
 #define TMD_SIZE_MIN        sizeof(TitleMetaData)
 #define TMD_SIZE_MAX        (sizeof(TitleMetaData) + (TMD_MAX_CONTENTS*sizeof(TmdContentChunk)))
 #define TMD_SIZE_N(n)       (sizeof(TitleMetaData) + (n*sizeof(TmdContentChunk)))
-#define TMD_SIZE_STUB       (TMD_SIZE_MIN - (0x20 + (64 * sizeof(TmdContentInfo))))
-#define TMD_SIZE_TWL        (TMD_SIZE_STUB + 0x24)
 #define TMD_CDNCERT_SIZE    0x700
 
 #define TMD_ISSUER          "Root-CA00000003-CP0000000b"
 #define TMD_ISSUER_DEV      "Root-CA00000004-CP0000000a"
 #define TMD_SIG_TYPE        0x00, 0x01, 0x00, 0x04 // RSA_2048 SHA256
 
-#define TMD_ISSUER_TWL      "Root-CA00000001-CP00000007"
-#define TMD_SIG_TYPE_TWL    0x00, 0x01, 0x00, 0x01 // RSA_2048 SHA1
-
 #define DLC_TID_HIGH        0x00, 0x04, 0x00, 0x8C // title id high for DLC
 
 // from: https://github.com/profi200/Project_CTR/blob/02159e17ee225de3f7c46ca195ff0f9ba3b3d3e4/ctrtool/tmd.h#L18-L59;
@@ -63,7 +58,6 @@ typedef struct {
 } __attribute__((packed, aligned(4))) TitleMetaData;
 
 u32 ValidateTmd(TitleMetaData* tmd);
-u32 ValidateTwlTmd(TitleMetaData* tmd);
 u32 ValidateTmdSignature(TitleMetaData* tmd);
 u32 VerifyTmd(TitleMetaData* tmd);
 u32 GetTmdCtr(u8* ctr, TmdContentChunk* chunk);

arm9/source/gamecart/card_spi.c

@@ -18,7 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <arm.h>
 #include "card_spi.h"
 #include <spi.h>
 #include "timer.h"
@@ -58,56 +57,58 @@ int CardSPIWriteSaveData_24bit_erase_program(CardSPIType type, u32 offset, const
 int CardSPIEraseSector_emulated(CardSPIType type, u32 offset);
 int CardSPIEraseSector_real(CardSPIType type, u32 offset);
 
-const CardSPITypeData EEPROM_512B = { CardSPIEnableWriting_512B, CardSPIReadSaveData_9bit, CardSPIWriteSaveData_9bit, CardSPIEraseSector_emulated, 0xffff, 1 << 9, 16, 16, 16, 0, 0, 0 };
+const CardSPITypeData EEPROM_512B_ = { CardSPIEnableWriting_512B, CardSPIReadSaveData_9bit, CardSPIWriteSaveData_9bit, CardSPIEraseSector_emulated, 0xffffff, 1 << 9, 16, 16, 16, 0, 0, 0 };
 
-const CardSPITypeData EEPROM_DUMMY = { CardSPIEnableWriting_regular, CardSPIReadSaveData_16bit, CardSPIWriteSaveData_16bit, CardSPIEraseSector_emulated, 0xffff, UINT32_MAX, 1, 1, 1, SPI_EEPROM_CMD_WRITE, 0, 0 };
+const CardSPITypeData EEPROM_DUMMY = { CardSPIEnableWriting_regular, CardSPIReadSaveData_16bit, CardSPIWriteSaveData_16bit, CardSPIEraseSector_emulated, 0xffffff, UINT32_MAX, 1, 1, 1, SPI_EEPROM_CMD_WRITE, 0, 0 };
 const CardSPITypeData EEPROMTypes[] = {
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_16bit, CardSPIWriteSaveData_16bit, CardSPIEraseSector_emulated, 0xffff, 1 << 13, 32, 32, 32, SPI_EEPROM_CMD_WRITE, 0, 0}, // EEPROM 8 KB
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_16bit, CardSPIWriteSaveData_16bit, CardSPIEraseSector_emulated, 0xffff, 1 << 16, 128, 128, 128, SPI_EEPROM_CMD_WRITE, 0, 0}, // EEPROM 64 KB
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_emulated, 0xffff, 1 << 17, 256, 256, 256, SPI_EEPROM_CMD_WRITE, 0, 0}, // EEPROM 128 KB
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_16bit, CardSPIWriteSaveData_16bit, CardSPIEraseSector_emulated, 0xffffff, 1 << 13, 32, 32, 32, SPI_EEPROM_CMD_WRITE, 0, 0}, // EEPROM 8 KB
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_16bit, CardSPIWriteSaveData_16bit, CardSPIEraseSector_emulated, 0xffffff, 1 << 16, 128, 128, 128, SPI_EEPROM_CMD_WRITE, 0, 0}, // EEPROM 64 KB
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_emulated, 0xffffff, 1 << 17, 256, 256, 256, SPI_EEPROM_CMD_WRITE, 0, 0}, // EEPROM 128 KB
 };
 
 const CardSPITypeData FLASH_DUMMY = { NULL, CardSPIReadSaveData_24bit, NULL, NULL, 0x0, 0, 0, 0, 0, 0, 0, 0 };
 const CardSPITypeData flashTypes[] = {
     // NTR/TWL
-
-    // Most common flash chip in DS games, in 3 different sizes (256kB: ST M45PE20, 512kB: ST M45PE40, 1MB: ST M45PE80)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_real, 0x2040, 0, 65536, 256, 256, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
-
-    // Found in Mario Kart, for example (always 256kB, Sanyo LE25FW203T)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0x6216, 1 << 18, 65536, 256, 65536, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
-
-    // Found in some copies of Pokemon Diamond/Pearl (always 512kB, Sanyo ??)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_real, 0x6211, 1 << 19, 65536, 256, 256, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
-
-    // Found in Art Academy, and maybe some other ones (8MB: ST M25P64)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0x2020, 0, 65536, 256, 65536, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
-
-    // Found in some DS bootlegs (ST M25PE40VP in my case)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0x2080, 0, 65536, 256, 65536, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
-
-    // This is the most common type of flash 3DS cartridges. Not normally found in DS ones, but check anyway. (Custom MXIC chips)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0xC222, 0, 4096, 32, 4096, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_MXIC_SE },
-
-    // Found this in some copies of ArtAcademy, I think it's something from MXIC (Thank you for the help @FerozElMejor on Discord)
-    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0xC220, 0, 4096, 32, 4096, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_MXIC_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_real, 0x204012, 1 << 18, 65536, 256, 256, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0x621600, 1 << 18, 65536, 256, 65536, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_real, 0x204013, 1 << 19, 65536, 256, 256, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_real, 0x621100, 1 << 19, 65536, 256, 256, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_write, CardSPIEraseSector_real, 0x204014, 1 << 20, 65536, 256, 256, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0x202017, 1 << 23, 65536, 256, 65536, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_SE },
+    // CTR
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0xC22211, 1 << 17, 4096, 32, 4096, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_MXIC_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0xC22213, 1 << 19, 4096, 32, 4096, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_MXIC_SE },
+    { CardSPIEnableWriting_regular, CardSPIReadSaveData_24bit, CardSPIWriteSaveData_24bit_erase_program, CardSPIEraseSector_real, 0xC22214, 1 << 20, 4096, 32, 4096, SPI_FLASH_CMD_PW, SPI_CMD_PP, SPI_FLASH_CMD_MXIC_SE },
 };
 
-const CardSPITypeData * const FLASH_CTR_GENERIC = flashTypes + 5;
+const CardSPITypeData * const EEPROM_512B = &EEPROM_512B_;
+
+const CardSPITypeData * const EEPROM_8KB = EEPROMTypes + 0;
+const CardSPITypeData * const EEPROM_64KB = EEPROMTypes + 1;
+const CardSPITypeData * const EEPROM_128KB = EEPROMTypes + 2;
+
+const CardSPITypeData * const FLASH_256KB_1 = flashTypes + 0;
+const CardSPITypeData * const FLASH_256KB_2 = flashTypes + 1;
+const CardSPITypeData * const FLASH_512KB_1 = flashTypes + 2;
+const CardSPITypeData * const FLASH_512KB_2 = flashTypes + 3;
+const CardSPITypeData * const FLASH_1MB = flashTypes + 4;
+const CardSPITypeData * const FLASH_8MB = flashTypes + 5;
+
+const CardSPITypeData * const FLASH_128KB_CTR = flashTypes + 6;
+const CardSPITypeData * const FLASH_512KB_CTR = flashTypes + 7;
+const CardSPITypeData * const FLASH_1MB_CTR = flashTypes + 8;
 
 #define REG_CFG9_CARDCTL      *((vu16*)0x1000000C)
 #define CARDCTL_SPICARD       (1u<<8)
 
-int CardSPIWriteRead(bool infrared, const void* cmd, u32 cmdSize, void* answer, u32 answerSize, const void* data, u32 dataSize) {
+int CardSPIWriteRead(CardSPIType type, const void* cmd, u32 cmdSize, void* answer, u32 answerSize, const void* data, u32 dataSize) {
     u32 headerFooterVal = 0;
 
     REG_CFG9_CARDCTL |= CARDCTL_SPICARD;
 
-    if (infrared) {
+    if (type.infrared) {
         SPI_XferInfo irXfer = { &headerFooterVal, 1, false };
         SPI_DoXfer(SPI_DEV_CART_IR, &irXfer, 1, false);
-        // Wait as specified by GBATEK (0x800 cycles at 33 MHz)
-        ARM_WaitCycles(0x800 * 4);
     }
 
     SPI_XferInfo transfers[3] = {
@@ -119,21 +120,16 @@ int CardSPIWriteRead(bool infrared, const void* cmd, u32 cmdSize, void* answer,
 
     REG_CFG9_CARDCTL &= ~CARDCTL_SPICARD;
 
-    if (infrared) {
-        // Wait as specified by GBATEK (0x800 cycles at 33 MHz)
-        ARM_WaitCycles(0x800 * 4);
-    }
-
     return 0;
 }
 
-int CardSPIWaitWriteEnd(bool infrared, u32 timeout) {
+int CardSPIWaitWriteEnd(CardSPIType type, u32 timeout) {
     u8 cmd = SPI_CMD_RDSR, statusReg = 0;
     int res = 0;
     u64 time_start = timer_start();
 
     do {
-        res = CardSPIWriteRead(infrared, &cmd, 1, &statusReg, 1, 0, 0);
+        res = CardSPIWriteRead(type, &cmd, 1, &statusReg, 1, 0, 0);
         if (res) return res;
         if (timer_msec(time_start) > timeout) return 1;
     } while(statusReg & SPI_FLG_WIP);
@@ -143,18 +139,18 @@ int CardSPIWaitWriteEnd(bool infrared, u32 timeout) {
 
 int CardSPIEnableWriting_512B(CardSPIType type) {
     u8 cmd = SPI_CMD_WREN;
-    return CardSPIWriteRead(type.infrared, &cmd, 1, NULL, 0, 0, 0);
+    return CardSPIWriteRead(type, &cmd, 1, NULL, 0, 0, 0);
 }
 
 int CardSPIEnableWriting_regular(CardSPIType type) {
     u8 cmd = SPI_CMD_WREN, statusReg = 0;
-    int res = CardSPIWriteRead(type.infrared, &cmd, 1, NULL, 0, 0, 0);
+    int res = CardSPIWriteRead(type, &cmd, 1, NULL, 0, 0, 0);
 
     if (res) return res;
     cmd = SPI_CMD_RDSR;
 
     do {
-        res = CardSPIWriteRead(type.infrared, &cmd, 1, &statusReg, 1, 0, 0);
+        res = CardSPIWriteRead(type, &cmd, 1, &statusReg, 1, 0, 0);
         if (res) return res;
     } while(statusReg & ~SPI_FLG_WEL);
 
@@ -169,24 +165,24 @@ int CardSPIEnableWriting(CardSPIType type) {
 int _SPIWriteTransaction(CardSPIType type, void* cmd, u32 cmdSize, const void* data, u32 dataSize) {
     int res;
     if ((res = CardSPIEnableWriting(type))) return res;
-    if ((res = CardSPIWriteRead(type.infrared, cmd, cmdSize, NULL, 0, (void*) ((u8*) data), dataSize))) return res;
-    return CardSPIWaitWriteEnd(type.infrared, 10000);
+    if ((res = CardSPIWriteRead(type, cmd, cmdSize, NULL, 0, (void*) ((u8*) data), dataSize))) return res;
+    return CardSPIWaitWriteEnd(type, 1000);
 }
 
-int CardSPIReadJEDECIDAndStatusReg(bool infrared, u32* id, u8* statusReg) {
+int CardSPIReadJEDECIDAndStatusReg(CardSPIType type, u32* id, u8* statusReg) {
     u8 cmd = SPI_FLASH_CMD_RDID;
     u8 reg = 0;
     u8 idbuf[3] = { 0 };
     u32 id_ = 0;
-    int res = CardSPIWaitWriteEnd(infrared, 10);
+    int res = CardSPIWaitWriteEnd(type, 0);
     if (res) return res;
 
-    if ((res = CardSPIWriteRead(infrared, &cmd, 1, idbuf, 3, 0, 0))) return res;
+    if ((res = CardSPIWriteRead(type, &cmd, 1, idbuf, 3, 0, 0))) return res;
 
     id_ = (idbuf[0] << 16) | (idbuf[1] << 8) | idbuf[2];
     cmd = SPI_CMD_RDSR;
 
-    if ((res = CardSPIWriteRead(infrared, &cmd, 1, &reg, 1, 0, 0))) return res;
+    if ((res = CardSPIWriteRead(type, &cmd, 1, &reg, 1, 0, 0))) return res;
 
     if (id) *id = id_;
     if (statusReg) *statusReg = reg;
@@ -206,19 +202,7 @@ u32 CardSPIGetEraseSize(CardSPIType type) {
 
 u32 CardSPIGetCapacity(CardSPIType type) {
     if (type.chip == NO_CHIP) return 0;
-    if (type.chip->capacity != 0) {
     return type.chip->capacity;
-    } else {
-        u32 jedecid;
-        CardSPIReadJEDECIDAndStatusReg(type.infrared, &jedecid, NULL);
-        u8 size_exponent = jedecid & 0xff;
-        if ((size_exponent >= 8) && (size_exponent <= 24)) {
-            // Thanks to @wwylele for pointing this out
-            return 1 << size_exponent;
-        } else {
-            return 0;
-        }
-    }
 }
 
 int CardSPIWriteSaveData_9bit(CardSPIType type, u32 offset, const void* data, u32 size) {
@@ -272,7 +256,7 @@ int CardSPIWriteSaveData_24bit_erase_program(CardSPIType type, u32 offset, const
             if (!(res = _SPIWriteTransaction(type, cmd, 4, (void*) ((u8*) data - offset + pos), pageSize))) {
                 break;
             }
-            CardSPIWriteRead(type.infrared, "\x04", 1, NULL, 0, NULL, 0);
+            CardSPIWriteRead(type, "\x04", 1, NULL, 0, NULL, 0);
         }
         if(res) {
             free(newData);
@@ -288,12 +272,13 @@ int CardSPIWriteSaveData(CardSPIType type, u32 offset, const void* data, u32 siz
     if (type.chip == NO_CHIP) return 1;
 
     if (size == 0) return 0;
+    size = min(size, CardSPIGetCapacity(type) - offset);
     u32 end = offset + size;
     u32 pos = offset;
     u32 writeSize = type.chip->writeSize;
     if (writeSize == 0) return 0xC8E13404;
 
-    int res = CardSPIWaitWriteEnd(type.infrared, 1000);
+    int res = CardSPIWaitWriteEnd(type, 1000);
     if (res) return res;
 
     while(pos < end) {
@@ -318,23 +303,23 @@ int CardSPIReadSaveData_9bit(CardSPIType type, u32 pos, void* data, u32 size) {
 
     u32 read = 0;
     if (pos < 0x100) {
-        u32 len = min(0x100 - pos, size);
+        u32 len = 0x100 - pos;
         cmd[0] = SPI_512B_EEPROM_CMD_RDLO;
         cmd[1] = (u8) pos;
 
-        int res = CardSPIWriteRead(type.infrared, cmd, cmdSize, data, len, NULL, 0);
+        int res = CardSPIWriteRead(type, cmd, cmdSize, data, len, NULL, 0);
         if (res) return res;
 
         read += len;
     }
 
     if (end >= 0x100) {
-        u32 len = min(end - 0x100, size);
+        u32 len = end - 0x100;
 
         cmd[0] = SPI_512B_EEPROM_CMD_RDHI;
         cmd[1] = (u8)(pos + read);
 
-        int res = CardSPIWriteRead(type.infrared, cmd, cmdSize, (void*)((u8*)data + read), len, NULL, 0);
+        int res = CardSPIWriteRead(type, cmd, cmdSize, (void*)((u8*)data + read), len, NULL, 0);
 
         if (res) return res;
     }
@@ -345,13 +330,13 @@ int CardSPIReadSaveData_9bit(CardSPIType type, u32 pos, void* data, u32 size) {
 int CardSPIReadSaveData_16bit(CardSPIType type, u32 offset, void* data, u32 size) {
     u8 cmd[3] = { SPI_CMD_READ, (u8)(offset >> 8), (u8) offset };
 
-    return CardSPIWriteRead(type.infrared, cmd, 3, data, size, NULL, 0);
+    return CardSPIWriteRead(type, cmd, 3, data, size, NULL, 0);
 }
 
 int CardSPIReadSaveData_24bit(CardSPIType type, u32 offset, void* data, u32 size) {
     u8 cmd[4] = { SPI_CMD_READ, (u8)(offset >> 16), (u8)(offset >> 8), (u8) offset };
 
-    return CardSPIWriteRead(type.infrared, cmd, 4, data, size, NULL, 0);
+    return CardSPIWriteRead(type, cmd, 4, data, size, NULL, 0);
 }
 
 int CardSPIReadSaveData(CardSPIType type, u32 offset, void* data, u32 size) {
@@ -359,9 +344,11 @@ int CardSPIReadSaveData(CardSPIType type, u32 offset, void* data, u32 size) {
 
     if (size == 0) return 0;
 
-    int res = CardSPIWaitWriteEnd(type.infrared, 1000);
+    int res = CardSPIWaitWriteEnd(type, 1000);
     if (res) return res;
 
+    size = (size <= CardSPIGetCapacity(type) - offset) ? size : CardSPIGetCapacity(type) - offset;
+
     return type.chip->readSaveData(type, offset, data, size);
 }
 
@@ -380,7 +367,7 @@ int CardSPIEraseSector_emulated(CardSPIType type, u32 offset) {
 int CardSPIEraseSector_real(CardSPIType type, u32 offset) {
     u8 cmd[4] = { type.chip->eraseCommand, (u8)(offset >> 16), (u8)(offset >> 8), (u8) offset };
 
-    int res = CardSPIWaitWriteEnd(type.infrared, 10000);
+    int res = CardSPIWaitWriteEnd(type, 10000);
     if (res) return res;
 
     return _SPIWriteTransaction(type, cmd, 4, NULL, 0);
@@ -451,21 +438,28 @@ int _SPIIsDataMirrored(CardSPIType type, int size, bool* mirrored) {
     return 0;
 }
 
-CardSPIType CardSPIGetCardSPIType(bool infrared) {
+int CardSPIGetCardSPIType(CardSPIType* type, bool infrared) {
     u8 sr = 0;
     u32 jedec = 0;
     CardSPIType t = {NO_CHIP, infrared};
     int res;
 
-    res = CardSPIReadJEDECIDAndStatusReg(infrared, &jedec, &sr);
-    if (res) return (CardSPIType) {NO_CHIP, false};
+    if(infrared) {
+        // Infrared carts currently not supported, need additional handling!
+        *type = (CardSPIType) {NO_CHIP, true};
+        return 0;
+    }
+
+    res = CardSPIReadJEDECIDAndStatusReg(t, &jedec, &sr);
+    if (res) return res;
 
     if ((sr & 0xfd) == 0x00 && (jedec != 0x00ffffff)) { t.chip = &FLASH_DUMMY; }
-    if ((sr & 0xfd) == 0xF0 && (jedec == 0x00ffffff)) { return (CardSPIType) { &EEPROM_512B, false }; }
+    if ((sr & 0xfd) == 0xF0 && (jedec == 0x00ffffff)) { *type = (CardSPIType) { EEPROM_512B, false }; return 0; }
     if ((sr & 0xfd) == 0x00 && (jedec == 0x00ffffff)) { t = (CardSPIType) { &EEPROM_DUMMY, false }; }
 
     if(t.chip == NO_CHIP) {
-        return (CardSPIType) {NO_CHIP, false};
+        *type = (CardSPIType) {NO_CHIP, false};
+        return 0;
     }
 
     if (t.chip == &EEPROM_DUMMY) {
@@ -473,20 +467,24 @@ CardSPIType CardSPIGetCardSPIType(bool infrared) {
         size_t i;
 
         for(i = 0; i < sizeof(EEPROMTypes) / sizeof(CardSPITypeData) - 1; i++) {
-            if ((res = _SPIIsDataMirrored(t, CardSPIGetCapacity((CardSPIType) {EEPROMTypes + i, false}), &mirrored))) return (CardSPIType) {NO_CHIP, false};
+            if ((res = _SPIIsDataMirrored(t, CardSPIGetCapacity((CardSPIType) {EEPROMTypes + i, false}), &mirrored))) return res;
             if (mirrored) {
-                return (CardSPIType) {EEPROMTypes + i, false};
+                *type = (CardSPIType) {EEPROMTypes + i, false};
+                return 0;
             }
         }
-        return (CardSPIType) { EEPROMTypes + i, false };
+        *type = (CardSPIType) { EEPROMTypes + i, false };
+        return 0;
     }
 
     for(size_t i = 0; i < sizeof(flashTypes) / sizeof(CardSPITypeData); i++) {
-        if (flashTypes[i].jedecId == (jedec >> 8)) {
-            return (CardSPIType) { flashTypes + i, infrared };
+        if (flashTypes[i].jedecId == jedec) {
+            *type = (CardSPIType) { flashTypes + i, infrared };
+            return 0;
         }
     }
 
-    return (CardSPIType) { NO_CHIP, infrared };
+    *type = (CardSPIType) { NO_CHIP, infrared };
+    return 0;
 
 }

arm9/source/gamecart/card_spi.h

@@ -37,7 +37,7 @@ struct CardSPITypeData {
     int (*readSaveData) (CardSPIType type, u32 offset, void* data, u32 size);
     int (*writeSaveData) (CardSPIType type, u32 offset, const void* data, u32 size);
     int (*eraseSector) (CardSPIType type, u32 offset);
-    u16 jedecId;
+    u32 jedecId;
     u32 capacity;
     u32 eraseSize;
     u32 pageSize;
@@ -49,13 +49,28 @@ struct CardSPITypeData {
 
 #define NO_CHIP NULL
 
-extern const CardSPITypeData * const FLASH_CTR_GENERIC; // Handles each 3ds cartridge the exact same
+extern const CardSPITypeData * const EEPROM_512B;
 
-int CardSPIWriteRead(bool infrared, const void* cmd, u32 cmdSize, void* answer, u32 answerSize, const void* data, u32 dataSize);
-int CardSPIWaitWriteEnd(bool infrared, u32 timeout);
+extern const CardSPITypeData * const EEPROM_8KB;
+extern const CardSPITypeData * const EEPROM_64KB;
+extern const CardSPITypeData * const EEPROM_128KB;
+
+extern const CardSPITypeData * const FLASH_256KB_1;
+extern const CardSPITypeData * const FLASH_256KB_2;
+extern const CardSPITypeData * const FLASH_512KB_1;
+extern const CardSPITypeData * const FLASH_512KB_2;
+extern const CardSPITypeData * const FLASH_1MB;
+extern const CardSPITypeData * const FLASH_8MB;
+
+extern const CardSPITypeData * const FLASH_128KB_CTR; // Most common, including Ocarina of time 3D
+extern const CardSPITypeData * const FLASH_512KB_CTR; // Also common, including Detective Pikachu
+extern const CardSPITypeData * const FLASH_1MB_CTR; // For example Pokemon Ultra Sun
+
+int CardSPIWriteRead(CardSPIType type, const void* cmd, u32 cmdSize, void* answer, u32 answerSize, const void* data, u32 dataSize);
+int CardSPIWaitWriteEnd(CardSPIType type, u32 timeout);
 int CardSPIEnableWriting(CardSPIType type);
-int CardSPIReadJEDECIDAndStatusReg(bool infrared, u32* id, u8* statusReg);
-CardSPIType CardSPIGetCardSPIType(bool infrared);
+int CardSPIReadJEDECIDAndStatusReg(CardSPIType type, u32* id, u8* statusReg);
+int CardSPIGetCardSPIType(CardSPIType* type, bool infrared);
 u32 CardSPIGetPageSize(CardSPIType type);
 u32 CardSPIGetCapacity(CardSPIType type);
 u32 CardSPIGetEraseSize(CardSPIType type);

arm9/source/gamecart/command_ctr.c

@@ -27,7 +27,7 @@ void CTR_CmdReadData(u32 sector, u32 length, u32 blocks, void* buffer)
         (u32)((sector << 9) & 0xFFFFFFFF),
         0x00000000, 0x00000000
     };
-    CTR_SendCommand(read_cmd, length, blocks, 0x104822C, buffer); // Clock divider 5 (13.4 MHz). Same as Process9.
+    CTR_SendCommand(read_cmd, length, blocks, 0x704822C, buffer);
 }
 
 void CTR_CmdReadHeader(void* buffer)

arm9/source/gamecart/command_ntr.h

@@ -15,5 +15,5 @@ void NTR_CmdEnter16ByteMode(void);
 void NTR_CmdReadHeader (u8* buffer);
 void NTR_CmdReadData (u32 offset, void* buffer);
 
-bool NTR_Secure_Init (u8* buffer, u8* sa_copy, u32 CartID, int iCardDevice);
+bool NTR_Secure_Init (u8* buffer, u32 CartID, int iCardDevice);
 

arm9/source/gamecart/gamecart.c

@@ -6,7 +6,6 @@
 #include "nds.h"
 #include "ncch.h"
 #include "ncsd.h"
-#include "rtc.h"
 
 #define CART_INSERTED (!(REG_CARDSTATUS & 0x1))
 
@@ -33,7 +32,8 @@ typedef struct {
     TwlHeader ntr_header;
     u8 ntr_padding[0x3000]; // 0x00
     u8 secure_area[0x4000];
-    u8 secure_area_enc[0x4000];
+    TwlHeader twl_header;
+    u8 twl_padding[0x3000]; // 0x00
     u8 modcrypt_area[0x4000];
     u32 cart_type;
     u32 cart_id;
@@ -44,9 +44,6 @@ typedef struct {
     u32 arm9i_rom_offset;
 } PACKED_ALIGN(16) CartDataNtrTwl;
 
-static DsTime init_time;
-static bool encrypted_sa = false;
-
 u32 GetCartName(char* name, CartData* cdata) {
     if (cdata->cart_type & CART_CTR) {
         CartDataCtr* cdata_i = (CartDataCtr*)cdata;
@@ -62,128 +59,13 @@ u32 GetCartName(char* name, CartData* cdata) {
     return 0;
 }
 
-u32 GetCartInfoString(char* info, size_t info_size, CartData* cdata) {
-    size_t info_index = 0;
-    u8 padding;
-
-    // read the last byte of the cart storage, but ignore the result
-    ReadCartBytes(&padding, cdata->cart_size - 1, 1, cdata, false);
-
-    if (cdata->cart_type & CART_CTR) {
-        CartDataCtr* cdata_i = (CartDataCtr*)cdata;
-        NcsdHeader* ncsd = &(cdata_i->ncsd);
-        NcchHeader* ncch = &(cdata_i->ncch);
-        info_index += snprintf(info + info_index, info_size - info_index,
-            "Title ID     : %016llX\n"
-            "Product Code : %.10s\n"
-            "Revision     : %lu\n"
-            "Cart ID      : %08lX\n"
-            "Platform     : %s\n",
-            ncsd->mediaId, ncch->productcode, cdata_i->rom_version, cdata_i->cart_id,
-            (ncch->flags[4] == 0x2) ? "N3DS" : "O3DS");
-    }  else if (cdata->cart_type & CART_NTR) {
-        CartDataNtrTwl* cdata_i = (CartDataNtrTwl*)cdata;
-        TwlHeader* nds = &(cdata_i->ntr_header);
-        info_index += snprintf(info + info_index, info_size - info_index,
-            "Title String : %.12s\n"
-            "Product Code : %.6s\n"
-            "Revision     : %u\n"
-            "Cart ID      : %08lX\n"
-            "Platform     : %s\n",
-            nds->game_title, nds->game_code, nds->rom_version, cdata_i->cart_id,
-            (nds->unit_code == 0x2) ? "DSi Enhanced" : (nds->unit_code == 0x3) ? "DSi Exclusive" : "DS");
-    } else return 1;
-
-    info_index += snprintf(info + info_index, info_size - info_index,
-        "Save Type    : %s\n",
-        (cdata->save_type == CARD_SAVE_NONE) ? "NONE" :
-        (cdata->save_type == CARD_SAVE_SPI) ? "SPI" :
-        (cdata->save_type == CARD_SAVE_CARD2) ? "CARD2" :
-        (cdata->save_type == CARD_SAVE_RETAIL_NAND) ? "RETAIL_NAND" : "UNK");
-
-    if (cdata->save_type == CARD_SAVE_SPI) {
-        u32 jedecid = 0;
-        if (CardSPIReadJEDECIDAndStatusReg(cdata->spi_save_type.infrared, &jedecid, NULL) == 0) {
-            info_index += snprintf(info + info_index, info_size - info_index,
-                "Save chip ID : %06lX\n",
-                jedecid);
-        }
-    } else info_index += snprintf(info + info_index, info_size - info_index,
-        "Save chip ID : <none>\n");
-
-    info_index += snprintf(info + info_index, info_size - info_index,
-        "Padding Byte : %02X\n"
-        "Timestamp    : 20%02X-%02X-%02X %02X:%02X:%02X\n"
-        "GM9 Version  : %s\n",
-        padding,
-        init_time.bcd_Y, init_time.bcd_M, init_time.bcd_D,
-        init_time.bcd_h, init_time.bcd_m, init_time.bcd_s,
-        VERSION);
-    return 0;
-}
-
-u32 SetSecureAreaEncryption(bool encrypted) {
-    encrypted_sa = encrypted;
-    return 0;
-}
-
-static u32 GetCtrCartSaveSize(CartData* cdata) {
-    NcsdHeader* ncsd = (NcsdHeader*) (void*) cdata->header;
-    u32 ncch_sector = ncsd->partitions[0].offset;
-
-    // Load header and ExHeader for first partition
-    u8 buffer[0x400];
-    CTR_CmdReadData(ncch_sector, 0x200, 2, buffer);
-    NcchHeader* ncch = (NcchHeader*) (void*) buffer;
-    if (ValidateNcchHeader(ncch) != 0) {
-        return 0;
-    }
-
-    // Ensure first partition has ExHeader
-    if (ncch->size_exthdr < 0x200) {
-        return 0;
-    }
-
-    // Decrypt ExHeader
-    if ((NCCH_ENCRYPTED(ncch)) && (SetupNcchCrypto(ncch, NCCH_NOCRYPTO) == 0)) {
-        DecryptNcch(buffer + NCCH_EXTHDR_OFFSET, NCCH_EXTHDR_OFFSET, sizeof(buffer) - NCCH_EXTHDR_OFFSET, ncch, NULL);
-    }
-    u64 savesize = getle64(buffer + NCCH_EXTHDR_OFFSET + 0x1C0);
-
-    // check our work
-    if (savesize <= UINT32_MAX) {
-        return (u32) savesize;
-    } else {
-        return 0;
-    }
-}
-
 u32 InitCartRead(CartData* cdata) {
-    get_dstime(&init_time);
-    encrypted_sa = false;
     memset(cdata, 0x00, sizeof(CartData));
     cdata->cart_type = CART_NONE;
     if (!CART_INSERTED) return 1;
     Cart_Init();
     cdata->cart_id = Cart_GetID();
     cdata->cart_type = (cdata->cart_id & 0x10000000) ? CART_CTR : CART_NTR;
-
-    // Use the cart ID to determine the ROM size.
-    // (ROM header might be incorrect on dev carts.)
-    switch ((cdata->cart_id >> 16) & 0xFF) {
-        case 0x07:  cdata->cart_size = 8ULL*1024*1024; break;
-        case 0x0F:  cdata->cart_size = 16ULL*1024*1024; break;
-        case 0x1F:  cdata->cart_size = 32ULL*1024*1024; break;
-        case 0x3F:  cdata->cart_size = 64ULL*1024*1024; break;
-        case 0x7F:  cdata->cart_size = 128ULL*1024*1024; break;
-        case 0xFF:  cdata->cart_size = 256ULL*1024*1024; break;
-        case 0xFE:  cdata->cart_size = 512ULL*1024*1024; break;
-        case 0xFA:  cdata->cart_size = 1024ULL*1024*1024; break;
-        case 0xF8:  cdata->cart_size = 2048ULL*1024*1024; break;
-        case 0xF0:  cdata->cart_size = 4096ULL*1024*1024; break;
-        default:    cdata->cart_size = 0; break;
-    }
-
     if (cdata->cart_type & CART_CTR) { // CTR cartridges
         memset(cdata, 0xFF, 0x4000 + PRIV_HDR_SIZE); // switch the padding to 0xFF
 
@@ -203,7 +85,6 @@ u32 InitCartRead(CartData* cdata) {
         NcchHeader* ncch = (NcchHeader*) (void*) ncch_header;
         if ((ValidateNcsdHeader(ncsd) != 0) || (ValidateNcchHeader(ncch) != 0))
             return 1;
-        if (cdata->cart_size == 0)
         cdata->cart_size = (u64) ncsd->size * NCSD_MEDIA_UNIT;
         cdata->data_size = GetNcsdTrimmedSize(ncsd);
         if (cdata->cart_size > 0x100000000) return 1; // carts > 4GB don't exist
@@ -219,40 +100,19 @@ u32 InitCartRead(CartData* cdata) {
 
         // save data
         u32 card2_offset = getle32(cdata->header + 0x200);
-        if (card2_offset != 0xFFFFFFFF) {
-            cdata->save_type = CARD_SAVE_CARD2;
-            cdata->save_size = GetCtrCartSaveSize(cdata);
-            // Sanity checks
-            if ((cdata->save_size == 0) ||
-                (card2_offset * NCSD_MEDIA_UNIT >= cdata->cart_size) ||
-                (card2_offset * NCSD_MEDIA_UNIT + cdata->save_size > cdata->cart_size)) {
-                cdata->save_type = CARD_SAVE_NONE;
-            }
-        } else {
-            cdata->spi_save_type = (CardSPIType) { FLASH_CTR_GENERIC, false };
-            cdata->save_size = CardSPIGetCapacity(cdata->spi_save_type);
-            if (cdata->save_size == 0) {
-                cdata->spi_save_type = (CardSPIType) { NO_CHIP, false };
-            }
-            if (cdata->spi_save_type.chip == NO_CHIP) {
-                cdata->save_type = CARD_SAVE_NONE;
-            } else {
-                cdata->save_type = CARD_SAVE_SPI;
-                cdata->save_size = CardSPIGetCapacity(cdata->spi_save_type);
-            }
+        if ((card2_offset != 0xFFFFFFFF) || (CardSPIGetCardSPIType(&(cdata->save_type), 0) != 0)) {
+            cdata->save_type = (CardSPIType) { NO_CHIP, false };
         }
+        cdata->save_size = CardSPIGetCapacity(cdata->save_type);
     } else { // NTR/TWL cartridges
         // NTR header
         TwlHeader* nds_header = (void*)cdata->header;
-        u8 secure_area_enc[0x4000];
         NTR_CmdReadHeader(cdata->header);
         if (!(*(cdata->header))) return 1; // error reading the header
-        if (!NTR_Secure_Init(cdata->header, secure_area_enc, Cart_GetID(), 0)) return 1;
-
+        if (!NTR_Secure_Init(cdata->header, Cart_GetID(), 0)) return 1;
 
         // cartridge size, trimmed size, twl presets
         if (nds_header->device_capacity >= 15) return 1; // too big, not valid
-        if (cdata->cart_size == 0)
         cdata->cart_size = (128 * 1024) << nds_header->device_capacity;
         cdata->data_size = nds_header->ntr_rom_size;
         cdata->arm9i_rom_offset = 0;
@@ -265,49 +125,29 @@ u32 InitCartRead(CartData* cdata) {
             if ((cdata->arm9i_rom_offset < nds_header->ntr_rom_size) ||
                 (cdata->arm9i_rom_offset + MODC_AREA_SIZE > cdata->data_size))
                 return 1; // safety first
-
-            // Some NTR dev carts have TWL ROMs flashed to them.
-            // We'll only want to use TWL secure init if this is a TWL cartridge.
-            if (cdata->cart_id & 0x40000000U) { // TWL cartridge
             Cart_Init();
-                NTR_CmdReadHeader(cdata->storage);
-                if (!NTR_Secure_Init(cdata->storage, NULL, Cart_GetID(), 1)) return 1;
+            NTR_CmdReadHeader(cdata->twl_header);
+            if (!NTR_Secure_Init(cdata->twl_header, Cart_GetID(), 1)) return 1;
         }
-        } else {
-            // Check if immediately after the reported cart size
-            // is the magic number string 'ac' (auth code).
-            // If found, add 0x88 bytes for the download play RSA key.
-            u16 rsaMagic;
-            ReadCartBytes(&rsaMagic, cdata->data_size, 2, cdata, false);
-            if(rsaMagic == 0x6361) {
-                cdata->data_size += 0x88;
-            }
-        }
-
-        // store encrypted secure area
-        memcpy(cdata->storage, secure_area_enc, 0x4000);
 
         // last safety check
         if (cdata->data_size > cdata->cart_size) return 1;
 
         // save data
         bool infrared = *(nds_header->game_code) == 'I';
-        cdata->spi_save_type = CardSPIGetCardSPIType(infrared);
-        if (cdata->spi_save_type.chip == NO_CHIP) {
-            cdata->save_type = CARD_SAVE_NONE;
-        } else {
-            cdata->save_type = CARD_SAVE_SPI;
-            cdata->save_size = CardSPIGetCapacity(cdata->spi_save_type);
+        if (CardSPIGetCardSPIType(&(cdata->save_type), infrared) != 0) {
+            cdata->save_type = (CardSPIType) { NO_CHIP, false };
         }
+        cdata->save_size = CardSPIGetCapacity(cdata->save_type);
     }
     return 0;
 }
 
-u32 ReadCartSectors(void* buffer, u32 sector, u32 count, CartData* cdata, bool card2_blanking) {
+u32 ReadCartSectors(void* buffer, u32 sector, u32 count, CartData* cdata) {
     u8* buffer8 = (u8*) buffer;
     if (!CART_INSERTED) return 1;
     // header
-    const u32 header_sectors = 0x4000/0x200;
+    u32 header_sectors = (cdata->cart_type & CART_CTR) ? 0x4000/0x200 : 0x8000/0x200;
     if (sector < header_sectors) {
         u32 header_count = (sector + count > header_sectors) ? header_sectors - sector : count;
         memcpy(buffer8, cdata->header + (sector * 0x200), header_count * 0x200);
@@ -327,50 +167,21 @@ u32 ReadCartSectors(void* buffer, u32 sector, u32 count, CartData* cdata, bool c
             CTR_CmdReadData(sector + i, 0x200, min(max_read, count - i), buff);
             buff += max_read * 0x200;
         }
-
         // overwrite the card2 savegame with 0xFF
         u32 card2_offset = getle32(cdata->header + 0x200);
-        u32 save_sectors = cdata->save_size / 0x200;
-        if (card2_blanking &&
-            (cdata->save_type == CARD_SAVE_CARD2) &&
+        if ((card2_offset != 0xFFFFFFFF) &&
             ((card2_offset * 0x200) >= cdata->data_size) &&
-            (sector + count > card2_offset) && // requested area ends after the save starts
-            (sector < card2_offset + save_sectors)) { // requested area starts before the save ends
-            u32 blank_start_sector, blank_end_sector;
-            if (sector > card2_offset) {
-                blank_start_sector = sector;
-            } else {
-                blank_start_sector = card2_offset;
-            }
-            if (sector + count < card2_offset + save_sectors) {
-                blank_end_sector = sector + count;
-            } else {
-                blank_end_sector = card2_offset + save_sectors;
-            }
-
-            memset(buffer8 + (blank_start_sector - sector) * 0x200, 0xFF,
-                (blank_end_sector - blank_start_sector) * 0x200);
+            (sector + count > card2_offset)) {
+            if (sector > card2_offset)
+                memset(buffer8, 0xFF, (count * 0x200));
+            else memset(buffer8 + (card2_offset - sector) * 0x200, 0xFF,
+                (count - (card2_offset - sector)) * 0x200);
         }
     } else if (cdata->cart_type & CART_NTR) {
         u8* buff = buffer8;
-
-        // secure area handling
-        const u32 sa_sector_end = 0x8000/0x200;
-        if (sector < sa_sector_end) {
-            CartDataNtrTwl* cdata_twl = (CartDataNtrTwl*) cdata;
-            u8* sa = encrypted_sa ? cdata_twl->secure_area_enc : cdata_twl->secure_area;
-            u32 count_sa = ((sector + count) > sa_sector_end) ?  sa_sector_end - sector : count;
-            memcpy(buff, sa + ((sector - header_sectors) * 0x200), count_sa * 0x200);
-            buff += count_sa * 0x200;
-            sector += count_sa;
-            count -= count_sa;
-        }
-
-        // regular cart data
         u32 off = sector * 0x200;
         for (u32 i = 0; i < count; i++, off += 0x200, buff += 0x200)
             NTR_CmdReadData(off, buff);
-
         // modcrypt area handling
         if ((cdata->cart_type & CART_TWL) &&
             ((sector+count) * 0x200 > cdata->arm9i_rom_offset) &&
@@ -385,22 +196,22 @@ u32 ReadCartSectors(void* buffer, u32 sector, u32 count, CartData* cdata, bool c
             size_i = MODC_AREA_SIZE - offset_i;
             if (size_i > (count * 0x200) - (buffer_arm9i - buffer8))
                 size_i = (count * 0x200) - (buffer_arm9i - buffer8);
-            if (size_i) memcpy(buffer_arm9i, cdata->storage + 0x4000 + offset_i, size_i);
+            if (size_i) memcpy(buffer_arm9i, cdata->twl_header + 0x4000 + offset_i, size_i);
         }
     } else return 1;
     return 0;
 }
 
-u32 ReadCartBytes(void* buffer, u64 offset, u64 count, CartData* cdata, bool card2_blanking) {
+u32 ReadCartBytes(void* buffer, u64 offset, u64 count, CartData* cdata) {
     if (!(offset % 0x200) && !(count % 0x200)) { // aligned data -> simple case
         // simple wrapper function for ReadCartSectors(...)
-        return ReadCartSectors(buffer, offset / 0x200, count / 0x200, cdata, card2_blanking);
+        return ReadCartSectors(buffer, offset / 0x200, count / 0x200, cdata);
     } else { // misaligned data -> -___-
         u8* buffer8 = (u8*) buffer;
         u8 l_buffer[0x200];
         if (offset % 0x200) { // handle misaligned offset
             u32 offset_fix = 0x200 - (offset % 0x200);
-            if (ReadCartSectors(l_buffer, offset / 0x200, 1, cdata, card2_blanking) != 0) return 1;
+            if (ReadCartSectors(l_buffer, offset / 0x200, 1, cdata) != 0) return 1;
             memcpy(buffer8, l_buffer + 0x200 - offset_fix, min(offset_fix, count));
             if (count <= offset_fix) return 0;
             offset += offset_fix;
@@ -408,11 +219,11 @@ u32 ReadCartBytes(void* buffer, u64 offset, u64 count, CartData* cdata, bool car
             count -= offset_fix;
         } // offset is now aligned and part of the data is read
         if (count >= 0x200) { // otherwise this is misaligned and will be handled below
-            if (ReadCartSectors(buffer8, offset / 0x200, count / 0x200, cdata, card2_blanking) != 0) return 1;
+            if (ReadCartSectors(buffer8, offset / 0x200, count / 0x200, cdata) != 0) return 1;
         }
         if (count % 0x200) { // handle misaligned count
             u32 count_fix = count % 0x200;
-            if (ReadCartSectors(l_buffer, (offset + count) / 0x200, 1, cdata, card2_blanking) != 0) return 1;
+            if (ReadCartSectors(l_buffer, (offset + count) / 0x200, 1, cdata) != 0) return 1;
             memcpy(buffer8 + count - count_fix, l_buffer, count_fix);
         }
         return 0;
@@ -429,43 +240,30 @@ u32 ReadCartPrivateHeader(void* buffer, u64 offset, u64 count, CartData* cdata)
     return 0;
 }
 
-u32 ReadCartInfo(u8* buffer, u64 offset, u64 count, CartData* cdata) {
-    char info[256];
-    u32 len;
-
-    GetCartInfoString(info, sizeof(info), cdata);
-    len = strnlen(info, 255);
-
-    if (offset >= len) return 0;
-    if (offset + count > len) count = len - offset;
-    memcpy(buffer, info + offset, count);
-
-    return 0;
-}
-
 u32 ReadCartSave(u8* buffer, u64 offset, u64 count, CartData* cdata) {
     if (offset >= cdata->save_size) return 1;
     if (offset + count > cdata->save_size) count = cdata->save_size - offset;
-    switch (cdata->save_type) {
-        case CARD_SAVE_SPI:
-            return (CardSPIReadSaveData(cdata->spi_save_type, offset, buffer, count) == 0) ? 0 : 1;
-            break;
-
-        case CARD_SAVE_CARD2:
-        {
-            u32 card2_offset = getle32(cdata->header + 0x200);
-            return ReadCartBytes(buffer, card2_offset * NCSD_MEDIA_UNIT + offset, count, cdata, false);
-            break;
-        }
-
-        default:
-            return 1;
-            break;
-    }
+    return (CardSPIReadSaveData(cdata->save_type, offset, buffer, count) == 0) ? 0 : 1;
 }
 
 u32 WriteCartSave(const u8* buffer, u64 offset, u64 count, CartData* cdata) {
     if (offset >= cdata->save_size) return 1;
     if (offset + count > cdata->save_size) count = cdata->save_size - offset;
-    return (CardSPIWriteSaveData(cdata->spi_save_type, offset, buffer, count) == 0) ? 0 : 1;
+    return (CardSPIWriteSaveData(cdata->save_type, offset, buffer, count) == 0) ? 0 : 1;
+}
+
+u32 ReadCartSaveJedecId(u8* buffer, u64 offset, u64 count, CartData* cdata) {
+    u8 ownBuf[JEDECID_AND_SREG_SIZE] = { 0 };
+    u32 id;
+    u8 sReg;
+    if (offset >= JEDECID_AND_SREG_SIZE) return 1;
+    if (offset + count > JEDECID_AND_SREG_SIZE) count = JEDECID_AND_SREG_SIZE - offset;
+    int res = CardSPIReadJEDECIDAndStatusReg(cdata->save_type, &id, &sReg);
+    if (res) return res;
+    ownBuf[0] = (id >> 16) & 0xff;
+    ownBuf[1] = (id >> 8) & 0xff;
+    ownBuf[2] = id & 0xff;
+    ownBuf[JEDECID_AND_SREG_SIZE - 1] = sReg;
+    memcpy(buffer, ownBuf + offset, count);
+    return 0;
 }

arm9/source/gamecart/gamecart.h

@@ -10,34 +10,25 @@
 
 #define MODC_AREA_SIZE          0x4000
 #define PRIV_HDR_SIZE           0x50
-
-typedef enum CardSaveType {
-    CARD_SAVE_NONE,
-    CARD_SAVE_SPI,
-    CARD_SAVE_CARD2,
-    CARD_SAVE_RETAIL_NAND,
-} CardSaveType;
+#define JEDECID_AND_SREG_SIZE   0x4
 
 typedef struct {
     u8  header[0x8000]; // NTR header + secure area / CTR header + private header
-    u8  storage[0x8000]; // encrypted secure area + modcrypt area / unused
+    u8  twl_header[0x8000]; // TWL header + modcrypt area / unused
     u32 cart_type;
     u32 cart_id;
     u64 cart_size;
     u64 data_size;
     u32 save_size;
-    CardSaveType save_type;
-    CardSPIType spi_save_type; // Specific data for SPI save 
+    CardSPIType save_type;
     u32 arm9i_rom_offset; // TWL specific
 } PACKED_ALIGN(16) CartData;
 
 u32 GetCartName(char* name, CartData* cdata);
-u32 GetCartInfoString(char* info, size_t info_size, CartData* cdata);
-u32 SetSecureAreaEncryption(bool encrypted);
 u32 InitCartRead(CartData* cdata);
-u32 ReadCartSectors(void* buffer, u32 sector, u32 count, CartData* cdata, bool card2_blanking);
-u32 ReadCartBytes(void* buffer, u64 offset, u64 count, CartData* cdata, bool card2_blanking);
+u32 ReadCartSectors(void* buffer, u32 sector, u32 count, CartData* cdata);
+u32 ReadCartBytes(void* buffer, u64 offset, u64 count, CartData* cdata);
 u32 ReadCartPrivateHeader(void* buffer, u64 offset, u64 count, CartData* cdata);
-u32 ReadCartInfo(u8* buffer, u64 offset, u64 count, CartData* cdata);
 u32 ReadCartSave(u8* buffer, u64 offset, u64 count, CartData* cdata);
 u32 WriteCartSave(const u8* buffer, u64 offset, u64 count, CartData* cdata);
+u32 ReadCartSaveJedecId(u8* buffer, u64 offset, u64 count, CartData* cdata);

arm9/source/gamecart/secure_ntr.c

@@ -231,7 +231,7 @@ void NTR_CmdSecure (u32 flags, void* buffer, u32 length, u8* pcmd)
     cardPolledTransfer (flags, buffer, length, pcmd);
 }
 
-bool NTR_Secure_Init (u8* header, u8* sa_copy, u32 CartID, int iCardDevice)
+bool NTR_Secure_Init (u8* header, u32 CartID, int iCardDevice)
 {
     u32 iGameCode;
     u32 iCardHash[0x412] = {0};
@@ -329,7 +329,6 @@ bool NTR_Secure_Init (u8* header, u8* sa_copy, u32 CartID, int iCardDevice)
     NTR_CmdSecure (flagsKey1, NULL, 0, cmdData);
 
     //CycloDS doesn't like the dsi secure area being decrypted
-    if (sa_copy) memcpy(sa_copy, secureArea, 0x4000);
     if(!iCardDevice && ((nds9Offset != 0x4000) || secureArea[0] || secureArea[1]))
     {
         NTR_DecryptSecureArea (iGameCode, iCardHash, nCardHash, iKeyCode, secureArea, iCardDevice);

arm9/source/language.c

@@ -1,188 +0,0 @@
-#include "language.h"
-#include "fsdrive.h"
-#include "fsutil.h"
-#include "support.h"
-#include "ui.h"
-
-#define STRING(what, def) const char* STR_##what = NULL;
-#include "language.inl"
-#undef STRING
-
-static const char** translation_ptrs[] = {
-    #define STRING(what, def) &STR_##what,
-    #include "language.inl"
-    #undef STRING
-};
-
-static const char* translation_fallbacks[] = {
-    #define STRING(what, def) def,
-    #include "language.inl"
-    #undef STRING
-};
-
-static char* translation_data = NULL;
-
-typedef struct {
-    char name[32];
-    char path[256];
-} Language;
-
-typedef struct {
-    char chunk_id[4]; // NOT null terminated
-    u32 size;
-} RiffChunkHeader;
-
-typedef struct {
-    u32 version;
-    u32 count;
-    char languageName[32];
-} LanguageMeta;
-STATIC_ASSERT(sizeof(LanguageMeta) == 40);
-
-bool SetLanguage(const void* translation, u32 translation_size) {
-    u32 str_count;
-    const void* ptr = translation;
-    const RiffChunkHeader* riff_header;
-    const RiffChunkHeader* chunk_header;
-
-    // Free old translation data
-    if (translation_data) {
-        free(translation_data);
-        translation_data = NULL;
-    }
-
-    if ((ptr = GetLanguage(translation, translation_size, NULL, &str_count, NULL))) {
-        // load total size
-        riff_header = translation;
-
-        while ((u32)(ptr - translation) < riff_header->size + sizeof(RiffChunkHeader)) {
-            chunk_header = ptr;
-
-            if (memcmp(chunk_header->chunk_id, "SDAT", 4) == 0) { // string data
-                if (chunk_header->size > 0) {
-                    translation_data = malloc(chunk_header->size);
-                    if (!translation_data) goto fallback;
-
-                    memcpy(translation_data, ptr + sizeof(RiffChunkHeader), chunk_header->size);
-                }
-            } else if (memcmp(chunk_header->chunk_id, "SMAP", 4) == 0) { // string map
-                // string data must come before the map
-                if (!translation_data && str_count > 0) goto fallback;
-
-                u16* string_map = (u16*)(ptr + sizeof(RiffChunkHeader));
-
-                // Load all the strings
-                for (u32 i = 0; i < countof(translation_ptrs); i++) {
-                    if (i < str_count) {
-                        *translation_ptrs[i] = (translation_data + string_map[i]);
-                    } else {
-                        *translation_ptrs[i] = translation_fallbacks[i];
-                    }
-                }
-            }
-
-            ptr += sizeof(RiffChunkHeader) + chunk_header->size;
-        }
-
-        return true;
-    }
-
-fallback:
-    if (translation_data) {
-        free(translation_data);
-        translation_data = NULL;
-    }
-
-    for (u32 i = 0; i < countof(translation_ptrs); i++) {
-        *translation_ptrs[i] = translation_fallbacks[i];
-    }
-
-    return false;
-}
-
-const void* GetLanguage(const void* riff, const u32 riff_size, u32* version, u32* count, char* language_name) {
-    const void* ptr = riff;
-    const RiffChunkHeader* riff_header;
-    const RiffChunkHeader* chunk_header;
-
-    // check header magic and load size
-    if (!ptr) return NULL;
-    riff_header = ptr;
-    if (memcmp(riff_header->chunk_id, "RIFF", 4) != 0) return NULL;
-
-    // ensure enough space is allocated
-    if (riff_header->size > riff_size) return NULL;
-
-    ptr += sizeof(RiffChunkHeader);
-
-    while ((u32)(ptr - riff) < riff_header->size + sizeof(RiffChunkHeader)) {
-        chunk_header = ptr;
-
-        // check for and load META section
-        if (memcmp(chunk_header->chunk_id, "META", 4) == 0) {
-            if (chunk_header->size != sizeof(LanguageMeta)) return NULL;
-
-            const LanguageMeta *meta = ptr + sizeof(RiffChunkHeader);
-            if (meta->version != TRANSLATION_VER || meta->count > countof(translation_ptrs)) return NULL;
-
-            // all good
-            if (version) *version = meta->version;
-            if (count) *count = meta->count;
-            if (language_name) strcpy(language_name, meta->languageName);
-            return ptr;
-        }
-
-        ptr += sizeof(RiffChunkHeader) + chunk_header->size;
-    }
-
-    return NULL;
-}
-
-int compLanguage(const void* e1, const void* e2) {
-    const Language* entry2 = (const Language*) e2;
-    const Language* entry1 = (const Language*) e1;
-    return strncasecmp(entry1->name, entry2->name, 32);
-}
-
-bool LanguageMenu(char* result, const char* title) {
-    DirStruct* langDir = (DirStruct*)malloc(sizeof(DirStruct));
-    if (!langDir) return false;
-
-    char path[256];
-    if (!GetSupportDir(path, LANGUAGES_DIR)) return false;
-    GetDirContents(langDir, path);
-
-    char* header = (char*)malloc(0x2C0);
-    Language* langs = (Language*)malloc(langDir->n_entries * sizeof(Language));
-    int langCount = 0;
-
-    // Find all valid files and get their language names
-    for (u32 i = 0; i < langDir->n_entries; i++) {
-        if (langDir->entry[i].type == T_FILE) {
-            size_t fsize = FileGetSize(langDir->entry[i].path);
-            FileGetData(langDir->entry[i].path, header, 0x2C0, 0);
-            if (GetLanguage(header, fsize, NULL, NULL, langs[langCount].name)) {
-                memcpy(langs[langCount].path, langDir->entry[i].path, 256);
-                langCount++;
-            }
-        }
-    }
-
-    free(langDir);
-    free(header);
-
-    qsort(langs, langCount, sizeof(Language), compLanguage);
-
-    // Make an array of just the names for the select promt
-    const char* langNames[langCount];
-    for (int i = 0; i < langCount; i++) {
-        langNames[i] = langs[i].name;
-    }
-
-    u32 selected = ShowSelectPrompt(langCount, langNames, "%s", title);
-    if (selected > 0 && result) {
-        memcpy(result, langs[selected - 1].path, 256);
-    }
-
-    return selected > 0;
-}

arm9/source/language.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-#define STRING(what, def) extern const char* STR_##what;
-#include "language.inl"
-#undef STRING
-
-bool SetLanguage(const void* translation, u32 translation_size);
-const void* GetLanguage(const void* riff, u32 riff_size, u32* version, u32* count, char* language_name);
-
-bool LanguageMenu(char* result, const char* title);

arm9/source/lua/README.md

@@ -1,14 +0,0 @@
-This is Lua 5.4.7 with a few modifications:
-* Patches made to silence warnings: https://github.com/ihaveamac/GodMode9/commit/9905b939b26aae3422c906c7858d8852764fa279
-* lua.c, luac.c, lua.hpp removed (not useful in GodMode9)
-* liolib.c, loslib.c removed (replaced with custom implementations)
-
-## License of Lua 5.4.7
-
-Copyright © 1994–2024 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

arm9/source/lua/gm9internalfs.c

@@ -1,800 +0,0 @@
-#ifndef NO_LUA
-#include "gm9internalfs.h"
-#include "fs.h"
-#include "ui.h"
-#include "utils.h"
-#include "sha.h"
-#include "nand.h"
-#include "language.h"
-#include "hid.h"
-#include "game.h"
-#include "gamecart.h"
-
-#define _MAX_FOR_DEPTH  16
-
-static u8 no_data_hash_256[32] = { SHA256_EMPTY_HASH };
-static u8 no_data_hash_1[32] = { SHA1_EMPTY_HASH };
-
-static bool PathIsDirectory(const char* path) {
-    FRESULT res;
-    FILINFO fno;
-    res = fvx_stat(path, &fno);
-    if (res != FR_OK) return false;
-    return fno.fattrib & AM_DIR;
-}
-
-static void CreateStatTable(lua_State* L, FILINFO* fno) {
-    lua_createtable(L, 0, 4); // create nested table
-    lua_pushstring(L, fno->fname);
-    lua_setfield(L, -2, "name");
-    lua_pushstring(L, (fno->fattrib & AM_DIR) ? "dir" : "file");
-    lua_setfield(L, -2, "type");
-    lua_pushinteger(L, fno->fsize);
-    lua_setfield(L, -2, "size");
-    lua_pushboolean(L, fno->fattrib & AM_RDO);
-    lua_setfield(L, -2, "read_only");
-    // ... and leave this table on the stack for the caller to deal with
-}
-
-static int internalfs_move(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 2, "_fs.move");
-    const char* path_src = luaL_checkstring(L, 1);
-    const char* path_dst = luaL_checkstring(L, 2);
-    FILINFO fno;
-
-    CheckWritePermissionsLuaError(L, path_src);
-    CheckWritePermissionsLuaError(L, path_dst);
-
-    u32 flags = BUILD_PATH;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 3, flags, NO_CANCEL | SILENT | OVERWRITE_ALL | SKIP_ALL);
-    }
-
-    if (!(flags & OVERWRITE_ALL) && (fvx_stat(path_dst, &fno) == FR_OK)) {
-        return luaL_error(L, "destination already exists on %s -> %s and {overwrite=true} was not used", path_src, path_dst);
-    }
-
-    if (!(PathMoveCopy(path_dst, path_src, &flags, true))) {
-        return luaL_error(L, "PathMoveCopy failed on %s -> %s", path_src, path_dst);
-    }
-    return 0;
-}
-
-static int internalfs_remove(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "_fs.remove");
-    const char* path = luaL_checkstring(L, 1);
-
-    CheckWritePermissionsLuaError(L, path);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, flags, RECURSIVE);
-    }
-
-    if (!(flags & RECURSIVE)) {
-        if (PathIsDirectory(path)) {
-            return luaL_error(L, "requested directory remove without {recursive=true} on %s", path);
-        }
-    }
-
-    if (!(PathDelete(path))) {
-        return luaL_error(L, "PathDelete failed on %s", path);
-    }
-    
-    return 0;
-}
-
-static int internalfs_copy(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 2, "_fs.copy");
-    const char* path_src = luaL_checkstring(L, 1);
-    const char* path_dst = luaL_checkstring(L, 2);
-    FILINFO fno;
-
-    CheckWritePermissionsLuaError(L, path_dst);
-
-    u32 flags = BUILD_PATH;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 3, flags, CALC_SHA | USE_SHA1 | NO_CANCEL | SILENT | OVERWRITE_ALL | SKIP_ALL | APPEND_ALL | RECURSIVE);
-    }
-
-    if (!(flags & RECURSIVE)) {
-        if (PathIsDirectory(path_src)) {
-            return luaL_error(L, "requested directory copy without {recursive=true} on %s -> %s", path_src, path_dst);
-        }
-    }
-
-    if (!(flags & OVERWRITE_ALL) && (fvx_stat(path_dst, &fno) == FR_OK)) {
-        return luaL_error(L, "destination already exists on %s -> %s and {overwrite=true} was not used", path_src, path_dst);
-    }
-
-    if (!(PathMoveCopy(path_dst, path_src, &flags, false))) {
-        return luaL_error(L, "PathMoveCopy failed on %s -> %s", path_src, path_dst);
-    }
-
-    return 0;
-}
-
-static int internalfs_mkdir(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.mkdir");
-    const char* path = luaL_checkstring(L, 1);
-
-    CheckWritePermissionsLuaError(L, path);
-
-    FRESULT res = fvx_rmkdir(path);
-    if (res != FR_OK) {
-        return luaL_error(L, "could not mkdir %s (%d)", path, res);
-    }
-
-    return 0;
-}
-
-static int internalfs_list_dir(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.list_dir");
-    const char* path = luaL_checkstring(L, 1);
-    lua_newtable(L);
-
-    DIR dir;
-    FILINFO fno;
-
-    FRESULT res = fvx_opendir(&dir, path);
-    if (res != FR_OK) {
-        lua_pop(L, 1); // remove final table from stack
-        return luaL_error(L, "could not opendir %s (%d)", path, res);
-    }
-
-    for (int i = 1; true; i++) {
-        res = fvx_readdir(&dir, &fno);
-        if (res != FR_OK) {
-            fvx_closedir(&dir);
-            lua_pop(L, 1); // remove final table from stack
-            return luaL_error(L, "could not readdir %s (%d)", path, res);
-        }
-        if (fno.fname[0] == 0) break;
-        CreateStatTable(L, &fno);
-        lua_seti(L, -2, i); // add nested table to final table
-    }
-    fvx_closedir(&dir);
-
-    return 1;
-}
-
-static int internalfs_stat(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.stat");
-    const char* path = luaL_checkstring(L, 1);
-    FILINFO fno;
-
-    FRESULT res = fvx_stat(path, &fno);
-    if (res != FR_OK) {
-        return luaL_error(L, "could not stat %s (%d)", path, res);
-    }
-    CreateStatTable(L, &fno);
-    return 1;
-}
-
-// TODO: make this manually check for permissions recursively
-static int internalfs_fix_cmacs(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.fix_cmacs");
-    const char* path = luaL_checkstring(L, 1);
-
-    ShowString("%s", STR_FIXING_CMACS_PLEASE_WAIT);
-    if (RecursiveFixFileCmac(path) != 0) {
-        return luaL_error(L, "fixcmac failed");
-    }
-
-    return 0;
-}
-
-static int internalfs_stat_fs(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.stat_fs");
-    const char* path = luaL_checkstring(L, 1);
-
-    u64 freespace = GetFreeSpace(path);
-    u64 totalspace = GetTotalSpace(path);
-    u64 usedspace = totalspace - freespace;
-
-    lua_createtable(L, 0, 3);
-    lua_pushinteger(L, freespace);
-    lua_setfield(L, -2, "free");
-    lua_pushinteger(L, totalspace);
-    lua_setfield(L, -2, "total");
-    lua_pushinteger(L, usedspace);
-    lua_setfield(L, -2, "used");
-
-    return 1;
-}
-
-static int internalfs_dir_info(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.dir_info");
-    const char* path = luaL_checkstring(L, 1);
-
-    u64 tsize = 0;
-    u32 tdirs = 0;
-    u32 tfiles = 0;
-    if (!DirInfo(path, &tsize, &tdirs, &tfiles)) {
-        return luaL_error(L, "error when running DirInfo");
-    }
-
-    lua_createtable(L, 0, 3);
-    lua_pushinteger(L, tsize);
-    lua_setfield(L, -2, "size");
-    lua_pushinteger(L, tdirs);
-    lua_setfield(L, -2, "dirs");
-    lua_pushinteger(L, tfiles);
-    lua_setfield(L, -2, "files");
-
-    return 1;
-}
-
-static int FileDirSelector(lua_State* L, const char* path_orig, const char* prompt, bool is_dir, bool include_dirs, bool explorer) {
-    bool ret;
-    char path[_VAR_CNT_LEN] = { 0 };
-    char choice[_VAR_CNT_LEN] = { 0 };
-    strncpy(path, path_orig, _VAR_CNT_LEN);
-    if (strncmp(path, "Z:", 2) == 0) {
-        return luaL_error(L, "forbidden drive");
-    } else if (!is_dir) {
-        u32 flags_ext = include_dirs ? 0 : NO_DIRS;
-        char *npattern = strrchr(path, '/');
-        if (!npattern) {
-            return luaL_error(L, "invalid path");
-        }
-        *(npattern++) = '\0';
-        ret = FileSelector(choice, prompt, path, npattern, flags_ext, explorer);
-    } else {
-        ret = FileSelector(choice, prompt, path, NULL, NO_FILES | SELECT_DIRS, explorer);
-    }
-
-    if (ret) {
-        lua_pushstring(L, choice);
-    } else {
-        lua_pushnil(L);
-    }
-    return 1;
-}
-
-static int internalfs_ask_select_file(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 2, "_fs.ask_select_file");
-    const char* prompt = luaL_checkstring(L, 1);
-    const char* path = luaL_checkstring(L, 2);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 3, flags, INCLUDE_DIRS | EXPLORER);
-    };
-
-    return FileDirSelector(L, path, prompt, false, (flags & INCLUDE_DIRS), (flags & EXPLORER));
-}
-
-static int internalfs_ask_select_dir(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 2, "_fs.ask_select_dir");
-    const char* prompt = luaL_checkstring(L, 1);
-    const char* path = luaL_checkstring(L, 2);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 3, flags, EXPLORER);
-    };
-
-    return FileDirSelector(L, path, prompt, true, true, (flags & EXPLORER));
-}
-
-static int internalfs_find(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "_fs.find");
-    const char* pattern = luaL_checkstring(L, 1);
-    char path[_VAR_CNT_LEN] = { 0 };
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, flags, FIND_FIRST);
-    }
-
-    u8 mode = (flags & FIND_FIRST) ? FN_LOWEST : FN_HIGHEST;
-    FRESULT res = fvx_findpath(path, pattern, mode);
-    if (res == FR_NO_PATH) {
-        lua_pushnil(L);
-    } else if (res != FR_OK) {
-        return luaL_error(L, "failed to find %s (%d)", pattern, res);
-    } else {
-        lua_pushstring(L, path);
-    }
-    return 1;
-}
-
-// this should probably be rewritten
-static int internalfs_find_all(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 2, "_fs.find_all");
-    const char* dir = luaL_checkstring(L, 1);
-    const char* pattern = luaL_checkstring(L, 2);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 3, flags, RECURSIVE);
-    }
-
-    char forpath[_VAR_CNT_LEN] = { 0 };
-
-    // without re-implementing for_handler, i need to give it a "*" pattern
-    // and then manually compare each filename to see if it matches
-    // so that a recursive search actually works
-    bool forstatus = for_handler(NULL, dir, "*", flags & RECURSIVE);
-    if (!forstatus) {
-        return luaL_error(L, "could not open directory");
-    }
-
-    lua_newtable(L);
-    int i = 1;
-    char* slash;
-
-    while (true) {
-        forstatus = for_handler(forpath, NULL, NULL, false);
-        if (!forstatus) {
-            forpath[0] = '\0';
-        }
-        if (!forpath[0]) {
-            // finish for_handler
-            for_handler(NULL, NULL, NULL, false);
-            break;
-        } else {
-            slash = strrchr(forpath, '/');
-            if (!slash) bkpt; // this should never, ever happen
-            if (fvx_match_name(slash+1, pattern) == FR_OK) {
-                lua_pushstring(L, forpath);
-                lua_seti(L, -2, i++);
-            }
-        }
-    }
-
-    return 1;
-}
-
-static int internalfs_find_not(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.find_not");
-    const char* pattern = luaL_checkstring(L, 1);
-    char path[_VAR_CNT_LEN] = { 0 };
-
-    FRESULT res = fvx_findnopath(path, pattern);
-    if (res != FR_OK) {
-        return luaL_error(L, "failed to find %s (%d)", pattern, res);
-    }
-
-    lua_pushstring(L, path);
-    return 1;
-}
-
-static int internalfs_exists(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.exists");
-    const char* path = luaL_checkstring(L, 1);
-    FILINFO fno;
-
-    lua_pushboolean(L, (fvx_stat(path, &fno) == FR_OK));
-    return 1;
-}
-
-static int internalfs_is_dir(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.is_dir");
-    const char* path = luaL_checkstring(L, 1);
-
-    lua_pushboolean(L, PathIsDirectory(path));
-    return 1;
-}
-
-static int internalfs_is_file(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.is_file");
-    const char* path = luaL_checkstring(L, 1);
-    FILINFO fno;
-
-    FRESULT res = fvx_stat(path, &fno);
-    if (res != FR_OK) {
-        lua_pushboolean(L, false);
-    } else {
-        lua_pushboolean(L, !(fno.fattrib & AM_DIR));
-    }
-    return 1;
-}
-
-static int internalfs_read_file(lua_State* L) {
-    CheckLuaArgCount(L, 3, "_fs.read_file");
-    const char* path = luaL_checkstring(L, 1);
-    lua_Integer offset = luaL_checkinteger(L, 2);
-    lua_Integer size = luaL_checkinteger(L, 3);
-
-    char *buf = malloc(size);
-    if (!buf) {
-        return luaL_error(L, "could not allocate memory to read file");
-    }
-    UINT bytes_read = 0;
-    FRESULT res = fvx_qread(path, buf, offset, size, &bytes_read);
-    if (res != FR_OK) {
-        free(buf);
-        return luaL_error(L, "could not read %s (%d)", path, res);
-    }
-    lua_pushlstring(L, buf, bytes_read);
-    free(buf);
-    return 1;
-}
-
-static int internalfs_write_file(lua_State* L) {
-    CheckLuaArgCount(L, 3, "_fs.write_file");
-    const char* path = luaL_checkstring(L, 1);
-    lua_Integer offset = luaL_checkinteger(L, 2);
-    size_t data_length = 0;
-    const char* data = luaL_checklstring(L, 3, &data_length);
-
-    CheckWritePermissionsLuaError(L, path);
-    
-    UINT bytes_written = 0;
-    FRESULT res = fvx_qwrite(path, data, offset, data_length, &bytes_written);
-    if (res != FR_OK) {
-        return luaL_error(L, "error writing %s (%d)", path, res);
-    }
-
-    lua_pushinteger(L, bytes_written);
-    return 1;
-}
-
-static int internalfs_fill_file(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 4, "_fs.fill_file");
-    const char* path = luaL_checkstring(L, 1);
-    lua_Integer offset = luaL_checkinteger(L, 2);
-    lua_Integer size = luaL_checkinteger(L, 3);
-    lua_Integer byte = luaL_checkinteger(L, 4);
-
-    u8 real_byte = byte & 0xFF;
-
-    u32 flags = ALLOW_EXPAND;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 4, flags, NO_CANCEL);
-    };
-
-    if ((byte < 0) || (byte > 0xFF)) {
-        return luaL_error(L, "byte is not between 0x00 and 0xFF (got: %I)", byte);
-    }
-
-    CheckWritePermissionsLuaError(L, path);
-
-    if (!(FileSetByte(path, offset, size, real_byte, &flags))) {
-        return luaL_error(L, "FileSetByte failed on %s", path);
-    }
-
-    return 0;
-}
-
-static int internalfs_make_dummy_file(lua_State* L) {
-    CheckLuaArgCount(L, 2, "_fs.make_dummy_file");
-    const char* path = luaL_checkstring(L, 1);
-    lua_Integer size = luaL_checkinteger(L, 2);
-
-    CheckWritePermissionsLuaError(L, path);
-
-    if (!(FileCreateDummy(path, NULL, size))) {
-        return luaL_error(L, "FileCreateDummy failed on %s", path);
-    }
-
-    return 0;
-}
-
-static int internalfs_truncate(lua_State* L) {
-    CheckLuaArgCount(L, 2, "_fs.truncate");
-    const char* path = luaL_checkstring(L, 1);
-    lua_Integer size = luaL_checkinteger(L, 2);
-    FIL fp;
-    FRESULT res;
-
-    CheckWritePermissionsLuaError(L, path);
-
-    res = f_open(&fp, path, FA_READ | FA_WRITE);
-    if (res != FR_OK) {
-        return luaL_error(L, "failed to open %s (note: this only works on FAT filesystems, not virtual)", path);
-    }
-
-    res = f_lseek(&fp, size);
-    if (res != FR_OK) {
-        f_close(&fp);
-        return luaL_error(L, "failed to seek on %s", path);
-    }
-
-    res = f_truncate(&fp);
-    if (res != FR_OK) {
-        f_close(&fp);
-        return luaL_error(L, "failed to truncate %s", path);
-    }
-
-    f_close(&fp);
-    return 0;
-}
-
-static int internalfs_img_mount(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.img_mount");
-    const char* path = luaL_checkstring(L, 1);
-
-    bool res = InitImgFS(path);
-    if (!res) {
-        return luaL_error(L, "failed to mount %s", path);
-    }
-
-    return 0;
-}
-
-static int internalfs_img_umount(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_fs.img_umount");
-    
-    InitImgFS(NULL);
-    
-    return 0;
-}
-
-static int internalfs_get_img_mount(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_fs.get_img_mount");
-
-    char path[256] = { 0 };
-    strncpy(path, GetMountPath(), 256);
-    if (path[0] == 0) {
-        // since lua treats "" as true, return a nil to make if/else easier
-        lua_pushnil(L);
-    } else {
-        lua_pushstring(L, path);
-    }
-
-    return 1;
-}
-
-// TODO: what if someone does offset != 0 but size = 0 (end of file)?
-static int internalfs_hash_file(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 3, "_fs.hash_file");
-    const char* path = luaL_checkstring(L, 1);
-    lua_Integer offset = luaL_checkinteger(L, 2);
-    lua_Integer size = luaL_checkinteger(L, 3);
-    FRESULT res;
-    FILINFO fno;
-
-    if (size == 0) {
-        res = fvx_stat(path, &fno);
-        if (res != FR_OK) {
-            return luaL_error(L, "failed to stat %s", path);
-        }
-
-        size = fno.fsize;
-    }
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 4, flags, USE_SHA1);
-    }
-
-    const u8 hashlen = (flags & USE_SHA1) ? 20 : 32;
-    u8 hash_fil[0x20];
-
-    if (size == 0) {
-        // shortcut by just returning the hash of empty data
-        memcpy(hash_fil, (flags & USE_SHA1) ? no_data_hash_1 : no_data_hash_256, hashlen);
-    } else if (!(FileGetSha(path, hash_fil, offset, size, (flags & USE_SHA1)))) {
-        return luaL_error(L, "FileGetSha failed on %s", path);
-    }
-
-    lua_pushlstring(L, (char*)hash_fil, hashlen);
-    return 1;
-}
-
-static int internalfs_hash_data(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "_fs.hash_data");
-    size_t data_length = 0;
-    const char* data = luaL_checklstring(L, 1, &data_length);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, flags, USE_SHA1);
-    }
-
-    const u8 hashlen = (flags & USE_SHA1) ? 20 : 32;
-    u8 hash_fil[0x20];
-
-    if (data_length == 0) {
-        // shortcut by just returning the hash of empty data
-        memcpy(hash_fil, (flags & USE_SHA1) ? no_data_hash_1 : no_data_hash_256, hashlen);
-    } else {
-        sha_quick(hash_fil, data, data_length, (flags & USE_SHA1) ? SHA1_MODE : SHA256_MODE);
-    }
-
-    lua_pushlstring(L, (char*)hash_fil, hashlen);
-    return 1;
-}
-
-static int internalfs_allow(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "_fs.allow");
-    const char* path = luaL_checkstring(L, 1);
-    u32 flags = 0;
-    bool allowed;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, 0, ASK_ALL);
-    }
-
-    if (flags & ASK_ALL) {
-        allowed = CheckDirWritePermissions(path);
-    } else {
-        allowed = CheckWritePermissions(path);
-    }
-    lua_pushboolean(L, allowed);
-    return 1;
-};
-
-static int internalfs_verify(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_fs.verify");
-    const char* path = luaL_checkstring(L, 1);
-    bool res;
-
-    u64 filetype = IdentifyFileType(path);
-    if (filetype & IMG_NAND) res = (ValidateNandDump(path) == 0);
-    else res = (VerifyGameFile(path) == 0);
-
-    lua_pushboolean(L, res);
-    return 1;
-}
-
-static int internalfs_sd_is_mounted(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_fs.sd_is_mounted");
-
-    lua_pushboolean(L, CheckSDMountState());
-    return 1;
-}
-
-static int internalfs_sd_switch(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 0, "_fs.sd_switch");
-    const char* message;
-
-    if (extra) {
-        message = luaL_checkstring(L, 1);
-    } else {
-        message = "Please switch the SD card now.";
-    }
-
-    bool ret;
-
-    DeinitExtFS();
-    if (!(ret = CheckSDMountState())) {
-        return luaL_error(L, "%s", STR_SCRIPTERR_SD_NOT_MOUNTED);
-    }
-
-    u32 pad_state;
-    DeinitSDCardFS();
-    ShowString("%s\n \n%s", message, STR_EJECT_SD_CARD);
-    while (!((pad_state = InputWait(0)) & (BUTTON_B|SD_EJECT)));
-    if (pad_state & SD_EJECT) {
-        ShowString("%s\n \n%s", message, STR_INSERT_SD_CARD);
-        while (!((pad_state = InputWait(0)) & (BUTTON_B|SD_INSERT)));
-    }
-    if (pad_state & BUTTON_B) {
-        return luaL_error(L, "user canceled");
-    }
-
-    InitSDCardFS();
-    AutoEmuNandBase(true);
-    InitExtFS();
-
-    return 0;
-}
-
-static int internalfs_key_dump(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "_fs.key_dump");
-    const char* opts[] = {SEEDINFO_NAME, TIKDB_NAME_ENC, TIKDB_NAME_DEC, NULL};
-    int opt = luaL_checkoption(L, 1, NULL, opts);
-    bool ret = false;
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, 0, OVERWRITE_ALL);
-    }
-
-    if (opt == 1 || opt == 2) {
-        bool tik_dec = opt == 2;
-        if (flags & OVERWRITE_ALL) fvx_unlink(tik_dec ? OUTPUT_PATH "/" TIKDB_NAME_DEC : OUTPUT_PATH "/" TIKDB_NAME_ENC);
-        if (BuildTitleKeyInfo(NULL, tik_dec, false) == 0) {
-            ShowString(STR_BUILDING_TO_OUT_ARG, OUTPUT_PATH, opts[opt]);
-            if (((BuildTitleKeyInfo("1:/dbs/ticket.db", tik_dec, false) == 0) ||
-                 (BuildTitleKeyInfo("4:/dbs/ticket.db", tik_dec, false) == 0)) &&
-                (BuildTitleKeyInfo(NULL, tik_dec, true) == 0))
-                ret = true;
-        }
-    } else if (opt == 0) {
-        if (flags & OVERWRITE_ALL) fvx_unlink(OUTPUT_PATH "/" SEEDINFO_NAME);
-        if (BuildSeedInfo(NULL, false) == 0) {
-            ShowString(STR_BUILDING_TO_OUT_ARG, OUTPUT_PATH, opts[opt]);
-            if (((BuildSeedInfo("1:", false) == 0) ||
-                 (BuildSeedInfo("4:", false) == 0)) &&
-                (BuildSeedInfo(NULL, true) == 0))
-                ret = true;
-        }
-    }
-
-    if (!ret) {
-        return luaL_error(L, "building %s failed", opts[opt]);
-    }
-
-    return 0;
-}
-
-static int internalfs_cart_dump(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 2, "_fs.cart_dump");
-    const char* path = luaL_checkstring(L, 1);
-    u64 fsize = (u64)luaL_checkinteger(L, 2);
-    bool ret = false;
-    const char* errstr = "";
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 3, flags, ENCRYPTED);
-    }
-
-    CartData* cdata = (CartData*) malloc(sizeof(CartData));
-    u8* buf = (u8*) malloc(STD_BUFFER_SIZE);
-    ret = false;
-    if (!cdata || !buf) {
-        errstr = "out of memory";
-    } else if (InitCartRead(cdata) != 0){
-        errstr = "cart init fail";
-    } else {
-        SetSecureAreaEncryption(flags & ENCRYPTED);
-        fvx_unlink(path);
-        ret = true;
-        errstr = "cart dump failed or canceled";
-        for (u64 p = 0; p < fsize; p += STD_BUFFER_SIZE) {
-            u64 len = min((fsize - p), STD_BUFFER_SIZE);
-            ShowProgress(p, fsize, path);
-            if (!ShowProgress(p, fsize, path) ||
-                (ReadCartBytes(buf, p, len, cdata, false) != 0) ||
-                (fvx_qwrite(path, buf, p, len, NULL) != FR_OK)) {
-                ret = false;
-                break;
-            }
-        }
-    }
-    free(buf);
-    free(cdata);
-
-    if (!ret) {
-        return luaL_error(L, "%s", errstr);
-    }
-    return 0;
-}
-
-static const luaL_Reg internalfs_lib[] = {
-    {"move", internalfs_move},
-    {"remove", internalfs_remove},
-    {"copy", internalfs_copy},
-    {"mkdir", internalfs_mkdir},
-    {"list_dir", internalfs_list_dir},
-    {"stat", internalfs_stat},
-    {"stat_fs", internalfs_stat_fs},
-    {"dir_info", internalfs_dir_info},
-    {"ask_select_file", internalfs_ask_select_file},
-    {"ask_select_dir", internalfs_ask_select_dir},
-    {"find", internalfs_find},
-    {"find_all", internalfs_find_all},
-    {"find_not", internalfs_find_not},
-    {"exists", internalfs_exists},
-    {"is_dir", internalfs_is_dir},
-    {"is_file", internalfs_is_file},
-    {"read_file", internalfs_read_file},
-    {"write_file", internalfs_write_file},
-    {"fill_file", internalfs_fill_file},
-    {"make_dummy_file", internalfs_make_dummy_file},
-    {"truncate", internalfs_truncate},
-    {"img_mount", internalfs_img_mount},
-    {"img_umount", internalfs_img_umount},
-    {"get_img_mount", internalfs_get_img_mount},
-    {"hash_file", internalfs_hash_file},
-    {"hash_data", internalfs_hash_data},
-    {"verify", internalfs_verify},
-    {"allow", internalfs_allow},
-    {"sd_is_mounted", internalfs_sd_is_mounted},
-    {"sd_switch", internalfs_sd_switch},
-    {"fix_cmacs", internalfs_fix_cmacs},
-    {"key_dump", internalfs_key_dump},
-    {"cart_dump", internalfs_cart_dump},
-    {NULL, NULL}
-};
-
-int gm9lua_open_internalfs(lua_State* L) {
-    luaL_newlib(L, internalfs_lib);
-    return 1;
-}
-#endif

arm9/source/lua/gm9internalfs.h

@@ -1,23 +0,0 @@
-#pragma once
-#include "gm9lua.h"
-
-#define GM9LUA_INTERNALFSLIBNAME "_fs"
-
-#define SHA256_EMPTY_HASH \
-    0xE3, 0xB0, 0xC4, 0x42, \
-    0x98, 0xFC, 0x1C, 0x14, \
-    0x9A, 0xFB, 0xF4, 0xC8, \
-    0x99, 0x6F, 0xB9, 0x24, \
-    0x27, 0xAE, 0x41, 0xE4, \
-    0x64, 0x9B, 0x93, 0x4C, \
-    0xA4, 0x95, 0x99, 0x1B, \
-    0x78, 0x52, 0xB8, 0x55
-
-#define SHA1_EMPTY_HASH \
-    0xDA, 0x39, 0xA3, 0xEE, \
-    0x5E, 0x6B, 0x4B, 0x0D, \
-    0x32, 0x55, 0xBF, 0xEF, \
-    0x95, 0x60, 0x18, 0x90, \
-    0xAF, 0xD8, 0x07, 0x09
-
-int gm9lua_open_internalfs(lua_State* L);

arm9/source/lua/gm9internalsys.c

@@ -1,181 +0,0 @@
-#ifndef NO_LUA
-#include "gm9internalsys.h"
-#include "bootfirm.h"
-#include "fs.h"
-#include "pxi.h"
-#include "game.h"
-#include "power.h"
-#include "sha.h"
-#include "nand.h"
-#include "utils.h"
-#include "ui.h"
-#include "rtc.h"
-#include "godmode.h"
-
-#define UNUSED(x)   ((void)(x))
-
-static int internalsys_boot(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_sys.boot");
-    const char* path = lua_tostring(L, 1);
-
-    u8* firm = (u8*) malloc(FIRM_MAX_SIZE);
-    if (!firm) {
-        return luaL_error(L, "out of memory");
-    }
-
-    size_t firm_size = FileGetData(path, firm, FIRM_MAX_SIZE, 0);
-    if (!(firm_size && IsBootableFirm(firm, firm_size))) {
-        return luaL_error(L, "not a bootable firm");
-    }
-
-    char fixpath[256] = { 0 };
-    if ((*path == '0') || (*path == '1'))
-        snprintf(fixpath, sizeof(fixpath), "%s%s", (*path == '0') ? "sdmc" : "nand", path + 1);
-    else strncpy(fixpath, path, 256);
-    fixpath[255] = '\0';
-    DeinitExtFS();
-    DeinitSDCardFS();
-    PXI_DoCMD(PXICMD_LEGACY_BOOT, NULL, 0);
-    PXI_Barrier(PXI_FIRMLAUNCH_BARRIER);
-    BootFirm((FirmHeader*)(void*)firm, fixpath);
-    while(1);
-}
-
-static int internalsys_reboot(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_sys.reboot");
-    DeinitExtFS();
-    DeinitSDCardFS();
-    Reboot();
-    return 0;
-}
-
-static int internalsys_power_off(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_sys.power_off");
-    DeinitExtFS();
-    DeinitSDCardFS();
-    PowerOff();
-    return 0;
-}
-
-static int internalsys_get_id0(lua_State* L) {
-    CheckLuaArgCount(L, 1, "_sys.get_id0");
-    const char* path = lua_tostring(L, 1);
-
-    char env_id0[32+1];
-    u8 sd_keyy[0x10] __attribute__((aligned(4)));
-    if (FileGetData(path, sd_keyy, 0x10, 0x110) == 0x10) {
-        u32 sha256sum[8];
-        sha_quick(sha256sum, sd_keyy, 0x10, SHA256_MODE);
-        snprintf(env_id0, sizeof(env_id0), "%08lx%08lx%08lx%08lx",
-            sha256sum[0], sha256sum[1], sha256sum[2], sha256sum[3]);
-        lua_pushstring(L, env_id0);
-    } else {
-        lua_pushnil(L);
-    }
-    return 1;
-}
-
-static int internalsys_next_emu(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_sys.next_emu");
-
-    DismountDriveType(DRV_EMUNAND);
-    AutoEmuNandBase(false);
-    InitExtFS();
-
-    return 0;
-}
-
-static int internalsys_get_emu_base(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_sys.get_emu_base");
-
-    lua_pushinteger(L, GetEmuNandBase());
-    return 1;
-}
-
-static int internalsys_check_embedded_backup(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_sys.check_embedded_backup");
-
-    if (PathExist("S:/essential.exefs")) {
-        lua_pushboolean(L, true);
-        return 1;
-    }
-
-    bool ncsd_check = CheckGenuineNandNcsd();
-    if (!ncsd_check) {
-        lua_pushnil(L);
-        return 1;
-    }
-
-    bool ret = false;
-
-    if (ncsd_check && ShowPrompt(true, "%s", STR_ESSENTIAL_BACKUP_NOT_FOUND_CREATE_NOW)) {
-        if (EmbedEssentialBackup("S:/nand.bin") == 0) {
-            u32 flags = BUILD_PATH | SKIP_ALL;
-            PathCopy(OUTPUT_PATH, "S:/essential.exefs", &flags);
-            ShowPrompt(false, STR_BACKUP_EMBEDDED_WRITTEN_TO_OUT, OUTPUT_PATH);
-            ret = true;
-        } else {
-            ret = false;
-        }
-    } else {
-        ret = false;
-    }
-
-    lua_pushboolean(L, ret);
-    return 1;
-}
-
-static int internalsys_check_raw_rtc(lua_State* L) {
-    CheckLuaArgCount(L, 0, "_sys.check_raw_rtc");
-
-    bool result = false;
-
-    DsTime dstime;
-    get_dstime(&dstime);
-    if (DSTIMEGET(&dstime, bcd_Y) >= 18) {
-        result = true;
-    } else if (ShowPrompt(true, "%s", STR_RTC_DATE_TIME_SEEMS_TO_BE_WRONG_SET_NOW) &&
-         ShowRtcSetterPrompt(&dstime, "%s", STR_TITLE_SET_RTC_DATE_TIME)) {
-        //char timestr[UTF_BUFFER_BYTESIZE(32)];
-        set_dstime(&dstime);
-        // this is only in godmode.h
-        //GetTimeString(timestr, true, true);
-        // ShowPrompt(false, STR_NEW_RTC_DATE_TIME_IS_TIME, timestr);
-        result = true;
-    }
-
-    lua_pushboolean(L, result);
-    return 1;
-}
-
-static int internalsys_global_bkpt(lua_State* L) {
-    UNUSED(L);
-    bkpt;
-    while(1);
-}
-
-static const luaL_Reg internalsys_lib[] = {
-    {"boot", internalsys_boot},
-    {"reboot", internalsys_reboot},
-    {"power_off", internalsys_power_off},
-    {"get_id0", internalsys_get_id0},
-    {"next_emu", internalsys_next_emu},
-    {"get_emu_base", internalsys_get_emu_base},
-    {"check_embedded_backup", internalsys_check_embedded_backup},
-    {"check_raw_rtc", internalsys_check_raw_rtc},
-    {NULL, NULL}
-};
-
-static const luaL_Reg internalsys_global_lib[] = {
-    {"bkpt", internalsys_global_bkpt},
-    {NULL, NULL}
-};
-
-int gm9lua_open_internalsys(lua_State* L) {
-    luaL_newlib(L, internalsys_lib);
-    lua_pushglobaltable(L); // push global table to stack
-    luaL_setfuncs(L, internalsys_global_lib, 0); // set global funcs
-    lua_pop(L, 1); // pop global table from stack
-    return 1;
-}
-#endif

arm9/source/lua/gm9internalsys.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "gm9lua.h"
-
-#define GM9LUA_INTERNALSYSLIBNAME "_sys"
-
-int gm9lua_open_internalsys(lua_State* L);

arm9/source/lua/gm9loader.c

@@ -1,128 +0,0 @@
-#ifndef NO_LUA
-#include "gm9loader.h"
-#include "gm9lua.h"
-#include "vff.h"
-#include "ui.h"
-
-// a lot of this code is based on stuff in loadlib.c but adapted for GM9
-
-// similar to readable
-static int Readable(const char* filename) {
-    FIL f;
-    FRESULT res = fvx_open(&f, filename, FA_READ | FA_OPEN_EXISTING);
-    if (res != FR_OK) return 0;
-    fvx_close(&f);
-    return 1;
-}
-
-// similar to getnextfilename
-static const char* GetNextFileName(char** path, char* end) {
-    char *sep;
-    char *name = *path;
-    if (name == end)
-        return NULL;  /* no more names */
-    else if (*name == '\0') {  /* from previous iteration? */
-        *name = *LUA_PATH_SEP;  /* restore separator */
-        name++;  /* skip it */
-    }
-    sep = strchr(name, *LUA_PATH_SEP);  /* find next separator */
-    if (sep == NULL)  /* separator not found? */
-        sep = end;  /* name goes until the end */
-    *sep = '\0';  /* finish file name */
-    *path = sep;  /* will start next search from here */
-    return name;
-}
-
-// similar to pusherrornotfound
-static void PushErrorNotFound(lua_State* L, const char* path) {
-    luaL_Buffer b;
-    luaL_buffinit(L, &b);
-    luaL_addstring(&b, "no file '");
-    luaL_addgsub(&b, path, LUA_PATH_SEP, "'\n\tno file '");
-    luaL_addstring(&b, "'");
-    luaL_pushresult(&b);
-}
-
-// similar to searchpath
-static const char* SearchPath(lua_State* L, const char* name, const char* path, const char* sep) {
-    luaL_Buffer buff;
-    char* pathname;
-    char* endpathname;
-    const char* filename;
-    if (*sep != '\0' && strchr(name, *sep) != NULL)
-        name = luaL_gsub(L, name, sep, "/");
-
-    luaL_buffinit(L, &buff);
-    // add path to the buffer, replacing marks ('?') with the file name
-    luaL_addgsub(&buff, path, LUA_PATH_MARK, name);
-    luaL_addchar(&buff, '\0');
-    pathname = luaL_buffaddr(&buff);
-    endpathname = pathname + luaL_bufflen(&buff) + 1;
-    while ((filename = GetNextFileName(&pathname, endpathname)) != NULL) {
-        if (Readable(filename))
-            return lua_pushstring(L, filename);
-    }
-    luaL_pushresult(&buff);
-    PushErrorNotFound(L, lua_tostring(L, -1));
-    return NULL;
-}
-
-// similar to findfile
-static const char* FindLuaFile(lua_State* L, const char* name, const char* pname) {
-    const char* path;
-    lua_getfield(L, lua_upvalueindex(1), pname); // gets 'package' table
-    path = lua_tostring(L, -1);
-    if (path == NULL) luaL_error(L, "'package.%s' must be a string", pname);
-    return SearchPath(L, name, path, ".");
-}
-
-// similar to checkload
-static int CheckLoad(lua_State* L, int stat, const char* filename) {
-    if (stat) {
-        lua_pushstring(L, filename);
-        return 2; // return open function and filename
-    } else {
-        return luaL_error(L, "error loading module '%s' from file '%s':\n\t%s",
-                             lua_tostring(L, 1), filename, lua_tostring(L, -1));
-    }
-}
-
-// similar to searcher_Lua
-static int PackageSearcher(lua_State* L) {
-    const char *filename;
-    const char *name = luaL_checkstring(L, 1);
-
-    filename = FindLuaFile(L, name, "path");
-
-    if (filename == NULL) return 1;  // module not found in this path
-    return CheckLoad(L, (LoadLuaFile(L, filename) == LUA_OK), filename);
-}
-
-void ResetPackageSearchersAndPath(lua_State* L) {
-    // get package module
-    lua_getglobal(L, "package");
-    
-    // the default package.path only makes sense on a full OS
-    // maybe this should include the lua script's current directory somehow...
-    lua_pushliteral(L, GM9LUA_DEFAULT_PATH);
-    lua_setfield(L, -2, "path");
-
-    // package.cpath is for loading binary modules, useless on GM9
-    lua_pushliteral(L, "");
-    lua_setfield(L, -2, "cpath");
-
-    // the default package searchers only make sense on a full OS
-    // so here we replace the lua loader with a custom one, and remove the C/Croot loaders
-    // leaving the initial one (preload)
-    lua_getfield(L, -1, "searchers");
-    lua_pushvalue(L, -2); // copy 'package' to the top of the stack, to set 'package' as upvalue for all searchers
-    lua_pushcclosure(L, PackageSearcher, 1); // push PackageSearcher with one upvalue being the "packages" module/table
-    lua_rawseti(L, -2, 2); // replace default lua loader
-    lua_pushnil(L);
-    lua_rawseti(L, -2, 3); // remove C loader
-    lua_pushnil(L);
-    lua_rawseti(L, -2, 4); // remove C root loader
-    lua_pop(L, 1); // remove "searchers"
-    lua_pop(L, 1); // remove "packages"
-}
-#endif

arm9/source/lua/gm9loader.h

@@ -1,15 +0,0 @@
-#include "gm9lua.h"
-
-/*
- * 0:/gm9/luapackages/?.lua;
- * 0:/gm9/luapackages/?/init.lua;
- * V:/luapackages/?.lua;
- * V:/luapackages/?/init.lua
- */
-#define GM9LUA_DEFAULT_PATH \
-        "0:/gm9/luapackages/"LUA_PATH_MARK".lua" LUA_PATH_SEP \
-        "0:/gm9/luapackages/"LUA_PATH_MARK"/init.lua" LUA_PATH_SEP \
-        "V:/luapackages/"LUA_PATH_MARK".lua" LUA_PATH_SEP \
-        "V:/luapackages/"LUA_PATH_MARK"/init.lua"
-
-void ResetPackageSearchersAndPath(lua_State* L);

arm9/source/lua/gm9lua.c

@@ -1,216 +0,0 @@
-#include "gm9lua.h"
-#include "ui.h"
-#include "language.h"
-#ifndef NO_LUA
-#include "fs.h"
-#include "ff.h"
-#include "vff.h"
-#include "fsutil.h"
-#include "unittype.h"
-#include "nand.h"
-#include "gm9loader.h"
-#include "gm9os.h"
-#include "gm9ui.h"
-#include "gm9title.h"
-#include "gm9internalfs.h"
-#include "gm9internalsys.h"
-
-#define DEBUGSP(x) ShowPrompt(false, (x))
-
-typedef struct GM9LuaLoadF {
-    int n; // pre-read characters
-    FIL f;
-    FRESULT res;
-    char buff[BUFSIZ];
-} GM9LuaLoadF;
-
-// similar to "getF" in lauxlib.c
-static const char* GetF(lua_State* L, void* ud, size_t* size) {
-    GM9LuaLoadF* lf = (GM9LuaLoadF*)ud;
-    UINT br = 0;
-    (void)L; // unused
-    if (lf->n > 0) { // check for pre-read characters
-        *size = lf->n; // return those
-        lf->n = 0;
-    } else {
-        if (fvx_eof(&lf->f)) return NULL;
-        lf->res = fvx_read(&lf->f, lf->buff, BUFSIZ, &br);
-        *size = (size_t)br;
-        if (lf->res != FR_OK) return NULL;
-    }
-    return lf->buff;
-}
-
-// similar to "errfile" in lauxlib.c
-static int ErrFile(lua_State* L, const char* what, int fnameindex, FRESULT res) {
-    const char* filename = lua_tostring(L, fnameindex) + 1;
-    lua_pushfstring(L, "cannot %s %s:\nfatfs error %d", what, filename, res);
-    lua_remove(L, fnameindex);
-    return LUA_ERRFILE;
-}
-
-int LoadLuaFile(lua_State* L, const char* filename) {
-    GM9LuaLoadF lf;
-    lf.n = 0;
-    int status;
-    int fnameindex = lua_gettop(L) + 1; // index of filename on the stack
-    lua_pushfstring(L, "@%s", filename);
-    lf.res = fvx_open(&lf.f, filename, FA_READ | FA_OPEN_EXISTING);
-    if (lf.res != FR_OK) return ErrFile(L, "open", fnameindex, lf.res);
-    
-    status = lua_load(L, GetF, &lf, lua_tostring(L, -1), NULL);
-    fvx_close(&lf.f);
-    if (lf.res != FR_OK) {
-        lua_settop(L, fnameindex);
-        return ErrFile(L, "read", fnameindex, lf.res);
-    }
-    lua_remove(L, fnameindex);
-    return status;
-}
-
-u32 GetFlagsFromTable(lua_State* L, int pos, u32 flags_ext_starter, u32 allowed_flags) {
-    char types[FLAGS_COUNT][14] = { FLAGS_STR };
-    int types_int[FLAGS_COUNT] = { FLAGS_CONSTS };
-    u32 flags_ext = flags_ext_starter;
-
-    for (int i = 0; i < FLAGS_COUNT; i++) {
-        if (!(allowed_flags & types_int[i])) continue;
-        lua_getfield(L, pos, types[i]);
-        if (lua_toboolean(L, -1)) flags_ext |= types_int[i];
-        lua_pop(L, 1);
-    }
-
-    return flags_ext;
-}
-
-void CheckWritePermissionsLuaError(lua_State* L, const char* path) {
-    if (!CheckWritePermissions(path)) {
-        luaL_error(L, "writing not allowed: %s", path);
-    }
-}
-
-static const luaL_Reg gm9lualibs[] = {
-    // built-ins
-    {LUA_GNAME, luaopen_base},
-    {LUA_LOADLIBNAME, luaopen_package},
-    {LUA_COLIBNAME, luaopen_coroutine},
-    {LUA_TABLIBNAME, luaopen_table},
-    {LUA_STRLIBNAME, luaopen_string},
-    {LUA_MATHLIBNAME, luaopen_math},
-    {LUA_UTF8LIBNAME, luaopen_utf8},
-    {LUA_DBLIBNAME, luaopen_debug},
-
-    // gm9 custom
-    {GM9LUA_OSLIBNAME, gm9lua_open_os},
-    {GM9LUA_UILIBNAME, gm9lua_open_ui},
-    {GM9LUA_TITLELIBNAME, gm9lua_open_title},
-
-    // gm9 custom internals (usually wrapped by a pure lua module)
-    {GM9LUA_INTERNALFSLIBNAME, gm9lua_open_internalfs},
-    {GM9LUA_INTERNALSYSLIBNAME, gm9lua_open_internalsys},
-
-    {NULL, NULL}
-};
-
-static void loadlibs(lua_State* L) {
-    const luaL_Reg* lib;
-    for (lib = gm9lualibs; lib->func; lib++) {
-        luaL_requiref(L, lib->name, lib->func, 1);
-        lua_pop(L, 1); // remove lib from stack
-    }
-}
-
-static bool RunFile(lua_State* L, const char* file) {
-    int result = LoadLuaFile(L, file);
-    if (result != LUA_OK) {
-        char errstr[BUFSIZ] = {0};
-        strlcpy(errstr, lua_tostring(L, -1), BUFSIZ);
-        WordWrapString(errstr, 0);
-        ShowPrompt(false, "Error during loading:\n%s", errstr);
-        return false;
-    }
-
-    if (lua_pcall(L, 0, LUA_MULTRET, 0) != LUA_OK) {
-        char errstr[BUFSIZ] = {0};
-        strlcpy(errstr, lua_tostring(L, -1), BUFSIZ);
-        WordWrapString(errstr, 0);
-        ShowPrompt(false, "Error during execution:\n%s", errstr);
-        return false;
-    }
-
-    return true;
-}
-
-// this is also taken from scripting.c
-static inline bool isntrboot(void) {
-    // taken over from Luma 3DS:
-    // https://github.com/AuroraWright/Luma3DS/blob/bb5518b0f68d89bcd8efaf326355a770d5e57856/source/main.c#L58-L62
-    const vu8 *bootMediaStatus = (const vu8 *) 0x1FFFE00C;
-    const vu32 *bootPartitionsStatus = (const vu32 *) 0x1FFFE010;
-
-    // shell closed, no error booting NTRCARD, NAND partitions not even considered
-    return (bootMediaStatus[3] == 2) && !bootMediaStatus[1] && !bootPartitionsStatus[0] && !bootPartitionsStatus[1];
-}
-
-bool ExecuteLuaScript(const char* path_script) {
-    lua_State* L = luaL_newstate();
-    loadlibs(L);
-
-    ResetPackageSearchersAndPath(L);
-    ClearOutputBuffer();
-
-    // current path
-    char curr_dir[_VAR_CNT_LEN];
-    if (path_script) {
-        strncpy(curr_dir, path_script, _VAR_CNT_LEN);
-        curr_dir[_VAR_CNT_LEN-1] = '\0';
-        char* slash = strrchr(curr_dir, '/');
-        if (slash) *slash = '\0';
-
-        lua_pushstring(L, curr_dir);
-    } else {
-        lua_pushnil(L);
-    }
-    lua_setglobal(L, "CURRDIR");
-
-    lua_pushliteral(L, VERSION);
-    lua_setglobal(L, "GM9VER");
-
-    lua_pushstring(L, path_script);
-    lua_setglobal(L, "SCRIPT");
-
-    lua_pushliteral(L, OUTPUT_PATH);
-    lua_setglobal(L, "GM9OUT");
-
-    lua_pushstring(L, IS_UNLOCKED ? (isntrboot() ? "ntrboot" : "sighax") : "");
-    lua_setglobal(L, "HAX");
-
-    lua_pushinteger(L, GetNandSizeSectors(NAND_SYSNAND) * 0x200);
-    lua_setglobal(L, "NANDSIZE");
-
-    lua_pushboolean(L, IS_DEVKIT);
-    lua_setglobal(L, "IS_DEVKIT");
-
-    lua_pushstring(L, IS_O3DS ? "O3DS" : "N3DS");
-    lua_setglobal(L, "CONSOLE_TYPE");
-
-    bool result = RunFile(L, "V:/preload.lua");
-    if (!result) {
-        ShowPrompt(false, "A fatal error happened in GodMode9's preload script.\n \nThis is not an error with your code, but with\nGodMode9. Please report it on GitHub.");
-        lua_close(L);
-        return false;
-    }
-
-    RunFile(L, path_script);
-
-    lua_close(L);
-    return true;
-}
-#else
-// No-Lua version
-bool ExecuteLuaScript(const char* path_script) {
-    (void)path_script; // unused
-    ShowPrompt(false, "%s", STR_LUA_NOT_INCLUDED);
-    return false;
-}
-#endif

arm9/source/lua/gm9lua.h

@@ -1,47 +0,0 @@
-#pragma once
-#include "common.h"
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-#include "scripting.h"
-
-// this should probably go in filesys/fsutil.h
-#define RECURSIVE       (1UL<<11)
-#define TO_EMUNAND      (1UL<<12)
-#define LEGIT           (1UL<<13)
-#define FIND_FIRST      (1UL<<14)
-#define INCLUDE_DIRS    (1UL<<15)
-#define EXPLORER        (1UL<<16)
-#define ENCRYPTED       (1UL<<17)
-
-#define FLAGS_STR       "no_cancel", "silent", "calc_sha", "sha1", "skip", "overwrite", "append", "all", "recursive", "to_emunand", "legit", "first", "include_dirs", "explorer", "encrypted"
-#define FLAGS_CONSTS    NO_CANCEL, SILENT, CALC_SHA, USE_SHA1, SKIP_ALL, OVERWRITE_ALL, APPEND_ALL, ASK_ALL, RECURSIVE, TO_EMUNAND, LEGIT, FIND_FIRST, INCLUDE_DIRS, EXPLORER, ENCRYPTED
-#define FLAGS_COUNT     15
-
-#define LUASCRIPT_EXT      "lua"
-#define LUASCRIPT_MAX_SIZE STD_BUFFER_SIZE
-
-// taken from arm9/source/utils/scripting.c
-#define _VAR_CNT_LEN    256
-
-#ifndef NO_LUA
-static inline void CheckLuaArgCount(lua_State* L, int argcount, const char* cmd) {
-    int args = lua_gettop(L);
-    if (args != argcount) {
-        luaL_error(L, "bad number of arguments passed to '%s' (expected %d, got %d)", cmd, argcount, args);
-    }
-}
-// this is used in cases where a function accepts a flags table or something else
-static inline bool CheckLuaArgCountPlusExtra(lua_State* L, int argcount, const char* cmd) {
-    int args = lua_gettop(L);
-    if (args != argcount && args != argcount + 1) {
-        luaL_error(L, "bad number of arguments passed to '%s' (expected %d or %d, got %d)", cmd, argcount, argcount + 1, args);
-    }
-    return args == argcount + 1;
-}
-
-int LoadLuaFile(lua_State* L, const char* filename);
-u32 GetFlagsFromTable(lua_State* L, int pos, u32 flags_ext_starter, u32 allowed_flags);
-void CheckWritePermissionsLuaError(lua_State* L, const char* path);
-#endif
-bool ExecuteLuaScript(const char* path_script);

arm9/source/lua/gm9os.c

@@ -1,686 +0,0 @@
-#ifndef NO_LUA
-#include "gm9os.h"
-#include "timer.h"
-#include "rtc.h"
-#include "ui.h"
-
-u64 osclock;
-
-static inline bool isLeapYear(u32 year) {
-    return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); 
-}
-
-size_t getWeekday(bool abbreviated, char* out, u8 weekday) {
-    if (abbreviated) {
-        switch(weekday) {
-            case 1:
-                strcat(out, "Mon");
-                break;
-            case 2:
-                strcat(out, "Tue");
-                break;
-            case 3:
-                strcat(out, "Wed");
-                break;
-            case 4:
-                strcat(out, "Thu");
-                break;
-            case 5:
-                strcpy(out, "Fri");
-                break;
-            case 6:
-                strcat(out, "Sat");
-                break;
-            case 0:
-            case 7:
-                strcat(out, "Sun");
-                break;
-            default: 
-                strcat(out, "");
-                return 0;
-        }
-        return 3;
-    }
-    switch(weekday) {
-        case 1:
-            strcat(out, "Monday");
-            return 6;
-        case 2:
-            strcat(out, "Tuesday");
-            return 7;
-        case 3:
-            strcat(out, "Wednesday");
-            return 9;
-        case 4:
-            strcat(out, "Thursday");
-            return 8;
-        case 5:
-            strcpy(out, "Friday");
-            return 6;
-        case 6:
-            strcat(out, "Saturday");
-            return 8;
-        case 7:
-        case 0:
-            strcat(out, "Sunday");
-            return 6;
-        default: 
-            strcat(out, "");
-            return 0;
-    }
-    return 0;
-    
-}
-
-size_t getMonthName(bool abbreviated, char* out, u8 month) {
-    if (abbreviated) {
-        switch(month) {
-            case 1:
-                strcat(out, "Jan");
-                break;
-            case 2:
-                strcat(out, "Feb");
-                break;
-            case 3:
-                strcat(out, "Mar");
-                break;
-            case 4:
-                strcat(out, "Apr");
-                break;
-            case 5:
-                strcat(out, "May");
-                break;
-            case 6:
-                strcat(out, "Jun");
-                break;
-            case 7:
-                strcat(out, "Jul");
-                break;
-            case 8:
-                strcat(out, "Aug");
-                break;
-            case 9:
-                strcat(out, "Sep");
-                break;
-            case 10:
-                strcat(out, "Oct");
-                break;
-            case 11:
-                strcat(out, "Nov");
-                break;
-            case 12:
-                strcat(out, "Dec");
-                break; 
-            default:
-                strcat(out, "");
-                return 0;
-        }
-        return 3;
-    }
-    switch(month) {
-        case 1:
-            strcat(out, "January");
-            return 7;
-        case 2:
-            strcat(out, "February");
-            return 8;
-        case 3:
-            strcat(out, "March");
-            return 5;
-        case 4:
-            strcat(out, "April");
-            return 5;
-        case 5:
-            strcat(out, "May");
-            return 3;
-        case 6:
-            strcat(out, "Juny");
-            return 4;
-        case 7:
-            strcat(out, "July");
-            return 4;
-        case 8:
-            strcat(out, "August");
-            return 6;
-        case 9:
-            strcat(out, "September");
-            return 9;
-        case 10:
-            strcat(out, "October");
-            return 7;
-        case 11:
-            strcat(out, "November");
-            return 8;
-        case 12:
-            strcat(out, "December");
-            return 8; 
-        default:
-            strcat(out, "");
-            return 0;
-    }
-    return 0;
-}
-
-u16 getDaysMonths(u32 months, u8 years) {
-    u8 daysInMonth[12] = {31, isLeapYear(2000 + years) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; //is this ?: bad practice?
-    u16 ret;
-    for (u32 month = 0; month < months - 1; month++) {
-        ret += daysInMonth[month];
-    }
-    return ret;
-}
-
-u64 calcUnixTime(u8 years, u8 months, u8 days, u8 hours, u8 minutes, u8 seconds) {
-    u8 daysInMonth[12] = {31, isLeapYear(2000 + years) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; //is this ?: bad practice?
-    u32 curdays;
-    u64 ret = 0;
-
-    ret += seconds;
-    ret += minutes * 60;
-    ret += hours * 60 * 60;
-    ret += (days - 1) * 24 * 60 * 60;
-
-    for (u16 year = 0; year < years + 30; year++) { //+30 because unix time starting in 1970 but rtc starts in 2000
-        if (isLeapYear(2000 + year)) {
-            curdays = 366;
-        } else {
-            curdays = 365;
-        }
-        ret += curdays * 24 * 60 * 60;
-    }
-
-    for (u16 month = 0; month < months - 1; month++) {
-        ret += daysInMonth[month] * 24 * 60 * 60;
-    }
-
-    return ret;
-}
-
-u64 getUnixTimeFromRtc(DsTime *dstime) {
-
-    u8
-    seconds = DSTIMEGET(dstime, bcd_s),
-    minutes = DSTIMEGET(dstime, bcd_m),
-    hours = DSTIMEGET(dstime, bcd_h),
-    days = DSTIMEGET(dstime, bcd_D),
-    months = DSTIMEGET(dstime, bcd_M),
-    years = DSTIMEGET(dstime, bcd_Y);
-    return calcUnixTime(years, months, days, hours, minutes, seconds);
-    
-}
-
-u64 timer_usec( u64 start_time ) {
-    return timer_ticks( start_time ) / (TICKS_PER_SEC/1000000);
-}
-
-void weekdayfix(DsTime *dstime) {
-    int days = getUnixTimeFromRtc(dstime) / 86400; //days since thursday 1 1 1970
-    u8 weekday = (days + 5) % 7;
-    dstime->weekday = NUM2BCD(weekday);
-}
-
-void unixtodstime(u64 unixtime, DsTime *dstime) {
-    u32 seconds, minutes, hours, days, year, month;
-    seconds = unixtime;
-    minutes = seconds / 60;
-    seconds %= 60;
-    hours = minutes / 60;
-    minutes %= 60;
-    days = hours / 24;
-    hours %= 24;
-    year = 1970;
-
-    while(true)
-    {
-        bool leapYear = (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
-        u16 daysInYear = leapYear ? 366 : 365;
-        if(days >= daysInYear)
-        {
-            days -= daysInYear;
-            ++year;
-        }
-        else
-        {
-            static const u8 daysInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-            for(month = 0; month < 12; ++month)
-            {
-                u8 dim = daysInMonth[month];
-
-                if (month == 1 && leapYear)
-                    ++dim;
-
-                if (days >= dim)
-                    days -= dim;
-                else
-                    break;
-            }
-            break;
-        }
-    }
-    days++;
-    month++;
-    u8 bcd_year = year-2000;
-    dstime->bcd_Y = NUM2BCD(bcd_year);
-    dstime->bcd_M = NUM2BCD(month);
-    dstime->bcd_D = NUM2BCD(days);
-    dstime->bcd_h = NUM2BCD(hours);
-    dstime->bcd_m = NUM2BCD(minutes);
-    dstime->bcd_s = NUM2BCD(seconds);
-    dstime->weekday = 0;
-}
-
-bool my_strftime(char* _out, size_t _maxsize, const char* str, DsTime *dstime) { //my refers to github.com/Gruetzig
-    weekdayfix(dstime);
-    size_t strl = strlen(str);
-    size_t outpos = 0;
-    char out[_maxsize+10];
-    memset(out, 0, _maxsize+10);
-    u8 minute, hour, day, month, year, weekday, second, weeknumber;
-    u16 currentday, nextsunday, fyear;
-    char numbuf[3], numbuf2[5], numbuf3[9], numnum1[3], numnum2[3], numnum3[3];
-    if (!is_valid_dstime(dstime)) {
-        return false;
-    }
-    for (size_t i = 0;i<strl;i++) {
-        if (str[i] == '%') {
-            i++;
-            switch(str[i]) {
-                case 'a':
-                    outpos += getWeekday(true, out, DSTIMEGET(dstime, weekday));
-                    break;
-                case 'A':
-                    outpos += getWeekday(false, out, DSTIMEGET(dstime, weekday));
-                    break;
-                case 'b':
-                    outpos += getMonthName(true, out, DSTIMEGET(dstime, bcd_M));
-                    break;
-                case 'B':
-                    outpos += getMonthName(false, out, DSTIMEGET(dstime, bcd_M));
-                    break;
-                case 'c':
-                    char buf[100];
-                    my_strftime(buf, _maxsize-outpos-10, "%a %b %d %X %Y", dstime);
-                    strcat(out, buf);
-                    outpos += strlen(buf);
-                    break;
-                case 'd':
-                    day = DSTIMEGET(dstime, bcd_D);
-                    if (day < 10) {
-                        sprintf(numbuf, "0%d", day);
-                    } else {
-                        sprintf(numbuf, "%d", day);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'H':
-                    hour = DSTIMEGET(dstime, bcd_h);
-                    if (day < 10) {
-                        sprintf(numbuf, "0%d", hour);
-                    } else {
-                        sprintf(numbuf, "%d", hour);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'I':
-                    hour = DSTIMEGET(dstime, bcd_h);
-                    if (hour > 12) {
-                        hour = hour - 12;
-                    }
-                    if (!hour) {
-                        hour = 12;
-                    }
-                    if (hour < 10) {
-                        sprintf(numbuf, "0%d", hour);
-                    } else {
-                        sprintf(numbuf, "%d", hour);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'j':
-                    currentday = getDaysMonths(DSTIMEGET(dstime, bcd_M), DSTIMEGET(dstime, bcd_Y))+DSTIMEGET(dstime, bcd_D);
-                    if (currentday < 10) {
-                        sprintf(numbuf, "00%d", currentday);
-                    } else if (currentday < 100) {
-                        sprintf(numbuf, "0%d", currentday);
-                    } else {
-                        sprintf(numbuf, "%d", currentday);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 3;
-                    break;
-                case 'm':
-                    month = DSTIMEGET(dstime, bcd_M);
-                    if (month < 10) {
-                        sprintf(numbuf, "0%d", month);
-                    } else {
-                        sprintf(numbuf, "%d", month);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'M':
-                    minute = DSTIMEGET(dstime, bcd_m);
-                    if (minute < 10) {
-                        sprintf(numbuf, "0%d", minute);
-                    } else {
-                        sprintf(numbuf, "%d", minute);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'p':
-                    hour = DSTIMEGET(dstime, bcd_h);
-                    if (hour >= 12) {
-                        strcat(out, "PM");
-                    } else {
-                        strcat(out, "AM");
-                    }
-                    outpos += 2;
-                    break;
-                case 'S':
-                    second = DSTIMEGET(dstime, bcd_m);
-                    if (second < 10) {
-                        sprintf(numbuf, "0%d", second);
-                    } else {
-                        sprintf(numbuf, "%d", second);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'U': 
-                    currentday = getDaysMonths(DSTIMEGET(dstime, bcd_M), DSTIMEGET(dstime, bcd_Y))+DSTIMEGET(dstime, bcd_D);
-                    weekday = DSTIMEGET(dstime, weekday);
-                    nextsunday = ((7-weekday)+currentday);
-                    weeknumber = (nextsunday/7)+1;
-                    if (weeknumber < 10) {
-                        sprintf(numbuf, "0%d", weeknumber);
-                    } else {
-                        sprintf(numbuf, "%d", weeknumber);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'w':
-                    weekday = DSTIMEGET(dstime, weekday);
-                    if (weekday == 7) {
-                        weekday = 0;
-                    }
-                    sprintf(out, "%d", weekday);
-                    strcat(out, numbuf);
-                    outpos++;
-                    break;
-                case 'W':
-                    currentday = getDaysMonths(DSTIMEGET(dstime, bcd_M), DSTIMEGET(dstime, bcd_Y))+DSTIMEGET(dstime, bcd_D);
-                    weekday = DSTIMEGET(dstime, weekday);
-                    nextsunday = ((8-weekday)+currentday);
-                    weeknumber = (nextsunday/7);
-                    if (weeknumber < 10) {
-                        sprintf(numbuf, "0%d", weeknumber);
-                    } else {
-                        sprintf(numbuf, "%d", weeknumber);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'x': 
-                    month = DSTIMEGET(dstime, bcd_M);
-                    day = DSTIMEGET(dstime, bcd_D);
-                    year = DSTIMEGET(dstime, bcd_Y);
-
-                    if (month < 10) {
-                        sprintf(numnum1, "0%d", month);
-                    } else {
-                        sprintf(numnum1, "%d", month);
-                    }
-
-                    if (day < 10) {
-                        sprintf(numnum2, "0%d", day);
-                    } else {
-                        sprintf(numnum2, "%d", day);
-                    }
-
-                    if (year < 10) {
-                        sprintf(numnum3, "0%d", year);
-                    } else {
-                        sprintf(numnum3, "%d", year);
-                    }
-                    sprintf(numbuf3, "%s/%s/%s", numnum1, numnum2, numnum3);
-                    strcat(out, numbuf3);
-                    outpos += 8;
-                    break;
-                case 'X':
-                    hour = DSTIMEGET(dstime, bcd_h);
-                    minute = DSTIMEGET(dstime, bcd_m);
-                    second = DSTIMEGET(dstime, bcd_s);
-
-                    if (hour < 10) {
-                        sprintf(numnum1, "0%d", hour);
-                    } else {
-                        sprintf(numnum1, "%d", hour);
-                    }
-
-                    if (minute < 10) {
-                        sprintf(numnum2, "0%d", minute);
-                    } else {
-                        sprintf(numnum2, "%d", minute);
-                    }
-
-                    if (second < 10) {
-                        sprintf(numnum3, "0%d", second);
-                    } else {
-                        sprintf(numnum3, "%d", second);
-                    }
-                    sprintf(numbuf3, "%s:%s:%s", numnum1, numnum2, numnum3);
-                    strcat(out, numbuf3);
-                    outpos += 8;
-                    break;
-                case 'y':
-                    year = DSTIMEGET(dstime, bcd_Y);
-                    if (year < 10) {
-                        sprintf(numbuf, "0%d", year);
-                    } else {
-                        sprintf(numbuf, "%d", year);
-                    }
-                    strcat(out, numbuf);
-                    outpos += 2;
-                    break;
-                case 'Y':
-                    fyear = DSTIMEGET(dstime, bcd_Y);
-                    fyear += 2000;
-                    sprintf(numbuf2, "%d", fyear);
-                    strcat(out, numbuf2);
-                    outpos += 4;
-                    break;
-                case '%':
-                    strcat(out, "%");
-                    outpos++;
-                    break;
-                default:
-                    break; //not implemented
-
-
-            }
-
-        } else {
-            out[outpos] = str[i];
-            outpos++;
-        }
-        if (outpos > _maxsize) {
-            break;
-        }
-
-    }
-    strncpy(_out, out, _maxsize);
-    return true;
-}
-
-static int os_time(lua_State *L) {
-    int args = lua_gettop(L);
-    u64 unixtime;
-    switch(args) {
-        case 0:
-            DsTime dstime;
-            get_dstime(&dstime);
-            unixtime = getUnixTimeFromRtc(&dstime);
-            lua_pushinteger(L, unixtime);
-            return 1;
-        case 1:
-            lua_geti(L, 1, 1);
-            int year = lua_tointeger(L, -1);
-            lua_pop(L, 1);
-            if (year >= 2000) year -= 2000;
-
-            lua_geti(L, 1, 2);
-            int month = lua_tointeger(L, -1);
-            lua_pop(L, 1);
-
-            lua_geti(L, 1, 3);
-            int day = lua_tointeger(L, -1);
-            lua_pop(L, 1);
-
-            lua_geti(L, 1, 4);
-            int hour = lua_tointeger(L, -1);
-            lua_pop(L, 1);
-
-            lua_geti(L, 1, 5);
-            int minute = lua_tointeger(L, -1);
-            lua_pop(L, 1);
-            
-            lua_geti(L, 1, 6);
-            int second = lua_tointeger(L, -1);
-            lua_pop(L, 1);
-            
-            lua_pushinteger(L, calcUnixTime(year, month, day, hour, minute, second));
-
-            return 1;
-        default:
-            return luaL_error(L, "not a valid amount of arguments");
-
-    }
-}
-
-static int os_date(lua_State *L) {
-    DsTime dstime;
-    
-    get_dstime(&dstime);
-    char retbuf[100];
-    memset(retbuf, 0, 100);
-    int args = lua_gettop(L);
-    switch(args) {
-        case 0:
-            my_strftime(retbuf, 100, "%c", &dstime);
-            lua_pushstring(L, retbuf);
-            return 1;
-        case 1:
-            const char* str = lua_tostring(L, 1);
-            if ((strcmp(str, "*t") == 0 || strcmp(str, "!*t") == 0)) {
-                weekdayfix(&dstime);
-                //return table with date values
-                lua_newtable(L);
-                //year
-                lua_pushinteger(L, 2000+DSTIMEGET(&dstime, bcd_Y));
-                lua_setfield(L, -2, "year");
-                //month
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_M));
-                lua_setfield(L, -2, "month");
-                //wday (weekday)
-                lua_pushinteger(L, DSTIMEGET(&dstime, weekday));
-                lua_setfield(L, -2, "wday");
-                //yday (yearday)
-                lua_pushinteger(L, getDaysMonths(DSTIMEGET(&dstime, bcd_M), DSTIMEGET(&dstime, bcd_Y))+DSTIMEGET(&dstime, bcd_D));
-                lua_setfield(L, -2, "yday");
-                //day
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_D));
-                lua_setfield(L, -2, "day");
-                //hour
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_h));
-                lua_setfield(L, -2, "hour");
-                //minute
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_m));
-                lua_setfield(L, -2, "min");
-                //second
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_s));
-                lua_setfield(L, -2, "sec");
-                return 1;
-            } else {
-                my_strftime(retbuf, 100, lua_tostring(L, 1), &dstime);
-                lua_pushstring(L, retbuf);
-                return 1;
-            }
-        case 2:
-            if (lua_tointeger(L, 2) < 946684800) { //unix timestamp is 01.01.2000 00:00:00, so everything before is previous century and not supported
-                return luaL_error(L, "unix timestamp from before 2000 is not supported");
-            }
-            const char* str2 = lua_tostring(L, 1);
-            if ((strcmp(str2, "*t") == 0 || strcmp(str2, "!*t") == 0)) {
-                unixtodstime( lua_tointeger(L, 2) , &dstime);
-                weekdayfix(&dstime);
-                //return table with date values
-                lua_newtable(L);
-                //year
-                lua_pushinteger(L, 2000+DSTIMEGET(&dstime, bcd_Y));
-                lua_setfield(L, -2, "year");
-                //month
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_M));
-                lua_setfield(L, -2, "month");
-                //wday (weekday)
-                lua_pushinteger(L, DSTIMEGET(&dstime, weekday));
-                lua_setfield(L, -2, "wday");
-                //yday (yearday)
-                lua_pushinteger(L, getDaysMonths(DSTIMEGET(&dstime, bcd_M), DSTIMEGET(&dstime, bcd_Y))+DSTIMEGET(&dstime, bcd_D));
-                lua_setfield(L, -2, "yday");
-                //day
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_D));
-                lua_setfield(L, -2, "day");
-                //hour
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_h));
-                lua_setfield(L, -2, "hour");
-                //minute
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_m));
-                lua_setfield(L, -2, "min");
-                //second
-                lua_pushinteger(L, DSTIMEGET(&dstime, bcd_s));
-                lua_setfield(L, -2, "sec");
-                return 1;
-            } else {
-                unixtodstime( lua_tointeger(L, 2) , &dstime);
-                my_strftime(retbuf, 100, str2, &dstime);
-                lua_pushstring(L, retbuf);
-                return 1;
-            }
-            
-        default:
-            return luaL_error(L, "not a valid amount of arguments");
-    }
-}
-
-static int os_clock(lua_State *L) {
-    lua_pushnumber(L, timer_usec(osclock)/10000000.0);
-    return 1;
-}
-
-static int os_difftime(lua_State *L) {
-    u64 t2 = lua_tointeger(L, 1);
-    u64 t1 = lua_tointeger(L, 2);
-    lua_pushinteger(L, t2-t1);
-    return 1;
-}
-
-// os.remove and os.rename are done in data/luapackages/fs.lua
-static const luaL_Reg os[] = {
-    {"clock", os_clock},
-    {"time", os_time},
-    {"date", os_date},
-    {"difftime", os_difftime},
-    {NULL, NULL}
-};
-
-int gm9lua_open_os(lua_State* L) {
-    luaL_newlib(L, os);
-    osclock = timer_start();
-    return 1;
-}
-#endif

arm9/source/lua/gm9os.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "gm9lua.h"
-
-#define GM9LUA_OSLIBNAME "os"
-
-int gm9lua_open_os(lua_State* L);

arm9/source/lua/gm9title.c

@@ -1,183 +0,0 @@
-#ifndef NO_LUA
-#include "gm9lua.h"
-#include "utils.h"
-#include "fs.h"
-#include "language.h"
-#include "ui.h"
-#include "game.h"
-#include "ips.h"
-#include "bps.h"
-
-static int title_decrypt(lua_State* L) {
-    CheckLuaArgCount(L, 1, "title.decrypt");
-    const char* path = luaL_checkstring(L, 1);
-    const char* whichfailed = "";
-
-    u64 filetype = IdentifyFileType(path);
-    bool ret;
-    if (filetype & BIN_KEYDB) {
-        ret = (CryptAesKeyDb(path, true, false) == 0);
-        whichfailed = "CryptAesKeyDb";
-    } else {
-        ret = (CryptGameFile(path, true, false) == 0);
-        whichfailed = "CryptGameFile";
-    }
-
-    if (!ret) {
-        return luaL_error(L, "%s failed on %s", whichfailed, path);
-    }
-
-    return 0;
-}
-
-static int title_encrypt(lua_State* L) {
-    CheckLuaArgCount(L, 1, "title.encrypt");
-    const char* path = luaL_checkstring(L, 1);
-    const char* whichfailed = "";
-
-    u64 filetype = IdentifyFileType(path);
-    bool ret;
-    if (filetype & BIN_KEYDB) {
-        ret = (CryptAesKeyDb(path, true, true) == 0);
-        whichfailed = "CryptAesKeyDb";
-    } else {
-        ret = (CryptGameFile(path, true, true) == 0);
-        whichfailed = "CryptGameFile";
-    }
-
-    if (!ret) {
-        return luaL_error(L, "%s failed on %s", whichfailed, path);
-    }
-
-    return 0;
-}
-
-static int title_install(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "title.install");
-    const char* path = luaL_checkstring(L, 1);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, flags, TO_EMUNAND);
-    };
-
-    bool ret = (InstallGameFile(path, (flags & TO_EMUNAND)) == 0);
-    if (!ret) {
-        return luaL_error(L, "InstallGameFile failed on %s", path);
-    }
-
-    return 0;
-}
-
-static int title_build_cia(lua_State* L) {
-    bool extra = CheckLuaArgCountPlusExtra(L, 1, "title.build_cia");
-    const char* path = luaL_checkstring(L, 1);
-
-    u32 flags = 0;
-    if (extra) {
-        flags = GetFlagsFromTable(L, 2, flags, LEGIT);
-    };
-
-    bool ret = (BuildCiaFromGameFile(path, (flags & LEGIT)) == 0);
-    if (!ret) {
-        return luaL_error(L, "BuildCiaFromGameFile failed on %s", path);
-    }
-
-    return 0;
-}
-
-static int title_extract_code(lua_State* L) {
-    CheckLuaArgCount(L, 2, "title.extract_code");
-    const char* path_src = luaL_checkstring(L, 1);
-    const char* path_dst = luaL_checkstring(L, 2);
-
-    u64 filetype = IdentifyFileType(path_src);
-    if (!FTYPE_HASCODE(filetype)) {
-        return luaL_error(L, "%s does not have code", path_src);
-    } else {
-        CheckWritePermissionsLuaError(L, path_dst);
-        ShowString("%s", STR_EXTRACTING_DOT_CODE);
-        bool ret = (ExtractCodeFromCxiFile(path_src, path_dst, NULL) == 0);
-        if (!ret) {
-            return luaL_error(L, "failed to extract code from %s", path_src);
-        }
-    }
-
-    return 0;
-}
-
-static int title_compress_code(lua_State* L) {
-    CheckLuaArgCount(L, 2, "title.compress_code");
-    const char* path_src = luaL_checkstring(L, 1);
-    const char* path_dst = luaL_checkstring(L, 2);
-
-    CheckWritePermissionsLuaError(L, path_dst);
-    ShowString("%s", STR_COMPRESSING_DOT_CODE);
-    bool ret = (CompressCode(path_src, path_dst) == 0);
-    if (!ret) {
-        return luaL_error(L, "failed to compress code from %s", path_src);
-    }
-
-    return 0;
-}
-
-static int title_apply_ips(lua_State* L) {
-    CheckLuaArgCount(L, 3, "title.apply_ips");
-    const char* path_patch = luaL_checkstring(L, 1);
-    const char* path_src = luaL_checkstring(L, 2);
-    const char* path_target = luaL_checkstring(L, 3);
-
-    bool ret = (ApplyIPSPatch(path_patch, path_src, path_target) == 0);
-    if (!ret) {
-        return luaL_error(L, "ApplyIPSPatch failed");
-    }
-
-    return 0;
-}
-
-static int title_apply_bps(lua_State* L) {
-    CheckLuaArgCount(L, 3, "title.apply_bps");
-    const char* path_patch = luaL_checkstring(L, 1);
-    const char* path_src = luaL_checkstring(L, 2);
-    const char* path_target = luaL_checkstring(L, 3);
-
-    bool ret = (ApplyBPSPatch(path_patch, path_src, path_target) == 0);
-    if (!ret) {
-        return luaL_error(L, "ApplyBPSPatch failed");
-    }
-
-    return 0;
-}
-
-static int title_apply_bpm(lua_State* L) {
-    CheckLuaArgCount(L, 3, "title.apply_bpm");
-    const char* path_patch = luaL_checkstring(L, 1);
-    const char* path_src = luaL_checkstring(L, 2);
-    const char* path_target = luaL_checkstring(L, 3);
-
-    bool ret = (ApplyBPMPatch(path_patch, path_src, path_target) == 0);
-    if (!ret) {
-        return luaL_error(L, "ApplyBPMPatch failed");
-    }
-
-    return 0;
-}
-
-static const luaL_Reg title_lib[] = {
-    {"decrypt", title_decrypt},
-    {"encrypt", title_encrypt},
-    {"install", title_install},
-    {"build_cia", title_build_cia},
-    {"extract_code", title_extract_code},
-    {"compress_code", title_compress_code},
-    {"apply_ips", title_apply_ips},
-    {"apply_bps", title_apply_bps},
-    {"apply_bpm", title_apply_bpm},
-    {NULL, NULL}
-};
-
-int gm9lua_open_title(lua_State* L) {
-    luaL_newlib(L, title_lib);
-    return 1;
-}
-#endif

arm9/source/lua/gm9title.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "gm9lua.h"
-
-#define GM9LUA_TITLELIBNAME "title"
-
-int gm9lua_open_title(lua_State* L);

arm9/source/lua/gm9ui.c

@@ -1,360 +0,0 @@
-#ifndef NO_LUA
-#include "gm9ui.h"
-#include "ui.h"
-#include "fs.h"
-#include "png.h"
-#include "swkbd.h"
-#include "qrcodegen.h"
-#include "utils.h"
-#include "hid.h"
-
-#define MAXOPTIONS     256
-#define MAXOPTIONS_STR "256"
-
-#define OUTPUTMAXLINES 24
-#define OUTPUTMAXCHARSPERLINE 80 // make sure this includes space for '\0'
-
-// this output buffer stuff is especially a test, it needs to take into account newlines and fonts that are not 8x10
-
-char output_buffer[OUTPUTMAXLINES][OUTPUTMAXCHARSPERLINE]; // hold 24 lines
-
-void ShiftOutputBufferUp(void) {
-    for (int i = 0; i < OUTPUTMAXLINES - 1; i++) {
-        memcpy(output_buffer[i], output_buffer[i + 1], OUTPUTMAXCHARSPERLINE);
-    }
-}
-
-void ClearOutputBuffer(void) {
-    memset(output_buffer, 0, sizeof(output_buffer));
-}
-
-void WriteToOutputBuffer(char* text) {
-    strlcpy(output_buffer[OUTPUTMAXLINES - 1], text, OUTPUTMAXCHARSPERLINE);
-}
-
-void RenderOutputBuffer(void) {
-    ClearScreenF(false, true, COLOR_STD_BG);
-    for (int i = 0; i < OUTPUTMAXLINES; i++) {
-        DrawString(ALT_SCREEN, output_buffer[i], 0, i * 10, COLOR_STD_FONT, COLOR_TRANSPARENT);
-    }
-}
-
-static int ui_echo(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.echo");
-    const char* text = lua_tostring(L, 1);
-
-    ShowPrompt(false, "%s", text);
-    return 0;
-}
-
-static int ui_ask(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.ask");
-    const char* text = lua_tostring(L, 1);
-
-    bool ret = ShowPrompt(true, "%s", text);
-    lua_pushboolean(L, ret);
-    return 1;
-}
-
-static int ui_ask_hex(lua_State* L) {
-    CheckLuaArgCount(L, 3, "ui.ask_hex");
-    const char* text = lua_tostring(L, 1);
-    u64 initial_hex = lua_tonumber(L, 2);
-    u32 n_digits = lua_tonumber(L, 3);
-
-    u64 ret = ShowHexPrompt(initial_hex, n_digits, "%s", text);
-    if (ret == (u64) -1) {
-        lua_pushnil(L);
-    } else {
-        lua_pushnumber(L, ret);
-    }
-    return 1;
-}
-
-static int ui_ask_number(lua_State* L) {
-    CheckLuaArgCount(L, 2, "ui.ask_number");
-    const char* text = lua_tostring(L, 1);
-    u64 initial_num = lua_tonumber(L, 2);
-
-    u64 ret = ShowNumberPrompt(initial_num, "%s", text);
-    if (ret == (u64) -1) {
-        lua_pushnil(L);
-    } else {
-        lua_pushnumber(L, ret);
-    }
-    return 1;
-
-}
-
-static int ui_ask_text(lua_State* L) {
-    CheckLuaArgCount(L, 3, "ui.ask_text");
-    const char* prompt = lua_tostring(L, 1);
-    const char* _initial_text = lua_tostring(L, 2);
-    u32 initial_text_size = strlen(_initial_text)+1;
-    char initial_text[initial_text_size];
-    snprintf(initial_text, initial_text_size, "%s", _initial_text);
-    u32 max_size = lua_tonumber(L, 3);
-    bool result = ShowKeyboardOrPrompt(initial_text, max_size, "%s", prompt);
-    if (result)
-        lua_pushstring(L, initial_text);
-    else
-        lua_pushnil(L);
-    return 1;
-}
-
-static int ui_clear(lua_State* L) {
-    CheckLuaArgCount(L, 0, "ui.clear");
-
-    ClearScreen(ALT_SCREEN, COLOR_STD_BG);
-
-    return 0;
-}
-
-static int ui_show_png(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.show_png");
-    const char* path = luaL_checkstring(L, 1);
-    u16 *screen = ALT_SCREEN;
-    u16 *bitmap = NULL;
-    u8* png = (u8*) malloc(SCREEN_SIZE(screen));
-    u32 bitmap_width, bitmap_height;
-    if (png) {
-        u32 png_size = FileGetData(path, png, SCREEN_SIZE(screen), 0);
-        if (!png_size) {
-            free(png);
-            return luaL_error(L, "Could not read %s", path);
-        }
-        if (png_size && png_size < SCREEN_SIZE(screen)) {
-            bitmap = PNG_Decompress(png, png_size, &bitmap_width, &bitmap_height);
-            if (!bitmap) {
-                free(png);
-                return luaL_error(L, "Invalid PNG file");
-            }
-        }
-        free(png);
-        if (!bitmap) {
-            return luaL_error(L, "PNG too large");
-        } else if ((SCREEN_WIDTH(screen) < bitmap_width) || (SCREEN_HEIGHT < bitmap_height)) {
-            free(bitmap);
-            return luaL_error(L, "PNG too large");
-        } else {
-            ClearScreen(ALT_SCREEN, COLOR_STD_BG);
-            DrawBitmap(
-                screen,        // screen
-                -1,       // x coordinate from argument
-                -1,       // y coordinate from argument
-                bitmap_width,  // width
-                bitmap_height, // height
-                bitmap         // bitmap
-                );
-            free(bitmap);
-        }
-    }
-    return 0;
-}
-
-static int ui_show_text(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.show_text");
-
-    const char* text = lua_tostring(L, 1);
-
-    ClearScreen(ALT_SCREEN, COLOR_STD_BG);
-    DrawStringCenter(ALT_SCREEN, COLOR_STD_FONT, COLOR_STD_BG, "%s", text);
-    return 0;
-}
-
-static int ui_show_game_info(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.show_game_info");
-    const char* path = luaL_checkstring(L, 1);
-
-    bool ret = (ShowGameFileIcon(path, ALT_SCREEN) == 0);
-    if (!ret) {
-        return luaL_error(L, "ShowGameFileIcon failed on %s", path);
-    }
-
-    return 0;
-}
-
-static int ui_show_qr(lua_State* L) {
-    CheckLuaArgCount(L, 2, "ui.show_qr");
-    size_t data_len;
-    const char* text = luaL_checkstring(L, 1);
-    const char* data = luaL_checklstring(L, 2, &data_len);
-
-    const u32 screen_size = SCREEN_SIZE(ALT_SCREEN);
-    u8* screen_copy = (u8*) malloc(screen_size);
-    u8 qrcode[qrcodegen_BUFFER_LEN_MAX];
-    u8 temp[qrcodegen_BUFFER_LEN_MAX];
-    bool ret = screen_copy && qrcodegen_encodeText(data, temp, qrcode, qrcodegen_Ecc_LOW,
-        qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX, qrcodegen_Mask_AUTO, true);
-    if (ret) {
-        memcpy(screen_copy, ALT_SCREEN, screen_size);
-        DrawQrCode(ALT_SCREEN, qrcode);
-        ShowPrompt(false, "%s", text);
-        memcpy(ALT_SCREEN, screen_copy, screen_size);
-    } else {
-        return luaL_error(L, "could not allocate memory");
-    }
-    free(screen_copy);
-
-    return 0;
-}
-
-static int ui_show_text_viewer(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.show_text_viewer");
-    size_t len = 0;
-    const char* text = luaL_tolstring(L, 1, &len);
-
-    // validate text ourselves so we can return a better error
-    // MemTextViewer calls ShowPrompt if it's bad, and i don't want that
-    
-    if (!(ValidateText(text, len))) {
-        return luaL_error(L, "text validation failed");
-    }
-
-    if (!(MemTextViewer(text, len, 1, false))) {
-        return luaL_error(L, "failed to run MemTextViewer");
-    }
-
-    return 0;
-}
-
-static int ui_show_file_text_viewer(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.show_file_text_viewer");
-    const char* path = luaL_checkstring(L, 1);
-
-    // validate text ourselves so we can return a better error
-    // MemTextViewer calls ShowPrompt if it's bad, and i don't want that
-    // and FileTextViewer calls the above function
-    
-    char* text = malloc(STD_BUFFER_SIZE);
-    if (!text) {
-        return luaL_error(L, "could not allocate memory");
-    };
-
-    // TODO: replace this with something that can detect file read errors and actual 0-length files
-    size_t flen = FileGetData(path, text, STD_BUFFER_SIZE - 1, 0);
-
-    text[flen] = '\0';
-    u32 len = (ptrdiff_t)memchr(text, '\0', flen + 1) - (ptrdiff_t)text;
-    
-    if (!(ValidateText(text, len))) {
-        free(text);
-        return luaL_error(L, "text validation failed");
-    }
-
-    if (!(MemTextViewer(text, len, 1, false))) {
-        free(text);
-        return luaL_error(L, "failed to run MemTextViewer");
-    }
-
-    free(text);
-
-    return 0;
-}
-
-static int ui_ask_selection(lua_State* L) {
-    CheckLuaArgCount(L, 2, "ui.ask_selection");
-    const char* text = lua_tostring(L, 1);
-    char* options[MAXOPTIONS];
-    const char* tmpstr;
-    size_t len;
-    int i;
-    
-    luaL_argcheck(L, lua_istable(L, 2), 2, "table expected");
-
-    lua_Integer opttablesize = luaL_len(L, 2);
-    luaL_argcheck(L, opttablesize <= MAXOPTIONS, 2, "more than " MAXOPTIONS_STR " options given");
-    for (i = 0; i < opttablesize; i++) {
-        lua_geti(L, 2, i + 1);
-        tmpstr = lua_tolstring(L, -1, &len);
-        options[i] = malloc(len + 1);
-        strlcpy(options[i], tmpstr, len + 1);
-        lua_pop(L, 1);
-    }
-    int result = ShowSelectPrompt(opttablesize, (const char**)options, "%s", text);
-    for (i = 0; i < opttablesize; i++) free(options[i]);
-    // lua only treats "false" and "nil" as false values
-    // so to make this easier, return nil and not 0 if no choice was made
-    // https://www.lua.org/manual/5.4/manual.html#3.3.4
-    if (result)
-        lua_pushinteger(L, result);
-    else
-        lua_pushnil(L);
-    return 1;
-}
-
-static int ui_format_bytes(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.format_bytes");
-    lua_Integer size = luaL_checkinteger(L, 1);
-
-    char bytesstr[32] = { 0 };
-    FormatBytes(bytesstr, (u64)size);
-
-    lua_pushstring(L, bytesstr);
-    return 1;
-}
-
-static int ui_global_print(lua_State* L) {
-    //const char* text = lua_tostring(L, 1);
-    char buf[OUTPUTMAXCHARSPERLINE] = {0};
-    int argcount = lua_gettop(L);
-    for (int i = 0; i < lua_gettop(L); i++) {
-        const char* str = luaL_tolstring(L, i+1, NULL);
-        if (str) {
-            strlcat(buf, str, OUTPUTMAXCHARSPERLINE);
-            lua_pop(L, 1);
-        } else {
-            // idk
-            strlcat(buf, "(unknown)", OUTPUTMAXCHARSPERLINE);
-        }
-        if (i < argcount) strlcat(buf, " ", OUTPUTMAXCHARSPERLINE);
-    }
-    ShiftOutputBufferUp();
-    WriteToOutputBuffer((char*)buf);
-    RenderOutputBuffer();
-    return 0;
-}
-
-// TODO: use luaL_checkoption which will auto-raise an error
-// use BUTTON_STRINGS from common/hid_map.h
-static int ui_check_key(lua_State* L) {
-    CheckLuaArgCount(L, 1, "ui.check_key");
-    const char* key = luaL_checkstring(L, 1);
-
-    lua_pushboolean(L, CheckButton(StringToButton((char*)key)));
-
-    return 1;
-}
-
-static const luaL_Reg ui_lib[] = {
-    {"echo", ui_echo},
-    {"ask", ui_ask},
-    {"ask_hex", ui_ask_hex},
-    {"ask_number", ui_ask_number},
-    {"ask_text", ui_ask_text},
-    {"ask_selection", ui_ask_selection},
-    {"clear", ui_clear},
-    {"show_png", ui_show_png},
-    {"show_text", ui_show_text},
-    {"show_game_info", ui_show_game_info},
-    {"show_qr", ui_show_qr},
-    {"show_text_viewer", ui_show_text_viewer},
-    {"show_file_text_viewer", ui_show_file_text_viewer},
-    {"format_bytes", ui_format_bytes},
-    {"check_key", ui_check_key},
-    {NULL, NULL}
-};
-
-static const luaL_Reg ui_global_lib[] = {
-    {"print", ui_global_print},
-    {NULL, NULL}
-};
-
-int gm9lua_open_ui(lua_State* L) {
-    luaL_newlib(L, ui_lib);
-    lua_pushglobaltable(L); // push global table to stack
-    luaL_setfuncs(L, ui_global_lib, 0); // set global funcs
-    lua_pop(L, 1); // pop global table from stack
-    return 1;
-}
-#endif

arm9/source/lua/gm9ui.h

@@ -1,10 +0,0 @@
-#pragma once
-#include "gm9lua.h"
-
-#define GM9LUA_UILIBNAME "ui"
-
-void ShiftOutputBufferUp(void);
-void ClearOutputBuffer(void);
-void RenderOutputBuffer(void);
-void WriteToOutputBuffer(char* text);
-int gm9lua_open_ui(lua_State* L);

arm9/source/lua/lapi.h

@@ -1,52 +0,0 @@
-/*
-** $Id: lapi.h $
-** Auxiliary functions from Lua API
-** See Copyright Notice in lua.h
-*/
-
-#ifndef lapi_h
-#define lapi_h
-
-
-#include "llimits.h"
-#include "lstate.h"
-
-
-/* Increments 'L->top.p', checking for stack overflows */
-#define api_incr_top(L)	{L->top.p++; \
-			 api_check(L, L->top.p <= L->ci->top.p, \
-					"stack overflow");}
-
-
-/*
-** If a call returns too many multiple returns, the callee may not have
-** stack space to accommodate all results. In this case, this macro
-** increases its stack space ('L->ci->top.p').
-*/
-#define adjustresults(L,nres) \
-    { if ((nres) <= LUA_MULTRET && L->ci->top.p < L->top.p) \
-	L->ci->top.p = L->top.p; }
-
-
-/* Ensure the stack has at least 'n' elements */
-#define api_checknelems(L,n) \
-	api_check(L, (n) < (L->top.p - L->ci->func.p), \
-			  "not enough elements in the stack")
-
-
-/*
-** To reduce the overhead of returning from C functions, the presence of
-** to-be-closed variables in these functions is coded in the CallInfo's
-** field 'nresults', in a way that functions with no to-be-closed variables
-** with zero, one, or "all" wanted results have no overhead. Functions
-** with other number of wanted results, as well as functions with
-** variables to be closed, have an extra check.
-*/
-
-#define hastocloseCfunc(n)	((n) < LUA_MULTRET)
-
-/* Map [-1, inf) (range of 'nresults') into (-inf, -2] */
-#define codeNresults(n)		(-(n) - 3)
-#define decodeNresults(n)	(-(n) - 3)
-
-#endif

arm9/source/lua/lauxlib.h

@@ -1,301 +0,0 @@
-/*
-** $Id: lauxlib.h $
-** Auxiliary functions for building Lua libraries
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef lauxlib_h
-#define lauxlib_h
-
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "luaconf.h"
-#include "lua.h"
-
-
-/* global table */
-#define LUA_GNAME	"_G"
-
-
-typedef struct luaL_Buffer luaL_Buffer;
-
-
-/* extra error code for 'luaL_loadfilex' */
-#define LUA_ERRFILE     (LUA_ERRERR+1)
-
-
-/* key, in the registry, for table of loaded modules */
-#define LUA_LOADED_TABLE	"_LOADED"
-
-
-/* key, in the registry, for table of preloaded loaders */
-#define LUA_PRELOAD_TABLE	"_PRELOAD"
-
-
-typedef struct luaL_Reg {
-  const char *name;
-  lua_CFunction func;
-} luaL_Reg;
-
-
-#define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
-
-LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
-#define luaL_checkversion(L)  \
-	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
-
-LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
-LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
-LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
-LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
-LUALIB_API int (luaL_typeerror) (lua_State *L, int arg, const char *tname);
-LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
-                                                          size_t *l);
-LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
-                                          const char *def, size_t *l);
-LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
-LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
-
-LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
-                                          lua_Integer def);
-
-LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
-LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
-LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
-
-LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
-LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
-LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
-LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
-
-LUALIB_API void (luaL_where) (lua_State *L, int lvl);
-LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
-
-LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
-                                   const char *const lst[]);
-
-LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
-LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
-
-
-/* predefined references */
-#define LUA_NOREF       (-2)
-#define LUA_REFNIL      (-1)
-
-LUALIB_API int (luaL_ref) (lua_State *L, int t);
-LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
-
-LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
-                                               const char *mode);
-
-#define luaL_loadfile(L,f)	luaL_loadfilex(L,f,NULL)
-
-LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
-                                   const char *name, const char *mode);
-LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
-
-LUALIB_API lua_State *(luaL_newstate) (void);
-
-LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
-
-LUALIB_API void (luaL_addgsub) (luaL_Buffer *b, const char *s,
-                                     const char *p, const char *r);
-LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s,
-                                    const char *p, const char *r);
-
-LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
-
-LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
-
-LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
-                                  const char *msg, int level);
-
-LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
-                                 lua_CFunction openf, int glb);
-
-/*
-** ===============================================================
-** some useful macros
-** ===============================================================
-*/
-
-
-#define luaL_newlibtable(L,l)	\
-  lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
-
-#define luaL_newlib(L,l)  \
-  (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
-
-#define luaL_argcheck(L, cond,arg,extramsg)	\
-	((void)(luai_likely(cond) || luaL_argerror(L, (arg), (extramsg))))
-
-#define luaL_argexpected(L,cond,arg,tname)	\
-	((void)(luai_likely(cond) || luaL_typeerror(L, (arg), (tname))))
-
-#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
-#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
-
-#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
-
-#define luaL_dofile(L, fn) \
-	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
-
-#define luaL_dostring(L, s) \
-	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
-
-#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
-
-#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
-
-#define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
-
-
-/*
-** Perform arithmetic operations on lua_Integer values with wrap-around
-** semantics, as the Lua core does.
-*/
-#define luaL_intop(op,v1,v2)  \
-	((lua_Integer)((lua_Unsigned)(v1) op (lua_Unsigned)(v2)))
-
-
-/* push the value used to represent failure/error */
-#define luaL_pushfail(L)	lua_pushnil(L)
-
-
-/*
-** Internal assertions for in-house debugging
-*/
-#if !defined(lua_assert)
-
-#if defined LUAI_ASSERT
-  #include <assert.h>
-  #define lua_assert(c)		assert(c)
-#else
-  #define lua_assert(c)		((void)0)
-#endif
-
-#endif
-
-
-
-/*
-** {======================================================
-** Generic Buffer manipulation
-** =======================================================
-*/
-
-struct luaL_Buffer {
-  char *b;  /* buffer address */
-  size_t size;  /* buffer size */
-  size_t n;  /* number of characters in buffer */
-  lua_State *L;
-  union {
-    LUAI_MAXALIGN;  /* ensure maximum alignment for buffer */
-    char b[LUAL_BUFFERSIZE];  /* initial buffer */
-  } init;
-};
-
-
-#define luaL_bufflen(bf)	((bf)->n)
-#define luaL_buffaddr(bf)	((bf)->b)
-
-
-#define luaL_addchar(B,c) \
-  ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
-   ((B)->b[(B)->n++] = (c)))
-
-#define luaL_addsize(B,s)	((B)->n += (s))
-
-#define luaL_buffsub(B,s)	((B)->n -= (s))
-
-LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
-LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
-LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
-LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
-LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
-LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
-
-#define luaL_prepbuffer(B)	luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
-
-/* }====================================================== */
-
-
-
-/*
-** {======================================================
-** File handles for IO library
-** =======================================================
-*/
-
-/*
-** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
-** initial structure 'luaL_Stream' (it may contain other fields
-** after that initial structure).
-*/
-
-#define LUA_FILEHANDLE          "FILE*"
-
-
-typedef struct luaL_Stream {
-  FILE *f;  /* stream (NULL for incompletely created streams) */
-  lua_CFunction closef;  /* to close stream (NULL for closed streams) */
-} luaL_Stream;
-
-/* }====================================================== */
-
-/*
-** {==================================================================
-** "Abstraction Layer" for basic report of messages and errors
-** ===================================================================
-*/
-
-/* print a string */
-#if !defined(lua_writestring)
-#define lua_writestring(s,l)   fwrite((s), sizeof(char), (l), stdout)
-#endif
-
-/* print a newline and flush the output */
-#if !defined(lua_writeline)
-#define lua_writeline()        (lua_writestring("\n", 1), fflush(stdout))
-#endif
-
-/* print an error message */
-#if !defined(lua_writestringerror)
-#define lua_writestringerror(s,p) \
-        (fprintf(stderr, (s), (p)), fflush(stderr))
-#endif
-
-/* }================================================================== */
-
-
-/*
-** {============================================================
-** Compatibility with deprecated conversions
-** =============================================================
-*/
-#if defined(LUA_COMPAT_APIINTCASTS)
-
-#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
-#define luaL_optunsigned(L,a,d)	\
-	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
-
-#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
-#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
-
-#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
-#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
-
-#endif
-/* }============================================================ */
-
-
-
-#endif
-
-

arm9/source/lua/lbaselib.c

@@ -1,549 +0,0 @@
-/*
-** $Id: lbaselib.c $
-** Basic library
-** See Copyright Notice in lua.h
-*/
-
-#define lbaselib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lua.h"
-
-#include "lauxlib.h"
-#include "lualib.h"
-
-
-static int luaB_print (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  for (i = 1; i <= n; i++) {  /* for each argument */
-    size_t l;
-    const char *s = luaL_tolstring(L, i, &l);  /* convert it to string */
-    if (i > 1)  /* not the first element? */
-      lua_writestring("\t", 1);  /* add a tab before it */
-    lua_writestring(s, l);  /* print it */
-    lua_pop(L, 1);  /* pop result */
-  }
-  lua_writeline();
-  return 0;
-}
-
-
-/*
-** Creates a warning with all given arguments.
-** Check first for errors; otherwise an error may interrupt
-** the composition of a warning, leaving it unfinished.
-*/
-static int luaB_warn (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  luaL_checkstring(L, 1);  /* at least one argument */
-  for (i = 2; i <= n; i++)
-    luaL_checkstring(L, i);  /* make sure all arguments are strings */
-  for (i = 1; i < n; i++)  /* compose warning */
-    lua_warning(L, lua_tostring(L, i), 1);
-  lua_warning(L, lua_tostring(L, n), 0);  /* close warning */
-  return 0;
-}
-
-
-#define SPACECHARS	" \f\n\r\t\v"
-
-static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
-  lua_Unsigned n = 0;
-  int neg = 0;
-  s += strspn(s, SPACECHARS);  /* skip initial spaces */
-  if (*s == '-') { s++; neg = 1; }  /* handle sign */
-  else if (*s == '+') s++;
-  if (!isalnum((unsigned char)*s))  /* no digit? */
-    return NULL;
-  do {
-    int digit = (isdigit((unsigned char)*s)) ? *s - '0'
-                   : (toupper((unsigned char)*s) - 'A') + 10;
-    if (digit >= base) return NULL;  /* invalid numeral */
-    n = n * base + digit;
-    s++;
-  } while (isalnum((unsigned char)*s));
-  s += strspn(s, SPACECHARS);  /* skip trailing spaces */
-  *pn = (lua_Integer)((neg) ? (0u - n) : n);
-  return s;
-}
-
-
-static int luaB_tonumber (lua_State *L) {
-  if (lua_isnoneornil(L, 2)) {  /* standard conversion? */
-    if (lua_type(L, 1) == LUA_TNUMBER) {  /* already a number? */
-      lua_settop(L, 1);  /* yes; return it */
-      return 1;
-    }
-    else {
-      size_t l;
-      const char *s = lua_tolstring(L, 1, &l);
-      if (s != NULL && lua_stringtonumber(L, s) == l + 1)
-        return 1;  /* successful conversion to number */
-      /* else not a number */
-      luaL_checkany(L, 1);  /* (but there must be some parameter) */
-    }
-  }
-  else {
-    size_t l;
-    const char *s;
-    lua_Integer n = 0;  /* to avoid warnings */
-    lua_Integer base = luaL_checkinteger(L, 2);
-    luaL_checktype(L, 1, LUA_TSTRING);  /* no numbers as strings */
-    s = lua_tolstring(L, 1, &l);
-    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
-    if (b_str2int(s, (int)base, &n) == s + l) {
-      lua_pushinteger(L, n);
-      return 1;
-    }  /* else not a number */
-  }  /* else not a number */
-  luaL_pushfail(L);  /* not a number */
-  return 1;
-}
-
-
-static int luaB_error (lua_State *L) {
-  int level = (int)luaL_optinteger(L, 2, 1);
-  lua_settop(L, 1);
-  if (lua_type(L, 1) == LUA_TSTRING && level > 0) {
-    luaL_where(L, level);   /* add extra information */
-    lua_pushvalue(L, 1);
-    lua_concat(L, 2);
-  }
-  return lua_error(L);
-}
-
-
-static int luaB_getmetatable (lua_State *L) {
-  luaL_checkany(L, 1);
-  if (!lua_getmetatable(L, 1)) {
-    lua_pushnil(L);
-    return 1;  /* no metatable */
-  }
-  luaL_getmetafield(L, 1, "__metatable");
-  return 1;  /* returns either __metatable field (if present) or metatable */
-}
-
-
-static int luaB_setmetatable (lua_State *L) {
-  int t = lua_type(L, 2);
-  luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
-  if (l_unlikely(luaL_getmetafield(L, 1, "__metatable") != LUA_TNIL))
-    return luaL_error(L, "cannot change a protected metatable");
-  lua_settop(L, 2);
-  lua_setmetatable(L, 1);
-  return 1;
-}
-
-
-static int luaB_rawequal (lua_State *L) {
-  luaL_checkany(L, 1);
-  luaL_checkany(L, 2);
-  lua_pushboolean(L, lua_rawequal(L, 1, 2));
-  return 1;
-}
-
-
-static int luaB_rawlen (lua_State *L) {
-  int t = lua_type(L, 1);
-  luaL_argexpected(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
-                      "table or string");
-  lua_pushinteger(L, lua_rawlen(L, 1));
-  return 1;
-}
-
-
-static int luaB_rawget (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_checkany(L, 2);
-  lua_settop(L, 2);
-  lua_rawget(L, 1);
-  return 1;
-}
-
-static int luaB_rawset (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_checkany(L, 2);
-  luaL_checkany(L, 3);
-  lua_settop(L, 3);
-  lua_rawset(L, 1);
-  return 1;
-}
-
-
-static int pushmode (lua_State *L, int oldmode) {
-  if (oldmode == -1)
-    luaL_pushfail(L);  /* invalid call to 'lua_gc' */
-  else
-    lua_pushstring(L, (oldmode == LUA_GCINC) ? "incremental"
-                                             : "generational");
-  return 1;
-}
-
-
-/*
-** check whether call to 'lua_gc' was valid (not inside a finalizer)
-*/
-#define checkvalres(res) { if (res == -1) break; }
-
-static int luaB_collectgarbage (lua_State *L) {
-  static const char *const opts[] = {"stop", "restart", "collect",
-    "count", "step", "setpause", "setstepmul",
-    "isrunning", "generational", "incremental", NULL};
-  static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
-    LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
-    LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
-  int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
-  switch (o) {
-    case LUA_GCCOUNT: {
-      int k = lua_gc(L, o);
-      int b = lua_gc(L, LUA_GCCOUNTB);
-      checkvalres(k);
-      lua_pushnumber(L, (lua_Number)k + ((lua_Number)b/1024));
-      return 1;
-    }
-    case LUA_GCSTEP: {
-      int step = (int)luaL_optinteger(L, 2, 0);
-      int res = lua_gc(L, o, step);
-      checkvalres(res);
-      lua_pushboolean(L, res);
-      return 1;
-    }
-    case LUA_GCSETPAUSE:
-    case LUA_GCSETSTEPMUL: {
-      int p = (int)luaL_optinteger(L, 2, 0);
-      int previous = lua_gc(L, o, p);
-      checkvalres(previous);
-      lua_pushinteger(L, previous);
-      return 1;
-    }
-    case LUA_GCISRUNNING: {
-      int res = lua_gc(L, o);
-      checkvalres(res);
-      lua_pushboolean(L, res);
-      return 1;
-    }
-    case LUA_GCGEN: {
-      int minormul = (int)luaL_optinteger(L, 2, 0);
-      int majormul = (int)luaL_optinteger(L, 3, 0);
-      return pushmode(L, lua_gc(L, o, minormul, majormul));
-    }
-    case LUA_GCINC: {
-      int pause = (int)luaL_optinteger(L, 2, 0);
-      int stepmul = (int)luaL_optinteger(L, 3, 0);
-      int stepsize = (int)luaL_optinteger(L, 4, 0);
-      return pushmode(L, lua_gc(L, o, pause, stepmul, stepsize));
-    }
-    default: {
-      int res = lua_gc(L, o);
-      checkvalres(res);
-      lua_pushinteger(L, res);
-      return 1;
-    }
-  }
-  luaL_pushfail(L);  /* invalid call (inside a finalizer) */
-  return 1;
-}
-
-
-static int luaB_type (lua_State *L) {
-  int t = lua_type(L, 1);
-  luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
-  lua_pushstring(L, lua_typename(L, t));
-  return 1;
-}
-
-
-static int luaB_next (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TTABLE);
-  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
-  if (lua_next(L, 1))
-    return 2;
-  else {
-    lua_pushnil(L);
-    return 1;
-  }
-}
-
-
-static int pairscont (lua_State *L, int status, lua_KContext k) {
-  (void)L; (void)status; (void)k;  /* unused */
-  return 3;
-}
-
-static int luaB_pairs (lua_State *L) {
-  luaL_checkany(L, 1);
-  if (luaL_getmetafield(L, 1, "__pairs") == LUA_TNIL) {  /* no metamethod? */
-    lua_pushcfunction(L, luaB_next);  /* will return generator, */
-    lua_pushvalue(L, 1);  /* state, */
-    lua_pushnil(L);  /* and initial value */
-  }
-  else {
-    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
-    lua_callk(L, 1, 3, 0, pairscont);  /* get 3 values from metamethod */
-  }
-  return 3;
-}
-
-
-/*
-** Traversal function for 'ipairs'
-*/
-static int ipairsaux (lua_State *L) {
-  lua_Integer i = luaL_checkinteger(L, 2);
-  i = luaL_intop(+, i, 1);
-  lua_pushinteger(L, i);
-  return (lua_geti(L, 1, i) == LUA_TNIL) ? 1 : 2;
-}
-
-
-/*
-** 'ipairs' function. Returns 'ipairsaux', given "table", 0.
-** (The given "table" may not be a table.)
-*/
-static int luaB_ipairs (lua_State *L) {
-  luaL_checkany(L, 1);
-  lua_pushcfunction(L, ipairsaux);  /* iteration function */
-  lua_pushvalue(L, 1);  /* state */
-  lua_pushinteger(L, 0);  /* initial value */
-  return 3;
-}
-
-
-static int load_aux (lua_State *L, int status, int envidx) {
-  if (l_likely(status == LUA_OK)) {
-    if (envidx != 0) {  /* 'env' parameter? */
-      lua_pushvalue(L, envidx);  /* environment for loaded function */
-      if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
-        lua_pop(L, 1);  /* remove 'env' if not used by previous call */
-    }
-    return 1;
-  }
-  else {  /* error (message is on top of the stack) */
-    luaL_pushfail(L);
-    lua_insert(L, -2);  /* put before error message */
-    return 2;  /* return fail plus error message */
-  }
-}
-
-
-static int luaB_loadfile (lua_State *L) {
-  const char *fname = luaL_optstring(L, 1, NULL);
-  const char *mode = luaL_optstring(L, 2, NULL);
-  int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
-  int status = luaL_loadfilex(L, fname, mode);
-  return load_aux(L, status, env);
-}
-
-
-/*
-** {======================================================
-** Generic Read function
-** =======================================================
-*/
-
-
-/*
-** reserved slot, above all arguments, to hold a copy of the returned
-** string to avoid it being collected while parsed. 'load' has four
-** optional arguments (chunk, source name, mode, and environment).
-*/
-#define RESERVEDSLOT	5
-
-
-/*
-** Reader for generic 'load' function: 'lua_load' uses the
-** stack for internal stuff, so the reader cannot change the
-** stack top. Instead, it keeps its resulting string in a
-** reserved slot inside the stack.
-*/
-static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
-  (void)(ud);  /* not used */
-  luaL_checkstack(L, 2, "too many nested functions");
-  lua_pushvalue(L, 1);  /* get function */
-  lua_call(L, 0, 1);  /* call it */
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 1);  /* pop result */
-    *size = 0;
-    return NULL;
-  }
-  else if (l_unlikely(!lua_isstring(L, -1)))
-    luaL_error(L, "reader function must return a string");
-  lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
-  return lua_tolstring(L, RESERVEDSLOT, size);
-}
-
-
-static int luaB_load (lua_State *L) {
-  int status;
-  size_t l;
-  const char *s = lua_tolstring(L, 1, &l);
-  const char *mode = luaL_optstring(L, 3, "bt");
-  int env = (!lua_isnone(L, 4) ? 4 : 0);  /* 'env' index or 0 if no 'env' */
-  if (s != NULL) {  /* loading a string? */
-    const char *chunkname = luaL_optstring(L, 2, s);
-    status = luaL_loadbufferx(L, s, l, chunkname, mode);
-  }
-  else {  /* loading from a reader function */
-    const char *chunkname = luaL_optstring(L, 2, "=(load)");
-    luaL_checktype(L, 1, LUA_TFUNCTION);
-    lua_settop(L, RESERVEDSLOT);  /* create reserved slot */
-    status = lua_load(L, generic_reader, NULL, chunkname, mode);
-  }
-  return load_aux(L, status, env);
-}
-
-/* }====================================================== */
-
-
-static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
-  (void)d1;  (void)d2;  /* only to match 'lua_Kfunction' prototype */
-  return lua_gettop(L) - 1;
-}
-
-
-static int luaB_dofile (lua_State *L) {
-  const char *fname = luaL_optstring(L, 1, NULL);
-  lua_settop(L, 1);
-  if (l_unlikely(luaL_loadfile(L, fname) != LUA_OK))
-    return lua_error(L);
-  lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
-  return dofilecont(L, 0, 0);
-}
-
-
-static int luaB_assert (lua_State *L) {
-  if (l_likely(lua_toboolean(L, 1)))  /* condition is true? */
-    return lua_gettop(L);  /* return all arguments */
-  else {  /* error */
-    luaL_checkany(L, 1);  /* there must be a condition */
-    lua_remove(L, 1);  /* remove it */
-    lua_pushliteral(L, "assertion failed!");  /* default message */
-    lua_settop(L, 1);  /* leave only message (default if no other one) */
-    return luaB_error(L);  /* call 'error' */
-  }
-}
-
-
-static int luaB_select (lua_State *L) {
-  int n = lua_gettop(L);
-  if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
-    lua_pushinteger(L, n-1);
-    return 1;
-  }
-  else {
-    lua_Integer i = luaL_checkinteger(L, 1);
-    if (i < 0) i = n + i;
-    else if (i > n) i = n;
-    luaL_argcheck(L, 1 <= i, 1, "index out of range");
-    return n - (int)i;
-  }
-}
-
-
-/*
-** Continuation function for 'pcall' and 'xpcall'. Both functions
-** already pushed a 'true' before doing the call, so in case of success
-** 'finishpcall' only has to return everything in the stack minus
-** 'extra' values (where 'extra' is exactly the number of items to be
-** ignored).
-*/
-static int finishpcall (lua_State *L, int status, lua_KContext extra) {
-  if (l_unlikely(status != LUA_OK && status != LUA_YIELD)) {  /* error? */
-    lua_pushboolean(L, 0);  /* first result (false) */
-    lua_pushvalue(L, -2);  /* error message */
-    return 2;  /* return false, msg */
-  }
-  else
-    return lua_gettop(L) - (int)extra;  /* return all results */
-}
-
-
-static int luaB_pcall (lua_State *L) {
-  int status;
-  luaL_checkany(L, 1);
-  lua_pushboolean(L, 1);  /* first result if no errors */
-  lua_insert(L, 1);  /* put it in place */
-  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, finishpcall);
-  return finishpcall(L, status, 0);
-}
-
-
-/*
-** Do a protected call with error handling. After 'lua_rotate', the
-** stack will have <f, err, true, f, [args...]>; so, the function passes
-** 2 to 'finishpcall' to skip the 2 first values when returning results.
-*/
-static int luaB_xpcall (lua_State *L) {
-  int status;
-  int n = lua_gettop(L);
-  luaL_checktype(L, 2, LUA_TFUNCTION);  /* check error function */
-  lua_pushboolean(L, 1);  /* first result */
-  lua_pushvalue(L, 1);  /* function */
-  lua_rotate(L, 3, 2);  /* move them below function's arguments */
-  status = lua_pcallk(L, n - 2, LUA_MULTRET, 2, 2, finishpcall);
-  return finishpcall(L, status, 2);
-}
-
-
-static int luaB_tostring (lua_State *L) {
-  luaL_checkany(L, 1);
-  luaL_tolstring(L, 1, NULL);
-  return 1;
-}
-
-
-static const luaL_Reg base_funcs[] = {
-  {"assert", luaB_assert},
-  {"collectgarbage", luaB_collectgarbage},
-  {"dofile", luaB_dofile},
-  {"error", luaB_error},
-  {"getmetatable", luaB_getmetatable},
-  {"ipairs", luaB_ipairs},
-  {"loadfile", luaB_loadfile},
-  {"load", luaB_load},
-  {"next", luaB_next},
-  {"pairs", luaB_pairs},
-  {"pcall", luaB_pcall},
-  {"print", luaB_print},
-  {"warn", luaB_warn},
-  {"rawequal", luaB_rawequal},
-  {"rawlen", luaB_rawlen},
-  {"rawget", luaB_rawget},
-  {"rawset", luaB_rawset},
-  {"select", luaB_select},
-  {"setmetatable", luaB_setmetatable},
-  {"tonumber", luaB_tonumber},
-  {"tostring", luaB_tostring},
-  {"type", luaB_type},
-  {"xpcall", luaB_xpcall},
-  /* placeholders */
-  {LUA_GNAME, NULL},
-  {"_VERSION", NULL},
-  {NULL, NULL}
-};
-
-
-LUAMOD_API int luaopen_base (lua_State *L) {
-  /* open lib into global table */
-  lua_pushglobaltable(L);
-  luaL_setfuncs(L, base_funcs, 0);
-  /* set global _G */
-  lua_pushvalue(L, -1);
-  lua_setfield(L, -2, LUA_GNAME);
-  /* set global _VERSION */
-  lua_pushliteral(L, LUA_VERSION);
-  lua_setfield(L, -2, "_VERSION");
-  return 1;
-}
-

arm9/source/lua/lcode.h

@@ -1,101 +0,0 @@
-/*
-** $Id: lcode.h $
-** Code generator for Lua
-** See Copyright Notice in lua.h
-*/
-
-#ifndef lcode_h
-#define lcode_h
-
-#include "llex.h"
-#include "lobject.h"
-#include "lopcodes.h"
-#include "lparser.h"
-
-
-/*
-** Marks the end of a patch list. It is an invalid value both as an absolute
-** address, and as a list link (would link an element to itself).
-*/
-#define NO_JUMP (-1)
-
-
-/*
-** grep "ORDER OPR" if you change these enums  (ORDER OP)
-*/
-typedef enum BinOpr {
-  /* arithmetic operators */
-  OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
-  OPR_DIV, OPR_IDIV,
-  /* bitwise operators */
-  OPR_BAND, OPR_BOR, OPR_BXOR,
-  OPR_SHL, OPR_SHR,
-  /* string operator */
-  OPR_CONCAT,
-  /* comparison operators */
-  OPR_EQ, OPR_LT, OPR_LE,
-  OPR_NE, OPR_GT, OPR_GE,
-  /* logical operators */
-  OPR_AND, OPR_OR,
-  OPR_NOBINOPR
-} BinOpr;
-
-
-/* true if operation is foldable (that is, it is arithmetic or bitwise) */
-#define foldbinop(op)	((op) <= OPR_SHR)
-
-
-#define luaK_codeABC(fs,o,a,b,c)	luaK_codeABCk(fs,o,a,b,c,0)
-
-
-typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
-
-
-/* get (pointer to) instruction of given 'expdesc' */
-#define getinstruction(fs,e)	((fs)->f->code[(e)->u.info])
-
-
-#define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
-
-#define luaK_jumpto(fs,t)	luaK_patchlist(fs, luaK_jump(fs), t)
-
-LUAI_FUNC int luaK_code (FuncState *fs, Instruction i);
-LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
-LUAI_FUNC int luaK_codeABCk (FuncState *fs, OpCode o, int A,
-                                            int B, int C, int k);
-LUAI_FUNC int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v);
-LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
-LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
-LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
-LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
-LUAI_FUNC void luaK_int (FuncState *fs, int reg, lua_Integer n);
-LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
-LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
-LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
-LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);
-LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
-LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
-LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
-LUAI_FUNC int luaK_jump (FuncState *fs);
-LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
-LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
-LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
-LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
-LUAI_FUNC int luaK_getlabel (FuncState *fs);
-LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
-LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
-LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
-                            expdesc *v2, int line);
-LUAI_FUNC void luaK_settablesize (FuncState *fs, int pc,
-                                  int ra, int asize, int hsize);
-LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
-LUAI_FUNC void luaK_finish (FuncState *fs);
-LUAI_FUNC l_noret luaK_semerror (LexState *ls, const char *msg);
-
-
-#endif

arm9/source/lua/lcorolib.c

@@ -1,210 +0,0 @@
-/*
-** $Id: lcorolib.c $
-** Coroutine Library
-** See Copyright Notice in lua.h
-*/
-
-#define lcorolib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
-
-#include <stdlib.h>
-
-#include "lua.h"
-
-#include "lauxlib.h"
-#include "lualib.h"
-
-
-static lua_State *getco (lua_State *L) {
-  lua_State *co = lua_tothread(L, 1);
-  luaL_argexpected(L, co, 1, "thread");
-  return co;
-}
-
-
-/*
-** Resumes a coroutine. Returns the number of results for non-error
-** cases or -1 for errors.
-*/
-static int auxresume (lua_State *L, lua_State *co, int narg) {
-  int status, nres;
-  if (l_unlikely(!lua_checkstack(co, narg))) {
-    lua_pushliteral(L, "too many arguments to resume");
-    return -1;  /* error flag */
-  }
-  lua_xmove(L, co, narg);
-  status = lua_resume(co, L, narg, &nres);
-  if (l_likely(status == LUA_OK || status == LUA_YIELD)) {
-    if (l_unlikely(!lua_checkstack(L, nres + 1))) {
-      lua_pop(co, nres);  /* remove results anyway */
-      lua_pushliteral(L, "too many results to resume");
-      return -1;  /* error flag */
-    }
-    lua_xmove(co, L, nres);  /* move yielded values */
-    return nres;
-  }
-  else {
-    lua_xmove(co, L, 1);  /* move error message */
-    return -1;  /* error flag */
-  }
-}
-
-
-static int luaB_coresume (lua_State *L) {
-  lua_State *co = getco(L);
-  int r;
-  r = auxresume(L, co, lua_gettop(L) - 1);
-  if (l_unlikely(r < 0)) {
-    lua_pushboolean(L, 0);
-    lua_insert(L, -2);
-    return 2;  /* return false + error message */
-  }
-  else {
-    lua_pushboolean(L, 1);
-    lua_insert(L, -(r + 1));
-    return r + 1;  /* return true + 'resume' returns */
-  }
-}
-
-
-static int luaB_auxwrap (lua_State *L) {
-  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
-  int r = auxresume(L, co, lua_gettop(L));
-  if (l_unlikely(r < 0)) {  /* error? */
-    int stat = lua_status(co);
-    if (stat != LUA_OK && stat != LUA_YIELD) {  /* error in the coroutine? */
-      stat = lua_closethread(co, L);  /* close its tbc variables */
-      lua_assert(stat != LUA_OK);
-      lua_xmove(co, L, 1);  /* move error message to the caller */
-    }
-    if (stat != LUA_ERRMEM &&  /* not a memory error and ... */
-        lua_type(L, -1) == LUA_TSTRING) {  /* ... error object is a string? */
-      luaL_where(L, 1);  /* add extra info, if available */
-      lua_insert(L, -2);
-      lua_concat(L, 2);
-    }
-    return lua_error(L);  /* propagate error */
-  }
-  return r;
-}
-
-
-static int luaB_cocreate (lua_State *L) {
-  lua_State *NL;
-  luaL_checktype(L, 1, LUA_TFUNCTION);
-  NL = lua_newthread(L);
-  lua_pushvalue(L, 1);  /* move function to top */
-  lua_xmove(L, NL, 1);  /* move function from L to NL */
-  return 1;
-}
-
-
-static int luaB_cowrap (lua_State *L) {
-  luaB_cocreate(L);
-  lua_pushcclosure(L, luaB_auxwrap, 1);
-  return 1;
-}
-
-
-static int luaB_yield (lua_State *L) {
-  return lua_yield(L, lua_gettop(L));
-}
-
-
-#define COS_RUN		0
-#define COS_DEAD	1
-#define COS_YIELD	2
-#define COS_NORM	3
-
-
-static const char *const statname[] =
-  {"running", "dead", "suspended", "normal"};
-
-
-static int auxstatus (lua_State *L, lua_State *co) {
-  if (L == co) return COS_RUN;
-  else {
-    switch (lua_status(co)) {
-      case LUA_YIELD:
-        return COS_YIELD;
-      case LUA_OK: {
-        lua_Debug ar;
-        if (lua_getstack(co, 0, &ar))  /* does it have frames? */
-          return COS_NORM;  /* it is running */
-        else if (lua_gettop(co) == 0)
-            return COS_DEAD;
-        else
-          return COS_YIELD;  /* initial state */
-      }
-      default:  /* some error occurred */
-        return COS_DEAD;
-    }
-  }
-}
-
-
-static int luaB_costatus (lua_State *L) {
-  lua_State *co = getco(L);
-  lua_pushstring(L, statname[auxstatus(L, co)]);
-  return 1;
-}
-
-
-static int luaB_yieldable (lua_State *L) {
-  lua_State *co = lua_isnone(L, 1) ? L : getco(L);
-  lua_pushboolean(L, lua_isyieldable(co));
-  return 1;
-}
-
-
-static int luaB_corunning (lua_State *L) {
-  int ismain = lua_pushthread(L);
-  lua_pushboolean(L, ismain);
-  return 2;
-}
-
-
-static int luaB_close (lua_State *L) {
-  lua_State *co = getco(L);
-  int status = auxstatus(L, co);
-  switch (status) {
-    case COS_DEAD: case COS_YIELD: {
-      status = lua_closethread(co, L);
-      if (status == LUA_OK) {
-        lua_pushboolean(L, 1);
-        return 1;
-      }
-      else {
-        lua_pushboolean(L, 0);
-        lua_xmove(co, L, 1);  /* move error message */
-        return 2;
-      }
-    }
-    default:  /* normal or running coroutine */
-      return luaL_error(L, "cannot close a %s coroutine", statname[status]);
-  }
-}
-
-
-static const luaL_Reg co_funcs[] = {
-  {"create", luaB_cocreate},
-  {"resume", luaB_coresume},
-  {"running", luaB_corunning},
-  {"status", luaB_costatus},
-  {"wrap", luaB_cowrap},
-  {"yield", luaB_yield},
-  {"isyieldable", luaB_yieldable},
-  {"close", luaB_close},
-  {NULL, NULL}
-};
-
-
-
-LUAMOD_API int luaopen_coroutine (lua_State *L) {
-  luaL_newlib(L, co_funcs);
-  return 1;
-}
-

arm9/source/lua/lctype.c

@@ -1,64 +0,0 @@
-/*
-** $Id: lctype.c $
-** 'ctype' functions for Lua
-** See Copyright Notice in lua.h
-*/
-
-#define lctype_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
-
-#include "lctype.h"
-
-#if !LUA_USE_CTYPE	/* { */
-
-#include <limits.h>
-
-
-#if defined (LUA_UCID)		/* accept UniCode IDentifiers? */
-/* consider all non-ascii codepoints to be alphabetic */
-#define NONA		0x01
-#else
-#define NONA		0x00	/* default */
-#endif
-
-
-LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
-  0x00,  /* EOZ */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
-  0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 1. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,	/* 2. */
-  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
-  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,	/* 3. */
-  0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
-  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 4. */
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 5. */
-  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
-  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 6. */
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
-  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 7. */
-  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 8. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 9. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* a. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* b. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  0x00,  0x00,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* c. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* d. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* e. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  0x00,  0x00,  0x00,	/* f. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00
-};
-
-#endif			/* } */

arm9/source/lua/lctype.h

@@ -1,101 +0,0 @@
-/*
-** $Id: lctype.h $
-** 'ctype' functions for Lua
-** See Copyright Notice in lua.h
-*/
-
-#ifndef lctype_h
-#define lctype_h
-
-#include "lua.h"
-
-
-/*
-** WARNING: the functions defined here do not necessarily correspond
-** to the similar functions in the standard C ctype.h. They are
-** optimized for the specific needs of Lua.
-*/
-
-#if !defined(LUA_USE_CTYPE)
-
-#if 'A' == 65 && '0' == 48
-/* ASCII case: can use its own tables; faster and fixed */
-#define LUA_USE_CTYPE	0
-#else
-/* must use standard C ctype */
-#define LUA_USE_CTYPE	1
-#endif
-
-#endif
-
-
-#if !LUA_USE_CTYPE	/* { */
-
-#include <limits.h>
-
-#include "llimits.h"
-
-
-#define ALPHABIT	0
-#define DIGITBIT	1
-#define PRINTBIT	2
-#define SPACEBIT	3
-#define XDIGITBIT	4
-
-
-#define MASK(B)		(1 << (B))
-
-
-/*
-** add 1 to char to allow index -1 (EOZ)
-*/
-#define testprop(c,p)	(luai_ctype_[(c)+1] & (p))
-
-/*
-** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_'
-*/
-#define lislalpha(c)	testprop(c, MASK(ALPHABIT))
-#define lislalnum(c)	testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT)))
-#define lisdigit(c)	testprop(c, MASK(DIGITBIT))
-#define lisspace(c)	testprop(c, MASK(SPACEBIT))
-#define lisprint(c)	testprop(c, MASK(PRINTBIT))
-#define lisxdigit(c)	testprop(c, MASK(XDIGITBIT))
-
-
-/*
-** In ASCII, this 'ltolower' is correct for alphabetic characters and
-** for '.'. That is enough for Lua needs. ('check_exp' ensures that
-** the character either is an upper-case letter or is unchanged by
-** the transformation, which holds for lower-case letters and '.'.)
-*/
-#define ltolower(c)  \
-  check_exp(('A' <= (c) && (c) <= 'Z') || (c) == ((c) | ('A' ^ 'a')),  \
-            (c) | ('A' ^ 'a'))
-
-
-/* one entry for each character and for -1 (EOZ) */
-LUAI_DDEC(const lu_byte luai_ctype_[UCHAR_MAX + 2];)
-
-
-#else			/* }{ */
-
-/*
-** use standard C ctypes
-*/
-
-#include <ctype.h>
-
-
-#define lislalpha(c)	(isalpha(c) || (c) == '_')
-#define lislalnum(c)	(isalnum(c) || (c) == '_')
-#define lisdigit(c)	(isdigit(c))
-#define lisspace(c)	(isspace(c))
-#define lisprint(c)	(isprint(c))
-#define lisxdigit(c)	(isxdigit(c))
-
-#define ltolower(c)	(tolower(c))
-
-#endif			/* } */
-
-#endif
-

arm9/source/lua/ldblib.c

@@ -1,483 +0,0 @@
-/*
-** $Id: ldblib.c $
-** Interface from Lua to its debug API
-** See Copyright Notice in lua.h
-*/
-
-#define ldblib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lua.h"
-
-#include "lauxlib.h"
-#include "lualib.h"
-
-
-/*
-** The hook table at registry[HOOKKEY] maps threads to their current
-** hook function.
-*/
-static const char *const HOOKKEY = "_HOOKKEY";
-
-
-/*
-** If L1 != L, L1 can be in any state, and therefore there are no
-** guarantees about its stack space; any push in L1 must be
-** checked.
-*/
-static void checkstack (lua_State *L, lua_State *L1, int n) {
-  if (l_unlikely(L != L1 && !lua_checkstack(L1, n)))
-    luaL_error(L, "stack overflow");
-}
-
-
-static int db_getregistry (lua_State *L) {
-  lua_pushvalue(L, LUA_REGISTRYINDEX);
-  return 1;
-}
-
-
-static int db_getmetatable (lua_State *L) {
-  luaL_checkany(L, 1);
-  if (!lua_getmetatable(L, 1)) {
-    lua_pushnil(L);  /* no metatable */
-  }
-  return 1;
-}
-
-
-static int db_setmetatable (lua_State *L) {
-  int t = lua_type(L, 2);
-  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
-  lua_settop(L, 2);
-  lua_setmetatable(L, 1);
-  return 1;  /* return 1st argument */
-}
-
-
-static int db_getuservalue (lua_State *L) {
-  int n = (int)luaL_optinteger(L, 2, 1);
-  if (lua_type(L, 1) != LUA_TUSERDATA)
-    luaL_pushfail(L);
-  else if (lua_getiuservalue(L, 1, n) != LUA_TNONE) {
-    lua_pushboolean(L, 1);
-    return 2;
-  }
-  return 1;
-}
-
-
-static int db_setuservalue (lua_State *L) {
-  int n = (int)luaL_optinteger(L, 3, 1);
-  luaL_checktype(L, 1, LUA_TUSERDATA);
-  luaL_checkany(L, 2);
-  lua_settop(L, 2);
-  if (!lua_setiuservalue(L, 1, n))
-    luaL_pushfail(L);
-  return 1;
-}
-
-
-/*
-** Auxiliary function used by several library functions: check for
-** an optional thread as function's first argument and set 'arg' with
-** 1 if this argument is present (so that functions can skip it to
-** access their other arguments)
-*/
-static lua_State *getthread (lua_State *L, int *arg) {
-  if (lua_isthread(L, 1)) {
-    *arg = 1;
-    return lua_tothread(L, 1);
-  }
-  else {
-    *arg = 0;
-    return L;  /* function will operate over current thread */
-  }
-}
-
-
-/*
-** Variations of 'lua_settable', used by 'db_getinfo' to put results
-** from 'lua_getinfo' into result table. Key is always a string;
-** value can be a string, an int, or a boolean.
-*/
-static void settabss (lua_State *L, const char *k, const char *v) {
-  lua_pushstring(L, v);
-  lua_setfield(L, -2, k);
-}
-
-static void settabsi (lua_State *L, const char *k, int v) {
-  lua_pushinteger(L, v);
-  lua_setfield(L, -2, k);
-}
-
-static void settabsb (lua_State *L, const char *k, int v) {
-  lua_pushboolean(L, v);
-  lua_setfield(L, -2, k);
-}
-
-
-/*
-** In function 'db_getinfo', the call to 'lua_getinfo' may push
-** results on the stack; later it creates the result table to put
-** these objects. Function 'treatstackoption' puts the result from
-** 'lua_getinfo' on top of the result table so that it can call
-** 'lua_setfield'.
-*/
-static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
-  if (L == L1)
-    lua_rotate(L, -2, 1);  /* exchange object and table */
-  else
-    lua_xmove(L1, L, 1);  /* move object to the "main" stack */
-  lua_setfield(L, -2, fname);  /* put object into table */
-}
-
-
-/*
-** Calls 'lua_getinfo' and collects all results in a new table.
-** L1 needs stack space for an optional input (function) plus
-** two optional outputs (function and line table) from function
-** 'lua_getinfo'.
-*/
-static int db_getinfo (lua_State *L) {
-  lua_Debug ar;
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  const char *options = luaL_optstring(L, arg+2, "flnSrtu");
-  checkstack(L, L1, 3);
-  luaL_argcheck(L, options[0] != '>', arg + 2, "invalid option '>'");
-  if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
-    options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
-    lua_pushvalue(L, arg + 1);  /* move function to 'L1' stack */
-    lua_xmove(L, L1, 1);
-  }
-  else {  /* stack level */
-    if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
-      luaL_pushfail(L);  /* level out of range */
-      return 1;
-    }
-  }
-  if (!lua_getinfo(L1, options, &ar))
-    return luaL_argerror(L, arg+2, "invalid option");
-  lua_newtable(L);  /* table to collect results */
-  if (strchr(options, 'S')) {
-    lua_pushlstring(L, ar.source, ar.srclen);
-    lua_setfield(L, -2, "source");
-    settabss(L, "short_src", ar.short_src);
-    settabsi(L, "linedefined", ar.linedefined);
-    settabsi(L, "lastlinedefined", ar.lastlinedefined);
-    settabss(L, "what", ar.what);
-  }
-  if (strchr(options, 'l'))
-    settabsi(L, "currentline", ar.currentline);
-  if (strchr(options, 'u')) {
-    settabsi(L, "nups", ar.nups);
-    settabsi(L, "nparams", ar.nparams);
-    settabsb(L, "isvararg", ar.isvararg);
-  }
-  if (strchr(options, 'n')) {
-    settabss(L, "name", ar.name);
-    settabss(L, "namewhat", ar.namewhat);
-  }
-  if (strchr(options, 'r')) {
-    settabsi(L, "ftransfer", ar.ftransfer);
-    settabsi(L, "ntransfer", ar.ntransfer);
-  }
-  if (strchr(options, 't'))
-    settabsb(L, "istailcall", ar.istailcall);
-  if (strchr(options, 'L'))
-    treatstackoption(L, L1, "activelines");
-  if (strchr(options, 'f'))
-    treatstackoption(L, L1, "func");
-  return 1;  /* return table */
-}
-
-
-static int db_getlocal (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  int nvar = (int)luaL_checkinteger(L, arg + 2);  /* local-variable index */
-  if (lua_isfunction(L, arg + 1)) {  /* function argument? */
-    lua_pushvalue(L, arg + 1);  /* push function */
-    lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
-    return 1;  /* return only name (there is no value) */
-  }
-  else {  /* stack-level argument */
-    lua_Debug ar;
-    const char *name;
-    int level = (int)luaL_checkinteger(L, arg + 1);
-    if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
-      return luaL_argerror(L, arg+1, "level out of range");
-    checkstack(L, L1, 1);
-    name = lua_getlocal(L1, &ar, nvar);
-    if (name) {
-      lua_xmove(L1, L, 1);  /* move local value */
-      lua_pushstring(L, name);  /* push name */
-      lua_rotate(L, -2, 1);  /* re-order */
-      return 2;
-    }
-    else {
-      luaL_pushfail(L);  /* no name (nor value) */
-      return 1;
-    }
-  }
-}
-
-
-static int db_setlocal (lua_State *L) {
-  int arg;
-  const char *name;
-  lua_State *L1 = getthread(L, &arg);
-  lua_Debug ar;
-  int level = (int)luaL_checkinteger(L, arg + 1);
-  int nvar = (int)luaL_checkinteger(L, arg + 2);
-  if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
-    return luaL_argerror(L, arg+1, "level out of range");
-  luaL_checkany(L, arg+3);
-  lua_settop(L, arg+3);
-  checkstack(L, L1, 1);
-  lua_xmove(L, L1, 1);
-  name = lua_setlocal(L1, &ar, nvar);
-  if (name == NULL)
-    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
-  lua_pushstring(L, name);
-  return 1;
-}
-
-
-/*
-** get (if 'get' is true) or set an upvalue from a closure
-*/
-static int auxupvalue (lua_State *L, int get) {
-  const char *name;
-  int n = (int)luaL_checkinteger(L, 2);  /* upvalue index */
-  luaL_checktype(L, 1, LUA_TFUNCTION);  /* closure */
-  name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
-  if (name == NULL) return 0;
-  lua_pushstring(L, name);
-  lua_insert(L, -(get+1));  /* no-op if get is false */
-  return get + 1;
-}
-
-
-static int db_getupvalue (lua_State *L) {
-  return auxupvalue(L, 1);
-}
-
-
-static int db_setupvalue (lua_State *L) {
-  luaL_checkany(L, 3);
-  return auxupvalue(L, 0);
-}
-
-
-/*
-** Check whether a given upvalue from a given closure exists and
-** returns its index
-*/
-static void *checkupval (lua_State *L, int argf, int argnup, int *pnup) {
-  void *id;
-  int nup = (int)luaL_checkinteger(L, argnup);  /* upvalue index */
-  luaL_checktype(L, argf, LUA_TFUNCTION);  /* closure */
-  id = lua_upvalueid(L, argf, nup);
-  if (pnup) {
-    luaL_argcheck(L, id != NULL, argnup, "invalid upvalue index");
-    *pnup = nup;
-  }
-  return id;
-}
-
-
-static int db_upvalueid (lua_State *L) {
-  void *id = checkupval(L, 1, 2, NULL);
-  if (id != NULL)
-    lua_pushlightuserdata(L, id);
-  else
-    luaL_pushfail(L);
-  return 1;
-}
-
-
-static int db_upvaluejoin (lua_State *L) {
-  int n1, n2;
-  checkupval(L, 1, 2, &n1);
-  checkupval(L, 3, 4, &n2);
-  luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
-  luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
-  lua_upvaluejoin(L, 1, n1, 3, n2);
-  return 0;
-}
-
-
-/*
-** Call hook function registered at hook table for the current
-** thread (if there is one)
-*/
-static void hookf (lua_State *L, lua_Debug *ar) {
-  static const char *const hooknames[] =
-    {"call", "return", "line", "count", "tail call"};
-  lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
-  lua_pushthread(L);
-  if (lua_rawget(L, -2) == LUA_TFUNCTION) {  /* is there a hook function? */
-    lua_pushstring(L, hooknames[(int)ar->event]);  /* push event name */
-    if (ar->currentline >= 0)
-      lua_pushinteger(L, ar->currentline);  /* push current line */
-    else lua_pushnil(L);
-    lua_assert(lua_getinfo(L, "lS", ar));
-    lua_call(L, 2, 0);  /* call hook function */
-  }
-}
-
-
-/*
-** Convert a string mask (for 'sethook') into a bit mask
-*/
-static int makemask (const char *smask, int count) {
-  int mask = 0;
-  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
-  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
-  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
-  if (count > 0) mask |= LUA_MASKCOUNT;
-  return mask;
-}
-
-
-/*
-** Convert a bit mask (for 'gethook') into a string mask
-*/
-static char *unmakemask (int mask, char *smask) {
-  int i = 0;
-  if (mask & LUA_MASKCALL) smask[i++] = 'c';
-  if (mask & LUA_MASKRET) smask[i++] = 'r';
-  if (mask & LUA_MASKLINE) smask[i++] = 'l';
-  smask[i] = '\0';
-  return smask;
-}
-
-
-static int db_sethook (lua_State *L) {
-  int arg, mask, count;
-  lua_Hook func;
-  lua_State *L1 = getthread(L, &arg);
-  if (lua_isnoneornil(L, arg+1)) {  /* no hook? */
-    lua_settop(L, arg+1);
-    func = NULL; mask = 0; count = 0;  /* turn off hooks */
-  }
-  else {
-    const char *smask = luaL_checkstring(L, arg+2);
-    luaL_checktype(L, arg+1, LUA_TFUNCTION);
-    count = (int)luaL_optinteger(L, arg + 3, 0);
-    func = hookf; mask = makemask(smask, count);
-  }
-  if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
-    /* table just created; initialize it */
-    lua_pushliteral(L, "k");
-    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
-    lua_pushvalue(L, -1);
-    lua_setmetatable(L, -2);  /* metatable(hooktable) = hooktable */
-  }
-  checkstack(L, L1, 1);
-  lua_pushthread(L1); lua_xmove(L1, L, 1);  /* key (thread) */
-  lua_pushvalue(L, arg + 1);  /* value (hook function) */
-  lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
-  lua_sethook(L1, func, mask, count);
-  return 0;
-}
-
-
-static int db_gethook (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  char buff[5];
-  int mask = lua_gethookmask(L1);
-  lua_Hook hook = lua_gethook(L1);
-  if (hook == NULL) {  /* no hook? */
-    luaL_pushfail(L);
-    return 1;
-  }
-  else if (hook != hookf)  /* external hook? */
-    lua_pushliteral(L, "external hook");
-  else {  /* hook table must exist */
-    lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
-    checkstack(L, L1, 1);
-    lua_pushthread(L1); lua_xmove(L1, L, 1);
-    lua_rawget(L, -2);   /* 1st result = hooktable[L1] */
-    lua_remove(L, -2);  /* remove hook table */
-  }
-  lua_pushstring(L, unmakemask(mask, buff));  /* 2nd result = mask */
-  lua_pushinteger(L, lua_gethookcount(L1));  /* 3rd result = count */
-  return 3;
-}
-
-
-static int db_debug (lua_State *L) {
-  for (;;) {
-    char buffer[250];
-    lua_writestringerror("%s", "lua_debug> ");
-    if (fgets(buffer, sizeof(buffer), stdin) == NULL ||
-        strcmp(buffer, "cont\n") == 0)
-      return 0;
-    if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
-        lua_pcall(L, 0, 0, 0))
-      lua_writestringerror("%s\n", luaL_tolstring(L, -1, NULL));
-    lua_settop(L, 0);  /* remove eventual returns */
-  }
-}
-
-
-static int db_traceback (lua_State *L) {
-  int arg;
-  lua_State *L1 = getthread(L, &arg);
-  const char *msg = lua_tostring(L, arg + 1);
-  if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
-    lua_pushvalue(L, arg + 1);  /* return it untouched */
-  else {
-    int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
-    luaL_traceback(L, L1, msg, level);
-  }
-  return 1;
-}
-
-
-static int db_setcstacklimit (lua_State *L) {
-  int limit = (int)luaL_checkinteger(L, 1);
-  int res = lua_setcstacklimit(L, limit);
-  lua_pushinteger(L, res);
-  return 1;
-}
-
-
-static const luaL_Reg dblib[] = {
-  {"debug", db_debug},
-  {"getuservalue", db_getuservalue},
-  {"gethook", db_gethook},
-  {"getinfo", db_getinfo},
-  {"getlocal", db_getlocal},
-  {"getregistry", db_getregistry},
-  {"getmetatable", db_getmetatable},
-  {"getupvalue", db_getupvalue},
-  {"upvaluejoin", db_upvaluejoin},
-  {"upvalueid", db_upvalueid},
-  {"setuservalue", db_setuservalue},
-  {"sethook", db_sethook},
-  {"setlocal", db_setlocal},
-  {"setmetatable", db_setmetatable},
-  {"setupvalue", db_setupvalue},
-  {"traceback", db_traceback},
-  {"setcstacklimit", db_setcstacklimit},
-  {NULL, NULL}
-};
-
-
-LUAMOD_API int luaopen_debug (lua_State *L) {
-  luaL_newlib(L, dblib);
-  return 1;
-}
-