3 files changed, 47 insertions, 46 deletions
diff --git a/include/brightness.h b/include/brightness.h
new file mode 100644
index 00000000..029ee0b9
--- /dev/null
+++ b/include/brightness.h
@@ -0,0 +1,38 @@
+#ifndef POKEDIAMOND_UNK_0200A104_H
+#define POKEDIAMOND_UNK_0200A104_H
+
+#include "global.h"
+#include "nitro/FX_types.h"
+
+struct BrightnessData
+{
+    fx32 surfaceMask;
+    u32 screenMask;
+    u16 step_count;
+    s16 target_brightness;
+    u32 unk0c;
+    s8 transition_direction;
+    s16 brightness_diff;
+    s16 step_size_integer;
+    u16 step_size_fractional;
+    u16 fractional_count;
+    s16 current_brightness;
+    BOOL transitionActive;
+};
+
+void DoBrightnessTransitionStep(struct BrightnessData *brightness);
+void InitBrightnessTransition(struct BrightnessData *brightnessData,
+    u16 step_count,
+    s16 target_brightness,
+    s16 start_brightness,
+    fx32 surfaceMask,
+    u32 screenMask);
+void StartBrightnessTransition(
+    u16 step_count, s16 target_brightness, s16 start_brightness, fx32 surfaceMask, u32 screenMask);
+void SetBrightness(fx32 brightness, fx32 surfaceMask, u32 screenMask);
+void InitAllScreenBrightnessData(void);
+void InitScreenBrightnessData(u32 screenMask);
+void DoAllScreenBrightnessTransitionStep(void);
+BOOL IsBrightnessTransitionActive(u32 screenMask);
+
+#endif // POKEDIAMOND_UNK_0200A104_H
diff --git a/include/unk_02009EAC.h b/include/oam.h
index a2242605..773c985d 100644
--- a/include/unk_02009EAC.h
+++ b/include/oam.h
@@ -4,7 +4,7 @@
 #include "global.h"
 #include "NNS_g2d.h"
 
-struct UnkStruct_02009EAC
+struct OamData
 {
     NNSG2dOamManager oamManagers[2];
     u32 heap_id;
@@ -19,7 +19,7 @@ void FUN_02009EAC(s32 param0,
     u32 param6,
     u32 param7,
     u32 param8);
-void FUN_02009EF0(s32 param0,
+void InitOamData(s32 param0,
     s32 param1,
     s32 param2,
     s32 param3,
@@ -28,15 +28,15 @@ void FUN_02009EF0(s32 param0,
     u32 param6,
     u32 param7,
     u32 heap_id);
-void FUN_02009F80(void);
-void FUN_02009FA0(void);
+void ApplyAndResetOamManagerBuffer(void);
+void DeinitOamData(void);
 void FUN_02009FD8(void *param0, u32 *param1, u32 param2, u32 param3);
-NNSG2dOamManager *FUN_0200A03C(u32 param0);
+NNSG2dOamManager *GetOamManager(u32 screen);
 void FUN_0200A064(u32 heap_id);
 void FUN_0200A06C(u32 heap_id);
-u32 FUN_0200A074(u32 param0, u32 param1);
-u32 FUN_0200A094(u32 param0, u32 param1);
-u32 FUN_0200A0B8(u32 param0);
-u32 FUN_0200A0DC(u32 param0);
+u32 EntryOamManagerOamWithAffineIdxMainScreen(u32 param0, u32 param1);
+u32 EntryOamManagerOamWithAffineIdxSubScreen(u32 param0, u32 param1);
+u32 EntryOamManagerAffineMainScreen(u32 param0);
+u32 EntryOamManagerAffineSubScreen(u32 param0);
 
 #endif // POKEDIAMOND_UNK_02009EAC_H
diff --git a/include/unk_0200A104.h b/include/unk_0200A104.h
deleted file mode 100644
index de46ed49..00000000
--- a/include/unk_0200A104.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef POKEDIAMOND_UNK_0200A104_H
-#define POKEDIAMOND_UNK_0200A104_H
-
-#include "global.h"
-#include "nitro/FX_types.h"
-
-
-#define reg_addr_G2_BLDCNT              (u16 *)0x4000050
-#define reg_addr_G2S_DB_BLDCNT          (u16 *)0x4001050
-
-struct UnkStruct_0200A104
-{
-    fx32 unk00;
-    u32 unk04;
-    u16 unk08;
-    s16 unk0a;
-    u32 unk0c;
-    s8 unk10;
-    s16 unk12;
-    s16 unk14;
-    u16 unk16;
-    u16 unk18;
-    s16 unk1a;
-    u32 unk1c;
-};
-
-void FUN_0200A104(struct UnkStruct_0200A104 *param0);
-void FUN_0200A1A0(
-    struct UnkStruct_0200A104 *param0, u16 param1, s16 param2, s16 param3, fx32 param4, u32 param5);
-void FUN_0200A208(u16 param0, s16 param1, s16 param2, fx32 param3, u32 param4);
-void FUN_0200A274(fx32 brightness, fx32 param1, u32 param2);
-void FUN_0200A2AC(void);
-void FUN_0200A2D8(u32 param0);
-void FUN_0200A318(void);
-u32 FUN_0200A344(u32 param0);
-
-#endif // POKEDIAMOND_UNK_0200A104_H