dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #935 from GriffinRichards/doc-warp

Browse Source 
Document some warp/field screen effect
This commit is contained in:
Diegoisawesome
2019-12-20 23:44:56 -08:00
committed by GitHub
parent d42ea06dc5 d1cf9006fb
commit 026e1108b2
43 changed files with 428 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scrcmd.c
View File

@@ -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;
}