Merge branch 'master' of github.com:pret/pokediamond

8 files changed, 68 insertions, 11 deletions

diff --git a/include/macros.inc b/include/macros.inc
new file mode 100644
index 00000000..eb060422
--- /dev/null
+++ b/include/macros.inc
@@ -0,0 +1,5 @@
+.macro glabel label

+    .global \label

+    .thumb

+    \label:

+.endm

diff --git a/include/main.h b/include/main.h
index 499861a8..d40e22f9 100644
--- a/include/main.h
+++ b/include/main.h
@@ -22,7 +22,7 @@ struct UnkStruct_02006234
     u32 unk14;
     int * unk18;
     void * unk1C;
-    u32 unk20;
+    struct SaveBlock2 * unk20;
     u32 unk24;
 };
 
diff --git a/include/nitro/PXI_fifo_shared.h b/include/nitro/PXI_fifo_shared.h
index 2698e89d..297625a1 100644
--- a/include/nitro/PXI_fifo_shared.h
+++ b/include/nitro/PXI_fifo_shared.h
@@ -13,6 +13,12 @@
 #ifndef POKEDIAMOND_PXI_FIFO_SHARED_H
 #define POKEDIAMOND_PXI_FIFO_SHARED_H
 
+typedef enum
+{
+    PXI_PROC_ARM9 = 0,
+    PXI_PROC_ARM7 = 1
+} PXIProc;
+
 typedef enum {
     PXI_FIFO_TAG_EX = 0,               // Extension format
     PXI_FIFO_TAG_USER_0,               // for application programmer, use it in free
diff --git a/include/options.h b/include/options.h
index 5f7a3d3f..fbddbffc 100644
--- a/include/options.h
+++ b/include/options.h
@@ -1,15 +1,33 @@
 #ifndef POKEDIAMOND_OPTIONS_H
 #define POKEDIAMOND_OPTIONS_H
 
+struct SaveBlock2;
+
 struct Options {
-    u16 unk0_0:4;
-    u16 unk0_4:2;
-    u16 unk0_6:1;
-    u16 unk0_7:1;
-    u16 unk0_8:2;
-    u16 unk0_A:5;
+    u16 textSpeed:4;
+    u16 soundMethod:2;
+    u16 battleStyle:1;
+    u16 battleScene:1;
+    u16 buttonMode:2;
+    u16 frame:5;
 };
 
+struct Options * Options_new(u32 heap_id);
+void Options_copy(struct Options * src, struct Options * dest);
 void Options_init(struct Options * options);
+void Options_SetButtonModeOnMain(struct SaveBlock2 * sav2, u32 buttonMode);
+u16 Options_GetTextSpeed(struct Options * options);
+void Options_SetTextSpeed(struct Options * options, u16 textSpeed);
+u32 Options_GetTextFrameDelay(struct Options * options);
+u16 Options_GetSoundMethod(struct Options * options);
+void Options_SetSoundMethod(struct Options * options, u16 soundMethod);
+u16 Options_GetBattleScene(struct Options * options);
+void Options_SetBattleScene(struct Options * options, u16 battleScene);
+u16 Options_GetBattleStyle(struct Options * options);
+void Options_SetBattleStyle(struct Options * options, u16 battleStyle);
+u16 Options_GetButtonMode(struct Options * options);
+void Options_SetButtonMode(struct Options * options, u16 buttonMode);
+u16 Options_GetFrame(struct Options * options);
+void Options_SetFrame(struct Options * options, u16 frame);
 
 #endif //POKEDIAMOND_OPTIONS_H
diff --git a/include/overlay_manager.h b/include/overlay_manager.h
new file mode 100644
index 00000000..193bc7e8
--- /dev/null
+++ b/include/overlay_manager.h
@@ -0,0 +1,16 @@
+#ifndef POKEDIAMOND_OVERLAY_MANAGER_H
+#define POKEDIAMOND_OVERLAY_MANAGER_H
+
+#include "nitro/types.h"
+
+struct Unk21DBE18;
+
+struct UnkStruct_02006234 * OverlayManager_new(struct Unk21DBE18 * ovly_mgr, int * a1, u32 heap_id);
+void OverlayManager_delete(struct UnkStruct_02006234 * a0);
+void * OverlayManager_CreateAndGetData(struct UnkStruct_02006234 * a0, u32 size, u32 heap_id);
+void * OverlayManager_GetData(struct UnkStruct_02006234 * a0);
+void OverlayManager_FreeData(struct UnkStruct_02006234 * a0);
+int * OverlayManager_GetField18(struct UnkStruct_02006234 * a0);
+BOOL OverlayManager_Run(struct UnkStruct_02006234 * a0);
+
+#endif //POKEDIAMOND_OVERLAY_MANAGER_H
diff --git a/include/unk_0200CA44.h b/include/unk_0200CA44.h
index 27d58c5c..2e479ab8 100644
--- a/include/unk_0200CA44.h
+++ b/include/unk_0200CA44.h
@@ -1,10 +1,10 @@
 #ifndef POKEDIAMOND_UNK_0200CA44_H
 #define POKEDIAMOND_UNK_0200CA44_H
 
-void FUN_0200CA44(void (*r0)(void *, void *), void * r1, void * r2);
-void FUN_0200CA60(void (*r0)(void *, void *), void * r1, void * r2);
-void FUN_0200CA7C(void (*r0)(void *, void *), void * r1, void * r2);
-void FUN_0200CA98(void (*r0)(void *, void *), void * r1, void * r2);
+BOOL FUN_0200CA44(void (*r0)(u32, void *), void * r1, void * r2);
+BOOL FUN_0200CA60(void (*r0)(u32, void *), void * r1, void * r2);
+BOOL FUN_0200CA7C(void (*r0)(u32, void *), void * r1, void * r2);
+BOOL FUN_0200CA98(void (*r0)(u32, void *), void * r1, void * r2);
 void FUN_0200CAB4(s32 unk1);
 
 #endif //POKEDIAMOND_UNK_0200CA44_H
diff --git a/include/unk_02029FB0.h b/include/unk_02029FB0.h
new file mode 100644
index 00000000..545a6d3a
--- /dev/null
+++ b/include/unk_02029FB0.h
@@ -0,0 +1,9 @@
+#ifndef POKEDIAMOND_UNK_02029FB0_H
+#define POKEDIAMOND_UNK_02029FB0_H
+
+struct UnkStruct_02029FB0
+{
+    u8 unk[0x14C];
+};
+
+#endif
diff --git a/include/unk_0202C144.h b/include/unk_0202C144.h
index 31d3942c..95ca3be4 100644
--- a/include/unk_0202C144.h
+++ b/include/unk_0202C144.h
@@ -1,6 +1,9 @@
 #ifndef POKEDIAMOND_UNK_0202C144_H

 #define POKEDIAMOND_UNK_0202C144_H

 

+#include "save_block_2.h"

+#include "pokemon.h"

+

 void FUN_0202C144(struct SaveBlock2 * sav2, struct Pokemon * mon);

 

 #endif //POKEDIAMOND_UNK_0202C144_H