diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-12 16:53:04 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-12 16:53:04 -0500 |
| commit | a185f8a26dc5e5a04908c272ab54bede7af8a10c (patch) | |
| tree | 9e427bbb6c06e6e6693bd5dfeed04140acb5554e /src/pokemon_menu.c | |
| parent | 3b3d1596526ad0b19f7042d5176d92eac4738451 (diff) | |
lots more relabeling
Diffstat (limited to 'src/pokemon_menu.c')
| -rw-r--r-- | src/pokemon_menu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c index 36144ae7c..d460833c3 100644 --- a/src/pokemon_menu.c +++ b/src/pokemon_menu.c @@ -779,7 +779,7 @@ static void sub_808AB34(u8 taskID) #undef tFieldMoveId -void sub_808AB90(void) +void FieldCallback_Teleport(void) { pal_fill_black(); CreateTask(sub_808ABA8, 8); @@ -814,7 +814,7 @@ static bool8 SetUpFieldMove_Surf(void) { if (PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_808AC2C; return TRUE; } @@ -832,13 +832,13 @@ static bool8 SetUpFieldMove_Fly(void) { if (ShouldDoBrailleFlyEffect()) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = DoBrailleFlyEffect; return TRUE; } - if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == 1) + if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_808AC8C; return TRUE; } @@ -884,7 +884,7 @@ static bool8 SetUpFieldMove_Dive(void) gFieldEffectArguments[1] = sub_8068F18(); if (gFieldEffectArguments[1]) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_808ADAC; return TRUE; } @@ -905,7 +905,7 @@ static bool8 SetUpFieldMove_Waterfall(void) if (MetatileBehavior_IsWaterfall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE && IsPlayerSurfingNorth() == TRUE) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_808AE08; return TRUE; } |