diff --git a/emummc/source/libs/fatfs/ff.c b/emummc/source/libs/fatfs/ff.c index 50105173e..bdab26d42 100644 --- a/emummc/source/libs/fatfs/ff.c +++ b/emummc/source/libs/fatfs/ff.c @@ -3304,7 +3304,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */ } if (fmt == 4) { EFSPRINTF("BRNL"); - return FR_DISK_ERR; /* An error occured in the disk I/O layer */ + return FR_DISK_ERR; /* An error occurred in the disk I/O layer */ } if (fmt >= 2) { EFSPRINTF("NOFAT"); diff --git a/exosphere/mariko_fatal/source/fatfs/ff.c b/exosphere/mariko_fatal/source/fatfs/ff.c index 3e8d435a5..54ffd7ddb 100644 --- a/exosphere/mariko_fatal/source/fatfs/ff.c +++ b/exosphere/mariko_fatal/source/fatfs/ff.c @@ -3441,7 +3441,7 @@ static FRESULT mount_volume ( /* FR_OK(0): successful, !=0: an error occurred /* Find an FAT volume on the drive */ fmt = find_volume(fs, LD2PT(vol)); - if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */ + if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */ bsect = fs->winsect; /* Volume location */ diff --git a/fusee/fusee-primary/src/exception_handlers.c b/fusee/fusee-primary/src/exception_handlers.c index 128425891..77303a4fa 100644 --- a/fusee/fusee-primary/src/exception_handlers.c +++ b/fusee/fusee-primary/src/exception_handlers.c @@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) { uint32_t cpsr = registers[16]; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; - sprintf(exception_log, "An exception occured!\n"); + sprintf(exception_log, "An exception occurred!\n"); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); diff --git a/fusee/fusee-primary/src/exception_handlers_asm.s b/fusee/fusee-primary/src/exception_handlers_asm.s index 4404c565a..db61e5083 100644 --- a/fusee/fusee-primary/src/exception_handlers_asm.s +++ b/fusee/fusee-primary/src/exception_handlers_asm.s @@ -19,7 +19,7 @@ ldr sp, =_regs stmia sp!, {r0-r7} - /* Adjust lr to make it point to the location where the exception occured. */ + /* Adjust lr to make it point to the location where the exception occurred. */ mrs r1, spsr tst r1, #0x20 subeq lr, lr, #\lr_arm_displ diff --git a/fusee/fusee-primary/src/lib/fatfs/ff.c b/fusee/fusee-primary/src/lib/fatfs/ff.c index e114a97b5..3542fcf21 100644 --- a/fusee/fusee-primary/src/lib/fatfs/ff.c +++ b/fusee/fusee-primary/src/lib/fatfs/ff.c @@ -3284,7 +3284,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */ fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */ } while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4); } - if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */ + if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */ /* An FAT volume is found (bsect). Following code initializes the filesystem object */ diff --git a/fusee/fusee-secondary/src/exception_handlers.c b/fusee/fusee-secondary/src/exception_handlers.c index 5ade0ba66..d22a3d9eb 100644 --- a/fusee/fusee-secondary/src/exception_handlers.c +++ b/fusee/fusee-secondary/src/exception_handlers.c @@ -90,7 +90,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) { uint32_t cpsr = registers[16]; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; - sprintf(exception_log, "An exception occured!\n"); + sprintf(exception_log, "An exception occurred!\n"); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); diff --git a/fusee/fusee-secondary/src/exception_handlers_asm.s b/fusee/fusee-secondary/src/exception_handlers_asm.s index 4404c565a..db61e5083 100644 --- a/fusee/fusee-secondary/src/exception_handlers_asm.s +++ b/fusee/fusee-secondary/src/exception_handlers_asm.s @@ -19,7 +19,7 @@ ldr sp, =_regs stmia sp!, {r0-r7} - /* Adjust lr to make it point to the location where the exception occured. */ + /* Adjust lr to make it point to the location where the exception occurred. */ mrs r1, spsr tst r1, #0x20 subeq lr, lr, #\lr_arm_displ diff --git a/fusee/fusee-secondary/src/lib/fatfs/ff.c b/fusee/fusee-secondary/src/lib/fatfs/ff.c index e114a97b5..3542fcf21 100644 --- a/fusee/fusee-secondary/src/lib/fatfs/ff.c +++ b/fusee/fusee-secondary/src/lib/fatfs/ff.c @@ -3284,7 +3284,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */ fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */ } while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4); } - if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */ + if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */ /* An FAT volume is found (bsect). Following code initializes the filesystem object */ diff --git a/sept/sept-secondary/src/exception_handlers.c b/sept/sept-secondary/src/exception_handlers.c index 128425891..77303a4fa 100644 --- a/sept/sept-secondary/src/exception_handlers.c +++ b/sept/sept-secondary/src/exception_handlers.c @@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) { uint32_t cpsr = registers[16]; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; - sprintf(exception_log, "An exception occured!\n"); + sprintf(exception_log, "An exception occurred!\n"); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); diff --git a/sept/sept-secondary/src/exception_handlers_asm.s b/sept/sept-secondary/src/exception_handlers_asm.s index 4404c565a..db61e5083 100644 --- a/sept/sept-secondary/src/exception_handlers_asm.s +++ b/sept/sept-secondary/src/exception_handlers_asm.s @@ -19,7 +19,7 @@ ldr sp, =_regs stmia sp!, {r0-r7} - /* Adjust lr to make it point to the location where the exception occured. */ + /* Adjust lr to make it point to the location where the exception occurred. */ mrs r1, spsr tst r1, #0x20 subeq lr, lr, #\lr_arm_displ diff --git a/sept/sept-secondary/src/lib/fatfs/ff.c b/sept/sept-secondary/src/lib/fatfs/ff.c index e114a97b5..3542fcf21 100644 --- a/sept/sept-secondary/src/lib/fatfs/ff.c +++ b/sept/sept-secondary/src/lib/fatfs/ff.c @@ -3284,7 +3284,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */ fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */ } while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4); } - if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */ + if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */ /* An FAT volume is found (bsect). Following code initializes the filesystem object */ diff --git a/stratosphere/fatal/source/fatal_config.cpp b/stratosphere/fatal/source/fatal_config.cpp index 8b144a4be..3a04b92de 100644 --- a/stratosphere/fatal/source/fatal_config.cpp +++ b/stratosphere/fatal/source/fatal_config.cpp @@ -82,7 +82,7 @@ namespace ams::fatal::srv { { this->error_msg = "Error Code: 2%03d-%04d (0x%x)\n"; - this->error_desc = "An error has occured.\n\n" + this->error_desc = "An error has occurred.\n\n" "Please press the POWER Button to restart the console normally, or a VOL button\n" "to reboot to a payload (or RCM, if none is present). If you are unable to\n" "restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"