dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiple fixes

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-02 09:38:28 +08:00
parent 3ec40eb833
commit 5384fd020c
11 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fldeff_dig.c
+4 -5
View File
@@ -8,7 +8,7 @@
#include "sprite.h"
#include "constants/map_objects.h"
static void hm2_dig(void);
static void FieldCallback_Dig(void);
static void sub_80C9AFC(void);
bool8 SetUpFieldMove_Dig(void)
@@ -16,13 +16,13 @@ bool8 SetUpFieldMove_Dig(void)
if (CanUseEscapeRopeOnCurrMap() == TRUE)
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = hm2_dig;
gPostMenuFieldCallback = FieldCallback_Dig;
return TRUE;
}
return FALSE;
}
static void hm2_dig(void)
static void FieldCallback_Dig(void)
{
Overworld_ResetStateAfterDigEscRope();
FieldEffectStart(FLDEFF_USE_DIG);
@@ -33,8 +33,7 @@ bool8 FldEff_UseDig(void)
{
u8 taskId = oei_task_add();
gTasks[taskId].data[8] = (u32)sub_80C9AFC >> 16;
gTasks[taskId].data[9] = (u32)sub_80C9AFC;
FLDEFF_SET_FUNC_TO_DATA(sub_80C9AFC);
SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
return FALSE;
}