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/RustboroCity_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/RustboroCity_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 896e8e220..53b481832 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton 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/RustboroCity_PokemonCenter_1F.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/RustboroCity_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 53b481832..a1c0ac31b 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - sethealplace 6 + setrespawn 6 call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_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/RustboroCity_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/RustboroCity_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index a1c0ac31b..c9a2a48a4 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call RustboroCity_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/RustboroCity_PokemonCenter_1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/RustboroCity_PokemonCenter_1F.inc') diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index c9a2a48a4..653cceb25 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress -- cgit v1.2.3