From 5ddb348cebe6a32e178574b1e7e9392b93ff1b90 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 27 Dec 2021 16:09:31 +0200 Subject: [PATCH] Use gSaveHeader --- src/demoScreen.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/demoScreen.c b/src/demoScreen.c index c38296e4..2d0ef585 100644 --- a/src/demoScreen.c +++ b/src/demoScreen.c @@ -136,15 +136,14 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void) } } } - tmp4 = (0x80 << 0x12); - tmp = *(u8*)(tmp4 + 4); + tmp = gSaveHeader->saveFileId; tmp2 = val + 3; tmp += tmp2; - *(u8*)(tmp4 + 4) = tmp % 3; + gSaveHeader->saveFileId = tmp % 3; tmp3 = gChooseFileState.unk_0x10; - tmp = *(u8*)(tmp4 + 4); + tmp = gSaveHeader->saveFileId; tmp *= 0x68; if (tmp != tmp3) { @@ -158,8 +157,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void) } gChooseFileState.unk_0x0 = unk_0x0; - tmp4 = (0x80 << 0x12); - sub_080A3198(*(u8*)(tmp4 + 4), 0); + sub_080A3198(gSaveHeader->saveFileId, 0); } } END_NONMATCH