finish decompiling main.c (#17)

* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting

* decompile up to nonmatching VBlankIntr

* finish decompiling main.c

* formatting

1 files changed, 165 insertions, 29 deletions

diff --git a/src/main.c b/src/main.c
index ff28b1e84..32e0429d3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,6 +3,12 @@
 #include "gba/flash_internal.h"
 #include "gba/m4a_internal.h"
 
+extern u16 GetGpuReg(u8);
+extern void SetGpuReg(u8, u16);
+extern void LinkVSync(void);
+extern void sub_800E174(void);
+extern void sub_800B9B8(void);
+
 extern struct SoundInfo gSoundInfo;
 extern u32 gFlashMemoryPresent;
 extern u32 IntrMain[];
@@ -10,7 +16,10 @@ extern u8 gHeap[];
 extern struct SaveBlock2 gUnknown_02024A54;
 extern char *gUnknown_03005D94;
 extern char gUnknown_02029808[];
-extern u32 gUnknown_0203CF5C;
+extern u16 gIntrCheck;
+extern u32 gBattleTypeFlags;
+extern u8 gUnknown_03002748;
+//extern u32 gUnknown_0203CF5C;
 
 void Timer3Intr(void);
 bool8 HandleLinkConnection(void);
@@ -22,7 +31,6 @@ static void VCountIntr(void);
 static void SerialIntr(void);
 static void IntrDummy(void);
 
-
 const u8 gGameVersion = VERSION_EMERALD;
 
 const u8 gGameLanguage = GAME_LANGUAGE; // English
@@ -70,7 +78,7 @@ static void InitMainCallbacks(void);
 static void CallCallbacks(void);
 static void SeedRngWithRtc(void);
 static void ReadKeys(void);
-static void InitIntrHandlers(void);
+void InitIntrHandlers(void);
 static void WaitForVBlank(void);
 
 #define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON)
@@ -149,10 +157,17 @@ static void UpdateLinkAndCallCallbacks(void)
         CallCallbacks();
 }
 
+struct gUnknown_0203CF5C_Struct
+{
+    u32 value;
+};
+
+extern struct gUnknown_0203CF5C_Struct gUnknown_0203CF5C;
+
 static void InitMainCallbacks(void)
 {
     gMain.vblankCounter1 = 0;
-    gUnknown_0203CF5C = 0;
+    gUnknown_0203CF5C.value = 0;
     gMain.vblankCounter2 = 0;
     gMain.callback1 = NULL;
     SetMainCallback2(c2_copyright_1);
@@ -193,12 +208,19 @@ u16 GetTrainerId(void)
     return gTrainerId;
 }
 
