diff options
Diffstat (limited to 'engine/overworld/scripting.asm')
| -rw-r--r-- | engine/overworld/scripting.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index d1f4ceecf..40a43d270 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -511,7 +511,7 @@ Script_verbosegiveitem: call Script_giveitem call CurItemName ld de, wStringBuffer1 - ld a, 1 + ld a, MEM_BUFFER_1 call CopyConvertedText ld b, BANK(GiveItemScript) ld de, GiveItemScript @@ -544,7 +544,7 @@ Script_verbosegiveitem2: ; parameters: item, var call GetScriptByte - cp -1 + cp ITEM_FROM_MEM jr nz, .ok ld a, [wScriptVar] .ok @@ -562,7 +562,7 @@ Script_verbosegiveitem2: ld [wScriptVar], a call CurItemName ld de, wStringBuffer1 - ld a, 1 + ld a, MEM_BUFFER_1 call CopyConvertedText ld b, BANK(GiveItemScript) ld de, GiveItemScript @@ -1222,7 +1222,7 @@ Script_loademote: ; parameters: bubble call GetScriptByte - cp -1 + cp EMOTE_FROM_MEM jr nz, .not_var_emote ld a, [wScriptVar] .not_var_emote @@ -1249,7 +1249,7 @@ Script_showemote: jp ScriptCall ShowEmoteScript: - loademote EMOTE_MEM + loademote EMOTE_FROM_MEM applymovement2 .Show pause 0 applymovement2 .Hide @@ -2520,7 +2520,7 @@ Script_blackoutmod: Script_dontrestartmapmusic: ; script command 0x83 - ld a, 1 + ld a, TRUE ld [wDontPlayMapMusicOnReload], a ret @@ -2547,7 +2547,7 @@ Script_delcmdqueue: ld b, a farcall DelCmdQueue ; no need to farcall ret c - ld a, 1 + ld a, TRUE ld [wScriptVar], a ret |