falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #579 from jeremyherbert/master

This commit is contained in:
notyourav 2022-10-19 13:43:23 -07:00 committed by GitHub
parent 7c2e150ede 58e8ba867b
commit f8559dd95e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.c
View File

@ -168,8 +168,7 @@ const SaveHeader sDefaultSettings = {
.initialized = 0, .initialized = 0,
}; };
// single misplaced ldr void InitSaveHeader(void) {
/*static*/ NONMATCH("asm/non_matching/InitSaveHeader.inc", void InitSaveHeader(void)) {
u32 b; u32 b;
if (!CheckHeaderValid()) { if (!CheckHeaderValid()) {
@ -196,11 +195,11 @@ const SaveHeader sDefaultSettings = {
b = TRUE; b = TRUE;
} }
if (b) { if (b) {
MemClear(&gUnk_02000010, sizeof gUnk_02000010); FORCE_REGISTER(struct_02000010 * ptr, r4) = &gUnk_02000010;
gUnk_02000010.signature = SIGNATURE; MemClear(ptr, sizeof gUnk_02000010);
ptr->signature = SIGNATURE;
} }
} }
END_NONMATCH
/*static*/ u32 CheckHeaderValid(void) { /*static*/ u32 CheckHeaderValid(void) {
if ((gSaveHeader->signature != SIGNATURE) || (gSaveHeader->saveFileId >= NUM_SAVE_SLOTS) || if ((gSaveHeader->signature != SIGNATURE) || (gSaveHeader->saveFileId >= NUM_SAVE_SLOTS) ||