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

clang format

This commit is contained in:
Tal Hayon 2021-12-27 10:25:32 +02:00
parent 4241057135
commit 930979a5ca
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/fileScreen.h
View File

@ -14,9 +14,9 @@ typedef struct {
u8 fillerA[0x5]; u8 fillerA[0x5];
s16 unk_0x10; s16 unk_0x10;
u16 unk_0x12; u16 unk_0x12;
u8 fillerB[0xC]; u8 fillerB[0xC];
u8 unk_0x20; u8 unk_0x20;
u8 fillerC[0xF]; u8 fillerC[0xF];
} ChooseFileState; } ChooseFileState;
static_assert(sizeof(ChooseFileState) == 0x30); static_assert(sizeof(ChooseFileState) == 0x30);

13
src/demoScreen.c
View File

@ -116,8 +116,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
gChooseFileState.unk_0x20 = 4; gChooseFileState.unk_0x20 = 4;
SoundReq(SFX_TEXTBOX_CHOICE); SoundReq(SFX_TEXTBOX_CHOICE);
} }
} } else if ((keys) > 0x10) {
else if ((keys) > 0x10) {
if ((keys) != 0x40) { if ((keys) != 0x40) {
if ((keys) <= (s16)0x40) { if ((keys) <= (s16)0x40) {
if (keys == DPAD_LEFT) { if (keys == DPAD_LEFT) {
@ -129,8 +128,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
} }
} }
} }
} } else if ((keys) == 0x1 || (keys) == 0x8) {
else if ((keys) == 0x1 || (keys) == 0x8) {
if (gChooseFileState.unk_0x0 == 0) { if (gChooseFileState.unk_0x0 == 0) {
gMain.screen = 2; gMain.screen = 2;
gMain.funcIndex = gChooseFileState.unk_0x0; gMain.funcIndex = gChooseFileState.unk_0x0;
@ -144,7 +142,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
*(u8*)(tmp4 + 4) = __modsi3(tmp, 3); *(u8*)(tmp4 + 4) = __modsi3(tmp, 3);
tmp3 = gChooseFileState.unk_0x10; tmp3 = gChooseFileState.unk_0x10;
tmp = *(u8*)(tmp4 + 4); tmp = *(u8*)(tmp4 + 4);
tmp *= 0x68; tmp *= 0x68;
@ -155,8 +153,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
tmp4 += tmp3; tmp4 += tmp3;
gChooseFileState.unk_0x10 = __modsi3(tmp4 + (0x9c << 1), 0x9c << 1); gChooseFileState.unk_0x10 = __modsi3(tmp4 + (0x9c << 1), 0x9c << 1);
unk_0x0 = 1; unk_0x0 = 1;
} } else {
else {
unk_0x0 = 0; unk_0x0 = 0;
} }
@ -221,7 +218,7 @@ void sub_080A3198(u32 param_1, u32 param_2) {
if (r4 != 0) { if (r4 != 0) {
sub_0805F46C(r4, &gUnk_08127C98); sub_0805F46C(r4, &gUnk_08127C98);
} }
gScreen.bg0.updated = 1; gScreen.bg0.updated = 1;
} }
} }