diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-03 01:59:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 01:59:36 -0500 |
| commit | f2ce06683d828e2dad06736600b6c3b52ba3a5b4 (patch) | |
| tree | 0485372cbc678a2932d901c1b3319872d5b95b45 /src/scrcmd.c | |
| parent | 4a04b16ac1e9b8d7a6e028c69e0434530c9b1c89 (diff) | |
| parent | 88e951bfe39066d9109e714968410a5277c3cfac (diff) | |
Merge pull request #1285 from GriffinRichards/doc-fieldscr
Minor field_screen_effect / field_player_avatar documentation
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index ef0b3f86b..f36a44187 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2235,7 +2235,9 @@ bool8 ScrCmd_gotoram(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_warpD1(struct ScriptContext *ctx) +// Unused +// For the warp used by the Aqua Hideout, see DoTeleportTileWarp +bool8 ScrCmd_warpspinenter(struct ScriptContext *ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -2244,8 +2246,8 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_808D074(GetPlayerFacingDirection()); - sub_80B0244(); + SetSpinStartFacingDir(GetPlayerFacingDirection()); + DoSpinEnterWarp(); ResetInitialPlayerAvatarState(); return TRUE; } |