From f4b261415c39a1803c8bf089d047736c4b763b33 Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Tue, 28 Dec 2021 05:41:26 +0200
Subject: [PATCH] Move sub_080ADA04 to screen.h

---
 include/functions.h |  2 --
 include/screen.h    |  2 ++
 src/demoScreen.c    | 14 +++++---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index 105228da..77def4f0 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -224,6 +224,4 @@ extern void sub_080806BC(u32, u32, u32, u32);
 
 extern void LoadObjPalette(Entity*, u32);
 
-extern void sub_080ADA04(OAMCommand*, void*);
-
 #endif
diff --git a/include/screen.h b/include/screen.h
index 53f56b89..e057442a 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -82,4 +82,6 @@ extern BgControls gBgControls;
 extern Screen gScreen;
 extern OAMCommand gOamCmd;
 
+extern void sub_080ADA04(OAMCommand*, void*);
+
 #endif
diff --git a/src/demoScreen.c b/src/demoScreen.c
index 2d0ef585..efc3368d 100644
--- a/src/demoScreen.c
+++ b/src/demoScreen.c
@@ -110,16 +110,14 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
         val = 0;
         keys = gInput.heldKeys;
         switch (keys) {
-            case DPAD_RIGHT:
-            {
+            case DPAD_RIGHT: {
                 if (gChooseFileState.unk_0x0 == 0) {
                     val = 1;
                     gChooseFileState.unk_0x20 = 4;
                     SoundReq(SFX_TEXTBOX_CHOICE);
                 }
             }
-            case DPAD_LEFT:
-            {
+            case DPAD_LEFT: {
                 if (gChooseFileState.unk_0x0 == 0) {
                     val = -1;
                     gChooseFileState.unk_0x20 = 0xfc;
@@ -127,8 +125,7 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
                 }
             }
             case START_BUTTON:
-            case A_BUTTON:
-            {
+            case A_BUTTON: {
                 if (gChooseFileState.unk_0x0 == 0) {
                     gMain.screen = 2;
                     gMain.funcIndex = gChooseFileState.unk_0x0;
@@ -146,13 +143,12 @@ NONMATCH("asm/non_matching/demoScreen/sub_080A2FD0.inc", void sub_080A2FD0(void)
         tmp = gSaveHeader->saveFileId;
         tmp *= 0x68;
 
-       if (tmp != tmp3) {
+        if (tmp != tmp3) {
             tmp5 = gChooseFileState.unk_0x20;
             tmp5 += tmp3;
             gChooseFileState.unk_0x10 = (tmp5 + (0x9c << 1)) % (0x9c << 1);
             unk_0x0 = 1;
-        }
-        else {
+        } else {
             unk_0x0 = 0;
         }