From ae5ec7f5b05218ba21c53ef632590a5243a7f647 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:17:14 -0500 Subject: Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 636cac8f1..bb924026c 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -36,13 +36,13 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 move 4, FallarborTown_PokemonCenter_1F_Movement_153B74 waitmove 0 - jump FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 move 4, FallarborTown_PokemonCenter_1F_Movement_153B81 waitmove 0 - jump FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index bb924026c..320ba0a3a 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playsfx 18 + playse 18 disappear 4 clearflag 870 release -- cgit v1.2.3 From 598756eaa47b523bd557a619e05cb23399ac02e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:57:54 -0500 Subject: more script command renaming --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 320ba0a3a..abe0ac7c6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -34,14 +34,14 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 end FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 - move 4, FallarborTown_PokemonCenter_1F_Movement_153B74 - waitmove 0 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74 + waitmovement 0 goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 - move 4, FallarborTown_PokemonCenter_1F_Movement_153B81 - waitmove 0 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81 + waitmovement 0 goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end -- cgit v1.2.3 From b4ba35a54c0f6204e34d2814351162c79ea4c0ba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:33:52 -0500 Subject: more command renaming --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index abe0ac7c6..3b33c5a41 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -47,7 +47,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 - disappear 4 + removeobject 4 clearflag 870 release end -- cgit v1.2.3 From e926119b726839bc687c503db3680899906aad0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 17:04:25 -0500 Subject: update --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 3b33c5a41..5b1f1c948 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end @@ -27,7 +27,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 lock faceplayer msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4 - closebutton + closemessage switch FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 -- cgit v1.2.3 From 65207e03662c639970ef19b372c21b8e28b6f097 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Dec 2017 14:43:21 -0800 Subject: Label all flags up to 901 --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 5b1f1c948..1e50c2fd6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 removeobject 4 - clearflag 870 + clearflag FLAG_HIDE_LANETTE release end -- cgit v1.2.3 From a753c44277c050fb24aaf97a8947c7f54e0dacd7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Dec 2017 19:58:17 -0600 Subject: Use event script macro names from pokeemerald --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1e50c2fd6..dd6e83be3 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - sethealplace 17 + setrespawn 17 call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end -- cgit v1.2.3 From 1c8b05e7b059a98d4259f4129896d0cc1eaa3847 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 10:11:43 -0600 Subject: Name and use constants for special vars --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index dd6e83be3..cf8f778fb 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress -- cgit v1.2.3 From 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 14:00:44 -0600 Subject: 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index cf8f778fb..0c9880137 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/FallarborTown_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 0c9880137..93a5115af 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse 18 + playse SE_JIDO_DOA removeobject 4 clearflag FLAG_HIDE_LANETTE release -- cgit v1.2.3