dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into berry_crush

Browse Source
This commit is contained in:
Kurausukun
2020-12-10 23:30:52 -05:00
parent 32ae13f9b6 8d29f65c6c
commit 58976ebaa8
500 changed files with 25386 additions and 24803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/trainer_see.c
View File

@@ -603,7 +603,7 @@ static void sub_80B44C8(u8 taskId)
struct ObjectEvent *objEvent;
// another objEvent loaded into by loadword?
LoadWordFromTwoHalfwords((u16*)&task->data[1], (u32 *)&objEvent);
LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent);
if (!task->data[7])
{
ObjectEventClearHeldMovement(objEvent);
@@ -624,7 +624,7 @@ static void sub_80B44C8(u8 taskId)
void sub_80B4578(struct ObjectEvent *var)
{
StoreWordInTwoHalfwords((u16 *)&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
}
void EndTrainerApproach(void)