pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match LoadBattleDmaData (#455)

Browse Source 
* Match LoadBattleDmaData

* Delete LoadBattleDmaData.s

* Add DmaTable

* Update battle.h

* Fix build

* Fix Fix

* Fix Fix's Fix
This commit is contained in:
JoshDuMan 2021-10-02 07:02:18 -04:00 committed by GitHub
parent 387414b395
commit d2721ed191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common_structs.h
View File

@ -92,6 +92,12 @@ typedef struct CamPosSettings {
/* 0x10 */ Vec3f position; /* 0x10 */ Vec3f position;
} CamPosSettings; // size = 0x1C } CamPosSettings; // size = 0x1C
typedef struct DmaTable {
/* 0x00 */ s32 dmaStart;
/* 0x04 */ s32 dmaEnd;
/* 0x08 */ s32 dmaDest;
} DmaTable;
typedef struct PartnerData { typedef struct PartnerData {
/* 0x00 */ u8 enabled; /* 0x00 */ u8 enabled;
/* 0x01 */ s8 level; /* 0x01 */ s8 level;

17
src/181810.c
View File

@ -1,4 +1,5 @@
#include "common.h" #include "common.h"
#include "battle/battle.h"
extern MessagePrintState* gSpeakingActorPrintCtx; extern MessagePrintState* gSpeakingActorPrintCtx;
extern MessagePrintState* D_8029FA64; extern MessagePrintState* D_8029FA64;
@ -211,7 +212,21 @@ ApiStatus OverrideBattleDmaDest(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2; 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) { ApiStatus func_802536A8(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus; BattleStatus* battleStatus = &gBattleStatus;

2
src/battle/battle.h
View File

@ -315,7 +315,7 @@ typedef struct BattleArea {
/* 0x10 */ BattleList* battles; /* 0x10 */ BattleList* battles;
/* 0x14 */ StageList* stages; /* 0x14 */ StageList* stages;
/* 0x18 */ s32 unused_18; /* 0x18 */ s32 unused_18;
/* 0x1C */ void* dmaTable; /* 0x1C */ DmaTable* dmaTable;
} BattleArea; // size = 0x20 } BattleArea; // size = 0x20
extern BattleArea gBattleAreas[0x30]; extern BattleArea gBattleAreas[0x30];

40
ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s
View File

@ -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