-/*
+void EnableVCountIntrAtLine150(void)
+{
+    u16 gpuReg = GetGpuReg(0x4) & 0xFF | 0x9600;
+
+    SetGpuReg(4, gpuReg | 0x20);
+    EnableInterrupts(0x4); // please use IRQ_MASK_VCOUNT
+}
+
 void InitKeys(void)
 {
     gKeyRepeatContinueDelay = 5;
     gKeyRepeatStartDelay = 40;
-
+    
     gMain.heldKeys = 0;
     gMain.newKeys = 0;
     gMain.newAndRepeatedKeys = 0;
@@ -237,7 +259,7 @@ static void ReadKeys(void)
     gMain.heldKeys = gMain.heldKeysRaw;
 
     // Remap L to A if the L=A option is enabled.
-    if (gSaveBlock2.optionsButtonMode == 2)
+    if (gSaveBlock2Ptr->optionsButtonMode == 2)
     {
         if (gMain.newKeys & L_BUTTON)
             gMain.newKeys |= A_BUTTON;
@@ -250,7 +272,7 @@ static void ReadKeys(void)
         gMain.watchedKeysPressed = TRUE;
 }
 
-static void InitIntrHandlers(void)
+void InitIntrHandlers(void)
 {
     int i;
 
@@ -266,9 +288,8 @@ static void InitIntrHandlers(void)
     SetSerialCallback(NULL);
 
     REG_IME = 1;
-    REG_IE = INTR_FLAG_VBLANK;
-    REG_DISPSTAT = DISPSTAT_VBLANK_INTR;
-    REG_IE |= INTR_FLAG_VBLANK;
+    
+    EnableInterrupts(0x1);
 }
 
 void SetVBlankCallback(IntrCallback callback)
@@ -286,43 +307,146 @@ void SetVCountCallback(IntrCallback callback)
     gMain.vcountCallback = callback;
 }
 
+void RestoreSerialTimer3IntrHandlers(void)
+{
+    gIntrTable[1] = SerialIntr;
+    gIntrTable[2] = Timer3Intr;
+}
+
 void SetSerialCallback(IntrCallback callback)
 {
     gMain.serialCallback = callback;
 }
 
+extern void CopyBufferedValuesToGpuRegs(void);
+extern void ProcessDma3Requests(void);
+
+#ifdef NONMATCHING
 static void VBlankIntr(void)
 {
-    u16 savedIme;
-
-    if (!gLinkVSyncDisabled)
+    if (gLinkVSyncDisabled != FALSE)
         LinkVSync();
+    else if(gUnknown_03002748 == FALSE)
+        sub_800B9B8();
 
-    savedIme = REG_IME;
-    REG_IME = 0;
-    m4aSoundVSync();
-    REG_IME = savedIme;
-
-    gMain.vblankCounter1++;
+    gMain.vblankCounter1++; // in the original asm, gMain is put into r0 for this addition and then preserved in r4 after it. the compiler wants to skip that and put it in either r4 or r1.
 
+    if(gUnknown_0203CF5C.value > 0)
+        if(gUnknown_0203CF5C.value < 0xFFFFFFFF)
+            gUnknown_0203CF5C.value++;
+    
     if (gMain.vblankCallback)
         gMain.vblankCallback();
 
     gMain.vblankCounter2++;
+    
+    CopyBufferedValuesToGpuRegs();
+    ProcessDma3Requests();
 
     gPcmDmaCounter = gSoundInfo.pcmDmaCounter;
 
     m4aSoundMain();
-    sub_800C35C();
-    Random();
+    sub_8033648();
+
+    if(!gMain.inBattle || (gBattleTypeFlags & 0x013F0102) == 0)
+        Random();
 
-    INTR_CHECK |= INTR_FLAG_VBLANK;
+    sub_800E174();
+
+    gIntrCheck |= INTR_FLAG_VBLANK;
     gMain.intrCheck |= INTR_FLAG_VBLANK;
 }
+#else
+__attribute__((naked))
+static void VBlankIntr(void)
+{
+    asm(".syntax unified\n\
+    push {r4,lr}\n\
+    ldr r0, =gLinkVSyncDisabled\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _0800074C\n\
+    bl LinkVSync\n\
+    b _08000758\n\
+    .pool\n\
+_0800074C:\n\
+    ldr r0, =gUnknown_03002748\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _08000758\n\
+    bl sub_800B9B8\n\
+_08000758:\n\
+    ldr r0, =gMain\n\
+    ldr r1, [r0, 0x20]\n\
+    adds r1, 0x1\n\
+    str r1, [r0, 0x20]\n\
+    ldr r1, =gUnknown_0203CF5C\n\
+    ldr r1, [r1]\n\
+    adds r4, r0, 0\n\
+    cmp r1, 0\n\
+    beq _08000778\n\
+    ldr r2, [r1]\n\
+    movs r0, 0x2\n\
+    negs r0, r0\n\
+    cmp r2, r0\n\
+    bhi _08000778\n\
+    adds r0, r2, 0x1\n\
+    str r0, [r1]\n\
+_08000778:\n\
+    ldr r0, [r4, 0xC]\n\
+    cmp r0, 0\n\
+    beq _08000782\n\
+    bl _call_via_r0\n\
+_08000782:\n\
+    ldr r0, [r4, 0x24]\n\
+    adds r0, 0x1\n\
+    str r0, [r4, 0x24]\n\
+    bl CopyBufferedValuesToGpuRegs\n\
+    bl ProcessDma3Requests\n\
+    ldr r1, =gPcmDmaCounter\n\
+    ldr r0, =gSoundInfo\n\
+    ldrb r0, [r0, 0x4]\n\
+    strb r0, [r1]\n\
+    bl m4aSoundMain\n\
+    bl sub_8033648\n\
+    ldr r1, =0x00000439\n\
+    adds r0, r4, r1\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _080007BA\n\
+    ldr r0, =gBattleTypeFlags\n\
+    ldr r0, [r0]\n\
+    ldr r1, =0x013f0102\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080007BE\n\
+_080007BA:\n\
+    bl Random\n\
+_080007BE:\n\
+    bl sub_800E174\n\
+    ldr r2, =gIntrCheck\n\
+    ldrh r0, [r2]\n\
+    movs r1, 0x1\n\
+    orrs r0, r1\n\
+    strh r0, [r2]\n\
+    ldr r0, =gMain\n\
+    ldrh r2, [r0, 0x1C]\n\
+    ldrh r3, [r0, 0x1C]\n\
+    orrs r1, r2\n\
+    strh r1, [r0, 0x1C]\n\
+    pop {r4}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
+    .syntax divided");
+}
+#endif
 
-void InitFlashTimer(void)
+void StartFlashMemoryTimer(void)
 {
-    SetFlashTimerIntr(2, gFlashTimerIntrFunc);
+    SetFlashTimerIntr(2, gIntrTable + 0x7);
 }
 
 static void HBlankIntr(void)
@@ -339,7 +463,8 @@ static void VCountIntr(void)
     if (gMain.vcountCallback)
         gMain.vcountCallback();
 
-    INTR_CHECK |= INTR_FLAG_VCOUNT;
+    m4aSoundVSync();
+    gIntrCheck |= INTR_FLAG_VCOUNT;
     gMain.intrCheck |= INTR_FLAG_VCOUNT;
 }
 
@@ -348,7 +473,7 @@ static void SerialIntr(void)
     if (gMain.serialCallback)
         gMain.serialCallback();
 
-    INTR_CHECK |= INTR_FLAG_SERIAL;
+    gIntrCheck |= INTR_FLAG_SERIAL;
     gMain.intrCheck |= INTR_FLAG_SERIAL;
 }
 
@@ -358,7 +483,19 @@ static void IntrDummy(void)
 static void WaitForVBlank(void)
 {
     gMain.intrCheck &= ~INTR_FLAG_VBLANK;
-    VBlankIntrWait();
+    
+    while(!(gMain.intrCheck & 0x1))
+        ;
+}
+
+void sub_80008DC(u32 var)
+{
+    gUnknown_0203CF5C.value = var;
+}
+
+void sub_80008E8(void)
+{
+    gUnknown_0203CF5C.value = 0;
 }
 
 void DoSoftReset(void)
@@ -377,4 +514,3 @@ void ClearPokemonCrySongs(void)
 {
     CpuFill16(0, gPokemonCrySongs, MAX_POKEMON_CRIES * sizeof(struct PokemonCrySong));
 }
-*/
\ No newline at end of file