From d2721ed191cfbd8db21dc51d710cde830506fb6a Mon Sep 17 00:00:00 2001
From: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Date: Sat, 2 Oct 2021 07:02:18 -0400
Subject: [PATCH] Match LoadBattleDmaData (#455)

* Match LoadBattleDmaData

* Delete LoadBattleDmaData.s

* Add DmaTable

* Update battle.h

* Fix build

* Fix Fix

* Fix Fix's Fix
---
 include/common_structs.h                      |  6 +++
 src/181810.c                                  | 17 +++++++-
 src/battle/battle.h                           |  2 +-
 .../nonmatchings/181810/LoadBattleDmaData.s   | 40 -------------------
 4 files changed, 23 insertions(+), 42 deletions(-)
 delete mode 100644 ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s

diff --git a/include/common_structs.h b/include/common_structs.h
index 4f1a9a8a72..1c64386544 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -92,6 +92,12 @@ typedef struct CamPosSettings {
     /* 0x10 */ Vec3f position;
 } CamPosSettings; // size = 0x1C
 
+typedef struct DmaTable {
+    /* 0x00 */ s32 dmaStart;
+    /* 0x04 */ s32 dmaEnd;
+    /* 0x08 */ s32 dmaDest;
+} DmaTable;
+
 typedef struct PartnerData {
     /* 0x00 */ u8 enabled;
     /* 0x01 */ s8 level;
diff --git a/src/181810.c b/src/181810.c
index 7f0e300607..1b325e5f0d 100644
--- a/src/181810.c
+++ b/src/181810.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "battle/battle.h"
 
 extern MessagePrintState* gSpeakingActorPrintCtx;
 extern MessagePrintState* D_8029FA64;
@@ -211,7 +212,21 @@ ApiStatus OverrideBattleDmaDest(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "181810", LoadBattleDmaData);
+ApiStatus LoadBattleDmaData(Evt* script, s32 isInitialCall) {
+    s32* moveScript = &gBattleAreas[gCurrentBattleSection].dmaTable[evt_get_variable(script, *script->ptrReadPos)];
+
+    if (moveScript == NULL) {
+        return ApiStatus_DONE2;
+    }
+    
+    if (gBattleDmaDest == 0) {
+            dma_copy(moveScript[0], moveScript[1], moveScript[2]);
+        } else {
+            dma_copy(moveScript[0], moveScript[1], gBattleDmaDest);
+    }
+
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_802536A8(Evt* script, s32 isInitialCall) {
     BattleStatus* battleStatus = &gBattleStatus;
diff --git a/src/battle/battle.h b/src/battle/battle.h
index c9fd475aac..a4b4a5de66 100644
--- a/src/battle/battle.h
+++ b/src/battle/battle.h
@@ -315,7 +315,7 @@ typedef struct BattleArea {
     /* 0x10 */ BattleList* battles;
     /* 0x14 */ StageList* stages;
     /* 0x18 */ s32 unused_18;
-    /* 0x1C */ void* dmaTable;
+    /* 0x1C */ DmaTable* dmaTable;
 } BattleArea; // size = 0x20
 
 extern BattleArea gBattleAreas[0x30];
diff --git a/ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s b/ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s
deleted file mode 100644
index 3de70e1096..0000000000
--- a/ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s
+++ /dev/null
@@ -1,40 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel LoadBattleDmaData
-/* 181F04 80253624 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 181F08 80253628 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 181F0C 8025362C 8C82000C */  lw        $v0, 0xc($a0)
-/* 181F10 80253630 0C0B1EAF */  jal       evt_get_variable
-/* 181F14 80253634 8C450000 */   lw       $a1, ($v0)
-/* 181F18 80253638 00021840 */  sll       $v1, $v0, 1
-/* 181F1C 8025363C 3C04800E */  lui       $a0, %hi(gCurrentBattleSection)
-/* 181F20 80253640 9084C4EA */  lbu       $a0, %lo(gCurrentBattleSection)($a0)
-/* 181F24 80253644 00621821 */  addu      $v1, $v1, $v0
-/* 181F28 80253648 00042140 */  sll       $a0, $a0, 5
-/* 181F2C 8025364C 3C028009 */  lui       $v0, %hi(gBattleAreas+0x1C)
-/* 181F30 80253650 00441021 */  addu      $v0, $v0, $a0
-/* 181F34 80253654 8C425A4C */  lw        $v0, %lo(gBattleAreas+0x1C)($v0)
-/* 181F38 80253658 00031880 */  sll       $v1, $v1, 2
-/* 181F3C 8025365C 00431021 */  addu      $v0, $v0, $v1
-/* 181F40 80253660 5040000E */  beql      $v0, $zero, .L8025369C
-/* 181F44 80253664 24020002 */   addiu    $v0, $zero, 2
-/* 181F48 80253668 3C068028 */  lui       $a2, %hi(gBattleDmaDest)
-/* 181F4C 8025366C 8CC64000 */  lw        $a2, %lo(gBattleDmaDest)($a2)
-/* 181F50 80253670 14C00005 */  bnez      $a2, .L80253688
-/* 181F54 80253674 00000000 */   nop
-/* 181F58 80253678 8C440000 */  lw        $a0, ($v0)
-/* 181F5C 8025367C 8C450004 */  lw        $a1, 4($v0)
-/* 181F60 80253680 08094DA4 */  j         .L80253690
-/* 181F64 80253684 8C460008 */   lw       $a2, 8($v0)
-.L80253688:
-/* 181F68 80253688 8C440000 */  lw        $a0, ($v0)
-/* 181F6C 8025368C 8C450004 */  lw        $a1, 4($v0)
-.L80253690:
-/* 181F70 80253690 0C00A5CF */  jal       dma_copy
-/* 181F74 80253694 00000000 */   nop
-/* 181F78 80253698 24020002 */  addiu     $v0, $zero, 2
-.L8025369C:
-/* 181F7C 8025369C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 181F80 802536A0 03E00008 */  jr        $ra
-/* 181F84 802536A4 27BD0018 */   addiu    $sp, $sp, 0x18