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/FallarborTown/scripts.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/FallarborTown') diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 21cea72e1..80dc91f9e 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -13,21 +13,21 @@ FallarborTown_EventScript_1EB20C:: @ 81EB20C faceplayer checkflag FLAG_0x08B goto_eq FallarborTown_EventScript_1EB221 - msgbox FallarborTown_Text_1EB26B, 4 + msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB221:: @ 81EB221 - msgbox FallarborTown_Text_1EB2DE, 4 + msgbox FallarborTown_Text_1EB2DE, MSGBOX_DEFAULT release end FallarborTown_EventScript_1EB22B:: @ 81EB22B - msgbox FallarborTown_Text_1EB35F, 2 + msgbox FallarborTown_Text_1EB35F, MSGBOX_NPC end FallarborTown_EventScript_1EB234:: @ 81EB234 - msgbox FallarborTown_Text_1EB3CA, 2 + msgbox FallarborTown_Text_1EB3CA, MSGBOX_NPC end FallarborTown_EventScript_1EB23D:: @ 81EB23D @@ -35,21 +35,21 @@ FallarborTown_EventScript_1EB23D:: @ 81EB23D faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_1EB3B5, 4 + msgbox FallarborTown_Text_1EB3B5, MSGBOX_DEFAULT waitmoncry release end FallarborTown_EventScript_1EB250:: @ 81EB250 - msgbox FallarborTown_Text_1EB4C2, 3 + msgbox FallarborTown_Text_1EB4C2, MSGBOX_SIGN end FallarborTown_EventScript_1EB259:: @ 81EB259 - msgbox FallarborTown_Text_1EB4FE, 3 + msgbox FallarborTown_Text_1EB4FE, MSGBOX_SIGN end FallarborTown_EventScript_1EB262:: @ 81EB262 - msgbox FallarborTown_Text_1EB534, 3 + msgbox FallarborTown_Text_1EB534, MSGBOX_SIGN end FallarborTown_Text_1EB26B: @ 81EB26B -- 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/FallarborTown/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/FallarborTown') diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 80dc91f9e..7a9d0b444 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -53,13 +53,13 @@ FallarborTown_EventScript_1EB262:: @ 81EB262 end FallarborTown_Text_1EB26B: @ 81EB26B - .string "Something’s happening,\n" - .string "and I don’t like it!\p" - .string "I’ve seen shady characters wandering\n" - .string "in and out of PROF. COZMO’s home…$" + .string "Something's happening,\n" + .string "and I don't like it!\p" + .string "I've seen shady characters wandering\n" + .string "in and out of PROF. COZMO's home…$" FallarborTown_Text_1EB2DE: @ 81EB2DE - .string "This region’s been known for meteors\n" + .string "This region's been known for meteors\n" .string "since the olden days.\p" .string "They say METEOR FALLS was gouged out\n" .string "by a falling meteorite long ago.$" @@ -67,7 +67,7 @@ FallarborTown_Text_1EB2DE: @ 81EB2DE FallarborTown_Text_1EB35F: @ 81EB35F .string "See! Take a look!\n" .string "This is my precious AZURILL!\p" - .string "It’s slick and smooth and plushy, too!$" + .string "It's slick and smooth and plushy, too!$" FallarborTown_Text_1EB3B5: @ 81EB3B5 .string "AZURILL: Rooreelooo.$" @@ -75,10 +75,10 @@ FallarborTown_Text_1EB3B5: @ 81EB3B5 FallarborTown_Text_1EB3CA: @ 81EB3CA .string "Have you already challenged FLANNERY,\n" .string "the LEADER of LAVARIDGE GYM?\p" - .string "The girl’s grandfather was famous.\n" + .string "The girl's grandfather was famous.\n" .string "He was one of the ELITE FOUR in the\l" .string "POKéMON LEAGUE at one point.\p" - .string "It wouldn’t surprise me to see FLANNERY\n" + .string "It wouldn't surprise me to see FLANNERY\n" .string "become a great TRAINER in her own\l" .string "right.$" @@ -91,6 +91,6 @@ FallarborTown_Text_1EB4FE: @ 81EB4FE .string "“A farm community with small gardens.”$" FallarborTown_Text_1EB534: @ 81EB534 - .string "MOVE TUTOR’S HOUSE\n" + .string "MOVE TUTOR'S HOUSE\n" .string "“New moves taught to POKéMON.”$" -- cgit v1.2.3