diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-09-13 11:01:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 11:01:47 -0500 |
| commit | c1c2015f7046676b043641c0d1f9d9e29bc73647 (patch) | |
| tree | cbea3afbcdad3d6bcc178ae4abffa9bbe88549f7 /src/fldeff_sweetscent.c | |
| parent | 37cf3484223366ee381f15d9a2cfeaf3612fd228 (diff) | |
| parent | 9e9c40214f7672662820636167d2cc1469ca2ba1 (diff) | |
Merge pull request #430 from camthesaxman/scrcmd_renaming
(don't merge yet) rename script commands
Diffstat (limited to 'src/fldeff_sweetscent.c')
| -rw-r--r-- | src/fldeff_sweetscent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 4c3e6bf4a..b9dbf619d 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -23,15 +23,15 @@ extern u8 SweetScentNothingHereScript[]; bool8 SetUpFieldMove_SweetScent(void) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_812BFD4; return TRUE; } static void sub_812BFD4(void) { - FieldEffectStart(51); - gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened; + FieldEffectStart(FLDEFF_SWEET_SCENT); + gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; } bool8 FldEff_SweetScent() @@ -51,7 +51,7 @@ static void sub_812C01C(void) BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F); taskId = CreateTask(sub_812C084, 0); gTasks[taskId].data[0] = 0; - FieldEffectActiveListRemove(51); + FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT); } static void sub_812C084(u8 taskId) |