From bf73772a560ddfdf0b404ba3f85eb26542031b7b Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 10 Apr 2016 14:42:14 -0400 Subject: Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style --- engine/scripting.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 42d060e9b..c6a92c16e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -582,7 +582,7 @@ GiveItemScript: ; 96f77 itemnotify end -.Full +.Full: buttonsound pocketisfull end @@ -681,19 +681,19 @@ GetPocketName: ; 96ffe call CopyName2 ret -.Pockets +.Pockets: dw .Item dw .Key dw .Ball dw .TM -.Item +.Item: db "ITEM POCKET@" -.Key +.Key: db "KEY POCKET@" -.Ball +.Ball: db "BALL POCKET@" -.TM +.TM: db "TM POCKET@" ; 97051 @@ -1425,12 +1425,12 @@ ShowEmoteScript: ; 973b6 applymovement2 .Hide end -.Show +.Show: show_emote step_sleep_1 step_end -.Hide +.Hide: hide_emote step_sleep_1 step_end -- cgit v1.2.3 From 6be4cd4da98093bf1b9362c946e693c89e4713ad Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 10 Apr 2016 15:01:49 -0400 Subject: Local labels starting with lowercase letters are no longer decorated with a trailing colon --- engine/scripting.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index c6a92c16e..078ce8931 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1455,7 +1455,7 @@ Script_earthquake: ; 973c7 jp ScriptCall ; 973e6 -.script: ; 973e6 +.script ; 973e6 applymovement PLAYER, wd002 end ; 973eb -- cgit v1.2.3