From c557ac61aef788f1630d3960dd2366bf000db8e0 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 03:37:46 -0500 Subject: adds constants, cleans up callstd and msgbox code * adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants --- data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattleFrontier_PokemonCenter_1F') diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 3dff67a93..e37842cf5 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -16,15 +16,15 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 end BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916 - msgbox BattleFrontier_PokemonCenter_1F_Text_267944, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F - msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, 2 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC end BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 @@ -32,7 +32,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, 4 + msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT waitmoncry release end -- cgit v1.2.3 From 2615ece23bd9463f3e43fca40eac1adcabeb2813 Mon Sep 17 00:00:00 2001 From: Melody Date: Fri, 7 Dec 2018 10:41:08 -0500 Subject: Use normal apostrophes like adults --- data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/BattleFrontier_PokemonCenter_1F') diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index e37842cf5..42c6db053 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -39,19 +39,19 @@ BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931 BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944 .string "There was someone here using a \n" - .string "POKéMON I’ve never seen before.\p" + .string "POKéMON I've never seen before.\p" .string "I never learned about it at\n" - .string "TRAINER’S SCHOOL at least.\p" + .string "TRAINER'S SCHOOL at least.\p" .string "I wonder where you can catch POKéMON\n" .string "like that.$" BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB .string "Okay! Next stop, the BATTLE ARENA!\n" - .string "I’d better get the right POKéMON from\l" + .string "I'd better get the right POKéMON from\l" .string "the PC Storage System.$" BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B - .string "Giggle… I’m going to go through every\n" + .string "Giggle… I'm going to go through every\n" .string "challenge with just this baby!$" BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90 -- cgit v1.2.3