diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-12-20 23:44:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 23:44:56 -0800 |
| commit | 026e1108b26f4ce5cea362997135bd8efc7cb28a (patch) | |
| tree | 4f99fb34ab0abd51d8f0a4f958ec5b0001f5fed9 /src/scrcmd.c | |
| parent | d42ea06dc5ade2209fb84ffedafd33de3fbc9cd1 (diff) | |
| parent | d1cf9006fb4b29e63302c69c912e431a873626c0 (diff) | |
Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index a6ead183b..ac6e2d689 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -810,7 +810,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_80AF848(); + DoTeleportWarp(); ResetInitialPlayerAvatarState(); return TRUE; } @@ -2286,7 +2286,7 @@ void SetMovingNpcId(u16 npcId) sMovingNpcId = npcId; } -bool8 ScrCmd_warpE0(struct ScriptContext *ctx) +bool8 ScrCmd_warpsootopolislegend(struct ScriptContext *ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -2295,7 +2295,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_80AF79C(); + DoSootopolisLegendWarp(); ResetInitialPlayerAvatarState(); return TRUE; } |