From 53db497f8891c05587468c5e6d8e798999326017 Mon Sep 17 00:00:00 2001 From: windows-server-2003 Date: Wed, 4 Apr 2018 20:58:23 +0900 Subject: [PATCH] Fix some typos --- arm9/Makefile | 2 +- arm9/source/filesys/filetype.h | 8 ++++---- arm9/source/godmode.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arm9/Makefile b/arm9/Makefile index ce00a3a..7636a82 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -6,7 +6,7 @@ SOURCE := source BUILD := build SUBARCH := -D$(PROCESSOR) -mcpu=arm946e-s -mtune=arm946e-s -mfloat-abi=soft -mthumb -INCDIRS := source source/common source/filesys source/crypto source/fatfs source/nand source/virtual source/game source/gamecart source/lodepng source/quicklz 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) diff --git a/arm9/source/filesys/filetype.h b/arm9/source/filesys/filetype.h index 4f985e6..ea7fffb 100644 --- a/arm9/source/filesys/filetype.h +++ b/arm9/source/filesys/filetype.h @@ -43,9 +43,9 @@ #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_TICKDB|BIN_KEYDB)) -#define FYTPE_VERIFICABLE(tp) (tp&(IMG_NAND|GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_TMD|GAME_BOSS|SYS_FIRM)) -#define FYTPE_DECRYPTABLE(tp) (tp&(GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_BOSS|GAME_NUSCDN|SYS_FIRM|BIN_KEYDB)) -#define FYTPE_ENCRYPTABLE(tp) (tp&(GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_BOSS|BIN_KEYDB)) +#define FTYPE_VERIFICABLE(tp) (tp&(IMG_NAND|GAME_CIA|GAME_NCSD|GAME_NCCH|GAME_TMD|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)) #define FTYPE_CIABUILD_L(tp) (FTYPE_CIABUILD(tp) && (tp&(GAME_TMD))) #define FTYPE_CXIDUMP(tp) (tp&(GAME_TMD)) @@ -68,6 +68,6 @@ #define FTYPE_GFX(tp) (tp&(GFX_PNG)) #define FTYPE_BOOTABLE(tp) (tp&(SYS_FIRM)) #define FTYPE_INSTALLABLE(tp) (tp&(SYS_FIRM)) -#define FTPYE_AGBSAVE(tp) (tp&(SYS_AGBSAVE)) +#define FTYPE_AGBSAVE(tp) (tp&(SYS_AGBSAVE)) u64 IdentifyFileType(const char* path); diff --git a/arm9/source/godmode.c b/arm9/source/godmode.c index 660c27a..52a16ee 100644 --- a/arm9/source/godmode.c +++ b/arm9/source/godmode.c @@ -282,7 +282,7 @@ void DrawUserInterface(const char* curr_path, DirEntry* curr_entry, u32 curr_pan DrawStringF(MAIN_SCREEN, SCREEN_WIDTH_MAIN - len_info - 4, info_start + 12 + (n_cb_show*10), COLOR_DARKGREY, COLOR_STD_BG, "%*s", len_info / FONT_WIDTH_EXT, tempstr); - // bottom: inctruction block + // bottom: instruction block char instr[512]; snprintf(instr, 512, "%s\n%s%s%s%s%s%s%s%s", FLAVOR " " VERSION, // generic start part @@ -997,9 +997,9 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan // special stuff, only available for known filetypes (see int special below) bool mountable = (FTYPE_MOUNTABLE(filetype) && !(drvtype & DRV_IMAGE) && !((drvtype & (DRV_SYSNAND|DRV_EMUNAND)) && (drvtype & DRV_VIRTUAL) && (filetype & IMG_FAT))); - bool verificable = (FYTPE_VERIFICABLE(filetype)); - bool decryptable = (FYTPE_DECRYPTABLE(filetype)); - bool encryptable = (FYTPE_ENCRYPTABLE(filetype)); + bool verificable = (FTYPE_VERIFICABLE(filetype)); + bool decryptable = (FTYPE_DECRYPTABLE(filetype)); + bool encryptable = (FTYPE_ENCRYPTABLE(filetype)); bool cryptable_inplace = ((encryptable||decryptable) && !in_output_path && (drvtype & DRV_FAT)); bool cia_buildable = (FTYPE_CIABUILD(filetype)); bool cia_buildable_legit = (FTYPE_CIABUILD_L(filetype)); @@ -1023,8 +1023,8 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan bool viewable = (FTYPE_GFX(filetype)); bool bootable = (FTYPE_BOOTABLE(filetype)); bool installable = (FTYPE_INSTALLABLE(filetype)); - bool agbexportable = (FTPYE_AGBSAVE(filetype) && (drvtype & DRV_VIRTUAL) && (drvtype & DRV_SYSNAND)); - bool agbimportable = (FTPYE_AGBSAVE(filetype) && (drvtype & DRV_VIRTUAL) && (drvtype & DRV_SYSNAND)); + bool agbexportable = (FTYPE_AGBSAVE(filetype) && (drvtype & DRV_VIRTUAL) && (drvtype & DRV_SYSNAND)); + bool agbimportable = (FTYPE_AGBSAVE(filetype) && (drvtype & DRV_VIRTUAL) && (drvtype & DRV_SYSNAND)); char cxi_path[256] = { 0 }; // special options for TMD if ((filetype & GAME_TMD) && !(filetype & FLAG_NUSCDN) &&