diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-27 17:18:23 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-27 17:18:23 -0400 |
commit | a178ce5d9733abfbf13f1d9e8ae5557915e3afa6 (patch) | |
tree | e99cba1e5e3a893cc2eeb6ebb4cd75439cb4f50b /arm9/src/scrcmd_18_c.c | |
parent | e4ddc167504a65fabbeb77d9db6e4241b92b2a54 (diff) |
Resolve warnings in scrcmd_18_c and script_pokemon_util
Diffstat (limited to 'arm9/src/scrcmd_18_c.c')
-rw-r--r-- | arm9/src/scrcmd_18_c.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arm9/src/scrcmd_18_c.c b/arm9/src/scrcmd_18_c.c index d2753587..b8bbbcdd 100644 --- a/arm9/src/scrcmd_18_c.c +++ b/arm9/src/scrcmd_18_c.c @@ -4,6 +4,7 @@ #include "save_block_2.h"
#include "unk_0204639C.h"
#include "map_header.h"
+#include "scrcmd.h"
extern u16 VarGet(struct UnkStruct_0204639C* arg, u16 wk);
extern u16 *GetVarPointer(struct UnkStruct_0204639C* arg, u16);
@@ -18,6 +19,6 @@ THUMB_FUNC BOOL ScrCmd_givemon(struct ScriptContext* ctx) u16 item = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
u16 * varPtr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
struct PlayerParty * party = SavArray_PlayerParty_get((struct SaveBlock2 *) savePtr->unkC);
- *varPtr = GiveMon(11, (struct SaveBlock2 *) savePtr->unkC, species, level, item, mapSec, 12);
+ *varPtr = (u16)GiveMon(11, (struct SaveBlock2 *) savePtr->unkC, species, (u8)level, item, mapSec, 12);
return FALSE;
}
|