From 79ea091ff627d5e3613799698b5bf1ea95f45148 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 24 Jan 2019 21:41:14 -0500 Subject: Use and define more WRAM constants --- engine/overworld/scripting.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engine/overworld/scripting.asm') diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 40a43d270..f500d3c0e 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -1399,7 +1399,7 @@ Script_reloadmap: ld [wBattleScriptFlags], a ld a, MAPSETUP_RELOADMAP ldh [hMapEntryMethod], a - ld a, $1 + ld a, MAPSTATUS_ENTER call LoadMapStatus call StopScript ret @@ -2473,11 +2473,11 @@ Script_warp: ld [wXCoord], a call GetScriptByte ld [wYCoord], a - ld a, -1 + ld a, SPAWN_N_A ld [wDefaultSpawnpoint], a ld a, MAPSETUP_WARP ldh [hMapEntryMethod], a - ld a, 1 + ld a, MAPSTATUS_ENTER call LoadMapStatus call StopScript ret @@ -2486,11 +2486,11 @@ Script_warp: call GetScriptByte call GetScriptByte call GetScriptByte - ld a, -1 + ld a, SPAWN_N_A ld [wDefaultSpawnpoint], a ld a, MAPSETUP_BADWARP ldh [hMapEntryMethod], a - ld a, 1 + ld a, MAPSTATUS_ENTER call LoadMapStatus call StopScript ret @@ -2611,7 +2611,7 @@ Script_newloadmap: call GetScriptByte ldh [hMapEntryMethod], a - ld a, 1 + ld a, MAPSTATUS_ENTER call LoadMapStatus call StopScript ret @@ -2793,7 +2793,7 @@ Script_credits: farcall RedCredits ReturnFromCredits: call Script_endall - ld a, $3 + ld a, MAPSTATUS_DONE call LoadMapStatus call StopScript ret -- cgit v1.2.3