diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_control_avatar.c | 8 | ||||
| -rw-r--r-- | src/field_fadetransition.c | 2 | ||||
| -rw-r--r-- | src/scrcmd.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index b0b56ac13..6e9858cc5 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -75,11 +75,11 @@ extern u8 S_UseWaterfall[]; extern u8 S_CannotUseWaterfall[]; extern u8 UseDiveScript[]; extern u8 S_UseDiveUnderwater[]; -extern u8 S_FallDownHole[]; +extern u8 EventScript_FallDownHole[]; extern u8 gUnknown_081A14B8[]; extern u8 S_EggHatch[]; extern u8 gUnknown_0815FD0D[]; -extern u8 gUnknown_081C6BDE[]; +extern u8 EventScript_FallDownHoleMtPyre[]; static void GetPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *); @@ -563,7 +563,7 @@ bool8 TryStartCrackedFloorHoleScript(u16 metatileBehavior) { if (MetatileBehavior_IsCrackedFloorHole(metatileBehavior)) { - ScriptContext1_SetupScript(S_FallDownHole); + ScriptContext1_SetupScript(EventScript_FallDownHole); return TRUE; } return FALSE; @@ -717,7 +717,7 @@ bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileBehavior } if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE) { - ScriptContext1_SetupScript(gUnknown_081C6BDE); + ScriptContext1_SetupScript(EventScript_FallDownHoleMtPyre); return TRUE; } sub_8080E88(); diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index ee1b334a8..a4959703e 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -401,7 +401,7 @@ void sub_8080EF0(void) CreateTask(sub_808115C, 10); } -void sp13F_fall_to_last_warp(void) +void DoFallWarp(void) { sp13E_warp_to_last_warp(); gFieldCallback = sub_8086748; diff --git a/src/scrcmd.c b/src/scrcmd.c index 4d3f7ca2c..1a2d55f2e 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -770,7 +770,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); - sp13F_fall_to_last_warp(); + DoFallWarp(); ResetInitialPlayerAvatarState(); return TRUE; } |