finish fade.c

4 files changed, 18 insertions, 12 deletions

diff --git a/include/arm_proxy.h b/include/arm_proxy.h
index c07a649e..9364ebf0 100644
--- a/include/arm_proxy.h
+++ b/include/arm_proxy.h
@@ -1,6 +1,6 @@
 #ifndef ARM_PROXY_H
 #define ARM_PROXY_H
 
-extern void PrepNextFrame(void);
+extern void WaitForNextFrame(void);
 
 #endif
diff --git a/include/audio.h b/include/audio.h
index 99ccf298..ccfdee57 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -593,6 +593,6 @@ extern SoundPlayingInfo gSoundPlayingInfo;
 
 void InitSound(void);
 void SoundReq(Sound sound);
-void SoundLoop(void);
+void AudioMain(void);
 
 #endif // AUDIO_H
diff --git a/include/functions.h b/include/functions.h
index d9125a19..1b446323 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -49,7 +49,6 @@ extern u32 GetSaleItemConfirmMessageID(u32);
 extern void FlushSprites(void);
 extern void DispReset(u32);
 extern void InitSoundPlayingInfo(void);
-extern void InitDMA(void);
 extern Entity* CreateProjectile(u32);
 extern void RegisterPlayerHitbox();
 extern s32 GetItemPrice();
diff --git a/include/main.h b/include/main.h
index 5721b22d..c9675bfe 100644
--- a/include/main.h
+++ b/include/main.h
@@ -47,18 +47,23 @@ enum {
     SCREEN_DEBUG_TEXT,
 };
 
+enum {
+    DEFAULT,
+    SLEEP,
+};
+
 typedef struct {
     vu8 interruptFlag;
-    u8 field_0x1;
+    u8 sleepStatus;
     u8 screen;
     u8 funcIndex;
     u8 transition;
     u8 field_0x5;
     u8 muteAudio;
     u8 field_0x7;
-    u8 countdown;
-    u8 field_0x9;
-    u8 field_0xa;
+    u8 pauseFrames;
+    u8 pauseCount;
+    u8 pauseInterval;
     u16 ticks;
 } Main;
 
@@ -84,18 +89,20 @@ extern UI gUnk_02032EC0;
  */
 void InitScreen(u32 screen);
 
+void InitDMA(void);
+
 extern void sub_08056208(void);
-extern void sub_0804FFE4(void);
-extern void sub_080ADD30(void);
+extern void InitFade(void);
+extern void ResetPalettes(void);
 
 extern void DoSoftReset(void);
-extern void sub_08056260(void);
+extern void SetSleepMode(void);
 extern void VBlankIntrWait();
-extern void UpdateFade(void);
+extern void FadeMain(void);
 
 extern u8 gUnk_03003DE4;
 
-extern void sub_0804FF84(u32);
+extern void SetBrightness(u32);
 extern u16 gPaletteBuffer[];
 extern void VBlankInterruptWait(void);
 extern void DisableInterruptsAndDMA(void);