Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-10 10:06:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ScrCmd_Unk0191

Browse Source
This commit is contained in:
red031000
2023-05-11 00:30:21 +01:00
parent b2b0a1e6ae
commit 8a30fdb892
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arm9/asm/scrcmd_asm.s
View File

@@ -14,29 +14,6 @@ UNK_021C5A0C: ; 0x021C5A0C
.text
thumb_func_start ScrCmd_Unk0191
ScrCmd_Unk0191: ; 0x0203B8E4
push {r3-r5, lr}
add r5, r0, #0x0
add r0, #0x80
ldr r0, [r0, #0x0]
mov r1, #0x13
bl FUN_02039438
add r1, r5, #0x0
add r1, #0x80
add r4, r0, #0x0
ldr r1, [r1, #0x0]
mov r0, #0x20
bl FUN_020379F8
str r0, [r4, #0x0]
ldr r1, _0203B910 ; =FUN_0203BC04
add r0, r5, #0x0
bl SetupNativeScript
mov r0, #0x1
pop {r3-r5, pc}
nop
_0203B910: .word FUN_0203BC04
thumb_func_start ScrCmd_Unk02A5
ScrCmd_Unk02A5: ; 0x0203B914
push {r3-r5, lr}

10
arm9/src/scrcmd.c
View File

@@ -92,6 +92,7 @@ extern void FUN_02058EB0(struct Vecx32 *vector, u32 param1);
extern u16 FUN_02029E0C(struct SealCase *sealCase);
extern u16 FUN_02029E2C(struct SealCase *sealCase, u16 sealId);
extern void FUN_02029D44(struct SealCase *sealCase, u16 sealId, s16 amount);
extern u32 FUN_020379F8(u32 param0, struct FieldSystem *fieldSystem);
extern u8 UNK_021C5A0C[4];
@@ -118,6 +119,8 @@ static void FUN_0203B174(struct FieldSystem *fieldSystem, u32 param1, void *para
static void FUN_0203B1A8(u32 param0, UnkStruct_0203B174 *param1);
static BOOL FUN_0203B218(struct ScriptContext *ctx);
extern BOOL FUN_0203BC04(struct ScriptContext *ctx);
extern u8 sScriptConditionTable[6][3];
THUMB_FUNC BOOL ScrCmd_Nop(struct ScriptContext *ctx) //0000
@@ -1810,3 +1813,10 @@ THUMB_FUNC BOOL ScrCmd_GetPokemonForme(struct ScriptContext *ctx) //0095
return FALSE;
}
THUMB_FUNC BOOL ScrCmd_Unk0191(struct ScriptContext *ctx) //0191
{
u32 *unk = FUN_02039438(ctx->fieldSystem, 0x13);
*unk = FUN_020379F8(0x20, ctx->fieldSystem);
SetupNativeScript(ctx, FUN_0203BC04);
return TRUE;
}

1
include/scrcmd.h
View File

@@ -138,6 +138,7 @@ BOOL ScrCmd_Unk02AB(struct ScriptContext *ctx);
BOOL ScrCmd_GetSealCountFromId(struct ScriptContext *ctx);
BOOL ScrCmd_GiveSeals(struct ScriptContext *ctx);
BOOL ScrCmd_GetPokemonForme(struct ScriptContext *ctx);
BOOL ScrCmd_Unk0191(struct ScriptContext *ctx);
// scrcmd_mart.c
BOOL ScrCmd_NormalMart(struct ScriptContext * ctx);