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/RustboroCity_PokemonCenter_1F/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/RustboroCity_PokemonCenter_1F/scripts.inc') diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index acf33e647..0a5a6ed92 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -17,15 +17,15 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 end RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84 - msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D - msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 - msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F -- 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/RustboroCity_PokemonCenter_1F/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/RustboroCity_PokemonCenter_1F/scripts.inc') diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 0a5a6ed92..f76603dbd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -30,15 +30,15 @@ RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96 RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F .string "My POKéMON has a NAIVE nature, and my\n" - .string "friend’s has a JOLLY nature.\p" - .string "It’s fascinating how POKéMON have\n" + .string "friend's has a JOLLY nature.\p" + .string "It's fascinating how POKéMON have\n" .string "personalities!$" RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13 .string "Just like people, there are male and\n" .string "female POKéMON.\p" .string "But no one seems to have any idea how\n" - .string "they’re different.$" + .string "they're different.$" RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81 .string "The man next door gave me an HM!\p" -- cgit v1.2.3